Skip to content

A
amos-boot-biz
Commit 5565e50a authored by suhuiguang's avatar suhuiguang
Browse files
Options

Merge branch 'develop_tzs_bugfix' of http://39.100.92.250:5000/moa/amos-boot-biz…

Merge branch 'develop_tzs_bugfix' of http://39.100.92.250:5000/moa/amos-boot-biz into develop_tzs_bugfix # Conflicts: # amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/DataHandlerController.java
parents 039e4d92 26171aa5
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 16 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/EquipSourceEnum.java
View file @ 5565e50a
......@@ -54,4 +54,17 @@ public enum EquipSourceEnum {
return EquipSourceEnum.jg_his.getName();
}
}
public static String getDataSourceType(String dataSource) {
if(StringUtils.isEmpty(dataSource)){
return EquipSourceEnum.jg_his.getType();
}
if(EquipSourceEnum.jg.getCode().equals(dataSource) || (dataSource.startsWith(EquipSourceEnum.jg.getCode()) && !dataSource.startsWith(EquipSourceEnum.jg_his.getCode()))){
return EquipSourceEnum.jg.getType();
} else if(dataSource.startsWith(EquipSourceEnum.jg_his_black.getCode())){
return EquipSourceEnum.jg_his_black.getType();
} else {
return EquipSourceEnum.jg_his.getType();
}
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/DataHandlerController.java
View file @ 5565e50a
......@@ -50,6 +50,7 @@ public class DataHandlerController extends BaseController {
/**
* 向新增的工程装置表刷入数据(补充使用单位code为空的)
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
......@@ -61,9 +62,9 @@ public class DataHandlerController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "使用登记表属地监管部门历史数据处理",notes = "supervisionOrgCode在history表json数据写入，气瓶导入页面无此字段，使用单位的属地监管部门写入")
@ApiOperation(value = "使用登记表属地监管部门历史数据处理", notes = "supervisionOrgCode在history表json数据写入，气瓶导入页面无此字段，使用单位的属地监管部门写入")
@PutMapping(value = "/useRegistration/supervisionOrgCode")
public ResponseModel<Boolean> writeSupervisionOrgCode2UseRegister(){
public ResponseModel<Boolean> writeSupervisionOrgCode2UseRegister() {
dataHandlerService.writeSupervisionOrgCode2UseRegister();
return ResponseHelper.buildResponse(true);
}
......@@ -72,7 +73,7 @@ public class DataHandlerController extends BaseController {
@ApiOperation(httpMethod = "PUT", value = "安装告知缺少装置id、装置未创建、安装告知完成但是设备状态为未纳管数据处理", notes = "历史数据处理")
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/v3/projectContraption/notice")
public ResponseModel<Boolean> projectContraptionNoticeDataDealV3(){
public ResponseModel<Boolean> projectContraptionNoticeDataDealV3() {
dataHandlerService.projectContraptionNoticeDataDeal();
return ResponseHelper.buildResponse(true);
}
......@@ -80,7 +81,7 @@ public class DataHandlerController extends BaseController {
@ApiOperation(httpMethod = "PUT", value = "使用登记缺少装置id数据处理", notes = "历史数据处理,依赖/v3/projectContraption/notice作为基础数据")
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/v3/projectContraption/useRegister")
public ResponseModel<Boolean> projectContraptionUseRegisterDataDealV3(){
public ResponseModel<Boolean> projectContraptionUseRegisterDataDealV3() {
dataHandlerService.projectContraptionUseRegisterDataDeal();
return ResponseHelper.buildResponse(true);
}
......@@ -88,7 +89,7 @@ public class DataHandlerController extends BaseController {
@ApiOperation(httpMethod = "PUT", value = "由于前期设备纳管状态不对，导致的1220上线时 创建的装置纳管状态不对，刷库", notes = "历史数据处理")
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/v2/projectContraption/info")
public ResponseModel<Boolean> projectContraptionInfoUpdateV2(){
public ResponseModel<Boolean> projectContraptionInfoUpdateV2() {
dataHandlerService.projectContraptionInfoUpdateV2();
return ResponseHelper.buildResponse(true);
}
......@@ -97,7 +98,7 @@ public class DataHandlerController extends BaseController {
@ApiOperation(httpMethod = "PUT", value = "20250108-刷管道，设备使用信息表装置id未更新，导致的错误数据处理，已es为准", notes = "历史数据处理")
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/v3/projectContraption/useInfo")
public ResponseModel<Boolean> projectUseInfoUpdateV3(){
public ResponseModel<Boolean> projectUseInfoUpdateV3() {
dataHandlerService.projectUseInfoUpdateV3();
return ResponseHelper.buildResponse(true);
}
......@@ -105,7 +106,7 @@ public class DataHandlerController extends BaseController {
@ApiOperation(httpMethod = "PUT", value = "20250108-1220上线时, 已完成安装告知管道未写入装置的施工信息表（导致使用登记不能回显施工信息），刷库", notes = "历史数据处理")
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/v3/projectContraption/info")
public ResponseModel<Boolean> projectContraptionInfoUpdateV3(){
public ResponseModel<Boolean> projectContraptionInfoUpdateV3() {
dataHandlerService.projectContraptionInfoUpdateV3();
return ResponseHelper.buildResponse(true);
}
......@@ -113,7 +114,7 @@ public class DataHandlerController extends BaseController {
@ApiOperation(httpMethod = "PUT", value = "20250109-之前刷库问题导致的管道的装置id与安装告知不一样，已安装告知为准，刷使用信息表的装置id、es的装置id【只处理未做过使用登记或者使用登记未完成的】", notes = "历史数据处理")
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/v4/projectContraption/useInfo")
public ResponseModel<Boolean> projectUseInfoUpdateV4(){
public ResponseModel<Boolean> projectUseInfoUpdateV4() {
dataHandlerService.projectUseInfoUpdateV4();
return ResponseHelper.buildResponse(true);
}
......@@ -121,7 +122,7 @@ public class DataHandlerController extends BaseController {
@ApiOperation(httpMethod = "PUT", value = "20250110-处理一个管道在多个安装告知里，刷管道的use_info、es的装置id,已最新安装告知为准", notes = "历史数据处理")
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/v5/projectContraption/useInfo")
public ResponseModel<Boolean> projectUseInfoUpdateV5(){
public ResponseModel<Boolean> projectUseInfoUpdateV5() {
dataHandlerService.projectUseInfoUpdateV5();
return ResponseHelper.buildResponse(true);
}
......@@ -181,7 +182,7 @@ public class DataHandlerController extends BaseController {
@ApiOperation(httpMethod = "PUT", value = "补充西安导入数据的使用信用代码，压力管道除外", notes = "补充西安导入数据的使用信用代码，压力管道除外")
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/v1/xa/useInfo")
public ResponseModel<Boolean> updateUseInfoOfCompanyV1(){
public ResponseModel<Boolean> updateUseInfoOfCompanyV1() {
dataHandlerService.updateUseInfoOfCompanyV1();
return ResponseHelper.buildResponse(true);
}
......@@ -189,7 +190,7 @@ public class DataHandlerController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "恢复单位变更数据", notes = "恢复单位变更数据")
@GetMapping(value = "/restore")
public ResponseModel<Boolean> restore(){
public ResponseModel<Boolean> restore() {
dataHandlerService.restore();
return ResponseHelper.buildResponse(true);
}
......@@ -198,7 +199,7 @@ public class DataHandlerController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "PUT", value = "存量数据刷属地监管部门到证管理表", notes = "存量数据刷属地监管部门到证管理表")
@PutMapping(value = "/supervise2UseRegManage")
public ResponseModel<Long> saveSupervise2UseRegManage(){
public ResponseModel<Long> saveSupervise2UseRegManage() {
return ResponseHelper.buildResponse(dataHandlerService.saveSupervise2UseRegManage());
}
......@@ -206,7 +207,7 @@ public class DataHandlerController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "PUT", value = "历史安全追溯问题闭环【维保备案】【检验超期】", notes = "历史安全追溯问题闭环【维保备案】【检验超期】")
@PutMapping(value = "/safeTraceabilityClosedLoop")
public ResponseModel<String> safeTraceabilityClosedLoop(){
public ResponseModel<String> safeTraceabilityClosedLoop() {
return ResponseHelper.buildResponse(dataHandlerService.safeTraceabilityClosedLoop());
}
......@@ -224,7 +225,7 @@ public class DataHandlerController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "put", value = "历史设备装置初始化数据质量等级", notes = "车用气瓶登记产权单位信息刷入useInfo表")
@PutMapping(value = "/initDataQualityScore")
public ResponseModel<String> initDataQualityScore(){
public ResponseModel<String> initDataQualityScore() {
return ResponseHelper.buildResponse(dataHandlerService.initDataQualityScore());
}
}
}
\ No newline at end of file
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/CommonServiceImpl.java
View file @ 5565e50a
......@@ -1397,6 +1397,7 @@ public class CommonServiceImpl implements ICommonService {
Map<String, Object> useRegFormUploadObj = (Map<String, Object>) map.get(useRegFormUpload);
String uploadMode = String.valueOf(useRegFormUploadObj.get("uploadMode"));
jsonObject.put("historySubmitType", historySubmitType);
jsonObject.put("historyEquType", historyEquType);
Map<String, Function<JSONObject, Object>> handlerMap = new HashMap<>();
handlerMap.put("unit", jgUseRegistrationServiceImpl::handleUnitHistoryEquip);
......
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/IdxBizJgRegisterInfoServiceImpl.java
View file @ 5565e50a
......@@ -1106,6 +1106,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
// 设备注册信息
Map<String, Object> equipInfoMap = this.getEquipInfoMap(record, "");
if (!ValidationUtil.isEmpty(equIpClassMap)) {
equIpClassMap.put(DATA_SOURCE,equipInfoMap.get(DATA_SOURCE));
resultMap.put(EQUIP_CLASS_FORM_ID, equIpClassMap);
}
equipInfoMap.put("companyLevel", companyLevel);
......@@ -1469,6 +1470,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
}
}
objMap.put(DATA_SOURCE_NAME, EquipSourceEnum.getDataSourceName(useInfo.getDataSource()));
objMap.put(DATA_SOURCE, EquipSourceEnum.getDataSourceType(useInfo.getDataSource()));
// 设计制造
IdxBizJgDesignInfo designInfo = iIdxBizJgDesignInfoService.getOneData(record);
if (!ValidationUtil.isEmpty(designInfo)) {
......
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 @ 5565e50a
......@@ -4298,7 +4298,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
}
// 历史设备 生成证书管理表记录 & 生成安装 维保等操作记录
if (registerInfo != null) {
if (registerInfo != null && !"temp".equals(map.get("historySubmitType"))) {
this.historyEquGenManageRelated(map, jgUseRegistration, registerInfo, idxBizJgFactoryInfo);
}
String routePath = this.buildTaskModel(jgUseRegistration, map, reginParams);
......
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