日志

src/main/java/com/chenyang/nse/bussiness/controller/aop/DesensitizationStrategyLogController.java

@@ -60,9 +60,9 @@ public class DesensitizationStrategyLogController {
     @PostMapping({"/checkEnc"})
     @CrossOrigin
     public Response checkEnc(@RequestBody Map<String, Object> vo) {
-        String module = vo.get("module").toString();
-        String range = vo.get("range").toString();
-        String user = vo.get("user").toString();
+        String module = vo.get("module") == null ? "" : vo.get("module").toString();
+        String range = vo.get("range") == null ? "" : vo.get("range").toString();
+        String user = vo.get("user") == null ? "" : vo.get("user").toString();
         String projectId = "";
         if (null != vo.get("projectId")) {
             projectId = vo.get("projectId").toString();
@@ -76,9 +76,9 @@ public class DesensitizationStrategyLogController {
     @PostMapping({"/getdesensitizationStrategyLog"})
     @CrossOrigin
     public Response getdesensitizationStrategyLog(@RequestBody Map<String, Object> vo, HttpServletRequest request, HttpServletResponse response) {
-        String module = vo.get("module").toString();
-        String range = vo.get("range").toString();
-        String user = vo.get("user").toString();
+       String module = vo.get("module") == null ? "" : vo.get("module").toString();
+        String range = vo.get("range") == null ? "" : vo.get("range").toString();
+        String user = vo.get("user") == null ? "" : vo.get("user").toString();
         String projectId = "";
         if (null != vo.get("projectId")) {
             projectId = vo.get("projectId").toString();

src/main/java/com/chenyang/nse/bussiness/controller/aop/EncryptLogController.java

@@ -95,8 +95,8 @@ public class EncryptLogController {
          projectId = vo.get("projectId").toString();
       }
 
-      String module = vo.get("module").toString();
-      String range = vo.get("range").toString();
+   String module = vo.get("module") == null ? "" : vo.get("module").toString();
+   String range = vo.get("range") == null ? "" : vo.get("range").toString();
       String user = "";
       if (null != vo.get("user")) {
          user = vo.get("user").toString();

src/main/java/com/chenyang/nse/bussiness/service/console/impl/DesensitizationStrategyLogImpl.java

@@ -67,61 +67,40 @@ public List<DesensitizationStrategyLogVO> queryRow(PageInfo pageInfo, String mod
 }
 
   public List<Map<String, Object>> queryList(String module, String range, String user, String projectId) {
-      Criterion moduleCon;
-      if (module != null && !"".equals(module)) {
-         moduleCon = Restrictions.eq("operModule", module);
-      } else {
-         moduleCon = Restrictions.like("operModule", "%%");
-      }
+       List<Criterion> criteria = new ArrayList<>();
 
-      Criterion userCon;
-      if (user != null && !"".equals(user)) {
-         userCon = Restrictions.eq("createuser", user);
-      } else {
-         userCon = Restrictions.like("createuser", "%%");
+       if (module != null && !module.isEmpty()) {
+           criteria.add(Restrictions.eq("operModule", module));
+       }
+       if (user != null && !user.isEmpty()) {
+           criteria.add(Restrictions.eq("createuser", user));
        }
-
        Date today = new Date();
-      List<TCoreDesensitizationStrategyLog> logList;
-      if (range != null && !"".equals(range)) {
+       if (range != null && !range.isEmpty()) {
            if (!"0".equals(range)) {
                if (!"全部".equals(range)) {
-               Criterion timeCon = Restrictions.between("createtime", DateTimeTool.beforeDays(today, Integer.valueOf(range)), today);
-               if (null != projectId && !"".equals(projectId.trim())) {
-                  logList = this.tCoreDesensitizationStrategyLogDao.queryAll(Order.desc("createtime"), new Criterion[]{moduleCon, timeCon, userCon, Restrictions.eq("projectId", projectId)});
-               } else {
-                  logList = this.tCoreDesensitizationStrategyLogDao.queryAll(Order.desc("createtime"), new Criterion[]{moduleCon, timeCon, userCon});
+                   criteria.add(Restrictions.between("createtime", DateTimeTool.beforeDays(today, Integer.valueOf(range)), today));
                }
-            } else if (null != projectId && !"".equals(projectId.trim())) {
-               logList = this.tCoreDesensitizationStrategyLogDao.queryAll(Order.desc("createtime"), new Criterion[]{moduleCon, userCon, Restrictions.eq("projectId", projectId)});
            } else {
-               logList = this.tCoreDesensitizationStrategyLogDao.queryAll(Order.desc("createtime"), new Criterion[]{moduleCon, userCon});
-            }
-         } else {
-            Criterion timeCon = Restrictions.ge("createtime", DateTimeTool.dayOfStart(today));
-            if (null != projectId && !"".equals(projectId.trim())) {
-               logList = this.tCoreDesensitizationStrategyLogDao.queryAll(Order.desc("createtime"), new Criterion[]{moduleCon, timeCon, userCon, Restrictions.eq("projectId", projectId)});
-            } else {
-               logList = this.tCoreDesensitizationStrategyLogDao.queryAll(Order.desc("createtime"), new Criterion[]{moduleCon, timeCon, userCon});
+               criteria.add(Restrictions.ge("createtime", DateTimeTool.dayOfStart(today)));
            }
        }
-      } else if (null != projectId && !"".equals(projectId.trim())) {
-         logList = this.tCoreDesensitizationStrategyLogDao.queryAll(Order.desc("createtime"), new Criterion[]{moduleCon, userCon, Restrictions.eq("projectId", projectId)});
-      } else {
-         logList = this.tCoreDesensitizationStrategyLogDao.queryAll(Order.desc("createtime"), new Criterion[]{moduleCon, userCon});
+       if (projectId != null && !projectId.trim().isEmpty()) {
+           criteria.add(Restrictions.eq("projectId", projectId));
        }
 
-      List<Map<String, Object>> mapList = new ArrayList();
+       List<TCoreDesensitizationStrategyLog> logList = tCoreDesensitizationStrategyLogDao.queryAll(
+               Order.desc("createtime"), criteria.toArray(new Criterion[0]));
 
-      for(TCoreDesensitizationStrategyLog encryptionLogVo : logList) {
-         Map<String, Object> resultMap = new HashMap();
+       List<Map<String, Object>> mapList = new ArrayList<>();
+       for (TCoreDesensitizationStrategyLog encryptionLogVo : logList) {
+           Map<String, Object> resultMap = new HashMap<>();
            resultMap.put("用户", encryptionLogVo.getCreateuser());
            resultMap.put("时间", encryptionLogVo.getCreatetime());
            resultMap.put("操作代码", encryptionLogVo.getCode());
            resultMap.put("操作信息", encryptionLogVo.getOperationMassage());
            mapList.add(resultMap);
        }
-
        return mapList;
    }