Browse Source

调整模型删除接口

wangchangsheng 2 years ago
parent
commit
eb2219eef4

+ 2 - 1
gyee-sample-impala/src/main/java/com/gyee/impala/common/result/ResultCode.java

@@ -39,7 +39,8 @@ public enum ResultCode {
     USER_ERROR_TOKEN(2005, "登录已过期,请重新登录"),
     USER_ERROR_TOKEN(2005, "登录已过期,请重新登录"),
 
 
     /* 业务错误 */
     /* 业务错误 */
-    NO_PERMISSION(3001, "没有权限");
+    NO_PERMISSION(3001, "没有权限"),
+    ERROR_ENABLE(3002, "模型为启用状态,不允许删除");
 
 
     private Integer code;
     private Integer code;
     private String message;
     private String message;

+ 3 - 6
gyee-sample-impala/src/main/java/com/gyee/impala/controller/diagnose/DiagnosetrainhistoryController.java

@@ -52,12 +52,9 @@ public class DiagnosetrainhistoryController {
 
 
     @PostMapping("/removeHistory")
     @PostMapping("/removeHistory")
     public JSONObject removeDiagnosetrainhistory(String id) {
     public JSONObject removeDiagnosetrainhistory(String id) {
-        try {
-            diagnosetrainhistoryService.deleteById(id);
-            return JsonResult.success(ResultCode.SUCCESS);
-        } catch (Exception e) {
-            return JsonResult.error(ResultCode.ERROR_DATA);
-        }
+        diagnosetrainhistoryService.deleteById(id);
+        return JsonResult.success(ResultCode.SUCCESS);
+
     }
     }
 
 
 
 

+ 6 - 0
gyee-sample-impala/src/main/java/com/gyee/impala/service/impl/master/diagnose/DiagnosetrainhistoryServiceImpl.java

@@ -71,6 +71,12 @@ public class DiagnosetrainhistoryServiceImpl extends ServiceImpl<Diagnosetrainhi
             throw new CustomException(ResultCode.ERROR_DATA);
             throw new CustomException(ResultCode.ERROR_DATA);
         }
         }
 
 
+
+        if (oriHistory.isEnable()) {
+            logger.warn(oriHistory.getName()+"为启用状态,不允许删除");
+            throw new CustomException(ResultCode.ERROR_ENABLE);
+        }
+
         QueryWrapper<Diagnosetrainhistory> wrapper = new QueryWrapper<>();
         QueryWrapper<Diagnosetrainhistory> wrapper = new QueryWrapper<>();
         wrapper.eq("id",id);
         wrapper.eq("id",id);
         try {
         try {