重构方案数据存储

services/load-transfer-si/src/main/java/com/hdkj/lt/si/modle/dto/BreakerOpDTO.java → api/load-transfer-si-api/src/main/java/com/hdkj/lt/modle/dto/recon/BreakerOpDTO.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.si.modle.dto;
+package com.hdkj.lt.modle.dto.recon;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;

services/load-transfer-si/src/main/java/com/hdkj/lt/si/modle/dto/FeederFlowDTO.java → api/load-transfer-si-api/src/main/java/com/hdkj/lt/modle/dto/recon/FeederFlowDTO.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.si.modle.dto;
+package com.hdkj.lt.modle.dto.recon;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;

services/load-transfer-si/src/main/java/com/hdkj/lt/si/modle/dto/FeederResultDTO.java → api/load-transfer-si-api/src/main/java/com/hdkj/lt/modle/dto/recon/FeederResultDTO.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.si.modle.dto;
+package com.hdkj.lt.modle.dto.recon;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;

services/load-transfer-si/src/main/java/com/hdkj/lt/si/modle/dto/FinalCheckDTO.java → api/load-transfer-si-api/src/main/java/com/hdkj/lt/modle/dto/recon/FinalCheckDTO.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.si.modle.dto;
+package com.hdkj.lt.modle.dto.recon;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;

services/load-transfer-si/src/main/java/com/hdkj/lt/si/modle/dto/HotCheckDTO.java → api/load-transfer-si-api/src/main/java/com/hdkj/lt/modle/dto/recon/HotCheckDTO.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.si.modle.dto;
+package com.hdkj.lt.modle.dto.recon;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;

services/load-transfer-si/src/main/java/com/hdkj/lt/si/modle/dto/MetricsDTO.java → api/load-transfer-si-api/src/main/java/com/hdkj/lt/modle/dto/recon/MetricsDTO.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.si.modle.dto;
+package com.hdkj.lt.modle.dto.recon;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;

services/load-transfer-si/src/main/java/com/hdkj/lt/si/modle/dto/RawResultDTO.java → api/load-transfer-si-api/src/main/java/com/hdkj/lt/modle/dto/recon/RawResultDTO.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.si.modle.dto;
+package com.hdkj.lt.modle.dto.recon;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;

services/load-transfer-si/src/main/java/com/hdkj/lt/si/modle/dto/ReconApiResponseDTO.java → api/load-transfer-si-api/src/main/java/com/hdkj/lt/modle/dto/recon/ReconApiResponseDTO.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.si.modle.dto;
+package com.hdkj.lt.modle.dto.recon;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;

services/load-transfer-si/src/main/java/com/hdkj/lt/si/modle/dto/ScoreItemsDTO.java → api/load-transfer-si-api/src/main/java/com/hdkj/lt/modle/dto/recon/ScoreItemsDTO.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.si.modle.dto;
+package com.hdkj.lt.modle.dto.recon;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;

services/load-transfer-si/src/main/java/com/hdkj/lt/si/modle/dto/SwitchOpDTO.java → api/load-transfer-si-api/src/main/java/com/hdkj/lt/modle/dto/recon/SwitchOpDTO.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.si.modle.dto;
+package com.hdkj.lt.modle.dto.recon;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;

services/load-transfer-si/src/main/java/com/hdkj/lt/si/modle/dto/SwitchResultDTO.java → api/load-transfer-si-api/src/main/java/com/hdkj/lt/modle/dto/recon/SwitchResultDTO.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.si.modle.dto;
+package com.hdkj.lt.modle.dto.recon;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;

services/load-transfer-si/src/main/java/com/hdkj/lt/si/modle/dto/SwitchSeqDTO.java → api/load-transfer-si-api/src/main/java/com/hdkj/lt/modle/dto/recon/SwitchSeqDTO.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.si.modle.dto;
+package com.hdkj.lt.modle.dto.recon;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;

services/load-transfer-si/src/main/java/com/hdkj/lt/si/modle/dto/VolExtremesDTO.java → api/load-transfer-si-api/src/main/java/com/hdkj/lt/modle/dto/recon/VolExtremesDTO.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.si.modle.dto;
+package com.hdkj.lt.modle.dto.recon;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.databind.JsonNode;

services/load-transfer-si/src/main/java/com/hdkj/lt/si/modle/dto/VolResultDTO.java → api/load-transfer-si-api/src/main/java/com/hdkj/lt/modle/dto/recon/VolResultDTO.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.si.modle.dto;
+package com.hdkj.lt.modle.dto.recon;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;

services/load-transfer-si/src/main/java/com/hdkj/lt/si/modle/FhzgReconFeederResult.java → api/load-transfer-si-api/src/main/java/com/hdkj/lt/modle/po/FhzgReconFeederResult.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.si.modle;
+package com.hdkj.lt.modle.po;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

services/load-transfer-si/src/main/java/com/hdkj/lt/si/modle/FhzgReconMetrics.java → api/load-transfer-si-api/src/main/java/com/hdkj/lt/modle/po/FhzgReconMetrics.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.si.modle;
+package com.hdkj.lt.modle.po;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

services/load-transfer-si/src/main/java/com/hdkj/lt/si/modle/FhzgReconResult.java → api/load-transfer-si-api/src/main/java/com/hdkj/lt/modle/po/FhzgReconResult.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.si.modle;
+package com.hdkj.lt.modle.po;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

services/load-transfer-si/src/main/java/com/hdkj/lt/si/modle/FhzgReconSwitchOp.java → api/load-transfer-si-api/src/main/java/com/hdkj/lt/modle/po/FhzgReconSwitchOp.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.si.modle;
+package com.hdkj.lt.modle.po;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

services/load-transfer-si/src/main/java/com/hdkj/lt/si/modle/FhzgReconSwitchResultDetail.java → api/load-transfer-si-api/src/main/java/com/hdkj/lt/modle/po/FhzgReconSwitchResultDetail.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.si.modle;
+package com.hdkj.lt.modle.po;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

services/load-transfer-si/src/main/java/com/hdkj/lt/si/modle/FhzgReconSwitchSeq.java → api/load-transfer-si-api/src/main/java/com/hdkj/lt/modle/po/FhzgReconSwitchSeq.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.si.modle;
+package com.hdkj.lt.modle.po;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

services/load-transfer-si/src/main/java/com/hdkj/lt/si/modle/FhzgReconVolDetail.java → api/load-transfer-si-api/src/main/java/com/hdkj/lt/modle/po/FhzgReconVolDetail.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.si.modle;
+package com.hdkj.lt.modle.po;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

services/load-transfer-si/src/main/java/com/hdkj/lt/si/modle/FhzgReconVolResult.java → api/load-transfer-si-api/src/main/java/com/hdkj/lt/modle/po/FhzgReconVolResult.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.si.modle;
+package com.hdkj.lt.modle.po;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

services/load-transfer-si/src/main/java/com/hdkj/lt/si/modle/vo/ReconstructionParam.java → api/load-transfer-si-api/src/main/java/com/hdkj/lt/modle/vo/recon/ReconstructionParam.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.si.modle.vo;
+package com.hdkj.lt.modle.vo.recon;
 
 import lombok.Data;
 

services/load-transfer-si/src/main/java/com/hdkj/lt/si/controller/recon/ReconResultController.java

@@ -1,7 +1,7 @@
 package com.hdkj.lt.si.controller.recon;
 
 
-import com.hdkj.lt.si.modle.vo.ReconstructionParam;
+import com.hdkj.lt.modle.vo.recon.ReconstructionParam;
 import com.hdkj.lt.si.service.recon.ReconResultService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

services/load-transfer-si/src/main/java/com/hdkj/lt/si/dao/FhzgReconFeederResultMapper.java

@@ -1,7 +1,7 @@
 package com.hdkj.lt.si.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hdkj.lt.si.modle.FhzgReconFeederResult;
+import com.hdkj.lt.modle.po.FhzgReconFeederResult;
 import org.apache.ibatis.annotations.Mapper;
 
 /** 馈线结果 Mapper */

services/load-transfer-si/src/main/java/com/hdkj/lt/si/dao/FhzgReconMetricsMapper.java

@@ -1,7 +1,7 @@
 package com.hdkj.lt.si.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hdkj.lt.si.modle.FhzgReconMetrics;
+import com.hdkj.lt.modle.po.FhzgReconMetrics;
 import org.apache.ibatis.annotations.Mapper;
 
 /** 运行指标 Mapper */

services/load-transfer-si/src/main/java/com/hdkj/lt/si/dao/FhzgReconResultMapper.java

@@ -1,7 +1,7 @@
 package com.hdkj.lt.si.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hdkj.lt.si.modle.FhzgReconResult;
+import com.hdkj.lt.modle.po.FhzgReconResult;
 import org.apache.ibatis.annotations.Mapper;
 
 /** 重构结果主表 Mapper */

services/load-transfer-si/src/main/java/com/hdkj/lt/si/dao/FhzgReconSwitchOpMapper.java

@@ -1,7 +1,7 @@
 package com.hdkj.lt.si.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hdkj.lt.si.modle.FhzgReconSwitchOp;
+import com.hdkj.lt.modle.po.FhzgReconSwitchOp;
 import org.apache.ibatis.annotations.Mapper;
 
 /** 开关操作-简化版 Mapper */

services/load-transfer-si/src/main/java/com/hdkj/lt/si/dao/FhzgReconSwitchResultDetailMapper.java

@@ -1,7 +1,7 @@
 package com.hdkj.lt.si.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hdkj.lt.si.modle.FhzgReconSwitchResultDetail;
+import com.hdkj.lt.modle.po.FhzgReconSwitchResultDetail;
 import org.apache.ibatis.annotations.Mapper;
 
 /** 开关状态-详情 Mapper */

services/load-transfer-si/src/main/java/com/hdkj/lt/si/dao/FhzgReconSwitchSeqMapper.java

@@ -1,7 +1,7 @@
 package com.hdkj.lt.si.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hdkj.lt.si.modle.FhzgReconSwitchSeq;
+import com.hdkj.lt.modle.po.FhzgReconSwitchSeq;
 import org.apache.ibatis.annotations.Mapper;
 
 /** 开关操作序列-详细 Mapper */

services/load-transfer-si/src/main/java/com/hdkj/lt/si/dao/FhzgReconVolDetailMapper.java

@@ -1,7 +1,7 @@
 package com.hdkj.lt.si.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hdkj.lt.si.modle.FhzgReconVolDetail;
+import com.hdkj.lt.modle.po.FhzgReconVolDetail;
 import org.apache.ibatis.annotations.Mapper;
 
 /** 电压结果-节点详情 Mapper */

services/load-transfer-si/src/main/java/com/hdkj/lt/si/dao/FhzgReconVolResultMapper.java

@@ -1,7 +1,7 @@
 package com.hdkj.lt.si.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hdkj.lt.si.modle.FhzgReconVolResult;
+import com.hdkj.lt.modle.po.FhzgReconVolResult;
 import org.apache.ibatis.annotations.Mapper;
 
 /** 电压结果-汇总 Mapper */

services/load-transfer-si/src/main/java/com/hdkj/lt/si/service/recon/impl/ReconResultServiceImpl.java

@@ -1,32 +1,24 @@
 package com.hdkj.lt.si.service.recon.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import com.hdkj.lt.base.exception.ExceptionCast;
-import com.hdkj.lt.core.bizms.modle.dto.StateEstimation;
 import com.hdkj.lt.core.rest.service.IRemoteCallService;
+import com.hdkj.lt.modle.dto.recon.*;
+import com.hdkj.lt.modle.po.*;
 import com.hdkj.lt.si.dao.*;
-import com.hdkj.lt.si.modle.dto.*;
 import com.hdkj.lt.si.service.recon.ReconResultService;
-import com.hdkj.lt.si.service.remote.impl.PsrDeviceRemoteCallServiceImpl;
 import com.hdkj.lt.si.service.remote.impl.ReconRemoteCallServiceImpl;
 import lombok.RequiredArgsConstructor;
-import com.hdkj.lt.si.modle.*;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StreamUtils;
 
 import javax.annotation.Resource;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
 import java.time.OffsetDateTime;
 import java.time.format.DateTimeFormatter;