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

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

@@ -57,6 +57,9 @@ public class EquipmentSpecificAlarmLog extends BaseEntity {
     @TableField("confirm_type")
     private String confirmType;
 
+    @ApiModelProperty(value = "确认类型名称，前端已确认时回填用")
+    private String confirmTypeName;
+
     @ApiModelProperty(value = "报警原因")
     @TableField("alarm_reason")
     private String alarmReason;

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

@@ -15,10 +15,19 @@ public class EquiplistSpecificBySystemVO {
 
     @ApiModelProperty(value = "id")
     private Long id;
+
     @ApiModelProperty(value = "设备名")
     private String equipmentName;
+    
     @ApiModelProperty(value = "设备编码")
     private String code;
+
     @ApiModelProperty(value = "设备分组名称")
     private String categoryName;
+
+    @ApiModelProperty(value = "类型")
+    private String type;
+
+    @ApiModelProperty(value = "是否绑定")
+    private Boolean isBound;
 }

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

@@ -13,10 +13,10 @@ import java.io.Serializable;
  */
 @Data
 public class VideoDownloadVO implements Serializable {
-    @ExcelProperty(value = "名称", index = 0)
+    @ExcelProperty(value = "名称(必填)", index = 0)
     private String name;
 
-    @ExcelProperty(value = "编号", index = 1)
+    @ExcelProperty(value = "编号(必填)", index = 1)
     private String code;
 
     @ExcelProperty(value = "视频地址", index = 2)
@@ -31,7 +31,7 @@ public class VideoDownloadVO implements Serializable {
     @ExcelProperty(value = "关联消防设备编码(多个分号分隔)", index = 5)
     private String equipmentSpecificCodes;
 
-    @ExcelProperty(value = "详细地址", index = 6)
+    @ExcelProperty(value = "详细地址(必填)", index = 6)
     private String address;
 
     @ExcelProperty(value = "备注", index = 7)
@@ -39,5 +39,11 @@ public class VideoDownloadVO implements Serializable {
 
     @ExcelProperty(value = "关联电力设备编码(多个分号分隔)", index = 8)
     private String importantEquipmentCodes;
+    
+    @ExcelProperty(value = "视频类型(枪机/球机)(必填)", index = 9)
+    private String type;
+    
+    @ExcelProperty(value = "图片地址", index = 10)
+    private String img;
 
 }

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

+package com.yeejoin.equipmanage.common.enums;
+
+
+/**
+ * 画布资源枚举
+ * @author DELL
+ *
+ */
+public enum VideoTypeEnum {
+
+	gun("枪机", "51000000"),
+	ball("球机", "52000000");
+
+    VideoTypeEnum(String name, String code) {
+        this.name = name;
+        this.code = code;
+    }
+
+    private String name;
+    private String code;
+
+    public String getName() {
+        return name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+    
+
+	public static String getCode(String name) {
+		for (VideoTypeEnum c : VideoTypeEnum.values()) {
+			if (c.getName() == name) {
+				return c.code;
+			}
+		}
+		return "";
+	}
+}

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

@@ -125,11 +125,11 @@ public class BuildingController extends AbstractBaseController {
         return buildService.getScenesList(instanceId, groupType);
     }
 
-    @GetMapping(value = "/equipInSceneId")
+    @GetMapping(value = "/{floorId}/pointInFloor")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "查询建筑画布下装备")
-    public List<EquiplistSpecificBySystemVO> getEquipBySceneId(@RequestParam Long sceneId) {
-        return buildService.getEquipBySceneId(sceneId);
+    @ApiOperation(value = "查询指定楼层下装备、摄像头")
+    public List<EquiplistSpecificBySystemVO> getPointInFloor(@PathVariable Long floorId) {
+        return buildService.getPointInFloor(floorId);
     }
 
     @PostMapping(value = "/commonSave")

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

@@ -45,7 +45,6 @@ public class ConfirmAlarmController extends AbstractBaseController {
     public void confirmAlam(@RequestBody EquipmentSpecificAlarmLog ent) {
         String appKey = getAppKey();
         String product = getProduct();
-        String token = getToken();
         iConfirmAlarmService.confirmAlam(ent, appKey, product, getToken(), getUserId());
     }
 

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

@@ -149,7 +149,7 @@ public class EquipmentAlarmController extends AbstractBaseController {
         CommonRequest request11 = new CommonRequest();
         request11.setName("cleanStatus");
         request11.setValue(StringUtil.isNotEmpty(cleanStatus) ? StringUtils.trimToNull(cleanStatus) : null);
-        queryRequests.add(request1);
+        queryRequests.add(request11);
         CommonRequest request12 = new CommonRequest();
         request12.setName("isRemoveShield");
         request12.setValue(StringUtil.isNotEmpty(isRemoveShield) ? StringUtils.trimToNull(isRemoveShield) : null);

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

@@ -107,15 +107,6 @@ public class EquipmentDetailController extends AbstractBaseController {
             throw new BadRequest("管理方式未输入");
         }
         EquipmentSpecific vo = equipmentDate.getEquipmentSpecific();
-
-//        int code = equipmentSpecificSerivce.count(new QueryWrapper<EquipmentSpecific>().eq("code", vo.getCode()));
-//        int iotCode = equipmentSpecificSerivce.count(new QueryWrapper<EquipmentSpecific>().eq("iot_code", vo.getIotCode()));
-//        if (code > 0){
-//            throw new BadRequest("设备编码重复");
-//        }
-//        if (iotCode > 0){
-//            throw new BadRequest("设备物联编码重复");
-//        }
         String sysCode = vo.getCode();
         if (StringUtils.isNotEmpty(sysCode) && StringUtils.isNotEmpty(sysCode.trim())){
             int code = equipmentSpecificSerivce.count(new QueryWrapper<EquipmentSpecific>().eq("code", sysCode.trim()));
@@ -238,6 +229,7 @@ public class EquipmentDetailController extends AbstractBaseController {
                 equipmentSpecific.setPosition(warehouseStructure.getFullName());
             }
         }
+        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/controller/VideoController.java

@@ -26,6 +26,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.equipmanage.common.entity.Video;
 import com.yeejoin.equipmanage.common.entity.dto.VideoDTO;
 import com.yeejoin.equipmanage.common.entity.dto.VideoSaveDto;
@@ -68,7 +69,7 @@ public class VideoController extends AbstractBaseController {
     @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
     public Video saveVideo(@RequestBody VideoSaveDto video) {
         Video video1 = video.getVideo();
-
+        ReginParams usrinfo = getSelectedOrgInfo();
         if (StringUtils.isNotEmpty(video1.getAddress())) {
             String[] addressData = video1.getAddress().split("@address@");
             if (addressData.length > 1) {
@@ -80,6 +81,10 @@ public class VideoController extends AbstractBaseController {
                 if (StringUtils.isNotEmpty(langLatObj.getString("latitude"))) {
                     video1.setLatitude(Double.valueOf(langLatObj.getString("latitude")));
                 }
+                video1.setOrgCode(usrinfo.getCompany().getOrgCode());
+                video1.setCreatorId(usrinfo.getUserModel().getSequenceNbr());
+                video1.setCreatorName(usrinfo.getUserModel().getRealName());
+                video1.setCompanyName(usrinfo.getCompany().getCompanyName());
                 video.setVideo(video1);
             }
         }

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

@@ -55,13 +55,6 @@ public interface BuildingMapper extends BaseMapper<Building> {
     String getVPointInScene(Long id);
 
     /**
-     * 获取建筑画布下装备
-     * @param ids
-     * @return
-     */
-    List<EquiplistSpecificBySystemVO> getEquipBySceneId( @Param("ids") String[] ids);
-    List<EquiplistSpecificBySystemVO> getVideoBySceneId( @Param("ids") String[] ids);
-    /**
      * 根据类型获取名下画布集合
      * @param id
      * @param groupType

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

@@ -138,7 +138,6 @@ public interface EquipmentSpecificAlarmMapper extends BaseMapper<EquipmentSpecif
 
     Page<Map<String, Object>> page(Page page, @Param("param") CommonPageInfoParam param);
 
-    int count(CommonPageInfoParam param);
 
     List<HashMap<String, Object>> getAlarmList(CommonPageInfoParam param);
 

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

@@ -8,10 +8,7 @@ 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.ComplementCodeVO;
-import com.yeejoin.equipmanage.common.entity.vo.EquipmentSpecificVo;
-import com.yeejoin.equipmanage.common.entity.vo.PointTreeVo;
-import com.yeejoin.equipmanage.common.entity.vo.SourceNameByEquipSpeIdVO;
+import com.yeejoin.equipmanage.common.entity.vo.*;
 import com.yeejoin.equipmanage.common.vo.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -202,4 +199,6 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecific> {
     
     
     List<Map<String,String>> getStationInfo();
+
+    List<EquiplistSpecificBySystemVO> getListByWarehouseStructureId(Long floorId);
 }

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

@@ -85,4 +85,6 @@ public interface VideoMapper extends BaseMapper<Video> {
     List<VideoListVo>listByType(@Param("type")String type);
     
     List<Video>listByCode(@Param("code")String code);
+
+    List<Video> selectListBySourceId(Long floorId);
 }

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

@@ -69,14 +69,6 @@ public interface IBuilldService extends IService<Building> {
     List<SourceScene> getScenesList(Long id, String groupType);
 
     /**
-     * 查询建筑画布下装备
-     *
-     * @param id
-     * @return
-     */
-    List<EquiplistSpecificBySystemVO> getEquipBySceneId(@RequestParam Long id);
-
-    /**
      * 消防建筑树查询接口
      *
      * @return List<BuildingTreeVo>
@@ -298,4 +290,12 @@ public interface IBuilldService extends IService<Building> {
  * @return
  */
 	Map<String, String> getBuildingToLongitudeAndLatitude(String instanceId);
+
+    /**
+     * 查询指定楼层下装备、摄像头
+     * @param floorId 楼层id
+     * @return List<EquiplistSpecificBySystemVO>
+     */
+    List<EquiplistSpecificBySystemVO> getPointInFloor(Long floorId);
+
 }

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

@@ -143,6 +143,9 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
     @Value("${firefightingsystem.equip.alarms.url}")
     private String ffsEquipAlarmsUrl;
 
+    @Autowired
+    EquipmentSpecificMapper equipmentSpecificMapper;
+
     /**
      * @param groupCode
      * @Description 根据groupCode查询allowOperation对应的操作菜单
@@ -276,22 +279,6 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
     }
 
     @Override
-    public List<EquiplistSpecificBySystemVO> getEquipBySceneId(Long id) {
-        String pointInScene = this.baseMapper.getPointInScene(id);
-        String vPointInScene = this.baseMapper.getVPointInScene(id);
-        if (("".equals(pointInScene) || pointInScene == null) && ("".equals(vPointInScene) || vPointInScene == null)) {
-            return new ArrayList<>();
-        }
-        String[] ids = pointInScene.split(",");
-        String[] vids = vPointInScene.split(",");
-        List<EquiplistSpecificBySystemVO> list = new ArrayList<>();
-        list.addAll(this.baseMapper.getEquipBySceneId(ids));
-        list.addAll(this.baseMapper.getVideoBySceneId(vids));
-
-        return list;
-    }
-
-    @Override
     public Object saveForm(String groupCode, String companyCode, Map<String, Object> map) {
         final String instanceId = "instanceId";
         //1.保存表单数据
@@ -1100,4 +1087,36 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
 		// TODO Auto-generated method stub
 		return formInstanceMapper.getBuildingToLongitudeAndLatitude(instanceId);
 	}
+
+    @Override
+    public List<EquiplistSpecificBySystemVO> getPointInFloor(Long floorId) {
+        //0.查询画布信息，todo 建筑可标记点类型为装备、摄像头
+        List<SourceScene> sourceScenes = sourceSceneService.findBySourceId(floorId);
+        SourceScene sourceScene = sourceScenes.size() > 0 ? sourceScenes.get(0) : new SourceScene();
+        //0.1已标记装备点
+        String equipPointInScene = sourceScene.getPointInScene() != null ? sourceScene.getPointInScene() : "";
+        //0.2已标记视频点
+        String videoPointInScene = sourceScene.getVideoInScene() != null ? sourceScene.getVideoInScene() : "";
+        //1.查询楼层下的所有装备list
+        List<EquiplistSpecificBySystemVO> equipmentSpecifics = equipmentSpecificMapper.getListByWarehouseStructureId(floorId);
+        equipmentSpecifics.forEach(e->{
+            e.setIsBound(equipPointInScene.contains(e.getId().toString()));
+            e.setType("装备点");
+        });
+        List<EquiplistSpecificBySystemVO> bySystemVOS = new ArrayList<>(equipmentSpecifics);
+        //2.查询楼层下的所有视频list
+        List<Video> videos = videoMapper.selectListBySourceId(floorId);
+        //3.数据加工
+        videos.forEach(v->{
+            EquiplistSpecificBySystemVO vo = new EquiplistSpecificBySystemVO();
+            vo.setId(v.getId());
+            vo.setCode(v.getCode());
+            vo.setCategoryName(v.getType());
+            vo.setEquipmentName(v.getName());
+            vo.setType("视频点");
+            vo.setIsBound(videoPointInScene.contains(v.getId().toString()));
+            bySystemVOS.add(vo);
+        });
+        return bySystemVOS;
+    }
 }

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

@@ -3,6 +3,8 @@ package com.yeejoin.equipmanage.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.api.dto.IotSystemAlarmRo;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@@ -12,6 +14,7 @@ import com.yeejoin.equipmanage.common.dto.UserDto;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarm;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarmLog;
+import com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex;
 import com.yeejoin.equipmanage.common.entity.vo.AlamVideoVO;
 import com.yeejoin.equipmanage.common.enums.AlarmCleanTypeEnum;
 import com.yeejoin.equipmanage.common.enums.AlarmStatusEnum;
@@ -81,6 +84,9 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
     private IEquipmentSpecificSerivce equipmentSpecificSerivce;
 
     @Autowired
+    private IEquipmentSpecificIndexSerivce iEquipmentSpecificIndexSerivce;
+
+    @Autowired
     private IVideoService videoService;
 
     @Value("${systemctl.jcs.switch}")
@@ -110,7 +116,6 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
     @Override
     public Map<String, Object> getDetailsById(Long alarmId, Long equipId, String type, String area) {
         final String videoType = "video";
-        final String alarmType = "IOT_CORE_PARAM";
         Map<String, Object> res = new HashMap<>();
         if (videoType.equals(type)) {
             List<AlamVideoVO> video = videoMapper.getVideoBySpeId(equipId);
@@ -127,10 +132,6 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
             videoBySpeId = videoMapper.getVideoBySpeId(equipId);
         } else {
             videoBySpeId = videoMapper.getVideoBySpeId(specificAlarm.getEquipmentSpecificId());
-            List<DictionarieValueModel> dict = remoteSecurityService.listDictionaryByDictCode(alarmType);
-            Map<String, String> dictMap = dict.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey, DictionarieValueModel::getDictDataValue));
-            //specificAlarm.getEquipmentSpecificIndexKey() 取值为告警类型type，兼容之前的页面取值
-            specificAlarm.setEquipmentSpecificIndexName(dictMap.get(specificAlarm.getEquipmentSpecificIndexKey()));
         }
 
         videoBySpeId.forEach(action -> {
@@ -160,6 +161,13 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
                     EquipmentSpecificAlarm alarm = equipmentSpecificAlarmMapper.selectById(alarmLog.getEquipmentSpecificAlarmId());
                     alarm.setStatus(AlarmStatusEnum.HF.getCode());
                     equipmentSpecificAlarmMapper.updateById(alarm);
+                    // 警情处理确认后消除更新value 为false,否则灯还在闪
+                    LambdaUpdateWrapper<EquipmentSpecificIndex> updateWrapper =new LambdaUpdateWrapper<EquipmentSpecificIndex>().
+                            set(EquipmentSpecificIndex::getValue,"false").
+                            set(EquipmentSpecificIndex::getUpdateDate,new Date()).
+                            eq(EquipmentSpecificIndex::getEquipmentSpecificId,alarm.getEquipmentSpecificId()).
+                            eq(EquipmentSpecificIndex::getEquipmentIndexKey,alarm.getEquipmentSpecificIndexKey());
+                    iEquipmentSpecificIndexSerivce.update(updateWrapper);
                     MqttReceiveServiceImpl.upAlarmLogStatus(alarmLog.getIotCode(), alarmLog.getEquipmentSpecificIndexKey(), equipmentSpecificAlarmLogService);
                 }
                 //  如果是批量确警，先查询，再确警，用于批量消息推送

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

@@ -177,11 +177,6 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
         Page<Map<String, Object>> resultPage = this.baseMapper.page(result, param);
         if (resultPage.getTotal() > 0) {
             for (Map<String, Object> x : resultPage.getRecords()) {
-                Object type = x.get("type");
-                if (AlarmTypeEnum.HZGJ.getCode().equals(type) || AlarmTypeEnum.GZGJ.getCode().equals(type)) {
-                    x.put("typeCode", type);
-                    x.put("type", AlarmTypeEnum.getTypeByCode(String.valueOf(type)));
-                }
                 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"))));
@@ -209,11 +204,8 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
                     e.printStackTrace();
                 }
                 dataVO.setAlarmEquip(String.valueOf(x.get("fireEquipmentName")));
-                Object type = x.get("type");
-                if (AlarmTypeEnum.HZGJ.getCode().equals(type) || AlarmTypeEnum.GZGJ.getCode().equals(type)
-                        || AlarmTypeEnum.PB.getCode().equals(type)) {
-                    dataVO.setAlarmType(AlarmTypeEnum.getTypeByCode(String.valueOf(type)));
-                }
+                Object alarmType = x.get("alarmType");
+                dataVO.setAlarmType(StringUtil.isNotEmpty(alarmType) ? alarmType.toString() : "");
                 dataVO.setType(String.valueOf(x.get("type")));
                 dataVO.setAlarmInfo(x.get("fireEquipmentName") + dataVO.getAlarmType());
                 dataVO.setEquipSpeId(Long.valueOf(String.valueOf(x.get("fireEquipmentId"))));

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

@@ -1230,6 +1230,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
                 equipmentSpecific.getStockDetail().setEquipmentSpecificId(equipmentSpecific.getId());
                 equipmentSpecific.getStockDetail().setQrCode(qrCode);
                 equipmentSpecific.getStockDetail().setBatchNum(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
+                equipmentSpecific.getStockDetail().setDescription(equipmentDetail.getArea());
                 stockDetailService.save(equipmentSpecific.getStockDetail());
 
                 //4.3生成入库单
@@ -1315,9 +1316,9 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
                         stockDetail.setUpdateDate(new Date());
                         stockDetail.setQrCode(list.get(i));
                         stockDetail.setEquipmentSpecificId(equipmentSpecifics.get(i).getId());
+                        stockDetail.setDescription(equipmentDetail.getArea());
                         stockDetails.add(stockDetail);
                         stockDetail.setBatchNum(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
-
                     }
                     stockDetailService.saveBatch(stockDetails);
                     //5.3生成入库单
@@ -1413,6 +1414,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
                     equipmentSpecific.getStockDetail().setWarehouseId(equipmentSpecific.getStock().getWarehouseId());
                     equipmentSpecific.getStockDetail().setEquipmentSpecificId(equipmentSpecific.getId());
                     equipmentSpecific.getStockDetail().setBatchNum(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
+                    equipmentSpecific.getStockDetail().setDescription(equipmentDetail.getArea());
                     stockDetailService.save(equipmentSpecific.getStockDetail());
                     //生成入库单
                     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

@@ -161,8 +161,8 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
         }
         List<DynamicFormInstance> formInstance = vo.getFormInstances();
         // 验证必填项 BUG 2725 by kongfm 2021-09-09
-        formInstance.stream().forEach(item -> {
-            if (item.getNotNull() == true && StringUtils.isEmpty(item.getFieldValue())) {
+        formInstance.forEach(item -> {
+            if (item.getNotNull() && StringUtils.isEmpty(item.getFieldValue())) {
                 throw new BadRequest(item.getFieldLabel() + "为必填项，请确认");
             }
         });
@@ -770,7 +770,6 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
         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)) {
@@ -786,6 +785,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
             data = fireFightingSystemMapper.fireWaterSysCollectingDevice();
             this.putAll(data, fireFightingSystemMapper.fireWaterSysPool());
             this.putAll(data, fireFightingSystemMapper.fireWaterSysWaterPump());
+            this.putAll(data, fireFightingSystemMapper.fireWaterSysHydrant());
         } else {
             data = fireFightingSystemMapper.otherSysIndexNumAndTotal();
         }

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

@@ -75,9 +75,7 @@ import com.yeejoin.equipmanage.mapper.FireFightingSystemMapper;
 import com.yeejoin.equipmanage.remote.RemoteSecurityService;
 import com.yeejoin.equipmanage.service.ICarPropertyService;
 import com.yeejoin.equipmanage.service.IEquipmentAlarmReportDayService;
-import com.yeejoin.equipmanage.service.IEquipmentDetailService;
 import com.yeejoin.equipmanage.service.IEquipmentIndexService;
-import com.yeejoin.equipmanage.service.IEquipmentService;
 import com.yeejoin.equipmanage.service.IEquipmentSpecificAlarmLogService;
 import com.yeejoin.equipmanage.service.IEquipmentSpecificAlarmService;
 import com.yeejoin.equipmanage.service.IEquipmentSpecificIndexSerivce;
@@ -1137,7 +1135,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                     equipmentSpecificIndex = handleTemperatureAlarm(equipmentSpeIndex, iotDatalist);
                     
                     //指标告警处理
-                    if(1 == equipmentSpecificIndex.getIsAlarm()){
+                    if(equipmentSpecificIndex.getIsAlarm() !=null &&  1 == equipmentSpecificIndex.getIsAlarm()){
                     	equipmentSpecificAlarms.addAll(createIndexAlarmRecord(equipmentSpecificIndex));
                     }
                     
@@ -1451,6 +1449,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
 	      carProperties.forEach(carProperty->{
               if (iotDataVO.getKey().equals(carProperty.getNameKey())) {
                   carProperty.setValue(iotDataVO.getValue().toString());
+                  carProperty.setUpdateDate(new Date());
                   carPropertyVos.add(carPropertyToCarPropertyVo(carProperty));
                   carIndexsList.add(carProperty);
               }

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

@@ -446,7 +446,7 @@ public class SyncDataServiceImpl implements ISyncDataService {
 
     private void sendMessage(SyncDataMessage message) {
         try {
-            emqKeeper.getMqttClient().publish(message.getType().getMqTopic(), message.message2Bytes(), 1, false);
+            emqKeeper.getMqttClient().publish(message.getType().getMqTopic(), message.message2Bytes(), 2, false);
         } catch (MqttException e) {
             e.printStackTrace();
         }

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

@@ -47,6 +47,7 @@ import com.yeejoin.equipmanage.common.entity.vo.VideoDownloadVO;
 import com.yeejoin.equipmanage.common.entity.vo.VideoListVo;
 import com.yeejoin.equipmanage.common.enums.EquipmentSpeIndexEnum;
 import com.yeejoin.equipmanage.common.enums.IndustryEnum;
+import com.yeejoin.equipmanage.common.enums.VideoTypeEnum;
 import com.yeejoin.equipmanage.common.utils.HttpContentTypeUtil;
 import com.yeejoin.equipmanage.common.utils.StringUtil;
 import com.yeejoin.equipmanage.fegin.VideoFeignClient;
@@ -403,8 +404,8 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
             VideoDownloadVO x = videoDownloadVOS.get(i);
             // 数据校验
             if (ValidationUtil.isEmpty(x.getName()) || ValidationUtil.isEmpty(x.getCode())
-                    || ValidationUtil.isEmpty(x.getUrl()) || ValidationUtil.isEmpty(x.getToken())
-                    || ValidationUtil.isEmpty(x.getAddress()) || ValidationUtil.isEmpty(x.getEquipmentSpecificCodes())) {
+//                    || ValidationUtil.isEmpty(x.getUrl()) || ValidationUtil.isEmpty(x.getToken())
+                    || ValidationUtil.isEmpty(x.getAddress())) {
                 throw new RuntimeException("错误行" + rowNum + "：请检查非空字段");
             }
             if (videoCodeSet.contains(x.getCode().trim())) {
@@ -425,6 +426,9 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
             video.setCode(x.getCode());
             video.setRemark(x.getRemark());
             video.setAddress(x.getAddress());
+            video.setImg(x.getImg());
+            video.setType(x.getType());
+            video.setTypeCode(!ObjectUtils.isEmpty(VideoTypeEnum.getCode(x.getType()))?VideoTypeEnum.getCode(x.getType()):"");
             videos.add(video);
             this.baseMapper.insert(video);
             // 处理监控和建筑关系

amos-boot-system-equip/src/main/resources/changelog/wl-3.0.1.xml

@@ -2330,5 +2330,28 @@
             SET eard.is_alarm = ( SELECT is_alarm FROM wl_equipment_index wei WHERE eard.index_id = wei.id );
         </sql>
     </changeSet>
-
+    <changeSet author="suhuiguang" id="1646103800910-2">
+        <comment>wl_stock_detail 更新区域描述 之前新增编辑未更新 alarm表使用到</comment>
+        <sql>
+            update wl_stock_detail
+            sd set sd.description =
+            (select
+            ed.area from wl_equipment_detail ed
+            where
+            ed.id = sd.equipment_detail_id and ed.area <![CDATA[<>]]>''
+            )
+            where sd.description is null;
+        </sql>
+    </changeSet>
+    <changeSet author="suhuiguang" id="1646291252942-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="wl_equipment_specific_alarm_log" columnName="confirm_type_name"/>
+            </not>
+        </preConditions>
+        <comment>wl_equipment_specific_alarm_log add column confirm_type_name 确认类型名称前端回显用</comment>
+        <sql>
+            ALTER TABLE wl_equipment_specific_alarm_log ADD COLUMN `confirm_type_name` varchar(255) DEFAULT NULL COMMENT '确认类型名称前端回显用';
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

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

@@ -135,37 +135,6 @@
         select video_in_scene from wl_source_scene where scene_id =#{id}
     </select>
 
-    <select id="getEquipBySceneId" resultMap="EquiplistBySystemId">
-        SELECT
-                spe.id,
-                det.NAME equipment_name,
-                spe.CODE,
-                wlec.NAME AS category_name
-                FROM
-                wl_equipment_specific AS spe
-                LEFT JOIN wl_equipment_detail AS det ON spe.equipment_detail_id = det.id
-                LEFT JOIN wl_equipment AS wle ON wle.id = det.equipment_id
-                LEFT JOIN wl_equipment_category AS wlec ON wlec.id = wle.category_id
-                WHERE
-                spe.id in
-                <foreach item="item" collection="ids" separator="," open="(" close=")" index="">
-                    #{item}
-                </foreach>
-    </select>
-    <select id="getVideoBySceneId" resultMap="EquiplistBySystemId">
-            SELECT
-            id,
-            name equipment_name,
-            code,
-            name AS category_name
-            FROM
-            wl_video
-            WHERE
-            id in
-            <foreach item="item" collection="ids" separator="," open="(" close=")" index="">
-                #{item}
-            </foreach>
-    </select>
     <select id="getScenesList" resultType="com.yeejoin.equipmanage.common.entity.SourceScene">
         select
         ins.instance_id as id,

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

@@ -17,6 +17,7 @@
 			ala.equipment_specific_id,
 			spe.code AS equipmentSpecificCode,
 			ala.equipment_specific_index_name,
+		    (select  type_name from wl_signal_classify sc where sc.type_code = ala.type limit 1) as equipmentSpecificIndexName,
 			ala.type as equipment_specific_index_key,
 			concat(ala.equipment_specific_name,ala.equipment_specific_index_name) as alarmContent,
 			ala.location AS alarmPlace,
@@ -31,6 +32,7 @@
 			) as protectName,
 			if(confirm_type is null,'去确认','已处理') isConfirm,
 			confirm_type,
+		    (select type_name from wl_signal_classify sc where sc.type_code = ala.confirm_type limit 1) as confirmTypeName,
 			alarm_reason,
 			resolve_result,
 			confirm_user,
@@ -60,6 +62,7 @@
         set
         confirm_date = now(),
         confirm_type = #{confirmType},
+		confirm_type_name = #{confirmTypeName},
         alarm_reason = #{alarmReason},
         resolve_result = #{resolveResult},
         confirm_user = #{confirmUser},

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

@@ -197,7 +197,8 @@
         WHEN 'false' THEN '否'
         ELSE wlesal.equipment_specific_index_value END
         AS fireEquipmentPointValue,
-        wlesal.type AS type,
+        wlesal.type AS typeCode,
+        (select type_name from wl_signal_classify sc where sc.type_code = wlesal.type limit 1) as type,
         wlesal.create_date AS createDate,
         CONCAT_WS(' ', wles.position,wled.area) AS warehouseStructureName, /*告警列表拼接详细地址*/
         (select
@@ -223,10 +224,10 @@
             </if>
             <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'">AND d.type = #{param.alarmType}</if>
-            <if test="param.alarmType == 'FIREALARM'">AND d.type = #{param.alarmType}</if>
+            <if test="param.alarmType == 'BREAKDOWN'">AND d.typeCode = #{param.alarmType}</if>
+            <if test="param.alarmType == 'FIREALARM'">AND d.typeCode = #{param.alarmType}</if>
             <if test="param.orgCode != null and param.orgCode != ''">AND d.org_code = #{param.orgCode}</if>
-            <if test="param.type != null and param.type != ''">AND d.type = #{param.type}</if>
+            <if test="param.type != null and param.type != ''">AND d.typeCode = #{param.type}</if>
             <if test="param.handleStatus != null and param.handleStatus != '' and param.handleStatus == 1">AND
                 d.handleStatus = '已处理'
             </if>
@@ -250,43 +251,11 @@
                 d.cleanStatus = '未消除'
             </if>
             <if test="param.isRemoveShield != null and param.isRemoveShield != ''">AND
-                d.type != 'SHIELD'
+                d.typeCode != 'SHIELD'
             </if>
         </where>
         ORDER BY d.createDate DESC
     </select>
-    <select id="count" resultType="java.lang.Integer">
-        SELECT
-        count(1) AS total_num
-        FROM
-        (
-        SELECT
-        wlesa.id,
-        wlesa.equipment_specific_id AS fireEquipmentId,
-        wles.code AS fireEquipmentCode,
-        wlesa.equipment_index_id AS fireEquipmentIndexId,
-        wlesa.equipment_specific_index_key AS fireEquipmentSpecificIndexKey,
-        wlesa.equipment_specific_index_name AS fireEquipmentSpecificIndexName,
-        wlesa.type AS type,
-        wlesa.create_date AS createDate,
-        wlesa.location AS warehouseStructureName
-        FROM wl_equipment_specific_alarm_log wlesa
-        left join wl_equipment_specific wles ON wlesa.equipment_specific_id = wles.id
-        ) d
-        <where>
-            <if test="warehouseStructureName != null and warehouseStructureName != ''"> d.warehouseStructureName like
-                concat(concat("%",#{warehouseStructureName}),"%")
-            </if>
-            <if test="equipCode != null and equipCode != ''">AND d.fireEquipmentCode like
-                concat(concat("%",#{equipCode}),"%")
-            </if>
-            <if test="beginDate!=null">AND d.createDate >= #{beginDate}</if>
-            <if test="endDate!=null">AND d.createDate <![CDATA[<=]]> #{endDate}</if>
-            <if test="alarmType == 'BREAKDOWN'">AND d.type = #{alarmType}</if>
-            <if test="alarmType == 'FIREALARM'">AND d.type = #{alarmType}</if>
-        </where>
-    </select>
-    
     <select id="pageAlarmsInfo" resultType="Map">
         SELECT
         d.*
@@ -335,6 +304,7 @@
         wlesa.frequency AS frequency,
         wlesal.status AS status,
         wlesal.type AS type,
+        (select  type_name from wl_signal_classify sc where sc.type_code = wlesal.type limit 1) as alarmType,
         wlesal.create_date AS createDate,
         wlesal.build_id AS buildId,
         wlesa.recovery_date AS recoveryDate,

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

@@ -1482,4 +1482,18 @@
 			f_station_info
 		LIMIT 1
     </select>
+    <select id="getListByWarehouseStructureId"
+            resultType="com.yeejoin.equipmanage.common.entity.vo.EquiplistSpecificBySystemVO">
+            SELECT
+              spe.id,
+              spe.name equipment_name,
+              spe.code,
+              wlec.name AS category_name
+            FROM
+              wl_equipment_specific AS spe
+            LEFT JOIN wl_equipment AS wle ON spe.equipment_code = wle.code
+            LEFT JOIN wl_equipment_category AS wlec ON wlec.id = wle.category_id
+            WHERE
+              spe.warehouse_structure_id =#{floorId}
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -377,6 +377,16 @@
         wl_video as wlv
         where wlv.code = #{code}
     </select>
-
-
+    <select id="selectListBySourceId" resultType="com.yeejoin.equipmanage.common.entity.Video">
+        select
+            v.id,
+            v.code,
+            v.name,
+            v.type
+        from
+            wl_video v,
+            wl_video_source vs
+            where vs.source_id = #{floorId}
+            and vs.video_id = v.id
+    </select>
 </mapper>