From d0107d5b1ad955b0285627232b5f4299a81a78a4 Mon Sep 17 00:00:00 2001 From: chenze <1824191732@qq.com> Date: Wed, 28 Aug 2024 16:21:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=99=BA=E8=83=BD=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=AF=B9=E5=BA=94=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WisdomDeviceController.java | 12 ++++++--- .../controller/WisdomRoomController.java | 25 +++++++++++++------ .../impl/IcsCustomerStaffServiceImpl.java | 5 +++- .../service/impl/WisdomStaffServiceImpl.java | 1 + .../java/com/ics/common/utils/Sample.java | 10 ++++++++ .../ics/common/utils/device/SignUtils.java | 2 +- .../meeting/ApiEquipmentController.java | 3 ++- .../meeting/ApiRoomContentController.java | 13 +++++++--- .../mobile/wisdom/WisdomApiController.java | 10 +++++++- ics-web/src/main/resources/application.yml | 2 +- 10 files changed, 63 insertions(+), 20 deletions(-) diff --git a/ics-admin/src/main/java/com/ics/admin/controller/WisdomDeviceController.java b/ics-admin/src/main/java/com/ics/admin/controller/WisdomDeviceController.java index 3a9279b..3901d2b 100644 --- a/ics-admin/src/main/java/com/ics/admin/controller/WisdomDeviceController.java +++ b/ics-admin/src/main/java/com/ics/admin/controller/WisdomDeviceController.java @@ -47,7 +47,8 @@ public class WisdomDeviceController extends BaseController { /** * 查询智能设备列表 */ - @RequiresPermissions("wisdom:wisdomDevice:list") + @Ignore +// @RequiresPermissions("wisdom:wisdomDevice:list") @GetMapping("list") public R list(WisdomDevice wisdomDevice) { startPage(); @@ -65,7 +66,8 @@ public class WisdomDeviceController extends BaseController { /** * 新增保存智能设备 */ - @RequiresPermissions("wisdom:wisdomDevice:add") +// @RequiresPermissions("wisdom:wisdomDevice:add") + @Ignore @PostMapping("save") public R addSave(@RequestBody WisdomDevice wisdomDevice) { return toAjax(wisdomDeviceService.insertWisdomDevice(wisdomDevice)); @@ -74,7 +76,8 @@ public class WisdomDeviceController extends BaseController { /** * 修改保存智能设备 */ - @RequiresPermissions("wisdom:wisdomDevice:edit") +// @RequiresPermissions("wisdom:wisdomDevice:edit") + @Ignore @PostMapping("update") public R editSave(@RequestBody WisdomDevice wisdomDevice) { return toAjax(wisdomDeviceService.updateWisdomDevice(wisdomDevice)); @@ -83,7 +86,8 @@ public class WisdomDeviceController extends BaseController { /** * 删除智能设备 */ - @RequiresPermissions("wisdom:wisdomDevice:remove") +// @RequiresPermissions("wisdom:wisdomDevice:remove") + @Ignore @PostMapping("remove") public R remove(String ids) { return toAjax(wisdomDeviceService.deleteWisdomDeviceByIds(ids)); diff --git a/ics-admin/src/main/java/com/ics/admin/controller/WisdomRoomController.java b/ics-admin/src/main/java/com/ics/admin/controller/WisdomRoomController.java index 72f95d6..6dbb8c5 100644 --- a/ics-admin/src/main/java/com/ics/admin/controller/WisdomRoomController.java +++ b/ics-admin/src/main/java/com/ics/admin/controller/WisdomRoomController.java @@ -17,6 +17,7 @@ import com.ics.common.core.domain.R; import com.ics.common.core.controller.BaseController; import com.ics.admin.domain.WisdomRoom; import com.ics.admin.service.IWisdomRoomService; +import org.wf.jwtp.annotation.Ignore; import org.wf.jwtp.annotation.RequiresPermissions; import java.util.List; @@ -52,7 +53,8 @@ public class WisdomRoomController extends BaseController { /** * 查询智能房间列表 */ - @RequiresPermissions("wisdom:wisdomRoom:list") + @Ignore +// @RequiresPermissions("wisdom:wisdomRoom:list") @GetMapping("list") public R list(WisdomRoom wisdomRoom) { startPage(); @@ -60,7 +62,9 @@ public class WisdomRoomController extends BaseController { for (WisdomRoom room : wisdomRooms) { List collect = wisdomStaffService.selectWisdomStaffByRoomId(room.getId()); room.setStaffId(collect); - room.setStaffLists(customerStaffService.selectList()); + IcsCustomerStaff icsCustomerStaff =new IcsCustomerStaff(); + icsCustomerStaff.setIcsCustomerId(85L); + room.setStaffLists(customerStaffService.selectCustomerStaffList(icsCustomerStaff)); } return result(wisdomRooms); } @@ -69,7 +73,8 @@ public class WisdomRoomController extends BaseController { /** * 新增保存智能房间 */ - @RequiresPermissions("wisdom:wisdomRoom:add") +// @RequiresPermissions("wisdom:wisdomRoom:add") + @Ignore @PostMapping("save") public R addSave(@RequestBody WisdomRoom wisdomRoom) { int i = wisdomRoomService.insertWisdomRoom(wisdomRoom); @@ -87,7 +92,8 @@ public class WisdomRoomController extends BaseController { /** * 修改保存智能房间 */ - @RequiresPermissions("wisdom:wisdomRoom:edit") +// @RequiresPermissions("wisdom:wisdomRoom:edit") + @Ignore @PostMapping("update") public R editSave(@RequestBody WisdomRoom wisdomRoom) { int i = wisdomRoomService.updateWisdomRoom(wisdomRoom); @@ -97,6 +103,7 @@ public class WisdomRoomController extends BaseController { if (ids.size()>0) wisdomStaffService.deleteWisdomStaffByIds(joinStr); for (Long s : wisdomRoom.getStaffId()) { wisdomStaff.setWisdomRoomId(wisdomRoom.getId()); + wisdomStaff.setDataType("0"); wisdomStaff.setStaffId(s); wisdomStaffService.insertWisdomStaff(wisdomStaff); } @@ -106,7 +113,8 @@ public class WisdomRoomController extends BaseController { /** * 删除智能房间 */ - @RequiresPermissions("wisdom:wisdomRoom:remove") +// @RequiresPermissions("wisdom:wisdomRoom:remove") + @Ignore @PostMapping("remove") public R remove(String ids) { return toAjax(wisdomRoomService.deleteWisdomRoomByIds(ids)); @@ -115,10 +123,13 @@ public class WisdomRoomController extends BaseController { /** * 用户列表 */ - @RequiresPermissions("wisdom:wisdomRoom:view") +// @RequiresPermissions("wisdom:wisdomRoom:view") + @Ignore @GetMapping("selectStaff") public R selectStaff() { - List customerStaffs = customerStaffService.selectList(); + IcsCustomerStaff icsCustomerStaff =new IcsCustomerStaff(); + icsCustomerStaff.setIcsCustomerId(85L); + List customerStaffs = customerStaffService.selectCustomerStaffList(icsCustomerStaff); return R.data(customerStaffs); } 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 9471c7b..748901a 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 @@ -302,7 +302,10 @@ public class IcsCustomerStaffServiceImpl extends ServiceImpl selectList() { - return baseMapper.selectList(null); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.groupBy("id"); + + return baseMapper.selectList(wrapper); } @Override diff --git a/ics-admin/src/main/java/com/ics/admin/service/impl/WisdomStaffServiceImpl.java b/ics-admin/src/main/java/com/ics/admin/service/impl/WisdomStaffServiceImpl.java index 8d0b9b8..9dcd0cf 100644 --- a/ics-admin/src/main/java/com/ics/admin/service/impl/WisdomStaffServiceImpl.java +++ b/ics-admin/src/main/java/com/ics/admin/service/impl/WisdomStaffServiceImpl.java @@ -121,6 +121,7 @@ public class WisdomStaffServiceImpl extends ServiceImpl selectWisdomStaffByRoomId(Long id) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("wisdom_room_id",id); + wrapper.groupBy("staff_id"); List wisdomStaffs = wisdomStaffMapper.selectList(wrapper); List collect = wisdomStaffs.stream().map(WisdomStaff::getStaffId).collect(Collectors.toList()); return collect; diff --git a/ics-common/ics-common-core/src/main/java/com/ics/common/utils/Sample.java b/ics-common/ics-common-core/src/main/java/com/ics/common/utils/Sample.java index 6122fdb..0ce8aa6 100644 --- a/ics-common/ics-common-core/src/main/java/com/ics/common/utils/Sample.java +++ b/ics-common/ics-common-core/src/main/java/com/ics/common/utils/Sample.java @@ -24,6 +24,16 @@ public class Sample { return new com.aliyun.dysmsapi20170525.Client(config); } + /** + * message:上海长阳短信验证功能 + * date:2024-06-22 + * @param phone 手机号 + * @param name 名称 + * @param date 日期 + * @param meetingName 会议室名称 + * @param thing + * @throws Exception + */ public static void send1(String phone, String name, Date date,String meetingName,String thing) throws Exception { com.aliyun.dysmsapi20170525.Client client = Sample.createClient(); // 1.发送短信 diff --git a/ics-common/ics-common-core/src/main/java/com/ics/common/utils/device/SignUtils.java b/ics-common/ics-common-core/src/main/java/com/ics/common/utils/device/SignUtils.java index 0859745..07f7422 100644 --- a/ics-common/ics-common-core/src/main/java/com/ics/common/utils/device/SignUtils.java +++ b/ics-common/ics-common-core/src/main/java/com/ics/common/utils/device/SignUtils.java @@ -49,7 +49,7 @@ public class SignUtils { Map heads = new HashMap<>(); - String body = HttpRequest.post("http://116.227.212.175:8888/cootoo/openLock") + String body = HttpRequest.post("http://222.67.49.6:8888/cootoo/openLock") .headerMap(heads, false) .body(on.toString()).timeout(30 * 1000).execute().body(); System.out.println(body); diff --git a/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiEquipmentController.java b/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiEquipmentController.java index bbc6109..65b09df 100644 --- a/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiEquipmentController.java +++ b/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiEquipmentController.java @@ -237,10 +237,11 @@ public class ApiEquipmentController extends BaseController { WisdomDevice wisdomDevice = new WisdomDevice(); - //大会议室 + //大会议室 52 茶室 53 小会议室 54 if(roomRecord.getRoomId() == 237L ){ wisdomDevice.setEquipmentNum("238"); }else if (roomRecord.getRoomId() == 238L){ + wisdomDevice.setEquipmentNum("240"); }else if (roomRecord.getRoomId() == 239L){ wisdomDevice.setEquipmentNum("239"); 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 3e43ee3..792f153 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 @@ -139,7 +139,8 @@ public class ApiRoomContentController extends BaseController { } /** - * 展示会议列表，当天会议室的预约时间 + * 查询长阳展示会议列表，当天会议室的预约时间 + * date:2024-06-25 */ @RequiresPermissions("member:center:view") @GetMapping("/getMeetingRoomRecord/{meetingRoomId}") @@ -153,8 +154,8 @@ public class ApiRoomContentController extends BaseController { /** - * 查询空闲的会议室 - * + * 查询长阳空闲的会议室 + * date:2024-06-24 * @param reservation * @return */ @@ -204,7 +205,10 @@ public class ApiRoomContentController extends BaseController { } /** - * 上海会议预约记录 + * message:上海会议预约记录 + * project:上海长阳 + * date:2024-06-23 + * */ @RequiresPermissions("member:center:view") @PostMapping("/saveChangyangMeetingRecord") @@ -747,6 +751,7 @@ public class ApiRoomContentController extends BaseController { /** * 获取人员列表（上海长阳） + * date:2024-06-19 */ @RequiresPermissions("member:center:view") @GetMapping("getChangyangPersonList") diff --git a/ics-web/src/main/java/com/ics/controller/mobile/wisdom/WisdomApiController.java b/ics-web/src/main/java/com/ics/controller/mobile/wisdom/WisdomApiController.java index 4bd578a..bc10285 100644 --- a/ics-web/src/main/java/com/ics/controller/mobile/wisdom/WisdomApiController.java +++ b/ics-web/src/main/java/com/ics/controller/mobile/wisdom/WisdomApiController.java @@ -2,6 +2,8 @@ package com.ics.controller.mobile.wisdom; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateField; +import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.ics.admin.domain.*; @@ -84,6 +86,7 @@ public class WisdomApiController extends BaseController { @RequiresPermissions("member:center:view") @RequestMapping("/getAllDeviceInfoByRoomId") public R getAllDeviceInfoByRoomId(Long id) { + long currentUserId = getLoginStaffId(); //获取用户id 判断会议预约还是管理员 @@ -166,7 +169,12 @@ public class WisdomApiController extends BaseController { if (count1 == 0) { List list = wisdomStaffService.selectListByUserIdAndRoomId(loginStaffId, "1"); for (WisdomStaff wisdomStaff : list) { - boolean in = DateUtil.isIn(new Date(), wisdomStaff.getStartTime(), wisdomStaff.getEndDate()); + Date startTime = wisdomStaff.getStartTime(); + Date endDate = wisdomStaff.getEndDate(); + Date offset = DateUtil.offset(startTime, DateField.MINUTE, -10); + Date offset1 = DateUtil.offset(endDate, DateField.MINUTE, -10); + + boolean in = DateUtil.isIn(new Date(), offset, offset1); if (!in) return R.error("该用户没有权限开锁"); SignUtils.lock(wisdomDevice.getEquipmentNum()); } diff --git a/ics-web/src/main/resources/application.yml b/ics-web/src/main/resources/application.yml index a58fb9b..68c0260 100644 --- a/ics-web/src/main/resources/application.yml +++ b/ics-web/src/main/resources/application.yml @@ -27,7 +27,7 @@ spring: main: allow-bean-definition-overriding: true profiles: - active: dev + active: prod jackson: date-format: yyyy-MM-dd HH:mm:ss time-zone: GMT+8