1

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.*;
 
 import java.io.Serializable;
 import java.util.Date;
+
+import com.fdkankan.manage.vo.response.OrderVoStatus;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -133,5 +135,8 @@ public class AuthorizeCamera implements Serializable {
     @TableField(exist = false)
     private String useTypeStr;
 
+    public String getUseTypeStr() {
+        return OrderVoStatus.getUserTypeStr(useType);
 
+    }
 }

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.*;
 
 import java.io.Serializable;
 import java.util.Date;
+
+import com.fdkankan.manage.vo.response.OrderVoStatus;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -104,5 +106,8 @@ public class AuthorizeInstall implements Serializable {
     @TableField(exist = false)
     private String useTypeStr;
 
+    public String getUseTypeStr() {
+        return OrderVoStatus.getUserTypeStr(useType);
 
+    }
 }

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.*;
 
 import java.io.Serializable;
 import java.util.Date;
+
+import com.fdkankan.manage.vo.response.OrderVoStatus;
 import lombok.Getter;
 import lombok.Setter;
 import org.apache.commons.lang3.StringUtils;
@@ -110,5 +112,8 @@ public class AuthorizeModeling implements Serializable {
     @TableField(exist = false)
     private String useTypeStr;
 
+    public String getUseTypeStr() {
+        return OrderVoStatus.getUserTypeStr(useType);
 
+    }
 }

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

@@ -51,13 +51,10 @@ public class AuthorizeCameraServiceImpl extends ServiceImpl<IAuthorizeCameraMapp
     ICameraService cameraService;
     @Autowired
     ICameraDetailService cameraDetailService;
-    @Autowired
-    IIncrementUseTypeService iIncrementUseTypeService;
     @Override
     public Object pageList(AuthorizeParam param) {
 
         Page<AuthorizeCamera> page = getBaseMapper().pageList(new Page<>(param.getPageNum(), param.getPageSize()), param);
-        HashMap<Integer, IncrementUseType> typeMap = iIncrementUseTypeService.getTypeMap();
 
         Set<Long> sysIds = page.getRecords().stream().map(AuthorizeCamera::getSysUserId).collect(Collectors.toSet());
         Set<Integer> Ids = page.getRecords().stream().map(AuthorizeCamera::getId).collect(Collectors.toSet());
@@ -75,9 +72,6 @@ public class AuthorizeCameraServiceImpl extends ServiceImpl<IAuthorizeCameraMapp
                 }
             }
             record.setSnCodes(snCodes);
-            if(typeMap.get(record.getUseType()) !=null){
-                record.setUseTypeStr(typeMap.get(record.getUseType()).getName());
-            }
         }
         return PageInfo.PageInfo(page);
     }

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

@@ -40,8 +40,6 @@ public class AuthorizeInstallServiceImpl extends ServiceImpl<IAuthorizeInstallMa
 
     @Autowired
     ISysUserService sysUserService;
-    @Autowired
-    IIncrementUseTypeService iIncrementUseTypeService;
 
     @Override
     public Object pageList(AuthorizeParam param) {
@@ -68,15 +66,11 @@ public class AuthorizeInstallServiceImpl extends ServiceImpl<IAuthorizeInstallMa
         Page<AuthorizeInstall> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
         Set<Long> sysIds = page.getRecords().stream().map(AuthorizeInstall::getSysUserId).collect(Collectors.toSet());
         HashMap<Long, SysUser> userMap = sysUserService.getByIds(sysIds);
-        HashMap<Integer, IncrementUseType> typeMap = iIncrementUseTypeService.getTypeMap();
 
         for (AuthorizeInstall record : page.getRecords()) {
             if(userMap.get(record.getSysUserId())!=null){
                 record.setSysUserName(userMap.get(record.getSysUserId()).getNickName());
             }
-            if(typeMap.get(record.getUseType()) !=null){
-                record.setUseTypeStr(typeMap.get(record.getUseType()).getName());
-            }
         }
         return PageInfo.PageInfo(page);
     }

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

@@ -35,8 +35,6 @@ public class AuthorizeModelingServiceImpl extends ServiceImpl<IAuthorizeModeling
 
     @Autowired
     ISysUserService sysUserService;
-    @Autowired
-    IIncrementUseTypeService iIncrementUseTypeService;
     @Override
     public Object pageList(AuthorizeParam param) {
         LambdaQueryWrapper<AuthorizeModeling> wrapper = new LambdaQueryWrapper<>();
@@ -55,7 +53,6 @@ public class AuthorizeModelingServiceImpl extends ServiceImpl<IAuthorizeModeling
         wrapper.orderByDesc(AuthorizeModeling::getCreateTime);
         Page<AuthorizeModeling> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
         Set<Long> sysIds = page.getRecords().stream().map(AuthorizeModeling::getSysUserId).collect(Collectors.toSet());
-        HashMap<Integer, IncrementUseType> typeMap = iIncrementUseTypeService.getTypeMap();
 
 
         HashMap<Long, SysUser> userMap = sysUserService.getByIds(sysIds);
@@ -63,9 +60,6 @@ public class AuthorizeModelingServiceImpl extends ServiceImpl<IAuthorizeModeling
             if(userMap.get(record.getSysUserId())!=null){
                 record.setSysUserName(userMap.get(record.getSysUserId()).getNickName());
             }
-            if(typeMap.get(record.getUseType()) !=null){
-                record.setUseTypeStr(typeMap.get(record.getUseType()).getName());
-            }
         }
         return PageInfo.PageInfo(page);
     }