diff --git a/src/main/java/com/iflytop/nuclear/controller/NuclearCoreController.java b/src/main/java/com/iflytop/nuclear/controller/NuclearCoreController.java index a3daa89..427869c 100644 --- a/src/main/java/com/iflytop/nuclear/controller/NuclearCoreController.java +++ b/src/main/java/com/iflytop/nuclear/controller/NuclearCoreController.java @@ -45,6 +45,7 @@ public class NuclearCoreController { NuclearCore nuclearCore = NuclearCore.builder() .name(coreInfo.get("name")) .serialNumber(coreInfo.get("serialNumber")) + .stationId(Integer.parseInt(coreInfo.get("stationId"))) .build(); boolean save = nuclearCoreService.save(nuclearCore); res.put("result", save); @@ -60,7 +61,7 @@ public class NuclearCoreController { } @PostMapping("/update/{id}") - public ResponseData update(@PathVariable(name="id") Long coreId, @RequestBody Map coreInfo) { + public ResponseData update(@PathVariable(name="id") int coreId, @RequestBody Map coreInfo) { NuclearCore nuclearCore = NuclearCore.builder() .name(coreInfo.get("name")) .serialNumber(coreInfo.get("serialNumber")) diff --git a/src/main/java/com/iflytop/nuclear/controller/NuclearStationController.java b/src/main/java/com/iflytop/nuclear/controller/NuclearStationController.java index 8daad26..bbf7dc2 100644 --- a/src/main/java/com/iflytop/nuclear/controller/NuclearStationController.java +++ b/src/main/java/com/iflytop/nuclear/controller/NuclearStationController.java @@ -1,8 +1,11 @@ package com.iflytop.nuclear.controller; import com.alibaba.fastjson2.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iflytop.nuclear.model.Account; +import com.iflytop.nuclear.model.NuclearCore; import com.iflytop.nuclear.model.NuclearStation; +import com.iflytop.nuclear.service.NuclearCoreService; import com.iflytop.nuclear.service.NuclearStationService; import com.iflytop.nuclear.utils.ResponseData; import lombok.extern.slf4j.Slf4j; @@ -26,6 +29,8 @@ public class NuclearStationController { @Autowired NuclearStationService nuclearStationService; + @Autowired + NuclearCoreService nuclearCoreService; @GetMapping("/list") public ResponseData list() { @@ -53,6 +58,13 @@ public class NuclearStationController { @PostMapping("/delete/{id}") public ResponseData delete(@PathVariable(name="id") String stationId) { + // 根据id查询底下是否有核芯堆 + QueryWrapper nuclearCoreQueryWrapper = new QueryWrapper<>(); + nuclearCoreQueryWrapper.eq("station_id", stationId); + List list = nuclearCoreService.list(nuclearCoreQueryWrapper); + if (list.size() > 0){ + return ResponseData.fail("当前核电站下拥有核芯堆,禁止删除"); + } boolean b = nuclearStationService.removeById(stationId); JSONObject res = new JSONObject(); res.put("result", b); @@ -60,7 +72,7 @@ public class NuclearStationController { } @PostMapping("/update/{id}") - public ResponseData update(@PathVariable(name="id") Long stationId, @RequestBody Map stationInfo) { + public ResponseData update(@PathVariable(name="id") int stationId, @RequestBody Map stationInfo) { NuclearStation nuclearStation = NuclearStation.builder() .name(stationInfo.get("name")) .address(stationInfo.get("address")) diff --git a/src/main/java/com/iflytop/nuclear/model/NuclearCore.java b/src/main/java/com/iflytop/nuclear/model/NuclearCore.java index cfbf5fd..4c612fd 100644 --- a/src/main/java/com/iflytop/nuclear/model/NuclearCore.java +++ b/src/main/java/com/iflytop/nuclear/model/NuclearCore.java @@ -20,9 +20,12 @@ import lombok.NoArgsConstructor; public class NuclearCore { @TableId - private Long id; + private int id; private String name; @TableField("serial_number") private String serialNumber; + @TableField("station_id") + private int stationId; + } diff --git a/src/main/java/com/iflytop/nuclear/model/NuclearStation.java b/src/main/java/com/iflytop/nuclear/model/NuclearStation.java index 10eaf9b..5bcb28b 100644 --- a/src/main/java/com/iflytop/nuclear/model/NuclearStation.java +++ b/src/main/java/com/iflytop/nuclear/model/NuclearStation.java @@ -19,7 +19,7 @@ import lombok.NoArgsConstructor; public class NuclearStation { @TableId - private Long id; + private int id; private String name;