bug修改

yezhu-api/src/main/java/com/kioor/chat/service/impl/ChatLogServiceImpl.java

@@ -5,7 +5,6 @@ import com.kioor.chat.dao.ChatLogDao;
 import com.kioor.chat.dto.ChatLogDTO;
 import com.kioor.chat.entity.ChatLogEntity;
 import com.kioor.chat.service.ChatLogService;
-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;
@@ -31,7 +30,7 @@ public class ChatLogServiceImpl extends BaseServiceImpl<ChatLogDao, ChatLogEntit
     public PageData<ChatLogDTO> page(Map<String, Object> params) {
 
         //分页
-        IPage<ChatLogEntity> page = getPage(params, Constant.CREATE_DATE, false);
+        IPage<ChatLogEntity> page = getPage(params, "edit_time", false);
 
         //查询
         List<ChatLogDTO> list = baseDao.getList(params);

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

@@ -63,11 +63,13 @@ public class ApiHousingEstateController {
             @Parameter(name = Constant.ORDER_FIELD, description = "排序字段"),
             @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)"),
             @Parameter(name = "status", description = "小区状态:0待审核，1审核通过，2审核不通过，3禁用"),
-            @Parameter(name = "name", description = "名称")
+            @Parameter(name = "name", description = "名称"),
+            @Parameter(name = "selfFlag", description = "自己的小区：0所有小区，1自己的小区")
     })
-    public Result<PageData<HousingEstateDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params) {
+    public Result<PageData<HousingEstateDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params, @Parameter(hidden = true) @RequestAttribute("userId") Long userId) {
         //如果状态为空则查询已审核通过的小区
-//        params.putIfAbsent("status", 1);
+        params.putIfAbsent("status", 1);
+        params.put("userId", userId);
         PageData<HousingEstateDTO> page = housingEstateService.page(params);
 
         return new Result<PageData<HousingEstateDTO>>().ok(page);

yezhu-api/src/main/java/com/kioor/room/dto/RoomDetailDTO.java

@@ -42,6 +42,9 @@ public class RoomDetailDTO {
     @Schema(description = "房号")
     private Integer roomNum;
 
+    @Schema(description = "完整房号")
+    private String fullRoomNum;
+
     @Schema(description = "备注")
     private String remark;
 

yezhu-api/src/main/java/com/kioor/room/service/impl/RoomServiceImpl.java

@@ -21,6 +21,7 @@ import com.kioor.user.dto.UserResponseDTO;
 import com.kioor.user.entity.UserEntity;
 import com.kioor.user.service.UserService;
 import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -128,6 +129,16 @@ public class RoomServiceImpl extends BaseServiceImpl<RoomDao, RoomEntity> implem
             }
             userResponseDTOList.add(userResponseDTO);
         });
+        if(StringUtils.isNotBlank(roomDetailDTO.getRemark())){
+            //取remark最后一个"-"后面的内容
+            int lastIndex = roomDetailDTO.getRemark().lastIndexOf('-');
+
+            // 如果找到了 "-"
+            if (lastIndex != -1) {
+                String result = roomDetailDTO.getRemark().substring(lastIndex + 1);
+                roomDetailDTO.setFullRoomNum(result);
+            }
+        }
         roomDetailDTO.setUserList(userResponseDTOList);
     }
     /**

yezhu-api/src/main/java/com/kioor/websocket/WebSocketServer.java

@@ -149,6 +149,8 @@ public class WebSocketServer {
         if (fromMsgDetail != null && fromMsgDetail.getToId() != null) {
             Date editTime = new Date();
             fromMsgDetail.setEditTimeStr(DateUtils.format(editTime, DateUtils.DATE_TIME_PATTERN));
+            //将fromMsgDetail转回msg
+            msg = JsonUtils.toJsonString(fromMsgDetail);
             MessageData<String> message = new MessageData<String>().msg(msg);
             switch(fromMsgDetail.getToType()){
                 case 0:

yezhu-api/src/main/resources/mapper/chat/ChatLogDao.xml

@@ -16,7 +16,7 @@
                 and tcl.chat_partner_id = #{chatPartnerId}
             </if>
         </where>
-        order by tcl.edit_time asc
+        order by tcl.edit_time desc
     </select>
 
     <select id="get" resultType="com.kioor.chat.dto.ChatLogDTO">

yezhu-api/src/main/resources/mapper/room/HousingEstateDao.xml

@@ -5,12 +5,17 @@
 
 
     <select id="getList" resultType="com.kioor.room.entity.HousingEstateEntity">
-        select * from tb_housing_estate where 1=1
+        select DISTINCT the.* from tb_housing_estate the
+                 left join tb_user_housing_estate tuhe on tuhe.housing_estate_id = the.id
+        where 1=1
         <if test="status != null">
             and status = #{status}
         </if>
         <if test="name != null and name.trim() != ''">
             and name like #{name}
         </if>
+        <if test="selfFlag != 0 and userId != null ">
+            and tuhe.user_id = #{userId}
+        </if>
     </select>
 </mapper>