raojiang před 6 měsíci
rodič
revize
b0d844d747
100 změnil soubory, kde provedl 403 přidání a 338 odebrání
  1. 6 0
      api/load-transfer-bf-api/pom.xml
  2. 21 0
      api/load-transfer-io-api/pom.xml
  3. 52 0
      api/load-transfer-io-api/src/main/java/com/hdkj/lt/feign/IFileApiClient.java
  4. 59 0
      api/load-transfer-io-api/src/main/java/com/hdkj/lt/feign/fallback/FileApiClientFallBack.java
  5. 29 0
      api/load-transfer-io-api/src/main/java/com/hdkj/lt/modle/FileIdRequestDTO.java
  6. 28 0
      api/load-transfer-io-api/src/main/java/com/hdkj/lt/modle/FileInfoDTO.java
  7. 25 0
      api/load-transfer-io-api/src/main/java/com/hdkj/lt/modle/FileRequest.java
  8. 25 0
      api/load-transfer-io-api/src/main/java/com/hdkj/lt/modle/FileUploadDTO.java
  9. 6 0
      api/load-transfer-mq-api/pom.xml
  10. 6 1
      api/load-transfer-si-api/pom.xml
  11. 1 9
      api/pom.xml
  12. 0 75
      api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteActivityService.java
  13. 1 1
      api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteDeptService.java
  14. 1 1
      api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java
  15. 0 58
      api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteTodoService.java
  16. 0 61
      api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteTodoFallbackFactory.java
  17. 1 2
      common/common-core/pom.xml
  18. 4 5
      common/common-core/src/main/java/com/hdkj/lt/core/log/dao/FhzgLogInfoMapper.java
  19. 2 2
      common/common-core/src/main/java/com/hdkj/lt/core/log/dao/mapping/FhzgLogInfoMapper.xml
  20. 3 3
      common/common-core/src/main/java/com/hdkj/lt/core/log/exception/ExceptionErrorLogCast.java
  21. 1 1
      common/common-core/src/main/java/com/hdkj/lt/core/log/model/dto/LogInfoDTO.java
  22. 1 1
      common/common-core/src/main/java/com/hdkj/lt/core/log/model/param/ErrorLogParam.java
  23. 1 1
      common/common-core/src/main/java/com/hdkj/lt/core/log/model/param/LogInfoVO.java
  24. 1 1
      common/common-core/src/main/java/com/hdkj/lt/core/log/model/po/FhzgLogInfoEntity.java
  25. 5 5
      common/common-core/src/main/java/com/hdkj/lt/core/log/service/FhzgLogInfoService.java
  26. 15 15
      common/common-core/src/main/java/com/hdkj/lt/core/log/service/impl/FhzgLogInfoServiceImpl.java
  27. 1 1
      common/common-core/src/main/java/com/hdkj/lt/core/plugins/hussar/HussarTokenUtils.java.bak
  28. 2 1
      common/common-core/src/main/java/com/hdkj/lt/core/sys/dao/SysUserRoleMapper.java
  29. 20 0
      common/common-core/src/main/java/com/hdkj/lt/core/sys/service/ISysDicRefService.java
  30. 34 0
      common/common-core/src/main/java/com/hdkj/lt/core/sys/service/impl/SysDicRefServiceImpl.java
  31. 1 0
      common/common-core/src/main/java/com/hdkj/lt/core/sys/service/impl/SysDictServiceImpl.java
  32. 1 1
      pom.xml
  33. 1 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/adapter/SiStateEstimationClient.java
  34. 4 3
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/controller/FhzgLogController.java
  35. 2 2
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/FhzgNoticeAttachment.java
  36. 2 2
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/FhzgNoticeReceiveRecord.java
  37. 2 2
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/FhzgProblemFeedbackAttachment.java
  38. 4 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/UserFeedback.java
  39. 1 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/dto/BeakerStatusDTO.java
  40. 1 0
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/dto/BrakerScopeDTO.java
  41. 0 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/dto/FhzgAbnormalityWithVolVO.java
  42. 0 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/dto/FhzgDistCustomerCountDTO.java
  43. 0 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/dto/FhzgPlanTransferSchemeCheckResultDTO.java
  44. 0 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/dto/NoticeAddDTO.java
  45. 0 3
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/dto/ProblemFeedbackListDTO.java
  46. 0 2
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/dto/ProblemFeedbackUpdateDTO.java
  47. 1 2
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/dto/StrategyConfigDTO.java
  48. 0 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/dto/StruDTO.java
  49. 0 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/dto/VolPowerCutDTO.java
  50. 0 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/vo/BeakerStatusInfoVO.java
  51. 0 2
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/vo/BeakerSvgInfoVO.java
  52. 3 2
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/vo/BreakerAreaVO.java
  53. 0 2
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/vo/FhzgAwaitTransferPathDetailVO.java
  54. 0 2
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/vo/FhzgFaultOppositeLineCarryCapacityVO.java
  55. 0 4
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/vo/FhzgPlanPowerCutVO.java
  56. 0 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/vo/NoticeListVO.java
  57. 1 0
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/vo/wholestation/WholeStationPowerCutSchemeVO.java
  58. 0 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/vo/wholestation/WholeStationPowerCutVO.java
  59. 0 2
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FaultOppositeLineCarryCapacityMapper.java
  60. 1 2
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FaultTransferSchemeOppositeLineLoadFactorMapper.java
  61. 1 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FaultTransferSchemeSwitchingSequenceMapper.java
  62. 0 3
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FeederTopoMapper.java
  63. 0 2
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgGridOperationAbnormalityMapper.java
  64. 0 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgLineLoadfactorLossMapper.java
  65. 1 3
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgNoticeAttachmentMapper.java
  66. 1 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgNoticeReceiveRecordMapper.java
  67. 1 2
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgPlanAwaitTransferSwitchSectionMapper.java
  68. 1 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgPlanAwaitTransferUsersMapper.java
  69. 1 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgPlanOppositeLineCarryCapacityMapper.java
  70. 1 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgPlanStrategyDetialMapper.java
  71. 0 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgPlanStrategyMapper.java
  72. 1 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgPlanTransferSchemeEvaluationIndexMapper.java
  73. 1 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgPlanTransferSchemeFinalSegmentCurrentDetailMapper.java
  74. 1 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgPlanTransferSchemeFinalStateCheckMapper.java
  75. 1 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgPlanTransferSchemeFinalSwitchCurrentDetailMapper.java
  76. 1 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgPlanTransferSchemeLoopCloseCheckMapper.java
  77. 1 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgPlanTransferSchemeMapper.java
  78. 2 2
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgPlanTransferSchemePathDetailMapper.java
  79. 1 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgPlanTransferSchemeStrategyScoreMapper.java
  80. 1 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgPlanTransferSchemeSwitchingSequenceMapper.java
  81. 2 2
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgPlanTransferSchemeUsersMapper.java
  82. 1 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgProblemFeedbackAttachmentMapper.java
  83. 1 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgProblemFeedbackMapper.java
  84. 0 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgSwitchingSequenceMapper.java
  85. 0 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgVoltageViolationMapper.java
  86. 0 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/FhzgInfoLimitTransferSchemeMapper.java
  87. 0 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/FhzgInfoLimitTransferSchemeResultMapper.java
  88. 0 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/FhzgInfoLimitTransferSchemeSwitchingSequenceMapper.java
  89. 0 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/FhzgLimitTransferSchemeSwitchingLoopCheckMapper.java
  90. 0 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/FhzgLimitTransferSchemeSwitchingLoopSegCurrentDetailMapper.java
  91. 0 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/FhzgLimitTransferSchemeSwitchingLoopSwCurrentDetailMapper.java
  92. 0 2
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/FhzgVoltageLimitViolationPowerCutMapper.java
  93. 0 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/FhzgVoltageLimitViolationTransferSchemeDetailMapper.java
  94. 0 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/service/impl/CustomerPowerProtectionConfigHistServiceImpl.java
  95. 2 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/service/impl/DwdShbDsSwitchBaseServiceImpl.java
  96. 0 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/service/impl/FaultAwaitTransferAreaResultServiceImpl.java
  97. 1 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/service/impl/FaultDistMappingFileServiceImpl.java
  98. 1 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/service/impl/FaultOppositeLineConcatSwitchServiceImpl.java
  99. 1 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/service/impl/FaultPowerCutSwitchServiceImpl.java
  100. 1 1
      services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/service/impl/FaultTransferSchemeEvaluationIndexServiceImpl.java

+ 6 - 0
api/load-transfer-bf-api/pom.xml

@@ -10,4 +10,10 @@
 
 	<artifactId>load-transfer-bf-api</artifactId>
 
+	<dependencies>
+		<dependency>
+			<groupId>com.hdkj</groupId>
+			<artifactId>common-core</artifactId>
+		</dependency>
+	</dependencies>
 </project>

+ 21 - 0
api/load-transfer-io-api/pom.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.hdkj</groupId>
+        <artifactId>api</artifactId>
+        <version>${revision}</version>
+    </parent>
+
+    <artifactId>load-transfer-io-api</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.hdkj</groupId>
+            <artifactId>common-core</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

+ 52 - 0
api/load-transfer-io-api/src/main/java/com/hdkj/lt/feign/IFileApiClient.java

@@ -0,0 +1,52 @@
+package com.hdkj.lt.feign;
+
+import com.hdkj.hussar.ApiResponse;
+import com.hdkj.lt.base.constants.SystemGlobalConstant;
+import com.hdkj.lt.feign.fallback.FileApiClientFallBack;
+import com.hdkj.lt.modle.FileInfoDTO;
+import com.hdkj.lt.modle.FileRequest;
+import com.hdkj.lt.modle.FileUploadDTO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ * @Description
+ * @Author wcx
+ * @Date 2025/6/3 15:52
+ * @Version 1.0
+ */
+@FeignClient(value = SystemGlobalConstant.SERVICE_NAME_LOAD_TRANSFER_IO, fallbackFactory = FileApiClientFallBack.class)
+public interface IFileApiClient {
+    // 文件上传
+    String API_IO_SERVICE_FILE_UPLOAD = "feign/upload";
+    // 获取下载文件信息
+    String API_IO_SERVICE_FILE_GET = "feign/getFileById";
+
+    // 配电云主站附件查询
+    String API_IO_SERVICE_LIST_OBJECT = "feign/listObject";
+    // 配电云主站附件下载
+    String API_IO_SERVICE_GET_OBJECT = "feign/getObject";
+    // 配电云主站附件删除
+    String API_IO_SERVICE_REMOVE_OBJECT = "feign/removeObject";
+
+    @PostMapping(API_IO_SERVICE_FILE_UPLOAD)
+    ApiResponse<FileInfoDTO> upload(@RequestBody FileRequest request);
+
+    @PostMapping(API_IO_SERVICE_FILE_GET)
+    ApiResponse<byte[]> getFileById(@RequestBody FileRequest request);
+
+    @GetMapping(API_IO_SERVICE_LIST_OBJECT)
+    ApiResponse<List<FileUploadDTO>> listObject(@RequestParam("fileDir") String fileDir);
+
+    @GetMapping(API_IO_SERVICE_GET_OBJECT)
+    ApiResponse<byte[]> getObject(@RequestParam("objectName") String objectName);
+
+    @GetMapping(API_IO_SERVICE_REMOVE_OBJECT)
+    ApiResponse<String> removeObject(@RequestParam("objectName") String objectName);
+
+}

+ 59 - 0
api/load-transfer-io-api/src/main/java/com/hdkj/lt/feign/fallback/FileApiClientFallBack.java

@@ -0,0 +1,59 @@
+package com.hdkj.lt.feign.fallback;
+
+import com.alibaba.fastjson.JSON;
+import com.hdkj.hussar.ApiResponse;
+import com.hdkj.lt.feign.IFileApiClient;
+import com.hdkj.lt.modle.FileInfoDTO;
+import com.hdkj.lt.modle.FileRequest;
+import com.hdkj.lt.modle.FileUploadDTO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Description
+ * @Author wcx
+ * @Date 2025/6/3 15:53
+ * @Version 1.0
+ */
+@Slf4j
+@Component
+public class FileApiClientFallBack implements FallbackFactory<IFileApiClient> {
+
+    @Override
+    public IFileApiClient create(Throwable cause) {
+        return new IFileApiClient() {
+            @Override
+            public ApiResponse<FileInfoDTO> upload(FileRequest request) {
+                log.error("request params: {}", JSON.toJSONString(request));
+                return ApiResponse.fail(String.format("远程调用文件上传服务异常:%s", cause.getMessage()));
+            }
+
+            @Override
+            public ApiResponse<byte[]> getFileById(FileRequest request) {
+                log.error("request params: {}", JSON.toJSONString(request));
+                return ApiResponse.fail(String.format("远程调用文件下载服务异常:%s", cause.getMessage()));
+            }
+
+            @Override
+            public ApiResponse<List<FileUploadDTO>> listObject(String fileDir) {
+                log.error("request params: {}", fileDir);
+                return ApiResponse.fail(String.format("远程调用配电云主站附件查询服务异常:%s", cause.getMessage()));
+            }
+
+            @Override
+            public ApiResponse<byte[]> getObject(String objectName) {
+                log.error("request params: {}", objectName);
+                return ApiResponse.fail(String.format("远程调用配电云主站附件下载服务异常:%s", cause.getMessage()));
+            }
+
+            @Override
+            public ApiResponse<String> removeObject(String objectName) {
+                log.error("request params: {}", objectName);
+                return ApiResponse.fail(String.format("远程调用配电云主站附件删除服务异常:%s", cause.getMessage()));
+            }
+        };
+    }
+}

+ 29 - 0
api/load-transfer-io-api/src/main/java/com/hdkj/lt/modle/FileIdRequestDTO.java

@@ -0,0 +1,29 @@
+package com.hdkj.lt.modle;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+/**
+ * @Description
+ * @Author wcx
+ * @Date 2025/8/4 16:58
+ * @Version 1.0
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class FileIdRequestDTO {
+    /**
+     * 文件ID集合
+     */
+    @ApiModelProperty("文件ID集合")
+    @NotEmpty(message = "文件ID集合不能为空")
+    private List<Long> ids;
+}

+ 28 - 0
api/load-transfer-io-api/src/main/java/com/hdkj/lt/modle/FileInfoDTO.java

@@ -0,0 +1,28 @@
+package com.hdkj.lt.modle;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author wcx
+ * @Date 2025/6/3 17:41
+ * @Version 1.0
+ */
+@Data
+@Accessors(chain = true)
+public class FileInfoDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private String id;
+    private String location;
+    private String bucket;
+    private String dir;
+    private String originName;
+    private String suffix;
+    private String sizeKb;
+    private String sizeInfo;
+    private String objectName;
+    private String path;
+}

+ 25 - 0
api/load-transfer-io-api/src/main/java/com/hdkj/lt/modle/FileRequest.java

@@ -0,0 +1,25 @@
+package com.hdkj.lt.modle;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Description
+ * @Author wcx
+ * @Date 2025/6/4 21:32
+ * @Version 1.0
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class FileRequest {
+    // 文件ID
+    private Long fileId;
+    // 文件名称
+    private String fileName;
+    // 文件内容
+    private String fileContent;
+}

+ 25 - 0
api/load-transfer-io-api/src/main/java/com/hdkj/lt/modle/FileUploadDTO.java

@@ -0,0 +1,25 @@
+package com.hdkj.lt.modle;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+/**
+ * @Description
+ * @Author wcx
+ * @Date 2025/7/17 11:37
+ * @Version 1.0
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class FileUploadDTO {
+    // 上传文件名
+    private String fileName;
+    // 文件上传时间
+    private LocalDateTime uploadTime;
+}

+ 6 - 0
api/load-transfer-mq-api/pom.xml

@@ -11,4 +11,10 @@
 
     <artifactId>load-transfer-mq-api</artifactId>
 
+    <dependencies>
+        <dependency>
+            <groupId>com.hdkj</groupId>
+            <artifactId>common-core</artifactId>
+        </dependency>
+    </dependencies>
 </project>

+ 6 - 1
api/load-transfer-si-api/pom.xml

@@ -11,5 +11,10 @@
 
     <artifactId>load-transfer-si-api</artifactId>
 
-
+    <dependencies>
+        <dependency>
+            <groupId>com.hdkj</groupId>
+            <artifactId>common-core</artifactId>
+        </dependency>
+    </dependencies>
 </project>

+ 1 - 9
api/pom.xml

@@ -18,17 +18,10 @@
         <module>load-transfer-bf-api</module>
         <module>load-transfer-mq-api</module>
         <module>load-transfer-si-api</module>
+        <module>load-transfer-io-api</module>
     </modules>
 
     <dependencies>
-        <dependency>
-            <groupId>com.hdkj</groupId>
-            <artifactId>common-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.hdkj</groupId>
-            <artifactId>ruoyi-common-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
@@ -41,7 +34,6 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
-
     </dependencies>
 
 </project>

+ 0 - 75
api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteActivityService.java

@@ -1,75 +0,0 @@
-package com.ruoyi.system.api;
-
-
-import com.hdkj.fhzg.constant.ServiceNameConstants;
-import com.hdkj.fhzg.entity.ResultModel;
-import com.ruoyi.system.api.factory.RemoteUserFallbackFactory;
-import com.ruoyi.system.api.todo.request.ActivitiRequest;
-import com.ruoyi.system.api.todo.request.CancelProcessRequest;
-import com.ruoyi.system.api.todo.request.QueryTaskRequest;
-import com.ruoyi.system.api.todo.request.UpdateProcessVarsRequest;
-import com.ruoyi.system.api.todo.response.WorkFlowDTO;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * 获取待办
- *
- */
-@FeignClient(contextId = "remoteActivityService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class)
-public interface RemoteActivityService
-{
-    /**
-     * @return 启动流程
-     */
-    @PostMapping("/processInstance/start-process")
-    ResultModel<WorkFlowDTO> startProcessInstance(@RequestBody ActivitiRequest request);
-
-
-    /**
-     * 作废
-     *
-     * @param
-     * @return
-     */
-    @PostMapping("/processInstance/cancel-process")
-    ResultModel<String> cancelProcessInstance(@RequestBody CancelProcessRequest cancelProcessRequest);
-
-
-    /**
-     * 发起流程并提交
-     *
-     * @param activitiRequest
-     * @return
-     */
-    @PostMapping("/task/start-process-and-complete")
-    ResultModel<WorkFlowDTO> startProcessAndComplete(@RequestBody ActivitiRequest activitiRequest);
-
-    /**
-     * 执行流程
-     *
-     * @param activitiRequest
-     * @return
-     */
-    @PostMapping("/task/complete-task")
-    ResultModel<WorkFlowDTO> completeTask(@RequestBody ActivitiRequest activitiRequest);
-
-    /**
-     * 根据流程实例id或者业务id获取待办任务
-     *
-     * @param queryTaskRequest
-     * @return
-     */
-    @PostMapping("/todo/get-user-task-by-process-instance-or-business")
-    ResultModel<WorkFlowDTO> getUserTaskByProcessInstanceOrBusiness(@RequestBody QueryTaskRequest queryTaskRequest);
-
-    /**
-     * 更新流程变量
-     *
-     * @param request
-     * @return
-     */
-    @PostMapping("/task/update-task-variables")
-    ResultModel<String> updateTaskVariables(@RequestBody UpdateProcessVarsRequest request);
-}

+ 1 - 1
api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteDeptService.java

@@ -1,6 +1,6 @@
 package com.ruoyi.system.api;
 
-import com.hdkj.fhzg.constant.ServiceNameConstants;
+import com.ruoyi.common.core.constant.ServiceNameConstants;
 import com.ruoyi.system.api.domain.SysDept;
 import com.ruoyi.system.api.factory.RemoteDeptFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;

+ 1 - 1
api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java

@@ -1,6 +1,6 @@
 package com.ruoyi.system.api;
 
-import com.hdkj.fhzg.constant.ServiceNameConstants;
+import com.ruoyi.common.core.constant.ServiceNameConstants;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.system.api.domain.SysFile;
 import com.ruoyi.system.api.factory.RemoteFileFallbackFactory;

+ 0 - 58
api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteTodoService.java

@@ -1,58 +0,0 @@
-package com.ruoyi.system.api;
-
-import com.hdkj.fhzg.entity.ResultModel;
-import com.ruoyi.common.core.constant.ServiceNameConstants;
-import com.ruoyi.system.api.factory.RemoteTodoFallbackFactory;
-import com.ruoyi.system.api.todo.request.CreateTodoRequest;
-import com.ruoyi.system.api.todo.request.OrderBusinessRequest;
-import com.ruoyi.system.api.todo.request.TodoTypeRequest;
-import com.ruoyi.system.api.todo.request.UpdateTodoRequest;
-import com.ruoyi.system.api.todo.response.TodoInfoResponse;
-import com.ruoyi.system.api.todo.response.TodoInst;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-/**
- * 获取待办
- *
- */
-@FeignClient(contextId = "remoteTodoService",path = "/warehouse-order-todo", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteTodoFallbackFactory.class)
-public interface RemoteTodoService
-{
-    /**
-     * @param request
-     * @return 新增待办
-     */
-    @PostMapping("/create-todo")
-    ResultModel<Boolean> addTodo(@RequestBody CreateTodoRequest request);
-
-
-    /**
-     * @param request 用户ID
-     * @return 更新待办
-     */
-    @PostMapping("/update-todo")
-    ResultModel<Boolean> updateTodo(@RequestBody UpdateTodoRequest request);
-
-
-    @PostMapping("/find-todo-by-businessId")
-    ResultModel<TodoInfoResponse> findTodoByBusinessId(@RequestBody TodoTypeRequest request);
-    /**
-     * 根据业务id 待办类型获取待办列表
-     * @param request
-     * @return
-     */
-    @PostMapping("/get-todo-list-by-business")
-    ResultModel<List<TodoInst>> getTodoListByBusinessIds(@RequestBody OrderBusinessRequest request);
-
-    /**
-     * 根据业务id 待办类型获取待办列表
-     * @param request
-     * @return
-     */
-    @PostMapping("/get-todo-list-by-business2")
-    ResultModel<List<TodoInst>> getTodoListByBusinessIds2(@RequestBody OrderBusinessRequest request);
-}

+ 0 - 61
api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteTodoFallbackFactory.java

@@ -1,61 +0,0 @@
-package com.ruoyi.system.api.factory;
-
-import com.hdkj.fhzg.entity.ResultModel;
-import com.ruoyi.system.api.RemoteTodoService;
-import com.ruoyi.system.api.todo.request.CreateTodoRequest;
-import com.ruoyi.system.api.todo.request.OrderBusinessRequest;
-import com.ruoyi.system.api.todo.request.TodoTypeRequest;
-import com.ruoyi.system.api.todo.request.UpdateTodoRequest;
-import com.ruoyi.system.api.todo.response.TodoInfoResponse;
-import com.ruoyi.system.api.todo.response.TodoInst;
-import feign.hystrix.FallbackFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * 用户服务降级处理
- * 
- * @author ruoyi
- */
-@Component
-public class RemoteTodoFallbackFactory implements FallbackFactory<RemoteTodoService>
-{
-    private static final Logger log = LoggerFactory.getLogger(RemoteTodoFallbackFactory.class);
-
-    @Override
-    public RemoteTodoService create(Throwable throwable)
-    {
-        log.error("用户服务调用失败:{}", throwable.getMessage());
-        return new RemoteTodoService()
-        {
-
-            @Override
-            public ResultModel<Boolean> addTodo(CreateTodoRequest request) {
-                return null;
-            }
-
-            @Override
-            public ResultModel<Boolean> updateTodo(UpdateTodoRequest request) {
-                return null;
-            }
-
-            @Override
-            public ResultModel<TodoInfoResponse> findTodoByBusinessId(TodoTypeRequest request) {
-                return null;
-            }
-
-            @Override
-            public ResultModel<List<TodoInst>> getTodoListByBusinessIds(OrderBusinessRequest request) {
-                return null;
-            }
-
-            @Override
-            public ResultModel<List<TodoInst>> getTodoListByBusinessIds2(OrderBusinessRequest request) {
-                return null;
-            }
-        };
-    }
-}

+ 1 - 2
common/common-core/pom.xml

@@ -15,10 +15,9 @@
 	</properties>
 
 	<dependencies>
-
 		<dependency>
 			<groupId>com.hdkj</groupId>
-			<artifactId>ruoyi-common-core</artifactId>
+			<artifactId>ruoyi-common-security</artifactId>
 		</dependency>
 
 		<dependency>

+ 4 - 5
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/log/dao/FhzgLogInfoMapper.java → common/common-core/src/main/java/com/hdkj/lt/core/log/dao/FhzgLogInfoMapper.java

@@ -1,12 +1,11 @@
-package com.hdkj.lt.bf.log.dao;
+package com.hdkj.lt.core.log.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hdkj.lt.base.annotations.MybatisLikeInterceptorMethod;
-
-import com.hdkj.lt.bf.log.model.dto.LogInfoDTO;
-import com.hdkj.lt.bf.log.model.param.LogInfoVO;
-import com.hdkj.lt.bf.log.model.po.FhzgLogInfoEntity;
+import com.hdkj.lt.core.log.model.dto.LogInfoDTO;
+import com.hdkj.lt.core.log.model.param.LogInfoVO;
+import com.hdkj.lt.core.log.model.po.FhzgLogInfoEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

+ 2 - 2
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/log/dao/mapping/FhzgLogInfoMapper.xml → common/common-core/src/main/java/com/hdkj/lt/core/log/dao/mapping/FhzgLogInfoMapper.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.bf.log.dao.FhzgLogInfoMapper">
+<mapper namespace="com.hdkj.lt.core.log.dao.FhzgLogInfoMapper">
 
 
-    <select id="selectLogInfoPage" resultType="com.hdkj.lt.bf.log.model.dto.LogInfoDTO">
+    <select id="selectLogInfoPage" resultType="com.hdkj.lt.core.log.model.dto.LogInfoDTO">
         select id, error_time, event_type, event_id, stage, related_id, related_category, source_system,
                source_system_error_id, operation_step, error_level, error_category, details,
                additional_info from fhzg_log_info

+ 3 - 3
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/log/exception/ExceptionErrorLogCast.java → common/common-core/src/main/java/com/hdkj/lt/core/log/exception/ExceptionErrorLogCast.java

@@ -1,10 +1,10 @@
-package com.hdkj.lt.bf.log.exception;
+package com.hdkj.lt.core.log.exception;
 
 import com.hdkj.lt.base.constants.ErrorLogConstant;
 import com.hdkj.lt.base.exception.BusinessException;
-import com.hdkj.lt.bf.log.model.param.ErrorLogParam;
-import com.hdkj.lt.bf.log.service.FhzgLogInfoService;
 import com.hdkj.lt.core.hussar.SpringContextHolder;
+import com.hdkj.lt.core.log.model.param.ErrorLogParam;
+import com.hdkj.lt.core.log.service.FhzgLogInfoService;
 import org.apache.commons.lang3.StringUtils;
 
 /**

+ 1 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/log/model/dto/LogInfoDTO.java → common/common-core/src/main/java/com/hdkj/lt/core/log/model/dto/LogInfoDTO.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.bf.log.model.dto;
+package com.hdkj.lt.core.log.model.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+ 1 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/log/model/param/ErrorLogParam.java → common/common-core/src/main/java/com/hdkj/lt/core/log/model/param/ErrorLogParam.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.bf.log.model.param;
+package com.hdkj.lt.core.log.model.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+ 1 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/log/model/param/LogInfoVO.java → common/common-core/src/main/java/com/hdkj/lt/core/log/model/param/LogInfoVO.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.bf.log.model.param;
+package com.hdkj.lt.core.log.model.param;
 
 import com.hdkj.lt.core.bizms.modle.request.PaginationParam;
 import io.swagger.annotations.ApiModelProperty;

+ 1 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/log/model/po/FhzgLogInfoEntity.java → common/common-core/src/main/java/com/hdkj/lt/core/log/model/po/FhzgLogInfoEntity.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.bf.log.model.po;
+package com.hdkj.lt.core.log.model.po;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

+ 5 - 5
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/log/service/FhzgLogInfoService.java → common/common-core/src/main/java/com/hdkj/lt/core/log/service/FhzgLogInfoService.java

@@ -1,11 +1,11 @@
-package com.hdkj.lt.bf.log.service;
+package com.hdkj.lt.core.log.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.hdkj.lt.bf.log.model.dto.LogInfoDTO;
-import com.hdkj.lt.bf.log.model.param.ErrorLogParam;
-import com.hdkj.lt.bf.log.model.param.LogInfoVO;
-import com.hdkj.lt.bf.log.model.po.FhzgLogInfoEntity;
+import com.hdkj.lt.core.log.model.dto.LogInfoDTO;
+import com.hdkj.lt.core.log.model.param.ErrorLogParam;
+import com.hdkj.lt.core.log.model.param.LogInfoVO;
+import com.hdkj.lt.core.log.model.po.FhzgLogInfoEntity;
 
 /**
  * @Description:

+ 15 - 15
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/log/service/impl/FhzgLogInfoServiceImpl.java → common/common-core/src/main/java/com/hdkj/lt/core/log/service/impl/FhzgLogInfoServiceImpl.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.bf.log.service.impl;
+package com.hdkj.lt.core.log.service.impl;
 
 import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,12 +7,12 @@ import com.hdkj.lt.base.constants.DictConstants;
 import com.hdkj.lt.base.constants.ErrorLogConstant;
 import com.hdkj.lt.base.enums.ErrorLevelEnum;
 import com.hdkj.lt.base.enums.EventTypeEnum;
-import com.hdkj.lt.bf.log.dao.FhzgLogInfoMapper;
-import com.hdkj.lt.bf.log.model.dto.LogInfoDTO;
-import com.hdkj.lt.bf.log.model.param.ErrorLogParam;
-import com.hdkj.lt.bf.log.model.param.LogInfoVO;
-import com.hdkj.lt.bf.log.model.po.FhzgLogInfoEntity;
-import com.hdkj.lt.bf.log.service.FhzgLogInfoService;
+import com.hdkj.lt.core.log.dao.FhzgLogInfoMapper;
+import com.hdkj.lt.core.log.model.dto.LogInfoDTO;
+import com.hdkj.lt.core.log.model.param.ErrorLogParam;
+import com.hdkj.lt.core.log.model.param.LogInfoVO;
+import com.hdkj.lt.core.log.model.po.FhzgLogInfoEntity;
+import com.hdkj.lt.core.log.service.FhzgLogInfoService;
 import com.hdkj.lt.core.sys.service.ISysDictService;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.model.LoginUser;
@@ -40,7 +40,7 @@ import java.util.Optional;
 @RequiredArgsConstructor
 public class FhzgLogInfoServiceImpl extends ServiceImpl<FhzgLogInfoMapper, FhzgLogInfoEntity> implements FhzgLogInfoService {
 
-//    private final ISysDictService sysDictService;
+    private final ISysDictService sysDictService;
 
     @Override
     public void saveLog(ErrorLogParam logParam) {
@@ -74,13 +74,13 @@ public class FhzgLogInfoServiceImpl extends ServiceImpl<FhzgLogInfoMapper, FhzgL
     public Page<LogInfoDTO> listPage(LogInfoVO logInfoVO) {
         Page<LogInfoDTO> page = new Page<>(Optional.of(logInfoVO.getCurrent()).orElse(1L), Optional.of(logInfoVO.getSize()).orElse(10L));
         Page<LogInfoDTO> logInfoDtoPage = this.getBaseMapper().selectLogInfoPage(page, logInfoVO);
-//        Map<String, Map<String, String>> dictVosByTypeNames = sysDictService.getCacheByTypeNames(DictConstants.SOURCE_SYSTEM, DictConstants.LOG_STAGE);
-//        Map<String, String> sourceSystemDict = dictVosByTypeNames.get(DictConstants.SOURCE_SYSTEM);
-//        Map<String, String> stageDict = dictVosByTypeNames.get(DictConstants.LOG_STAGE);
-//        logInfoDtoPage.getRecords().forEach(e -> {
-//            e.setEventType(EventTypeEnum.getEventTypeName(e.getEventType())).setSourceSystem(sourceSystemDict.get(e.getSourceSystem()))
-//                    .setStage(stageDict.get(e.getStage())).setErrorLevel(ErrorLevelEnum.getErrorLevelName(e.getErrorLevel()));
-//        });
+        Map<String, Map<String, String>> dictVosByTypeNames = sysDictService.getCacheByTypeNames(DictConstants.SOURCE_SYSTEM, DictConstants.LOG_STAGE);
+        Map<String, String> sourceSystemDict = dictVosByTypeNames.get(DictConstants.SOURCE_SYSTEM);
+        Map<String, String> stageDict = dictVosByTypeNames.get(DictConstants.LOG_STAGE);
+        logInfoDtoPage.getRecords().forEach(e -> {
+            e.setEventType(EventTypeEnum.getEventTypeName(e.getEventType())).setSourceSystem(sourceSystemDict.get(e.getSourceSystem()))
+                    .setStage(stageDict.get(e.getStage())).setErrorLevel(ErrorLevelEnum.getErrorLevelName(e.getErrorLevel()));
+        });
         return logInfoDtoPage;
     }
 }

+ 1 - 1
common/common-core/src/main/java/com/hdkj/lt/core/plugins/hussar/HussarTokenUtils.java.bak

@@ -103,7 +103,7 @@ public class HussarTokenUtils {
     }
 
     public HttpHeaders initHeaders() {
-        SecurityUser securityUser = BaseSecurityUtil.getUser();
+        LoginUser loginUser = SecurityUtils.getLoginUser();
         String authorization = Objects.isNull(securityUser) ? this.getToken() : securityUser.getAccessToken();
         HttpHeaders headers = new HttpHeaders();
         headers.set(HttpHeaders.AUTHORIZATION, authorization);

+ 2 - 1
common/common-core/src/main/java/com/hdkj/lt/core/sys/dao/SysUserRoleMapper.java

@@ -1,5 +1,6 @@
 package com.hdkj.lt.core.sys.dao;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hdkj.lt.core.sys.model.po.SysUserRole;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -10,5 +11,5 @@ import org.apache.ibatis.annotations.Mapper;
  * @Version: 1.0
  */
 @Mapper
-public interface SysUserRoleMapper extends HussarMapper<SysUserRole> {
+public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
 }

+ 20 - 0
common/common-core/src/main/java/com/hdkj/lt/core/sys/service/ISysDicRefService.java

@@ -0,0 +1,20 @@
+package com.hdkj.lt.core.sys.service;
+
+import com.hdkj.lt.core.sys.model.vo.DicLevelTreeVo;
+import com.hdkj.lt.core.sys.model.vo.DicVo;
+import com.hdkj.lt.core.sys.model.vo.DictVo;
+
+import java.util.List;
+
+/**
+ * @author rj
+ * @date 2026/1/30 9:13
+ * @description
+ */
+public interface ISysDicRefService {
+    List<DictVo> getDictVosByTypeNames(List<String> typeNames);
+
+    List<DicLevelTreeVo> getLevelDictByTypeName(String typeName);
+
+    List<DicVo> getDicListByType(String typeName);
+}

+ 34 - 0
common/common-core/src/main/java/com/hdkj/lt/core/sys/service/impl/SysDicRefServiceImpl.java

@@ -0,0 +1,34 @@
+package com.hdkj.lt.core.sys.service.impl;
+
+import com.hdkj.lt.core.sys.model.vo.DicLevelTreeVo;
+import com.hdkj.lt.core.sys.model.vo.DicVo;
+import com.hdkj.lt.core.sys.model.vo.DictVo;
+import com.hdkj.lt.core.sys.service.ISysDicRefService;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author rj
+ * @date 2026/1/30 9:13
+ * @description
+ */
+@Service
+public class SysDicRefServiceImpl implements ISysDicRefService {
+    //todo: 需要重写
+    @Override
+    public List<DicVo> getDicListByType(String typeName) {
+        return new ArrayList<>();
+    }
+
+    @Override
+    public List<DictVo> getDictVosByTypeNames(List<String> typeNames) {
+        return new ArrayList<>();
+    }
+
+    @Override
+    public List<DicLevelTreeVo> getLevelDictByTypeName(String typeName) {
+        return new ArrayList<>();
+    }
+}

+ 1 - 0
common/common-core/src/main/java/com/hdkj/lt/core/sys/service/impl/SysDictServiceImpl.java.bak → common/common-core/src/main/java/com/hdkj/lt/core/sys/service/impl/SysDictServiceImpl.java

@@ -6,6 +6,7 @@ import com.google.common.collect.Maps;
 import com.hdkj.lt.base.constants.DictConstants;
 import com.hdkj.lt.base.constants.RedisKeyConstants;
 import com.hdkj.lt.base.constants.SymbolConstants;
+import com.hdkj.lt.core.sys.service.ISysDicRefService;
 import com.hdkj.lt.core.sys.service.ISysDictService;
 import com.hdkj.lt.core.sys.service.ISysDictTypeService;
 import com.hdkj.lt.utils.cache.RedisRepository;

+ 1 - 1
pom.xml

@@ -34,7 +34,7 @@
         <hutool.version>5.8.34</hutool.version>
         <redisson.version>3.14.1</redisson.version>
         <log4j.version>2.17.2</log4j.version>
-        <mybatis-plus.version>3.5.4</mybatis-plus.version>
+        <mybatis-plus.version>3.5.9</mybatis-plus.version>
         <dubbo.version>3.3.0</dubbo.version>
         <dynamic-ds.version>4.3.1</dynamic-ds.version>
         <org.mapstruct.version>1.4.2.Final</org.mapstruct.version>

+ 1 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/adapter/SiStateEstimationClient.java

@@ -1,9 +1,9 @@
 package com.hdkj.lt.bf.adapter;
 
+import com.hdkj.hussar.ApiResponse;
 import com.hdkj.lt.core.bizms.modle.dto.StateEstimation;
 import com.hdkj.lt.core.bizms.modle.request.StateEstimationEquipRequest;
 import com.hdkj.lt.core.bizms.modle.request.StateEstimationRequest;
-import com.hdkj.hussar.ApiResponse;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;

+ 4 - 3
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/controller/FhzgLogController.java

@@ -1,9 +1,10 @@
 package com.hdkj.lt.bf.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hdkj.lt.bf.log.model.dto.LogInfoDTO;
-import com.hdkj.lt.bf.log.model.param.LogInfoVO;
-import com.hdkj.lt.bf.log.service.FhzgLogInfoService;
+
+import com.hdkj.lt.core.log.model.dto.LogInfoDTO;
+import com.hdkj.lt.core.log.model.param.LogInfoVO;
+import com.hdkj.lt.core.log.service.FhzgLogInfoService;
 import com.hdkj.lt.core.mvc.BaseController;
 import com.hdkj.hussar.ApiResponse;
 import io.swagger.annotations.ApiOperation;

+ 2 - 2
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/FhzgNoticeAttachment.java

@@ -1,12 +1,12 @@
 package com.hdkj.lt.bf.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 /**
  * 

+ 2 - 2
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/FhzgNoticeReceiveRecord.java

@@ -1,12 +1,12 @@
 package com.hdkj.lt.bf.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 /**
  * 通知接收记录

+ 2 - 2
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/FhzgProblemFeedbackAttachment.java

@@ -1,12 +1,12 @@
 package com.hdkj.lt.bf.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 /**
  * 问题反馈附件表

+ 4 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/UserFeedback.java

@@ -4,7 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;

+ 1 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/dto/BeakerStatusDTO.java

@@ -1,7 +1,7 @@
 package com.hdkj.lt.bf.entity.dto;
 
-import com.hdkj.lt.base.annotations.DateTimeValid;
 import cn.hutool.core.date.DatePattern;
+import com.hdkj.lt.base.annotations.DateTimeValid;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

+ 1 - 0
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/dto/BrakerScopeDTO.java

@@ -3,6 +3,7 @@ package com.hdkj.lt.bf.entity.dto;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+
 import java.io.Serializable;
 import java.util.List;
 

+ 0 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/dto/FhzgAbnormalityWithVolVO.java

@@ -2,7 +2,6 @@ package com.hdkj.lt.bf.entity.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.hdkj.lt.bf.entity.vo.FhzgGridOperationAbnormalityVO;
-import com.hdkj.lt.core.bizms.modle.dto.FhzgGridOperationAbnormalityDTO;
 import com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgVoltageLimitViolationPowerCut;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+ 0 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/dto/FhzgDistCustomerCountDTO.java

@@ -1,6 +1,5 @@
 package com.hdkj.lt.bf.entity.dto;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

+ 0 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/dto/FhzgPlanTransferSchemeCheckResultDTO.java

@@ -3,7 +3,6 @@ package com.hdkj.lt.bf.entity.dto;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.bcel.generic.INEG;
 
 import java.io.Serializable;
 

+ 0 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/dto/NoticeAddDTO.java

@@ -1,6 +1,5 @@
 package com.hdkj.lt.bf.entity.dto;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.util.List;

+ 0 - 3
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/dto/ProblemFeedbackListDTO.java

@@ -4,9 +4,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.Date;
 
 /**
  * @author rj

+ 0 - 2
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/dto/ProblemFeedbackUpdateDTO.java

@@ -1,7 +1,5 @@
 package com.hdkj.lt.bf.entity.dto;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 
 import java.util.List;

+ 1 - 2
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/dto/StrategyConfigDTO.java

@@ -1,13 +1,12 @@
 package com.hdkj.lt.bf.entity.dto;
 
-import com.hdkj.lt.base.annotations.DateTimeValid;
 import cn.hutool.core.date.DatePattern;
+import com.hdkj.lt.base.annotations.DateTimeValid;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 @Data

+ 0 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/dto/StruDTO.java

@@ -2,7 +2,6 @@ package com.hdkj.lt.bf.entity.dto;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 import java.util.List;

+ 0 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/dto/VolPowerCutDTO.java

@@ -7,7 +7,6 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-
 import java.time.LocalDateTime;
 import java.util.List;
 

+ 0 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/vo/BeakerStatusInfoVO.java

@@ -7,7 +7,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.util.List;
 
 @Data
 @NoArgsConstructor

+ 0 - 2
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/vo/BeakerSvgInfoVO.java

@@ -6,8 +6,6 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.List;
-
 @Data
 @NoArgsConstructor
 @AllArgsConstructor

+ 3 - 2
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/vo/BreakerAreaVO.java

@@ -1,13 +1,14 @@
 package com.hdkj.lt.bf.entity.vo;
 
-import java.io.Serializable;
-import java.util.List;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.util.List;
+
 @Data
 @NoArgsConstructor
 @AllArgsConstructor

+ 0 - 2
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/vo/FhzgAwaitTransferPathDetailVO.java

@@ -1,6 +1,5 @@
 package com.hdkj.lt.bf.entity.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.hdkj.lt.base.serializer.BigDecimalSerializer;
 import com.hdkj.lt.core.bizms.modle.po.operationAbnormality.FhzgOperationAbnormalityAwaitTransferPathDetail;
@@ -10,7 +9,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
-import javax.jws.HandlerChain;
 import java.math.BigDecimal;
 import java.util.List;
 

+ 0 - 2
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/vo/FhzgFaultOppositeLineCarryCapacityVO.java

@@ -2,9 +2,7 @@ package com.hdkj.lt.bf.entity.vo;
 
 import com.hdkj.lt.core.bizms.modle.po.fault.FaultOppositeLineCarryCapacity;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 @Data

+ 0 - 4
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/vo/FhzgPlanPowerCutVO.java

@@ -1,17 +1,13 @@
 package com.hdkj.lt.bf.entity.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.hdkj.lt.base.serializer.BigDecimalSerializer;
 import com.hdkj.lt.bf.entity.FhzgPlanPowerCut;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.Date;
 import java.util.List;
 
 @Data

+ 0 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/vo/NoticeListVO.java

@@ -1,6 +1,5 @@
 package com.hdkj.lt.bf.entity.vo;
 
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.hdkj.lt.bf.entity.dto.AttachmentDTO;
 import lombok.Data;

+ 1 - 0
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/vo/wholestation/WholeStationPowerCutSchemeVO.java

@@ -4,6 +4,7 @@ import com.hdkj.lt.bf.entity.vo.BreakerAreaVO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+
 import java.util.List;
 
 /**

+ 0 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/vo/wholestation/WholeStationPowerCutVO.java

@@ -1,6 +1,5 @@
 package com.hdkj.lt.bf.entity.vo.wholestation;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.hdkj.lt.bf.entity.dto.FhzgPlanDistMappingFileDTO;
 import com.hdkj.lt.bf.entity.vo.BreakerAreaVO;

+ 0 - 2
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FaultOppositeLineCarryCapacityMapper.java

@@ -2,11 +2,9 @@ package com.hdkj.lt.bf.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hdkj.lt.bf.entity.vo.FhzgFaultOppositeLineCarryCapacityVO;
-import com.hdkj.lt.bf.entity.vo.FhzgOppositeLineCarryCapacityVO;
 import com.hdkj.lt.core.bizms.modle.po.fault.FaultOppositeLineCarryCapacity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

+ 1 - 2
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FaultTransferSchemeOppositeLineLoadFactorMapper.java

@@ -1,10 +1,9 @@
 package com.hdkj.lt.bf.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hdkj.lt.bf.entity.dto.FhzgFaultTransferSchemeOppositeLineLoadFactorDTO;
 import com.hdkj.lt.bf.entity.dto.FaultTransferSchemeOppositeLineLoadFactorDTO;
+import com.hdkj.lt.bf.entity.dto.FhzgFaultTransferSchemeOppositeLineLoadFactorDTO;
 import com.hdkj.lt.core.bizms.modle.po.fault.FaultTransferSchemeOppositeLineLoadFactor;
 import org.apache.ibatis.annotations.Param;
 

+ 1 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FaultTransferSchemeSwitchingSequenceMapper.java

@@ -3,8 +3,8 @@ package com.hdkj.lt.bf.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hdkj.lt.bf.entity.dto.FhzgFaultTransferSchemeSwitchingSequenceDTO;
-import com.hdkj.lt.core.bizms.modle.po.fault.FaultTransferScheme;
 import com.hdkj.lt.bf.entity.dto.FhzgPlanTransferSchemeSwitchingSequenceCountDTO;
+import com.hdkj.lt.core.bizms.modle.po.fault.FaultTransferScheme;
 import com.hdkj.lt.core.bizms.modle.po.fault.FaultTransferSchemeSwitchingSequence;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

+ 0 - 3
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FeederTopoMapper.java

@@ -1,12 +1,9 @@
 package com.hdkj.lt.bf.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hdkj.lt.bf.entity.vo.SwitchOrTransformerVO;
 import com.hdkj.lt.core.bizms.modle.po.FeederTopo;
 import org.apache.ibatis.annotations.Mapper;
 
-import java.util.List;
-
 @Mapper
 public interface FeederTopoMapper extends BaseMapper<FeederTopo> {
 

+ 0 - 2
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgGridOperationAbnormalityMapper.java

@@ -1,8 +1,6 @@
 package com.hdkj.lt.bf.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hdkj.lt.base.annotations.MybatisLikeInterceptorMethod;
 import com.hdkj.lt.bf.entity.dto.DirectCurrentDTO;
 import com.hdkj.lt.bf.entity.vo.*;
 import com.hdkj.lt.core.bizms.modle.dto.FhzgGridOperationAbnormalityDTO;

+ 0 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgLineLoadfactorLossMapper.java

@@ -2,7 +2,6 @@ package com.hdkj.lt.bf.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hdkj.lt.core.bizms.modle.po.operationAbnormality.FhzgOperationAbnormalityLineLoadfactorLoss;
-import com.hdkj.lt.core.bizms.modle.po.operationAbnormality.FhzgOperationAbnormalitySwitchingSequence;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

+ 1 - 3
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgNoticeAttachmentMapper.java

@@ -1,9 +1,7 @@
 package com.hdkj.lt.bf.mapper;
 
-import com.hdkj.lt.bf.entity.FhzgNoticeAttachment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-import java.util.List;
+import com.hdkj.lt.bf.entity.FhzgNoticeAttachment;
 
 /**
 * @author Sunlit

+ 1 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgNoticeReceiveRecordMapper.java

@@ -1,7 +1,7 @@
 package com.hdkj.lt.bf.mapper;
 
-import com.hdkj.lt.bf.entity.FhzgNoticeReceiveRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hdkj.lt.bf.entity.FhzgNoticeReceiveRecord;
 
 /**
 * @author Sunlit

+ 1 - 2
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgPlanAwaitTransferSwitchSectionMapper.java

@@ -2,12 +2,11 @@ package com.hdkj.lt.bf.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hdkj.lt.core.bizms.modle.po.plan.FhzgPlanAwaitTransferSwitchSection;
 import com.hdkj.lt.core.bizms.modle.dto.FhzgDistCustomerDTO;
+import com.hdkj.lt.core.bizms.modle.po.plan.FhzgPlanAwaitTransferSwitchSection;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
-import org.apache.poi.hpsf.Decimal;
 
 import java.util.List;
 

+ 1 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgPlanAwaitTransferUsersMapper.java

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hdkj.lt.base.annotations.MybatisLikeInterceptorMethod;
 import com.hdkj.lt.core.bizms.modle.dto.FhzgDistCustomerDTO;
-import com.hdkj.lt.core.bizms.modle.po.plan.FhzgPlanAwaitTransferUsers;
 import com.hdkj.lt.core.bizms.modle.dto.FhzgPlanAwaitTransferUsersCountDTO;
+import com.hdkj.lt.core.bizms.modle.po.plan.FhzgPlanAwaitTransferUsers;
 import com.hdkj.lt.core.bizms.modle.vo.FhzgAwaitTransferUsersVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

+ 1 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgPlanOppositeLineCarryCapacityMapper.java

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.hdkj.lt.core.bizms.modle.po.plan.FhzgPlanOppositeLineCarryCapacity;
 import com.hdkj.lt.bf.entity.vo.FhzgOppositeLineCarryCapacityVO;
+import com.hdkj.lt.core.bizms.modle.po.plan.FhzgPlanOppositeLineCarryCapacity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;

+ 1 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgPlanStrategyDetialMapper.java

@@ -1,8 +1,8 @@
 package com.hdkj.lt.bf.mapper;
 
 
-import com.hdkj.lt.core.bizms.modle.po.plan.FhzgPlanTransferStrategyConfigDetail;
 import com.hdkj.lt.core.bizms.modle.dto.StrategyconfigDetailEntryDTO;
+import com.hdkj.lt.core.bizms.modle.po.plan.FhzgPlanTransferStrategyConfigDetail;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

+ 0 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgPlanStrategyMapper.java

@@ -1,7 +1,6 @@
 package com.hdkj.lt.bf.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hdkj.lt.bf.entity.FhzgPlanTransferStrategyConfig;
 import com.hdkj.lt.bf.entity.dto.StrategyConfigDTO;
 import com.hdkj.lt.bf.entity.dto.StrategyConfigDetailDTO;
 import com.hdkj.lt.bf.entity.dto.StrategyConfigEntryDTO;

+ 1 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgPlanTransferSchemeEvaluationIndexMapper.java

@@ -1,9 +1,9 @@
 package com.hdkj.lt.bf.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hdkj.lt.core.bizms.modle.po.plan.FhzgPlanTransferSchemeEvaluationIndex;
 import com.hdkj.lt.core.bizms.modle.dto.FhzgPlanTransferSchemeEvaluationIndexDTO;
 import com.hdkj.lt.core.bizms.modle.dto.TransferSchemeEvaluationReqDTO;
+import com.hdkj.lt.core.bizms.modle.po.plan.FhzgPlanTransferSchemeEvaluationIndex;
 
 import java.util.List;
 

+ 1 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgPlanTransferSchemeFinalSegmentCurrentDetailMapper.java

@@ -3,8 +3,8 @@ package com.hdkj.lt.bf.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hdkj.lt.bf.entity.FhzgPlanPowerCut;
-import com.hdkj.lt.core.bizms.modle.po.plan.FhzgPlanTransferSchemeFinalSegmentCurrentDetail;
 import com.hdkj.lt.bf.entity.dto.FhzgPlanTransferSchemeFinalSegmentCurrentDetailDTO;
+import com.hdkj.lt.core.bizms.modle.po.plan.FhzgPlanTransferSchemeFinalSegmentCurrentDetail;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

+ 1 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgPlanTransferSchemeFinalStateCheckMapper.java

@@ -1,8 +1,8 @@
 package com.hdkj.lt.bf.mapper;
 
+import com.hdkj.lt.bf.entity.dto.FhzgPlanTransferSchemeCheckResultDTO;
 import com.hdkj.lt.core.bizms.modle.po.plan.FhzgPlanTransferScheme;
 import com.hdkj.lt.core.bizms.modle.po.plan.FhzgPlanTransferSchemeFinalStateCheck;
-import com.hdkj.lt.bf.entity.dto.FhzgPlanTransferSchemeCheckResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

+ 1 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgPlanTransferSchemeFinalSwitchCurrentDetailMapper.java

@@ -2,8 +2,8 @@ package com.hdkj.lt.bf.mapper;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hdkj.lt.core.bizms.modle.po.plan.FhzgPlanTransferSchemeFinalSwitchCurrentDetail;
 import com.hdkj.lt.bf.entity.dto.FhzgPlanTransferSchemeFinalSwitchCurrentDetailDTO;
+import com.hdkj.lt.core.bizms.modle.po.plan.FhzgPlanTransferSchemeFinalSwitchCurrentDetail;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

+ 1 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgPlanTransferSchemeLoopCloseCheckMapper.java

@@ -1,8 +1,8 @@
 package com.hdkj.lt.bf.mapper;
 
+import com.hdkj.lt.bf.entity.dto.FhzgPlanTransferSchemeCheckResultDTO;
 import com.hdkj.lt.core.bizms.modle.po.plan.FhzgPlanTransferScheme;
 import com.hdkj.lt.core.bizms.modle.po.plan.FhzgPlanTransferSchemeLoopCloseCheck;
-import com.hdkj.lt.bf.entity.dto.FhzgPlanTransferSchemeCheckResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

+ 1 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgPlanTransferSchemeMapper.java

@@ -2,10 +2,10 @@ package com.hdkj.lt.bf.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hdkj.lt.core.bizms.modle.po.plan.FhzgPlanTransferScheme;
 import com.hdkj.lt.bf.entity.dto.FhzgPlanTransferSchemeCheckCountResultDTO;
 import com.hdkj.lt.bf.entity.dto.FhzgPlanTransferSchemeCheckResultDTO;
 import com.hdkj.lt.bf.entity.dto.FhzgPlanTransferSchemeDTO;
+import com.hdkj.lt.core.bizms.modle.po.plan.FhzgPlanTransferScheme;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

+ 2 - 2
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgPlanTransferSchemePathDetailMapper.java

@@ -2,9 +2,9 @@ package com.hdkj.lt.bf.mapper;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hdkj.lt.core.bizms.modle.po.plan.FhzgPlanTransferScheme;
-import com.hdkj.lt.core.bizms.modle.dto.FhzgPlanTransferSchemePathDetailDTO;
 import com.hdkj.lt.bf.entity.dto.FhzgPlanTransferSchemeSwitchingSequenceAndPathDTO;
+import com.hdkj.lt.core.bizms.modle.dto.FhzgPlanTransferSchemePathDetailDTO;
+import com.hdkj.lt.core.bizms.modle.po.plan.FhzgPlanTransferScheme;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

+ 1 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgPlanTransferSchemeStrategyScoreMapper.java

@@ -1,9 +1,9 @@
 package com.hdkj.lt.bf.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hdkj.lt.core.bizms.modle.po.plan.FhzgPlanTransferSchemeStrategyScore;
 import com.hdkj.lt.bf.entity.dto.FhzgPlanTransferSchemeStrategyScoreDTO;
 import com.hdkj.lt.core.bizms.modle.dto.TransferSchemeEvaluationReqDTO;
+import com.hdkj.lt.core.bizms.modle.po.plan.FhzgPlanTransferSchemeStrategyScore;
 
 import java.util.List;
 

+ 1 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgPlanTransferSchemeSwitchingSequenceMapper.java

@@ -2,8 +2,8 @@ package com.hdkj.lt.bf.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hdkj.lt.bf.entity.dto.FhzgPlanTransferSchemeSwitchingSequenceCountDTO;
-import com.hdkj.lt.core.bizms.modle.po.plan.FhzgPlanTransferScheme;
 import com.hdkj.lt.bf.entity.dto.FhzgPlanTransferSchemeSwitchingSequenceDTO;
+import com.hdkj.lt.core.bizms.modle.po.plan.FhzgPlanTransferScheme;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

+ 2 - 2
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgPlanTransferSchemeUsersMapper.java

@@ -2,10 +2,10 @@ package com.hdkj.lt.bf.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hdkj.lt.bf.entity.dto.LoadSwitchLoseUsersDTO;
-import com.hdkj.lt.core.bizms.modle.po.plan.FhzgPlanTransferSchemeUsers;
 import com.hdkj.lt.bf.entity.dto.FhzgPlanTransferSchemeUsersDTO;
+import com.hdkj.lt.bf.entity.dto.LoadSwitchLoseUsersDTO;
 import com.hdkj.lt.core.bizms.modle.dto.FhzgPlanTransferSchemeUsersReqDTO;
+import com.hdkj.lt.core.bizms.modle.po.plan.FhzgPlanTransferSchemeUsers;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

+ 1 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgProblemFeedbackAttachmentMapper.java

@@ -1,7 +1,7 @@
 package com.hdkj.lt.bf.mapper;
 
-import com.hdkj.lt.bf.entity.FhzgProblemFeedbackAttachment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hdkj.lt.bf.entity.FhzgProblemFeedbackAttachment;
 
 /**
 * @author Sunlit

+ 1 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgProblemFeedbackMapper.java

@@ -1,7 +1,7 @@
 package com.hdkj.lt.bf.mapper;
 
-import com.hdkj.lt.bf.entity.FhzgProblemFeedback;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hdkj.lt.bf.entity.FhzgProblemFeedback;
 
 /**
 * @author Sunlit

+ 0 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgSwitchingSequenceMapper.java

@@ -1,7 +1,6 @@
 package com.hdkj.lt.bf.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hdkj.lt.core.bizms.modle.po.operationAbnormality.FhzgOperationAbnormalityAwaitTransferPathDetail;
 import com.hdkj.lt.core.bizms.modle.po.operationAbnormality.FhzgOperationAbnormalitySwitchingSequence;
 import org.apache.ibatis.annotations.Mapper;
 

+ 0 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgVoltageViolationMapper.java

@@ -1,7 +1,6 @@
 package com.hdkj.lt.bf.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hdkj.lt.core.bizms.modle.po.operationAbnormality.FhzgOperationAbnormalityLineLoadfactorLoss;
 import com.hdkj.lt.core.bizms.modle.po.operationAbnormality.FhzgOperationAbnormalityVoltageViolation;
 import org.apache.ibatis.annotations.Mapper;
 

+ 0 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/FhzgInfoLimitTransferSchemeMapper.java

@@ -1,7 +1,6 @@
 package com.hdkj.lt.bf.mapper.voltageLimitViolation;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
 import com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgInfoLimitTransferScheme;
 import org.apache.ibatis.annotations.Mapper;
 

+ 0 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/FhzgInfoLimitTransferSchemeResultMapper.java

@@ -1,7 +1,6 @@
 package com.hdkj.lt.bf.mapper.voltageLimitViolation;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
 import com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgInfoLimitTransferSchemeResult;
 import org.apache.ibatis.annotations.Mapper;
 

+ 0 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/FhzgInfoLimitTransferSchemeSwitchingSequenceMapper.java

@@ -1,7 +1,6 @@
 package com.hdkj.lt.bf.mapper.voltageLimitViolation;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
 import com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgInfoLimitTransferSchemeSwitchingSequence;
 import org.apache.ibatis.annotations.Mapper;
 

+ 0 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/FhzgLimitTransferSchemeSwitchingLoopCheckMapper.java

@@ -1,7 +1,6 @@
 package com.hdkj.lt.bf.mapper.voltageLimitViolation;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
 import com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingLoopCheck;
 import org.apache.ibatis.annotations.Mapper;
 

+ 0 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/FhzgLimitTransferSchemeSwitchingLoopSegCurrentDetailMapper.java

@@ -1,7 +1,6 @@
 package com.hdkj.lt.bf.mapper.voltageLimitViolation;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
 import com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingLoopSegCurrentDetail;
 import org.apache.ibatis.annotations.Mapper;
 

+ 0 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/FhzgLimitTransferSchemeSwitchingLoopSwCurrentDetailMapper.java

@@ -1,7 +1,6 @@
 package com.hdkj.lt.bf.mapper.voltageLimitViolation;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
 import com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingLoopSwCurrentDetail;
 import org.apache.ibatis.annotations.Mapper;
 

+ 0 - 2
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/FhzgVoltageLimitViolationPowerCutMapper.java

@@ -1,8 +1,6 @@
 package com.hdkj.lt.bf.mapper.voltageLimitViolation;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hdkj.lt.base.annotations.MybatisLikeInterceptorMethod;
 import com.hdkj.lt.bf.entity.dto.VolPowerCutDTO;
 import com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgVoltageLimitViolationPowerCut;

+ 0 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/FhzgVoltageLimitViolationTransferSchemeDetailMapper.java

@@ -1,7 +1,6 @@
 package com.hdkj.lt.bf.mapper.voltageLimitViolation;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
 import com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgVoltageLimitViolationTransferSchemeDetail;
 import org.apache.ibatis.annotations.Mapper;
 

+ 0 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/service/impl/CustomerPowerProtectionConfigHistServiceImpl.java

@@ -7,7 +7,6 @@ import com.hdkj.lt.core.bizms.modle.dto.TransformerNameDTO;
 import com.hdkj.lt.core.bizms.modle.po.CustomerPowerProtectionConfigHist;
 import org.springframework.stereotype.Service;
 
-import java.util.Collections;
 import java.util.Map;
 
 /**

+ 2 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/service/impl/DwdShbDsSwitchBaseServiceImpl.java

@@ -97,7 +97,8 @@ public class DwdShbDsSwitchBaseServiceImpl extends ServiceImpl<DwdShbDsSwitchBas
             throw new BusinessException("参数不合法");
         }
         switchInfoUpdateRequest.setLastTime(new Date());
-        switchProtectionSettingsService.saveOrUpdate(switchInfoUpdateRequest, new LambdaUpdateWrapper<FhzgSwitchProtectionSettings>().eq(FhzgSwitchProtectionSettings::getDevicePrsId, switchInfoUpdateRequest.getDevicePrsId()));
+        //todo:需要修改
+//        switchProtectionSettingsService.saveOrUpdate(switchInfoUpdateRequest, new LambdaUpdateWrapper<FhzgSwitchProtectionSettings>().eq(FhzgSwitchProtectionSettings::getDevicePrsId, switchInfoUpdateRequest.getDevicePrsId()));
         //更新联络开关是否有效字段
         String contactEffective = request.getContactEffective();
         if (StrUtil.isNotBlank(contactEffective)) {

+ 0 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/service/impl/FaultAwaitTransferAreaResultServiceImpl.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hdkj.lt.bf.mapper.FaultAwaitTransferAreaResultMapper;
 import com.hdkj.lt.bf.service.IFaultAwaitTransferAreaResultService;
 import com.hdkj.lt.core.bizms.modle.po.fault.FaultAwaitTransferAreaResult;
-
 import org.springframework.stereotype.Service;
 
 /**

+ 1 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/service/impl/FaultDistMappingFileServiceImpl.java

@@ -1,9 +1,9 @@
 package com.hdkj.lt.bf.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hdkj.lt.core.bizms.modle.po.fault.FaultDistMappingFile;
 import com.hdkj.lt.bf.mapper.FaultDistMappingFileMapper;
 import com.hdkj.lt.bf.service.IFaultDistMappingFileService;
+import com.hdkj.lt.core.bizms.modle.po.fault.FaultDistMappingFile;
 import org.springframework.stereotype.Service;
 
 /**

+ 1 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/service/impl/FaultOppositeLineConcatSwitchServiceImpl.java

@@ -1,9 +1,9 @@
 package com.hdkj.lt.bf.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hdkj.lt.core.bizms.modle.po.fault.FaultOppositeLineConcatSwitch;
 import com.hdkj.lt.bf.mapper.FaultOppositeLineConcatSwitchMapper;
 import com.hdkj.lt.bf.service.IFaultOppositeLineConcatSwitchService;
+import com.hdkj.lt.core.bizms.modle.po.fault.FaultOppositeLineConcatSwitch;
 import org.springframework.stereotype.Service;
 
 /**

+ 1 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/service/impl/FaultPowerCutSwitchServiceImpl.java

@@ -1,9 +1,9 @@
 package com.hdkj.lt.bf.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hdkj.lt.core.bizms.modle.po.fault.FaultPowerCutSwitch;
 import com.hdkj.lt.bf.mapper.FaultPowerCutSwitchMapper;
 import com.hdkj.lt.bf.service.IFaultPowerCutSwitchService;
+import com.hdkj.lt.core.bizms.modle.po.fault.FaultPowerCutSwitch;
 import org.springframework.stereotype.Service;
 
 /**

+ 1 - 1
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/service/impl/FaultTransferSchemeEvaluationIndexServiceImpl.java

@@ -12,8 +12,8 @@ import com.hdkj.lt.bf.service.FhzgPlanStrategyService;
 import com.hdkj.lt.bf.service.IFaultTransferSchemeEvaluationIndexService;
 import com.hdkj.lt.core.bizms.modle.dto.FhzgPlanTransferSchemeEvaluationIndexDTO;
 import com.hdkj.lt.core.bizms.modle.dto.TransferSchemeEvaluationReqDTO;
-import com.hdkj.lt.core.bizms.modle.po.plan.FhzgPlanTransferStrategyConfigDetail;
 import com.hdkj.lt.core.bizms.modle.po.fault.FaultTransferSchemeEvaluationIndex;
+import com.hdkj.lt.core.bizms.modle.po.plan.FhzgPlanTransferStrategyConfigDetail;
 import com.hdkj.lt.core.sys.dao.SysDictMapper;
 import com.hdkj.lt.core.sys.model.po.DicSingle;
 import lombok.extern.slf4j.Slf4j;

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů