修改WiFi前缀

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

@@ -1,13 +1,16 @@
 package com.fdkankan.manage.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.manage.common.Result;
 import com.fdkankan.manage.common.ResultData;
+import com.fdkankan.manage.entity.CameraWifiPrefix;
 import com.fdkankan.manage.service.ICameraWifiPrefixService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -26,9 +29,12 @@ public class CameraWifiPrefixController {
     ICameraWifiPrefixService cameraWifiPrefixService;
 
     @GetMapping("/allList")
-    public ResultData allList(){
-
-        return ResultData.ok(cameraWifiPrefixService.list());
+    public ResultData allList(@RequestParam(required = false) Integer cameraType){
+        LambdaQueryWrapper<CameraWifiPrefix> wr = new LambdaQueryWrapper<>();
+        if(cameraType != null){
+            wr.eq(CameraWifiPrefix::getCameraType,cameraType);
+        }
+        return ResultData.ok(cameraWifiPrefixService.list(wr));
     }
 }
 

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

@@ -587,13 +587,19 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
         if(camera == null){
             throw new BusinessException(ResultCode.CAMERA_NOT_EXIST);
         }
-        CameraType cameraType = cameraTypeService.getByType(param.getCameraType());
-        if(cameraType == null){
-            throw new BusinessException(ResultCode.CAMERA_TYPE_ERROR);
+        String wifiNamePrefix = null;
+        if(StringUtils.isNotBlank(param.getWifiNamePrefix())){
+            wifiNamePrefix = param.getWifiNamePrefix();
+        }else {
+            CameraType cameraType = cameraTypeService.getByType(param.getCameraType());
+            if(cameraType == null){
+                throw new BusinessException(ResultCode.CAMERA_TYPE_ERROR);
+            }
+
         }
         LambdaUpdateWrapper<Camera> cameraLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
         cameraLambdaUpdateWrapper.eq(Camera::getId,param.getId());
-        cameraLambdaUpdateWrapper.set(Camera::getWifiName,cameraType.getWifiNamePrefix()+ camera.getSnCode());
+        cameraLambdaUpdateWrapper.set(Camera::getWifiName,wifiNamePrefix+ camera.getSnCode());
         this.update(cameraLambdaUpdateWrapper);
 
 

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

@@ -17,4 +17,6 @@ public class CameraInOutParam {
     private String buyDate;
 
     private Integer cameraType;
+
+    private String wifiNamePrefix;
 }