审计日志存储和内存容量告警修改

backend/src/main/java/com/jiayue/ssi/job/AuditBakPathCapCheck.java

@@ -13,6 +13,7 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.text.DecimalFormat;
 /**
 * 自动备份审计日志
@@ -30,7 +31,7 @@ public class AuditBakPathCapCheck {
     /**
      * 每10分钟执行执行一次
      */
-    @Scheduled(cron = "2 0/10 * * * ?")
+    @Scheduled(cron = "2 0/1 * * * ?")
     public void auditCheck() throws Exception {
 
         DecimalFormat df = new DecimalFormat("#.00");//设置保留两位小数
@@ -40,8 +41,8 @@ public class AuditBakPathCapCheck {
         long size = FileUtils.sizeOfDirectory(new File(FileUtil.getAuditBackUpPath()));
 //        log.debug("审查日志备份路径大小：{} ,转换后大小：{} GB",size,getSizeToGb(size));
 
-        if(Convert.toFloat(getSizeToGb(size))>logSpaceWarnCap){
-            log.info("发送邮箱通知系统管理员后台输出======> 审计日志备份目录存量大小已超过设定阈值"+sysPolicy.getLogSpaceWarn()+"%");
+        if(Convert.toFloat(getSizeToGb(new BigDecimal(sysPolicy.getAuditLogBakCapAlarm()).longValue()-size))<logSpaceWarnCap){
+            log.info("发送邮箱通知系统管理员后台输出======> 审计日志存储剩余容量低于额定容量"+sysPolicy.getLogSpaceWarn()+"%,邮箱告警！");
         }else{
 //            log.info("检测审计日志备份目录大小正常。");
         }

backend/src/main/java/com/jiayue/ssi/job/AutoScanAccount.java

@@ -62,10 +62,10 @@ public class AutoScanAccount {
                     int i = sysUserMapper.update(new SysUser(), updateWrapper);
 
                     if (i<=0){
-                        log.info(sysUser.getUsername()+",超过"+autoScanAccount+"个月未使用,锁定账号失败");
+                        log.info("账号："+sysUser.getUsername()+",超过"+autoScanAccount+"个月未使用,锁定账号失败!");
                     }
                     else{
-                        log.info(sysUser.getUsername()+",超过"+autoScanAccount+"个月未使用,锁定账号成功");
+                        log.info("账号："+sysUser.getUsername()+",超过"+autoScanAccount+"个月未使用,锁定账号成功!");
                     }
                 }
             }

backend/src/main/java/com/jiayue/ssi/job/AutoScanMemory.java

@@ -49,7 +49,7 @@ public class AutoScanMemory {
 //                sysAlarm.setReadSign("0");
 //                // 低于策略设定值则告警
 //                sysAlarmService.save(sysAlarm);
-                log.info("发送邮箱通知系统管理员后台输出======> "+"系统内存邮箱告警：低于设定阈值"+memoryWarn + "%");
+                log.info("发送邮箱通知系统管理员后台输出======> "+"系统剩余内存低于总内存"+memoryWarn + "%，邮箱告警!");
             }
         }
         catch (Exception e){

ui/src/views/sysManager/sysPolicy/index.vue

@@ -24,8 +24,9 @@
             </el-checkbox>
           </el-checkbox-group>
         </el-form-item>
-        <el-form-item label="账号在月数内未使用锁定" prop="scanAccount">
-          <el-input v-model="form.scanAccount" style="width: 240px"></el-input>
+        <el-form-item label="账号" prop="scanAccount">
+          <el-input v-model="form.scanAccount" style="width: 60px"></el-input>
+          <span style="font-weight: bold;color: #606266;">  月数内未使用锁定。</span>
         </el-form-item>
       </fieldset>
       <fieldset>
@@ -39,17 +40,19 @@
             </el-checkbox>
           </el-checkbox-group>
         </el-form-item>
-        <el-form-item label="审计日志存储容量告警上限(GB)" prop="auditLogBakCapAlarm" type="number">
+        <el-form-item label="审计日志存储额定容量上限(GB)" prop="auditLogBakCapAlarm" type="number">
           <el-input v-model="form.auditLogBakCapAlarm" style="width: 240px"></el-input>
         </el-form-item>
-        <el-form-item label="审计日志存储低于阈值邮箱告警(%)" prop="logSpaceWarn">
-          <el-input v-model="form.logSpaceWarn" style="width: 240px"></el-input>
+        <el-form-item label="审计日志存储剩余容量低于额定容量" prop="logSpaceWarn">
+          <el-input v-model="form.logSpaceWarn" style="width: 60px"></el-input>
+          <span style="font-weight: bold;color: #606266;">  (%)时，邮箱告警。</span>
         </el-form-item>
       </fieldset>
       <fieldset>
         <legend>系统策略配置</legend>
-        <el-form-item label="内存低于阈值邮箱告警(%)" prop="memoryWarn">
-          <el-input v-model="form.memoryWarn" style="width: 240px"></el-input>
+        <el-form-item label="剩余内存低于总内存" prop="memoryWarn">
+          <el-input v-model="form.memoryWarn" style="width: 60px"></el-input>
+          <span style="font-weight: bold;color: #606266">  (%)时，邮箱告警。</span>
         </el-form-item>
         <el-divider></el-divider>
         <el-row>
@@ -176,7 +179,7 @@ export default {
           {pattern: /^([1-9]|10)$/, message: "请输入1-10整数", trigger: "blur"}
         ],
         scanAccount: [
-          {required: true, message: "扫描未使用的账号不能为空", trigger: "blur"},
+          {required: true, message: "设定月数不能为空", trigger: "blur"},
           {pattern: /^([1-3])$/, message: "请输入1-3整数", trigger: "blur"}
         ],
         loginLock: [
@@ -193,14 +196,14 @@ export default {
         ],
         auditLogBakCapAlarm: [
           {required: true, message: "审计日志保存容量上限不能为空", trigger: "blur"},
-          {pattern: /^\d+(\.\d+)?$/, message: "请输入数字", trigger: "blur"}
+          {pattern: /^([1-9]|10)$/, message: "请输入1-10整数", trigger: "blur"}
         ],
         memoryWarn: [
-          {required: true, message: "内存低于阈值告警不能为空", trigger: "blur"},
+          {required: true, message: "内存设定值不能为空", trigger: "blur"},
           {pattern: /^(?:[2-8]\d|90)$/, message: "请输入20-90整数", trigger: "blur"}
         ],
         logSpaceWarn: [
-          {required: true, message: "日志存储低于阈值告警不能为空", trigger: "blur"},
+          {required: true, message: "日志存储设定值告警不能为空", trigger: "blur"},
           {pattern: /^(?:[2-8]\d|90)$/, message: "请输入20-90整数", trigger: "blur"}
         ],
         bfhhs: [