Merge branch 'develop_dl_plan6' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/enums/SystemTypeEnum.java

@@ -17,8 +17,8 @@ public enum SystemTypeEnum {
 	fireFoamMistSys("fireFoamMistSys", "细水雾涡扇炮系统"),
 	fireWaterSys("fireWaterSys", "消防给水系统"),
 	otherSys("otherSys", "其他系统"),
-	envMonitoringSys("envMonitoringSys", "环境监测系统");
-
+	envMonitoringSys("envMonitoringSys", "环境监测系统"),
+	fireSpraySys("fireSpraySys","换流变水喷雾系统");
 
     private String code;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/CommonPageInfoParam.java

@@ -124,6 +124,36 @@ public class CommonPageInfoParam extends CommonPageable {
 
 	private String isRemovedFire;
 
+	private String equipmentCode;
+
+	private String indexTypeCode;
+
+	private String fireEquipmentSpecificIndexKey;
+
+	public void setFireEquipmentSpecificIndexKey(String fireEquipmentSpecificIndexKey) {
+		this.fireEquipmentSpecificIndexKey = fireEquipmentSpecificIndexKey;
+	}
+
+	public String getFireEquipmentSpecificIndexKey() {
+		return fireEquipmentSpecificIndexKey;
+	}
+
+	public String getIndexTypeCode() {
+		return indexTypeCode;
+	}
+
+	public void setIndexTypeCode(String indexTypeCode) {
+		this.indexTypeCode = indexTypeCode;
+	}
+
+	public String getEquipmentCode() {
+		return equipmentCode;
+	}
+
+	public void setEquipmentCode(String equipmentCode) {
+		this.equipmentCode = equipmentCode;
+	}
+
 	public void setIsRemovedFire(String isRemovedFire) {
 		this.isRemovedFire = isRemovedFire;
 	}

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/CommonPageParamUtil.java

@@ -66,8 +66,14 @@ public class CommonPageParamUtil {
 			} else if("isRemovedFire".equals(name)){
 				param.setIsRemovedFire(toString(queryRequests.get(i).getValue()));
 			} else if("bizOrgCode".equals(name)){
-			param.setBizOrgCode(toString(queryRequests.get(i).getValue()));
-		}
+				param.setBizOrgCode(toString(queryRequests.get(i).getValue()));
+			} else if("equipmentCode".equals(name)){
+				param.setEquipmentCode(toString(queryRequests.get(i).getValue()));
+			} else if("specificIndexKey".equals(name)){
+				param.setFireEquipmentSpecificIndexKey(toString(queryRequests.get(i).getValue()));
+			} else if("indexTypeCode".equals(name)){
+				param.setIndexTypeCode(toString(queryRequests.get(i).getValue()));
+			}
 		}
 		if(commonPageable !=null){
 			param.setPageNumber(commonPageable.getPageNumber());

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgPersonController.java

@@ -226,6 +226,25 @@ public class OrgPersonController extends BaseController {
                 requestBody));
     }
 
+    /**
+     * 根据当前登陆人获取站内所有人员信息 （表单使用）
+     *
+     * @return
+     */
+    @TycloudOperation( ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/listAllByCurrentUser", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "列表分页查询(表单用)", notes = "列表分页查询（表单用）")
+    public ResponseModel<Object> listAllByCurrentUser() {
+        Map<String, Object> req = new HashMap<>();
+        ReginParams reginParams = getSelectedOrgInfo();
+        String bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
+        req.put("bizOrgCode", bizOrgCode);
+        if(redisUtils.get("userList:" + bizOrgCode) != null){
+            return ResponseHelper.buildResponse(redisUtils.get("userList:" + bizOrgCode));
+        }
+        return ResponseHelper.buildResponse(iOrgUsrService.listAllByCurrentUser(null, null, req));
+    }
+
 
     @TycloudOperation( ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/getUserByCode/list", method = RequestMethod.GET)

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -57,6 +57,7 @@ import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 
 /**
  * 机构/部门/人员表 服务实现类
@@ -650,6 +651,115 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return pageBean;
 	}
 
+	public IPage<Map<String, Object>> listAllByCurrentUser(String pageNum, String pageSize, Map<String, Object> req) {
+		String bizOrgCode = req.get("bizOrgCode").toString();
+		IPage<Map<String, Object>> pageBean = null;
+		if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
+			pageBean = new Page<>(0, Long.MAX_VALUE);
+		} else {
+			pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+		}
+		Map<String, Object> map = new HashMap<>();
+		/* Bug2652 根据名字和工号模糊查询失效 已添加模糊匹配 2021-09-01 陈召 开始 */
+		map.put("bizOrgType", OrgPersonEnum.人员.getKey());
+		if (!ObjectUtils.isEmpty(req.get("bizOrgName"))) {
+			map.put("bizOrgName", req.get("bizOrgName"));
+		}
+		if (!ObjectUtils.isEmpty(req.get("personNumber"))) {
+			map.put("personNumber", req.get("personNumber"));
+		}
+		if (req!=null&&req.containsKey("company") && !ObjectUtils.isEmpty(req.get("company"))) {
+			req.put("company", req.get("company"));
+		}
+
+		if (req!=null&&req.containsKey("bizOrgCode") && !ObjectUtils.isEmpty(req.get("bizOrgCode"))) {
+			LambdaQueryWrapper<OrgUsr> query = new LambdaQueryWrapper<>();
+			query.eq(OrgUsr::getBizOrgCode, req.get("bizOrgCode").toString());
+			OrgUsr orgUsr = this.getOne(query);
+			req.remove("bizOrgCode");
+			map.put("company", orgUsr.getSequenceNbr().toString());
+		}
+		/* BUG2680 查询部门人员错误 传递参数类型不正确 修改为string 2021-09-14 陈召 开始 */
+		if (!req.isEmpty()&&req.containsKey("parentId") && req.get("parentId") != null && req.get("parentId") != "") {
+			OrgUsr parent = this.getById(req.get("parentId").toString());
+			map.put("bizOrgCode", ObjectUtils.isEmpty(parent) ? null : parent.getBizOrgCode());
+		}
+
+		// 新加
+		if (!ObjectUtils.isEmpty(req)&&req.containsKey("OrgCode") && req.get("OrgCode") != null && !req.get("OrgCode").equals("")) {
+			map.put("bizOrgCode", req.get("OrgCode"));
+			req.remove("OrgCode");
+		}
+
+		/* BUG2680 查询部门人员错误 传递参数类型不正确 修改为string 2021-09-14 陈召 开始 */
+		if (!req.isEmpty()&&req.containsKey("amosOrgId") && !ObjectUtils.isEmpty(req.get("amosOrgId"))) {
+			map.put("amosOrgCode", req.get("amosOrgId"));// 当时给前端给的key名字错了，以为是传Id过来，现在传名字，那就将错就错吧
+		}
+
+		req.remove("bizOrgName");
+		req.remove("pageSize");
+		req.remove("pageNum");
+		req.remove("parentId");
+		req.remove("amosOrgId");
+		req.remove("company");
+		map.put("fieldsValue", req);
+		map.put("fields", alertFormServiceImpl.queryListByFormId(OrgPersonEnum.人员.getCode()));
+		pageBean.setTotal(this.baseMapper.selectPersonListCount(map));
+		map.put("pageNum", (pageBean.getCurrent() - 1) * pageBean.getSize());
+		map.put("pageSize", pageBean.getSize());
+		List<Map<String, Object>> list = this.baseMapper.selectPersonList(map);
+		//处理循环中的远程调用（原有逻辑不变）
+		List<String> amosIds = new ArrayList<>();
+		list.stream().forEach(t -> {
+			// BUG2886 因为前期沟通 人员code 可能会发生改变 所以 现在接口code 不再保存，查询数据时通过接口重新赋值 by kongfm
+			// 2021-09-16
+			if (null != t.get("amosOrgId") && StringUtils.isNotEmpty(t.get("amosOrgId").toString())) {
+				amosIds.add(t.get("amosOrgId").toString());
+//				FeignClientResult<AgencyUserModel> result1 = Privilege.agencyUserClient
+//						.queryByUserId(t.get("amosOrgId").toString());
+//				if (null != result1.getResult()) {
+//					t.put("amosOrgCode", result1.getResult().getRealName());
+//				}
+				String chargePersonId = iOrgUsrService.getIdNumberByAmosId(t.get("amosOrgId").toString());
+				t.put("chargePersonId", chargePersonId);
+			} else {
+				t.put("chargePersonId", null);
+			}
+			if (!ObjectUtils.isEmpty(t.get("state"))) {
+				DataDictionary gwmc = dataDictionaryService.getByCode(t.get("state").toString(), "RYZT");
+				if (!ObjectUtils.isEmpty(gwmc)) {
+					t.put("stateName", gwmc.getName());
+				} else {
+					t.put("stateName", t.get("state"));
+				}
+			}
+
+		});
+		if (CollectionUtils.isNotEmpty(amosIds)) {
+			String join = String.join(",", amosIds);
+			List<AgencyUserModel> amosUser = Privilege.agencyUserClient.queryByIds(join, false).getResult();
+			Map<String, AgencyUserModel> collect = amosUser.stream().collect(Collectors.toMap(AgencyUserModel::getUserId, t -> t));
+			list.stream().forEach(t -> {
+				if (null != t.get("amosOrgId") && StringUtils.isNotEmpty(t.get("amosOrgId").toString()) && collect.containsKey(t.get("amosOrgId").toString())) {
+					t.put("amosOrgCode", collect.get(t.get("amosOrgId").toString()).getRealName());
+				}
+			});
+		}
+		/* Bug2652 根据名字和工号模糊查询失效 已添加模糊匹配 2021-09-01 陈召 结束 */
+		pageBean.setRecords(list);
+
+		Calendar calendar = Calendar.getInstance();
+		calendar.add(Calendar.DAY_OF_YEAR,1);
+		calendar.set(Calendar.HOUR_OF_DAY,0);
+		calendar.set(Calendar.SECOND,0);
+		calendar.set(Calendar.MINUTE,0);
+		calendar.set(Calendar.MILLISECOND,0);
+		//当前时间与晚上十二点的秒差
+		Long timeOut = (calendar.getTimeInMillis()-System.currentTimeMillis()) / 1000;
+		redisUtils.set("userList:" + bizOrgCode, pageBean, timeOut);
+		return pageBean;
+	}
+
 	@Override
 	public List<FormValue> getFormValue(Long id) {
 		// 动态表单数据

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

@@ -225,6 +225,7 @@ public class EquipmentAlarmController extends AbstractBaseController {
     public ResponseModel listAlarmsPage(@RequestParam(value = "beginDate", required = false) String beginDate,
                                         @RequestParam(value = "endDate", required = false) String endDate,
                                         @RequestParam(value = "warehouseStructureName", required = false) String warehouseStructureName,
+                                        // 此处equipCode指的是equipmentSpecificCode
                                         @RequestParam(value = "equipCode", required = false) String equipCode,
                                         @RequestParam(value = "equipDetailCode", required = false) String equipDetailCode,
                                         @RequestParam(value = "confirmType", required = false) String confirmType,
@@ -235,6 +236,9 @@ public class EquipmentAlarmController extends AbstractBaseController {
                                         @RequestParam(value = "id", required = false) String id,
                                         @RequestParam(value = "cleanStatus", required = false) String cleanStatus,
                                         @RequestParam(value = "isRemovedFire", required = false) String isRemovedFire,
+                                        @RequestParam(value = "equipmentCode", required = false) String equipmentCode,
+                                        @RequestParam(value = "indexTypeCode", required = false) String indexTypeCode,
+                                        @RequestParam(value = "specificIndexKey", required = false) String specificIndexKey,
                                         CommonPageable commonPageable) {
         List<CommonRequest> queryRequests = new ArrayList<>();
         ReginParams reginParams = getSelectedOrgInfo();
@@ -287,10 +291,28 @@ public class EquipmentAlarmController extends AbstractBaseController {
         request13.setName("isRemovedFire");
         request13.setValue(StringUtil.isNotEmpty(isRemovedFire) ? StringUtils.trimToNull(isRemovedFire) : null);
         queryRequests.add(request13);
+      
         CommonRequest request15 = new CommonRequest();
         request15.setName("equipDetailCode");
         request15.setValue(StringUtil.isNotEmpty(equipDetailCode) ? StringUtils.trimToNull(equipDetailCode) : null);
         queryRequests.add(request15);
+        
+        CommonRequest request16 = new CommonRequest();
+        request16.setName("specificIndexKey");
+        request16.setValue(StringUtil.isNotEmpty(specificIndexKey) ? StringUtils.trimToNull(specificIndexKey) : null);
+        queryRequests.add(request16);
+        
+        CommonRequest request17 = new CommonRequest();
+        request17.setName("indexTypeCode");
+        request17.setValue(StringUtil.isNotEmpty(indexTypeCode) ? StringUtils.trimToNull(indexTypeCode) : null);
+        queryRequests.add(request17);
+        
+        CommonRequest request18 = new CommonRequest();
+        request18.setName("equipmentCode");
+        request18.setValue(StringUtil.isNotEmpty(equipmentCode) ? StringUtils.trimToNull(equipmentCode) : null);
+        queryRequests.add(request18);
+      
+       
         if (equioEnabled){
             if (!ValidationUtil.isEmpty(reginParams.getPersonIdentity())){
                 CommonRequest request14 = new CommonRequest();
@@ -305,6 +327,7 @@ public class EquipmentAlarmController extends AbstractBaseController {
         }
 
             CommonPageInfoParam param = CommonPageParamUtil.fillCommonPageInfoParam(queryRequests, commonPageable);
+
         org.springframework.data.domain.Page<AlarmListDataVO> list = iEquipmentSpecificAlarmService.listAlarmsPage(param);
         return CommonResponseUtil.success(list);
     }

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

@@ -678,14 +678,14 @@ public class FireFightingSystemController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "按照组态格式获取系统报警，或者建筑报警列表", notes = "按照组态格式获取系统报警，或者建筑报警列表")
     @GetMapping(value = "/getEquipmentAlarmBySystemIdOrSourceIdVO/{Systemtype}/{id}")
-    public IPage<EquipmentAlarmBySystemIdOrSourceIdVO> getEquipmentAlarmBySystemIdOrSourceIdVO(Integer pageSize, Integer current, Integer confirmType, String createDate, String type, @PathVariable String Systemtype, @PathVariable Long id) {
+    public IPage<EquipmentAlarmBySystemIdOrSourceIdVO> getEquipmentAlarmBySystemIdOrSourceIdVO(Integer pageSize, Integer current, Integer confirmType, String createDate, String type, @PathVariable String Systemtype, @PathVariable Long id, String equipmentId) {
         Page<EquipmentAlarmBySystemIdOrSourceIdVO> page = new Page();
         page.setCurrent(current);
         page.setSize(pageSize);
         if (("building").equals(Systemtype)) {
-            return fireFightingSystemService.getEquipmentAlarmBySystemIdOrSourceIdVO(page, id, null, confirmType, createDate, type);
+            return fireFightingSystemService.getEquipmentAlarmBySystemIdOrSourceIdVO(page, id, null, confirmType, createDate, type, equipmentId);
         } else if ("system".equals(Systemtype)) {
-            return fireFightingSystemService.getEquipmentAlarmBySystemIdOrSourceIdVO(page, null, id, confirmType, createDate, type);
+            return fireFightingSystemService.getEquipmentAlarmBySystemIdOrSourceIdVO(page, null, id, confirmType, createDate, type, equipmentId);
         } else {
             return page;
         }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/dto/EquipmentDetailDownloadTemplateDto.java

 package com.yeejoin.equipmanage.dto;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.yeejoin.equipmanage.utils.ExplicitConstraint;
+import com.yeejoin.equipmanage.utils.RoleNameExplicitConstraint;
 import lombok.Data;
+import org.bouncycastle.cert.dane.DANECertificateFetcher;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * @author ZeHua Li
@@ -48,4 +54,24 @@ public class EquipmentDetailDownloadTemplateDto implements Serializable {
 
     @Excel(name = "所属单位",width = 30,orderNum = "12")
     private String companyName;
+
+    @Excel(name = "生产日期",width = 30, orderNum = "13")
+    //@Excel(name = "品牌", width = 30, orderNum = "4")
+    private Date productionDate;
+
+    @Excel(name = "报废年限",width = 30, orderNum = "14")
+    //@Excel(name = "品牌", width = 30, orderNum = "4")
+    private String expiryDate;
+
+    @Excel(name = "维保周期",width = 30, orderNum = "15")
+    //@Excel(name = "品牌", width = 30, orderNum = "4")
+    private BigDecimal maintenanceCycle ;
+
+    @Excel(name = "投运时间",width = 30, orderNum = "16")
+    //@Excel(name = "品牌", width = 30, orderNum = "4")
+    private Date deliveryDate;
+    
+    @Excel(name = "所属系统",width = 30, orderNum = "17")
+    //@Excel(name = "所属单位",width = 30,orderNum = "12")
+    private String systemName;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/dto/EquipmentDetailExcelSingleTemplateDto.java

@@ -4,6 +4,9 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.yeejoin.equipmanage.utils.ExplicitConstraint;
 import com.yeejoin.equipmanage.utils.RoleNameExplicitConstraint;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * @author litw
  * @date 2021-10-08.
@@ -60,4 +63,26 @@ public class EquipmentDetailExcelSingleTemplateDto {
     @ExcelProperty(value = "所属单位", index = 11)
     //@Excel(name = "所属单位",width = 30,orderNum = "12")
     private String companyName;
+
+    @ExcelProperty(value = "生产日期", index = 12)
+    //@Excel(name = "品牌", width = 30, orderNum = "4")
+    private Date productionDate;
+
+    @ExcelProperty(value = "报废年限", index = 13)
+    //@Excel(name = "品牌", width = 30, orderNum = "4")
+    private String expiryDate;
+
+    @ExcelProperty(value = "维保周期", index = 14)
+    //@Excel(name = "品牌", width = 30, orderNum = "4")
+    private BigDecimal maintenanceCycle ;
+
+    @ExcelProperty(value = "投运时间", index = 15)
+    //@Excel(name = "品牌", width = 30, orderNum = "4")
+    private Date deliveryDate;
+
+    //动态下拉内容
+    @ExplicitConstraint(indexNum = 16, sourceClass = RoleNameExplicitConstraint.class,method="getFireSystemList") //动态下拉内容
+    @ExcelProperty(value = "所属系统", index = 16)
+    //@Excel(name = "所属单位",width = 30,orderNum = "12")
+    private String systemName;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/dto/EquipmentDetailExcelTemplateDto.java

@@ -5,6 +5,8 @@ import com.yeejoin.equipmanage.utils.ExplicitConstraint;
 import com.yeejoin.equipmanage.utils.RoleNameExplicitConstraint;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * @author litw
@@ -62,4 +64,26 @@ public class EquipmentDetailExcelTemplateDto implements Serializable {
     @ExcelProperty(value = "所属单位", index = 11)
     //@Excel(name = "所属单位",width = 30,orderNum = "12")
     private String companyName;
+
+    @ExcelProperty(value = "生产日期", index = 12)
+    //@Excel(name = "品牌", width = 30, orderNum = "4")
+    private Date productionDate;
+
+    @ExcelProperty(value = "报废年限", index = 13)
+    //@Excel(name = "品牌", width = 30, orderNum = "4")
+    private String expiryDate;
+
+    @ExcelProperty(value = "维保周期", index = 14)
+    //@Excel(name = "品牌", width = 30, orderNum = "4")
+    private BigDecimal maintenanceCycle ;
+
+    @ExcelProperty(value = "投运时间", index = 15)
+    //@Excel(name = "品牌", width = 30, orderNum = "4")
+    private Date deliveryDate;
+
+    //动态下拉内容
+    @ExplicitConstraint(indexNum = 16, sourceClass = RoleNameExplicitConstraint.class,method="getFireSystemList") //动态下拉内容
+    @ExcelProperty(value = "所属系统", index = 16)
+    //@Excel(name = "所属单位",width = 30,orderNum = "12")
+    private String systemName;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/FireFightingSystemMapper.java

@@ -111,7 +111,8 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
             , @Param("systemId") Long systemId
             , @Param("confirmType") Integer confirmType
             , @Param("createDate") String createDate
-            , @Param("type") String type);
+            , @Param("type") String type
+            , @Param("equipmentId")String equipmentId);
 
     IPage<EquipTypeImgAmountVO> getColaCategoryAmountList(@Param("page") IPage page,
                                                           @Param("hierarchy") int hierarchy,
@@ -128,6 +129,7 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
                                                              @Param("codeHead") String codeHead,
                                                              @Param("equipTypeAmountPage") EquipTypeAmountPageDTO equipTypeAmountPage);
 
+
     IPage<EquipTypeImgAmountVO> getColaCategoryAmountEquList(@Param("page") IPage page,
                                                              @Param("hierarchy") int hierarchy,
                                                              @Param("codeHead") String codeHead,
@@ -196,6 +198,9 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
     Map<String, Object> fireWaterSysPipeNetwork();
 
 
+    Map<String,Object> fireWaterSysPipeStatus();
+
+
     /**
      * 消防水系统-》消火栓按钮
      *
@@ -307,7 +312,7 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
      *
      * @return
      */
-    Map<String, Object> getFireSystemInfo(HashMap<String, Object> hashMap);
+    List<Map<String, Object>> getFireSystemInfo(HashMap<String, Object> hashMap);
 
     /**
      * 获取系统近一月告警设备top5

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

 package com.yeejoin.equipmanage.service;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -8,13 +12,18 @@ import com.yeejoin.amos.feign.morphic.model.ResourceDTO;
 import com.yeejoin.equipmanage.common.datasync.entity.FireFightingSystem;
 import com.yeejoin.equipmanage.common.entity.FireFightingSystemEntity;
 import com.yeejoin.equipmanage.common.entity.dto.EquipTypeAmountPageDTO;
-import com.yeejoin.equipmanage.common.entity.vo.*;
-import com.yeejoin.equipmanage.common.vo.*;
-
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+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.vo.AlarmDataVO;
+import com.yeejoin.equipmanage.common.vo.EquipmentManageVo;
+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;
 
 public interface IFireFightingSystemService extends IService<FireFightingSystemEntity> {
 
@@ -112,8 +121,7 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
      */
     List<AlarmDataVO> getSystemById(Long id);
 
-    IPage<EquipmentAlarmBySystemIdOrSourceIdVO> getEquipmentAlarmBySystemIdOrSourceIdVO(IPage<EquipmentAlarmBySystemIdOrSourceIdVO> page, Long sourceId, Long systemId, Integer confirmType, String createDate, String type);
-
+    IPage<EquipmentAlarmBySystemIdOrSourceIdVO> getEquipmentAlarmBySystemIdOrSourceIdVO(IPage<EquipmentAlarmBySystemIdOrSourceIdVO> page,Long sourceId,Long systemId,Integer confirmType,String createDate,String type, String equipmentId);
 
     /**
      * 删除装备系统

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

@@ -672,7 +672,7 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
             LinkedHashSet<String> xAxis = new LinkedHashSet<>();
             List<Map<String, Object>> yAxis = new ArrayList<>();
 
-            //  取出所有非空indexName
+            //  取出所有非空indexNamesortMap = {TreeMap@15960}  size = 7
             Set<String> indexKNameSet = list.stream().map(EquipAlarmLineVo::getIndexName).filter(StringUtils::isNotBlank).collect(Collectors.toSet());
             Map<String, List<EquipAlarmLineVo>> dateCollect = list.stream().collect(Collectors.groupingBy(EquipAlarmLineVo::getDate));
             Map<String, List<EquipAlarmLineVo>> sortMap = new TreeMap<>((o1, o2) -> o2.compareTo(o1));
@@ -680,33 +680,32 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
 
             //  迭代器倒序遍历map
             String date = null;
-            for (String indexName : indexKNameSet) {
+            HashSet<String> dateSet = new HashSet<>();
+            for (int i = 0; i < indexKNameSet.size(); i++) {
                 HashMap<String, Object> dataMap = new HashMap<>();
                 LinkedList<Object> yData = new LinkedList<>();
+                dataMap.put("data", yData);
+                yAxis.add(dataMap);
+            }
+            int index = 0;
+            for (String indexName : indexKNameSet) {
+                HashMap<String, Object> dataMap = (HashMap<String, Object>) yAxis.get(index++);
+                LinkedList<Object> yData = (LinkedList<Object>) dataMap.get("data");
                 //  解决迭代器遍历一次的问题
                 ListIterator<Map.Entry<String, List<EquipAlarmLineVo>>> i = new ArrayList<Map.Entry<String, List<EquipAlarmLineVo>>>(sortMap.entrySet()).listIterator(sortMap.size());
                 while (i.hasPrevious()) {
                     Map.Entry<String, List<EquipAlarmLineVo>> entry = i.previous();
                     String key = entry.getKey();
-                    List<EquipAlarmLineVo> value = entry.getValue();
-
-                    for (EquipAlarmLineVo vo : value) {
-                        String name = vo.getIndexName();
-                        if (key.equals(date)) {
-                            yData = (LinkedList<Object>) yAxis.get(i.previousIndex()).get("data");
-                        }
-                        if (indexName.equals(name)) {
-                            yData.add(vo.getTotal());
-                        } else {
-                            yData.add(0);
-                        }
+                    List<EquipAlarmLineVo> collect = entry.getValue().stream().filter(x -> indexName.equals(x.getIndexName())).collect(Collectors.toList());
+                    if (!CollectionUtils.isEmpty(collect)) {
+                        yData.add(collect.get(0).getTotal());
+                    } else {
+                        yData.add(0);
                     }
                     xAxis.add(key.substring(5));
-                    date = key;
                 }
                 dataMap.put("data", yData);
                 dataMap.put("name", indexName);
-                yAxis.add(dataMap);
             }
             resultMap.put("legend", indexKNameSet);
             resultMap.put("axisData", xAxis);

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

@@ -957,11 +957,8 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
     }
 
     @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);
+    public IPage<EquipmentAlarmBySystemIdOrSourceIdVO> getEquipmentAlarmBySystemIdOrSourceIdVO(IPage<EquipmentAlarmBySystemIdOrSourceIdVO> page, Long sourceId, Long systemId, Integer confirmType, String createDate, String type, String equipmentId) {
+        return this.baseMapper.getEquipmentAlarmBySystemIdOrSourceIdVO(page, sourceId, systemId, confirmType, createDate, type, equipmentId);
     }
 
     private static String getInet4Address() {
@@ -1031,6 +1028,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
             this.putAll(data, fireFightingSystemMapper.fireWaterSysWaterPump());
             this.putAll(data, fireFightingSystemMapper.fireWaterSysHydrant());
             this.putAll(data, fireFightingSystemMapper.fireWaterSysPipeNetwork());
+//            this.putAll(data, fireFightingSystemMapper.fireWaterSysPipeStatus());
         } else {
             data = fireFightingSystemMapper.otherSysIndexNumAndTotal();
         }
@@ -1267,10 +1265,10 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
     @Override
     public Map<String, Object> getSystemStatus(HashMap<String, Object> hashMap) {
         Map<String, Object> resultMap = new HashMap<>();
-        Map<String, Object> map = fireFightingSystemMapper.getFireSystemInfo(hashMap);
+        List<Map<String, Object>> map = fireFightingSystemMapper.getFireSystemInfo(hashMap);
         if (!map.isEmpty()) {
             ArrayList<Object> status = new ArrayList<>();
-            status.add(map.get("status"));
+            status.add(map.get(0).get("status"));
             resultMap.put("values", status);
             resultMap.put("labels", status);
         }
@@ -1280,9 +1278,9 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
     @Override
     public Map<String, Object> getSystemName(HashMap<String, Object> hashMap) {
         Map<String, Object> resultMap = new HashMap<>();
-        Map<String, Object> map = fireFightingSystemMapper.getFireSystemInfo(hashMap);
+        List<Map<String, Object>> map = fireFightingSystemMapper.getFireSystemInfo(hashMap);
         if (!map.isEmpty()) {
-            resultMap.put("name", map.get("name"));
+            resultMap.put("name", map.get(0).get("name"));
         }
         return resultMap;
     }

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

@@ -7,6 +7,7 @@ import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
+import com.yeejoin.equipmanage.common.utils.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -51,10 +52,6 @@ import com.yeejoin.equipmanage.common.enums.EquipStatusEnum;
 import com.yeejoin.equipmanage.common.enums.JournalTypeEnum;
 import com.yeejoin.equipmanage.common.enums.NoticeEnum;
 import com.yeejoin.equipmanage.common.enums.StockBillTypeEnum;
-import com.yeejoin.equipmanage.common.utils.ExcelUtils;
-import com.yeejoin.equipmanage.common.utils.QRCodeUtil;
-import com.yeejoin.equipmanage.common.utils.SpringUtils;
-import com.yeejoin.equipmanage.common.utils.StringUtil;
 import com.yeejoin.equipmanage.common.vo.StockDataVO;
 import com.yeejoin.equipmanage.dto.EquipmentDetailDownloadTemplateDto;
 import com.yeejoin.equipmanage.mapper.EquipmentDetailMapper;
@@ -113,7 +110,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
     private ProductionQRCode equipmentProductionQRCode;
     @Autowired
     private IEquipmentSpecificIndexSerivce iEquipmentSpecificIndexSerivce;
-    
+
     @Autowired
     IManufacturerInfoService manufacturerInfoService;
 
@@ -308,7 +305,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
     @Override
 //    @Transactional(rollbackFor = Exception.class)
     public Object uploadListByTemplate(List<EquipmentDetailDownloadTemplateDto> equipmentDetailDownloadVOS, ReginParams reginParams, AgencyUserModel agencyUserModel) {
-    	
+
     	StringBuffer fireFightSysIdsBuffer = new StringBuffer();
 
         StringBuffer errBufferName= new StringBuffer();
@@ -626,6 +623,10 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
                  equipmentDetail.setEquipmentName(equipment.getName());
                  equipmentDetail.setName(equipmentDetailDownloadVOS.getName());
                  equipmentDetail.setArea(equipmentDetailDownloadVOS.getDescription());
+                 equipmentDetail.setProductionDate(equipmentDetailDownloadVOS.getProductionDate());
+                 equipmentDetail.setExpiryDate(equipmentDetailDownloadVOS.getExpiryDate());
+                 equipmentDetail.setDeliveryDate(equipmentDetailDownloadVOS.getDeliveryDate());
+                 equipmentDetail.setMaintenanceCycle(equipmentDetailDownloadVOS.getMaintenanceCycle());
 
                  // 导入新增所属单位
 
@@ -668,6 +669,10 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
 
 
                  }
+                 if (StringUtils.isNotBlank(equipmentDetailDownloadVOS.getSystemName())) {
+                     String[] SystemName = equipmentDetailDownloadVOS.getSystemName().split("@");
+                     equipmentSpecific.setSystemId(SystemName[1]);
+                 }
                  equipmentSpecificMapper.insert(equipmentSpecific);
                  StockServiceImpl controllerProxy = SpringUtils.getBean(StockServiceImpl.class);
                  //添加对于装备类型统计数据的刷新

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml

@@ -1319,6 +1319,7 @@
 			es.id,
 			ed.`name`,
 			es.`code`,
+			es.equipment_code AS equipmentCode,
 			es.`qr_code` AS qrCde,
 			es.system_id,
 			ws.full_name as location

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -746,6 +746,9 @@
             <if test='confirmType != null and confirmType == 3'>
                 and wlesal.clean_time IS NOT NULL
             </if>
+            <if test='equipmentId != null'>
+                and wlesal.equipment_id=#{equipmentId}
+            </if>
         </where>
         ) d
         <where>
@@ -1162,288 +1165,16 @@
                     `wl_equipment_specific_index` si
                 WHERE
                     si.equipment_index_key = 'SCS_FireDamper_FireAlarm'
-		    ) AS fhznum
+		    ) AS fhznum,
+		    (SELECT
+	            count(1)
+	        from
+	        `wl_equipment_specific_index` si
+	        where
+	        si.equipment_index_key = 'FAS_VESDA_SignalMAction') as vesdanum
 	    </select>
-	    <select id="fireAlarmSysIndexNumber" resultType="java.util.Map">
-	        SELECT
-		(
-			SELECT
-				count(1)
-			FROM
-				`wl_equipment_specific_index` s
-			WHERE
-				s.equipment_index_key = 'FAS_SmokeAlarm_Shield'
-			AND s.`value` = 'true'
-		) AS ywtcqpb,
-		(
-			SELECT
-				count(1)
-			FROM
-				`wl_equipment_specific_index` s
-			WHERE
-				s.equipment_index_key = 'FAS_SmokeAlarm_Fault'
-			AND s.`value` = 'true'
-		) AS ywtcqgz,
-		(
-			SELECT
-				count(1)
-			FROM
-				`wl_equipment_specific_index` s
-			WHERE
-				s.equipment_index_key = 'FAS_SmokeAlarm_FireAlarm'
-			AND s.`value` = 'true'
-		) AS ywtcqhj,
-		(
-			SELECT
-				count(1)
-			FROM
-				`wl_equipment_specific_index` s
-			WHERE
-				s.equipment_index_key = 'FAS_SoundLightAlarm_Shield'
-			AND s.`value` = 'true'
-		) AS sgbjqpb,
-		(
-			SELECT
-				count(1)
-			FROM
-				`wl_equipment_specific_index` s
-			WHERE
-				s.equipment_index_key = 'FAS_SoundLightAlarm_Fault'
-			AND s.`value` = 'true'
-		) AS sgbjqgz,
-		(
-			SELECT
-				count(1)
-			FROM
-				`wl_equipment_specific_index` s
-			WHERE
-				s.equipment_index_key = 'FAS_SoundLightAlarm_FireAlarm'
-			AND s.`value` = 'true'
-		) AS sgbjqhj,
-		(
-			SELECT
-				count(1)
-			FROM
-				`wl_equipment_specific_index` s
-			WHERE
-				s.equipment_index_key = 'FAS_InfraredLight_Shield'
-			AND s.`value` = 'true'
-		) AS hwdspb,
-		(
-			SELECT
-				count(1)
-			FROM
-				`wl_equipment_specific_index` s
-			WHERE
-				s.equipment_index_key = 'FAS_InfraredLight_Fault'
-			AND s.`value` = 'true'
-		) AS hwdsgz,
-		(
-			SELECT
-				count(1)
-			FROM
-				`wl_equipment_specific_index` s
-			WHERE
-				s.equipment_index_key = 'FAS_InfraredLight_FireAlarm'
-			AND s.`value` = 'true'
-		) AS hwdshj,
-		(
-			SELECT
-				count(1)
-			FROM
-				`wl_equipment_specific_index` s
-			WHERE
-				s.equipment_index_key = 'FAS_ManualAlarm_Shield'
-			AND s.`value` = 'true'
-		) AS sdbjapb,
-		(
-			SELECT
-				count(1)
-			FROM
-				`wl_equipment_specific_index` s
-			WHERE
-				s.equipment_index_key = 'FAS_ManualAlarm_Fault'
-			AND s.`value` = 'true'
-		) AS sdbjagz,
-		(
-			SELECT
-				count(1)
-			FROM
-				`wl_equipment_specific_index` s
-			WHERE
-				s.equipment_index_key = 'FAS_ManualAlarm_FireAlarm'
-			AND s.`value` = 'true'
-		) AS sdbjahj,
-		(
-			SELECT
-				count(1)
-			FROM
-				`wl_equipment_specific_index` s
-			WHERE
-				s.equipment_index_key = 'FAS_TemperatureCable_Shield'
-			AND s.`value` = 'true'
-		) AS gwdlpb,
-		(
-			SELECT
-				count(1)
-			FROM
-				`wl_equipment_specific_index` s
-			WHERE
-				s.equipment_index_key = 'FAS_TemperatureCable_Fault'
-			AND s.`value` = 'true'
-		) AS gwdlgz,
-		(
-			SELECT
-				count(1)
-			FROM
-				`wl_equipment_specific_index` s
-			WHERE
-				s.equipment_index_key = 'FAS_TemperatureCable_FireAlarm'
-			AND s.`value` = 'true'
-		) AS gwdlhj,
-		(
-			SELECT
-				count(1)
-			FROM
-				`wl_equipment_specific_index` s
-			WHERE
-				s.equipment_index_key = 'FAS_TemperatureFireDetector_Shield'
-			AND s.`value` = 'true'
-		) AS fbwgpb,
-		(
-			SELECT
-				count(1)
-			FROM
-				`wl_equipment_specific_index` s
-			WHERE
-				s.equipment_index_key = 'FAS_TemperatureFireDetector_Fault'
-			AND s.`value` = 'true'
-		) AS fbwggz,
-		(
-			SELECT
-				count(1)
-			FROM
-				`wl_equipment_specific_index` s
-			WHERE
-				s.equipment_index_key = 'FAS_TemperatureFireDetector_FireAlarm'
-			AND s.`value` = 'true'
-		) AS fbwgqhj,
-		(
-			SELECT
-				count(1)
-			FROM
-				`wl_equipment_specific_index` s
-			WHERE
-				s.equipment_index_key = 'FAS_AirSampler_Shield'
-			AND s.`value` = 'true'
-		) AS kqcypb,
-		(
-			SELECT
-				count(1)
-			FROM
-				`wl_equipment_specific_index` s
-			WHERE
-				s.equipment_index_key = 'FAS_AirSampler_Fault'
-			AND s.`value` = 'true'
-		) AS kqcygz,
-		(
-			SELECT
-				count(1)
-			FROM
-				`wl_equipment_specific_index` s
-			WHERE
-				s.equipment_index_key = 'FAS_AirSampler_FireAlarm'
-			AND s.`value` = 'true'
-		) AS kqcyhj,
-		(
-			SELECT
-				count(1)
-			FROM
-				`wl_equipment_specific_index` s
-			WHERE
-				s.equipment_index_key = 'FAS_UltravioletLight_Shield'
-			AND s.`value` = 'true'
-		) AS zwhypb,
-		(
-			SELECT
-				count(1)
-			FROM
-				`wl_equipment_specific_index` s
-			WHERE
-				s.equipment_index_key = 'FAS_UltravioletLight_Fault'
-			AND s.`value` = 'true'
-		) AS zwhygz,
-		(
-			SELECT
-				count(1)
-			FROM
-				`wl_equipment_specific_index` s
-			WHERE
-				s.equipment_index_key = 'FAS_UltravioletLight_FireAlarm'
-			AND s.`value` = 'true'
-		) AS zwhyhj,
-		(
-			SELECT
-				count(1)
-			FROM
-				`wl_equipment_specific_index` s
-			WHERE
-				s.equipment_index_key = 'SCS_FireDamper_Shield'
-			AND s.`value` = 'true'
-		) AS fhzpb,
-		(
-			SELECT
-				count(1)
-			FROM
-				`wl_equipment_specific_index` s
-			WHERE
-				s.equipment_index_key = 'SCS_FireDamper_Fault'
-			AND s.`value` = 'true'
-		) AS fhzgz,
-		(
-			SELECT
-				count(1)
-			FROM
-				`wl_equipment_specific_index` s
-			WHERE
-				s.equipment_index_key = 'SCS_FireDamper_FireAlarm'
-			AND s.`value` = 'true'
-		) AS fhzhj,
-		(
-			SELECT
-				count(1)
-			FROM
-				`wl_equipment_specific_index` s
-			WHERE
-				s.equipment_index_key = 'FES_FireBroadcast_Shield'
-			AND s.`value` = 'true'
-		) AS yjgbpb,
-		(
-			SELECT
-				count(1)
-			FROM
-				`wl_equipment_specific_index` s
-			WHERE
-				s.equipment_index_key = 'FES_FireBroadcast_Fault'
-			AND s.`value` = 'true'
-		) AS yjgbgz,
-		(
-			SELECT
-				count(1)
-			FROM
-				`wl_equipment_specific_index` s
-			WHERE
-				s.equipment_index_key = 'FES_FireBroadcast_Start'
-			AND s.`value` = 'true'
-		) AS yjgbqd,
-		(
-			SELECT
-				count(1)
-			FROM
-				`wl_equipment_specific_index` si
-			WHERE
-				si.equipment_index_key = 'FES_FireBroadcast_Start'
-		) AS yjgbnum
+    <select id="fireAlarmSysIndexNumber" resultType="java.util.Map">
+        SELECT * FROM v_fire_fas_index_num
     </select>
     <select id="fireWaterSysHydrant" resultType="java.util.Map">
         SELECT
@@ -1669,6 +1400,18 @@
 	        LIMIT 1
     </select>
 
+    <select id="fireWaterSysPipeStatus" resultType="java.util.Map">
+        SELECT
+         esi.`value`,
+        esi.equipment_index_key
+        FROM
+            `wl_equipment_specific_index` esi
+        LEFT JOIN wl_equipment_specific es ON es.id = esi.equipment_specific_id
+        WHERE
+            -- 此处为水喷雾系统code，水系统实现消息实时刷新
+            es.`code` = "011023306003020000010509"
+    </select>
+
     <select id="fireFoamSysEquipmentIndexNumber" resultType="java.util.Map">
         select * from v_fire_equip_ffs_num
     </select>
@@ -1697,7 +1440,10 @@
 				`d`.`mjnum` AS `mjnum`,
 				`d`.`mjqd` AS `mjqd`,
 				`d`.`mjgz` AS `mjgz`,
-				`d`.`mjpb` AS `mjpb`
+				`d`.`mjpb` AS `mjpb`,
+				`d`.fhzpb AS fhzpb,
+				`d`.fhzgz AS fhzgz,
+				`d`.fhzhj AS fhzhj
 			FROM
 				(
 					SELECT
@@ -1910,7 +1656,34 @@
 							where
 							si.equipment_index_key  = 'ACS_AccessControl_Shield'
 							and si.`value` = 'true'
-						) AS `mjpb`
+						) AS `mjpb`,
+						(
+                            SELECT
+                                count(1)
+                            FROM
+                                `wl_equipment_specific_index` s
+                            WHERE
+                                s.equipment_index_key = 'SCS_FireDamper_Shield'
+                            AND s.`value` = 'true'
+                        ) AS fhzpb,
+                        (
+                            SELECT
+                                count(1)
+                            FROM
+                                `wl_equipment_specific_index` s
+                            WHERE
+                                s.equipment_index_key = 'SCS_FireDamper_Fault'
+                            AND s.`value` = 'true'
+                        ) AS fhzgz,
+                        (
+                            SELECT
+                                count(1)
+                            FROM
+                                `wl_equipment_specific_index` s
+                            WHERE
+                                s.equipment_index_key = 'SCS_FireDamper_FireAlarm'
+                            AND s.`value` = 'true'
+                        ) AS fhzhj
 				) `d`
      </select>
     <select id="fireFoamSysEquipmentNumber" resultType="java.util.Map">
@@ -2651,7 +2424,15 @@
         )))
         LEFT JOIN `wl_manufacturer_info` `mim` ON ((
         `mim`.`id` = `fs`.`construction_unit`
-        )))) `nz` where `nz`.code = #{systemCode} and `nz`.biz_org_code = #{bizOrgCode}
+        )))) `nz`
+        <where>
+            <if test="systemCode!=null and systemCode!=''">
+               and `nz`.code = #{systemCode}
+            </if>
+            <if test="bizOrgCode!=null and bizOrgCode!=''">
+               and `nz`.biz_org_code = #{bizOrgCode}
+            </if>
+        </where>
     </select>
 
     <select id="equipAlarmTOP"  resultType="java.util.Map">