Skip to content

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

修改提交

parent 359f4c40
Hide whitespace changes
Inline Side-by-side
Showing with 120 additions and 33 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IOrgUsrService.java
View file @ ee44a087
......@@ -216,4 +216,12 @@ public interface IOrgUsrService {
* @return
*/
List<OrgUsrExcelDto> exportPersonToExcelByParentId(Long parentId);
/**
* 根据机场人员id获取amos账号id
*
* @param orgUserId
* @return
*/
String getAmosIdByOrgUserId(String orgUserId) throws Exception;
}
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 @ ee44a087
......@@ -478,5 +478,16 @@ public class OrgUsrController extends BaseController {
return ResponseHelper.buildResponse(iOrgUsrService.amosIdExist(amosId));
}
/**
* 根据机场人员id获取amos平台人员id
*
* @param
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/amos/{orgUserId}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据机场人员id获取amos平台人员id", notes = "根据机场人员id获取amos平台人员id")
public ResponseModel<String> getAmosIdByOrgUserId(@PathVariable String orgUserId) throws Exception {
return ResponseHelper.buildResponse(iOrgUsrService.getAmosIdByOrgUserId(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 @ ee44a087
......@@ -32,6 +32,7 @@ import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import org.typroject.tyboot.component.emq.EmqKeeper;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import javax.annotation.Resource;
......@@ -1539,6 +1540,15 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
return true;
}
@Override
public String getAmosIdByOrgUserId(String orgUserId) throws Exception {
OrgUsr orgUsr = this.baseMapper.selectOne(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getSequenceNbr,
orgUserId));
if (ValidationUtil.isEmpty(orgUsr)) {
throw new Exception("账号不存在");
}
return orgUsr.getAmosOrgId();
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/feign/JcsFeignClient.java 0 → 100644
View file @ ee44a087
package com.yeejoin.amos.latentdanger.business.feign;
import com.yeejoin.amos.boot.module.common.api.feign.MultipartSupportConfig;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
/**
* 机场服务feign
*
* @author Dell
*/
@FeignClient(name = "${jcs.fegin.name}", path = "jcs", configuration = {MultipartSupportConfig.class})
public interface JcsFeignClient {
/**
* 根据机场人员id获取amos平台人员id
**/
@RequestMapping(value = "/org-usr/amos/{orgUserId}", method = RequestMethod.GET)
ResponseModel<String> getAmosIdByUserId(@PathVariable String orgUserId);
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/LatentDangerServiceImpl.java
View file @ ee44a087
......@@ -19,6 +19,7 @@ import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
import com.yeejoin.amos.boot.module.common.api.feign.SupervisionFeignClient;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
import com.yeejoin.amos.feign.systemctl.Systemctl;
......@@ -35,6 +36,7 @@ import com.yeejoin.amos.latentdanger.business.entity.mybatis.extend.LatentDanger
import com.yeejoin.amos.latentdanger.business.entity.mybatis.extend.LatentDangerFlowRecordBo;
import com.yeejoin.amos.latentdanger.business.entity.mybatis.extend.LatentDangerNoticeBo;
import com.yeejoin.amos.latentdanger.business.entity.mybatis.extend.LatentDangerPatrolBo;
import com.yeejoin.amos.latentdanger.business.feign.JcsFeignClient;
import com.yeejoin.amos.latentdanger.business.param.LatentDangerDto;
import com.yeejoin.amos.latentdanger.business.param.LatentDangerExecuteParam;
import com.yeejoin.amos.latentdanger.business.param.LatentDangerListParam;
......@@ -167,6 +169,9 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
private WorkflowFeignService workflowFeignService;
private String onSiteConfirmRole = "Person_charge_unit_fire_protection_supervision_inspection";
@Autowired
JcsFeignClient jcsFeignClient;
@Transactional(rollbackFor = Exception.class)
@Override
public CommonResponse saveNormal(LatentDangerDto latentDangerDto, String userId, String userRealName,
......@@ -368,8 +373,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
latentDanger.setOrgCode(orgCode);
latentDanger.setDangerType(dangerTypeEnum.getCode());
if (LatentDangerBizTypeEnum.防火监督.getCode().equals(bizType)) {
latentDanger.setDangerState(LatentDangerState.SupervisionDangerStateEnum.提交隐患.getCode());
latentDanger.setDangerStateName(LatentDangerState.SupervisionDangerStateEnum.提交隐患.getName());
latentDanger.setDangerState(LatentDangerState.SupervisionDangerStateEnum.现场确认.getCode());
latentDanger.setDangerStateName(LatentDangerState.SupervisionDangerStateEnum.现场确认.getName());
} else if (LatentDangerBizTypeEnum.巡检.getCode().equals(bizType)) {
latentDanger.setDangerState(LatentDangerState.PatrolDangerLevelEnum.待评审.getCode());
latentDanger.setDangerStateName(LatentDangerState.PatrolDangerLevelEnum.待评审.getName());
......@@ -1143,7 +1148,10 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
return executeSubmitDto;
}
String planType = bizInfo.get("planType").toString();
String checkLeaderId = "3400882"; //bizInfo.get("accompanyingUserId").toString();
// TODO 修改
//jcsFeignClient.getAmosIdByUserId(bizInfo.get("accompanyingUserId")
AgencyUserModel userModel = Privilege.agencyUserClient.queryByUserId("3400882").getResult();
String checkLeaderId = userModel.getUserName();
String processInstanceId = latentDanger.getInstanceId();
String currentDangerState = latentDanger.getDangerState();
......@@ -1180,7 +1188,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
latentDanger.setDangerState(LatentDangerState.SupervisionDangerStateEnum.现场确认.getCode());
latentDanger.setDangerStateName(LatentDangerState.SupervisionDangerStateEnum.现场确认.getName());
// 3、执行一步
// 3、执行一步现场确认
boolean executeResult = workflowExecuteService.excuteTask(latentDanger.getInstanceId(), planType);
if (!executeResult) {
this.updateById(latentDanger);
......@@ -1191,6 +1199,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
// 4、在执行完节点后需要将检查组长id设置为下个节点执行人
Object resultObj = workflowExecuteService.setTaskAssign(latentDanger.getInstanceId(), checkLeaderId);
if (!(Boolean) resultObj) {
executeSubmitDto.setIsOk(false);
executeSubmitDto.setMsg("设置节点执行人失败");
......@@ -1202,6 +1211,12 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
record = saveFlowRecord("", latentDanger.getDangerStateName(), userId, departmentId, latentDanger.getFlowJson(),
latentDanger.getId(), reginParams.getRole(), executeResultMsg, "", userRealName, departmentName,
latentDanger.getDangerState());
LatentDangerState.SupervisionDangerStateEnum curEnum =
LatentDangerState.SupervisionDangerStateEnum.getEnumByCode(latentDanger.getDangerState());
LatentDangerState.SupervisionDangerStateEnum nextEnum =
LatentDangerState.SupervisionDangerStateEnum.getEnumByCode(curEnum.getNext());
latentDanger.setDangerState(nextEnum.getCode());
latentDanger.setDangerStateName(nextEnum.getName());
latentDanger.setCurrentFlowRecordId(record.getId());
this.updateById(latentDanger);
......@@ -1256,20 +1271,22 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
latentDanger.setDangerState(LatentDangerState.SupervisionDangerStateEnum.整改完毕.getCode());
latentDanger.setDangerStateName(LatentDangerState.SupervisionDangerStateEnum.整改完毕.getName());
}
executeResultMsg = latentDanger.getDangerStateName() + ExecuteTypeEnum.通过.getName();
executeResultMsg = currentStateEnum.getName() + ExecuteTypeEnum.通过.getName();
} else {
LatentDangerState.SupervisionDangerStateEnum nextStateEnum =
LatentDangerState.SupervisionDangerStateEnum.getEnumByCode(currentStateEnum.getRejectNext());
nextState = nextStateEnum.getCode();
nextStateName = nextStateEnum.getName();
executeResultMsg = nextStateName + ExecuteTypeEnum.驳回.getName();
executeResultMsg = currentStateEnum.getName() + ExecuteTypeEnum.驳回.getName();
}
latentDanger.setDangerState(nextState);
latentDanger.setDangerStateName(nextStateName);
// 当隐患状态是整改任务分配时，在执行完节点后需要将整改分配责任人id设置为下个节点执行人
if (LatentDangerState.SupervisionDangerStateEnum.整改任务分配.getCode().equals(currentDangerState)) {
checkLeaderId = param.getReformLeaderId();
// 当隐患状态当前节点是整改任务分配时，在执行完节点后需要将整改分配责任人id设置为下个节点执行人
if (LatentDangerState.SupervisionDangerStateEnum.整改任务分配.getCode().equals(currentStateEnum.getCode())) {
// TODO 修改
checkLeaderId = jcsFeignClient.getAmosIdByUserId(param.getReformLeaderId()).getResult();
checkLeaderId = "jcs_hll_1";
Object result = workflowExecuteService.setTaskAssign(processInstanceId, checkLeaderId);
if (!(Boolean) result) {
executeSubmitDto.setIsOk(false);
......@@ -1277,8 +1294,21 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
}
}
// 当隐患状态是提交整改资料时，在执行完节点后需要将整改资料审核人id（检查组长）设置为下个节点执行人
if (LatentDangerState.SupervisionDangerStateEnum.提交整改资料.getCode().equals(currentDangerState)) {
// 当计划为单位检查且隐患状态当前节点是提交整改资料时，在执行完节点后需要将整改资料审核人id（检查组长）设置为下个节点执行人
if ("supervised".equals(planType) && LatentDangerState.SupervisionDangerStateEnum.提交整改资料.getCode().equals(currentStateEnum.getCode())) {
// TODO 修改
checkLeaderId = "jcs_hll_1";
Object result = workflowExecuteService.setTaskAssign(processInstanceId, checkLeaderId);
if (!(Boolean) result) {
executeSubmitDto.setIsOk(false);
executeResultMsg = "设置节点执行人失败";
}
}
// 当计划为公司专项或日常检查且隐患状态当前节点是整改分管领导审核（二级审核）时，
// 在执行完节点后需要将整改三级审核人id（检查组长）设置为下个节点执行人
if (!"supervised".equals(planType) && LatentDangerState.SupervisionDangerStateEnum.整改检查分管领导确认.getCode().equals(currentStateEnum.getCode())) {
// TODO 修改
checkLeaderId = "jcs_hll_1";
Object result = workflowExecuteService.setTaskAssign(processInstanceId, checkLeaderId);
if (!(Boolean) result) {
executeSubmitDto.setIsOk(false);
......@@ -1286,9 +1316,9 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
}
}
record = saveFlowRecord("", latentDanger.getDangerStateName(), userId, departmentId, latentDanger.getFlowJson(),
record = saveFlowRecord("", currentStateEnum.getName(), userId, departmentId, latentDanger.getFlowJson(),
latentDanger.getId(), reginParams.getRole(), executeResultMsg, "", userRealName, departmentName,
latentDanger.getDangerState());
currentStateEnum.getCode());
latentDanger.setCurrentFlowRecordId(record.getId());
this.updateById(latentDanger);
......@@ -1687,8 +1717,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
@Override
public IPage<LatentDanger> pageListDanger(PageParam pageParam) throws Exception {
IPage<LatentDanger> page = new Page<>(Integer.parseInt((String) pageParam.get("current")),
Integer.parseInt((String) pageParam.get("size")));
Page<LatentDanger> page = new Page<>(Long.parseLong((String) pageParam.get("current")),
Long.parseLong((String) pageParam.get("size")));
List allTaskList;
String order = Constants.ASC;
String idsStr = (String) pageParam.get("dangerIds");
......@@ -1735,6 +1765,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
order = pageParam.get("order").toString();
}
List<String> state = Lists.newArrayList(((String)pageParam.get("dangerState")).split(","));
LambdaQueryWrapper<LatentDanger> queryWrapper = new LambdaQueryWrapper();
queryWrapper.eq(LatentDanger::getBizType, bizType)
.eq(LatentDanger::getDeleted, false)
......@@ -1742,28 +1774,29 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
LatentDanger::getDangerName, pageParam.get("name"))
.eq(!ValidationUtil.isEmpty(pageParam.get("dangerLevel")), LatentDanger::getDangerLevel,
pageParam.get("dangerLevel"))
.in(!ValidationUtil.isEmpty(pageParam.get("dangerState")), LatentDanger::getDangerState,
pageParam.get("dangerState"))
.in(!ValidationUtil.isEmpty(pageParam.get("dangerState")), LatentDanger::getDangerState, state)
.in(!ValidationUtil.isEmpty(dangerIdList), LatentDanger::getId, dangerIdList)
.in(!ValidationUtil.isEmpty(structureIdList), LatentDanger::getStructureId, structureIdList)
.orderByDesc(Constants.DESC.equals(order), LatentDanger::getUpdateDate);
IPage<LatentDanger> iPage = latentDangerMapper.selectPage(page, queryWrapper);
this.baseMapper.selectPageByParam(new Page(Long.parseLong((String) pageParam.get("current")),
Long.parseLong((String)pageParam.get("size"))), pageParam);
Map<Long, String> buildingAbsolutePositionMap = new HashMap<>();
try {
LinkedHashMap<String, Object> buildingAbsolutePosition = (LinkedHashMap<String, Object>) equipFeign.getBuildingAbsolutePosition().getResult();
if (buildingAbsolutePosition == null || !"200".equals(buildingAbsolutePosition.get("status").toString())) {
throw new YeeException("获取建筑树出错");
if (!ValidationUtil.isEmpty(iPage.getRecords())) {
try {
LinkedHashMap<String, Object> buildingAbsolutePosition = (LinkedHashMap<String, Object>) equipFeign.getBuildingAbsolutePosition().getResult();
if (buildingAbsolutePosition == null || !"200".equals(buildingAbsolutePosition.get("status").toString())) {
throw new YeeException("获取建筑树出错");
}
buildingAbsolutePositionMap = (Map<Long, String>) buildingAbsolutePosition.get("result");
} catch (Exception e) {
}
buildingAbsolutePositionMap = (Map<Long, String>) buildingAbsolutePosition.get("result");
} catch (Exception e) {
}
if (!iPage.getRecords().isEmpty()) {
Map<Long, String> finalBuildingAbsolutePositionMap = buildingAbsolutePositionMap;
iPage.getRecords().forEach(danger -> danger.setStructureName(finalBuildingAbsolutePositionMap.get(danger.getStructureId())));
}
return latentDangerMapper.selectPage(page, queryWrapper);
return iPage;
}
private List<Map<String, Object>> getAllNodes(List<Map<String, Object>> buildingTree) {
......@@ -1944,15 +1977,16 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
if ("audit".equals(type)) {
List<LatentDangerState.SupervisionDangerStateEnum> stateEnums =
LatentDangerState.SupervisionDangerStateEnum.getEnumListByProcessState("审核中");
String dangerState = Joiner.on(",").join(stateEnums.stream().map(stateEnum -> stateEnum != null ? stateEnum.getCode() : null).collect(Collectors.toList()));
List<String> dangerState = stateEnums.stream().map(stateEnum -> stateEnum != null ?
stateEnum.getCode() : null).collect(Collectors.toList());
// 审核状态
pageParam.put("dangerState", dangerState);
pageParam.put("dangerState", Joiner.on(",").join(dangerState));
} else if ("review".equals(type)) {
List<LatentDangerState.SupervisionDangerStateEnum> stateEnums =
LatentDangerState.SupervisionDangerStateEnum.getEnumListByProcessState("整改中");
String dangerState = Joiner.on(",").join(stateEnums.stream().map(stateEnum -> stateEnum != null ? stateEnum.getCode() : null).collect(Collectors.toList()));
List<String> dangerState = stateEnums.stream().map(stateEnum -> stateEnum != null ? stateEnum.getCode() : null).collect(Collectors.toList());
// 复核状态
pageParam.put("dangerState", dangerState);
pageParam.put("dangerState", Joiner.on(",").join(dangerState));
}
return pageListDanger(pageParam);
}
......
amos-boot-system-latentdanger/src/main/resources/application-dev.properties
View file @ ee44a087
......@@ -90,4 +90,5 @@ file.url=http://39.98.45.134:9000/
iot.fegin.name=AMOS-API-IOT
control.fegin.name=JCS-API-CONTROL
supervision.feign.name=AMOS-SUPERVISION-API
\ No newline at end of file
supervision.feign.name=AMOS-SUPERVISION-API
jcs.fegin.name=JCS-tb
\ No newline at end of file
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