Skip to content

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

feat(jg): 完善历史设备登记功能

- 在 DataDockServiceImpl 中补充设置 paramsDto 的 equipId 字段 - 更新 TaskMessageDto 设置 equipId 来源为 paramsDto-修复 inUseRecordSet 添加元素时使用 equ 中的 record 值- 增加日志输出未更新设备 record 集合 - 在 updateHistoryInfo 方法中新增更新使用信息逻辑，标记设备为已纳管 - 补充更新设备 ES 数据、登记证信息及变更记录信息逻辑 - 新增 saveResumeInfo 方法用于生成和更新履历信息 - 优化地址拼接字段，将 factoryUseSiteStreet 替换为 streetName
parent 7470c019
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 17 deletions
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/service/XiAnDataDockServiceImpl.java
View file @ cc841257
...@@ -813,13 +813,11 @@ public class XiAnDataDockServiceImpl { ...@@ -813,13 +813,11 @@ public class XiAnDataDockServiceImpl {
// 等待所有异步任务完成 // 等待所有异步任务完成
CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join(); CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
if (!ValidationUtil.isEmpty(importResult)) { if (!ValidationUtil.isEmpty(importResult)) {
rMap.put("result", "success"); rMap.put("message", "设备已做过后续业务或被编辑，更新失败：[" + String.join(",", importResult) + "]");
rMap.put("message", "设备已做过后续业务或被编辑，更新失败：" + String.join(",", importResult)); log.info("设备已做过后续业务或被编辑，更新失败：[{}", String.join(",", importResult) + "]");
log.info("设备已做过后续业务或被编辑，更新失败：{}", String.join(",", importResult));
return rMap; return rMap;
} }
log.info("设备保存成功"); log.info("设备保存成功");
rMap.put("result", "success");
rMap.put("message", "设备保存成功"); rMap.put("message", "设备保存成功");
return rMap; return rMap;
} }
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/EquipRequestParamsDto.java
View file @ cc841257
...@@ -55,4 +55,5 @@ public class EquipRequestParamsDto { ...@@ -55,4 +55,5 @@ public class EquipRequestParamsDto {
private String startLatitudeLongitude; private String startLatitudeLongitude;
private String endLatitudeLongitude; private String endLatitudeLongitude;
private String equState; private String equState;
private String equipId;
} }
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/CommonMapper.java
View file @ cc841257
...@@ -351,6 +351,6 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> { ...@@ -351,6 +351,6 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
*/ */
List<Map<String, String>> queryRecentlyReceiveCompanyCode(String record); List<Map<String, String>> queryRecentlyReceiveCompanyCode(String record);
Integer countEquipInUseTimesForXaElevator(); Integer countEquipInUseTimesForXaElevator(String record);
} }
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/EquipClaimServiceImpl.java
View file @ cc841257
...@@ -1125,7 +1125,10 @@ public class EquipClaimServiceImpl { ...@@ -1125,7 +1125,10 @@ public class EquipClaimServiceImpl {
registrationHistory.setCreateUserId(userModel.getUserId()); registrationHistory.setCreateUserId(userModel.getUserId());
registrationHistory.setRecUserName(userModel.getRealName()); registrationHistory.setRecUserName(userModel.getRealName());
jgRegistrationHistoryService.save(registrationHistory); jgRegistrationHistoryService.save(registrationHistory);
String routePath = dockService.buildTaskModel(useReg, new EquipRequestParamsDto()); EquipRequestParamsDto paramsDto = new EquipRequestParamsDto();
paramsDto.setEquipId(useReg.getProjectContraptionId());
paramsDto.setEquListCode(EquipmentClassifityEnum.YLGD.getCode());
String routePath = dockService.buildTaskModel(useReg, paramsDto);
jgResumeInfoService.createWithModel(JgResumeInfoDto.builder() jgResumeInfoService.createWithModel(JgResumeInfoDto.builder()
.applyNo(useReg.getApplyNo()) .applyNo(useReg.getApplyNo())
.businessType(BusinessTypeEnum.JG_HISTORY_USAGE_REGISTRATION.getName()) .businessType(BusinessTypeEnum.JG_HISTORY_USAGE_REGISTRATION.getName())
......
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