|
|
@ -1,21 +1,14 @@ |
|
|
|
package com.mh.user.utils; |
|
|
|
package com.mh.user.utils; |
|
|
|
|
|
|
|
|
|
|
|
import com.mh.user.entity.*; |
|
|
|
import com.mh.user.entity.*; |
|
|
|
import com.mh.user.model.OrderParamModel; |
|
|
|
|
|
|
|
import com.mh.user.serialport.SerialPortThread; |
|
|
|
import com.mh.user.serialport.SerialPortThread; |
|
|
|
import com.mh.user.service.DeviceCodeParamService; |
|
|
|
import com.mh.user.service.DeviceCodeParamService; |
|
|
|
import com.mh.user.service.DeviceInstallService; |
|
|
|
import com.mh.user.service.DeviceInstallService; |
|
|
|
import com.mh.user.service.RegisterAddrService; |
|
|
|
import com.mh.user.service.RegisterAddrService; |
|
|
|
import com.mh.user.service.chillers.GatewayManageService; |
|
|
|
|
|
|
|
import com.mh.user.service.chillers.OrderMessageService; |
|
|
|
import com.mh.user.service.chillers.OrderMessageService; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
|
|
|
|
import org.apache.commons.collections4.Get; |
|
|
|
|
|
|
|
import org.apache.log4j.Logger; |
|
|
|
import org.apache.log4j.Logger; |
|
|
|
import org.springframework.context.ApplicationContext; |
|
|
|
import org.springframework.context.ApplicationContext; |
|
|
|
|
|
|
|
|
|
|
|
import javax.imageio.spi.RegisterableService; |
|
|
|
|
|
|
|
import java.net.UnknownHostException; |
|
|
|
|
|
|
|
import java.text.DecimalFormat; |
|
|
|
|
|
|
|
import java.text.ParseException; |
|
|
|
import java.text.ParseException; |
|
|
|
import java.text.SimpleDateFormat; |
|
|
|
import java.text.SimpleDateFormat; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.ArrayList; |
|
|
@ -137,6 +130,8 @@ public class GetReadOrder485 { |
|
|
|
str = str + "0300500002"; |
|
|
|
str = str + "0300500002"; |
|
|
|
} else if (cloudType.equalsIgnoreCase("35")){ // 瞬时流量/小时
|
|
|
|
} else if (cloudType.equalsIgnoreCase("35")){ // 瞬时流量/小时
|
|
|
|
str = str + "0300040002"; //0300000002(秒)、0300020002(分)、0300040002(时)
|
|
|
|
str = str + "0300040002"; //0300000002(秒)、0300020002(分)、0300040002(时)
|
|
|
|
|
|
|
|
} else if (cloudType.equalsIgnoreCase("36")){ // 瞬时冷量
|
|
|
|
|
|
|
|
str = str + "0300140002"; |
|
|
|
} |
|
|
|
} |
|
|
|
byte[] strOrder = ExchangeStringUtil.hexStrToBinaryStr(str); |
|
|
|
byte[] strOrder = ExchangeStringUtil.hexStrToBinaryStr(str); |
|
|
|
int checkNum = CRC16.CRC16_MODBUS(strOrder); |
|
|
|
int checkNum = CRC16.CRC16_MODBUS(strOrder); |
|
|
@ -359,8 +354,26 @@ public class GetReadOrder485 { |
|
|
|
deviceCodeParamEntity2.setRegisterName("瞬时流量"); |
|
|
|
deviceCodeParamEntity2.setRegisterName("瞬时流量"); |
|
|
|
String strData2=createCloudOrder(deviceCodeParamEntity2); |
|
|
|
String strData2=createCloudOrder(deviceCodeParamEntity2); |
|
|
|
deviceCodeParamEntity2.setStrData(strData2); |
|
|
|
deviceCodeParamEntity2.setStrData(strData2); |
|
|
|
deviceCodeParamEntity2.setGrade(2); |
|
|
|
deviceCodeParamEntity2.setGrade(10); |
|
|
|
deviceCodeParamEntityList.add(deviceCodeParamEntity2); |
|
|
|
deviceCodeParamEntityList.add(deviceCodeParamEntity2); |
|
|
|
|
|
|
|
//流量计冷量累积量
|
|
|
|
|
|
|
|
DeviceCodeParamEntity deviceCodeParamEntity3 = new DeviceCodeParamEntity(); |
|
|
|
|
|
|
|
deviceCodeParamEntity3.setRegisterAddr("36"); |
|
|
|
|
|
|
|
deviceCodeParamEntity3.setFunCode("03"); |
|
|
|
|
|
|
|
deviceCodeParamEntity3.setDeviceAddr(devices.getDeviceAddr()); |
|
|
|
|
|
|
|
deviceCodeParamEntity3.setDeviceName(devices.getDeviceName()); |
|
|
|
|
|
|
|
deviceCodeParamEntity3.setDeviceType(devices.getDeviceType()); |
|
|
|
|
|
|
|
deviceCodeParamEntity3.setBaudRate(devices.getBaudRate()); |
|
|
|
|
|
|
|
deviceCodeParamEntity3.setBrand(devices.getBrand()); |
|
|
|
|
|
|
|
deviceCodeParamEntity3.setDataPort(devices.getDataPort()); |
|
|
|
|
|
|
|
deviceCodeParamEntity3.setProjectID(devices.getProjectID()); |
|
|
|
|
|
|
|
deviceCodeParamEntity3.setParity(devices.getParity()); |
|
|
|
|
|
|
|
deviceCodeParamEntity3.setDigit(2); //保留小数位
|
|
|
|
|
|
|
|
deviceCodeParamEntity3.setRegisterName("瞬时冷量"); |
|
|
|
|
|
|
|
String strDat3 =createCloudOrder(deviceCodeParamEntity3); |
|
|
|
|
|
|
|
deviceCodeParamEntity3.setStrData(strDat3); |
|
|
|
|
|
|
|
deviceCodeParamEntity3.setGrade(11); |
|
|
|
|
|
|
|
deviceCodeParamEntityList.add(deviceCodeParamEntity3); |
|
|
|
|
|
|
|
|
|
|
|
}else if (devices.getDeviceType().equals("电表")){ |
|
|
|
}else if (devices.getDeviceType().equals("电表")){ |
|
|
|
DeviceCodeParamEntity deviceCodeParamEntity1 = new DeviceCodeParamEntity(); |
|
|
|
DeviceCodeParamEntity deviceCodeParamEntity1 = new DeviceCodeParamEntity(); |
|
|
|