Skip to content

A
amos-boot-biz
Commit 118f261c authored by tianyiming's avatar tianyiming
Browse files
Options

工业管道、气瓶增补功能

parent d39b1862
Show whitespace changes
Inline Side-by-side
Showing with 95 additions and 17 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/PipelineEnum.java 0 → 100644
View file @ 118f261c
package com.yeejoin.amos.boot.module.jg.api.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.HashMap;
import java.util.Map;
@Getter
@AllArgsConstructor
public enum PipelineEnum {
PRESSURE_PIPELINE("压力管道", "8000"),
INDUSTRIAL_PIPELINE("工业管道", "8300");
private final String name;
private final String code;
public static String getMessage(String code) {
for (PipelineEnum constants : values()) {
if (constants.getCode().equals(code)) {
return constants.getName();
}
}
return null;
}
public static Map<Integer,String> getName=new HashMap<>();
public static Map<String,Integer> getCode=new HashMap<>();
static {
for (ConstructionEnum e : ConstructionEnum.values()){
getName.put(e.code, e.name);
getCode.put(e.name, e.code);
}
}
public String getCode() {
return code;
}
public String getName() {
return name;
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java
View file @ 118f261c
......@@ -24,6 +24,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.*;
import com.yeejoin.amos.boot.module.jg.api.entity.*;
import com.yeejoin.amos.boot.module.jg.api.enums.*;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationEqMapper;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationManageMapper;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
import com.yeejoin.amos.boot.module.jg.api.service.IJgUseRegistrationService;
import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
......@@ -167,6 +168,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
private JgResumeInfoServiceImpl jgResumeInfoService;
@Autowired
private JgCertificateChangeRecordServiceImpl certificateChangeRecordService;
@Autowired
private JgUseRegistrationManageMapper jgUseRegistrationManageMapper;
@Autowired
private JgCertificateChangeRecordEqServiceImpl certificateChangeRecordEqService;
@Autowired
......@@ -246,7 +250,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
return this.baseMapper.getEquipListPage(page, factoryNum, equList, equCategory);
}
public void updateEquipMessage(String currentDocumentId, JgUseRegistration jgUseRegistration, JSONObject map, IdxBizJgRegisterInfo registerInfo, IdxBizJgOtherInfo otherInfo) {
public void updateEquipMessage(String currentDocumentId, JgUseRegistration jgUseRegistration, JSONObject map,
IdxBizJgRegisterInfo registerInfo, IdxBizJgOtherInfo otherInfo, Boolean flag, String useRegistrationCode) {
String useOrgCode = jgUseRegistration.getUseRegistrationCode();
// 市
List<LinkedHashMap> city = (List<LinkedHashMap>) redisUtils.get("CITY");
......@@ -328,7 +333,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
idxBizJgSupervisionInfoMapper.update(idxBizJgSupervisionInfo, eq);
}
// 更新设备使用登记证
idxBizJgRegisterInfoMapper.updateUseOrgCodeByEquip(String.valueOf(map.get("equipId")), useOrgCode);
idxBizJgRegisterInfoMapper.updateUseOrgCodeByEquip(String.valueOf(map.get("equipId")), flag ? useRegistrationCode : useOrgCode);
// 生成监管码、96333码
createCode(map, jgUseRegistration, registerInfo, useInfo, otherInfo);
}
......@@ -871,6 +876,19 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
Long changeRecordId= sequence.nextId();
JSONObject mapData = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
String useRegistrationCode = null;
Boolean flag = Boolean.FALSE;
String equCategoryCode = String.valueOf(mapData.get("EQU_CATEGORY_CODE"));
//如果是气瓶或工业管道判断之前是否已经做过使用登记
if (CylinderTypeEnum.CYLINDER.getCode().equals(equCategoryCode) || PipelineEnum.INDUSTRIAL_PIPELINE.getCode().equals(equCategoryCode)) {
// 获取最新的使用登记记录
String useUnitCreditCode = jgUseRegistration.getUseUnitCreditCode();
JgUseRegistrationManage jgUseRegistrationManage = commonServiceImpl.getLatestJgUseRegistrationManage(useUnitCreditCode, equCategoryCode);
useRegistrationCode = ObjectUtils.isEmpty(jgUseRegistrationManage) ? useRegistrationCode : jgUseRegistrationManage.getUseRegistrationCode();
flag = ObjectUtils.isEmpty(useRegistrationCode) ? flag : Boolean.TRUE;
}
List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) mapData.get("equipmentLists");
if (!CollectionUtils.isEmpty(equipmentLists)) {
for (int i = 0; i < equipmentLists.size(); i++) {
......@@ -886,8 +904,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(lambdaReg);
// 更新设备信息 && 生成使用登记证编号 && 同步es
processMapData(sequenceNbr, mapData, jgUseRegistration, jgRegistrationHistory,registerInfo,taskV2Model,jsonObject);
processMapData(sequenceNbr, mapData, jgUseRegistration, jgRegistrationHistory, registerInfo, taskV2Model, jsonObject, flag, useRegistrationCode);
// 查询设备制造信息
LambdaQueryWrapper<IdxBizJgFactoryInfo> factoryInfoWrapper = new LambdaQueryWrapper<>();
factoryInfoWrapper.eq(IdxBizJgFactoryInfo::getRecord, equId);
......@@ -908,10 +925,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(lambdaReg);
// 生成证书管理表
generateRegistrationManage(jgUseRegistration,registerInfo);
generateRegistrationManage(jgUseRegistration, registerInfo, flag, useRegistrationCode);
// 生成一条tzs_jg_certificate_change_record记录
generateCertificateChangeRecord(jgUseRegistration,registerInfo,changeRecordId,taskV2Model);
generateCertificateChangeRecord(jgUseRegistration, registerInfo, changeRecordId, taskV2Model, flag);
}
this.getBaseMapper().updateById(jgUseRegistration);
commonServiceImpl.saveExecuteFlowData2Redis(jgUseRegistration.getInstanceId(), this.buildInstanceRuntimeData(jgUseRegistration));
......@@ -924,7 +941,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
* @param changeRecordId
* @param taskV2Model
*/
private void generateCertificateChangeRecord(JgUseRegistration jgUseRegistration,IdxBizJgRegisterInfo registerInfo,Long changeRecordId,TaskV2Model taskV2Model) {
private void generateCertificateChangeRecord(JgUseRegistration jgUseRegistration,IdxBizJgRegisterInfo registerInfo,
Long changeRecordId,TaskV2Model taskV2Model ,Boolean flag) {
Map<String, String> equType = new HashMap<>();
equType.put("equList",this.baseMapper.getEquCategoryNameByCode(registerInfo.getEquList()));
equType.put("equListCode",registerInfo.getEquList());
......@@ -938,7 +956,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
changeRecord.setAuditPassDate(new Date());
changeRecord.setRegType(BusinessTypeEnum.JG_USAGE_REGISTRATION.getName());
changeRecord.setRegDate(jgUseRegistration.getCreateDate());
changeRecord.setChangeContent(this.buildRecordContent(jgUseRegistration));//变更内容
changeRecord.setChangeContent(this.buildRecordContent(jgUseRegistration, flag));//变更内容
changeRecord.setUseRegistrationCode(jgUseRegistration.getUseRegistrationCode());//使用登记编号
changeRecord.setReceiveCompanyCode(jgUseRegistration.getReceiveCompanyOrgCode());//接收机构公司代码
changeRecord.setCertificateNo(commonServiceImpl.generateCertificateNo(equType,new Date(),jgUseRegistration.getReceiveCompanyCode()));//登记证书唯一码
......@@ -956,7 +974,16 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
* @param jgUseRegistration 使用登记单
* @param registerInfo 一码通设备注册信息表
*/
private void generateRegistrationManage(JgUseRegistration jgUseRegistration,IdxBizJgRegisterInfo registerInfo) {
private void generateRegistrationManage(JgUseRegistration jgUseRegistration, IdxBizJgRegisterInfo registerInfo, Boolean flag, String useRegistrationCode) {
if (flag) {
LambdaQueryWrapper<JgUseRegistrationManage> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(JgUseRegistrationManage::getUseRegistrationCode, useRegistrationCode);
JgUseRegistrationManage jgUseRegistrationManage = jgUseRegistrationManageMapper.selectOne(queryWrapper);
jgUseRegistrationManage.setAuditPassDate(jgUseRegistration.getAuditPassDate());
jgUseRegistrationManageMapper.updateById(jgUseRegistrationManage);
return;
}
// 使用单位信息
Map<String, Object> enterpriseInfo = commonServiceImpl.getEnterpriseInfo(jgUseRegistration.getUseUnitCreditCode());
//
......@@ -1096,13 +1123,13 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
// 更新代办
TaskV2Model taskV2Model = updateAgency(jgUseRegistration);
processMapData(sequenceNbr, mapData, jgUseRegistration, jgRegistrationHistory, registerInfo, taskV2Model, jsonObject);
processMapData(sequenceNbr, mapData, jgUseRegistration, jgRegistrationHistory, registerInfo, taskV2Model, jsonObject, Boolean.FALSE, null);
// 生成证书管理表记录
generateRegistrationManage(jgUseRegistration,registerInfo);
generateRegistrationManage(jgUseRegistration, registerInfo, Boolean.FALSE, null);
// 生成一条使用登记证变更记录
generateCertificateChangeRecord(jgUseRegistration,registerInfo,changeRecordId,taskV2Model);
generateCertificateChangeRecord(jgUseRegistration, registerInfo, changeRecordId, taskV2Model, Boolean.FALSE);
// 查询设备制造信息
LambdaQueryWrapper<IdxBizJgFactoryInfo> factoryInfoWrapper = new LambdaQueryWrapper<>();
......@@ -1122,7 +1149,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
}
private void processMapData(Long sequenceNbr, JSONObject mapData, JgUseRegistration jgUseRegistration,
JgRegistrationHistory jgRegistrationHistory,IdxBizJgRegisterInfo registerInfo,TaskV2Model taskV2Model,JSONObject jsonObject) {
JgRegistrationHistory jgRegistrationHistory, IdxBizJgRegisterInfo registerInfo, TaskV2Model taskV2Model,
JSONObject jsonObject, Boolean flag, String useRegistrationCode) {
// 其他信息
LambdaQueryWrapper<IdxBizJgOtherInfo> lambdaOth = new QueryWrapper<IdxBizJgOtherInfo>().lambda();
lambdaOth.eq(IdxBizJgOtherInfo::getRecord, String.valueOf(mapData.get("equipId")));
......@@ -1130,12 +1158,12 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
jgUseRegistration.setSupervisoryCode(otherInfo.getSupervisoryCode());
// 更新设备信息
updateEquipMessage(String.valueOf(sequenceNbr), jgUseRegistration, mapData, registerInfo, otherInfo);
updateEquipMessage(String.valueOf(sequenceNbr), jgUseRegistration, mapData, registerInfo, otherInfo, flag, useRegistrationCode);
// 生成使用登记证编号
if (!ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode())) {
if ("unit".equals(jgUseRegistration.getManageType())) {
if ((Boolean) mapData.get("isFirstEquip")) {
String code = commonServiceImpl.generateRegistrationCode(String.valueOf(mapData.get("equipId")), jgUseRegistration.getSupervisoryCode(), jgUseRegistration.getReceiveCompanyCode());
String code = flag ? useRegistrationCode : commonServiceImpl.generateRegistrationCode(String.valueOf(mapData.get("equipId")), jgUseRegistration.getSupervisoryCode(), jgUseRegistration.getReceiveCompanyCode());
jgUseRegistration.setUseRegistrationCode(code);
jgUseRegistration.setAuditPassDate(new Date());
registerInfo.setUseOrgCode(code);
......@@ -1206,10 +1234,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
return commonServiceImpl.updateTaskModel(params);
}
private String buildRecordContent(JgUseRegistration obj) {
private String buildRecordContent(JgUseRegistration obj, Boolean flag) {
//张三办理了【单位变更】 ，单号【DWBG202407050001】，办理日期2024-07-05
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
return obj.getRecUserName() + "办理了【"+BusinessTypeEnum.JG_USAGE_REGISTRATION.getName()+"】，" +
return obj.getRecUserName() + "办理了【" + BusinessTypeEnum.JG_USAGE_REGISTRATION.getName() + (flag ? "设备增补" : "") + "】，" +
"单号【" + obj.getApplyNo() + "】，申请日期" + simpleDateFormat.format(obj.getRecDate());
}
......
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