From d7bf791dfc0c8d2661d6eb66e0f82d10806b3ca2 Mon Sep 17 00:00:00 2001 From: z Date: Fri, 22 Dec 2023 16:37:33 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B=E9=83=A8?= =?UTF-8?q?=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);