Commit cf71e17c by 高晓磊

名称校验,新增时不需要传id

parent 62e1aff6
...@@ -90,7 +90,7 @@ public class CameraInfoDaoImpl extends AbstractBaseDao implements CameraInfoDao, ...@@ -90,7 +90,7 @@ public class CameraInfoDaoImpl extends AbstractBaseDao implements CameraInfoDao,
KObject staff = AminoContextHolder.getContext().getStaff(); KObject staff = AminoContextHolder.getContext().getStaff();
kobject.set("modifyTime", new Date()); kobject.set("modifyTime", new Date());
kobject.set("modifier", staff.getUuid("id")); kobject.set("modifier", staff.getUuid("id"));
kobject.set("del", true); kobject.set("del", false);
template.merge(kobject); template.merge(kobject);
} }
......
...@@ -155,16 +155,14 @@ public class CameraInfoController { ...@@ -155,16 +155,14 @@ public class CameraInfoController {
* @return * @return
*/ */
@GetMapping("/validateName") @GetMapping("/validateName")
public ResponseObj validateName(@RequestParam("name") String name, @RequestParam("id") UUID id){ public ResponseObj validateName(@RequestParam("name") String name, @RequestParam(name="id",required = false) UUID id){
if(StringUtils.isEmpty(name)){ if(StringUtils.isEmpty(name)){
return ResponseObj.error(400,"摄像头名称不能为空"); return ResponseObj.error(400,"摄像头名称不能为空");
} }
KObject kObject = cameraInfoService.getByName(name,id); KObject kObject = cameraInfoService.getByName(name,id);
if(kObject != null){ if(kObject != null){
return ResponseObj.error("摄像头种类名称已存在!"); return ResponseObj.error("摄像头名称已存在!");
} }
return ResponseObj.success(); return ResponseObj.success();
} }
} }
...@@ -104,7 +104,7 @@ public class DinasTypeController { ...@@ -104,7 +104,7 @@ public class DinasTypeController {
* @return * @return
*/ */
@GetMapping("/validateName") @GetMapping("/validateName")
public ResponseObj validateName(@RequestParam("name") String name, @RequestParam("id") UUID id){ public ResponseObj validateName(@RequestParam("name") String name, @RequestParam(value = "id",required = false) UUID id){
if(StringUtils.isEmpty(name)){ if(StringUtils.isEmpty(name)){
return ResponseObj.error(400,"砂石种类名称不能为空"); return ResponseObj.error(400,"砂石种类名称不能为空");
} }
...@@ -137,7 +137,7 @@ public class DinasTypeController { ...@@ -137,7 +137,7 @@ public class DinasTypeController {
*/ */
@PostMapping("/unCheckedStation") @PostMapping("/unCheckedStation")
public ResponseObj unCheckedStation(@RequestParam("dinasTypeId") UUID dinasTypeId, @RequestParam("stationId") UUID stationId){ public ResponseObj unCheckedStation(@RequestParam("dinasTypeId") UUID dinasTypeId, @RequestParam(value = "stationId",required = true) UUID stationId){
if(null==dinasTypeId){ if(null==dinasTypeId){
return ResponseObj.error("未查询到砂石类型信息!"); return ResponseObj.error("未查询到砂石类型信息!");
} }
......
...@@ -142,7 +142,7 @@ public class StationController { ...@@ -142,7 +142,7 @@ public class StationController {
* @return * @return
*/ */
@GetMapping("/validateName") @GetMapping("/validateName")
public ResponseObj validateName(@RequestParam("name") String name,@RequestParam("id") UUID id){ public ResponseObj validateName(@RequestParam("name") String name,@RequestParam(value = "id",required = false) UUID id){
if(StringUtils.isEmpty(name)){ if(StringUtils.isEmpty(name)){
return ResponseObj.error(400,"场站名称不能为空"); return ResponseObj.error(400,"场站名称不能为空");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment