1.装备车辆缓存修改

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentCategoryController.java

@@ -10,10 +10,14 @@ import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.yeejoin.equipmanage.common.enums.SourceTypeEnum;
+import com.yeejoin.equipmanage.common.utils.SpringUtils;
+import com.yeejoin.equipmanage.service.ISourceStatistics;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -73,6 +77,9 @@ public class EquipmentCategoryController extends AbstractBaseController {
 	@Autowired
 	private RedisUtils redisUtils;
 
+	@Autowired
+	ISourceStatistics iSourceStatistics;
+
 	private static final String equipmentTreeListAll = "equipmentTreeListAll";
 	private static final String equipmentTreeListIndustry = "equipmentTreeListIndustry";
 	// 装备redis缓存key前缀
@@ -90,9 +97,17 @@ public class EquipmentCategoryController extends AbstractBaseController {
 			@RequestBody EquipmentCategory equipmentCategory) {
 		EquipmentCategory equipmentCategoryInstance = iEquipmentCategoryService
 				.saveEquipmentCategory(equipmentCategory);
+		EquipmentCategoryController controllerProxy = SpringUtils.getBean(EquipmentCategoryController.class);
+		controllerProxy.refreshAllCount();
 		return equipmentCategoryInstance;
 	}
 
+	@Async
+	public void refreshAllCount() {
+		iSourceStatistics.initAllCategoryStatisticsData(SourceTypeEnum.EQUIPMENT);
+		iSourceStatistics.initAllCategoryStatisticsData(SourceTypeEnum.CAR);
+	}
+
 	/**
 	 * 根据id删除
 	 * 
@@ -138,6 +153,8 @@ public class EquipmentCategoryController extends AbstractBaseController {
 		if (removeFlag) {
 			// 更新缓存
 			SpringContextHolder.publishEvent(new EquipmentTreeListEvent(this, idSet, typeSet));
+			EquipmentCategoryController controllerProxy = SpringUtils.getBean(EquipmentCategoryController.class);
+			controllerProxy.refreshAllCount();
 		}
 		return CommonResponseUtil.success(removeFlag);
 	}
@@ -157,6 +174,8 @@ public class EquipmentCategoryController extends AbstractBaseController {
 				.eq("group_code", equipmentCategory.getCode()).set("group_name", equipmentCategory.getName()));
 		if (updateFlag) {
 			// 更新缓存
+			EquipmentCategoryController controllerProxy = SpringUtils.getBean(EquipmentCategoryController.class);
+			controllerProxy.refreshAllCount();
 			SpringContextHolder.publishEvent(new EquipmentTreeListEvent(this, equipmentCategory));
 		}
 		return updateFlag;

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentDetailController.java

@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
 import com.yeejoin.equipmanage.common.entity.*;
 import com.yeejoin.equipmanage.common.entity.vo.EquipmentDetailDownloadVO;
 import com.yeejoin.equipmanage.common.enums.ExcelEnums;
+import com.yeejoin.equipmanage.common.enums.SourceTypeEnum;
 import com.yeejoin.equipmanage.common.utils.ExcelUtils;
 import com.yeejoin.equipmanage.common.utils.NameUtils;
 import com.yeejoin.equipmanage.common.utils.SpringUtils;
@@ -90,6 +91,9 @@ public class EquipmentDetailController extends AbstractBaseController {
     @Autowired
     FireFightingSystemServiceImpl fireFightingSystemServiceImpl;
 
+    @Autowired
+    ISourceStatistics iSourceStatistics;
+
     /**
      * 新增
      *
@@ -99,7 +103,7 @@ public class EquipmentDetailController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
     public EquipmentDetail saveEquipmentDetail(HttpServletRequest request, @RequestBody EquipmentDetail equipmentDetail) {
-    	EquipmentDetail detail=	iEquipmentDetailService.saveOne(equipmentDetail);
+        EquipmentDetail detail = iEquipmentDetailService.saveOne(equipmentDetail);
         return detail;
     }
 
@@ -110,7 +114,6 @@ public class EquipmentDetailController extends AbstractBaseController {
             fireFightingSystemServiceImpl.refreshEquipmentTypeAndCount(bizOrgCode);
         } catch (Exception e) {
         }
-
     }
 
     /**
@@ -120,7 +123,7 @@ public class EquipmentDetailController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
     public EquipmentDate saveEquipmentDetail(@RequestBody EquipmentDate equipmentDate) {
-    	
+
         if (equipmentDate.getEquipmentSpecific().getSingle() == null) {
             throw new BadRequest("管理方式未输入");
         }
@@ -222,7 +225,7 @@ public class EquipmentDetailController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "PUT", value = "修改", notes = "修改")
     public EquipmentDate updateByIdEquipmentDetail(HttpServletRequest request, @RequestBody EquipmentDate equipmentDate) {
-    	
+
         EquipmentSpecific vo = equipmentDate.getEquipmentSpecific();
         String sysCode = vo.getCode();
         if (StringUtils.isNotEmpty(sysCode) && StringUtils.isNotEmpty(sysCode.trim())) {
@@ -281,20 +284,20 @@ public class EquipmentDetailController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
     public boolean deleteById(HttpServletRequest request, @PathVariable Long id) {
-    boolean falg=	iEquipmentDetailService.removeOneById(id);
-    if(falg) {
-    	equipmentSpecificSerivce.refreshStaData();
-    }
-        return falg ;
+        boolean falg = iEquipmentDetailService.removeOneById(id);
+        if (falg) {
+            equipmentSpecificSerivce.refreshStaData();
+        }
+        return falg;
     }
 
     @RequestMapping(value = "/updatequota", method = RequestMethod.PUT)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "PUT", value = "修改", notes = "修改")
     public boolean quotaUpdate(HttpServletRequest request, @RequestBody List<EquProperty> e) {
-    	 boolean falg=		iEquipmentDetailService.quotaUpdate(e);
-    	if(falg) {
-        	equipmentSpecificSerivce.refreshStaData();
+        boolean falg = iEquipmentDetailService.quotaUpdate(e);
+        if (falg) {
+            equipmentSpecificSerivce.refreshStaData();
         }
         return falg;
     }
@@ -558,10 +561,16 @@ public class EquipmentDetailController extends AbstractBaseController {
         ExcelDto excelDto = new ExcelDto(excelEnums.getFileName(), excelEnums.getSheetName(), excelEnums.getClassUrl(), excelEnums.getType());
 
         excelService.commonUpload(file, excelDto, getSelectedOrgInfo(), getUserInfo());
-        // return iStockService.uploadListByTemplate(equipmentDetailDownloadS, getSelectedOrgInfo(), getUserInfo());
+        EquipmentDetailController controllerProxy = SpringUtils.getBean(EquipmentDetailController.class);
+        controllerProxy.refreshAllCount();
         return ResponseHelper.buildResponse(null);
     }
 
+    @Async
+    public void refreshAllCount() {
+        iSourceStatistics.initAllCategoryStatisticsData(SourceTypeEnum.EQUIPMENT);
+    }
+
     /**
      * 设备信息导入
      *

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentSpecificController.java

@@ -6,6 +6,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.yeejoin.equipmanage.common.utils.SpringUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
@@ -46,6 +48,7 @@ import io.swagger.annotations.ApiOperation;
  * @date 2020/10/29 14:26
  * @since v2.0
  */
+@Slf4j
 @RestController
 @Api(tags = "单个设备管理")
 @RequestMapping(value = "/equipSpecific")
@@ -63,6 +66,9 @@ public class EquipmentSpecificController extends AbstractBaseController {
     @Value("${systemctl.sync.switch}")
     private Boolean syncSwitch;
 
+    @Autowired
+    FireFightingSystemServiceImpl fireFightingSystemServiceImpl;
+
     /**
      * 补码页面分页
      *
@@ -247,7 +253,20 @@ public class EquipmentSpecificController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation( value = "删除装备相关所有数据", notes = "删除装备相关所有数据")
     public ResponseModel delEquipmentBySpecificId(@RequestParam Long specificId) {
-        return CommonResponseUtil.success(equipmentSpecificSerivce.delEquipmentBySpecificId(specificId));
+        EquipmentSpecific equipmentSpecific = equipmentSpecificSerivce.getById(specificId);
+        Boolean result = equipmentSpecificSerivce.delEquipmentSpecific(specificId);
+        // 同步刷新，不在异步，原因速度3秒左右
+        this.refreshCount(equipmentSpecific.getBizOrgCode());
+        return CommonResponseUtil.success(result);
+    }
+
+    private void refreshCount(String bizOrgCode) {
+        try {
+            equipmentSpecificSerivce.refreshStaData();
+            fireFightingSystemServiceImpl.refreshEquipmentTypeAndCount(bizOrgCode);
+        } catch (Exception e) {
+            log.error("刷新装备分类树缓存失败" + e.getMessage());
+        }
     }
     
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FireFightingSystemController.java

@@ -7,9 +7,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import com.yeejoin.equipmanage.common.entity.*;
+import com.yeejoin.equipmanage.common.utils.SpringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -33,12 +36,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
 import com.yeejoin.amos.feign.morphic.model.ResourceDTO;
-import com.yeejoin.equipmanage.common.entity.EquProperty;
-import com.yeejoin.equipmanage.common.entity.Equipment;
-import com.yeejoin.equipmanage.common.entity.EquipmentCategory;
-import com.yeejoin.equipmanage.common.entity.EquipmentIndex;
-import com.yeejoin.equipmanage.common.entity.FireFightingSystemEntity;
-import com.yeejoin.equipmanage.common.entity.ManufacturerInfo;
 import com.yeejoin.equipmanage.common.entity.dto.EquipTypeAmountPageDTO;
 import com.yeejoin.equipmanage.common.entity.vo.EquipCountBySystemVO;
 import com.yeejoin.equipmanage.common.entity.vo.EquipTypeImgAmountVO;
@@ -170,7 +167,21 @@ public class FireFightingSystemController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "DELETE", value = "装备卡片删除")
     public Boolean delEquipmentSpecific(Long id) {
-        return equipmentSpecificSerivce.delEquipmentSpecific(id);
+        EquipmentSpecific equipmentSpecific = equipmentSpecificSerivce.getById(id);
+        Boolean result = equipmentSpecificSerivce.delEquipmentSpecific(id);
+        // 同步刷新，不在异步，原因速度3秒左右
+        this.refreshCount(equipmentSpecific.getBizOrgCode());
+        return result;
+    }
+
+
+    private void refreshCount(String bizOrgCode) {
+        equipmentSpecificSerivce.refreshStaData();
+        try {
+            fireFightingSystemService.refreshEquipmentTypeAndCount(bizOrgCode);
+        } catch (Exception e) {
+            log.error("刷新装备分类树缓存失败" + e.getMessage());
+        }
     }
 
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/IndustryController.java

 package com.yeejoin.equipmanage.controller;
 
-import java.util.List;
-
+import com.yeejoin.equipmanage.common.entity.Industry;
+import com.yeejoin.equipmanage.service.IIndustryService;
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
-import com.yeejoin.equipmanage.common.entity.Industry;
-import com.yeejoin.equipmanage.service.IIndustryService;
-
-import io.swagger.annotations.Api;
+import java.util.List;
 
 @RestController
 @Api(tags = "行业分类Industry")
@@ -19,6 +19,7 @@ public class IndustryController {
     @Autowired
     IIndustryService industryService;
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/list")
     public List<Industry> listAll() {
         return industryService.list();

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IFireFightingSystemService.java

@@ -222,7 +222,9 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
 	 */
 	Object getCarTypeAndCount(String bizOrgCode) throws Exception;
 	
-	public Object refreshEquipmentTypeAndCount(String bizOrgCode) throws Exception;
+	Object refreshEquipmentTypeAndCount(String bizOrgCode) throws Exception;
 	
-	public Object refreshCarTypeAndCount(String bizOrgCode) throws Exception;
+	Object refreshCarTypeAndCount(String bizOrgCode) throws Exception;
+
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/ISourceStatistics.java

@@ -13,4 +13,11 @@ public interface ISourceStatistics {
      * @return int 数量
      */
     int equipCategoryStatistics(String bizOrgCode, SourceTypeEnum sourceType, String categoryCode);
+
+    /**
+     * 初始化所有有分类数据（装备、车辆），bizOrgCode + "_" + sourceType.getCode() + "_" + categoryCode
+     * * 消防装备、消防车辆页面右侧构建分类树，统计装备和车辆数量使用
+     * * @param sourceType sourceType
+     */
+    void initAllCategoryStatisticsData(SourceTypeEnum sourceType);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/ApplicationRunnerImpl.java

@@ -2,8 +2,10 @@ package com.yeejoin.equipmanage.service.impl;
 
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.equipmanage.common.enums.ConfigPageTopicEnum;
+import com.yeejoin.equipmanage.common.enums.SourceTypeEnum;
 import com.yeejoin.equipmanage.listener.IntegratePageDataListener;
 import com.yeejoin.equipmanage.service.IMaintenanceResourceDataService;
+import com.yeejoin.equipmanage.service.ISourceStatistics;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.ApplicationArguments;
@@ -40,14 +42,20 @@ public class ApplicationRunnerImpl implements ApplicationRunner {
     @Value("${redis_equip_type_count}")
     private String equipTypeAndCount;
 
+    @Autowired
+    ISourceStatistics iSourceStatistics;
+
     @Override
     public void run(ApplicationArguments args) throws Exception {
-        // 清空装备分类树缓存
+        // 清空单位装备分类树缓存
         redisUtils.getAndDeletePatternKeys(carTypeAndCount + "*");
         // 清空车辆分类树缓存
         redisUtils.getAndDeletePatternKeys(equipTypeAndCount + "*");
         // 清空单位分类数量统计缓存
         redisUtils.getAndDeletePatternKeys(SourcesStatisticsImpl.PREFIX_CATEGORY_COUNT + "*");
+        // 刷新单位分类数量统计
+        iSourceStatistics.initAllCategoryStatisticsData(SourceTypeEnum.EQUIPMENT);
+        iSourceStatistics.initAllCategoryStatisticsData(SourceTypeEnum.CAR);
         maintenanceResourceDataService.subscribeTopic();
         emqKeeper.getMqttClient().subscribe(ConfigPageTopicEnum.INTEGRATE.getTopic(), 2, integratePageDataListener);
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java

 package com.yeejoin.equipmanage.service.impl;
 
-import java.net.Inet4Address;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.SocketException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.apache.commons.beanutils.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -36,7 +9,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
-import com.google.gson.JsonArray;
 import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
@@ -49,380 +21,363 @@ import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import com.yeejoin.equipmanage.common.datasync.entity.FireFightingSystem;
 import com.yeejoin.equipmanage.common.dto.OrgUsrDto;
-import com.yeejoin.equipmanage.common.entity.DynamicFormGroup;
-import com.yeejoin.equipmanage.common.entity.DynamicFormInstance;
-import com.yeejoin.equipmanage.common.entity.EquipmentCategory;
-import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
-import com.yeejoin.equipmanage.common.entity.FireFightingSystemEntity;
-import com.yeejoin.equipmanage.common.entity.SourceScene;
+import com.yeejoin.equipmanage.common.entity.*;
 import com.yeejoin.equipmanage.common.entity.dto.EquipTypeAmountPageDTO;
-import com.yeejoin.equipmanage.common.entity.vo.EquipCountBySystemVO;
-import com.yeejoin.equipmanage.common.entity.vo.EquipTypeImgAmountVO;
-import com.yeejoin.equipmanage.common.entity.vo.EquiplistSpecificBySystemVO;
-import com.yeejoin.equipmanage.common.entity.vo.EquipmentAlarmBySystemIdOrSourceIdVO;
-import com.yeejoin.equipmanage.common.entity.vo.PointTreeVo;
-import com.yeejoin.equipmanage.common.enums.EquipmentRiskTypeEnum;
-import com.yeejoin.equipmanage.common.enums.EquipmentSpeIndexEnum;
-import com.yeejoin.equipmanage.common.enums.SourceTypeEnum;
-import com.yeejoin.equipmanage.common.enums.SystemTypeEnum;
-import com.yeejoin.equipmanage.common.enums.TrueOrFalseEnum;
+import com.yeejoin.equipmanage.common.entity.vo.*;
+import com.yeejoin.equipmanage.common.enums.*;
 import com.yeejoin.equipmanage.common.utils.StringUtil;
-import com.yeejoin.equipmanage.common.vo.AlarmDataVO;
-import com.yeejoin.equipmanage.common.vo.EquipmentManageVo;
-import com.yeejoin.equipmanage.common.vo.FileUploadVo;
-import com.yeejoin.equipmanage.common.vo.FireFightingSystem3dVo;
-import com.yeejoin.equipmanage.common.vo.FireFightingSystemTreeVo;
-import com.yeejoin.equipmanage.common.vo.FireFightingSystemTypeTreeVo;
-import com.yeejoin.equipmanage.common.vo.FireFightingSystemVo;
-import com.yeejoin.equipmanage.common.vo.SpeIndexVo;
-import com.yeejoin.equipmanage.mapper.BuildingMapper;
-import com.yeejoin.equipmanage.mapper.EquipmentManageMapper;
-import com.yeejoin.equipmanage.mapper.FireFightingSystemMapper;
-import com.yeejoin.equipmanage.mapper.FormInstanceMapper;
-import com.yeejoin.equipmanage.mapper.SourceSceneMapper;
+import com.yeejoin.equipmanage.common.vo.*;
+import com.yeejoin.equipmanage.mapper.*;
 import com.yeejoin.equipmanage.remote.RemoteSecurityService;
-import com.yeejoin.equipmanage.service.EquipmentManageService;
-import com.yeejoin.equipmanage.service.IEqDynamicFormGroupService;
-import com.yeejoin.equipmanage.service.IEqDynamicFormInstanceService;
-import com.yeejoin.equipmanage.service.IEquipmentCategoryService;
-import com.yeejoin.equipmanage.service.IEquipmentSpecificSerivce;
-import com.yeejoin.equipmanage.service.IFireFightingSystemService;
-import com.yeejoin.equipmanage.service.IRiskSourceSceneService;
-import com.yeejoin.equipmanage.service.ISourceSceneService;
-import com.yeejoin.equipmanage.service.ISourceStatistics;
-import com.yeejoin.equipmanage.service.ISyncDataService;
-import com.yeejoin.equipmanage.service.MqttSendGateway;
+import com.yeejoin.equipmanage.service.*;
+import org.apache.commons.beanutils.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSystemMapper, FireFightingSystemEntity>
-		implements IFireFightingSystemService {
-
-	@Autowired
-	FireFightingSystemMapper fireFightingSystemMapper;
-	@Autowired
-	IRiskSourceSceneService iRiskSourceSceneService;
-	@Autowired
-	private RemoteSecurityService remoteSecurityService;
-
-	@Autowired
-	private EquipmentManageMapper equipmentManageMapper;
-	@Autowired
-	private EquipmentManageService equipmentManageService;
-	@Autowired
-	private BuildingMapper buildingMapper;
-	@Autowired
-	private FormInstanceMapper formInstanceMapper;
-	@Autowired
-	private SourceSceneMapper sourceSceneMapper;
-	@Value("${equipment.fire.systemid}")
-	private String fireSystemId;
-	@Value("${morphic.projectSeq}")
-	private Long projectSeq;
-	@Value("${mqtt.scene.host}")
-	private String sceneUrl;
-	@Value("${equip.point.equipmentdata.topic}")
-	private String wsTopic;
-
-	@Value("${equip.point.speindex.url}")
-	private String speindexUrl;
-	@Value("${equip.point.equipmentDetail.url}")
-	private String equipmentDetailUrl;
-
-	@Value("${systemctl.dict.iot-core-param}")
-	private String iotCoreParam;
-
-	@Autowired
-	private IEqDynamicFormGroupService iEqDynamicFormGroupService;
-
-	@Autowired
-	private IEqDynamicFormInstanceService instanceService;
-
-	@Autowired
-	@Lazy
-	private IEquipmentSpecificSerivce equipmentSpecificSerivce;
-
-	@Autowired
-	private ISourceSceneService iSourceSceneService;
-
-	@Autowired
-	private ISyncDataService syncDataService;
-
-	@Autowired
-	private RedisUtils redisUtils;
-
-	@Autowired
-	MqttSendGateway mqttSendGateway;
-
-	@Autowired
-	private JCSRemoteService jcsRemoteService;
-
-	@Value("${systemctl.sync.switch}")
-	private Boolean syncSwitch;
-
-	@Value("${auth-key-fire-system:fire_system_info}")
-	private String authKey;
-
-	@Value("${equipment.type}")
-	String equipmentCategoryLeftTypeCode;
-
-	@Autowired
-	IEquipmentCategoryService iEquipmentCategoryService;
-
-	@Autowired
-	ISourceStatistics sourceStatistics;
-
-	@Value("${redis_car_type_count}")
-	private String carTypeAndCount;
-
-	@Value("${redis_equip_type_count}")
-	private String equipTypeAndCount;
-
-	@Override
-	public List<EquipCountBySystemVO> getEquipCountBySystemId(Long systemId) {
-		return this.baseMapper.getEquipCountBySystemId(systemId);
-	}
-
-	@Override
-	public List<EquiplistSpecificBySystemVO> getEquiplistBySystemId(Long systemId) {
-		return this.baseMapper.getEquiplistBySystemId(systemId);
-	}
-
-	@Override
-	public Map<String, Object> queryEquipmenInfoAndCount(String equimentName, String equimentCode, String construction,
-			String maintenance, String bizOrgCode, String formGroupId, int current, int pageSize) {
-		Map<String, Object> map = equipmentManageService.queryEquipmenInfoAndCount(equimentName, equimentCode,
-				construction, maintenance, bizOrgCode, formGroupId, current, pageSize);
-		List<EquipmentManageVo> dataList = (List<EquipmentManageVo>) map.get("dataList");
-		StringBuilder stb = new StringBuilder();
-		dataList.forEach(y -> {
-			if (StringUtil.isNotEmpty(String.valueOf(stb))) {
-				stb.append("," + y.getChargePerson());
-			} else {
-				stb.append(y.getChargePerson());
-			}
-		});
-		Map<String, String> userMap = new HashMap<>();
-		if (StringUtil.isNotEmpty(stb)) {
-			List<AgencyUserModel> agencyUserModels = remoteSecurityService.listUserByUserIds(stb.toString());
-			agencyUserModels.forEach(z -> {
-				userMap.put(z.getUserId(), z.getRealName());
-			});
-		}
-
-		dataList.forEach(x -> {
-			x.setChargePerson(userMap.get(x.getChargePerson()));
-			x.setSystemimg(equipmentManageMapper.getFiles(String.valueOf(x.getId()), "face"));
-		});
-		map.put("dataList", dataList);
-		return map;
-	}
-
-	@Override
-	public FireFightingSystemEntity getOneById(Long id) {
-		FireFightingSystemEntity fireFightingSystemEntity = this.baseMapper.selectById(id);
-		return fireFightingSystemEntity;
-	}
-
-	@Override
-	public String save(FireFightingSystemVo vo) {
-		if (!systemCodeCheck(vo)) {
-			throw new BadRequest("系统编号已存在，请重新输入");
-		}
-		List<DynamicFormInstance> formInstance = vo.getFormInstances();
-		// 验证必填项 BUG 2725 by kongfm 2021-09-09
-		formInstance.stream().forEach(item -> {
-			if (item.getNotNull() == true && StringUtils.isEmpty(item.getFieldValue())) {
-				throw new BadRequest(item.getFieldLabel() + "为必填项，请确认");
-			}
-		});
-		String userId = remoteSecurityService.getAgencyUser().getUserId();
-		// 冗余名称，数据同步使用
-		this.setChargePersonName(vo);
-		String s = String.valueOf(System.currentTimeMillis());
-		vo.setId(s);
-		vo.setRecUserId(userId);
-		vo.setSort(s);
-		DynamicFormGroup dynamicFormGroup = iEqDynamicFormGroupService.getById(vo.getFormGroupId());
-		vo.setSystemType(dynamicFormGroup.getRelationId() != null ? dynamicFormGroup.getRelationId().toString() : "");
-		// fireSystemId 为字典表火灾系统id 以此确保第一个生成的火灾报警系统排序为1
-		if (vo.getSystemType().equals(fireSystemId)) {
-			vo.setSort("1");
-		}
-		if ("".equals(vo.getInstallDate())) {
-			vo.setInstallDate(null);
-		}
-		if ("".equals(vo.getFirstMaintenanceDate())) {
-			vo.setFirstMaintenanceDate(null);
-		}
-		// 1.保存动态表单数据
-		if (vo.getFormInstances() != null && vo.getFormInstances().size() > 0) {
-			Long instanceId = instanceService.saveInstanceBatch(vo.getFormInstances());
-			vo.setInstanceId(instanceId);
-			s = s + "," + instanceId;
-		}
-		// 2.保存消防系统数据
-		int save = fireFightingSystemMapper.save(vo);
-		if (save > 0 && syncSwitch) {
-			// AST数据同步
-			List<FireFightingSystem> fireFightingSystemDetail = getFireFightingSystemDetail(vo);
-			syncDataService.syncCreatedFireFightingSystem(fireFightingSystemDetail);
-		} else {
-			return s;
-		}
-		// 3.保存图片数据
-		this.insertFiles(vo);
-		return s;
-	}
-
-	@Override
-	public String update(FireFightingSystemVo vo) {
-		if (!systemCodeCheck(vo)) {
-			throw new BadRequest("系统编号已存在，请重新输入");
-		}
-		// 验证必填项 BUG 2725 by kongfm 2021-09-09
-		List<DynamicFormInstance> formInstance = vo.getFormInstances();
-		formInstance.stream().forEach(item -> {
-			if (item.getNotNull() == true && StringUtils.isEmpty(item.getFieldValue())) {
-				throw new BadRequest(item.getFieldLabel() + "为必填项，请确认");
-			}
-		});
-		String userId = remoteSecurityService.getAgencyUser().getUserId();
-		vo.setRecUserId(userId);
-		// 冗余名称，数据同步使用
-		this.setChargePersonName(vo);
-		if ("".equals(vo.getInstallDate())) {
-			vo.setInstallDate(null);
-		}
-		if ("".equals(vo.getFirstMaintenanceDate())) {
-			vo.setFirstMaintenanceDate(null);
-		}
-
-		int update = fireFightingSystemMapper.update(vo);
-		if (update > 0 && syncSwitch) {
-			// AST数据同步
-			List<FireFightingSystem> fireFightingSystemDetail = getFireFightingSystemDetail(vo);
-			syncDataService.syncCreatedFireFightingSystem(fireFightingSystemDetail);
-		} else {
-			return null;
-		}
-		// 1.更新消防系统数据
-		String sequenceNbr = vo.getId();
-		fireFightingSystemMapper.deleteFilre(sequenceNbr);
-		// 2.更新动态表单数据
-		if (vo.getInstanceId() != null && vo.getFormInstances().size() > 0) {
-			instanceService.updateInstanceBatch(vo.getInstanceId(), vo.getFormInstances());
-		}
-		// 3.更新图片数据
-		this.insertFiles(vo);
-		return vo.getId();
-	}
-
-	private void setChargePersonName(FireFightingSystemVo vo) {
-		if (StringUtil.isNotEmpty(vo.getChargePerson())) {
-			FeignClientResult<AgencyUserModel> result = Privilege.agencyUserClient.queryByUserId(vo.getChargePerson());
-			AgencyUserModel userModel = result == null ? new AgencyUserModel() : result.getResult();
-			vo.setChargePersonName(userModel.getRealName());
-		}
-	}
-
-	private boolean systemCodeCheck(FireFightingSystemVo systemVo) {
-		if (StringUtils.isEmpty(systemVo.getId())) {
-			// 新建系统时
-			int count = this.baseMapper.selectCount(new LambdaQueryWrapper<FireFightingSystemEntity>()
-					.eq(FireFightingSystemEntity::getCode, systemVo.getCode()));
-			return count < 1;
-		} else {
-			int count = this.baseMapper.selectCount(new LambdaQueryWrapper<FireFightingSystemEntity>()
-					.eq(FireFightingSystemEntity::getCode, systemVo.getCode())
-					.ne(FireFightingSystemEntity::getId, systemVo.getId()));
-			return count < 1;
-		}
-	}
-
-	@Override
-	public FireFightingSystemVo createMorphic(FireFightingSystemVo model) {
-		ResourceDTO resourceDTO = new ResourceDTO();
-		resourceDTO.setSubjectId(projectSeq);
-		resourceDTO.setSubjectid(projectSeq);
-		resourceDTO.setName(model.getName());
-		// 为首次 添加的画布添加mqtt 相关数据
-		String content = "{\"layout\":\"\",\"boardConfig\":{\"modeType\":\"custom\",\"orientation\":\"lengthways\",\"autoRefresh\":true,\"name\":\"1\",\"showMode\":\"actual\",\"paperSize\":\"1280X900\"},\"boardStyle\":{\"backgroundImage\":\"\"},\"dataConfig\":{}}";
-		Map parse = (Map) JSON.parse(content);
-		Map<String, Object> dataConfig = new HashMap<>();
-		dataConfig.put("msgType", "mqtt");
-		dataConfig.put("wsUrl", sceneUrl);
-		parse.put("dataConfig", dataConfig);
-		content = JSONObject.toJSONString(parse);
-		dataConfig.put("wsTopic", wsTopic);
-		resourceDTO.setContent(content);
-		ResourceDTO morphic = Morphic.morphicSubjectClient.create(resourceDTO).getResult();
-		model.setSceneId(morphic.getId());
+        implements IFireFightingSystemService {
+
+    @Autowired
+    FireFightingSystemMapper fireFightingSystemMapper;
+    @Autowired
+    IRiskSourceSceneService iRiskSourceSceneService;
+    @Autowired
+    private RemoteSecurityService remoteSecurityService;
+
+    @Autowired
+    private EquipmentManageMapper equipmentManageMapper;
+    @Autowired
+    private EquipmentManageService equipmentManageService;
+    @Autowired
+    private BuildingMapper buildingMapper;
+    @Autowired
+    private FormInstanceMapper formInstanceMapper;
+    @Autowired
+    private SourceSceneMapper sourceSceneMapper;
+    @Value("${equipment.fire.systemid}")
+    private String fireSystemId;
+    @Value("${morphic.projectSeq}")
+    private Long projectSeq;
+    @Value("${mqtt.scene.host}")
+    private String sceneUrl;
+    @Value("${equip.point.equipmentdata.topic}")
+    private String wsTopic;
+
+    @Value("${equip.point.speindex.url}")
+    private String speindexUrl;
+    @Value("${equip.point.equipmentDetail.url}")
+    private String equipmentDetailUrl;
+
+    @Value("${systemctl.dict.iot-core-param}")
+    private String iotCoreParam;
+
+    @Autowired
+    private IEqDynamicFormGroupService iEqDynamicFormGroupService;
+
+    @Autowired
+    private IEqDynamicFormInstanceService instanceService;
+
+    @Autowired
+    @Lazy
+    private IEquipmentSpecificSerivce equipmentSpecificSerivce;
+
+    @Autowired
+    private ISourceSceneService iSourceSceneService;
+
+    @Autowired
+    private ISyncDataService syncDataService;
+
+    @Autowired
+    private RedisUtils redisUtils;
+
+    @Autowired
+    MqttSendGateway mqttSendGateway;
+
+    @Autowired
+    private JCSRemoteService jcsRemoteService;
+
+    @Value("${systemctl.sync.switch}")
+    private Boolean syncSwitch;
+
+    @Value("${auth-key-fire-system:fire_system_info}")
+    private String authKey;
+
+    @Value("${equipment.type}")
+    String equipmentCategoryLeftTypeCode;
+
+    @Autowired
+    IEquipmentCategoryService iEquipmentCategoryService;
+
+    @Autowired
+    ISourceStatistics sourceStatistics;
+
+    @Value("${redis_car_type_count}")
+    private String carTypeAndCount;
+
+    @Value("${redis_equip_type_count}")
+    private String equipTypeAndCount;
+
+    @Override
+    public List<EquipCountBySystemVO> getEquipCountBySystemId(Long systemId) {
+        return this.baseMapper.getEquipCountBySystemId(systemId);
+    }
+
+    @Override
+    public List<EquiplistSpecificBySystemVO> getEquiplistBySystemId(Long systemId) {
+        return this.baseMapper.getEquiplistBySystemId(systemId);
+    }
+
+    @Override
+    public Map<String, Object> queryEquipmenInfoAndCount(String equimentName, String equimentCode, String construction,
+                                                         String maintenance, String bizOrgCode, String formGroupId, int current, int pageSize) {
+        Map<String, Object> map = equipmentManageService.queryEquipmenInfoAndCount(equimentName, equimentCode,
+                construction, maintenance, bizOrgCode, formGroupId, current, pageSize);
+        List<EquipmentManageVo> dataList = (List<EquipmentManageVo>) map.get("dataList");
+        StringBuilder stb = new StringBuilder();
+        dataList.forEach(y -> {
+            if (StringUtil.isNotEmpty(String.valueOf(stb))) {
+                stb.append("," + y.getChargePerson());
+            } else {
+                stb.append(y.getChargePerson());
+            }
+        });
+        Map<String, String> userMap = new HashMap<>();
+        if (StringUtil.isNotEmpty(stb)) {
+            List<AgencyUserModel> agencyUserModels = remoteSecurityService.listUserByUserIds(stb.toString());
+            agencyUserModels.forEach(z -> {
+                userMap.put(z.getUserId(), z.getRealName());
+            });
+        }
+
+        dataList.forEach(x -> {
+            x.setChargePerson(userMap.get(x.getChargePerson()));
+            x.setSystemimg(equipmentManageMapper.getFiles(String.valueOf(x.getId()), "face"));
+        });
+        map.put("dataList", dataList);
+        return map;
+    }
+
+    @Override
+    public FireFightingSystemEntity getOneById(Long id) {
+        FireFightingSystemEntity fireFightingSystemEntity = this.baseMapper.selectById(id);
+        return fireFightingSystemEntity;
+    }
+
+    @Override
+    public String save(FireFightingSystemVo vo) {
+        if (!systemCodeCheck(vo)) {
+            throw new BadRequest("系统编号已存在，请重新输入");
+        }
+        List<DynamicFormInstance> formInstance = vo.getFormInstances();
+        // 验证必填项 BUG 2725 by kongfm 2021-09-09
+        formInstance.stream().forEach(item -> {
+            if (item.getNotNull() == true && StringUtils.isEmpty(item.getFieldValue())) {
+                throw new BadRequest(item.getFieldLabel() + "为必填项，请确认");
+            }
+        });
+        String userId = remoteSecurityService.getAgencyUser().getUserId();
+        // 冗余名称，数据同步使用
+        this.setChargePersonName(vo);
+        String s = String.valueOf(System.currentTimeMillis());
+        vo.setId(s);
+        vo.setRecUserId(userId);
+        vo.setSort(s);
+        DynamicFormGroup dynamicFormGroup = iEqDynamicFormGroupService.getById(vo.getFormGroupId());
+        vo.setSystemType(dynamicFormGroup.getRelationId() != null ? dynamicFormGroup.getRelationId().toString() : "");
+        // fireSystemId 为字典表火灾系统id 以此确保第一个生成的火灾报警系统排序为1
+        if (vo.getSystemType().equals(fireSystemId)) {
+            vo.setSort("1");
+        }
+        if ("".equals(vo.getInstallDate())) {
+            vo.setInstallDate(null);
+        }
+        if ("".equals(vo.getFirstMaintenanceDate())) {
+            vo.setFirstMaintenanceDate(null);
+        }
+        // 1.保存动态表单数据
+        if (vo.getFormInstances() != null && vo.getFormInstances().size() > 0) {
+            Long instanceId = instanceService.saveInstanceBatch(vo.getFormInstances());
+            vo.setInstanceId(instanceId);
+            s = s + "," + instanceId;
+        }
+        // 2.保存消防系统数据
+        int save = fireFightingSystemMapper.save(vo);
+        if (save > 0 && syncSwitch) {
+            // AST数据同步
+            List<FireFightingSystem> fireFightingSystemDetail = getFireFightingSystemDetail(vo);
+            syncDataService.syncCreatedFireFightingSystem(fireFightingSystemDetail);
+        } else {
+            return s;
+        }
+        // 3.保存图片数据
+        this.insertFiles(vo);
+        return s;
+    }
+
+    @Override
+    public String update(FireFightingSystemVo vo) {
+        if (!systemCodeCheck(vo)) {
+            throw new BadRequest("系统编号已存在，请重新输入");
+        }
+        // 验证必填项 BUG 2725 by kongfm 2021-09-09
+        List<DynamicFormInstance> formInstance = vo.getFormInstances();
+        formInstance.stream().forEach(item -> {
+            if (item.getNotNull() == true && StringUtils.isEmpty(item.getFieldValue())) {
+                throw new BadRequest(item.getFieldLabel() + "为必填项，请确认");
+            }
+        });
+        String userId = remoteSecurityService.getAgencyUser().getUserId();
+        vo.setRecUserId(userId);
+        // 冗余名称，数据同步使用
+        this.setChargePersonName(vo);
+        if ("".equals(vo.getInstallDate())) {
+            vo.setInstallDate(null);
+        }
+        if ("".equals(vo.getFirstMaintenanceDate())) {
+            vo.setFirstMaintenanceDate(null);
+        }
+
+        int update = fireFightingSystemMapper.update(vo);
+        if (update > 0 && syncSwitch) {
+            // AST数据同步
+            List<FireFightingSystem> fireFightingSystemDetail = getFireFightingSystemDetail(vo);
+            syncDataService.syncCreatedFireFightingSystem(fireFightingSystemDetail);
+        } else {
+            return null;
+        }
+        // 1.更新消防系统数据
+        String sequenceNbr = vo.getId();
+        fireFightingSystemMapper.deleteFilre(sequenceNbr);
+        // 2.更新动态表单数据
+        if (vo.getInstanceId() != null && vo.getFormInstances().size() > 0) {
+            instanceService.updateInstanceBatch(vo.getInstanceId(), vo.getFormInstances());
+        }
+        // 3.更新图片数据
+        this.insertFiles(vo);
+        return vo.getId();
+    }
+
+    private void setChargePersonName(FireFightingSystemVo vo) {
+        if (StringUtil.isNotEmpty(vo.getChargePerson())) {
+            FeignClientResult<AgencyUserModel> result = Privilege.agencyUserClient.queryByUserId(vo.getChargePerson());
+            AgencyUserModel userModel = result == null ? new AgencyUserModel() : result.getResult();
+            vo.setChargePersonName(userModel.getRealName());
+        }
+    }
+
+    private boolean systemCodeCheck(FireFightingSystemVo systemVo) {
+        if (StringUtils.isEmpty(systemVo.getId())) {
+            // 新建系统时
+            int count = this.baseMapper.selectCount(new LambdaQueryWrapper<FireFightingSystemEntity>()
+                    .eq(FireFightingSystemEntity::getCode, systemVo.getCode()));
+            return count < 1;
+        } else {
+            int count = this.baseMapper.selectCount(new LambdaQueryWrapper<FireFightingSystemEntity>()
+                    .eq(FireFightingSystemEntity::getCode, systemVo.getCode())
+                    .ne(FireFightingSystemEntity::getId, systemVo.getId()));
+            return count < 1;
+        }
+    }
+
+    @Override
+    public FireFightingSystemVo createMorphic(FireFightingSystemVo model) {
+        ResourceDTO resourceDTO = new ResourceDTO();
+        resourceDTO.setSubjectId(projectSeq);
+        resourceDTO.setSubjectid(projectSeq);
+        resourceDTO.setName(model.getName());
+        // 为首次 添加的画布添加mqtt 相关数据
+        String content = "{\"layout\":\"\",\"boardConfig\":{\"modeType\":\"custom\",\"orientation\":\"lengthways\",\"autoRefresh\":true,\"name\":\"1\",\"showMode\":\"actual\",\"paperSize\":\"1280X900\"},\"boardStyle\":{\"backgroundImage\":\"\"},\"dataConfig\":{}}";
+        Map parse = (Map) JSON.parse(content);
+        Map<String, Object> dataConfig = new HashMap<>();
+        dataConfig.put("msgType", "mqtt");
+        dataConfig.put("wsUrl", sceneUrl);
+        parse.put("dataConfig", dataConfig);
+        content = JSONObject.toJSONString(parse);
+        dataConfig.put("wsTopic", wsTopic);
+        resourceDTO.setContent(content);
+        ResourceDTO morphic = Morphic.morphicSubjectClient.create(resourceDTO).getResult();
+        model.setSceneId(morphic.getId());
 //        fireFightingSystemMapper.setSceneId(model);
-		return model;
-	}
-
-	@Override
-	@Transactional
-	public ResourceDTO updateMorphic(ResourceDTO resourceDTO) {
-		try {
-			// 1.更新画布信息
-			resourceDTO.setSubjectId(projectSeq);
-			resourceDTO.setSubjectid(projectSeq);
-			String content = resourceDTO.getContent();
-			Map parse = (Map) JSON.parse(content);
-			Map<String, Object> dataConfig = new HashMap<>();
-			dataConfig.put("msgType", "mqtt");
-			dataConfig.put("wsUrl", sceneUrl);
-			dataConfig.put("wsTopic", wsTopic);
-			parse.put("dataConfig", dataConfig);
-			content = JSONObject.toJSONString(parse);
-			resourceDTO.setContent(content);
-			FeignUtil.remoteCall(() -> Morphic.morphicSubjectClient.update(resourceDTO));
-			// 2.更新业务关联的画布id
-			Long systemId = Long.valueOf(resourceDTO.getCode());
-			FireFightingSystemVo systemVo = new FireFightingSystemVo();
-			systemVo.setId(String.valueOf(systemId));
-			systemVo.setSceneId(resourceDTO.getId());
-			fireFightingSystemMapper.setSceneId(systemVo);
-			// 3.保存场景关联信息表
-			SourceScene sourceScene = sourceSceneMapper
-					.selectOne(new LambdaQueryWrapper<SourceScene>().eq(SourceScene::getSceneId, resourceDTO.getId()));
-			if (sourceScene == null) {
-				sourceScene = new SourceScene();
-				sourceScene.setProjectId(String.valueOf(projectSeq));
-				sourceScene.setSourceId(systemId);
-				sourceScene.setSourceName(resourceDTO.getName());
-				sourceScene.setSceneId(resourceDTO.getId());
-			}
-			// TODO 获取画布下 绑定的装备点、摄像头，目前消防系统只能绑定装备，不能绑定摄像头（树未返回摄像头）
-			List<Map> children = (List<Map>) parse.get("children");
-			String pointInScene = "";
-			String videoInScene = "";
-			if (!CollectionUtils.isEmpty(children)) {
-				for (Map<String, String> map : children) {
-					String key = map.get("key");
-					if (!"".equals(key) && "equipment".equals(key)) {
-						pointInScene = "".equals(pointInScene) ? map.get("sequenceNbr")
-								: pointInScene + "," + map.get("sequenceNbr");
-					}
-					if (!"".equals(key) && "video".equals(key)) {
-						videoInScene = "".equals(videoInScene) ? map.get("sequenceNbr")
-								: videoInScene + "," + map.get("sequenceNbr");
-					}
-				}
-			}
-			sourceScene.setPointInScene(pointInScene);
-			sourceScene.setVideoInScene(videoInScene);
-			iSourceSceneService.saveOrUpdate(sourceScene);
-		} catch (Exception e) {
-			log.error(e.getMessage(), e);
-			throw new BadRequest("保存画布失败");
-		}
-		return resourceDTO;
-	}
-
-	@Override
-	public List<PointTreeVo> getPointTree(String id, String orgCode) {
+        return model;
+    }
+
+    @Override
+    @Transactional
+    public ResourceDTO updateMorphic(ResourceDTO resourceDTO) {
+        try {
+            // 1.更新画布信息
+            resourceDTO.setSubjectId(projectSeq);
+            resourceDTO.setSubjectid(projectSeq);
+            String content = resourceDTO.getContent();
+            Map parse = (Map) JSON.parse(content);
+            Map<String, Object> dataConfig = new HashMap<>();
+            dataConfig.put("msgType", "mqtt");
+            dataConfig.put("wsUrl", sceneUrl);
+            dataConfig.put("wsTopic", wsTopic);
+            parse.put("dataConfig", dataConfig);
+            content = JSONObject.toJSONString(parse);
+            resourceDTO.setContent(content);
+            FeignUtil.remoteCall(() -> Morphic.morphicSubjectClient.update(resourceDTO));
+            // 2.更新业务关联的画布id
+            Long systemId = Long.valueOf(resourceDTO.getCode());
+            FireFightingSystemVo systemVo = new FireFightingSystemVo();
+            systemVo.setId(String.valueOf(systemId));
+            systemVo.setSceneId(resourceDTO.getId());
+            fireFightingSystemMapper.setSceneId(systemVo);
+            // 3.保存场景关联信息表
+            SourceScene sourceScene = sourceSceneMapper
+                    .selectOne(new LambdaQueryWrapper<SourceScene>().eq(SourceScene::getSceneId, resourceDTO.getId()));
+            if (sourceScene == null) {
+                sourceScene = new SourceScene();
+                sourceScene.setProjectId(String.valueOf(projectSeq));
+                sourceScene.setSourceId(systemId);
+                sourceScene.setSourceName(resourceDTO.getName());
+                sourceScene.setSceneId(resourceDTO.getId());
+            }
+            // TODO 获取画布下 绑定的装备点、摄像头，目前消防系统只能绑定装备，不能绑定摄像头（树未返回摄像头）
+            List<Map> children = (List<Map>) parse.get("children");
+            String pointInScene = "";
+            String videoInScene = "";
+            if (!CollectionUtils.isEmpty(children)) {
+                for (Map<String, String> map : children) {
+                    String key = map.get("key");
+                    if (!"".equals(key) && "equipment".equals(key)) {
+                        pointInScene = "".equals(pointInScene) ? map.get("sequenceNbr")
+                                : pointInScene + "," + map.get("sequenceNbr");
+                    }
+                    if (!"".equals(key) && "video".equals(key)) {
+                        videoInScene = "".equals(videoInScene) ? map.get("sequenceNbr")
+                                : videoInScene + "," + map.get("sequenceNbr");
+                    }
+                }
+            }
+            sourceScene.setPointInScene(pointInScene);
+            sourceScene.setVideoInScene(videoInScene);
+            iSourceSceneService.saveOrUpdate(sourceScene);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            throw new BadRequest("保存画布失败");
+        }
+        return resourceDTO;
+    }
+
+    @Override
+    public List<PointTreeVo> getPointTree(String id, String orgCode) {
 //        CommonResponse se = riskModelFeign.getRiskSourceList(orgCode);
 //        List<Map<String, Object>> list = (List<Map<String, Object>>) se.getDataList();
 //        List<PointTreeVo> responses = new ArrayList<>();
@@ -437,234 +392,234 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
 //            responses.add(p);
 //        });
 //        List<PointTreeVo> regionList = responses.stream().filter(r -> "TRUE".equals(r.getIsRegion())).collect(Collectors.toList());
-		List<PointTreeVo> buildList = buildingMapper.getBuildList(orgCode);
-		return transferListToPointTree(buildList, id);
-	}
-
-	@Override
-	public List<SpeIndexVo> getSpeIndex(Long id) {
-		return makeStatus(fireFightingSystemMapper.getSpeIndex(id));
-	}
-
-	private void insertFiles(FireFightingSystemVo vo) {
-		List<FileUploadVo> video = vo.getVideo();
-		if (video.size() > 0) {
-			for (FileUploadVo f : video) {
-				f.setId(String.valueOf(System.currentTimeMillis()));
-				f.setUserId(vo.getRecUserId());
-				f.setFileType("video");
-				f.setObjectId(vo.getId());
-				fireFightingSystemMapper.insertFile(f);
-			}
-		}
-		List<FileUploadVo> faceimg = vo.getFaceimg();
-		if (faceimg.size() > 0) {
-			for (FileUploadVo f : faceimg) {
-				f.setId(String.valueOf(System.currentTimeMillis()));
-				f.setUserId(vo.getRecUserId());
-				f.setFileType("face");
-				f.setObjectId(vo.getId());
-				fireFightingSystemMapper.insertFile(f);
-			}
-		}
-		List<FileUploadVo> instruction = vo.getInstruction();
-		if (instruction.size() > 0) {
-			for (FileUploadVo f : instruction) {
-				f.setId(String.valueOf(System.currentTimeMillis()));
-				f.setUserId(vo.getRecUserId());
-				f.setFileType("instruction");
-				f.setObjectId(vo.getId());
-				fireFightingSystemMapper.insertFile(f);
-			}
-		}
-		List<FileUploadVo> asser = vo.getAsser();
-		if (asser.size() > 0) {
-			for (FileUploadVo f : asser) {
-				f.setId(String.valueOf(System.currentTimeMillis()));
-				f.setUserId(vo.getRecUserId());
-				f.setFileType("certificate");
-				f.setObjectId(vo.getId());
-				fireFightingSystemMapper.insertFile(f);
-			}
-		}
-
-		List<FileUploadVo> spotimg = vo.getSpotimg();
-		if (spotimg.size() > 0) {
-			for (FileUploadVo f : spotimg) {
-				f.setId(String.valueOf(System.currentTimeMillis()));
-				f.setUserId(vo.getRecUserId());
-				f.setFileType("spotimg");
-				f.setObjectId(vo.getId());
-				fireFightingSystemMapper.insertFile(f);
-			}
-		}
-
-		List<FileUploadVo> tdmod = vo.getTdmod();
-		if (tdmod.size() > 0) {
-			for (FileUploadVo f : tdmod) {
-				f.setId(String.valueOf(System.currentTimeMillis()));
-				f.setUserId(vo.getRecUserId());
-				f.setFileType("tdmod");
-				f.setObjectId(vo.getId());
-				fireFightingSystemMapper.insertFile(f);
-			}
-		}
-	}
-
-	/**
-	 * 生成树结构
-	 *
-	 * @param allRiskSource
-	 * @param id
-	 * @return
-	 */
-	public List<PointTreeVo> transferListToPointTree(List<PointTreeVo> allRiskSource, String id) {
-		List<PointTreeVo> treeList = new ArrayList<>();
-		// TODO id为空，为消防建筑使用；id不为空，为点位图使用
-		List<PointTreeVo> pointData = fireFightingSystemMapper.getPointData(id);
-		if (!CollectionUtils.isEmpty(pointData)) {
-			List<Long> idList = pointData.stream().map(PointTreeVo::getSequenceNbr).collect(Collectors.toList());
-			List<SpeIndexVo> indexVoList = fireFightingSystemMapper.getSpeIndexIn(idList);
-			if (!CollectionUtils.isEmpty(indexVoList)) {
-				Map<Long, List<SpeIndexVo>> indexMap = indexVoList.stream()
-						.collect(Collectors.groupingBy(SpeIndexVo::getEquipmentSpecificId));
-				pointData.stream().forEach(p -> {
-					Map map = new HashMap();
-					map.put("imgPath", p.getImgPath());
-					map.put("equipCode", p.getEquipCode());
-					map.put("equipSyetemId", p.getEquipSyetemId());
-					map.put("equipTypeId", p.getEquipId());
-					map.put("speindexList", makeStatus(indexMap.get(p.getSequenceNbr())));
-					map.put("speindexApi", speindexUrl + p.getSequenceNbr());
-					map.put("detailInfoApi", equipmentDetailUrl + p.getSequenceNbr());
-					map.put("detailApi", equipmentDetailUrl + p.getSequenceNbr());
-					p.setDataConfig(map);
-				});
-			}
-		}
-		allRiskSource.addAll(pointData);
-		for (PointTreeVo tree : allRiskSource) {
-			if (tree.getParentId() == null || tree.getParentId() == -1) {
-				treeList.add(tree);
-			}
-			for (PointTreeVo treeNode : allRiskSource) {
-				if (tree.getSequenceNbr().equals(treeNode.getParentId())) {
-					if (tree.getChildren() == null) {
-						tree.setChildren(new ArrayList<>());
-					}
-					tree.getChildren().add(treeNode);
-				}
-			}
-		}
-		return treeList;
-	}
-
-	/**
-	 * 生成树结构
-	 *
-	 * @param allRiskSource
-	 * @return
-	 */
-	public List<PointTreeVo> transferListTo3dPointTree(List<PointTreeVo> allRiskSource) {
-		List<PointTreeVo> treeList = new ArrayList<>();
-		List<PointTreeVo> pointData = fireFightingSystemMapper.get3dPointData();
-		if (!CollectionUtils.isEmpty(pointData)) {
-			allRiskSource.addAll(pointData);
-			for (PointTreeVo tree : allRiskSource) {
-				if (tree.getParentId() == null || tree.getParentId() == -1) {
-					treeList.add(tree);
-				}
-				for (PointTreeVo treeNode : allRiskSource) {
-					if (tree.getSequenceNbr().equals(treeNode.getParentId())) {
-						if (tree.getChildren() == null) {
-							tree.setChildren(new ArrayList<>());
-						}
-						tree.getChildren().add(treeNode);
-					}
-				}
-			}
-			return treeList;
-		}
-		return Lists.newArrayList();
-	}
-
-	private static <T> void mapToBean(Map<String, Object> map, T bean) {
-		try {
-			BeanUtils.populate(bean, map);
-		} catch (Exception e) {
-			throw new RuntimeException(e);
-		}
-		Set<?> set = new HashSet<>();
-
-	}
-
-	/**
-	 * 生成 性能指标数据
-	 *
-	 * @param list
-	 * @return
-	 */
-	private List<SpeIndexVo> makeStatus(List<SpeIndexVo> list) {
-		if (list == null || list.size() == 0) {
-			return new ArrayList<>();
-		}
-		List<SpeIndexVo> newList = new ArrayList<>();
-		List<SpeIndexVo> statusList = new ArrayList<>();
-		for (SpeIndexVo vo : list) {
-			String k = vo.getTypeCode();
-			if (EquipmentRiskTypeEnum.GZ.getCode().equals(k) || EquipmentRiskTypeEnum.HZGJ.getCode().equals(k)
-					|| EquipmentRiskTypeEnum.YXZT.getCode().equals(k) || EquipmentRiskTypeEnum.PB.getCode().equals(k)) {
-				statusList.add(vo);
-			}
-			newList.add(vo);
-		}
-		if (statusList.size() == 0) {
-			return newList;
-		}
-		SpeIndexVo spe = new SpeIndexVo();
-		spe.setKey(EquipmentSpeIndexEnum.YXZT.getCode());
-		spe.setName("当前状态");
-		spe.setValue(getStatus(statusList));
-		statusList.clear();
-		statusList.add(spe);
-		statusList.addAll(newList);
-		return statusList;
-	}
-
-	/**
-	 * 判断 装备状态
-	 *
-	 * @param statusList
-	 * @return
-	 */
-	private String getStatus(List<SpeIndexVo> statusList) {
-		SpeIndexVo indexVo = statusList.get(0);
-		if (EquipmentRiskTypeEnum.HZGJ.getCode().equals(indexVo.getTypeCode())
-				&& TrueOrFalseEnum.real.value.equals(indexVo.getValue())) {
-			return "报警";
-		}
-		if (EquipmentRiskTypeEnum.GZ.getCode().equals(indexVo.getTypeCode())
-				&& TrueOrFalseEnum.real.value.equals(indexVo.getValue())) {
-			return "故障";
-		}
-		if (EquipmentRiskTypeEnum.PB.getCode().equals(indexVo.getTypeCode())
-				&& TrueOrFalseEnum.real.value.equals(indexVo.getValue())) {
-			return "屏蔽";
-		}
-		if (EquipmentRiskTypeEnum.YXZT.getCode().equals(indexVo.getTypeCode())
-				&& TrueOrFalseEnum.fake.value.equals(indexVo.getValue())) {
-			return "停运";
-		}
-		return "运行";
-	}
-
-	@Override
-	public List<FireFightingSystemEntity> getList() {
-		return this.list();
-	}
-
-	@Override
-	public Boolean deleteSystem(Long id) {
+        List<PointTreeVo> buildList = buildingMapper.getBuildList(orgCode);
+        return transferListToPointTree(buildList, id);
+    }
+
+    @Override
+    public List<SpeIndexVo> getSpeIndex(Long id) {
+        return makeStatus(fireFightingSystemMapper.getSpeIndex(id));
+    }
+
+    private void insertFiles(FireFightingSystemVo vo) {
+        List<FileUploadVo> video = vo.getVideo();
+        if (video.size() > 0) {
+            for (FileUploadVo f : video) {
+                f.setId(String.valueOf(System.currentTimeMillis()));
+                f.setUserId(vo.getRecUserId());
+                f.setFileType("video");
+                f.setObjectId(vo.getId());
+                fireFightingSystemMapper.insertFile(f);
+            }
+        }
+        List<FileUploadVo> faceimg = vo.getFaceimg();
+        if (faceimg.size() > 0) {
+            for (FileUploadVo f : faceimg) {
+                f.setId(String.valueOf(System.currentTimeMillis()));
+                f.setUserId(vo.getRecUserId());
+                f.setFileType("face");
+                f.setObjectId(vo.getId());
+                fireFightingSystemMapper.insertFile(f);
+            }
+        }
+        List<FileUploadVo> instruction = vo.getInstruction();
+        if (instruction.size() > 0) {
+            for (FileUploadVo f : instruction) {
+                f.setId(String.valueOf(System.currentTimeMillis()));
+                f.setUserId(vo.getRecUserId());
+                f.setFileType("instruction");
+                f.setObjectId(vo.getId());
+                fireFightingSystemMapper.insertFile(f);
+            }
+        }
+        List<FileUploadVo> asser = vo.getAsser();
+        if (asser.size() > 0) {
+            for (FileUploadVo f : asser) {
+                f.setId(String.valueOf(System.currentTimeMillis()));
+                f.setUserId(vo.getRecUserId());
+                f.setFileType("certificate");
+                f.setObjectId(vo.getId());
+                fireFightingSystemMapper.insertFile(f);
+            }
+        }
+
+        List<FileUploadVo> spotimg = vo.getSpotimg();
+        if (spotimg.size() > 0) {
+            for (FileUploadVo f : spotimg) {
+                f.setId(String.valueOf(System.currentTimeMillis()));
+                f.setUserId(vo.getRecUserId());
+                f.setFileType("spotimg");
+                f.setObjectId(vo.getId());
+                fireFightingSystemMapper.insertFile(f);
+            }
+        }
+
+        List<FileUploadVo> tdmod = vo.getTdmod();
+        if (tdmod.size() > 0) {
+            for (FileUploadVo f : tdmod) {
+                f.setId(String.valueOf(System.currentTimeMillis()));
+                f.setUserId(vo.getRecUserId());
+                f.setFileType("tdmod");
+                f.setObjectId(vo.getId());
+                fireFightingSystemMapper.insertFile(f);
+            }
+        }
+    }
+
+    /**
+     * 生成树结构
+     *
+     * @param allRiskSource
+     * @param id
+     * @return
+     */
+    public List<PointTreeVo> transferListToPointTree(List<PointTreeVo> allRiskSource, String id) {
+        List<PointTreeVo> treeList = new ArrayList<>();
+        // TODO id为空，为消防建筑使用；id不为空，为点位图使用
+        List<PointTreeVo> pointData = fireFightingSystemMapper.getPointData(id);
+        if (!CollectionUtils.isEmpty(pointData)) {
+            List<Long> idList = pointData.stream().map(PointTreeVo::getSequenceNbr).collect(Collectors.toList());
+            List<SpeIndexVo> indexVoList = fireFightingSystemMapper.getSpeIndexIn(idList);
+            if (!CollectionUtils.isEmpty(indexVoList)) {
+                Map<Long, List<SpeIndexVo>> indexMap = indexVoList.stream()
+                        .collect(Collectors.groupingBy(SpeIndexVo::getEquipmentSpecificId));
+                pointData.stream().forEach(p -> {
+                    Map map = new HashMap();
+                    map.put("imgPath", p.getImgPath());
+                    map.put("equipCode", p.getEquipCode());
+                    map.put("equipSyetemId", p.getEquipSyetemId());
+                    map.put("equipTypeId", p.getEquipId());
+                    map.put("speindexList", makeStatus(indexMap.get(p.getSequenceNbr())));
+                    map.put("speindexApi", speindexUrl + p.getSequenceNbr());
+                    map.put("detailInfoApi", equipmentDetailUrl + p.getSequenceNbr());
+                    map.put("detailApi", equipmentDetailUrl + p.getSequenceNbr());
+                    p.setDataConfig(map);
+                });
+            }
+        }
+        allRiskSource.addAll(pointData);
+        for (PointTreeVo tree : allRiskSource) {
+            if (tree.getParentId() == null || tree.getParentId() == -1) {
+                treeList.add(tree);
+            }
+            for (PointTreeVo treeNode : allRiskSource) {
+                if (tree.getSequenceNbr().equals(treeNode.getParentId())) {
+                    if (tree.getChildren() == null) {
+                        tree.setChildren(new ArrayList<>());
+                    }
+                    tree.getChildren().add(treeNode);
+                }
+            }
+        }
+        return treeList;
+    }
+
+    /**
+     * 生成树结构
+     *
+     * @param allRiskSource
+     * @return
+     */
+    public List<PointTreeVo> transferListTo3dPointTree(List<PointTreeVo> allRiskSource) {
+        List<PointTreeVo> treeList = new ArrayList<>();
+        List<PointTreeVo> pointData = fireFightingSystemMapper.get3dPointData();
+        if (!CollectionUtils.isEmpty(pointData)) {
+            allRiskSource.addAll(pointData);
+            for (PointTreeVo tree : allRiskSource) {
+                if (tree.getParentId() == null || tree.getParentId() == -1) {
+                    treeList.add(tree);
+                }
+                for (PointTreeVo treeNode : allRiskSource) {
+                    if (tree.getSequenceNbr().equals(treeNode.getParentId())) {
+                        if (tree.getChildren() == null) {
+                            tree.setChildren(new ArrayList<>());
+                        }
+                        tree.getChildren().add(treeNode);
+                    }
+                }
+            }
+            return treeList;
+        }
+        return Lists.newArrayList();
+    }
+
+    private static <T> void mapToBean(Map<String, Object> map, T bean) {
+        try {
+            BeanUtils.populate(bean, map);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        Set<?> set = new HashSet<>();
+
+    }
+
+    /**
+     * 生成 性能指标数据
+     *
+     * @param list
+     * @return
+     */
+    private List<SpeIndexVo> makeStatus(List<SpeIndexVo> list) {
+        if (list == null || list.size() == 0) {
+            return new ArrayList<>();
+        }
+        List<SpeIndexVo> newList = new ArrayList<>();
+        List<SpeIndexVo> statusList = new ArrayList<>();
+        for (SpeIndexVo vo : list) {
+            String k = vo.getTypeCode();
+            if (EquipmentRiskTypeEnum.GZ.getCode().equals(k) || EquipmentRiskTypeEnum.HZGJ.getCode().equals(k)
+                    || EquipmentRiskTypeEnum.YXZT.getCode().equals(k) || EquipmentRiskTypeEnum.PB.getCode().equals(k)) {
+                statusList.add(vo);
+            }
+            newList.add(vo);
+        }
+        if (statusList.size() == 0) {
+            return newList;
+        }
+        SpeIndexVo spe = new SpeIndexVo();
+        spe.setKey(EquipmentSpeIndexEnum.YXZT.getCode());
+        spe.setName("当前状态");
+        spe.setValue(getStatus(statusList));
+        statusList.clear();
+        statusList.add(spe);
+        statusList.addAll(newList);
+        return statusList;
+    }
+
+    /**
+     * 判断 装备状态
+     *
+     * @param statusList
+     * @return
+     */
+    private String getStatus(List<SpeIndexVo> statusList) {
+        SpeIndexVo indexVo = statusList.get(0);
+        if (EquipmentRiskTypeEnum.HZGJ.getCode().equals(indexVo.getTypeCode())
+                && TrueOrFalseEnum.real.value.equals(indexVo.getValue())) {
+            return "报警";
+        }
+        if (EquipmentRiskTypeEnum.GZ.getCode().equals(indexVo.getTypeCode())
+                && TrueOrFalseEnum.real.value.equals(indexVo.getValue())) {
+            return "故障";
+        }
+        if (EquipmentRiskTypeEnum.PB.getCode().equals(indexVo.getTypeCode())
+                && TrueOrFalseEnum.real.value.equals(indexVo.getValue())) {
+            return "屏蔽";
+        }
+        if (EquipmentRiskTypeEnum.YXZT.getCode().equals(indexVo.getTypeCode())
+                && TrueOrFalseEnum.fake.value.equals(indexVo.getValue())) {
+            return "停运";
+        }
+        return "运行";
+    }
+
+    @Override
+    public List<FireFightingSystemEntity> getList() {
+        return this.list();
+    }
+
+    @Override
+    public Boolean deleteSystem(Long id) {
 //        QueryWrapper<FormInstance> fqw = new QueryWrapper<>();
 //        fqw.eq("field_value",id);
 //        fqw.groupBy("instance_id");
@@ -678,436 +633,437 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
 //            String name = formInstance.getFieldValue();
 //            throw new BadRequest(name+"建筑与该系统存在绑定关系，请清除后再进行删除！");
 //        }
-		FireFightingSystemEntity entity = baseMapper.selectById(id);
-		if (entity.getSceneId() != null) {
-			FeignUtil.remoteCall(() -> Morphic.morphicSubjectClient.delete(entity.getSceneId()));
-		}
-		formInstanceMapper.clearSystemId(id);
-		// 解除装备与消防系统关系
-		this.removeBondSystemId(id);
-		this.baseMapper.deleteFilre(String.valueOf(id));
-		int i = this.baseMapper.deleteById(id);
-		if (i > 0 && syncSwitch) {
-			syncDataService.syncDeletedFireFightingSystem(Arrays.asList(id));
-		}
-		// 删除动态关联表单实例数据
-		if (entity.getInstanceId() != null) {
-			instanceService.remove(new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getInstanceId,
-					entity.getInstanceId()));
-		}
-		return i > 0;
-	}
-
-	private void removeBondSystemId(Long id) {
-		List<EquipmentSpecific> equipmentSpecifics = equipmentSpecificSerivce
-				.list(new LambdaQueryWrapper<EquipmentSpecific>().like(EquipmentSpecific::getSystemId, id));
-		equipmentSpecifics.forEach(equipmentSpecific -> {
-			List<String> ids = new ArrayList<>();
-			if (StringUtil.isNotEmpty(equipmentSpecific.getSystemId())) {
-				ids = Arrays.asList(equipmentSpecific.getSystemId().split(","));
-				ids = new ArrayList<>(ids);
-				ids.remove(id.toString());
-			}
-			equipmentSpecific.setSystemId(Joiner.on(",").join(ids));
-		});
-		if (!equipmentSpecifics.isEmpty()) {
-			equipmentSpecificSerivce.saveOrUpdateBatch(equipmentSpecifics);
-		}
-	}
-
-	@Override
-	public Boolean isDeleteCanvas(Long id) {
-		FireFightingSystemEntity system = baseMapper
-				.selectOne(new QueryWrapper<FireFightingSystemEntity>().eq("scene_id", id));
-		if (system != null) {
-			return true;
-		} else {
-			FeignUtil.remoteCall(() -> Morphic.morphicSubjectClient.delete(id));
-			return false;
-		}
-	}
-
-	@Override
-	public IPage<EquipTypeImgAmountVO> getColaCategoryAmountList(int hierarchy, String codeHead,
-			EquipTypeAmountPageDTO equipTypeAmountPage) {
-		String type = equipTypeAmountPage.getType();
-		if (!"".equals(type) && "car".equals(type)) {
-			equipTypeAmountPage.setSystemId(null);
-			equipTypeAmountPage.setStatus(null);
-		}
-		IPage<EquipTypeImgAmountVO> list = fireFightingSystemMapper
-				.getColaCategoryAmountList(equipTypeAmountPage.getPage(), hierarchy, codeHead, equipTypeAmountPage);
-		list.getRecords().forEach(x -> {
-			if (!x.getEqtype().startsWith("4") && StringUtil.isNotEmpty(x.getAmount())) {
-				x.setAmount(x.getAmount().split("\\.")[0]);
-			}
-		});
-		return list;
-	}
-
-	@Override
-	public IPage<EquipTypeImgAmountVO> getColaCategoryAmountCarList(int hierarchy, String codeHead,
-			EquipTypeAmountPageDTO equipTypeAmountPage) {
-		String type = equipTypeAmountPage.getType();
-		if (!"".equals(type) && "car".equals(type)) {
-			equipTypeAmountPage.setSystemId(null);
-			equipTypeAmountPage.setStatus(null);
-		}
-		IPage<EquipTypeImgAmountVO> list = fireFightingSystemMapper
-				.getColaCategoryAmountCarList(equipTypeAmountPage.getPage(), hierarchy, codeHead, equipTypeAmountPage);
-		list.getRecords().forEach(x -> {
-			if (!x.getEqtype().startsWith("4") && StringUtil.isNotEmpty(x.getAmount())) {
-				x.setAmount(x.getAmount().split("\\.")[0]);
-			}
-		});
-		return list;
-	}
-
-	@Override
-	public IPage<EquipTypeImgAmountVO> getColaCategoryAmountEquList(int hierarchy, String codeHead,
-			EquipTypeAmountPageDTO equipTypeAmountPage) {
-		String type = equipTypeAmountPage.getType();
-		if (!"".equals(type) && "car".equals(type)) {
-			equipTypeAmountPage.setSystemId(null);
-			equipTypeAmountPage.setStatus(null);
-		}
-		IPage<EquipTypeImgAmountVO> list = fireFightingSystemMapper
-				.getColaCategoryAmountEquList(equipTypeAmountPage.getPage(), hierarchy, codeHead, equipTypeAmountPage);
-		list.getRecords().forEach(x -> {
-			if (!x.getEqtype().startsWith("4") && StringUtil.isNotEmpty(x.getAmount())) {
-				x.setAmount(x.getAmount().split("\\.")[0]);
-			}
-		});
-		return list;
-	}
-
-	@Override
-	public List<EquipmentManageVo> getSystemCategory() {
-		return equipmentManageMapper.getSystemList();
-	}
-
-	@Override
-	public List<FireFightingSystem> getFireFightingSystemDetail(FireFightingSystemVo fireFightingSystemVo) {
-		return fireFightingSystemMapper.getFireFightingSystemDetail(fireFightingSystemVo);
-	}
-
-	@Override
-	public List<FireFightingSystemEntity> getFightingSysByCodes(String[] idsArr) {
-		List<FireFightingSystemEntity> fightingSystemList = fireFightingSystemMapper.getFightingSysByCodes(idsArr);
-		if (fightingSystemList != null && !fightingSystemList.isEmpty()) {
-			return fightingSystemList;
-		}
-		return Lists.newArrayList();
-	}
-
-	@Override
-	public List<FireFightingSystem3dVo> get3dFightingSystemList() {
-		FeignClientResult<List<DictionarieValueModel>> dictValues = Systemctl.dictionarieClient
-				.dictValues(iotCoreParam);
-		Optional.ofNullable(dictValues).orElseThrow(() -> new BadRequest("查询字段数据为空"));
-		List<DictionarieValueModel> values = dictValues.getResult();
-		if (!CollectionUtils.isEmpty(values)) {
-			List<String> collect = values.stream().map(DictionarieValueModel::getDictDataKey)
-					.collect(Collectors.toList());
-			List<FireFightingSystem3dVo> list = fireFightingSystemMapper.get3dFightingSystemList(collect);
-			if (!CollectionUtils.isEmpty(list)) {
-				return list;
-			}
-		}
-		return Lists.newArrayList();
-	}
-
-	@Override
-	public FireFightingSystemEntity getDetailByCode(String systemCode) {
-		LambdaQueryWrapper<FireFightingSystemEntity> wrapper = new LambdaQueryWrapper<>();
-		wrapper.eq(FireFightingSystemEntity::getCode, systemCode);
-		List<FireFightingSystemEntity> systemEntities = this.list(wrapper);
-		if (systemEntities.isEmpty()) {
-			throw new RuntimeException("code" + systemCode + "不存在");
-		}
-		return systemEntities.get(0);
-	}
-
-	@Override
-	public List<AlarmDataVO> getSystemById(Long id) {
-		return this.baseMapper.getSystemById(id);
-	}
-
-	@Override
-	public IPage<EquipmentAlarmBySystemIdOrSourceIdVO> getEquipmentAlarmBySystemIdOrSourceIdVO(
-			IPage<EquipmentAlarmBySystemIdOrSourceIdVO> page, Long sourceId, Long systemId, Integer confirmType,
-			String createDate, String type) {
-		return this.baseMapper.getEquipmentAlarmBySystemIdOrSourceIdVO(page, sourceId, systemId, confirmType,
-				createDate, type);
-	}
-
-	private static String getInet4Address() {
-		Enumeration<NetworkInterface> nis;
-		String ip = null;
-		try {
-			nis = NetworkInterface.getNetworkInterfaces();
-			for (; nis.hasMoreElements();) {
-				NetworkInterface ni = nis.nextElement();
-				Enumeration<InetAddress> ias = ni.getInetAddresses();
-				for (; ias.hasMoreElements();) {
-					InetAddress ia = ias.nextElement();
-					if (ia instanceof Inet4Address && !ia.getHostAddress().equals("127.0.0.1")) {
-						ip = ia.getHostAddress();
-					}
-				}
-			}
-		} catch (SocketException e) {
-			e.printStackTrace();
-		}
-		return ip;
-	}
-
-	@Override
-	public Map<String, Object> integrationPageSysData(String systemCode, Boolean isUpdate) {
-		// TODO Auto-generated method stub
-		if (!StringUtil.isNotEmpty(SystemTypeEnum.getEnum(systemCode))) {
-			return null;
-		}
-		Map<String, Object> data = null;
-
-		if (isUpdate) {
-			data = saveIntegrationPageSysData(systemCode);
-		} else {
-			if (redisUtils.hasKey(systemCode)) {
-				data = JSONObject.parseObject(redisUtils.get(systemCode).toString(), Map.class);
-			} else {
-				data = saveIntegrationPageSysData(systemCode);
-			}
-
-		}
-		if (!ObjectUtils.isEmpty(data)) {
-			mqttSendGateway.sendToMqtt(String.format("%s%s", "INTEGRATE_TOPIC/", systemCode), JSON.toJSONString(data));
-		}
-		return null;
-	}
-
-	public Map<String, Object> saveIntegrationPageSysData(String systemCode) {
-		Map<String, Object> data = null;
-		if (SystemTypeEnum.fireAlarmSys.getCode().equals(systemCode)) {
-			data = fireFightingSystemMapper.fireAlarmSysEquipmentNumber();
-			this.putAll(data, fireFightingSystemMapper.fireAlarmSysIndexNumber());
-			this.putAll(data, fireFightingSystemMapper.fireWaterSysHydrant());
-		} else if (SystemTypeEnum.fireCAFSSys.getCode().equals(systemCode)) {
-			data = fireFightingSystemMapper.getFireCafsSystem();
-		} else if (SystemTypeEnum.fireONLSys.getCode().equals(systemCode)) {
-			data = fireFightingSystemMapper.getFireOnlSystem();
-			this.putAll(data, fireFightingSystemMapper.getFireOnlSystemThreeSmall());
-		} else if (SystemTypeEnum.fireFoamSys.getCode().equals(systemCode)) {
-			data = fireFightingSystemMapper.fireFoamSysEquipmentIndexNumber();
-		} else if (SystemTypeEnum.fireFoamMistSys.getCode().equals(systemCode)
-				|| SystemTypeEnum.envMonitoringSys.getCode().equals(systemCode)) {
-			// TODO 灯泡及门状态，实时数据库刷新,存放数据，套用后续逻辑进行数据的发送
-			data = new HashMap<>();
-			data.put("waitRefresh", true);
-		} else if (SystemTypeEnum.fireWaterSys.getCode().equals(systemCode)) {
-			data = fireFightingSystemMapper.fireWaterSysCollectingDevice();
-			this.putAll(data, fireFightingSystemMapper.fireWaterSysPool());
-			this.putAll(data, fireFightingSystemMapper.fireWaterSysWaterPump());
-		} else {
-			data = fireFightingSystemMapper.otherSysIndexNumAndTotal();
-		}
-		if (!ObjectUtils.isEmpty(data)) {
-			redisUtils.set(systemCode, JSONObject.toJSONString(data));
-		}
-		return data;
-	}
-
-	private void putAll(Map<String, Object> data, Map<String, Object> addMap) {
-		if (!CollectionUtils.isEmpty(addMap)) {
-			data.putAll(addMap);
-		}
-	}
-
-	@Override
-	public List<FireFightingSystemTreeVo> getSystemTreeByOrgCode(String bizOrgCode) {
-		// 获取公司部门list
-		List<OrgUsrDto> orgUsrLists = jcsRemoteService.getCompanyDeptListWithAuth("COMPANY,DEPARTMENT", bizOrgCode);
-		List<FireFightingSystemTreeVo> fireFightingSystemTreeList = orgUsrLists.stream().map(key -> {
-			FireFightingSystemTreeVo vo = new FireFightingSystemTreeVo();
-			vo.setId(String.valueOf(key.getSequenceNbr()));
-			vo.setName(key.getBizOrgName());
-			vo.setType(key.getBizOrgType());
-			vo.setBizOrgCode(key.getBizOrgCode());
-			vo.setParentId(key.getParentId());
-			return vo;
-		}).collect(Collectors.toList());
-
-		// 根据bizOrgCode获取系统list
-		List<String> bizOrgCodes = fireFightingSystemTreeList.stream().map(FireFightingSystemTreeVo::getBizOrgCode)
-				.collect(Collectors.toList());
-		LambdaQueryWrapper<FireFightingSystemEntity> wrapper = new LambdaQueryWrapper<>();
-		wrapper.in(FireFightingSystemEntity::getBizOrgCode, bizOrgCodes);
-		List<FireFightingSystemEntity> fireFightingSystemEntityList = this.baseMapper.selectList(wrapper);
-		List<FireFightingSystemTreeVo> systemList = fireFightingSystemEntityList.stream().map(key -> {
-			FireFightingSystemTreeVo vo = new FireFightingSystemTreeVo();
-			vo.setId(String.valueOf(key.getId()));
-			vo.setName(key.getName());
-			vo.setType("system");
-			vo.setBizOrgCode(key.getBizOrgCode());
-			return vo;
-		}).collect(Collectors.toList());
-
-		// 组装公司部门树
-		fireFightingSystemTreeList.addAll(systemList);
-		return fireFightingSystemTreeList.stream().filter(d -> !"system".equals(d.getType()))
-				.peek((m) -> m.setChildren(getChildren(m, fireFightingSystemTreeList))).collect(Collectors.toList());
-	}
-
-	private List<FireFightingSystemTreeVo> getChildren(FireFightingSystemTreeVo root,
-			List<FireFightingSystemTreeVo> all) {
-		return all.stream()
-				.filter(d -> StringUtil.isNotEmpty(d.getParentId()) && d.getParentId().equals(root.getId())
-						|| (StringUtil.isNotEmpty(d.getBizOrgCode()) && d.getBizOrgCode().equals(root.getBizOrgCode())
-								&& !"system".equals(root.getType()) && !d.getId().equals(root.getId())))
-				.peek(m -> m.setChildren(getChildren(m, all))).collect(Collectors.toList());
-	}
-
-	@Override
-	public List<OrgMenuDto> companyTreeByUserAndType(String type) {
-		return jcsRemoteService.getCompanyDeptTreeWithAuth(authKey, type);
-	}
-
-	@Override
-	public List<FireFightingSystemTypeTreeVo> systemTypeTree(String bizOrgCode) {
-		// 获取所有系统分类list
-		LambdaQueryWrapper<DynamicFormGroup> wrapper = new LambdaQueryWrapper<>();
-		wrapper.eq(DynamicFormGroup::getGroupType, "fireSystem");
-		wrapper.eq(DynamicFormGroup::getParentId, 0);
-		List<DynamicFormGroup> list = iEqDynamicFormGroupService.list(wrapper);
-		List<Map<String, Object>> typeList = fireFightingSystemMapper.listByBizOrgCode(bizOrgCode);
-		List<FireFightingSystemTypeTreeVo> childrenList = list.stream().map(item -> {
-			FireFightingSystemTypeTreeVo vo = new FireFightingSystemTypeTreeVo();
-			vo.setName(item.getGroupName());
-			typeList.forEach(obj -> {
-				if (item.getId().equals(Long.valueOf(obj.get("typeId").toString()))) {
-					vo.setTotal(obj.get("total").toString());
-				}
-			});
-			vo.setType(item.getGroupType());
-			vo.setId(String.valueOf(item.getId()));
-			return vo;
-		}).collect(Collectors.toList());
-		// 计算总数
-		long total = typeList.stream().mapToLong(o -> {
-			if (!ObjectUtils.isEmpty(o.get("total"))) {
-				return (long) o.get("total");
-			}
-			return 0;
-		}).sum();
-		// 自定义根节点返回树
-		FireFightingSystemTypeTreeVo parentNode = new FireFightingSystemTypeTreeVo();
-		parentNode.setType("all");
-		parentNode.setName("全部分类");
-		parentNode.setId("-1");
-		parentNode.setParentId("-1");
-		parentNode.setTotal(String.valueOf(total));
-		parentNode.setChildren(childrenList);
-		return Collections.singletonList(parentNode);
-	}
-
-	@Override
-	public Object getEquipmentTypeAndCount(String bizOrgCode) {
-		if (redisUtils.hasKey(equipTypeAndCount + bizOrgCode)) {
-			return JSONArray.parseArray(
-					JSONArray.toJSONString(redisUtils.get(equipTypeAndCount + bizOrgCode)), EquipmentCategory.class);
-		} else {
-			return refreshEquipmentTypeAndCount(bizOrgCode);
-		}
-	}
-	@Override
-	public Object refreshEquipmentTypeAndCount(String bizOrgCode) {
-			List<EquipmentCategory> responseList = this.typeList();
-			if (responseList == null || responseList.size() < 1) {
-				return null;
-			}
-			List<EquipmentCategory> equipmentTypeList = responseList.stream()
-					.filter(i -> !i.getCode().startsWith("2") && "2".equals(i.getIndustryCode()))
-					.collect(Collectors.toList());
-			List<EquipmentCategory> list = typeListTree(equipmentTypeList, bizOrgCode, SourceTypeEnum.EQUIPMENT);
-			redisUtils.set(equipTypeAndCount + bizOrgCode, list, 86400);
-			return list;
-	}
-	
-	@Override
-	public Object getCarTypeAndCount(String bizOrgCode) {
-		if (redisUtils.hasKey(carTypeAndCount + bizOrgCode)) {
-			List<EquipmentCategory> typeList = JSONArray.parseArray(
-					JSONArray.toJSONString(redisUtils.get(carTypeAndCount + bizOrgCode)), EquipmentCategory.class);
-			return typeList;
-		} else {
-			return refreshCarTypeAndCount(bizOrgCode);
-		}
-	}
-	@Override
-	public Object refreshCarTypeAndCount(String bizOrgCode) {
-			List<EquipmentCategory> responseList = this.typeList();
-			if (responseList == null || responseList.size() < 1) {
-				return null;
-			}
-			List<EquipmentCategory> equipmentTypeList = responseList.stream()
-					.filter(i -> i.getCode().startsWith("2") && "2".equals(i.getIndustryCode()))
-					.collect(Collectors.toList());
-			List<EquipmentCategory> list = typeListTree(equipmentTypeList, bizOrgCode, SourceTypeEnum.CAR);
-			redisUtils.set(carTypeAndCount + bizOrgCode, list);
-			return list;
-	}
-	
-	
-
-	public List<EquipmentCategory> typeList() {
-		List<EquipmentCategory> equipmentCategorys = this.iEquipmentCategoryService
-				.getEquipmentCategoryList(Integer.valueOf(equipmentCategoryLeftTypeCode));
-		return equipmentCategorys;
-	}
-
-	public List<EquipmentCategory> typeListTree(List<EquipmentCategory> equipmentCategorys, String bizOrgCode,
-			SourceTypeEnum sourceTypeEnum) {
-		List<EquipmentCategory> list = new ArrayList<>();
-		Map<String, List<EquipmentCategory>> tmpMap = new HashMap<String, List<EquipmentCategory>>();
-		equipmentCategorys.forEach(action -> {
-			int num = sourceStatistics.equipCategoryStatistics(bizOrgCode, sourceTypeEnum, action.getCode());
-			action.setCount(Double.parseDouble(num + ""));
-			if (action.getParentId() == null) {
-				list.add(action);
-			} else {
-				if (tmpMap.get(action.getParentId().toString()) == null) {
-					ArrayList<EquipmentCategory> tmplist = new ArrayList<EquipmentCategory>();
-					tmplist.add(action);
-					tmpMap.put(action.getParentId().toString(), tmplist);
-				} else {
-					if (!tmpMap.get(action.getParentId().toString()).contains(action)) {
-						tmpMap.get(action.getParentId().toString()).add(action);
-					}
-				}
-			}
-		});
-		getChildren(list, tmpMap);
-		return list;
-	}
-
-	private void getChildren(List<EquipmentCategory> list, Map<String, List<EquipmentCategory>> tmpMap) {
-		for (EquipmentCategory equipmentCategory : list) {
-			if (tmpMap.get(equipmentCategory.getId().toString()) != null
-					&& tmpMap.get(equipmentCategory.getId().toString()).size() > 0) {
-				List<EquipmentCategory> equipcliss = tmpMap.get(equipmentCategory.getId().toString());
-				equipmentCategory.setHasLowerClassification(true);
-				equipmentCategory.setChildren(equipcliss);
-				getChildren(equipcliss, tmpMap);
-			}
-		}
-	}
-
-	@Override
-	public List<FireFightingSystemEntity> systemListByBziOrgCode(String bizOrgCode) {
-		LambdaQueryWrapper<FireFightingSystemEntity> wrapper = new LambdaQueryWrapper<>();
-		if (StringUtil.isNotEmpty(bizOrgCode)) {
-			wrapper.likeRight(FireFightingSystemEntity::getBizOrgCode, bizOrgCode);
-		}
-		return this.baseMapper.selectList(wrapper);
-	}
+        FireFightingSystemEntity entity = baseMapper.selectById(id);
+        if (entity.getSceneId() != null) {
+            FeignUtil.remoteCall(() -> Morphic.morphicSubjectClient.delete(entity.getSceneId()));
+        }
+        formInstanceMapper.clearSystemId(id);
+        // 解除装备与消防系统关系
+        this.removeBondSystemId(id);
+        this.baseMapper.deleteFilre(String.valueOf(id));
+        int i = this.baseMapper.deleteById(id);
+        if (i > 0 && syncSwitch) {
+            syncDataService.syncDeletedFireFightingSystem(Arrays.asList(id));
+        }
+        // 删除动态关联表单实例数据
+        if (entity.getInstanceId() != null) {
+            instanceService.remove(new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getInstanceId,
+                    entity.getInstanceId()));
+        }
+        return i > 0;
+    }
+
+    private void removeBondSystemId(Long id) {
+        List<EquipmentSpecific> equipmentSpecifics = equipmentSpecificSerivce
+                .list(new LambdaQueryWrapper<EquipmentSpecific>().like(EquipmentSpecific::getSystemId, id));
+        equipmentSpecifics.forEach(equipmentSpecific -> {
+            List<String> ids = new ArrayList<>();
+            if (StringUtil.isNotEmpty(equipmentSpecific.getSystemId())) {
+                ids = Arrays.asList(equipmentSpecific.getSystemId().split(","));
+                ids = new ArrayList<>(ids);
+                ids.remove(id.toString());
+            }
+            equipmentSpecific.setSystemId(Joiner.on(",").join(ids));
+        });
+        if (!equipmentSpecifics.isEmpty()) {
+            equipmentSpecificSerivce.saveOrUpdateBatch(equipmentSpecifics);
+        }
+    }
+
+    @Override
+    public Boolean isDeleteCanvas(Long id) {
+        FireFightingSystemEntity system = baseMapper
+                .selectOne(new QueryWrapper<FireFightingSystemEntity>().eq("scene_id", id));
+        if (system != null) {
+            return true;
+        } else {
+            FeignUtil.remoteCall(() -> Morphic.morphicSubjectClient.delete(id));
+            return false;
+        }
+    }
+
+    @Override
+    public IPage<EquipTypeImgAmountVO> getColaCategoryAmountList(int hierarchy, String codeHead,
+                                                                 EquipTypeAmountPageDTO equipTypeAmountPage) {
+        String type = equipTypeAmountPage.getType();
+        if (!"".equals(type) && "car".equals(type)) {
+            equipTypeAmountPage.setSystemId(null);
+            equipTypeAmountPage.setStatus(null);
+        }
+        IPage<EquipTypeImgAmountVO> list = fireFightingSystemMapper
+                .getColaCategoryAmountList(equipTypeAmountPage.getPage(), hierarchy, codeHead, equipTypeAmountPage);
+        list.getRecords().forEach(x -> {
+            if (!x.getEqtype().startsWith("4") && StringUtil.isNotEmpty(x.getAmount())) {
+                x.setAmount(x.getAmount().split("\\.")[0]);
+            }
+        });
+        return list;
+    }
+
+    @Override
+    public IPage<EquipTypeImgAmountVO> getColaCategoryAmountCarList(int hierarchy, String codeHead,
+                                                                    EquipTypeAmountPageDTO equipTypeAmountPage) {
+        String type = equipTypeAmountPage.getType();
+        if (!"".equals(type) && "car".equals(type)) {
+            equipTypeAmountPage.setSystemId(null);
+            equipTypeAmountPage.setStatus(null);
+        }
+        IPage<EquipTypeImgAmountVO> list = fireFightingSystemMapper
+                .getColaCategoryAmountCarList(equipTypeAmountPage.getPage(), hierarchy, codeHead, equipTypeAmountPage);
+        list.getRecords().forEach(x -> {
+            if (!x.getEqtype().startsWith("4") && StringUtil.isNotEmpty(x.getAmount())) {
+                x.setAmount(x.getAmount().split("\\.")[0]);
+            }
+        });
+        return list;
+    }
+
+    @Override
+    public IPage<EquipTypeImgAmountVO> getColaCategoryAmountEquList(int hierarchy, String codeHead,
+                                                                    EquipTypeAmountPageDTO equipTypeAmountPage) {
+        String type = equipTypeAmountPage.getType();
+        if (!"".equals(type) && "car".equals(type)) {
+            equipTypeAmountPage.setSystemId(null);
+            equipTypeAmountPage.setStatus(null);
+        }
+        IPage<EquipTypeImgAmountVO> list = fireFightingSystemMapper
+                .getColaCategoryAmountEquList(equipTypeAmountPage.getPage(), hierarchy, codeHead, equipTypeAmountPage);
+        list.getRecords().forEach(x -> {
+            if (!x.getEqtype().startsWith("4") && StringUtil.isNotEmpty(x.getAmount())) {
+                x.setAmount(x.getAmount().split("\\.")[0]);
+            }
+        });
+        return list;
+    }
+
+    @Override
+    public List<EquipmentManageVo> getSystemCategory() {
+        return equipmentManageMapper.getSystemList();
+    }
+
+    @Override
+    public List<FireFightingSystem> getFireFightingSystemDetail(FireFightingSystemVo fireFightingSystemVo) {
+        return fireFightingSystemMapper.getFireFightingSystemDetail(fireFightingSystemVo);
+    }
+
+    @Override
+    public List<FireFightingSystemEntity> getFightingSysByCodes(String[] idsArr) {
+        List<FireFightingSystemEntity> fightingSystemList = fireFightingSystemMapper.getFightingSysByCodes(idsArr);
+        if (fightingSystemList != null && !fightingSystemList.isEmpty()) {
+            return fightingSystemList;
+        }
+        return Lists.newArrayList();
+    }
+
+    @Override
+    public List<FireFightingSystem3dVo> get3dFightingSystemList() {
+        FeignClientResult<List<DictionarieValueModel>> dictValues = Systemctl.dictionarieClient
+                .dictValues(iotCoreParam);
+        Optional.ofNullable(dictValues).orElseThrow(() -> new BadRequest("查询字段数据为空"));
+        List<DictionarieValueModel> values = dictValues.getResult();
+        if (!CollectionUtils.isEmpty(values)) {
+            List<String> collect = values.stream().map(DictionarieValueModel::getDictDataKey)
+                    .collect(Collectors.toList());
+            List<FireFightingSystem3dVo> list = fireFightingSystemMapper.get3dFightingSystemList(collect);
+            if (!CollectionUtils.isEmpty(list)) {
+                return list;
+            }
+        }
+        return Lists.newArrayList();
+    }
+
+    @Override
+    public FireFightingSystemEntity getDetailByCode(String systemCode) {
+        LambdaQueryWrapper<FireFightingSystemEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(FireFightingSystemEntity::getCode, systemCode);
+        List<FireFightingSystemEntity> systemEntities = this.list(wrapper);
+        if (systemEntities.isEmpty()) {
+            throw new RuntimeException("code" + systemCode + "不存在");
+        }
+        return systemEntities.get(0);
+    }
+
+    @Override
+    public List<AlarmDataVO> getSystemById(Long id) {
+        return this.baseMapper.getSystemById(id);
+    }
+
+    @Override
+    public IPage<EquipmentAlarmBySystemIdOrSourceIdVO> getEquipmentAlarmBySystemIdOrSourceIdVO(
+            IPage<EquipmentAlarmBySystemIdOrSourceIdVO> page, Long sourceId, Long systemId, Integer confirmType,
+            String createDate, String type) {
+        return this.baseMapper.getEquipmentAlarmBySystemIdOrSourceIdVO(page, sourceId, systemId, confirmType,
+                createDate, type);
+    }
+
+    private static String getInet4Address() {
+        Enumeration<NetworkInterface> nis;
+        String ip = null;
+        try {
+            nis = NetworkInterface.getNetworkInterfaces();
+            for (; nis.hasMoreElements(); ) {
+                NetworkInterface ni = nis.nextElement();
+                Enumeration<InetAddress> ias = ni.getInetAddresses();
+                for (; ias.hasMoreElements(); ) {
+                    InetAddress ia = ias.nextElement();
+                    if (ia instanceof Inet4Address && !ia.getHostAddress().equals("127.0.0.1")) {
+                        ip = ia.getHostAddress();
+                    }
+                }
+            }
+        } catch (SocketException e) {
+            e.printStackTrace();
+        }
+        return ip;
+    }
+
+    @Override
+    public Map<String, Object> integrationPageSysData(String systemCode, Boolean isUpdate) {
+        // TODO Auto-generated method stub
+        if (!StringUtil.isNotEmpty(SystemTypeEnum.getEnum(systemCode))) {
+            return null;
+        }
+        Map<String, Object> data = null;
+
+        if (isUpdate) {
+            data = saveIntegrationPageSysData(systemCode);
+        } else {
+            if (redisUtils.hasKey(systemCode)) {
+                data = JSONObject.parseObject(redisUtils.get(systemCode).toString(), Map.class);
+            } else {
+                data = saveIntegrationPageSysData(systemCode);
+            }
+
+        }
+        if (!ObjectUtils.isEmpty(data)) {
+            mqttSendGateway.sendToMqtt(String.format("%s%s", "INTEGRATE_TOPIC/", systemCode), JSON.toJSONString(data));
+        }
+        return null;
+    }
+
+    public Map<String, Object> saveIntegrationPageSysData(String systemCode) {
+        Map<String, Object> data = null;
+        if (SystemTypeEnum.fireAlarmSys.getCode().equals(systemCode)) {
+            data = fireFightingSystemMapper.fireAlarmSysEquipmentNumber();
+            this.putAll(data, fireFightingSystemMapper.fireAlarmSysIndexNumber());
+            this.putAll(data, fireFightingSystemMapper.fireWaterSysHydrant());
+        } else if (SystemTypeEnum.fireCAFSSys.getCode().equals(systemCode)) {
+            data = fireFightingSystemMapper.getFireCafsSystem();
+        } else if (SystemTypeEnum.fireONLSys.getCode().equals(systemCode)) {
+            data = fireFightingSystemMapper.getFireOnlSystem();
+            this.putAll(data, fireFightingSystemMapper.getFireOnlSystemThreeSmall());
+        } else if (SystemTypeEnum.fireFoamSys.getCode().equals(systemCode)) {
+            data = fireFightingSystemMapper.fireFoamSysEquipmentIndexNumber();
+        } else if (SystemTypeEnum.fireFoamMistSys.getCode().equals(systemCode)
+                || SystemTypeEnum.envMonitoringSys.getCode().equals(systemCode)) {
+            // TODO 灯泡及门状态，实时数据库刷新,存放数据，套用后续逻辑进行数据的发送
+            data = new HashMap<>();
+            data.put("waitRefresh", true);
+        } else if (SystemTypeEnum.fireWaterSys.getCode().equals(systemCode)) {
+            data = fireFightingSystemMapper.fireWaterSysCollectingDevice();
+            this.putAll(data, fireFightingSystemMapper.fireWaterSysPool());
+            this.putAll(data, fireFightingSystemMapper.fireWaterSysWaterPump());
+        } else {
+            data = fireFightingSystemMapper.otherSysIndexNumAndTotal();
+        }
+        if (!ObjectUtils.isEmpty(data)) {
+            redisUtils.set(systemCode, JSONObject.toJSONString(data));
+        }
+        return data;
+    }
+
+    private void putAll(Map<String, Object> data, Map<String, Object> addMap) {
+        if (!CollectionUtils.isEmpty(addMap)) {
+            data.putAll(addMap);
+        }
+    }
+
+    @Override
+    public List<FireFightingSystemTreeVo> getSystemTreeByOrgCode(String bizOrgCode) {
+        // 获取公司部门list
+        List<OrgUsrDto> orgUsrLists = jcsRemoteService.getCompanyDeptListWithAuth("COMPANY,DEPARTMENT", bizOrgCode);
+        List<FireFightingSystemTreeVo> fireFightingSystemTreeList = orgUsrLists.stream().map(key -> {
+            FireFightingSystemTreeVo vo = new FireFightingSystemTreeVo();
+            vo.setId(String.valueOf(key.getSequenceNbr()));
+            vo.setName(key.getBizOrgName());
+            vo.setType(key.getBizOrgType());
+            vo.setBizOrgCode(key.getBizOrgCode());
+            vo.setParentId(key.getParentId());
+            return vo;
+        }).collect(Collectors.toList());
+
+        // 根据bizOrgCode获取系统list
+        List<String> bizOrgCodes = fireFightingSystemTreeList.stream().map(FireFightingSystemTreeVo::getBizOrgCode)
+                .collect(Collectors.toList());
+        LambdaQueryWrapper<FireFightingSystemEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(FireFightingSystemEntity::getBizOrgCode, bizOrgCodes);
+        List<FireFightingSystemEntity> fireFightingSystemEntityList = this.baseMapper.selectList(wrapper);
+        List<FireFightingSystemTreeVo> systemList = fireFightingSystemEntityList.stream().map(key -> {
+            FireFightingSystemTreeVo vo = new FireFightingSystemTreeVo();
+            vo.setId(String.valueOf(key.getId()));
+            vo.setName(key.getName());
+            vo.setType("system");
+            vo.setBizOrgCode(key.getBizOrgCode());
+            return vo;
+        }).collect(Collectors.toList());
+
+        // 组装公司部门树
+        fireFightingSystemTreeList.addAll(systemList);
+        return fireFightingSystemTreeList.stream().filter(d -> !"system".equals(d.getType()))
+                .peek((m) -> m.setChildren(getChildren(m, fireFightingSystemTreeList))).collect(Collectors.toList());
+    }
+
+    private List<FireFightingSystemTreeVo> getChildren(FireFightingSystemTreeVo root,
+                                                       List<FireFightingSystemTreeVo> all) {
+        return all.stream()
+                .filter(d -> StringUtil.isNotEmpty(d.getParentId()) && d.getParentId().equals(root.getId())
+                        || (StringUtil.isNotEmpty(d.getBizOrgCode()) && d.getBizOrgCode().equals(root.getBizOrgCode())
+                        && !"system".equals(root.getType()) && !d.getId().equals(root.getId())))
+                .peek(m -> m.setChildren(getChildren(m, all))).collect(Collectors.toList());
+    }
+
+    @Override
+    public List<OrgMenuDto> companyTreeByUserAndType(String type) {
+        return jcsRemoteService.getCompanyDeptTreeWithAuth(authKey, type);
+    }
+
+    @Override
+    public List<FireFightingSystemTypeTreeVo> systemTypeTree(String bizOrgCode) {
+        // 获取所有系统分类list
+        LambdaQueryWrapper<DynamicFormGroup> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(DynamicFormGroup::getGroupType, "fireSystem");
+        wrapper.eq(DynamicFormGroup::getParentId, 0);
+        List<DynamicFormGroup> list = iEqDynamicFormGroupService.list(wrapper);
+        List<Map<String, Object>> typeList = fireFightingSystemMapper.listByBizOrgCode(bizOrgCode);
+        List<FireFightingSystemTypeTreeVo> childrenList = list.stream().map(item -> {
+            FireFightingSystemTypeTreeVo vo = new FireFightingSystemTypeTreeVo();
+            vo.setName(item.getGroupName());
+            typeList.forEach(obj -> {
+                if (item.getId().equals(Long.valueOf(obj.get("typeId").toString()))) {
+                    vo.setTotal(obj.get("total").toString());
+                }
+            });
+            vo.setType(item.getGroupType());
+            vo.setId(String.valueOf(item.getId()));
+            return vo;
+        }).collect(Collectors.toList());
+        // 计算总数
+        long total = typeList.stream().mapToLong(o -> {
+            if (!ObjectUtils.isEmpty(o.get("total"))) {
+                return (long) o.get("total");
+            }
+            return 0;
+        }).sum();
+        // 自定义根节点返回树
+        FireFightingSystemTypeTreeVo parentNode = new FireFightingSystemTypeTreeVo();
+        parentNode.setType("all");
+        parentNode.setName("全部分类");
+        parentNode.setId("-1");
+        parentNode.setParentId("-1");
+        parentNode.setTotal(String.valueOf(total));
+        parentNode.setChildren(childrenList);
+        return Collections.singletonList(parentNode);
+    }
+
+    @Override
+    public Object getEquipmentTypeAndCount(String bizOrgCode) {
+        if (redisUtils.hasKey(equipTypeAndCount + bizOrgCode)) {
+            return JSONArray.parseArray(
+                    JSONArray.toJSONString(redisUtils.get(equipTypeAndCount + bizOrgCode)), EquipmentCategory.class);
+        } else {
+            return refreshEquipmentTypeAndCount(bizOrgCode);
+        }
+    }
+
+
+    @Override
+    public Object refreshEquipmentTypeAndCount(String bizOrgCode) {
+        List<EquipmentCategory> responseList = this.typeList();
+        if (responseList == null || responseList.size() < 1) {
+            return null;
+        }
+        List<EquipmentCategory> equipmentTypeList = responseList.stream()
+                .filter(i -> !i.getCode().startsWith("2") && "2".equals(i.getIndustryCode()))
+                .collect(Collectors.toList());
+        List<EquipmentCategory> list = typeListTree(equipmentTypeList, bizOrgCode, SourceTypeEnum.EQUIPMENT);
+        redisUtils.set(equipTypeAndCount + bizOrgCode, list, 86400);
+        return list;
+    }
+
+    @Override
+    public Object getCarTypeAndCount(String bizOrgCode) {
+        if (redisUtils.hasKey(carTypeAndCount + bizOrgCode)) {
+            List<EquipmentCategory> typeList = JSONArray.parseArray(
+                    JSONArray.toJSONString(redisUtils.get(carTypeAndCount + bizOrgCode)), EquipmentCategory.class);
+            return typeList;
+        } else {
+            return refreshCarTypeAndCount(bizOrgCode);
+        }
+    }
+
+    @Override
+    public Object refreshCarTypeAndCount(String bizOrgCode) {
+        List<EquipmentCategory> responseList = this.typeList();
+        if (responseList == null || responseList.size() < 1) {
+            return null;
+        }
+        List<EquipmentCategory> equipmentTypeList = responseList.stream()
+                .filter(i -> i.getCode().startsWith("2") && "2".equals(i.getIndustryCode()))
+                .collect(Collectors.toList());
+        List<EquipmentCategory> list = typeListTree(equipmentTypeList, bizOrgCode, SourceTypeEnum.CAR);
+        redisUtils.set(carTypeAndCount + bizOrgCode, list);
+        return list;
+    }
+
+    public List<EquipmentCategory> typeList() {
+        List<EquipmentCategory> equipmentCategorys = this.iEquipmentCategoryService
+                .getEquipmentCategoryList(Integer.valueOf(equipmentCategoryLeftTypeCode));
+        return equipmentCategorys;
+    }
+
+    public List<EquipmentCategory> typeListTree(List<EquipmentCategory> equipmentCategorys, String bizOrgCode,
+                                                SourceTypeEnum sourceTypeEnum) {
+        List<EquipmentCategory> list = new ArrayList<>();
+        Map<String, List<EquipmentCategory>> tmpMap = new HashMap<String, List<EquipmentCategory>>();
+        equipmentCategorys.forEach(action -> {
+            int num = sourceStatistics.equipCategoryStatistics(bizOrgCode, sourceTypeEnum, action.getCode());
+            action.setCount(Double.parseDouble(num + ""));
+            if (action.getParentId() == null) {
+                list.add(action);
+            } else {
+                if (tmpMap.get(action.getParentId().toString()) == null) {
+                    ArrayList<EquipmentCategory> tmplist = new ArrayList<EquipmentCategory>();
+                    tmplist.add(action);
+                    tmpMap.put(action.getParentId().toString(), tmplist);
+                } else {
+                    if (!tmpMap.get(action.getParentId().toString()).contains(action)) {
+                        tmpMap.get(action.getParentId().toString()).add(action);
+                    }
+                }
+            }
+        });
+        getChildren(list, tmpMap);
+        return list;
+    }
+
+    private void getChildren(List<EquipmentCategory> list, Map<String, List<EquipmentCategory>> tmpMap) {
+        for (EquipmentCategory equipmentCategory : list) {
+            if (tmpMap.get(equipmentCategory.getId().toString()) != null
+                    && tmpMap.get(equipmentCategory.getId().toString()).size() > 0) {
+                List<EquipmentCategory> equipcliss = tmpMap.get(equipmentCategory.getId().toString());
+                equipmentCategory.setHasLowerClassification(true);
+                equipmentCategory.setChildren(equipcliss);
+                getChildren(equipcliss, tmpMap);
+            }
+        }
+    }
+
+    @Override
+    public List<FireFightingSystemEntity> systemListByBziOrgCode(String bizOrgCode) {
+        LambdaQueryWrapper<FireFightingSystemEntity> wrapper = new LambdaQueryWrapper<>();
+        if (StringUtil.isNotEmpty(bizOrgCode)) {
+            wrapper.likeRight(FireFightingSystemEntity::getBizOrgCode, bizOrgCode);
+        }
+        return this.baseMapper.selectList(wrapper);
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/SourcesStatisticsImpl.java

@@ -19,7 +19,7 @@ public class SourcesStatisticsImpl implements ISourceStatistics {
     @Autowired
     private RedisUtils redisUtil;
 
-    public static String PREFIX_CATEGORY_COUNT = "CATEGORY_COUNT_";
+    static String PREFIX_CATEGORY_COUNT = "CATEGORY_COUNT_";
 
 
     @Override
@@ -31,28 +31,28 @@ public class SourcesStatisticsImpl implements ISourceStatistics {
             //求和
             return this.sumNumber(keys);
         } else {
-            //按照类型插入缓存
-            Object bean = SpringContextHelper.getBean(sourceType.getBeanName());
-            Method[] methods = bean.getClass().getDeclaredMethods();
-            for (Method method : methods) {
-                if (method.getName().equals(sourceType.getMethodName())) {
-                    try {
-                        method.invoke(bean);
-                    } catch (Exception e) {
-                        throw new RuntimeException("更新redis数据失败" + e.getMessage());
-                    }
-                }
-            }
-            return this.sumNumberAndInitRedis(bizOrgCode,sourceType,treeCode, keys);
+            return 0;
         }
     }
 
-    private int sumNumberAndInitRedis(String bizOrgCode, SourceTypeEnum sourceType, String treeCode, Set<String> keys) {
-        int result = this.sumNumber(keys);
-        if(result == 0){
-            redisUtil.set(buildKey(bizOrgCode,sourceType.getCode(),treeCode),0,86400);
+    /**
+     * 系统初始化时调用刷新缓存
+     * @param sourceType 缓存类型
+     */
+    @Override
+    public void initAllCategoryStatisticsData(SourceTypeEnum sourceType) {
+        //按照类型插入缓存
+        Object bean = SpringContextHelper.getBean(sourceType.getBeanName());
+        Method[] methods = bean.getClass().getDeclaredMethods();
+        for (Method method : methods) {
+            if (method.getName().equals(sourceType.getMethodName())) {
+                try {
+                    method.invoke(bean);
+                } catch (Exception e) {
+                    throw new RuntimeException("更新redis数据失败" + e.getMessage());
+                }
+            }
         }
-        return result;
     }
 
     private int sumNumber(Set<String> keys) {
@@ -69,7 +69,4 @@ public class SourcesStatisticsImpl implements ISourceStatistics {
         return PREFIX_CATEGORY_COUNT + bizOrgCode + "*_" + sourceType + "_" + treeCode + "*";
     }
 
-    private String buildKey(String bizOrgCode, String sourceType, String treeCode) {
-        return PREFIX_CATEGORY_COUNT + bizOrgCode + "_" + sourceType + "_" + treeCode;
-    }
 }