Merge branch 'rj-test' into dev-0

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/load-transfer-mq/src/main/java/com/hdkj/lt/mq/listener/RocketConsumerCityFeederTopoListener.java

@@ -57,10 +57,10 @@ public class RocketConsumerCityFeederTopoListener implements MessageListener {
                 log.info("===== 处理拓扑数据完成 =====");
             }
             //解析完成后重新成图
-            SvgGenerationDTO svgGenerationDTO = new SvgGenerationDTO();
-            svgGenerationDTO.setSvgType("1");
-            svgGenerationDTO.setFeederList(lineIds);
-            lineSvgFileApiClient.lineDynamicSvgSave(svgGenerationDTO);
+//            SvgGenerationDTO svgGenerationDTO = new SvgGenerationDTO();
+//            svgGenerationDTO.setSvgType("1");
+//            svgGenerationDTO.setFeederList(lineIds);
+//            lineSvgFileApiClient.lineDynamicSvgSave(svgGenerationDTO);
             /* // 连接响应时间无法保证,废弃此方式改成topo服务主动触发
             if (objectApiResponse.isSuccess() && rocketMQProperties.getEnabled()) {
                 log.info("===== 处理拓扑数据完成 =====");

services/load-transfer-mq/src/main/java/com/hdkj/lt/mq/listener/RocketConsumerDistLineFileListener.java

@@ -44,6 +44,7 @@ public class RocketConsumerDistLineFileListener implements MessageListener {
             String type = message.getTag();
             String value = new String(message.getBody(), StandardCharsets.UTF_8);
             // 调用业务层操作
+            value = value.replaceAll("\"","");
             this.executeFunc(value, type);
             return Action.CommitMessage;
         } catch (Exception e) {

services/load-transfer-si/src/main/java/com/hdkj/lt/si/service/svg/impl/SvgGenerationServiceImpl.java

@@ -430,7 +430,7 @@ public class SvgGenerationServiceImpl implements ISvgGenerationService {
     private DynamicSvgVO getDynamicSvgInfo(SvgGenerationDTO svgGeneration, FeederBaseVO feederBase, List<FeederBaseVO> feederList,
                                            List<StateEstimation.StateEstimationSwitchResult> list, List<AppendSwitchDTO> details, String switchId) {
         String appendLogInfo = Optional.ofNullable(details).filter(ObjectUtils::isNotEmpty).map(e -> "-负荷点").orElse("");
-        SvgObjectDTO svgObject = svgGeneration.getSvgObject();
+        SvgObjectDTO svgObject = Optional.ofNullable(svgGeneration.getSvgObject()).orElse(SvgObjectDTO.builder().build());
         String feeder = feederBase.getPsrId(); // 主线路ID
         String objId = Optional.ofNullable(svgObject.getObjId()).map(String::valueOf).orElse(feeder); // 动态成图参数关联ID
         String objType = Optional.ofNullable(svgObject.getObjType()).orElse(ZERO); // 动态成图参数关联类型

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/controller/SysJobLogController.java

@@ -2,6 +2,12 @@ package com.hdkj.lt.job.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hdkj.lt.job.domain.SysJob;
+import com.ruoyi.common.core.constant.HttpStatus;
+import com.ruoyi.common.core.web.page.PageDomain;
+import com.ruoyi.common.core.web.page.TableSupport;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -38,9 +44,21 @@ public class SysJobLogController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(SysJobLog sysJobLog)
     {
-        startPage();
-        List<SysJobLog> list = jobLogService.selectJobLogList(sysJobLog);
-        return getDataTable(list);
+//        startPage();
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        Page<SysJobLog> page = new Page<>();
+        page.setCurrent(pageNum);
+        page.setSize(pageSize);
+//        List<SysJobLog> list = jobLogService.selectJobLogList(sysJobLog);
+        Page<SysJobLog> list = jobLogService.selectJobLogListPage(page, sysJobLog);
+        TableDataInfo tableDataInfo = new TableDataInfo();
+        tableDataInfo.setCode(HttpStatus.SUCCESS);
+        tableDataInfo.setMsg("查询成功");
+        tableDataInfo.setRows(list.getRecords());
+        tableDataInfo.setTotal(list.getTotal());
+        return tableDataInfo;
     }
 
     /**

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/mapper/SysJobLogMapper.java

@@ -1,8 +1,10 @@
 package com.hdkj.lt.job.mapper;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hdkj.lt.job.domain.SysJobLog;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -12,8 +14,7 @@ import java.util.List;
  * @author ruoyi
  */
 @Mapper
-public interface SysJobLogMapper
-{
+public interface SysJobLogMapper {
     /**
      * 获取quartz调度器日志的计划任务
      *
@@ -22,6 +23,8 @@ public interface SysJobLogMapper
      */
     public List<SysJobLog> selectJobLogList(SysJobLog jobLog);
 
+    Page<SysJobLog> selectJobLogListPage(Page<SysJobLog> page, @Param("jobLog") SysJobLog jobLog);
+
     /**
      * 查询所有调度任务日志
      *
@@ -65,4 +68,6 @@ public interface SysJobLogMapper
      * 清空任务日志
      */
     public void cleanJobLog();
+
+
 }

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

@@ -13,8 +13,7 @@ import java.util.List;
  * @author ruoyi
  */
 @Mapper
-public interface SysJobMapper
-{
+public interface SysJobMapper {
     /**
      * 查询调度任务日志集合
      *

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

@@ -1,6 +1,8 @@
 package com.hdkj.lt.job.service;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hdkj.lt.job.domain.SysJob;
 import com.hdkj.lt.job.domain.SysJobLog;
 
 import java.util.List;
@@ -20,6 +22,8 @@ public interface ISysJobLogService
      */
     public List<SysJobLog> selectJobLogList(SysJobLog jobLog);
 
+    public Page<SysJobLog> selectJobLogListPage(Page<SysJobLog> page, SysJobLog jobLog);
+
     /**
      * 通过调度任务日志ID查询调度信息
      *

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;
     }

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

@@ -1,6 +1,9 @@
 package com.hdkj.lt.job.service.impl;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hdkj.lt.job.domain.SysJob;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.hdkj.lt.job.domain.SysJobLog;
@@ -29,6 +32,11 @@ public class SysJobLogServiceImpl implements com.hdkj.lt.job.service.ISysJobLogS
         return jobLogMapper.selectJobLogList(jobLog);
     }
 
+    @Override
+    public Page<SysJobLog> selectJobLogListPage(Page<SysJobLog> page, SysJobLog jobLog) {
+        return jobLogMapper.selectJobLogListPage(page, jobLog);
+    }
+
     /**
      * 通过调度任务日志ID查询调度信息
      *

services/ruoyi-job/src/main/java/com/hdkj/lt/job/mapper/mapping/DistOSSSvgFileMapper.xml → services/ruoyi-job/src/main/resources/mapper/DistOSSSvgFileMapper.xml

@@ -3,13 +3,13 @@
 <mapper namespace="com.hdkj.lt.job.mapper.DistOSSSvgFileMapper">
 
     <select id="getCustomStorageLine" resultType="java.lang.String">
-        select f.psr_id from dwd_shb_ds_feeder_base f join SYS_DICT_SINGLE s on f.city = s.VALUE
-        join SYS_DICT_TYPE t on s.TYPE_ID = t.TYPE_ID and t.TYPE_NAME = 'custom_storage'
-        where s.BAK_1 is null and f.psr_state= '20'
+        select f.psr_id from dwd_shb_ds_feeder_base f join SYS_DICT_DATA s on f.city = s.DICT_VALUE
+        and s.DICT_TYPE = 'custom_storage'
+        where s.BAK1 is null and f.psr_state= '20'
         union all
-        select f.psr_id from dwd_shb_ds_feeder_base f join SYS_DICT_SINGLE s on f.city = s.LABEL
-        join SYS_DICT_TYPE t on s.TYPE_ID = t.TYPE_ID and t.TYPE_NAME = 'custom_storage'
-        where s.BAK_1 is null and f.psr_state= '20'
+        select f.psr_id from dwd_shb_ds_feeder_base f join SYS_DICT_DATA s on f.city = s.DICT_LABEL
+         and s.DICT_TYPE = 'custom_storage'
+        where s.BAK1 is null and f.psr_state= '20'
     </select>
 
     <insert id="insertDistMasterStationFile">

services/ruoyi-job/src/main/resources/mapper/SysJobLogMapper.xml

@@ -45,6 +45,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by create_time desc
 	</select>
 
+	<select id="selectJobLogListPage" resultType="com.hdkj.lt.job.domain.SysJobLog">
+		<include refid="selectJobLogVo"/>
+		<where>
+			<if test="jobLog.jobName != null and jobLog.jobName != ''">
+				AND job_name like concat('%', #{jobLog.jobName}, '%')
+			</if>
+			<if test="jobLog.jobGroup != null and jobLog.jobGroup != ''">
+				AND job_group = #{jobLog.jobGroup}
+			</if>
+			<if test="jobLog.status != null and jobLog.status != ''">
+				AND status = #{jobLog.status}
+			</if>
+			<if test="jobLog.invokeTarget != null and jobLog.invokeTarget != ''">
+				AND invoke_target like concat('%', #{jobLog.invokeTarget}, '%')
+			</if>
+			<if test="jobLog.startTime != null and jobLog.startTime != ''"><!-- 开始时间检索 -->
+				and date_format(create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
+			</if>
+			<if test="jobLog.stopTime != null and jobLog.stopTime != ''"><!-- 结束时间检索 -->
+				and date_format(create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
+			</if>
+		</where>
+		order by create_time desc
+	</select>
+
+
 	<select id="selectJobLogAll" resultMap="SysJobLogResult">
 		<include refid="selectJobLogVo"/>
 	</select>
@@ -54,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where job_log_id = #{jobLogId}
 	</select>
 
-	<delete id="deleteJobLogById" parameterType="Long">
+    <delete id="deleteJobLogById" parameterType="Long">
  		delete from sys_job_log where job_log_id = #{jobLogId}
  	</delete>