|
@ -64,16 +64,11 @@ public class NuclearCoreController { |
|
|
// 不通核电站的可以相同 |
|
|
// 不通核电站的可以相同 |
|
|
JSONObject res = new JSONObject(); |
|
|
JSONObject res = new JSONObject(); |
|
|
NuclearCore ns = nuclearCoreService.queryCoreByName(coreInfo.get("name"), coreInfo.get("stationId")); |
|
|
NuclearCore ns = nuclearCoreService.queryCoreByName(coreInfo.get("name"), coreInfo.get("stationId")); |
|
|
NuclearCore ns1 = nuclearCoreService.queryCoreBySerial(coreInfo.get("serialNumber"), coreInfo.get("stationId")); |
|
|
|
|
|
if (ns != null) { |
|
|
if (ns != null) { |
|
|
return ResponseData.fail("已经存在该名称的反应堆"); |
|
|
return ResponseData.fail("已经存在该名称的反应堆"); |
|
|
} |
|
|
} |
|
|
if (ns1 != null) { |
|
|
|
|
|
return ResponseData.fail("已经存在该序列号的反应堆"); |
|
|
|
|
|
} |
|
|
|
|
|
NuclearCore nuclearCore = NuclearCore.builder() |
|
|
NuclearCore nuclearCore = NuclearCore.builder() |
|
|
.name(coreInfo.get("name")) |
|
|
.name(coreInfo.get("name")) |
|
|
.serialNumber(coreInfo.get("serialNumber")) |
|
|
|
|
|
.stationId(Integer.parseInt(coreInfo.get("stationId"))) |
|
|
.stationId(Integer.parseInt(coreInfo.get("stationId"))) |
|
|
.build(); |
|
|
.build(); |
|
|
boolean save = nuclearCoreService.save(nuclearCore); |
|
|
boolean save = nuclearCoreService.save(nuclearCore); |
|
@ -93,7 +88,6 @@ public class NuclearCoreController { |
|
|
public ResponseData update(@PathVariable(name="id") int coreId, @RequestBody Map<String,String> coreInfo) { |
|
|
public ResponseData update(@PathVariable(name="id") int coreId, @RequestBody Map<String,String> coreInfo) { |
|
|
NuclearCore nuclearCore = NuclearCore.builder() |
|
|
NuclearCore nuclearCore = NuclearCore.builder() |
|
|
.name(coreInfo.get("name")) |
|
|
.name(coreInfo.get("name")) |
|
|
.serialNumber(coreInfo.get("serialNumber")) |
|
|
|
|
|
.id(coreId) |
|
|
.id(coreId) |
|
|
.build(); |
|
|
.build(); |
|
|
boolean b = nuclearCoreService.updateById(nuclearCore); |
|
|
boolean b = nuclearCoreService.updateById(nuclearCore); |
|
|