From 1c014a75a7128700d6edd6d71baf952ceab697e2 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Wed, 12 Mar 2025 15:04:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/SocketDevResponseService.java | 2 +- .../plan/service/impl/AdPlanServiceImpl.java | 2 +- .../result/controller/ResultController.java | 18 ++++++++---- .../gather/result/pojo/param/ResultParam.java | 4 +-- .../gather/result/service/IResultService.java | 7 +++++ .../service/impl/ResultServiceImpl.java | 28 +++++++++++++++---- .../storage/pojo/param/StorageParam.java | 2 +- .../storage/service/AdHarmonicService.java | 2 +- .../storage/service/AdNonHarmonicService.java | 2 +- .../service/impl/AdHarmonicServiceImpl.java | 2 +- .../impl/AdNonHarmonicServiceImpl.java | 2 +- 11 files changed, 52 insertions(+), 19 deletions(-) diff --git a/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java b/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java index 83da2f29..9cfc47a3 100644 --- a/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java +++ b/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java @@ -780,7 +780,7 @@ public class SocketDevResponseService { if (param.getOperateType().equals(SourceOperateCodeEnum.RE_ERROR_TEST.getValue())) { //不合格项复检 StorageParam storageParam = new StorageParam(); - storageParam.setCode(Integer.valueOf(param.getCode())); + storageParam.setCode(param.getCode()); storageParam.setScriptId(param.getScriptId()); List indexes = adHarmonicService.getIndex(storageParam, true); issueParam.setIndexList(indexes); diff --git a/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java b/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java index 3db9a36f..e524559d 100644 --- a/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java @@ -379,7 +379,7 @@ public class AdPlanServiceImpl extends ServiceImpl impleme // scriptDtlsList = scriptDtlsList.stream().filter(obj -> !sortSet.contains(obj.getScriptIndex())).collect(Collectors.toList()); // } StorageParam storageParam = new StorageParam(); - storageParam.setCode(Integer.valueOf(adPlan.getCode())); + storageParam.setCode(adPlan.getCode()+""); storageParam.setScriptId(adPlan.getScriptId()); List indexes = adHarmonicService.getIndex(storageParam, true); scriptDtlsList = scriptDtlsList.stream().filter(obj -> indexes.contains(obj.getScriptIndex())).collect(Collectors.toList()); diff --git a/detection/src/main/java/com/njcn/gather/result/controller/ResultController.java b/detection/src/main/java/com/njcn/gather/result/controller/ResultController.java index a11a42cf..fcdcaca8 100644 --- a/detection/src/main/java/com/njcn/gather/result/controller/ResultController.java +++ b/detection/src/main/java/com/njcn/gather/result/controller/ResultController.java @@ -6,7 +6,6 @@ import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.LogUtil; -import com.njcn.gather.device.pojo.param.PqDevParam; import com.njcn.gather.result.pojo.param.ResultParam; import com.njcn.gather.result.pojo.vo.FormContentVO; import com.njcn.gather.result.pojo.vo.ResultVO; @@ -20,10 +19,7 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -98,4 +94,16 @@ public class ResultController extends BaseController { resultService.changeErrorSystem(param); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DELETE) + @GetMapping("/deleteTempTable") + @ApiOperation("删除临时表") + @ApiImplicitParam(name = "param", value = "删除参数", required = true) + public HttpResult deleteTempTable(@RequestParam("code") String code) { + String methodDescribe = getMethodDescribe("deleteTempTable"); + LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, code); + + resultService.deleteTempTable(code); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } } diff --git a/detection/src/main/java/com/njcn/gather/result/pojo/param/ResultParam.java b/detection/src/main/java/com/njcn/gather/result/pojo/param/ResultParam.java index 52c4a902..12bbc82f 100644 --- a/detection/src/main/java/com/njcn/gather/result/pojo/param/ResultParam.java +++ b/detection/src/main/java/com/njcn/gather/result/pojo/param/ResultParam.java @@ -38,7 +38,7 @@ public class ResultParam { /** * 自动生成，用于生成数据表后缀 */ - private Integer code; + private String code; /** * 检测脚本序号 @@ -86,6 +86,6 @@ public class ResultParam { @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.DEV_ID_FORMAT_ERROR) private String deviceId; - private Integer code; + private String code; } } diff --git a/detection/src/main/java/com/njcn/gather/result/service/IResultService.java b/detection/src/main/java/com/njcn/gather/result/service/IResultService.java index 641b2890..dc322637 100644 --- a/detection/src/main/java/com/njcn/gather/result/service/IResultService.java +++ b/detection/src/main/java/com/njcn/gather/result/service/IResultService.java @@ -52,4 +52,11 @@ public interface IResultService { * @param param */ void changeErrorSystem(ResultParam.ChangeErrorSystemParam param); + + /** + * 删除（更换误差体系时产生的）临时表 + * + * @param code + */ + void deleteTempTable(String code); } diff --git a/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java b/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java index 5c29b7c7..2ee669ce 100644 --- a/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java @@ -106,13 +106,13 @@ public class ResultServiceImpl implements IResultService { DictTree dictTree = dictTreeService.getById(queryParam.getScriptType()); if (HARMONIC_TYPE_CODE.contains(dictTree.getCode())) { - allResultList.addAll(adHarmonicService.get(scriptId, indexList, queryParam.getDeviceId(), queryParam.getChnNum(), plan.getCode())); + allResultList.addAll(adHarmonicService.get(scriptId, indexList, queryParam.getDeviceId(), queryParam.getChnNum(), plan.getCode() + "")); } else { - allResultList.addAll(adNonHarmonicService.get(scriptId, indexList, queryParam.getDeviceId(), queryParam.getChnNum(), plan.getCode())); + allResultList.addAll(adNonHarmonicService.get(scriptId, indexList, queryParam.getDeviceId(), queryParam.getChnNum(), plan.getCode() + "")); } } else { //查询所有的脚本类型 - allResultList.addAll(adHarmonicService.get(scriptId, null, queryParam.getDeviceId(), queryParam.getChnNum(), plan.getCode())); - allResultList.addAll(adNonHarmonicService.get(scriptId, null, queryParam.getDeviceId(), queryParam.getChnNum(), plan.getCode())); + allResultList.addAll(adHarmonicService.get(scriptId, null, queryParam.getDeviceId(), queryParam.getChnNum(), plan.getCode() + "")); + allResultList.addAll(adNonHarmonicService.get(scriptId, null, queryParam.getDeviceId(), queryParam.getChnNum(), plan.getCode() + "")); } @@ -866,6 +866,11 @@ public class ResultServiceImpl implements IResultService { this.insertTempResultTable(param.getPlanId(), param.getScriptId(), param.getCode() + "", param.getErrorSysId(), param.getDeviceId()); } + @Override + public void deleteTempTable(String code) { + this.dropTempResultTable(code); + } + private Integer conform(Set numbers) { if (CollUtil.isNotEmpty(numbers)) { if (numbers.size() > 1) { @@ -894,7 +899,7 @@ public class ResultServiceImpl implements IResultService { * @param code */ private void createTempResultTable(String code) { - tableGenMapper.genAdHarmonicTable("drop table if exists AD_Non_Harmonic_Result_" + code + "_temp,AD_Harmonic_Result_" + code + "_temp"); + this.dropTempResultTable(code); tableGenMapper.genAdNonHarmonicResultTable(code + "_temp"); StringBuilder A = new StringBuilder(); StringBuilder B = new StringBuilder(); @@ -922,6 +927,19 @@ public class ResultServiceImpl implements IResultService { " PRIMARY KEY (Monitor_Id, Script_Id, Sort, AD_Type)\n" + ") COMMENT='监测数据表';"; tableGenMapper.genAdHarmonicTable(sql1); + + sql1 = "CREATE TABLE ad_non_harmonic_" + code + "_temp " + "LIKE ad_non_harmonic_" + code; + tableGenMapper.genAdHarmonicTable(sql1); + sql1 = "INSERT INTO ad_non_harmonic_" + code + "_temp " + "SELECT * FROM ad_non_harmonic_" + code; + tableGenMapper.genAdHarmonicTable(sql1); + sql1 = "CREATE TABLE ad_harmonic_" + code + "_temp " + "LIKE ad_harmonic_" + code; + tableGenMapper.genAdHarmonicTable(sql1); + sql1 = "INSERT INTO ad_harmonic_" + code + "_temp " + "SELECT * FROM ad_harmonic_" + code; + tableGenMapper.genAdHarmonicTable(sql1); + } + + private void dropTempResultTable(String code) { + tableGenMapper.genAdHarmonicTable("drop table if exists AD_Non_Harmonic_Result_" + code + "_temp,AD_Harmonic_Result_" + code + "_temp," + "ad_non_harmonic_" + code + "_temp," + "ad_harmonic_" + code + "_temp"); } /** diff --git a/storage/src/main/java/com/njcn/gather/storage/pojo/param/StorageParam.java b/storage/src/main/java/com/njcn/gather/storage/pojo/param/StorageParam.java index f49bf858..ec247905 100644 --- a/storage/src/main/java/com/njcn/gather/storage/pojo/param/StorageParam.java +++ b/storage/src/main/java/com/njcn/gather/storage/pojo/param/StorageParam.java @@ -35,7 +35,7 @@ public class StorageParam { /** * 自动生成，用于生成数据表后缀 */ - private Integer code; + private String code; /** * 谐波次数 diff --git a/storage/src/main/java/com/njcn/gather/storage/service/AdHarmonicService.java b/storage/src/main/java/com/njcn/gather/storage/service/AdHarmonicService.java index ea045443..2178778d 100644 --- a/storage/src/main/java/com/njcn/gather/storage/service/AdHarmonicService.java +++ b/storage/src/main/java/com/njcn/gather/storage/service/AdHarmonicService.java @@ -26,7 +26,7 @@ public interface AdHarmonicService extends IService { * @param code 计划code * @return 谐波结果 */ - List get(String scriptId, List index, String deviceId, String chnNum, Integer code); + List get(String scriptId, List index, String deviceId, String chnNum, String code); /** * 查询原始数据 diff --git a/storage/src/main/java/com/njcn/gather/storage/service/AdNonHarmonicService.java b/storage/src/main/java/com/njcn/gather/storage/service/AdNonHarmonicService.java index f546f256..a9ada8f2 100644 --- a/storage/src/main/java/com/njcn/gather/storage/service/AdNonHarmonicService.java +++ b/storage/src/main/java/com/njcn/gather/storage/service/AdNonHarmonicService.java @@ -23,7 +23,7 @@ public interface AdNonHarmonicService extends IService { * @param chnNum 通道号，从1开始 * @return 非谐波结果 */ - List get(String scriptId, List sort, String deviceId, String chnNum, Integer code); + List get(String scriptId, List sort, String deviceId, String chnNum, String code); /** * 非谐波原始数据展示 diff --git a/storage/src/main/java/com/njcn/gather/storage/service/impl/AdHarmonicServiceImpl.java b/storage/src/main/java/com/njcn/gather/storage/service/impl/AdHarmonicServiceImpl.java index 676be6f1..547e0d8c 100644 --- a/storage/src/main/java/com/njcn/gather/storage/service/impl/AdHarmonicServiceImpl.java +++ b/storage/src/main/java/com/njcn/gather/storage/service/impl/AdHarmonicServiceImpl.java @@ -47,7 +47,7 @@ public class AdHarmonicServiceImpl extends ServiceImpl get(String scriptId, List sort, String deviceId, String chnNum, Integer code) { + public List get(String scriptId, List sort, String deviceId, String chnNum, String code) { String prefix = "ad_harmonic_result_"; DynamicTableNameHandler.setTableName(prefix + code); MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); diff --git a/storage/src/main/java/com/njcn/gather/storage/service/impl/AdNonHarmonicServiceImpl.java b/storage/src/main/java/com/njcn/gather/storage/service/impl/AdNonHarmonicServiceImpl.java index 27cf03fc..47fb9d4b 100644 --- a/storage/src/main/java/com/njcn/gather/storage/service/impl/AdNonHarmonicServiceImpl.java +++ b/storage/src/main/java/com/njcn/gather/storage/service/impl/AdNonHarmonicServiceImpl.java @@ -41,7 +41,7 @@ public class AdNonHarmonicServiceImpl extends ServiceImpl get(String scriptId, List sort, String deviceId, String chnNum, Integer code) { + public List get(String scriptId, List sort, String deviceId, String chnNum, String code) { String prefix = "ad_non_harmonic_result_"; DynamicTableNameHandler.setTableName(prefix + code);