diff --git a/src/main/java/com/iflytop/nuclear/controller/NuclearCoreController.java b/src/main/java/com/iflytop/nuclear/controller/NuclearCoreController.java index 21f8121..447737e 100644 --- a/src/main/java/com/iflytop/nuclear/controller/NuclearCoreController.java +++ b/src/main/java/com/iflytop/nuclear/controller/NuclearCoreController.java @@ -60,11 +60,17 @@ public class NuclearCoreController { @PostMapping("/add") public ResponseData add(@RequestBody Map coreInfo) { + // 同一核电站不能存在相同的名称反应堆 不能存在相同的唯一序列号 + // 不通核电站的可以相同 JSONObject res = new JSONObject(); - NuclearCore ns = nuclearCoreService.queryCoreByName(coreInfo.get("name")); + NuclearCore ns = nuclearCoreService.queryCoreByName(coreInfo.get("name"), coreInfo.get("stationId")); + NuclearCore ns1 = nuclearCoreService.queryCoreBySerial(coreInfo.get("serialNumber"), coreInfo.get("stationId")); if (ns != null) { return ResponseData.fail("已经存在该名称的反应堆"); } + if (ns1 != null) { + return ResponseData.fail("已经存在该序列号的反应堆"); + } NuclearCore nuclearCore = NuclearCore.builder() .name(coreInfo.get("name")) .serialNumber(coreInfo.get("serialNumber")) diff --git a/src/main/java/com/iflytop/nuclear/controller/UploadController.java b/src/main/java/com/iflytop/nuclear/controller/UploadController.java index 9f26a28..9a0d018 100644 --- a/src/main/java/com/iflytop/nuclear/controller/UploadController.java +++ b/src/main/java/com/iflytop/nuclear/controller/UploadController.java @@ -61,6 +61,7 @@ public class UploadController { SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd"); String format = sdf.format(new Date()); String savePath = System.getProperty("user.dir") + "/" + "uploadfiles" + "/" + fileType + "/" + format; + // String savePath = "/home/zwsd/" + "uploadfiles" + "/" + fileType + "/" + format; // 保存文件的文件夹 File folder = new File(savePath); // 判断路径是否存在,不存在则自动创建 diff --git a/src/main/java/com/iflytop/nuclear/service/NuclearCoreService.java b/src/main/java/com/iflytop/nuclear/service/NuclearCoreService.java index 5f21a6b..bf65299 100644 --- a/src/main/java/com/iflytop/nuclear/service/NuclearCoreService.java +++ b/src/main/java/com/iflytop/nuclear/service/NuclearCoreService.java @@ -14,5 +14,7 @@ import java.util.List; @Transactional public interface NuclearCoreService extends IService { - NuclearCore queryCoreByName(String name); + NuclearCore queryCoreByName(String name, String stationId); + + NuclearCore queryCoreBySerial(String serialNumber, String stationId); } diff --git a/src/main/java/com/iflytop/nuclear/service/impl/NuclearCoreServiceImpl.java b/src/main/java/com/iflytop/nuclear/service/impl/NuclearCoreServiceImpl.java index 863bc2f..d78c861 100644 --- a/src/main/java/com/iflytop/nuclear/service/impl/NuclearCoreServiceImpl.java +++ b/src/main/java/com/iflytop/nuclear/service/impl/NuclearCoreServiceImpl.java @@ -19,9 +19,17 @@ import java.util.List; public class NuclearCoreServiceImpl extends ServiceImpl implements NuclearCoreService { @Override - public NuclearCore queryCoreByName(String name) { + public NuclearCore queryCoreByName(String name, String stationId) { QueryWrapper nuclearCoreQueryWrapper = new QueryWrapper<>(); - nuclearCoreQueryWrapper.eq("name", name); + nuclearCoreQueryWrapper.eq("name", name).eq("station_id", stationId); + NuclearCore nuclearCore = this.getOne(nuclearCoreQueryWrapper); + return nuclearCore; + } + + @Override + public NuclearCore queryCoreBySerial(String serialNumber, String stationId) { + QueryWrapper nuclearCoreQueryWrapper = new QueryWrapper<>(); + nuclearCoreQueryWrapper.eq("serial_number", serialNumber).eq("station_id", stationId); NuclearCore nuclearCore = this.getOne(nuclearCoreQueryWrapper); return nuclearCore; } diff --git a/src/main/java/com/iflytop/nuclear/service/impl/TaskServiceImpl.java b/src/main/java/com/iflytop/nuclear/service/impl/TaskServiceImpl.java index a60f13b..a4ce347 100644 --- a/src/main/java/com/iflytop/nuclear/service/impl/TaskServiceImpl.java +++ b/src/main/java/com/iflytop/nuclear/service/impl/TaskServiceImpl.java @@ -36,7 +36,7 @@ public class TaskServiceImpl extends ServiceImpl implements Ta @Override public List getTaskInfoByUsername(String username, String user_role) { List list = null; - if (user_role == "ROLE_USER"){ + if ("ROLE_USER".equals(user_role) ){ QueryWrapper taskQueryWrapper = new QueryWrapper<>(); taskQueryWrapper.eq("operator_id", username); list = this.list(taskQueryWrapper); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index ce43231..187dacf 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -2,6 +2,7 @@ spring: datasource: url: jdbc:mysql://127.0.0.1:3306/nuclear?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai +# url: jdbc:mysql://192.168.1.194:3306/nuclear?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai username: root password: root driverClassName: com.mysql.cj.jdbc.Driver diff --git a/src/test/java/com/iflytop/nuclear/NuclearApplicationTests.java b/src/test/java/com/iflytop/nuclear/NuclearApplicationTests.java index 51b8654..63494c8 100644 --- a/src/test/java/com/iflytop/nuclear/NuclearApplicationTests.java +++ b/src/test/java/com/iflytop/nuclear/NuclearApplicationTests.java @@ -6,8 +6,8 @@ import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest class NuclearApplicationTests { - @Test - void contextLoads() { - } + // @Test + // void contextLoads() { + // } } diff --git a/uploadfiles/xlsx/20230725/堆芯模版-28.xlsx b/uploadfiles/xlsx/20230725/堆芯模版-28.xlsx new file mode 100644 index 0000000..1b0a04e Binary files /dev/null and b/uploadfiles/xlsx/20230725/堆芯模版-28.xlsx differ diff --git a/uploadfiles/xlsx/20230725/堆芯模版-29.xlsx b/uploadfiles/xlsx/20230725/堆芯模版-29.xlsx new file mode 100644 index 0000000..1b0a04e Binary files /dev/null and b/uploadfiles/xlsx/20230725/堆芯模版-29.xlsx differ diff --git a/uploadfiles/xlsx/20230726/template-31.xlsx b/uploadfiles/xlsx/20230726/template-31.xlsx new file mode 100644 index 0000000..1b0a04e Binary files /dev/null and b/uploadfiles/xlsx/20230726/template-31.xlsx differ diff --git a/uploadfiles/xlsx/20230726/堆芯模版-30.xlsx b/uploadfiles/xlsx/20230726/堆芯模版-30.xlsx new file mode 100644 index 0000000..1b0a04e Binary files /dev/null and b/uploadfiles/xlsx/20230726/堆芯模版-30.xlsx differ