修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -109,6 +109,8 @@ public class CommandController extends BaseController {
     @Autowired
     RemoteSecurityService remoteSecurityService;
     @Autowired
+    private IAircraftService ircraftService;
+    @Autowired
     IAlertFormValueService alertFormValueService;
     // 文件读取参数
     @Value("${file.url}")
@@ -959,47 +961,53 @@ public class CommandController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getOrgUsrzhDto/{id}")
     @ApiOperation(httpMethod = "GET", value = "根据灾情id处置对象单位详情", notes = "根据灾情id处置对象单位详情")
-    public ResponseModel<OrgusrDataxDto> getOrgUsrzhDto(@PathVariable Long id) {
+    public ResponseModel<Object> getOrgUsrzhDto(@PathVariable Long id) {
         AlertCalled AlertCalled = iAlertCalledService.getAlertCalledById(id);
-        String buildId = null;
-        OrgusrDataxDto orgusrDataxDto = new OrgusrDataxDto();
-        if (AlertCalled.getUnitInvolved() != null && !"".equals(AlertCalled.getUnitInvolved())) {
-            List<OrgUsrzhDto> orgUsrzhDto = iOrgUsrService.getOrgUsrzhDto(AlertCalled.getUnitInvolved());
-            orgusrDataxDto.setOrgUsrzhDto(orgUsrzhDto != null && orgUsrzhDto.size() > 0 ? orgUsrzhDto.get(0) : null);
-            if (orgUsrzhDto != null && orgUsrzhDto.size() > 0 && orgUsrzhDto.get(0) != null) {
-                buildId = orgUsrzhDto.get(0).getBuildId();
-            }
-        }
-        if (buildId != null) {
-            List<Map<String, Object>> list = equipFeignClient.findImgByFileCategory(buildId, "fourImg").getResult();
-            List<String> url = new ArrayList<>();
-            if (list != null && list.size() > 0) {
-                list.stream().forEach(map -> {
-                    url.add(map.get("filePath").toString());
-                });
-            }
 
-            //通道
-            List<Map<String, Object>> list1 = equipFeignClient.findImgByFileCategory(buildId, "secondImg").getResult();
-            List<String> url1 = new ArrayList<>();
-            if (list1 != null && list1.size() > 0) {
-                list1.stream().forEach(map -> {
-                    url1.add(map.get("filePath").toString());
-                });
-            }
-            //立面
-            List<Map<String, Object>> list2 = equipFeignClient.findImgByFileCategory(buildId, "threeImg").getResult();
-            List<String> url2 = new ArrayList<>();
-            if (list2 != null && list2.size() > 0) {
-                list2.stream().forEach(map -> {
-                    url2.add(map.get("filePath").toString());
-                });
-            }
-            orgusrDataxDto.setPlanePicture(url);
-            orgusrDataxDto.setScenePicture(url1);
-            orgusrDataxDto.setFacadePicture(url2);
-        }
-        return ResponseHelper.buildResponse(orgusrDataxDto);
+       if("230".equals(AlertCalled.getAlertTypeCode())){
+           AircraftDto aircraftDto=aircraftService.queryByAircraftSeq(RequestContext.getAgencyCode(),id);
+           return ResponseHelper.buildResponse(aircraftDto);
+       }else{
+           String buildId = null;
+           OrgusrDataxDto orgusrDataxDto = new OrgusrDataxDto();
+           if (AlertCalled.getUnitInvolved() != null && !"".equals(AlertCalled.getUnitInvolved())) {
+               List<OrgUsrzhDto> orgUsrzhDto = iOrgUsrService.getOrgUsrzhDto(AlertCalled.getUnitInvolved());
+               orgusrDataxDto.setOrgUsrzhDto(orgUsrzhDto != null && orgUsrzhDto.size() > 0 ? orgUsrzhDto.get(0) : null);
+               if (orgUsrzhDto != null && orgUsrzhDto.size() > 0 && orgUsrzhDto.get(0) != null) {
+                   buildId = orgUsrzhDto.get(0).getBuildId();
+               }
+           }
+           if (buildId != null) {
+               List<Map<String, Object>> list = equipFeignClient.findImgByFileCategory(buildId, "fourImg").getResult();
+               List<String> url = new ArrayList<>();
+               if (list != null && list.size() > 0) {
+                   list.stream().forEach(map -> {
+                       url.add(map.get("filePath").toString());
+                   });
+               }
+
+               //通道
+               List<Map<String, Object>> list1 = equipFeignClient.findImgByFileCategory(buildId, "secondImg").getResult();
+               List<String> url1 = new ArrayList<>();
+               if (list1 != null && list1.size() > 0) {
+                   list1.stream().forEach(map -> {
+                       url1.add(map.get("filePath").toString());
+                   });
+               }
+               //立面
+               List<Map<String, Object>> list2 = equipFeignClient.findImgByFileCategory(buildId, "threeImg").getResult();
+               List<String> url2 = new ArrayList<>();
+               if (list2 != null && list2.size() > 0) {
+                   list2.stream().forEach(map -> {
+                       url2.add(map.get("filePath").toString());
+                   });
+               }
+               orgusrDataxDto.setPlanePicture(url);
+               orgusrDataxDto.setScenePicture(url1);
+               orgusrDataxDto.setFacadePicture(url2);
+           }
+           return ResponseHelper.buildResponse(orgusrDataxDto);
+       }
     }
 
 
@@ -1447,9 +1455,11 @@ public class CommandController extends BaseController {
         //获取正在进行的灾情null
         if (userCar != null) {
             AlertCalled alertCalled = powerTransferCompanyResourcesService.getByPowerTransferCompanyResourId(userCar.getCarId());
-            alertCalled.setLatitude(alertCalled.getCoordinateX()!=null?alertCalled.getCoordinateX().toString():null);
-            alertCalled.setLongitude(alertCalled.getCoordinateY()!=null?alertCalled.getCoordinateY().toString():null);
-            return ResponseHelper.buildResponse(alertCalled);
+            if(alertCalled!=null) {
+                alertCalled.setLatitude(alertCalled.getCoordinateX() != null ? alertCalled.getCoordinateX().toString() : null);
+                alertCalled.setLongitude(alertCalled.getCoordinateY() != null ? alertCalled.getCoordinateY().toString() : null);
+                return ResponseHelper.buildResponse(alertCalled);
+            }
         }
         return ResponseHelper.buildResponse(null);
     }

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

@@ -937,13 +937,13 @@
                     AND ( d.type = 'FIREALARM' OR d.type = 'BREAKDOWN' OR d.type = 'SHIELD' OR d.type = 'NOTICE' )
                 </otherwise>
             </choose>
-            <if test='dto.fireEquipmentName != null  '>
+            <if test="dto.fireEquipmentName != null and dto.fireEquipmentName != '' ">
                 AND d.fireEquipmentName LIKE CONCAT('%', #{dto.fireEquipmentName}, '%' )
             </if>
             <if test='dto.systemIds != null  '>
                 AND d.systemIds in (#{dto.systemIds})
             </if>
-            <if test='dto.confirmUserName != null  '>
+            <if test="dto.confirmUserName != null  and dto.confirmUserName != '' ">
                 AND d.confirmUserName LIKE CONCAT('%', #{dto.confirmUserName}, '%' )
             </if>
             <if test="dto.code != null">