修改值班管理日志注解

hzims-biz-common/src/main/java/com/hnac/hzims/common/logs/aop/SysLogAspect.java

@@ -7,6 +7,7 @@ import com.hnac.hzims.common.logs.consumer.SysLogQueue;
 import com.hnac.hzims.common.logs.to.SysLogTo;
 import com.hnac.hzims.common.logs.enums.BusinessStatus;
 import com.hnac.hzims.common.logs.utils.StringUtils;
+import com.hnac.hzims.common.logs.utils.WebIpUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.*;
@@ -226,7 +227,7 @@ public class SysLogAspect {
                     sysLog.setOperationUserName(userName);
                     sysLog.setOperationUserId(userId);
                     sysLog.setTenantId(Func.toStr(AuthUtil.getTenantId(), BladeConstant.ADMIN_TENANT_ID));
-                    sysLog.setLocalIp(WebUtil.getIP(request));// 请求IP
+                    sysLog.setLocalIp(WebIpUtils.getIpAddr(request));// 请求IP
                     // if (stopWatch.isRunning()) {
                     //     stopWatch.stop();
                     // }

hzims-biz-common/src/main/java/com/hnac/hzims/common/logs/utils/WebIpUtils.java

@@ -0,0 +1,29 @@
+package com.hnac.hzims.common.logs.utils;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/7/26 11:34
+ */
+public class WebIpUtils {
+
+    public static String getIpAddr(HttpServletRequest request) {
+        String ip = request.getHeader("x-forwarded-for");
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("Proxy-Client-IP");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("WL-Proxy-Client-IP");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getRemoteAddr();
+        }
+        if (!(null == ip || "".equals(ip.trim()) || "null".equalsIgnoreCase(ip.trim())) && ip.contains(",")) {
+            ip = ip.split(",")[0];
+        }
+        return ip;
+    }
+}

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/DangerSourceController.java

@@ -85,7 +85,7 @@ public class DangerSourceController extends BladeController {
 	@ApiOperation(value = "分页", notes = "查询条件：eqId,level,`dangerEle,applyType,type")
 	@OperationAnnotation(moduleName = "安全管理",title = "危险点列表",operatorType = OperatorType.MOBILE,businessType =
 			BusinessType.GENCODE,
-			action = "分页查询危险点列表列表")
+			action = "分页查询危险点列表")
 	public R<IPage<DangerSourceVO>> list(DangerSourceEntity req, Query query) {
 		return dangerSourceService.pageCondition(req, query);
 	}