日志开关

lac优化
OPC UA工具类

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java

@@ -7,6 +7,7 @@ import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
@@ -25,9 +26,13 @@ import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
-
+import org.springframework.web.bind.annotation.GetMapping;
-import javax.mail.MessagingException;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import java.util.List;
 
 /**
@@ -340,4 +345,9 @@ public class SysConfigController extends CoreBaseController {
             return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
         }
     }
+
+    public static void main(String[] args) {
+        SnowflakeIdMaker snowflakeIdMaker = new SnowflakeIdMaker();
+        System.out.println(snowflakeIdMaker.nextId());
+    }
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDashboardController.java

@@ -20,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -50,6 +49,8 @@ public class SysDashboardController extends CoreBaseController {
     @Resource(name = CommonConstWords.IMPP_REDIS_CORE)
     private ImppRedis redisCore;
 
+    public static final int TIMEOUT = 60 * 60;
+
     /**
      * 获取基础数据
      * @return 处理结果
@@ -61,7 +62,7 @@ public class SysDashboardController extends CoreBaseController {
         try {
             LOGGER.info("getBasicInfo:{}",redisCore);
             // 保持时间,key统一
-            String redisKey = PlatformConstWords.REDIS_DASHBOARD_BASIC_INFO + "_" + TimeTool.getNowTime("yyyyMMddhhmmss");
+            String redisKey = PlatformConstWords.REDIS_DASHBOARD_BASIC_INFO;
 
             Map<Object, Object> dashboardData = redisCore.getHashMap(redisKey);
             LOGGER.info("getBasicInforedisKey:{},dashboardData:{}",redisKey,dashboardData);
@@ -72,7 +73,7 @@ public class SysDashboardController extends CoreBaseController {
                 dashboardData.put("onlineUser", webSessionManager.getSessionDAO().getActiveSessions().size());
                 dashboardData.put("userLoginLog", sysDashboardService.findSysUserLoginLog(10));
 
-                redisCore.putHashMap(redisKey, dashboardData, 500);
+                redisCore.putHashMap(redisKey, dashboardData,  TIMEOUT);
             }
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultMap(dashboardData);
         } catch (ImppBusiException busExcep) {
@@ -93,16 +94,16 @@ public class SysDashboardController extends CoreBaseController {
         try {
             LOGGER.info("getLogInfo:{}",redisCore);
             // 保持时间,key统一
-            String redisKey = PlatformConstWords.REDIS_DASHBOARD_LOG_INFO + "_" + TimeTool.getNowTime("yyyyMMddhhmmss");
+            String redisKey = PlatformConstWords.REDIS_DASHBOARD_LOG_INFO;
 
             Map<Object, Object> dashboardData = redisCore.getHashMap(redisKey);
-            LOGGER.info("getLogInforedisKey:{},dashboardData:{}",redisKey,dashboardData);
+            LOGGER.info("最近操作，异常日志:{}",redisKey);
             if (dashboardData == null || dashboardData.size() == 0) {
                 dashboardData = new HashMap<>();
                 dashboardData.put("logOperate", sysDashboardService.findNewSysLogOperateSize(10));
                 dashboardData.put("logException", sysDashboardService.findNewSysLogExceptionSize(10));
 
-                redisCore.putHashMap(redisKey, dashboardData, 500);
+                redisCore.putHashMap(redisKey, dashboardData, TIMEOUT);
             }
 
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
@@ -125,7 +126,7 @@ public class SysDashboardController extends CoreBaseController {
         LOGGER.info("getAvgResponseTime:{}",redisCore);
         try {
             // 保持时间,key统一
-            String redisKey = PlatformConstWords.REDIS_DASHBOARD_AVG_RESP_TIME + "_" + TimeTool.getNowTime("yyyyMMddhhmmss");
+            String redisKey = PlatformConstWords.REDIS_DASHBOARD_AVG_RESP_TIME;
 
             Map<Object, Object> dashboardData = redisCore.getHashMap(redisKey);
             LOGGER.info("getAvgResponseTimeredisKey:{},dashboardData:{}",redisKey,dashboardData);
@@ -137,7 +138,7 @@ public class SysDashboardController extends CoreBaseController {
                 dashboardData = sysDashboardService.querySysLogSystemAvgExecuteTime(
                         sdf.format(TimeTool.timeCalc(nowDate, Calendar.MINUTE, -3)),sdf.format(nowDate));
 
-                redisCore.putHashMap(redisKey, dashboardData, 500);
+                redisCore.putHashMap(redisKey, dashboardData, TIMEOUT);
             }
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
                     .setResultMap(dashboardData);
@@ -159,7 +160,7 @@ public class SysDashboardController extends CoreBaseController {
         LOGGER.info("getLevelLogNum:{}",redisCore);
         try {
             // 保持时间,key统一
-            String redisKey = PlatformConstWords.REDIS_DASHBOARD_LOG_NUM + "_" + TimeTool.getNowTime("yyyyMMddhhmms");
+            String redisKey = PlatformConstWords.REDIS_DASHBOARD_LOG_NUM;
 
             Map<Object, Object> dashboardData = redisCore.getHashMap(redisKey);
             LOGGER.info("getLevelLogNumredisKey:{},dashboardData:{}",redisKey,dashboardData);
@@ -193,7 +194,7 @@ public class SysDashboardController extends CoreBaseController {
         LOGGER.info("getServerPressure:{}",redisCore);
         try {
             // 保持时间,key统一
-            String redisKey = PlatformConstWords.REDIS_DASHBOARD_SERVER_PRESSURE + "_" + TimeTool.getNowTime("yyyyMMddhhmmss");
+            String redisKey = PlatformConstWords.REDIS_DASHBOARD_SERVER_PRESSURE;
 
             Map<Object, Object> dashboardData = redisCore.getHashMap(redisKey);
             LOGGER.info("getServerPressureredisKey:{},dashboardData:{}",redisKey,dashboardData);
@@ -234,4 +235,5 @@ public class SysDashboardController extends CoreBaseController {
             return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
         }
     }
+
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java

@@ -1,6 +1,5 @@
 package cn.estsh.i3plus.core.apiservice.mq;
 
-import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService;
 import cn.estsh.i3plus.core.apiservice.util.MailUtil;
@@ -12,6 +11,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
 import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage;
 import cn.estsh.i3plus.pojo.platform.bean.SysUser;
+import cn.estsh.impp.framework.boot.util.RedisUtilTool;
 import com.alibaba.fastjson.JSON;
 import com.rabbitmq.client.Channel;
 import org.apache.commons.lang3.StringUtils;
@@ -41,8 +41,6 @@ public class MessageMailQueueReceiver {
     @Autowired
     private ISysUserService sysUserService;
     @Autowired
-    private ISysConfigService sysConfigService;
-    @Autowired
     private MailUtil mailUtil;
 
     /**
@@ -73,7 +71,7 @@ public class MessageMailQueueReceiver {
             if (msg.getMessageReceiverType() != null) {
                 if (msg.getMessageReceiverType().intValue() == ImppEnumUtil.MESSAGE_RECEIVER_TYPE.URGENT.getValue()) {
                     // 判断是否为系统紧急提示 微服注册状态提示
-                    mailUtil.setTo(sysConfigService.getSysConfigByCode(PlatformConstWords.CONTACT_MAIL).getConfigValue());
+                    mailUtil.setTo(RedisUtilTool.getSysConfigStrVal(PlatformConstWords.CONTACT_MAIL));
                     // 次数过于频繁
                     mailUtil.send();
 

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/CoreLogClearJob.java

@@ -7,6 +7,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysLogTaskTimeService;
 import cn.estsh.i3plus.platform.common.tool.TimeTool;
 import cn.estsh.impp.framework.base.schedule.BaseImppScheduleJob;
 import cn.estsh.impp.framework.boot.init.ApplicationProperties;
+import com.alibaba.fastjson.JSONObject;
 import org.quartz.JobExecutionContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -49,23 +50,47 @@ public class CoreLogClearJob extends BaseImppScheduleJob {
     @Override
     public void executeImppJob(JobExecutionContext context, ApplicationProperties applicationProperties) {
         // 判断日志保留时间 -1 永久
-        if(getJobParam() != null && Integer.parseInt(getJobParam()) != -1){
+        if (getJobParam() == null) {
+            return;
+        }
+        JSONObject clearParam = JSONObject.parseObject(getJobParam());
+
         // 计算保留日期
         String dateTime = TimeTool.pareDateToString("yyyy-MM-dd HH:mm:ss",
                 TimeTool.timeCalc(new Date(), Calendar.DAY_OF_MONTH, -retentionTime)
         );
         long count;
+        // 系统日志
+        if (clearParam.containsKey("logSystem") && clearParam.getInteger("logSystem") != -1) {
             count = sysLogSystemService.deleteSysLogSystemByDateTimeAfter(dateTime);
             LOGGER.info("【日志清理】 清理系统日志 {} 条", count);
+        }
 
+        // 异常日志
+        if (clearParam.containsKey("logException") && clearParam.getInteger("logException") != -1) {
             count = sysLogExceptionService.deleteSysLogExceptionByDateTimeAfter(dateTime);
             LOGGER.info("【日志清理】 清理异常日志 {} 条", count);
+        }
 
+        // 操作日志
+        if (clearParam.containsKey("logOperate") && clearParam.getInteger("logOperate") != -1) {
             count = sysLogOperateService.deleteSysLogOperateByDateTimeAfter(dateTime);
             LOGGER.info("【日志清理】 清理操作日志 {} 条", count);
+        }
 
+        // 任务日志
+        if (clearParam.containsKey("logTask") && clearParam.getInteger("logTask") != -1) {
             count = sysLogTaskTimeService.deleteSysLogTaskTimeByDateTimeAfter(dateTime);
             LOGGER.info("【日志清理】 清理定时任务日志 {} 条", count);
         }
     }
+
+    public static void main(String[] args) {
+        JSONObject clearParam = new JSONObject();
+        clearParam.put("logSystem",30);
+        clearParam.put("logException",30);
+        clearParam.put("logOperate",30);
+        clearParam.put("logTask",30);
+        System.out.println(clearParam.toJSONString());
+    }
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/SysDashboardDataJob.java

@@ -0,0 +1,112 @@
+package cn.estsh.i3plus.core.apiservice.schedulejob;
+
+import cn.estsh.i3plus.core.api.iservice.busi.ISysDashboardService;
+import cn.estsh.i3plus.core.apiservice.controller.busi.SysDashboardController;
+import cn.estsh.i3plus.platform.common.tool.TimeTool;
+import cn.estsh.i3plus.platform.common.util.CommonConstWords;
+import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
+import cn.estsh.impp.framework.base.schedule.BaseImppScheduleJob;
+import cn.estsh.impp.framework.boot.init.ApplicationProperties;
+import cn.estsh.impp.framework.boot.util.ImppRedis;
+import org.apache.shiro.web.session.mgt.DefaultWebSessionManager;
+import org.quartz.JobExecutionContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Description : 仪表盘数据查询
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-11-08 15:15
+ * @Modify:
+ **/
+public class SysDashboardDataJob extends BaseImppScheduleJob {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(SysDashboardDataJob.class);
+
+    public SysDashboardDataJob(Class cls, String jobDesc) {
+        super(SysDashboardDataJob.class, "仪表盘数据查询");
+    }
+
+    @Autowired
+    private ISysDashboardService sysDashboardService;
+
+    @Resource(name = CommonConstWords.IMPP_REDIS_CORE)
+    private ImppRedis redisCore;
+
+    @Resource(name = "imppSessionManager")
+    private DefaultWebSessionManager webSessionManager;
+
+    @Override
+    public void executeImppJob(JobExecutionContext context, ApplicationProperties applicationProperties) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date nowDate = new Date();
+
+        // 更新基础信息 获取基础数据，用户，部门，组织等信息
+        Map<Object, Object> dashboardData = new HashMap<>();
+        dashboardData.put("orgNum", sysDashboardService.getSysOrganizeCount());
+        dashboardData.put("deptNum", sysDashboardService.getSysDepartmentCount());
+        dashboardData.put("onlineUser", webSessionManager.getSessionDAO().getActiveSessions().size());
+        dashboardData.put("userLoginLog", sysDashboardService.findSysUserLoginLog(10));
+
+        LOGGER.debug("获取仪表板基础信息 {}：{}", PlatformConstWords.REDIS_DASHBOARD_BASIC_INFO, dashboardData);
+        redisCore.putHashMap(PlatformConstWords.REDIS_DASHBOARD_BASIC_INFO, dashboardData, SysDashboardController.TIMEOUT);
+
+        // 最近操作，异常日志
+        dashboardData = new HashMap<>();
+        dashboardData.put("logOperate", sysDashboardService.findNewSysLogOperateSize(10));
+        dashboardData.put("logException", sysDashboardService.findNewSysLogExceptionSize(10));
+
+        LOGGER.info("最近操作，异常日志 {}：{}", PlatformConstWords.REDIS_DASHBOARD_LOG_INFO, dashboardData);
+        redisCore.putHashMap(PlatformConstWords.REDIS_DASHBOARD_LOG_INFO, dashboardData, SysDashboardController.TIMEOUT);
+
+        // 获取平均响应时间,前3分钟时间
+        dashboardData = sysDashboardService.querySysLogSystemAvgExecuteTime(
+                sdf.format(TimeTool.timeCalc(nowDate, Calendar.MINUTE, -3)), TimeTool.getNowTime(true));
+
+        LOGGER.info("获取平均响应时间 {}：{}", PlatformConstWords.REDIS_DASHBOARD_AVG_RESP_TIME, dashboardData);
+        redisCore.putHashMap(PlatformConstWords.REDIS_DASHBOARD_AVG_RESP_TIME, dashboardData, SysDashboardController.TIMEOUT);
+
+        // 获取各等级日志数量，前10分钟的日志数量
+        dashboardData = sysDashboardService.querySysLogSystemByLevel(
+                sdf.format(TimeTool.timeCalc(nowDate, Calendar.MINUTE, -10)), TimeTool.getNowTime(true));
+
+        LOGGER.info("获取各等级日志数量 {}：{}", PlatformConstWords.REDIS_DASHBOARD_LOG_NUM, dashboardData);
+        redisCore.putHashMap(PlatformConstWords.REDIS_DASHBOARD_LOG_NUM, dashboardData, SysDashboardController.TIMEOUT);
+
+
+        // 获取服务压力情况
+        dashboardData = new HashMap<>();
+        //获取上一分钟,请求来源数据
+        Map<?, ?> dataMap = redisCore.getHashMap(
+                CommonConstWords.REDIS_DASHBOARD_MINUTE_SOURCE + "_" + sdf.format(TimeTool.timeCalc(nowDate, Calendar.MINUTE, -1)));
+        if (dataMap == null) {
+            dataMap = new HashMap<>();
+        }
+        dashboardData.put("requestSource", dataMap);
+
+        //获取上一秒，服务器压力数据
+        sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+        Object pressureObj = redisCore.getObject(
+                CommonConstWords.REDIS_DASHBOARD_SECOND_PRESSURE + "_" + sdf.format(TimeTool.timeCalc(nowDate, Calendar.SECOND, -1)));
+        int pressure = 0;
+        if (pressureObj != null) {
+            try {
+                pressure = Integer.parseInt(pressureObj.toString());
+            } catch (Exception e) {
+                LOGGER.error("【无法转换压力】data：{}", pressureObj);
+            }
+        }
+        dashboardData.put("serverPressure", pressure);
+
+        LOGGER.info("保存服务压力情况 {}：{}", PlatformConstWords.REDIS_DASHBOARD_SERVER_PRESSURE, dashboardData);
+        redisCore.putHashMap(PlatformConstWords.REDIS_DASHBOARD_SERVER_PRESSURE, dashboardData, 500);
+    }
+}

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/MailUtil.java

@@ -1,17 +1,18 @@
 package cn.estsh.i3plus.core.apiservice.util;
 
-import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService;
 import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
+import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.MailConfig;
-import cn.estsh.i3plus.pojo.platform.bean.SysConfig;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
+import cn.estsh.impp.framework.boot.util.ImppRedis;
+import cn.estsh.impp.framework.boot.util.RedisUtilTool;
 import com.sun.mail.smtp.SMTPAddressFailedException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
 import javax.mail.Address;
 import javax.mail.AuthenticationFailedException;
 import javax.mail.Message;
@@ -52,8 +53,8 @@ public class MailUtil {
     private String smtpPassword = "";
     private boolean isAuthenticationSMTP = false;
 
-    @Autowired
+    @Resource(name = CommonConstWords.IMPP_REDIS_RES)
-    private ISysConfigService sysConfigService;
+    private ImppRedis redisRes;
 
     /**
      * 初始化服务器邮箱参数
@@ -63,19 +64,15 @@ public class MailUtil {
     public MailUtil init() {
         try {
             // 查询是否开启邮件服务器
-            SysConfig sysConfig = sysConfigService.getSysConfigByCode(PlatformConstWords.MAIL_SWITCH);
+            this.mailSwitch = RedisUtilTool.getSysConfigIntVal(PlatformConstWords.MAIL_SWITCH,
-            if (sysConfig != null) {
+                    CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
-                this.mailSwitch = Integer.parseInt(sysConfig.getConfigValue());
+            this.smtpHost = RedisUtilTool.getSysConfigStrVal(PlatformConstWords.MAIL_HOST);
-                this.smtpHost = sysConfigService.getSysConfigByCode(PlatformConstWords.MAIL_HOST).getConfigValue();
+            this.smtpPort = RedisUtilTool.getSysConfigIntVal(PlatformConstWords.MAIL_PORT);
-                this.smtpPort = Integer.parseInt(sysConfigService.getSysConfigByCode(PlatformConstWords.MAIL_PORT).getConfigValue());
+            this.from = RedisUtilTool.getSysConfigStrVal(PlatformConstWords.MAIL_USER);
-                this.from = sysConfigService.getSysConfigByCode(PlatformConstWords.MAIL_USER).getConfigValue();
+            this.nick = RedisUtilTool.getSysConfigStrVal(PlatformConstWords.MAIL_NICK);
-                this.nick = sysConfigService.getSysConfigByCode(PlatformConstWords.MAIL_NICK).getConfigValue();
+            this.smtpUser =RedisUtilTool.getSysConfigStrVal(PlatformConstWords.MAIL_USER);
-                this.smtpUser = sysConfigService.getSysConfigByCode(PlatformConstWords.MAIL_USER).getConfigValue();
+            this.smtpPassword = RedisUtilTool.getSysConfigStrVal(PlatformConstWords.MAIL_PASSWORD);
-                this.smtpPassword = sysConfigService.getSysConfigByCode(PlatformConstWords.MAIL_PASSWORD).getConfigValue();
             this.isAuthenticationSMTP = true;
-            } else {
-                this.mailSwitch = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
-            }
             return this;
         } catch (Exception e) {
             LOGGER.error("邮箱配置初始化失败！", e.getMessage());
@@ -187,6 +184,7 @@ public class MailUtil {
 
     /**
      * 获取邮箱地址
+     *
      * @param add 邮箱地址字符串
      * @return
      */