From d7bf791dfc0c8d2661d6eb66e0f82d10806b3ca2 Mon Sep 17 00:00:00 2001 From: z Date: Fri, 22 Dec 2023 16:37:33 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../KeyprojectCheckController.java | 15 +++++- .../keyProjects/OutSourcedController.java | 48 +++++++++---------- .../app/AppKeyprojectCheckController.java | 21 ++++---- .../app/AppKeyprojectPunishController.java | 6 ++- 4 files changed, 54 insertions(+), 36 deletions(-) diff --git a/src/main/java/com/zcloud/controller/keyProjects/KeyprojectCheckController.java b/src/main/java/com/zcloud/controller/keyProjects/KeyprojectCheckController.java index eae3b74a..cce33ff0 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/KeyprojectCheckController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/KeyprojectCheckController.java @@ -49,18 +49,28 @@ public class KeyprojectCheckController extends BaseController { Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); + PageData KEYPROJECTCHECK = new PageData(); +// PageData KEYPROJECTCHECKINFO = new PageData(); +// PageData HIDDEN = new PageData(); + + + pd = this.getPageData(); pd.put("KEYPROJECTCHECK_ID", this.get32UUID()); //主键 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("ISDELETE", 0); //是否删除 pd.put("SOURCE", 1); //企业ID + + keyprojectcheckService.save(pd); + KEYPROJECTCHECK.putAll(pd); String currentTime = DateUtil.date2Str(new Date()); if (Tools.notEmpty(pd.getString("SITUATIONJSON"))) { List list = (List) JSON.parse(pd.getString("SITUATIONJSON")); String time = currentTime; + List situationPdList = new ArrayList<>(); for (JSONObject json : list) { PageData situationPd = new PageData(); situationPd.put("KEYPROJECTCHECKINFO_ID", UuidUtil.get32UUID()); //主键 @@ -72,8 +82,11 @@ public class KeyprojectCheckController extends BaseController { situationPd.put("OPERATOR", pd.getString("OPERATOR")); //修改人 situationPd.put("OPERATTIME", time); //修改时间 keyprojectcheckInfoService.save(situationPd); + situationPdList.add(situationPd); time = DateUtil.calculateDateSecond(time, 1); } + pd.put("KEYPROJECTCHECKINFO",situationPdList); +// p2.putAll(pd); } if (Tools.notEmpty(pd.getString("HIDDENJSON"))) { @@ -110,7 +123,7 @@ public class KeyprojectCheckController extends BaseController { hiddenList.add(hidden); time = DateUtil.calculateDateSecond(time, 1); } - pd.put("hiddenList", hiddenList); + pd.put("HIDDEN", hiddenList); } map.put("pd", pd); map.put("dockData", JSON.toJSONString(pd)); diff --git a/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java b/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java index 72937c15..9561c461 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java @@ -5,7 +5,6 @@ import com.zcloud.aspect.DockAnnotation; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.entity.system.Department; import com.zcloud.service.bus.ImgFilesService; import com.zcloud.service.keyProjects.AIWarningService; import com.zcloud.service.keyProjects.OutSourcedService; @@ -15,7 +14,6 @@ import com.zcloud.service.system.UsersService; import com.zcloud.util.*; import org.apache.commons.lang.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.apache.shiro.session.Session; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -59,7 +57,7 @@ public class OutSourcedController extends BaseController { @RequestMapping(value = "/add") @RequiresPermissions("outsourced:add") @ResponseBody - @DockAnnotation(isAdd = true,hasAnnex = true) + @DockAnnotation(isAdd = true, hasAnnex = true) public Object add(@RequestParam(value = "file", required = false) MultipartFile file, @RequestParam(value = "file1", required = false) MultipartFile file1, @RequestParam(value = "file2", required = false) MultipartFile file2, @@ -238,7 +236,7 @@ public class OutSourcedController extends BaseController { pdImg.put("FILEPATH", Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); pdImg.put("TYPE", "300"); pdImg.put("FOREIGN_KEY", pd.getString("OUTSOURCED_ID")); - Smb.sshSftp(file9One, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile,IMGFILES_ID,pd.getString("OUTSOURCED_ID"),"300"); + Smb.sshSftp(file9One, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile, IMGFILES_ID, pd.getString("OUTSOURCED_ID"), "300"); imgfilesService.save(pdImg); } } @@ -250,7 +248,7 @@ public class OutSourcedController extends BaseController { //} pd.put("INVOLVING_CORPS", Jurisdiction.getCORPINFO_ID()); outsourcedService.save(pd); - pd.put("pictList",strings); + pd.put("pictList", strings); map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); return map; @@ -445,7 +443,7 @@ public class OutSourcedController extends BaseController { pdImg.put("TYPE", "300"); pdImg.put("FOREIGN_KEY", pd.getString("OUTSOURCED_ID")); imgfilesService.save(pdImg); - Smb.sshSftp(file9One, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile,IMGFILES_ID,pd.getString("OUTSOURCED_ID"),"300"); + Smb.sshSftp(file9One, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile, IMGFILES_ID, pd.getString("OUTSOURCED_ID"), "300"); } @@ -738,47 +736,47 @@ public class OutSourcedController extends BaseController { pd = this.getPageData(); //校验当前重点工程是否存在未完成的隐患 （包含未整改，未处罚，ai报警未处置的） PageData pageData = outsourcedService.jieshuOutSourced(pd); - if(!StringUtils.equals("0",pageData.getString("qr"))){ + if (!StringUtils.equals("0", pageData.getString("qr"))) { map.put("result", errInfo); - map.put("msg","当前重点工程还有"+pageData.getString("qr")+"项待确认安全环保检查,请处理以后再结束"); - map.put("code","500"); + map.put("msg", "当前重点工程还有" + pageData.getString("qr") + "项待确认安全环保检查,请处理以后再结束"); + map.put("code", "500"); return map; } - if(!StringUtils.equals("0",pageData.getString("zg"))){ + if (!StringUtils.equals("0", pageData.getString("zg"))) { map.put("result", errInfo); - map.put("msg","当前重点工程还有"+pageData.getString("zg")+"项需整改的隐患,请处理以后再结束"); - map.put("code","500"); + map.put("msg", "当前重点工程还有" + pageData.getString("zg") + "项需整改的隐患,请处理以后再结束"); + map.put("code", "500"); return map; } - if(!StringUtils.equals("0",pageData.getString("ys"))){ + if (!StringUtils.equals("0", pageData.getString("ys"))) { map.put("result", errInfo); - map.put("msg","当前重点工程还有"+pageData.getString("ys")+"项待验收隐患,请处理以后再结束"); - map.put("code","500"); + map.put("msg", "当前重点工程还有" + pageData.getString("ys") + "项待验收隐患,请处理以后再结束"); + map.put("code", "500"); return map; } - if(!StringUtils.equals("0",pageData.getString("cf"))){ + if (!StringUtils.equals("0", pageData.getString("cf"))) { map.put("result", errInfo); - map.put("msg","当前重点工程还有"+pageData.getString("cf")+"项待处罚隐患,请处理以后再结束"); - map.put("code","500"); + map.put("msg", "当前重点工程还有" + pageData.getString("cf") + "项待处罚隐患,请处理以后再结束"); + map.put("code", "500"); return map; } - if(!StringUtils.equals("0",pageData.getString("fk"))){ + if (!StringUtils.equals("0", pageData.getString("fk"))) { map.put("result", errInfo); - map.put("msg","当前重点工程还有"+pageData.getString("fk")+"项处罚待反馈隐患,请处理以后再结束"); - map.put("code","500"); + map.put("msg", "当前重点工程还有" + pageData.getString("fk") + "项处罚待反馈隐患,请处理以后再结束"); + map.put("code", "500"); return map; } - if(!StringUtils.equals("0",pageData.getString("ai"))){ + if (!StringUtils.equals("0", pageData.getString("ai"))) { map.put("result", errInfo); - map.put("msg","当前重点工程还有"+pageData.getString("ai")+"项AI报警待处置,请处理以后再结束"); - map.put("code","500"); + map.put("msg", "当前重点工程还有" + pageData.getString("ai") + "项AI报警待处置,请处理以后再结束"); + map.put("code", "500"); return map; } pd = outsourcedService.findById(pd); outsourcedService.jie(pd); //清空摄像头与重点工程的关联关系 videoManagerService.updateAiByOUTSOURCED_ID(pd); - map.put("code","0"); + map.put("code", "0"); map.put("result", errInfo); //返回结果 return map; } diff --git a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java index ed324c42..4c4d214d 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java @@ -61,6 +61,7 @@ public class AppKeyprojectCheckController extends BaseController { Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); + PageData KEYPROJECTCHECK = new PageData(); pd = this.getPageData(); pd.put("KEYPROJECTCHECK_ID", this.get32UUID()); //主键 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 @@ -71,8 +72,9 @@ public class AppKeyprojectCheckController extends BaseController { ArrayList parm2List = new ArrayList<>(); ArrayList parm3List = new ArrayList<>(); - parm1.putAll(pd); - keyprojectcheckService.save(parm1); +// parm1.putAll(pd); + keyprojectcheckService.save(pd); + KEYPROJECTCHECK.putAll(pd); @@ -95,6 +97,7 @@ public class AppKeyprojectCheckController extends BaseController { parm2List.add(situationPd); time = DateUtil.calculateDateSecond(time, 1); } + pd.put("KEYPROJECTCHECKINFO",parm2List); } Boolean boo = false; // 增加开关控制 if (Tools.notEmpty(pd.getString("HIDDENJSON"))) { @@ -130,12 +133,12 @@ public class AppKeyprojectCheckController extends BaseController { keyprojectHiddenService.save(hidden); - parm3List.add(hidden); +// parm3List.add(hidden); hiddenList.add(hidden); time = DateUtil.calculateDateSecond(time, 1); } - pd.put("hiddenList", hiddenList); + pd.put("HIDDEN", hiddenList); } try { //这里发送短信 通知 先判断重点工程是否要求发短信, 不发直接过，发的话 找到对应人以及对应手机号 发送对应模板短信啊 @@ -187,12 +190,8 @@ public class AppKeyprojectCheckController extends BaseController { }catch (Exception e){ e.printStackTrace(); }finally { - PageData pageData = new PageData(); - pageData.put("p1",parm1); - pageData.put("p1",parm1); - pageData.put("p1",parm1); map.put("pd",pd); - map.put("dockData", JSON.toJSONString(pageData)); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); } return map; @@ -338,6 +337,7 @@ public class AppKeyprojectCheckController extends BaseController { @RequestMapping(value="/check") @ResponseBody @Transactional + @DockAnnotation public Object check() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -347,6 +347,7 @@ public class AppKeyprojectCheckController extends BaseController { keyprojectHiddenService.editstate(pd); map.put("result", errInfo); + map.put("dockData", JSON.toJSONString(pd)); return map; } /**修改处罚状态 @@ -356,12 +357,14 @@ public class AppKeyprojectCheckController extends BaseController { @RequestMapping(value="/editHiddenIspunish") @ResponseBody @Transactional + @DockAnnotation public Object editHiddenIspunish() throws Exception{ Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); keyprojectHiddenService.editstate(pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectPunishController.java b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectPunishController.java index 6d51e5c2..e8fc5904 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectPunishController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectPunishController.java @@ -1,7 +1,9 @@ package com.zcloud.controller.keyProjects.app; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.zcloud.aspect.DockAnnotation; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -55,6 +57,7 @@ public class AppKeyprojectPunishController extends BaseController { */ @RequestMapping(value="/add") @ResponseBody + @DockAnnotation(isAdd = true) public Object add() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -101,6 +104,7 @@ public class AppKeyprojectPunishController extends BaseController { }finally { map.put("result", errInfo); } + map.put("dockData", JSON.toJSONString(pd)); return map; } @@ -136,7 +140,7 @@ public class AppKeyprojectPunishController extends BaseController { // String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file, fileName, Const.FILEPATHFILE + ffile); - pd.put("HANDLE_IMG", Const.FILEPATHFILE + ffile + "/" + fileName); + pd.put("HANDLE_IMG", Const.FILEPATHFILE + pd.get("HANDLEDID") + "/" + ffile + "/" + fileName); } } keyprojectpunishService.editstate(pd); From b057d96317bc504e4cdb2a09ef4363d05479204b Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 27 Dec 2023 14:50:18 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E5=9B=AD=E5=9C=B0?= =?UTF-8?q?=E3=80=81=E6=95=99=E8=82=B2=E5=9F=B9=E8=AE=AD=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bus/PersonObtainEvidenceController.java | 56 +++++++----- .../bus/StudySectionController.java | 52 +++++++---- .../bus/TrainingInfoController.java | 46 ++++++---- .../bus/TrainingPlanController.java | 51 +++++++---- .../controller/bus/VideoController.java | 44 ++++++---- .../MfolderStipulateController.java | 87 ++++++++++++------- 6 files changed, 217 insertions(+), 119 deletions(-) diff --git a/src/main/java/com/zcloud/controller/bus/PersonObtainEvidenceController.java b/src/main/java/com/zcloud/controller/bus/PersonObtainEvidenceController.java index 3bba07e3..dc7da92d 100644 --- a/src/main/java/com/zcloud/controller/bus/PersonObtainEvidenceController.java +++ b/src/main/java/com/zcloud/controller/bus/PersonObtainEvidenceController.java @@ -6,6 +6,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.alibaba.fastjson.JSON; +import com.zcloud.aspect.DockAnnotation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -34,7 +36,7 @@ import com.zcloud.service.system.DepartmentService; import com.zcloud.service.system.PostService; import com.zcloud.service.system.UsersService; -/** +/** * 说明：人员取证情况 * 作者：luoxiaobao * 时间：2020-12-29 @@ -52,7 +54,7 @@ public class PersonObtainEvidenceController extends BaseController { private DepartmentService departmentService; @Autowired private PostService postService; - + /**新增 * @param * @throws Exception @@ -60,6 +62,7 @@ public class PersonObtainEvidenceController extends BaseController { @RequestMapping(value="/add") @RequiresPermissions("personobtainevidence:add") @ResponseBody + @DockAnnotation(hasAnnex = true) public Object add(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -72,6 +75,7 @@ public class PersonObtainEvidenceController extends BaseController { pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 + List fileList = new ArrayList<>(); if (null != file && !file.isEmpty()) { String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { @@ -84,12 +88,15 @@ public class PersonObtainEvidenceController extends BaseController { String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file, fileName,Const.FILEPATHIMG + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("IMGPATH", Const.FILEPATHIMG + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + fileList.add(Const.HTTPFILEURL + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName); } personobtainevidenceService.save(pd); + map.put("dockData", pd); + map.put("sendPicturesList", JSON.toJSONString(fileList)); map.put("result", errInfo); return map; } - + /**删除 * @param out * @throws Exception @@ -97,8 +104,9 @@ public class PersonObtainEvidenceController extends BaseController { @RequestMapping(value="/delete") @RequiresPermissions("personobtainevidence:del") @ResponseBody + @DockAnnotation public Object delete() throws Exception{ - Map map = new HashMap(); + Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); @@ -106,9 +114,10 @@ public class PersonObtainEvidenceController extends BaseController { pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 personobtainevidenceService.delete(pd); map.put("result", errInfo); //返回结果 + map.put("dockData", pd); return map; } - + /**修改 * @param * @throws Exception @@ -116,6 +125,7 @@ public class PersonObtainEvidenceController extends BaseController { @RequestMapping(value="/edit") @RequiresPermissions("personobtainevidence:edit") @ResponseBody + @DockAnnotation(hasAnnex = true) public Object edit(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -123,6 +133,7 @@ public class PersonObtainEvidenceController extends BaseController { pd = this.getPageData(); pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + List fileList = new ArrayList<>(); if (null != file && !file.isEmpty()) { String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { @@ -135,12 +146,15 @@ public class PersonObtainEvidenceController extends BaseController { String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file, fileName,Const.FILEPATHIMG + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("IMGPATH", Const.FILEPATHIMG + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + fileList.add(Const.HTTPFILEURL + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName); } personobtainevidenceService.edit(pd); + map.put("dockData", pd); + map.put("sendPicturesList", JSON.toJSONString(fileList)); map.put("result", errInfo); return map; } - + /**列表 * @param page * @throws Exception @@ -163,7 +177,7 @@ public class PersonObtainEvidenceController extends BaseController { map.put("result", errInfo); return map; } - + /**去修改页面获取数据 * @param * @throws Exception @@ -184,7 +198,7 @@ public class PersonObtainEvidenceController extends BaseController { // PageData dept = new PageData(); // dept.put("DEPARTMENT_ID",ZDEPARTMENT_ID); // dept=departmentService.findById(dept); - + //获取部门下拉树 List zdepartmentPdList = new ArrayList(); @@ -192,7 +206,7 @@ public class PersonObtainEvidenceController extends BaseController { dept.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); dept=this.departmentService.findByCorpId(dept); String ZDEPARTMENT_ID = dept.getString("DEPARTMENT_ID"); - + PageData node = new PageData(); node.put("id", dept.get("DEPARTMENT_ID")); node.put("parentId", dept.get("PARENT_ID")); @@ -211,13 +225,13 @@ public class PersonObtainEvidenceController extends BaseController { PageData post = new PageData(); post.put("DEPARTMENT_ID", pd.getString("DEPARTMENT_ID")); post.put("STATUS", 0); - List postList = postService.listAll(post); + List postList = postService.listAll(post); map.put("postList", postList); map.put("pd", pd); map.put("result", errInfo); return map; - } - + } + /**获取部门下拉树 * @param @@ -242,7 +256,7 @@ public class PersonObtainEvidenceController extends BaseController { // PageData dept = new PageData(); // dept.put("DEPARTMENT_ID",ZDEPARTMENT_ID); // dept=this.departmentService.findById(dept); - + PageData node = new PageData(); node.put("id", dept.get("DEPARTMENT_ID")); node.put("parentId", dept.get("PARENT_ID")); @@ -251,7 +265,7 @@ public class PersonObtainEvidenceController extends BaseController { zdepartmentPdList.add(node); JSONArray arr = JSONArray.fromObject(departmentService.listAllDepartmentToSelect(ZDEPARTMENT_ID,zdepartmentPdList)); map.put("zTreeNodes", (null == arr ?"":"{\"treeNodes\":" + arr.toString() + "}")); - + PageData loginDept = new PageData(); loginDept.put("DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID()); loginDept = departmentService.findById(loginDept); @@ -259,7 +273,7 @@ public class PersonObtainEvidenceController extends BaseController { // PageData post = new PageData(); // post.put("DEPARTMENT_ID", ZDEPARTMENT_ID); // post.put("STATUS", 0); -// List postList = this.postService.listAll(post); +// List postList = this.postService.listAll(post); // map.put("postList", postList); map.put("result", errInfo); @@ -267,9 +281,9 @@ public class PersonObtainEvidenceController extends BaseController { map.put("USER_ID", Jurisdiction.getUSER_ID()); map.put("DEPT_NAME", loginDept.get("NAME")); return map; - } - - + } + + /**批量删除 * @param * @throws Exception @@ -280,7 +294,7 @@ public class PersonObtainEvidenceController extends BaseController { public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); + PageData pd = new PageData(); pd = this.getPageData(); String DATA_IDS = pd.getString("DATA_IDS"); if(Tools.notEmpty(DATA_IDS)){ @@ -293,7 +307,7 @@ public class PersonObtainEvidenceController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**导出到excel * @param * @throws Exception @@ -352,5 +366,5 @@ public class PersonObtainEvidenceController extends BaseController { mv = new ModelAndView(erv,dataMap); return mv; } - + } diff --git a/src/main/java/com/zcloud/controller/bus/StudySectionController.java b/src/main/java/com/zcloud/controller/bus/StudySectionController.java index 9511ad0c..020d57e1 100644 --- a/src/main/java/com/zcloud/controller/bus/StudySectionController.java +++ b/src/main/java/com/zcloud/controller/bus/StudySectionController.java @@ -6,6 +6,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.alibaba.fastjson.JSON; +import com.zcloud.aspect.DockAnnotation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -28,7 +30,7 @@ import com.zcloud.util.Tools; import com.zcloud.entity.PageData; import com.zcloud.service.bus.StudySectionService; -/** +/** * 说明：学习园地 * 作者：luoxiaobao * 时间：2021-01-07 @@ -37,10 +39,10 @@ import com.zcloud.service.bus.StudySectionService; @Controller @RequestMapping("/studysection") public class StudySectionController extends BaseController { - + @Autowired private StudySectionService studysectionService; - + /**新增 * @param * @throws Exception @@ -48,6 +50,7 @@ public class StudySectionController extends BaseController { @RequestMapping(value="/add") @RequiresPermissions("studysection:add") @ResponseBody + @DockAnnotation(hasAnnex = true) public Object add(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -60,6 +63,7 @@ public class StudySectionController extends BaseController { pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 + List fileList = new ArrayList<>(); if (null != file && !file.isEmpty()) { String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { @@ -72,14 +76,19 @@ public class StudySectionController extends BaseController { // String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径 // String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); + Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + fileList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName); } studysectionService.save(pd); + map.put("dockData", pd); + if (fileList.size() > 0) { + map.put("sendPicturesList", JSON.toJSONString(fileList)); + } map.put("result", errInfo); return map; } - + /**删除 * @param out * @throws Exception @@ -87,18 +96,20 @@ public class StudySectionController extends BaseController { @RequestMapping(value="/delete") @RequiresPermissions("studysection:del") @ResponseBody + @DockAnnotation public Object delete() throws Exception{ - Map map = new HashMap(); + Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 studysectionService.delete(pd); + map.put("dockData", pd); map.put("result", errInfo); //返回结果 return map; } - + /**修改 * @param * @throws Exception @@ -106,6 +117,7 @@ public class StudySectionController extends BaseController { @RequestMapping(value="/edit") @RequiresPermissions("studysection:edit") @ResponseBody + @DockAnnotation(hasAnnex = true) public Object edit(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -114,6 +126,7 @@ public class StudySectionController extends BaseController { pd = this.getPageData(); pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + List fileList = new ArrayList<>(); if (null != file && !file.isEmpty()) { String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { @@ -124,15 +137,20 @@ public class StudySectionController extends BaseController { } String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); + Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + fileList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName); } studysectionService.edit(pd); + map.put("dockData", pd); + if (fileList.size() > 0) { + map.put("sendPicturesList", JSON.toJSONString(fileList)); + } map.put("result", errInfo); return map; } - - + + /**列表 * @param page * @throws Exception @@ -156,7 +174,7 @@ public class StudySectionController extends BaseController { String suffix = var.get("FILEPATH").toString().substring(var.get("FILEPATH").toString().lastIndexOf(".") + 1); var.put("extension_name", suffix); } - + } } map.put("varList", varList); @@ -164,7 +182,7 @@ public class StudySectionController extends BaseController { map.put("result", errInfo); return map; } - + /**去修改页面获取数据 * @param * @throws Exception @@ -181,8 +199,8 @@ public class StudySectionController extends BaseController { map.put("pd", pd); map.put("result", errInfo); return map; - } - + } + /**批量删除 * @param * @throws Exception @@ -193,7 +211,7 @@ public class StudySectionController extends BaseController { public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); + PageData pd = new PageData(); pd = this.getPageData(); String DATA_IDS = pd.getString("DATA_IDS"); if(Tools.notEmpty(DATA_IDS)){ @@ -206,7 +224,7 @@ public class StudySectionController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**导出到excel * @param * @throws Exception @@ -257,5 +275,5 @@ public class StudySectionController extends BaseController { mv = new ModelAndView(erv,dataMap); return mv; } - + } diff --git a/src/main/java/com/zcloud/controller/bus/TrainingInfoController.java b/src/main/java/com/zcloud/controller/bus/TrainingInfoController.java index 4580d7a2..88a1c57f 100644 --- a/src/main/java/com/zcloud/controller/bus/TrainingInfoController.java +++ b/src/main/java/com/zcloud/controller/bus/TrainingInfoController.java @@ -6,6 +6,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.alibaba.fastjson.JSON; +import com.zcloud.aspect.DockAnnotation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -28,7 +30,7 @@ import com.zcloud.util.Tools; import com.zcloud.entity.PageData; import com.zcloud.service.bus.TrainingInfoService; -/** +/** * 说明：培训情况 * 作者：luoxiaobao * 时间：2020-12-29 @@ -37,10 +39,10 @@ import com.zcloud.service.bus.TrainingInfoService; @Controller @RequestMapping("/traininginfo") public class TrainingInfoController extends BaseController { - + @Autowired private TrainingInfoService traininginfoService; - + /**新增 * @param * @throws Exception @@ -48,6 +50,7 @@ public class TrainingInfoController extends BaseController { @RequestMapping(value="/add") @RequiresPermissions("traininginfo:add") @ResponseBody + @DockAnnotation(hasAnnex = true) public Object add(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -60,6 +63,7 @@ public class TrainingInfoController extends BaseController { pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 + List fileLst = new ArrayList<>(); if (null != file && !file.isEmpty()) { String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { @@ -70,14 +74,17 @@ public class TrainingInfoController extends BaseController { } String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); + Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + fileLst.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); } traininginfoService.save(pd); map.put("result", errInfo); + map.put("dockData", pd); + map.put("sendPicturesList", fileLst); return map; } - + /**删除 * @param out * @throws Exception @@ -85,8 +92,9 @@ public class TrainingInfoController extends BaseController { @RequestMapping(value="/delete") @RequiresPermissions("traininginfo:del") @ResponseBody + @DockAnnotation public Object delete() throws Exception{ - Map map = new HashMap(); + Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); @@ -94,9 +102,10 @@ public class TrainingInfoController extends BaseController { pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 traininginfoService.delete(pd); map.put("result", errInfo); //返回结果 + map.put("dockData", pd); return map; } - + /**修改 * @param * @throws Exception @@ -104,6 +113,7 @@ public class TrainingInfoController extends BaseController { @RequestMapping(value="/edit") @RequiresPermissions("traininginfo:edit") @ResponseBody + @DockAnnotation(hasAnnex = true) public Object edit(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -111,6 +121,7 @@ public class TrainingInfoController extends BaseController { pd = this.getPageData(); pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + List fileLst = new ArrayList<>(); if (null != file && !file.isEmpty()) { String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { @@ -121,14 +132,17 @@ public class TrainingInfoController extends BaseController { } String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); + Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + fileLst.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); } traininginfoService.edit(pd); map.put("result", errInfo); + map.put("dockData", pd); + map.put("sendPicturesList", JSON.toJSONString(fileLst)); return map; } - + /**列表 * @param page * @throws Exception @@ -154,7 +168,7 @@ public class TrainingInfoController extends BaseController { String suffix = var.get("FILEPATH").toString().substring(var.get("FILEPATH").toString().lastIndexOf(".") + 1); var.put("extension_name", suffix); } - + } } map.put("varList", varList); @@ -162,7 +176,7 @@ public class TrainingInfoController extends BaseController { map.put("result", errInfo); return map; } - + /**去修改页面获取数据 * @param * @throws Exception @@ -179,8 +193,8 @@ public class TrainingInfoController extends BaseController { map.put("pd", pd); map.put("result", errInfo); return map; - } - + } + /**批量删除 * @param * @throws Exception @@ -191,7 +205,7 @@ public class TrainingInfoController extends BaseController { public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); + PageData pd = new PageData(); pd = this.getPageData(); String DATA_IDS = pd.getString("DATA_IDS"); if(Tools.notEmpty(DATA_IDS)){ @@ -204,7 +218,7 @@ public class TrainingInfoController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**导出到excel * @param * @throws Exception @@ -255,5 +269,5 @@ public class TrainingInfoController extends BaseController { mv = new ModelAndView(erv,dataMap); return mv; } - + } diff --git a/src/main/java/com/zcloud/controller/bus/TrainingPlanController.java b/src/main/java/com/zcloud/controller/bus/TrainingPlanController.java index f89dc158..d2557f4e 100644 --- a/src/main/java/com/zcloud/controller/bus/TrainingPlanController.java +++ b/src/main/java/com/zcloud/controller/bus/TrainingPlanController.java @@ -7,6 +7,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.alibaba.fastjson.JSON; +import com.zcloud.aspect.DockAnnotation; +import net.sf.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -30,7 +33,7 @@ import com.zcloud.util.Tools; import com.zcloud.entity.PageData; import com.zcloud.service.bus.TrainingPlanService; -/** +/** * 说明：培训计划 * 作者：luoxiaobao * 时间：2020-12-28 @@ -39,10 +42,10 @@ import com.zcloud.service.bus.TrainingPlanService; @Controller @RequestMapping("/trainingplan") public class TrainingPlanController extends BaseController { - + @Autowired private TrainingPlanService trainingplanService; - + /**新增 * @param * @throws Exception @@ -50,6 +53,7 @@ public class TrainingPlanController extends BaseController { @RequestMapping(value="/add") @RequiresPermissions("trainingplan:add") @ResponseBody + @DockAnnotation(hasAnnex = true) public Object add(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -62,6 +66,7 @@ public class TrainingPlanController extends BaseController { pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 + List fileList = new ArrayList<>(); if (null != file && !file.isEmpty()) { String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { @@ -72,14 +77,17 @@ public class TrainingPlanController extends BaseController { } String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); + Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + fileList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName); } trainingplanService.save(pd); + map.put("dockData", pd); + map.put("sendPicturesList", JSON.toJSONString(fileList)); map.put("result", errInfo); return map; } - + /**删除 * @param out * @throws Exception @@ -87,8 +95,9 @@ public class TrainingPlanController extends BaseController { @RequestMapping(value="/delete") @RequiresPermissions("trainingplan:del") @ResponseBody + @DockAnnotation public Object delete() throws Exception{ - Map map = new HashMap(); + Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); @@ -96,9 +105,10 @@ public class TrainingPlanController extends BaseController { pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 trainingplanService.delete(pd); map.put("result", errInfo); //返回结果 + map.put("dockDate", pd); return map; } - + /**修改 * @param * @throws Exception @@ -106,6 +116,7 @@ public class TrainingPlanController extends BaseController { @RequestMapping(value="/edit") @RequiresPermissions("trainingplan:edit") @ResponseBody + @DockAnnotation(hasAnnex = true) public Object edit(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -114,6 +125,7 @@ public class TrainingPlanController extends BaseController { pd = this.getPageData(); pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + List fileList = new ArrayList<>(); if (null != file && !file.isEmpty()) { String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { @@ -126,14 +138,17 @@ public class TrainingPlanController extends BaseController { // String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径 // String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); + Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + fileList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName); } trainingplanService.edit(pd); + map.put("dockData", pd); map.put("result", errInfo); + map.put("sendPicturesList", JSON.toJSONString(fileList)); return map; } - + /**列表 * @param page * @throws Exception @@ -157,7 +172,7 @@ public class TrainingPlanController extends BaseController { String suffix = var.get("FILEPATH").toString().substring(var.get("FILEPATH").toString().lastIndexOf(".") + 1); var.put("extension_name", suffix); } - + } } map.put("varList", varList); @@ -165,7 +180,7 @@ public class TrainingPlanController extends BaseController { map.put("result", errInfo); return map; } - + /**去修改页面获取数据 * @param * @throws Exception @@ -182,8 +197,8 @@ public class TrainingPlanController extends BaseController { map.put("pd", pd); map.put("result", errInfo); return map; - } - + } + /**批量删除 * @param * @throws Exception @@ -194,7 +209,7 @@ public class TrainingPlanController extends BaseController { public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); + PageData pd = new PageData(); pd = this.getPageData(); String DATA_IDS = pd.getString("DATA_IDS"); if(Tools.notEmpty(DATA_IDS)){ @@ -207,7 +222,7 @@ public class TrainingPlanController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**导出到excel * @param * @throws Exception @@ -258,9 +273,9 @@ public class TrainingPlanController extends BaseController { mv = new ModelAndView(erv,dataMap); return mv; } - - + + /**列表 * @param page * @throws Exception @@ -278,5 +293,5 @@ public class TrainingPlanController extends BaseController { map.put("result", errInfo); return map; } - + } diff --git a/src/main/java/com/zcloud/controller/bus/VideoController.java b/src/main/java/com/zcloud/controller/bus/VideoController.java index e030c1e2..131a41ce 100644 --- a/src/main/java/com/zcloud/controller/bus/VideoController.java +++ b/src/main/java/com/zcloud/controller/bus/VideoController.java @@ -6,6 +6,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.zcloud.aspect.DockAnnotation; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -28,7 +29,7 @@ import com.zcloud.util.PathUtil; import com.zcloud.util.Smb; import com.zcloud.util.Tools; -/** +/** * 说明：视频管理 * 作者：luoxiaobao * 时间：2021-01-15 @@ -37,10 +38,10 @@ import com.zcloud.util.Tools; @Controller @RequestMapping("/video") public class VideoController extends BaseController { - + @Autowired private VideoService videoService; - + /**新增 * @param * @throws Exception @@ -48,6 +49,7 @@ public class VideoController extends BaseController { @RequestMapping(value="/add") @RequiresPermissions("video:add") @ResponseBody + @DockAnnotation(hasAnnex = true) public Object add(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -60,6 +62,7 @@ public class VideoController extends BaseController { pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 pd.put("TYPE", "0"); //是否置顶 0否 1是 // pd.put("CORPINFO_TYPE", "1"); //上传状态（管理员上传 0企业上传1） + List fileList = new ArrayList<>(); if (null != file && !file.isEmpty()) { String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { @@ -76,13 +79,16 @@ public class VideoController extends BaseController { //pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); Smb.sshSftp(file, fileName,Const.HTTPFILEURL + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("FILEPATH", Const.HTTPFILEURL + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + fileList.add(Const.HTTPFILEURL + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName); } - + videoService.save(pd); + map.put("dockData", pd); + map.put("sendPicturesList", fileList); map.put("result", errInfo); return map; } - + /**删除 * @param out * @throws Exception @@ -90,16 +96,18 @@ public class VideoController extends BaseController { @RequestMapping(value="/delete") @RequiresPermissions("video:del") @ResponseBody + @DockAnnotation public Object delete() throws Exception{ - Map map = new HashMap(); + Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); videoService.delete(pd); map.put("result", errInfo); //返回结果 + map.put("dockData", pd); return map; } - + /**修改 * @param * @throws Exception @@ -107,6 +115,7 @@ public class VideoController extends BaseController { @RequestMapping(value="/edit") @RequiresPermissions("video:edit") @ResponseBody + @DockAnnotation public Object edit() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -114,9 +123,10 @@ public class VideoController extends BaseController { pd = this.getPageData(); videoService.edit(pd); map.put("result", errInfo); + map.put("dockData", pd); return map; } - + /**列表 * @param page * @throws Exception @@ -142,7 +152,7 @@ public class VideoController extends BaseController { map.put("result", errInfo); return map; } - + /**去修改页面获取数据 * @param * @throws Exception @@ -150,6 +160,7 @@ public class VideoController extends BaseController { @RequestMapping(value="/goEdit") @RequiresPermissions("video:edit") @ResponseBody + @DockAnnotation public Object goEdit() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -157,10 +168,11 @@ public class VideoController extends BaseController { pd = this.getPageData(); pd = videoService.findById(pd); //根据ID读取 map.put("pd", pd); + map.put("dockData", pd); map.put("result", errInfo); return map; - } - + } + /**列表 数据置顶 * @param * @throws Exception @@ -168,6 +180,7 @@ public class VideoController extends BaseController { @RequestMapping(value="/editZhiding") @RequiresPermissions("video:edit") @ResponseBody + @DockAnnotation public Object editZhiding() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -185,9 +198,10 @@ public class VideoController extends BaseController { pd.put("TYPE", "1"); videoService.editZhiding(pd);//置顶信息 map.put("pd", pd); + map.put("dockData", pd); map.put("result", errInfo); return map; - } + } /**批量删除 * @param * @throws Exception @@ -198,7 +212,7 @@ public class VideoController extends BaseController { public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); + PageData pd = new PageData(); pd = this.getPageData(); String DATA_IDS = pd.getString("DATA_IDS"); if(Tools.notEmpty(DATA_IDS)){ @@ -211,7 +225,7 @@ public class VideoController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**导出到excel * @param * @throws Exception @@ -275,7 +289,7 @@ public class VideoController extends BaseController { pd.put("CORPINFO_TYPE", "2"); pd.put("TYPE", "1"); List ptVarList = videoService.listAll(pd); //平台视频 - + map.put("ptVarList", ptVarList); map.put("cpvarList", cpvarList); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/controller/filemanager/MfolderStipulateController.java b/src/main/java/com/zcloud/controller/filemanager/MfolderStipulateController.java index af2d0a63..f8f317e8 100644 --- a/src/main/java/com/zcloud/controller/filemanager/MfolderStipulateController.java +++ b/src/main/java/com/zcloud/controller/filemanager/MfolderStipulateController.java @@ -1,12 +1,11 @@ package com.zcloud.controller.filemanager; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import javax.servlet.http.HttpServletResponse; +import com.alibaba.fastjson.JSON; +import com.zcloud.aspect.DockAnnotation; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -31,18 +30,18 @@ import com.zcloud.util.Tools; import net.sf.json.JSONArray; -/** +/** * 说明：文件管理 - * 作者：zCloud + * 作者：zCloud * 官网： */ @Controller @RequestMapping("/mfolderStipulate") public class MfolderStipulateController extends BaseController { - + @Autowired private MfolderStipulateService mfolderService; - + /**创建目录 * @param * @throws Exception @@ -50,6 +49,7 @@ public class MfolderStipulateController extends BaseController { @RequestMapping(value="/add") @RequiresPermissions("mfolderStipulate:add") @ResponseBody + @DockAnnotation public Object add() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -61,12 +61,13 @@ public class MfolderStipulateController extends BaseController { pd.put("UNAME", Jurisdiction.getName()); //上传者 pd.put("MASTER", Jurisdiction.getUsername()); //所属人 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业 - pd.put("FILESIZE", ""); + pd.put("FILESIZE", ""); mfolderService.save(pd); + map.put("dockData", pd); map.put("result", errInfo); return map; } - + /**上传文件 * @param * @throws Exception @@ -74,6 +75,7 @@ public class MfolderStipulateController extends BaseController { @RequestMapping(value="/upload") @RequiresPermissions("mfolderStipulate:add") @ResponseBody + @DockAnnotation(hasAnnex = true) public Object add( @RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception{ Map map = new HashMap(); @@ -93,7 +95,9 @@ public class MfolderStipulateController extends BaseController { // fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); - pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); //文件路径 + pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + List fileList = new ArrayList<>(); + fileList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName); //pd.put("NAME", NAME); //文件名 //pd.put("PARENT_ID", PARENT_ID); //目录ID pd.put("CTIME", DateUtil.date2Str(new Date())); //创建时间 @@ -103,9 +107,11 @@ public class MfolderStipulateController extends BaseController { //pd.put("REMARKS", REMARKS); //备注 //pd.put("SHARE", SHARE); //是否共享 //pd.put("TYPE", TYPE); //数据类型 1.文件夹 2.文件 - + pd.put("MFOLDER_ID", this.get32UUID()); //主键 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业 + map.put("dockData", pd); + map.put("sendPicturesList", JSON.toJSONString(fileList)); mfolderService.save(pd); //存入数据库表 }else{ errInfo = "fail"; @@ -113,7 +119,7 @@ public class MfolderStipulateController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**上传文件 * @param * @throws Exception @@ -121,6 +127,7 @@ public class MfolderStipulateController extends BaseController { @RequestMapping(value="/editUpload") @RequiresPermissions("mfolderStipulate:add") @ResponseBody + @DockAnnotation(hasAnnex = true) public Object editUpload( @RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception{ Map map = new HashMap(); @@ -128,6 +135,7 @@ public class MfolderStipulateController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); String ffile = DateUtil.getDays(), fileName = ""; + List fileList = new ArrayList<>(); if (null != file && !file.isEmpty()) { String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { @@ -141,6 +149,8 @@ public class MfolderStipulateController extends BaseController { fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); //文件路径 + + fileList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName); //pd.put("NAME", NAME); //文件名 //pd.put("PARENT_ID", PARENT_ID); //目录ID pd.put("UNAME", Jurisdiction.getName()); //上传者,当前用户的姓名 @@ -149,15 +159,19 @@ public class MfolderStipulateController extends BaseController { //pd.put("REMARKS", REMARKS); //备注 //pd.put("SHARE", SHARE); //是否共享 //pd.put("TYPE", TYPE); //数据类型 1.文件夹 2.文件 - + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业 } mfolderService.edit(pd); //存入数据库表 + map.put("dockData", pd); + if (fileList.size() > 0) { + map.put("sendPicturesList", JSON.toJSONString(fileList)); + } map.put("result", errInfo); //返回结果 return map; } - - + + /**去修改页面获取数据 * @param * @throws Exception @@ -174,14 +188,15 @@ public class MfolderStipulateController extends BaseController { map.put("pd", pd); map.put("result", errInfo); return map; - } - + } + /**上传文件 * @param * @throws Exception */ @RequestMapping(value="/uploadAll") @ResponseBody + @DockAnnotation(hasAnnex = true) public Object uploadAll( @RequestParam(value="file",required=false) MultipartFile file, @RequestParam(value="FH_ID",required=false) String MFOLDER_ID @@ -201,8 +216,10 @@ public class MfolderStipulateController extends BaseController { // String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径 // fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); + Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); //文件路径 + List fileList = new ArrayList<>(); + fileList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName); String realName = file.getOriginalFilename(); String[] fileFullNames = realName.split("\\.");//上传文件全名 String extension =fileFullNames[fileFullNames.length-1];//上传文件文件后缀 @@ -218,6 +235,8 @@ public class MfolderStipulateController extends BaseController { pd.put("MFOLDER_ID", this.get32UUID()); //主键 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业 mfolderService.save(pd); //存入数据库表 + map.put("dockData", pd); + map.put("sendPicturesList", JSON.toJSONString(fileList)); }else{ errInfo = "fail"; } @@ -231,8 +250,9 @@ public class MfolderStipulateController extends BaseController { @RequestMapping(value="/delete") @RequiresPermissions("mfolderStipulate:del") @ResponseBody + @DockAnnotation public Object delete(@RequestParam String MFOLDER_ID,@RequestParam String FILEPATH) throws Exception{ - Map map = new HashMap(); + Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd.put("parentId", MFOLDER_ID); @@ -244,11 +264,12 @@ public class MfolderStipulateController extends BaseController { } pd.put("MFOLDER_ID", MFOLDER_ID); mfolderService.delete(pd); + map.put("dockData", pd); } map.put("result", errInfo); //返回结果 return map; } - + /**修改 * @param * @throws Exception @@ -256,16 +277,18 @@ public class MfolderStipulateController extends BaseController { @RequestMapping(value="/edit") @RequiresPermissions("mfolderStipulate:edit") @ResponseBody + @DockAnnotation public Object edit() throws Exception{ Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); mfolderService.edit(pd); + map.put("dockData", pd); map.put("result", errInfo); return map; } - + /**列表 * @param page * @throws Exception @@ -285,7 +308,7 @@ public class MfolderStipulateController extends BaseController { MFOLDER_ID = null == pd.get("MFOLDER_ID")?"":pd.get("MFOLDER_ID").toString(); pd.put("MFOLDER_ID", MFOLDER_ID); //当作上级ID } - + // if(Tools.notEmpty(SHARE) && "yes".equals(SHARE)) { // pd.put("SHARE", "yes"); // }else { @@ -337,7 +360,7 @@ public class MfolderStipulateController extends BaseController { fileType = "video"; //视频文件类型 } varList.get(i).put("extension_name", extension_name); //文件拓展名 - varList.get(i).put("fileType", fileType); //用于文件图标 + varList.get(i).put("fileType", fileType); //用于文件图标 } map.put("varList", varList); map.put("page", page); @@ -370,9 +393,9 @@ public class MfolderStipulateController extends BaseController { map.put("result", errInfo); return map; } - + /**预览txt,java,php,等文本文件 - * @return + * @return */ @RequestMapping(value="/viewTxt") @ResponseBody @@ -388,7 +411,7 @@ public class MfolderStipulateController extends BaseController { map.put("result", errInfo); return map; } - + /**批量操作 * @param * @throws Exception @@ -399,7 +422,7 @@ public class MfolderStipulateController extends BaseController { public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); + PageData pd = new PageData(); pd = this.getPageData(); String DATA_IDS = pd.getString("DATA_IDS"); if(Tools.notEmpty(DATA_IDS)){ @@ -413,7 +436,7 @@ public class MfolderStipulateController extends BaseController { map.put("result", errInfo); //返回结果 return map; } - + /**下载 * @param response * @throws Exception @@ -431,7 +454,7 @@ public class MfolderStipulateController extends BaseController { throw new NofileStiException("=========要下载的文件已经没有了========="); } } - + } /* @@ -440,7 +463,7 @@ public class MfolderStipulateController extends BaseController { class NofileStiException extends Exception { private static final long serialVersionUID = 1L; - + public NofileStiException() { super(); } @@ -456,5 +479,5 @@ class NofileStiException extends Exception { public NofileStiException(Throwable cause) { super(cause); } - + } From 9becfa6a9f6f1b2ece2450a547272b80816341ca Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Thu, 28 Dec 2023 09:18:15 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=A1=A3=E6=A1=88=EF=BC=8C=E5=AD=A6?= =?UTF-8?q?=E4=B9=A0=EF=BC=8C=E7=89=B9=E7=A7=8D=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bus/ArchivesFilesController.java | 10 +- .../bus/StudySectionController.java | 449 +++++++++--------- .../bus/TrainingScheduleController.java | 8 + .../onlinexxks/CurriculumController.java | 14 + .../onlinexxks/DataCoursewareController.java | 19 +- .../onlinexxks/QuestionController.java | 23 +- .../StageexampaperInputController.java | 9 + .../onlinexxks/StudyTaskController.java | 4 + .../onlinexxks/VideoCoursewareController.java | 14 + .../tzsb/SpecialEquipmentAqxjController.java | 4 + .../tzsb/SpecialEquipmentController.java | 29 +- 11 files changed, 356 insertions(+), 227 deletions(-) diff --git a/src/main/java/com/zcloud/controller/bus/ArchivesFilesController.java b/src/main/java/com/zcloud/controller/bus/ArchivesFilesController.java index 48b71fc5..668429ec 100644 --- a/src/main/java/com/zcloud/controller/bus/ArchivesFilesController.java +++ b/src/main/java/com/zcloud/controller/bus/ArchivesFilesController.java @@ -1,5 +1,7 @@ package com.zcloud.controller.bus; +import com.alibaba.fastjson.JSON; +import com.zcloud.aspect.DockAnnotation; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.PageData; import com.zcloud.service.bus.ArchivesFilesService; @@ -38,6 +40,7 @@ public class ArchivesFilesController extends BaseController { */ @RequestMapping(value="/add") @ResponseBody + @DockAnnotation(hasAnnex = true) public Object add( @RequestParam(value="FFILE",required=false) MultipartFile[] files, @RequestParam(value="TYPE",required=false) String TYPE, @@ -52,7 +55,7 @@ public class ArchivesFilesController extends BaseController { pd.put("TYPE", TYPE); pd.put("YEAR", YEAR); pd.put("STUDYTASK_ID", STUDYTASK_ID); - + ArrayList sendPicturesList = new ArrayList<>(); if (files != null && files.length > 0) { for (int i = 0; i < files.length; i++) { String suffixName = files[i].getOriginalFilename().substring(files[i].getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); @@ -72,11 +75,14 @@ public class ArchivesFilesController extends BaseController { Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd.put("FILE_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + sendPicturesList.add(pd.getString("FILE_PATH")+"@@"+fileName); } } archivesfilesService.save(pd); map.put("result", errInfo); + map.put("dockData", JSON.toJSONString(pd)); + map.put("sendPicturesList", JSON.toJSONString(sendPicturesList)); return map; } /**删除 @@ -85,6 +91,7 @@ public class ArchivesFilesController extends BaseController { */ @RequestMapping(value="/delete") @ResponseBody + @DockAnnotation public Object delete() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -93,6 +100,7 @@ public class ArchivesFilesController extends BaseController { Smb.deleteFile(pd.getString("FILE_PATH")); archivesfilesService.delete(pd); map.put("result", errInfo); //返回结果 + map.put("dockData", JSON.toJSONString(pd)); //返回结果 return map; } diff --git a/src/main/java/com/zcloud/controller/bus/StudySectionController.java b/src/main/java/com/zcloud/controller/bus/StudySectionController.java index 020d57e1..48be77b3 100644 --- a/src/main/java/com/zcloud/controller/bus/StudySectionController.java +++ b/src/main/java/com/zcloud/controller/bus/StudySectionController.java @@ -40,240 +40,243 @@ import com.zcloud.service.bus.StudySectionService; @RequestMapping("/studysection") public class StudySectionController extends BaseController { - @Autowired - private StudySectionService studysectionService; + @Autowired + private StudySectionService studysectionService; - /**新增 - * @param - * @throws Exception - */ - @RequestMapping(value="/add") - @RequiresPermissions("studysection:add") - @ResponseBody - @DockAnnotation(hasAnnex = true) - public Object add(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("STUDYSECTION_ID", this.get32UUID()); //主键 - pd.put("CREATOR", Jurisdiction.getUsername()); //添加人 - pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 - pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 - pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 - List fileList = new ArrayList<>(); - if (null != file && !file.isEmpty()) { - String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); - if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { - errInfo = "fail"; - map.put("result", errInfo); - map.put("msg", "文件格式不正确！"); - return map; - } - String ffile = DateUtil.getDays(); + /** + * 新增 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/add") + @RequiresPermissions("studysection:add") + @ResponseBody + @DockAnnotation(hasAnnex = true) + public Object add(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + ArrayList sendPicturesList = new ArrayList<>(); + pd.put("STUDYSECTION_ID", this.get32UUID()); //主键 + pd.put("CREATOR", Jurisdiction.getUsername()); //添加人 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 + pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 + if (null != file && !file.isEmpty()) { + String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase(); + if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { + errInfo = "fail"; + map.put("result", errInfo); + map.put("msg", "文件格式不正确！"); + return map; + } + String ffile = DateUtil.getDays(); // String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径 // String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 - String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); - pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); - fileList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName); - } - studysectionService.save(pd); - map.put("dockData", pd); - if (fileList.size() > 0) { - map.put("sendPicturesList", JSON.toJSONString(fileList)); - } - map.put("result", errInfo); - return map; - } + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + Smb.sshSftp(file, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); + pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + sendPicturesList.add(pd.getString("FILEPATH") + "@@" + fileName); + } + studysectionService.save(pd); + map.put("result", errInfo); + map.put("dockData", JSON.toJSONString(pd)); + map.put("sendPicturesList", JSON.toJSONString(sendPicturesList)); + return map; + } - /**删除 - * @param out - * @throws Exception - */ - @RequestMapping(value="/delete") - @RequiresPermissions("studysection:del") - @ResponseBody - @DockAnnotation - public Object delete() throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 - pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 - studysectionService.delete(pd); - map.put("dockData", pd); - map.put("result", errInfo); //返回结果 - return map; - } + /** + * 删除 + * + * @param out + * @throws Exception + */ + @RequestMapping(value = "/delete") + @RequiresPermissions("studysection:del") + @ResponseBody + public Object delete() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + studysectionService.delete(pd); + map.put("result", errInfo); //返回结果 + return map; + } - /**修改 - * @param - * @throws Exception - */ - @RequestMapping(value="/edit") - @RequiresPermissions("studysection:edit") - @ResponseBody - @DockAnnotation(hasAnnex = true) - public Object edit(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/edit") + @RequiresPermissions("studysection:edit") + @ResponseBody + public Object edit(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 - pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 - List fileList = new ArrayList<>(); - if (null != file && !file.isEmpty()) { - String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); - if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { - errInfo = "fail"; - map.put("result", errInfo); - map.put("msg", "文件格式不正确！"); - return map; - } - String ffile = DateUtil.getDays(); - String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); - pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); - fileList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName); - } - studysectionService.edit(pd); - map.put("dockData", pd); - if (fileList.size() > 0) { - map.put("sendPicturesList", JSON.toJSONString(fileList)); - } - map.put("result", errInfo); - return map; - } + pd = this.getPageData(); + pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + if (null != file && !file.isEmpty()) { + String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase(); + if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { + errInfo = "fail"; + map.put("result", errInfo); + map.put("msg", "文件格式不正确！"); + return map; + } + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + Smb.sshSftp(file, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); + pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + } + studysectionService.edit(pd); + map.put("result", errInfo); + return map; + } - /**列表 - * @param page - * @throws Exception - */ - @RequestMapping(value="/list") - @RequiresPermissions("studysection:list") - @ResponseBody - public Object list(Page page) throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 - if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); - pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - page.setPd(pd); - List varList = studysectionService.list(page); //列出StudySection列表 - if(varList != null && varList.size() > 0) { - for(PageData var : varList) { - if(var.get("FILEPATH") != null && Tools.notEmpty(var.getString("FILEPATH").toString())) { - String suffix = var.get("FILEPATH").toString().substring(var.get("FILEPATH").toString().lastIndexOf(".") + 1); - var.put("extension_name", suffix); - } + /** + * 列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/list") + @RequiresPermissions("studysection:list") + @ResponseBody + public Object list(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim()); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + page.setPd(pd); + List varList = studysectionService.list(page); //列出StudySection列表 + if (varList != null && varList.size() > 0) { + for (PageData var : varList) { + if (var.get("FILEPATH") != null && Tools.notEmpty(var.getString("FILEPATH").toString())) { + String suffix = var.get("FILEPATH").toString().substring(var.get("FILEPATH").toString().lastIndexOf(".") + 1); + var.put("extension_name", suffix); + } - } - } - map.put("varList", varList); - map.put("page", page); - map.put("result", errInfo); - return map; - } + } + } + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } - /**去修改页面获取数据 - * @param - * @throws Exception - */ - @RequestMapping(value="/goEdit") - @RequiresPermissions("studysection:edit") - @ResponseBody - public Object goEdit() throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd = studysectionService.findById(pd); //根据ID读取 - map.put("pd", pd); - map.put("result", errInfo); - return map; - } + /** + * 去修改页面获取数据 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/goEdit") + @RequiresPermissions("studysection:edit") + @ResponseBody + public Object goEdit() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = studysectionService.findById(pd); //根据ID读取 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } - /**批量删除 - * @param - * @throws Exception - */ - @RequestMapping(value="/deleteAll") - @RequiresPermissions("studysection:del") - @ResponseBody - public Object deleteAll() throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - String DATA_IDS = pd.getString("DATA_IDS"); - if(Tools.notEmpty(DATA_IDS)){ - String ArrayDATA_IDS[] = DATA_IDS.split(","); - studysectionService.deleteAll(ArrayDATA_IDS); - errInfo = "success"; - }else{ - errInfo = "fail"; - } - map.put("result", errInfo); //返回结果 - return map; - } + /** + * 批量删除 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/deleteAll") + @RequiresPermissions("studysection:del") + @ResponseBody + public Object deleteAll() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String DATA_IDS = pd.getString("DATA_IDS"); + if (Tools.notEmpty(DATA_IDS)) { + String ArrayDATA_IDS[] = DATA_IDS.split(","); + studysectionService.deleteAll(ArrayDATA_IDS); + errInfo = "success"; + } else { + errInfo = "fail"; + } + map.put("result", errInfo); //返回结果 + return map; + } - /**导出到excel - * @param - * @throws Exception - */ - @RequestMapping(value="/excel") - @RequiresPermissions("toExcel") - public ModelAndView exportExcel() throws Exception{ - ModelAndView mv = new ModelAndView(); - PageData pd = new PageData(); - pd = this.getPageData(); - Map dataMap = new HashMap(); - List titles = new ArrayList(); - titles.add("所属行业"); //1 - titles.add("所属专业"); //2 - titles.add("所属小专业"); //3 - titles.add("类型"); //4 - titles.add("标题"); //5 - titles.add("内容"); //6 - titles.add("附件路径"); //7 - titles.add("企业ID"); //8 - titles.add("添加人"); //9 - titles.add("添加时间"); //10 - titles.add("修改人"); //11 - titles.add("修改时间"); //12 - titles.add("是否删除 1-是 0-否"); //13 - dataMap.put("titles", titles); - List varOList = studysectionService.listAll(pd); - List varList = new ArrayList(); - for(int i=0;i dataMap = new HashMap(); + List titles = new ArrayList(); + titles.add("所属行业"); //1 + titles.add("所属专业"); //2 + titles.add("所属小专业"); //3 + titles.add("类型"); //4 + titles.add("标题"); //5 + titles.add("内容"); //6 + titles.add("附件路径"); //7 + titles.add("企业ID"); //8 + titles.add("添加人"); //9 + titles.add("添加时间"); //10 + titles.add("修改人"); //11 + titles.add("修改时间"); //12 + titles.add("是否删除 1-是 0-否"); //13 + dataMap.put("titles", titles); + List varOList = studysectionService.listAll(pd); + List varList = new ArrayList(); + for (int i = 0; i < varOList.size(); i++) { + PageData vpd = new PageData(); + vpd.put("var1", varOList.get(i).getString("INDUSTRY")); //1 + vpd.put("var2", varOList.get(i).getString("CORP_TYPE")); //2 + vpd.put("var3", varOList.get(i).getString("CORP_TYPE_SMALL")); //3 + vpd.put("var4", varOList.get(i).getString("TYPE")); //4 + vpd.put("var5", varOList.get(i).getString("TITLE")); //5 + vpd.put("var6", varOList.get(i).getString("CONTENT")); //6 + vpd.put("var7", varOList.get(i).getString("FILEPATH")); //7 + vpd.put("var8", varOList.get(i).getString("CORPINFO_ID")); //8 + vpd.put("var9", varOList.get(i).getString("CREATOR")); //9 + vpd.put("var10", varOList.get(i).getString("CREATTIME")); //10 + vpd.put("var11", varOList.get(i).getString("OPERATOR")); //11 + vpd.put("var12", varOList.get(i).getString("OPERATTIME")); //12 + vpd.put("var13", varOList.get(i).getString("ISDELETE")); //13 + varList.add(vpd); + } + dataMap.put("varList", varList); + ObjectExcelView erv = new ObjectExcelView(); + mv = new ModelAndView(erv, dataMap); + return mv; + } } diff --git a/src/main/java/com/zcloud/controller/bus/TrainingScheduleController.java b/src/main/java/com/zcloud/controller/bus/TrainingScheduleController.java index 0296ec89..5bdd559a 100644 --- a/src/main/java/com/zcloud/controller/bus/TrainingScheduleController.java +++ b/src/main/java/com/zcloud/controller/bus/TrainingScheduleController.java @@ -1,5 +1,7 @@ package com.zcloud.controller.bus; +import com.alibaba.fastjson.JSON; +import com.zcloud.aspect.DockAnnotation; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -39,6 +41,7 @@ public class TrainingScheduleController extends BaseController { */ @RequestMapping(value="/add") @ResponseBody + @DockAnnotation public Object add() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -53,6 +56,7 @@ public class TrainingScheduleController extends BaseController { pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID trainingscheduleService.save(pd); map.put("result", errInfo); + map.put("dockData", JSON.toJSONString(pd)); return map; } @@ -62,6 +66,7 @@ public class TrainingScheduleController extends BaseController { */ @RequestMapping(value="/delete") @ResponseBody + @DockAnnotation public Object delete() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -69,6 +74,7 @@ public class TrainingScheduleController extends BaseController { pd = this.getPageData(); trainingscheduleService.delete(pd); map.put("result", errInfo); //返回结果 + map.put("dockData", JSON.toJSONString(pd)); //返回结果 return map; } @@ -78,6 +84,7 @@ public class TrainingScheduleController extends BaseController { */ @RequestMapping(value="/edit") @ResponseBody + @DockAnnotation public Object edit() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -87,6 +94,7 @@ public class TrainingScheduleController extends BaseController { pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 trainingscheduleService.edit(pd); map.put("result", errInfo); + map.put("dockData", JSON.toJSONString(pd)); return map; } diff --git a/src/main/java/com/zcloud/controller/onlinexxks/CurriculumController.java b/src/main/java/com/zcloud/controller/onlinexxks/CurriculumController.java index a83d38cf..ead97cf0 100644 --- a/src/main/java/com/zcloud/controller/onlinexxks/CurriculumController.java +++ b/src/main/java/com/zcloud/controller/onlinexxks/CurriculumController.java @@ -1,5 +1,7 @@ package com.zcloud.controller.onlinexxks; +import com.alibaba.fastjson.JSON; +import com.zcloud.aspect.DockAnnotation; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -46,11 +48,13 @@ public class CurriculumController extends BaseController { @RequestMapping(value="/add") @RequiresPermissions("curriculum:add") @ResponseBody + @DockAnnotation(hasAnnex = true) public Object add(@RequestParam(value="FFILE",required=false) MultipartFile FFILE) throws Exception{ Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); + ArrayList sendPicturesList = new ArrayList<>(); pd.put("CURRICULUM_ID", this.get32UUID()); //主键 pd.put("CREATOR", Jurisdiction.getUsername()); //添加人 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 @@ -74,10 +78,13 @@ public class CurriculumController extends BaseController { String fileName = this.get32UUID()+FFILE.getOriginalFilename().substring(FFILE.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(FFILE, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("CAPTURE", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + sendPicturesList.add(pd.getString("CAPTURE")+"@@"+fileName); } curriculumService.save(pd); map.put("pd", pd); map.put("result", errInfo); + map.put("sendPicturesList", JSON.toJSONString(sendPicturesList)); + map.put("dockData", JSON.toJSONString(pd)); return map; } @@ -88,6 +95,7 @@ public class CurriculumController extends BaseController { @RequestMapping(value="/delete") @RequiresPermissions("curriculum:del") @ResponseBody + @DockAnnotation public Object delete() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -104,6 +112,7 @@ public class CurriculumController extends BaseController { } curriculumService.delete(pd); map.put("result", errInfo); //返回结果 + map.put("dockData", JSON.toJSONString(pd)); //返回结果 return map; } @@ -114,11 +123,13 @@ public class CurriculumController extends BaseController { @RequestMapping(value="/edit") @RequiresPermissions("curriculum:edit") @ResponseBody + @DockAnnotation(hasAnnex = true) public Object edit(@RequestParam(value="FFILE",required=false) MultipartFile FFILE) throws Exception{ Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); + ArrayList sendPicturesList = new ArrayList<>(); pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 if (null != FFILE && !FFILE.isEmpty()) { @@ -137,10 +148,13 @@ public class CurriculumController extends BaseController { String fileName = this.get32UUID()+FFILE.getOriginalFilename().substring(FFILE.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(FFILE, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("CAPTURE", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + sendPicturesList.add(pd.getString("CAPTURE")+"@@"+fileName); } curriculumService.edit(pd); map.put("pd", pd); map.put("result", errInfo); + map.put("sendPicturesList", JSON.toJSONString(sendPicturesList)); + map.put("dockData",JSON.toJSONString(pd)); return map; } diff --git a/src/main/java/com/zcloud/controller/onlinexxks/DataCoursewareController.java b/src/main/java/com/zcloud/controller/onlinexxks/DataCoursewareController.java index 6d3e3f80..7c0e8817 100644 --- a/src/main/java/com/zcloud/controller/onlinexxks/DataCoursewareController.java +++ b/src/main/java/com/zcloud/controller/onlinexxks/DataCoursewareController.java @@ -1,5 +1,7 @@ package com.zcloud.controller.onlinexxks; +import com.alibaba.fastjson.JSON; +import com.zcloud.aspect.DockAnnotation; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -42,12 +44,14 @@ public class DataCoursewareController extends BaseController { @RequestMapping(value="/add") @RequiresPermissions("courseware:add") @ResponseBody + @DockAnnotation public Object add(@RequestParam(value="cfile",required=false) MultipartFile cfile, @RequestParam(value="ccfile",required=false) MultipartFile ccfile) throws Exception{ Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); + ArrayList sendPicturesList = new ArrayList<>(); pd.put("DATACOURSEWARE_ID", this.get32UUID()); //主键 pd.put("CREATOR", Jurisdiction.getUsername()); //添加人 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 @@ -72,6 +76,7 @@ public class DataCoursewareController extends BaseController { String fileName = this.get32UUID()+cfile.getOriginalFilename().substring(cfile.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(cfile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("COURSEWAREFILES", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + sendPicturesList.add(pd.getString("COURSEWAREFILES")+"@@"+fileName); } if (null != ccfile && !ccfile.isEmpty()) { String suffixName = ccfile.getOriginalFilename().substring(ccfile.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); @@ -89,9 +94,12 @@ public class DataCoursewareController extends BaseController { String fileName = this.get32UUID()+ccfile.getOriginalFilename().substring(ccfile.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(ccfile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("COURSEWARECAPTURE", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + sendPicturesList.add(pd.getString("COURSEWARECAPTURE")+"@@"+fileName); } datacoursewareService.save(pd); map.put("pd", pd); + map.put("dockData", JSON.toJSONString(pd)); + map.put("sendPicturesList", JSON.toJSONString(sendPicturesList)); map.put("result", errInfo); return map; } @@ -103,6 +111,7 @@ public class DataCoursewareController extends BaseController { @RequestMapping(value="/delete") @RequiresPermissions("courseware:del") @ResponseBody + @DockAnnotation public Object delete() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -126,6 +135,7 @@ public class DataCoursewareController extends BaseController { questionService.deleteByCoursewareIds(pd); datacoursewareService.delete(pd); map.put("result", errInfo); //返回结果 + map.put("dockData", JSON.toJSONString(pd)); //返回结果 return map; } @@ -136,13 +146,14 @@ public class DataCoursewareController extends BaseController { @RequestMapping(value="/edit") @RequiresPermissions("courseware:edit") @ResponseBody + @DockAnnotation public Object edit(@RequestParam(value="cfile",required=false) MultipartFile cfile, @RequestParam(value="ccfile",required=false) MultipartFile ccfile) throws Exception{ Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - + ArrayList sendPicturesList = new ArrayList<>(); PageData d = datacoursewareService.findById(pd); //已经不修改了，还删附件是什么意思 // Smb.deleteFile(d.getString("COURSEWAREFILES")); @@ -165,6 +176,7 @@ public class DataCoursewareController extends BaseController { String fileName = this.get32UUID()+cfile.getOriginalFilename().substring(cfile.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(cfile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("COURSEWAREFILES", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + sendPicturesList.add(pd.getString("COURSEWAREFILES")+"@@"+fileName); } if (null != ccfile) { String suffixName = ccfile.getOriginalFilename().substring(ccfile.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); @@ -182,10 +194,13 @@ public class DataCoursewareController extends BaseController { String fileName = this.get32UUID()+ccfile.getOriginalFilename().substring(ccfile.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(ccfile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("COURSEWARECAPTURE", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + sendPicturesList.add(pd.getString("COURSEWARECAPTURE")+"@@"+fileName); } datacoursewareService.edit(pd); map.put("pd", pd); map.put("result", errInfo); + map.put("dockData",JSON.toJSONString(pd)); + map.put("sendPicturesList", JSON.toJSONString(sendPicturesList)); return map; } @@ -355,6 +370,7 @@ public class DataCoursewareController extends BaseController { @RequestMapping(value="/editState") @RequiresPermissions("courseware:edit") @ResponseBody + @DockAnnotation public Object editState() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -364,6 +380,7 @@ public class DataCoursewareController extends BaseController { pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 datacoursewareService.editByState(pd); map.put("result", errInfo); + map.put("dockData",JSON.toJSONString(pd)); return map; } } diff --git a/src/main/java/com/zcloud/controller/onlinexxks/QuestionController.java b/src/main/java/com/zcloud/controller/onlinexxks/QuestionController.java index 46c5f393..24681e21 100644 --- a/src/main/java/com/zcloud/controller/onlinexxks/QuestionController.java +++ b/src/main/java/com/zcloud/controller/onlinexxks/QuestionController.java @@ -1,5 +1,7 @@ package com.zcloud.controller.onlinexxks; +import com.alibaba.fastjson.JSON; +import com.zcloud.aspect.DockAnnotation; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -42,6 +44,7 @@ public class QuestionController extends BaseController { @RequestMapping(value="/add") @RequiresPermissions( value = {"question:add" , "courseware:add"}, logical = Logical.OR) @ResponseBody + @DockAnnotation public Object add() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -56,6 +59,7 @@ public class QuestionController extends BaseController { pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID questionService.save(pd); map.put("pd", pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); return map; } @@ -67,6 +71,7 @@ public class QuestionController extends BaseController { @RequestMapping(value="/delete") @RequiresPermissions( value = {"question:del" , "courseware:del"}, logical = Logical.OR) @ResponseBody + @DockAnnotation public Object delete() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -76,6 +81,7 @@ public class QuestionController extends BaseController { pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 questionService.delete(pd); map.put("result", errInfo); //返回结果 + map.put("dockData", JSON.toJSONString(pd)); //返回结果 return map; } @@ -86,11 +92,19 @@ public class QuestionController extends BaseController { @RequestMapping(value="/edit") @RequiresPermissions( value = {"question:edit" , "courseware:edit"}, logical = Logical.OR) @ResponseBody + @DockAnnotation public Object edit() throws Exception{ Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); + if (Tools.notEmpty(pd.getString("dockData"))) { + // 咱们的对接流程 如有异常 使用 throw new BizException(); + PageData dockData = JSON.parseObject(pd.getString("dockData"), PageData.class); + + // 正常返回 + return ReturnMap.ok(); + } pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 questionService.edit(pd); @@ -147,6 +161,7 @@ public class QuestionController extends BaseController { @RequestMapping(value="/deleteAll") @RequiresPermissions( value = {"question:del" , "courseware:del"}, logical = Logical.OR) @ResponseBody + @DockAnnotation public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -160,6 +175,8 @@ public class QuestionController extends BaseController { pd.put("ArrayDATA_IDS", ArrayDATA_IDS); //待删除ids questionService.deleteAll(pd); errInfo = "success"; + map.put("dockData", JSON.toJSONString(pd)); //返回结果 + }else{ errInfo = "fail"; } @@ -293,13 +310,14 @@ public class QuestionController extends BaseController { @SuppressWarnings("unchecked") @ResponseBody @Transactional + @DockAnnotation public Object readExcel2(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception{ Map map = new HashMap(); String errInfo = "success"; StringBuffer errorStr = new StringBuffer(); PageData pd = new PageData(); pd = this.getPageData(); // COURSEWAREID - + ArrayList dataArrayList = new ArrayList<>(); if (null != file && !file.isEmpty()) { String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); if (!"xls".equals(suffixName)) { @@ -446,6 +464,7 @@ public class QuestionController extends BaseController { pageData.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID questionService.save(pageData); + dataArrayList.add(pageData); } errorStr.append("成功导入"+listAll.size()+"条数据!"); }else { @@ -472,6 +491,8 @@ public class QuestionController extends BaseController { map.put("msg",errorStr.toString()); //返回结果 map.put("isExcel","1"); //返回类型 map.put("resultStr", errorStr.toString()); + pd.put("dataArrayList",dataArrayList); + map.put("dockData", JSON.toJSONString(pd)); return map; } } diff --git a/src/main/java/com/zcloud/controller/onlinexxks/StageexampaperInputController.java b/src/main/java/com/zcloud/controller/onlinexxks/StageexampaperInputController.java index a8ae8e6f..8fd540e8 100644 --- a/src/main/java/com/zcloud/controller/onlinexxks/StageexampaperInputController.java +++ b/src/main/java/com/zcloud/controller/onlinexxks/StageexampaperInputController.java @@ -1,5 +1,7 @@ package com.zcloud.controller.onlinexxks; +import com.alibaba.fastjson.JSON; +import com.zcloud.aspect.DockAnnotation; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -40,6 +42,7 @@ public class StageexampaperInputController extends BaseController { @RequestMapping(value="/add") @RequiresPermissions( value = {"stageexampaper:add", "curriculum:add"}, logical = Logical.OR) @ResponseBody + @DockAnnotation public Object add() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -58,6 +61,7 @@ public class StageexampaperInputController extends BaseController { List saveStageList = stageexampaperinputService.getSaveStage(pd); if(null != saveStageList){ + pd.put("saveStageList",saveStageList); stageexampaperinputService.save(pd); stageExamPaperInputQuestionService.saveAll(pd, saveStageList); }else{ @@ -65,6 +69,7 @@ public class StageexampaperInputController extends BaseController { map.put("msg", "培训行业类型或岗位培训类型对应的习题数量不足，无法生成试卷，请重新选择！"); } map.put("result", errInfo); + map.put("dockData", JSON.toJSONString(pd)); return map; } @@ -75,6 +80,7 @@ public class StageexampaperInputController extends BaseController { @RequestMapping(value="/delete") @RequiresPermissions( value = {"stageexampaper:del", "curriculum:del"}, logical = Logical.OR) @ResponseBody + @DockAnnotation public Object delete() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -82,6 +88,7 @@ public class StageexampaperInputController extends BaseController { pd = this.getPageData(); stageexampaperinputService.delete(pd); map.put("result", errInfo); //返回结果 + map.put("dockData", JSON.toJSONString(pd)); //返回结果 return map; } @@ -257,6 +264,7 @@ public class StageexampaperInputController extends BaseController { @RequestMapping(value="/editState") @RequiresPermissions( value = {"stageexampaper:edit", "curriculum:edit"}, logical = Logical.OR) @ResponseBody + @DockAnnotation public Object editState() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -266,6 +274,7 @@ public class StageexampaperInputController extends BaseController { pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //操作时间 stageexampaperinputService.editState(pd); map.put("result", errInfo); + map.put("dockData", JSON.toJSONString(pd)); return map; } } diff --git a/src/main/java/com/zcloud/controller/onlinexxks/StudyTaskController.java b/src/main/java/com/zcloud/controller/onlinexxks/StudyTaskController.java index aa315613..a64f5441 100644 --- a/src/main/java/com/zcloud/controller/onlinexxks/StudyTaskController.java +++ b/src/main/java/com/zcloud/controller/onlinexxks/StudyTaskController.java @@ -1,5 +1,7 @@ package com.zcloud.controller.onlinexxks; +import com.alibaba.fastjson.JSON; +import com.zcloud.aspect.DockAnnotation; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -44,6 +46,7 @@ public class StudyTaskController extends BaseController { @RequestMapping(value="/add") @RequiresPermissions("studytask:add") @ResponseBody + @DockAnnotation public Object add() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -73,6 +76,7 @@ public class StudyTaskController extends BaseController { stageStudentRelationService.saveFromPagerV2(pd); // 任务-人员 map.put("result", errInfo); + map.put("dockData", JSON.toJSONString(pd)); return map; } diff --git a/src/main/java/com/zcloud/controller/onlinexxks/VideoCoursewareController.java b/src/main/java/com/zcloud/controller/onlinexxks/VideoCoursewareController.java index 66af9a8b..53509911 100644 --- a/src/main/java/com/zcloud/controller/onlinexxks/VideoCoursewareController.java +++ b/src/main/java/com/zcloud/controller/onlinexxks/VideoCoursewareController.java @@ -57,6 +57,7 @@ public class VideoCoursewareController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); + ArrayList sendPicturesList = new ArrayList<>(); pd.put("VIDEOCOURSEWARE_ID", this.get32UUID()); //主键 pd.put("CREATOR", Jurisdiction.getUsername()); //添加人 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 @@ -81,6 +82,7 @@ public class VideoCoursewareController extends BaseController { String fileName = this.get32UUID() + vfile.getOriginalFilename().substring(vfile.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(vfile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("VIDEOFILES", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + sendPicturesList.add(pd.getString("VIDEOFILES")+"@@"+fileName); // 将MultipartFile file转换成为File File f_file = FileUtil.MultipartFileToFile(vfile); MultimediaObject instance = new MultimediaObject(f_file); @@ -107,10 +109,12 @@ public class VideoCoursewareController extends BaseController { String fileName = this.get32UUID() + vcfile.getOriginalFilename().substring(vcfile.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(vcfile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("VIDEOCAPTURE", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + sendPicturesList.add(pd.getString("VIDEOCAPTURE")+"@@"+fileName); } videocoursewareService.save(pd); map.put("pd", pd); map.put("dockData", JSON.toJSONString(pd)); + map.put("sendPicturesList", JSON.toJSONString(sendPicturesList)); map.put("result", errInfo); return map; } @@ -124,6 +128,7 @@ public class VideoCoursewareController extends BaseController { @RequestMapping(value = "/delete") @RequiresPermissions("courseware:del") @ResponseBody + @DockAnnotation public Object delete() throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -148,6 +153,7 @@ public class VideoCoursewareController extends BaseController { questionService.deleteByCoursewareIds(pd); videocoursewareService.delete(pd); map.put("result", errInfo); //返回结果 + map.put("dockData", JSON.toJSONString(pd)); //返回结果 return map; } @@ -160,6 +166,7 @@ public class VideoCoursewareController extends BaseController { @RequestMapping(value = "/edit") @RequiresPermissions("courseware:edit") @ResponseBody + @DockAnnotation(hasAnnex = true) public Object edit(@RequestParam(value = "vfile", required = false) MultipartFile vfile, @RequestParam(value = "vcfile", required = false) MultipartFile vcfile) throws Exception { Map map = new HashMap(); @@ -167,6 +174,7 @@ public class VideoCoursewareController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); PageData d = videocoursewareService.findById(pd); + ArrayList sendPicturesList = new ArrayList<>(); pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 if (null != vfile) { @@ -185,6 +193,7 @@ public class VideoCoursewareController extends BaseController { String fileName = this.get32UUID() + vfile.getOriginalFilename().substring(vfile.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(vfile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("VIDEOFILES", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + sendPicturesList.add(pd.getString("VIDEOFILES")+"@@"+fileName); // 将MultipartFile file转换成为File File f_file = FileUtil.MultipartFileToFile(vfile); MultimediaObject instance = new MultimediaObject(f_file); @@ -211,9 +220,12 @@ public class VideoCoursewareController extends BaseController { String fileName = this.get32UUID() + vcfile.getOriginalFilename().substring(vcfile.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(vcfile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("VIDEOCAPTURE", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + sendPicturesList.add(pd.getString("VIDEOCAPTURE")+"@@"+fileName); } videocoursewareService.edit(pd); map.put("pd", pd); + map.put("dockData", JSON.toJSONString(pd)); + map.put("sendPicturesList", JSON.toJSONString(sendPicturesList)); map.put("result", errInfo); return map; } @@ -379,6 +391,7 @@ public class VideoCoursewareController extends BaseController { @RequestMapping(value = "/editState") @RequiresPermissions("courseware:edit") @ResponseBody + @DockAnnotation public Object editState() throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -388,6 +401,7 @@ public class VideoCoursewareController extends BaseController { pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 videocoursewareService.editByState(pd); map.put("result", errInfo); + map.put("dockData", JSON.toJSONString(pd)); return map; } } diff --git a/src/main/java/com/zcloud/controller/tzsb/SpecialEquipmentAqxjController.java b/src/main/java/com/zcloud/controller/tzsb/SpecialEquipmentAqxjController.java index bb80de39..eb588fd9 100644 --- a/src/main/java/com/zcloud/controller/tzsb/SpecialEquipmentAqxjController.java +++ b/src/main/java/com/zcloud/controller/tzsb/SpecialEquipmentAqxjController.java @@ -1,5 +1,7 @@ package com.zcloud.controller.tzsb; +import com.alibaba.fastjson.JSON; +import com.zcloud.aspect.DockAnnotation; import com.zcloud.controller.base.BaseController; import com.zcloud.controller.bus.ImgFilesController; import com.zcloud.entity.Page; @@ -45,6 +47,7 @@ public class SpecialEquipmentAqxjController extends BaseController { @RequestMapping(value="/add") @RequiresPermissions("specialequipmentaqxj:add") @ResponseBody + @DockAnnotation(hasAnnex = true) public Object add(@RequestParam(value="FFILE",required=false) MultipartFile[] FILES, @RequestParam(value="TYPE",required=false) String[] TYPE) throws Exception{ Map map = new HashMap(); @@ -75,6 +78,7 @@ public class SpecialEquipmentAqxjController extends BaseController { imgFilesController.finish(fileList.toArray(fileArr),type,pd.getString("SPECIALEQUIPMENTAQXJ_ID")); } map.put("pd", pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/controller/tzsb/SpecialEquipmentController.java b/src/main/java/com/zcloud/controller/tzsb/SpecialEquipmentController.java index 471f614e..ba67b23a 100644 --- a/src/main/java/com/zcloud/controller/tzsb/SpecialEquipmentController.java +++ b/src/main/java/com/zcloud/controller/tzsb/SpecialEquipmentController.java @@ -1,5 +1,7 @@ package com.zcloud.controller.tzsb; +import com.alibaba.fastjson.JSON; +import com.zcloud.aspect.DockAnnotation; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -49,11 +51,13 @@ public class SpecialEquipmentController extends BaseController { @RequestMapping(value="/add") @RequiresPermissions("specialequipment:add") @ResponseBody + @DockAnnotation(hasAnnex = true) public Object add(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{ Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); + ArrayList sendPicturesList = new ArrayList<>(); pd.put("SPECIALEQUIPMENT_ID", this.get32UUID()); //主键 pd.put("CREATOR", Jurisdiction.getUsername()); //添加人 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 @@ -78,8 +82,11 @@ public class SpecialEquipmentController extends BaseController { Smb.sshSftp(file, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("TECHNICALFILENAME", file.getOriginalFilename()); pd.put("TECHNICALFILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + sendPicturesList.add(pd.getString("TECHNICALFILEPATH")+"@@"+fileName); } + PageData dockData = new PageData(); specialequipmentService.save(pd); + dockData.putAll(pd); map.put("pd", pd); PageData changeData = new PageData(); @@ -137,7 +144,10 @@ public class SpecialEquipmentController extends BaseController { // changeData.put("REMARKS_BEFORE", pd.getString("REMARKS")); //备注（前） changeData.put("REMARKS_AFTER", pd.getString("REMARKS")); //备注（后） specialequipmentchangeService.save(changeData); + dockData.put("changeData",changeData); map.put("result", errInfo); + map.put("dockData", JSON.toJSONString(dockData)); + map.put("sendPicturesList", JSON.toJSONString(sendPicturesList)); return map; } @@ -148,6 +158,7 @@ public class SpecialEquipmentController extends BaseController { @RequestMapping(value="/delete") @RequiresPermissions("specialequipment:del") @ResponseBody + @DockAnnotation public Object delete() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -192,7 +203,9 @@ public class SpecialEquipmentController extends BaseController { pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 specialequipmentService.delete(pd); + pd.put("changeData",changeData); map.put("result", errInfo); //返回结果 + map.put("dockData", JSON.toJSONString(pd)); //返回结果 return map; } @@ -203,13 +216,14 @@ public class SpecialEquipmentController extends BaseController { @RequestMapping(value="/edit") @RequiresPermissions("specialequipment:edit") @ResponseBody + @DockAnnotation(hasAnnex = true) public Object edit(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{ Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); PageData updateBefour = specialequipmentService.findById(pd); - + ArrayList sendPicturesList = new ArrayList<>(); PageData changeData = new PageData(); changeData.put("SPECIALEQUIPMENTCHANGE_ID", this.get32UUID()); //主键 changeData.put("SPECIALEQUIPMENT_ID", updateBefour.getString("SPECIALEQUIPMENT_ID")); //主键 @@ -262,6 +276,7 @@ public class SpecialEquipmentController extends BaseController { Smb.sshSftp(file, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); pd.put("TECHNICALFILENAME", file.getOriginalFilename()); pd.put("TECHNICALFILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); + sendPicturesList.add(pd.getString("TECHNICALFILEPATH") + "@@"+ fileName); } specialequipmentService.edit(pd); changeData.put("EQUIPMENTNAME_AFTER", pd.getString("EQUIPMENTNAME")); //设备名称（后） @@ -294,8 +309,13 @@ public class SpecialEquipmentController extends BaseController { changeData.put("TECHNICALFILEPATH_AFTER", pd.getString("TECHNICALFILEPATH")); //设备技术档案（附件）路径（后） changeData.put("REMARKS_AFTER", pd.getString("REMARKS")); //备注（后） specialequipmentchangeService.save(changeData); + PageData dockData = new PageData(); + dockData.putAll(pd); + dockData.put("changeData",changeData); map.put("pd", pd); map.put("result", errInfo); + map.put("dockData", JSON.toJSONString(dockData)); + map.put("sendPicturesList", JSON.toJSONString(sendPicturesList)); return map; } @@ -347,6 +367,7 @@ public class SpecialEquipmentController extends BaseController { @RequestMapping(value="/deleteAll") @RequiresPermissions("specialequipment:del") @ResponseBody + @DockAnnotation public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -355,6 +376,7 @@ public class SpecialEquipmentController extends BaseController { pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 String DATA_IDS = pd.getString("DATA_IDS"); + ArrayList changeDataList = new ArrayList<>(); if(Tools.notEmpty(DATA_IDS)){ String ArrayDATA_IDS[] = DATA_IDS.split(","); pd.put("ArrayDATA_IDS", ArrayDATA_IDS); //待删除ids @@ -397,10 +419,15 @@ public class SpecialEquipmentController extends BaseController { changeData.put("TECHNICALFILEPATH_AFTER", updateBefour.getString("TECHNICALFILEPATH")); //设备技术档案（附件）路径（前） changeData.put("REMARKS_AFTER", updateBefour.getString("REMARKS")); //备注（前） specialequipmentchangeService.save(changeData); + changeDataList.add(changeData); } specialequipmentService.deleteAll(pd); errInfo = "success"; + pd.put("changeDataList",changeDataList); + map.put("dockData", JSON.toJSONString(pd)); //返回结果 + map.put("result", errInfo); //返回结果 + }else{ errInfo = "fail"; } From 77bdb85662cb6d758f784beb589a4f77e4de8a4a Mon Sep 17 00:00:00 2001 From: z Date: Thu, 28 Dec 2023 10:23:30 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/AppImgFilesController.java | 31 +++++++++---------- .../app/AppKeyprojectCheckController.java | 8 ++--- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/zcloud/controller/app/AppImgFilesController.java b/src/main/java/com/zcloud/controller/app/AppImgFilesController.java index 6f2cb1cb..fd09c065 100644 --- a/src/main/java/com/zcloud/controller/app/AppImgFilesController.java +++ b/src/main/java/com/zcloud/controller/app/AppImgFilesController.java @@ -1,16 +1,15 @@ package com.zcloud.controller.app; -import java.io.File; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import com.zcloud.aspect.DockAnnotation; +import com.zcloud.controller.base.BaseController; import com.zcloud.dto.TenCorpDto; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.bus.ImgFilesService; import com.zcloud.service.mq.DockSendMessageService; import com.zcloud.util.*; +import org.apache.commons.io.FileUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; @@ -19,13 +18,12 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; -import org.apache.commons.io.FileUtils; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import com.zcloud.controller.base.BaseController; -import com.zcloud.entity.Page; -import com.zcloud.entity.PageData; -import com.zcloud.service.bus.ImgFilesService; +import java.io.File; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 说明：图片管理 @@ -51,6 +49,7 @@ public class AppImgFilesController extends BaseController { @RequestMapping(value = "/add", headers = "content-type=multipart/form-data") @ResponseBody @Transactional + @DockAnnotation(hasAnnex = true) public Object finish( @RequestParam(value = "FFILE", required = false) MultipartFile[] files, @RequestParam(value = "TYPE", required = false) String TYPE, @@ -92,7 +91,7 @@ public class AppImgFilesController extends BaseController { File old = new File(PathUtil.getProjectpath() + pageData.getString("FILEPATH")); old.delete(); imgfilesService.delete(pageData); - pageData.put("delete","1"); + pageData.put("delete", "1"); TenCorpDto tenCorpDto = new TenCorpDto(); tenCorpDto.setMessage("删除文件消息"); tenCorpDto.setId(UuidUtil.get32UUID()); @@ -113,7 +112,7 @@ public class AppImgFilesController extends BaseController { pd.put("FILEPATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd.put("TYPE", TYPE); pd.put("FOREIGN_KEY", FOREIGN_KEY); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile+ "/", IMGFILES_ID, FOREIGN_KEY, TYPE); + Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/", IMGFILES_ID, FOREIGN_KEY, TYPE); imgfilesService.save(pd); } } @@ -244,7 +243,7 @@ public class AppImgFilesController extends BaseController { file.delete(); imgfilesService.delete(pd); TenCorpDto tenCorpDto = new TenCorpDto(); - pd.put("delete","1"); + pd.put("delete", "1"); tenCorpDto.setData(pd); dockSendMessageService.sendMessagePictureDelete(tenCorpDto); map.put("result", errInfo); //返回结果 diff --git a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java index 4c4d214d..c65f0121 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java @@ -56,7 +56,7 @@ public class AppKeyprojectCheckController extends BaseController { */ @RequestMapping(value="/add") @ResponseBody - @DockAnnotation(isAdd = true) + @DockAnnotation(hasAnnex = true) public Object add() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -138,7 +138,7 @@ public class AppKeyprojectCheckController extends BaseController { hiddenList.add(hidden); time = DateUtil.calculateDateSecond(time, 1); } - pd.put("HIDDEN", hiddenList); + pd.put("HIDDEN", JSON.toJSONString(hiddenList)); } try { //这里发送短信 通知 先判断重点工程是否要求发短信, 不发直接过，发的话 找到对应人以及对应手机号 发送对应模板短信啊 @@ -266,8 +266,8 @@ public class AppKeyprojectCheckController extends BaseController { List situationList = keyprojectcheckInfoService.listAll(pd); pd.put("FOREIGN_ID", pd.getString("KEYPROJECTCHECK_ID")); - pd.put("hiddenList", keyprojectHiddenService.listAllInspection(pd)); - pd.put("situationList", situationList); + pd.put("hiddenList", JSON.toJSONString(keyprojectHiddenService.listAllInspection(pd))); + pd.put("situationList", JSON.toJSONString(situationList)); map.put("pd", pd); map.put("result", errInfo); return map;