From f298a112b19ebc3364282c71feab32afbbe2f2c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=94=E8=80=81=E5=B3=B0?= Date: Sun, 1 Dec 2024 22:30:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A2=AF=E6=8E=A7?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E8=BD=AC=E6=8D=A2=E5=B8=A6=E5=AD=90?= =?UTF-8?q?=E6=AF=8D=E7=9A=84=E6=88=BF=E9=97=B4=E4=B8=BA=E6=95=B0=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StartAccessControlDoorCmd.java | 83 +++++++++++++++++++ .../StopAccessControlDoorCmd.java | 83 +++++++++++++++++++ .../AbstractAccessControlManufactorAdapt.java | 10 +++ .../manufactor/IAccessControlManufactor.java | 15 ++++ .../yiteSmart/SyncUserCardImpl.java | 31 ++++++- .../accessControl/yiteSmart/SyncUserImpl.java | 35 +++++++- .../YiteSmartAccessControlProcessAdapt.java | 60 ++++++++++++++ .../bmo/impl/SyncCardsBidBmoImpl.java | 29 ++++++- .../bmo/impl/SyncUserBidBmoImpl.java | 29 ++++++- .../accessControlManage.html | 10 +++ .../accessControlManage.js | 43 ++++++++++ 11 files changed, 417 insertions(+), 11 deletions(-) create mode 100644 iot-accessControl/src/main/java/com/java110/accessControl/cmd/accessControl/StartAccessControlDoorCmd.java create mode 100644 iot-accessControl/src/main/java/com/java110/accessControl/cmd/accessControl/StopAccessControlDoorCmd.java diff --git a/iot-accessControl/src/main/java/com/java110/accessControl/cmd/accessControl/StartAccessControlDoorCmd.java b/iot-accessControl/src/main/java/com/java110/accessControl/cmd/accessControl/StartAccessControlDoorCmd.java new file mode 100644 index 00000000..cf0137be --- /dev/null +++ b/iot-accessControl/src/main/java/com/java110/accessControl/cmd/accessControl/StartAccessControlDoorCmd.java @@ -0,0 +1,83 @@ +package com.java110.accessControl.cmd.accessControl; + +import com.alibaba.fastjson.JSONObject; +import com.java110.accessControl.manufactor.IAccessControlManufactor; +import com.java110.bean.ResultVo; +import com.java110.core.annotation.Java110Cmd; +import com.java110.core.cmd.Cmd; +import com.java110.core.cmd.CmdEvent; +import com.java110.core.context.ICmdDataFlowContext; +import com.java110.core.exception.CmdException; +import com.java110.core.factory.ApplicationContextFactory; +import com.java110.core.utils.Assert; +import com.java110.core.utils.CmdContextUtils; +import com.java110.dto.accessControl.AccessControlDto; +import com.java110.dto.hardwareManufacturer.HardwareManufacturerDto; +import com.java110.dto.user.UserDto; +import com.java110.intf.accessControl.IAccessControlV1InnerServiceSMO; +import com.java110.intf.system.IHardwareManufacturerV1InnerServiceSMO; +import com.java110.intf.user.IUserV1InnerServiceSMO; +import org.springframework.beans.factory.annotation.Autowired; + +import java.text.ParseException; +import java.util.List; + + +@Java110Cmd(serviceCode = "accessControl.StartAccessControlDoor") +public class StartAccessControlDoorCmd extends Cmd { + + @Autowired + private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl; + + @Autowired + private IAccessControlV1InnerServiceSMO accessControlV1InnerServiceSMOImpl; + + @Autowired + private IHardwareManufacturerV1InnerServiceSMO hardwareManufacturerV1InnerServiceSMOImpl; + + @Override + public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException { + Assert.hasKeyAndValue(reqJson, "machineId", "未包含设备信息"); + Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区信息"); + } + + @Override + public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException { + + String userId = CmdContextUtils.getUserId(context); + + UserDto userDto = new UserDto(); + userDto.setUserId(userId); + List userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto); + + Assert.listOnlyOne(userDtos, "用户不存在"); + + + AccessControlDto accessControlDto = new AccessControlDto(); + accessControlDto.setMachineId(reqJson.getString("machineId")); + accessControlDto.setCommunityId(reqJson.getString("communityId")); + List accessControlDtos = accessControlV1InnerServiceSMOImpl.queryAccessControls(accessControlDto); + + Assert.listOnlyOne(accessControlDtos, "门禁不存在"); + HardwareManufacturerDto hardwareManufacturerDto = new HardwareManufacturerDto(); + hardwareManufacturerDto.setHmId(accessControlDtos.get(0).getImplBean()); + List hardwareManufacturerDtos = hardwareManufacturerV1InnerServiceSMOImpl.queryHardwareManufacturers(hardwareManufacturerDto); + + Assert.listOnlyOne(hardwareManufacturerDtos, "协议不存在"); + + accessControlDtos.get(0).setUserId(userId); + accessControlDtos.get(0).setUserName(userDtos.get(0).getName()); + + IAccessControlManufactor accessControlManufactor = ApplicationContextFactory.getBean(hardwareManufacturerDtos.get(0).getProtocolImpl(), IAccessControlManufactor.class); + boolean openFlag = accessControlManufactor.ladder_start(accessControlDtos.get(0)); + + if (openFlag) { + context.setResponseEntity(ResultVo.success()); + return; + } + + context.setResponseEntity(ResultVo.error("开放电梯失败")); + + + } +} diff --git a/iot-accessControl/src/main/java/com/java110/accessControl/cmd/accessControl/StopAccessControlDoorCmd.java b/iot-accessControl/src/main/java/com/java110/accessControl/cmd/accessControl/StopAccessControlDoorCmd.java new file mode 100644 index 00000000..3e6785ce --- /dev/null +++ b/iot-accessControl/src/main/java/com/java110/accessControl/cmd/accessControl/StopAccessControlDoorCmd.java @@ -0,0 +1,83 @@ +package com.java110.accessControl.cmd.accessControl; + +import com.alibaba.fastjson.JSONObject; +import com.java110.accessControl.manufactor.IAccessControlManufactor; +import com.java110.bean.ResultVo; +import com.java110.core.annotation.Java110Cmd; +import com.java110.core.cmd.Cmd; +import com.java110.core.cmd.CmdEvent; +import com.java110.core.context.ICmdDataFlowContext; +import com.java110.core.exception.CmdException; +import com.java110.core.factory.ApplicationContextFactory; +import com.java110.core.utils.Assert; +import com.java110.core.utils.CmdContextUtils; +import com.java110.dto.accessControl.AccessControlDto; +import com.java110.dto.hardwareManufacturer.HardwareManufacturerDto; +import com.java110.dto.user.UserDto; +import com.java110.intf.accessControl.IAccessControlV1InnerServiceSMO; +import com.java110.intf.system.IHardwareManufacturerV1InnerServiceSMO; +import com.java110.intf.user.IUserV1InnerServiceSMO; +import org.springframework.beans.factory.annotation.Autowired; + +import java.text.ParseException; +import java.util.List; + + +@Java110Cmd(serviceCode = "accessControl.StopAccessControlDoor") +public class StopAccessControlDoorCmd extends Cmd { + + @Autowired + private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl; + + @Autowired + private IAccessControlV1InnerServiceSMO accessControlV1InnerServiceSMOImpl; + + @Autowired + private IHardwareManufacturerV1InnerServiceSMO hardwareManufacturerV1InnerServiceSMOImpl; + + @Override + public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException { + Assert.hasKeyAndValue(reqJson, "machineId", "未包含设备信息"); + Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区信息"); + } + + @Override + public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException { + + String userId = CmdContextUtils.getUserId(context); + + UserDto userDto = new UserDto(); + userDto.setUserId(userId); + List userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto); + + Assert.listOnlyOne(userDtos, "用户不存在"); + + + AccessControlDto accessControlDto = new AccessControlDto(); + accessControlDto.setMachineId(reqJson.getString("machineId")); + accessControlDto.setCommunityId(reqJson.getString("communityId")); + List accessControlDtos = accessControlV1InnerServiceSMOImpl.queryAccessControls(accessControlDto); + + Assert.listOnlyOne(accessControlDtos, "门禁不存在"); + HardwareManufacturerDto hardwareManufacturerDto = new HardwareManufacturerDto(); + hardwareManufacturerDto.setHmId(accessControlDtos.get(0).getImplBean()); + List hardwareManufacturerDtos = hardwareManufacturerV1InnerServiceSMOImpl.queryHardwareManufacturers(hardwareManufacturerDto); + + Assert.listOnlyOne(hardwareManufacturerDtos, "协议不存在"); + + accessControlDtos.get(0).setUserId(userId); + accessControlDtos.get(0).setUserName(userDtos.get(0).getName()); + + IAccessControlManufactor accessControlManufactor = ApplicationContextFactory.getBean(hardwareManufacturerDtos.get(0).getProtocolImpl(), IAccessControlManufactor.class); + boolean openFlag = accessControlManufactor.ladder_stop(accessControlDtos.get(0)); + + if (openFlag) { + context.setResponseEntity(ResultVo.success()); + return; + } + + context.setResponseEntity(ResultVo.error("限制电梯失败")); + + + } +} diff --git a/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/AbstractAccessControlManufactorAdapt.java b/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/AbstractAccessControlManufactorAdapt.java index 41674a73..d292f3d5 100644 --- a/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/AbstractAccessControlManufactorAdapt.java +++ b/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/AbstractAccessControlManufactorAdapt.java @@ -184,6 +184,16 @@ public abstract class AbstractAccessControlManufactorAdapt implements IAccessCon return true; } + + + public boolean ladder_stop(AccessControlDto accessControlDto){ + return true; + } + + + public boolean ladder_start(AccessControlDto accessControlDto){ + return true; + } /** * 门禁记录上报 * diff --git a/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/IAccessControlManufactor.java b/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/IAccessControlManufactor.java index 2cc9623d..c27c74f4 100644 --- a/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/IAccessControlManufactor.java +++ b/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/IAccessControlManufactor.java @@ -131,4 +131,19 @@ public interface IAccessControlManufactor { * @return */ boolean addAd(AccessControlDto accessControlDto, AccessControlAdRelPo accessControlAdRelPo); + + /** + * 开放电梯 + * @param accessControlDto 门禁信息 + * @return + */ + boolean ladder_stop(AccessControlDto accessControlDto); + + /** + * 限制电梯 + * @param accessControlDto 门禁信息 + * @return + */ + boolean ladder_start(AccessControlDto accessControlDto); + } diff --git a/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/adapt/accessControl/yiteSmart/SyncUserCardImpl.java b/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/adapt/accessControl/yiteSmart/SyncUserCardImpl.java index d08abf90..61c42a85 100644 --- a/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/adapt/accessControl/yiteSmart/SyncUserCardImpl.java +++ b/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/adapt/accessControl/yiteSmart/SyncUserCardImpl.java @@ -106,7 +106,7 @@ public class SyncUserCardImpl implements ISyncUserCard { addCard = new JSONObject(); addCard.put("card", accessControlFacePo.getCardNumber()); - addCard.put("roomnum", "0000-909");//添加楼栋单元号 + addCard.put("roomnum", "9909-909");//添加楼栋单元号 long timestrap = DateUtil.getDateFromStringA(accessControlFacePo.getEndTime()).getTime(); timestrap = timestrap / 1000; addCard.put("expired", timestrap); @@ -187,14 +187,39 @@ public class SyncUserCardImpl implements ISyncUserCard { addCard = new JSONObject(); addCard.put("card", accessControlFacePo.getCardNumber()); + String ysfjh=""; + String thfjh=""; String roomName = accessControlFacePo.getRoomName(); if (!StringUtil.isEmpty(roomName) && roomName.split("-", 3).length == 3) { //addCard.put("roomnum", roomName.split("-", 3)[0] + roomName.split("-", 3)[1] + "-" + roomName.split("-", 3)[2]); + ysfjh = (roomName.split("-", 3)[2]); + thfjh = (roomName.split("-", 3)[2]); + // 利用switch表达式根据变量值进行替换 + switch (ysfjh) { + case "1B01": + thfjh = "2201"; + break; + case "1B02" : + thfjh = "2202"; + break; + case "1A01" : + thfjh = "2301"; + break; + case "1A02" : + thfjh = "2302"; + break; + case "17A1" : + thfjh = "2401"; + break; + case "17A2" : + thfjh = "2402"; + break; + default : + }; addCard.put("roomnum", String.format("%02d%02d-%04d", Integer.parseInt(roomName.split("-", 3)[0]), Integer.parseInt(roomName.split("-", 3)[1]), - Integer.parseInt(roomName.split("-", 3)[2]))); - + Integer.parseInt(thfjh))); } long timestrap = DateUtil.getDateFromStringA(accessControlFacePo.getEndTime()).getTime(); timestrap = timestrap / 1000; diff --git a/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/adapt/accessControl/yiteSmart/SyncUserImpl.java b/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/adapt/accessControl/yiteSmart/SyncUserImpl.java index a89b432d..cc31cf02 100644 --- a/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/adapt/accessControl/yiteSmart/SyncUserImpl.java +++ b/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/adapt/accessControl/yiteSmart/SyncUserImpl.java @@ -117,20 +117,47 @@ public class SyncUserImpl implements ISyncUser { addRoom.put("id", 1); addRoom.put("uid", 1); addRoom.put("name", "管理处"); //修改物业中心名称 - addRoom.put("num", "0000-909");//添加楼栋单元号 + addRoom.put("num", "9909-909");//添加楼栋单元号 + String ysfjh=""; + String thfjh=""; String roomName = accessControlFaceDtos.get(0).getRoomName(); if (!StringUtil.isEmpty(roomName) && roomName.split("-", 3).length == 3) { addRoom.put("name", roomName.split("-", 3)[2]); //addRoom.put("num", roomName.split("-", 3)[0] + roomName.split("-", 3)[1] + "-" + roomName.split("-", 3)[2]); //添加楼栋单元号 - addRoom.put("num", String.format("%02d%02d-%4d", + ysfjh = (roomName.split("-", 3)[2]); + thfjh = (roomName.split("-", 3)[2]); + // 利用switch表达式根据变量值进行替换 + switch (ysfjh) { + case "1B01": + thfjh = "2201"; + break; + case "1B02" : + thfjh = "2202"; + break; + case "1A01" : + thfjh = "2301"; + break; + case "1A02" : + thfjh = "2302"; + break; + case "17A1" : + thfjh = "2401"; + break; + case "17A2" : + thfjh = "2402"; + break; + default : + }; + + addRoom.put("num", String.format("%02d%02d-%04d", Integer.parseInt(roomName.split("-", 3)[0]), Integer.parseInt(roomName.split("-", 3)[1]), - Integer.parseInt(roomName.split("-", 3)[2]))); + Integer.parseInt(thfjh))); RoomDto roomDto = new RoomDto(); roomDto.setFloorNum(roomName.split("-", 3)[0]); roomDto.setUnitNum(roomName.split("-", 3)[1]); - roomDto.setRoomNum(roomName.split("-", 3)[2]); + roomDto.setRoomNum(thfjh); roomDto.setCommunityId(accessControlFaceDtos.get(0).getCommunityId()); List roomDtos = roomV1InnerServiceSMOImpl.queryRooms(roomDto); if (ListUtil.isNull(roomDtos)) { diff --git a/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/adapt/accessControl/yiteSmart/YiteSmartAccessControlProcessAdapt.java b/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/adapt/accessControl/yiteSmart/YiteSmartAccessControlProcessAdapt.java index 74887f8e..ab808468 100644 --- a/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/adapt/accessControl/yiteSmart/YiteSmartAccessControlProcessAdapt.java +++ b/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/adapt/accessControl/yiteSmart/YiteSmartAccessControlProcessAdapt.java @@ -300,6 +300,66 @@ public class YiteSmartAccessControlProcessAdapt extends AbstractAccessControlMan } + /** + *{ + * "c": "ladder_stop", + * "f": "server_php", + * "m": { + * "t": "0101" + * }, + * "t": "c166a74c96b50944" + * } + + * @param accessControlDto 门禁信息 + * @return + */ + @Override + public boolean ladder_stop(AccessControlDto accessControlDto) { + + JSONObject paramIn = new JSONObject(); + paramIn.put("t", accessControlDto.getMachineCode()); + paramIn.put("c", "ladder_stop"); + paramIn.put("f", "server_php"); + + JSONObject m = new JSONObject(); + m.put("t", "0101"); + paramIn.put("m", m); + + MqttFactory.publish("zghl_door/" + accessControlDto.getMachineCode(), paramIn.toJSONString()); + + return true; + } + + /** + *{ + * "c": "ladder_start", + * "f": "server_php", + * "m": { + * "t": "0101" + * }, + * "t": "c166a74c96b50944" + * } + + * @param accessControlDto 门禁信息 + * @return + */ + @Override + public boolean ladder_start(AccessControlDto accessControlDto) { + + JSONObject paramIn = new JSONObject(); + paramIn.put("t", accessControlDto.getMachineCode()); + paramIn.put("c", "ladder_start"); + paramIn.put("f", "server_php"); + + JSONObject m = new JSONObject(); + m.put("t", "0101"); + paramIn.put("m", m); + + MqttFactory.publish("zghl_door/" + accessControlDto.getMachineCode(), paramIn.toJSONString()); + + return true; + } + @Override public boolean addAd(AccessControlDto accessControlDto, AccessControlAdRelPo accessControlAdRelPo){ JSONObject paramIn = new JSONObject(); diff --git a/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/bmo/impl/SyncCardsBidBmoImpl.java b/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/bmo/impl/SyncCardsBidBmoImpl.java index 4181ec75..6cf01ba2 100644 --- a/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/bmo/impl/SyncCardsBidBmoImpl.java +++ b/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/bmo/impl/SyncCardsBidBmoImpl.java @@ -154,7 +154,7 @@ public class SyncCardsBidBmoImpl implements ISyncCardsBidBmo { for (AccessControlFaceDto tmpAccessControlFaceDto : accessControlFaceDtos) { addCard = new JSONObject(); addCard.put("card", tmpAccessControlFaceDto.getCardNumber()); - addCard.put("roomnum", "0000-909");//添加楼栋单元号 + addCard.put("roomnum", "9909-909");//添加楼栋单元号 long timestrap = DateUtil.getDateFromStringA(tmpAccessControlFaceDto.getEndTime()).getTime(); timestrap = timestrap / 1000; addCard.put("expired", timestrap); @@ -248,10 +248,35 @@ public class SyncCardsBidBmoImpl implements ISyncCardsBidBmo { addCard = new JSONObject(); addCard.put("card", tmpOwnerRoomRelDto.getCardNumber()); //addCard.put("roomnum", unitDtos.get(0).getFloorNum() + unitDtos.get(0).getUnitNum() + "-" + tmpRoomDto.getRoomNum());//添加楼栋单元号 + String ysfjh = tmpRoomDto.getRoomNum(); + String thfjh= tmpRoomDto.getRoomNum(); + // 利用switch表达式根据变量值进行替换 + switch (ysfjh) { + case "1B01": + thfjh = "2201"; + break; + case "1B02" : + thfjh = "2202"; + break; + case "1A01" : + thfjh = "2301"; + break; + case "1A02" : + thfjh = "2302"; + break; + case "17A1" : + thfjh = "2401"; + break; + case "17A2" : + thfjh = "2402"; + break; + default : + + }; addCard.put("roomnum", String.format("%02d%02d-%04d", Integer.parseInt(unitDtos.get(0).getFloorNum()), Integer.parseInt(unitDtos.get(0).getUnitNum()), - Integer.parseInt( tmpRoomDto.getRoomNum()))); + Integer.parseInt(thfjh))); long timestrap = tmpOwnerRoomRelDto.getEndTime().getTime(); timestrap = timestrap / 1000; diff --git a/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/bmo/impl/SyncUserBidBmoImpl.java b/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/bmo/impl/SyncUserBidBmoImpl.java index 633c799b..9c8cd2b9 100644 --- a/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/bmo/impl/SyncUserBidBmoImpl.java +++ b/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/bmo/impl/SyncUserBidBmoImpl.java @@ -134,7 +134,7 @@ public class SyncUserBidBmoImpl implements ISyncUserBidBmo { addRoom.put("id", 1); addRoom.put("uid", 1); addRoom.put("name", "管理处");//修改物业中心名称 - addRoom.put("num", "0000-909");//添加楼栋单元号 + addRoom.put("num", "9909-909");//添加楼栋单元号 users = new JSONArray(); addRoom.put("user", users); @@ -243,10 +243,35 @@ public class SyncUserBidBmoImpl implements ISyncUserBidBmo { addRoom.put("uid", tmpRoomDto.getRoomId()); addRoom.put("name", tmpRoomDto.getRoomNum()); //addRoom.put("num", unitDtos.get(0).getFloorNum() + unitDtos.get(0).getUnitNum() + "-" + tmpRoomDto.getRoomNum());//添加楼栋单元号 + String ysfjh = tmpRoomDto.getRoomNum(); + String thfjh = tmpRoomDto.getRoomNum(); + // 利用switch表达式根据变量值进行替换 + switch (ysfjh) { + case "1B01": + thfjh = "2201"; + break; + case "1B02" : + thfjh = "2202"; + break; + case "1A01" : + thfjh = "2301"; + break; + case "1A02" : + thfjh = "2302"; + break; + case "17A1" : + thfjh = "2401"; + break; + case "17A2" : + thfjh = "2402"; + break; + default : + + }; addRoom.put("num", String.format("%02d%02d-%04d", Integer.parseInt(unitDtos.get(0).getFloorNum()), Integer.parseInt(unitDtos.get(0).getUnitNum()), - Integer.parseInt(tmpRoomDto.getRoomNum()))); + Integer.parseInt(thfjh))); users = new JSONArray(); addRoom.put("user", users); diff --git a/iot-web/public/pages/accessControl/accessControlManage/accessControlManage.html b/iot-web/public/pages/accessControl/accessControlManage/accessControlManage.html index 84479cb9..51080520 100644 --- a/iot-web/public/pages/accessControl/accessControlManage/accessControlManage.html +++ b/iot-web/public/pages/accessControl/accessControlManage/accessControlManage.html @@ -121,6 +121,16 @@ +
+ +
+
+ +
diff --git a/iot-web/public/pages/accessControl/accessControlManage/accessControlManage.js b/iot-web/public/pages/accessControl/accessControlManage/accessControlManage.js index 3b1920c0..ef443b5e 100644 --- a/iot-web/public/pages/accessControl/accessControlManage/accessControlManage.js +++ b/iot-web/public/pages/accessControl/accessControlManage/accessControlManage.js @@ -145,6 +145,49 @@ }); }, + + _ladder_stop: function (_accessControl) { + vc.http.apiPost( + '/accessControl.StopAccessControlDoor', + JSON.stringify(_accessControl), { + emulateJSON: true + }, + function (json, res) { + //vm.menus = vm.refreshMenuActive(JSON.parse(json),0); + let _json = JSON.parse(json); + vc.toast(_json.msg); + if (_json.code == 0) { + vc.emit('accessControlManage', 'listAccessControl', {}); + } + }, + function (errInfo, error) { + console.log('请求失败处理'); + + vc.toast(errInfo); + + }); + }, + _ladder_start: function (_accessControl) { + vc.http.apiPost( + '/accessControl.StartAccessControlDoor', + JSON.stringify(_accessControl), { + emulateJSON: true + }, + function (json, res) { + //vm.menus = vm.refreshMenuActive(JSON.parse(json),0); + let _json = JSON.parse(json); + vc.toast(_json.msg); + if (_json.code == 0) { + vc.emit('accessControlManage', 'listAccessControl', {}); + } + }, + function (errInfo, error) { + console.log('请求失败处理'); + + vc.toast(errInfo); + + }); + }, _toAccessControlDetail: function (_accessControl) { vc.jumpToPage('/#/pages/accessControl/accessControlDetail?machineId=' + _accessControl.machineId); }, -- Gitee From 4a18e07467adda8b0d2f5625189d6017674a3d8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=94=E8=80=81=E5=B3=B0?= Date: Sun, 1 Dec 2024 23:29:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=85=E7=94=B5?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/charge/chargeMachineOrder/chargeMachineOrder.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iot-web/public/pages/charge/chargeMachineOrder/chargeMachineOrder.js b/iot-web/public/pages/charge/chargeMachineOrder/chargeMachineOrder.js index 4becf4e6..d7d01697 100644 --- a/iot-web/public/pages/charge/chargeMachineOrder/chargeMachineOrder.js +++ b/iot-web/public/pages/charge/chargeMachineOrder/chargeMachineOrder.js @@ -48,7 +48,7 @@ $that.chargeMachineOrderInfo.conditions.page = _page; $that.chargeMachineOrderInfo.conditions.row = _rows; - $that.chargeMachineOrderInfo.conditions.row = vc.getCurrentCommunity().communityId; + $that.chargeMachineOrderInfo.conditions.communityId = vc.getCurrentCommunity().communityId; let param = { params: $that.chargeMachineOrderInfo.conditions }; -- Gitee