Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

删除MQTT相关代码

Browse Source
This commit is contained in:
hzj
2026-04-16 13:47:30 +08:00
parent c692282ea4
commit 0c5c9bf067
5 changed files with 1595 additions and 1609 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pqs-common/common-core/pom.xml
View File

@@ -97,11 +97,11 @@
<groupId>com.fasterxml.jackson.datatype</groupId> <groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId> <artifactId>jackson-datatype-jsr310</artifactId>
</dependency> </dependency>
<!--mqtt相关依赖--> <!-- &lt;!&ndash;mqtt相关依赖&ndash;&gt;-->
<dependency> <!-- <dependency>-->
<groupId>com.github.tocrhz</groupId> <!-- <groupId>com.github.tocrhz</groupId>-->
<artifactId>mqtt-spring-boot-starter</artifactId> <!-- <artifactId>mqtt-spring-boot-starter</artifactId>-->
</dependency> <!-- </dependency>-->
<!-- <dependency>--> <!-- <dependency>-->
<!-- <groupId>org.springframework.boot</groupId>--> <!-- <groupId>org.springframework.boot</groupId>-->

257
pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/controller/DeviceController.java
View File

@@ -3,9 +3,6 @@ package com.njcn.device.device.controller;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Console; import cn.hutool.core.lang.Console;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.tocrhz.mqtt.annotation.MqttSubscribe;
import com.github.tocrhz.mqtt.annotation.NamedValue;
import com.github.tocrhz.mqtt.annotation.Payload;
import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.dto.SimpleDTO; import com.njcn.common.pojo.dto.SimpleDTO;
import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.common.LogEnum;
@@ -27,12 +24,10 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.eclipse.paho.client.mqttv3.MqttMessage;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
@@ -57,132 +52,132 @@ public class DeviceController extends BaseController {
private final GeneralDeviceService generalDeviceService; private final GeneralDeviceService generalDeviceService;
@OperateInfo(info = LogEnum.SYSTEM_COMMON) // @OperateInfo(info = LogEnum.SYSTEM_COMMON)
@PostMapping("/socketLine") // @PostMapping("/socketLine")
@ApiOperation("获取监测点定值信息") // @ApiOperation("获取监测点定值信息")
public HttpResult<String> socketLine(@RequestBody @Validated ConstantValueParam.Constant param) { // public HttpResult<String> socketLine(@RequestBody @Validated ConstantValueParam.Constant param) {
String methodDescribe = getMethodDescribe("socketLine"); // String methodDescribe = getMethodDescribe("socketLine");
if(StrUtil.isBlank(param.getIp())){ // if(StrUtil.isBlank(param.getIp())){
param.setIp(RequestUtil.getRealIp()); // param.setIp(RequestUtil.getRealIp());
} // }
String s = iDeviceService.sentLine(param); // String s = iDeviceService.sentLine(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe); // return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
} // }
//
@OperateInfo(info = LogEnum.SYSTEM_COMMON) // @OperateInfo(info = LogEnum.SYSTEM_COMMON)
@PostMapping("/updateSocketLine") // @PostMapping("/updateSocketLine")
@ApiOperation("修改监测点定值信息") // @ApiOperation("修改监测点定值信息")
public HttpResult<String> updateSocketLine(@RequestBody @Validated ConstantValueParam.ValueData param) { // public HttpResult<String> updateSocketLine(@RequestBody @Validated ConstantValueParam.ValueData param) {
String methodDescribe = getMethodDescribe("updateSocketLine"); // String methodDescribe = getMethodDescribe("updateSocketLine");
if(StrUtil.isBlank(param.getIp())){ // if(StrUtil.isBlank(param.getIp())){
param.setIp(RequestUtil.getRealIp()); // param.setIp(RequestUtil.getRealIp());
} // }
String s = iDeviceService.sentLineData(param); // String s = iDeviceService.sentLineData(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe); // return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
} // }
//
@OperateInfo(info = LogEnum.SYSTEM_COMMON) // @OperateInfo(info = LogEnum.SYSTEM_COMMON)
@PostMapping("/socketDev") // @PostMapping("/socketDev")
@ApiOperation("获取终端定值信息") // @ApiOperation("获取终端定值信息")
public HttpResult<String> socketDev(@RequestBody @Validated ConstantValueParam.Constant param) { // public HttpResult<String> socketDev(@RequestBody @Validated ConstantValueParam.Constant param) {
String methodDescribe = getMethodDescribe("socketDev"); // String methodDescribe = getMethodDescribe("socketDev");
if(StrUtil.isBlank(param.getIp())){ // if(StrUtil.isBlank(param.getIp())){
param.setIp(RequestUtil.getRealIp()); // param.setIp(RequestUtil.getRealIp());
} // }
String s = iDeviceService.sentDev(param); // String s = iDeviceService.sentDev(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe); // return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
} // }
@OperateInfo(info = LogEnum.SYSTEM_COMMON) // @OperateInfo(info = LogEnum.SYSTEM_COMMON)
@PostMapping("/updateSocketDev") // @PostMapping("/updateSocketDev")
@ApiOperation("修改终端定值信息") // @ApiOperation("修改终端定值信息")
public HttpResult<String> updateSocketDev(@RequestBody @Validated ConstantValueParam.ValueData param) { // public HttpResult<String> updateSocketDev(@RequestBody @Validated ConstantValueParam.ValueData param) {
String methodDescribe = getMethodDescribe("updateSocketDev"); // String methodDescribe = getMethodDescribe("updateSocketDev");
if(StrUtil.isBlank(param.getIp())){ // if(StrUtil.isBlank(param.getIp())){
param.setIp(RequestUtil.getRealIp()); // param.setIp(RequestUtil.getRealIp());
} // }
String s = iDeviceService.sentDevData(param); // String s = iDeviceService.sentDevData(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe); // return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
} // }
//
@OperateInfo(info = LogEnum.SYSTEM_COMMON) // @OperateInfo(info = LogEnum.SYSTEM_COMMON)
@PostMapping("/socketDevProperty") // @PostMapping("/socketDevProperty")
@ApiOperation("获取终端性能信息") // @ApiOperation("获取终端性能信息")
public HttpResult<String> socketDevProperty(String devID) { // public HttpResult<String> socketDevProperty(String devID) {
String methodDescribe = getMethodDescribe("socketDevProperty"); // String methodDescribe = getMethodDescribe("socketDevProperty");
String s = iDeviceService.socketDevProperty(devID); // String s = iDeviceService.socketDevProperty(devID);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe); // return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
} // }
//
@OperateInfo(info = LogEnum.SYSTEM_COMMON) // @OperateInfo(info = LogEnum.SYSTEM_COMMON)
@PostMapping("/socketDevPropertyClose") // @PostMapping("/socketDevPropertyClose")
@ApiOperation("终端性能关闭") // @ApiOperation("终端性能关闭")
public HttpResult<String> socketDevPropertyClose(String devID) { // public HttpResult<String> socketDevPropertyClose(String devID) {
String methodDescribe = getMethodDescribe("socketDevPropertyClose"); // String methodDescribe = getMethodDescribe("socketDevPropertyClose");
String s = iDeviceService.socketDevPropertyClose(devID); // String s = iDeviceService.socketDevPropertyClose(devID);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe); // return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
} // }
//
@OperateInfo(info = LogEnum.SYSTEM_COMMON) // @OperateInfo(info = LogEnum.SYSTEM_COMMON)
@PostMapping("/realTimeData") // @PostMapping("/realTimeData")
@ApiOperation("监测点实时数据查看") // @ApiOperation("监测点实时数据查看")
public HttpResult<String> realTimeData(String lineID) { // public HttpResult<String> realTimeData(String lineID) {
String methodDescribe = getMethodDescribe("realTimeData"); // String methodDescribe = getMethodDescribe("realTimeData");
String s = iDeviceService.realTimeData(lineID); // String s = iDeviceService.realTimeData(lineID);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe); // return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
} // }
//
@OperateInfo(info = LogEnum.SYSTEM_COMMON) // @OperateInfo(info = LogEnum.SYSTEM_COMMON)
@PostMapping("/heartRealTimeData") // @PostMapping("/heartRealTimeData")
@ApiOperation("监测实施数据心跳") // @ApiOperation("监测实施数据心跳")
public HttpResult<String> heartRealTimeData(String lineID) { // public HttpResult<String> heartRealTimeData(String lineID) {
String methodDescribe = getMethodDescribe("heartRealTimeData"); // String methodDescribe = getMethodDescribe("heartRealTimeData");
String s = iDeviceService.heartRealTimeData(lineID); // String s = iDeviceService.heartRealTimeData(lineID);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe); // return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
} // }
//
@OperateInfo(info = LogEnum.SYSTEM_COMMON) // @OperateInfo(info = LogEnum.SYSTEM_COMMON)
@PostMapping("/closeRealTimeData") // @PostMapping("/closeRealTimeData")
@ApiOperation("监测点实施数据关闭") // @ApiOperation("监测点实施数据关闭")
public HttpResult<String> closeRealTimeData(String lineID) { // public HttpResult<String> closeRealTimeData(String lineID) {
String methodDescribe = getMethodDescribe("closeRealTimeData"); // String methodDescribe = getMethodDescribe("closeRealTimeData");
String s = iDeviceService.closeRealTimeData(lineID); // String s = iDeviceService.closeRealTimeData(lineID);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe); // return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
} // }
//
@OperateInfo(info = LogEnum.SYSTEM_COMMON) // @OperateInfo(info = LogEnum.SYSTEM_COMMON)
@PostMapping("/getDevUpgrades") // @PostMapping("/getDevUpgrades")
@ApiOperation("终端版本升级") // @ApiOperation("终端版本升级")
public HttpResult<String> getDevUpgrades(@RequestBody @Validated ConstantValueParam.Upgrades param) { // public HttpResult<String> getDevUpgrades(@RequestBody @Validated ConstantValueParam.Upgrades param) {
String methodDescribe = getMethodDescribe("getDevUpgrades"); // String methodDescribe = getMethodDescribe("getDevUpgrades");
String s = iDeviceService.getDevUpgrades(param.getList(),param.getEdIndex()); // String s = iDeviceService.getDevUpgrades(param.getList(),param.getEdIndex());
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe); // return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
} // }
//
@OperateInfo(info = LogEnum.SYSTEM_COMMON) // @OperateInfo(info = LogEnum.SYSTEM_COMMON)
@PostMapping("/closeUpgrades") // @PostMapping("/closeUpgrades")
@ApiOperation("终端升级取消") // @ApiOperation("终端升级取消")
public HttpResult<String> closeUpgrades(@RequestBody List<String> devList) { // public HttpResult<String> closeUpgrades(@RequestBody List<String> devList) {
String methodDescribe = getMethodDescribe("closeUpgrades"); // String methodDescribe = getMethodDescribe("closeUpgrades");
String s = iDeviceService.closeUpgrades(devList); // String s = iDeviceService.closeUpgrades(devList);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe); // return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
} // }
//
@OperateInfo(info = LogEnum.SYSTEM_COMMON) // @OperateInfo(info = LogEnum.SYSTEM_COMMON)
@PostMapping("/restartDev") // @PostMapping("/restartDev")
@ApiOperation("重启装置命令") // @ApiOperation("重启装置命令")
public HttpResult<String> restartDev(@RequestBody List<String> devList) { // public HttpResult<String> restartDev(@RequestBody List<String> devList) {
String methodDescribe = getMethodDescribe("restartDev"); // String methodDescribe = getMethodDescribe("restartDev");
String s = iDeviceService.restartDev(devList); // String s = iDeviceService.restartDev(devList);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe); // return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
} // }
@MqttSubscribe(value = "/zl/devData/{devID}",qos = 1) // @MqttSubscribe(value = "/zl/devData/{devID}",qos = 1)
public void responseRtData(String topic, @NamedValue("devID") String pageId, MqttMessage message, @Payload String payload) { // public void responseRtData(String topic, @NamedValue("devID") String pageId, MqttMessage message, @Payload String payload) {
Console.log("receive from : {}", topic); // Console.log("receive from : {}", topic);
Console.log("receive from : {}", pageId); // Console.log("receive from : {}", pageId);
Console.log("message : {}", message.getPayload()); // Console.log("message : {}", message.getPayload());
Console.log("message payload : {}", new String(message.getPayload(), StandardCharsets.UTF_8)); // Console.log("message payload : {}", new String(message.getPayload(), StandardCharsets.UTF_8));
Console.log("string payload : {}", payload); // Console.log("string payload : {}", payload);
} // }
@OperateInfo(info = LogEnum.SYSTEM_COMMON) @OperateInfo(info = LogEnum.SYSTEM_COMMON)
@PostMapping("/updateDevCheckTime") @PostMapping("/updateDevCheckTime")

214
pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/IDeviceService.java
View File

@@ -19,113 +19,113 @@ import java.util.List;
public interface IDeviceService extends IService<Device> { public interface IDeviceService extends IService<Device> {
/*** // /***
* @Description: mqtt获取外部定值 // * @Description: mqtt获取外部定值
* @param param // * @param param
* @return: java.lang.String // * @return: java.lang.String
* @Author: wr // * @Author: wr
* @Date: 2023/8/14 10:17 // * @Date: 2023/8/14 10:17
*/ // */
String sentLine(ConstantValueParam.Constant param); // String sentLine(ConstantValueParam.Constant param);
//
/*** // /***
* @Description: mqtt修改外部定值 // * @Description: mqtt修改外部定值
* @param param // * @param param
* @return: java.lang.String // * @return: java.lang.String
* @Author: wr // * @Author: wr
* @Date: 2023/8/14 11:07 // * @Date: 2023/8/14 11:07
*/ // */
String sentLineData(ConstantValueParam.ValueData param); // String sentLineData(ConstantValueParam.ValueData param);
//
/** // /**
* @param param // * @param param
* @Description: mqtt获取内部定值 // * @Description: mqtt获取内部定值
* @return: java.lang.String // * @return: java.lang.String
* @Author: wr // * @Author: wr
* @Date: 2023/8/14 14:51 // * @Date: 2023/8/14 14:51
*/ // */
String sentDev(ConstantValueParam.Constant param); // String sentDev(ConstantValueParam.Constant param);
//
/** // /**
* @param param // * @param param
* @Description: mqtt修改内部定值 // * @Description: mqtt修改内部定值
* @return: java.lang.String // * @return: java.lang.String
* @Author: wr // * @Author: wr
* @Date: 2023/8/14 14:51 // * @Date: 2023/8/14 14:51
*/ // */
String sentDevData(ConstantValueParam.ValueData param); // String sentDevData(ConstantValueParam.ValueData param);
//
/** // /**
* @param devID // * @param devID
* @Description: 终端性能查看 // * @Description: 终端性能查看
* @return: java.lang.String // * @return: java.lang.String
* @Author: wr // * @Author: wr
* @Date: 2023/8/15 11:27 // * @Date: 2023/8/15 11:27
*/ // */
String socketDevProperty(String devID); // String socketDevProperty(String devID);
//
/** // /**
* @param devID // * @param devID
* @Description: 终端性能关闭 // * @Description: 终端性能关闭
* @return: java.lang.String // * @return: java.lang.String
* @Author: wr // * @Author: wr
* @Date: 2023/8/15 16:13 // * @Date: 2023/8/15 16:13
*/ // */
String socketDevPropertyClose(String devID); // String socketDevPropertyClose(String devID);
//
/** // /**
* @param lineIndex // * @param lineIndex
* @Description: 监测点实时数据查看 // * @Description: 监测点实时数据查看
* @return: java.lang.String // * @return: java.lang.String
* @Author: wr // * @Author: wr
* @Date: 2023/8/15 16:13 // * @Date: 2023/8/15 16:13
*/ // */
String realTimeData(String lineIndex); // String realTimeData(String lineIndex);
//
/** // /**
* @param lineIndex // * @param lineIndex
* @Description: 监测实施数据心跳 // * @Description: 监测实施数据心跳
* @return: java.lang.String // * @return: java.lang.String
* @Author: wr // * @Author: wr
* @Date: 2023/8/15 16:14 // * @Date: 2023/8/15 16:14
*/ // */
String heartRealTimeData(String lineIndex); // String heartRealTimeData(String lineIndex);
//
/** // /**
* @param lineIndex // * @param lineIndex
* @Description: 监测点实施数据关闭 // * @Description: 监测点实施数据关闭
* @return: java.lang.String // * @return: java.lang.String
* @Author: wr // * @Author: wr
* @Date: 2023/8/15 16:14 // * @Date: 2023/8/15 16:14
*/ // */
String closeRealTimeData(String lineIndex); // String closeRealTimeData(String lineIndex);
//
/** // /**
* 终端版本升级，批量升级条件必须是相同终端系列的终端才能升级 // * 终端版本升级，批量升级条件必须是相同终端系列的终端才能升级
* // *
* @param list // * @param list
* @param edIndex // * @param edIndex
* @return // * @return
*/ // */
String getDevUpgrades(List<String> list, String edIndex); // String getDevUpgrades(List<String> list, String edIndex);
//
/** // /**
* @param devList // * @param devList
* @Description: 终端升级取消 // * @Description: 终端升级取消
* @return: java.lang.String // * @return: java.lang.String
* @Author: wr // * @Author: wr
* @Date: 2023/8/17 9:24 // * @Date: 2023/8/17 9:24
*/ // */
String closeUpgrades(List<String> devList); // String closeUpgrades(List<String> devList);
//
/** // /**
* @param devList // * @param devList
* @Description: 重启装置命令 // * @Description: 重启装置命令
* @return: java.lang.String // * @return: java.lang.String
* @Author: wr // * @Author: wr
* @Date: 2023/8/17 9:24 // * @Date: 2023/8/17 9:24
*/ // */
String restartDev(List<String> devList); // String restartDev(List<String> devList);
/** /**
* @param devId 装置id * @param devId 装置id

711
pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/DeviceServiceImpl.java
View File

@@ -1,10 +1,6 @@
package com.njcn.device.device.service.impl; package com.njcn.device.device.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -14,16 +10,11 @@ import com.njcn.device.device.mapper.DeviceMapper;
import com.njcn.device.device.service.IDeviceService; import com.njcn.device.device.service.IDeviceService;
import com.njcn.device.device.service.ProgramVersionService; import com.njcn.device.device.service.ProgramVersionService;
import com.njcn.device.line.mapper.LineMapper; import com.njcn.device.line.mapper.LineMapper;
import com.njcn.device.pq.pojo.advanced.*;
import com.njcn.device.pq.pojo.param.ConstantValueParam;
import com.njcn.device.pq.pojo.po.DevVersion;
import com.njcn.device.pq.pojo.po.Device; import com.njcn.device.pq.pojo.po.Device;
import com.njcn.device.pq.pojo.po.Line;
import com.njcn.device.pq.pojo.po.Version;
import com.njcn.device.pq.pojo.vo.DevStatusNumVO; import com.njcn.device.pq.pojo.vo.DevStatusNumVO;
import com.njcn.device.pq.pojo.vo.DeviceIpRVO;
import com.njcn.device.utils.SocketClient;
import com.njcn.web.utils.RequestUtil;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -45,360 +36,360 @@ import java.util.stream.Collectors;
public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> implements IDeviceService { public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> implements IDeviceService {
private final LineMapper lineMapper; private final LineMapper lineMapper;
private final SocketClient socketClient; // private final SocketClient socketClient;
private final DevVersionMapper devVersionMapper; private final DevVersionMapper devVersionMapper;
private final ProgramVersionService programVersionService; private final ProgramVersionService programVersionService;
@Value("${socket.port:60000}") @Value("${socket.port:60000}")
private Integer socketPort; private Integer socketPort;
@Override // @Override
public String sentLine(ConstantValueParam.Constant param) { // public String sentLine(ConstantValueParam.Constant param) {
try { // try {
//获取根据监测点获取终端信息 // //获取根据监测点获取终端信息
UpDevVO upDevVO = lineMapper.getDevInfo(param.getId()); // UpDevVO upDevVO = lineMapper.getDevInfo(param.getId());
//查询前置ip // //查询前置ip
String host = lineMapper.getNodeIp(upDevVO.getDevIndex(),0); // String host = lineMapper.getNodeIp(upDevVO.getDevIndex(),0);
//拼接属性 // //拼接属性
ContValueRVO upParamVO = new ContValueRVO(); // ContValueRVO upParamVO = new ContValueRVO();
ContValueVO valueVO = new ContValueVO(); // ContValueVO valueVO = new ContValueVO();
valueVO.setType(param.getType()); // valueVO.setType(param.getType());
valueVO.setLineid(param.getId()); // valueVO.setLineid(param.getId());
valueVO.setHander(param.getHander()); // valueVO.setHander(param.getHander());
JSONObject jsonStr = new JSONObject(valueVO); // JSONObject jsonStr = new JSONObject(valueVO);
Integer len = jsonStr.toString().length(); // Integer len = jsonStr.toString().length();
upParamVO.setLen(len.toString()); // upParamVO.setLen(len.toString());
upParamVO.setData(valueVO); // upParamVO.setData(valueVO);
JSONObject jsonObject = new JSONObject(upParamVO); // JSONObject jsonObject = new JSONObject(upParamVO);
String str = jsonObject.toString(); // String str = jsonObject.toString();
List<UpDevVO> devList = new ArrayList<>(); // List<UpDevVO> devList = new ArrayList<>();
devList.add(upDevVO); // devList.add(upDevVO);
return socketClient.sentLine(param.getIp(), str, host, socketPort, "wr", devList); // return socketClient.sentLine(param.getIp(), str, host, socketPort, "wr", devList);
} catch (Exception e) { // } catch (Exception e) {
return "获取定值失败"; // return "获取定值失败";
} // }
//
} // }
//
@Override // @Override
public String sentLineData(ConstantValueParam.ValueData param) { // public String sentLineData(ConstantValueParam.ValueData param) {
try { // try {
//获取根据监测点获取终端信息 // //获取根据监测点获取终端信息
UpDevVO upDevVO = lineMapper.getDevInfo(param.getId()); // UpDevVO upDevVO = lineMapper.getDevInfo(param.getId());
//查询前置ip // //查询前置ip
String host = lineMapper.getNodeIp(upDevVO.getDevIndex(),0); // String host = lineMapper.getNodeIp(upDevVO.getDevIndex(),0);
ContUpdateValueRVO upParamVO = new ContUpdateValueRVO(); // ContUpdateValueRVO upParamVO = new ContUpdateValueRVO();
ContUpdateValueVO valueVO = new ContUpdateValueVO(); // ContUpdateValueVO valueVO = new ContUpdateValueVO();
valueVO.setType(param.getType()); // valueVO.setType(param.getType());
valueVO.setLineid(param.getId()); // valueVO.setLineid(param.getId());
valueVO.setHander(param.getHander()); // valueVO.setHander(param.getHander());
float[] intArr; // float[] intArr;
if (StrUtil.isBlank(param.getInterValue())) { // if (StrUtil.isBlank(param.getInterValue())) {
intArr = new float[0]; // intArr = new float[0];
} else { // } else {
String[] valueArr = param.getInterValue().split(","); // String[] valueArr = param.getInterValue().split(",");
intArr = new float[valueArr.length]; // intArr = new float[valueArr.length];
for (int i = 0; i < valueArr.length; i++) { // for (int i = 0; i < valueArr.length; i++) {
intArr[i] = Float.parseFloat(valueArr[i]); // intArr[i] = Float.parseFloat(valueArr[i]);
} // }
} // }
valueVO.setValue(intArr); // valueVO.setValue(intArr);
JSONObject jsonStr = new JSONObject(valueVO); // JSONObject jsonStr = new JSONObject(valueVO);
Integer len = jsonStr.toString().length(); // Integer len = jsonStr.toString().length();
upParamVO.setLen(len.toString()); // upParamVO.setLen(len.toString());
upParamVO.setData(valueVO); // upParamVO.setData(valueVO);
JSONObject jsonObject = new JSONObject(upParamVO); // JSONObject jsonObject = new JSONObject(upParamVO);
String str = jsonObject.toString(); // String str = jsonObject.toString();
List<UpDevVO> devList = new ArrayList<>(); // List<UpDevVO> devList = new ArrayList<>();
devList.add(upDevVO); // devList.add(upDevVO);
return socketClient.sentLine(param.getIp(), str, host, socketPort, "wr", devList); // return socketClient.sentLine(param.getIp(), str, host, socketPort, "wr", devList);
} catch (Exception e) { // } catch (Exception e) {
return "运行失败"; // return "运行失败";
} // }
} // }
//
@Override // @Override
public String sentDev(ConstantValueParam.Constant param) { // public String sentDev(ConstantValueParam.Constant param) {
try { // try {
Line line = lineMapper.selectById(param.getId()); // Line line = lineMapper.selectById(param.getId());
UpDevVO upDevVO = new UpDevVO(); // UpDevVO upDevVO = new UpDevVO();
upDevVO.setDevIndex(line.getId()); // upDevVO.setDevIndex(line.getId());
upDevVO.setDevName(line.getName()); // upDevVO.setDevName(line.getName());
String host = lineMapper.getNodeIp(line.getId(),1); // String host = lineMapper.getNodeIp(line.getId(),1);
ContValueRVO upParamVO = new ContValueRVO(); // ContValueRVO upParamVO = new ContValueRVO();
ContValueVO valueVO = new ContValueVO(); // ContValueVO valueVO = new ContValueVO();
valueVO.setType(param.getType()); // valueVO.setType(param.getType());
valueVO.setIndex(param.getId()); // valueVO.setIndex(param.getId());
valueVO.setHander(param.getHander()); // valueVO.setHander(param.getHander());
JSONObject jsonStr = new JSONObject(valueVO); // JSONObject jsonStr = new JSONObject(valueVO);
Integer len = jsonStr.toString().length(); // Integer len = jsonStr.toString().length();
upParamVO.setLen(len.toString()); // upParamVO.setLen(len.toString());
upParamVO.setData(valueVO); // upParamVO.setData(valueVO);
JSONObject jsonObject = new JSONObject(upParamVO); // JSONObject jsonObject = new JSONObject(upParamVO);
String str = jsonObject.toString(); // String str = jsonObject.toString();
List<UpDevVO> devList = new ArrayList<>(); // List<UpDevVO> devList = new ArrayList<>();
devList.add(upDevVO); // devList.add(upDevVO);
return socketClient.sentDZDev(param.getIp(), str, host, socketPort, "wr", devList); // return socketClient.sentDZDev(param.getIp(), str, host, socketPort, "wr", devList);
} catch (Exception e) { // } catch (Exception e) {
return "获取定值失败"; // return "获取定值失败";
} // }
} // }
//
@Override // @Override
public String sentDevData(ConstantValueParam.ValueData param) { // public String sentDevData(ConstantValueParam.ValueData param) {
try { // try {
Line line = lineMapper.selectById(param.getId()); // Line line = lineMapper.selectById(param.getId());
UpDevVO upDevVO = new UpDevVO(); // UpDevVO upDevVO = new UpDevVO();
upDevVO.setDevIndex(line.getId()); // upDevVO.setDevIndex(line.getId());
upDevVO.setDevName(line.getName()); // upDevVO.setDevName(line.getName());
String host = lineMapper.getNodeIp(line.getId(),1); // String host = lineMapper.getNodeIp(line.getId(),1);
ContUpdateDevValueRVO upParamVO = new ContUpdateDevValueRVO(); // ContUpdateDevValueRVO upParamVO = new ContUpdateDevValueRVO();
ContUpdateDevValueVO valueVO = new ContUpdateDevValueVO(); // ContUpdateDevValueVO valueVO = new ContUpdateDevValueVO();
valueVO.setType(param.getType()); // valueVO.setType(param.getType());
valueVO.setIndex(line.getId()); // valueVO.setIndex(line.getId());
valueVO.setHander(String.valueOf(param.getHander())); // valueVO.setHander(String.valueOf(param.getHander()));
int[] intArr; // int[] intArr;
if (StrUtil.isBlank(param.getInterValue())) { // if (StrUtil.isBlank(param.getInterValue())) {
intArr = new int[0]; // intArr = new int[0];
} else { // } else {
String[] valueArr = param.getInterValue().split(","); // String[] valueArr = param.getInterValue().split(",");
intArr = new int[valueArr.length]; // intArr = new int[valueArr.length];
for (int i = 0; i < valueArr.length; i++) { // for (int i = 0; i < valueArr.length; i++) {
intArr[i] = Integer.parseInt(valueArr[i]); // intArr[i] = Integer.parseInt(valueArr[i]);
} // }
} // }
valueVO.setInterValue(intArr); // valueVO.setInterValue(intArr);
JSONObject jsonStr = new JSONObject(valueVO); // JSONObject jsonStr = new JSONObject(valueVO);
Integer len = jsonStr.toString().length(); // Integer len = jsonStr.toString().length();
upParamVO.setLen(len.toString()); // upParamVO.setLen(len.toString());
upParamVO.setData(valueVO); // upParamVO.setData(valueVO);
JSONObject jsonObject = new JSONObject(upParamVO); // JSONObject jsonObject = new JSONObject(upParamVO);
String str = jsonObject.toString(); // String str = jsonObject.toString();
//
List<UpDevVO> devList = new ArrayList<>(); // List<UpDevVO> devList = new ArrayList<>();
devList.add(upDevVO); // devList.add(upDevVO);
return socketClient.sentDZDev(param.getIp(), str, host, socketPort, "wr", devList); // return socketClient.sentDZDev(param.getIp(), str, host, socketPort, "wr", devList);
} catch (Exception e) { // } catch (Exception e) {
return "运行失败"; // return "运行失败";
} // }
} // }
//
@Override // @Override
public String socketDevProperty(String devID) { // public String socketDevProperty(String devID) {
String host = lineMapper.getNodeIp(devID,1); // String host = lineMapper.getNodeIp(devID,1);
if(StrUtil.isBlank(host)){ // if(StrUtil.isBlank(host)){
return "前置ip获取失败"; // return "前置ip获取失败";
} // }
JSONObject jsonObject = new JSONObject(); // JSONObject jsonObject = new JSONObject();
Map<String,String> map = new HashMap<>(); // Map<String,String> map = new HashMap<>();
map.put("type","190"); // map.put("type","190");
map.put("index",devID); // map.put("index",devID);
map.put("hander","1"); // map.put("hander","1");
jsonObject.set("data", map); // jsonObject.set("data", map);
Integer len = jsonObject.get("data").toString().length(); // Integer len = jsonObject.get("data").toString().length();
jsonObject.set("len", len.toString()); // jsonObject.set("len", len.toString());
socketClient.showProperty(jsonObject.toString(),host,socketPort,RequestUtil.getLoginName()); // socketClient.showProperty(jsonObject.toString(),host,socketPort,RequestUtil.getLoginName());
return "终端性能获取成功"; // return "终端性能获取成功";
} // }
//
@Override // @Override
public String socketDevPropertyClose(String devID) { // public String socketDevPropertyClose(String devID) {
String host = lineMapper.getNodeIp(devID,1); // String host = lineMapper.getNodeIp(devID,1);
try { // try {
JSONObject jsonObject = new JSONObject(); // JSONObject jsonObject = new JSONObject();
Map<String, String> map = new HashMap<>(); // Map<String, String> map = new HashMap<>();
map.put("type", "190"); // map.put("type", "190");
map.put("index", devID); // map.put("index", devID);
map.put("hander", "0"); // map.put("hander", "0");
jsonObject.set("data", map); // jsonObject.set("data", map);
Integer len = jsonObject.get("data").toString().length(); // Integer len = jsonObject.get("data").toString().length();
jsonObject.set("len", len.toString()); // jsonObject.set("len", len.toString());
socketClient.closeDevSocket(jsonObject.toString(),host,socketPort,RequestUtil.getLoginName()); // socketClient.closeDevSocket(jsonObject.toString(),host,socketPort,RequestUtil.getLoginName());
return "执行成功"; // return "执行成功";
}catch (Exception e){ // }catch (Exception e){
return "执行失败"; // return "执行失败";
} // }
} // }
//
@Override // @Override
public String realTimeData(String lineIndex) { // public String realTimeData(String lineIndex) {
//查询前置ip // //查询前置ip
String host = lineMapper.getNodeIp(lineIndex,0); // String host = lineMapper.getNodeIp(lineIndex,0);
if(StrUtil.isBlank(host)){ // if(StrUtil.isBlank(host)){
return "设备前置机服务器配置异常,请联系管理员"; // return "设备前置机服务器配置异常,请联系管理员";
}else { // }else {
JSONObject jsonObject = new JSONObject(); // JSONObject jsonObject = new JSONObject();
jsonObject.set("LineId", lineIndex); // jsonObject.set("LineId", lineIndex);
jsonObject.set("type", 0); // jsonObject.set("type", 0);
JSONObject jsonObject1 = new JSONObject(); // JSONObject jsonObject1 = new JSONObject();
jsonObject1.set("len",0); // jsonObject1.set("len",0);
jsonObject1.set("data",jsonObject); // jsonObject1.set("data",jsonObject);
socketClient.realTimeData(jsonObject1.toString(),host,socketPort,lineIndex); // socketClient.realTimeData(jsonObject1.toString(),host,socketPort,lineIndex);
} // }
return "请求成功"; // return "请求成功";
} // }
//
@Override // @Override
public String heartRealTimeData(String lineIndex) { // public String heartRealTimeData(String lineIndex) {
JSONObject jsonObject = new JSONObject(); // JSONObject jsonObject = new JSONObject();
jsonObject.set("LineId", lineIndex); // jsonObject.set("LineId", lineIndex);
jsonObject.set("type", 1); // jsonObject.set("type", 1);
JSONObject jsonObject1 = new JSONObject(); // JSONObject jsonObject1 = new JSONObject();
jsonObject1.set("len", 0); // jsonObject1.set("len", 0);
jsonObject1.set("data", jsonObject); // jsonObject1.set("data", jsonObject);
String host = lineMapper.getNodeIp(lineIndex,0); // String host = lineMapper.getNodeIp(lineIndex,0);
socketClient.heartRealData(jsonObject1.toString(),host,socketPort,lineIndex); // socketClient.heartRealData(jsonObject1.toString(),host,socketPort,lineIndex);
return "实时数据心跳请求成功"; // return "实时数据心跳请求成功";
} // }
//
@Override // @Override
public String closeRealTimeData(String lineIndex) { // public String closeRealTimeData(String lineIndex) {
socketClient.closeRealData(lineIndex); // socketClient.closeRealData(lineIndex);
return "关闭实时数据请求成功"; // return "关闭实时数据请求成功";
} // }
//
@Override // @Override
public String getDevUpgrades(List<String> list, String edIndex) { // public String getDevUpgrades(List<String> list, String edIndex) {
List<DeviceIpRVO> resTemlist = new ArrayList<>(); // List<DeviceIpRVO> resTemlist = new ArrayList<>();
//
List<DeviceIpRVO> relist = lineMapper.getDevicesIp(list); // List<DeviceIpRVO> relist = lineMapper.getDevicesIp(list);
//判断设备版本号 // //判断设备版本号
Integer isExit = devVersionMapper.selectCount(new LambdaQueryWrapper<DevVersion>() // Integer isExit = devVersionMapper.selectCount(new LambdaQueryWrapper<DevVersion>()
.eq(DevVersion::getVersionId,edIndex) // .eq(DevVersion::getVersionId,edIndex)
.in(DevVersion::getLineId,list) // .in(DevVersion::getLineId,list)
.eq(DevVersion::getState,1) // .eq(DevVersion::getState,1)
); // );
if (isExit > 0) { // if (isExit > 0) {
return "请勿选择相同版本号升级"; // return "请勿选择相同版本号升级";
} // }
if (!CollectionUtil.isEmpty(relist)) { // if (!CollectionUtil.isEmpty(relist)) {
Version version = programVersionService.getById(edIndex); // Version version = programVersionService.getById(edIndex);
String series = version.getDevType(); // String series = version.getDevType();
//判断设备是否存在相同型号 // //判断设备是否存在相同型号
for (DeviceIpRVO deviceIpRVO : relist) { // for (DeviceIpRVO deviceIpRVO : relist) {
if (!series.equals(deviceIpRVO.getDevSeries())) { // if (!series.equals(deviceIpRVO.getDevSeries())) {
return "当前装置版本系列与目标版本系列不相同"; // return "当前装置版本系列与目标版本系列不相同";
} // }
} // }
//
//判断是否断开 // //判断是否断开
if (relist.stream().filter(w -> w.getComFlag() == 0).findAny().isPresent()) { // if (relist.stream().filter(w -> w.getComFlag() == 0).findAny().isPresent()) {
return "存在通讯中断设备"; // return "存在通讯中断设备";
} // }
//
//
Set<String> set = new HashSet<>(); // Set<String> set = new HashSet<>();
for (DeviceIpRVO d : relist) { // for (DeviceIpRVO d : relist) {
set.add(d.getIp()); // set.add(d.getIp());
} // }
Iterator<String> iterator = set.iterator(); // Iterator<String> iterator = set.iterator();
while (iterator.hasNext()) { // while (iterator.hasNext()) {
List<UpDevVO> devIndex = new ArrayList<>(); // List<UpDevVO> devIndex = new ArrayList<>();
DeviceIpRVO deviceIpRVO = new DeviceIpRVO(); // DeviceIpRVO deviceIpRVO = new DeviceIpRVO();
String ip = iterator.next(); // String ip = iterator.next();
for (DeviceIpRVO d : relist) { // for (DeviceIpRVO d : relist) {
UpDevVO upDevVO = new UpDevVO(); // UpDevVO upDevVO = new UpDevVO();
upDevVO.setDevIndex(d.getDevIndex()); // upDevVO.setDevIndex(d.getDevIndex());
upDevVO.setDevName(d.getDevName()); // upDevVO.setDevName(d.getDevName());
if (ip.equals(d.getIp())) { // if (ip.equals(d.getIp())) {
devIndex.add(upDevVO); // devIndex.add(upDevVO);
} // }
} // }
deviceIpRVO.setIp(ip); // deviceIpRVO.setIp(ip);
deviceIpRVO.setDevlist(devIndex); // deviceIpRVO.setDevlist(devIndex);
resTemlist.add(deviceIpRVO); // resTemlist.add(deviceIpRVO);
} // }
} else { // } else {
return "存在未知错误"; // return "存在未知错误";
} // }
for (DeviceIpRVO deviceIpRVO : resTemlist) { // for (DeviceIpRVO deviceIpRVO : resTemlist) {
String ip = deviceIpRVO.getIp(); // String ip = deviceIpRVO.getIp();
List<UpDevVO> devlist = deviceIpRVO.getDevlist(); // List<UpDevVO> devlist = deviceIpRVO.getDevlist();
UpDataVO upDataVO = new UpDataVO(); // UpDataVO upDataVO = new UpDataVO();
UpParamVO upParamVO = new UpParamVO(); // UpParamVO upParamVO = new UpParamVO();
upDataVO.setTerminal(devlist); // upDataVO.setTerminal(devlist);
upDataVO.setType("180"); // upDataVO.setType("180");
upDataVO.setEdIndex(edIndex); // upDataVO.setEdIndex(edIndex);
upDataVO.setUserIndex(RequestUtil.getUserIndex()); // upDataVO.setUserIndex(RequestUtil.getUserIndex());
JSONObject jsonstr = new JSONObject(upDataVO); // JSONObject jsonstr = new JSONObject(upDataVO);
Integer len = jsonstr.toString().length(); // Integer len = jsonstr.toString().length();
upParamVO.setData(upDataVO); // upParamVO.setData(upDataVO);
upParamVO.setLen(len.toString()); // upParamVO.setLen(len.toString());
JSONObject jsonObject = new JSONObject(upParamVO); // JSONObject jsonObject = new JSONObject(upParamVO);
String str = jsonObject.toString(); // String str = jsonObject.toString();
socketClient.sentUpgrades(str, ip, socketPort, RequestUtil.getLoginName(), edIndex, devlist); // socketClient.sentUpgrades(str, ip, socketPort, RequestUtil.getLoginName(), edIndex, devlist);
} // }
return "运行成功"; // return "运行成功";
} // }
//
@Override // @Override
public String closeUpgrades(List<String> devList) { // public String closeUpgrades(List<String> devList) {
List<DeviceIpRVO> relist = lineMapper.getDevicesIp(devList); // List<DeviceIpRVO> relist = lineMapper.getDevicesIp(devList);
if(CollectionUtil.isEmpty(relist)){ // if(CollectionUtil.isEmpty(relist)){
return "前置机为空"; // return "前置机为空";
}else { // }else {
List<String> nodeIp = relist.stream().map(DeviceIpRVO::getIp).distinct().collect(Collectors.toList()); // List<String> nodeIp = relist.stream().map(DeviceIpRVO::getIp).distinct().collect(Collectors.toList());
for(String ip: nodeIp){ // for(String ip: nodeIp){
List<DeviceIpRVO> devLl= relist.stream().filter(item->item.getIp().equals(ip)).collect(Collectors.toList()); // List<DeviceIpRVO> devLl= relist.stream().filter(item->item.getIp().equals(ip)).collect(Collectors.toList());
if(CollectionUtil.isEmpty(devLl)){ // if(CollectionUtil.isEmpty(devLl)){
return "出错啦"; // return "出错啦";
} // }
//
List<JSONObject> list = new ArrayList<>(); // List<JSONObject> list = new ArrayList<>();
for(DeviceIpRVO devRVO:devLl){ // for(DeviceIpRVO devRVO:devLl){
JSONObject dev = new JSONObject(); // JSONObject dev = new JSONObject();
dev.put("devIndex",devRVO.getDevIndex()); // dev.put("devIndex",devRVO.getDevIndex());
dev.put("devName",devRVO.getDevName()); // dev.put("devName",devRVO.getDevName());
list.add(dev); // list.add(dev);
} // }
JSONObject jsonObject = new JSONObject(); // JSONObject jsonObject = new JSONObject();
jsonObject.set("terminal", list); // jsonObject.set("terminal", list);
jsonObject.set("type", 182); // jsonObject.set("type", 182);
JSONObject jsonObject1 = new JSONObject(); // JSONObject jsonObject1 = new JSONObject();
jsonObject1.set("len", 0); // jsonObject1.set("len", 0);
jsonObject1.set("data", jsonObject); // jsonObject1.set("data", jsonObject);
socketClient.cancelUp(jsonObject1.toString(),ip,socketPort,devLl.size()); // socketClient.cancelUp(jsonObject1.toString(),ip,socketPort,devLl.size());
} // }
} // }
return "取消命令发送成功"; // return "取消命令发送成功";
} // }
//
@Override // @Override
public String restartDev(List<String> devList) { // public String restartDev(List<String> devList) {
List<DeviceIpRVO> relist = lineMapper.getDevicesIp(devList); // List<DeviceIpRVO> relist = lineMapper.getDevicesIp(devList);
if(CollUtil.isEmpty(relist)){ // if(CollUtil.isEmpty(relist)){
return "前置机为空"; // return "前置机为空";
}else { // }else {
List<String> nodeIp = relist.stream().map(DeviceIpRVO::getIp).distinct().collect(Collectors.toList()); // List<String> nodeIp = relist.stream().map(DeviceIpRVO::getIp).distinct().collect(Collectors.toList());
for(String ip: nodeIp){ // for(String ip: nodeIp){
List<DeviceIpRVO> devLl = relist.stream().filter(item->item.getIp().equals(ip)).collect(Collectors.toList()); // List<DeviceIpRVO> devLl = relist.stream().filter(item->item.getIp().equals(ip)).collect(Collectors.toList());
if(CollUtil.isEmpty(devLl)){ // if(CollUtil.isEmpty(devLl)){
return "出错啦"; // return "出错啦";
} // }
//
List<JSONObject> list = new ArrayList<>(); // List<JSONObject> list = new ArrayList<>();
List<String> devIn = new ArrayList<>(); // List<String> devIn = new ArrayList<>();
for(DeviceIpRVO devRVO:devLl){ // for(DeviceIpRVO devRVO:devLl){
devIn.add(devRVO.getDevIndex()); // devIn.add(devRVO.getDevIndex());
JSONObject dev = new JSONObject(); // JSONObject dev = new JSONObject();
dev.set("devIndex", devRVO.getDevIndex()); // dev.set("devIndex", devRVO.getDevIndex());
dev.set("devName", devRVO.getDevName()); // dev.set("devName", devRVO.getDevName());
list.add(dev); // list.add(dev);
} // }
//
JSONObject jsonObject = new JSONObject(); // JSONObject jsonObject = new JSONObject();
jsonObject.set("terminal", list); // jsonObject.set("terminal", list);
jsonObject.set("type", 181); // jsonObject.set("type", 181);
jsonObject.set("userIndex", RequestUtil.getUserIndex()); // jsonObject.set("userIndex", RequestUtil.getUserIndex());
JSONObject jsonObject1 = new JSONObject(); // JSONObject jsonObject1 = new JSONObject();
jsonObject1.set("len", 0); // jsonObject1.set("len", 0);
jsonObject1.set("data", jsonObject); // jsonObject1.set("data", jsonObject);
//
socketClient.restartDev(jsonObject1.toString(),ip,socketPort,devIn); // socketClient.restartDev(jsonObject1.toString(),ip,socketPort,devIn);
} // }
} // }
return "命令发送成功"; // return "命令发送成功";
} // }
@Override @Override
public void updateDevCheckTime(String devId, String thisTimeCheck, String nextTimeCheck) { public void updateDevCheckTime(String devId, String thisTimeCheck, String nextTimeCheck) {

2012
pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/utils/SocketClient.java
View File

File diff suppressed because it is too large Load Diff