Merge branch 'master' of http://49.4.53.36:3000/hotel/hotel-saas-backend

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusMeetingRoomController.java

@@ -10,7 +10,10 @@ import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.TokenUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.business.entity.BusMeetingRoom;
 import org.jeecg.modules.business.service.IBusMeetingRoomService;
@@ -84,6 +87,13 @@ public class BusMeetingRoomController extends JeecgController<BusMeetingRoom, IB
 	//@RequiresPermissions("business:bus_meeting_room:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody BusMeetingRoom busMeetingRoom) {
+		LoginUser user = TokenUtils.getAuthUser();
+		if (user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")) {
+			busMeetingRoom.setTenantId(user.getRelTenantIds());
+		} else {
+			throw new JeecgBootException("当前登录人租户信息错误");
+		}
+		busMeetingRoom.setStatus(1);
 		busMeetingRoomService.save(busMeetingRoom);
 		return Result.OK("添加成功！");
 	}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusMeetingRoomScheduleController.java

@@ -6,8 +6,11 @@ import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.Enum.ResultCode;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.modules.business.dto.BusMeetingRoomScheduleDetailDto;
 import org.jeecg.modules.business.dto.BusMeetingRoomScheduleDto;
+import org.jeecg.modules.business.entity.BusMeetingRoom;
+import org.jeecg.modules.business.entity.BusMeetingRoomSchedule;
 import org.jeecg.modules.business.entity.BusMeetingRoomScheduleDetail;
 import org.jeecg.modules.business.service.impl.BusMeetingRoomScheduleServiceImpl;
 import org.jeecg.modules.business.service.impl.BusMeetingRoomServiceImpl;
@@ -78,5 +81,39 @@ public class BusMeetingRoomScheduleController {
 
 
 
+    @ApiOperation(value="获取", notes="获取")
+    @GetMapping(value = "/fetch")
+    public Result fetch(String startDate,String endDate,String hotelId){
+        if(StringUtils.isBlank(startDate)){
+            return Result.error(ResultCode.PARAM_MISS);
+        }
+        if(StringUtils.isBlank(endDate)){
+            return Result.error(ResultCode.PARAM_MISS);
+        }
+        if(StringUtils.isBlank(hotelId)){
+            return Result.error(ResultCode.PARAM_MISS);
+        }
+        try {
+            return roomScheduleService.fetch(startDate,endDate,hotelId);
+        }catch (Exception e){
+            return Result.error(e.getMessage());
+        }
+    }
+
+    /**
+     *  编辑
+     *
+     * @param busMeetingRoomSchedule
+     * @return
+     */
+    @AutoLog(value = "bus_meeting_room-编辑")
+    @ApiOperation(value="bus_meeting_room-编辑", notes="bus_meeting_room-编辑")
+    //@RequiresPermissions("business:bus_meeting_room:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+    public Result<String> edit(@RequestBody BusMeetingRoomSchedule busMeetingRoomSchedule) {
+        roomScheduleService.updateById(busMeetingRoomSchedule);
+        return Result.OK("编辑成功!");
+    }
+
 }
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusMeetingRoomSchedule.java

@@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -72,6 +75,8 @@ public class BusMeetingRoomSchedule extends Model<BusMeetingRoomSchedule> {
     /**
      * 创建时间
      */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private LocalDateTime createTime;
 
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusMeetingRoomScheduleDetail.java

@@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -49,6 +52,8 @@ public class BusMeetingRoomScheduleDetail extends Model<BusMeetingRoomScheduleDe
     /**
      * 会议日期
      */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private LocalDateTime meetingDate;
 
     /**

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/enums/CouponsKeyEnum.java

@@ -0,0 +1,58 @@
+package org.jeecg.modules.business.enums;
+
+import org.jeecg.common.system.annotation.EnumDict;
+import org.jeecg.common.system.vo.DictModel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+@EnumDict("couponsKeyEnum")
+public enum CouponsKeyEnum {
+
+    AM(1, "上午"),
+    MO(2, "下午"),
+    DE(3, "晚上");
+
+    Integer key;
+
+    String title;
+
+    CouponsKeyEnum(Integer key, String title){
+        this.key = key;
+        this.title = title;
+    }
+    public Integer getKey() {
+        return key;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * 获取字典数据
+     * @return
+     */
+    public static List<DictModel> getDictList(){
+        List<DictModel> list = new ArrayList<>();
+        DictModel dictModel = null;
+        for(CouponsKeyEnum e: CouponsKeyEnum.values()){
+            dictModel = new DictModel();
+            dictModel.setValue(e.key.toString());
+            dictModel.setText(e.title);
+            list.add(dictModel);
+        }
+        return list;
+    }
+
+    public static CouponsKeyEnum val(Integer key){
+        for(CouponsKeyEnum bld: values()){
+            if(bld.key == key){
+                return bld;
+            }
+        }
+        return null;
+    }
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusMeetingRoomScheduleDetailServiceImpl.java

@@ -1,6 +1,8 @@
 package org.jeecg.modules.business.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.jeecg.common.util.TokenUtils;
 import org.jeecg.modules.business.entity.BusMeetingRoomScheduleDetail;
 import org.jeecg.modules.business.mapper.BusMeetingRoomScheduleDetailMapper;
 import org.jeecg.modules.business.service.IBusMeetingRoomScheduleDetailService;
@@ -8,6 +10,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -34,4 +38,17 @@ public class BusMeetingRoomScheduleDetailServiceImpl extends ServiceImpl<BusMeet
         if(CollectionUtil.isEmpty(detailList)) return false;
         return saveBatch(detailList);
     }
+
+
+
+    public List<BusMeetingRoomScheduleDetail> fetchByDateRange(LocalDateTime startDate, LocalDateTime endDate,String hotelId,List<String> meetRoomIds){
+        if(CollectionUtil.isEmpty(meetRoomIds)) return new ArrayList<>();
+        QueryWrapper<BusMeetingRoomScheduleDetail> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(BusMeetingRoomScheduleDetail.TENANT_ID, TokenUtils.currentTenantId());
+        queryWrapper.eq(BusMeetingRoomScheduleDetail.HOTEL_ID,hotelId);
+        queryWrapper.between(BusMeetingRoomScheduleDetail.MEETING_DATE, startDate,endDate);
+        queryWrapper.in(BusMeetingRoomScheduleDetail.MEETING_ROOM_ID,meetRoomIds);
+
+        return scheduleDetailMapper.selectList(queryWrapper);
+    }
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusMeetingRoomScheduleServiceImpl.java

@@ -1,25 +1,37 @@
 package org.jeecg.modules.business.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.commons.collections.map.HashedMap;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.util.TokenUtils;
 import org.jeecg.modules.business.dto.BusMeetingRoomScheduleDetailDto;
 import org.jeecg.modules.business.dto.BusMeetingRoomScheduleDto;
+import org.jeecg.modules.business.entity.BusMeetingRoom;
 import org.jeecg.modules.business.entity.BusMeetingRoomSchedule;
 import org.jeecg.modules.business.entity.BusMeetingRoomScheduleDetail;
+import org.jeecg.modules.business.enums.CouponsKeyEnum;
 import org.jeecg.modules.business.mapper.BusMeetingRoomScheduleDetailMapper;
 import org.jeecg.modules.business.mapper.BusMeetingRoomScheduleMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.business.vo.BusMeetingKeyValueVo;
+import org.jeecg.modules.business.vo.BusMeetingRoomScheduleDetailVo;
+import org.jeecg.modules.business.vo.BusMeetingRoomScheduleVo;
+import org.jeecg.modules.business.vo.MeetingRoomScheduleDetailVo;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.transaction.Transactional;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -37,6 +49,10 @@ public class BusMeetingRoomScheduleServiceImpl extends ServiceImpl<BusMeetingRoo
         @Resource
         private BusMeetingRoomScheduleDetailServiceImpl meetingRoomScheduleDetailService;
 
+        @Resource
+        private BusMeetingRoomServiceImpl busMeetingRoomService;
+
+
     /**
      *
      * @return
@@ -69,15 +85,94 @@ public class BusMeetingRoomScheduleServiceImpl extends ServiceImpl<BusMeetingRoo
             detail.setHotelId(hotelId);
             details.add(detail);
         });
-        meetingRoomScheduleDetailService.saveBatch(details);
+        meetingRoomScheduleDetailService.saveBatchDetail(details);
 
         return Result.ok("创建成功!");
     }
 
 
+    /**
+     * 查询 创建数据
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    public  Result fetch(String startDate,String endDate,String hotelId){
+        List<BusMeetingRoomScheduleVo> vos = new ArrayList<>();
 
-    public  Result fetch(){
+        DateTimeFormatter struct = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime startTime = LocalDate.parse(startDate,struct).atStartOfDay();
+        LocalDate endLocalDate = LocalDate.parse(endDate,struct);
+        LocalDateTime endTime = LocalDateTime.of(endLocalDate, LocalTime.of(23,59,59));;
 
-        return Result.ok("");
+        DateTimeFormatter struct1 = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        List<BusMeetingRoom> busMeetingRooms = busMeetingRoomService.fetch(hotelId);
+        if(CollectionUtil.isEmpty(busMeetingRooms)) return Result.ok(vos);
+        List<String> meetingIds  = busMeetingRooms.stream().map(v -> v.getId()).collect(Collectors.toList());
+
+        List<BusMeetingRoomScheduleDetail> scheduleDetails =  meetingRoomScheduleDetailService.fetchByDateRange(startTime,endTime, hotelId,meetingIds);
+
+        List<String> scheduleIds =  scheduleDetails.stream().map(v -> v.getMeetingRoomScheduleId()).collect(Collectors.toList());
+        List<BusMeetingRoomSchedule> schedules = new ArrayList<>();
+        if(!CollectionUtil.isEmpty(scheduleIds)){
+            schedules =  meetingRoomScheduleMapper.selectBatchIds(scheduleIds);
+        }
+        List<BusMeetingRoomSchedule> finalSchedules = schedules;
+        busMeetingRooms.forEach(v -> {
+            BusMeetingRoomScheduleVo vo = new BusMeetingRoomScheduleVo();
+            vo.setMeetingRoomName(v.getName());
+            vo.setId(v.getId());
+            List<BusMeetingRoomScheduleDetailVo> schedule = new ArrayList<>();
+
+            //获取当前会议室下的所有 预定详情数据
+            List<BusMeetingRoomScheduleDetail> details =  scheduleDetails.stream().filter(schedul -> schedul.getMeetingRoomId().equals(v.getId())).collect(Collectors.toList());
+            for (int key = 1; key <= CouponsKeyEnum.getDictList().size(); key++) {
+                //第二层 上午下午中午
+                BusMeetingRoomScheduleDetailVo detailVo = new BusMeetingRoomScheduleDetailVo();
+                detailVo.setTimePeriod(CouponsKeyEnum.val(key).getTitle());
+
+                List<BusMeetingKeyValueVo> dataCh = new ArrayList<>();
+                //第二层结束
+                Map<String, List<MeetingRoomScheduleDetailVo>> map = new HashedMap();
+                //查询详情数据
+                int finalKey = key;
+                List<BusMeetingRoomScheduleDetail> value = details.stream().filter(detail -> detail.getTimeSpan().intValue() == finalKey).collect(Collectors.toList());
+                if (!CollectionUtil.isEmpty(value)) {
+                    //第三层开始 eg: 上午 ： 上午的所有数据
+                    value.forEach(vl -> {
+                        MeetingRoomScheduleDetailVo scheduleDetailVo = new MeetingRoomScheduleDetailVo();
+                        //生成key
+                        String value_key = vl.getMeetingDate().format(struct1);
+                        List<MeetingRoomScheduleDetailVo> scheduleDetailVos = new ArrayList<>();
+                        //如果存在这个key
+                        if (map.containsKey(value_key)) {
+                            scheduleDetailVos = map.get(value_key);
+                        }
+                        Optional<BusMeetingRoomSchedule> scheduleOptional = finalSchedules.stream().filter(sc -> sc.getId().equals(vl.getMeetingRoomScheduleId())).findFirst();
+                        if (!scheduleOptional.isPresent()) return;
+                        BusMeetingRoomSchedule vl_schedule = scheduleOptional.get();
+                        //生成数据
+                        scheduleDetailVo.setTheme(vl_schedule.getTheme());
+                        scheduleDetailVo.setDetail(vl);
+                        scheduleDetailVo.setRoomSchedule(vl_schedule);
+                        scheduleDetailVos.add(scheduleDetailVo);
+                        map.put(value_key, scheduleDetailVos);
+                    });
+                    map.forEach((map_k, map_v) -> {
+                        BusMeetingKeyValueVo valueVo = new BusMeetingKeyValueVo();
+                        valueVo.setKey(map_k);
+                        valueVo.setValue(map_v);
+                        dataCh.add(valueVo);
+                    });
+                    detailVo.setSchedule(dataCh);
+                }else{
+                    detailVo.setSchedule(new ArrayList<>());
+                }
+                schedule.add(detailVo);
+            }
+            vo.setChild(schedule);
+            vos.add(vo);
+        });
+        return Result.ok(vos);
     }
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusMeetingRoomServiceImpl.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.business.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.jeecg.modules.business.entity.BusMeetingRoom;
 import org.jeecg.modules.business.mapper.BusMeetingRoomMapper;
 import org.jeecg.modules.business.service.IBusMeetingRoomService;
@@ -7,6 +9,10 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @Description: bus_meeting_room
  * @Author: jeecg-boot
@@ -16,4 +22,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class BusMeetingRoomServiceImpl extends ServiceImpl<BusMeetingRoomMapper, BusMeetingRoom> implements IBusMeetingRoomService {
 
+    @Resource
+    private BusMeetingRoomMapper busMeetingRoomMapper;
+
+    /**
+     * 获取当前酒店的所有启用的 会议室数据
+     * @param hotelId
+     * @return
+     */
+    public List<BusMeetingRoom> fetch(String hotelId){
+        if(StringUtils.isBlank(hotelId)) return new ArrayList<>();
+        return busMeetingRoomMapper.selectList(Wrappers.<BusMeetingRoom>lambdaQuery().eq(BusMeetingRoom::getHotelId,hotelId).eq(BusMeetingRoom::getStatus, 1));
+    }
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/BusMeetingKeyValueVo.java

@@ -0,0 +1,12 @@
+package org.jeecg.modules.business.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class BusMeetingKeyValueVo {
+    private String key;
+
+    private List<MeetingRoomScheduleDetailVo> value;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/BusMeetingRoomScheduleDetailVo.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.business.vo;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class BusMeetingRoomScheduleDetailVo {
+    /**
+     * 上午 中午 下午
+     */
+     private String timePeriod;
+
+     public List<BusMeetingKeyValueVo> schedule;
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/BusMeetingRoomScheduleVo.java

@@ -0,0 +1,21 @@
+package org.jeecg.modules.business.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 会议室预定 前端VO
+ */
+@Data
+public class BusMeetingRoomScheduleVo {
+
+    /**
+     * 会议室名称
+     */
+    private String meetingRoomName;
+
+    private String id;
+
+    private List<BusMeetingRoomScheduleDetailVo>  child;
+ }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/MeetingRoomScheduleDetailVo.java

@@ -0,0 +1,13 @@
+package org.jeecg.modules.business.vo;
+
+import lombok.Data;
+import org.jeecg.modules.business.entity.BusMeetingRoomSchedule;
+import org.jeecg.modules.business.entity.BusMeetingRoomScheduleDetail;
+
+@Data
+public class MeetingRoomScheduleDetailVo {
+        private String theme;// 主题
+        private BusMeetingRoomSchedule roomSchedule;
+
+        private BusMeetingRoomScheduleDetail detail;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/DTO/CesRoomSearchDto.java

@@ -5,7 +5,7 @@ import org.jeecg.common.api.dto.BasePage;
 
 @Data
 public class CesRoomSearchDto  extends BasePage {
-     private String hotelIds;
+     private String hotelId;
 
     private String buildId;
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/controller/CesAllDayRuleMinuteController.java

@@ -21,6 +21,5 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 public class CesAllDayRuleMinuteController   extends JeecgController<CesAllDayRuleMinute, CesAllDayRuleMinuteServiceImpl> {
 
-
 }
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/service/CesRoomsServiceImpl.java

@@ -66,9 +66,9 @@ public class CesRoomsServiceImpl extends ServiceImpl<CesRoomsMapper, CesRooms> i
         if(!StringUtils.isBlank(dto.getFloorId())){
             queryWrapper.eq(CesRooms.FLOOR_ID,dto.getFloorId());
         }
-        if(!StringUtils.isBlank(dto.getHotelIds())){
-           List<String> hotelIds = Arrays.stream(dto.getHotelIds().split(",")).collect(Collectors.toList());
-           queryWrapper.in(CesRooms.HOTEL_ID, hotelIds);
+        if(!StringUtils.isBlank(dto.getHotelId())){
+//           List<String> hotelIds = Arrays.stream(dto.getHotelId().split(",")).collect(Collectors.toList());
+           queryWrapper.eq(CesRooms.HOTEL_ID, dto.getHotelId());
         }
         queryWrapper.eq(CesRooms.INVALID,false);
         queryWrapper.orderByDesc(CesRooms.SORT, CesRooms.CREATEAT);