修改返回数据格式

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

@@ -777,7 +777,7 @@ public class OrgUsrController extends BaseController {
     @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) {
+    public ResponseModel<List<OrgUsr>> 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

@@ -2368,14 +2368,14 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	}
 
 
-	public Map<String,String>	getByAmosId(List<String> amosIds) {
+	public List<OrgUsr>	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));
+		return this.baseMapper.selectList(wrapper).stream().collect(Collectors.toList());
 
 
 	}

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

 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.dto.AlarmDTO;
 import com.yeejoin.equipmanage.common.entity.dto.EquipSpecificAlarmDTO;
 import com.yeejoin.equipmanage.common.entity.vo.EquipmentAppVO;
@@ -150,7 +151,7 @@ public class EquipmentSpecificAlarmController extends AbstractBaseController {
     @RequestMapping(value = "/getConfirmUser", method = RequestMethod.GET)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "获取处理人", notes = "获取处理人")
-    public ResponseModel<Map<String,String>> getConfirmUser() {
+    public ResponseModel<List<OrgUsrDto>> 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

@@ -149,7 +149,7 @@ public interface JcsFeign {
      * @return
      */
     @RequestMapping(value = "/org-usr/find/getByAmosId", method = RequestMethod.GET, consumes = "application/json")
-    ResponseModel<Map<String,String>> getByAmosId(
+    ResponseModel<List<OrgUsrDto>> 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/service/IEquipmentSpecificAlarmService.java

@@ -3,6 +3,7 @@ package com.yeejoin.equipmanage.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.dto.AlarmDTO;
 import com.yeejoin.equipmanage.common.entity.dto.EquipSpecificAlarmDTO;
@@ -60,7 +61,7 @@ public interface IEquipmentSpecificAlarmService extends IService<EquipmentSpecif
 
     Page<EquipSpecificAlarmDTO> getEqPage(Page page, AlarmDTO dto);
 
-    Map<String,String> getConfirmUser();
+    List<OrgUsrDto> getConfirmUser();
 
 
 

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

@@ -22,6 +22,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import javax.servlet.http.HttpServletResponse;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.equipmanage.common.dto.OrgUsrDto;
 import com.yeejoin.equipmanage.common.vo.*;
 import com.yeejoin.equipmanage.fegin.JcsFeign;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -612,9 +613,10 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
     }
 
     @Override
-    public  Map<String,String> getConfirmUser() {
+    public  List<OrgUsrDto> getConfirmUser() {
         List<String> confirmUser = equipmentSpecificAlarmMapper.getConfirmUser();
-        return  jcsFeign.getByAmosId(confirmUser).getResult();
+        List<OrgUsrDto> result = jcsFeign.getByAmosId(confirmUser).getResult();
+        return result;
     }
 
     @Override