去掉rec_status字段，统一用tb_status字段作为逻辑状态

4dkankan-center-platform/src/main/java/com/fdkankan/platform/agent/entity/Agent.java

@@ -92,13 +92,6 @@ public class Agent implements Serializable {
     private Date updateTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    //@TableLogic(value="A",delval = "I")
-    private String recStatus;
-
-    /**
      * 0正常 ，1删除
      */
        @TableLogic(value="0",delval = "1")

4dkankan-center-platform/src/main/java/com/fdkankan/platform/agent/entity/AgentAudit.java

@@ -116,13 +116,6 @@ public class AgentAudit implements Serializable {
     private Date updateTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    //@TableLogic(value="A",delval = "I")
-    private String recStatus;
-
-    /**
      * 备注等级
      */
     @TableField("note_type")

4dkankan-center-platform/src/main/java/com/fdkankan/platform/agent/entity/AgentFramework.java

@@ -37,10 +37,6 @@ public class AgentFramework implements Serializable {
     @TableField("agent_name")
     private String agentName;
 
-    @TableField("rec_status")
-    //@TableLogic(value="A",delval = "I")
-    private String recStatus;
-
     @TableField("create_time")
     private Date createTime;
 
@@ -51,7 +47,7 @@ public class AgentFramework implements Serializable {
      * 0正常，1删除
      */
    @TableField("tb_status")
-@TableLogic(value="0",delval = "1")
+    @TableLogic(value="0",delval = "1")
     private Integer tbStatus;
 
 

4dkankan-center-platform/src/main/java/com/fdkankan/platform/agent/entity/AgentNotice.java

@@ -50,13 +50,6 @@ public class AgentNotice implements Serializable {
     private Date updateTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    //@TableLogic(value="A",delval = "I")
-    private String recStatus;
-
-    /**
      * 0正常，1删除
      */
    @TableField("tb_status")

4dkankan-center-platform/src/main/java/com/fdkankan/platform/agent/entity/VaildCameras.java

@@ -49,10 +49,6 @@ public class VaildCameras implements Serializable {
     @TableField("devicemac")
     private String devicemac;
 
-    @TableField("rec_status")
-    //@TableLogic(value="A",delval = "I")
-    private String recStatus;
-
     @TableField("create_time")
     private Date createTime;
 
@@ -63,7 +59,7 @@ public class VaildCameras implements Serializable {
      * 0正常，1删除
      */
    @TableField("tb_status")
-@TableLogic(value="0",delval = "1")
+    @TableLogic(value="0",delval = "1")
     private Integer tbStatus;
 
 

4dkankan-center-platform/src/main/java/com/fdkankan/platform/agent/service/impl/AgentAuditServiceImpl.java

@@ -3,6 +3,7 @@ package com.fdkankan.platform.agent.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.platform.agent.entity.AgentAudit;
 import com.fdkankan.platform.agent.mapper.IAgentAuditMapper;
 import com.fdkankan.platform.agent.request.RequestAgentAudit;
@@ -60,7 +61,7 @@ public class AgentAuditServiceImpl extends ServiceImpl<IAgentAuditMapper, AgentA
     @Override
     public Page<AgentAudit> getPageList(Integer pageNum, Integer pageSize) {
         QueryWrapper<AgentAudit> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(AgentAudit::getRecStatus,"A");
+        queryWrapper.lambda().eq(AgentAudit::getTbStatus, TbStatus.VALID.code());
         queryWrapper.lambda().orderByDesc(AgentAudit::getCreateTime);
         Page<AgentAudit> page = new Page<>();
         page.setCurrent(pageNum);
@@ -103,7 +104,7 @@ public class AgentAuditServiceImpl extends ServiceImpl<IAgentAuditMapper, AgentA
     @Override
     public Page<AgentAuditVo> searchLike(RequestSearch param) {
         QueryWrapper<AgentAudit> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(AgentAudit::getRecStatus,"A");
+        queryWrapper.lambda().eq(AgentAudit::getTbStatus,TbStatus.VALID.code());
         if(StringUtils.isNotBlank(param.getStartDate())){
             queryWrapper.lambda().ge(AgentAudit::getCreateTime,param.getStartDate());
         }

4dkankan-center-platform/src/main/java/com/fdkankan/platform/agent/service/impl/AgentFrameworkServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fdkankan.platform.agent.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.platform.agent.entity.AgentFramework;
 import com.fdkankan.platform.agent.mapper.IAgentFrameworkMapper;
 import com.fdkankan.platform.agent.request.RequestAgentFramework;
@@ -38,7 +39,7 @@ public class AgentFrameworkServiceImpl extends ServiceImpl<IAgentFrameworkMapper
         }
         QueryWrapper<AgentFramework> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(AgentFramework::getAgentName,param.getName());
-        queryWrapper.lambda().eq(AgentFramework::getRecStatus,"A");
+        queryWrapper.lambda().eq(AgentFramework::getTbStatus, TbStatus.VALID.code());
         List<AgentFramework> list = this.list(queryWrapper);
         if(list != null && list.size() > 0){
             throw new BusinessException(ErrorCode.AGENT_EXIST);

4dkankan-center-platform/src/main/java/com/fdkankan/platform/agent/service/impl/AgentNoticeServiceImpl.java

@@ -2,6 +2,7 @@ package com.fdkankan.platform.agent.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.platform.agent.entity.AgentNotice;
 import com.fdkankan.platform.agent.mapper.IAgentNoticeMapper;
 import com.fdkankan.platform.agent.service.IAgentNoticeService;
@@ -31,7 +32,7 @@ public class AgentNoticeServiceImpl extends ServiceImpl<IAgentNoticeMapper, Agen
     @Override
     public AgentNoticeVo getAgentNotice() {
         QueryWrapper<AgentNotice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(AgentNotice::getRecStatus,"A");
+        queryWrapper.lambda().eq(AgentNotice::getTbStatus, TbStatus.VALID.code());
         queryWrapper.lambda().orderByDesc(AgentNotice::getCreateTime);
 
         Page<AgentNotice> agentNoticePage = new Page<>();

4dkankan-center-platform/src/main/java/com/fdkankan/platform/agent/service/impl/AgentServiceImpl.java

@@ -8,6 +8,7 @@ import com.fdkankan.common.constant.ConstantFilePath;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.LoginType;
 import com.fdkankan.common.constant.ServerCode;
+import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.user.SSOLoginHelper;
 import com.fdkankan.common.util.PasswordUtils;
@@ -63,7 +64,7 @@ public class AgentServiceImpl extends ServiceImpl<IAgentMapper, Agent> implement
     public Agent getAgentById(String agentId) {
         QueryWrapper<Agent> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(Agent::getAgentId,agentId);
-        queryWrapper.lambda().eq(Agent::getRecStatus,"A");
+        queryWrapper.lambda().eq(Agent::getTbStatus, TbStatus.VALID.code());
         List<Agent> list = this.list(queryWrapper);
         if(list == null || list.size()<=0){
             throw new BusinessException(ErrorCode.USER_NOT_EXIST);
@@ -240,7 +241,7 @@ public class AgentServiceImpl extends ServiceImpl<IAgentMapper, Agent> implement
 
     private QueryWrapper<Agent> getQueryWrapper(RequestAgent param){
         QueryWrapper<Agent> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(Agent::getRecStatus,"A");
+        queryWrapper.lambda().eq(Agent::getTbStatus,TbStatus.VALID.code());
         if(StringUtils.isNotBlank(param.getAgentName())){
             queryWrapper.lambda().like(Agent::getAgentName,param.getAgentName());
         }

4dkankan-center-platform/src/main/java/com/fdkankan/platform/agent/service/impl/VaildCamerasServiceImpl.java

@@ -128,13 +128,13 @@ public class VaildCamerasServiceImpl extends ServiceImpl<IVaildCamerasMapper, Va
 
     public List<VaildCameras> getListByCompanyName(String companyName){
         QueryWrapper<VaildCameras> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(VaildCameras::getRecStatus,"A");
+        queryWrapper.lambda().eq(VaildCameras::getTbStatus,TbStatus.VALID.code());
         queryWrapper.lambda().eq(VaildCameras::getCompanyName,companyName);
         return this.list(queryWrapper);
     }
     public VaildCameras getByCompanyNameAndDevicemac(String companyName,String devicemac){
         QueryWrapper<VaildCameras> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(VaildCameras::getRecStatus,"A");
+        queryWrapper.lambda().eq(VaildCameras::getTbStatus,TbStatus.VALID.code());
         queryWrapper.lambda().eq(VaildCameras::getCompanyName,companyName);
         queryWrapper.lambda().eq(VaildCameras::getDevicemac,devicemac);
         List<VaildCameras> list = this.list(queryWrapper);

4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/controller/manager/ManagerCompanyController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.constant.ConstantFilePath;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.ServerCode;
+import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.platform.goods.entity.Company;
 import com.fdkankan.platform.goods.request.RequestCompany;
@@ -65,7 +66,7 @@ public class ManagerCompanyController {
             throw new BusinessException(ErrorCode.MISSING_REQUIRED_PARAMETERS);
         }
         Company company = companyService.getById(param.getId());
-        if(company!=null && "A".equals(company.getRecStatus())){
+        if(company!=null && TbStatus.VALID.code().equals(company.getTbStatus())){
             return company;
         }
         return null;
@@ -101,7 +102,7 @@ public class ManagerCompanyController {
      */
     @PostMapping(value = "/listAll")
     public List<Company> listAll(){
-        return companyService.list(new QueryWrapper<Company>().lambda().eq(Company::getRecStatus,"A"));
+        return companyService.list(new QueryWrapper<Company>().lambda().eq(Company::getTbStatus,TbStatus.VALID.code()));
     }
 
     /**

4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/entity/Camera.java

@@ -76,17 +76,10 @@ public class Camera implements Serializable {
     private Date updateTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    //@TableLogic(value="A",delval = "I")
-    private String recStatus;
-
-    /**
      * 0正常，1删除
      */
-   @TableField("tb_status")
-@TableLogic(value="0",delval = "1")
+    @TableField("tb_status")
+    @TableLogic(value="0",delval = "1")
     private Integer tbStatus;
 
 

4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/entity/CameraDetail.java

@@ -130,13 +130,6 @@ public class CameraDetail implements Serializable {
     private Date updateTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    //@TableLogic(value="A",delval = "I")
-    private String recStatus;
-
-    /**
      * 0正常，1删除
      */
    @TableField("tb_status")

4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/entity/CameraOut.java

@@ -55,10 +55,6 @@ public class CameraOut implements Serializable {
     @TableField("update_time")
     private Date updateTime;
 
-    @TableField("rec_status")
-    //@TableLogic(value="A",delval = "I")
-    private String recStatus;
-
     /**
      * 0正常，1删除
      */

4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/entity/CameraSpace.java

@@ -68,13 +68,6 @@ public class CameraSpace implements Serializable {
     private Date createTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    //@TableLogic(value="A",delval = "I")
-    private String recStatus;
-
-    /**
      * 更新时间
      */
     @TableField("update_time")

4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/entity/CameraVersion.java

@@ -68,13 +68,6 @@ public class CameraVersion implements Serializable {
     private String acStatus;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    //@TableLogic(value="A",delval = "I")
-    private String recStatus;
-
-    /**
      * 创建日期
      */
     @TableField("create_time")

4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/entity/Cart.java

@@ -75,13 +75,6 @@ public class Cart implements Serializable {
     private Date createTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    //@TableLogic(value="A",delval = "I")
-    private String recStatus;
-
-    /**
      * 更新时间
      */
     @TableField("update_time")

4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/entity/Company.java

@@ -88,13 +88,6 @@ public class Company implements Serializable {
     private Date updateTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    //@TableLogic(value="A",delval = "I")
-    private String recStatus;
-
-    /**
      * 0正常，1删除
      */
    @TableField("tb_status")

4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/entity/Goods.java

@@ -93,13 +93,6 @@ public class Goods implements Serializable {
     private Date createTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    //@TableLogic(value="A",delval = "I")
-    private String recStatus;
-
-    /**
      * 更新时间
      */
     @TableField("update_time")

4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/entity/GoodsSku.java

@@ -87,13 +87,6 @@ public class GoodsSku implements Serializable {
     private Date createTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    //@TableLogic(value="A",delval = "I")
-    private String recStatus;
-
-    /**
      * 更新时间
      */
     @TableField("update_time")

4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/entity/GoodsSpec.java

@@ -38,13 +38,6 @@ public class GoodsSpec implements Serializable {
     private Date createTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    //@TableLogic(value="A",delval = "I")
-    private String recStatus;
-
-    /**
      * 更新时间
      */
     @TableField("update_time")

4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/entity/GoodsSpecValue.java

@@ -44,13 +44,6 @@ public class GoodsSpecValue implements Serializable {
     private Date createTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    //@TableLogic(value="A",delval = "I")
-    private String recStatus;
-
-    /**
      * 更新时间
      */
     @TableField("update_time")

4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/entity/GoodsSpuSpec.java

@@ -44,13 +44,6 @@ public class GoodsSpuSpec implements Serializable {
     private Date createTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    //@TableLogic(value="A",delval = "I")
-    private String recStatus;
-
-    /**
      * 更新时间
      */
     @TableField("update_time")

4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/service/ManagerCameraService.java

@@ -210,7 +210,7 @@ public class ManagerCameraService {
         if(cameraDetailEntity.getCompanyId() != null){
             Company companyEntity = companyService.getById(cameraDetailEntity.getCompanyId());
             if(companyEntity != null && companyEntity.getCameraDelete() == 0){
-                cameraEntity.setRecStatus("I");
+                cameraEntity.setTbStatus(TbStatus.DELETE.code());
                 cameraService.updateById(cameraEntity);
             }
         }
@@ -387,7 +387,7 @@ public class ManagerCameraService {
         this.checkManagerUser(token);
         Camera cameraEntity = new Camera();
         cameraEntity.setId(param.getCameraId());
-        cameraEntity.setRecStatus(param.getRecStatus());
+        cameraEntity.setTbStatus(param.getTbStatus());
         cameraService.updateById(cameraEntity);
 
         CameraDetail cameraDetailEntity = cameraDetailService.getByCameraId(param.getCameraId());
@@ -455,7 +455,7 @@ public class ManagerCameraService {
             throw new BusinessException(ErrorCode.MISSING_REQUIRED_PARAMETERS);
         }
         Camera cameraEntity = cameraService.getById(param.getCameraId());
-        if(cameraEntity == null || "I".equals(cameraEntity.getRecStatus())){
+        if(cameraEntity == null || TbStatus.DELETE.code().equals(cameraEntity.getTbStatus())){
             throw new BusinessException(CameraConstant.FAILURE_6003);
         }
         CameraDetail cameraDetailEntity = cameraDetailService.getByCameraId(cameraEntity.getId());
@@ -489,21 +489,21 @@ public class ManagerCameraService {
         for (ResponseCamera responseCamera : pageInfo.getRecords()) {
             if(responseCamera.getAgentFrameworkId() != null){
                 agentFrameworkEntity = agentFrameworkService.getById(responseCamera.getAgentFrameworkId());
-                if(agentFrameworkEntity != null && "A".equals(agentFrameworkEntity.getRecStatus())){
+                if(agentFrameworkEntity != null && TbStatus.VALID.code().equals(agentFrameworkEntity.getTbStatus())){
                     responseCamera.setAgentFrameworkName(agentFrameworkEntity.getAgentName());
                 }
             }
 
             if(responseCamera.getCompanyId() != null){
                 companyEntity = companyService.getById(responseCamera.getCompanyId());
-                if(companyEntity != null && "A".equals(companyEntity.getRecStatus())){
+                if(companyEntity != null && TbStatus.VALID.code().equals(companyEntity.getTbStatus())){
                     responseCamera.setCompanyName(companyEntity.getCompanyName());
                 }
             }
 
             if(responseCamera.getUserId() != null){
                 userEntity = userService.getById(responseCamera.getUserId());
-                if(userEntity != null && "A".equals(userEntity.getRecStatus())){
+                if(userEntity != null && TbStatus.VALID.code().equals(userEntity.getTbStatus())){
                     responseCamera.setUserName(userEntity.getUserName());
                 }
             }
@@ -625,7 +625,7 @@ public class ManagerCameraService {
                     }
 
                     queryWrapper = new QueryWrapper<>();
-                    queryWrapper.lambda().eq(AgentFramework::getRecStatus,"A");
+                    queryWrapper.lambda().eq(AgentFramework::getTbStatus,TbStatus.VALID.code());
                     queryWrapper.lambda().eq(AgentFramework::getAgentName,cellList.get(2).trim());
                     List<AgentFramework> agentFrameworkEntityList = agentFrameworkService.list(queryWrapper);
                     if(agentFrameworkEntityList.size() <= 0){
@@ -635,7 +635,7 @@ public class ManagerCameraService {
                 }
 
                 cameraEntity = cameraService.getBySnCode(cellList.get(0).trim());
-                if(cameraEntity == null || "I".equals(cameraEntity.getRecStatus())){
+                if(cameraEntity == null || TbStatus.DELETE.code().equals(cameraEntity.getTbStatus())){
                     throw new BusinessException(CameraConstant.FAILURE_6020.code(), importError + CameraConstant.FAILURE_6020.name());
                 }
 
@@ -710,7 +710,7 @@ public class ManagerCameraService {
                 }
 
                 cameraEntity = cameraService.getBySnCode(cellList.get(1).trim());
-                if(cameraEntity == null || "I".equals(cameraEntity.getRecStatus())){
+                if(cameraEntity == null || TbStatus.DELETE.code().equals(cameraEntity.getTbStatus())){
                     throw new BusinessException(CameraConstant.FAILURE_6020.code(), importError + CameraConstant.FAILURE_6020.name());
                 }
 
@@ -720,7 +720,7 @@ public class ManagerCameraService {
                 }
 
                 queryWrapper = new QueryWrapper<>();
-                queryWrapper.lambda().eq(Company::getRecStatus,"A");
+                queryWrapper.lambda().eq(Company::getTbStatus,TbStatus.VALID.code());
                 queryWrapper.lambda().eq(Company::getCompanyName,cellList.get(1).trim());
                 companyEntityList = companyService.list(queryWrapper);
                 if(companyEntityList.size() <= 0){

4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/service/impl/CameraDetailServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.platform.agent.request.RequestAgent;
 import com.fdkankan.platform.agent.vo.ResponseAgentCamera;
 import com.fdkankan.common.constant.AppConstant;
@@ -65,7 +66,7 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
     @Override
     public Integer getCountByAgentId(String agentId) {
         LambdaQueryWrapper<CameraDetail> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(CameraDetail::getRecStatus, "A");
+        queryWrapper.eq(CameraDetail::getTbStatus, TbStatus.VALID.code());
         queryWrapper.eq(CameraDetail::getAgency, agentId);
         long count = this.count();
         return Math.toIntExact(count);
@@ -73,7 +74,7 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
     @Override
     public CameraDetail getByCameraId(Long cameraId) {
         QueryWrapper<CameraDetail> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CameraDetail :: getRecStatus,"A");
+        queryWrapper.lambda().eq(CameraDetail :: getTbStatus,TbStatus.VALID.code());
         queryWrapper.lambda().eq(CameraDetail :: getCameraId,cameraId);
         List<CameraDetail> list = this.list(queryWrapper);
         if(list == null || list.size()<=0){
@@ -86,7 +87,7 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
     public Page<ResponseAgentCamera> getPageByAgentId(RequestAgent param) {
         QueryWrapper<CameraDetail> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(CameraDetail :: getAgency,param.getAgentId());
-        queryWrapper.lambda().eq(CameraDetail :: getRecStatus,"A");
+        queryWrapper.lambda().eq(CameraDetail :: getTbStatus,TbStatus.VALID.code());
         queryWrapper.lambda().orderByDesc(CameraDetail::getCreateTime);
 
         Page<CameraDetail> page = new Page<>();
@@ -117,7 +118,7 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
     @Override
     public List<CameraDetail> getListByAgentId(String agentId) {
         QueryWrapper<CameraDetail> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CameraDetail::getRecStatus,"A");
+        queryWrapper.lambda().eq(CameraDetail::getTbStatus,TbStatus.VALID.code());
         queryWrapper.lambda().eq(CameraDetail::getAgency,agentId);
         queryWrapper.lambda().orderByDesc(CameraDetail::getCreateTime);
         return  this.list(queryWrapper);
@@ -156,7 +157,7 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
 
     private QueryWrapper<CameraDetail> getQueryByUserAndType(Integer cameraType, Long userId) {
         QueryWrapper<CameraDetail> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CameraDetail::getRecStatus,"A");
+        queryWrapper.lambda().eq(CameraDetail::getTbStatus,TbStatus.VALID.code());
         if(userId != null){
             queryWrapper.lambda().eq(CameraDetail::getUserId,userId);
         }
@@ -348,7 +349,7 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
     @Override
     public Integer getDeadLineNumber(Long userId) {
         QueryWrapper<CameraDetail> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CameraDetail::getRecStatus,"A");
+        queryWrapper.lambda().eq(CameraDetail::getTbStatus,TbStatus.VALID.code());
         queryWrapper.lambda().eq(CameraDetail::getUserId,userId);
         List<CameraDetail> list = this.list(queryWrapper);
         Integer number = 0;
@@ -381,7 +382,7 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
     private boolean bindOrUnbind(Long cameraId, Long userId){
         UpdateWrapper<CameraDetail> updateWrapper = new UpdateWrapper<>();
         updateWrapper.lambda().set(CameraDetail::getUserId,userId);
-        updateWrapper.lambda().eq(CameraDetail::getRecStatus,"A");
+        updateWrapper.lambda().eq(CameraDetail::getTbStatus,TbStatus.VALID.code());
         updateWrapper.lambda().eq(CameraDetail::getCameraId,cameraId);
         return this.update(updateWrapper);
     }
@@ -423,7 +424,7 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
     @Override
     public List<CameraDetail> getListByUserId(Long userId, Long cameraType) {
         QueryWrapper<CameraDetail> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CameraDetail::getRecStatus,"A");
+        queryWrapper.lambda().eq(CameraDetail::getTbStatus,TbStatus.VALID.code());
         queryWrapper.lambda().eq(CameraDetail::getUserId,userId);
         queryWrapper.lambda().orderByDesc(CameraDetail::getUpdateTime);
         if(cameraType != null ){

4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/service/impl/CameraServiceImpl.java

@@ -100,7 +100,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     @Override
     public Camera getByChildName(String childName){
         QueryWrapper<Camera> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(Camera::getRecStatus,"A");
+        queryWrapper.lambda().eq(Camera::getTbStatus,TbStatus.VALID.code());
         queryWrapper.lambda().eq(Camera::getChildName,childName);
         return this.getEntityByQuery(queryWrapper);
     }
@@ -163,7 +163,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     @Override
     public List<ResponseCamera> getByUser(Long userId, Integer cameraType) {
         QueryWrapper<CameraDetail> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CameraDetail::getRecStatus,"A");
+        queryWrapper.lambda().eq(CameraDetail::getTbStatus,TbStatus.VALID.code());
         if(cameraType == null){
             queryWrapper.lambda().eq(CameraDetail::getUserId,userId);
         }else if(cameraType == 4){
@@ -250,7 +250,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     @Override
     public Camera getBySnCode(String snCode) {
         QueryWrapper<Camera> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(Camera::getRecStatus,"A");
+        queryWrapper.lambda().eq(Camera::getTbStatus,TbStatus.VALID.code());
         queryWrapper.lambda().eq(Camera::getSnCode,snCode);
         return this.getEntityByQuery(queryWrapper);
     }
@@ -303,7 +303,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     @Override
     public List<Camera> getCameraLikeSnCode(String trim) {
         QueryWrapper<Camera> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(Camera::getRecStatus,"A");
+        queryWrapper.lambda().eq(Camera::getTbStatus,TbStatus.VALID.code());
         queryWrapper.lambda().like(Camera::getSnCode,trim);
         return this.list(queryWrapper);
     }
@@ -311,7 +311,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     @Override
     public Camera getByChildNameAndChildPassword(String appUserName, String appPassword) {
         QueryWrapper<Camera> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(Camera::getRecStatus,RecStatus.VALID.code());
+        queryWrapper.lambda().eq(Camera::getTbStatus,TbStatus.VALID.code());
         queryWrapper.lambda().eq(Camera::getChildName,appUserName);
         queryWrapper.lambda().eq(Camera::getChildPassword,appPassword);
         return this.getEntityByQuery(queryWrapper);
@@ -320,7 +320,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     @Override
     public Camera getAvailableById(Long id) {
         Camera camera = this.getOne(new LambdaQueryWrapper<Camera>()
-                .eq(Camera::getRecStatus, RecStatus.VALID.code())
+                .eq(Camera::getTbStatus, TbStatus.VALID.code())
                 .eq(Camera::getId, id));
         return camera;
     }

4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/service/impl/CameraSpaceServiceImpl.java

@@ -3,6 +3,7 @@ package com.fdkankan.platform.goods.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.platform.goods.entity.CameraSpace;
 import com.fdkankan.platform.goods.mapper.ICameraSpaceMapper;
 import com.fdkankan.platform.goods.service.ICameraSpaceService;
@@ -32,7 +33,7 @@ public class CameraSpaceServiceImpl extends ServiceImpl<ICameraSpaceMapper, Came
     @Override
     public List<CameraSpace> getListByCameraId(Long cameraId) {
         QueryWrapper<CameraSpace> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CameraSpace::getRecStatus,"A");
+        queryWrapper.lambda().eq(CameraSpace::getTbStatus, TbStatus.VALID.code());
         queryWrapper.lambda().eq(CameraSpace::getCameraId,cameraId);
         return this.list(queryWrapper);
     }
@@ -45,7 +46,7 @@ public class CameraSpaceServiceImpl extends ServiceImpl<ICameraSpaceMapper, Came
     @Override
     public CameraSpace getByUserIdAndCameraId(Long userId, Long cameraId) {
         QueryWrapper<CameraSpace> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CameraSpace::getRecStatus,"A");
+        queryWrapper.lambda().eq(CameraSpace::getTbStatus,TbStatus.VALID.code());
         queryWrapper.lambda().eq(CameraSpace::getUserId,userId)
                 .eq(CameraSpace::getCameraId,cameraId)
                 .eq(CameraSpace::getSpaceType,1);
@@ -59,9 +60,9 @@ public class CameraSpaceServiceImpl extends ServiceImpl<ICameraSpaceMapper, Came
     @Override
     public void removeByCameraId(Long cameraId) {
         UpdateWrapper<CameraSpace> update = new UpdateWrapper<>();
-        update.lambda().eq(CameraSpace::getRecStatus,"A");
+        update.lambda().eq(CameraSpace::getTbStatus,TbStatus.VALID.code());
         update.lambda().eq(CameraSpace::getCameraId,cameraId);
-        update.lambda().set(CameraSpace::getRecStatus,"I");
+        update.lambda().set(CameraSpace::getTbStatus,TbStatus.DELETE.code());
         this.update(update);
     }
 

4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/service/impl/CameraVersionServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.ServerCode;
+import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.FileMd5Util;
 import com.fdkankan.common.util.FileUtils;
@@ -51,7 +52,7 @@ public class CameraVersionServiceImpl extends ServiceImpl<ICameraVersionMapper,
     private LambdaQueryWrapper<CameraVersion> getQueryByType(String type){
         LambdaQueryWrapper<CameraVersion> queryWrapper = new LambdaQueryWrapper<>();
         String cameraType = StringUtils.isNotBlank(type) ? type : "1";
-        queryWrapper.eq(CameraVersion::getRecStatus,"A");
+        queryWrapper.eq(CameraVersion::getTbStatus, TbStatus.VALID.code());
         queryWrapper.eq(CameraVersion::getCameraType,cameraType)
                 .orderByDesc(CameraVersion::getCreateTime);
         return queryWrapper;
@@ -91,7 +92,7 @@ public class CameraVersionServiceImpl extends ServiceImpl<ICameraVersionMapper,
     public Page<CameraVersion> searchLike(RequestSearch param) {
         String cameraType = StringUtils.isNotBlank(param.getType()) ? param.getType() : "1";
         LambdaQueryWrapper<CameraVersion> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(CameraVersion::getRecStatus,"A");
+        queryWrapper.eq(CameraVersion::getTbStatus,TbStatus.VALID.code());
         queryWrapper.eq(CameraVersion::getCameraType,cameraType);
         if(param.getStartDate()!=null){
             queryWrapper.ge(CameraVersion::getCreateTime,param.getStartDate());
@@ -160,7 +161,7 @@ public class CameraVersionServiceImpl extends ServiceImpl<ICameraVersionMapper,
 
     @Override
     public CameraVersion getByType(String type) {
-        List<CameraVersion> list = this.list(getQueryByType(type).eq(CameraVersion::getRecStatus, "A"));
+        List<CameraVersion> list = this.list(getQueryByType(type).eq(CameraVersion::getTbStatus, TbStatus.VALID.code()));
         if(list == null || list.size() <= 0){
             return null;
         }

4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/service/impl/CartServiceImpl.java

@@ -2,6 +2,7 @@ package com.fdkankan.platform.goods.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.common.user.SSOUser;
 import com.fdkankan.platform.goods.entity.Cart;
 import com.fdkankan.platform.goods.entity.Goods;
@@ -107,7 +108,7 @@ public class CartServiceImpl extends ServiceImpl<ICartMapper, Cart> implements I
 
     public List<Cart> getByUser(Long userId){
         QueryWrapper<Cart> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(Cart::getRecStatus,"A");
+        queryWrapper.lambda().eq(Cart::getTbStatus, TbStatus.VALID.code());
         queryWrapper.lambda().eq(Cart::getUserId,userId);
         queryWrapper.lambda().orderByDesc(Cart::getCreateTime);
         return this.list(queryWrapper);
@@ -115,7 +116,7 @@ public class CartServiceImpl extends ServiceImpl<ICartMapper, Cart> implements I
 
     public Cart getByUserAndGoods(Long userId ,Long goodsId){
         QueryWrapper<Cart> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(Cart::getRecStatus,"A");
+        queryWrapper.lambda().eq(Cart::getTbStatus,TbStatus.VALID.code());
         queryWrapper.lambda().eq(Cart::getUserId,userId);
         queryWrapper.lambda().eq(Cart::getGoodsId,goodsId);
         queryWrapper.lambda().last("LIMIT 1");

4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/service/impl/CompanyServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.ServerCode;
+import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.platform.goods.entity.Company;
 import com.fdkankan.platform.goods.mapper.ICompanyMapper;
@@ -47,7 +48,7 @@ public class CompanyServiceImpl extends ServiceImpl<ICompanyMapper, Company> imp
     @Override
     public Page<Company> pageList(RequestCompany param) {
         LambdaQueryWrapper<Company> queryWrapper =new LambdaQueryWrapper<>();
-        queryWrapper.eq(Company::getRecStatus,"A");
+        queryWrapper.eq(Company::getTbStatus, TbStatus.VALID.code());
         queryWrapper.orderByDesc(Company::getId);
         if(!StringUtils.isEmpty(param.getCompanyName())){
             queryWrapper.eq(Company::getCompanyName,param.getCompanyName());
@@ -69,7 +70,7 @@ public class CompanyServiceImpl extends ServiceImpl<ICompanyMapper, Company> imp
     @Override
     public List<Long> getManagerId() {
         LambdaQueryWrapper<Company> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(Company::getRecStatus,"A");
+        queryWrapper.eq(Company::getTbStatus,TbStatus.VALID.code());
         queryWrapper.isNotNull(Company::getManagerId);
         List<Company> list = this.list(queryWrapper);
         List<Long> returnList = new ArrayList<>();

4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/service/impl/GoodsSkuServiceImpl.java

@@ -2,6 +2,7 @@ package com.fdkankan.platform.goods.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.platform.goods.common.SkuCache;
 import com.fdkankan.platform.goods.entity.GoodsSku;
 import com.fdkankan.platform.goods.mapper.IGoodsSkuMapper;
@@ -38,7 +39,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl<IGoodsSkuMapper, GoodsSku>
     @Override
     public GoodsSku getBySkuSn(String skuSn) {
         QueryWrapper<GoodsSku> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(GoodsSku::getRecStatus,"A");
+        queryWrapper.lambda().eq(GoodsSku::getTbStatus, TbStatus.VALID.code());
         queryWrapper.lambda().eq(GoodsSku::getSkuSn,skuSn);
         queryWrapper.last("LIMIT 1");
         List<GoodsSku> list = this.list(queryWrapper);
@@ -51,7 +52,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl<IGoodsSkuMapper, GoodsSku>
     @Override
     public List<GoodsSku> getByGoodsId(long goodsId) {
         QueryWrapper<GoodsSku> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(GoodsSku::getRecStatus,"A");
+        queryWrapper.lambda().eq(GoodsSku::getTbStatus,TbStatus.VALID.code());
         queryWrapper.lambda().eq(GoodsSku::getGoodsId,goodsId);
         return this.list(queryWrapper);
     }

4dkankan-center-platform/src/main/java/com/fdkankan/platform/order/entity/CommerceOrder.java

@@ -99,13 +99,6 @@ public class CommerceOrder implements Serializable {
     private Date createTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    //@TableLogic(value="A",delval = "I")
-    private String recStatus;
-
-    /**
      * 更新时间
      */
     @TableField("update_time")

4dkankan-center-platform/src/main/java/com/fdkankan/platform/order/entity/DownloadOrder.java

@@ -93,13 +93,6 @@ public class DownloadOrder implements Serializable {
     private Date createTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    //@TableLogic(value="A",delval = "I")
-    private String recStatus;
-
-    /**
      * 更新时间
      */
     @TableField("update_time")

4dkankan-center-platform/src/main/java/com/fdkankan/platform/order/entity/ExpansionOrder.java

@@ -123,13 +123,6 @@ public class ExpansionOrder implements Serializable {
     private Date createTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    //@TableLogic(value="A",delval = "I")
-    private String recStatus;
-
-    /**
      * 更新时间
      */
     @TableField("update_time")

4dkankan-center-platform/src/main/java/com/fdkankan/platform/order/entity/IncrementOrder.java

@@ -99,13 +99,6 @@ public class IncrementOrder implements Serializable {
     private Date createTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    //@TableLogic(value="A",delval = "I")
-    private String recStatus;
-
-    /**
      * 更新时间
      */
     @TableField("update_time")

4dkankan-center-platform/src/main/java/com/fdkankan/platform/order/entity/Invoice.java

@@ -135,13 +135,6 @@ public class Invoice implements Serializable {
     private String emailAddress;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    //@TableLogic(value="A",delval = "I")
-    private String recStatus;
-
-    /**
      * 更新时间
      */
     @TableField("update_time")

4dkankan-center-platform/src/main/java/com/fdkankan/platform/order/entity/Order.java

@@ -183,13 +183,6 @@ public class Order implements Serializable {
     private Date createTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    //@TableLogic(value="A",delval = "I")
-    private String recStatus;
-
-    /**
      * 更新时间
      */
     @TableField("update_time")

4dkankan-center-platform/src/main/java/com/fdkankan/platform/order/entity/OrderItem.java

@@ -93,13 +93,6 @@ public class OrderItem implements Serializable {
     private Date createTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    //@TableLogic(value="A",delval = "I")
-    private String recStatus;
-
-    /**
      * 更新时间
      */
     @TableField("update_time")

4dkankan-center-platform/src/main/java/com/fdkankan/platform/order/entity/PreSale.java

@@ -80,13 +80,6 @@ public class PreSale implements Serializable {
     private Date createTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    //@TableLogic(value="A",delval = "I")
-    private String recStatus;
-
-    /**
      * 更新时间
      */
     @TableField("update_time")

4dkankan-center-platform/src/main/java/com/fdkankan/platform/order/entity/SpaceSdk.java

@@ -92,13 +92,6 @@ public class SpaceSdk implements Serializable {
     private Date updateTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    //@TableLogic(value="A",delval = "I")
-    private String recStatus;
-
-    /**
      * 0正常，1删除
      */
    @TableField("tb_status")

4dkankan-center-platform/src/main/java/com/fdkankan/platform/order/entity/TradeLog.java

@@ -87,13 +87,6 @@ public class TradeLog implements Serializable {
     private Date createTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    //@TableLogic(value="A",delval = "I")
-    private String recStatus;
-
-    /**
      * 更新时间
      */
     @TableField("update_time")

4dkankan-center-platform/src/main/java/com/fdkankan/platform/order/entity/VirtualOrder.java

@@ -111,13 +111,6 @@ public class VirtualOrder implements Serializable {
     private Date createTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    //@TableLogic(value="A",delval = "I")
-    private String recStatus;
-
-    /**
      * 更新时间
      */
     @TableField("update_time")

4dkankan-center-platform/src/main/java/com/fdkankan/platform/order/service/impl/CommerceOrderServiceImpl.java

@@ -3,6 +3,7 @@ package com.fdkankan.platform.order.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.common.util.NumberUtils;
 import com.fdkankan.platform.order.entity.CommerceOrder;
 import com.fdkankan.platform.order.mapper.ICommerceOrderMapper;
@@ -49,7 +50,7 @@ public class CommerceOrderServiceImpl extends ServiceImpl<ICommerceOrderMapper,
     @Override
     public CommerceOrder getByOrderSn(String orderSn) {
         LambdaQueryWrapper<CommerceOrder> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(CommerceOrder::getRecStatus,"A");
+        queryWrapper.eq(CommerceOrder::getTbStatus, TbStatus.VALID.code());
         queryWrapper.eq(CommerceOrder::getOrderSn,orderSn);
         List<CommerceOrder> list = this.list(queryWrapper);
         if(list == null || list.size() <= 0){
@@ -65,7 +66,7 @@ public class CommerceOrderServiceImpl extends ServiceImpl<ICommerceOrderMapper,
                 .set(CommerceOrder::getNumber,tradeNo)
                 .set(CommerceOrder::getPayStatus,1)
                 .set(CommerceOrder::getTradeTime,new Date())
-                .eq(CommerceOrder::getRecStatus,"A")
+                .eq(CommerceOrder::getTbStatus,TbStatus.VALID.code())
                 .eq(CommerceOrder::getOrderSn,orderSn);
         return this.update(updateWrapper);
     }

4dkankan-center-platform/src/main/java/com/fdkankan/platform/order/service/impl/DownloadOrderServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.common.util.NumberUtils;
 import com.fdkankan.platform.goods.common.SkuCache;
 import com.fdkankan.platform.goods.service.IGoodsSkuService;
@@ -70,7 +71,7 @@ public class DownloadOrderServiceImpl extends ServiceImpl<IDownloadOrderMapper,
     @Override
     public Page<ResponseDownloadOrder> getPageByParam(Long userId, RequestDownloadOrder param) {
         QueryWrapper<DownloadOrder> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(DownloadOrder::getRecStatus,"A");
+        queryWrapper.lambda().eq(DownloadOrder::getTbStatus, TbStatus.VALID.code());
         queryWrapper.lambda().eq(DownloadOrder::getUserId,userId);
         queryWrapper.lambda().eq(DownloadOrder::getPayStatus,1);
         queryWrapper.lambda().orderByDesc(DownloadOrder::getTradeTime);
@@ -117,7 +118,7 @@ public class DownloadOrderServiceImpl extends ServiceImpl<IDownloadOrderMapper,
     @Override
     public DownloadOrder getByOrderSn(String orderSn) {
         QueryWrapper<DownloadOrder> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(DownloadOrder::getRecStatus,"A");
+        queryWrapper.lambda().eq(DownloadOrder::getTbStatus,TbStatus.VALID.code());
         queryWrapper.lambda().eq(DownloadOrder::getOrderSn,orderSn);
         List<DownloadOrder> list = this.list(queryWrapper);
         if(list == null || list.size() <=0){
@@ -133,7 +134,7 @@ public class DownloadOrderServiceImpl extends ServiceImpl<IDownloadOrderMapper,
                 .set(DownloadOrder::getNumber,tradeNo)
                 .set(DownloadOrder::getPayStatus,1)
                 .set(DownloadOrder::getTradeTime,new Date())
-                .eq(DownloadOrder::getRecStatus,"A")
+                .eq(DownloadOrder::getTbStatus,TbStatus.VALID.code())
                 .eq(DownloadOrder::getOrderSn,orderSn);
         return this.update(updateWrapper);
     }

4dkankan-center-platform/src/main/java/com/fdkankan/platform/order/service/impl/ExpansionOrderServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.ErrorCode;
+import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.NumberUtils;
 import com.fdkankan.platform.order.entity.ExpansionOrder;
@@ -78,7 +79,7 @@ public class ExpansionOrderServiceImpl extends ServiceImpl<IExpansionOrderMapper
     @Override
     public ExpansionOrder getByOrderSn(String orderSn) {
         QueryWrapper<ExpansionOrder> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(ExpansionOrder::getRecStatus,"A");
+        queryWrapper.lambda().eq(ExpansionOrder::getTbStatus, TbStatus.VALID.code());
         queryWrapper.lambda().eq(ExpansionOrder::getOrderSn,orderSn);
         List<ExpansionOrder> list = this.list(queryWrapper);
         if(list == null || list.size()<=0){
@@ -95,7 +96,7 @@ public class ExpansionOrderServiceImpl extends ServiceImpl<IExpansionOrderMapper
                 .set(ExpansionOrder::getStatus, status)
                 .set(ExpansionOrder::getPayStatus, 1)
                 .set(ExpansionOrder::getTradeTime, new Date())
-                .eq(ExpansionOrder::getRecStatus,"A")
+                .eq(ExpansionOrder::getTbStatus,TbStatus.VALID.code())
                 .eq(ExpansionOrder::getOrderSn,orderSn);
         return this.update(updateWrapper);
     }

4dkankan-center-platform/src/main/java/com/fdkankan/platform/order/service/impl/IncrementOrderServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.ErrorCode;
+import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.NumberUtils;
 import com.fdkankan.platform.goods.common.SkuCache;
@@ -68,7 +69,7 @@ public class IncrementOrderServiceImpl extends ServiceImpl<IIncrementOrderMapper
     @Override
     public Page<ResponseIncrementOrder> getPageByParam(Long userId, RequestIncrementOrder param) {
         QueryWrapper<IncrementOrder> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(IncrementOrder::getRecStatus,"A");
+        queryWrapper.lambda().eq(IncrementOrder::getTbStatus, TbStatus.VALID.code());
         queryWrapper.lambda().eq(IncrementOrder::getUserId,userId);
         queryWrapper.lambda().eq(IncrementOrder::getPayStatus,1);
         queryWrapper.lambda().orderByDesc(IncrementOrder::getTradeTime);
@@ -116,7 +117,7 @@ public class IncrementOrderServiceImpl extends ServiceImpl<IIncrementOrderMapper
     @Override
     public IncrementOrder getByOrderSn(String orderSn) {
         QueryWrapper<IncrementOrder> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(IncrementOrder::getRecStatus,"A");
+        queryWrapper.lambda().eq(IncrementOrder::getTbStatus,TbStatus.VALID.code());
         queryWrapper.lambda().eq(IncrementOrder::getOrderSn,orderSn);
         List<IncrementOrder> list = this.list(queryWrapper);
         if(list == null || list.size()<=0){
@@ -133,7 +134,7 @@ public class IncrementOrderServiceImpl extends ServiceImpl<IIncrementOrderMapper
                 .set(IncrementOrder::getPayStatus, 1)
                 .set(IncrementOrder::getTradeTime, new Date())
                 .eq(IncrementOrder::getOrderSn,orderSn)
-                .eq(IncrementOrder::getRecStatus,"A");
+                .eq(IncrementOrder::getTbStatus,TbStatus.VALID.code());
         return this.update(updateWrapper);
     }
 

4dkankan-center-platform/src/main/java/com/fdkankan/platform/order/service/impl/InvoiceServiceImpl.java

@@ -59,7 +59,7 @@ public class InvoiceServiceImpl extends ServiceImpl<IInvoiceMapper, Invoice> imp
 
     private Integer getMaxInvoice(Long cameraId){
         QueryWrapper<VirtualOrder> virtualOrderQueryWrapper = new QueryWrapper<>();
-        virtualOrderQueryWrapper.lambda().eq(VirtualOrder::getRecStatus,"A");
+        virtualOrderQueryWrapper.lambda().eq(VirtualOrder::getTbStatus,TbStatus.VALID.code());
         virtualOrderQueryWrapper.lambda().eq(VirtualOrder::getCameraId,cameraId);
         List<VirtualOrder> virtualOrders = virtualOrderService.list(virtualOrderQueryWrapper);
         Integer maxInvoice = 0;
@@ -73,7 +73,7 @@ public class InvoiceServiceImpl extends ServiceImpl<IInvoiceMapper, Invoice> imp
         }
 
         QueryWrapper<ExpansionOrder> expansionOrderQueryWrapper = new QueryWrapper<>();
-        expansionOrderQueryWrapper.lambda().eq(ExpansionOrder::getRecStatus,"A");
+        expansionOrderQueryWrapper.lambda().eq(ExpansionOrder::getTbStatus,TbStatus.VALID.code());
         expansionOrderQueryWrapper.lambda().eq(ExpansionOrder::getCameraId,cameraId);
         List<ExpansionOrder> expansionOrders = expansionOrderService.list(expansionOrderQueryWrapper);
         for (ExpansionOrder expansionOrder : expansionOrders) {
@@ -85,7 +85,7 @@ public class InvoiceServiceImpl extends ServiceImpl<IInvoiceMapper, Invoice> imp
         }
 
         QueryWrapper<Invoice> invoiceQueryWrapper = new QueryWrapper<>();
-        invoiceQueryWrapper.lambda().eq(Invoice::getRecStatus,"A");
+        invoiceQueryWrapper.lambda().eq(Invoice::getTbStatus,TbStatus.VALID.code());
         invoiceQueryWrapper.lambda().eq(Invoice::getCameraId,cameraId);
         invoiceQueryWrapper.lambda().eq(Invoice::getConsumeType,1);
         List<Invoice> invoices = this.list(invoiceQueryWrapper);
@@ -100,7 +100,7 @@ public class InvoiceServiceImpl extends ServiceImpl<IInvoiceMapper, Invoice> imp
     @Override
     public Page<ResponseInvoice> listInvoice(RequestInvoice param, String token) {
         QueryWrapper<Invoice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(Invoice::getRecStatus,"A");
+        queryWrapper.lambda().eq(Invoice::getTbStatus,TbStatus.VALID.code());
         if(token!=null){
             SSOUser ssoUser = userService.getSSOUserByToken(token);
             queryWrapper.lambda().eq(Invoice::getUserId,ssoUser.getId());
@@ -138,7 +138,7 @@ public class InvoiceServiceImpl extends ServiceImpl<IInvoiceMapper, Invoice> imp
     }
     private Invoice getMineInvoice(Long userId,String invoiceType){
         QueryWrapper<Invoice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(Invoice::getRecStatus,"A");
+        queryWrapper.lambda().eq(Invoice::getTbStatus,TbStatus.VALID.code());
         queryWrapper.lambda().eq(Invoice::getUserId,userId);
         queryWrapper.lambda().eq(Invoice::getConsumeType ,-1);
         queryWrapper.lambda().eq(Invoice::getType ,invoiceType);
@@ -324,7 +324,7 @@ public class InvoiceServiceImpl extends ServiceImpl<IInvoiceMapper, Invoice> imp
 
     private void checkInvoice(Long orderId, Integer consumeType) {
         QueryWrapper<Invoice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(Invoice::getRecStatus,"A");
+        queryWrapper.lambda().eq(Invoice::getTbStatus,TbStatus.VALID.code());
         switch (consumeType){
             case 1 :    //验证 消费订单是否开票
                 queryWrapper.lambda().eq(Invoice::getVirtualOrderId,orderId);break;
@@ -345,7 +345,7 @@ public class InvoiceServiceImpl extends ServiceImpl<IInvoiceMapper, Invoice> imp
     @Override
     public Invoice getByOrderId(Long orderId) {
         QueryWrapper<Invoice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(Invoice::getRecStatus,"A");
+        queryWrapper.lambda().eq(Invoice::getTbStatus,TbStatus.VALID.code());
         queryWrapper.lambda().eq(Invoice::getOrderId,orderId);
         queryWrapper.last("LIMIT 1");
         List<Invoice> list = this.list(queryWrapper);
@@ -427,7 +427,7 @@ public class InvoiceServiceImpl extends ServiceImpl<IInvoiceMapper, Invoice> imp
 
     public LambdaQueryWrapper<Invoice> getWrapperByParam(RequestTrade param){
         LambdaQueryWrapper<Invoice> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(Invoice::getRecStatus,"A");
+        queryWrapper.eq(Invoice::getTbStatus,TbStatus.VALID.code());
         if(param.getFinish()!=null){
             queryWrapper.eq(Invoice::getFinish,param.getFinish());
         }

4dkankan-center-platform/src/main/java/com/fdkankan/platform/order/service/impl/OrderServiceImpl.java

@@ -105,7 +105,7 @@ public class OrderServiceImpl extends ServiceImpl<IOrderMapper, Order> implement
     public ResponseOrder getOrderDetail(Long orderId) {
         Order order = this.getById(orderId);
         ResponseOrder responseOrder = new ResponseOrder();
-        if(order == null || "I".equals(order.getRecStatus())){
+        if(order == null || TbStatus.DELETE.code().equals(order.getTbStatus())){
             return responseOrder;
         }
         BeanUtils.copyProperties(order,responseOrder);
@@ -126,7 +126,7 @@ public class OrderServiceImpl extends ServiceImpl<IOrderMapper, Order> implement
     public Page<ResponseOrder> getOrders(RequestOrder param, String token) {
         SSOUser ssoUser = userService.getSSOUserByToken(token);
         QueryWrapper<Order> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(Order::getRecStatus,"A");
+        queryWrapper.lambda().eq(Order::getTbStatus,TbStatus.VALID.code());
         queryWrapper.lambda().eq(Order::getUserId,ssoUser.getId());
         queryWrapper.lambda().eq(Order::getPaymentStatus, OrderEnum.PaymentStatus.paid);
         queryWrapper.lambda().orderByDesc(Order::getOrderTime);
@@ -147,7 +147,7 @@ public class OrderServiceImpl extends ServiceImpl<IOrderMapper, Order> implement
     public String cancelOrder(RequestOrder param, String token) {
         Order order = this.getById(param.getOrderId());
         order.setOrderStatus(OrderEnum.OrderStatus.invalid.name());
-        order.setRecStatus("I");
+        order.setTbStatus(TbStatus.DELETE.code());
         if(!this.updateById(order)){
             throw  new BusinessException(ErrorCode.ERROR_MSG);
         }
@@ -469,7 +469,7 @@ public class OrderServiceImpl extends ServiceImpl<IOrderMapper, Order> implement
     @Override
     public Order getByOrderSn(String orderSn) {
         QueryWrapper<Order> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(Order::getRecStatus,"A");
+        queryWrapper.lambda().eq(Order::getTbStatus,TbStatus.VALID.code());
         queryWrapper.lambda().eq(Order::getOrderSn,orderSn);
         List<Order> list = this.list(queryWrapper);
         if(list == null || list.size()<=0){
@@ -484,7 +484,7 @@ public class OrderServiceImpl extends ServiceImpl<IOrderMapper, Order> implement
         updateWrapper.set(Order::getPaymentTypeName,paymentTypeName)
                 .set(Order::getTradeNum,tradeNo)
                 .set(Order::getPaymentStatus,OrderEnum.PaymentStatus.paid.name())
-                .eq(Order::getRecStatus,"A")
+                .eq(Order::getTbStatus,TbStatus.VALID.code())
                 .eq(Order::getOrderSn,orderSn);
         return this.update(updateWrapper);
     }

4dkankan-center-platform/src/main/java/com/fdkankan/platform/order/service/impl/SpaceSdkServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.ServerCode;
+import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.fyun.oss.UploadToOssUtil;
@@ -51,7 +52,7 @@ public class SpaceSdkServiceImpl extends ServiceImpl<ISpaceSdkMapper, SpaceSdk>
     @Override
     public Page<SpaceSdk> getPageByParam(RequestSdkVersion param) {
         LambdaQueryWrapper<SpaceSdk> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(SpaceSdk::getRecStatus,"A");
+        queryWrapper.eq(SpaceSdk::getTbStatus, TbStatus.VALID.code());
         if(param.getStatus()!=null){
             queryWrapper.eq(SpaceSdk::getStatus,param.getStatus());
         }
@@ -153,7 +154,7 @@ public class SpaceSdkServiceImpl extends ServiceImpl<ISpaceSdkMapper, SpaceSdk>
             throw new BusinessException(ErrorCode.MISSING_REQUIRED_PARAMETERS);
         }
         LambdaUpdateWrapper<SpaceSdk> updateWrapper = new LambdaUpdateWrapper<>();
-        updateWrapper.set(SpaceSdk::getRecStatus,"I")
+        updateWrapper.set(SpaceSdk::getTbStatus,TbStatus.DELETE.code())
                 .eq(SpaceSdk::getId,id);
         this.update(updateWrapper);
         return ServerCode.SUCCESS.message();
@@ -166,7 +167,7 @@ public class SpaceSdkServiceImpl extends ServiceImpl<ISpaceSdkMapper, SpaceSdk>
             throw new BusinessException(ErrorCode.MISSING_REQUIRED_PARAMETERS);
         }
         SpaceSdk managerSdkEntity = this.getById(param.getId());
-        if(managerSdkEntity == null || "I".equals(managerSdkEntity.getRecStatus())){
+        if(managerSdkEntity == null || TbStatus.DELETE.code().equals(managerSdkEntity.getTbStatus())){
             throw new BusinessException(-1,"获取记录为空");
         }
         if(managerSdkEntity.getPublishTime()!=null){
@@ -180,7 +181,7 @@ public class SpaceSdkServiceImpl extends ServiceImpl<ISpaceSdkMapper, SpaceSdk>
         LambdaUpdateWrapper<SpaceSdk> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.set(SpaceSdk::getStatus,status)
                 .set(SpaceSdk::getPublishTime,new Date())
-                .eq(SpaceSdk::getId,id).eq(SpaceSdk::getRecStatus,"A");
+                .eq(SpaceSdk::getId,id).eq(SpaceSdk::getTbStatus,TbStatus.VALID.code());
         this.update(updateWrapper);
         return ServerCode.SUCCESS.message();
     }
@@ -188,7 +189,7 @@ public class SpaceSdkServiceImpl extends ServiceImpl<ISpaceSdkMapper, SpaceSdk>
     private String updateBySdkId(Long id, Integer status) {
         LambdaUpdateWrapper<SpaceSdk> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.set(SpaceSdk::getStatus,status)
-                .eq(SpaceSdk::getId,id).eq(SpaceSdk::getRecStatus,"A");
+                .eq(SpaceSdk::getId,id).eq(SpaceSdk::getTbStatus,TbStatus.VALID.code());
         this.update(updateWrapper);
         return ServerCode.SUCCESS.message();
     }
@@ -202,7 +203,7 @@ public class SpaceSdkServiceImpl extends ServiceImpl<ISpaceSdkMapper, SpaceSdk>
     private void updatTopFBysdkId(Long Id,Integer isTop) {
         LambdaUpdateWrapper<SpaceSdk> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.set(SpaceSdk::getIsTop,isTop)
-                .eq(SpaceSdk::getId,Id).eq(SpaceSdk::getRecStatus,"A");
+                .eq(SpaceSdk::getId,Id).eq(SpaceSdk::getTbStatus,TbStatus.VALID.code());
         this.update(updateWrapper);
     }
 }

4dkankan-center-platform/src/main/java/com/fdkankan/platform/order/service/impl/TradeLogServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fdkankan.platform.order.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.platform.order.entity.TradeLog;
 import com.fdkankan.platform.order.mapper.ITradeLogMapper;
 import com.fdkankan.platform.order.service.ITradeLogService;
@@ -23,7 +24,7 @@ public class TradeLogServiceImpl extends ServiceImpl<ITradeLogMapper, TradeLog>
     @Override
     public TradeLog getByOrderSn(String orderSn) {
         LambdaQueryWrapper<TradeLog> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(TradeLog::getRecStatus,"A");
+        queryWrapper.eq(TradeLog::getTbStatus, TbStatus.VALID.code());
         queryWrapper.eq(TradeLog::getOrderSn,orderSn);
         List<TradeLog> list = this.list(queryWrapper);
         if(list == null || list.size() <= 0){

4dkankan-center-platform/src/main/java/com/fdkankan/platform/order/service/impl/VirtualOrderServiceImpl.java

@@ -9,6 +9,7 @@ import com.fdkankan.common.constant.CameraConstant;
 import com.fdkankan.common.constant.Constant;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.ServerCode;
+import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.user.SSOUser;
 import com.fdkankan.common.util.NumberUtils;
@@ -79,7 +80,7 @@ public class VirtualOrderServiceImpl extends ServiceImpl<IVirtualOrderMapper, Vi
     @Override
     public void getByStatusAndCameraId(AgentVo agentVo, String startDate, String endDate) {
         QueryWrapper<VirtualOrder> queryWrapper= new QueryWrapper<>();
-        queryWrapper.lambda().eq(VirtualOrder::getRecStatus,"A");
+        queryWrapper.lambda().eq(VirtualOrder::getTbStatus, TbStatus.VALID.code());
         queryWrapper.lambda().eq(VirtualOrder::getPayStatus,1);
         queryWrapper.lambda().inSql(VirtualOrder::getCameraId,
                 "select o.camera_id from t_camera_detail o where o.agency like '%"+agentVo.getAgentId()+"%' and o.rec_status = 'A'");
@@ -139,7 +140,7 @@ public class VirtualOrderServiceImpl extends ServiceImpl<IVirtualOrderMapper, Vi
         BigDecimal extract = new BigDecimal(0.0);
         if(StringUtils.isNotBlank(startDate)){
             QueryWrapper<VirtualOrder> queryWrapper = new QueryWrapper<>();
-            queryWrapper.lambda().eq(VirtualOrder::getRecStatus,"A");
+            queryWrapper.lambda().eq(VirtualOrder::getTbStatus,TbStatus.VALID.code());
             queryWrapper.lambda().eq(VirtualOrder::getPayStatus,1);
             queryWrapper.lambda().eq(VirtualOrder::getCameraId,cameraId);
             queryWrapper.lambda().orderByDesc(VirtualOrder::getTradeTime);
@@ -287,7 +288,7 @@ public class VirtualOrderServiceImpl extends ServiceImpl<IVirtualOrderMapper, Vi
     @Override
     public VirtualOrder getByOrderSn(String orderSn) {
         QueryWrapper<VirtualOrder> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(VirtualOrder::getRecStatus,"A");
+        queryWrapper.lambda().eq(VirtualOrder::getTbStatus,TbStatus.VALID.code());
         queryWrapper.lambda().eq(VirtualOrder::getOrderSn,orderSn);
         List<VirtualOrder> list = this.list(queryWrapper);
         if(list == null || list.size()<=0){
@@ -304,7 +305,7 @@ public class VirtualOrderServiceImpl extends ServiceImpl<IVirtualOrderMapper, Vi
                 .set(VirtualOrder::getPayStatus, 1)
                 .set(VirtualOrder::getTradeTime, new Date())
                 .eq(VirtualOrder::getOrderSn,orderSn)
-                .eq(VirtualOrder::getRecStatus,"A");
+                .eq(VirtualOrder::getTbStatus,TbStatus.VALID.code());
         return this.update(updateWrapper);
     }
 
@@ -316,7 +317,7 @@ public class VirtualOrderServiceImpl extends ServiceImpl<IVirtualOrderMapper, Vi
     @Override
     public Page<ResponseVirtualOrder> getPageVoByParam(RequestCamera param) {
         LambdaQueryWrapper<VirtualOrder> query = new LambdaQueryWrapper<>();
-        query.eq(VirtualOrder::getRecStatus,"A");
+        query.eq(VirtualOrder::getTbStatus,TbStatus.VALID.code());
         query.eq(VirtualOrder::getCameraId,param.getCameraId());
         if(param.getType() == 0 ){
             query.or().eq(VirtualOrder::getStatus,1).or().eq(VirtualOrder::getStatus,-2);

4dkankan-center-platform/src/main/java/com/fdkankan/platform/test/TestSendController.java

@@ -1,5 +1,6 @@
 package com.fdkankan.platform.test;
 
+import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.platform.agent.entity.Agent;
 import com.fdkankan.platform.agent.service.IAgentService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +20,7 @@ public class TestSendController {
     private void sentTest(){
         Agent cameraEntity = new Agent();
         cameraEntity.setId(18L);
-        cameraEntity.setRecStatus("A");
+        cameraEntity.setTbStatus(TbStatus.VALID.code());
         agentService.updateById(cameraEntity);
     }
     @RequestMapping("/test1")

4dkankan-center-platform/src/main/java/com/fdkankan/platform/user/entity/IncrementLog.java

@@ -74,12 +74,6 @@ public class IncrementLog implements Serializable {
     private Date createTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    private String recStatus;
-
-    /**
      * 更新时间
      */
     @TableField("update_time")

4dkankan-center-platform/src/main/java/com/fdkankan/platform/user/entity/IncrementType.java

@@ -61,10 +61,6 @@ public class IncrementType implements Serializable {
     @TableField("update_time")
     private Date updateTime;
 
-    @TableField("rec_status")
-    //@TableLogic(value="A",delval = "I")
-    private String recStatus;
-
     @TableField("create_user")
     private Integer createUser;
 

4dkankan-center-platform/src/main/java/com/fdkankan/platform/user/entity/IntercomMessage.java

@@ -50,13 +50,6 @@ public class IntercomMessage implements Serializable {
     private Date updateTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    //@TableLogic(value="A",delval = "I")
-    private String recStatus;
-
-    /**
      * 电话
      */
     @TableField("phone")

4dkankan-center-platform/src/main/java/com/fdkankan/platform/user/entity/Manager.java

@@ -80,13 +80,6 @@ public class Manager implements Serializable {
     private Date updateTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    //@TableLogic(value="A",delval = "I")
-    private String recStatus;
-
-    /**
      * 0正常，1删除
      */
    @TableField("tb_status")

4dkankan-center-platform/src/main/java/com/fdkankan/platform/user/entity/Province.java

@@ -38,13 +38,6 @@ public class Province implements Serializable {
     private Date createTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    //@TableLogic(value="A",delval = "I")
-    private String recStatus;
-
-    /**
      * 更新时间
      */
     @TableField("update_time")

4dkankan-center-platform/src/main/java/com/fdkankan/platform/user/entity/ReceiverInfo.java

@@ -89,13 +89,6 @@ public class ReceiverInfo implements Serializable {
     private Date createTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    //@TableLogic(value="A",delval = "I")
-    private String recStatus;
-
-    /**
      * 更新时间
      */
     @TableField("update_time")

4dkankan-center-platform/src/main/java/com/fdkankan/platform/user/entity/User.java

@@ -124,13 +124,6 @@ public class User implements Serializable {
     private Date createTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    //@TableLogic(value="A",delval = "I")
-    private String recStatus;
-
-    /**
      * 更新时间
      */
     @TableField("update_time")

4dkankan-center-platform/src/main/java/com/fdkankan/platform/user/entity/UserIncrement.java

@@ -70,13 +70,6 @@ public class UserIncrement implements Serializable {
     private Date createTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    //@TableLogic(value="A",delval = "I")
-    private String recStatus;
-
-    /**
      * 更新时间
      */
     @TableField("update_time")

4dkankan-center-platform/src/main/java/com/fdkankan/platform/user/request/RequestCamera.java

@@ -86,4 +86,6 @@ public class RequestCamera extends RequestBase implements Serializable {
 
     private String selecttype;
 
+    private Integer tbStatus;
+
 }

4dkankan-center-platform/src/main/java/com/fdkankan/platform/user/service/impl/IntercomMessageServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.ServerCode;
+import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.validation.ValidationUtils;
 import com.fdkankan.platform.agent.request.RequestNote;
@@ -55,7 +56,7 @@ public class IntercomMessageServiceImpl extends ServiceImpl<IIntercomMessageMapp
             throw new BusinessException(ErrorCode.MISSING_REQUIRED_PARAMETERS);
         }
         LambdaQueryWrapper<IntercomMessage> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(IntercomMessage::getRecStatus,"A");
+        queryWrapper.eq(IntercomMessage::getTbStatus, TbStatus.VALID.code());
         queryWrapper.eq(IntercomMessage::getEmail,email);
         queryWrapper.orderByDesc(IntercomMessage::getCreateTime);
         return this.list(queryWrapper);
@@ -96,7 +97,7 @@ public class IntercomMessageServiceImpl extends ServiceImpl<IIntercomMessageMapp
     public Page<IntercomMessage> searchLike(RequestSearch param) {
         Page<IntercomMessage> page = new Page<>(param.getPageNum(), param.getPageSize());
         QueryWrapper<IntercomMessage> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().ge(IntercomMessage::getRecStatus,"A");
+        queryWrapper.lambda().ge(IntercomMessage::getTbStatus,TbStatus.VALID.code());
         if(StringUtils.isNotBlank(param.getStartDate())){
             queryWrapper.lambda().ge(IntercomMessage::getCreateTime,param.getStartDate());
         }

4dkankan-center-platform/src/main/java/com/fdkankan/platform/user/service/impl/ManagerServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.ConstantFilePath;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.ServerCode;
+import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.*;
 import com.fdkankan.platform.common.ConstantExcel;
@@ -85,7 +86,7 @@ public class ManagerServiceImpl extends ServiceImpl<IManagerMapper, Manager> imp
     @Override
     public List<Manager> getByFrameworkId(Long parentId) {
         queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(Manager::getRecStatus,"A");
+        queryWrapper.lambda().eq(Manager::getTbStatus, TbStatus.VALID.code());
         queryWrapper.lambda().eq(Manager::getAgentFrameworkId,parentId);
         return  this.list(queryWrapper);
     }
@@ -93,7 +94,7 @@ public class ManagerServiceImpl extends ServiceImpl<IManagerMapper, Manager> imp
     @Override
     public Manager getByUserName(String userName) {
         queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(Manager::getRecStatus,"A");
+        queryWrapper.lambda().eq(Manager::getTbStatus,TbStatus.VALID.code());
         queryWrapper.lambda().eq(Manager::getUsername,userName);
         return getEntityByQuery(queryWrapper);
     }
@@ -819,7 +820,7 @@ public class ManagerServiceImpl extends ServiceImpl<IManagerMapper, Manager> imp
     public List<Manager> managerList() {
         List<Long> ids = companyService.getManagerId();
         LambdaQueryWrapper<Manager> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(Manager::getIsCompany,1).eq(Manager::getRecStatus,"A");
+        queryWrapper.eq(Manager::getIsCompany,1).eq(Manager::getTbStatus,TbStatus.VALID.code());
         if(ids!=null || ids.size()>0){
             queryWrapper.notIn(Manager::getId,ids);
         }
@@ -931,7 +932,7 @@ public class ManagerServiceImpl extends ServiceImpl<IManagerMapper, Manager> imp
         if(managerEntity == null){
             throw new BusinessException(ErrorCode.USER_NOT_EXIST);
         }
-        managerEntity.setRecStatus("I");
+        managerEntity.setTbStatus(TbStatus.DELETE.code());
         this.updateById(managerEntity);
         return ServerCode.SUCCESS.message();
     }

4dkankan-center-platform/src/main/java/com/fdkankan/platform/user/service/impl/ReceiverInfoServiceImpl.java

@@ -3,6 +3,7 @@ package com.fdkankan.platform.user.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.ServerCode;
+import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.platform.user.entity.ReceiverInfo;
 import com.fdkankan.platform.user.mapper.IReceiverInfoMapper;
@@ -27,7 +28,7 @@ public class ReceiverInfoServiceImpl extends ServiceImpl<IReceiverInfoMapper, Re
     @Override
     public ReceiverInfo getDefaultByUserId(Long userId){
         QueryWrapper<ReceiverInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(ReceiverInfo::getRecStatus,"A");
+        queryWrapper.lambda().eq(ReceiverInfo::getTbStatus, TbStatus.VALID.code());
         queryWrapper.lambda().eq(ReceiverInfo::getUserId,userId);
         queryWrapper.lambda().eq(ReceiverInfo::getSetDefault,1);
         List<ReceiverInfo> list = this.list(queryWrapper);
@@ -84,7 +85,7 @@ public class ReceiverInfoServiceImpl extends ServiceImpl<IReceiverInfoMapper, Re
     @Override
     public List<ReceiverInfo> getListByUserId(Long userId) {
         QueryWrapper<ReceiverInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(ReceiverInfo::getRecStatus,"A");
+        queryWrapper.lambda().eq(ReceiverInfo::getTbStatus,TbStatus.VALID.code());
         queryWrapper.lambda().eq(ReceiverInfo::getUserId,userId);
         return this.list(queryWrapper);
     }
@@ -92,7 +93,7 @@ public class ReceiverInfoServiceImpl extends ServiceImpl<IReceiverInfoMapper, Re
     @Override
     public ReceiverInfo findDefaultByUserId(Long userId) {
         QueryWrapper<ReceiverInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(ReceiverInfo::getRecStatus,"A");
+        queryWrapper.lambda().eq(ReceiverInfo::getTbStatus,TbStatus.VALID.code());
         queryWrapper.lambda().eq(ReceiverInfo::getSetDefault,1);
         List<ReceiverInfo> list = this.list(queryWrapper);
         if(list == null || list.size()<=0){

4dkankan-center-platform/src/main/java/com/fdkankan/platform/user/service/impl/UserIncrementServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.CameraConstant;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.ServerCode;
+import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.user.SSOUser;
 import com.fdkankan.common.util.DateUtil;
@@ -61,7 +62,7 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
     @Override
     public Integer getCountByUserId(Long userId, int status) {
         QueryWrapper<UserIncrement> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(UserIncrement::getRecStatus,"A");
+        queryWrapper.lambda().eq(UserIncrement::getTbStatus, TbStatus.VALID.code());
         queryWrapper.lambda().eq(UserIncrement::getUserId,userId);
         queryWrapper.lambda().eq(UserIncrement::getIsExpired,status);
         return Math.toIntExact(this.count(queryWrapper));
@@ -70,7 +71,7 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
     @Override
     public Integer getCountBindByUserId(Long userId) {
         QueryWrapper<UserIncrement> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(UserIncrement::getRecStatus,"A");
+        queryWrapper.lambda().eq(UserIncrement::getTbStatus,TbStatus.VALID.code());
         queryWrapper.lambda().eq(UserIncrement::getUserId,userId);
         queryWrapper.lambda().isNotNull(UserIncrement::getCameraId);
         return Math.toIntExact(this.count(queryWrapper));
@@ -79,7 +80,7 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
     @Override
     public UserIncrement getByCameraId(Long cameraId) {
         QueryWrapper<UserIncrement> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(UserIncrement::getRecStatus,"A");
+        queryWrapper.lambda().eq(UserIncrement::getTbStatus,TbStatus.VALID.code());
         queryWrapper.lambda().eq(UserIncrement::getCameraId,cameraId);
         List<UserIncrement> list = this.list(queryWrapper);
         if(list == null || list.size()<=0){
@@ -178,7 +179,7 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
         }
         Page<UserIncrement> page = new Page<>(param.getPageNum(), param.getPageSize());
         QueryWrapper<UserIncrement> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(UserIncrement::getRecStatus,"A");
+        queryWrapper.lambda().eq(UserIncrement::getTbStatus,TbStatus.VALID.code());
         queryWrapper.lambda().eq(UserIncrement::getUserId,ssoUser.getId());
         if(cameraIdList!=null ){
             queryWrapper.lambda().in(UserIncrement::getCameraId,cameraIdList);
@@ -223,7 +224,7 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
     @Override
     public ResponseUserIncrement findById(RequestUserIncrement param, String token) {
         UserIncrement userIncrementEntity = this.getById(param.getId());
-        if(userIncrementEntity == null || "I".equals(userIncrementEntity.getRecStatus())){
+        if(userIncrementEntity == null || TbStatus.DELETE.code().equals(userIncrementEntity.getTbStatus())){
             throw new BusinessException(ErrorCode.ERROR_MSG);
         }
         ResponseUserIncrement responseUserIncrement = new ResponseUserIncrement();
@@ -243,7 +244,7 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
         IncrementLog tmIncrementLogEntity = new IncrementLog();
         //获取用户id
         User userEntity = userService.getUserByUserName(param.getUserName());
-        if(userEntity==null || userEntity.getId()==null || "I".equals(userEntity.getRecStatus())){
+        if(userEntity==null || userEntity.getId()==null || TbStatus.DELETE.code().equals(userEntity.getTbStatus())){
             throw new BusinessException(ErrorCode.USER_NOT_EXIST);
         }
         if(param.getIncrementNum()!=null && param.getIncrementNum()>0 && param.getIncrementEndTime() != null){

4dkankan-center-platform/src/main/java/com/fdkankan/platform/user/service/impl/UserServiceImpl.java

@@ -101,7 +101,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     @Override
     public User getUserByUserName(String userName){
         QueryWrapper<User> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(User::getRecStatus,"A");
+        queryWrapper.lambda().eq(User::getTbStatus,TbStatus.VALID.code());
         queryWrapper.lambda().eq(User::getUserName,userName);
         List<User> list = this.list(queryWrapper);
         if(list == null || list.size()<=0){
@@ -332,7 +332,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
 
     private User getByEmail(String email){
         QueryWrapper<User> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(User ::getRecStatus,"A");
+        queryWrapper.lambda().eq(User ::getTbStatus,TbStatus.VALID.code());
         queryWrapper.lambda().eq(User ::getEmail,email);
         List<User> list = this.list(queryWrapper);
         if(list == null || list.size()<=0){
@@ -478,7 +478,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     @Override
     public SSOUser getByNickName(String nickName) {
         QueryWrapper<User> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(User ::getRecStatus,"A");
+        queryWrapper.lambda().eq(User ::getTbStatus,TbStatus.VALID.code());
         queryWrapper.lambda().eq(User ::getNickName,nickName);
         List<User> list = this.list(queryWrapper);
         if(list == null || list.size()<=0){
@@ -498,7 +498,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         User user = this.getOne(
                 new LambdaQueryWrapper<User>()
                 .select(User::getNickName)
-                .eq(User::getRecStatus, RecStatus.VALID.code())
+                .eq(User::getTbStatus, TbStatus.VALID.code())
                 .eq(User::getId, userId));
         if(Objects.isNull(user)){
             return null;
@@ -536,7 +536,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     @Override
     public List<User> getUserLikeUserName(String searchKey) {
         LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(User::getRecStatus,"A")
+        queryWrapper.eq(User::getTbStatus,TbStatus.VALID.code())
                 .like(User::getUserName,searchKey);
         return this.list(queryWrapper);
     }