fix(jg):西安数据对接接口代码结构调整

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/feign/TzsJgServiceFeignClient.java

@@ -81,7 +81,7 @@ public interface TzsJgServiceFeignClient {
      * @param equipInfoExcelDtos
      * @return
      */
-    @RequestMapping(value = "/xi-an/saveEquipmentData", method = RequestMethod.POST)
+    @RequestMapping(value = "/dataDock/xi-an/saveEquipmentData", method = RequestMethod.POST)
     Object saveEquipmentData(@RequestBody List<XiAnEquipInfoExcelDto> equipInfoExcelDtos);
 
     /**

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/service/XiAnDataDockServiceImpl.java

@@ -183,7 +183,7 @@ public class XiAnDataDockServiceImpl {
     public void checkExcelData(String sheetName, XiAnEquipInfoExcelDto data, AnalysisContext context, Map<String, Object> sheetError) {
         ReadRowHolder readRowHolder = context.readRowHolder();
         int rowIndex = readRowHolder.getRowIndex() + 1;
-        StringBuilder rowError = new StringBuilder();
+        StringBuffer rowError = new StringBuffer();
         log.info("开始解析数据，第{}条数据", rowIndex);
         // 是否起重机械
         boolean isQZJX = !ValidationUtil.isEmpty(data.getEquList()) && "4000".equals(data.getEquList());
@@ -252,7 +252,7 @@ public class XiAnDataDockServiceImpl {
      * @param errorMessage 错误信息
      * @param rowError     结果集
      */
-    private void checkNotBlank(String value, String errorMessage, StringBuilder rowError) {
+    private void checkNotBlank(String value, String errorMessage, StringBuffer rowError) {
         if (StringUtils.isBlank(value)) {
             rowError.append(errorMessage);
         }
@@ -264,7 +264,7 @@ public class XiAnDataDockServiceImpl {
      * @param data     源数据
      * @param rowError 错误集合
      */
-    private void commonFieldCheck(XiAnEquipInfoExcelDto data, StringBuilder rowError) {
+    private void commonFieldCheck(XiAnEquipInfoExcelDto data, StringBuffer rowError) {
 
         boolean isPressureVessel = !ObjectUtils.isEmpty(data.getEquList()) && "2000".equals(data.getEquList());// 是否压力容器
         boolean isPressurePiping = !ObjectUtils.isEmpty(data.getEquList()) && "8000".equals(data.getEquList());// 是否压力管道
@@ -387,7 +387,7 @@ public class XiAnDataDockServiceImpl {
      * @param errorMessage 错误内容
      * @param rowError     错误集
      */
-    private void checkDateFormatCorrect(String date, String errorMessage, StringBuilder rowError) {
+    private void checkDateFormatCorrect(String date, String errorMessage, StringBuffer rowError) {
         if (!date.matches("\\d{4}-\\d{2}-\\d{2}")) {
             rowError.append(errorMessage);
         }
@@ -400,7 +400,7 @@ public class XiAnDataDockServiceImpl {
      * @param errorMessage 错误内容
      * @param rowError     错误集
      */
-    private void checkCreditCode(String code, String errorMessage, StringBuilder rowError) {
+    private void checkCreditCode(String code, String errorMessage, StringBuffer rowError) {
         String regex = "^[A-Z0-9]{15}(?:[A-Z0-9]{3})?$";
         if (!code.matches(regex)) {
             rowError.append(errorMessage);
@@ -414,7 +414,7 @@ public class XiAnDataDockServiceImpl {
      * @param errorMessage 错误内容
      * @param rowError     错误集
      */
-    private void checkDateFormatNumber(String date, String errorMessage, StringBuilder rowError) {
+    private void checkDateFormatNumber(String date, String errorMessage, StringBuffer rowError) {
         if (!NumberUtils.isCreatable(date)) {
             rowError.append(errorMessage);
         }
@@ -425,7 +425,7 @@ public class XiAnDataDockServiceImpl {
      *
      * @param data
      */
-    private void checkFactoryNumUniqueness(XiAnEquipInfoExcelDto data, StringBuilder rowError) {
+    private void checkFactoryNumUniqueness(XiAnEquipInfoExcelDto data, StringBuffer rowError) {
         Integer count = jgServiceFeignClient.checkFactoryNumUniquenessForVehicleCylinder(data.getFactoryNum());
         if (count > 0) {
             rowError.append("出厂编号/产品编码系统中已存在！");
@@ -438,7 +438,7 @@ public class XiAnDataDockServiceImpl {
      * @param equCode
      * @param rowError
      */
-    private void checkEquCodeUniqueness(String equCode, StringBuilder rowError) {
+    private void checkEquCodeUniqueness(String equCode, StringBuffer rowError) {
         Boolean bool = jgServiceFeignClient.selectByEquCodeAndClaimStatus(equCode);
         if (bool) {
             rowError.append("设备代码系统中已存在；");
@@ -451,7 +451,7 @@ public class XiAnDataDockServiceImpl {
      * @param data
      * @param rowError
      */
-    private void QZJXTechnicalParamsCheck(XiAnEquipInfoExcelDto data, StringBuilder rowError) {
+    private void QZJXTechnicalParamsCheck(XiAnEquipInfoExcelDto data, StringBuffer rowError) {
     }
 
     /**
@@ -460,7 +460,7 @@ public class XiAnDataDockServiceImpl {
      * @param data
      * @param rowError
      */
-    private void CNJDCLTechnicalParamsCheck(XiAnEquipInfoExcelDto data, StringBuilder rowError) {
+    private void CNJDCLTechnicalParamsCheck(XiAnEquipInfoExcelDto data, StringBuffer rowError) {
     }
 
     /**
@@ -469,7 +469,7 @@ public class XiAnDataDockServiceImpl {
      * @param data
      * @param rowError
      */
-    private void GLTechnicalParamsCheck(XiAnEquipInfoExcelDto data, StringBuilder rowError) {
+    private void GLTechnicalParamsCheck(XiAnEquipInfoExcelDto data, StringBuffer rowError) {
     }
 
     /**
@@ -478,7 +478,7 @@ public class XiAnDataDockServiceImpl {
      * @param data
      * @param rowError
      */
-    private void YLRQTechnicalParamsCheck(XiAnEquipInfoExcelDto data, StringBuilder rowError) {
+    private void YLRQTechnicalParamsCheck(XiAnEquipInfoExcelDto data, StringBuffer rowError) {
         //checkNotBlank(data.getSingleBottleVolume(), "单瓶容积不能为空；", rowError);
         //checkNotBlank(data.getChargingMedium(), "充装介质不能为空；", rowError);
         //checkNotBlank(data.getNominalWorkingPressure(), "公称工作压力不能为空；", rowError);
@@ -490,7 +490,7 @@ public class XiAnDataDockServiceImpl {
      * @param data
      * @param rowError
      */
-    private void YLGDTechnicalParamsCheck(XiAnEquipInfoExcelDto data, StringBuilder rowError) {
+    private void YLGDTechnicalParamsCheck(XiAnEquipInfoExcelDto data, StringBuffer rowError) {
         //checkNotBlank(data.getWallThickness_YLGD(), "公称壁厚不能为空；", rowError);
         //checkNotBlank(data.getNominalDiameter(), "公称直径不能为空；", rowError);
         checkNotBlank(data.getPipeLength(), "管道长度不能为空；", rowError);
@@ -516,7 +516,7 @@ public class XiAnDataDockServiceImpl {
      * @param data
      * @param rowError
      */
-    private void DXYLSSTechnicalParamsCheck(XiAnEquipInfoExcelDto data, StringBuilder rowError) {
+    private void DXYLSSTechnicalParamsCheck(XiAnEquipInfoExcelDto data, StringBuffer rowError) {
     }
 
     /**
@@ -525,7 +525,7 @@ public class XiAnDataDockServiceImpl {
      * @param data
      * @param rowError
      */
-    private void KYSDTechnicalParamsCheck(XiAnEquipInfoExcelDto data, StringBuilder rowError) {
+    private void KYSDTechnicalParamsCheck(XiAnEquipInfoExcelDto data, StringBuffer rowError) {
     }
 
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/XiAnDataDockController.java → amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/DataDockController.java

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
-import com.yeejoin.amos.boot.module.jg.biz.service.impl.XiAnDataDockServiceImpl;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.DataDockServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -17,26 +17,26 @@ import java.util.Map;
 
 
 @RestController
-@Api(tags = "西安数据对接 API")
-@RequestMapping(value = "/xi-an")
-public class XiAnDataDockController {
+@Api(tags = "数据对接 API")
+@RequestMapping(value = "/dataDock")
+public class DataDockController {
 
-    private final XiAnDataDockServiceImpl xiAnDataDockService;
+    private final DataDockServiceImpl dataDockService;
 
-    public XiAnDataDockController(XiAnDataDockServiceImpl xiAnDataDockService) {
-        this.xiAnDataDockService = xiAnDataDockService;
+    public DataDockController(DataDockServiceImpl dataDockService) {
+        this.dataDockService = dataDockService;
     }
 
     /**
-     * 批量导入设备数据的接口
+     * 西安数据对接-批量导入设备数据的接口
      * @param equLists 设备数据集合
-     * @return
+     * @return result
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping(value = "/saveEquipmentData")
-    @ApiOperation(httpMethod = "POST", value = "设备批量导入", notes = "导入多个设备的数据文件")
+    @PostMapping(value = "/xi-an/saveEquipmentData")
+    @ApiOperation(httpMethod = "POST", value = "西安数据对接-设备批量导入", notes = "西安数据对接-导入多个设备的数据文件")
     public ResponseModel<?> saveEquipmentData(@RequestBody List<Map<?,?>> equLists) throws Exception {
-        return ResponseHelper.buildResponse(xiAnDataDockService.saveEquipmentData(equLists));
+        return ResponseHelper.buildResponse(dataDockService.xiAnSaveEquipmentData(equLists));
     }
 }
 

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/XiAnDataDockServiceImpl.java → 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/DataDockServiceImpl.java

@@ -28,7 +28,7 @@ import static com.alibaba.fastjson.JSON.toJSONString;
 
 @Slf4j
 @Service
-public class XiAnDataDockServiceImpl {
+public class DataDockServiceImpl {
 
     @Autowired
     private ESEquipmentCategory esEquipmentCategory;
@@ -73,14 +73,14 @@ public class XiAnDataDockServiceImpl {
 
 
     /**
-     * 保存设备信息
+     * 西安数据对接-保存设备信息
      *
      * @param equLists 数据集
      * @return 保存结果
      */
     @Transactional(rollbackFor = Exception.class)
     @GlobalTransactional(rollbackFor = Exception.class)
-    public boolean saveEquipmentData(List<Map<?, ?>> equLists) {
+    public boolean xiAnSaveEquipmentData(List<Map<?, ?>> equLists) {
         CompletableFuture.allOf(equLists.stream().map(equ -> CompletableFuture.runAsync(() -> saveEquipmentDataInTransaction(equ))).toArray(CompletableFuture[]::new)).join();
         return Boolean.TRUE;
     }