消防巡查隐患优化-指定治理人

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

@@ -570,4 +570,17 @@ public class OrgUsrController extends BaseController {
     public ResponseModel<List<AgencyUserModel>> getAmosUserByOrgUser(@PathVariable String orgUserId) throws Exception {
         return ResponseHelper.buildResponse(iOrgUsrService.getAmosUserByOrgUser(orgUserId));
     }
+
+    /**
+     * 根据机场单位id获取单位人员列表
+     *
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "根据机场单位id获取单位人员列表", notes = "根据机场单位id获取单位人员列表")
+    @GetMapping(value = "/{companyId}/person/list")
+    public ResponseModel<List<OrgUsr>> getPersonListByCompanyId(@PathVariable String companyId) {
+        return ResponseHelper.buildResponse(iOrgUsrService.getPersonListByCompanyId(companyId));
+    }
 }
\ No newline at end of file

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

@@ -1594,6 +1594,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	 * @param id
 	 * @return
 	 */
+	@Override
 	public List<OrgUsr> getPersonListByParentId(Long id) {
 		LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<OrgUsr>();
 		wrapper.eq(OrgUsr::getIsDelete, false);
@@ -1882,4 +1883,22 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		}
 		return amosUser;
 	}
+
+	/**
+	 * 查询组织机构下面的人员列表信息
+	 *
+	 * @param id
+	 * @return
+	 */
+	public List<OrgUsr> getPersonListByCompanyId(String id) {
+		OrgUsr company = this.getById(id);
+		if (ValidationUtil.isEmpty(company)) {
+			return null;
+		}
+		LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<OrgUsr>();
+		wrapper.eq(OrgUsr::getIsDelete, false);
+		wrapper.eq(OrgUsr::getBizOrgType, OrgPersonEnum.人员.getKey());
+		wrapper.likeRight(OrgUsr::getBizOrgCode, company.getBizOrgCode());
+		return this.baseMapper.selectList(wrapper);
+	}
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/LatentDangerController.java

@@ -324,4 +324,11 @@ public class LatentDangerController extends AbstractBaseController {
             return CommonResponseUtil.failure("系统繁忙，请稍后再试");
         }
     }
+
+    @ApiOperation(value = "应急指挥科人员列表", notes = "应急指挥科人员列表")
+    @GetMapping(value = "/emergencyCommandSection/person/list")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    public CommonResponse getPersonListByCompanyId() {
+        return CommonResponseUtil.success(iLatentDangerService.getPersonListByCompanyId());
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/feign/JcsFeignClient.java

@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.List;
+import java.util.Map;
 
 // 机场服务
 @FeignClient(name = "${jcs.fegin.name}", path = "jcs", configuration = FeignConfiguration.class)
@@ -21,5 +22,14 @@ public interface JcsFeignClient {
      **/
     @RequestMapping(value = "/org-usr/amos/list/{orgUserId}", method = RequestMethod.GET)
     ResponseModel<List<AgencyUserModel>> getAmosUserByUserId(@PathVariable String orgUserId);
+
+    /**
+     * 根据机场单位id获取单位下人员列表
+     *
+     * @param companyId 机场单位id
+     * @return Object 单位下人员列表
+     **/
+    @RequestMapping(value = "/org-usr/{companyId}/person/list", method = RequestMethod.GET)
+    ResponseModel<List<Map<String, Object>>> getPersonListByCompanyId(@PathVariable String companyId);
 }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/LatentDangerServiceImpl.java

@@ -207,6 +207,9 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
 
     private String bizType = "patrol";
 
+    @Value("${emergency.command.section.id}")
+    private String emergencyCommandSectionId;
+
     @Transactional
     @Override
     public CommonResponse saveNormal(LatentDangerNormalParam latentDangerParam, String userId, String userRealName, String departmentId, String departmentName, String companyId, String orgCode, RoleBo role) {
@@ -1703,4 +1706,10 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
         }
         return taskId;
     }
+
+    @Override
+    public List<Map<String, Object>> getPersonListByCompanyId() {
+        List<Map<String, Object>> personList = jcsFeignClient.getPersonListByCompanyId(emergencyCommandSectionId).getResult();
+        return personList;
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/ILatentDangerService.java

 package com.yeejoin.amos.patrol.business.service.intfc;
 
 import java.util.List;
+import java.util.Map;
 
 import org.springframework.data.domain.Page;
 
@@ -83,4 +84,6 @@ public interface ILatentDangerService {
     List<DangerTimeAxisVo> queryExecuteLog(Integer dateTime);
 
     String queryTaskByInstanceId(String processInstanceId);
+
+    List<Map<String, Object>> getPersonListByCompanyId();
 }