取消驼峰命名

src/main/java/com/sky/ioc/controller/user/UserController.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 
-@Api(tags = "系统--登录")
+@Api(tags = "系统--用户管理")
 @Slf4j
 @RestController
 @RequestMapping("/users")

src/main/java/com/sky/ioc/entity/domain/organization/Company.java

@@ -9,19 +9,19 @@ public class Company {
 
     @TableId(type = IdType.AUTO)
     private Integer id;
-    private String companyName;//公司名')
+    private String company_name;//公司名')
     private String logo ;//商标')
     private String abbreviation;//公司简称')
     private Integer code;//统一社会信用代码')
-    private String registeredAddress;//注册地址')
-    private String businessAddress;//经营地址')
-    private String legalPersonName;//'法人姓名')
-    private String contactPerson;//联系人')
-    private String contactInformation;//联系人电话')
-    private String companyCode;//公司编码')
-    private Integer staffSize;//'编制人数')
-    private Integer onGuardSize;//在岗人数')
-    private Integer parentCompany;//'上级公司id'
-    private Integer areaId;//区域id')
-    private Integer officeId ;//'部门id')
+    private String registered_address;//注册地址')
+    private String business_address;//经营地址')
+    private String legal_person_name;//'法人姓名')
+    private String contact_person;//联系人')
+    private String contact_information;//联系人电话')
+    private String company_code;//公司编码')
+    private Integer staff_size;//'编制人数')
+    private Integer on_guard_size;//在岗人数')
+    private Integer parent_company;//'上级公司id'
+    private Integer area_id;//区域id')
+    private Integer office_id;//'部门id')
 }

src/main/java/com/sky/ioc/entity/domain/organization/Department.java

@@ -10,16 +10,16 @@ public class Department {
     private Integer id;
     private Integer company_id;//公司id')
     private String name;//部门名')
-    private String fullName;//怕重名 部门全名')
+    private String full_name;//怕重名 部门全名')
     private String principal;//负责人')
-    private String liaisonOfficer;//接口人')
-    private Integer onGuard;//在岗人数')
-    private Integer freelanceStaff;//自由员工')
-    private Integer cooperationStaff;//协作员工')
-    private Integer thirdpartyStaff;//第三方员工')
+    private String liaison_officer;//接口人')
+    private Integer on_guard;//在岗人数')
+    private Integer freelance_staff;//自由员工')
+    private Integer cooperation_staff;//协作员工')
+    private Integer thirdparty_staff;//第三方员工')
     private String censure;//职责')
     private String code;//部门编码')
     private Integer sort;//部门排序')
-    private String oriId ;//部门id')
-    private String parentId;//部门上级id')
+    private String ori_id;//部门id')
+    private String parent_id;//部门上级id')
 }

src/main/java/com/sky/ioc/entity/domain/strategy/MeetingRoom.java

@@ -2,24 +2,26 @@ package com.sky.ioc.entity.domain.strategy;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 @Data
+@TableName("meeting_room")
 public class MeetingRoom {
 
     @TableId(type = IdType.AUTO)
     private Integer id;
-    private String orderNo;//排序号')
-    private String mrNo;//编号')
+    private String order_no;//排序号')
+    private String mr_no;//编号')
     private String name;//会议室名称')
-    private Integer floorId;//楼层')
+    private Integer floor_id;//楼层')
     private String type;//类型')
     private String status;//状态')
-    private String openTime;//开放时间')
-    private String closeTime;//关闭时间')
-    private String auditTime;//会议超过几小时需要审核')
-    private String limitDay;//限定可预约时间(天)')
-    private Integer isDel;//是否删除')
+    private String open_time;//开放时间')
+    private String close_time;//关闭时间')
+    private String audit_time;//会议超过几小时需要审核')
+    private String limit_day;//限定可预约时间(天)')
+    private Integer is_del;//是否删除')
     private String remark;//备注信息')
     private Integer capacity;//容纳人数')
 }

src/main/java/com/sky/ioc/entity/domain/system/Users.java

@@ -14,7 +14,7 @@ public class Users {
     private Integer id;
     /** 用户名 */
     @ExcelProperty("用户名")
-    private String userName;
+    private String user_name;
     /** 密码 */
     @ExcelIgnore
     private String password;
@@ -38,22 +38,22 @@ public class Users {
     private String department;
     /** 在职状态 0-在职 */
     @ExcelIgnore
-    private String onJobStatus;
+    private String on_job_status;
     @ExcelIgnore
     private String duty;
     /** 账户状态 0-在职 */
     @ExcelIgnore
-    private String accountStatus;
+    private String account_status;
     @ExcelIgnore
     private String nationality;
     /** 创建时间 */
     @ExcelIgnore
-    private String registerTime;
+    private String register_time;
     /**
      * 常用功能ID，例如 1,5,6
      */
     @ExcelIgnore
-    private  String commonMenus;
+    private  String common_menus;
     @ExcelIgnore
     private String role;
     @ExcelIgnore

src/main/java/com/sky/ioc/service/strategy/impl/MeetingRoomServiceImpl.java

@@ -11,7 +11,6 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 @Service
 public class MeetingRoomServiceImpl implements MeetingRoomService {
@@ -22,10 +21,10 @@ public class MeetingRoomServiceImpl implements MeetingRoomService {
     @Override
     public ReturnMsg getList() {
         List<MeetingRoom> rooms = meetingRoomMapper.selectList(null);
-        List<Integer> floors = rooms.stream().map(MeetingRoom::getFloorId).collect(Collectors.toList());
+        List<Integer> floors = rooms.stream().map(MeetingRoom::getFloor_id).collect(Collectors.toList());
         JSONObject json = new JSONObject();
         for(Integer floor : floors){
-            String[] names = meetingRoomMapper.selectList(new LambdaQueryWrapper<MeetingRoom>().eq(MeetingRoom::getFloorId,floor))
+            String[] names = meetingRoomMapper.selectList(new LambdaQueryWrapper<MeetingRoom>().eq(MeetingRoom::getFloor_id,floor))
                     .stream().map(MeetingRoom::getName).collect(Collectors.toList()).toArray(new String[0]);
             json.put(floor+"",names);
         }

src/main/java/com/sky/ioc/service/user/impl/UserServiceImpl.java

@@ -36,7 +36,7 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public JSONObject login(String username, String password) {
-        Users users = userMapper.selectOne(new LambdaQueryWrapper<Users>().eq(Users::getUserName, username));
+        Users users = userMapper.selectOne(new LambdaQueryWrapper<Users>().eq(Users::getUser_name, username));
         if (Objects.isNull(users)){
             throw new RuntimeException("用户名或密码错误");
         }
@@ -63,7 +63,7 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public ReturnMsg addUser(Users users) {
-        Users u = userMapper.selectOne(new LambdaQueryWrapper<Users>().eq(Users::getUserName, users.getUserName()));
+        Users u = userMapper.selectOne(new LambdaQueryWrapper<Users>().eq(Users::getUser_name, users.getUser_name()));
         if (!Objects.isNull(u)){
             throw new RuntimeException("用户名已存在");
         }
@@ -105,10 +105,10 @@ public class UserServiceImpl implements UserService {
     public ReturnMsg getUserList(String status, String filter, String page, String pageSize) {
         LambdaQueryWrapper<Users> queryWrapper = new LambdaQueryWrapper<>();
         if (StringUtils.isNotBlank(status)) {
-            queryWrapper.eq(Users::getAccountStatus, status);
+            queryWrapper.eq(Users::getAccount_status, status);
         }
         if (StringUtils.isNotBlank(filter)) {
-            queryWrapper.like(Users::getUserName, "%"+filter+"%")
+            queryWrapper.like(Users::getUser_name, "%"+filter+"%")
                     .or().like(Users::getCompany, "%"+filter+"%")
                     .or().like(Users::getDepartment, "%"+filter+"%");
         }
@@ -134,7 +134,7 @@ public class UserServiceImpl implements UserService {
         if (users==null) {
             throw new RuntimeException("用户不存在");
         }
-        users.setAccountStatus(status);
+        users.setAccount_status(status);
         int i = userMapper.updateById(users);
         return ReturnMsg.ok();
     }

src/main/java/com/sky/ioc/tool/JwtUtil.java

@@ -24,7 +24,7 @@ public class JwtUtil {
      * @return
      */
     public static String genJwtToken(Users users) {
-        String token = JWT.create().withJWTId(UUID.randomUUID().toString()).withAudience("user").withIssuer("sky-ioc-server").withIssuedAt(new Date()).withSubject(users.getUserName()).withClaim("userID", users.getId()).withExpiresAt(Instant.now().plus(16, ChronoUnit.HOURS)).sign(Algorithm.HMAC256(secretKey));
+        String token = JWT.create().withJWTId(UUID.randomUUID().toString()).withAudience("user").withIssuer("sky-ioc-server").withIssuedAt(new Date()).withSubject(users.getUser_name()).withClaim("userID", users.getId()).withExpiresAt(Instant.now().plus(16, ChronoUnit.HOURS)).sign(Algorithm.HMAC256(secretKey));
         return token;
 
     }

src/main/resources/application.yml

@@ -82,7 +82,7 @@ mybatis-plus:
   mapperLocations: classpath*:mapper/**/*Mapper.xml
   configuration:
     # 字段名驼峰映射
-    map-underscore-to-camel-case: true
+    map-underscore-to-camel-case: false
     # 日志输出
     log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
   global-config: