xj修改

src/main/java/com/fdkankan/ucenter/constant/CameraConstant.java

@@ -3,6 +3,12 @@ package com.fdkankan.ucenter.constant;
 // 6001-7000 相机状态码
 public class CameraConstant {
 
+    public static final String CHILD_PASSWORD_VALUE = "4dkankan@4dage";
+
+    public static final String WIFI_PASSWORD_VALUE = "12345678";
+
+    public static final String DEFAULT_AGENT = "4dage";
+
     public static final String IMPORT_ERROR_NUM = "第{n}行存在错误，";
 
     public static final int FAILURE_CODE_6001 = 6001;

src/main/java/com/fdkankan/ucenter/controller/fire/FdUserCameraController.java

@@ -52,30 +52,16 @@ public class FdUserCameraController extends BaseController {
         String snCode = param.getString("snCode");
         String userName = param.getString("userName");
         String platform = param.getString("platform");
+        Integer cameraType = param.getInteger("cameraType");
         if(StringUtils.isEmpty(userName)){
             userName = JwtUtil.getUsername(getToken());
         }
         Camera cameraEntity = cameraService.getBySnCode(snCode);
         if(ObjectUtils.isEmpty(cameraEntity)){
-            throw new BusinessException(CameraConstant.FAILURE_CODE_6020,CameraConstant.FAILURE_MSG_6020);
+            cameraService.add(snCode,cameraType);
         }
-        CameraDetail cameraDetailEntity = cameraDetailService.getByCameraId(cameraEntity.getId());
-        if(ObjectUtils.isEmpty(cameraDetailEntity)){
-            throw new BusinessException(CameraConstant.FAILURE_CODE_6020,CameraConstant.FAILURE_MSG_6020);
-        }
-        if (ObjectUtils.isEmpty(cameraDetailEntity.getCompanyId()) ) {
-            throw new BusinessException(CameraConstant.FAILURE_CODE_6005, CameraConstant.FAILURE_MSG_6005);
-        }
-        if(!StringUtils.isEmpty(platform) && "fusion".equals(platform) && !cameraDetailEntity.getCompanyId().equals(25L)){
-            throw new BusinessException(CameraConstant.FAILURE_CODE_6005, CameraConstant.FAILURE_MSG_6005);
-        }
-
-        if(cameraDetailEntity.getUserId() != null){
-            throw new BusinessException(AppConstant.FAILURE_CODE_4011, AppConstant.FAILURE_MSG_4011);
-        }
-
         // 绑定相机
-        cameraService.bind(cameraDetailEntity.getType(),cameraEntity.getSnCode(), userName);
+        cameraService.bind(cameraType,cameraEntity.getSnCode(), userName);
 
         return Result.success();
     }

src/main/java/com/fdkankan/ucenter/entity/CameraDetail.java

@@ -148,5 +148,9 @@ public class CameraDetail implements Serializable {
 
     @TableField("unit")
     private String unit;
-
+    /**
+     * 出库时间
+     */
+    @TableField("out_time")
+    private String outTime;
 }

src/main/java/com/fdkankan/ucenter/service/ICameraService.java

@@ -53,4 +53,6 @@ public interface ICameraService extends IService<Camera> {
     List<Camera> findLikeChildName(String searchKey);
 
     List<Camera> getBySnCodes(List<String> snCodes);
+
+    void add(String snCode, Integer cameraType);
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.constant.AppConstant;
+import com.fdkankan.common.constant.Constant;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.ucenter.common.CameraTypeEnum;
 import com.fdkankan.ucenter.common.PageInfo;
@@ -500,4 +501,50 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
         wrapper.in(Camera::getSnCode,snCodes);
         return this.list(wrapper);
     }
+
+    @Override
+    public void add(String snCode, Integer cameraType) {
+        Camera camera = new Camera();
+        camera.setWifiName(snCode);
+        camera.setSnCode(snCode);
+        camera.setChildName(snCode);
+        camera.setWifiPassword(CameraConstant.WIFI_PASSWORD_VALUE);
+        camera.setChildPassword(CameraConstant.CHILD_PASSWORD_VALUE);
+        camera.setActivatedTime(DateUtil.date2String(new Date(),DateUtil.DEFAULT_DATE_FORMAT));
+        this.save(camera);
+
+        CameraDetail cameraDetail = new CameraDetail();
+        cameraDetail.setAgency(CameraConstant.DEFAULT_AGENT);
+        cameraDetail.setCameraId(camera.getId());
+        cameraDetail.setCountry(0);//默认中国
+        cameraDetail.setType(cameraType);
+        cameraDetail.setTotalSpace(Long.valueOf(Constant.CAMERA_BASE_SPACE_VALUE));
+        cameraDetail.setUsedSpace(0L);
+        cameraDetail.setUnit("GB");
+        Long goodId = null;
+        if(cameraDetail.getType() == 1 || cameraDetail.getType() == 4){
+            goodId = 4L;
+        }
+        if(cameraDetail.getType() == 9){
+            goodId = 9L;
+        }
+        if(cameraDetail.getType() == 10){
+            goodId = 10L;
+        }
+        cameraDetail.setGoodsId(goodId);
+        cameraDetail.setCountry(2);
+        cameraDetail.setOwn(2);
+        cameraDetail.setOutTime(DateUserUtil.getDate(new Date()));
+        cameraDetailService.save(cameraDetail);
+
+        UserIncrement userIncrementEntity = new UserIncrement();
+        userIncrementEntity.setKeyWord(UUID.randomUUID().toString().replace("-", ""));
+        userIncrementEntity.setCameraId(camera.getId());
+        userIncrementEntity.setOrderSn(UUID.randomUUID().toString().replace("-", ""));
+        userIncrementEntity.setIncrementStartTime(DateUserUtil.getDate(new Date()));
+        userIncrementEntity.setIncrementEndTime("2099-01-01 00:00:00");
+        userIncrementEntity.setIsExpired(0);
+        userIncrementEntity.setIncrementTypeId(1);
+        userIncrementService.save(userIncrementEntity);
+    }
 }