自定义报表-折线图,饼图,柱状图,矩形图 完成

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISysLogService.java

@@ -25,24 +25,28 @@ public interface ISysLogService {
     List<SysLogException> findLogExceptionList(SysLogException log);
     SysLogException insertLogException(SysLogException log);
     SysLogException getLogException(SysLogException log);
+    void deleteLogException(SysLogException log);
 
     ListPager<SysLogOperate> queryLogOperatePager(SysLogOperate log, Pager pager);
     List<SysLogOperate> findLogOperateList(SysLogOperate log, Pager pager);
     List<SysLogOperate> findLogOperateList(SysLogOperate log);
     SysLogOperate insertLogOperate(SysLogOperate log);
     SysLogOperate getLogOperate(SysLogOperate log);
+    void deleteLogOperate(SysLogOperate log);
 
     ListPager<SysLogSystem> queryLogSystemPager(SysLogSystem log, Pager pager);
     List<SysLogSystem> findLogSystemList(SysLogSystem log, Pager pager);
     List<SysLogSystem> findLogSystemList(SysLogSystem log);
     SysLogSystem insertLogSystem(SysLogSystem log);
     SysLogSystem getLogSystem(SysLogSystem log);
+    void deleteLogSystem(SysLogSystem log);
 
     ListPager<SysLogTaskTime> queryLogTaskTimePager(SysLogTaskTime log, Pager pager);
     List<SysLogTaskTime> findLogTaskTimeList(SysLogTaskTime log, Pager pager);
     List<SysLogTaskTime> findLogTaskTimeList(SysLogTaskTime log);
     SysLogTaskTime insertLogTaskTime(SysLogTaskTime log);
     SysLogTaskTime getLogTaskTime(SysLogTaskTime log);
+    void deleteLogTaskTime(SysLogTaskTime log);
 
     @ApiOperation(value = "查询时间段内平均请求耗时",notes = "查询时间段内平均请求耗时")
     Map<String, Object> querySysLogSystemAvgExecuteTime(String startTime, String endTime);

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java

@@ -45,7 +45,7 @@ public class AppStartSystemInit implements CommandLineRunner {
     @Value("${" + CommonConstWords.PROP_IMPP_ELASTICSEARCH_URL + "}")
     public String PROP_IMPP_ELASTICSEARCH_URL;
 
-    @Resource(name = "redisRes")
+    @Resource(name = CommonConstWords.IMPP_REDIS_RES)
     private ImppRedis redisRes;
 
     @Autowired

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.core.apiservice.controller;
 
+import cn.estsh.i3plus.core.apiservice.schedulejob.CoreLogClearJob;
 import cn.estsh.i3plus.platform.common.tool.HttpClientTool;
 import cn.estsh.i3plus.platform.common.tool.SerializeTool;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
@@ -17,6 +18,7 @@ import cn.estsh.impp.framework.boot.util.ResultBean;
 import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+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;
@@ -37,7 +39,8 @@ import java.util.List;
 @RequestMapping(PlatformConstWords.BASE_URL + "/demo")
 public class DemoController extends CoreBaseController {
 
-
+    @Autowired
+    private CoreLogClearJob coreLogClearJob;
 
     @GetMapping(value = "/query")
     @ApiOperation(value = "添加操作日志", notes = "添加操作日志，可用于国际化")
@@ -89,4 +92,5 @@ public class DemoController extends CoreBaseController {
     }
 
 
+
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BackstageController.java

@@ -3,14 +3,22 @@ package cn.estsh.i3plus.core.apiservice.controller.base;
 import cn.estsh.i3plus.core.api.iservice.base.ISystemInitService;
 import cn.estsh.i3plus.core.api.iservice.busi.ICoreMemTreeService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService;
+import cn.estsh.i3plus.core.apiservice.serviceimpl.base.SysLogElasticSearchService;
+import cn.estsh.i3plus.core.apiservice.serviceimpl.base.SysLogMongoService;
 import cn.estsh.i3plus.platform.common.tool.SerializeTool;
+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.i3plus.platform.plugin.elasticsearch.ElasticSearchTool;
 import cn.estsh.i3plus.platform.plugin.license.ImppLicense;
 import cn.estsh.i3plus.platform.plugin.license.ImppLicenseTool;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
+import cn.estsh.i3plus.pojo.platform.platbean.SysLogException;
+import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate;
+import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem;
+import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime;
 import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@@ -28,6 +36,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -53,6 +62,12 @@ public class BackstageController extends CoreBaseController {
     @Autowired
     private ICoreMemTreeService memTreeService;
 
+    @Autowired
+    private SysLogElasticSearchService elasticSearchService;
+
+    @Autowired
+    private SysLogMongoService mongoService;
+
     @Resource(name= CommonConstWords.IMPP_REDIS_CORE)
     private ImppRedis redisRes;
 
@@ -131,4 +146,51 @@ public class BackstageController extends CoreBaseController {
         }
     }
 
+
+    @GetMapping(value = "/clean-log")
+    @ApiOperation(value = "添加操作日志", notes = "添加操作日志，可用于国际化")
+    public ResultBean logClean(String time) {
+        try{
+            Date thisTime = TimeTool.parseDate(time);
+            String startTime = TimeTool.getToday(TimeTool.getDateBefore(thisTime, 0)) + " 00:00:00";
+            String endTime = TimeTool.getToday(TimeTool.getDateBefore(thisTime, 0)) + " 23:59:59";
+
+            SysLogOperate operate = new SysLogOperate();
+            operate.setCreateDatetime(startTime);
+            operate.setCreateDateTimeStart(startTime);
+            operate.setCreateDateTimeEnd(endTime);
+
+            SysLogSystem system = new SysLogSystem();
+            system.setCreateDatetime(startTime);
+            system.setCreateDateTimeStart(startTime);
+            system.setCreateDateTimeEnd(endTime);
+
+            SysLogException exception = new SysLogException();
+            exception.setCreateDatetime(startTime);
+            exception.setCreateDateTimeStart(startTime);
+            exception.setCreateDateTimeEnd(endTime);
+
+            SysLogTaskTime taskTime = new SysLogTaskTime();
+            taskTime.setCreateDatetime(startTime);
+            taskTime.setCreateDateTimeStart(startTime);
+            taskTime.setCreateDateTimeEnd(endTime);
+
+            ElasticSearchTool.reload();
+            elasticSearchService.deleteLogOperate(operate);
+            elasticSearchService.deleteLogSystem(system);
+            elasticSearchService.deleteLogException(exception);
+            elasticSearchService.deleteLogTaskTime(taskTime);
+
+            mongoService.deleteLogOperate(operate);
+            mongoService.deleteLogSystem(system);
+            mongoService.deleteLogException(exception);
+            mongoService.deleteLogTaskTime(taskTime);
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        } catch (ImppBusiException busExcep) {
+            return ResultBean.fail(busExcep).build();
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java

@@ -88,7 +88,7 @@ public class WhiteController extends CoreBaseController {
     @Autowired
     private ISysConfigService configService;
 
-    @Resource(name="redisRes")
+    @Resource(name=CommonConstWords.IMPP_REDIS_RES)
     private ImppRedis redisRes;
 
     @Autowired

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

@@ -7,6 +7,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService;
 import cn.estsh.i3plus.platform.common.tool.ExcelTool;
 import cn.estsh.i3plus.platform.common.tool.FileTool;
 import cn.estsh.i3plus.platform.common.tool.ZipTool;
+import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
@@ -63,7 +64,7 @@ public class SysLogExceptionController extends CoreBaseController {
     @Autowired
     private EntityManager entityManager;
 
-    @Resource(name="redisRes")
+    @Resource(name= CommonConstWords.IMPP_REDIS_RES)
     private ImppRedis redisRes;
 
     /**

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

@@ -8,6 +8,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService;
 import cn.estsh.i3plus.platform.common.tool.ExcelTool;
 import cn.estsh.i3plus.platform.common.tool.FileTool;
 import cn.estsh.i3plus.platform.common.tool.ZipTool;
+import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
@@ -66,7 +67,7 @@ public class SysLogOperateController extends CoreBaseController {
     @Autowired
     private EntityManager entityManager;
 
-    @Resource(name="redisRes")
+    @Resource(name= CommonConstWords.IMPP_REDIS_RES)
     private ImppRedis redisRes;
 
 //    /**

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

@@ -10,6 +10,7 @@ import cn.estsh.i3plus.platform.common.tool.ExcelTool;
 import cn.estsh.i3plus.platform.common.tool.FileTool;
 import cn.estsh.i3plus.platform.common.tool.StringTool;
 import cn.estsh.i3plus.platform.common.tool.ZipTool;
+import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
@@ -71,7 +72,7 @@ public class SysOrderNoRuleController extends CoreBaseController {
     @Autowired
     private EntityManager entityManager;
 
-    @Resource(name="redisRes")
+    @Resource(name= CommonConstWords.IMPP_REDIS_RES)
     private ImppRedis redisRes;
 
     /**

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

@@ -7,6 +7,7 @@ import cn.estsh.i3plus.platform.common.tool.ExcelTool;
 import cn.estsh.i3plus.platform.common.tool.FileTool;
 import cn.estsh.i3plus.platform.common.tool.ZipTool;
 import cn.estsh.i3plus.platform.common.tool.StringTool;
+import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
@@ -80,7 +81,7 @@ public class SysUserInfoController extends CoreBaseController{
     @Autowired
     private IPersonnelService personnelService;
 
-    @Resource(name="redisRes")
+    @Resource(name= CommonConstWords.IMPP_REDIS_RES)
     private ImppRedis redisRes;
     /**
      * 添加用户信息

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

@@ -1,18 +1,24 @@
 package cn.estsh.i3plus.core.apiservice.schedulejob;
 
-import cn.estsh.i3plus.core.api.iservice.base.ISysLogService;
+import cn.estsh.i3plus.core.apiservice.serviceimpl.base.SysLogElasticSearchService;
+import cn.estsh.i3plus.core.apiservice.serviceimpl.base.SysLogMongoService;
 import cn.estsh.i3plus.platform.common.tool.TimeTool;
+import cn.estsh.i3plus.platform.common.util.CommonConstWords;
+import cn.estsh.i3plus.platform.plugin.elasticsearch.ElasticSearchTool;
+import cn.estsh.i3plus.pojo.platform.platbean.SysLogException;
+import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate;
+import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem;
+import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime;
 import cn.estsh.impp.framework.base.schedule.BaseImppScheduleJob;
 import cn.estsh.impp.framework.boot.init.ApplicationProperties;
-import com.alibaba.fastjson.JSONObject;
+import cn.estsh.impp.framework.boot.util.RedisUtilTool;
 import org.quartz.DisallowConcurrentExecution;
 import org.quartz.JobExecutionContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
-import java.util.Calendar;
 import java.util.Date;
 
 /**
@@ -22,6 +28,7 @@ import java.util.Date;
  * @CreateDate : 2019-07-04 19:13
  * @Modify:
  **/
+@Component
 @DisallowConcurrentExecution
 public class CoreLogClearJob extends BaseImppScheduleJob {
 
@@ -32,67 +39,49 @@ public class CoreLogClearJob extends BaseImppScheduleJob {
         super(CoreLogClearJob.class, "日志清除");
     }
 
-    @Value("${impp.logService.retention-time:-1}")
-    private Integer retentionTime;
-
     @Autowired
-    private ISysLogService logService;
+    private SysLogElasticSearchService elasticSearchService;
 
+    @Autowired
+    private SysLogMongoService mongoService;
 
     @Override
     public void executeImppJob(JobExecutionContext context, ApplicationProperties applicationProperties) {
-//        // 判断日志保留时间 -1 永久
+        int to = RedisUtilTool.getSysConfigIntVal(CommonConstWords.LOG_STORAGE_DAYS, CommonConstWords.LOG_STORAGE_DAYS_DEFAULT);
-//        if (getJobParam() == null) {
+        Date thisTime = new Date();
-//            return;
+        String startTime = TimeTool.getToday(TimeTool.getDateBefore(thisTime, to)) + " 00:00:00";
-//        }
+        String endTime = TimeTool.getToday(TimeTool.getDateBefore(thisTime, to)) + " 23:59:59";
-//        JSONObject clearParam = JSONObject.parseObject(getJobParam());
-//
-//        // 计算保留日期
-//        String dateTime =  TimeTool.timeCalc(new Date(), Calendar.DAY_OF_MONTH, -retentionTime,"yyyy-MM-dd HH:mm:ss");
-//        long count;
-//        // 系统日志
-//        if (clearParam.containsKey("logSystem") && clearParam.getInteger("logSystem") != -1) {
-//            dateTime =  TimeTool.timeCalc(new Date(), Calendar.DAY_OF_MONTH, -clearParam.getInteger("logSystem"),"yyyy-MM-dd HH:mm:ss");
-//            count = logService.deleteSysLogSystemByDateTimeAfter(dateTime);
-//            LOGGER.info("【日志清理】 清理系统日志 {} 条", count);
-//        }
-//
-//        // 异常日志
-//        if (clearParam.containsKey("logException") && clearParam.getInteger("logException") != -1) {
-//            dateTime =  TimeTool.timeCalc(new Date(), Calendar.DAY_OF_MONTH, -clearParam.getInteger("logException"),"yyyy-MM-dd HH:mm:ss");
-//            count = logService.deleteSysLogExceptionByDateTimeAfter(dateTime);
-//            LOGGER.info("【日志清理】 清理异常日志 {} 条", count);
-//        }
-//
-//        // 操作日志
-//        if (clearParam.containsKey("logOperate") && clearParam.getInteger("logOperate") != -1) {
-//            dateTime =  TimeTool.timeCalc(new Date(), Calendar.DAY_OF_MONTH, -clearParam.getInteger("logException"),"yyyy-MM-dd HH:mm:ss");
-//            count = logService.deleteSysLogOperateByDateTimeAfter(dateTime);
-//            LOGGER.info("【日志清理】 清理操作日志 {} 条", count);
-//        }
-//
-//        // 任务日志
-//        if (clearParam.containsKey("logTask") && clearParam.getInteger("logTask") != -1) {
-//            dateTime =  TimeTool.timeCalc(new Date(), Calendar.DAY_OF_MONTH, -clearParam.getInteger("logException"),"yyyy-MM-dd HH:mm:ss");
-//            count = logService.deleteSysLogTaskTimeByDateTimeAfter(dateTime);
-//            LOGGER.info("【日志清理】 清理定时任务日志 {} 条", count);
-//        }
-    }
 
-    public static void main(String[] args) {
+        SysLogOperate operate = new SysLogOperate();
-        JSONObject clearParam = new JSONObject();
+        operate.setCreateDatetime(startTime);
-        clearParam.put("logSystem",30);
+        operate.setCreateDateTimeStart(startTime);
-        clearParam.put("logException",30);
+        operate.setCreateDateTimeEnd(endTime);
-        clearParam.put("logOperate",30);
-        clearParam.put("logTask",30);
-        System.out.println(clearParam.toJSONString());
 
+        SysLogSystem system = new SysLogSystem();
+        system.setCreateDatetime(startTime);
+        system.setCreateDateTimeStart(startTime);
+        system.setCreateDateTimeEnd(endTime);
 
-        clearParam = JSONObject.parseObject("{\"logOperate\":10,\"logException\":10,\"logSystem\":10,\"logTask\":10}");
+        SysLogException exception = new SysLogException();
+        exception.setCreateDatetime(startTime);
+        exception.setCreateDateTimeStart(startTime);
+        exception.setCreateDateTimeEnd(endTime);
 
-        // 计算保留日期
+        SysLogTaskTime taskTime = new SysLogTaskTime();
-        String dateTime = TimeTool.pareDateToString("yyyy-MM-dd HH:mm:ss",
+        taskTime.setCreateDatetime(startTime);
-                TimeTool.timeCalc(new Date(), Calendar.DAY_OF_MONTH, 1)
+        taskTime.setCreateDateTimeStart(startTime);
-        );
+        taskTime.setCreateDateTimeEnd(endTime);
+
+        ElasticSearchTool.reload();
+        elasticSearchService.deleteLogOperate(operate);
+        elasticSearchService.deleteLogSystem(system);
+        elasticSearchService.deleteLogException(exception);
+        elasticSearchService.deleteLogTaskTime(taskTime);
+
+        mongoService.deleteLogOperate(operate);
+        mongoService.deleteLogSystem(system);
+        mongoService.deleteLogException(exception);
+        mongoService.deleteLogTaskTime(taskTime);
     }
+
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogElasticSearchService.java

@@ -13,7 +13,6 @@ import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate;
 import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem;
 import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime;
 import cn.estsh.impp.framework.boot.util.ImppLog;
-import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.search.aggregations.Aggregation;
 import org.elasticsearch.search.aggregations.bucket.terms.ParsedTerms;
 import org.elasticsearch.search.aggregations.bucket.terms.Terms;
@@ -70,6 +69,11 @@ public class SysLogElasticSearchService implements ISysLogService {
     }
 
     @Override
+    public void deleteLogException(SysLogException log) {
+        ElasticSearchTool.deleteQuery(NoSqlPack.packEsSysLogException(log));
+    }
+
+    @Override
     public ListPager<SysLogOperate> queryLogOperatePager(SysLogOperate log, Pager pager) {
         return ElasticSearchTool.searchPager(NoSqlPack.packEsSysLogOperate(log),pager,SysLogOperate.class);
     }
@@ -96,6 +100,11 @@ public class SysLogElasticSearchService implements ISysLogService {
     }
 
     @Override
+    public void deleteLogOperate(SysLogOperate log) {
+        ElasticSearchTool.deleteQuery(NoSqlPack.packEsSysLogOperate(log));
+    }
+
+    @Override
     public ListPager<SysLogSystem> queryLogSystemPager(SysLogSystem log, Pager pager) {
         return ElasticSearchTool.searchPager(NoSqlPack.packEsSysLogSystem(log),pager,SysLogSystem.class);
     }
@@ -122,6 +131,11 @@ public class SysLogElasticSearchService implements ISysLogService {
     }
 
     @Override
+    public void deleteLogSystem(SysLogSystem log) {
+        ElasticSearchTool.deleteQuery(NoSqlPack.packEsSysLogSystem(log));
+    }
+
+    @Override
     public ListPager<SysLogTaskTime> queryLogTaskTimePager(SysLogTaskTime log, Pager pager) {
         return ElasticSearchTool.searchPager(NoSqlPack.packEsSysLogTaskTime(log),pager,SysLogTaskTime.class);
     }
@@ -147,6 +161,11 @@ public class SysLogElasticSearchService implements ISysLogService {
         return ElasticSearchTool.getPrimaryKey(log.getId(),SysLogTaskTime.class);
     }
 
+    @Override
+    public void deleteLogTaskTime(SysLogTaskTime log) {
+         ElasticSearchTool.deleteQuery(NoSqlPack.packEsSysLogTaskTime(log));
+    }
+
     /******************************************************* 定时任务日志 End *********************************************************/
 
 

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogFactory.java

@@ -19,7 +19,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description :
@@ -104,6 +105,11 @@ public class SysLogFactory implements ISysLogService {
     }
 
     @Override
+    public void deleteLogException(SysLogException log) {
+        getSysLogService().deleteLogException(log);
+    }
+
+    @Override
     public ListPager<SysLogOperate> queryLogOperatePager(SysLogOperate log, Pager pager) {
         return getSysLogService().queryLogOperatePager(log,pager);
     }
@@ -129,6 +135,11 @@ public class SysLogFactory implements ISysLogService {
     }
 
     @Override
+    public void deleteLogOperate(SysLogOperate log) {
+         getSysLogService().deleteLogOperate(log);
+    }
+
+    @Override
     public ListPager<SysLogSystem> queryLogSystemPager(SysLogSystem log, Pager pager) {
         return getSysLogService().queryLogSystemPager(log,pager);
     }
@@ -154,6 +165,11 @@ public class SysLogFactory implements ISysLogService {
     }
 
     @Override
+    public void deleteLogSystem(SysLogSystem log) {
+        getSysLogService().deleteLogSystem(log);
+    }
+
+    @Override
     public ListPager<SysLogTaskTime> queryLogTaskTimePager(SysLogTaskTime log, Pager pager) {
         return getSysLogService().queryLogTaskTimePager(log,pager);
     }
@@ -178,6 +194,11 @@ public class SysLogFactory implements ISysLogService {
         return getSysLogService().getLogTaskTime(log);
     }
 
+    @Override
+    public void deleteLogTaskTime(SysLogTaskTime log) {
+         getSysLogService().deleteLogTaskTime(log);
+    }
+
     /******************************************************* 定时任务日志 End *********************************************************/
 
 

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogMongoService.java

@@ -172,6 +172,11 @@ public class SysLogMongoService implements ISysLogService {
     }
 
     @Override
+    public void deleteLogException(SysLogException log) {
+        getSysLogExceptionRepository().deleteByProperty(NoSqlPack.packMongoBySysLogException(log));
+    }
+
+    @Override
     public ListPager<SysLogOperate> queryLogOperatePager(SysLogOperate log, Pager pager) {
         Bson bson = NoSqlPack.packMongoByLogOperate(log);
         pager = PagerHelper.getPager(pager, getSysLogTaskTimeRepository().findByBsonCount(bson));
@@ -201,6 +206,11 @@ public class SysLogMongoService implements ISysLogService {
     }
 
     @Override
+    public void deleteLogOperate(SysLogOperate log) {
+        getSysLogOperateRepository().deleteByProperty(NoSqlPack.packMongoByLogOperate(log));
+    }
+
+    @Override
     public ListPager<SysLogSystem> queryLogSystemPager(SysLogSystem log, Pager pager) {
         Bson bson = NoSqlPack.packMongoByLogSystem(log);
         pager = PagerHelper.getPager(pager, getSysLogTaskTimeRepository().findByBsonCount(bson));
@@ -230,6 +240,11 @@ public class SysLogMongoService implements ISysLogService {
     }
 
     @Override
+    public void deleteLogSystem(SysLogSystem log) {
+        getSysLogSystemRepository().deleteByProperty(NoSqlPack.packMongoByLogSystem(log));
+    }
+
+    @Override
     public ListPager<SysLogTaskTime> queryLogTaskTimePager(SysLogTaskTime log, Pager pager) {
         Bson bson = NoSqlPack.packMongoByLogTaskTime(log);
         pager = PagerHelper.getPager(pager, getSysLogTaskTimeRepository().findByBsonCount(bson));
@@ -258,6 +273,11 @@ public class SysLogMongoService implements ISysLogService {
         return getSysLogTaskTimeRepository().getById(log.getId());
     }
 
+    @Override
+    public void deleteLogTaskTime(SysLogTaskTime log) {
+        getSysLogTaskTimeRepository().deleteByProperty(NoSqlPack.packMongoByLogTaskTime(log));
+    }
+
     /******************************************************* 定时任务日志 End *********************************************************/
 
 

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java

@@ -83,7 +83,7 @@ public class SystemInitService implements ISystemInitService {
         List<SysConfig> list = configRDao.findAll();
         if(list != null && list.size() > 0){
             list.forEach(config -> {
-                RedisUtilTool.setSysConfigByConfigCode(redisRes, config);
+                RedisUtilTool.setSysConfigByConfigCode(config);
             });
         }
         LOGGER.info("加载系统配置数量：【{}】",list.size());
@@ -101,12 +101,12 @@ public class SystemInitService implements ISystemInitService {
 
                 for (String key : parentCodeMap.keySet()) {
                     //存放于缓存
-                    RedisUtilTool.setSysDictionaryListByCode(redisRes, key, parentCodeMap.get(key));
+                    RedisUtilTool.setSysDictionaryListByCode(key, parentCodeMap.get(key));
                 }
 
                 for (long key : parentIdMap.keySet()) {
                     putDataToCache(CommonConstWords.REDIS_PREFIX_CACHE_DICTIONARY + ":" + key, parentIdMap.get(key),Object.class);
-                    RedisUtilTool.setSysDictionaryListByParentId(redisRes,key,parentIdMap.get(key));
+                    RedisUtilTool.setSysDictionaryListByParentId(key,parentIdMap.get(key));
                 }
             }
         }catch (Exception e){

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java

@@ -609,7 +609,7 @@ public class SysUserService implements ISysUserService {
 
     @Override
     public SessionUser packPageSessionUser(SessionUser sessionUser, SysUser user) {
-        SysConfig configPageList = RedisUtilTool.getSysConfigByConfigCode(redisRes, CommonConstWords.CONFIG_PAGE_SIZE_LIST);
+        SysConfig configPageList = RedisUtilTool.getSysConfigByConfigCode(CommonConstWords.CONFIG_PAGE_SIZE_LIST);
         try {
             if(configPageList != null && StringUtils.isNotBlank(configPageList.getConfigValue())){
                 String[] split = configPageList.getConfigValue().split(",");
@@ -623,7 +623,7 @@ public class SysUserService implements ISysUserService {
             sessionUser.setPageSizeArray(CommonConstWords.CONFIG_PAGE_SIZE_LIST_DEFAULT);
         }
 
-        SysConfig configPageSize = RedisUtilTool.getSysConfigByConfigCode(redisRes, CommonConstWords.CONFIG_PAGE_DEFAULT_SIZE);
+        SysConfig configPageSize = RedisUtilTool.getSysConfigByConfigCode(CommonConstWords.CONFIG_PAGE_DEFAULT_SIZE);
         try {
             if(configPageSize != null && StringUtils.isNotBlank(configPageSize.getConfigValue())){
                 sessionUser.setPageDefaultSize(Integer.parseInt(configPageSize.getConfigValue()));

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SystemResourceService.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.ISystemResourceService;
+import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
@@ -32,7 +33,7 @@ import java.util.Map;
 @Service
 public class SystemResourceService implements ISystemResourceService {
 
-    @Resource(name="redisRes")
+    @Resource(name= CommonConstWords.IMPP_REDIS_RES)
     private ImppRedis redisRes;
 
     @Autowired

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

@@ -57,7 +57,7 @@ public class NoSqlPack {
 
         bson = BsonPackTool.getNumEqualPack(sysLogException.getExcModule(), "excModule", bson);
         bson = BsonPackTool.getStringLikerPack(sysLogException.getExcMessage(), "excMessage", bson);
-        bson = BsonPackTool.timeBuilder(sysLogException.getCreateDatetime(), "createDatetime", bson, false, false);
+        bson = BsonPackTool.timeBuilder("createDatetime", bson, sysLogException.getCreateDateTimeStart(),sysLogException.getCreateDateTimeEnd());
 
         return bson;
     }
@@ -84,7 +84,7 @@ public class NoSqlPack {
         bson = BsonPackTool.getNumEqualPack(logOperate.getId(), "id", bson);
         bson = BsonPackTool.getNumEqualPack(logOperate.getOperateType(), "operateType", bson);
         bson = BsonPackTool.getNumEqualPack(logOperate.getOperateModule(), "operateModule", bson);
-        bson = BsonPackTool.timeBuilder(logOperate.getCreateDatetime(), "createDatetime", bson, false, false);
+        bson = BsonPackTool.timeBuilder("createDatetime", bson, logOperate.getCreateDateTimeStart(),logOperate.getCreateDateTimeEnd());
         bson = BsonPackTool.getStringLikerPack(logOperate.getRemoteIp(), "remoteIp", bson);
         bson = BsonPackTool.getStringLikerPack(logOperate.getOperateMessage(), "operateMessage", bson);
         bson = BsonPackTool.getStringLikerPack(logOperate.getCreateUser(), "createUser", bson);
@@ -118,7 +118,7 @@ public class NoSqlPack {
         bson = BsonPackTool.getNumEqualPack(logSystem.getId(), "id", bson);
         bson = BsonPackTool.getNumEqualPack(logSystem.getLogLevel(), "logLevel", bson);
         bson = BsonPackTool.getNumEqualPack(logSystem.getLogModuleId(), "logModuleId", bson);
-        bson = BsonPackTool.timeBuilder(logSystem.getCreateDatetime(), "createDatetime", bson, false, false);
+        bson = BsonPackTool.timeBuilder("createDatetime", bson, logSystem.getCreateDateTimeStart(),logSystem.getCreateDateTimeEnd());
         bson = BsonPackTool.getStringLikerPack(logSystem.getRemoteIp(), "remoteIp", bson);
         bson = BsonPackTool.getStringLikerPack(logSystem.getRequestUrl(), "requestUrl", bson);
         bson = BsonPackTool.getStringLikerPack(logSystem.getLogMethod(), "logMethod", bson);
@@ -151,7 +151,7 @@ public class NoSqlPack {
         bson = BsonPackTool.getNumEqualPack(sysLogTaskTime.getId(), "id", bson);
         bson = BsonPackTool.getStringLikerPack(sysLogTaskTime.getName(), "name", bson);
         bson = BsonPackTool.getStringLikerPack(sysLogTaskTime.getGroupName(), "groupName", bson);
-        bson = BsonPackTool.timeBuilder(sysLogTaskTime.getCreateDatetime(), "createDatetime", bson, false, false);
+        bson = BsonPackTool.timeBuilder("createDatetime", bson, sysLogTaskTime.getCreateDateTimeStart(),sysLogTaskTime.getCreateDateTimeEnd());
 
         return bson;
     }

modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysLocaleResourceService.java

@@ -3,6 +3,7 @@ package test.cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysLocaleResourceService;
 import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestBase;
 import cn.estsh.i3plus.platform.common.tool.ExcelTool;
+import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource;
 import cn.estsh.impp.framework.boot.util.ImppRedis;
 import org.junit.Test;
@@ -29,7 +30,7 @@ public class TestSysLocaleResourceService extends TestBase {
     @Autowired
     private EntityManager entityManager;
 
-    @Resource(name = "redisRes")
+    @Resource(name = CommonConstWords.IMPP_REDIS_RES)
     private ImppRedis redisRes;
 
 

modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/util/ExcelReadData.java

@@ -1,6 +1,7 @@
 package test.cn.estsh.i3plus.core.apiservice.util;
 
 import cn.estsh.i3plus.platform.common.tool.ExcelTool;
+import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
 import cn.estsh.impp.framework.boot.util.ImppRedis;
 import com.alibaba.fastjson.JSON;
@@ -29,7 +30,7 @@ public class ExcelReadData {
 
     private static ImppRedis redisRes;
 
-    @Resource(name = "redisRes")
+    @Resource(name = CommonConstWords.IMPP_REDIS_RES)
     public void setRedisRes(ImppRedis redisRes) {
         this.redisRes = redisRes;
     }

modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/util/JavaTest.java

@@ -2,6 +2,7 @@ package test.cn.estsh.i3plus.core.apiservice.util;
 
 import cn.estsh.i3plus.platform.common.tool.ExcelTool;
 import cn.estsh.i3plus.platform.common.tool.StringTool;
+import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
 import cn.estsh.impp.framework.boot.util.ImppRedis;
 import lombok.Data;
@@ -945,7 +946,7 @@ public class JavaTest {
 
     private static ImppRedis redisRes;
 
-    @Resource(name = "redisRes")
+    @Resource(name = CommonConstWords.IMPP_REDIS_RES)
     public void setRedisRes(ImppRedis redisRes) {
         this.redisRes = redisRes;
     }

modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/util/TestExcelUtil.java

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.util;
 
 import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestBase;
 import cn.estsh.i3plus.platform.common.tool.ExcelTool;
+import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.SysTool;
 import cn.estsh.impp.framework.boot.util.ImppRedis;
@@ -37,7 +38,7 @@ public class TestExcelUtil extends TestBase {
     @Autowired
     private EntityManager entityManager;
 
-    @Resource(name = "redisRes")
+    @Resource(name = CommonConstWords.IMPP_REDIS_RES)
     private ImppRedis redisRes;
 
     @Test