From 675075c8e140ee0882c5277bd68468fe6194b207 Mon Sep 17 00:00:00 2001 From: zhangnaisong <2434969829@qq.com> Date: 星期三, 24 七月 2024 21:41:47 +0800 Subject: [PATCH] 电磁锁实时状态提交 --- ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java | 514 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 503 insertions(+), 11 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java index 06593f7..d68c81b 100644 --- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java +++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java @@ -1,27 +1,61 @@ package com.ruoyi.sy.service.impl; -import java.util.List; +import java.util.*; +import com.alibaba.fastjson.JSON; +import com.github.pagehelper.PageHelper; +import com.ruoyi.common.core.domain.entity.SysConfig; import com.ruoyi.common.utils.uuid.IdUtils; -import org.springframework.beans.factory.annotation.Autowired; +import com.ruoyi.sy.domain.ArdSyCar; +import com.ruoyi.sy.domain.ArdSyUser; +import com.ruoyi.sy.domain.ArdTankLockState; +import com.ruoyi.sy.mapper.*; +import com.ruoyi.system.mapper.SysConfigMapper; +import com.ruoyi.utils.forest.SYClient; +import com.ruoyi.utils.websocket.util.WebSocketUtils; +import org.apache.commons.codec.digest.DigestUtils; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.sy.mapper.ArdTankLockMapper; + +import java.util.stream.Collectors; + import com.ruoyi.sy.domain.ArdTankLock; import com.ruoyi.sy.service.IArdTankLockService; + +import javax.annotation.Resource; + +import static com.ruoyi.utils.websocket.util.WebSocketUtils.ONLINE_USER_SESSIONS; /** * 鐢电閿丼ervice涓氬姟灞傚鐞� * * @author ard - * @date 2024-06-29 + * @date 2024-07-01 */ @Service public class ArdTankLockServiceImpl implements IArdTankLockService { - @Autowired + @Resource private ArdTankLockMapper ardTankLockMapper; + + @Resource + private ArdTankWallLockMapper ardTankWallLockMapper; + + @Resource + private ArdTankWallLockTemporaryMapper ardTankWallLockTemporaryMapper; + + @Resource + private ArdSyUserMapper ardSyUserMapper; + + @Resource + private SysConfigMapper sysConfigMapper; + + @Resource + private ArdSyCarMapper ardSyCarMapper; + + @Resource + private ArdTankLockStateMapper ardTankLockStateMapper; + + @Resource + private SYClient sYClient; /** * 鏌ヨ鐢电閿� @@ -48,14 +82,31 @@ /** * 鏂板鐢电閿� * - * @param ardTankLock 鐢电閿� * @return 缁撴灉 */ @Override + public int insertArdTankLock(Map<String,Object> para) { + String carId = (String) para.get("carId"); + List<Map<String,String>> lockList = (List<Map<String,String>>)para.get("lockList"); + List<ArdTankLock> ardTankLocks = new ArrayList(); + for(Map<String,String> map : lockList){ + ArdTankLock ardTankLock = new ArdTankLock(); + ardTankLock.setId(IdUtils.simpleUUID()); + ardTankLock.setLockNum(map.get("lockNum")); + ardTankLock.setLockName(map.get("lockName")); + ardTankLock.setImgPositionTop(map.get("imgPositionTop")); + ardTankLock.setImgPositionLeft(map.get("imgPositionLeft")); + ardTankLock.setCarId(carId); + ardTankLock.setEnable(map.get("enable")); + ardTankLocks.add(ardTankLock); + } + return ardTankLockMapper.insertArdTankLocks(ardTankLocks); + } + /*@Override public int insertArdTankLock(ArdTankLock ardTankLock) { ardTankLock.setId(IdUtils.simpleUUID()); return ardTankLockMapper.insertArdTankLock(ardTankLock); - } + }*/ /** * 淇敼鐢电閿� @@ -87,6 +138,447 @@ */ @Override public int deleteArdTankLockById(String id) { - return ardTankLockMapper.deleteArdTankLockById(id); + try{ + return ardTankLockMapper.deleteArdTankLockById(id); + } finally { + ardTankWallLockMapper.deleteArdTankWallLockByLockId(id);//鍒犻櫎姘镐箙鐢靛瓙鍥存爮涓棿琛� + ardTankWallLockTemporaryMapper.deleteArdTankWallLockTemporaryByLockId(id);//鍒犻櫎涓存椂鐢靛瓙鍥存爮涓棿琛� + } + } + + @Override + //public Results List<Map<String,Object>> getAll(String usersId) { + public Map<String,Object> getAll(String usersId) { + List<ArdTankLock> ardTankLockList = ardTankLockMapper.getAll(); + ArdSyUser ardSyUser = ardSyUserMapper.userById(usersId); + if(ardSyUser == null){ + return new HashMap(); + } + List<SysConfig> syURLResult = sysConfigMapper.selectByType("syCarPT"); + String syURL = ""; + if(syURLResult.size() != 0){ + syURL = syURLResult.get(0).getConfigValue(); + }else{ + return new HashMap(); + } + String passwordMd5 = DigestUtils.md5Hex(ardSyUser.getPassword()); + Map<String, Object> LogInResult = sYClient.logIn(syURL, passwordMd5, ardSyUser.getUserId()); + String sessionId = (String) LogInResult.get("sessionId"); + //List<ArdTankLock> ardTankLockList = ardTankLockMapper.getAll(); + List<Map<String,Object>> result = new ArrayList(); + for(ArdTankLock ardTankLock : ardTankLockList){ + Map<String,Object> map = new HashMap(); + map.put("id",ardTankLock.getId()); + map.put("lockNum",ardTankLock.getLockNum()); + map.put("lockName",ardTankLock.getLockName()); + map.put("imgPositionTop",ardTankLock.getImgPositionTop()); + map.put("imgPositionLeft",ardTankLock.getImgPositionLeft()); + map.put("carId",ardTankLock.getCarId()); + map.put("enable",ardTankLock.getEnable()); + if(ardTankLock.getRestartState() == null){ + map.put("restartState",""); + }else{ + map.put("restartState",ardTankLock.getRestartState()); + } + if(ardTankLock.getOnlineTime() == null){ + map.put("onlineTime",""); + }else{ + map.put("onlineTime",ardTankLock.getOnlineTime()); + } + Map<String,Object> syResult = sYClient.getCarNearPositionByCarId(syURL, ardTankLock.getCarId(), ardSyUser.getUserId(), sessionId); + if(((String)syResult.get("rspCode")).equals("1")){ + Map<String,Object> carMap = ((List<Map<String,Object>>)syResult.get("list")).get(0); + map.put("carPlate",carMap.get("carPlate")); + } + result.add(map); + } + List<Map<String,Object>> result0 = new ArrayList();//鎷兼帴carId鍜宑arPlate + Set<String> carIdSet = new HashSet(); + for(Map<String,Object> map : result){ + if(!carIdSet.contains((String) map.get("carId"))){ + Map<String,Object> mapr = new HashMap(); + mapr.put("carId",map.get("carId")); + mapr.put("carPlate",map.get("carPlate")); + mapr.put("lockList",new ArrayList()); + result0.add(mapr); + } + carIdSet.add((String) map.get("carId")); + } + for(Map<String,Object> map : result0){ + for(Map<String,Object> map0 : result){ + if(((String)map.get("carId")).equals((String)map0.get("carId"))){ + ((List)map.get("lockList")).add(map0); + } + } + } + Long total = ardTankLockMapper.selectArdTankLockTotal(); + Map<String,Object> resultMap = new HashMap(); + resultMap.put("list",result0); + resultMap.put("total",total); + return resultMap; + } + + @Override + public Map<String, Object> getLockByCarId(String carId, String usersId) { + ArdSyUser ardSyUser = ardSyUserMapper.userById(usersId); + if(ardSyUser == null){ + return new HashMap(); + } + List<SysConfig> syURLResult = sysConfigMapper.selectByType("syCarPT"); + String syURL = ""; + if(syURLResult.size() != 0){ + syURL = syURLResult.get(0).getConfigValue(); + }else{ + return new HashMap(); + } + String passwordMd5 = DigestUtils.md5Hex(ardSyUser.getPassword()); + Map<String, Object> LogInResult = sYClient.logIn(syURL, passwordMd5, ardSyUser.getUserId()); + String sessionId = (String) LogInResult.get("sessionId"); + List<ArdTankLock> ardTankLockList = ardTankLockMapper.getLockByCarId(carId); + Map<String,Object> syResult = sYClient.getCarNearPositionByCarId(syURL, carId, ardSyUser.getUserId(), sessionId); + + Map<String,Object> resultMap = new HashMap(); + if(ardTankLockList.size() != 0){ + resultMap.put("carId",carId); + if(((String)syResult.get("rspCode")).equals("1")){ + Map<String,Object> carMap = ((List<Map<String,Object>>)syResult.get("list")).get(0); + resultMap.put("carPlate",carMap.get("carPlate")); + } + }else{ + resultMap.put("carId",carId); + if(((String)syResult.get("rspCode")).equals("1")){ + Map<String,Object> carMap = ((List<Map<String,Object>>)syResult.get("list")).get(0); + resultMap.put("carPlate",carMap.get("carPlate")); + } + resultMap.put("lockList",new ArrayList()); + } + + List<Map<String,Object>> result = new ArrayList(); + for(ArdTankLock ardTankLock : ardTankLockList){ + Map<String,Object> map = new HashMap(); + map.put("id",ardTankLock.getId()); + map.put("lockNum",ardTankLock.getLockNum()); + map.put("lockName",ardTankLock.getLockName()); + map.put("imgPositionTop",ardTankLock.getImgPositionTop()); + map.put("imgPositionLeft",ardTankLock.getImgPositionLeft()); + map.put("carId",ardTankLock.getCarId()); + map.put("enable",ardTankLock.getEnable()); + if(ardTankLock.getRestartState() == null){ + map.put("restartState",""); + }else{ + map.put("restartState",ardTankLock.getRestartState()); + } + if(ardTankLock.getOnlineTime() == null){ + map.put("onlineTime",""); + }else{ + map.put("onlineTime",ardTankLock.getOnlineTime()); + } + if(ardTankLock.getArdTankLockState() != null){//鐢电閿佺姸鎬� + map.put("ardTankLockState",ardTankLock.getArdTankLockState()); + }else{ + ArdTankLockState ardTankLockState = new ArdTankLockState(); + ardTankLockState.setId(""); + ardTankLockState.setLockId(""); + ardTankLockState.setLockNum(""); + ardTankLockState.setLockState(""); + ardTankLockState.setLockPositionState(""); + ardTankLockState.setLockShellState(""); + ardTankLockState.setRestartState(""); + ardTankLockState.setBatterVoltage(""); + ardTankLockState.setPowerVoltage(""); + ardTankLockState.setUploadTime(""); + ardTankLockState.setUniqueMark(""); + ardTankLockState.setLockStateMark(false); + map.put("ardTankLockState",ardTankLockState); + } + Map<String,Object> carMap = ((List<Map<String,Object>>)syResult.get("list")).get(0); + map.put("carPlate",carMap.get("carPlate")); + result.add(map); + } + resultMap.put("lockList",result); + return resultMap; + } + + @Override + public int deleteLockByCarId(String carId) { + int result = ardTankLockMapper.deleteLockByCarId(carId); + return result; + } + + @Override + public int updateLockByCarId(Map<String, Object> para) { + int result = 0; + String carId = (String) para.get("carId"); + List<ArdTankLock> ardTankLockOldList = ardTankLockMapper.getLockByCarId(carId); + Set<String> idSet = new HashSet();//涔嬪墠鐨勪富閿� + for(ArdTankLock ardTankLock : ardTankLockOldList){ + idSet.add(ardTankLock.getId()); + } + //Set<String> newIdSet = new HashSet();//浼犲弬鐨勪富閿� + List<Map<String,Object>> lockList = (List<Map<String, Object>>) para.get("lockList"); + if(lockList.isEmpty()){//鏁扮粍涓虹┖锛屽仛鍒犻櫎鎿嶄綔 + if(ardTankLockOldList.isEmpty()){//鑻ユ病鏈夋寕鎺ワ紝涓嶅仛鎿嶄綔 + return 1; + } + result = ardTankLockMapper.deleteLockByCarId(carId); + return result; + } + + List<ArdTankLock> ardTankLocks = new ArrayList(); + for(Map<String,Object> map : lockList){ + if(map.get("id") != null){//鏈変富閿紝鍋氫慨鏀规搷浣� + //newIdSet.add((String) map.get("id")); + idSet.remove((String) map.get("id")); + ArdTankLock ardTankLock = new ArdTankLock(); + ardTankLock.setId((String) map.get("id")); + ardTankLock.setLockNum((String) map.get("lockNum")); + ardTankLock.setLockName((String) map.get("lockName")); + ardTankLock.setImgPositionTop((String) map.get("imgPositionTop")); + ardTankLock.setImgPositionLeft((String) map.get("imgPositionLeft")); + ardTankLock.setCarId((String) map.get("carId")); + ardTankLock.setEnable((String) map.get("enable")); + result = result + ardTankLockMapper.updateArdTankLock(ardTankLock); + }else{//鏃犱富閿紝鍋氭柊澧炴搷浣� + ArdTankLock ardTankLock = new ArdTankLock(); + ardTankLock.setId(IdUtils.simpleUUID()); + ardTankLock.setLockNum((String) map.get("lockNum")); + ardTankLock.setLockName((String) map.get("lockName")); + ardTankLock.setImgPositionTop((String) map.get("imgPositionTop")); + ardTankLock.setImgPositionLeft((String) map.get("imgPositionLeft")); + ardTankLock.setCarId(carId); + ardTankLock.setEnable((String) map.get("enable")); + ardTankLocks.add(ardTankLock); + } + } + if(ardTankLocks.size() != 0){ + result = result + ardTankLockMapper.insertArdTankLocks(ardTankLocks); + } + if(!idSet.isEmpty()){ + result = result + ardTankLockMapper.deleteArdTankLockByIdSet(idSet); + } + return result; + } + + @Override + public Map<String,Object> getLockByCarPlate(String usersId, String carPlate, Integer pageNum, Integer pageSize) { + ArdSyUser ardSyUser = ardSyUserMapper.userById(usersId); + if(ardSyUser == null){ + return new HashMap(); + } + List<SysConfig> syURLResult = sysConfigMapper.selectByType("syCarPT"); + String syURL = ""; + if(syURLResult.size() != 0){ + syURL = syURLResult.get(0).getConfigValue(); + }else{ + return new HashMap(); + } + String passwordMd5 = DigestUtils.md5Hex(ardSyUser.getPassword()); + Map<String, Object> LogInResult = sYClient.logIn(syURL, passwordMd5, ardSyUser.getUserId()); + String sessionId = (String) LogInResult.get("sessionId"); + List<ArdTankLock> ardTankLockList = new ArrayList(); + List<Map<String,Object>> result = new ArrayList(); + List<String> carIdList = new ArrayList();//璁板綍涓変竴杞﹁締涓婚敭 + if(!carPlate.equals("")){ + Map<String,Object> carMap = sYClient.getCarListByPlate(syURL,carPlate,ardSyUser.getUserId(),sessionId);//杞︾墝鍙锋ā绯婃悳绱㈣溅杈� + List<Map<String,Object>> carList = new ArrayList(); + if(((String)carMap.get("rspCode")).equals("1")){ + carList = (List<Map<String, Object>>) carMap.get("list"); + }else{ + return new HashMap(); + } + //List<String> carIdList = new ArrayList();//璁板綍涓変竴杞﹁締涓婚敭 + for(Map<String,Object> map : carList){ + carIdList.add((String) map.get("carId")); + } + PageHelper.startPage(pageNum, pageSize);//鍒嗛〉 + ardTankLockList = ardTankLockMapper.getLockByCarIdList(carIdList); + for(ArdTankLock ardTankLock : ardTankLockList){ + if(carIdList.contains(ardTankLock.getCarId())){//杩斿洖鐨勮溅杈嗗寘鍚暟鎹簱褰曞叆鐨勮溅杈� + Map<String,Object> map = new HashMap(); + map.put("id",ardTankLock.getId()); + map.put("lockNum",ardTankLock.getLockNum()); + map.put("lockName",ardTankLock.getLockName()); + map.put("imgPositionTop",ardTankLock.getImgPositionTop()); + map.put("imgPositionLeft",ardTankLock.getImgPositionLeft()); + map.put("carId",ardTankLock.getCarId()); + map.put("enable",ardTankLock.getEnable()); + if(ardTankLock.getRestartState() == null){ + map.put("restartState",""); + }else{ + map.put("restartState",ardTankLock.getRestartState()); + } + if(ardTankLock.getOnlineTime() == null){ + map.put("onlineTime",""); + }else{ + map.put("onlineTime",ardTankLock.getOnlineTime()); + } + Map<String,Object> car = carList.stream().filter(mapCar -> ((String)mapCar.get("carId")).equals(ardTankLock.getCarId())).collect(Collectors.toList()).get(0); + map.put("carPlate", (String) car.get("carPlate")); + result.add(map); + }else{ + continue; + } + } + }else{ + PageHelper.startPage(pageNum, pageSize);//鍒嗛〉 + ardTankLockList = ardTankLockMapper.getAll(); + for(ArdTankLock ardTankLock : ardTankLockList){ + Map<String,Object> map = new HashMap(); + map.put("id",ardTankLock.getId()); + map.put("lockNum",ardTankLock.getLockNum()); + map.put("lockName",ardTankLock.getLockName()); + map.put("imgPositionTop",ardTankLock.getImgPositionTop()); + map.put("imgPositionLeft",ardTankLock.getImgPositionLeft()); + map.put("carId",ardTankLock.getCarId()); + map.put("enable",ardTankLock.getEnable()); + if(ardTankLock.getRestartState() == null){ + map.put("restartState",""); + }else{ + map.put("restartState",ardTankLock.getRestartState()); + } + if(ardTankLock.getOnlineTime() == null){ + map.put("onlineTime",""); + }else{ + map.put("onlineTime",ardTankLock.getOnlineTime()); + } + Map<String,Object> syResult = sYClient.getCarNearPositionByCarId(syURL, ardTankLock.getCarId(), ardSyUser.getUserId(), sessionId); + if(((String)syResult.get("rspCode")).equals("1")){ + Map<String,Object> carMap = ((List<Map<String,Object>>)syResult.get("list")).get(0); + map.put("carPlate", (String) carMap.get("carPlate")); + } + result.add(map); + } + } + Long total = Long.valueOf(0); + if(!carPlate.equals("")){ + total = ardTankLockMapper.selectArdTankLockTotalByCarIdList(carIdList); + }else{ + total = ardTankLockMapper.selectArdTankLockAllTotal(); + } + Map<String,Object> mapResult = new HashMap(); + mapResult.put("list",result); + mapResult.put("total",total); + return mapResult; + } + + @Override + public List<ArdTankLock> getArdTankLockAll() { + List<ArdTankLock> result = ardTankLockMapper.getAll(); + return result; + } + + @Override + public void sendLockState(String userId, String syUserId, String syPassword) { + List<SysConfig> syURLResult = sysConfigMapper.selectByType("syCarPT"); + String syURL = ""; + if(syURLResult.size() != 0){ + syURL = syURLResult.get(0).getConfigValue(); + }else{ + return; + } + String passwordMd5 = DigestUtils.md5Hex(syPassword); + Map<String, Object> LogInResult = sYClient.logIn(syURL, passwordMd5, syUserId); + String sessionId = (String) LogInResult.get("sessionId"); + + List<SysConfig> lockBatteryVoltageResult = sysConfigMapper.selectByType("lockBatteryVoltage"); + Integer lockBatteryVoltage = 9; + if(!lockBatteryVoltageResult.isEmpty()){ + lockBatteryVoltage = Integer.parseInt(lockBatteryVoltageResult.get(0).getConfigValue()); + } + + List<SysConfig> lockPowerVoltageResult = sysConfigMapper.selectByType("lockPowerVoltage"); + Integer lockPowerVoltage = 5; + if(!lockPowerVoltageResult.isEmpty()){ + lockPowerVoltage = Integer.parseInt(lockPowerVoltageResult.get(0).getConfigValue()); + } + + List<Map<String,Object>> result = new ArrayList(); + List<ArdSyCar> ardSyCarResult = ardSyCarMapper.selectArdSyCarAndTankLockByUserId(userId.split("_")[0]); + for(ArdSyCar ardSyCar : ardSyCarResult){ + Map<String,Object> map = new HashMap(); + map.put("id",ardSyCar.getId()); + map.put("carId",ardSyCar.getCarId()); + map.put("carModel",ardSyCar.getCarModel()); + map.put("carType",ardSyCar.getCarType()); + map.put("carBrand",ardSyCar.getCarBrand()); + map.put("deptId",ardSyCar.getDeptId()); + map.put("carPicture",ardSyCar.getCarPicture()); + Map<String,Object> syResult = sYClient.getCarNearPositionByCarId(syURL, ardSyCar.getCarId(), syUserId, sessionId); + if(((String)syResult.get("rspCode")).equals("1")){ + Map<String,Object> carMap = ((List<Map<String,Object>>)syResult.get("list")).get(0); + map.put("carPlate", (String) carMap.get("carPlate")); + } + List<Map<String,Object>> lockList = new ArrayList(); + List<ArdTankLock> ardTankLockList = ardSyCar.getArdTankLockList(); + for(ArdTankLock ardTankLock : ardTankLockList){ + Map<String,Object> lockMap = new HashMap(); + lockMap.put("id",ardTankLock.getId()); + lockMap.put("lockNum",ardTankLock.getLockNum()); + lockMap.put("lockName",ardTankLock.getLockName()); + lockMap.put("imgPositionTop",ardTankLock.getImgPositionTop()); + lockMap.put("imgPositionLeft",ardTankLock.getImgPositionLeft()); + lockMap.put("carId",ardTankLock.getCarId()); + lockMap.put("enable",ardTankLock.getEnable()); + if(ardTankLock.getRestartState() == null){ + lockMap.put("restartState",""); + }else{ + lockMap.put("restartState",ardTankLock.getRestartState()); + } + if(ardTankLock.getOnlineTime() == null){ + lockMap.put("onlineTime",""); + }else{ + lockMap.put("onlineTime",ardTankLock.getOnlineTime()); + } + Map<String,Object> ardTankLockState = new HashMap(); + ArdTankLockState ardTankLockStateResult = ardTankLockStateMapper.selectArdTankLockStateByLockIdLimitOne(ardTankLock.getId()); + if(ardTankLockStateResult == null){ + ardTankLockState.put("id",""); + ardTankLockState.put("lockId",""); + ardTankLockState.put("lockNum",""); + ardTankLockState.put("lockState",""); + ardTankLockState.put("lockPositionState",""); + ardTankLockState.put("lockShellState",""); + ardTankLockState.put("restartState",""); + ardTankLockState.put("batterVoltage",""); + ardTankLockState.put("batterVoltageAlarm",false); + ardTankLockState.put("powerVoltage",""); + ardTankLockState.put("powerVoltageAlarm",false); + ardTankLockState.put("uploadTime",""); + ardTankLockState.put("uniqueMark",""); + ardTankLockState.put("lockStateMark",false); + lockMap.put("ardTankLockState",ardTankLockState); + }else{ + ardTankLockState.put("id",ardTankLockStateResult.getId()); + ardTankLockState.put("lockId",ardTankLockStateResult.getLockId()); + ardTankLockState.put("lockNum",ardTankLockStateResult.getLockNum()); + ardTankLockState.put("lockState",ardTankLockStateResult.getLockState()); + ardTankLockState.put("lockPositionState",ardTankLockStateResult.getLockPositionState()); + ardTankLockState.put("lockShellState",ardTankLockStateResult.getLockShellState()); + ardTankLockState.put("restartState",ardTankLockStateResult.getRestartState()); + ardTankLockState.put("batterVoltage",ardTankLockStateResult.getBatterVoltage()); + if(Double.parseDouble(ardTankLockStateResult.getBatterVoltage()) <= lockBatteryVoltage){ + ardTankLockState.put("batterVoltageAlarm",true); + }else{ + ardTankLockState.put("batterVoltageAlarm",false); + } + ardTankLockState.put("powerVoltage",ardTankLockStateResult.getPowerVoltage()); + if(Double.parseDouble(ardTankLockStateResult.getPowerVoltage()) <= lockPowerVoltage){ + ardTankLockState.put("powerVoltageAlarm",true); + }else{ + ardTankLockState.put("powerVoltageAlarm",false); + } + ardTankLockState.put("uploadTime",ardTankLockStateResult.getUploadTime()); + ardTankLockState.put("uniqueMark",ardTankLockStateResult.getUniqueMark()); + ardTankLockState.put("lockStateMark",ardTankLockStateResult.getLockStateMark()); + lockMap.put("ardTankLockState",ardTankLockState); + } + lockList.add(lockMap); + } + map.put("lockList",lockList); + result.add(map); + Map<String,Object> data = new HashMap(); + data.put("40002",result); + WebSocketUtils.sendMessage(ONLINE_USER_SESSIONS.get(userId), JSON.toJSONString(data)); + } } } -- Gitblit v1.9.3