1

src/main/java/com/fdkankan/manage/controller/CaseController.java

@@ -1,12 +1,15 @@
 package com.fdkankan.manage.controller;
 
 
+import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.entity.Case;
+import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.service.ICaseNumService;
 import com.fdkankan.manage.service.ICaseService;
 import com.fdkankan.manage.vo.request.CaseNumType;
 import com.fdkankan.manage.vo.request.CaseParam;
+import com.sun.corba.se.spi.oa.OADestroyed;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -52,5 +55,14 @@ public class CaseController {
         caseService.addOrUpdate(param);
         return ResultData.ok();
     }
+
+    @PostMapping("/del")
+    public ResultData del(@RequestBody CaseParam param){
+        if(param.getCaseId() == null){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        caseService.removeById(param.getCaseId());
+        return ResultData.ok();
+    }
 }
 

src/main/java/com/fdkankan/manage/service/impl/CameraServiceImpl.java

@@ -153,22 +153,12 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
             cameraDetail.setCameraId(camera.getId());
             cameraDetail.setCountry(0);//默认中国
             cameraDetail.setType(type);
-            if (1 == cameraDetail.getType() || 9 == cameraDetail.getType() || 10 == cameraDetail.getType() ||11 ==cameraDetail.getType() ){
-                cameraDetail.setTotalSpace(Long.valueOf(Constant.CAMERA_BASE_SPACE_VALUE));
-                cameraDetail.setUsedSpace(0L);
-            }
-            if(type != 9 && type != 10){
-                type = type == 0 ? 1: 4;
-            }
-            if("aws".equals(CacheUtil.uploadType)){
-                cameraDetail.setCountry(1);//1-国外
-            }
+            cameraDetail.setTotalSpace(Long.valueOf(Constant.CAMERA_BASE_SPACE_VALUE));
+            cameraDetail.setUsedSpace(0L);
             cameraDetail.setGoodsId(Long.valueOf(type));
-            if("local".equals(CacheUtil.uploadType)) { //本地版本 ,入库即出库，并且添加无限期会员权限
-                cameraDetail.setCountry(2);
-                cameraDetail.setOwn(2);
-                cameraDetail.setOutTime(new Date());
-            }
+            cameraDetail.setCountry(2);
+            cameraDetail.setOwn(2);
+            cameraDetail.setOutTime(new Date());
             cameraDetailList.add(cameraDetail);
         }
         return  cameraDetailService.saveBatch(cameraDetailList) ? cameraList.size() : 0;

src/main/java/com/fdkankan/manage/service/impl/CaseServiceImpl.java

@@ -85,14 +85,14 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, Case> implements I
         if(param.getCaseId() != null){
 
             HashMap<Integer,CaseNumType> map = caseNumService.getCaseNumTypeByCaseId(param.getCaseId());
-            List<Integer> typeKes = param.getCaseNumTypeList().stream().map(CaseNumType::getType).collect(Collectors.toList());
+            List<Integer> typeKes = param.getSceneNumParam().stream().map(CaseNumType::getType).collect(Collectors.toList());
             for (Integer key : map.keySet()) {
                 if(!typeKes.contains(key)){
                     caseNumService.delByCaseIdAndNumList(param.getCaseId(),map.get(key).getNumList(),key);
                 }
             }
 
-            for (CaseNumType paramType : param.getCaseNumTypeList()) {
+            for (CaseNumType paramType : param.getSceneNumParam()) {
                 CaseNumType dbType = map.get(paramType.getType());
                 List<String> delNums = dbType.getNumList().stream().filter(e -> !paramType.getNumList().contains(e)).collect(Collectors.toList());
                 List<String> addNums = paramType.getNumList().stream().filter(e -> !dbType.getNumList().contains(e)).collect(Collectors.toList());

src/main/java/com/fdkankan/manage/vo/request/CaseParam.java

@@ -12,6 +12,6 @@ public class CaseParam extends RequestBase{
     private Integer caseId;
     private String caseTitle;
 
-    private List<CaseNumType> caseNumTypeList = new ArrayList<>();
+    private List<CaseNumType> sceneNumParam = new ArrayList<>();
 
 }