From 039abee6b27058ca46b1e1e82aa0b5407a5dad44 Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期一, 28 七月 2025 15:25:26 +0800 Subject: [PATCH] 优化 和修改bug --- springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/aspectj/OperLogAspect.java | 18 +++++++----------- 1 files changed, 7 insertions(+), 11 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/aspectj/OperLogAspect.java b/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/aspectj/OperLogAspect.java index 6a3fdda..0c13149 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/aspectj/OperLogAspect.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/aspectj/OperLogAspect.java @@ -1,8 +1,9 @@ package com.panzhihua.westcommittee.aspectj; +import cn.hutool.crypto.SecureUtil; import com.alibaba.fastjson.JSONObject; import com.panzhihua.common.controller.BaseController; -import com.panzhihua.common.model.vos.sangeshenbian.SystemUserVo; +import com.panzhihua.common.model.vos.west.SystemUserVo; import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.westcommittee.annotation.SysLog; import com.panzhihua.westcommittee.model.entity.*; @@ -11,6 +12,8 @@ import com.panzhihua.westcommittee.warpper.EditSystemRole; import com.panzhihua.westcommittee.warpper.PartyMemberDTO; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.codec.digest.Md5Crypt; +import org.apache.tomcat.util.security.MD5Encoder; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.Aspect; @@ -131,20 +134,14 @@ // 拿到返回原来的数据 JSONObject configData = jsonResult.getJSONObject("data"); String targetName=""; - // 判断是否修改了诉求处理时间 - if(workOrderItemConfig.getDemandProcessingTime()!=configData.getInteger("demandProcessingTime")){ - targetName += "修改诉求处理时间、"; - } // 判断是否修改了市级账号诉求处理时间 - if(workOrderItemConfig.getCityHandlingTime()!=configData.getInteger("cityHandlingTime") - || workOrderItemConfig.getDistrictHandlingTime()!=configData.getInteger("districtHandlingTime") + if( workOrderItemConfig.getDistrictHandlingTime()!=configData.getInteger("districtHandlingTime") || workOrderItemConfig.getStreetHandlingTime()!=configData.getInteger("streetHandlingTime") || workOrderItemConfig.getCommunityHandlingTime()!=configData.getInteger("communityHandlingTime") - || workOrderItemConfig.getPartyMemberHandlingTime()!=configData.getInteger("partyMemberHandlingTime")){ + ){ targetName += "修改处理超时时间、"; } - if(workOrderItemConfig.getCityDeadlineReminder()!=configData.getInteger("cityDeadlineReminder") - || workOrderItemConfig.getDistrictDeadlineReminder()!=configData.getInteger("districtDeadlineReminder") + if( workOrderItemConfig.getDistrictDeadlineReminder()!=configData.getInteger("districtDeadlineReminder") || workOrderItemConfig.getStreetDeadlineReminder()!=configData.getInteger("streetDeadlineReminder") || workOrderItemConfig.getCommunityDeadlineReminder()!=configData.getInteger("communityDeadlineReminder") ){ @@ -269,6 +266,5 @@ e.printStackTrace(); } } - } \ No newline at end of file -- Gitblit v1.7.1