Merge remote-tracking branch 'origin/master' into master

blade-service/blade-manager/src/main/java/org/springblade/manager/utils/RegularExpressionUtil.java

@@ -4,41 +4,38 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
- * 正则表达式工具类
+ * 正则表达式
  */
 public class RegularExpressionUtil {
 
     //正、负整数
-    String POSITIVE_NEGTIVE_INTEGER = "-?[1-9]\\d*";
+    private static final String POSITIVE_NEGTIVE_INTEGER = "-?[1-9]*$";
     //正、负浮点数
-    String POSITIVE_NEGTIVE_FLOAT = "-?([1-9]\\d*.\\d*|0\\.\\d*[1-9]\\d*)";
-    //日期 yyyy MM dd
-    String DATE_TIME = "^\\d{4}-\\d{1,2}-\\d{1,2}";
+    private static final String POSITIVE_NEGTIVE_FLOAT = "^-?((([0-9]+\\.[0-9]*[1-9][0-9]*)|([0-9]*[1-9][0-9]*\\.[0-9]+)|([0-9]*[1-9][0-9]*)))$";
+    //日期 yyyy-MM-dd
+    private static final String DATE_TIME = "^[1-2][0-9][0-9][0-9]-[0-1]{0,1}[0-9]-[0-3]{0,1}[0-9]$";
 
     public static String getRegularExpression(String filedType) {
-        RegularExpressionUtil obj = new RegularExpressionUtil();
-        switch (filedType) {
-            case "bigint":
-                return obj.POSITIVE_NEGTIVE_INTEGER;
-                //return obj.POSITIVE_NEGTIVE_INTEGER.replaceAll("\\\\\\\\", "\\\\");
-            case "decimal":
-                return obj.POSITIVE_NEGTIVE_FLOAT;
-                //return obj.POSITIVE_NEGTIVE_FLOAT.replaceAll("\\\\\\\\", "\\\\");
-            case "datetime":
-                return obj.DATE_TIME;
-                //return obj.DATE_TIME.replaceAll("\\\\\\\\", "\\\\");
+        if (filedType != null) {
+            switch (filedType) {
+                case "bigint":
+                    return POSITIVE_NEGTIVE_INTEGER;
+                case "decimal":
+                    return POSITIVE_NEGTIVE_FLOAT;
+                case "datetime":
+                    return DATE_TIME;
+            }
         }
         return "";
     }
 
     /*public static void main(String[] args) {
-        *//*String str = "datetime";
-        System.out.println(getRegularExpression(str));
-        *//*
-        String str = "2020-01-01";
-        String pattern = "^\\d{4}-\\d{1,2}-\\d{1,2}";
-
-        Pattern r = Pattern.compile(pattern);
+        String str = "-5465465465465546";
+        String pattern1 = "^-?([1-9]\\d\\*\\.\\d\\*|0\\.\\d\\*[1-9]\\d\\*|0?\\.0+|0)$";
+        String pattern2 = "^(-?\\d+)(\\.\\d+)?$";
+        String pattern3 = "^[1-2][0-9][0-9][0-9]-[0-1]{0,1}[0-9]-[0-3]{0,1}[0-9]$";
+        String pattern4 = "^-?((([0-9]+\\.[0-9]*[1-9][0-9]*)|([0-9]*[1-9][0-9]*\\.[0-9]+)|([0-9]*[1-9][0-9]*)))$";
+        Pattern r = Pattern.compile(POSITIVE_NEGTIVE_INTEGER);
         Matcher m = r.matcher(str);
         System.out.println(m.matches());
     }*/

blade-service/blade-manager/src/main/java/org/springblade/manager/utils/WbsElementUtil.java

@@ -199,11 +199,11 @@ public class WbsElementUtil {
         if (type != null) {
             switch (type) {
                 case "bigint":
-                    return "请输入0-9整数数值";
+                    return "请输入整数数值，格式0-9数字";
                 case "decimal":
-                    return "请输入小数";
+                    return "请输入小数，格式0.0";
                 case "datetime":
-                    return "请输入日期";
+                    return "请输入日期，格式yyyy-MM-dd";
                 default:
                     return "请输入字符串";
             }

blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java

@@ -377,4 +377,24 @@ public class UserController {
         return R.success("操作成功");
     }
 
+    /**
+     * 账号封禁
+     */
+    @PostMapping("/lock")
+    @ApiOperationSupport(order = 20)
+    @ApiOperation(value = "账号封禁", notes = "传入ids")
+    public R lock(String userIds) {
+        if (StringUtil.isBlank(userIds)) {
+            return R.fail("请至少选择一个用户");
+        }
+        //获取用户list
+        List<User> userList = userService.list(Wrappers.<User>lambdaQuery().in(User::getId, Func.toLongList(userIds)));
+        //修改status状态
+        for (User user : userList) {
+            user.setStatus(0);
+            userService.updateUser(user);
+        }
+        return R.success("操作成功");
+    }
+
 }