Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -772,7 +772,14 @@ public class OrgUsrController extends BaseController {
     public ResponseModel<String> getIdNumberByAmosId(@RequestParam String amosId) {
     	 return ResponseHelper.buildResponse(iOrgUsrService.getIdNumberByAmosId(amosId));
     }
-    
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "根据平台Id查询人员", notes = "根据平台Id查询人员")
+    @GetMapping(value = "find/getByAmosId")
+    public ResponseModel<Map<String,String>> getByAmosId(@RequestParam List<String> amosIds) {
+        return ResponseHelper.buildResponse(iOrgUsrService.getByAmosId(amosIds));
+    }
     
     
     

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -2367,4 +2367,17 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return null;
 	}
 
+
+	public Map<String,String>	getByAmosId(List<String> amosIds) {
+		if (ValidationUtil.isEmpty(amosIds)) {
+			return null;
+		}
+		LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
+		wrapper.in(OrgUsr::getAmosOrgId, amosIds);
+		wrapper.eq(OrgUsr::getBizOrgType, OrgPersonEnum.人员.getKey());
+		return this.baseMapper.selectList(wrapper).stream().collect(Collectors.toMap(OrgUsr::getAmosOrgId, OrgUsr::getBizOrgName));
+
+
+	}
+
 }
\ No newline at end of file

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

@@ -147,7 +147,15 @@ public class EquipmentSpecificAlarmController extends AbstractBaseController {
         return CommonResponseUtil.success(pageBean);
     }
 
+    @RequestMapping(value = "/getConfirmUser", method = RequestMethod.GET)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "获取处理人", notes = "获取处理人")
+    public ResponseModel<Map<String,String>> getConfirmUser() {
+
+        return  CommonResponseUtil.success(iEquipmentSpecificAlarmService.getConfirmUser());
 
+    }
+    
     /**
      * 设备信息
      *

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/fegin/JcsFeign.java

@@ -143,4 +143,13 @@ public interface JcsFeign {
     ResponseModel<OrgUsrDto> getCompanyByBizOrgCodeList(
             @RequestParam(required = false) String bizOrgCode);
 
+    /**
+     * 根据amosId查询人员
+     *
+     * @return
+     */
+    @RequestMapping(value = "/org-usr/find/getByAmosId", method = RequestMethod.GET, consumes = "application/json")
+    ResponseModel<Map<String,String>> getByAmosId(
+            @RequestParam(required = false) List<String> amosIds);
+
 }

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

@@ -164,6 +164,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();
 
     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

@@ -60,6 +60,10 @@ public interface IEquipmentSpecificAlarmService extends IService<EquipmentSpecif
 
     Page<EquipSpecificAlarmDTO> getEqPage(Page page, AlarmDTO dto);
 
+    Map<String,String> getConfirmUser();
+
+
+
     //各种类型统计
     Integer getcountAlarmtype(String tyep);
 

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

@@ -21,7 +21,9 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import javax.servlet.http.HttpServletResponse;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.equipmanage.common.vo.*;
+import com.yeejoin.equipmanage.fegin.JcsFeign;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.PageImpl;
@@ -97,6 +99,9 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
     @Value("${window.vedioFormat}")
     String vedioFormat;
 
+    @Autowired
+    JcsFeign jcsFeign;
+
     @Override
     public void handleExport(HttpServletResponse response, List<Long> ids, String alarmType) {
         CommonPageInfoParam param = new CommonPageInfoParam();
@@ -607,6 +612,12 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
     }
 
     @Override
+    public  Map<String,String> getConfirmUser() {
+        List<String> confirmUser = equipmentSpecificAlarmMapper.getConfirmUser();
+        return  jcsFeign.getByAmosId(confirmUser).getResult();
+    }
+
+    @Override
     public Integer getcountAlarmtype(String tyep) {
         return equipmentSpecificAlarmMapper.getcountAlarmtype(tyep);
     }

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

@@ -1030,6 +1030,15 @@
         ORDER BY status DESC
     </select>
 
+    <select id="getConfirmUser" resultType="string">
+        SELECT
+            distinct 	confirm_user
+        FROM
+            wl_equipment_specific_alarm_log
+        WHERE
+            confirm_user IS NOT NULL;
+    </select>
+
     <select id="getbyqrCode" resultType="com.yeejoin.equipmanage.common.entity.dto.EquipSpecificAlarmDTO">
 
        SELECT