From 22db8e5abf4fa7f6accbb12159a5871e8dc18e7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AE=B5=E9=A3=9E=E5=AE=87?= <2684146481@qq.com>
Date: Fri, 30 Jun 2023 15:59:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hzims/middle/systemlog/controller/SysLogController.java    |  3 +++
 .../hnac/hzims/middle/systemlog/mapper/StatisticsMapper.java   |  1 -
 .../hnac/hzims/middle/systemlog/mapper/StatisticsMapper.xml    |  8 ++++++++
 .../com/hnac/hzims/middle/systemlog/mapper/SysLogMapper.java   |  1 -
 .../middle/systemlog/service/impl/StatisticsServiceImpl.java   | 10 +++-------
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/controller/SysLogController.java b/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/controller/SysLogController.java
index c3c4e3e..e06411e 100644
--- a/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/controller/SysLogController.java
+++ b/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/controller/SysLogController.java
@@ -97,6 +97,9 @@ public class SysLogController {
      */
     @ApiOperation("根据Id获取日志数据")
     @GetMapping("/get/{id}")
+    @ApiResponses({
+            @ApiResponse(code = 200,message = "OK",response = SysLog.class),
+    })
     public R getById(@PathVariable Long id) {
         SysLog sysLog = sysLogService.getById(id);
         return R.data(sysLog);
diff --git a/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/mapper/StatisticsMapper.java b/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/mapper/StatisticsMapper.java
index ec84925..66c3c85 100644
--- a/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/mapper/StatisticsMapper.java
+++ b/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/mapper/StatisticsMapper.java
@@ -18,7 +18,6 @@ import org.springframework.stereotype.Repository;
  * @author dfy
  * @since 2023-04-08
  */
-@Repository
 public interface StatisticsMapper extends BaseMapper<Statistics> {
 
 
diff --git a/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/mapper/StatisticsMapper.xml b/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/mapper/StatisticsMapper.xml
index a8c53e1..f8e11c7 100644
--- a/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/mapper/StatisticsMapper.xml
+++ b/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/mapper/StatisticsMapper.xml
@@ -5,6 +5,14 @@
     <select id="selectPages" resultType="com.hnac.hzims.middle.systemlog.vo.StatisticsResponseVo">
         select module_name moduleName, sum(module_name_num) moduleNameNum
         from hzims_statistics
+         <where>
+            <if test="statistics.createTime != null">
+                date_format(date_calculated,'%Y-%m-%d') &gt;= #{statistics.createTime}
+            </if>
+             <if test="statistics.endTime != null">
+               and  date_format(date_calculated,'%Y-%m-%d') &lt;= #{statistics.endTime}
+             </if>
+         </where>
         group by module_name;
     </select>
 </mapper>
diff --git a/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/mapper/SysLogMapper.java b/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/mapper/SysLogMapper.java
index 9d468d3..9bce1df 100644
--- a/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/mapper/SysLogMapper.java
+++ b/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/mapper/SysLogMapper.java
@@ -21,7 +21,6 @@ import java.util.List;
  * @author dfy
  * @since 2023-04-04
  */
-@Repository
 public interface SysLogMapper extends BaseMapper<SysLog> {
 
     /**
diff --git a/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/service/impl/StatisticsServiceImpl.java b/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/service/impl/StatisticsServiceImpl.java
index 0df0a4c..e6c9baa 100644
--- a/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/service/impl/StatisticsServiceImpl.java
+++ b/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/service/impl/StatisticsServiceImpl.java
@@ -33,10 +33,6 @@ public class StatisticsServiceImpl extends ServiceImpl<StatisticsMapper, Statist
     @Autowired
     private SysLogService sysLogService;
 
-    @Autowired
-    private StatisticsService statisticsService;
-
-
     /**
      * 保存统计的数据
      */
@@ -55,18 +51,18 @@ public class StatisticsServiceImpl extends ServiceImpl<StatisticsMapper, Statist
                 continue;
             }
             //查询数据
-            Statistics statistics = statisticsService.getStatisticsBydateCalculated(sysLogStatisticsVo);
+            Statistics statistics = this.getStatisticsBydateCalculated(sysLogStatisticsVo);
             //如果为空保存数据，如果不为空更新数据
             if (statistics == null) {
                 statistics = new Statistics();
                 statistics.setDateCalculated(sysLogStatisticsVo.getOperationTime());
                 statistics.setModuleNameNum(sysLogStatisticsVo.getModuleNameCount());
                 statistics.setModuleName(sysLogStatisticsVo.getModuleName());
-                statisticsService.save(statistics);
+                this.save(statistics);
             } else {
                 statistics.setModuleName(sysLogStatisticsVo.getModuleName());
                 statistics.setModuleNameNum(sysLogStatisticsVo.getModuleNameCount());
-                statisticsService.updateById(statistics);
+                this.updateById(statistics);
             }
         }
     }