xml移动目录

common/common-core/src/main/java/com/hdkj/lt/core/plugins/security/SqlExecuterTimeInterceptor.java

@@ -49,7 +49,7 @@ public class SqlExecuterTimeInterceptor implements Interceptor {
         } finally {
             // 拼接日志打印过程
             long costTime = endTime - startTime;
-            logger.info("\n 执行SQL耗时：{}ms 执行SQL：{}", costTime, printSql);
+            logger.info("\n 执行SQL耗时：{}ms 执行SQL：{}", costTime, printSql.length() > 200 ? printSql.substring(0, 200) : printSql);
         }
         return proceed;
     }

services/load-transfer-io/src/main/java/com/hdkj/lt/io/LoadTransferIOApplication.java

@@ -17,7 +17,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @EnableFeignClients(basePackages = {SystemGlobalConstant.HUSSAR_ROOT_PACKAGE, SystemGlobalConstant.BIZMS_BASE_PACKAGE})
 @EnableDiscoveryClient
 @SpringBootApplication(scanBasePackages = {SystemGlobalConstant.BIZMS_BASE_PACKAGE})
-@MapperScan(basePackages = {SystemGlobalConstant.HUSSAR_DAO_PACKAGE, SystemGlobalConstant.BIZMS_DAO_PACKAGE})
+@MapperScan(basePackages = {SystemGlobalConstant.HUSSAR_DAO_PACKAGE, SystemGlobalConstant.BIZMS_DAO_PACKAGE, SystemGlobalConstant.BIZMS_MAPPER_PACKAGE})
 @EnableCaching
 //@EnableSwagger2WebMvc
 public class LoadTransferIOApplication {

services/load-transfer-io/src/main/java/com/hdkj/lt/io/config/AliyunOSSConfiguration.java

@@ -2,7 +2,7 @@ package com.hdkj.lt.io.config;
 
 import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSSClientBuilder;
-import com.hdkj.lt.io.dao.DistSVGFileMapper;
+import com.hdkj.lt.io.mapper.DistSVGFileMapper;
 import com.hdkj.lt.io.service.impl.AliyunIObjectStorageServiceImpl;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;

services/load-transfer-io/src/main/java/com/hdkj/lt/io/config/MinioOSSConfiguration.java

@@ -1,6 +1,6 @@
 package com.hdkj.lt.io.config;
 
-import com.hdkj.lt.io.dao.DistSVGFileMapper;
+import com.hdkj.lt.io.mapper.DistSVGFileMapper;
 import com.hdkj.lt.io.service.impl.MinioIObjectStorageServiceImpl;
 import io.minio.MinioClient;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

services/load-transfer-io/src/main/java/com/hdkj/lt/io/dao/DistSVGFileMapper.java → services/load-transfer-io/src/main/java/com/hdkj/lt/io/mapper/DistSVGFileMapper.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.io.dao;
+package com.hdkj.lt.io.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
 

services/load-transfer-io/src/main/java/com/hdkj/lt/io/service/impl/AliyunIObjectStorageServiceImpl.java

@@ -6,7 +6,7 @@ import com.aliyun.oss.model.*;
 import com.hdkj.lt.base.constants.CommonConstant;
 import com.hdkj.lt.base.constants.SymbolConstants;
 import com.hdkj.lt.io.config.AliyunOSSConfigProperties;
-import com.hdkj.lt.io.dao.DistSVGFileMapper;
+import com.hdkj.lt.io.mapper.DistSVGFileMapper;
 import com.hdkj.lt.io.service.IObjectStorageService;
 import com.hdkj.lt.modle.FileUploadDTO;
 import lombok.extern.slf4j.Slf4j;

services/load-transfer-io/src/main/java/com/hdkj/lt/io/service/impl/MinioIObjectStorageServiceImpl.java

@@ -3,7 +3,7 @@ package com.hdkj.lt.io.service.impl;
 import com.google.common.collect.Lists;
 import com.hdkj.lt.base.constants.SymbolConstants;
 import com.hdkj.lt.io.config.MinioOSSConfigProperties;
-import com.hdkj.lt.io.dao.DistSVGFileMapper;
+import com.hdkj.lt.io.mapper.DistSVGFileMapper;
 import com.hdkj.lt.io.service.IObjectStorageService;
 import com.hdkj.lt.modle.FileUploadDTO;
 import io.minio.*;

services/load-transfer-io/src/main/java/com/hdkj/lt/io/dao/mapping/DistSVGFileMapper.xml → services/load-transfer-io/src/main/resources/mapper/DistSVGFileMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hdkj.lt.io.dao.DistSVGFileMapper">
+<mapper namespace="com.hdkj.lt.io.mapper.DistSVGFileMapper">
 
     <select id="getConfigFileChangeTime" resultType="java.time.LocalDateTime">
         SELECT max(LAST_TIME) conf_time from SYS_BASE_CONFIG where CONFIG_KEY = 'ds_svg_file_config' group by CONFIG_KEY
     </select>
 
-</mapper>
+</mapper>

services/ruoyi-job/src/main/java/com/hdkj/lt/job/RuoYiJobApplication.java

@@ -12,7 +12,7 @@ import com.ruoyi.common.security.annotation.EnableRyFeignClients;
  *
  * @author ruoyi
  */
-@MapperScan(basePackages = {SystemGlobalConstant.BIZMS_DAO_PACKAGE, SystemGlobalConstant.BIZMS_MAPPER_PACKAGE, "com.hdkj.lt.job.mapper"})
+@MapperScan(basePackages = {"com.hdkj.lt.job.mapper", SystemGlobalConstant.BIZMS_DAO_PACKAGE, SystemGlobalConstant.BIZMS_MAPPER_PACKAGE})
 @EnableCustomConfig
 @EnableRyFeignClients(basePackages = {SystemGlobalConstant.BIZMS_BASE_PACKAGE, "com.ruoyi"})
 @SpringBootApplication(scanBasePackages = {SystemGlobalConstant.BIZMS_BASE_PACKAGE, "com.ruoyi"})

services/ruoyi-job/src/main/java/com/hdkj/lt/job/mapper/DistOSSSvgFileMapper.java

@@ -1,5 +1,6 @@
 package com.hdkj.lt.job.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hdkj.lt.core.sys.dao.HussarMapper;
 import com.hdkj.lt.job.entity.po.FhzgDistMappingFilePO;
 import com.hdkj.lt.modle.FileUploadDTO;
@@ -15,7 +16,7 @@ import java.util.List;
  * @Version 1.0
  */
 @Mapper
-public interface DistOSSSvgFileMapper extends HussarMapper<FhzgDistMappingFilePO> {
+public interface DistOSSSvgFileMapper extends BaseMapper<FhzgDistMappingFilePO> {
     /**
      * 获取配置的自定义附件存储线路信息
      */

services/ruoyi-job/src/main/java/com/hdkj/lt/job/service/impl/DealPsrDeviceServiceImpl.java

@@ -39,7 +39,9 @@ import java.util.stream.Collectors;
 public class DealPsrDeviceServiceImpl implements IDealPsrDeviceService {
 
     private final IPsrDeviceApiClient psrDeviceApiClient;
+
     private final IPsrDeviceSaveService psrDeviceSaveService;
+
     private final MultiThreadExecuteService multiThreadExecute;
 
     @Value("${hussar.psr.device.max-query-size:500}")
@@ -95,7 +97,7 @@ public class DealPsrDeviceServiceImpl implements IDealPsrDeviceService {
      */
     private List<String> getCityListByShort(String cityShort) {
         // 定时任务参数 地市简称
-        List<String> cityShortlist = Arrays.asList(cityShort.split(","));
+        List<String> cityShortlist = Arrays.asList(cityShort.split("-"));
         List<String> cityList = psrDeviceSaveService.getConfigCityInfo(cityShortlist);
         return cityList;
     }