bug调试，修改留言板名称为论坛

yezhu-api/src/main/java/com/kioor/messageboard/controller/ApiMessageBoardController.java

@@ -32,14 +32,14 @@ import java.util.Arrays;
 import java.util.Map;
 
 /**
- * 留言板
+ * 论坛
  *
  * @author Mark sunlightcs@gmail.com
  */
 @AllArgsConstructor
 @RestController
 @RequestMapping("/client/messageboard")
-@Tag(name = "留言板")
+@Tag(name = "论坛")
 public class ApiMessageBoardController {
 
     private final MessageBoardService messageBoardService;
@@ -48,7 +48,7 @@ public class ApiMessageBoardController {
 
     @Login
     @GetMapping("infoByHousingEstate")
-    @Operation(summary = "根据小区查看留言板详情")
+    @Operation(summary = "根据小区查看论坛详情")
     @Parameters({
             @Parameter(name = "housingEstateId", description = "小区id",required = true)
     })

yezhu-api/src/main/java/com/kioor/messageboard/controller/ApiMessageController.java

@@ -58,12 +58,12 @@ public class ApiMessageController {
             @Parameter(name = Constant.ORDER_FIELD, description = "排序字段"),
             @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)"),
             @Parameter(name = "housingEstateId", description = "小区id"),
-            @Parameter(name = "messageBoardId", description = "留言板id")
+            @Parameter(name = "messageBoardId", description = "论坛id")
     })
     public Result<PageData<MessageDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params) {
-        //小区和留言板id不能同时为空
+        //小区和论坛id不能同时为空
         if(params.get("housingEstateId") == null && params.get("messageBoardId") == null){
-            return new Result().error(ErrorCode.NOT_NULL,"小区和留言板不能同时为空");
+            return new Result().error(ErrorCode.NOT_NULL,"小区和论坛不能同时为空");
         }
         PageData<MessageDTO> page = messageService.page(params);
         //校验小区状态

yezhu-api/src/main/java/com/kioor/messageboard/controller/ApiNoticeController.java

@@ -58,12 +58,12 @@ public class ApiNoticeController {
             @Parameter(name = Constant.ORDER_FIELD, description = "排序字段"),
             @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)"),
             @Parameter(name = "housingEstateId", description = "小区id"),
-            @Parameter(name = "messageBoardId", description = "留言板id")
+            @Parameter(name = "messageBoardId", description = "论坛id")
     })
     public Result<PageData<NoticeDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params) {
-        //小区和留言板id不能同时为空
+        //小区和论坛id不能同时为空
         if(params.get("housingEstateId") == null && params.get("messageBoardId") == null){
-            return new Result().error(ErrorCode.NOT_NULL,"小区和留言板不能同时为空");
+            return new Result().error(ErrorCode.NOT_NULL,"小区和论坛不能同时为空");
         }
         PageData<NoticeDTO> page = noticeService.page(params);
         //校验小区状态

yezhu-api/src/main/java/com/kioor/messageboard/dao/MessageBoardDao.java

@@ -16,7 +16,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 留言板
+ * 论坛
  * 
  * @author Mark sunlightcs@gmail.com
  */

yezhu-api/src/main/java/com/kioor/messageboard/dto/MessageBoardDTO.java

@@ -14,12 +14,12 @@ import lombok.Data;
 
 
 /**
- * 留言板
+ * 论坛
  *
  * @author Mark sunlightcs@gmail.com
  */
 @Data
-@Schema(description = "留言板")
+@Schema(description = "论坛")
 public class MessageBoardDTO {
     @Schema(description = "id")
     private Long id;
@@ -27,7 +27,7 @@ public class MessageBoardDTO {
     @Schema(description = "小区")
     private Long housingEstateId;
 
-    @Schema(description = "留言板名称")
+    @Schema(description = "论坛名称")
     private String name;
 
 }

yezhu-api/src/main/java/com/kioor/messageboard/dto/MessageDTO.java

@@ -29,7 +29,7 @@ public class MessageDTO {
     @Schema(description = "小区")
     private Long housingEstateId;
 
-    @Schema(description = "留言板")
+    @Schema(description = "论坛")
     private Long messageBoardId;
 
     @Schema(description = "留言内容")

yezhu-api/src/main/java/com/kioor/messageboard/dto/NoticeDTO.java

@@ -30,7 +30,7 @@ public class NoticeDTO {
     @Schema(description = "小区")
     private Long housingEstateId;
 
-    @Schema(description = "留言板")
+    @Schema(description = "论坛")
     private Long messageBoardId;
 
     @Schema(description = "公告标题")

yezhu-api/src/main/java/com/kioor/messageboard/entity/MessageBoardEntity.java

@@ -15,7 +15,7 @@ import lombok.Data;
 import java.io.Serializable;
 
 /**
- * 留言板
+ * 论坛
  *
  * @author Mark sunlightcs@gmail.com
  */
@@ -32,7 +32,7 @@ public class MessageBoardEntity implements Serializable {
      */
     private Long housingEstateId;
     /**
-     * 留言板名称
+     * 论坛名称
      */
     private String name;
 

yezhu-api/src/main/java/com/kioor/messageboard/entity/MessageEntity.java

@@ -29,7 +29,7 @@ public class MessageEntity implements Serializable {
     @TableId
     private Long id;
     /**
-     * 留言板
+     * 论坛
      */
     private Long messageBoardId;
     /**

yezhu-api/src/main/java/com/kioor/messageboard/entity/NoticeEntity.java

@@ -16,7 +16,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 留言板公告
+ * 论坛公告
  *
  * @author Mark sunlightcs@gmail.com
  */
@@ -29,7 +29,7 @@ public class NoticeEntity implements Serializable {
     @TableId
     private Long id;
     /**
-     * 留言板
+     * 论坛
      */
     private Long messageBoardId;
     /**

yezhu-api/src/main/java/com/kioor/messageboard/service/MessageBoardService.java

@@ -16,7 +16,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 留言板
+ * 论坛
  * 
  * @author Mark sunlightcs@gmail.com
  */
@@ -30,7 +30,7 @@ public interface MessageBoardService extends BaseService<MessageBoardEntity> {
     void update(MessageBoardDTO dto);
 
     /**
-     * 根据小区查看留言板详情
+     * 根据小区查看论坛详情
      * @param housingEstateId
      * @return
      */

yezhu-api/src/main/java/com/kioor/messageboard/service/impl/MessageBoardServiceImpl.java

@@ -62,7 +62,7 @@ public class MessageBoardServiceImpl extends BaseServiceImpl<MessageBoardDao, Me
     }
 
     /**
-     * 根据小区查看留言板详情
+     * 根据小区查看论坛详情
      *
      * @param housingEstateId
      * @return

yezhu-api/src/main/java/com/kioor/messageboard/service/impl/MessageServiceImpl.java

@@ -9,7 +9,6 @@
 package com.kioor.messageboard.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.kioor.common.constant.Constant;
 import com.kioor.common.page.PageData;
 import com.kioor.common.service.impl.BaseServiceImpl;
 import com.kioor.common.utils.CommonUtils;
@@ -38,7 +37,7 @@ public class MessageServiceImpl extends BaseServiceImpl<MessageDao, MessageEntit
     public PageData<MessageDTO> page(Map<String, Object> params) {
 
         //分页
-        IPage<MessageEntity> page = getPage(params, Constant.CREATE_DATE, false);
+        IPage<MessageEntity> page = getPage(params, "edit_time", true);
 
         //查询
         List<MessageDTO> list = baseDao.getList(params);

yezhu-api/src/main/java/com/kioor/room/controller/ApiHousingEstateController.java

@@ -177,7 +177,7 @@ public class ApiHousingEstateController {
         if(!buildingInitDTOList.isEmpty()){
             buildingInitDTOList.forEach(buildingInitDTO -> {
                 housingEstateService.cleanAll(buildingInitDTO.getHousingEstateId());
-                //删除小区留言板
+                //删除小区论坛
                 MessageBoardDTO messageBoardDTO = messageBoardService.infoByHousingEstate(buildingInitDTO.getHousingEstateId());
                 if(messageBoardDTO != null ){
                     messageBoardService.deleteById(messageBoardDTO.getId());
@@ -189,12 +189,12 @@ public class ApiHousingEstateController {
         //初始化小区信息
         housingEstateService.buildingInit(buildingInitDTOList);
 
-        //初始化小区留言板
+        //初始化小区论坛
         MessageBoardDTO messageBoardDTO = messageBoardService.infoByHousingEstate(buildingInitDTOList.get(0).getHousingEstateId());
         if(messageBoardDTO == null ){
             messageBoardDTO = new MessageBoardDTO();
             messageBoardDTO.setHousingEstateId(buildingInitDTOList.get(0).getHousingEstateId());
-            messageBoardDTO.setName(housingEstateDTO==null?"小区留言板":housingEstateDTO.getName()+"-小区留言板");
+            messageBoardDTO.setName(housingEstateDTO==null?"小区论坛":housingEstateDTO.getName()+"-小区论坛");
             messageBoardService.save(messageBoardDTO);
         }
 
@@ -213,7 +213,7 @@ public class ApiHousingEstateController {
         }
         Long housingEstateId = Long.parseLong(String.valueOf(params.get("housingEstateId")));
         housingEstateService.cleanAll(housingEstateId);
-        //删除小区留言板
+        //删除小区论坛
         MessageBoardDTO messageBoardDTO = messageBoardService.infoByHousingEstate(housingEstateId);
         if(messageBoardDTO != null ){
             messageBoardService.deleteById(messageBoardDTO.getId());

yezhu-api/src/main/java/com/kioor/user/controller/ApiUserController.java

@@ -10,6 +10,7 @@ package com.kioor.user.controller;
 
 
 import com.kioor.annotation.Login;
+import com.kioor.annotation.LoginUser;
 import com.kioor.common.utils.Result;
 import com.kioor.common.validator.ValidatorUtils;
 import com.kioor.user.dto.UserRequestDTO;
@@ -35,6 +36,13 @@ import java.util.Map;
 public class ApiUserController {
     private final UserService userService;
 
+    @Login
+    @GetMapping("userInfo")
+    @Operation(summary = "获取用户信息")
+    public Result<UserEntity> userInfo(@Parameter(hidden = true) @LoginUser UserEntity user) {
+        return new Result<UserEntity>().ok(user);
+    }
+
     @Login
     @PutMapping
     @Operation(summary = "修改用户信息")

yezhu-api/src/main/resources/mapper/messageboard/MessageDao.xml

@@ -17,7 +17,7 @@
                 and tmb.housing_estate_id = #{housingEstateId}
             </if>
         </where>
-        order by tm.edit_time desc
+        order by tm.edit_time asc
     </select>
 
     <select id="get" resultType="com.kioor.messageboard.dto.MessageDTO">