修改驼峰

webapidemo-api/src/main/java/com/example/controller/HomeController.java

@@ -66,7 +66,7 @@ public class HomeController extends BaseController {
     @ApiOperation("登录")
     @PostMapping("/login")
     public AjaxResult Login(@RequestBody LoginInput input) {
-        if (input == null || StringHelper.isEmpty(input.getUsername()) || StringHelper.isEmpty(input.getPassword()) || StringHelper.isEmpty(input.getCode())) {
+        if (input == null || StringHelper.isEmpty(input.getUserName()) || StringHelper.isEmpty(input.getPassword()) || StringHelper.isEmpty(input.getCode())) {
             return Error("请输入账号、密码、验证码");
         }
         if (StringHelper.isEmpty(input.getUuid())) {
@@ -78,9 +78,9 @@ public class HomeController extends BaseController {
             return Error("验证码已过期");
         }
         LambdaQueryWrapper<User> qw = new LambdaQueryWrapper<>();
-        qw.eq(User::getUser_name, input.getUsername())
+        qw.eq(User::getUserName, input.getUserName())
                 .eq(User::getPassword, DigestUtils.md5DigestAsHex(input.getPassword().getBytes()))
-                .eq(User::getDel_flag, 0);
+                .eq(User::getDelFlag, 0);
         User entity = userService.getEntity(qw);
         if (entity == null) {
             return Error("账号或者密码错误");
@@ -90,11 +90,11 @@ public class HomeController extends BaseController {
         }
         redisHelper.deleteCache(verifyKey);
 
-        List<Long> roleids = userRoleService.getList().stream().filter(p -> p.getUser_id().equals(entity.getUser_id()))
-                .map(p -> p.getRole_id()).sorted().collect(Collectors.toList());
+        List<Long> roleids = userRoleService.getList().stream().filter(p -> p.getUserId().equals(entity.getUserId()))
+                .map(p -> p.getRoleId()).sorted().collect(Collectors.toList());
 
         Map<String, Object> cls = new HashMap<String, Object>();
-        cls.put("UserId", entity.getUser_id());
+        cls.put("UserId", entity.getUserId());
         cls.put("RoleIds", roleids);
         String token = JwtHelper.createToken(cls);
         return Success("登录成功", token);
@@ -104,11 +104,11 @@ public class HomeController extends BaseController {
     @PostMapping("/login/user")
     public AjaxResult Login(@RequestBody User user) {
         if (!userService.checkUserNameUnique(user)) {
-            return Error("注册用户'" + user.getUser_name() + "'失败，登录账号已存在");
+            return Error("注册用户'" + user.getUserName() + "'失败，登录账号已存在");
         } else if (StringHelper.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
-            return Error("注册用户'" + user.getUser_name() + "'失败，手机号码已存在");
+            return Error("注册用户'" + user.getUserName() + "'失败，手机号码已存在");
         } else if (StringHelper.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
-            return Error("注册用户'" + user.getUser_name() + "'失败，邮箱账号已存在");
+            return Error("注册用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
 
         String md5Password = DigestUtils.md5DigestAsHex((user.getPassword()).getBytes());

webapidemo-api/src/main/java/com/example/controller/call/BlacklistController.java

@@ -63,7 +63,7 @@ public class BlacklistController extends BaseController {
             return Error("此号码已经存在");
         }
 
-        input.setCreateBy(CurrentUser().getUser_name());
+        input.setCreateBy(CurrentUser().getUserName());
         input.setCreateTime(new Date());
         input.setDelFlag("0");
         boolean result = blacklistService.insert(input);
@@ -85,7 +85,7 @@ public class BlacklistController extends BaseController {
             return Error("此号码已经存在");
         }
 
-        input.setUpdateBy(CurrentUser().getUser_name());
+        input.setUpdateBy(CurrentUser().getUserName());
         input.setUpdateTime(new Date());
         boolean result = blacklistService.update(input);
         if (result) {

webapidemo-api/src/main/java/com/example/controller/call/GroupController.java

@@ -63,7 +63,7 @@ public class GroupController extends BaseController {
             return Error("此编码已经存在");
         }
 
-        input.setCreateBy(CurrentUser().getUser_name());
+        input.setCreateBy(CurrentUser().getUserName());
         input.setCreateTime(new Date());
         input.setDelFlag("0");
         boolean result = groupService.insert(input);
@@ -84,7 +84,7 @@ public class GroupController extends BaseController {
         if(groupService.getCount(qw)>0){
             return Error("此编码已经存在");
         }
-        input.setUpdateBy(CurrentUser().getUser_name());
+        input.setUpdateBy(CurrentUser().getUserName());
         input.setUpdateTime(new Date());
         boolean result = groupService.update(input);
         if (result) {

webapidemo-api/src/main/java/com/example/controller/call/IvrWordController.java

@@ -58,7 +58,7 @@ public class IvrWordController extends BaseController {
     @Log(title = "新增ivr文字文件表",businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody IvrWord input) {
-        input.setCreateBy(CurrentUser().getUser_name());
+        input.setCreateBy(CurrentUser().getUserName());
         input.setCreateTime(new Date());
         input.setDelFlag("0");
         boolean result = ivrwordService.insert(input);
@@ -73,7 +73,7 @@ public class IvrWordController extends BaseController {
     @Log(title = "编辑ivr文字文件表",businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody IvrWord input)  {
-        input.setUpdateBy(CurrentUser().getUser_name());
+        input.setUpdateBy(CurrentUser().getUserName());
         input.setUpdateTime(new Date());
         boolean result = ivrwordService.update(input);
         if (result) {

webapidemo-api/src/main/java/com/example/controller/quartz/SysJobController.java

@@ -91,7 +91,7 @@ public class SysJobController extends BaseController {
         if(isError){
             return Error("新增任务'" + jobName + "'失败，目标字符串存在违规");
         }
-        input.setCreateBy(CurrentUser().getUser_name());
+        input.setCreateBy(CurrentUser().getUserName());
         input.setCreateTime(new Date());
         boolean result = sysjobService.insert(input);
         if (result) {
@@ -135,7 +135,7 @@ public class SysJobController extends BaseController {
         if(isError){
             return Error("编辑任务'" + jobName + "'失败，目标字符串存在违规");
         }
-        input.setUpdateBy(CurrentUser().getUser_name());
+        input.setUpdateBy(CurrentUser().getUserName());
         input.setUpdateTime(new Date());
         boolean result = sysjobService.update(input);
         if (result) {

webapidemo-api/src/main/java/com/example/filter/AuthenticationInterceptor.java

@@ -74,10 +74,10 @@ public class AuthenticationInterceptor implements HandlerInterceptor {
                     Long userId = Long.parseLong(cls.get("UserId").toString());
                     if (userId > 0) {
                         //判断用户信息
-                        List<User> users = userService.getList().stream().filter(p -> p.getUser_id() == userId && Objects.equals(p.getStatus(), "0") && Objects.equals(p.getDel_flag(), "0")).collect(Collectors.toList());
+                        List<User> users = userService.getList().stream().filter(p -> p.getUserId() == userId && Objects.equals(p.getStatus(), "0") && Objects.equals(p.getDelFlag(), "0")).collect(Collectors.toList());
                         if (users != null && users.size() > 0) {
                             User user = users.get(0);
-                            List<Long> roleids = userRoleService.getList().stream().filter(p -> p.getUser_id() == userId).map(p -> p.getRole_id()).sorted().collect(Collectors.toList());
+                            List<Long> roleids = userRoleService.getList().stream().filter(p -> p.getUserId() == userId).map(p -> p.getRoleId()).sorted().collect(Collectors.toList());
                             if (user.isAdmin()) {
                                 isAuth = true;
                             } else {
@@ -88,9 +88,9 @@ public class AuthenticationInterceptor implements HandlerInterceptor {
                                             .replace("Controller", "");
                                     String methodName = handlerMethod.getMethod().getName();
                                     String permission = (className + "/" + methodName).toLowerCase();
-                                    List<Long> mids = menuService.getList().stream().filter(p -> Objects.equals(p.getPerms(), permission)).map(p -> p.getMenu_id()).collect(Collectors.toList());
+                                    List<Long> mids = menuService.getList().stream().filter(p -> Objects.equals(p.getPerms(), permission)).map(p -> p.getMenuId()).collect(Collectors.toList());
                                     if (mids != null && mids.size() > 0) {
-                                        Long n = roleMenuService.getList().stream().filter(p -> roleids.contains(p.getRole_id()) && mids.contains(p.getMenu_id())).count();
+                                        Long n = roleMenuService.getList().stream().filter(p -> roleids.contains(p.getRoleId()) && mids.contains(p.getMenuId())).count();
                                         if (n > 0) {
                                             isAuth = true;
                                         } else {

webapidemo-entity/src/main/java/com/example/entity/database/system/RoleDept.java

@@ -1,5 +1,6 @@
 package com.example.entity.database.system;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -12,8 +13,10 @@ import lombok.Data;
 public class RoleDept {
     /** 角色ID */
     @ApiModelProperty("角色ID")
+    @TableField("role_id")
     private Long roleId;
     /** 部门ID */
     @ApiModelProperty("部门ID")
+    @TableField("dept_id")
     private Long deptId;
 }

webapidemo-entity/src/main/java/com/example/entity/database/system/RoleMenu.java

@@ -1,5 +1,6 @@
 package com.example.entity.database.system;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -12,8 +13,10 @@ import lombok.Data;
 public class RoleMenu {
     /** 角色ID */
     @ApiModelProperty("角色ID")
+    @TableField("role_id")
     private Long roleId;
     /** 菜单ID */
     @ApiModelProperty("菜单ID")
+    @TableField("menu_id")
     private Long menuId;
 }

webapidemo-entity/src/main/java/com/example/entity/database/system/UserPost.java

@@ -1,5 +1,6 @@
 package com.example.entity.database.system;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -12,8 +13,10 @@ import lombok.Data;
 public class UserPost {
     /** 用户ID */
     @ApiModelProperty("用户ID")
+    @TableField("user_id")
     private Long userId;
     /** 岗位ID */
     @ApiModelProperty("岗位ID")
+    @TableField("post_id")
     private Long postId;
 }

webapidemo-entity/src/main/java/com/example/entity/database/system/UserRole.java

@@ -1,5 +1,6 @@
 package com.example.entity.database.system;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -12,8 +13,10 @@ import lombok.Data;
 public class UserRole {
     /** 用户ID */
     @ApiModelProperty("用户ID")
+    @TableField("user_id")
     private Long userId;
     /** 角色ID */
     @ApiModelProperty("角色ID")
+    @TableField("role_id")
     private Long roleId;
 }