refactor(jg): 西安导入数据修改

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/controller/XiAnDataDockController.java

@@ -28,7 +28,7 @@ public class XiAnDataDockController {
     /**
      * 西安除电梯外七大类设备批量导入
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @PostMapping(value = "/importData")
     @ApiOperation(httpMethod = "POST", value = "西安除电梯外七大类设备批量导入", notes = "西安除电梯外七大类设备批量导入")
     public Object importPressureData(@RequestParam MultipartFile file) {
@@ -53,7 +53,7 @@ public class XiAnDataDockController {
     /**
      * 西安电梯历史设备以及业务数据批量导入
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @PostMapping(value = "/importElevatorData")
     @ApiOperation(httpMethod = "POST", value = "西安电梯历史设备以及业务数据批量导入", notes = "西安电梯历史设备以及业务数据批量导入")
     public Object importElevatorData(@RequestParam MultipartFile file, @RequestParam(required = false, defaultValue = "true") Boolean isRegistration) {

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/OpenapiBizTokenMapper.java

 package com.yeejoin.amos.api.openapi.face.orm.dao;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.api.openapi.face.orm.entity.OpenapiBizToken;
 import org.apache.ibatis.annotations.Param;
@@ -32,6 +33,7 @@ public interface OpenapiBizTokenMapper extends BaseMapper<OpenapiBizToken> {
 	@Select("select DEVELOPER_AGENCY from iot_openapi_biz_token  where DEVELOPER_AGENCY is not null AND DATA_TYPE = 'cyl' group by DEVELOPER_AGENCY")
 	public List<String> getServiceList();
 
-	@Select("select use_unit_code, use_unit from amos_tzs_biz.tz_base_enterprise_info where app_id = '${appId}'")
+	@Select("select use_unit_code, use_unit from amos_tzs_biz.tz_base_enterprise_info where app_id = #{appId}")
+	@DS("tzs")
 	Map<String, String> queryUnitInfoByAppId(@Param("appId") String appId);
 }	
\ No newline at end of file

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

@@ -66,6 +66,8 @@ public class OpenapiBizTokenService extends BaseService<OpenapiBizTokenModel, Op
 		idPasswordAuthModel.setPassword(DesUtil.encode(systemUserInfo.getPassword(), Constant.PASSWORD_ENCODE_KEY));
 		BizTokenModel bizTokenModel = new BizTokenModel();
 		bizTokenModel.setAppId(appId);
+		bizTokenModel.setProduct(appId);
+
 		RequestContext.setProduct(appId);
 	    RequestContext.setAppKey(bizTokenModel.getAppKey());
 		FeignClientResult<HashMap<String, Object>> responseModel = Privilege.authClient.idpassword(idPasswordAuthModel);
@@ -73,9 +75,6 @@ public class OpenapiBizTokenService extends BaseService<OpenapiBizTokenModel, Op
 		String token = (String) authModel.get("token");
 		bizTokenModel.setToken(token);
 		RequestContext.setToken(token);
-//		AgencyUserModel user = Privilege.agencyUserClient.getme().getResult();
-//		bizTokenModel.setApiCompanyCode(user.getCompanys().get(0).getCompanyCode()); // 当前一个人只能有一个单位
-//		bizTokenModel.setApiCompanyName(user.getCompanys().get(0).getCompanyName()); // 当前一个人只能有一个单位
 		// 调整为从业务表根据appId查询单位信息
 		bizTokenModel.setApiCompanyCode(unitCode);
 		bizTokenModel.setApiCompanyName(unitName);

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

@@ -783,7 +783,7 @@ public class XiAnDataDockServiceImpl {
         Map<String, Object> rMap = new HashMap<>();
         // 主线程中获取登录信息传递到异步线程中
         RequestContextWrapper contextWrapper = RequestContextWrapper.capture();
-        Set<String> importResult = ConcurrentHashMap.newKeySet(); // 使用线程安全的Set
+        Set<String> errorResult = ConcurrentHashMap.newKeySet(); // 使用线程安全的Set
         // 分批处理，但限制同时运行的批次数
         int maxConcurrentBatches = 5; // 最大并发批次数
         Semaphore semaphore = new Semaphore(maxConcurrentBatches);
@@ -812,7 +812,7 @@ public class XiAnDataDockServiceImpl {
                         Collection<?> data = (Collection<?>) resultMap.get("result");
                         data.stream()
                                 .filter(item -> item instanceof String)
-                                .forEach(item -> importResult.add((String) item));
+                                .forEach(item -> errorResult.add((String) item));
                     }
                     if (resultMap.containsKey("status") && Integer.parseInt(resultMap.get("status").toString()) != 200) {
                         throw new RuntimeException(resultMap.get("message").toString());
@@ -828,9 +828,9 @@ public class XiAnDataDockServiceImpl {
         }
         // 等待所有异步任务完成
         CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
-        if (!ValidationUtil.isEmpty(importResult)) {
-            rMap.put("message", importResult);
-            log.info("更新失败：{}", importResult);
+        if (!ValidationUtil.isEmpty(errorResult)) {
+            rMap.put("message", errorResult);
+            log.info("更新失败：{}", errorResult);
             return rMap;
         }
         log.info("设备保存成功");

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/biz/service/impl/CylinderSyncServiceImpl.java

@@ -19,7 +19,7 @@ import java.util.List;
  * @date 2022-03-04
  */
 @Service
-@DS("cyl")
+@DS("openapi")
 public class CylinderSyncServiceImpl {
 	@Autowired
 	private CylCylinderFillingCheckMapper fillingCheckMapper;

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/ElevatorDataTransactionService.java

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import io.seata.spring.annotation.GlobalTransactional;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Map;
+
+@Service
+public class ElevatorDataTransactionService {
+
+    private final DataDockServiceImpl dataDockService;
+
+    @Autowired
+    public ElevatorDataTransactionService(@Lazy DataDockServiceImpl dataDockService) {
+        this.dataDockService = dataDockService;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class)
+    public Object saveSingleElevatorData(Map<String, Object> equ) {
+        return dataDockService.saveElevatorDataInTransaction(equ, "jg_his_xa", null);
+    }
+}

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/JgChangeRegistrationTransferServiceImpl.java

@@ -652,7 +652,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      */
     @Override
     @ResultFieldMapping({
-            @ResultFieldMapping.ResultFieldMap(sourceField = "changeRegistrationTransfer.transferUseInfo",
+            @ResultFieldMapping.ResultFieldMap(sourceField = "changeRegistrationTransfer.estateUnitCode",
                     targetField = "changeRegistrationTransfer.estateUnitSeq",
                     serviceClass = CommonServiceImpl.class,
                     queryMethod = "queryTcmUnitSeqByCreditCode",

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/CylinderOpenApiServiceImpl.java

@@ -11,7 +11,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.rdbms.annotation.Condition;
 import org.typroject.tyboot.core.rdbms.annotation.Operator;
 
-@DS("cyl")
+@DS("openapi")
 @Service
 public class CylinderOpenApiServiceImpl {