相机协作

doc/update-1.3.1.sql

@@ -11,7 +11,8 @@ CREATE TABLE `t_agent_authorize_modeling` (
                                               `authorize_key` text COMMENT '授权key',
                                               `authorize_start_time` varchar(255) DEFAULT NULL COMMENT '授权期限',
                                               `authorize_end_time` varchar(255) DEFAULT NULL,
-                                              `agent_id` int DEFAULT NULL COMMENT '创建人',
+                                              `agent_id` int DEFAULT NULL,
+                                              `create_agent_id` int DEFAULT NULL,
                                               `rec_status` varchar(255) DEFAULT 'A',
                                               `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
                                               `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,

src/main/java/com/fdkankan/agent/controller/AgentAuthorizeModelingController.java

@@ -40,6 +40,9 @@ public class AgentAuthorizeModelingController extends BaseController {
 
     @PostMapping("/addOrUpdate")
     public ResultData addOrUpdate(@RequestBody AgentAuthorizeModeling param){
+        if(param.getId() == null){
+            param.setCreateAgentId(getAgent().getId());
+        }
         return ResultData.ok( authorizeModelingService.addOrUpdate(param));
     }
 

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

@@ -82,11 +82,15 @@ public class AgentAuthorizeModeling implements Serializable {
     private String authorizeEndTime;
 
 
+
+    @TableField("agent_id")
+    private Integer agentId;
+
     /**
      * 创建人
      */
-    @TableField("agent_id")
-    private Integer agentId;
+    @TableField("create_agent_id")
+    private Integer createAgentId;
 
     @TableField(exist = false)
     private String agentName;

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

@@ -41,7 +41,6 @@ public class AgentAuthorizeModelingServiceImpl extends ServiceImpl<IAgentAuthori
     @Override
     public Object pageList(AuthorizeParam param) {
         LambdaQueryWrapper<AgentAuthorizeModeling> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(AgentAuthorizeModeling::getAgentId,param.getAgentId());
         if(StringUtils.isNotBlank(param.getCustomerName())){
             wrapper.like(AgentAuthorizeModeling::getCustomerName,param.getCustomerName());
         }
@@ -54,6 +53,10 @@ public class AgentAuthorizeModelingServiceImpl extends ServiceImpl<IAgentAuthori
         if(StringUtils.isNotBlank(param.getAuthorizeKey())){
             wrapper.like(AgentAuthorizeModeling::getAuthorizeKey,param.getAuthorizeKey());
         }
+        wrapper.and(e -> wrapper.eq(AgentAuthorizeModeling::getCreateAgentId,param.getAgentId())
+                .or()
+                .eq(AgentAuthorizeModeling::getAgentId,param.getAgentId()));
+
         wrapper.orderByDesc(AgentAuthorizeModeling::getCreateTime);
         Page<AgentAuthorizeModeling> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
         List<Integer> sysIds = page.getRecords().stream().map(AgentAuthorizeModeling::getAgentId).collect(Collectors.toList());