修改bug

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

@@ -48,7 +48,7 @@ public class ConfirmAlarmController extends AbstractBaseController {
     @GetMapping(value = "/getDetailsById")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "根据id，type查询确警页面相关数据")
-    public Map<String, Object> getDetailsById(@RequestParam Long alamId, @RequestParam(required = false) Long equipId, @RequestParam(required = false) String type, @RequestParam String area) {
+    public Map<String, Object> getDetailsById(@RequestParam String alamId, @RequestParam(required = false) String equipId, @RequestParam(required = false) String type, @RequestParam String area) {
         return iConfirmAlarmService.getDetailsById(alamId, equipId, type, area);
     }
 

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

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param;
 
 public interface ConfirmAlarmMapper extends BaseMapper<EquipmentSpecificAlarm> {
 
-	EquipmentSpecificAlarmLog  getDetailsById(@Param("id") Long id, @Param("equipId")Long equipId);
+	EquipmentSpecificAlarmLog  getDetailsById(@Param("id") String id, @Param("equipId")String equipId);
 
     int confirmAlam(EquipmentSpecificAlarmLog ent);
 

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

@@ -17,7 +17,7 @@ public interface IConfirmAlarmService extends IService<EquipmentSpecificAlarm> {
     /**
      * 根据id查询确警页面相关数据
      */
-    Map<String ,Object> getDetailsById( Long alamId,  Long equipId , String type, String area);
+    Map<String ,Object> getDetailsById(String alamId,  String equipId , String type, String area);
 
     Map<String ,Integer> videoList(List<String> list);
 

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

@@ -133,11 +133,11 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
     private SourceSceneMapper sourceSceneMapper;
 
     @Override
-    public Map<String, Object> getDetailsById(Long alarmId, Long equipId, String type, String area) {
+    public Map<String, Object> getDetailsById(String alarmId, String equipId, String type, String area) {
         final String videoType = "video";
         Map<String, Object> res = new HashMap<>();
         if (videoType.equals(type)) {
-            List<AlamVideoVO> video = videoMapper.getVideoBySpeId(equipId);
+            List<AlamVideoVO> video = videoMapper.getVideoBySpeId(Long.valueOf(equipId));
             video.forEach(action -> {
                 action.setVedioFormat(vedioFormat);
                 action.setUrl(videoService.getVideoUrl(action.getName(), action.getPresetPosition(), action.getUrl(), action.getCode()));
@@ -153,7 +153,7 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
         }
         List<AlamVideoVO> videoBySpeId;
         if (specificAlarm == null) {
-            videoBySpeId = videoMapper.getVideoBySpeId(equipId);
+            videoBySpeId = videoMapper.getVideoBySpeId(Long.valueOf(equipId));
         } else {
             videoBySpeId = videoMapper.getVideoBySpeId(specificAlarm.getEquipmentSpecificId());
         }
@@ -449,7 +449,7 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
 //        Token serverToken = remoteSecurityService.getServerToken();
         IotSystemAlarmRo confirmAlamVo = new IotSystemAlarmRo();
         confirmAlamVo.setId(ent.getId());
-        ent = confirmAlarmMapper.getDetailsById(ent.getId(), null);
+        ent = confirmAlarmMapper.getDetailsById(String.valueOf(ent.getId()), null);
         EquipmentSpecific equipmentSpecific = equipmentSpecificSerivce.getById(ent.getEquipmentSpecificId());
 
         List<FormInstance> formInstances =  new ArrayList<>();

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

@@ -592,7 +592,7 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
     }
 
     private List<AlarmDataVO> getProcessInfo(Long id) {
-        EquipmentSpecificAlarmLog alam = confirmAlarmMapper.getDetailsById(id, null);
+        EquipmentSpecificAlarmLog alam = confirmAlarmMapper.getDetailsById(String.valueOf(id), null);
 
         List<AlarmDataVO> lists = new ArrayList<>();
         AlarmDataVO v1 = new AlarmDataVO();

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

@@ -729,7 +729,7 @@
             LEFT JOIN wl_equipment_specific_alarm wlesa ON wlesa.id = wlesal.equipment_specific_alarm_id
         <where>
             <if test="systemId!=null">
-                and find_in_set(#{systemId},wlesal.system_ids)
+                and 0 <![CDATA[<>]]> find_in_set(#{systemId},wlesal.system_ids)
             </if>
             <if test="sourceId!=null">
                 and (wlesal.build_id=#{sourceId}