From e5a866ab20ceaa09e367e3d6a2935f762c2c3d8d Mon Sep 17 00:00:00 2001 From: chendaze <1824191732@qq.com> Date: Wed, 3 Apr 2024 14:28:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=AF=B9=E5=BA=94PC?= =?UTF-8?q?=20=E9=A1=B5=E9=9D=A2=E7=9A=84bug=EF=BC=8C=E5=92=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E4=BA=86=E5=A4=9A=E5=9B=AD=E5=8C=BA=E7=9A=84=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/BuildingController.java | 6 +- .../ics/admin/controller/ClueController.java | 1 + .../admin/controller/CustomerController.java | 57 ++-- .../controller/CustomerStaffController.java | 279 +++++++++++++++--- .../ics/admin/controller/ParkController.java | 13 + .../meeting/EquipmentController.java | 90 ++++-- .../meeting/ReservationController.java | 30 +- .../meeting/RoomContentController.java | 85 +++++- .../meeting/RoomItemController.java | 12 + .../meeting/RoomServeController.java | 13 + .../meeting/ShowroomController.java | 39 +++ .../meeting/ShowroomRecordController.java | 42 ++- .../controller/meeting/TicketController.java | 16 + .../meeting/VisitorPersonController.java | 43 ++- .../java/com/ics/admin/domain/Customer.java | 12 +- .../main/java/com/ics/admin/domain/Room.java | 6 + .../ics/admin/domain/meeting/Equipment.java | 10 + .../ics/admin/domain/meeting/Reservation.java | 3 + .../ics/admin/domain/meeting/RoomContent.java | 13 + .../ics/admin/domain/meeting/Showroom.java | 4 + .../admin/domain/meeting/ShowroomRecord.java | 4 + .../admin/domain/meeting/VisitorPerson.java | 3 + .../admin/mapper/IcsCustomerStaffMapper.java | 1 + .../mapper/meeting/UserEquipmentMapper.java | 2 + .../service/IIcsCustomerStaffService.java | 4 + .../impl/IcsCustomerStaffServiceImpl.java | 62 +++- .../service/impl/RoomServeServiceImpl.java | 2 + .../admin/service/impl/TicketServiceImpl.java | 3 + .../impl/UserEquipmentServiceImpl.java | 26 +- .../impl/meeting/EquipmentServiceImpl.java | 15 +- .../meeting/IVisitorPersonServiceImpl.java | 5 + .../impl/meeting/ReservationServiceImpl.java | 5 + .../impl/meeting/RoomContentServiceImpl.java | 4 + .../impl/meeting/RoomItemServiceImpl.java | 3 + .../meeting/ShowroomRecordServiceImpl.java | 8 +- .../impl/meeting/ShowroomServiceImpl.java | 4 + .../service/meeting/IEquipmentService.java | 4 + .../src/main/resources/excel/用户导入模板.xls | Bin 0 -> 20480 bytes .../resources/mapper/admin/BuildingMapper.xml | 1 + .../resources/mapper/admin/CustomerMapper.xml | 3 + .../mapper/admin/IcsCustomerStaffMapper.xml | 7 + .../resources/mapper/admin/RoomMapper.xml | 6 + .../mapper/admin/meeting/EquipmentMapper.xml | 17 +- .../admin/meeting/ReservationMapper.xml | 2 +- .../admin/meeting/RoomContentMapper.xml | 2 + .../admin/meeting/UserEquipmentMapper.xml | 8 +- .../ics/common/core/domain/BaseEntity.java | 6 +- .../common/core/domain/IcsCustomerStaff.java | 18 +- .../com/ics/common/utils/poi/ExcelUtil.java | 7 + .../ics/system/controller/UserController.java | 10 +- .../main/java/com/ics/system/domain/User.java | 7 + .../com/ics/system/mapper/UserMapper.java | 3 + .../com/ics/system/service/IUserService.java | 4 + .../system/service/impl/UserServiceImpl.java | 9 + .../resources/mapper/system/UserMapper.xml | 8 +- .../mobile/WxLoginAPIController.java | 16 +- .../meeting/ApiRoomContentController.java | 4 +- .../mobile/meeting/ApiRoomController.java | 19 +- .../mobile/meeting/ApiVisitorController.java | 65 ++-- 59 files changed, 1001 insertions(+), 150 deletions(-) create mode 100644 ics-admin/src/main/resources/excel/用户导入模板.xls diff --git a/ics-admin/src/main/java/com/ics/admin/controller/BuildingController.java b/ics-admin/src/main/java/com/ics/admin/controller/BuildingController.java index 92d3b29..8e820a2 100644 --- a/ics-admin/src/main/java/com/ics/admin/controller/BuildingController.java +++ b/ics-admin/src/main/java/com/ics/admin/controller/BuildingController.java @@ -10,6 +10,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.wf.jwtp.annotation.RequiresPermissions; +import java.util.List; + /** * 楼宇管理 提供者 * @@ -27,6 +29,7 @@ public class BuildingController extends BaseController { private IParkService parkService; + /** * 查询楼宇管理 */ @@ -44,7 +47,8 @@ public class BuildingController extends BaseController { public R list(Building building) { startPage(); building.setDeleteFlag(0); - return result(buildingService.selectBuildingList(building)); + List buildings = buildingService.selectBuildingList(building); + return result(buildings); } diff --git a/ics-admin/src/main/java/com/ics/admin/controller/ClueController.java b/ics-admin/src/main/java/com/ics/admin/controller/ClueController.java index b182e15..5d834b8 100644 --- a/ics-admin/src/main/java/com/ics/admin/controller/ClueController.java +++ b/ics-admin/src/main/java/com/ics/admin/controller/ClueController.java @@ -130,5 +130,6 @@ public class ClueController extends BaseController { context.putVar("date", "2031-04-15"); context.putVar("clueList", clueList); new ExcelView("excel/招商线索导出模板.xls", "招商线索导出", context); + } } diff --git a/ics-admin/src/main/java/com/ics/admin/controller/CustomerController.java b/ics-admin/src/main/java/com/ics/admin/controller/CustomerController.java index 5fe93e5..df51ab6 100644 --- a/ics-admin/src/main/java/com/ics/admin/controller/CustomerController.java +++ b/ics-admin/src/main/java/com/ics/admin/controller/CustomerController.java @@ -1,6 +1,8 @@ package com.ics.admin.controller; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Maps; @@ -15,6 +17,7 @@ import com.ics.common.constant.Constants; import com.ics.common.core.controller.BaseController; import com.ics.common.core.domain.IcsCustomerStaff; import com.ics.common.core.domain.R; +import com.ics.common.core.text.Convert; import com.ics.common.utils.ValidatorUtils; import com.ics.common.utils.http.HttpUtils; import com.ics.system.domain.User; @@ -24,8 +27,11 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import org.wf.jwtp.annotation.RequiresPermissions; +import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** @@ -98,10 +104,16 @@ public class CustomerController extends BaseController { public Customer get(@PathVariable("id") Long id) { Customer customer = customerService.selectCustomerById(id); - Room room = roomService.selectRoomById(customer.getRoomId()); - if (room != null){ - customer.setRoomName(room.getName()); - } + + String roomId = customer.getRoomId(); + List roomIds = StrUtil.split(roomId, ','); + + List collect = roomIds.stream().map(item -> Long.valueOf(item)).collect(Collectors.toList()); + customer.setRoomIds(collect); + String buildId = customer.getBuildId(); + List buildIds = StrUtil.split(buildId, ','); + List collect1 = buildIds.stream().map(Long::valueOf).collect(Collectors.toList()); + customer.setBuildingDetailIds(collect1); return customer; } @@ -125,17 +137,9 @@ public class CustomerController extends BaseController { public R allList(Customer customer) { List customerList = customerService.selectCustomerList(customer); - - - List customerMaps = Lists.newArrayList(); for (Customer item : customerList) { - Long roomId = item.getRoomId(); - - - - Map customerMap = Maps.newHashMap(); getCustomerMap(customerMap, item); customerMaps.add(customerMap); @@ -183,16 +187,33 @@ public class CustomerController extends BaseController { // } - customer.setParkId(1L); - customer.setTenantId(1L); + //房间转成逗号隔开 + List buildingDetailIds = customer.getBuildingDetailIds(); + + String buildIds = CollUtil.join(buildingDetailIds, ","); + + customer.setBuildId(buildIds); + List roomIds = customer.getRoomIds(); + + String roomids = CollUtil.join(roomIds, ","); + customer.setRoomId(roomids); + + customer.setParkId(customer.getParkId()); + customer.setTenantId(customer.getTenantId()); ValidatorUtils.validateEntity(customer); customer.setCreateBy(getLoginName()); int i = customerService.insertCustomer(customer); //如果新增成功，把房间的状态改为已启用 - Room room = roomService.selectRoomById(customer.getRoomId()); - room.setStatus(Room.Status.YES); - int i1 = roomService.updateRoom(room); - Assert.isTrue(i1 > 0, "修改房间已租状态失败"); + for (Long roomId : roomIds) { + Room room = roomService.selectRoomById(roomId); + room.setStatus(Room.Status.YES); + int i1 = roomService.updateRoom(room); + Assert.isTrue(i1 > 0, "修改房间已租状态失败"); + + } + + + return toAjax(i); } diff --git a/ics-admin/src/main/java/com/ics/admin/controller/CustomerStaffController.java b/ics-admin/src/main/java/com/ics/admin/controller/CustomerStaffController.java index dec1190..9a1176b 100644 --- a/ics-admin/src/main/java/com/ics/admin/controller/CustomerStaffController.java +++ b/ics-admin/src/main/java/com/ics/admin/controller/CustomerStaffController.java @@ -1,31 +1,53 @@ package com.ics.admin.controller; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; -import com.ics.admin.domain.Customer; -import com.ics.admin.domain.Room; +import cn.hutool.core.util.StrUtil; +import com.alibaba.excel.EasyExcel; +import com.ics.admin.domain.*; import com.ics.admin.domain.meeting.*; -import com.ics.admin.service.ICustomerService; -import com.ics.admin.service.IIcsCustomerStaffService; -import com.ics.admin.service.IRoomService; -import com.ics.admin.service.meeting.IDetailEquipmentService; -import com.ics.admin.service.meeting.IRoomContentService; -import com.ics.admin.service.meeting.IRoomEquipmentService; -import com.ics.admin.service.meeting.IUserEquipmentService; +import com.ics.admin.listener.ImportPowerWaterFeeListener; +import com.ics.admin.service.*; +import com.ics.admin.service.meeting.*; +import com.ics.admin.utils.ExcelView; +import com.ics.admin.vo.ImportPowerWaterFeeVO; import com.ics.common.constant.Constants; import com.ics.common.core.controller.BaseController; +import com.ics.common.core.domain.BaseEntity; import com.ics.common.core.domain.IcsCustomerStaff; import com.ics.common.core.domain.R; +import com.ics.common.utils.DateUtils; +import com.ics.common.utils.GuavaCacheUtil; +import com.ics.common.utils.StringUtils; +import com.ics.common.utils.poi.ExcelUtil; import com.ics.system.domain.User; +import com.ics.system.service.ICurrentUserService; import com.ics.system.service.IUserService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.compress.utils.Lists; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.ss.usermodel.WorkbookFactory; +import org.jxls.common.Context; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import org.wf.jwtp.annotation.Ignore; import org.wf.jwtp.annotation.RequiresPermissions; +import org.wf.jwtp.util.SubjectUtil; +import javax.servlet.http.HttpServletResponse; +import java.io.BufferedInputStream; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import java.net.URLEncoder; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** * 企业员工 提供者 @@ -33,6 +55,7 @@ import java.util.List; * @author ics * @date 2024-02-19 */ +@Slf4j @RestController @RequestMapping("/admin/staff") public class CustomerStaffController extends BaseController { @@ -52,6 +75,9 @@ public class CustomerStaffController extends BaseController { @Autowired private IRoomService roomService; + @Autowired + private ICurrentUserService currentUserService; + @Autowired private IRoomEquipmentService roomEquipmentService; @@ -61,6 +87,18 @@ public class CustomerStaffController extends BaseController { @Autowired private IUserEquipmentService userEquipmentService; + @Autowired + private IEquipmentService equipmentService; + + @Autowired + private IBuildingDetailService buildingDetailService; + + /** + * app的密钥值 + */ + @Value("${dfs.path}") + private String path; + /** * 查询企业员工 */ @@ -82,7 +120,7 @@ public class CustomerStaffController extends BaseController { } // Integer customerId = getLoginCustomerId(); // icsCustomerStaff.setIcsCustomerId(customerId.longValue()); -// icsCustomerStaff.setDataType(Constants.CUSTOMER_STAFF); + icsCustomerStaff.setDataType(Constants.CUSTOMER_VISIT); return result(icsCustomerStaffService.selectIcsCustomerStaffList(icsCustomerStaff)); } @@ -110,9 +148,9 @@ public class CustomerStaffController extends BaseController { icsCustomerStaff.setIcsCustomerId(Long.valueOf(customerId)); } List staffListByUser = icsCustomerStaffService.getStaffListByUser(icsCustomerStaff); - if (icsCustomerStaff.getStaffId() != null){ + if (icsCustomerStaff.getStaffId() != null) { IcsCustomerStaff customerStaff = icsCustomerStaffService.selectIcsCustomerStaffById(icsCustomerStaff.getStaffId()); - if (null != customerStaff){ + if (null != customerStaff) { staffListByUser.add(customerStaff); } } @@ -121,7 +159,6 @@ public class CustomerStaffController extends BaseController { } - /** * 新增保存企业员工 */ @@ -143,13 +180,14 @@ public class CustomerStaffController extends BaseController { @PostMapping("update") public R editSave(@RequestBody IcsCustomerStaff icsCustomerStaff) { - + icsCustomerStaff.setDataType(Constants.CUSTOMER_STAFF); icsCustomerStaff.setUpdateTime(new Date()); return toAjax(icsCustomerStaffService.updateIcsCustomerStaff(icsCustomerStaff)); } /** * 新增企业员工 + * * @param icsCustomerStaff * @return */ @@ -165,8 +203,13 @@ public class CustomerStaffController extends BaseController { //根据企业id 查询对应的房间 Customer customer = customerService.selectCustomerById(Long.valueOf(icsCustomerStaff.getCustomerId())); - if (customer !=null ){ - Room room = roomService.selectRoomById(customer.getRoomId()); + if (customer != null) { + String roomId = customer.getRoomId(); + List roomIds = StrUtil.split(roomId, ','); + + List collect = roomIds.stream().map(Long::valueOf).collect(Collectors.toList()); + for (Long roomid : collect) { + Room room = roomService.selectRoomById(roomid); if (null != room) { Long id = room.getId(); RoomEquipment roomEquipment = roomEquipmentService.selectByRoomId(id); @@ -181,19 +224,19 @@ 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 userEquipment = new UserEquipment(); - userEquipment.setEquipmentId(id); - userEquipment.setUserId(Long.valueOf(icsCustomerStaff.getMobile())); - userEquipment.setStartTime(customer.getStartDate()); - userEquipment.setEndDate(customer.getEndDate()); - userEquipmentService.insertUserEquipment(userEquipment); -// } - } + } + + if (CollUtil.isNotEmpty(ids)) { + for (Long id : ids) { + + UserEquipment userEquipment = new UserEquipment(); + userEquipment.setEquipmentId(id); + userEquipment.setUserId(Long.valueOf(icsCustomerStaff.getMobile())); + userEquipment.setStartTime(customer.getStartDate()); + userEquipment.setEndDate(customer.getEndDate()); + userEquipmentService.insertUserEquipment(userEquipment); } + } } customerStaff.setUpdateTime(new Date()); @@ -202,6 +245,7 @@ public class CustomerStaffController extends BaseController { /** * 删除企业员工 + * * @param icsCustomerStaff * @return */ @@ -214,12 +258,6 @@ public class CustomerStaffController extends BaseController { return toAjax(icsCustomerStaffService.updateByCustomer(customerStaff)); } - - - - - - /** * 删除企业员工 */ @@ -230,6 +268,179 @@ public class CustomerStaffController extends BaseController { } + @Ignore + @GetMapping("selectCustomerStaffList") + public R selectCustomerStaffList(IcsCustomerStaff icsCustomerStaff) { + startPage(); + String customerId = icsCustomerStaff.getCustomerId(); + if (customerId != null && !"".equals(customerId)) { + icsCustomerStaff.setIcsCustomerId(Long.valueOf(customerId)); + } + List icsCustomerStaffs = icsCustomerStaffService.selectCustomerStaffList(icsCustomerStaff); + for (IcsCustomerStaff customerStaff : icsCustomerStaffs) { + //获取设备数量 + UserEquipment userEquipment = new UserEquipment(); + userEquipment.setUserId(customerStaff.getId()); + List equipments = userEquipmentService.selectUserEquipmentList(userEquipment); + customerStaff.setNum(equipments.size()); + } + return result(icsCustomerStaffs); + } + + // @RequiresPermissions("admin:staff:import") + @Ignore + @PostMapping("/importData") + public R importData(MultipartFile file) throws Exception { +// } + ExcelUtil util = new ExcelUtil(IcsCustomerStaff.class); + List userList = util.importExcel(file.getInputStream()); + + for (IcsCustomerStaff customerStaff : userList) { + long currentUserId = getCurrentUserId(); + User user = userService.selectUserById(currentUserId); + if (user != null) { + customerStaff.setIcsCustomerId(user.getCustomerId()); + } + } + String message = icsCustomerStaffService.importCustomerStaff(userList); + return R.data(message); + } + + @Ignore + @PostMapping("/exportTemplate") + public void exportTemplate(HttpServletResponse response) throws IOException { + List icsCustomerStaffs = icsCustomerStaffService.selectIcsCustomerStaffList(new IcsCustomerStaff()); + ExcelUtil util = new ExcelUtil(IcsCustomerStaff.class); + util.exportExcel(icsCustomerStaffs, "客户员工表"); + } + + + //授权用户设备权限，查询出所有的设备 + @RequiresPermissions("meeting:roomContent:list") + @PostMapping("/selectUserDeviceList") + public R selectUserDeviceList() { + + //根据园区 角色 查询所有的设备信息 + boolean isAdmin = SubjectUtil.hasRole(getRequest(), "manager"); + if (isAdmin) { + Long parkId = currentUserService.getParkId(); + Long tenantId = currentUserService.getTenantId(); + Equipment equipment1 = new Equipment(); + equipment1.setParkId(parkId); + equipment1.setTenantId(tenantId); + + //根据园区id 查询所有的设备信息 + List equipment = equipmentService.selectEquipmentList(equipment1); + List equipment2 = selectEquipmentListByIds(equipment); + + return R.data(equipment2); + } + boolean b = SubjectUtil.hasRole(getRequest(), "admin"); + if (b) { + User user = userService.selectUserById(getCurrentUserId()); + if (null != user.getCustomerId()) { + ArrayList ids = new ArrayList<>(); + Customer customer = customerService.selectCustomerById(user.getCustomerId()); + //根据企业 查询对应的 房间，和对应的楼层 + String roomId = customer.getRoomId(); + List roomIds = StrUtil.split(roomId, ','); + List collect = roomIds.stream().map(Long::valueOf).collect(Collectors.toList()); + for (Long roomid : collect) { + Room room = roomService.selectRoomById(roomid); + if (null != room) { + Long id = room.getId(); + RoomEquipment roomEquipment = roomEquipmentService.selectByRoomId(id); + if (null != roomEquipment) { + ids.add(roomEquipment.getEquipmentId()); + } + List detailEquipments = detailEquipmentService.selectByRoomId(id); + if (CollUtil.isNotEmpty(detailEquipments)) { + for (DetailEquipment detailEquipment : detailEquipments) { + ids.add(detailEquipment.getEquipmentId()); + } + } + } + } + + + if (CollUtil.isNotEmpty(ids)) { + List equipment = equipmentService.selectListByIds(ids); + List equipment1 = selectEquipmentListByIds(equipment); + + return R.data(equipment1); + } else { + return R.data(new ArrayList()); + } + } + } + + List equipment = equipmentService.selectEquipmentList(new Equipment()); + List equipment1 = selectEquipmentListByIds(equipment); + return R.data(equipment1); + } + + /** + * 查询当前用户的所有设备 + * + * @return + */ + @RequiresPermissions("meeting:roomContent:list") + @PostMapping("/selectEquipmentListById") + public R selectEquipmentListById(@RequestBody UserEquipment equipment) { + List equipments = userEquipmentService.selectUserEquipmentList(equipment); + List collect = equipments.stream().map(UserEquipment::getEquipmentId).collect(Collectors.toList()); + if (CollUtil.isNotEmpty(collect)) { + List equipment1 = equipmentService.selectListByIds(collect); + List equipment2 = selectEquipmentListByIds(equipment1); + return R.data(equipment2); + } + return R.data(equipments); + + } + + + public List selectEquipmentListByIds(List equipment) { + for (Equipment equipment2 : equipment) { + RoomEquipment roomEquipment = roomEquipmentService.selectByEquipmentId(equipment2.getId()); + if (roomEquipment != null) { + Room room = roomService.selectRoomById(roomEquipment.getRoomId()); + equipment2.setRoomId(room.getId()); + equipment2.setBuildId(room.getBuildingDetailId()); + equipment2.setRoomName(room.getName()); + BuildingDetail buildingDetail = buildingDetailService.selectBuildingDetailById(room.getBuildingDetailId()); + if (buildingDetail != null) { + equipment2.setBuildName(buildingDetail.getFloorName()); + } + } else { + DetailEquipment detailEquipment = detailEquipmentService.selectByEquipmentId(equipment2.getId()); + if (null != detailEquipment) { + BuildingDetail buildingDetail = buildingDetailService.selectBuildingDetailById(detailEquipment.getBuildingDetailId()); + if (buildingDetail != null) { + equipment2.setBuildName(buildingDetail.getFloorName()); + } + } + } + } + return equipment; + } + + @RequiresPermissions("meeting:roomContent:list") + @PostMapping("/saveUserEquipment") + public R saveUserEquipment(@RequestBody UserEquipment equipment) { + for (Long id : equipment.getUserIds()) { + + UserEquipment userEquipment = new UserEquipment(); + userEquipment.setEquipmentId(id); + userEquipment.setUserId(equipment.getUserId()); + Customer customer = customerService.selectCustomerById(equipment.getUserId()); + if (customer != null) { + userEquipment.setStartTime(customer.getStartDate()); + userEquipment.setEndDate(customer.getEndDate()); + } + userEquipmentService.insertUserEquipment(userEquipment); + } + return R.ok(); + } } diff --git a/ics-admin/src/main/java/com/ics/admin/controller/ParkController.java b/ics-admin/src/main/java/com/ics/admin/controller/ParkController.java index 650fdf0..c25b5d3 100644 --- a/ics-admin/src/main/java/com/ics/admin/controller/ParkController.java +++ b/ics-admin/src/main/java/com/ics/admin/controller/ParkController.java @@ -9,9 +9,12 @@ import com.ics.common.utils.ValidatorUtils; import com.ics.system.domain.Dept; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import org.wf.jwtp.annotation.Ignore; import org.wf.jwtp.annotation.Logical; import org.wf.jwtp.annotation.RequiresPermissions; +import java.util.List; + /** * 园区管理 提供者 @@ -122,4 +125,14 @@ public class ParkController extends BaseController { return toAjax(parkService.initPark(dept)); } + + /** + * 获取园区列表 + */ + @Ignore + public R selectParkList(Park park) { + + return R.data(parkService.selectParkList(park)); + } + } \ No newline at end of file diff --git a/ics-admin/src/main/java/com/ics/admin/controller/meeting/EquipmentController.java b/ics-admin/src/main/java/com/ics/admin/controller/meeting/EquipmentController.java index 43c08a3..832a70f 100644 --- a/ics-admin/src/main/java/com/ics/admin/controller/meeting/EquipmentController.java +++ b/ics-admin/src/main/java/com/ics/admin/controller/meeting/EquipmentController.java @@ -3,6 +3,7 @@ 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 cn.hutool.core.util.StrUtil; import com.ics.admin.domain.BuildingDetail; import com.ics.admin.domain.Customer; import com.ics.admin.domain.Room; @@ -13,6 +14,9 @@ import com.ics.admin.service.IIcsCustomerStaffService; import com.ics.admin.service.IRoomService; import com.ics.admin.service.meeting.*; import com.ics.common.core.domain.IcsCustomerStaff; +import com.ics.system.domain.User; +import com.ics.system.service.ICurrentUserService; +import com.ics.system.service.IUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -25,7 +29,9 @@ import com.ics.common.core.domain.R; import com.ics.common.core.controller.BaseController; import org.wf.jwtp.annotation.Ignore; import org.wf.jwtp.annotation.RequiresPermissions; +import org.wf.jwtp.util.SubjectUtil; +import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -75,6 +81,12 @@ public class EquipmentController extends BaseController { @Autowired private IReservationPersonService reservationPersonService; + @Autowired + private ICurrentUserService currentUserService; + + @Autowired + private IUserService userService; + /** * 查询设备 */ @@ -98,6 +110,27 @@ public class EquipmentController extends BaseController { @GetMapping("list") public R list(Equipment equipment) { startPage(); + boolean isAdmin = SubjectUtil.hasRole(getRequest(),"manager"); + if (isAdmin){ + Long parkId = currentUserService.getParkId(); + Long tenantId = currentUserService.getTenantId(); + equipment.setParkId(parkId); + equipment.setTenantId(tenantId); + } + boolean b = SubjectUtil.hasRole(getRequest(),"admin"); + if (b){ + User user = userService.selectUserById(getCurrentUserId()); + if (null != user.getCustomerId()){ + //todo 查询房间id + Customer customer = customerService.selectCustomerById(user.getCustomerId()); + if (customer !=null){ + String roomId = customer.getRoomId(); + List roomIds = StrUtil.split(roomId, ','); + List collect = roomIds.stream().map(Long::valueOf).collect(Collectors.toList()); + equipment.setRoomIds(collect); + } + } + } List equipment1 = equipmentService.selectEquipmentList(equipment); for (Equipment equipment2 : equipment1) { RoomEquipment roomEquipment = roomEquipmentService.selectByEquipmentId(equipment2.getId()); @@ -151,14 +184,9 @@ public class EquipmentController extends BaseController { addPersonDeviceByRoomContent(room,equipment.getId()); } } - return toAjax(i); - } - - - /** * 修改保存设备 */ @@ -178,27 +206,21 @@ public class EquipmentController extends BaseController { 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()) ) { + if (!ObjectUtil.equals(equipment1.getBuildId(),equipment.getBuildId())) { List 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()); @@ -268,7 +290,6 @@ public class EquipmentController extends BaseController { } - /** * 删除设备 */ @@ -306,11 +327,25 @@ public class EquipmentController extends BaseController { * 获取所有的用户 */ - @Ignore + @RequiresPermissions("meeting:roomContent:list") @GetMapping("getUserList") public R getUserList(IcsCustomerStaff customerStaff) { - System.out.println(customerStaff); + boolean isAdmin = SubjectUtil.hasRole(getRequest(),"manager"); + if (isAdmin){ + Long parkId = currentUserService.getParkId(); + Long tenantId = currentUserService.getTenantId(); + customerStaff.setParkId(parkId); + customerStaff.setTenantId(tenantId); + } + boolean b = SubjectUtil.hasRole(getRequest(),"admin"); + if (b){ + User user = userService.selectUserById(getCurrentUserId()); + if (null != user.getCustomerId()){ + Customer customer = customerService.selectCustomerById(user.getCustomerId()); + customerStaff.setIcsCustomerId(customer.getId()); + } + } List icsCustomerStaffs = staffService.selectIcsCustomerStaffList(customerStaff); for (IcsCustomerStaff icsCustomerStaff : icsCustomerStaffs) { Customer customer = customerService.selectCustomerById(icsCustomerStaff.getIcsCustomerId()); @@ -325,12 +360,33 @@ public class EquipmentController extends BaseController { * 获取所有的用户 */ - @Ignore + @RequiresPermissions("meeting:roomContent:list") @GetMapping("getUserListByDeviceId/{id}") public R getUserListByDeviceId(@PathVariable("id") Long id) { - UserEquipment userEquipment = new UserEquipment(); userEquipment.setEquipmentId(id); + ArrayList userId = new ArrayList<>(); + boolean isAdmin = SubjectUtil.hasRole(getRequest(),"manager"); + if (isAdmin){ + Long parkId = currentUserService.getParkId(); + Long tenantId = currentUserService.getTenantId(); + userEquipment.setParkId(parkId); + userEquipment.setTenantId(tenantId); + } + boolean b = SubjectUtil.hasRole(getRequest(),"admin"); + if (b){ + User user = userService.selectUserById(getCurrentUserId()); + if (null != user.getCustomerId()){ + Customer customer = customerService.selectCustomerById(user.getCustomerId()); + //根据企业查询对应用户id + List icsCustomerStaffs = staffService.selectUserByCustomer(customer.getId()); + List ids = icsCustomerStaffs.stream().map(item -> { + return item.getId(); + }).collect(Collectors.toList()); + userId.addAll(ids); + } + } + userEquipment.setUserIds(userId); List equipments = userEquipmentService.selectUserEquipmentList(userEquipment); List userIds = equipments.stream().map(item -> { return item.getUserId(); diff --git a/ics-admin/src/main/java/com/ics/admin/controller/meeting/ReservationController.java b/ics-admin/src/main/java/com/ics/admin/controller/meeting/ReservationController.java index 23d4406..471f3bb 100644 --- a/ics-admin/src/main/java/com/ics/admin/controller/meeting/ReservationController.java +++ b/ics-admin/src/main/java/com/ics/admin/controller/meeting/ReservationController.java @@ -11,6 +11,7 @@ import com.ics.admin.service.meeting.IRoomContentService; import com.ics.common.core.domain.IcsCustomerStaff; import com.ics.system.domain.User; import com.ics.system.mapper.DictDataMapper; +import com.ics.system.service.ICurrentUserService; import com.ics.system.service.IUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -26,6 +27,7 @@ import com.ics.admin.domain.meeting.Reservation; import com.ics.admin.service.meeting.IReservationService; import org.wf.jwtp.annotation.Ignore; import org.wf.jwtp.annotation.RequiresPermissions; +import org.wf.jwtp.util.SubjectUtil; import java.util.Date; import java.util.List; @@ -58,6 +60,9 @@ public class ReservationController extends BaseController { @Autowired private IUserService userService; + @Autowired + private ICurrentUserService currentUserService; + /** * 查询预约记录 */ @@ -95,13 +100,34 @@ public class ReservationController extends BaseController { @GetMapping("list") public R list(Reservation reservation) { startPage(); + boolean isAdmin = SubjectUtil.hasRole(getRequest(),"manager"); + if (isAdmin){ + Long parkId = currentUserService.getParkId(); + Long tenantId = currentUserService.getTenantId(); + reservation.setParkId(parkId); + reservation.setTenantId(tenantId); + } + boolean b = SubjectUtil.hasRole(getRequest(),"admin"); + if (b){ + User user = userService.selectUserById(getCurrentUserId()); + if (null != user.getCustomerId()){ + reservation.setCustomerId(user.getCustomerId()); + } + } List reservations = reservationService.selectReservationList(reservation); for (Reservation reservation1 : reservations) { RoomContent roomContent = iRoomContentService.selectRoomContentById(reservation1.getRoomContentId()); String typeName = dictDataMapper.selectDictLabel("meeting_type", String.valueOf(roomContent.getType())); roomContent.setTypeName(typeName); + if (reservation1.getOrderTime()!=null){ + // 已经支付 + reservation1.setIsPay("已支付"); + }else { + reservation1.setIsPay("未支付"); + } + //会议室名称 reservation1.setRoomContent(roomContent); reservation1.setStatusName(reservation1.getStauts().getName()); @@ -129,8 +155,8 @@ public class ReservationController extends BaseController { long currentUserId1 = this.getCurrentUserId(); User user = userService.selectUserById(currentUserId1); Assert.isTrue(user.getStaffId() !=null, "当前用户没有绑定小程序用户"); - long currentUserId = this.getLoginStaffId(); - reservation.setUserId(currentUserId); + + reservation.setUserId(user.getStaffId()); return toAjax(reservationService.insertReservation(reservation)); } diff --git a/ics-admin/src/main/java/com/ics/admin/controller/meeting/RoomContentController.java b/ics-admin/src/main/java/com/ics/admin/controller/meeting/RoomContentController.java index bf051f4..6c978b9 100644 --- a/ics-admin/src/main/java/com/ics/admin/controller/meeting/RoomContentController.java +++ b/ics-admin/src/main/java/com/ics/admin/controller/meeting/RoomContentController.java @@ -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.StrUtil; import com.ics.admin.domain.BuildingDetail; import com.ics.admin.domain.Customer; import com.ics.admin.domain.Room; @@ -12,7 +14,10 @@ import com.ics.admin.service.meeting.IRoomContentService; import com.ics.admin.service.meeting.IRoomItemByRoomService; import com.ics.admin.service.meeting.IRoomServeByRoomService; import com.ics.common.core.controller.BaseController; +import com.ics.system.domain.User; import com.ics.system.mapper.DictDataMapper; +import com.ics.system.service.ICurrentUserService; +import com.ics.system.service.IUserService; import org.checkerframework.checker.units.qual.A; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -28,9 +33,12 @@ import com.ics.admin.domain.meeting.RoomContent; import com.ics.admin.service.meeting.IRoomContentService; import org.wf.jwtp.annotation.Ignore; import org.wf.jwtp.annotation.RequiresPermissions; +import org.wf.jwtp.util.SubjectUtil; +import javax.security.auth.Subject; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 房间主体内容 提供者 @@ -60,6 +68,11 @@ public class RoomContentController extends BaseController { @Autowired private ICustomerService customerService; + @Autowired + private ICurrentUserService currentUserService; + + @Autowired + private IUserService userService; /** @@ -88,6 +101,24 @@ public class RoomContentController extends BaseController { @GetMapping("list") public R list(RoomContent roomContent) { startPage(); + boolean isAdmin = SubjectUtil.hasRole(getRequest(),"manager"); + if (isAdmin){ + Long parkId = currentUserService.getParkId(); + Long tenantId = currentUserService.getTenantId(); + roomContent.setParkId(parkId); + roomContent.setTenantId(tenantId); + } + boolean b = SubjectUtil.hasRole(getRequest(),"admin"); + if (b){ + User user = userService.selectUserById(getCurrentUserId()); + if (null != user.getCustomerId()){ + Customer customer = customerService.selectCustomerById(user.getCustomerId()); + String roomId = customer.getRoomId(); + List roomIds = StrUtil.split(roomId, ','); + List collect = roomIds.stream().map(Long::valueOf).collect(Collectors.toList()); + roomContent.setRoomIds(collect); + } + } List roomContents = roomContentService.selectRoomContentList(roomContent); for (RoomContent content : roomContents) { RoomServeByRoom roomServeByRoom = new RoomServeByRoom(); @@ -99,15 +130,14 @@ public class RoomContentController extends BaseController { roomItemByRoom.setRoomContentId(content.getId()); List roomItemByRooms = roomItemByRoomService.selectRoomItemByRoomList(roomItemByRoom); content.setItemCount(roomItemByRooms.size()); - Long roomId = content.getRoomId(); Room room = roomService.selectRoomById(roomId); if (room != null){ content.setBuildId(room.getBuildingDetailId()); content.setArea(room.getArea()); content.setRoomName(room.getName()); + content.setBuildingId(room.getBuildingId()); } - } return result(roomContents); } @@ -220,8 +250,30 @@ public class RoomContentController extends BaseController { public R list(Room room) { room.setDeleteFlag(0); room.setBuildingDetailId(room.getBuildingDetailId()); - return R.ok().put("data",roomService.selectRoomList(room)); + List rooms = roomService.selectRoomList(room); + if (room.getId() != null ){ + Room room1 = roomService.selectRoomById(room.getId()); + rooms.add(room1); + } + return R.ok().put("data",rooms); } + @Ignore + @PostMapping("/getRoomListByBuildIds") + public R getRoomListByBuildIds(@RequestBody Room room) { + room.setDeleteFlag(0); + room.setBuildingDetailIds(room.getBuildingDetailIds()); + List rooms = roomService.selectRoomList(room); + if (CollUtil.isNotEmpty(room.getIds()) ){ + for (Long id : room.getIds()) { + Room room1 = roomService.selectRoomById(id); + rooms.add(room1); + } + } + return R.ok().put("data",rooms); + } + + + @Ignore @GetMapping("/selectRoomById") @@ -235,14 +287,31 @@ public class RoomContentController extends BaseController { @GetMapping("/customerList") public R list(Customer customer) { List customers = customerService.selectCustomerList(customer); - return result(customers); + return R.data(customers); } - @Ignore + @RequiresPermissions("meeting:roomContent:list") @GetMapping("/roomContentList") - public R roomContentList() { - - return R.data(roomContentService.selectRoomContentList(new RoomContent())); + public R roomContentList(RoomContent roomContent) { + boolean isAdmin = SubjectUtil.hasRole(getRequest(),"manager"); + if (isAdmin){ + Long parkId = currentUserService.getParkId(); + Long tenantId = currentUserService.getTenantId(); + roomContent.setParkId(parkId); + roomContent.setTenantId(tenantId); + } + boolean b = SubjectUtil.hasRole(getRequest(),"admin"); + if (b){ + User user = userService.selectUserById(getCurrentUserId()); + if (null != user.getCustomerId()){ + Customer customer = customerService.selectCustomerById(user.getCustomerId()); + String roomId = customer.getRoomId(); + List roomIds = StrUtil.split(roomId, ','); + List collect = roomIds.stream().map(Long::valueOf).collect(Collectors.toList()); + roomContent.setRoomIds(collect); + } + } + return R.data(roomContentService.selectRoomContentList(roomContent)); } } \ No newline at end of file diff --git a/ics-admin/src/main/java/com/ics/admin/controller/meeting/RoomItemController.java b/ics-admin/src/main/java/com/ics/admin/controller/meeting/RoomItemController.java index c0fb638..90a1c57 100644 --- a/ics-admin/src/main/java/com/ics/admin/controller/meeting/RoomItemController.java +++ b/ics-admin/src/main/java/com/ics/admin/controller/meeting/RoomItemController.java @@ -1,5 +1,6 @@ package com.ics.admin.controller.meeting; +import com.ics.system.service.ICurrentUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -13,6 +14,7 @@ import com.ics.common.core.controller.BaseController; import com.ics.admin.domain.meeting.RoomItem; import com.ics.admin.service.meeting.IRoomItemService; import org.wf.jwtp.annotation.RequiresPermissions; +import org.wf.jwtp.util.SubjectUtil; /** * 房间物品 提供者 @@ -27,6 +29,9 @@ public class RoomItemController extends BaseController { @Autowired private IRoomItemService roomItemService; + @Autowired + private ICurrentUserService currentUserService; + /** * 查询房间物品 */ @@ -42,6 +47,13 @@ public class RoomItemController extends BaseController { @GetMapping("list") public R list(RoomItem roomItem) { startPage(); + boolean isAdmin = SubjectUtil.hasRole(getRequest(),"manager"); + if (isAdmin){ + Long parkId = currentUserService.getParkId(); + Long tenantId = currentUserService.getTenantId(); + roomItem.setParkId(parkId); + roomItem.setTenantId(tenantId); + } return result(roomItemService.selectRoomItemList(roomItem)); } diff --git a/ics-admin/src/main/java/com/ics/admin/controller/meeting/RoomServeController.java b/ics-admin/src/main/java/com/ics/admin/controller/meeting/RoomServeController.java index d33a699..d255610 100644 --- a/ics-admin/src/main/java/com/ics/admin/controller/meeting/RoomServeController.java +++ b/ics-admin/src/main/java/com/ics/admin/controller/meeting/RoomServeController.java @@ -1,5 +1,6 @@ package com.ics.admin.controller.meeting; +import com.ics.system.service.ICurrentUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -13,6 +14,7 @@ import com.ics.common.core.controller.BaseController; import com.ics.admin.domain.meeting.RoomServe; import com.ics.admin.service.meeting.IRoomServeService; import org.wf.jwtp.annotation.RequiresPermissions; +import org.wf.jwtp.util.SubjectUtil; /** * 服务 提供者 @@ -27,6 +29,9 @@ public class RoomServeController extends BaseController { @Autowired private IRoomServeService roomServeService; + @Autowired + private ICurrentUserService currentUserService; + /** * 查询服务 */ @@ -42,6 +47,14 @@ public class RoomServeController extends BaseController { @GetMapping("list") public R list(RoomServe roomServe) { startPage(); + boolean isAdmin = SubjectUtil.hasRole(getRequest(),"manager"); + if (isAdmin){ + Long parkId = currentUserService.getParkId(); + Long tenantId = currentUserService.getTenantId(); + roomServe.setParkId(parkId); + roomServe.setTenantId(tenantId); + } + return result(roomServeService.selectRoomServeList(roomServe)); } diff --git a/ics-admin/src/main/java/com/ics/admin/controller/meeting/ShowroomController.java b/ics-admin/src/main/java/com/ics/admin/controller/meeting/ShowroomController.java index a7935eb..b3ff183 100644 --- a/ics-admin/src/main/java/com/ics/admin/controller/meeting/ShowroomController.java +++ b/ics-admin/src/main/java/com/ics/admin/controller/meeting/ShowroomController.java @@ -1,10 +1,17 @@ package com.ics.admin.controller.meeting; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.StrUtil; import com.ics.admin.domain.BuildingDetail; +import com.ics.admin.domain.Customer; import com.ics.admin.domain.Room; import com.ics.admin.service.IBuildingDetailService; +import com.ics.admin.service.ICustomerService; import com.ics.admin.service.IRoomService; +import com.ics.system.domain.User; +import com.ics.system.service.ICurrentUserService; +import com.ics.system.service.IUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -19,8 +26,10 @@ import com.ics.admin.domain.meeting.Showroom; import com.ics.admin.service.meeting.IShowroomService; import org.wf.jwtp.annotation.Ignore; import org.wf.jwtp.annotation.RequiresPermissions; +import org.wf.jwtp.util.SubjectUtil; import java.util.List; +import java.util.stream.Collectors; /** * 展厅管理 提供者 @@ -41,6 +50,17 @@ public class ShowroomController extends BaseController { @Autowired private IBuildingDetailService buildingDetailService; + @Autowired + private ICurrentUserService currentUserService; + + @Autowired + private IUserService userService; + + @Autowired + private ICustomerService customerService; + + + /** * 查询展厅管理 */ @@ -66,6 +86,25 @@ public class ShowroomController extends BaseController { @GetMapping("list") public R list(Showroom showroom) { startPage(); + boolean isAdmin = SubjectUtil.hasRole(getRequest(),"manager"); + if (isAdmin){ + Long parkId = currentUserService.getParkId(); + Long tenantId = currentUserService.getTenantId(); + showroom.setParkId(parkId); + showroom.setTenantId(tenantId); + } + boolean b = SubjectUtil.hasRole(getRequest(),"admin"); + if (b){ + User user = userService.selectUserById(getCurrentUserId()); + if (null != user.getCustomerId()){ + Customer customer = customerService.selectCustomerById(user.getCustomerId()); + String roomId = customer.getRoomId(); + List roomIds = StrUtil.split(roomId, ','); + List collect = roomIds.stream().map(Long::valueOf).collect(Collectors.toList()); + showroom.setRoomIds(collect); + + } + } List showrooms = showroomService.selectShowroomList(showroom); for (Showroom showroom1 : showrooms) { Long roomId = showroom1.getRoomId(); diff --git a/ics-admin/src/main/java/com/ics/admin/controller/meeting/ShowroomRecordController.java b/ics-admin/src/main/java/com/ics/admin/controller/meeting/ShowroomRecordController.java index cbba110..442b2f0 100644 --- a/ics-admin/src/main/java/com/ics/admin/controller/meeting/ShowroomRecordController.java +++ b/ics-admin/src/main/java/com/ics/admin/controller/meeting/ShowroomRecordController.java @@ -9,6 +9,9 @@ import com.ics.admin.service.ICustomerService; import com.ics.admin.service.IIcsCustomerStaffService; import com.ics.admin.service.meeting.IShowroomService; import com.ics.common.core.domain.IcsCustomerStaff; +import com.ics.system.domain.User; +import com.ics.system.service.ICurrentUserService; +import com.ics.system.service.IUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -23,10 +26,12 @@ import com.ics.admin.domain.meeting.ShowroomRecord; import com.ics.admin.service.meeting.IShowroomRecordService; import org.wf.jwtp.annotation.Ignore; import org.wf.jwtp.annotation.RequiresPermissions; +import org.wf.jwtp.util.SubjectUtil; import java.util.Date; import java.util.List; import java.util.Random; +import java.util.stream.Collectors; /** * 展厅预约记录 提供者 @@ -50,6 +55,15 @@ public class ShowroomRecordController extends BaseController { @Autowired private ICustomerService customerService; + @Autowired + private ICurrentUserService currentUserService; + + @Autowired + private IUserService userService; + + @Autowired + private IIcsCustomerStaffService staffService; + /** * 查询展厅预约记录 */ @@ -81,6 +95,27 @@ public class ShowroomRecordController extends BaseController { @GetMapping("list") public R list(ShowroomRecord showroomRecord) { startPage(); + boolean isAdmin = SubjectUtil.hasRole(getRequest(),"manager"); + if (isAdmin){ + Long parkId = currentUserService.getParkId(); + Long tenantId = currentUserService.getTenantId(); + showroomRecord.setParkId(parkId); + showroomRecord.setTenantId(tenantId); + } + boolean b = SubjectUtil.hasRole(getRequest(),"admin"); + if (b){ + User user = userService.selectUserById(getCurrentUserId()); + if (null != user.getCustomerId()){ + Customer customer = customerService.selectCustomerById(user.getCustomerId()); + if (null != customer){ + List icsCustomerStaffs = staffService.selectUserByCustomer(customer.getId()); + List ids = icsCustomerStaffs.stream().map(item -> { + return item.getId(); + }).collect(Collectors.toList()); + showroomRecord.setStaffIds(ids); + } + } + } List showroomRecords = showroomRecordService.selectShowroomRecordList(showroomRecord); for (ShowroomRecord record : showroomRecords) { Showroom showroom = showroomService.selectShowroomById(record.getShowroomId()); @@ -98,8 +133,11 @@ public class ShowroomRecordController extends BaseController { @RequiresPermissions("meeting:showroomRecord:add") @PostMapping("save") public R addSave(@RequestBody ShowroomRecord showroomRecord) { - long currentUserId = getLoginStaffId(); - showroomRecord.setUserId(currentUserId); + + User user = userService.selectUserById(getCurrentUserId()); + if (null != user.getCustomerId()){ + showroomRecord.setUserId(user.getCustomerId()); + } showroomRecord.setShowroomId(1L); showroomRecord.setCreateTime(new Date()); showroomRecord.setStatus(1); diff --git a/ics-admin/src/main/java/com/ics/admin/controller/meeting/TicketController.java b/ics-admin/src/main/java/com/ics/admin/controller/meeting/TicketController.java index 2b9b07c..74f0d42 100644 --- a/ics-admin/src/main/java/com/ics/admin/controller/meeting/TicketController.java +++ b/ics-admin/src/main/java/com/ics/admin/controller/meeting/TicketController.java @@ -8,7 +8,9 @@ import com.ics.admin.domain.meeting.CustomerTicket; import com.ics.admin.domain.meeting.vo.TicketCustomerVo; import com.ics.admin.service.ICustomerService; import com.ics.admin.service.meeting.ICustomerTicketService; +import com.ics.common.core.domain.IcsCustomerStaff; import com.ics.system.domain.User; +import com.ics.system.service.ICurrentUserService; import com.ics.system.service.IUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -24,6 +26,7 @@ import com.ics.admin.domain.meeting.Ticket; import com.ics.admin.service.meeting.ITicketService; import org.wf.jwtp.annotation.Ignore; import org.wf.jwtp.annotation.RequiresPermissions; +import org.wf.jwtp.util.SubjectUtil; import java.util.*; import java.util.function.Function; @@ -51,6 +54,11 @@ public class TicketController extends BaseController { @Autowired private ICustomerTicketService customerTicketService; + @Autowired + private ICurrentUserService currentUserService; + + + /** * 查询优惠卷 */ @@ -97,6 +105,14 @@ public class TicketController extends BaseController { @GetMapping("list") public R list(Ticket ticket) { startPage(); + boolean isAdmin = SubjectUtil.hasRole(getRequest(),"manager"); + if (isAdmin){ + Long parkId = currentUserService.getParkId(); + Long tenantId = currentUserService.getTenantId(); + ticket.setParkId(parkId); + ticket.setTenantId(tenantId); + } + List tickets = ticketService.selectTicketList(ticket); return result(tickets); diff --git a/ics-admin/src/main/java/com/ics/admin/controller/meeting/VisitorPersonController.java b/ics-admin/src/main/java/com/ics/admin/controller/meeting/VisitorPersonController.java index 0fc5a17..a489ac6 100644 --- a/ics-admin/src/main/java/com/ics/admin/controller/meeting/VisitorPersonController.java +++ b/ics-admin/src/main/java/com/ics/admin/controller/meeting/VisitorPersonController.java @@ -7,6 +7,9 @@ import com.ics.admin.service.IIcsCustomerStaffService; import com.ics.admin.service.meeting.IVisitorPersonService; import com.ics.common.core.domain.IcsCustomerStaff; import com.ics.common.utils.DateUtils; +import com.ics.system.domain.User; +import com.ics.system.service.ICurrentUserService; +import com.ics.system.service.IUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -20,9 +23,11 @@ import com.ics.common.core.controller.BaseController; import com.ics.admin.domain.meeting.VisitorPerson; import org.wf.jwtp.annotation.Ignore; import org.wf.jwtp.annotation.RequiresPermissions; +import org.wf.jwtp.util.SubjectUtil; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** * 访客预约表 提供者 @@ -43,6 +48,14 @@ public class VisitorPersonController extends BaseController { @Autowired private ICustomerService customerService; + + + @Autowired + private ICurrentUserService currentUserService; + + @Autowired + private IUserService userService; + /** * 查询预约参观人员 */ @@ -74,6 +87,27 @@ public class VisitorPersonController extends BaseController { @GetMapping("list") public R list(VisitorPerson visitorPerson) { startPage(); + boolean isAdmin = SubjectUtil.hasRole(getRequest(),"manager"); + if (isAdmin){ + Long parkId = currentUserService.getParkId(); + Long tenantId = currentUserService.getTenantId(); + visitorPerson.setParkId(parkId); + visitorPerson.setTenantId(tenantId); + } + boolean b = SubjectUtil.hasRole(getRequest(),"admin"); + if (b){ + User user = userService.selectUserById(getCurrentUserId()); + if (null != user.getCustomerId()){ + Customer customer = customerService.selectCustomerById(user.getCustomerId()); + if (null != customer){ + List icsCustomerStaffs = staffService.selectUserByCustomer(customer.getId()); + List ids = icsCustomerStaffs.stream().map(item -> { + return item.getId(); + }).collect(Collectors.toList()); + visitorPerson.setStaffIds(ids); + } + } + } return result(visitorPersonService.selectReservationPersonList(visitorPerson)); } @@ -84,9 +118,16 @@ public class VisitorPersonController extends BaseController { @RequiresPermissions("meeting:visitorPerson:add") @PostMapping("save") public R addSave(@RequestBody VisitorPerson visitorPerson) { + + + visitorPerson.setUserId(visitorPerson.getUserId()); + long currentUserId = this.getCurrentUserId(); + User user = userService.selectUserById(currentUserId); + if (null != user){ + visitorPerson.setIntervieweeId(user.getStaffId()); + } visitorPerson.setStatus(1); visitorPerson.setCreateTime(DateUtils.getNowDate()); - visitorPerson.setUserId(getLoginCustomerId()); return toAjax(visitorPersonService.insertReservationPerson(visitorPerson)); } diff --git a/ics-admin/src/main/java/com/ics/admin/domain/Customer.java b/ics-admin/src/main/java/com/ics/admin/domain/Customer.java index 2623238..771ace9 100644 --- a/ics-admin/src/main/java/com/ics/admin/domain/Customer.java +++ b/ics-admin/src/main/java/com/ics/admin/domain/Customer.java @@ -334,9 +334,11 @@ public class Customer extends BaseEntity { private String channelName; - private Long buildId; + private String buildId; - private Long roomId; + private String roomId; + + private Long buildingId; @TableField(exist = false) private String roomName; @@ -421,4 +423,10 @@ public class Customer extends BaseEntity { @TableField(exist = false) private User user; + @TableField(exist = false) + private List buildingDetailIds; + + @TableField(exist = false) + private List roomIds; + } \ No newline at end of file diff --git a/ics-admin/src/main/java/com/ics/admin/domain/Room.java b/ics-admin/src/main/java/com/ics/admin/domain/Room.java index 15698b4..145548e 100644 --- a/ics-admin/src/main/java/com/ics/admin/domain/Room.java +++ b/ics-admin/src/main/java/com/ics/admin/domain/Room.java @@ -318,4 +318,10 @@ public class Room extends BaseEntity { private String buildingName; + @TableField(exist = false) + private List buildingDetailIds; + + @TableField(exist = false) + private List ids; + } \ No newline at end of file diff --git a/ics-admin/src/main/java/com/ics/admin/domain/meeting/Equipment.java b/ics-admin/src/main/java/com/ics/admin/domain/meeting/Equipment.java index 07bbdf2..948a33e 100644 --- a/ics-admin/src/main/java/com/ics/admin/domain/meeting/Equipment.java +++ b/ics-admin/src/main/java/com/ics/admin/domain/meeting/Equipment.java @@ -8,6 +8,7 @@ import lombok.NoArgsConstructor; import lombok.RequiredArgsConstructor; import java.util.Date; +import java.util.List; /** * 设备对象 tb_equipment @@ -53,4 +54,13 @@ public class Equipment extends BaseEntity { @TableField(exist = false) private Integer personCount; + @TableField(exist = false) + private List staffIds; + + @TableField(exist = false) + private List roomIds; + + @TableField(exist = false) + private List buildingDetailIds; + } diff --git a/ics-admin/src/main/java/com/ics/admin/domain/meeting/Reservation.java b/ics-admin/src/main/java/com/ics/admin/domain/meeting/Reservation.java index 0d65a62..cb85430 100644 --- a/ics-admin/src/main/java/com/ics/admin/domain/meeting/Reservation.java +++ b/ics-admin/src/main/java/com/ics/admin/domain/meeting/Reservation.java @@ -168,4 +168,7 @@ public class Reservation extends BaseEntity { @TableField(exist = false) private Long duration; + @TableField(exist = false) + private String isPay; + } diff --git a/ics-admin/src/main/java/com/ics/admin/domain/meeting/RoomContent.java b/ics-admin/src/main/java/com/ics/admin/domain/meeting/RoomContent.java index d0d8035..b2e2a2e 100644 --- a/ics-admin/src/main/java/com/ics/admin/domain/meeting/RoomContent.java +++ b/ics-admin/src/main/java/com/ics/admin/domain/meeting/RoomContent.java @@ -74,6 +74,9 @@ public class RoomContent extends BaseEntity { /** 房间id */ private Long roomId; + @TableField(exist = false) + private List roomIds; + /** 是否收费 */ private Long isToll; @@ -85,7 +88,14 @@ public class RoomContent extends BaseEntity { private String remake; + private Long parkId; + private Long tenantId; + + + + @TableField(exist = false) + private Long customerId; @TableField(exist = false) @@ -153,6 +163,9 @@ public class RoomContent extends BaseEntity { @TableField(exist = false) private String build; + @TableField(exist = false) + private Long buildingId; + @TableField(exist = false) private Long buildId; diff --git a/ics-admin/src/main/java/com/ics/admin/domain/meeting/Showroom.java b/ics-admin/src/main/java/com/ics/admin/domain/meeting/Showroom.java index 3bc7371..353bb67 100644 --- a/ics-admin/src/main/java/com/ics/admin/domain/meeting/Showroom.java +++ b/ics-admin/src/main/java/com/ics/admin/domain/meeting/Showroom.java @@ -7,6 +7,7 @@ import lombok.Data; import java.math.BigDecimal; import java.util.Date; +import java.util.List; /** * 展厅管理对象 tb_showroom @@ -75,4 +76,7 @@ public class Showroom extends BaseEntity { @TableField(exist = false) private Long buildId; + @TableField(exist = false) + private List roomIds; + } diff --git a/ics-admin/src/main/java/com/ics/admin/domain/meeting/ShowroomRecord.java b/ics-admin/src/main/java/com/ics/admin/domain/meeting/ShowroomRecord.java index 025e970..27dd634 100644 --- a/ics-admin/src/main/java/com/ics/admin/domain/meeting/ShowroomRecord.java +++ b/ics-admin/src/main/java/com/ics/admin/domain/meeting/ShowroomRecord.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.ics.common.core.domain.BaseEntity; import lombok.Data; import java.util.Date; +import java.util.List; /** * 展厅预约记录对象 tb_showroom_record @@ -92,4 +93,7 @@ public class ShowroomRecord extends BaseEntity { @TableField(exist = false) private String statusName; + @TableField(exist = false) + private List staffIds; + } diff --git a/ics-admin/src/main/java/com/ics/admin/domain/meeting/VisitorPerson.java b/ics-admin/src/main/java/com/ics/admin/domain/meeting/VisitorPerson.java index 57a46e3..21b7147 100644 --- a/ics-admin/src/main/java/com/ics/admin/domain/meeting/VisitorPerson.java +++ b/ics-admin/src/main/java/com/ics/admin/domain/meeting/VisitorPerson.java @@ -89,4 +89,7 @@ public class VisitorPerson extends BaseEntity { @TableField(exist = false) private List userIds; + @TableField(exist = false) + private List staffIds; + } diff --git a/ics-admin/src/main/java/com/ics/admin/mapper/IcsCustomerStaffMapper.java b/ics-admin/src/main/java/com/ics/admin/mapper/IcsCustomerStaffMapper.java index 93f657f..0205ca7 100644 --- a/ics-admin/src/main/java/com/ics/admin/mapper/IcsCustomerStaffMapper.java +++ b/ics-admin/src/main/java/com/ics/admin/mapper/IcsCustomerStaffMapper.java @@ -73,4 +73,5 @@ public interface IcsCustomerStaffMapper extends BaseMapper { int updateByCustomer(IcsCustomerStaff customerStaff); + IcsCustomerStaff selectUserByMobile(String mobile); } diff --git a/ics-admin/src/main/java/com/ics/admin/mapper/meeting/UserEquipmentMapper.java b/ics-admin/src/main/java/com/ics/admin/mapper/meeting/UserEquipmentMapper.java index f5b8f9f..72d4db1 100644 --- a/ics-admin/src/main/java/com/ics/admin/mapper/meeting/UserEquipmentMapper.java +++ b/ics-admin/src/main/java/com/ics/admin/mapper/meeting/UserEquipmentMapper.java @@ -61,4 +61,6 @@ public interface UserEquipmentMapper extends BaseMapper { * @return 结果 */ int deleteUserEquipmentByIds(String[] ids); + + int selectCountByUserIdAndDeviceId(UserEquipment userEquipment1); } diff --git a/ics-admin/src/main/java/com/ics/admin/service/IIcsCustomerStaffService.java b/ics-admin/src/main/java/com/ics/admin/service/IIcsCustomerStaffService.java index 093919f..06d96bc 100644 --- a/ics-admin/src/main/java/com/ics/admin/service/IIcsCustomerStaffService.java +++ b/ics-admin/src/main/java/com/ics/admin/service/IIcsCustomerStaffService.java @@ -80,4 +80,8 @@ public interface IIcsCustomerStaffService extends IService { IcsCustomerStaff selectByPhone(String mobile); int updateByCustomer(IcsCustomerStaff customerStaff); + + List selectCustomerStaffList(IcsCustomerStaff icsCustomerStaff); + + String importCustomerStaff(List userList); } diff --git a/ics-admin/src/main/java/com/ics/admin/service/impl/IcsCustomerStaffServiceImpl.java b/ics-admin/src/main/java/com/ics/admin/service/impl/IcsCustomerStaffServiceImpl.java index 62d6abb..e0679e4 100644 --- a/ics-admin/src/main/java/com/ics/admin/service/impl/IcsCustomerStaffServiceImpl.java +++ b/ics-admin/src/main/java/com/ics/admin/service/impl/IcsCustomerStaffServiceImpl.java @@ -1,6 +1,7 @@ package com.ics.admin.service.impl; import cn.hutool.core.collection.CollUtil; +import com.aliyun.oss.ServiceException; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ics.admin.mapper.IcsCustomerStaffMapper; @@ -118,7 +119,7 @@ public class IcsCustomerStaffServiceImpl extends ServiceImpl selectListByUserIds(List userIds) { QueryWrapper objectQueryWrapper = new QueryWrapper<>(); - objectQueryWrapper.in(CollUtil.isNotEmpty(userIds),"id",userIds); + objectQueryWrapper.in("id",userIds); return icsCustomerStaffMapper.selectList(objectQueryWrapper); } @@ -157,4 +158,63 @@ public class IcsCustomerStaffServiceImpl extends ServiceImpl selectCustomerStaffList(IcsCustomerStaff icsCustomerStaff) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("ics_customer_id",icsCustomerStaff.getIcsCustomerId()); + return icsCustomerStaffMapper.selectList(wrapper); + } + + @Override + public String importCustomerStaff(List userList) { + + if (StringUtils.isNull(userList) || userList.size() == 0) + { + throw new ServiceException("导入用户数据不能为空！"); + } + int successNum = 0; + int failureNum = 0; + StringBuilder successMsg = new StringBuilder(); + StringBuilder failureMsg = new StringBuilder(); + for (IcsCustomerStaff user : userList) + { + try + { + // 验证是否存在这个用户 + IcsCustomerStaff u = icsCustomerStaffMapper.selectUserByMobile(user.getMobile()); + if (StringUtils.isNull(u)) + { + user.setCardNo("0"); + user.setDataType("1"); + icsCustomerStaffMapper.insert(user); + successNum++; + successMsg.append("
" + successNum + "、账号 " + user.getName() + " 导入成功"); + } + + else + { + failureNum++; + failureMsg.append("
" + failureNum + "、账号 " + user.getName() + " 已存在"); + } + } + catch (Exception e) + { + failureNum++; + String msg = "
" + failureNum + "、账号 " + user.getName() + " 导入失败："; + failureMsg.append(msg + e.getMessage()); + log.error(msg, e); + } + } + if (failureNum > 0) + { + failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下："); + throw new ServiceException(failureMsg.toString()); + } + else + { + successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下："); + } + return successMsg.toString(); + } } diff --git a/ics-admin/src/main/java/com/ics/admin/service/impl/RoomServeServiceImpl.java b/ics-admin/src/main/java/com/ics/admin/service/impl/RoomServeServiceImpl.java index 67f83dc..794bb35 100644 --- a/ics-admin/src/main/java/com/ics/admin/service/impl/RoomServeServiceImpl.java +++ b/ics-admin/src/main/java/com/ics/admin/service/impl/RoomServeServiceImpl.java @@ -44,6 +44,8 @@ public class RoomServeServiceImpl extends ServiceImpl impleme @Override public List selectTicketList(Ticket ticket) { QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq(ticket.getParkId() !=null,"park_id", ticket.getParkId()); + queryWrapper.eq(ticket.getTenantId() !=null,"tenant_id", ticket.getTenantId()); + return ticketMapper.selectList(queryWrapper); } diff --git a/ics-admin/src/main/java/com/ics/admin/service/impl/UserEquipmentServiceImpl.java b/ics-admin/src/main/java/com/ics/admin/service/impl/UserEquipmentServiceImpl.java index 971af5b..958dfd7 100644 --- a/ics-admin/src/main/java/com/ics/admin/service/impl/UserEquipmentServiceImpl.java +++ b/ics-admin/src/main/java/com/ics/admin/service/impl/UserEquipmentServiceImpl.java @@ -15,6 +15,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -38,6 +39,7 @@ import org.springframework.stereotype.Service; import com.ics.admin.mapper.meeting.UserEquipmentMapper; import com.ics.admin.domain.meeting.UserEquipment; import com.ics.admin.service.meeting.IUserEquipmentService; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; @@ -92,6 +94,7 @@ public class UserEquipmentServiceImpl extends ServiceImpl 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); + + // 开门时，时间提前。 +// QueryWrapper 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); + + +// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); +// queryWrapper.eq(UserEquipment::getEquipmentId, userEquipment1.getEquipmentId()) +// .eq(UserEquipment::getUserId, userEquipment1.getUserId()) +// .gt(UserEquipment::getEndDate, DateUtil.date()) +// .lt(UserEquipment::getStartTime, DateUtil.date()); + return userEquipmentMapper.selectCountByUserIdAndDeviceId(userEquipment1); } diff --git a/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/EquipmentServiceImpl.java b/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/EquipmentServiceImpl.java index 7be3427..28d1c4e 100644 --- a/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/EquipmentServiceImpl.java +++ b/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/EquipmentServiceImpl.java @@ -1,5 +1,6 @@ package com.ics.admin.service.impl.meeting; +import java.util.ArrayList; import java.util.List; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; @@ -41,8 +42,11 @@ public class EquipmentServiceImpl extends ServiceImpl selectEquipmentList(Equipment equipment) { - QueryWrapper queryWrapper = new QueryWrapper(); - return equipmentMapper.selectList(queryWrapper); +// QueryWrapper queryWrapper = new QueryWrapper(); +// queryWrapper.eq(equipment.getParkId() !=null,"park_id", equipment.getParkId()); +// queryWrapper.eq(equipment.getTenantId() !=null,"tenant_id", equipment.getTenantId()); +// + return equipmentMapper.selectEquipmentList(equipment); } /** @@ -89,4 +93,11 @@ public class EquipmentServiceImpl extends ServiceImpl selectListByIds(List ids) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.in("id", ids); + return baseMapper.selectList(queryWrapper); + } } diff --git a/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/IVisitorPersonServiceImpl.java b/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/IVisitorPersonServiceImpl.java index aecd251..915d8b5 100644 --- a/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/IVisitorPersonServiceImpl.java +++ b/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/IVisitorPersonServiceImpl.java @@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ics.admin.mapper.meeting.VisitorPersonMapper; import com.ics.admin.domain.meeting.VisitorPerson; +import org.springframework.transaction.annotation.Transactional; /** * 预约参观人员Service业务层处理 @@ -52,6 +53,9 @@ public class IVisitorPersonServiceImpl extends ServiceImpl selectReservationPersonList(VisitorPerson visitorPerson) { QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq(visitorPerson.getParkId() !=null,"park_id", visitorPerson.getParkId()); + queryWrapper.eq(visitorPerson.getTenantId() !=null,"tenant_id", visitorPerson.getTenantId()); + queryWrapper.eq(CollUtil.isNotEmpty(visitorPerson.getStaffIds()),"interviewee_id", visitorPerson.getStaffIds()); return visitorPersonMapper.selectList(queryWrapper); } @@ -61,6 +65,7 @@ public class IVisitorPersonServiceImpl extends ServiceImpl i @Override public List selectRoomItemList(RoomItem roomItem) { QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.like(StrUtil.isNotBlank(roomItem.getName()), "name", roomItem.getName()); + queryWrapper.eq(roomItem.getParkId() !=null,"park_id", roomItem.getParkId()); + queryWrapper.eq(roomItem.getTenantId() !=null,"tenant_id", roomItem.getTenantId()); return roomItemMapper.selectList(queryWrapper); } diff --git a/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ShowroomRecordServiceImpl.java b/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ShowroomRecordServiceImpl.java index 8124d02..a525ec7 100644 --- a/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ShowroomRecordServiceImpl.java +++ b/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ShowroomRecordServiceImpl.java @@ -52,6 +52,9 @@ public class ShowroomRecordServiceImpl extends ServiceImpl selectShowroomRecordList(ShowroomRecord showroomRecord) { QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq(showroomRecord.getParkId() !=null,"park_id", showroomRecord.getParkId()); + queryWrapper.eq(showroomRecord.getTenantId() !=null,"tenant_id", showroomRecord.getTenantId()); + queryWrapper.eq(CollUtil.isNotEmpty(showroomRecord.getStaffIds()),"user_id", showroomRecord.getStaffIds()); return showroomRecordMapper.selectList(queryWrapper); } @@ -105,14 +108,13 @@ public class ShowroomRecordServiceImpl extends ServiceImpl list = new ArrayList<>(); // 根据最近七天查询数据 - showroomRecord.setShowroomId(1L); List dates = showroomRecordMapper.selectListByDate(showroomRecord.getShowroomId()); for (Date dateTime : dates) { ShowroomRecordDTO showroomRecordDTO = new ShowroomRecordDTO(); showroomRecordDTO.setNowDate(DateUtil.format(dateTime,"yyyy-MM-dd")); // 查询会议室记录 QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("showroom_id",1L); + wrapper.eq("showroom_id",showroomRecord.getShowroomId()); 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 showroomRecords = showroomRecordMapper.selectList(wrapper); @@ -129,7 +131,7 @@ public class ShowroomRecordServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("showroom_id",1L); + queryWrapper.eq("showroom_id",showroomRecord.getShowroomId()); Date startTime = showroomRecord.getStartTime(); Date endDate = showroomRecord.getEndDate(); diff --git a/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ShowroomServiceImpl.java b/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ShowroomServiceImpl.java index e421bf3..558a84e 100644 --- a/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ShowroomServiceImpl.java +++ b/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ShowroomServiceImpl.java @@ -42,6 +42,10 @@ public class ShowroomServiceImpl extends ServiceImpl i @Override public List selectShowroomList(Showroom showroom) { QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq(showroom.getParkId() !=null,"park_id", showroom.getParkId()); + queryWrapper.eq(showroom.getTenantId() !=null,"tenant_id", showroom.getTenantId()); + queryWrapper.eq(showroom.getRoomId() !=null,"room_id", showroom.getRoomId()); + queryWrapper.eq(showroom.getRoomIds() !=null,"room_id", showroom.getRoomIds()); return showroomMapper.selectList(queryWrapper); } diff --git a/ics-admin/src/main/java/com/ics/admin/service/meeting/IEquipmentService.java b/ics-admin/src/main/java/com/ics/admin/service/meeting/IEquipmentService.java index a4bdfa0..49f6146 100644 --- a/ics-admin/src/main/java/com/ics/admin/service/meeting/IEquipmentService.java +++ b/ics-admin/src/main/java/com/ics/admin/service/meeting/IEquipmentService.java @@ -2,6 +2,8 @@ package com.ics.admin.service.meeting; import com.ics.admin.domain.meeting.Equipment; import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.ArrayList; import java.util.List; /** @@ -58,4 +60,6 @@ public interface IEquipmentService extends IService { * @return 结果 */ int deleteEquipmentById(Long id); + + List selectListByIds(List ids); } diff --git a/ics-admin/src/main/resources/excel/用户导入模板.xls b/ics-admin/src/main/resources/excel/用户导入模板.xls new file mode 100644 index 0000000000000000000000000000000000000000..c1d0f6cc06c0241ee11c9ccf40e2d96810e1d90c GIT binary patch literal 20480 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 bB>=cQ;MX4b{3)aW;P8Zh_JMW$XTtvgx>^1h literal 0 HcmV?d00001 diff --git a/ics-admin/src/main/resources/mapper/admin/BuildingMapper.xml b/ics-admin/src/main/resources/mapper/admin/BuildingMapper.xml index 20b6f29..3d8074f 100644 --- a/ics-admin/src/main/resources/mapper/admin/BuildingMapper.xml +++ b/ics-admin/src/main/resources/mapper/admin/BuildingMapper.xml @@ -49,6 +49,7 @@ AND ib.building_name LIKE CONCAT('%', #{buildingName}, '%') and ib.delete_flag = #{deleteFlag} + and ib.park_id = #{parkId} ORDER BY ib.id DESC diff --git a/ics-admin/src/main/resources/mapper/admin/CustomerMapper.xml b/ics-admin/src/main/resources/mapper/admin/CustomerMapper.xml index b8621c6..24963c0 100644 --- a/ics-admin/src/main/resources/mapper/admin/CustomerMapper.xml +++ b/ics-admin/src/main/resources/mapper/admin/CustomerMapper.xml @@ -47,6 +47,7 @@ + @@ -67,6 +68,7 @@ ic.country, ic.process, ic.contacts, + ic.building_id, ic.phone, ic.email, ic.room_id, @@ -109,6 +111,7 @@ AND ic.contacts LIKE CONCAT('%', #{contacts}, '%') AND phone LIKE CONCAT('%', #{phone}, '%') and ic.delete_flag = #{deleteFlag} + and ic.park_id = #{parkId} order by ic.create_time desc diff --git a/ics-admin/src/main/resources/mapper/admin/IcsCustomerStaffMapper.xml b/ics-admin/src/main/resources/mapper/admin/IcsCustomerStaffMapper.xml index 0e9f9f7..c34b0d6 100644 --- a/ics-admin/src/main/resources/mapper/admin/IcsCustomerStaffMapper.xml +++ b/ics-admin/src/main/resources/mapper/admin/IcsCustomerStaffMapper.xml @@ -49,6 +49,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND ics_customer_id = #{icsCustomerId} AND mobile LIKE CONCAT('%', #{mobile}, '%') AND name LIKE CONCAT('%', #{name}, '%') + AND data_type = #{dataType} + AND park_id = #{parkId} + AND tenant_id = #{tenantId} @@ -185,6 +188,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + diff --git a/ics-admin/src/main/resources/mapper/admin/RoomMapper.xml b/ics-admin/src/main/resources/mapper/admin/RoomMapper.xml index 4c90115..0e67ee2 100644 --- a/ics-admin/src/main/resources/mapper/admin/RoomMapper.xml +++ b/ics-admin/src/main/resources/mapper/admin/RoomMapper.xml @@ -120,6 +120,12 @@ AND ir.status = #{type} AND ir.is_marketable = #{isMarketable} and ir.delete_flag = #{deleteFlag} + + AND ir.building_detail_id IN + + #{buildingDetailId} + + ORDER BY ir.create_time DESC diff --git a/ics-admin/src/main/resources/mapper/admin/meeting/EquipmentMapper.xml b/ics-admin/src/main/resources/mapper/admin/meeting/EquipmentMapper.xml index 1d9b045..1a9fc3f 100644 --- a/ics-admin/src/main/resources/mapper/admin/meeting/EquipmentMapper.xml +++ b/ics-admin/src/main/resources/mapper/admin/meeting/EquipmentMapper.xml @@ -24,9 +24,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ics-admin/src/main/resources/mapper/admin/meeting/ReservationMapper.xml b/ics-admin/src/main/resources/mapper/admin/meeting/ReservationMapper.xml index b97ecf4..88940d9 100644 --- a/ics-admin/src/main/resources/mapper/admin/meeting/ReservationMapper.xml +++ b/ics-admin/src/main/resources/mapper/admin/meeting/ReservationMapper.xml @@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE id = #{id} diff --git a/ics-admin/src/main/resources/mapper/admin/meeting/UserEquipmentMapper.xml b/ics-admin/src/main/resources/mapper/admin/meeting/UserEquipmentMapper.xml index 1fc7b61..4da2a60 100644 --- a/ics-admin/src/main/resources/mapper/admin/meeting/UserEquipmentMapper.xml +++ b/ics-admin/src/main/resources/mapper/admin/meeting/UserEquipmentMapper.xml @@ -27,7 +27,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE id = #{id} - + + INSERT INTO tb_user_equipment diff --git a/ics-common/ics-common-core/src/main/java/com/ics/common/core/domain/BaseEntity.java b/ics-common/ics-common-core/src/main/java/com/ics/common/core/domain/BaseEntity.java index e206754..6f17c48 100644 --- a/ics-common/ics-common-core/src/main/java/com/ics/common/core/domain/BaseEntity.java +++ b/ics-common/ics-common-core/src/main/java/com/ics/common/core/domain/BaseEntity.java @@ -73,14 +73,14 @@ public class BaseEntity implements Serializable { /** * 租户Id */ -// @TableField(fill = FieldFill.INSERT) - @TableField(exist = false) + @TableField(fill = FieldFill.INSERT) +// @TableField(exist = false) private Long tenantId; /** * 关联园区ID */ - @TableField(fill = FieldFill.INSERT,exist = false) + @TableField(fill = FieldFill.INSERT) // @TableField(exist = false) private Long parkId; diff --git a/ics-common/ics-common-core/src/main/java/com/ics/common/core/domain/IcsCustomerStaff.java b/ics-common/ics-common-core/src/main/java/com/ics/common/core/domain/IcsCustomerStaff.java index 989e9ae..bb7ef1d 100644 --- a/ics-common/ics-common-core/src/main/java/com/ics/common/core/domain/IcsCustomerStaff.java +++ b/ics-common/ics-common-core/src/main/java/com/ics/common/core/domain/IcsCustomerStaff.java @@ -3,6 +3,7 @@ package com.ics.common.core.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.ics.common.annotation.Excel; import lombok.Data; import java.util.Date; @@ -17,23 +18,30 @@ import java.util.Date; @TableName("ics_customer_staff") public class IcsCustomerStaff extends BaseEntity { private static final long serialVersionUID = 1L; - /** 姓名 */ + + @Excel(name = "微信昵称",type = Excel.Type.EXPORT) private String username; + @Excel(name = "姓名",type = Excel.Type.EXPORT) private String name; private String photo; + @Excel(name = "地址",type = Excel.Type.EXPORT) private String address; + @Excel(name = "邮箱") private String email; + @Excel(name = "学历") private String degree; + @Excel(name = "紧急联系人") private String urgent; /** 电话 */ + @Excel(name = "手机号") private String mobile; /** 企业客户id */ @@ -49,6 +57,7 @@ public class IcsCustomerStaff extends BaseEntity { private String avatar; /** 用户性别（0男 1女 2未知） */ + @Excel(name = "性别") private String gender; /** 帐号状态（0正常 1停用） */ @@ -57,10 +66,14 @@ public class IcsCustomerStaff extends BaseEntity { /** 园区ID */ private Long parkId; + @TableField(exist = false) + private String parkName; + /**证件类型*/ private String cardType; /**证件号码**/ + @Excel(name = "身份证号") private String cardNo; /**来访时间*/ @@ -95,4 +108,7 @@ public class IcsCustomerStaff extends BaseEntity { @TableField(exist = false) private Long staffId; + @TableField(exist = false) + private Integer num; + } diff --git a/ics-common/ics-common-core/src/main/java/com/ics/common/utils/poi/ExcelUtil.java b/ics-common/ics-common-core/src/main/java/com/ics/common/utils/poi/ExcelUtil.java index c49821d..99b8ae1 100644 --- a/ics-common/ics-common-core/src/main/java/com/ics/common/utils/poi/ExcelUtil.java +++ b/ics-common/ics-common-core/src/main/java/com/ics/common/utils/poi/ExcelUtil.java @@ -13,11 +13,13 @@ import org.apache.poi.hssf.usermodel.HSSFFont; import org.apache.poi.hssf.util.HSSFColor.HSSFColorPredefined; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddressList; +import org.apache.poi.util.IOUtils; import org.apache.poi.xssf.streaming.SXSSFWorkbook; import org.apache.poi.xssf.usermodel.XSSFDataValidation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.servlet.http.HttpServletResponse; import java.io.*; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -213,6 +215,11 @@ public class ExcelUtil { return exportExcel(); } + + + + + /** * 对list数据源将其里面的数据导入到excel表单 * diff --git a/ics-system/src/main/java/com/ics/system/controller/UserController.java b/ics-system/src/main/java/com/ics/system/controller/UserController.java index d046312..29c4249 100644 --- a/ics-system/src/main/java/com/ics/system/controller/UserController.java +++ b/ics-system/src/main/java/com/ics/system/controller/UserController.java @@ -40,7 +40,15 @@ public class UserController extends BaseController { @RequiresPermissions("system:user:list") @GetMapping("get/{userId}") public User get(@PathVariable("userId") Long userId) { - return userService.selectUserById(userId); + User user = userService.selectUserById(userId); + Long customerId = user.getStaffId(); + if (null != customerId){ + IcsCustomerStaff customerStaff = userService.selectCustomerStaffById(customerId); + if (null != customerStaff){ + user.setStaffPhone(customerStaff.getMobile()); + } + } + return user; } /** diff --git a/ics-system/src/main/java/com/ics/system/domain/User.java b/ics-system/src/main/java/com/ics/system/domain/User.java index 0bf0d29..46f36c7 100644 --- a/ics-system/src/main/java/com/ics/system/domain/User.java +++ b/ics-system/src/main/java/com/ics/system/domain/User.java @@ -175,6 +175,9 @@ public class User extends BaseEntity { */ private Long staffId; + @TableField + private String parkName; + /** * 在线用户记录 */ @@ -187,6 +190,10 @@ public class User extends BaseEntity { @TableField(exist = false) private List deptIds; + + @TableField(exist = false) + private String staffPhone; + /** * 是否超管 * diff --git a/ics-system/src/main/java/com/ics/system/mapper/UserMapper.java b/ics-system/src/main/java/com/ics/system/mapper/UserMapper.java index 811d8dc..e2c3823 100644 --- a/ics-system/src/main/java/com/ics/system/mapper/UserMapper.java +++ b/ics-system/src/main/java/com/ics/system/mapper/UserMapper.java @@ -1,5 +1,6 @@ package com.ics.system.mapper; +import com.ics.common.core.domain.IcsCustomerStaff; import com.ics.system.domain.User; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -166,4 +167,6 @@ public interface UserMapper { List getStaffListByUser(); + IcsCustomerStaff selectCustomerStaffById(Long customerId); + } diff --git a/ics-system/src/main/java/com/ics/system/service/IUserService.java b/ics-system/src/main/java/com/ics/system/service/IUserService.java index a8d5da9..791906e 100644 --- a/ics-system/src/main/java/com/ics/system/service/IUserService.java +++ b/ics-system/src/main/java/com/ics/system/service/IUserService.java @@ -1,5 +1,6 @@ package com.ics.system.service; +import com.ics.common.core.domain.IcsCustomerStaff; import com.ics.system.domain.User; import java.util.List; @@ -202,4 +203,7 @@ public interface IUserService { Set selectUserIdsInDepts(Long[] deptIds); User selectUserByCustomer(Long id); + + IcsCustomerStaff selectCustomerStaffById(Long customerId); + } diff --git a/ics-system/src/main/java/com/ics/system/service/impl/UserServiceImpl.java b/ics-system/src/main/java/com/ics/system/service/impl/UserServiceImpl.java index 7741912..30c410d 100644 --- a/ics-system/src/main/java/com/ics/system/service/impl/UserServiceImpl.java +++ b/ics-system/src/main/java/com/ics/system/service/impl/UserServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ArrayUtil; import com.ics.common.annotation.DataScope; import com.ics.common.constant.UserConstants; +import com.ics.common.core.domain.IcsCustomerStaff; import com.ics.common.core.text.Convert; import com.ics.common.exception.BusinessException; import com.ics.common.utils.StringUtils; @@ -418,4 +419,12 @@ public class UserServiceImpl implements IUserService { return userMapper.selectUserByCustomer(id); } + @Override + public IcsCustomerStaff selectCustomerStaffById(Long customerId) { + + return userMapper.selectCustomerStaffById(customerId); + } + + + } diff --git a/ics-system/src/main/resources/mapper/system/UserMapper.xml b/ics-system/src/main/resources/mapper/system/UserMapper.xml index 88d924b..ecc5e57 100644 --- a/ics-system/src/main/resources/mapper/system/UserMapper.xml +++ b/ics-system/src/main/resources/mapper/system/UserMapper.xml @@ -283,9 +283,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - + DELETE FROM sys_user WHERE id = #{id} diff --git a/ics-web/src/main/java/com/ics/controller/mobile/WxLoginAPIController.java b/ics-web/src/main/java/com/ics/controller/mobile/WxLoginAPIController.java index 80635e9..6ac4690 100644 --- a/ics-web/src/main/java/com/ics/controller/mobile/WxLoginAPIController.java +++ b/ics-web/src/main/java/com/ics/controller/mobile/WxLoginAPIController.java @@ -3,7 +3,9 @@ package com.ics.controller.mobile; import cn.binarywang.wx.miniapp.api.WxMaService; import com.alibaba.fastjson.JSONObject; +import com.ics.admin.domain.Park; import com.ics.admin.service.IIcsCustomerStaffService; +import com.ics.admin.service.IParkService; import com.ics.common.constant.Constants; import com.ics.common.core.controller.BaseController; import com.ics.common.core.domain.IcsCustomerStaff; @@ -51,6 +53,9 @@ public class WxLoginAPIController extends BaseController { @Autowired private RedisTemplate redisTemplate; + @Autowired + private IParkService parkService; + String smallWxAccessTokenKey = "smallWxAccessToken"; String smallWxUserPassword = "123456"; @@ -77,6 +82,11 @@ public class WxLoginAPIController extends BaseController { IcsCustomerStaff sysUser = icsCustomerStaffService.selectUserByOpenid(openid); // 用户存在直接获取token if (sysUser != null) { + Long parkId = sysUser.getParkId(); + if (parkId !=null){ + Park park = parkService.selectParkById(parkId); + sysUser.setParkName(park.getName()); + } String phonenumber = sysUser.getMobile(); User user = new User(); PublishFactory.recordLoginInfo(sysUser.getUsername(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")); @@ -124,7 +134,11 @@ public class WxLoginAPIController extends BaseController { customerStaff.setOpenid(openid); icsCustomerStaffService.updateIcsCustomerStaff(customerStaff); } - + Long parkId = customerStaff.getParkId(); + if (parkId !=null){ + Park park = parkService.selectParkById(parkId); + customerStaff.setParkName(park.getName()); + } User user = new User(); PublishFactory.recordLoginInfo(customerStaff.getUsername(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")); diff --git a/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomContentController.java b/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomContentController.java index a667624..80b1114 100644 --- a/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomContentController.java +++ b/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomContentController.java @@ -431,9 +431,9 @@ public class ApiRoomContentController extends BaseController { */ @RequiresPermissions("member:center:view") @GetMapping("/selectCoordinate") - public R selectCoordinate() { + public R selectCoordinate(Long parkId) { //根据用户获取对应的企业id，查询该企业下对应的优惠卷 - Park park = parkService.selectParkById(1L); + Park park = parkService.selectParkById(parkId); return R.ok().put("lat", park.getLat()).put("lng", park.getLng()).put("address", park.getAddress()); } diff --git a/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomController.java b/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomController.java index c71939e..8fbb937 100644 --- a/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomController.java +++ b/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomController.java @@ -74,7 +74,7 @@ public class ApiRoomController extends BaseController { /** * 获取房间内容 */ - @Ignore + @RequiresPermissions("member:center:view") @PostMapping("list") public R list() { List roomContents = roomContentService.selectApiRoomList(new RoomContent()); @@ -91,7 +91,7 @@ public class ApiRoomController extends BaseController { /** * 查询今日的会议和正常进行的会议 */ - @Ignore + @RequiresPermissions("member:center:view") @PostMapping("todayMeeting") public R todayMeeting(@RequestBody RoomContent roomContent) { List roomContents=roomContentService.todayMeeting(roomContent); @@ -99,12 +99,15 @@ public class ApiRoomController extends BaseController { } - - - - - - + /** + * 查询所有的园区 + */ + @RequiresPermissions("member:center:view") + @GetMapping("selectParkList") + public R selectParkList() { + List parkList = parkService.selectParkList(new Park()); + return R.data(parkList); + } } diff --git a/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiVisitorController.java b/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiVisitorController.java index 3b67242..319329d 100644 --- a/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiVisitorController.java +++ b/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiVisitorController.java @@ -200,6 +200,37 @@ public class ApiVisitorController extends BaseController { person.setReviewers(person.getUserId()); person.setReviewersTime(new Date()); int update = visitorPersonService.updateVisitorPersonStatus(person); + if (update > 0){ + String s = DeviceUtils.queryPersons(String.valueOf(person.getIntervieweeId())); + JSONObject jsonObject = JSONUtil.parseObj(s); + Integer amount = (Integer) jsonObject.get("amount"); + if (amount > 0){ + //todo 需要修改 到底是按照访客时间。 + return toAjax(1); + } +// Assert.isTrue(IdcardUtil.isValidCard(person.getCardNo()), "身份证格式不正确"); +// Assert.isTrue(Validator.isPlateNumber(person.getPhone()), "手机号格式不正确"); + DevicePersonDto devicePersonDto = new DevicePersonDto(); + ArrayList facesDtos = new ArrayList<>(); + devicePersonDto.setPersonId(String.valueOf(person.getIntervieweeId())); + devicePersonDto.setName(person.getName()); + devicePersonDto.setPhone(String.valueOf(person.getPhone())); + devicePersonDto.setCertificateType("111"); + devicePersonDto.setCertificateNumber(person.getCardNo()); + //添加人员类型 + devicePersonDto.setPersonType("visitor"); + //添加访客时间 + devicePersonDto.setVisitorValidStartTime(DateUtil.format(person.getVisitTime(), "yyyy-MM-dd'T'HH:mm:ss")); + devicePersonDto.setVisitorValidEndTime(DateUtil.format(person.getLeaveTime(), "yyyy-MM-dd'T'HH:mm:ss")); + FacesDto facesDto = new FacesDto(); + facesDto.setFaceId(String.valueOf(person.getUserId())); + String faceData =BASE64_PREFIX+ UrlToBase64Util.imageUrlToBase64(person.getUrl()); + facesDto.setData(faceData); + facesDtos.add(facesDto); + devicePersonDto.setFaces(facesDtos); + + DeviceUtils.addPersons(devicePersonDto); + } return toAjax(update); } @@ -226,39 +257,11 @@ public class ApiVisitorController extends BaseController { @PostMapping("visitorPerson") public R visitorPerson(@RequestBody VisitorPerson person) { person.setStatus(0); - boolean save = visitorPersonService.save(person); - Assert.isTrue(save, "添加访客预约失败"); + int i = visitorPersonService.insertReservationPerson(person); + Assert.isTrue(i>0, "添加访客预约失败"); //添加成功后，需要 往设备中添加一条数据 - String s = DeviceUtils.queryPersons(String.valueOf(person.getIntervieweeId())); - JSONObject jsonObject = JSONUtil.parseObj(s); - Integer amount = (Integer) jsonObject.get("amount"); - if (amount > 0){ - //todo 需要修改 到底是按照访客时间。 - return toAjax(save); - } -// Assert.isTrue(IdcardUtil.isValidCard(person.getCardNo()), "身份证格式不正确"); -// Assert.isTrue(Validator.isPlateNumber(person.getPhone()), "手机号格式不正确"); - DevicePersonDto devicePersonDto = new DevicePersonDto(); - ArrayList facesDtos = new ArrayList<>(); - devicePersonDto.setPersonId(String.valueOf(person.getIntervieweeId())); - devicePersonDto.setName(person.getName()); - devicePersonDto.setPhone(String.valueOf(person.getPhone())); - devicePersonDto.setCertificateType("111"); - devicePersonDto.setCertificateNumber(person.getCardNo()); - //添加人员类型 - devicePersonDto.setPersonType("visitor"); - //添加访客时间 - devicePersonDto.setVisitorValidStartTime(DateUtil.format(person.getVisitTime(), "yyyy-MM-dd'T'HH:mm:ss")); - devicePersonDto.setVisitorValidEndTime(DateUtil.format(person.getLeaveTime(), "yyyy-MM-dd'T'HH:mm:ss")); - FacesDto facesDto = new FacesDto(); - facesDto.setFaceId(String.valueOf(person.getUserId())); - String faceData =BASE64_PREFIX+ UrlToBase64Util.imageUrlToBase64(person.getUrl()); - facesDto.setData(faceData); - facesDtos.add(facesDto); - devicePersonDto.setFaces(facesDtos); - DeviceUtils.addPersons(devicePersonDto); - return toAjax(save); + return toAjax(i); } /**