Merge remote-tracking branch 'origin/czks1.0' into czks1.0

src/main/java/com/zcloud/controller/app/AppHiddenController.java

@@ -111,6 +111,7 @@ public class AppHiddenController extends BaseController {
     private HiddenExamineApiService hiddenExamineApiService; //隐患审核 隐患的审核步骤的人员的信息的记录
     @Autowired
     private MessageService messageService;
+
     /**
      * app首页获取数量
      *
@@ -186,8 +187,6 @@ public class AppHiddenController extends BaseController {
             }
 
 
-
-
             List<PageData> creatorHid = hiddenService.getCountByCreatorId(pd); // 根据人员id获取发现隐患信息
             for (int i = 0; i < creatorHid.size(); i++) {
                 PageData cre = creatorHid.get(i);
@@ -321,7 +320,8 @@ public class AppHiddenController extends BaseController {
                 if (Tools.isEmpty(departmentService.findById(userpd).getString("HEADMAN"))) {//判断部门是否有负责人
                     map.put("msg", "所在部门未维护部门负责人");
                     return map;
-				}{
+                }
+                {
                     userpd.put("USER_ID", departmentService.findById(userpd).getString("HEADMAN"));
                     userpd.put("CORPINFO_ID", pd.getString("CORPINFO_ID"));
                     if (Tools.isEmpty(usersService.findById(userpd))) {
@@ -379,6 +379,7 @@ public class AppHiddenController extends BaseController {
      */
     @RequestMapping(value = "/appAdd")
     @ResponseBody
+    @DockAnnotation(hasAnnex = true)
     public Object appAdd() throws Exception {
         Map<String, Object> map = new HashMap<String, Object>();
         String errInfo = "success";
@@ -412,6 +413,9 @@ public class AppHiddenController extends BaseController {
         before.put("CREATOR", pd.getString("loginUserId"));
         before.put("OPERATOR", pd.getString("loginUserId"));
         hiddenExamineService.saveApp(before);
+        PageData hiddenExaminePageData = new PageData();
+        hiddenExaminePageData.putAll(before);
+
         if (pd.get("RISKITEM_ID") != null && Tools.notEmpty(pd.get("RISKITEM_ID").toString())) {
             if ("2".equals(pd.getString("SOURCE"))) {
                 PageData item = new PageData();
@@ -466,6 +470,7 @@ public class AppHiddenController extends BaseController {
             pd.put("STATE", "0");
         }
         List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("other").toString()); // 隐患发现人
+        ArrayList<PageData> hiddenUserList = new ArrayList<>();
         for (JSONObject json : list) {
             PageData hiddenconUserAdd = new PageData();
             hiddenconUserAdd.put("HIDDENUSER_ID", UuidUtil.get32UUID());
@@ -474,6 +479,7 @@ public class AppHiddenController extends BaseController {
             hiddenconUserAdd.put("TYPE", "1");
             hiddenconUserAdd.put("IS_MAIN", "0");
             hiddenUserService.save(hiddenconUserAdd); // 添加隐患发现人
+            hiddenUserList.add(hiddenconUserAdd);
         }
         pd.put("ISCONFIRM", "0");
         if (pd.getString("HIDDENLEVEL").equals("jdyh001") || pd.getString("HIDDENLEVEL").equals("hiddenLevel2002")) {//判断是否是重大隐患
@@ -497,7 +503,8 @@ public class AppHiddenController extends BaseController {
                 if (Tools.isEmpty(departmentService.findById(userpd).getString("HEADMAN"))) {//判断部门是否有负责人
                     map.put("msg", "所在部门未维护部门负责人");
                     return map;
-				}{
+                }
+                {
                     userpd.put("USER_ID", departmentService.findById(userpd).getString("HEADMAN"));
                     userpd.put("CORPINFO_ID", pd.getString("CORPINFO_ID"));
                     PageData usersPd = usersService.findById(userpd);
@@ -511,6 +518,10 @@ public class AppHiddenController extends BaseController {
             }
         }
         hiddenService.save(pd);
+        PageData dockData = new PageData();
+        dockData.put("hiddenData", pd);
+        dockData.put("hiddenExaminePageData", hiddenExaminePageData);
+        dockData.put("hiddenUserList", hiddenUserList);
         // 发送短信
         if (Tools.notEmpty(pd.getString("CONFIRM_USER")) && !pd.getString("STATE").equals("0")) {
             messageService.sendMessageByParameter("HIDDEN_MAIL_001", "友情提示：有一条隐患需要确认", pd.getString("CORPINFO_ID"), pd.getString("CONFIRM_USER"), pd.getString("HIDDEN_ID"),
@@ -518,6 +529,7 @@ public class AppHiddenController extends BaseController {
         }
         map.put("result", errInfo);
         map.put("pd", pd);
+        map.put("dockData", JSON.toJSONString(dockData));
         return map;
     }
 
@@ -581,7 +593,9 @@ public class AppHiddenController extends BaseController {
         return map;
     }
 
-	 /**去修改页面获取数据
+    /**
+     * 去修改页面获取数据
+     *
      * @param
      * @throws Exception
      */
@@ -661,6 +675,7 @@ public class AppHiddenController extends BaseController {
         FHLOG.save(pd.getString("loginUserName"), "删除隐患ID:" + pd.getString("HIDDEN_ID"), ip);                //记录日志  用户ID 隐患id 时间
         applicationContext.publishEvent(new DeviceHiddenEvent(new Object(), pd.getString("HIDDEN_ID"), "1"));
         map.put("result", errInfo); // 返回结果
+        map.put("dockData",JSON.toJSONString(pd));
         return map;
     }
 
@@ -778,21 +793,22 @@ public class AppHiddenController extends BaseController {
      */
     @RequestMapping(value = "/edit")
     @ResponseBody
+    @DockAnnotation
     public Object edit() throws Exception {
         Map<String, Object> map = new HashMap<String, Object>();
         String errInfo = "success";
-		PageData pd = new PageData();
+        PageData pd = this.getPageData();
-		pd = this.getPageData();
-
         hiddenUserService.delete(pd); //删除隐患相关人员 -- 隐患发现人
         if (pd.getString("STATE").equals("16")) {//如果状态等于16进入此方法肯定是提交过来的，赋值给待确认
             pd.put("STATE", "-2");
-			if(Tools.notEmpty(pd.getString("POSITIONDESC"))){hiddenService.editInformation(pd);}
+            if (Tools.notEmpty(pd.getString("POSITIONDESC"))) {
+                hiddenService.editInformation(pd);
+            }
             hiddenService.editstate(pd);
         }
         hiddenService.editInfo(pd);
-
         List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("other").toString()); // 隐患发现人
+		ArrayList<PageData> hiddenUserList = new ArrayList<>();
 		for (JSONObject json : list) {
             PageData hiddenconUserAdd = new PageData();
             hiddenconUserAdd.put("HIDDENUSER_ID", UuidUtil.get32UUID());
@@ -801,14 +817,18 @@ public class AppHiddenController extends BaseController {
             hiddenconUserAdd.put("TYPE", "1");
             hiddenconUserAdd.put("IS_MAIN", "0");
             hiddenUserService.save(hiddenconUserAdd); // 添加隐患发现人
+			hiddenUserList.add(hiddenconUserAdd);
         }
+		PageData dockData = new PageData();
+		dockData.putAll(pd);
+		dockData.put("hiddenUserList",hiddenUserList);
 		map.put("pd", pd);
+        map.put("dockData", JSON.toJSONString(dockData));
         map.put("result", errInfo);
         return map;
     }
 
 
-
     /**
      * 修改
      *
@@ -1346,6 +1366,7 @@ public class AppHiddenController extends BaseController {
         map.put("result", errInfo);
         return map;
     }
+
     /**
      * 获取检查记录风险点
      *
@@ -1364,6 +1385,7 @@ public class AppHiddenController extends BaseController {
         map.put("hiddenList", hiddenList);
         return map;
     }
+
     /**
      * 列表 隐患列表接口
      *
@@ -1534,6 +1556,7 @@ public class AppHiddenController extends BaseController {
 
     /**
      * 获取隐患部位列表(菜单管理)
+     *
      * @return
      */
     @RequestMapping(value = "/getTreehiddenRegionListAll")
@@ -1594,6 +1617,7 @@ public class AppHiddenController extends BaseController {
         map.put("result", errInfo);
         return map;
     }
+
     /**
      * 安全环保检查隐患指派
      *
@@ -1707,6 +1731,7 @@ public class AppHiddenController extends BaseController {
 
     /**
      * 隐患确认打回
+     *
      * @param
      * @throws Exception
      */
@@ -1760,6 +1785,7 @@ public class AppHiddenController extends BaseController {
 
     /**
      * 判断登录人是否已经验收
+     *
      * @param
      * @throws Exception
      */

src/main/java/com/zcloud/controller/app/AppImgFilesController.java

@@ -7,6 +7,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.zcloud.aspect.DockAnnotation;
+import com.zcloud.dto.TenCorpDto;
+import com.zcloud.service.mq.DockSendMessageService;
 import com.zcloud.util.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -36,8 +39,12 @@ public class AppImgFilesController extends BaseController {
 
     @Autowired
     private ImgFilesService imgfilesService;
+    @Autowired
+    private DockSendMessageService dockSendMessageService;
 
-	/**完成
+    /**
+     * 完成
+     *
      * @param
      * @throws Exception
      */
@@ -85,6 +92,14 @@ public class AppImgFilesController extends BaseController {
                         File old = new File(PathUtil.getProjectpath() + pageData.getString("FILEPATH"));
                         old.delete();
                         imgfilesService.delete(pageData);
+                        pageData.put("delete","1");
+                        TenCorpDto tenCorpDto = new TenCorpDto();
+                        tenCorpDto.setMessage("删除文件消息");
+                        tenCorpDto.setId(UuidUtil.get32UUID());
+                        tenCorpDto.setTopic("docking");
+                        tenCorpDto.setProducer_name("qa-prevention-czks");
+                        tenCorpDto.setData(pageData);
+                        dockSendMessageService.sendMessagePictureDelete(tenCorpDto);
                     }
                 }
                 PageData pd = new PageData();
@@ -93,22 +108,23 @@ public class AppImgFilesController 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 + pd.getString("CORPINFO_ID") + "/" + ffile);
+                String IMGFILES_ID = this.get32UUID();
-
+                pd.put("IMGFILES_ID", IMGFILES_ID);
-        		pd.put("IMGFILES_ID",  this.get32UUID());
                 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);
                 imgfilesService.save(pd);
             }
         }
-
         map.put("result", errInfo);
         return map;
     }
 
 
-	/**新增
+    /**
+     * 新增
+     *
      * @param
      * @throws Exception
      */
@@ -141,7 +157,9 @@ public class AppImgFilesController extends BaseController {
     }
 
 
-	/**完成
+    /**
+     * 完成
+     *
      * @param
      * @throws Exception
      */
@@ -208,7 +226,9 @@ public class AppImgFilesController extends BaseController {
         return map;
     }
 
-	/**删除
+    /**
+     * 删除
+     *
      * @param out
      * @throws Exception
      */
@@ -223,11 +243,17 @@ public class AppImgFilesController extends BaseController {
         File file = new File(PathUtil.getProjectpath() + pd.getString("FILEPATH"));
         file.delete();
         imgfilesService.delete(pd);
+        TenCorpDto tenCorpDto = new TenCorpDto();
+        pd.put("delete","1");
+        tenCorpDto.setData(pd);
+        dockSendMessageService.sendMessagePictureDelete(tenCorpDto);
         map.put("result", errInfo);                //返回结果
         return map;
     }
 
-	/**修改
+    /**
+     * 修改
+     *
      * @param
      * @throws Exception
      */
@@ -244,7 +270,9 @@ public class AppImgFilesController extends BaseController {
         return map;
     }
 
-	/**列表
+    /**
+     * 列表
+     *
      * @param page
      * @throws Exception
      */
@@ -266,7 +294,9 @@ public class AppImgFilesController extends BaseController {
         return map;
     }
 
-	 /**去修改页面获取数据
+    /**
+     * 去修改页面获取数据
+     *
      * @param
      * @throws Exception
      */
@@ -284,7 +314,9 @@ public class AppImgFilesController extends BaseController {
         return map;
     }
 
-	 /**批量删除
+    /**
+     * 批量删除
+     *
      * @param
      * @throws Exception
      */
@@ -308,7 +340,9 @@ public class AppImgFilesController extends BaseController {
         return map;
     }
 
-	 /**导出到excel
+    /**
+     * 导出到excel
+     *
      * @param
      * @throws Exception
      */
@@ -340,7 +374,9 @@ public class AppImgFilesController extends BaseController {
     }
 
 
-	 /**查询图片集合
+    /**
+     * 查询图片集合
+     *
      * @param
      * @throws Exception
      */

src/main/java/com/zcloud/controller/filemanager/MfolderController.java

@@ -118,7 +118,9 @@ public class MfolderController extends BaseController {
 			pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());	//企业
 			mfolderService.save(pd);						//存入数据库表
 			//存自己表里的附件 使用文件全路径加文件名的方式 示例
-			// /uploadFiles/yhtp/8415df13cc4c46f0ac32f579462dbb8f/20231215/d3bc85d1bbe84b75b1e6e8b6182dc547.jpg@@d3bc85d1bbe84b75b1e6e8b6182dc547.jpg
+			// /uploadFiles/yhtp/8415df13cc4c46f0ac32f579462dbb8f/20231215/d3bc85d1bbe84b75b1e6e8b6182dc547.jpg
+			// @@
+			// d3bc85d1bbe84b75b1e6e8b6182dc547.jpg
 			pictureList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName+
 					"@@"
 					+fileName);

src/main/java/com/zcloud/controller/firemanager/FireResourcesController.java

@@ -0,0 +1,95 @@
+package com.zcloud.controller.firemanager;
+
+import com.zcloud.controller.base.BaseController;
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import com.zcloud.service.fireresources.FireResourcesService;
+import com.zcloud.util.DateUtil;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("/fireResources")
+public class FireResourcesController extends BaseController {
+
+    @Resource
+    private FireResourcesService fireResourcesService;
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object page(Page page) {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = this.getPageData();
+        page.setPd(pd);
+        //获取当前人的公司id
+        List<PageData> varList = fireResourcesService.datalistPage(page);
+        map.put("varList", varList);
+        map.put("page", page);
+        map.put("result", errInfo);
+        return map;
+    }
+
+    @RequestMapping(value = "/getById")
+    @ResponseBody
+    public Object getById() {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pddata = this.getPageData();
+        //获取当前人的公司id
+        PageData pd = fireResourcesService.getDataById(pddata);
+        map.put("pd", pd);
+        map.put("result", errInfo);
+        return map;
+    }
+
+    @RequestMapping(value = "/add")
+    @ResponseBody
+    public Object add(@RequestParam(value="FFILE",required=false) MultipartFile[] files) throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = this.getPageData();
+        String FIRERESOURCES_ID = this.get32UUID();
+        pd.put("FIRERESOURCES_ID", FIRERESOURCES_ID);
+        pd.put("CREATIME", DateUtil.date2Str(new Date()));
+        pd.put("OPERATIME", DateUtil.date2Str(new Date()));
+        pd.put("ISDELETE", "0");
+        fireResourcesService.save(pd,files);
+        map.put("result", errInfo);
+        return map;
+    }
+
+    @RequestMapping(value = "/edit")
+    @ResponseBody
+    public Object edit(@RequestParam(value="FFILE",required=false) MultipartFile[] files) throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        pd.put("OPERATIME", DateUtil.date2Str(new Date()));
+        pd.put("ISDELETE", "0");
+        fireResourcesService.edit(pd,files);
+        map.put("result", errInfo);
+        return map;
+    }
+
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete(Page page) {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        fireResourcesService.delete(pd);
+        map.put("result", errInfo);
+        return map;
+    }
+}

src/main/java/com/zcloud/controller/firemanager/app/AppFireRecordController.java

@@ -1,19 +1,21 @@
 package com.zcloud.controller.firemanager.app;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+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.mapper.datasource.firemanager.FireDeviceMapper;
 import com.zcloud.service.bus.ImgFilesService;
 import com.zcloud.service.firemanager.*;
-import com.zcloud.util.DateUtil;
+import com.zcloud.service.mq.DockSendMessageService;
 import com.zcloud.util.InitPageDataUtil;
-import com.zcloud.util.Jurisdiction;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -24,7 +26,8 @@ import java.util.stream.Collectors;
  * 作者：wangxuan
  * 官网：www.zcloudchina.com
  */
-@RestController
+@Controller
+@ResponseBody
 @RequestMapping("/app/fireRecordManger")
 public class AppFireRecordController extends BaseController {
 
@@ -35,7 +38,8 @@ public class AppFireRecordController extends BaseController {
 
     @Resource
     private ImgFilesService imgFilesService;
-
+    @Resource
+    private DockSendMessageService dockSendMessageService;
     @Resource
     private FireCheckStandardService fireCheckStandardService;
     @Autowired
@@ -47,7 +51,6 @@ public class AppFireRecordController extends BaseController {
     @Autowired
     private FirePointService firePointService;
 
-
     @Resource
     private InitPageDataUtil initPageDataUtil;
 
@@ -104,6 +107,7 @@ public class AppFireRecordController extends BaseController {
      * @Return: java.lang.Object
      */
     @RequestMapping("/checkList/v2")
+    @ResponseBody
     public Object checkListV2(Page page) {
         Map<String, Object> map = new HashMap<String, Object>();
         String errInfo = "success";
@@ -134,6 +138,7 @@ public class AppFireRecordController extends BaseController {
         map.put("result", errInfo);
         return map;
     }
+
     /**
      * @Description: 清单列表总数
      * @Author: dearLin
@@ -173,6 +178,7 @@ public class AppFireRecordController extends BaseController {
         map.put("varList", res);
         return map;
     }
+
     /**
      * @Description: 所有清单的检查记录最外层
      * @Author: dearLin
@@ -194,6 +200,7 @@ public class AppFireRecordController extends BaseController {
         map.put("varList", res);
         return map;
     }
+
     /**
      * @Description: 清单下的检查记录
      * @Author: dearLin
@@ -306,41 +313,41 @@ public class AppFireRecordController extends BaseController {
      * @Return: java.lang.Object
      */
     @RequestMapping("/editDeviceCheck")
+    @DockAnnotation
     public Object editDeviceCheck() throws Exception {
         String errInfo = "success";
         Map<String, Object> map = new HashMap<String, Object>();
         PageData pd = this.getPageData();
         List<PageData> list = JSONObject.parseArray(pd.getString("CHECK_DATA"), PageData.class);
+        ArrayList<PageData> dataArrayList = new ArrayList<>();
         // 点位下设备检查记录
         list.forEach(itemCheck -> {
             PageData itemCheckData = new PageData();
             itemCheckData.putAll(itemCheck);
             itemCheckData.put("FOREIGN_KEY", itemCheck.getString("EQUIPMENT_RECORD_ID"));
             itemCheckData.put("TYPE", "14");
-            List<PageData> data = null;
+            List<PageData> data = imgFilesService.listAll(itemCheckData);
-            try {
-                data = imgFilesService.listAll(itemCheckData);
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
             // 不合格
             if (!"0".equals(itemCheckData.getString("ISNORMAL"))) {
                 //  删除合格得照片
                 data.forEach(item -> {
-                    try {
                     imgFilesService.delete(item);
+                    TenCorpDto tenCorpDto = new TenCorpDto();
+                    tenCorpDto.setData(item);
+                    try {
+                        dockSendMessageService.sendMessagePictureDelete(tenCorpDto);
                     } catch (Exception e) {
                         throw new RuntimeException(e);
                     }
+
                 });
             }
             fireRecordService.editDeviceCheckByApp(itemCheckData);
-
+            dataArrayList.add(itemCheckData);
         });
-        // todo 校验一下有没有点位图片
-
-//        fireRecordService.modifyPointRecord(pd);
         map.put("result", errInfo);
+        pd.put("dataArrayList",dataArrayList);
+        map.put("dockData", JSON.toJSONString(pd));
         return map;
     }
 
@@ -352,12 +359,14 @@ public class AppFireRecordController extends BaseController {
      * @Return: java.lang.Object
      */
     @RequestMapping("/editDeviceCheckFine")
+    @DockAnnotation
     public Object editDeviceCheckFine() throws Exception {
         String errInfo = "success";
         Map<String, Object> map = new HashMap<String, Object>();
         PageData pd = this.getPageData();
         fireRecordService.modifyPointRecord(pd);
         map.put("result", errInfo);
+        map.put("dockData", JSON.toJSONString(pd));
         return map;
     }
 
@@ -369,7 +378,8 @@ public class AppFireRecordController extends BaseController {
      * @Return: java.lang.Object
      */
     @RequestMapping("/getOtherHidden")
-    private Object getOtherHidden() throws Exception {
+    @ResponseBody
+    public Object getOtherHidden() throws Exception {
         String errInfo = "success";
         Map<String, Object> map = new HashMap<String, Object>();
         PageData pageData = getPageData();
@@ -402,12 +412,15 @@ public class AppFireRecordController extends BaseController {
      * @Return: java.lang.Object
      */
     @RequestMapping("/addOtherHidden")
-    private Object addOtherHidden() throws Exception {
+    @ResponseBody
+    @DockAnnotation
+    public Object addOtherHidden() throws Exception {
         String errInfo = "success";
         Map<String, Object> map = new HashMap<String, Object>();
         PageData pageData = getPageData();
-        fireRecordService.addOtherHidden(pageData);
+        PageData dockData = fireRecordService.addOtherHidden(pageData);
         map.put("result", errInfo);
+        map.put("dockData", JSON.toJSONString(dockData));
         return map;
     }
 
@@ -419,12 +432,14 @@ public class AppFireRecordController extends BaseController {
      * @Return: java.lang.Object
      */
     @RequestMapping("/delOtherHidden")
-    private Object delOtherHidden() throws Exception {
+    @DockAnnotation
+    public Object delOtherHidden() throws Exception {
         String errInfo = "success";
         Map<String, Object> map = new HashMap<String, Object>();
         PageData pageData = getPageData();
         fireRecordService.delOtherHidden(pageData);
         map.put("result", errInfo);
+        map.put("dockData", JSON.toJSONString(pageData));
         return map;
     }
 
@@ -437,10 +452,12 @@ public class AppFireRecordController extends BaseController {
      * @Return: java.lang.Object
      */
     @RequestMapping("/finish")
-    private Object save() throws Exception {
+    @DockAnnotation
+    public Object finish() throws Exception {
         String errInfo = "success";
         Map<String, Object> map = new HashMap<String, Object>();
         PageData pageData = this.getPageData();
+        map.put("dockData",JSON.toJSONString(pageData));
         fireRecordService.finishByApp(pageData);
         map.put("result", errInfo);
         return map;

src/main/java/com/zcloud/controller/gf/AppGFBreakGroundController.java

@@ -2,6 +2,7 @@ package com.zcloud.controller.gf;
 
 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;
@@ -78,6 +79,7 @@ public class AppGFBreakGroundController extends BaseController {
 	@RequestMapping(value="/add")
 	@ResponseBody
 	@Transactional
+	@DockAnnotation(hasAnnex = true)
 	public Object add(
 			@RequestParam(value="FFILE",required=false) MultipartFile[] files
 	)  throws Exception{
@@ -86,6 +88,7 @@ public class AppGFBreakGroundController extends BaseController {
 		PageData pd = new PageData();
 		pd = this.getPageData();
 		PageData pd2 = new PageData();
+		ArrayList<String> sendPicturesList = new ArrayList<>();
 		Calendar calendar = Calendar.getInstance();
 		DecimalFormat dft=new DecimalFormat("00");
 		int year = calendar.get(Calendar.YEAR);
@@ -104,16 +107,20 @@ public class AppGFBreakGroundController extends BaseController {
 		pd.put("HAZARD_IDENTIFICATION", (StringUtils.isNotBlank(pd.getString("HAZARD_IDENTIFICATION")) ? pd.getString("HAZARD_IDENTIFICATION") : "") + ";_;");
 		if (files != null && files.length > 0) {
 			MultipartFile file = files[0];
-
 			String  ffile = DateUtil.getDays();
 			String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
 			smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
-
+			sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName
+					+"@@"+fileName
+			);
 			pd.put("APPLY_USER_SIGNER_PATH",  Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
 			pd.put("APPLY_USER_SIGNER_TIME",  pd.get("SIGNER_TIME"));
 		}
 		GFbreakGroundService.save(pd);
+		PageData breakGroundPageData = new PageData();
+		PageData breakGroundLogPageData = new PageData();
 
+		breakGroundPageData.putAll(pd);
 		if(pd.get("APPLY_STATUS").equals("1")) {
 			PageData log = new PageData();
 			log.put("BREAKGROUNDLOG_ID", this.get32UUID());
@@ -122,8 +129,8 @@ public class AppGFBreakGroundController extends BaseController {
 			log.put("CREATOR",pd.get("ACTION_USER"));
 			log.put("CREATTIME", DateUtil.date2Str(new Date()));
 			GFbreakGroundLogService.save(log);
-
+			breakGroundLogPageData.putAll(log);
-
+			List<PageData> paramsList = new ArrayList<PageData>();
 			// 发短信
 			PageData mes = new PageData();
 			mes.put("RECEIVER_ID", pd.get("CONSTRUCTION_USER_ID"));// 收信人userid
@@ -131,7 +138,6 @@ public class AppGFBreakGroundController extends BaseController {
 			mes.put("SMSCode", "SMS_227245922");// 短信模板编码
 			mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id
 			// 参数集合
-			List<PageData> paramsList = new ArrayList<PageData>();
 			// 第1个参数
 			PageData params1 = new PageData();
 			params1.put("name", "number");// 存入短信模板中的参数名称
@@ -155,8 +161,11 @@ public class AppGFBreakGroundController extends BaseController {
 			paramsList.add(params4);
 			sendMessageUtil.sendMessages(mes, paramsList);
 		}
-
+		PageData dockData = new PageData();
+		dockData.put("breakGroundPageData",breakGroundPageData);
+		dockData.put("breakGroundLogPageData",breakGroundLogPageData);
 		map.put("result", errInfo);
+		map.put("dockData", JSON.toJSONString(dockData));
 		return map;
 	}
 	/**修改

src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalController.java

@@ -399,6 +399,7 @@ public class SafetyEnvironmentalController extends BaseController {
     @RequestMapping(value = "/explain")
     @RequiresPermissions("safetyenvironmental:edit")
     @ResponseBody
+    @DockAnnotation(isAdd = true)
     public Object explain() throws Exception {
         Map<String, Object> map = new HashMap<String, Object>();
         String errInfo = "success";
@@ -421,12 +422,13 @@ public class SafetyEnvironmentalController extends BaseController {
 
             pd.put("INSPECTION_ORIGINATOR_SIGN_IMG", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
         }
-        safetyenvironmentalService.explain(pd);
+        PageData log = safetyenvironmentalService.explain(pd);
-
+        pd.put("log",JSON.toJSONString(log));
         pd.put("inspector", Jurisdiction.getUSER_ID());
         noticeCorpUtil.FailPleadind(pd);
         map.put("pd", pd);
         map.put("result", errInfo);
+        map.put("dockData",JSON.toJSONString(pd));
         return map;
     }
 

src/main/java/com/zcloud/service/bus/ImgFilesService.java

@@ -23,7 +23,7 @@ public interface ImgFilesService{
 	 * @param pd
 	 * @throws Exception
 	 */
-	public void delete(PageData pd)throws Exception;
+	public void delete(PageData pd);
 
 	/**删除
 	 * @param pd
@@ -47,7 +47,7 @@ public interface ImgFilesService{
 	 * @param pd
 	 * @throws Exception
 	 */
-	public List<PageData> listAll(PageData pd)throws Exception;
+	public List<PageData> listAll(PageData pd);
 
 	/**通过id获取数据
 	 * @param pd

src/main/java/com/zcloud/service/bus/impl/ImgFilesServiceImpl.java

@@ -5,6 +5,8 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.zcloud.dto.TenCorpDto;
+import com.zcloud.service.mq.DockSendMessageService;
 import com.zcloud.util.*;
 import org.apache.commons.io.FileUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,7 +30,8 @@ public class ImgFilesServiceImpl implements ImgFilesService{
 
 	@Autowired
 	private ImgFilesMapper imgfilesMapper;
-
+	@Autowired
+	private DockSendMessageService dockSendMessageService;
 	/**新增
 	 * @param pd
 	 * @throws Exception
@@ -41,8 +44,10 @@ public class ImgFilesServiceImpl implements ImgFilesService{
 	 * @param pd
 	 * @throws Exception
 	 */
-	public void delete(PageData pd)throws Exception{
+	@Override
+	public void delete(PageData pd){
 		imgfilesMapper.delete(pd);
+
 	}
 
 	/**删除
@@ -73,7 +78,8 @@ public class ImgFilesServiceImpl implements ImgFilesService{
 	 * @param pd
 	 * @throws Exception
 	 */
-	public List<PageData> listAll(PageData pd)throws Exception{
+	@Override
+	public List<PageData> listAll(PageData pd){
 		return imgfilesMapper.listAll(pd);
 	}
 

src/main/java/com/zcloud/service/firemanager/FireRecordService.java

@@ -45,7 +45,7 @@ public interface FireRecordService {
 
     List<PageData> getOtherHiddenListByApp(PageData pageData) throws Exception;
 
-    void addOtherHidden(PageData pageData);
+    PageData addOtherHidden(PageData pageData);
 
     void delOtherHidden(PageData pageData);
 

src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java

@@ -409,7 +409,7 @@ public class FireRecordServiceImpl implements FireRecordService {
 
     @Override
     @Transactional
-    public void addOtherHidden(PageData pageData) {
+    public PageData addOtherHidden(PageData pageData) {
         String hiddenId = (String) pageData.get("HIDDEN_ID");
         PageData dataList = fireRecordMapper.getOtherHiddenListByApp(pageData);
         String hiddenidlist = null;
@@ -425,7 +425,7 @@ public class FireRecordServiceImpl implements FireRecordService {
             pageData.put("HIDDENIDLIST", hiddenId);
         }
         fireRecordMapper.addOtherHidden(pageData);
-
+        return pageData;
     }
 
     @Override

src/main/java/com/zcloud/service/gf/impl/GFBlindBoardServiceImpl.java

@@ -83,8 +83,8 @@ public class GFBlindBoardServiceImpl implements GFBlindBoardService {
 	public PageData findById(PageData pd)throws Exception{
 		PageData pageData = GFblindboardMapper.findById(pd);
 		//调用接口 获取用户信息
-		String workUser = corpFgsService.getXgfUserName(pageData.getString("WORK_USER"));
+		//String workUser = corpFgsService.getXgfUserName(pageData.getString("WORK_USER"));
-		pageData.put("WORK_USER",workUser);
+		//pageData.put("WORK_USER",workUser);
 		return pageData;
 	}
 

src/main/java/com/zcloud/service/gf/impl/GFHighWorkServiceImpl.java

@@ -82,8 +82,8 @@ public class GFHighWorkServiceImpl implements GFHighWorkService {
 	public PageData findById(PageData pd)throws Exception{
 		PageData pageData = GFhighworkMapper.findById(pd);
 		//调用接口 获取用户信息
-		String workUser = corpFgsService.getXgfUserName(pageData.getString("PROJECT_MANAGER"));
+		//String workUser = corpFgsService.getXgfUserName(pageData.getString("PROJECT_MANAGER"));
-		pageData.put("PROJECT_MANAGER",workUser);
+		//pageData.put("PROJECT_MANAGER",workUser);
 		return pageData;
 	}
 

src/main/java/com/zcloud/service/inspection/SafetyEnvironmentalService.java

@@ -90,10 +90,12 @@ public interface SafetyEnvironmentalService{
 
 	/**
 	 * 申辩不成立时归档
+	 *
 	 * @param pd
+	 * @return
 	 * @throws Exception
 	 */
-	void explain(PageData pd)throws Exception;
+	PageData explain(PageData pd)throws Exception;
 
 	/**
 	 * 分公司安全环保检查考核分数统计

src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java

@@ -582,7 +582,7 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic
 	}
 
 	@Override
-	public void explain(PageData pd) throws Exception {
+	public PageData explain(PageData pd) throws Exception {
 		PageData data = safetyenvironmentalMapper.findById(pd);
 		pd.put("STATE", "101"); // 101.检查已归档，待指派
 		pd.put("INSPECTION_SOURCE",data.getString("INSPECTION_SOURCE"));
@@ -616,6 +616,7 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic
 			explain.put("OPERATTIME",DateUtil.date2Str(new Date()));
 			safetyEnvironmentalExplainService.edit(explain);
 		}
+		return log;
 	}
 
 	@Override

src/main/java/com/zcloud/service/mq/DockSendMessageService.java

@@ -6,6 +6,7 @@ public interface DockSendMessageService {
 
     void sendMessage(TenCorpDto tenCorpDto) throws Exception;
     void sendMessagePicture(TenCorpDto tenCorpDto) throws Exception;
+    void sendMessagePictureDelete(TenCorpDto tenCorpDto) throws Exception;
 
     void SendDelayQueue(TenCorpDto tenCorpDto);
     void SendDelayQueue(String message);

src/main/java/com/zcloud/service/mq/impl/DockSendMessageServiceImpl.java

@@ -84,6 +84,29 @@ public class DockSendMessageServiceImpl implements DockSendMessageService {
         }
     }
 
+    @Override
+    public void sendMessagePictureDelete(TenCorpDto tenCorpDto) throws Exception {
+        try {
+            PageData log = tenCorpDto.getPd();
+            log.put("MESSAGE_LOG_ID", Warden.get32UUID());
+            log.put("CREATE_TIME", DateUtil.getTime());
+            mqMessageLogMapper.save(log);
+            System.out.println("生产者:" + tenCorpDto.toString());
+            SendResult sendResult = rocketMQTemplate.syncSend(this.dockingPicture, tenCorpDto.toString());
+            if (!sendResult.getSendStatus().equals(SendStatus.SEND_OK)) {
+                throw new RuntimeException("产品入栈失败");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            PageData log = tenCorpDto.getPd();
+            log.put("MESSAGE_ERROR_LOG_ID", Warden.get32UUID());
+            log.put("ERROR_MESSAGE", e.getMessage());
+            log.put("TYPE", "0");
+            log.put("TIME", DateUtil.getTime());
+            mqErrorMessageLogMapper.save(log);
+        }
+    }
+
     @Override
     public void SendDelayQueue(TenCorpDto tenCorpDto) {
         PageData log = tenCorpDto.getPd();