diff --git a/casic-server/src/main/java/com/casic/missiles/modular/aspect/FrontLogAspect.java b/casic-server/src/main/java/com/casic/missiles/modular/aspect/FrontLogAspect.java index dbe37a4..1008a98 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/aspect/FrontLogAspect.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/aspect/FrontLogAspect.java @@ -1,10 +1,8 @@ package com.casic.missiles.modular.aspect; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.casic.missiles.model.response.ResponseData; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.exception.ExceptionUtils; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; @@ -55,13 +53,13 @@ args = ""; } } - log.info("ThreadID:{},MethodName:{},RequestURI:{},Param:{},url:{}", - Thread.currentThread().getId(), - classTarget.getName() + "." + methodName, request.getRequestURI(), JSONObject.toJSONString(args), request.getRequestURI()); +// log.info("ThreadID:{},MethodName:{},RequestURI:{},Param:{},url:{}", +// Thread.currentThread().getId(), +// classTarget.getName() + "." + methodName, request.getRequestURI(), JSONObject.toJSONString(args), request.getRequestURI()); result = joinPoint.proceed(); long duration = System.currentTimeMillis() - start; - log.info("ThreadID:{},MethodName:{},Response:{},TimeCost:{},url:{}", - Thread.currentThread().getId(), classTarget.getName() + "." + methodName, JSONObject.toJSONString(result), duration + "ms", request.getRequestURI()); +// log.info("ThreadID:{},MethodName:{},Response:{},TimeCost:{},url:{}", +// Thread.currentThread().getId(), classTarget.getName() + "." + methodName, JSONObject.toJSONString(result), duration + "ms", request.getRequestURI()); return result; } catch (Throwable e) { @@ -71,8 +69,8 @@ } long duration = System.currentTimeMillis() - start; result = ResponseData.error("系统异常"); - log.error("ThreadID:{},MethodName:{},Exception:{},Response:{}, TimeCost:{},url:{}", - Thread.currentThread().getId(), classTarget.getName() + "." + methodName, ExceptionUtils.getStackTrace(e), result, duration + "ms", request.getRequestURI()); +// log.error("ThreadID:{},MethodName:{},Exception:{},Response:{}, TimeCost:{},url:{}", +// Thread.currentThread().getId(), classTarget.getName() + "." + methodName, ExceptionUtils.getStackTrace(e), result, duration + "ms", request.getRequestURI()); return result; } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/aspect/FrontLogAspect.java b/casic-server/src/main/java/com/casic/missiles/modular/aspect/FrontLogAspect.java index dbe37a4..1008a98 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/aspect/FrontLogAspect.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/aspect/FrontLogAspect.java @@ -1,10 +1,8 @@ package com.casic.missiles.modular.aspect; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.casic.missiles.model.response.ResponseData; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.exception.ExceptionUtils; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; @@ -55,13 +53,13 @@ args = ""; } } - log.info("ThreadID:{},MethodName:{},RequestURI:{},Param:{},url:{}", - Thread.currentThread().getId(), - classTarget.getName() + "." + methodName, request.getRequestURI(), JSONObject.toJSONString(args), request.getRequestURI()); +// log.info("ThreadID:{},MethodName:{},RequestURI:{},Param:{},url:{}", +// Thread.currentThread().getId(), +// classTarget.getName() + "." + methodName, request.getRequestURI(), JSONObject.toJSONString(args), request.getRequestURI()); result = joinPoint.proceed(); long duration = System.currentTimeMillis() - start; - log.info("ThreadID:{},MethodName:{},Response:{},TimeCost:{},url:{}", - Thread.currentThread().getId(), classTarget.getName() + "." + methodName, JSONObject.toJSONString(result), duration + "ms", request.getRequestURI()); +// log.info("ThreadID:{},MethodName:{},Response:{},TimeCost:{},url:{}", +// Thread.currentThread().getId(), classTarget.getName() + "." + methodName, JSONObject.toJSONString(result), duration + "ms", request.getRequestURI()); return result; } catch (Throwable e) { @@ -71,8 +69,8 @@ } long duration = System.currentTimeMillis() - start; result = ResponseData.error("系统异常"); - log.error("ThreadID:{},MethodName:{},Exception:{},Response:{}, TimeCost:{},url:{}", - Thread.currentThread().getId(), classTarget.getName() + "." + methodName, ExceptionUtils.getStackTrace(e), result, duration + "ms", request.getRequestURI()); +// log.error("ThreadID:{},MethodName:{},Exception:{},Response:{}, TimeCost:{},url:{}", +// Thread.currentThread().getId(), classTarget.getName() + "." + methodName, ExceptionUtils.getStackTrace(e), result, duration + "ms", request.getRequestURI()); return result; } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/config/PositionPrivilegeInitCache.java b/casic-server/src/main/java/com/casic/missiles/modular/config/PositionPrivilegeInitCache.java index 2a69218..1f06b15 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/config/PositionPrivilegeInitCache.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/config/PositionPrivilegeInitCache.java @@ -38,7 +38,7 @@ String resultStr = HikUtil.hikApi(HikUri.PRIVILEGE_GROUP, body); JSONObject resultJson = (JSONObject)JSONObject.parse(resultStr); if(!"0".equals(resultJson.get("code"))){ - log.error("项目启动初始化,请求海康,查询访客权限组失败,海康response:{}", resultStr); +// log.error("项目启动初始化,请求海康,查询访客权限组失败,海康response:{}", resultStr); //失败再请求2次 for (int i = 0; i < 2; i++) { resultStr = HikUtil.hikApi(HikUri.PRIVILEGE_GROUP, body); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/aspect/FrontLogAspect.java b/casic-server/src/main/java/com/casic/missiles/modular/aspect/FrontLogAspect.java index dbe37a4..1008a98 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/aspect/FrontLogAspect.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/aspect/FrontLogAspect.java @@ -1,10 +1,8 @@ package com.casic.missiles.modular.aspect; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.casic.missiles.model.response.ResponseData; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.exception.ExceptionUtils; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; @@ -55,13 +53,13 @@ args = ""; } } - log.info("ThreadID:{},MethodName:{},RequestURI:{},Param:{},url:{}", - Thread.currentThread().getId(), - classTarget.getName() + "." + methodName, request.getRequestURI(), JSONObject.toJSONString(args), request.getRequestURI()); +// log.info("ThreadID:{},MethodName:{},RequestURI:{},Param:{},url:{}", +// Thread.currentThread().getId(), +// classTarget.getName() + "." + methodName, request.getRequestURI(), JSONObject.toJSONString(args), request.getRequestURI()); result = joinPoint.proceed(); long duration = System.currentTimeMillis() - start; - log.info("ThreadID:{},MethodName:{},Response:{},TimeCost:{},url:{}", - Thread.currentThread().getId(), classTarget.getName() + "." + methodName, JSONObject.toJSONString(result), duration + "ms", request.getRequestURI()); +// log.info("ThreadID:{},MethodName:{},Response:{},TimeCost:{},url:{}", +// Thread.currentThread().getId(), classTarget.getName() + "." + methodName, JSONObject.toJSONString(result), duration + "ms", request.getRequestURI()); return result; } catch (Throwable e) { @@ -71,8 +69,8 @@ } long duration = System.currentTimeMillis() - start; result = ResponseData.error("系统异常"); - log.error("ThreadID:{},MethodName:{},Exception:{},Response:{}, TimeCost:{},url:{}", - Thread.currentThread().getId(), classTarget.getName() + "." + methodName, ExceptionUtils.getStackTrace(e), result, duration + "ms", request.getRequestURI()); +// log.error("ThreadID:{},MethodName:{},Exception:{},Response:{}, TimeCost:{},url:{}", +// Thread.currentThread().getId(), classTarget.getName() + "." + methodName, ExceptionUtils.getStackTrace(e), result, duration + "ms", request.getRequestURI()); return result; } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/config/PositionPrivilegeInitCache.java b/casic-server/src/main/java/com/casic/missiles/modular/config/PositionPrivilegeInitCache.java index 2a69218..1f06b15 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/config/PositionPrivilegeInitCache.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/config/PositionPrivilegeInitCache.java @@ -38,7 +38,7 @@ String resultStr = HikUtil.hikApi(HikUri.PRIVILEGE_GROUP, body); JSONObject resultJson = (JSONObject)JSONObject.parse(resultStr); if(!"0".equals(resultJson.get("code"))){ - log.error("项目启动初始化,请求海康,查询访客权限组失败,海康response:{}", resultStr); +// log.error("项目启动初始化,请求海康,查询访客权限组失败,海康response:{}", resultStr); //失败再请求2次 for (int i = 0; i < 2; i++) { resultStr = HikUtil.hikApi(HikUri.PRIVILEGE_GROUP, body); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/service/impl/PropertyManageServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/service/impl/PropertyManageServiceImpl.java index 1225895..58c848e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/service/impl/PropertyManageServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/service/impl/PropertyManageServiceImpl.java @@ -1001,6 +1001,7 @@ map.put("score", BigDecimal.valueOf(100 * onDutyWeight).add(BigDecimal.valueOf(100 * levelAssessWeight)).setScale(2, BigDecimal.ROUND_HALF_UP).stripTrailingZeros().toPlainString()); } } + resultList.add(map); } else if (Objects.isNull(onDutyMap.get(date)) && Objects.isNull(levelAssessMap.get(date))) { //该日期2个都空 map.put("score", "100");