消防安全管理对接代码

src/main/java/com/zcloud/aspect/DockingAspect.java

@@ -3,12 +3,15 @@ package com.zcloud.aspect;
 import com.alibaba.fastjson.JSON;
 import com.zcloud.dto.TenCorpDto;
 import com.zcloud.entity.PageData;
+import com.zcloud.entity.system.User;
 import com.zcloud.service.docking.DockingRelationService;
 import com.zcloud.service.mq.DockSendMessageService;
 import com.zcloud.service.mq.SendMessageService;
+import com.zcloud.util.Const;
 import com.zcloud.util.Jurisdiction;
 import com.zcloud.util.Tools;
 import com.zcloud.util.UuidUtil;
+import org.apache.shiro.session.Session;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -164,6 +167,10 @@ public class DockingAspect {
             login_user.put("NAME", Jurisdiction.getName());
             login_user.put("ISSUPERVISE", Jurisdiction.getISSUPERVISE());
             login_user.put("POST_ID", Jurisdiction.getPOST_ID());
+            login_user.put("IS_MAIN", Jurisdiction.getIS_MAIN());
+            Session session = Jurisdiction.getSession();
+            User user = (User)session.getAttribute(Const.SESSION_USER);
+            login_user.put("user",JSON.toJSONString(user));
             sendData.put("LOGIN_USER", login_user);
         } else {
             // 手机app 会传递值。

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

@@ -51,7 +51,7 @@ public class AppImgFilesController extends BaseController {
     @RequestMapping(value = "/add", headers = "content-type=multipart/form-data")
     @ResponseBody
     @Transactional
-    @DockAnnotation(hasAnnex = true)
+//    @DockAnnotation(hasAnnex = true)
     public Object finish(
             @RequestParam(value = "FFILE", required = false) MultipartFile[] files,
             @RequestParam(value = "TYPE", required = false) String TYPE,

src/main/java/com/zcloud/controller/bus/CorpInfoController.java

@@ -127,6 +127,19 @@ public class CorpInfoController extends BaseController {
 		return map;
 	}
 
+	@RequestMapping(value = "/getSelectByCorpInfo")
+	@ResponseBody
+	public Object getSelectByCorpInfo() throws Exception {
+		Map<String, Object> map = new HashMap<String, Object>();
+		String errInfo = "success";
+		PageData pd = this.getPageData();
+		List<PageData> varList = corpinfoService.getSelectByCorpInfo(pd);
+		JSONArray corpInfoJson = JSONArray.fromObject(varList);
+		map.put("corpInfoJson", corpInfoJson.toString());
+		map.put("result", errInfo);
+		return map;
+	}
+
 	/**删除
 	 * @param out
 	 * @throws Exception

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

@@ -1,5 +1,7 @@
 package com.zcloud.controller.firemanager;
 
+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;
@@ -159,12 +161,15 @@ public class FireCheckListController extends BaseController {
      */
     @RequestMapping("/upd4PcById")
     @ResponseBody
+    @DockAnnotation(isAdd = true)
     public Object upd4PcById() throws Exception {
         Map<String, Object> map = new HashMap<String, Object>();
         String errInfo = "success";
         PageData pd = getPageData();
-        fireCheckListService.upd4PcById(pd);
+        Map<String, String> fireCheckMap = fireCheckListService.upd4PcById(pd);
+        pd.put("fireCheckMap",JSON.toJSONString(fireCheckMap));
         map.put("result", errInfo);
+        map.put("dockData", JSON.toJSONString(pd));
         return map;
     }
 
@@ -178,13 +183,15 @@ public class FireCheckListController extends BaseController {
     @LogOperation(value = "新增点检表成功", exceptionInformation = "新增点检表失败")
     @RequestMapping(value = "/saveInfo")
     @ResponseBody
-
+    @DockAnnotation(isAdd = true)
     public Object saveInfo() throws Exception {
         Map<String, Object> map = new HashMap<String, Object>();
         String errInfo = "success";
         PageData pd = getPageData();
-        fireCheckListService.saveInfo(pd);
+        ArrayList<PageData> pageData = fireCheckListService.saveInfo(pd);
+        pd.put("pageDataList", JSON.toJSONString(pageData));
         map.put("result", errInfo);
+        map.put("dockData",JSON.toJSONString(pd));
         return map;
     }
 
@@ -198,6 +205,7 @@ public class FireCheckListController extends BaseController {
     @LogOperation(value = "删除点检表成功", exceptionInformation = "删除点检表失败",isDelete = true)
     @RequestMapping("/delByIds")
     @ResponseBody
+    @DockAnnotation
     public Object delByIds() {
         Map<String, Object> map = new HashMap<String, Object>();
         String errInfo = "success";
@@ -223,6 +231,7 @@ public class FireCheckListController extends BaseController {
      */
     @RequestMapping("/setDelStateByIds")
     @ResponseBody
+    @DockAnnotation
     public Object setDelStateByIds() {
         Map<String, Object> map = new HashMap<String, Object>();
         String errInfo = "success";
@@ -299,6 +308,7 @@ public class FireCheckListController extends BaseController {
     @LogOperation(value = "禁用点检表成功", exceptionInformation = "禁用点检表失败")
     @RequestMapping("/closeCheck")
     @ResponseBody
+    @DockAnnotation
     public Object closeCheck() {
         Map<String, Object> map = new HashMap<String, Object>();
         String errInfo = "success";

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

@@ -2,6 +2,7 @@ package com.zcloud.controller.firemanager;
 
 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;
@@ -223,6 +224,7 @@ public class FireRecordController extends BaseController {
     @LogOperation(value = "删除点检记录成功", exceptionInformation = "删除点检记录失败", isDelete = true)
     @RequestMapping("/delByIds")
     @ResponseBody
+    @DockAnnotation
     public Object delByIds() {
         Map<String, Object> map = new HashMap<String, Object>();
         String errInfo = "success";
@@ -233,6 +235,4 @@ public class FireRecordController extends BaseController {
         map.put("result", errInfo);
         return map;
     }
-
-
 }

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

@@ -326,7 +326,12 @@ public class AppFireRecordController extends BaseController {
             itemCheckData.putAll(itemCheck);
             itemCheckData.put("FOREIGN_KEY", itemCheck.getString("EQUIPMENT_RECORD_ID"));
             itemCheckData.put("TYPE", "14");
-            List<PageData> data = imgFilesService.listAll(itemCheckData);
+            List<PageData> data = null;
+            try {
+                data = imgFilesService.listAll(itemCheckData);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
             // 不合格
             if (!"0".equals(itemCheckData.getString("ISNORMAL"))) {
                 //  删除合格得照片

src/main/java/com/zcloud/mapper/datasource/bus/CorpInfoMapper.java

@@ -76,5 +76,7 @@ public interface CorpInfoMapper{
 
 	//从公司端修改企业用户信息 新
 	void editCorpUserNew(PageData pd);
+
+	List<PageData> getSelectByCorpInfo(PageData pd);
 }
 

src/main/java/com/zcloud/mapper/dsno2/fireresources/FireResourcesMapper.java

@@ -1,4 +1,4 @@
-package com.zcloud.mapper.datasource.fireresources;
+package com.zcloud.mapper.dsno2.fireresources;
 
 import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;

src/main/java/com/zcloud/service/bimap/impl/BiMapServiceImpl.java

@@ -5,7 +5,7 @@ import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
 import com.zcloud.mapper.datasource.bimap.BiMapMapper;
 import com.zcloud.mapper.datasource.bus.CorpInfoMapper;
-import com.zcloud.mapper.datasource.fireresources.FireResourcesMapper;
+import com.zcloud.mapper.dsno2.fireresources.FireResourcesMapper;
 import com.zcloud.mapper.datasource.keyProjects.PlatformvideomanagementMapper;
 import com.zcloud.service.bimap.BiMapService;
 import com.zcloud.util.biMapFactory.AbsFireSourcesHandel;

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

@@ -88,5 +88,7 @@ public interface CorpInfoService{
 	 * @throws Exception
 	 */
 	void editCorpUserNew(PageData pd)throws Exception;
+
+	List<PageData> getSelectByCorpInfo(PageData pd);
 }
 

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

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

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

@@ -121,5 +121,10 @@ public class CorpInfoServiceImpl implements CorpInfoService{
 	public void editCorpUserNew(PageData pd) throws Exception {
 		corpinfoMapper.editCorpUserNew(pd);
 	}
+
+	@Override
+	public List<PageData> getSelectByCorpInfo(PageData pd) {
+		return corpinfoMapper.getSelectByCorpInfo(pd);
+	}
 }
 

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

@@ -3,7 +3,9 @@ package com.zcloud.service.firemanager;
 import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 说明：清单列表
@@ -39,13 +41,14 @@ public interface FireCheckListService {
     void updById(PageData pd) throws Exception;
 
     /**
+     * @return
      * @Description: 保存
      * @Author: dearLin
      * @Date: 2023/3/8/008 17:12
      * @Param: [com.zcloud.entity.PageData] [pd]
      * @Return: void
      */
-    void saveInfo(PageData pd) throws Exception;
+    ArrayList<PageData> saveInfo(PageData pd) throws Exception;
 
     /**
      * @Description: 删除
@@ -112,7 +115,7 @@ public interface FireCheckListService {
 
     List<PageData> getFireCheckListCountByAppV2(PageData pageData);
 
-    void upd4PcById(PageData pd);
+    Map<String, String> upd4PcById(PageData pd);
 
     void setDelStateByIds(PageData pd);
 }

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

@@ -82,6 +82,7 @@ public class FireCheckListServiceImpl implements FireCheckListService {
     }
 
     /**
+     * @return
      * @Description: 保存
      * @Author: dearLin
      * @Date: 2023/3/8/008 17:15
@@ -90,8 +91,7 @@ public class FireCheckListServiceImpl implements FireCheckListService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void saveInfo(PageData pd) throws Exception {
+    public ArrayList<PageData> saveInfo(PageData pd) throws Exception {
-
         // 处理一下检查表器材的检查项
         PageData pageData = JSON.parseObject((String) pd.get("from"), PageData.class);
         JSONArray userId = (JSONArray) pageData.get("USER_ID");
@@ -99,12 +99,15 @@ public class FireCheckListServiceImpl implements FireCheckListService {
         StringBuilder stringBuilder = new StringBuilder();
         String dataJson = JSON.toJSONString(dataList);
         LinkedList<PageData> logPageLinkedList = new LinkedList<>();
+        ArrayList<PageData> fireCheckList = new ArrayList<>();
         String OPERATOR = Jurisdiction.getUSER_ID();
         String OPERATOR_CORPINFO_ID = Jurisdiction.getCORPINFO_ID();
         String OPERATOR_NAME = Jurisdiction.getName();
         // 给每个人初始化点检表
         userId.forEach(USERID -> {
+            PageData saveData = new PageData();
             PageData logPageData = new PageData();
+            PageData fireCheck = new PageData();
             List<PageData> preDataList = new ArrayList<>();
             String fire_check_id = UuidUtil.get32UUID();
             pd.put("FIRE_CHECK_TYPE", pageData.get("FIRE_CHECK_TYPE"));
@@ -120,6 +123,8 @@ public class FireCheckListServiceImpl implements FireCheckListService {
             pd.put("OPERATTIME", DateUtil.date2Str(new Date()));
             //检查表
             fireCheckListMapper.saveInfo(pd);
+            fireCheck.putAll(pd);
+            saveData.put("fireCheck",JSON.toJSONString(fireCheck));
             try {
                 FHLOG.save(Jurisdiction.getUsername(), "保存点检表信息FIRE_CHECK_ID为" + fire_check_id);
             } catch (Exception e) {
@@ -147,6 +152,7 @@ public class FireCheckListServiceImpl implements FireCheckListService {
                 data.put("OPERATTIME", DateUtil.date2Str(new Date()));
                 preDataList.add(data);
             }
+            saveData.put("preDataList",JSON.toJSONString(preDataList));
             // 清单的器材
             firePreparedCheckListService.saveInfo(preDataList);
             List<PageData> prePointHiddenDataList = new ArrayList<>();
@@ -159,6 +165,7 @@ public class FireCheckListServiceImpl implements FireCheckListService {
                 pdPOINT.put("CORPINFO_ID", OPERATOR_CORPINFO_ID);
                 prePointHiddenDataList.add(pdPOINT);
             });
+            saveData.put("prePointHiddenDataList",JSON.toJSONString(prePointHiddenDataList));
             // 消防点位表用于点检的
             firePointPreparedService.saveBatch(prePointHiddenDataList);
             logPageData.put("CARRYINGDATA", dataJson);
@@ -171,9 +178,12 @@ public class FireCheckListServiceImpl implements FireCheckListService {
                     .append("。的消防点检表。");
             pageData.put("SKETCH", stringBuilder.toString());
             stringBuilder.setLength(0);
+            saveData.put("logPageData",JSON.toJSONString(logPageData));
             logPageLinkedList.add(logPageData);
+            fireCheckList.add(saveData);
         });
         fireChangeLogMapper.saveBatch(logPageLinkedList);
+        return fireCheckList;
     }
 
     /**
@@ -458,7 +468,7 @@ public class FireCheckListServiceImpl implements FireCheckListService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void upd4PcById(PageData pd) {
+    public Map<String, String> upd4PcById(PageData pd) {
         // 修改 针对于点检表只会修改 "FIRE_CHECK_STANDARD_NAME":"0914表-012","FIRE_CHECK_TYPE":"checkPeriod0001"
         // bus_fire_point_prepared 中点位 需要传过来的表单去计算要删除哪个，要新增哪个
         // bus_fire_device_prepared 的器材会传过来
@@ -492,6 +502,8 @@ public class FireCheckListServiceImpl implements FireCheckListService {
         });
         LinkedList<PageData> DEVICE_PREPARED_DATA = new LinkedList<>();
         List<JSONObject> dataList = (List<JSONObject>) postData.get("DATA");
+        Map<String,String> deviceInfoMap = new HashMap<>();
+        int count = 1;
         for (JSONObject item : dataList) {
             FIRE_PREPARED_DEVICE_TABLE.put(item.getString("FIRE_POINT_ID"), 1);
             if (Tools.isEmpty(item.getString("FIRE_PREPARED_ID"))) {
@@ -505,6 +517,8 @@ public class FireCheckListServiceImpl implements FireCheckListService {
                 device_prepared_info.put("OPERATOR", OPERATOR);
                 device_prepared_info.put("CREATTIME", DateUtil.date2Str(new Date()));
                 device_prepared_info.put("OPERATTIME", DateUtil.date2Str(new Date()));
+                deviceInfoMap.put("deviceInfo"+count,JSON.toJSONString(device_prepared_info));
+                count++;
                 DEVICE_PREPARED_DATA.add(device_prepared_info);
             }
         }
@@ -610,6 +624,7 @@ public class FireCheckListServiceImpl implements FireCheckListService {
                 fireRecordService.updCheckedByRidPid(checkedPageData);
             }
         }
+        return deviceInfoMap;
     }
 
     @Override

src/main/java/com/zcloud/service/fireresources/impl/FireResourcesServiceImpl.java

@@ -2,7 +2,7 @@ package com.zcloud.service.fireresources.impl;
 
 import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
-import com.zcloud.mapper.datasource.fireresources.FireResourcesMapper;
+import com.zcloud.mapper.dsno2.fireresources.FireResourcesMapper;
 import com.zcloud.service.bus.ImgFilesService;
 import com.zcloud.service.fireresources.FireResourcesService;
 import com.zcloud.util.Tools;

src/main/java/com/zcloud/util/biMapFactory/AbsFireSourcesHandel.java

@@ -1,7 +1,7 @@
 package com.zcloud.util.biMapFactory;
 
 import com.zcloud.entity.PageData;
-import com.zcloud.mapper.datasource.fireresources.FireResourcesMapper;
+import com.zcloud.mapper.dsno2.fireresources.FireResourcesMapper;
 import com.zcloud.service.fireresources.FireResourcesService;
 import org.springframework.beans.factory.InitializingBean;
 

src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml

@@ -453,4 +453,30 @@
         where USER_ID = #{USER_ID}
     </update>
 
+	<select id="getSelectByCorpInfo" resultType="com.zcloud.entity.PageData">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include>
+		f
+		left join `qa-czks-prevention`.sys_dictionaries d on d.DICTIONARIES_ID = f.REPORT_CYCLE
+		left join `qa-czks-regulatory`.BUS_CORPTYPE type on type.CORPTYPE_ID = f.CORP_OF_TYPE
+		left join `qa-czks-regulatory`.BUS_CORPTYPE type2 on type2.CORPTYPE_ID = f.CORP_OF_TYPE2
+		LEFT JOIN `qa-czks-prevention`.sys_dictionaries prvince ON prvince.BIANMA = f.PROVINCE
+		left join `qa-czks-prevention`.sys_dictionaries city on city.BIANMA = f.CITY
+		left join `qa-czks-prevention`.sys_dictionaries country on country.BIANMA = f.COUNTRY
+		left join `qa-czks-prevention`.sys_dictionaries village on village.BIANMA = f.VILLAGE
+		left join `qa-czks-prevention`.sys_dictionaries corpState on corpState.BIANMA = f.CORP_STATE
+		left join `qa-czks-prevention`.sys_dictionaries sub on sub.BIANMA = f.SUBORDINATION
+		left join `qa-czks-prevention`.sys_dictionaries ct1 on ct1.DICTIONARIES_ID = f.CORP_TYPE
+		left join `qa-czks-prevention`.sys_dictionaries ct2 on ct2.DICTIONARIES_ID = f.CORP_TYPE2
+		left join `qa-czks-prevention`.sys_dictionaries ct3 on ct3.DICTIONARIES_ID = f.CORP_TYPE3
+		left join `qa-czks-prevention`.sys_dictionaries ct4 on ct4.DICTIONARIES_ID = f.CORP_TYPE4
+		LEFT JOIN `qa-czks-prevention`.sys_dictionaries sd ON sd.DICTIONARIES_ID = f.INDUSTRY
+		left join `qa-czks-prevention`.sys_dictionaries state on state.BIANMA = f.CORP_STATE
+		LEFT JOIN `qa-czks-prevention`.sys_user su on su.CORPINFO_ID = f.CORPINFO_ID and su.isdelete = '0'
+		where 1=1 and f.ISDELETE ='0' and su.ISDELETE ='0'
+		GROUP BY f.CORPINFO_ID
+		ORDER BY (f.COR_ORDER+0) asc
+	</select>
 </mapper>