lyhzzz před 2 roky
rodič
revize
236e01c36b

+ 1 - 1
src/main/java/com/fdkankan/tk/controller/DataCountController.java

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.net.URLDecoder;
 import java.util.Date;
 import java.util.List;
 
@@ -72,7 +73,6 @@ public class DataCountController extends BaseController {
     public ResultData roomVisitData(@RequestParam(required = false) String roomTitle,
                                     @RequestParam(required = false) String startTime,
                                     @RequestParam(required = false) String endTime){
-
         return ResultData.ok(dataCountService.roomVisitData(getToken(),roomTitle,startTime,endTime));
     }
 

+ 3 - 0
src/main/java/com/fdkankan/tk/service/impl/RoomServiceImpl.java

@@ -196,6 +196,9 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
 
     @Override
     public RoomVo getRoomInfo(String roomId,String token,String wxToken) {
+        if(roomId.contains("_")){
+            roomId = roomId.split("_")[0];
+        }
         Room room = this.getById(roomId);
         if(room == null){
             throw new BusinessException(ResultCode.ROOM_MISS);

+ 5 - 0
src/main/java/com/fdkankan/tk/util/Dateutils.java

@@ -121,6 +121,11 @@ public class Dateutils {
         return new SimpleDateFormat("yyyy-MM-dd").format(ca.getTime()) +" 23:59:59";
     }
 
+    public static void main(String[] args) {
+        String date = "2023-03-14T13:03:34.135Z";
+        System.out.println(formatStartTime(date));
+    }
+
     public static String formatStartTime(String startTime) {
         if(StringUtils.isBlank(startTime)){
             startTime = Dateutils.getHalfYearStr();