Merge remote-tracking branch 'origin/develop_dl' into develop_dl

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/EquipTypeImgAmountVO.java

@@ -73,10 +73,10 @@ public class EquipTypeImgAmountVO {
     @ApiModelProperty(value = "分类名称/车或者装备")
     private String systemType;
 
-    @ApiModelProperty(value = "")
+    @ApiModelProperty(value = "状态评估")
     private String other;
 
-    @ApiModelProperty(value = "")
+    @ApiModelProperty(value = "日常运维")
     private String equip;
 
 }

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

@@ -563,6 +563,13 @@ public class FireFightingSystemController extends AbstractBaseController {
         return equipmentSpecificSerivce.getMonitoringUnitList(equipTypeAmountPage);
     }
 
+    @GetMapping(value = "/getMonitoringCount")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "查询监测部件列表", notes = "查询监测部件列表")
+    public List<Map<String, Object>> getMonitoringCount(String bizOrgCode) {
+        return equipmentSpecificSerivce.getMonitoringCount(bizOrgCode);
+    }
+
 
     /**
      * 添加系统

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

@@ -292,4 +292,6 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecific> {
     List<Map<String, Object>> getListByCode(@Param("code") String code, @Param("bizOrgCode") String bizOrgCode);
 
     IPage<EquipTypeImgAmountVO> getMonitoringUnitList(@Param("page") IPage page,@Param("equipTypeAmountPage") EquipTypeAmountPageDTO equipTypeAmountPage);
+
+    List<Map<String, Object >> getMonitoringCount(String bizOrgCode);
 }

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

@@ -287,4 +287,6 @@ public interface IEquipmentSpecificSerivce extends IService<EquipmentSpecific> {
     String updateEquipSpecificStatusByCheckInput( String id);
 
     IPage<EquipTypeImgAmountVO> getMonitoringUnitList(EquipTypeAmountPageDTO equipTypeAmountPage);
+
+    List<Map<String, Object >> getMonitoringCount(String bizOrgCode);
 }

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

@@ -37,6 +37,7 @@ import com.yeejoin.equipmanage.mapper.*;
 import com.yeejoin.equipmanage.remote.RemoteSecurityService;
 import com.yeejoin.equipmanage.service.*;
 import com.yeejoin.equipmanage.utils.RelationRedisUtil;
+import liquibase.pro.packaged.S;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -2150,4 +2151,9 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
     public IPage<EquipTypeImgAmountVO> getMonitoringUnitList(EquipTypeAmountPageDTO equipTypeAmountPage) {
         return equipmentSpecificMapper.getMonitoringUnitList(equipTypeAmountPage.getPage(),equipTypeAmountPage);
     }
+
+    @Override
+    public List<Map<String, Object >> getMonitoringCount(String bizOrgCode) {
+        return equipmentSpecificMapper.getMonitoringCount(bizOrgCode);
+    }
 }

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

@@ -74,6 +74,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         SendToMsgRiskEquipInfoVo equipInfoVo = new SendToMsgRiskEquipInfoVo();
         SendToMsgRiskAlarmInfoVo equipAlarm = new SendToMsgRiskAlarmInfoVo();
         Map<String, Object> m = new HashMap<>();
+        RiskBizInfoVo infoVo = new RiskBizInfoVo();
         if (source.equalsIgnoreCase(RiskSourceTypeEnum.PATROL.getName())) {
             List<Map<String, Object>> checkInputItems = equipmentSpecificMapper.queryCheckInputItemsByCheckId(id);
             Map<String, Object> map = checkInputItems.get(0);
@@ -102,6 +103,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                 m.put("checkUser", String.valueOf(patrolMap.get("username")));
                 m.put("checkResult", String.valueOf(patrolMap.get("inputStatus")));
                 m.put("checkTime", String.valueOf(patrolMap.get("checkTime")));
+                infoVo.setSourceSupplyField(String.valueOf(patrolMap.get("checkInputId")));
             }
         } else if (source.equalsIgnoreCase(RiskSourceTypeEnum.EQUIP.getName())) {
             equipmentSpecId = id;
@@ -148,7 +150,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         }
         detailVo.setEquipInfo(equipInfoVo);
         detailVo.setAlarmInfo(equipAlarm);
-        RiskBizInfoVo infoVo = new RiskBizInfoVo();
+
         infoVo.setWarningObjectName(detailVo.getEquipInfo().getName());
         infoVo.setWarningObjectCode(detailVo.getEquipInfo().getCode());
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -198,15 +200,23 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                     contentVo.setType("qrcode");
                     break;
                 case "alarmContent":
+                    if(!source.equalsIgnoreCase(RiskSourceTypeEnum.PATROL.getName())) {
                         contentVo.setLabel(u.getDescribe());
                         contentVo.setValue(equipAlarm.getAlarmContent());
                         contentVo.setType("text");
                         break;
+                    } else {
+                        break;
+                    }
                 case "alarmDate":
+                    if(!source.equalsIgnoreCase(RiskSourceTypeEnum.PATROL.getName())) {
                         contentVo.setLabel(u.getDescribe());
                         contentVo.setValue(equipAlarm.getAlarmDate());
                         contentVo.setType("text");
                         break;
+                    } else {
+                        break;
+                    }
                 default:
                     log.info("方法参数错误 !!!");
                     break;

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

@@ -2612,14 +2612,27 @@
                 AND  wes.biz_org_code LIKE CONCAT(#{equipTypeAmountPage.bizOrgCode},'%')
             </if>
             <if test="equipTypeAmountPage.equipStatus!=null and equipTypeAmountPage.equipStatus!=''">
-                And wlc.equip_status = #{equipTypeAmountPage.equipStatus}
+                And wes.equip_status = #{equipTypeAmountPage.equipStatus}
             </if>
             <if test="equipTypeAmountPage.equipmentClassificationCode!=null and equipTypeAmountPage.equipmentClassificationCode!=''">
                 and wed.`code` like concat(#{equipTypeAmountPage.equipmentClassificationCode}, '%')
             </if>
-             and wes.id = aqr.buss_id
         </where>
         ORDER BY  CONVERT(bizOrgName USING gbk) ASC, equipStatus DESC
     </select>
+    <select id="getMonitoringCount" resultType="java.util.Map">
+        SELECT
+            wes.id,
+            count(wed.code) AS count,
+            LEFT(wed.code, 8) AS code,
+            wed.equipment_name name
+                FROM
+                    wl_equipment_specific wes
+                    LEFT JOIN wl_equipment_detail wed ON wed.id = wes.equipment_detail_id
+                WHERE
+                    wes.biz_org_code LIKE CONCAT( #{bizOrgCode}, '%' )
+                  AND wed.equipment_name is not null
+                GROUP BY code
+    </select>
 
 </mapper>
\ No newline at end of file