v2.3.0

src/main/java/com/fdkankan/manage/common/ResultCode.java

@@ -74,7 +74,7 @@ public enum ResultCode  {
     COPY_NUM_NOTREBUILD(50056, "复制的场景不支持重算!"),
     READ_MACHINE_CODE_ERROR(50057, "读取机器码失败!"),
     GET_MACHINE_CODE_ERROR(50058, "获取授权码失败!"),
-
+    RECOED_NO_EXITS(50058, "记录不存在!"),
     ;
 
     private Integer code;

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

@@ -1,20 +1,19 @@
 package com.fdkankan.manage.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.entity.AuthorizeCamera;
+import com.fdkankan.manage.entity.AuthorizeCameraLog;
 import com.fdkankan.manage.entity.AuthorizeInstall;
 import com.fdkankan.manage.exception.BusinessException;
+import com.fdkankan.manage.service.IAuthorizeCameraLogService;
 import com.fdkankan.manage.service.IAuthorizeCameraService;
 import com.fdkankan.manage.service.IAuthorizeInstallService;
 import com.fdkankan.manage.vo.request.AuthorizeParam;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
@@ -30,6 +29,8 @@ public class AuthorizeCameraController {
 
     @Autowired
     IAuthorizeCameraService authorizeCameraService;
+    @Autowired
+    IAuthorizeCameraLogService authorizeCameraLogService;
 
     @PostMapping("/list")
     public ResultData list(@RequestBody AuthorizeParam param){
@@ -38,8 +39,8 @@ public class AuthorizeCameraController {
 
     @PostMapping("/addOrUpdate")
     public ResultData addOrUpdate(@RequestBody AuthorizeCamera param){
-        authorizeCameraService.addOrUpdate(param);
-        return ResultData.ok();
+
+        return ResultData.ok(authorizeCameraService.addOrUpdate(param));
     }
 
     @PostMapping("/delete")
@@ -50,5 +51,26 @@ public class AuthorizeCameraController {
         authorizeCameraService.removeById(param.getId());
         return ResultData.ok();
     }
+
+    @GetMapping("/detail/{id}")
+    public ResultData detail(@PathVariable Integer id){
+
+        return ResultData.ok(authorizeCameraService.detail(id));
+    }
+
+    @GetMapping("/snUpdateLog/{id}")
+    public ResultData snUpdateLog(@PathVariable Integer id){
+        LambdaQueryWrapper<AuthorizeCameraLog> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(AuthorizeCameraLog::getAuthorizeCameraId,id);
+        wrapper.orderByDesc(AuthorizeCameraLog::getCreateTime);
+        return ResultData.ok(authorizeCameraLogService.list(wrapper));
+    }
+
+    @GetMapping("/updateSnCode/{detailId}/{snCode}")
+    public ResultData updateSnCode(@PathVariable Integer detailId,
+                             @PathVariable String snCode){
+
+        return ResultData.ok(authorizeCameraService.updateSnCode(detailId,snCode));
+    }
 }
 

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

@@ -37,8 +37,7 @@ public class AuthorizeInstallController {
 
     @PostMapping("/addOrUpdate")
     public ResultData addOrUpdate(@RequestBody AuthorizeInstall param){
-        authorizeInstallService.addOrUpdate(param);
-        return ResultData.ok();
+        return ResultData.ok(authorizeInstallService.addOrUpdate(param));
     }
 
     @PostMapping("/delete")

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

@@ -32,8 +32,7 @@ public class AuthorizeModelingController {
 
     @PostMapping("/addOrUpdate")
     public ResultData addOrUpdate(@RequestBody AuthorizeModeling param){
-        authorizeModelingService.addOrUpdate(param);
-        return ResultData.ok();
+        return ResultData.ok( authorizeModelingService.addOrUpdate(param));
     }
 
     @PostMapping("/delete")

src/main/java/com/fdkankan/manage/entity/AuthorizeCameraLog.java

@@ -0,0 +1,57 @@
+package com.fdkankan.manage.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-10
+ */
+@Getter
+@Setter
+@TableName("t_authorize_camera_log")
+public class AuthorizeCameraLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("authorize_camera_id")
+    private Integer authorizeCameraId;
+
+    @TableField("detail_id")
+    private Integer detailId;
+
+    @TableField("old_sn_code")
+    private String oldSnCode;
+
+    @TableField("new_sn_code")
+    private String newSnCode;
+
+    @TableField("update_authorize_key")
+    private String updateAuthorizeKey;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

src/main/java/com/fdkankan/manage/generate/AutoGenerate.java

@@ -18,7 +18,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir");
 
         generate(path,"manage", getTables(new String[]{
-                "t_authorize_camera","t_authorize_camera_detail"
+                "t_authorize_camera_log"
         }));
 
 //        generate(path,"goods", getTables(new String[]{

src/main/java/com/fdkankan/manage/mapper/IAuthorizeCameraLogMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.manage.mapper;
+
+import com.fdkankan.manage.entity.AuthorizeCameraLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-10
+ */
+@Mapper
+public interface IAuthorizeCameraLogMapper extends BaseMapper<AuthorizeCameraLog> {
+
+}

src/main/java/com/fdkankan/manage/service/IAuthorizeCameraDetailService.java

@@ -3,6 +3,8 @@ package com.fdkankan.manage.service;
 import com.fdkankan.manage.entity.AuthorizeCameraDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +15,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IAuthorizeCameraDetailService extends IService<AuthorizeCameraDetail> {
 
+    List<AuthorizeCameraDetail> getByCameraId(Integer id);
+
+    void updateSnCode(Integer id, String snCode);
 }

src/main/java/com/fdkankan/manage/service/IAuthorizeCameraLogService.java

@@ -0,0 +1,18 @@
+package com.fdkankan.manage.service;
+
+import com.fdkankan.manage.entity.AuthorizeCameraDetail;
+import com.fdkankan.manage.entity.AuthorizeCameraLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-10
+ */
+public interface IAuthorizeCameraLogService extends IService<AuthorizeCameraLog> {
+
+    AuthorizeCameraLog saveLog(AuthorizeCameraDetail cameraDetail, String snCode, String authorizeKey);
+}

src/main/java/com/fdkankan/manage/service/IAuthorizeCameraService.java

@@ -16,5 +16,9 @@ public interface IAuthorizeCameraService extends IService<AuthorizeCamera> {
 
     Object pageList(AuthorizeParam param);
 
-    void addOrUpdate(AuthorizeCamera param);
+    AuthorizeCamera addOrUpdate(AuthorizeCamera param);
+
+    Object detail(Integer id);
+
+    Object updateSnCode(Integer detailId, String snCode);
 }

src/main/java/com/fdkankan/manage/service/IAuthorizeInstallService.java

@@ -17,5 +17,5 @@ public interface IAuthorizeInstallService extends IService<AuthorizeInstall> {
 
     Object pageList(AuthorizeParam param);
 
-    void addOrUpdate(AuthorizeInstall param);
+    AuthorizeInstall addOrUpdate(AuthorizeInstall param);
 }

src/main/java/com/fdkankan/manage/service/IAuthorizeModelingService.java

@@ -16,5 +16,5 @@ public interface IAuthorizeModelingService extends IService<AuthorizeModeling> {
 
     Object pageList(AuthorizeParam param);
 
-    void addOrUpdate(AuthorizeModeling param);
+    AuthorizeModeling addOrUpdate(AuthorizeModeling param);
 }

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

@@ -1,11 +1,15 @@
 package com.fdkankan.manage.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.manage.entity.AuthorizeCameraDetail;
 import com.fdkankan.manage.mapper.IAuthorizeCameraDetailMapper;
 import com.fdkankan.manage.service.IAuthorizeCameraDetailService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +21,18 @@ import org.springframework.stereotype.Service;
 @Service
 public class AuthorizeCameraDetailServiceImpl extends ServiceImpl<IAuthorizeCameraDetailMapper, AuthorizeCameraDetail> implements IAuthorizeCameraDetailService {
 
+    @Override
+    public List<AuthorizeCameraDetail> getByCameraId(Integer id) {
+        LambdaQueryWrapper<AuthorizeCameraDetail> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(AuthorizeCameraDetail::getAuthorizeCameraId,id);
+        return list(wrapper);
+    }
+
+    @Override
+    public void updateSnCode(Integer id, String snCode) {
+        LambdaUpdateWrapper<AuthorizeCameraDetail> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(AuthorizeCameraDetail::getId,id);
+        wrapper.set(AuthorizeCameraDetail::getSnCode,snCode);
+        this.update(wrapper);
+    }
 }

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

@@ -0,0 +1,33 @@
+package com.fdkankan.manage.service.impl;
+import java.util.Date;
+
+import com.fdkankan.manage.entity.AuthorizeCameraDetail;
+import com.fdkankan.manage.entity.AuthorizeCameraLog;
+import com.fdkankan.manage.mapper.IAuthorizeCameraLogMapper;
+import com.fdkankan.manage.service.IAuthorizeCameraLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-10
+ */
+@Service
+public class AuthorizeCameraLogServiceImpl extends ServiceImpl<IAuthorizeCameraLogMapper, AuthorizeCameraLog> implements IAuthorizeCameraLogService {
+
+    @Override
+    public AuthorizeCameraLog saveLog(AuthorizeCameraDetail cameraDetail, String snCode, String authorizeKey) {
+        AuthorizeCameraLog authorizeCameraLog = new AuthorizeCameraLog();
+        authorizeCameraLog.setAuthorizeCameraId(cameraDetail.getAuthorizeCameraId());
+        authorizeCameraLog.setDetailId(cameraDetail.getId());
+        authorizeCameraLog.setOldSnCode(cameraDetail.getSnCode());
+        authorizeCameraLog.setNewSnCode(snCode);
+        authorizeCameraLog.setUpdateAuthorizeKey(authorizeKey);
+        this.save(authorizeCameraLog);
+        return authorizeCameraLog;
+    }
+}

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

@@ -4,15 +4,32 @@ import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.manage.common.PageInfo;
+import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.entity.AuthorizeCamera;
+import com.fdkankan.manage.entity.AuthorizeCameraDetail;
+import com.fdkankan.manage.entity.AuthorizeCameraLog;
 import com.fdkankan.manage.entity.AuthorizeInstall;
+import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.mapper.IAuthorizeCameraMapper;
+import com.fdkankan.manage.service.IAuthorizeCameraDetailService;
+import com.fdkankan.manage.service.IAuthorizeCameraLogService;
 import com.fdkankan.manage.service.IAuthorizeCameraService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.manage.vo.request.AuthorizeParam;
+import com.fdkankan.reg.RegCodeUtil;
+import com.fdkankan.reg.dto.CamRegDto;
+import com.fdkankan.reg.dto.CamRegSDto;
+import com.fdkankan.reg.dto.MachineRegDto;
+import jdk.internal.dynalink.linker.LinkerServices;
 import org.apache.commons.lang3.StringUtils;
+import org.ini4j.Reg;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -24,6 +41,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class AuthorizeCameraServiceImpl extends ServiceImpl<IAuthorizeCameraMapper, AuthorizeCamera> implements IAuthorizeCameraService {
 
+    @Autowired
+    IAuthorizeCameraDetailService authorizeCameraDetailService;
+    @Autowired
+    IAuthorizeCameraLogService authorizeCameraLogService;
+
     @Override
     public Object pageList(AuthorizeParam param) {
         LambdaQueryWrapper<AuthorizeCamera> wrapper = new LambdaQueryWrapper<>();
@@ -48,8 +70,80 @@ public class AuthorizeCameraServiceImpl extends ServiceImpl<IAuthorizeCameraMapp
     }
 
     @Override
-    public void addOrUpdate(AuthorizeCamera param) {
+    public AuthorizeCamera addOrUpdate(AuthorizeCamera param) {
         param.setSysUserId(Long.valueOf((String) StpUtil.getLoginId()));
+        if(param.getId() == null){
+            //获取机器UUID，机器名称
+            MachineRegDto machineRegDto = RegCodeUtil.ParseMachineCode(param.getMachineCode());
+            if(machineRegDto == null){
+                throw new BusinessException(ResultCode.READ_MACHINE_CODE_ERROR);
+            }
+            param.setMachineUuid( machineRegDto.getUuid());
+            param.setMachineName( machineRegDto.getComputerName());
+            try {
+                CamRegSDto dtos = new CamRegSDto();
+                dtos.setMachineCode(param.getMachineCode());
+                dtos.setTimestamp(new Date().getTime());
+                List<CamRegDto> camRegs = new ArrayList<>();
+                String[] split = param.getSnCodes().split(",");
+                for (String snCode : split) {
+                    CamRegDto camRegDto = new CamRegDto();
+                    camRegDto.setSn(snCode);
+                    camRegs.add(camRegDto);
+                }
+                dtos.setCamRegs(camRegs);
+                String authorizeKey =  RegCodeUtil.batchGenRegeditCamCode(dtos);
+                if(StringUtils.isBlank(authorizeKey)){
+                    throw new BusinessException(ResultCode.GET_MACHINE_CODE_ERROR);
+                }
+                param.setAuthorizeKey(authorizeKey);
+            }catch (Exception e){
+                throw new BusinessException(ResultCode.GET_MACHINE_CODE_ERROR);
+            }
+        }
         this.saveOrUpdate(param);
+        return param;
+    }
+
+    @Override
+    public Object detail(Integer id) {
+        AuthorizeCamera authorizeCamera = this.getById(id);
+        if(authorizeCamera == null){
+            throw new BusinessException(ResultCode.RECOED_NO_EXITS);
+        }
+        return authorizeCameraDetailService.getByCameraId(id);
+    }
+
+    @Override
+    public Object updateSnCode(Integer detailId, String snCode) {
+        AuthorizeCameraDetail cameraDetail = authorizeCameraDetailService.getById(detailId);
+        if(cameraDetail == null){
+            throw new BusinessException(ResultCode.RECOED_NO_EXITS);
+        }
+        AuthorizeCamera authorizeCamera = this.getById(cameraDetail.getAuthorizeCameraId());
+        if(authorizeCamera == null){
+            throw new BusinessException(ResultCode.RECOED_NO_EXITS);
+        }
+
+        try {
+            CamRegSDto dtos = new CamRegSDto();
+            dtos.setMachineCode(authorizeCamera.getMachineCode());
+            dtos.setTimestamp(new Date().getTime());
+            List<CamRegDto> camRegs = new ArrayList<>();
+            CamRegDto camRegDto = new CamRegDto();
+            camRegDto.setSn(cameraDetail.getSnCode());
+            camRegDto.setToSn(snCode);
+            camRegs.add(camRegDto);
+            dtos.setCamRegs(camRegs);
+            String authorizeKey =  RegCodeUtil.batchGenRegeditCamCode(dtos);
+            if(StringUtils.isBlank(authorizeKey)){
+                throw new BusinessException(ResultCode.GET_MACHINE_CODE_ERROR);
+            }
+            AuthorizeCameraLog authorizeCameraLog = authorizeCameraLogService.saveLog(cameraDetail, snCode, authorizeKey);
+            authorizeCameraDetailService.updateSnCode(cameraDetail.getId(),snCode);
+            return authorizeCameraLog;
+        }catch (Exception e){
+            throw new BusinessException(ResultCode.GET_MACHINE_CODE_ERROR);
+        }
     }
 }

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

@@ -52,7 +52,7 @@ public class AuthorizeInstallServiceImpl extends ServiceImpl<IAuthorizeInstallMa
     }
 
     @Override
-    public void addOrUpdate(AuthorizeInstall param) {
+    public AuthorizeInstall addOrUpdate(AuthorizeInstall param) {
         param.setSysUserId(Long.valueOf((String) StpUtil.getLoginId()));
         if(param.getId() == null){
             //获取机器UUID，机器名称
@@ -73,5 +73,6 @@ public class AuthorizeInstallServiceImpl extends ServiceImpl<IAuthorizeInstallMa
             }
         }
         this.saveOrUpdate(param);
+        return param;
     }
 }

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

@@ -44,8 +44,9 @@ public class AuthorizeModelingServiceImpl extends ServiceImpl<IAuthorizeModeling
     }
 
     @Override
-    public void addOrUpdate(AuthorizeModeling param) {
+    public AuthorizeModeling addOrUpdate(AuthorizeModeling param) {
         param.setSysUserId(Long.valueOf((String) StpUtil.getLoginId()));
         this.saveOrUpdate(param);
+        return  param;
     }
 }

src/main/java/com/fdkankan/manage/test/TestController.java

@@ -112,7 +112,7 @@ public class TestController {
 
     @GetMapping("/initCamera")
     public ResultData initCamera(){
-        String[] snCodes = this.getSnCodes();
+        String[] snCodes = this.getSnCodeTest();
         List<String> snCodeList = Arrays.asList(snCodes);
         LambdaQueryWrapper<Camera> wrapper = new LambdaQueryWrapper<>();
         wrapper.in(Camera::getSnCode,snCodeList);
@@ -125,6 +125,9 @@ public class TestController {
             if(cameraDetail == null){
                 continue;
             }
+            if(cameraDetail.getType() == 10){
+                continue;
+            }
             Long proSpace = sceneProService.getCountByCameraId(cameraDetail.getCameraId());
             Long plusSpace = scenePlusService.getCountByCameraId(cameraDetail.getCameraId());
             LambdaUpdateWrapper<CameraDetail> wrapper1 = new LambdaUpdateWrapper<>();
@@ -139,6 +142,14 @@ public class TestController {
         return ResultData.ok();
     }
 
+    private String[] getSnCodeTest(){
+        String res [] = {
+                "064D8CBC5",
+        };
+        return res;
+    }
+
+
     private String[] getSnCodes(){
         String res [] = {
                 "067E15841",

src/main/resources/mapper/manage/AuthorizeCameraLogMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.manage.mapper.IAuthorizeCameraLogMapper">
+
+</mapper>