Преглед на файлове

删除场景校验场景计算状态

lyhzzz преди 1 година
родител
ревизия
094bd23560
променени са 2 файла, в които са добавени 13 реда и са изтрити 3 реда
  1. 1 0
      src/main/java/com/fdkankan/manage/common/ResultCode.java
  2. 12 3
      src/main/java/com/fdkankan/manage/controller/RtkInfoController.java

+ 1 - 0
src/main/java/com/fdkankan/manage/common/ResultCode.java

@@ -92,6 +92,7 @@ public enum ResultCode  {
     RTK_TOKEN_ERROR(50072, "签名校验失败"),
 
     CAN_NOT_DEL_MODELING_SCENE(50073, "计算中的场景无法删除"),
+    RTK_SN_EXIST(50074, "板卡SN码已存在"),
 
 
     ;

+ 12 - 3
src/main/java/com/fdkankan/manage/controller/RtkInfoController.java

@@ -20,6 +20,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Objects;
+
 /**
  * 经销商申请管理
  * @author 
@@ -41,13 +43,20 @@ public class RtkInfoController {
 
     @PostMapping("/saveOrEdit")
     public ResultData saveOrEdit(@RequestBody RtkInfo rtkInfo){
+        if(rtkInfo.getRtkType() == null || StringUtils.isBlank(rtkInfo.getCameraSnCode()) || StringUtils.isBlank(rtkInfo.getRtkSnCode())){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        RtkInfo dbRtkInfo = rtkInfoService.getByRtkSnCode(rtkInfo.getRtkSnCode());
         if(rtkInfo.getId() == null){
             rtkInfo.setCreateUserId(Long.valueOf((String)StpUtil.getLoginId()));
+            if(dbRtkInfo != null){
+                throw new BusinessException(ResultCode.RTK_SN_EXIST);
+            }
         }else {
             rtkInfo.setUpdateUserId(Long.valueOf((String)StpUtil.getLoginId()));
-        }
-        if(rtkInfo.getRtkType() == null || StringUtils.isBlank(rtkInfo.getCameraSnCode())){
-            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+            if( dbRtkInfo != null && !Objects.equals(dbRtkInfo.getId(), rtkInfo.getId()) ){
+                throw new BusinessException(ResultCode.RTK_SN_EXIST);
+            }
         }
         if(rtkInfo.getRtkType() == 0){
             rtkInfo.setIpAddr(null);