From 73c542715573c4931f9d3406af8a481fd74c6f2f Mon Sep 17 00:00:00 2001 From: chenxudong Date: Wed, 11 Jun 2025 14:56:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E9=80=9A=E4=BA=86=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E5=8C=96=E6=95=B0=E6=8D=AE=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ImportTableController.java | 1 - .../manage/mapper/ImportTableDataMapper.java | 3 +- .../manage/mapper/ImportTableInfoMapper.java | 2 +- .../pojo/req/AddImportTableDataDTO.java | 2 +- .../pojo/req/UpdateImportTableDataDTO.java | 2 +- .../manage/service/ImportTableService.java | 4 +- .../serviceimpl/ImportTableServiceImpl.java | 11 +- .../src/test/java/ImportTableTest.java | 311 ++++++++++++++++++ electrmangnetic/src/test/java/Test1.java | 12 - 9 files changed, 324 insertions(+), 24 deletions(-) create mode 100644 electrmangnetic/src/test/java/ImportTableTest.java delete mode 100644 electrmangnetic/src/test/java/Test1.java diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/ImportTableController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/ImportTableController.java index 360c63b..5e42d4f 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/ImportTableController.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/ImportTableController.java @@ -7,7 +7,6 @@ import com.electromagnetic.industry.software.manage.pojo.req.AddImportTableDataD import com.electromagnetic.industry.software.manage.pojo.req.UpdateImportTableDataDTO; import com.electromagnetic.industry.software.manage.service.ImportTableService; import jakarta.annotation.Resource; -import org.springframework.boot.context.properties.bind.DefaultValue; import org.springframework.web.bind.annotation.*; import java.util.Optional; diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/ImportTableDataMapper.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/ImportTableDataMapper.java index 543eb0d..20871a5 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/ImportTableDataMapper.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/ImportTableDataMapper.java @@ -2,7 +2,8 @@ package com.electromagnetic.industry.software.manage.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.electromagnetic.industry.software.manage.pojo.models.ImportTableData; -import org.mapstruct.Mapper; +import org.apache.ibatis.annotations.Mapper; + @Mapper public interface ImportTableDataMapper extends BaseMapper { diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/ImportTableInfoMapper.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/ImportTableInfoMapper.java index 86fd0c1..8519a0f 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/ImportTableInfoMapper.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/ImportTableInfoMapper.java @@ -2,7 +2,7 @@ package com.electromagnetic.industry.software.manage.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.electromagnetic.industry.software.manage.pojo.models.ImportTableInfo; -import org.mapstruct.Mapper; +import org.apache.ibatis.annotations.Mapper; @Mapper public interface ImportTableInfoMapper extends BaseMapper { diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/AddImportTableDataDTO.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/AddImportTableDataDTO.java index b932e0c..648e478 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/AddImportTableDataDTO.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/AddImportTableDataDTO.java @@ -8,5 +8,5 @@ import java.util.Map; public class AddImportTableDataDTO { private String tableInfoId; - private Map tableData; + private String tableData; } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UpdateImportTableDataDTO.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UpdateImportTableDataDTO.java index beafbe2..3f6e90e 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UpdateImportTableDataDTO.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UpdateImportTableDataDTO.java @@ -7,5 +7,5 @@ import java.util.Map; @Data public class UpdateImportTableDataDTO { private String id; - private Map tableData; + private String tableData; } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/ImportTableService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/ImportTableService.java index da424cf..0961245 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/ImportTableService.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/ImportTableService.java @@ -19,11 +19,11 @@ public interface ImportTableService { ElectromagneticResult selectTableInfoByRelatedId(String relatedId); - ElectromagneticResult addTableData(String tableInfoId, Map tableData); + ElectromagneticResult addTableData(String tableInfoId, String tableData); ElectromagneticResult removeTableDataById(String id); - ElectromagneticResult updateTableData(String id, Map tableHeader); + ElectromagneticResult updateTableData(String id, String tableHeader); ElectromagneticResult selectTableDataByTableInfoId(Integer pageNum, Integer pageSize, String tableInfoId); diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/ImportTableServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/ImportTableServiceImpl.java index 08eab8c..7226f5a 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/ImportTableServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/ImportTableServiceImpl.java @@ -95,9 +95,9 @@ public class ImportTableServiceImpl implements ImportTableService { } @Override - public ElectromagneticResult addTableData(String tableInfoId, Map tableData) { + public ElectromagneticResult addTableData(String tableInfoId, String tableData) { String id = IdWorker.getSnowFlakeIdString(); - ImportTableData importTableData = new ImportTableData().setId(id).setTableInfoId(tableInfoId).setData(JSONUtil.toJsonStr(tableData)); + ImportTableData importTableData = new ImportTableData().setId(id).setTableInfoId(tableInfoId).setData(tableData); importTableDataMapper.insert(importTableData); return ElectromagneticResultUtil.success(id); } @@ -112,10 +112,10 @@ public class ImportTableServiceImpl implements ImportTableService { } @Override - public ElectromagneticResult updateTableData(String id, Map tableHeader) { + public ElectromagneticResult updateTableData(String id, String tableHeader) { importTableDataMapper.update(new ImportTableData(), Wrappers.lambdaUpdate() .eq(ImportTableData::getId, id) - .set(ImportTableData::getData, JSONUtil.toJsonStr(tableHeader))); + .set(ImportTableData::getData, tableHeader)); return ElectromagneticResultUtil.success(true); } @@ -123,7 +123,8 @@ public class ImportTableServiceImpl implements ImportTableService { public ElectromagneticResult selectTableDataByTableInfoId(Integer pageNum, Integer pageSize, String tableInfoId) { Page importTableData = importTableDataMapper.selectPage(new Page<>(pageNum, pageSize), Wrappers.lambdaQuery(ImportTableData.class) .eq(ImportTableData::getTableInfoId, tableInfoId) - .eq(ImportTableData::getEffectFlag, EffectFlagEnum.EFFECT.code)); + .eq(ImportTableData::getEffectFlag, EffectFlagEnum.EFFECT.code) + .orderByAsc(ImportTableData::getCreatedTime)); long total = importTableData.getTotal(); if (0 == total) { return ElectromagneticResultUtil.success(new RespPageVO<>(total, List.of())); diff --git a/electrmangnetic/src/test/java/ImportTableTest.java b/electrmangnetic/src/test/java/ImportTableTest.java new file mode 100644 index 0000000..c76d10b --- /dev/null +++ b/electrmangnetic/src/test/java/ImportTableTest.java @@ -0,0 +1,311 @@ +//import cn.hutool.json.JSONUtil; +//import com.electromagnetic.industry.software.common.resp.ElectromagneticResult; +//import com.electromagnetic.industry.software.manage.Application; +//import com.electromagnetic.industry.software.manage.service.ImportTableService; +//import jakarta.annotation.Resource; +//import org.junit.jupiter.api.Test; +//import org.springframework.boot.test.context.SpringBootTest; +// +//import java.util.LinkedHashMap; +//import java.util.Map; +// +//@SpringBootTest(classes = Application.class) +//public class ImportTableTest { +// +// @Resource +// private ImportTableService importTableService; +// +// @Test +// public void test1() { +// +//// int[] ids1 = {100423, 100431, 100432, 100433, 100434, 100435}; +//// int[] ids2 = {100424, 100436, 100437, 100438, 100439, 100440}; +//// int[] ids3 = {100425, 100441, 100442, 100443, 100444, 100445}; +//// +//// Map map1 = new LinkedHashMap<>(); +//// map1.put(1, "起始频率"); +//// map1.put(2, "终止频率"); +//// map1.put(3, "M等级"); +//// map1.put(4, "O等级"); +//// map1.put(5, "R等级"); +//// map1.put(6, "S等级"); +//// map1.put(7, "T等级"); +//// map1.put(8, "W等级"); +//// map1.put(9, "Y等级"); +//// map1.put(10, "版本号"); +//// +//// Map map2 = new LinkedHashMap<>(); +//// map2.put(1, "起始频率"); +//// map2.put(2, "终止频率"); +//// map2.put(3, "B等级"); +//// map2.put(4, "D等级"); +//// map2.put(5, "F等级"); +//// map2.put(6, "G等级"); +//// map2.put(7, "L等级"); +//// map2.put(8, "R等级"); +//// map2.put(9, "S等级"); +//// map2.put(10, "T等级"); +//// map2.put(11, "W等级"); +//// map2.put(12, "Y等级"); +//// map2.put(13, "版本号"); +//// +//// Map map3 = new LinkedHashMap<>(); +//// map3.put(1, "起始频率"); +//// map3.put(2, "终止频率"); +//// map3.put(3, "B等级"); +//// map3.put(4, "F等级"); +//// map3.put(5, "S等级"); +//// map3.put(6, "G等级"); +//// map3.put(7, "L等级"); +//// map3.put(8, "R等级"); +//// map3.put(9, "版本号"); +//// +//// for (Integer id : ids1) { +//// importTableService.addTableInfo(id + "", map1); +//// } +//// +//// for (Integer id : ids2) { +//// importTableService.addTableInfo(id + "", map2); +//// } +//// +//// for (Integer id : ids3) { +//// importTableService.addTableInfo(id + "", map3); +//// } +// +// } +// +// @Test +// public void test2() { +// String[] arr1 = {"1932333966414524416", "1932333966867509248","1932333966922035200","1932333966993338368","1932333967026892800","1932333967060447232"}; +// Map map1 = new LinkedHashMap<>(); +// map1.put(1, 0.01); +// map1.put(2, 0.5); +// map1.put(3, 0.6); +// map1.put(4, 3); +// map1.put(5, 0.6); +// map1.put(6, 0.03); +// map1.put(7, 0.15); +// map1.put(8, 3); +// map1.put(9, 6); +// map1.put(10, 1); +// +// Map map2 = new LinkedHashMap<>(); +// map2.put(1, 0.5); +// map2.put(2, 1); +// map2.put(3, 30); +// map2.put(4, 150); +// map2.put(5, 30); +// map2.put(6, 1.5); +// map2.put(7, 7.5); +// map2.put(8, 150); +// map2.put(9, 300); +// map2.put(10, 1); +// +// Map map3 = new LinkedHashMap<>(); +// map3.put(1, 1); +// map3.put(2, 30); +// map3.put(3, 70); +// map3.put(4, 250); +// map3.put(5, 30); +// map3.put(6, 1.5); +// map3.put(7, 7.5); +// map3.put(8, 150); +// map3.put(9, 300); +// map3.put(10, 1); +// +// Map map4 = new LinkedHashMap<>(); +// map4.put(1, 30); +// map4.put(2, 40); +// map4.put(3, 70); +// map4.put(4, 250); +// map4.put(5, 30); +// map4.put(6, 1.5); +// map4.put(7, 7.5); +// map4.put(8, 150); +// map4.put(9, 300); +// map4.put(10, 1); +// +// Map map5 = new LinkedHashMap<>(); +// map5.put(1, 40); +// map5.put(2, 100); +// map5.put(3, 32); +// map5.put(4, 50); +// map5.put(5, 30); +// map5.put(6, 1.5); +// map5.put(7, 7.55); +// map5.put(8, 150); +// map5.put(9, 300); +// map5.put(10, 1); +// +// for (String id : arr1) { +// importTableService.addTableData(id, map1); +// importTableService.addTableData(id, map2); +// importTableService.addTableData(id, map3); +// importTableService.addTableData(id, map4); +// importTableService.addTableData(id, map5); +// } +// +// } +// +// @Test +// public void test3() { +// String[] arr1 = {"1932333967098195968", "1932333967177887744", "1932333967236608000", "1932333967274356736", "1932333967307911168", "1932333967341465600"}; +// +// Map map1 = new LinkedHashMap<>(); +// map1.put(1, 100); +// map1.put(2, 200); +// map1.put(3, 20); +// map1.put(4, 25); +// map1.put(5, 50); +// map1.put(6, 100); +// map1.put(7, 200); +// map1.put(8, 20); +// map1.put(9, 1); +// map1.put(10, 5); +// map1.put(11, 100); +// map1.put(12, 200); +// map1.put(13, 1); +// +// Map map2 = new LinkedHashMap<>(); +// map2.put(1, 200); +// map2.put(2, 400); +// map2.put(3, 20); +// map2.put(4, 25); +// map2.put(5, 50); +// map2.put(6, 100); +// map2.put(7, 200); +// map2.put(8, 20); +// map2.put(9, 1); +// map2.put(10, 5); +// map2.put(11, 100); +// map2.put(12, 200); +// map2.put(13, 1); +// +// Map map3 = new LinkedHashMap<>(); +// map3.put(1, 400); +// map3.put(2, 700); +// map3.put(3, 20); +// map3.put(4, 20); +// map3.put(5, 25); +// map3.put(6, 50); +// map3.put(7, 200); +// map3.put(8, 20); +// map3.put(9, 1); +// map3.put(10, 5); +// map3.put(11, 100); +// map3.put(12, 200); +// map3.put(13, 1); +// +// Map map4 = new LinkedHashMap<>(); +// map4.put(1, 700); +// map4.put(2, 1000); +// map4.put(3, 20); +// map4.put(4, 25); +// map4.put(5, 50); +// map4.put(6, 100); +// map4.put(7, 240); +// map4.put(8, 20); +// map4.put(9, 1); +// map4.put(10, 5); +// map4.put(11, 100); +// map4.put(12, 200); +// map4.put(13, 1); +// +// Map map5 = new LinkedHashMap<>(); +// map5.put(1, 100); +// map5.put(2, 2000); +// map5.put(3, 25); +// map5.put(4, 50); +// map5.put(5, 100); +// map5.put(6, 200); +// map5.put(7, 250); +// map5.put(8, 20); +// map5.put(9, 1); +// map5.put(10, 5); +// map5.put(11, 100); +// map5.put(12, 200); +// map5.put(13, 1); +// +// for (String id : arr1) { +// importTableService.addTableData(id, map1); +// importTableService.addTableData(id, map2); +// importTableService.addTableData(id, map3); +// importTableService.addTableData(id, map4); +// importTableService.addTableData(id, map5); +// } +// } +// +// @Test +// public void test4() { +// String[] arr1 = {"1932333967379214336", "1932333967412768768", "1932333967492460544", "1932333967555375104", "1932333967593123840", "1932333967626678272"}; +// +// Map map1 = new LinkedHashMap<>(); +// map1.put(1, 400); +// map1.put(2, 700); +// map1.put(3, 150); +// map1.put(4, 175); +// map1.put(5, 350); +// map1.put(6, 700); +// map1.put(7, 730); +// map1.put(8, 150); +// map1.put(9, 1); +// +// Map map2 = new LinkedHashMap<>(); +// map2.put(1, 700); +// map2.put(2, 1000); +// map2.put(3, 150); +// map2.put(4, 175); +// map2.put(5, 350); +// map2.put(6, 700); +// map2.put(7, 1400); +// map2.put(8, 150); +// map2.put(9, 1); +// +// Map map3 = new LinkedHashMap<>(); +// map3.put(1, 1000); +// map3.put(2, 2000); +// map3.put(3, 250); +// map3.put(4, 500); +// map3.put(5, 1000); +// map3.put(6, 2000); +// map3.put(7, 5000); +// map3.put(8, 150); +// map3.put(9, 1); +// +// Map map4 = new LinkedHashMap<>(); +// map4.put(1, 2000); +// map4.put(2, 4000); +// map4.put(3, 375); +// map4.put(4, 750); +// map4.put(5, 1500); +// map4.put(6, 3000); +// map4.put(7, 6000); +// map4.put(8, 150); +// map4.put(9, 1); +// +// Map map5 = new LinkedHashMap<>(); +// map5.put(1, 4000); +// map5.put(2, 6000); +// map5.put(3, 375); +// map5.put(4, 750); +// map5.put(5, 1500); +// map5.put(6, 3000); +// map5.put(7, 7200); +// map5.put(8, 150); +// map5.put(9, 1); +// +// for (String id : arr1) { +// importTableService.addTableData(id, map1); +// importTableService.addTableData(id, map2); +// importTableService.addTableData(id, map3); +// importTableService.addTableData(id, map4); +// importTableService.addTableData(id, map5); +// } +// } +// +// @Test +// public void test5() { +// ElectromagneticResult electromagneticResult = importTableService.selectTableDataByTableInfoId(1, 10, "1932333966867509248"); +// System.out.println(JSONUtil.toJsonStr(electromagneticResult)); +// } +//} diff --git a/electrmangnetic/src/test/java/Test1.java b/electrmangnetic/src/test/java/Test1.java deleted file mode 100644 index 3ce89b0..0000000 --- a/electrmangnetic/src/test/java/Test1.java +++ /dev/null @@ -1,12 +0,0 @@ -import com.electromagnetic.industry.software.manage.Application; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest(classes = Application.class) -public class Test1 { - -// @Test -// public void test() throws MalformedURLException { -// -// } - -}