Skip to content

A
amos-boot-biz
Commit 3773f814 authored by tianbo's avatar tianbo
Browse files
Options

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

parent b09be264
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 27 deletions
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
View file @ 3773f814
......@@ -557,4 +557,17 @@ public class OrgUsrController extends BaseController {
public ResponseModel<Map<String, Integer>> getDeptCountByCompanyIds(@RequestParam List<String> companyIdList) throws Exception {
return ResponseHelper.buildResponse(iOrgUsrService.getDeptCountByCompanyIds(companyIdList));
}
/**
* 根据机场人员ids获取amos平台人员列表
*
* @param
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "根据机场人员ids获取amos平台人员列表", notes = "根据机场人员ids获取amos平台人员列表")
@GetMapping(value = "/amos/list/{orgUserId}")
public ResponseModel<List<AgencyUserModel>> getAmosUserByOrgUser(@PathVariable String orgUserId) throws Exception {
return ResponseHelper.buildResponse(iOrgUsrService.getAmosUserByOrgUser(orgUserId));
}
}
\ 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
View file @ 3773f814
......@@ -1865,4 +1865,21 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
return orgUsrMapper.queryCompanyId(bizOrgName);
}
public List<AgencyUserModel> getAmosUserByOrgUser(String orgUserIds) throws Exception {
if (ValidationUtil.isEmpty(orgUserIds)) {
throw new Exception("账号不存在");
}
List<String> orgUserIdList = Lists.newArrayList(orgUserIds.split(","));
List<OrgUsr> orgUsr = this.baseMapper
.selectList(new LambdaQueryWrapper<OrgUsr>().in(OrgUsr::getSequenceNbr, orgUserIdList));
if (ValidationUtil.isEmpty(orgUsr)) {
throw new Exception("账号不存在");
}
String userIds = Joiner.on(",").join(Lists.transform(orgUsr, OrgUsr::getAmosOrgId));
List<AgencyUserModel> amosUser = Privilege.agencyUserClient.queryByIds(userIds, false).getResult();
if (ValidationUtil.isEmpty(amosUser)) {
throw new Exception("账号不存在");
}
return amosUser;
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/feign/JcsFeignClient.java
View file @ 3773f814
......@@ -7,17 +7,19 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.List;
// 机场服务
@FeignClient(name = "${jcs.fegin.name}", path = "jcs", configuration = FeignConfiguration.class)
public interface JcsFeignClient {
/**
* 根据机场人员id获取amos平台人员id
* 根据机场人员ids获取amos平台人员列表
*
* @param orgUserId 机场单位人员id
* @return AgencyUserModel 平台人员信息
* @param orgUserId 机场单位人员ids
* @return AgencyUserModel 平台人员信息列表
**/
@RequestMapping(value = "/org-usr/amos/{orgUserId}", method = RequestMethod.GET)
ResponseModel<AgencyUserModel> getAmosIdByUserId(@PathVariable String orgUserId);
@RequestMapping(value = "/org-usr/amos/list/{orgUserId}", method = RequestMethod.GET)
ResponseModel<List<AgencyUserModel>> getAmosUserByUserId(@PathVariable String orgUserId);
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/param/LatentDangerExcuteParam.java
View file @ 3773f814
......@@ -52,6 +52,6 @@ public class LatentDangerExcuteParam {
/**
* 治理人员id
*/
public String governUserId;
public String reviewUserIds;
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/LatentDangerServiceImpl.java
View file @ 3773f814
......@@ -1187,7 +1187,7 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
// }
// }
public DangerExecuteSubmitDto executeSubmit(LatentDangerExcuteParam param,
public DangerExecuteSubmitDto executeSubmit(LatentDangerExcuteParam executeParam,
LatentDangerExcuteTypeEnum executeTypeEnum,
LatentDangerBo latentDangerBo,
String userId,
......@@ -1200,15 +1200,16 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
if (executeTypeEnum.equals(LatentDangerExcuteTypeEnum.隐患评审通过)) {
// 消防巡查需求:评审通过后指定治理人
// 1.获取治理人员对应的amos平台人员
AgencyUserModel userModel = jcsFeignClient.getAmosIdByUserId(param.getGovernUserId()).getResult();
governUserId = userModel.getUserName();
if (ValidationUtil.isEmpty(userModel)) {
List<AgencyUserModel> userModelList =
jcsFeignClient.getAmosUserByUserId(executeParam.getReviewUserIds()).getResult();
if (ValidationUtil.isEmpty(userModelList)) {
executeSubmitDto.setIsOk(false);
executeSubmitDto.setMsg("治理人员指定失败");
return executeSubmitDto;
}
governUserId = Joiner.on(",").join(Lists.transform(userModelList, AgencyUserModel::getUserName));
}
JSONObject executeJson = remoteWorkFlowService.execute(param.getTaskId(), executeTypeEnum.getRequestBody());
JSONObject executeJson = remoteWorkFlowService.execute(executeParam.getTaskId(), executeTypeEnum.getRequestBody());
if (executeJson == null) {
executeSubmitDto.setIsOk(false);
executeSubmitDto.setMsg("执行失败");
......@@ -1222,33 +1223,33 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
if (executeTypeEnum.getNextState().equals(LatentDangerStateEnum.已撤销)) {
latentDangerBo.setDangerState(executeTypeEnum.getNextState().getCode().toString());
saveFlowRecord(executeJson.getString("id"), data.getString("name"), userId, departmentId,
param.getFlowJson(), param.getDangerId(), role, executeTypeEnum.getName(),param.getRemark());
executeParam.getFlowJson(), executeParam.getDangerId(), role, executeTypeEnum.getName(),executeParam.getRemark());
} else if (executeTypeEnum.getNextState().equals(LatentDangerStateEnum.治理完毕)) {
latentDangerBo.setDangerState(executeTypeEnum.getNextState().getCode().toString());
saveFlowRecord(executeJson.getString("id"), data.getString("name"), userId, departmentId,
param.getFlowJson(), param.getDangerId(), role, executeTypeEnum.getName(),param.getRemark());
executeParam.getFlowJson(), executeParam.getDangerId(), role, executeTypeEnum.getName(),executeParam.getRemark());
} else {
LatentDangerFlowRecordBo flowRecord = saveFlowRecord(executeJson.getString("id"), data.getString("name"), userId, departmentId,
param.getFlowJson(), param.getDangerId(), role, executeTypeEnum.getName(),param.getRemark());
executeParam.getFlowJson(), executeParam.getDangerId(), role, executeTypeEnum.getName(),executeParam.getRemark());
latentDangerBo.setCurrentFlowRecordId(flowRecord.getId());
latentDangerBo.setDangerState(executeTypeEnum.getNextState().getCode().toString());
if (executeTypeEnum.equals(LatentDangerExcuteTypeEnum.隐患常规治理)) {
latentDangerBo.setReformType(LatentDangerReformTypeEnum.常规整改.getCode().toString());
latentDangerBo.setReformJson(param.getFlowJson().toJSONString());
latentDangerBo.setInferOtherThings(param.getInferOtherThings());
latentDangerBo.setProblemDescription(param.getReasonAnalysis());
latentDangerBo.setReasonAnalysis(param.getRemark());
latentDangerBo.setReformJson(executeParam.getFlowJson().toJSONString());
latentDangerBo.setInferOtherThings(executeParam.getInferOtherThings());
latentDangerBo.setProblemDescription(executeParam.getReasonAnalysis());
latentDangerBo.setReasonAnalysis(executeParam.getRemark());
} else if (executeTypeEnum.equals(LatentDangerExcuteTypeEnum.隐患延期治理)) {
latentDangerBo.setReformType(LatentDangerReformTypeEnum.延期治理.getCode().toString());
latentDangerBo.setReformJson(param.getFlowJson().toJSONString());
latentDangerBo.setInferOtherThings(param.getInferOtherThings());
latentDangerBo.setProblemDescription(param.getReasonAnalysis());
latentDangerBo.setReasonAnalysis(param.getRemark());
latentDangerBo.setDelayLimitDate(DateUtil.str2Date(param.getDelayLimitDate(), DateUtil.DATETIME_DEFAULT_FORMAT));
latentDangerBo.setReformJson(executeParam.getFlowJson().toJSONString());
latentDangerBo.setInferOtherThings(executeParam.getInferOtherThings());
latentDangerBo.setProblemDescription(executeParam.getReasonAnalysis());
latentDangerBo.setReasonAnalysis(executeParam.getRemark());
latentDangerBo.setDelayLimitDate(DateUtil.str2Date(executeParam.getDelayLimitDate(), DateUtil.DATETIME_DEFAULT_FORMAT));
}
if (executeTypeEnum.equals(LatentDangerExcuteTypeEnum.隐患评审通过)) {
latentDangerBo.setReformLimitDate(DateUtil.str2Date(param.getReformLimitDate(), DateUtil.DATETIME_DEFAULT_FORMAT));
latentDangerBo.setDangerLevel(param.getDangerLevel().toString());
latentDangerBo.setReformLimitDate(DateUtil.str2Date(executeParam.getReformLimitDate(), DateUtil.DATETIME_DEFAULT_FORMAT));
latentDangerBo.setDangerLevel(executeParam.getDangerLevel().toString());
// 消防巡查需求:评审通过后制定治理人
// 2.指定治理执行人
......@@ -1257,7 +1258,7 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
}
if (executeTypeEnum.equals(LatentDangerExcuteTypeEnum.隐患延期治理车间部门审核通过)) {
// 延期治理评审通过且 不需要 公司审核
if (param.getNeedCompanyVerify() == 0) {
if (executeParam.getNeedCompanyVerify() == 0) {
latentDangerBo.setDangerState(LatentDangerStateEnum.延期治理申请.getCode().toString());
latentDangerBo.setReformLimitDate(latentDangerBo.getDelayLimitDate());
} else {// 延期治理评审通过且 需要 公司审核
......@@ -1266,7 +1267,7 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
latentDangerFlowRecordMapper.getByDangerIdAndCreate(latentDangerBo.getId());
String flowJsonStr = recordBo.getFlowJson();
JSONObject flowJson = JSONObject.parseObject(flowJsonStr);
flowJson.put("needCompanyVerify", param.getNeedCompanyVerify());
flowJson.put("needCompanyVerify", executeParam.getNeedCompanyVerify());
recordBo.setFlowJson(flowJson.toJSONString());
latentDangerFlowRecordMapper.update(recordBo);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment