修改接口

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

@@ -189,6 +189,10 @@ public class EquipmentSpecificAlarmLog extends BaseEntity {
     @TableField(exist = false)
     private String cleanStatus;
 
+    @ApiModelProperty(value = "机场单位人员姓名")//只做筛选用
+    @TableField(exist = false)
+    private String jcsConfirmUserName;
+
     /**
      * 颜色
      */

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

@@ -2,6 +2,7 @@ package com.yeejoin.equipmanage.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.equipmanage.common.dto.OrgUsrDto;
+import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarmLog;
 import com.yeejoin.equipmanage.common.entity.dto.AlarmDTO;
 import com.yeejoin.equipmanage.common.entity.dto.EquipSpecificAlarmDTO;
 import com.yeejoin.equipmanage.common.entity.vo.EquipmentAppVO;
@@ -151,7 +152,7 @@ public class EquipmentSpecificAlarmController extends AbstractBaseController {
     @RequestMapping(value = "/getConfirmUser", method = RequestMethod.GET)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "获取处理人", notes = "获取处理人")
-    public ResponseModel<List<OrgUsrDto>> getConfirmUser() {
+    public ResponseModel<List<EquipmentSpecificAlarmLog>> getConfirmUser() {
 
         return  CommonResponseUtil.success(iEquipmentSpecificAlarmService.getConfirmUser());
 

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.equipmanage.common.datasync.entity.FireEquipmentFireAlarm;
 import com.yeejoin.equipmanage.common.entity.EquipmentIndex;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarm;
+import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarmLog;
 import com.yeejoin.equipmanage.common.entity.dto.AlarmDTO;
 import com.yeejoin.equipmanage.common.entity.dto.EquipSpecificAlarmDTO;
 import com.yeejoin.equipmanage.common.entity.vo.EquipmentIotAlarmVO;
@@ -164,7 +165,7 @@ public interface EquipmentSpecificAlarmMapper extends BaseMapper<EquipmentSpecif
     Page<EquipSpecificAlarmDTO> getAlarmPage(Page page, @Param("dto") AlarmDTO dto);
 
     Page<EquipSpecificAlarmDTO> getEqPage(Page page, @Param("dto") AlarmDTO dto);
-    List<String> getConfirmUser();
+    List<EquipmentSpecificAlarmLog> getConfirmUser();
 
     EquipSpecificAlarmDTO getbyqrCode(@Param("code") String code);
 

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.equipmanage.common.datasync.entity.FireEquipmentFireAlarm;
 import com.yeejoin.equipmanage.common.dto.OrgUsrDto;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarm;
+import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarmLog;
 import com.yeejoin.equipmanage.common.entity.dto.AlarmDTO;
 import com.yeejoin.equipmanage.common.entity.dto.EquipSpecificAlarmDTO;
 import com.yeejoin.equipmanage.common.utils.CommonPageInfoParam;
@@ -61,7 +62,7 @@ public interface IEquipmentSpecificAlarmService extends IService<EquipmentSpecif
 
     Page<EquipSpecificAlarmDTO> getEqPage(Page page, AlarmDTO dto);
 
-    List<OrgUsrDto> getConfirmUser();
+    List<EquipmentSpecificAlarmLog> getConfirmUser();
 
 
 

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

@@ -613,10 +613,17 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
     }
 
     @Override
-    public  List<OrgUsrDto> getConfirmUser() {
-        List<String> confirmUser = equipmentSpecificAlarmMapper.getConfirmUser();
+    public  List<EquipmentSpecificAlarmLog> getConfirmUser() {
+        List<EquipmentSpecificAlarmLog> equipSpecificAlarmDTOList = equipmentSpecificAlarmMapper.getConfirmUser();
+        List<String> confirmUser = new ArrayList<>();
+        equipSpecificAlarmDTOList.forEach(e->confirmUser.add(e.getConfirmUser()));
         List<OrgUsrDto> result = jcsFeign.getByAmosId(confirmUser).getResult();
-        return result;
+        equipSpecificAlarmDTOList.stream().forEach(e->result.forEach(a->{
+            if (a.getAmosOrgId().equals(e.getConfirmUser())){
+                e.setJcsConfirmUserName(a.getBizOrgName());
+            }
+                }));
+        return equipSpecificAlarmDTOList;
     }
 
     @Override

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

@@ -1030,9 +1030,10 @@
         ORDER BY status DESC
     </select>
 
-    <select id="getConfirmUser" resultType="string">
+    <select id="getConfirmUser" resultType="com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarmLog">
         SELECT
-            distinct 	confirm_user
+            distinct 	confirm_user,
+                        confirm_user_name
         FROM
             wl_equipment_specific_alarm_log
         WHERE