经销商相机日志

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

@@ -1,6 +1,7 @@
 package com.fdkankan.agent.controller;
 
 
+import com.fdkankan.agent.common.BaseController;
 import com.fdkankan.agent.common.ResultData;
 import com.fdkankan.agent.entity.CameraIncrementLog;
 import com.fdkankan.agent.request.CameraIncrementParam;
@@ -18,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @RestController
 @RequestMapping("/agent/cameraIncrementLog")
-public class CameraIncrementLogController {
+public class CameraIncrementLogController extends BaseController {
 
     @Autowired
     private ICameraIncrementLogService cameraIncrementLogService;
@@ -26,7 +27,7 @@ public class CameraIncrementLogController {
 
     @PostMapping("/list")
     public ResultData list(@RequestBody CameraIncrementParam param){
-
+        param.setAgentId(getAgent().getId());
         return ResultData.ok(cameraIncrementLogService.pageList(param));
     }
 }

src/main/java/com/fdkankan/agent/request/CameraIncrementParam.java

@@ -12,6 +12,7 @@ public class CameraIncrementParam extends RequestBase {
     private Integer operationType;  //'0 绑定，1未绑定'
     private Integer incrementTypeId;  //权益类型
     private String operationUserName;
+    private Integer agentId;
     private List<String> timeList;
 
     private String startTime;

src/main/resources/mapper/agent/CameraIncrementLogMapper.xml

@@ -6,10 +6,11 @@
         select  cil.*,c.sn_code,u.user_name as operationUserName,ui.increment_type_id ,uit.valid_time_type
         from t_camera_increment_log cil
             left join t_camera c on cil.camera_id = c.id
+            left join t_camera_detail d on c.id = d.camera_id
             left join t_user_increment ui on cil.increment_id = ui.id
             left join t_user u on cil.operation_user = u.id
             left join t_increment_type uit on ui.increment_type_id = uit.id
-        where cil.rec_status = 'A'
+        where cil.rec_status = 'A' and d.agent_id = #{param.agentId}
             <if test="param.snCode != null and param.snCode !=''">
                 and c.sn_code like concat ('%',#{param.snCode},'%')
             </if>