|
...
|
...
|
@@ -5,10 +5,13 @@ import cn.hutool.core.util.ObjectUtil; |
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
|
import com.google.gson.Gson;
|
|
|
|
import com.google.gson.JsonObject;
|
|
|
|
import com.ruoyi.common.utils.ByteUtil;
|
|
|
|
import com.ruoyi.common.utils.GsonConstructor;
|
|
|
|
import com.zhonglai.luhui.smart.feeder.config.OperatingData;
|
|
|
|
import com.zhonglai.luhui.smart.feeder.config.ScheduledConfig;
|
|
|
|
import com.zhonglai.luhui.smart.feeder.dto.*;
|
|
|
|
import com.zhonglai.luhui.smart.feeder.dto.commd.FeederCommd03Request;
|
|
|
|
import com.zhonglai.luhui.smart.feeder.dto.commd.FeederCommdDto;
|
|
|
|
import com.zhonglai.luhui.smart.feeder.dto.commd.FeederTimer;
|
|
|
|
import com.zhonglai.luhui.smart.feeder.dto.mqtt.CmdDto;
|
|
|
|
import com.zhonglai.luhui.smart.feeder.dto.mqtt.Condata;
|
|
...
|
...
|
@@ -24,6 +27,8 @@ import java.util.ArrayList; |
|
|
|
import java.util.List;
|
|
|
|
import java.util.Map;
|
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
|
import java.util.regex.Matcher;
|
|
|
|
import java.util.regex.Pattern;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* 数据监听服务
|
|
...
|
...
|
@@ -40,6 +45,17 @@ public class DateListenService { |
|
|
|
this.serialPortService = serialPortService;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public static void main(String[] args) {
|
|
|
|
ConfigurationParameterService.initConfigurationParameter();
|
|
|
|
String str = "01032E00010004FFE0000000000001000000000000000000000000000000010001000600070000001500000000000000001EC4";
|
|
|
|
byte[] bytes = ByteUtil.hexStringToByte(str.replaceAll(" ",""));
|
|
|
|
FeederCommdDto commdDto = new FeederCommdDto(bytes);
|
|
|
|
AnalysisDataService analysisDataService = new AnalysisDataService();
|
|
|
|
Map<String,Object> data = analysisDataService.analysis(commdDto);
|
|
|
|
|
|
|
|
System.out.println(data);
|
|
|
|
}
|
|
|
|
public void run()
|
|
|
|
{
|
|
|
|
logger.info("数据上报");
|
|
...
|
...
|
@@ -47,6 +63,7 @@ public class DateListenService { |
|
|
|
ScheduledConfig.scheduler.scheduleWithFixedDelay(() -> {
|
|
|
|
ModbusDto modbusDto = serialPortService.sendHexData(FeederCommdUtil.readAll());
|
|
|
|
Map<String,Object> data = analysisDataService.analysis(modbusDto);
|
|
|
|
logger.info("查询投料机所有参数返回的数据:{}",data);
|
|
|
|
if(null != data && data.size() != 0)
|
|
|
|
{
|
|
|
|
Condata condata = BeanUtil.mapToBean(data, Condata.class,false,null);
|
|
...
|
...
|
@@ -62,25 +79,6 @@ public class DateListenService { |
|
|
|
}
|
|
|
|
OperatingData.feederData.setInfo(info);
|
|
|
|
|
|
|
|
//投料机不可以读
|
|
|
|
// List<Integer[]> timerList = new ArrayList<>();
|
|
|
|
// for(String key:data.keySet())
|
|
|
|
// {
|
|
|
|
// if(key.startsWith("timer"))
|
|
|
|
// {
|
|
|
|
// FeederTimer feederTimer = (FeederTimer) data.get(key);
|
|
|
|
// timerList.add(new Integer[]{feederTimer.getTimer_start_h(),feederTimer.getTimer_start_m(),feederTimer.getTimer_close_h(),feederTimer.getTimer_start_m(),feederTimer.getTimer_if_start()});
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
// if(null != timerList && timerList.size() != 0)
|
|
|
|
// {
|
|
|
|
// if(ObjectUtil.notEqual(OperatingData.feederConfig.getTimer(),timerList))
|
|
|
|
// {
|
|
|
|
// OperatingData.feederConfig.setTimer(timerList);
|
|
|
|
// reportTimer();
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
}
|
|
|
|
},1,10, TimeUnit.SECONDS);
|
|
|
|
|
|
...
|
...
|
@@ -115,6 +113,7 @@ public class DateListenService { |
|
|
|
|
|
|
|
//上报参数
|
|
|
|
ScheduledConfig.scheduler.schedule(() -> {
|
|
|
|
logger.info("内存数据--->{}",OperatingData.feederConfig.getCondata());
|
|
|
|
try {
|
|
|
|
Thread.sleep(10000);
|
|
|
|
reportSerialPortConfig();
|
|
...
|
...
|
@@ -161,27 +160,9 @@ public class DateListenService { |
|
|
|
devicedatRequest.setBattlevel(4);
|
|
|
|
devicedatRequest.setCondata(OperatingData.feederConfig.getCondata());
|
|
|
|
String str = GsonConstructor.get().toJson(devicedatRequest);
|
|
|
|
System.out.println(str);
|
|
|
|
CmdDto cmdDto = new CmdDto().setImei(OperatingData.sysConfig.getNettyConfig().getClientId()).setJsonObject( GsonConstructor.get().fromJson( str, JsonObject.class));
|
|
|
|
MessageUtil.sendMessage(InitService.nettyClient.getCtx(), cmdDto.generateCmd(),true);
|
|
|
|
}
|
|
|
|
// /**
|
|
|
|
// * 上报投料机定时参数
|
|
|
|
// */
|
|
|
|
// public void reportTimer()
|
|
|
|
// {
|
|
|
|
// DevicedatRequest devicedatRequest = new DevicedatRequest();
|
|
|
|
// devicedatRequest.setCmd("devicedata");
|
|
|
|
// devicedatRequest.setType("4G.hs");
|
|
|
|
// devicedatRequest.setSignal(4);
|
|
|
|
// devicedatRequest.setMachstate(1);
|
|
|
|
// devicedatRequest.setBattlevel(4);
|
|
|
|
// devicedatRequest.setTimer(OperatingData.feederConfig.getTimer());
|
|
|
|
// String str = GsonConstructor.get().toJson(devicedatRequest);
|
|
|
|
// System.out.println(str);
|
|
|
|
// CmdDto cmdDto = new CmdDto().setImei(OperatingData.sysConfig.getNettyConfig().getClientId()).setJsonObject( GsonConstructor.get().fromJson( str, JsonObject.class));
|
|
|
|
// MessageUtil.sendMessage(InitService.nettyClient.getCtx(), cmdDto.generateCmd(),true);
|
|
|
|
// }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* 上报串口参数
|
|
...
|
...
|
@@ -196,7 +177,6 @@ public class DateListenService { |
|
|
|
devicedatRequest.setBattlevel(4);
|
|
|
|
devicedatRequest.setSerialPortConfig(OperatingData.feederConfig.getSerialPortConfig());
|
|
|
|
String str = GsonConstructor.get().toJson(devicedatRequest);
|
|
|
|
System.out.println(str);
|
|
|
|
CmdDto cmdDto = new CmdDto().setImei(OperatingData.sysConfig.getNettyConfig().getClientId()).setJsonObject( GsonConstructor.get().fromJson( str, JsonObject.class));
|
|
|
|
MessageUtil.sendMessage(InitService.nettyClient.getCtx(), cmdDto.generateCmd(),true);
|
|
|
|
}
|
|
...
|
...
|
@@ -214,7 +194,6 @@ public class DateListenService { |
|
|
|
devicedatRequest.setBattlevel(4);
|
|
|
|
devicedatRequest.setSysConfig(OperatingData.sysConfig);
|
|
|
|
String str = GsonConstructor.get().toJson(devicedatRequest);
|
|
|
|
System.out.println(str);
|
|
|
|
CmdDto cmdDto = new CmdDto().setImei(OperatingData.sysConfig.getNettyConfig().getClientId()).setJsonObject( GsonConstructor.get().fromJson( str, JsonObject.class));
|
|
|
|
MessageUtil.sendMessage(InitService.nettyClient.getCtx(), cmdDto.generateCmd(),true);
|
|
|
|
}
|
|
...
|
...
|
@@ -233,7 +212,6 @@ public class DateListenService { |
|
|
|
devicedatRequest.setBattlevel(4);
|
|
|
|
devicedatRequest.setCameraConfig(OperatingData.cameraConfig);
|
|
|
|
String str = GsonConstructor.get().toJson(devicedatRequest);
|
|
|
|
System.out.println(str);
|
|
|
|
CmdDto cmdDto = new CmdDto().setImei(OperatingData.sysConfig.getNettyConfig().getClientId()).setJsonObject( GsonConstructor.get().fromJson( str, JsonObject.class));
|
|
|
|
MessageUtil.sendMessage(InitService.nettyClient.getCtx(), cmdDto.generateCmd(),true);
|
|
|
|
|
|
...
|
...
|
@@ -260,25 +238,4 @@ public class DateListenService { |
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
public static void main(String[] args) {
|
|
|
|
ConfigurationParameterService.initConfigurationParameter();
|
|
|
|
DevicedatRequest devicedatRequest = new DevicedatRequest();
|
|
|
|
devicedatRequest.setCmd("devicedata");
|
|
|
|
devicedatRequest.setType("4G.hs");
|
|
|
|
devicedatRequest.setSignal(4);
|
|
|
|
devicedatRequest.setMachstate(1);
|
|
|
|
devicedatRequest.setBattlevel(4);
|
|
|
|
|
|
|
|
devicedatRequest.setCondata(OperatingData.feederConfig.getCondata());
|
|
|
|
devicedatRequest.setInfo(OperatingData.feederData.getInfo());
|
|
|
|
// devicedatRequest.setTimer(OperatingData.feederConfig.getTimer());
|
|
|
|
|
|
|
|
devicedatRequest.setSysConfig(OperatingData.sysConfig);
|
|
|
|
devicedatRequest.setCameraData(OperatingData.cameraData);
|
|
|
|
devicedatRequest.setCameraConfig(OperatingData.cameraConfig);
|
|
|
|
devicedatRequest.setSerialPortConfig(OperatingData.feederConfig.getSerialPortConfig());
|
|
|
|
|
|
|
|
System.out.println(GsonConstructor.get().toJson(devicedatRequest));
|
|
|
|
}
|
|
|
|
|
|
|
|
} |
...
|
...
|
|