Browse Source

1111222333

xusl 1 year ago
parent
commit
6182eda350

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/controller/IpBlacklistController.java

@@ -42,7 +42,7 @@ public class IpBlacklistController {
      */
      */
     @GetMapping(value = "/getAll")
     @GetMapping(value = "/getAll")
     @PreAuthorize("@ss.hasPermi('system:ipblacklist:list')")
     @PreAuthorize("@ss.hasPermi('system:ipblacklist:list')")
-    @OperateLog(title = "短期预测", businessType = BusinessType.QUERY, auditType = AuditType.SYS,operdesc = "查询黑名单列表")
+    @OperateLog(title = "黑名单管理", businessType = BusinessType.QUERY, auditType = AuditType.SYS,operdesc = "查询黑名单列表")
     @PreventReplay
     @PreventReplay
     public ResponseVO getAll(String currentPage, String pageSize, String ip) throws CustomException {
     public ResponseVO getAll(String currentPage, String pageSize, String ip) throws CustomException {
         try {
         try {

+ 3 - 1
backend/src/main/java/com/jiayue/ssi/filter/JwtAuthenticationTokenFilter.java

@@ -188,7 +188,9 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
                         // 请求的地址
                         // 请求的地址
                         String ip = IPUtils.getIpAddr();
                         String ip = IPUtils.getIpAddr();
                         operLog.setOperIp(ip);
                         operLog.setOperIp(ip);
-                        operLog.setOperUrl(org.apache.commons.lang3.StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255));
+                        String operUrl = org.apache.commons.lang3.StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255);
+                        operLog.setOperUrl(operUrl);
+                        operLog.setOperatorType(1);
                         operLog.setOperName(username);
                         operLog.setOperName(username);
                         // 设置请求方式
                         // 设置请求方式
                         operLog.setRequestMethod(ServletUtils.getRequest().getMethod());
                         operLog.setRequestMethod(ServletUtils.getRequest().getMethod());

+ 1 - 1
ui/src/views/bizManager/electricField/index.vue

@@ -140,7 +140,7 @@ export default {
         ],
         ],
         capacity: [
         capacity: [
           {required: true, message: '请正确填写装机容量'},
           {required: true, message: '请正确填写装机容量'},
-          {pattern: /^\d+(\.\d{0,2})?$/, message: '只能输入正数数字或带两位小数的数字'}
+          {pattern: /^\d{0,4}(?:\.\d{0,2})?$/, message: '最多4位整数,小数部分最多2位'}
           // {message: '输入过长', max: 10}
           // {message: '输入过长', max: 10}
         ],
         ],
         gridce: [
         gridce: [

+ 1 - 1
ui/src/views/sysManager/sysPolicy/index.vue

@@ -151,7 +151,7 @@ export default {
       ],
       ],
       auditableEventList: [
       auditableEventList: [
         {value: '0', label: '不审计NWP预测查询'},
         {value: '0', label: '不审计NWP预测查询'},
-        {value: '1', label: '不审计DQ预测查询'}
+        {value: '1', label: '不审计短期预测查询'}
       ],
       ],
       form: {
       form: {
         loginFails: '',
         loginFails: '',