1

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

@@ -1,13 +1,17 @@
 package com.fdkankan.agent.controller;
 
+import com.fdkankan.agent.common.PageInfo;
 import com.fdkankan.agent.common.ResultData;
 import com.fdkankan.agent.entity.AgentNewLog;
 import com.fdkankan.agent.request.LogListParam;
 import com.fdkankan.agent.response.LogDataVo;
+import com.fdkankan.agent.response.LogListVo;
 import com.fdkankan.agent.service.IAgentNewLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/agent/log")
 public class AgentNewLogController {
@@ -17,10 +21,11 @@ public class AgentNewLogController {
 
     @GetMapping("/logData")
     public ResultData logData(){
-        return ResultData.ok(new LogDataVo());
+        return ResultData.ok( agentNewLogService.getLogDataM());
     }
     @PostMapping("/logList")
     public ResultData logList(@RequestBody LogListParam param){
+        agentNewLogService.pageUnList(param);
         return ResultData.ok();
     }
 

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

@@ -8,6 +8,7 @@ import com.fdkankan.agent.entity.AgentNew;
 import com.fdkankan.agent.request.CameraParam;
 import com.fdkankan.agent.service.IAgentNewService;
 import com.fdkankan.agent.service.ICameraService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -26,6 +27,7 @@ import java.util.List;
  * @since 2022-11-09
  */
 @RestController
+@Slf4j
 @RequestMapping("/agent/camera")
 public class CameraController extends BaseController {
 
@@ -38,6 +40,7 @@ public class CameraController extends BaseController {
     @PostMapping("/list")
     public ResultData list(@RequestBody CameraParam param){
         param.setAgentId(getAgent().getId());
+        log.info("agent:{}",param);
         return ResultData.ok(cameraService.pageList(param));
     }
 }

src/main/java/com/fdkankan/agent/mapper/IAgentNewLogMapper.java

@@ -4,9 +4,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.agent.entity.AgentNewLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fdkankan.agent.request.DownParam;
+import com.fdkankan.agent.request.LogListParam;
 import com.fdkankan.agent.response.DownLogVo;
+import com.fdkankan.agent.response.LogDataVo;
+import com.fdkankan.agent.response.LogListVo;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -19,4 +24,8 @@ import org.apache.ibatis.annotations.Mapper;
 public interface IAgentNewLogMapper extends BaseMapper<AgentNewLog> {
 
     Page<DownLogVo> downLogList(Page<Object> page, DownParam param);
+
+    List<AgentNewLog> getLogDataM();
+
+    Page<LogListVo> pageUnList(Page<Object> page, LogListParam param);
 }

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

@@ -3,10 +3,12 @@ package com.fdkankan.agent.request;
 import com.fdkankan.agent.common.RequestBase;
 import com.fdkankan.agent.util.Dateutils;
 import lombok.Data;
+import lombok.ToString;
 
 import java.util.List;
 
 @Data
+@ToString
 public class CameraParam extends RequestBase {
     private Long id;                            //设备id
     private Long userId;                        //用户id

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

@@ -4,7 +4,9 @@ import com.fdkankan.agent.entity.AgentNewLog;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.agent.request.DownParam;
 import com.fdkankan.agent.request.IncrementParam;
+import com.fdkankan.agent.request.LogListParam;
 import com.fdkankan.agent.response.AgentNewVo;
+import com.fdkankan.agent.response.LogDataVo;
 
 /**
  * <p>
@@ -19,4 +21,8 @@ public interface IAgentNewLogService extends IService<AgentNewLog> {
     Object downLogList(DownParam param);
 
     void addDown(IncrementParam param, AgentNewVo agent);
+
+    LogDataVo getLogDataM();
+
+    Object pageUnList(LogListParam param);
 }

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

@@ -12,8 +12,11 @@ import com.fdkankan.agent.exception.BusinessException;
 import com.fdkankan.agent.mapper.IAgentNewLogMapper;
 import com.fdkankan.agent.request.DownParam;
 import com.fdkankan.agent.request.IncrementParam;
+import com.fdkankan.agent.request.LogListParam;
 import com.fdkankan.agent.response.AgentNewVo;
 import com.fdkankan.agent.response.DownLogVo;
+import com.fdkankan.agent.response.LogDataVo;
+import com.fdkankan.agent.response.LogListVo;
 import com.fdkankan.agent.service.IAgentNewLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.agent.service.IAgentNewService;
@@ -69,7 +72,25 @@ public class AgentNewLogServiceImpl extends ServiceImpl<IAgentNewLogMapper, Agen
         user.setDownloadNumTotal(user.getDownloadNumTotal() + param.getCount() );
         userService.updateById(user);
         agentNewService.subNum(agent,user.getId(),null,param.getCount(),0);
+    }
 
+    @Override
+    public LogDataVo getLogDataM() {
+        List<AgentNewLog> logDataM = this.getBaseMapper().getLogDataM();
+        LogDataVo logDataVo = new LogDataVo();
+        for (AgentNewLog log : logDataM) {
+            switch (log.getType()){
+                case 0 : logDataVo.setLastMajorNum(log.getCount() + logDataVo.getLastMajorNum()); break;
+                case 1 : logDataVo.setLastHighNum(log.getCount() + logDataVo.getLastHighNum()); break;
+                case 2 : logDataVo.setLastDownNum(log.getCount() + logDataVo.getLastDownNum()); break;
+            }
+        }
+        return logDataVo;
+    }
 
+    @Override
+    public Object pageUnList(LogListParam param) {
+        Page<LogListVo> page = this.getBaseMapper().pageUnList(new Page<>(param.getPageNum(),param.getPageSize()),param);
+        return PageInfo.PageInfo(page);
     }
 }

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

@@ -63,9 +63,9 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
 
         for (UserIncrementVo vo :page.getRecords() ) {
             switch (vo.getValidTimeType()){
-                case 0 : vo.setIncrementTypeName(vo.getIncrementTypeName() +"(年)");
-                case 1 : vo.setIncrementTypeName(vo.getIncrementTypeName() +"(月)");
-                default: vo.setIncrementTypeName(vo.getIncrementTypeName() +"(日)");
+                case 0 : vo.setIncrementTypeName(vo.getIncrementTypeName() +"(年)"); break;
+                case 1 : vo.setIncrementTypeName(vo.getIncrementTypeName() +"(月)"); break;
+                default: vo.setIncrementTypeName(vo.getIncrementTypeName() +"(日)"); break;
             }
         }
         return PageInfo.PageInfo(page);

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

@@ -12,4 +12,13 @@
             and al.create_time BETWEEN (#{param.startTime} and #{param.endTime})
        </if>
     </select>
+    <select id="getLogDataM" resultType="com.fdkankan.agent.entity.AgentNewLog">
+        SELECT *
+        FROM t_agent_new WHERE PERIOD_DIFF( date_format( now( ) , '%Y%m' ) , date_format( create_time, '%Y%m' ) ) =1
+
+    </select>
+
+    <select id="pageUnList" resultType="com.fdkankan.agent.response.LogListVo">
+
+    </select>
 </mapper>