相机协作

src/main/java/com/fdkankan/agent/entity/AgentAuthorizeModeling.java

@@ -95,6 +95,10 @@ public class AgentAuthorizeModeling implements Serializable {
     @TableField(exist = false)
     private String agentName;
 
+    @TableField(exist = false)
+    private String useTypeStr;
+
+
     @TableField("rec_status")
     @TableLogic(value = "A",delval = "I")
     private String recStatus;

src/main/java/com/fdkankan/agent/service/IIncrementUseTypeService.java

@@ -3,6 +3,8 @@ package com.fdkankan.agent.service;
 import com.fdkankan.agent.entity.IncrementUseType;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.HashMap;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IIncrementUseTypeService extends IService<IncrementUseType> {
 
+    HashMap<Integer, IncrementUseType> getTypeMap();
 }

src/main/java/com/fdkankan/agent/service/impl/AgentAuthorizeModelingServiceImpl.java

@@ -5,12 +5,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.agent.common.PageInfo;
 import com.fdkankan.agent.entity.AgentAuthorizeModeling;
 import com.fdkankan.agent.entity.AgentNew;
+import com.fdkankan.agent.entity.IncrementUseType;
 import com.fdkankan.agent.entity.User;
 import com.fdkankan.agent.mapper.IAgentAuthorizeModelingMapper;
 import com.fdkankan.agent.request.AuthorizeParam;
 import com.fdkankan.agent.service.IAgentAuthorizeModelingService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.agent.service.IAgentNewService;
+import com.fdkankan.agent.service.IIncrementUseTypeService;
 import com.fdkankan.agent.service.IUserService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +38,8 @@ public class AgentAuthorizeModelingServiceImpl extends ServiceImpl<IAgentAuthori
     IUserService userService;
     @Autowired
     IAgentNewService agentNewService;
+    @Autowired
+    IIncrementUseTypeService iIncrementUseTypeService;
 
 
     @Override
@@ -60,11 +64,17 @@ public class AgentAuthorizeModelingServiceImpl extends ServiceImpl<IAgentAuthori
         wrapper.orderByDesc(AgentAuthorizeModeling::getId);
         Page<AgentAuthorizeModeling> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
         List<Integer> sysIds = page.getRecords().stream().map(AgentAuthorizeModeling::getAgentId).collect(Collectors.toList());
+
         HashMap<Integer, AgentNew> userMap = agentNewService.getMapByIds(sysIds);
+        HashMap<Integer, IncrementUseType> typeMap = iIncrementUseTypeService.getTypeMap();
+
         for (AgentAuthorizeModeling record : page.getRecords()) {
             if(userMap.get(record.getAgentId())!=null){
                 record.setAgentName(userMap.get(record.getAgentId()).getNickName());
             }
+            if(typeMap.get(record.getUseType()) !=null){
+                record.setUseTypeStr(typeMap.get(record.getUseType()).getName());
+            }
         }
         return PageInfo.PageInfo(page);
     }

src/main/java/com/fdkankan/agent/service/impl/IncrementUseTypeServiceImpl.java

@@ -6,6 +6,9 @@ import com.fdkankan.agent.service.IIncrementUseTypeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +20,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class IncrementUseTypeServiceImpl extends ServiceImpl<IIncrementUseTypeMapper, IncrementUseType> implements IIncrementUseTypeService {
 
+    @Override
+    public HashMap<Integer, IncrementUseType> getTypeMap() {
+        HashMap<Integer, IncrementUseType> map = new HashMap<>();
+        List<IncrementUseType> list = this.list();
+        list.forEach(e ->map.put(e.getId(),e));
+        return map;
+    }
 }