Browse Source

20210318v1.0

recovery
zy_Java 4 years ago
parent
commit
d8aebd00b2
  1. 5
      beneficiation/src/main/java/com/ccsens/beneficiation/service/ParameterService.java
  2. 4
      beneficiation/src/main/resources/application.yml

5
beneficiation/src/main/java/com/ccsens/beneficiation/service/ParameterService.java

@ -215,7 +215,8 @@ public class ParameterService implements IParameterService{
byte addr2 = (byte) (equipmentType.getAddr() & 0xff); byte addr2 = (byte) (equipmentType.getAddr() & 0xff);
log.info("计算addr的高低值:{}---{}",addr1,addr2); log.info("计算addr的高低值:{}---{}",addr1,addr2);
byte[] center = new byte[]{(byte)0x10,(byte)0x06,addr1,addr2,uc1,uc2}; // byte[] center = new byte[]{(byte)0x10,(byte)0x10,addr1,addr2,uc1,uc2};
byte[] center = new byte[]{(byte)0x10,(byte)0x10,addr1,addr2,0x00,0x01,0x02,uc1,uc2};
byte[] crc = new byte[2]; byte[] crc = new byte[2];
CRCUtil.crc16(crc,center,0,center.length); CRCUtil.crc16(crc,center,0,center.length);
log.info("计算crc校验:{}---{}",crc[0],crc[1]); log.info("计算crc校验:{}---{}",crc[0],crc[1]);
@ -236,7 +237,7 @@ public class ParameterService implements IParameterService{
*/ */
private void sendInMessage(byte[] all) throws Exception { private void sendInMessage(byte[] all) throws Exception {
Set<String> userIdSet = new HashSet<>(); Set<String> userIdSet = new HashSet<>();
userIdSet.add(String.valueOf(2)); userIdSet.add(String.valueOf(1));
MessageRule messageRule = MessageRule.defaultRule(MessageConstant.DomainType.User); MessageRule messageRule = MessageRule.defaultRule(MessageConstant.DomainType.User);
messageRule.setAckRule(MessageRule.AckRule.NONE); messageRule.setAckRule(MessageRule.AckRule.NONE);
messageRule.setOfflineDiscard((byte) 1); messageRule.setOfflineDiscard((byte) 1);

4
beneficiation/src/main/resources/application.yml

@ -1,6 +1,6 @@
spring: spring:
profiles: profiles:
active: dev active: test
include: common, util-dev include: common, util-test

Loading…
Cancel
Save