boyue2025/xiongan-meeting
3
0
Fork 0
mirror of https://gitee.com/elegant_wings/xiongan-meeting.git synced 2025-06-21 08:29:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

新增了定时任务，修改了用户信息

Browse Source
This commit is contained in:
chendaze 2024-03-30 15:17:31 +08:00
parent c9a969ddbd
commit 812b3ec3a8
23 changed files with 446 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ics-admin/src/main/java/com/ics/admin/controller/CustomerStaffController.java
View File

@ -183,15 +183,15 @@ public class CustomerStaffController extends BaseController {
}
if (CollUtil.isNotEmpty(ids)) {
for (Long id : ids) {
UserEquipment equipment = userEquipmentService.selectUserAndEquipment(Long.valueOf(icsCustomerStaff.getMobile()), id);
if (null == equipment) {
// UserEquipment equipment = userEquipmentService.selectUserAndEquipment(Long.valueOf(icsCustomerStaff.getMobile()), id);
// if (null == equipment) {
UserEquipment userEquipment = new UserEquipment();
userEquipment.setEquipmentId(id);
userEquipment.setUserId(Long.valueOf(icsCustomerStaff.getMobile()));
userEquipment.setStartTime(customer.getStartDate());
userEquipment.setEndDate(customer.getEndDate());
userEquipmentService.insertUserEquipment(userEquipment);
}
// }
}
}
}

110
ics-admin/src/main/java/com/ics/admin/controller/meeting/EquipmentController.java
View File

@ -1,6 +1,8 @@
package com.ics.admin.controller.meeting;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ObjectUtil;
import com.ics.admin.domain.BuildingDetail;
import com.ics.admin.domain.Customer;
import com.ics.admin.domain.Room;
@ -64,6 +66,15 @@ public class EquipmentController extends BaseController {
@Autowired
private IDetailEquipmentService detailEquipmentService;
@Autowired
private IRoomContentService roomContentService;
@Autowired
private IReservationService reservationService;
@Autowired
private IReservationPersonService reservationPersonService;
/**
* 查询设备
*/
@ -117,27 +128,37 @@ public class EquipmentController extends BaseController {
public R addSave(@RequestBody Equipment equipment) {
int i = equipmentService.insertEquipment(equipment);
Assert.isTrue(i > 0, "添加失败");
if (equipment.getRoomId() != null) {
RoomEquipment roomEquipment = new RoomEquipment();
roomEquipment.setEquipmentId(equipment.getId());
roomEquipment.setRoomId(equipment.getRoomId());
int i1 = roomEquipmentService.insertRoomEquipment(roomEquipment);
Assert.isTrue(i1 > 0, "添加失败");
//给用户添加权限,先去查询 这个房间是否已经绑定企业
Room room = roomService.selectRoomById(equipment.getRoomId());
addPersonDeviceByCustomer(room,equipment.getId());
addPersonDeviceByRoomContent(room,equipment.getId());
} else {
DetailEquipment detailEquipment = new DetailEquipment();
detailEquipment.setEquipmentId(equipment.getId());
detailEquipment.setBuildingDetailId(equipment.getBuildId());
int i1 = detailEquipmentService.insertDetailEquipment(detailEquipment);
Assert.isTrue(i1 > 0, "添加失败");
//查询所有的房间
List<Room> rooms = roomService.selectRoomByBuildId(equipment.getBuildId());
for (Room room : rooms) {
addPersonDeviceByCustomer(room,equipment.getId());
addPersonDeviceByRoomContent(room,equipment.getId());
}
}
return toAjax(i);
}
/**
* 修改保存设备
*/
@ -150,13 +171,34 @@ public class EquipmentController extends BaseController {
roomEquipment.setEquipmentId(equipment.getId());
roomEquipment.setRoomId(equipment.getRoomId());
Equipment equipment1 = equipmentService.selectEquipmentById(equipment.getId());
if (!ObjectUtil.equals(equipment1.getRoomId(),equipment.getRoomId()) ) {
Room room = roomService.selectRoomById(equipment.getRoomId());
addPersonDeviceByCustomer(room,equipment.getId());
addPersonDeviceByRoomContent(room,equipment.getId());
}
RoomEquipment roomEquipment1 = roomEquipmentService.selectByEquipmentId(equipment.getId());
if (null != roomEquipment1) {
roomEquipment1.setRoomId(equipment.getRoomId());
int i1 = roomEquipmentService.updateRoomEquipment(roomEquipment1);
Assert.isTrue(i1 > 0, "修改失败");
}
} else {
Equipment equipment1 = equipmentService.selectEquipmentById(equipment.getId());
if (!ObjectUtil.equals(equipment1.getBuildId(),equipment.getBuildId()) ) {
List<Room> rooms = roomService.selectRoomByBuildId(equipment.getBuildId());
for (Room room : rooms) {
addPersonDeviceByCustomer(room,equipment.getId());
addPersonDeviceByRoomContent(room,equipment.getId());
}
}
DetailEquipment detailEquipment = new DetailEquipment();
detailEquipment.setEquipmentId(equipment.getId());
detailEquipment.setBuildingDetailId(equipment.getBuildId());
@ -168,13 +210,65 @@ public class EquipmentController extends BaseController {
}
}
// RoomEquipment roomEquipment = new RoomEquipment();
// roomEquipment.setEquipmentId(equipment.getId());
// roomEquipment.setRoomId(equipment.getRoomId());
// roomEquipmentService.updateRoomEquipment(roomEquipment);
return toAjax(equipmentService.updateEquipment(equipment));
}
//根据企业id新增用户设备
public void addPersonDeviceByCustomer(Room room,Long deviceId) {
if (room != null) {
Customer customer = customerService.selectByRoomId(room.getId());
if (customer != null) {
List<IcsCustomerStaff> icsCustomerStaffs = staffService.selectUserByCustomer(customer.getId());
if (CollUtil.isNotEmpty(icsCustomerStaffs)) {
List<Long> ids = icsCustomerStaffs.stream().map(item -> {
return item.getId();
}).collect(Collectors.toList());
for (Long id : ids) {
UserEquipment userEquipment = new UserEquipment();
userEquipment.setEquipmentId(deviceId);
userEquipment.setUserId(id);
userEquipment.setStartTime(customer.getStartDate());
userEquipment.setEndDate(customer.getEndDate());
userEquipmentService.insertUserEquipment(userEquipment);
}
}
}
}
}
//根据会议室新增用户设备
public void addPersonDeviceByRoomContent(Room room,Long deviceId){
//先查出会议室的房间号
RoomContent roomContent = roomContentService.selectByRoomId(room.getId());
if (roomContent != null){
//查询会议室的预约情况
List<Reservation> reservations =reservationService.selectByRoomContent(roomContent);
if (CollUtil.isNotEmpty(reservations)){
for (Reservation reservation : reservations) {
List<ReservationPerson> reservations1 = reservationPersonService.selectListByReservationId(reservation.getId());
for (ReservationPerson reservationPerson : reservations1) {
UserEquipment userEquipment = new UserEquipment();
userEquipment.setEquipmentId(deviceId);
userEquipment.setUserId(reservationPerson.getUserId());
userEquipment.setStartTime(reservation.getStartTime());
userEquipment.setEndDate(reservation.getEndDate());
userEquipmentService.insertUserEquipment(userEquipment);
UserEquipment userEquipment1 = new UserEquipment();
userEquipment1.setEquipmentId(deviceId);
userEquipment1.setUserId(reservationPerson.getParticipantId());
userEquipment1.setStartTime(reservation.getStartTime());
userEquipment1.setEndDate(reservation.getEndDate());
userEquipmentService.insertUserEquipment(userEquipment1);
}
}
}
}
}
/**
* 删除设备
*/

1
ics-admin/src/main/java/com/ics/admin/domain/Customer.java
View File

@ -415,6 +415,7 @@ public class Customer extends BaseEntity<Customer> {
/**
* 关联园区
*/
@TableField(exist = false)
private Park park;
@TableField(exist = false)

2
ics-admin/src/main/java/com/ics/admin/service/ICustomerService.java
View File

@ -59,4 +59,6 @@ public interface ICustomerService extends IService<Customer> {
* @return 结果
*/
int deleteCustomerById(Long id);
Customer selectByRoomId(Long id);
}

2
ics-admin/src/main/java/com/ics/admin/service/IRoomService.java
View File

@ -75,4 +75,6 @@ public interface IRoomService extends IService<Room> {
* @return
*/
List<Room> selectNotRentRooms(Long deptId);
List<Room> selectRoomByBuildId(Long buildId);
}

10
ics-admin/src/main/java/com/ics/admin/service/impl/CustomerServiceImpl.java
View File

@ -2,6 +2,7 @@ package com.ics.admin.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ics.admin.domain.Customer;
import com.ics.admin.mapper.CustomerMapper;
@ -89,4 +90,13 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
public int deleteCustomerById(Long id) {
return customerMapper.deleteById(id);
}
@Override
public Customer selectByRoomId(Long id) {
QueryWrapper<Customer> queryWrapper =new QueryWrapper<>();
queryWrapper.eq("room_id",id);
return customerMapper.selectOne(queryWrapper);
}
}

9
ics-admin/src/main/java/com/ics/admin/service/impl/RoomServiceImpl.java
View File

@ -119,5 +119,14 @@ public class RoomServiceImpl extends ServiceImpl<RoomMapper, Room> implements IR
return roomMapper.selectList(queryWrapper);
}
@Override
public List<Room> selectRoomByBuildId(Long buildId) {
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("status", Room.Status.YES.getValue());
queryWrapper.eq("building_detail_Id", buildId);
return roomMapper.selectList(queryWrapper);
}
}

18
ics-admin/src/main/java/com/ics/admin/service/impl/UserEquipmentServiceImpl.java
View File

@ -1,6 +1,7 @@
package com.ics.admin.service.impl;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
@ -10,6 +11,7 @@ import java.util.stream.Collectors;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
@ -88,8 +90,8 @@ public class UserEquipmentServiceImpl extends ServiceImpl<UserEquipmentMapper, U
@Override
public List<UserEquipment> selectUserEquipmentList(UserEquipment userEquipment) {
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("equipment_id",userEquipment.getEquipmentId());
queryWrapper.eq("user_id",userEquipment.getUserId());
queryWrapper.eq(null != userEquipment.getEquipmentId(),"equipment_id",userEquipment.getEquipmentId());
queryWrapper.eq(null != userEquipment.getUserId(),"user_id",userEquipment.getUserId());
return userEquipmentMapper.selectList(queryWrapper);
}
@ -142,7 +144,7 @@ public class UserEquipmentServiceImpl extends ServiceImpl<UserEquipmentMapper, U
public List<UserEquipment> getEquipmentByUserId(Long userId) {
List<UserEquipment> list = baseMapper.selectList(new QueryWrapper<UserEquipment>().eq("user_id", userId));
List<UserEquipment> list = baseMapper.selectList(new QueryWrapper<UserEquipment>().eq("user_id", userId).groupBy("equipment_id"));
if (CollUtil.isEmpty(list)) {
return list;
}
@ -193,6 +195,16 @@ public class UserEquipmentServiceImpl extends ServiceImpl<UserEquipmentMapper, U
return userEquipmentMapper.selectOne(wrapper);
}
@Override
public int selectCountByUserIdAndDeviceId(UserEquipment userEquipment1) {
QueryWrapper<UserEquipment> wrapper = new QueryWrapper<>();
wrapper.eq("equipment_id", userEquipment1.getEquipmentId());
wrapper.eq("user_id", userEquipment1.getUserId());
wrapper.gt("end_date", DateUtil.date());
wrapper.lt("start_time", DateUtil.date());
return userEquipmentMapper.selectCount(wrapper);
}
public void updateDeviceDataSource(List<Equipment> equipments) {
RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();

8
ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ReservationPersonServiceImpl.java
View File

@ -172,10 +172,10 @@ public class ReservationPersonServiceImpl extends ServiceImpl<ReservationPersonM
}
@Override
public List<Reservation> selectListByReservationId(List<Long> collect) {
QueryWrapper<Reservation> queryWrapper = new QueryWrapper<>();
queryWrapper.in("id",collect);
return reservationMapper.selectList(queryWrapper);
public List<ReservationPerson> selectListByReservationId(Long collect) {
QueryWrapper<ReservationPerson> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("reservation_id",collect);
return reservationPersonMapper.selectList(queryWrapper);
}
}

9
ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ReservationServiceImpl.java
View File

@ -273,8 +273,13 @@ public class ReservationServiceImpl extends ServiceImpl<ReservationMapper, Reser
}
@Override
public List<Reservation> selectByRoomContent(RoomContent roomContent) {
QueryWrapper<Reservation> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("room_content_id",roomContent.getId());
queryWrapper.gt("start_time",new Date());
return reservationMapper.selectList(queryWrapper);
}
/**

8
ics-admin/src/main/java/com/ics/admin/service/impl/meeting/RoomContentServiceImpl.java
View File

@ -409,4 +409,12 @@ public class RoomContentServiceImpl extends ServiceImpl<RoomContentMapper, RoomC
return reservations;
}
@Override
public RoomContent selectByRoomId(Long id) {
QueryWrapper<RoomContent> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("room_id",id);
return roomContentMapper.selectOne(queryWrapper);
}
}

6
ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ShowroomRecordServiceImpl.java
View File

@ -105,14 +105,14 @@ public class ShowroomRecordServiceImpl extends ServiceImpl<ShowroomRecordMapper,
ArrayList<ShowroomRecordDTO> list = new ArrayList<>();
// 根据最近七天查询数据
showroomRecord.setShowroomId(1L);
List<Date> dates = showroomRecordMapper.selectListByDate(showroomRecord.getShowroomId());
for (Date dateTime : dates) {
ShowroomRecordDTO showroomRecordDTO = new ShowroomRecordDTO();
showroomRecordDTO.setNowDate(DateUtil.format(dateTime,"yyyy-MM-dd"));
// 查询会议室记录
QueryWrapper<ShowroomRecord> wrapper = new QueryWrapper<>();
wrapper.eq("showroom_id",5L);
wrapper.eq("showroom_id",1L);
wrapper.gt("start_time", DateUtil.format(dateTime,"yyyy-MM-dd")+ " 00:00:00");
wrapper.lt("end_date",DateUtil.format(dateTime,"yyyy-MM-dd") + " 23:59:59");
List<ShowroomRecord> showroomRecords = showroomRecordMapper.selectList(wrapper);
@ -129,7 +129,7 @@ public class ShowroomRecordServiceImpl extends ServiceImpl<ShowroomRecordMapper,
QueryWrapper<ShowroomRecord> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("showroom_id",5L);
queryWrapper.eq("showroom_id",1L);
Date startTime = showroomRecord.getStartTime();
Date endDate = showroomRecord.getEndDate();

2
ics-admin/src/main/java/com/ics/admin/service/meeting/IReservationPersonService.java
View File

@ -65,6 +65,6 @@ public interface IReservationPersonService extends IService<ReservationPerson> {
IPage<Reservation> selectListByParticipantId(Long userId, Integer page, Integer limit);
List<Reservation> selectListByReservationId(List<Long> collect);
List<ReservationPerson> selectListByReservationId(Long reservationId);
}

3
ics-admin/src/main/java/com/ics/admin/service/meeting/IReservationService.java
View File

@ -3,6 +3,7 @@ package com.ics.admin.service.meeting;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ics.admin.domain.meeting.Reservation;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ics.admin.domain.meeting.RoomContent;
import com.ics.admin.domain.meeting.vo.MeetingAmountVo;
import java.math.BigDecimal;
@ -72,4 +73,6 @@ public interface IReservationService extends IService<Reservation> {
Reservation selectByOrderNumber(String outTradeNo);
void selectTimeByMeetingRoomTime(Reservation reservation);
List<Reservation> selectByRoomContent(RoomContent roomContent);
}

2
ics-admin/src/main/java/com/ics/admin/service/meeting/IRoomContentService.java
View File

@ -77,4 +77,6 @@ public interface IRoomContentService extends IService<RoomContent> {
int addItemServe(RoomItemByRoom roomItemByRoom);
List<Reservation> todayMeeting(RoomContent roomContent);
RoomContent selectByRoomId(Long id);
}

2
ics-admin/src/main/java/com/ics/admin/service/meeting/IUserEquipmentService.java
View File

@ -64,4 +64,6 @@ public interface IUserEquipmentService extends IService<UserEquipment> {
int deleteUserEquipmentByEquipmentId(Long id);
UserEquipment selectUserAndEquipment(Long userId, Long id);
int selectCountByUserIdAndDeviceId(UserEquipment userEquipment1);
}

41
ics-quartz/src/main/java/com/ics/quartz/task/DeviceTask.java Normal file
View File

@ -0,0 +1,41 @@
package com.ics.quartz.task;
import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateUtil;
import com.ics.admin.domain.meeting.Reservation;
import com.ics.admin.domain.meeting.UserEquipment;
import com.ics.admin.service.meeting.IUserEquipmentService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.Date;
import java.util.List;
@Slf4j
@Component("deviceTask")
public class DeviceTask {
@Autowired
private IUserEquipmentService userEquipmentService;
// 定时删除用户与设备关联数据
public void removeUserDevice() {
log.info("定时删除用户与设备关联数据...");
UserEquipment userEquipment = new UserEquipment();
List<UserEquipment> equipments = userEquipmentService.selectUserEquipmentList(userEquipment);
for (UserEquipment userEquipment1 : equipments) {
Date endDate = userEquipment1.getEndDate();
int compare = DateUtil.compare(DateUtil.date(), endDate);
if (compare > 0) {
userEquipmentService.deleteUserEquipmentById(userEquipment1.getId());
log.info("删除用户与设备关联数据成功");
log.info("定时删除用户与设备关联数据");
}
}
}
}

37
ics-quartz/src/main/java/com/ics/quartz/task/MeetingStatusTask.java Normal file
View File

@ -0,0 +1,37 @@
package com.ics.quartz.task;
import cn.hutool.core.date.DateUtil;
import com.ics.admin.domain.meeting.Reservation;
import com.ics.admin.service.meeting.IReservationService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.Date;
import java.util.List;
@Slf4j
@Component("meetingStatusTask")
public class MeetingStatusTask {
@Autowired
private IReservationService iReservationService;
/**
* 开会开始状态
*/
public void meetingEndStatus() {
log.info("执行开会结束状态任务");
Reservation reservation = new Reservation();
reservation.setStatusValue(2);
List<Reservation> reservations = iReservationService.selectReservationList(reservation);
for (Reservation reservation1 : reservations) {
Date endDate = reservation1.getEndDate();
int compare = DateUtil.compare(DateUtil.date(), endDate);
if (compare > 0) {
reservation1.setStauts(Reservation.Status.ENDED);
iReservationService.updateReservation(reservation1);
log.info("执行开会结束状态任务");
}
}
}
}

65
ics-quartz/src/main/java/com/ics/quartz/task/PayTimeOutTask.java Normal file
View File

@ -0,0 +1,65 @@
package com.ics.quartz.task;
import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateUtil;
import com.ics.admin.domain.meeting.Reservation;
import com.ics.admin.service.meeting.IReservationService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.Date;
import java.util.List;
@Slf4j
@Component("payTimeOutTask")
public class PayTimeOutTask {
@Autowired
private IReservationService iReservationService;
// 支付超时处理
public void payTimeOut() {
log.info("执行支付超时处理任务");
// 处理逻辑
Reservation reservation = new Reservation();
reservation.setStatusValue(0);
List<Reservation> reservations = iReservationService.selectReservationList(reservation);
for (Reservation reservation1 : reservations) {
Date endDate = reservation1.getEndDate();
DateUtil.offset(endDate, DateField.MINUTE, 5);
int compare = DateUtil.compare(DateUtil.date(), endDate);
if (compare < 0) {
reservation1.setStauts(Reservation.Status.CANCELED);
iReservationService.updateReservation(reservation1);
log.info("支付超时处理任务执行成功");
}
}
}
/**
* 开会开始状态
*/
public void meetingStartStatus() {
log.info("执行开会开始状态任务");
Reservation reservation = new Reservation();
reservation.setStatusValue(1);
List<Reservation> reservations = iReservationService.selectReservationList(reservation);
for (Reservation reservation1 : reservations) {
Date startTime = reservation1.getStartTime();
Date endDate = reservation1.getEndDate();
boolean in = DateUtil.isIn(DateUtil.date(), startTime, endDate);
if (in) {
reservation1.setStauts(Reservation.Status.ONGOING);
iReservationService.updateReservation(reservation1);
log.info("执行开会开始状态任务");
}
}
}
}

7
ics-web/src/main/java/com/ics/controller/mobile/WxLoginAPIController.java
View File

@ -176,10 +176,9 @@ public class WxLoginAPIController extends BaseController {
//检查是否是否存在
IcsCustomerStaff icsCustomerStaff = new IcsCustomerStaff();
icsCustomerStaff.setId(userId);
List<IcsCustomerStaff> list = icsCustomerStaffService.selectIcsCustomerStaffList(icsCustomerStaff);
if(list.size()>0){
IcsCustomerStaff icsCustomerStaff1 = list.get(0);
return R.ok().put("data",icsCustomerStaff1);
IcsCustomerStaff customerStaff = icsCustomerStaffService.selectIcsCustomerStaffById(userId);
if(null !=customerStaff){
return R.ok().put("data",customerStaff);
}else {
return R.error("获取微信用户数据失败");
}

16
ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiEquipmentController.java
View File

@ -62,20 +62,12 @@ public class ApiEquipmentController extends BaseController {
UserEquipment userEquipment1 = new UserEquipment();
userEquipment1.setEquipmentId(roomRecord.getDeviceId());
userEquipment1.setUserId(roomRecord.getUserId());
List<UserEquipment> equipments = userEquipmentService.selectUserEquipmentList(userEquipment1);
if (CollUtil.isNotEmpty(equipments)){
//循环判断当前时间是否在时间段
for (UserEquipment userEquipment : equipments) {
boolean in = DateUtil.isIn(DateUtil.date(), userEquipment.getStartTime(), userEquipment.getEndDate());
if (!in){
return R.error("不在开门时间段");
int count =userEquipmentService.selectCountByUserIdAndDeviceId(userEquipment1);
if (count == 0){
return R.error("您没有权限开门,不在开门时间内");
}
}
}
String ip = equipmentService.selectEquipmentById(roomRecord.getDeviceId()).getIp();

35
ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomContentController.java
View File

@ -148,9 +148,9 @@ public class ApiRoomContentController extends BaseController {
}
/**
* 查询空闲的会议室
*
* @param reservation
* @return
*/
@ -270,8 +270,6 @@ public class ApiRoomContentController extends BaseController {
}
if (CollUtil.isNotEmpty(ids)) {
for (Long id : ids) {
UserEquipment equipment = userEquipmentService.selectUserAndEquipment(reservation.getUserId(), id);
if (null == equipment) {
UserEquipment userEquipment = new UserEquipment();
userEquipment.setEquipmentId(id);
userEquipment.setUserId(reservation.getUserId());
@ -281,7 +279,6 @@ public class ApiRoomContentController extends BaseController {
}
}
}
}
}
Long id = reservation.getId();
@ -327,13 +324,15 @@ public class ApiRoomContentController extends BaseController {
}
if (CollUtil.isNotEmpty(ids)) {
for (Long id : ids) {
UserEquipment equipment = userEquipmentService.selectUserAndEquipment(reservation.getUserId(), id);
if (null == equipment) {
// UserEquipment equipment = userEquipmentService.selectUserAndEquipment(reservation.getUserId(), id);
// if (null == equipment) {
UserEquipment userEquipment = new UserEquipment();
userEquipment.setEquipmentId(id);
userEquipment.setUserId(reservation.getUserId());
userEquipment.setStartTime(reservation.getStartTime());
userEquipment.setEndDate(reservation.getEndDate());
userEquipmentService.insertUserEquipment(userEquipment);
}
// }
}
}
}
@ -496,15 +495,15 @@ public class ApiRoomContentController extends BaseController {
}
if (CollUtil.isNotEmpty(ids)) {
for (Long id : ids) {
UserEquipment equipment = userEquipmentService.selectUserAndEquipment(reservationPerson.getReservationId(), id);
if (null == equipment) {
// UserEquipment equipment = userEquipmentService.selectUserAndEquipment(reservationPerson.getReservationId(), id);
// if (null == equipment) {
UserEquipment userEquipment = new UserEquipment();
userEquipment.setEquipmentId(id);
userEquipment.setUserId(reservationPerson.getParticipantId());
userEquipment.setStartTime(reservation.getStartTime());
userEquipment.setEndDate(reservation.getEndDate());
userEquipmentService.insertUserEquipment(userEquipment);
}
// }
}
}
@ -566,15 +565,15 @@ public class ApiRoomContentController extends BaseController {
}
if (CollUtil.isNotEmpty(ids)) {
for (Long id : ids) {
UserEquipment equipment =userEquipmentService.selectUserAndEquipment(reservation.getUserId(), id);
if (null == equipment){
// UserEquipment equipment =userEquipmentService.selectUserAndEquipment(reservation.getUserId(), id);
// if (null == equipment){
UserEquipment userEquipment = new UserEquipment();
userEquipment.setEquipmentId(id);
userEquipment.setStartTime(reservation.getStartTime());
userEquipment.setEndDate(reservation.getEndDate());
userEquipment.setUserId(reservation.getUserId());
userEquipmentService.insertUserEquipment(userEquipment);
}
// }
}
}
}
@ -600,11 +599,6 @@ public class ApiRoomContentController extends BaseController {
}
public static boolean timeIsInRound(String str1, String start, String end) {
SimpleDateFormat df = new SimpleDateFormat("HH:mm:ss");
Date now = null;
@ -636,11 +630,6 @@ public class ApiRoomContentController extends BaseController {
}
}

1
ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiVisitorController.java
View File

@ -197,7 +197,6 @@ public class ApiVisitorController extends BaseController {
VisitorPerson visitorPerson = visitorPersonService.selectReservationPersonById(person.getId());
Assert.isTrue(visitorPerson.getStatus() == 0, "该访客已审核");
person.setStatus(1);
person.setReviewers(person.getUserId());
person.setReviewersTime(new Date());
int update = visitorPersonService.updateVisitorPersonStatus(person);