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 6dbb8c5..c620ff2 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 @@ -64,7 +64,7 @@ public class WisdomRoomController extends BaseController { room.setStaffId(collect); IcsCustomerStaff icsCustomerStaff =new IcsCustomerStaff(); icsCustomerStaff.setIcsCustomerId(85L); - room.setStaffLists(customerStaffService.selectCustomerStaffList(icsCustomerStaff)); + room.setStaffLists(customerStaffService.selectCustomerStaff(icsCustomerStaff)); } return result(wisdomRooms); } @@ -130,6 +130,7 @@ public class WisdomRoomController extends BaseController { 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/domain/DeviceVo.java b/ics-admin/src/main/java/com/ics/admin/domain/DeviceVo.java index 7de00e5..80fcb56 100644 --- a/ics-admin/src/main/java/com/ics/admin/domain/DeviceVo.java +++ b/ics-admin/src/main/java/com/ics/admin/domain/DeviceVo.java @@ -18,4 +18,6 @@ public class DeviceVo { private String coverType; + private Integer userId; + } 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 d6a1475..93e0af2 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 @@ -82,4 +82,6 @@ public interface IcsCustomerStaffMapper extends BaseMapper { @InterceptorIgnore(tenantLine = "1") List selectListByCustomerId(); + + List selectCustomerStaff(IcsCustomerStaff icsCustomerStaff); } 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 82ae497..3712517 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 @@ -94,6 +94,8 @@ public interface IIcsCustomerStaffService extends IService { List selectListByCustomerId(); + List selectCustomerStaff(IcsCustomerStaff icsCustomerStaff); + // IcsCustomerStaff selectUserByMobileAndParkId(String phoneNumber, String parkId); } 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 748901a..9fe6eb0 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 @@ -316,6 +316,11 @@ public class IcsCustomerStaffServiceImpl extends ServiceImpl selectCustomerStaff(IcsCustomerStaff icsCustomerStaff) { + return icsCustomerStaffMapper.selectCustomerStaff(icsCustomerStaff); + } + //根据企业查询对应的设备 public void queryDeviceByCustomerId(Long customerId,Long userId){ 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 08b36ec..b1e6617 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 @@ -50,7 +50,7 @@ public class WisdomStaffServiceImpl extends ServiceImpl selectWisdomStaffList(WisdomStaff wisdomStaff) { - QueryWrapper queryWrapper = new QueryWrapper(); + QueryWrapper queryWrapper = new QueryWrapper(); return wisdomStaffMapper.selectList(queryWrapper); } diff --git a/ics-admin/src/main/resources/mapper/admin/IcsCustomerStaffMapper.xml b/ics-admin/src/main/resources/mapper/admin/IcsCustomerStaffMapper.xml index c6646fb..d3dc2ab 100644 --- a/ics-admin/src/main/resources/mapper/admin/IcsCustomerStaffMapper.xml +++ b/ics-admin/src/main/resources/mapper/admin/IcsCustomerStaffMapper.xml @@ -224,6 +224,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE tsc.ics_customer_id = 85 ORDER BY CONVERT(cs.name USING GBK) ASC + diff --git a/ics-common/ics-common-core/src/main/java/com/ics/common/utils/device/MenjinUtils.java b/ics-common/ics-common-core/src/main/java/com/ics/common/utils/device/MenjinUtils.java new file mode 100644 index 0000000..b85c2dc --- /dev/null +++ b/ics-common/ics-common-core/src/main/java/com/ics/common/utils/device/MenjinUtils.java @@ -0,0 +1,45 @@ +package com.ics.common.utils.device; + +import java.io.InputStream; +import java.io.OutputStream; +import java.net.ServerSocket; +import java.net.Socket; + +public class MenjinUtils { + public static void main(String[] args) { + try { + // 创建TCP服务器并绑定到指定端口 //tcp 通讯接口4370 + int port = 8083; + ServerSocket serverSocket = new ServerSocket(port); + System.out.println("服务器已启动，等待客户端连接..."); + + while (true) { + // 等待客户端连接 + Socket clientSocket = serverSocket.accept(); + System.out.println("客户端连接成功"); + + // 创建输入流和输出流 + InputStream inputStream = clientSocket.getInputStream(); + OutputStream outputStream = clientSocket.getOutputStream(); + + // 读取客户端发送的数据 + byte[] buffer = new byte[1024]; + int bytesRead = inputStream.read(buffer); + String receivedMessage = new String(buffer, 0, bytesRead); + System.out.println("收到消息：" + receivedMessage); + + // 发送响应数据给客户端 + String responseMessage = "Hello, Client!"; + outputStream.write(responseMessage.getBytes()); + + // 关闭连接 + clientSocket.close(); + } + } catch (Exception e) { + e.printStackTrace(); + } + } +} + + + 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 887a3d3..c4df0f1 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 @@ -51,9 +51,9 @@ public class SignUtils { Map heads = new HashMap<>(); - System.out.println("ip为："+"222.67.226.196"); + System.out.println("ip为："+"222.67.48.244"); - String body = HttpRequest.post("http://222.67.226.196:8888/cootoo/openLock") + String body = HttpRequest.post("http://222.67.48.244:8888/cootoo/openLock") .headerMap(heads, false) .body(on.toString()).timeout(30 * 1000).execute().body(); System.out.println(body); diff --git a/ics-common/ics-common-core/src/main/java/com/ics/common/utils/device/WisDomDeviceUtils.java b/ics-common/ics-common-core/src/main/java/com/ics/common/utils/device/WisDomDeviceUtils.java index faa8271..8c3206a 100644 --- a/ics-common/ics-common-core/src/main/java/com/ics/common/utils/device/WisDomDeviceUtils.java +++ b/ics-common/ics-common-core/src/main/java/com/ics/common/utils/device/WisDomDeviceUtils.java @@ -300,8 +300,8 @@ public class WisDomDeviceUtils { } public static String openControlLock(String ip) { - String url = "http://222.67.226.196:1234/api/Op/OpDoor?ipaddress="+ip; - log.info("开门控制器的url:{}", "222.67.226.196"); + String url = "http://222.67.48.244:1234/api/Op/OpDoor?ipaddress="+ip; + log.info("开门控制器的url:{}", "222.67.48.244"); String msg = HttpUtil.get(url); log.info("开门控制器的结果为结果:{}", msg); return msg; 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 6334d13..77ba8a9 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 @@ -1,5 +1,6 @@ package com.ics.controller.mobile.meeting; +import cn.hutool.core.date.DateField; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.json.JSONObject; @@ -97,16 +98,17 @@ public class ApiEquipmentController extends BaseController { } Equipment equipment = equipmentService.selectEquipmentById(roomRecord.getDeviceId()); - if (equipment.getType() == 0){ + if (equipment.getType() == 0) { String openlock = DeviceUtils.openlock(equipment.getIp()); JSONObject jsonObject = JSONUtil.parseObj(openlock); Integer code = (Integer) jsonObject.get("status"); Assert.isTrue(code == 0, "开门失败"); - }else if (equipment.getType() == 1){ + } else if (equipment.getType() == 1) { String openlock = DeviceUtils.openControlLock(equipment.getIp()); - log.info("开门控制器的结果为结果:{}", openlock);; + log.info("开门控制器的结果为结果:{}", openlock); + ; } roomRecord.setType("0"); int i = roomRecordService.insertRoomRecord(roomRecord); @@ -136,7 +138,6 @@ public class ApiEquipmentController extends BaseController { /** * 获取对比记录,获取设备的对比记录，设备往服务端传输数据 - * */ @Ignore @PostMapping("/getEquipmentByUserIdAndEquipmentId") @@ -225,7 +226,8 @@ public class ApiEquipmentController extends BaseController { String ip = equipmentService.selectEquipmentById(roomRecord.getDeviceId()).getIp(); String openlock = DeviceUtils.openControlLock(ip); - log.info("开门控制器的结果为结果:{}", openlock);; + log.info("开门控制器的结果为结果:{}", openlock); + ; } return R.ok("开门成功"); @@ -237,20 +239,20 @@ public class ApiEquipmentController extends BaseController { WisdomDevice wisdomDevice = new WisdomDevice(); - log.info("会议室的id为{}", roomRecord.getRoomId()); + log.info("2222222222222222222222会议室的id为{}", roomRecord.getRoomId()); //大会议室 52 茶室 53 小会议室 54 - if(roomRecord.getRoomId() == 237L ){ + if (roomRecord.getRoomId() == 237L) { wisdomDevice.setEquipmentNum("238"); - }else if (roomRecord.getRoomId() == 238L){ + } else if (roomRecord.getRoomId() == 238L) { wisdomDevice.setEquipmentNum("240"); - }else if (roomRecord.getRoomId() == 239L){ + } else if (roomRecord.getRoomId() == 239L) { wisdomDevice.setEquipmentNum("239"); - }else if (roomRecord.getRoomId() == 242L){ + } else if (roomRecord.getRoomId() == 242L) { wisdomDevice.setEquipmentNum("192.168.1.201"); wisdomDevice.setType("开门控制器"); - }else if (roomRecord.getRoomId() == 243L){ + } else if (roomRecord.getRoomId() == 243L) { wisdomDevice.setEquipmentNum("192.168.1.34"); wisdomDevice.setType("开门控制器"); } @@ -261,19 +263,28 @@ public class ApiEquipmentController extends BaseController { Integer count1 = wisdomStaffService.selectByUserIdAndRoomId(Integer.parseInt(String.valueOf(roomRecord.getUserId())), "0"); if (count1 == 0) { List list = wisdomStaffService.selectListByUserIdAndRoomId(Integer.parseInt(String.valueOf(roomRecord.getUserId())), "1"); + int num = 0; for (WisdomStaff wisdomStaff : list) { - boolean in = DateUtil.isIn(new Date(), wisdomStaff.getStartTime(), wisdomStaff.getEndDate()); - if (!in) return R.error("该用户没有权限开锁"); - if (wisdomDevice.getType() !=null && wisdomDevice.getType().equals("开门控制器")){ - WisDomDeviceUtils.openControlLock(wisdomDevice.getEquipmentNum()); - }else { - SignUtils.lock(wisdomDevice.getEquipmentNum()); + 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) { + num++; } } - } else { - if (wisdomDevice.getType() !=null && wisdomDevice.getType().equals("开门控制器")){ + if (num <= 0) return R.error("该用户没有权限开锁"); + if (wisdomDevice.getType() != null && wisdomDevice.getType().equals("开门控制器")) { WisDomDeviceUtils.openControlLock(wisdomDevice.getEquipmentNum()); - }else { + } else { + SignUtils.lock(wisdomDevice.getEquipmentNum()); + } + + } else { + if (wisdomDevice.getType() != null && wisdomDevice.getType().equals("开门控制器")) { + WisDomDeviceUtils.openControlLock(wisdomDevice.getEquipmentNum()); + } else { SignUtils.lock(wisdomDevice.getEquipmentNum()); } } @@ -281,7 +292,6 @@ public class ApiEquipmentController extends BaseController { } - /** * 扫描二维码开门 用户id 和设备id */ 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 ed92d16..d3f8c12 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 @@ -40,7 +40,7 @@ public class WisdomApiController extends BaseController { private IWisdomDeviceService wisdomDeviceService; @Autowired - private IWisdomStaffService wisdomStaffService; + private IWisdomStaffService wisdomStaffService; @Autowired private IIcsCustomerStaffService customerStaffService; @@ -103,7 +103,7 @@ public class WisdomApiController extends BaseController { wisdomDevice.setWisdomRoomId(id); if (id == 3 || id == 4) { wisdomDevice.setType("门锁"); - }else if (id ==18 || id == 19){ + } else if (id == 18 || id == 19) { wisdomDevice.setType("开门控制器"); } List wisdomDevices = wisdomDeviceService.selectWisdomDeviceList(wisdomDevice); @@ -147,6 +147,7 @@ public class WisdomApiController extends BaseController { */ @RequiresPermissions("member:center:view") +// @Ignore @RequestMapping("/callApiByDeviceId") public R callApiByDeviceId(@RequestBody DeviceVo deviceVo) { @@ -174,17 +175,19 @@ public class WisdomApiController extends BaseController { Integer count1 = wisdomStaffService.selectByUserIdAndRoomId(loginStaffId, "0"); if (count1 == 0) { List list = wisdomStaffService.selectListByUserIdAndRoomId(loginStaffId, "1"); + int num = 0; for (WisdomStaff wisdomStaff : list) { 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()); + if (in) { + num++; + } } + if (num <= 0) return R.error("该用户没有权限开锁"); + SignUtils.lock(wisdomDevice.getEquipmentNum()); } else { // WisDomDeviceUtils.openControlLock(wisdomDevice.getEquipmentNum()); @@ -257,4 +260,6 @@ public class WisdomApiController extends BaseController { return R.ok(); } + + }