diff --git a/src/main/java/com/zcloud/controller/keyProjects/AIWarningController.java b/src/main/java/com/zcloud/controller/keyProjects/AIWarningController.java index d92f570c..af88f70c 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/AIWarningController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/AIWarningController.java @@ -2,6 +2,7 @@ package com.zcloud.controller.keyProjects; import com.alibaba.fastjson.JSON; 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; @@ -85,6 +86,7 @@ public class AIWarningController extends BaseController { */ @RequestMapping(value = "/addPeople") @ResponseBody + @DockAnnotation(isAdd = true) public Object addPeople() throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -100,6 +102,7 @@ public class AIWarningController extends BaseController { set.add(p); }); if (set.size() == listperson.size()) { //判断是否有重复数据 + HashMap pdListmap = new HashMap<>(); for (int i = 0; i < listperson.size(); i++) { pd.put("AIWARNING_PEOPLE", listperson.get(i)); pd.put("CONTRACT_PIC_ID", this.get32UUID()); //主键 @@ -109,12 +112,22 @@ public class AIWarningController extends BaseController { pd.put("OPERATOR", DateUtil.date2Str(new Date())); //修改人 pd.put("ISDELETE", 0); //是否删除 aiwarningService.addPeople(pd); + PageData pdList = new PageData(); + pdList.put("AIWARNING_PEOPLE", listperson.get(i)); + pdList.put("CONTRACT_PIC_ID", pd.getString("CONTRACT_PIC_ID")); //主键 + pdList.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 + pdList.put("CREATOR", DateUtil.date2Str(new Date())); //添加人 + pdList.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + pdList.put("OPERATOR", DateUtil.date2Str(new Date())); //修改人 + pdList.put("ISDELETE", 0); //是否删除 + pdListmap.put("pdList"+i,JSON.toJSONString(pdList)); } + pd.put("pdListmap",JSON.toJSONString(pdListmap)); } else { map.put("state", "1"); map.put("msg", "报警人有重复数据"); } - + map.put("dockData",JSON.toJSONString(pd)); map.put("result", errInfo); return map; } @@ -127,6 +140,7 @@ public class AIWarningController extends BaseController { */ @RequestMapping(value = "/delete") @ResponseBody + @DockAnnotation public Object delete() throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -157,6 +171,7 @@ public class AIWarningController extends BaseController { @RequestMapping(value = "/edit") @ResponseBody @Transactional + @DockAnnotation public Object edit() throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -264,6 +279,7 @@ public class AIWarningController extends BaseController { */ @RequestMapping(value = "/deleteAll") @ResponseBody + @DockAnnotation public Object deleteAll() throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -300,6 +316,7 @@ public class AIWarningController extends BaseController { */ @RequestMapping(value = "/addAiWarning") @ResponseBody + @DockAnnotation public Object addAiWarning(HttpServletRequest request) throws Exception { Map map = new HashMap(); StringBuffer fhLog = new StringBuffer(); @@ -432,6 +449,7 @@ public class AIWarningController extends BaseController { */ @RequestMapping(value = "/deleteDisposer") @ResponseBody + @DockAnnotation public Object deleteDisposer() throws Exception { Map map = new HashMap(); String errInfo = "success"; diff --git a/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java b/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java index d7420516..96e2f522 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java @@ -1,5 +1,7 @@ package com.zcloud.controller.keyProjects; +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; @@ -57,6 +59,7 @@ public class OutSourcedController extends BaseController { @RequestMapping(value = "/add") @RequiresPermissions("outsourced:add") @ResponseBody + @DockAnnotation(isAdd = 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, @@ -239,6 +242,7 @@ public class OutSourcedController extends BaseController { //} pd.put("INVOLVING_CORPS", Jurisdiction.getCORPINFO_ID()); outsourcedService.save(pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); map.put("sendPicturesList", strings); return map; @@ -253,6 +257,7 @@ public class OutSourcedController extends BaseController { @RequestMapping(value = "/delete") @RequiresPermissions("outsourced:del") @ResponseBody + @DockAnnotation public Object delete() throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -272,6 +277,7 @@ public class OutSourcedController extends BaseController { @RequestMapping(value = "/edit") @RequiresPermissions("outsourced:edit") @ResponseBody + @DockAnnotation(isAdd = true) public Object edit(@RequestParam(value = "file", required = false) MultipartFile file, @RequestParam(value = "file1", required = false) MultipartFile file1, @RequestParam(value = "file2", required = false) MultipartFile file2, @@ -573,6 +579,7 @@ public class OutSourcedController extends BaseController { @RequestMapping(value = "/deleteAll") @RequiresPermissions("outsourced:del") @ResponseBody + @DockAnnotation public Object deleteAll() throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -713,6 +720,7 @@ public class OutSourcedController extends BaseController { */ @RequestMapping(value = "/jie") @ResponseBody + @DockAnnotation public Object jie() throws Exception { Map map = new HashMap(); String errInfo = "success"; diff --git a/src/main/java/com/zcloud/controller/keyProjects/PersonnelManagementController.java b/src/main/java/com/zcloud/controller/keyProjects/PersonnelManagementController.java index 273ba0ae..830b9336 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/PersonnelManagementController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/PersonnelManagementController.java @@ -66,6 +66,7 @@ public class PersonnelManagementController extends BaseController { @RequestMapping(value = "/delete") @RequiresPermissions("personnelmanagement:del") @ResponseBody + @DockAnnotation public Object delete() throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -93,6 +94,7 @@ public class PersonnelManagementController extends BaseController { @RequestMapping(value = "/edit") @RequiresPermissions("personnelmanagement:edit") @ResponseBody + @DockAnnotation(isAdd = true) public Object edit() throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -164,6 +166,7 @@ public class PersonnelManagementController extends BaseController { @RequestMapping(value = "/deleteAll") @RequiresPermissions("personnelmanagement:del") @ResponseBody + @DockAnnotation public Object deleteAll() throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -313,6 +316,7 @@ public class PersonnelManagementController extends BaseController { @RequestMapping(value = "/resetPwd") @ResponseBody + @DockAnnotation(isAdd = true) public Object resetPwd(Page page) throws Exception { Map map = new HashMap(); String errInfo = "success"; diff --git a/src/main/java/com/zcloud/controller/keyProjects/VideoManagerController.java b/src/main/java/com/zcloud/controller/keyProjects/VideoManagerController.java index 64a93959..68d30672 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/VideoManagerController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/VideoManagerController.java @@ -1,5 +1,7 @@ package com.zcloud.controller.keyProjects; +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 VideoManagerController extends BaseController { @RequestMapping(value="/add") @RequiresPermissions("videomanager:add") @ResponseBody + @DockAnnotation(isAdd = true) public Object add() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -50,6 +53,7 @@ public class VideoManagerController extends BaseController { pd.put("OPUSER", Jurisdiction.getUsername()); //操作人 pd.put("ISDELETE", "0"); //是否删除 videomanagerService.save(pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); return map; } @@ -61,6 +65,7 @@ public class VideoManagerController extends BaseController { @RequestMapping(value="/delete") @RequiresPermissions("videomanager:del") @ResponseBody + @DockAnnotation public Object delete() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -78,12 +83,14 @@ public class VideoManagerController extends BaseController { @RequestMapping(value="/edit") @RequiresPermissions("videomanager:edit") @ResponseBody + @DockAnnotation(isAdd = true) public Object edit() throws Exception{ Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); videomanagerService.edit(pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); return map; } @@ -211,6 +218,7 @@ public class VideoManagerController extends BaseController { @RequestMapping(value="/deleteAll") @RequiresPermissions("videomanager:del") @ResponseBody + @DockAnnotation public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; diff --git a/src/main/java/com/zcloud/controller/keyProjects/VideoResourcesController.java b/src/main/java/com/zcloud/controller/keyProjects/VideoResourcesController.java index 659c68be..df55c9a5 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/VideoResourcesController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/VideoResourcesController.java @@ -1,5 +1,7 @@ package com.zcloud.controller.keyProjects; +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 VideoResourcesController extends BaseController { @RequestMapping(value = "/add") @RequiresPermissions("videomanager:add") @ResponseBody + @DockAnnotation(isAdd = true) public Object add() throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -52,6 +55,7 @@ public class VideoResourcesController extends BaseController { pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //操作人 pd.put("ISDELETE", "0"); //是否删除 videoResourcesService.save(pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); return map; } @@ -65,6 +69,7 @@ public class VideoResourcesController extends BaseController { @RequestMapping(value = "/delete") @RequiresPermissions("videomanager:del") @ResponseBody + @DockAnnotation public Object delete() throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -102,15 +107,16 @@ public class VideoResourcesController extends BaseController { return map; } - /** - * 修改 - * - * @param - * @throws Exception - */ + /** + * 修改 + * + * @param + * @throws Exception + */ @RequestMapping(value = "/edit") @RequiresPermissions("videomanager:edit") @ResponseBody + @DockAnnotation public Object edit() throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -173,6 +179,7 @@ public class VideoResourcesController extends BaseController { @RequestMapping(value = "/deleteAll") @RequiresPermissions("videomanager:del") @ResponseBody + @DockAnnotation public Object deleteAll() throws Exception { Map map = new HashMap(); String errInfo = "success"; diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 4d8dd176..1a7480dd 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -61,7 +61,7 @@ gwj-baseimgpath=https://qgqy.qhdsafety.com/file/ gwj-backendaddr=http://192.168.0.31:8991/qa-prevention-gwj/ #mq ??????????? -rocketmq.name-server=192.168.0.79:9876 +rocketmq.name-server=192.168.0.75:9876 rocketmq.producer.group=libmiddle rocketmq.producer.send-message-timeout=3000 rocketmq.producer.compress-message-body-threshold=4096 diff --git a/src/main/resources/mybatis/dsno2/keyProjects/VideoResourcesMapper.xml b/src/main/resources/mybatis/dsno2/keyProjects/VideoResourcesMapper.xml index a70e443b..8fc13b2f 100644 --- a/src/main/resources/mybatis/dsno2/keyProjects/VideoResourcesMapper.xml +++ b/src/main/resources/mybatis/dsno2/keyProjects/VideoResourcesMapper.xml @@ -156,7 +156,8 @@ and f.UNIT_USE like CONCAT(CONCAT('%', #{pd.UNIT_USE}),'%') - GROUP BY f.OPERATTIME desc + group by f.VIDEO_RESOURCES_ID + order BY f.OPERATTIME desc