Merge branch 'lyh-agent1.1.0' into test

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

@@ -0,0 +1,65 @@
+package com.fdkankan.ucenter.entity;
+
+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-02-01
+ */
+@Getter
+@Setter
+@TableName("t_camera_increment_log")
+public class CameraIncrementLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 相机Id
+     */
+    @TableField("camera_id")
+    private Long cameraId;
+
+    /**
+     * 0 绑定，1未绑定
+     */
+    @TableField("operation_type")
+    private Integer operationType;
+
+    /**
+     * 操作userId
+     */
+    @TableField("operation_user")
+    private Long operationUser;
+
+    /**
+     * 权益Id
+     */
+    @TableField("increment_id")
+    private Long incrementId;
+
+    @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/ucenter/generate/AutoGenerate.java

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

src/main/java/com/fdkankan/ucenter/mapper/ICameraIncrementLogMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.ucenter.mapper;
+
+import com.fdkankan.ucenter.entity.CameraIncrementLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-02-01
+ */
+@Mapper
+public interface ICameraIncrementLogMapper extends BaseMapper<CameraIncrementLog> {
+
+}

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

@@ -0,0 +1,17 @@
+package com.fdkankan.ucenter.service;
+
+import com.fdkankan.ucenter.entity.CameraIncrementLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-02-01
+ */
+public interface ICameraIncrementLogService extends IService<CameraIncrementLog> {
+
+    void saveLog(Long cameraId, Long incrementId, Long userId, Integer operationType);
+}

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

@@ -0,0 +1,32 @@
+package com.fdkankan.ucenter.service.impl;
+import java.util.Date;
+
+import com.fdkankan.ucenter.entity.CameraIncrementLog;
+import com.fdkankan.ucenter.mapper.ICameraIncrementLogMapper;
+import com.fdkankan.ucenter.service.ICameraIncrementLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-02-01
+ */
+@Service
+public class CameraIncrementLogServiceImpl extends ServiceImpl<ICameraIncrementLogMapper, CameraIncrementLog> implements ICameraIncrementLogService {
+
+
+    @Override
+    public void saveLog(Long cameraId, Long incrementId, Long userId, Integer operationType) {
+        CameraIncrementLog cameraIncrementLog = new CameraIncrementLog();
+        cameraIncrementLog.setCameraId(cameraId);
+        cameraIncrementLog.setOperationType(operationType);
+        cameraIncrementLog.setOperationUser(userId);
+        cameraIncrementLog.setIncrementId(incrementId);
+        this.save(cameraIncrementLog);
+
+    }
+}

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

@@ -60,6 +60,8 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
     SmsService smsService;
     @Autowired
     IMailTemplateService mailTemplateService;
+    @Autowired
+    ICameraIncrementLogService cameraIncrementLogService;
 
     @Override
     public Long getCountByUserId(Long userId, int type) {
@@ -198,6 +200,7 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
         userIncrement.setCameraId(cameraEntity.getId());
         userIncrement.setUpdateTime(DateUserUtil.getDate(new Date()));
         this.updateById(userIncrement);
+        cameraIncrementLogService.saveLog(cameraEntity.getId(),userIncrement.getId(),user.getId(),0);
         sceneProService.lockOrUnLockBySpace(cameraDetailEntity,cameraEntity.getId(),1);
     }
 
@@ -217,10 +220,16 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
         if(cameraDetail == null){
             throw new BusinessException(CameraConstant.FAILURE_CODE_6003, CameraConstant.FAILURE_MSG_6003);
         }
+        User user = userService.getByUserName(param.getUserName());
+        if(user == null){
+            throw new BusinessException(CameraConstant.FAILURE_CODE_6003, CameraConstant.FAILURE_MSG_6003);
+        }
+        cameraIncrementLogService.saveLog(userIncrement.getCameraId(),userIncrement.getId(),user.getId(),1);
         LambdaUpdateWrapper<UserIncrement> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(UserIncrement::getId,param.getId());
         wrapper.set(UserIncrement::getCameraId,null);
         this.update(wrapper);
+
         sceneProService.lockOrUnLockBySpace(cameraDetail,cameraDetail.getCameraId(),-2);
     }
 

src/main/resources/mapper/ucenter/CameraIncrementLogMapper.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.ucenter.mapper.ICameraIncrementLogMapper">
+
+</mapper>