item：确警接口调试

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

@@ -184,4 +184,8 @@ public class EquipmentSpecificAlarmLog extends BaseEntity {
     @TableField("clean_time")
     @ApiModelProperty(value = "消除时间")
     private Date cleanTime;
+
+    @ApiModelProperty(value = "消除状态")
+    @TableField(exist = false)
+    private String cleanStatus;
 }

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

@@ -23,6 +23,8 @@ public class AlarmListDataVO {
 
     private String alarmEquip;
 
+    private String type;
+
     private String alarmType;
 
     private String alarmInfo;
@@ -34,4 +36,6 @@ public class AlarmListDataVO {
     private String alarmTypeCode;
 
     private String cleanStatus;
+
+    private String cleanStatusVal;
 }
\ No newline at end of file

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

@@ -208,11 +208,13 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
                         || AlarmTypeEnum.PB.getCode().equals(type)) {
                     dataVO.setAlarmType(AlarmTypeEnum.getTypeByCode(String.valueOf(type)));
                 }
+                dataVO.setType(String.valueOf(x.get("type")));
                 dataVO.setAlarmInfo(x.get("fireEquipmentName") + dataVO.getAlarmType());
                 dataVO.setEquipSpeId(Long.valueOf(String.valueOf(x.get("fireEquipmentId"))));
                 dataVO.setAlarmId(Long.valueOf(String.valueOf(x.get("alarmId"))));
                 dataVO.setAlarmTypeCode(String.valueOf(x.get("fireEquipmentSpecificIndexKey")));
                 dataVO.setCleanStatus(String.valueOf(x.get("cleanStatus")));
+                dataVO.setCleanStatusVal(String.valueOf(x.get("cleanStatusVal")));
                 res.add(dataVO);
             });
         }

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

 package com.yeejoin.equipmanage.service.impl;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import com.yeejoin.equipmanage.common.entity.*;
-import com.yeejoin.equipmanage.common.vo.*;
-import com.yeejoin.equipmanage.service.*;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
-import org.typroject.tyboot.core.foundation.utils.Bean;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -42,43 +16,34 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.equipmanage.common.datasync.entity.FireEquipment;
 import com.yeejoin.equipmanage.common.dto.EquipmentSpecificDto;
 import com.yeejoin.equipmanage.common.dto.UserDto;
+import com.yeejoin.equipmanage.common.entity.*;
 import com.yeejoin.equipmanage.common.entity.dto.EquipmentSpecificDTO;
-import com.yeejoin.equipmanage.common.entity.vo.AlamVideoVO;
-import com.yeejoin.equipmanage.common.entity.vo.AlarmInfoVO;
-import com.yeejoin.equipmanage.common.entity.vo.AlarmVO;
-import com.yeejoin.equipmanage.common.entity.vo.ComplementCodeVO;
-import com.yeejoin.equipmanage.common.entity.vo.CurrAlaramVO;
-import com.yeejoin.equipmanage.common.entity.vo.DetailPaneVO;
-import com.yeejoin.equipmanage.common.entity.vo.DevInfoVO;
-import com.yeejoin.equipmanage.common.entity.vo.DevOverviewVO;
-import com.yeejoin.equipmanage.common.entity.vo.EquipmentIndexVO;
-import com.yeejoin.equipmanage.common.entity.vo.EquipmentSecificDetailVO;
-import com.yeejoin.equipmanage.common.entity.vo.EquipmentSpecificVo;
-import com.yeejoin.equipmanage.common.entity.vo.ManufacturerVO;
-import com.yeejoin.equipmanage.common.entity.vo.PartDetailVO;
-import com.yeejoin.equipmanage.common.entity.vo.ProductInfoVO;
-import com.yeejoin.equipmanage.common.entity.vo.SourceNameByEquipSpeIdVO;
-import com.yeejoin.equipmanage.common.entity.vo.SurrVideoVO;
-import com.yeejoin.equipmanage.common.entity.vo.TechInfoListVO;
-import com.yeejoin.equipmanage.common.entity.vo.TechInfoVO;
-import com.yeejoin.equipmanage.common.entity.vo.VideoVO;
-import com.yeejoin.equipmanage.common.enums.BillContentEnum;
-import com.yeejoin.equipmanage.common.enums.BitmapEnum;
-import com.yeejoin.equipmanage.common.enums.EquipmentRiskTypeEnum;
-import com.yeejoin.equipmanage.common.enums.FileTypeEnum;
-import com.yeejoin.equipmanage.common.enums.StockBillTypeEnum;
+import com.yeejoin.equipmanage.common.entity.vo.*;
+import com.yeejoin.equipmanage.common.enums.*;
 import com.yeejoin.equipmanage.common.exception.BaseException;
 import com.yeejoin.equipmanage.common.utils.DateUtils;
 import com.yeejoin.equipmanage.common.utils.QRCodeUtil;
 import com.yeejoin.equipmanage.common.utils.StringUtil;
+import com.yeejoin.equipmanage.common.vo.*;
 import com.yeejoin.equipmanage.config.EquipmentIotMqttReceiveConfig;
-import com.yeejoin.equipmanage.fegin.VideoFeignClient;
-import com.yeejoin.equipmanage.mapper.EquipmentIndexMapper;
-import com.yeejoin.equipmanage.mapper.EquipmentSpecificAlarmMapper;
-import com.yeejoin.equipmanage.mapper.EquipmentSpecificMapper;
-import com.yeejoin.equipmanage.mapper.UploadFileMapper;
-import com.yeejoin.equipmanage.mapper.VideoMapper;
+import com.yeejoin.equipmanage.mapper.*;
+import com.yeejoin.equipmanage.service.*;
 import com.yeejoin.equipmanage.utils.RelationRedisUtil;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author ZeHua Li
@@ -436,7 +401,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
         SimpleDateFormat stf = new SimpleDateFormat("yyyy-MM-dd");
         // @TableField(updateStrategy = FieldStrategy.IGNORED) 置空不生效 为空单独设置 by kongfm 2021-09-10
         this.update(new LambdaUpdateWrapper<EquipmentSpecific>().set(EquipmentSpecific::getAgencyId, equipmentSpecific.getAgencyId()).set(EquipmentSpecific::getTeamId, equipmentSpecific.getTeamId()).eq(EquipmentSpecific::getId, equipmentSpecific.getId()));
-        if(equipmentSpecific.getStockDetail() != null && equipmentSpecific.getStockDetail().getWarehouseStructureId() != null){
+        if (equipmentSpecific.getStockDetail() != null && equipmentSpecific.getStockDetail().getWarehouseStructureId() != null) {
             equipmentSpecific.setWarehouseStructureId(equipmentSpecific.getStockDetail().getWarehouseStructureId());
         }
         boolean updateById = this.updateById(equipmentSpecific);
@@ -1028,17 +993,17 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
 
     @Override
     public Object getOneCard(Long id, String type) {
-        if(BitmapEnum.video.getKey().equals(type)){
+        if (BitmapEnum.video.getKey().equals(type)) {
             AlamVideoVO video = videoMapper.getVideoById(id);
-        	if(!ObjectUtils.isEmpty(video)){
+            if (!ObjectUtils.isEmpty(video)) {
                 video.setUrl(videoService.getVideoUrl(video.getName().toString(), video.getPresetPosition(), video.getUrl(), video.getCode()));
                 video.setId(id);
             }
             return video;
-        }else{
+        } else {
             DetailPaneVO detailPaneVO = new DetailPaneVO();
             Map<String, String> map = this.baseMapper.getQrCodeAndPic(id);
-	    	 if(ObjectUtils.isEmpty(map)){
+            if (ObjectUtils.isEmpty(map)) {
                 return detailPaneVO;
             }
             detailPaneVO.setQrCode(map.get("qrCode"));
@@ -1197,7 +1162,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
             equipmentSpecific.setEquipmentDetailId(equipmentDetail.getId());
             equipmentSpecific.setQrCode(qrCode);
             equipmentSpecific.setOrgCode(reginParams.getCompany().getOrgCode());
-            if(equipmentSpecific.getStockDetail() != null && equipmentSpecific.getStockDetail().getWarehouseStructureId() != null){
+            if (equipmentSpecific.getStockDetail() != null && equipmentSpecific.getStockDetail().getWarehouseStructureId() != null) {
                 equipmentSpecific.setWarehouseStructureId(equipmentSpecific.getStockDetail().getWarehouseStructureId());
             }
             boolean save = this.save(equipmentSpecific);
@@ -1275,7 +1240,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
                     equipmentSpecificBatch.setQrCode(list.get(i));
                     equipmentSpecificBatch.setOrgCode(reginParams.getCompany().getOrgCode());
                     equipmentSpecificBatch.setEquipmentDetailId(equipmentDetails.get(i).getId());
-                    if(equipmentSpecific.getStockDetail() != null && equipmentSpecific.getStockDetail().getWarehouseStructureId() != null){
+                    if (equipmentSpecific.getStockDetail() != null && equipmentSpecific.getStockDetail().getWarehouseStructureId() != null) {
                         equipmentSpecificBatch.setWarehouseStructureId(equipmentSpecific.getStockDetail().getWarehouseStructureId());
                     }
                     equipmentSpecifics.add(equipmentSpecificBatch);
@@ -1383,7 +1348,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
                 equipmentSpecific.setOrgCode(reginParams.getCompany().getOrgCode());
                 equipmentSpecific.setEquipmentDetailId(equipmentDetail.getId());
                 equipmentSpecific.setCreateDate(new Date());
-                if(equipmentSpecific.getStockDetail() != null && equipmentSpecific.getStockDetail().getWarehouseStructureId() != null){
+                if (equipmentSpecific.getStockDetail() != null && equipmentSpecific.getStockDetail().getWarehouseStructureId() != null) {
                     equipmentSpecific.setWarehouseStructureId(equipmentSpecific.getStockDetail().getWarehouseStructureId());
                 }
                 //插入设备数据
@@ -1629,26 +1594,14 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
     public Boolean videoOnEquipmentSpecific(VideoOnEquipmentSpecificVo videoOnEquipmentSpecificVo) {
         Long equipmentSpecificId = videoOnEquipmentSpecificVo.getEquipmentSpecificId();
         List<Long> videoIdList = videoOnEquipmentSpecificVo.getVideoIdList();
-        if (equipmentSpecificId != null && !CollectionUtils.isEmpty(videoIdList)) {
+        if (equipmentSpecificId != null) {
             EquipmentSpecific equipmentSpecific = this.baseMapper.selectById(equipmentSpecificId);
             if (!ObjectUtils.isEmpty(equipmentSpecific)) {
+                QueryWrapper<VideoEquipmentSpecific> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("equipment_specific_id", equipmentSpecificId);
+                boolean remove = videoEquipmentSpecificService.remove(queryWrapper);
+                if (remove) {
                     List<VideoEquipmentSpecific> videoSpecificList = new ArrayList<>();
-                List<VideoEquipmentSpecific> list = videoEquipmentSpecificService.findBySpecificIdAndVideoIdIn(equipmentSpecificId, videoIdList);
-                if (!CollectionUtils.isEmpty(list)) {
-                    List<Long> collect = list.stream().map(VideoEquipmentSpecific::getVideoId).collect(Collectors.toList());
-                    //  videoIdList - collect
-                    List<Long> reduce = videoIdList.stream().filter(item -> !collect.contains(item)).collect(Collectors.toList());
-                    if (!CollectionUtils.isEmpty(reduce)) {
-                        reduce.parallelStream().forEach(x -> {
-                            VideoEquipmentSpecific videoEquipmentSpecific = new VideoEquipmentSpecific();
-                            videoEquipmentSpecific.setVideoId(x);
-                            videoEquipmentSpecific.setEquipmentSpecificId(equipmentSpecificId);
-                            videoSpecificList.add(videoEquipmentSpecific);
-                        });
-                        videoEquipmentSpecificService.saveBatch(videoSpecificList);
-                        return Boolean.TRUE;
-                    }
-                } else {
                     videoIdList.parallelStream().forEach(x -> {
                         VideoEquipmentSpecific videoEquipmentSpecific = new VideoEquipmentSpecific();
                         videoEquipmentSpecific.setVideoId(x);
@@ -1657,13 +1610,14 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
                     });
                     videoEquipmentSpecificService.saveBatch(videoSpecificList);
                     return Boolean.TRUE;
+                } else {
+                    throw new RuntimeException("移除设备摄像头绑定关系失败！");
                 }
             } else {
                 throw new RuntimeException("未获取到此设备！");
             }
         } else {
-            throw new RuntimeException("设备ID或摄像头ID集合为空！");
+            throw new RuntimeException("设备ID为空！");
         }
-        return Boolean.FALSE;
     }
 }

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

@@ -44,7 +44,9 @@
 			confirm_user,
 			confirm_user_name,
 			confirm_date,
-			(SELECT GROUP_CONCAT(fem.name) FROM `f_fire_fighting_system` fem WHERE find_in_set(fem.id,spe.system_id)) as systemName
+			(SELECT GROUP_CONCAT(fem.name) FROM `f_fire_fighting_system` fem WHERE find_in_set(fem.id,spe.system_id)) as systemName,
+			if(ala.clean_time is null, '未清除', '已清除') AS cleanStatus,
+			ala.clean_time
         from
             wl_equipment_specific_alarm_log as ala
         left join wl_equipment_specific as spe on spe.id = ala.equipment_specific_id

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

@@ -311,6 +311,11 @@
         '已消除',
         '未消除'
         ) cleanStatus,
+        IF (
+        wlesal.clean_time IS NOT NULL,
+        '1',
+        '2'
+        ) cleanStatusVal,
         wlesal.confirm_type AS handleType,
         wlesal.system_codes AS systemCodes,
         wlesal.equipment_index_id AS fireEquipmentIndexId,
@@ -370,7 +375,7 @@
         </choose>
         <if test="param.beginDate!=null">AND d.createDate <![CDATA[>=]]> #{param.beginDate}</if>
         <if test="param.endDate!=null">AND d.createDate <![CDATA[<=]]> #{param.endDate}</if>
-        <if test="param.alarmType == 'BREAKDOWN' or param.alarmType == 'FIREALARM'">AND d.type = #{param.alarmType}</if>
+        <if test="param.alarmType != null and param.alarmType != ''">AND d.type = #{param.alarmType}</if>
         <if test="param.systemCode != null and param.systemCode != ''">
             AND find_in_set(#{param.systemCode},d.systemCodes)
         </if>