|
@@ -17,7 +17,7 @@ public class FireLaborUtil {
|
|
|
//起始地址低字节
|
|
//起始地址低字节
|
|
|
private static final String END_HIGN_CODE="00";
|
|
private static final String END_HIGN_CODE="00";
|
|
|
//36个寄存器查询地址
|
|
//36个寄存器查询地址
|
|
|
- private static final String All_REGISTER="00 24";
|
|
|
|
|
|
|
+ private static final String ALL_REGISTER="00 24";
|
|
|
|
|
|
|
|
|
|
|
|
|
private static final Map<String, String> statusMap = new HashMap<>();
|
|
private static final Map<String, String> statusMap = new HashMap<>();
|
|
@@ -79,7 +79,7 @@ public class FireLaborUtil {
|
|
|
public static String getFireActiveOrder(Integer addressBit){
|
|
public static String getFireActiveOrder(Integer addressBit){
|
|
|
String activeCode="";
|
|
String activeCode="";
|
|
|
String coverCode=coverCode(addressBit);
|
|
String coverCode=coverCode(addressBit);
|
|
|
- activeCode=coverCode+" "+FUNCTION_CODE+" "+START_HIGN_CODE+" "+END_HIGN_CODE+" "+All_REGISTER+" ";
|
|
|
|
|
|
|
+ activeCode=coverCode+" "+FUNCTION_CODE+" "+START_HIGN_CODE+" "+END_HIGN_CODE+" "+ALL_REGISTER+" ";
|
|
|
String disposeCode=activeCode.replace(" ","");
|
|
String disposeCode=activeCode.replace(" ","");
|
|
|
String crcCode=CRCCHECK.getCRC16Result(disposeCode);
|
|
String crcCode=CRCCHECK.getCRC16Result(disposeCode);
|
|
|
activeCode+=crcCode;
|
|
activeCode+=crcCode;
|