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

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FirefightersMapper.xml

@@ -47,6 +47,34 @@
     <!--消防队员列表按时间倒叙排列add desc 2021-09-08 by kongfm -->
     <select id="getFirefightersCount" resultType="Map">
         select COUNT(a.sequence_nbr) num from cb_firefighters a LEFT JOIN
+        cb_firefighters_post b on
+        a.sequence_nbr=b.firefighters_id where
+        a.is_delete=0
+        <if test='par.bizOrgCode!=null'>and a.biz_org_code like concat ('%',#{par.bizOrgCode},'%')</if>
+        <if test='par.postQualification!=null'>and b.post_qualification_code = #{par.postQualification}</if>
+        <if test='par.areasExpertise!=null'>and b.areas_expertise_code= #{par.areasExpertise}</if>
+        <if test='par.name!=null'>and a.name like concat ('%',#{par.name},'%')</if>
+        <if test='par.address!=null'>and a.residence_detail_val like concat ('%',#{par.address},'%')</if>
+        <if test='par.state!=null'>and a.state_code= #{par.state}</if>
+        <if test='par.company!=null and par.company!= -1'>and a.company= #{par.company}</if>
+        <if test='par.fireTeamId!=null'>and a.fire_team_id= #{par.fireTeamId}</if>
+        <if test='par.jobTitles!=null'>and a.job_title_code in
+            <foreach collection="par.jobTitles" item="id" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        <if
+                test='par.areasExpertiseCode!=null and par.areasExpertiseCode!="0"'>and b.areas_expertise_code
+            =#{par.areasExpertiseCode}
+        </if>
+        <if test='par.company!=null and par.company!= -1'>and a.company= #{par.company}</if>
+
+
+        <if test='par.areasExpertiseCode=="0"'>and b.areas_expertise_code is not null</if>
+<!--
+
+
+        select COUNT(a.sequence_nbr) num from cb_firefighters a LEFT JOIN
         cb_firefighters_post b on a.sequence_nbr=b.firefighters_id where
         a.is_delete=0
         <if test='par.bizOrgCode!=null'>and a.biz_org_code like concat ('%',#{par.bizOrgCode},'%')</if>
@@ -64,7 +92,7 @@
         </if>
         <if test='par.areasExpertiseCode=="0"'>and b.areas_expertise_code is not null</if>
 
-        ORDER BY a.rec_date desc
+        ORDER BY a.rec_date desc-->
     </select>
 
 

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

@@ -2,6 +2,7 @@ package com.yeejoin.equipmanage.common.utils;
 
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex;
 import com.yeejoin.equipmanage.common.entity.vo.StateVo;
+import com.yeejoin.equipmanage.common.enums.AlarmStatusEnum;
 import com.yeejoin.equipmanage.common.enums.EquipmentRiskTypeEnum;
 import com.yeejoin.equipmanage.common.enums.EquipmentStateEnum;
 import com.yeejoin.equipmanage.common.enums.TrueOrFalseEnum;
@@ -268,7 +269,7 @@ public class EquipmentStateUtil {
     
     public static String judgeEquipState(EquipmentSpecificIndex index) {
         if (TrueOrFalseEnum.real.value.toUpperCase().equals(String.valueOf(index.getValue()).toUpperCase())) {
-            return index.getEmergencyLevelColor();
+            return AlarmStatusEnum.BJ.getCode() == index.getIsAlarm() ? index.getEmergencyLevelColor() : "";
         }
         return "";
     }

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

@@ -277,7 +277,9 @@ public class EquipmentDetailController extends AbstractBaseController {
                 equipmentSpecific.setPosition(warehouseStructure.getFullName());
             }
         }
-        equipmentSpecific.getStockDetail().setDescription(equipmentDetail.getArea());
+        if (!ObjectUtils.isEmpty(equipmentSpecific.getStockDetail())) {
+            equipmentSpecific.getStockDetail().setDescription(equipmentDetail.getArea());
+        }
         equipmentSpecificSerivce.updateEquipmentSpecific(equipmentSpecific, getSelectedOrgInfo(), getUserInfo());
         // TODO 后续判断成功，执行同步
         // 编辑同步redis装备iotcode数据

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

 package com.yeejoin.equipmanage.service;
 
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.equipmanage.common.entity.SignalClassify;
 
-import java.util.List;
-
 /**
  * 信号分类量测枚举表接口类
  *
@@ -15,4 +12,5 @@ import java.util.List;
  */
 public interface ISignalClassifyService extends IService<SignalClassify> {
 
+    SignalClassify getTypeNameByCode(String code);
 }

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

@@ -153,6 +153,7 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
             if (!ObjectUtils.isEmpty(alarmLog)) {
                 Long equipmentSpecificAlarmId = alarmLog.getEquipmentSpecificAlarmId();
                 ent.setEquipmentSpecificAlarmId(equipmentSpecificAlarmId);
+                ent.setEquipmentSpecificId(alarmLog.getEquipmentSpecificId());
                 ent.setEquipmentSpecificIndexKey(alarmLog.getEquipmentSpecificIndexKey());
                 String cleanType = equipmentSpecificMapper.getEquipmentBySpecificId(alarmLog.getEquipmentSpecificId());
                 if (StringUtil.isNotEmpty(cleanType) && AlarmCleanTypeEnum.QRXC.getCode().equals(cleanType)) {

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

@@ -17,14 +17,12 @@ import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 import javax.servlet.http.HttpServletResponse;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.equipmanage.common.dto.OrgUsrDto;
 import com.yeejoin.equipmanage.common.vo.*;
 import com.yeejoin.equipmanage.fegin.JcsFeign;
+import com.yeejoin.equipmanage.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.PageImpl;
@@ -58,11 +56,6 @@ import com.yeejoin.equipmanage.mapper.EquipmentSpecificAlarmLogMapper;
 import com.yeejoin.equipmanage.mapper.EquipmentSpecificAlarmMapper;
 import com.yeejoin.equipmanage.mapper.EquipmentSpecificMapper;
 import com.yeejoin.equipmanage.mapper.FireFightingSystemMapper;
-import com.yeejoin.equipmanage.service.IEquipmentDetailService;
-import com.yeejoin.equipmanage.service.IEquipmentSpecificAlarmService;
-import com.yeejoin.equipmanage.service.IEquipmentSpecificIndexSerivce;
-import com.yeejoin.equipmanage.service.IEquipmentSpecificSerivce;
-import com.yeejoin.equipmanage.service.IVideoService;
 
 /**
  * @author DELL
@@ -96,6 +89,9 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
     
     @Autowired
     private IVideoService videoService;
+
+    @Autowired
+    private ISignalClassifyService signalClassifyService;
     
     @Value("${window.vedioFormat}")
     String vedioFormat;
@@ -106,7 +102,9 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
     @Override
     public void handleExport(HttpServletResponse response, List<Long> ids, String alarmType) {
         CommonPageInfoParam param = new CommonPageInfoParam();
-        param.setAlarmType(alarmType);
+        if (AlarmTypeEnum.GZGJ.getCode().equals(alarmType)) {
+            param.setIsFireAlarm("false");
+        }
         List<HashMap<String, Object>> list = this.baseMapper.getAlarmList(param);
         List<EquipmentAlarmDownloadVO> equipmentDownloads = handleExportData(ids, list);
         if (0 == list.size()) {
@@ -126,8 +124,7 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
                         EquipmentAlarmDownloadVO alarmDownloadVO = new EquipmentAlarmDownloadVO();
                         if ((alarm.get("id").toString()).equals(id.toString())) {
 //                            alarmDownloadVO.setId((Long) alarm.get("id"));
-                            alarmDownloadVO.setAlarmType(AlarmTypeEnum.GZGJ.getCode().equals(alarm.get("type").toString())
-                                    ? AlarmTypeEnum.GZGJ.getType() : AlarmTypeEnum.HZGJ.getType());
+                            alarmDownloadVO.setAlarmType(signalClassifyService.getTypeNameByCode(alarm.get("type").toString()).getTypeName());
                             alarmDownloadVO.setEquipName(alarm.get("fireEquipmentName").toString());
                             alarmDownloadVO.setAlarmContent(alarm.get("alarmContent").toString());
                             alarmDownloadVO.setEquipCode(StringUtil.isNotEmpty(alarm.get("fireEquipmentCode")) ? alarm.get("fireEquipmentCode").toString() : "");
@@ -153,8 +150,7 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
                 list.forEach(alarm -> {
                     EquipmentAlarmDownloadVO alarmDownloadVO = new EquipmentAlarmDownloadVO();
 //                    alarmDownloadVO.setId((Long) alarm.get("id"));
-                    alarmDownloadVO.setAlarmType(AlarmTypeEnum.GZGJ.getCode().equals(alarm.get("type").toString())
-                            ? AlarmTypeEnum.GZGJ.getType() : AlarmTypeEnum.HZGJ.getType());
+                    alarmDownloadVO.setAlarmType(signalClassifyService.getTypeNameByCode(alarm.get("type").toString()).getTypeName());
                     alarmDownloadVO.setEquipName(alarm.get("fireEquipmentName").toString());
                     alarmDownloadVO.setAlarmContent(alarm.get("alarmContent").toString());
                     alarmDownloadVO.setEquipCode(StringUtil.isNotEmpty(alarm.get("fireEquipmentCode")) ? alarm.get("fireEquipmentCode").toString() : "");
@@ -189,7 +185,13 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
             for (Map<String, Object> x : resultPage.getRecords()) {
                 LocalDateTime createDate = (LocalDateTime) x.get("createDate");
                 x.put("createDate", Date.from(createDate.atZone(ZoneId.systemDefault()).toInstant()));
-                x.put("handleType", ConfirmAlamEnum.getTypeByCode(String.valueOf(x.get("handleType"))));
+                if (ObjectUtils.isEmpty(x.get("handleType"))) {
+                    x.put("handleType", null);
+                } else {
+                    String handleType = ConfirmAlamEnum.getTypeByCode(String.valueOf(x.get("handleType")));
+                    x.put("handleType", StringUtil.isNotEmpty(handleType)
+                            ? handleType : signalClassifyService.getTypeNameByCode(String.valueOf(x.get("handleType"))).getTypeName());
+                }
                 // 冗余统一跑马灯显示字段取值
                 x.put("equipmentSpecificIndexName", x.get("fireEquipmentSpecificIndexName"));
             }

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

@@ -480,9 +480,11 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
                 queryWrapper.eq(EquipmentSpecificAlarm::getEquipmentSpecificId, equipmentSpecific.getId());
                 queryWrapper.ne(EquipmentSpecificAlarm::getStatus, AlarmStatusEnum.HF.getCode());
                 List<EquipmentSpecificAlarm> alarms = equipmentSpecificAlarmService.getBaseMapper().selectList(queryWrapper);
-                alarms.stream().map(x -> x.setLocation(equipmentSpecific.getPosition() + " "
-                        + equipmentSpecific.getStockDetail().getDescription())).collect(Collectors.toList());
-                equipmentSpecificAlarmService.updateBatchById(alarms);
+                if (0 < alarms.size()) {
+                    alarms.stream().map(x -> x.setLocation(equipmentSpecific.getPosition() + " "
+                            + equipmentSpecific.getStockDetail().getDescription())).collect(Collectors.toList());
+                    equipmentSpecificAlarmService.updateBatchById(alarms);
+                }
 
                 //生成入库单
                 StockBill stockBill = buildStockBills(equipmentSpecific, reginParams, agencyUserModel);

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

@@ -568,29 +568,30 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
         if (list == null || list.size() == 0) {
             return new ArrayList<>();
         }
-        List<SpeIndexVo> newList = new ArrayList<>();
+//        List<SpeIndexVo> newList = new ArrayList<>();
         List<SpeIndexVo> statusList = new ArrayList<>();
-        for (SpeIndexVo vo : list) {
-            int status = vo.getIsAlarm();
-            if (AlarmStatusEnum.BJ.getCode() == status) {
-                statusList.add(vo);
-            }
-            newList.add(vo);
-        }
-        if (statusList.size() == 0) {
-            return newList;
-        }
+        // 按照http://36.46.149.14:5080/zentao/task-view-5911.html的问题改动如下
+//        for (SpeIndexVo vo : list) {
+//            int status = vo.getIsAlarm();
+//            if (AlarmStatusEnum.BJ.getCode() == status) {
+//                statusList.add(vo);
+//            }
+//            newList.add(vo);
+//        }
+//        if (statusList.size() == 0) {
+//            return newList;
+//        }
         SpeIndexVo spe = new SpeIndexVo();
         spe.setKey(EquipmentSpeIndexEnum.YXZT.getCode());
-        SpeIndexVo latestVo = statusList.get(0);
+        SpeIndexVo latestVo = list.get(0);
         org.springframework.beans.BeanUtils.copyProperties(latestVo, spe);
         spe.setName("当前状态");
-        Map<String, String> map = getStatus(statusList);
+        Map<String, String> map = getStatus(list);
         spe.setValue(map.get("runStatus"));
         spe.setColor(map.get("color"));
         statusList.clear();
         statusList.add(spe);
-        statusList.addAll(newList);
+        statusList.addAll(list);
         return statusList;
     }
 
@@ -614,11 +615,17 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
             map.put("color", "");
             return map;
         }
+        if (StringUtil.isNotEmpty(indexVo.getIndexValue()) && AlarmStatusEnum.HF.getCode() == indexVo.getIsAlarm()) {
+            map.put("runStatus", indexVo.getIndexName());
+            map.put("color", "");
+            return map;
+        }
         if (StringUtil.isNotEmpty(indexVo.getIndexValue()) && TrueOrFalseEnum.real.value.toUpperCase().equals(indexVo.getIndexValue().toUpperCase())) {
             map.put("runStatus", indexVo.getIndexName());
             map.put("color", indexVo.getColor());
             return map;
         }
+
         map.put("runStatus", "运行");
         map.put("color", "");
         return map;

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

 package com.yeejoin.equipmanage.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yeejoin.equipmanage.common.entity.SignalClassify;
 import com.yeejoin.equipmanage.mapper.SignalClassifyMapper;
 import com.yeejoin.equipmanage.service.ISignalClassifyService;
 import org.springframework.stereotype.Service;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-
-import java.util.List;
 
 /**
  * 信号分类量测枚举表服务实现类
@@ -19,4 +16,8 @@ import java.util.List;
 @Service
 public class SignalClassifyServiceImpl extends ServiceImpl<SignalClassifyMapper, SignalClassify> implements ISignalClassifyService {
 
+    @Override
+    public SignalClassify getTypeNameByCode(String code) {
+        return this.baseMapper.selectOne(new LambdaQueryWrapper<SignalClassify>().eq(SignalClassify::getTypeCode, code));
+    }
 }
\ No newline at end of file

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

@@ -73,7 +73,7 @@
 				AND id = #{id}
 			</if>
 			<if test="isBatch == 1">
-				AND equipment_specific_alarm_id = #{equipmentSpecificAlarmId}
+				AND equipment_specific_id = #{equipmentSpecificId} AND equipment_specific_index_key = #{equipmentSpecificIndexKey}
 			</if>
 		</where>
     </update>

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

@@ -459,6 +459,7 @@
             <if test="endDate!=null">AND d.createDate <![CDATA[<=]]> #{endDate}</if>
             <if test="alarmType != null and alarmType != ''">AND d.type = #{alarmType}</if>
             <if test="id != null and id != ''">AND d.id = #{id}</if>
+            <if test="isFireAlarm == 'false'">AND d.type != 'FIREALARM'</if>
         </where>
         ORDER BY d.createDate DESC
     </select>

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

@@ -276,14 +276,16 @@
 			equipindex.`value`,
 			ei.type_code AS 'typeCode',
 			es.qr_code AS 'qrCode',
-			equipindex.color AS emergencyLevelColor
+			equipindex.color AS emergencyLevelColor,
+			equipindex.isAlarm AS isAlarm
 		FROM
 			(
 				SELECT
 					esi.equipment_index_id,
 					esi.equipment_specific_id,
 					esi.`value`,
-					esi.emergency_level_color as color
+					esi.emergency_level_color as color,
+					esi.is_alarm as isAlarm
 				FROM
 					wl_equipment_specific_index esi,
 					(
@@ -318,6 +320,7 @@
 			es.qr_code AS 'qrCode',
 			es.iot_code AS 'iotCode',
 			es.realtime_iot_index_value AS 'value',
+			sc.is_alarm AS isAlarm,
             sc.emergency_level_color AS 'emergencyLevelColor'
 		FROM
 			wl_equipment_specific es,

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

@@ -133,9 +133,10 @@
         ]]>
         <where>
             <if test="id != null">
-                FIND_IN_SET(m.id, getMaintenanceResourceTreeById(#{id}))
+                FIND_IN_SET(m.parent_id, getMaintenanceResourceTreeById(#{id}))
             </if>
         </where>
+        UNION (SELECT f.* from mt_maintenance_resource f where f.id =#{id})
     </select>
     <select id="findByIds" resultType="com.yeejoin.equipmanage.common.vo.MaintenanceResourceDataVo">
         <![CDATA[