Merge remote-tracking branch 'origin/new-exam' into new-exam

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysPropertynumController.java

@@ -188,7 +188,44 @@ public class SysPropertynumController extends BaseController {
 
     /**
      *
-     *检查近6个月统计
+     *近6个月统计涉密信息设备
+     * @return
+     */
+    @PostMapping("/countMessageMonth")
+    @ResponseBody
+    public AjaxResult countMessageMonth() {
+        List<String> recentlySixMonth = ObtainLastSixMonthsUtil.getRecentlySixMonth();
+        List<Long> yAxisData = new ArrayList<>();
+        recentlySixMonth.forEach(month -> {
+            // 获取指定月份的最大日期
+            String lastDayOfMonth = ObtainLastSixMonthsUtil.getLastDayOfMonth(month);
+            // 获取指定天的最大时间
+            Date date = Date.from(LocalDate.parse(lastDayOfMonth).atStartOfDay().atZone(ZoneId.systemDefault()).toInstant());
+            Date maxDayTime = ObtainLastSixMonthsUtil.getEndOfDay(date);
+            // 获取最小时间
+            date = Date.from(LocalDate.parse(month.concat(StrPool.DASHED).concat("01")).atStartOfDay().atZone(ZoneId.systemDefault()).toInstant());
+            Date minDayTime = ObtainLastSixMonthsUtil.getStartOfDay(date);
+            AtomicReference<Long> yAxis = new AtomicReference<>(0L);
+            PropertyManagerDTO tdPropertyManager = new PropertyManagerDTO();
+            tdPropertyManager.setMinDayTime(minDayTime);
+            tdPropertyManager.setMaxDayTime(maxDayTime);
+            tdPropertyManager.setSecretsType("1");
+            Integer count = tdPropertyManagerService.countMessageMonth(tdPropertyManager);
+            if(Objects.isNull(count)){
+                count = 0;
+            }
+            yAxis.set(Long.valueOf(count));
+            yAxisData.add(yAxis.get());
+        });
+        JSONObject obj = new JSONObject();
+        obj.put("xAxisData", recentlySixMonth.toArray());
+        obj.put("yAxisData", yAxisData);
+        return AjaxResult.success(obj);
+    }
+
+    /**
+     *
+     *检查近6个月统计涉密设备
      * @return
      */
     @PostMapping("/countSecretsMonth")
@@ -209,7 +246,7 @@ public class SysPropertynumController extends BaseController {
             PropertyManagerDTO tdPropertyManager = new PropertyManagerDTO();
             tdPropertyManager.setMinDayTime(minDayTime);
             tdPropertyManager.setMaxDayTime(maxDayTime);
-            tdPropertyManager.setSecretsType("1");
+            tdPropertyManager.setSecretsType("2");
             Integer count = tdPropertyManagerService.countSecretsMonth(tdPropertyManager);
             if(Objects.isNull(count)){
                 count = 0;

ruoyi-admin/src/main/resources/templates/system/check/checknum/checknum.html

@@ -234,6 +234,18 @@
                 {
                     field: 'checkStartTime',
                     title: '检查开始时间',
+                    formatter: function (value){
+                        let date = new Date(value);
+                        return date.toISOString().split('T')[0];
+                    }
+                },
+                {
+                    field: 'checkEndTime',
+                    title: '检查结束时间',
+                    formatter: function (value){
+                        let date = new Date(value);
+                        return date.toISOString().split('T')[0];
+                    }
                 },
                 {
                     field: 'createTime',

ruoyi-admin/src/main/resources/templates/system/checkReport/checkReport.html

@@ -134,6 +134,18 @@
                 {
                     field: 'checkStartTime',
                     title: '检查开始时间',
+                    formatter: function (value){
+                        let date = new Date(value);
+                        return date.toISOString().split('T')[0];
+                    }
+                },
+                {
+                    field: 'checkEndTime',
+                    title: '检查结束时间',
+                    formatter: function (value){
+                        let date = new Date(value);
+                        return date.toISOString().split('T')[0];
+                    }
                 },
                 {
                     field: 'createTime',

ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdPropertyManagerMapper.java

@@ -66,5 +66,7 @@ public interface TdPropertyManagerMapper extends BaseMapper<TdPropertyManager>
     public int deleteTdPropertyManagerByUseIds(String[] useIds);
 
 
+    public Integer countMessageMonth(PropertyManagerDTO propertyManagerDTO);
+
     public Integer countSecretsMonth(PropertyManagerDTO propertyManagerDTO);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ITdPropertyManagerService.java

@@ -66,5 +66,8 @@ public interface ITdPropertyManagerService extends IService<TdPropertyManager>
     public int deleteTdPropertyManagerByUseId(String useId);
 
 
+    public Integer countMessageMonth(PropertyManagerDTO propertyManagerDTO);
+
+
     public Integer countSecretsMonth(PropertyManagerDTO propertyManagerDTO);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdPropertyManagerServiceImpl.java

@@ -99,6 +99,11 @@ public class TdPropertyManagerServiceImpl extends ServiceImpl<TdPropertyManagerM
         return tdPropertyManagerMapper.deleteTdPropertyManagerByUseId(useId);
     }
 
+    @Override
+    public Integer countMessageMonth(PropertyManagerDTO propertyManagerDTO) {
+        return tdPropertyManagerMapper.countMessageMonth(propertyManagerDTO);
+    }
+
     @Override
     public Integer countSecretsMonth(PropertyManagerDTO propertyManagerDTO) {
         return tdPropertyManagerMapper.countSecretsMonth(propertyManagerDTO);

ruoyi-system/src/main/resources/mapper/system/TdPropertyManagerMapper.xml

@@ -112,12 +112,19 @@
         </foreach>
     </delete>
 
-    <select id="countSecretsMonth" resultType="java.lang.Integer" parameterType="PropertyManagerDTO">
+    <select id="countMessageMonth" resultType="java.lang.Integer" parameterType="PropertyManagerDTO">
         SELECT COUNT(t.*) from td_property_manager  t  RIGHT  JOIN  td_property_info  d
             on t.use_id = d.use_id  where t.secrets_type=#{secretsType}
             AND t.recover_date &gt;= #{minDayTime}
             AND t.recover_date &lt;= #{maxDayTime}
         and d.destory_state is null
     </select>
+    <select id="countSecretsMonth" resultType="java.lang.Integer" parameterType="PropertyManagerDTO">
+        SELECT COUNT(t.*) from td_property_manager  t  RIGHT  JOIN  td_property_ement  d
+        on t.use_id = d.use_id  where t.secrets_type=#{secretsType}
+          AND t.recover_date &gt;= #{minDayTime}
+          AND t.recover_date &lt;= #{maxDayTime}
+          and d.destory_state is null
+    </select>
 
 </mapper>