diff --git a/src/main/java/com/ifish/socket/SomeServer.java b/src/main/java/com/ifish/socket/SomeServer.java index 2c1bdf5..e81bea5 100644 --- a/src/main/java/com/ifish/socket/SomeServer.java +++ b/src/main/java/com/ifish/socket/SomeServer.java @@ -22,6 +22,7 @@ import com.ifish.socket.model.receive.BackBytes74; import com.ifish.socket.model.receive.BackBytes84; import com.ifish.socket.model.receive.BackBytes85; import com.ifish.socket.model.receive.BackBytes86; +import com.ifish.socket.model.receive.BackBytes86ByRuixinDuli; import com.ifish.socket.model.receive.BackBytes99; import com.ifish.socket.model.receive.BackFunctionCode8; import com.ifish.socket.model.send.BackFunctionCode1; @@ -296,8 +297,7 @@ public class SomeServer { } else { sendTest(session, strSrc, null); } - } //睿芯独立返回信息 - else if (message instanceof BackBytes84) { + } else if (message instanceof BackBytes84) { BackBytes84 receive = (BackBytes84) message; String strSrc = ByteUtil.bytesToHexString(receive.getSrc()); if (receive.getCheck_code() != 8) { @@ -322,7 +322,35 @@ public class SomeServer { //返回结果给客户端 sendTest(session, strSrc, null); } - } //设备登录服务器 + } //睿芯独立返回信息 + else if (message instanceof BackBytes86ByRuixinDuli) { + BackBytes86ByRuixinDuli receive = (BackBytes86ByRuixinDuli) message; + String strSrc = ByteUtil.bytesToHexString(receive.getSrc()); + if (receive.getCheck_code() != 8) { + Map json = new HashMap(); + Map dataMap = new HashMap(); + //加热温度 + dataMap.put(strSrc + "Result1", receive.getHeatStatus() == 1 ? "开" : "关"); + dataMap.put(strSrc + "Result2", (float) receive.getHeatWendu() / 10 + ""); + //灯1-灯4状态 + dataMap.put(strSrc + "Result3", receive.getOnoff1() == 1 ? "开" : "关"); + dataMap.put(strSrc + "Result4", receive.getOnoff2() == 1 ? "开" : "关"); + dataMap.put(strSrc + "Result5", receive.getOnoff3() == 1 ? "开" : "关"); + dataMap.put(strSrc + "Result6", receive.getOnoff4() == 1 ? "开" : "关"); + //柜灯状态 + dataMap.put(strSrc + "Result7", receive.getSarkLamp() == 1 ? "开" : "关"); + //加热制冷控制开关 + dataMap.put(strSrc + "Result8", receive.getIsRefrigeration() == 1 ? "开" : "关"); + dataMap.put(strSrc + "Wendu", (float) receive.getWendu() / 10 + ""); + json.put("result", "onoff"); + json.put("data", dataMap); + //返回结果给客户端 + sendTest(session, strSrc, json); + } else { + //返回结果给客户端 + sendTest(session, strSrc, null); + } + }//设备登录服务器 else if (message instanceof OrderFunctionCode1) { OrderFunctionCode1 receive = (OrderFunctionCode1) message; //mac地址先转换为字符串，再存进Map @@ -513,7 +541,7 @@ public class SomeServer { Integer[] str3 = new Integer[]{4, 1, 1, 4, 5, 3, 5, 7, 10, 6, 7, 10, 7, 7, 8}; //默认显示的厂家 if (factoryCode.equals("0a")) { - controlType = str1[14]; + controlType = str1[0]; } else if (factoryCode.equals("0b")) { controlType = str1[7]; } else if (factoryCode.equals("0c")) { @@ -663,7 +691,7 @@ public class SomeServer { map13.put("onOff6Checkbox", "附件"); showNameMap.put(str1[13], map13); orderNumberMap.put(str1[13], new int[]{-1, 14, 1, 2, 3, 4, 5}); - + //睿芯独立 Map map14 = new HashMap(); map14.put("onOff0Checkbox", "加热状态"); map14.put("onOff1Checkbox", "加热温度"); @@ -672,6 +700,7 @@ public class SomeServer { map14.put("onOff4Checkbox", "灯3"); map14.put("onOff5Checkbox", "灯4"); map14.put("onOff6Checkbox", "柜灯开关"); + map14.put("onOff7Checkbox", "加热制冷开关"); showNameMap.put(str1[14], map14); orderNumberMap.put(str1[14], new int[]{-1, 14, 1, 2, 3, 4, 13}); } diff --git a/src/main/java/com/ifish/socket/codeFactory/ServerDecode.java b/src/main/java/com/ifish/socket/codeFactory/ServerDecode.java index 8eefb87..d938542 100644 --- a/src/main/java/com/ifish/socket/codeFactory/ServerDecode.java +++ b/src/main/java/com/ifish/socket/codeFactory/ServerDecode.java @@ -22,6 +22,7 @@ import com.ifish.socket.model.receive.BackBytes74; import com.ifish.socket.model.receive.BackBytes84; import com.ifish.socket.model.receive.BackBytes85; import com.ifish.socket.model.receive.BackBytes86; +import com.ifish.socket.model.receive.BackBytes86ByRuixinDuli; import com.ifish.socket.model.receive.BackBytes99; import com.ifish.socket.model.send.BackFunctionCode7_11; import com.ifish.socket.model.send.OrderFunctionCode0; @@ -233,9 +234,23 @@ public class ServerDecode implements ProtocolDecoder { } //松诺5控返回信息 case 86: { + String hexDump = buf.getHexDump(); + byte[] hexByte = ByteUtil.hexStringToBytes(hexDump); + //mac地址 + byte[] srcByte = new byte[6]; + for (int i = 2; i < 8; i++) { + srcByte[i - 2] = hexByte[i]; + } + String strSrc = ByteUtil.bytesToHexString(srcByte); + String type = SomeServer.hardwareTypeMap.get(strSrc); //log.info("limit:【{}】,HexDump:【{}】",buf.limit(),buf.getHexDump()); //设备返回信息 - decode86(buf, out); + //如果型号是2a,则解码为睿芯独立的，否则解码为松诺5控 + if (type.equals("2a")) { + decode86ByRuixinDuli(buf, out); + } else { + decode86(buf, out); + } break; } //5控返回信息，长度为99 @@ -281,7 +296,7 @@ public class ServerDecode implements ProtocolDecoder { String type = SomeServer.hardwareTypeMap.get(strSrc); //睿芯独立 if (type != null && type.equals("2a")) { - decode84(buf, out); + decode86ByRuixinDuli(buf, out); } else { decode84(buf, out); } @@ -1981,6 +1996,156 @@ public class ServerDecode implements ProtocolDecoder { out.write(model); } + /** + * 设备返回信息（睿芯独立） + * + * @param buf + * @param out + */ + private void decode86ByRuixinDuli(IoBuffer buf, ProtocolDecoderOutput out) { + //实例化一个对象 + BackBytes86ByRuixinDuli model = new BackBytes86ByRuixinDuli(); + + //buf.get()取到的都是通信协议中从上往下的每段字节信息，所以要对应通信协议去插入每段数据，特别要注意前后顺序，不然会将A功能的状态插入到B功能 + //读取15字节头开始插入数据 + //发送消息类型,1回复类型,0发送类型 + model.setType(buf.get()); + + //功能码 对应通信协议的暗红、黄色部分发送、返回的功能码 + model.setCheck_code(buf.get()); + + //读取发送端的mac地址对象结构 + byte[] src = model.getSrc(); + //循环读取每一字节插入mac地址对象结构中 + for (int i = 0; i < src.length; i++) { + src[i] = buf.get(); + } + //将mac地址插入到对象中 + model.setSrc(src); + + //读取接收端的mac地址,如上 + byte[] dest = model.getDest(); + for (int i = 0; i < dest.length; i++) { + dest[i] = buf.get(); + } + model.setDest(dest); + + //整个包长度 + model.setRemote_len(buf.get()); + + //灯1编号和开关 + model.setLamp1(buf.get()); + model.setOnoff1(buf.get()); + + //灯2编号和开关 + model.setLamp2(buf.get()); + model.setOnoff2(buf.get()); + + //灯3编号和开关 + model.setLamp3(buf.get()); + model.setOnoff3(buf.get()); + + //灯4编号和开关 + model.setLamp4(buf.get()); + model.setOnoff4(buf.get()); + + //加热制冷开关 + model.setIsRefrigeration(buf.get()); + model.setOnoff5(buf.get()); + + //定时器编号 + byte timer_number1 = model.getTimer_number1(); + byte timer_number2 = model.getTimer_number2(); + byte timer_number3 = model.getTimer_number3(); + byte timer_number4 = model.getTimer_number4(); + byte timer_number5 = model.getTimer_number5(); + byte timer_number6 = model.getTimer_number6(); + byte timer_number7 = model.getTimer_number7(); + byte timer_number8 = model.getTimer_number8(); + + //定时器开关 + byte timer_onoff1 = model.getTimer_onoff1(); + byte timer_onoff2 = model.getTimer_onoff2(); + byte timer_onoff3 = model.getTimer_onoff3(); + byte timer_onoff4 = model.getTimer_onoff4(); + byte timer_onoff5 = model.getTimer_onoff5(); + byte timer_onoff6 = model.getTimer_onoff6(); + byte timer_onoff7 = model.getTimer_onoff7(); + byte timer_onoff8 = model.getTimer_onoff8(); + + //定时器时间 + byte[] timer_time1 = model.getTimer_time1(); + byte[] timer_time2 = model.getTimer_time2(); + byte[] timer_time3 = model.getTimer_time3(); + byte[] timer_time4 = model.getTimer_time4(); + byte[] timer_time5 = model.getTimer_time5(); + byte[] timer_time6 = model.getTimer_time6(); + byte[] timer_time7 = model.getTimer_time7(); + byte[] timer_time8 = model.getTimer_time8(); + + byte[] timer_numbers = {timer_number1, timer_number2, timer_number3, timer_number4, timer_number5, timer_number6, timer_number7, timer_number8}; + byte[] timer_onoffs = {timer_onoff1, timer_onoff2, timer_onoff3, timer_onoff4, timer_onoff5, timer_onoff6, timer_onoff7, timer_onoff8}; + byte[][] timers = {timer_time1, timer_time2, timer_time3, timer_time4, timer_time5, timer_time6, timer_time7, timer_time8}; + + for (int i = 0; i < timer_numbers.length; i++) { + //定时器编号 + timer_numbers[i] = buf.get(); + //定时器开关 + timer_onoffs[i] = buf.get(); + for (int j = 0; j < timers[i].length; j++) { + timers[i][j] = buf.get(); + } + } + //定时器编号 + model.setTimer_number1(timer_numbers[0]); + model.setTimer_number2(timer_numbers[1]); + model.setTimer_number3(timer_numbers[2]); + model.setTimer_number4(timer_numbers[3]); + model.setTimer_number5(timer_numbers[4]); + model.setTimer_number6(timer_numbers[5]); + model.setTimer_number7(timer_numbers[6]); + model.setTimer_number8(timer_numbers[7]); + //定时器开关 + model.setTimer_onoff1(timer_onoffs[0]); + model.setTimer_onoff2(timer_onoffs[1]); + model.setTimer_onoff3(timer_onoffs[2]); + model.setTimer_onoff4(timer_onoffs[3]); + model.setTimer_onoff5(timer_onoffs[4]); + model.setTimer_onoff6(timer_onoffs[5]); + model.setTimer_onoff7(timer_onoffs[6]); + model.setTimer_onoff8(timer_onoffs[7]); + //定时器时间 + model.setTimer_time1(timers[0]); + model.setTimer_time2(timers[1]); + model.setTimer_time3(timers[2]); + model.setTimer_time4(timers[3]); + model.setTimer_time5(timers[4]); + model.setTimer_time6(timers[5]); + model.setTimer_time7(timers[6]); + model.setTimer_time8(timers[7]); + //加热状态 + model.setHeatStatus(buf.get()); + //温度 + model.setWendu(buf.getShort()); + //加热温度 + model.setHeatWendu(buf.getShort()); + //柜灯 + model.setSarkLamp(buf.get()); + //报警开关 + model.setWarn_onoff(buf.get()); + //最低报警温度 + model.setLow_wendu(buf.getShort()); + //最高报警温度 + model.setHigh_wendu(buf.getShort()); + + //15字节头的校验码 + byte[] crc16_code = model.getCrc16_code(); + for (int i = 0; i < crc16_code.length; i++) { + crc16_code[i] = buf.get(); + } + out.write(model); + } + /** * 设备返回信息(84字节，睿芯独立) * diff --git a/src/main/java/com/ifish/socket/model/receive/BackBytes86ByRuixinDuli.java b/src/main/java/com/ifish/socket/model/receive/BackBytes86ByRuixinDuli.java new file mode 100644 index 0000000..c20c793 --- /dev/null +++ b/src/main/java/com/ifish/socket/model/receive/BackBytes86ByRuixinDuli.java @@ -0,0 +1,684 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package com.ifish.socket.model.receive; + +import com.ifish.socket.model.HeadModel; +import java.io.Serializable; + +/** + * + * @author Administrator + */ +public class BackBytes86ByRuixinDuli extends HeadModel implements Serializable { + + //灯编号1 + private byte lamp1; + //灯编号2 + private byte lamp2; + //灯编号3 + private byte lamp3; + //灯编号4 + private byte lamp4; + //是否制冷，0加热，1制冷 + private byte isRefrigeration; + //灯1开关 + private byte onoff1; + //灯2开关 + private byte onoff2; + //灯3开关 + private byte onoff3; + //灯4开关 + private byte onoff4; + //加热制冷开关 + private byte onoff5; + + /** + * *******定时器编号********* + */ + //定时器1编号 + private byte timer_number1; + //定时器2编号 + private byte timer_number2; + //定时器3编号 + private byte timer_number3; + //定时器4编号 + private byte timer_number4; + //定时器5编号 + private byte timer_number5; + //定时器6编号 + private byte timer_number6; + //定时器7编号 + private byte timer_number7; + //定时器8编号 + private byte timer_number8; + /** + * *******定时器开关********* + */ + //定时器1开关 + private byte timer_onoff1; + //定时器2开关 + private byte timer_onoff2; + //定时器3开关 + private byte timer_onoff3; + //定时器4开关 + private byte timer_onoff4; + //定时器5开关 + private byte timer_onoff5; + //定时器6开关 + private byte timer_onoff6; + //定时器7开关 + private byte timer_onoff7; + //定时器8开关 + private byte timer_onoff8; + /** + * *******定时器时间(48字节)********* + */ + //定时器1时间 + private byte[] timer_time1 = new byte[4]; + //定时器2时间 + private byte[] timer_time2 = new byte[4]; + //定时器3时间 + private byte[] timer_time3 = new byte[4]; + //定时器4时间 + private byte[] timer_time4 = new byte[4]; + //定时器5时间 + private byte[] timer_time5 = new byte[4]; + //定时器6时间 + private byte[] timer_time6 = new byte[4]; + //定时器7时间 + private byte[] timer_time7 = new byte[4]; + //定时器8时间 + private byte[] timer_time8 = new byte[4]; + //加热状态 + private byte heatStatus; + //温度 + private short wendu; + //加热温度 + private short heatWendu; + //柜灯 + private byte sarkLamp; + //报警开关,0关，1开 + private byte warn_onoff; + //最低报警温度 + private short low_wendu; + //最高报警温度 + private short high_wendu; + + /** + * @return the lamp1 + */ + public byte getLamp1() { + return lamp1; + } + + /** + * @param lamp1 the lamp1 to set + */ + public void setLamp1(byte lamp1) { + this.lamp1 = lamp1; + } + + /** + * @return the lamp2 + */ + public byte getLamp2() { + return lamp2; + } + + /** + * @param lamp2 the lamp2 to set + */ + public void setLamp2(byte lamp2) { + this.lamp2 = lamp2; + } + + /** + * @return the lamp3 + */ + public byte getLamp3() { + return lamp3; + } + + /** + * @param lamp3 the lamp3 to set + */ + public void setLamp3(byte lamp3) { + this.lamp3 = lamp3; + } + + /** + * @return the lamp4 + */ + public byte getLamp4() { + return lamp4; + } + + /** + * @param lamp4 the lamp4 to set + */ + public void setLamp4(byte lamp4) { + this.lamp4 = lamp4; + } + + /** + * @return the isRefrigeration + */ + public byte getIsRefrigeration() { + return isRefrigeration; + } + + /** + * @param isRefrigeration the isRefrigeration to set + */ + public void setIsRefrigeration(byte isRefrigeration) { + this.isRefrigeration = isRefrigeration; + } + + /** + * @return the onoff1 + */ + public byte getOnoff1() { + return onoff1; + } + + /** + * @param onoff1 the onoff1 to set + */ + public void setOnoff1(byte onoff1) { + this.onoff1 = onoff1; + } + + /** + * @return the onoff2 + */ + public byte getOnoff2() { + return onoff2; + } + + /** + * @param onoff2 the onoff2 to set + */ + public void setOnoff2(byte onoff2) { + this.onoff2 = onoff2; + } + + /** + * @return the onoff3 + */ + public byte getOnoff3() { + return onoff3; + } + + /** + * @param onoff3 the onoff3 to set + */ + public void setOnoff3(byte onoff3) { + this.onoff3 = onoff3; + } + + /** + * @return the onoff4 + */ + public byte getOnoff4() { + return onoff4; + } + + /** + * @param onoff4 the onoff4 to set + */ + public void setOnoff4(byte onoff4) { + this.onoff4 = onoff4; + } + + /** + * @return the onoff5 + */ + public byte getOnoff5() { + return onoff5; + } + + /** + * @param onoff5 the onoff5 to set + */ + public void setOnoff5(byte onoff5) { + this.onoff5 = onoff5; + } + + /** + * @return the timer_number1 + */ + public byte getTimer_number1() { + return timer_number1; + } + + /** + * @param timer_number1 the timer_number1 to set + */ + public void setTimer_number1(byte timer_number1) { + this.timer_number1 = timer_number1; + } + + /** + * @return the timer_number2 + */ + public byte getTimer_number2() { + return timer_number2; + } + + /** + * @param timer_number2 the timer_number2 to set + */ + public void setTimer_number2(byte timer_number2) { + this.timer_number2 = timer_number2; + } + + /** + * @return the timer_number3 + */ + public byte getTimer_number3() { + return timer_number3; + } + + /** + * @param timer_number3 the timer_number3 to set + */ + public void setTimer_number3(byte timer_number3) { + this.timer_number3 = timer_number3; + } + + /** + * @return the timer_number4 + */ + public byte getTimer_number4() { + return timer_number4; + } + + /** + * @param timer_number4 the timer_number4 to set + */ + public void setTimer_number4(byte timer_number4) { + this.timer_number4 = timer_number4; + } + + /** + * @return the timer_number5 + */ + public byte getTimer_number5() { + return timer_number5; + } + + /** + * @param timer_number5 the timer_number5 to set + */ + public void setTimer_number5(byte timer_number5) { + this.timer_number5 = timer_number5; + } + + /** + * @return the timer_number6 + */ + public byte getTimer_number6() { + return timer_number6; + } + + /** + * @param timer_number6 the timer_number6 to set + */ + public void setTimer_number6(byte timer_number6) { + this.timer_number6 = timer_number6; + } + + /** + * @return the timer_number7 + */ + public byte getTimer_number7() { + return timer_number7; + } + + /** + * @param timer_number7 the timer_number7 to set + */ + public void setTimer_number7(byte timer_number7) { + this.timer_number7 = timer_number7; + } + + /** + * @return the timer_number8 + */ + public byte getTimer_number8() { + return timer_number8; + } + + /** + * @param timer_number8 the timer_number8 to set + */ + public void setTimer_number8(byte timer_number8) { + this.timer_number8 = timer_number8; + } + + /** + * @return the timer_onoff1 + */ + public byte getTimer_onoff1() { + return timer_onoff1; + } + + /** + * @param timer_onoff1 the timer_onoff1 to set + */ + public void setTimer_onoff1(byte timer_onoff1) { + this.timer_onoff1 = timer_onoff1; + } + + /** + * @return the timer_onoff2 + */ + public byte getTimer_onoff2() { + return timer_onoff2; + } + + /** + * @param timer_onoff2 the timer_onoff2 to set + */ + public void setTimer_onoff2(byte timer_onoff2) { + this.timer_onoff2 = timer_onoff2; + } + + /** + * @return the timer_onoff3 + */ + public byte getTimer_onoff3() { + return timer_onoff3; + } + + /** + * @param timer_onoff3 the timer_onoff3 to set + */ + public void setTimer_onoff3(byte timer_onoff3) { + this.timer_onoff3 = timer_onoff3; + } + + /** + * @return the timer_onoff4 + */ + public byte getTimer_onoff4() { + return timer_onoff4; + } + + /** + * @param timer_onoff4 the timer_onoff4 to set + */ + public void setTimer_onoff4(byte timer_onoff4) { + this.timer_onoff4 = timer_onoff4; + } + + /** + * @return the timer_onoff5 + */ + public byte getTimer_onoff5() { + return timer_onoff5; + } + + /** + * @param timer_onoff5 the timer_onoff5 to set + */ + public void setTimer_onoff5(byte timer_onoff5) { + this.timer_onoff5 = timer_onoff5; + } + + /** + * @return the timer_onoff6 + */ + public byte getTimer_onoff6() { + return timer_onoff6; + } + + /** + * @param timer_onoff6 the timer_onoff6 to set + */ + public void setTimer_onoff6(byte timer_onoff6) { + this.timer_onoff6 = timer_onoff6; + } + + /** + * @return the timer_onoff7 + */ + public byte getTimer_onoff7() { + return timer_onoff7; + } + + /** + * @param timer_onoff7 the timer_onoff7 to set + */ + public void setTimer_onoff7(byte timer_onoff7) { + this.timer_onoff7 = timer_onoff7; + } + + /** + * @return the timer_onoff8 + */ + public byte getTimer_onoff8() { + return timer_onoff8; + } + + /** + * @param timer_onoff8 the timer_onoff8 to set + */ + public void setTimer_onoff8(byte timer_onoff8) { + this.timer_onoff8 = timer_onoff8; + } + + /** + * @return the timer_time1 + */ + public byte[] getTimer_time1() { + return timer_time1; + } + + /** + * @param timer_time1 the timer_time1 to set + */ + public void setTimer_time1(byte[] timer_time1) { + this.timer_time1 = timer_time1; + } + + /** + * @return the timer_time2 + */ + public byte[] getTimer_time2() { + return timer_time2; + } + + /** + * @param timer_time2 the timer_time2 to set + */ + public void setTimer_time2(byte[] timer_time2) { + this.timer_time2 = timer_time2; + } + + /** + * @return the timer_time3 + */ + public byte[] getTimer_time3() { + return timer_time3; + } + + /** + * @param timer_time3 the timer_time3 to set + */ + public void setTimer_time3(byte[] timer_time3) { + this.timer_time3 = timer_time3; + } + + /** + * @return the timer_time4 + */ + public byte[] getTimer_time4() { + return timer_time4; + } + + /** + * @param timer_time4 the timer_time4 to set + */ + public void setTimer_time4(byte[] timer_time4) { + this.timer_time4 = timer_time4; + } + + /** + * @return the timer_time5 + */ + public byte[] getTimer_time5() { + return timer_time5; + } + + /** + * @param timer_time5 the timer_time5 to set + */ + public void setTimer_time5(byte[] timer_time5) { + this.timer_time5 = timer_time5; + } + + /** + * @return the timer_time6 + */ + public byte[] getTimer_time6() { + return timer_time6; + } + + /** + * @param timer_time6 the timer_time6 to set + */ + public void setTimer_time6(byte[] timer_time6) { + this.timer_time6 = timer_time6; + } + + /** + * @return the timer_time7 + */ + public byte[] getTimer_time7() { + return timer_time7; + } + + /** + * @param timer_time7 the timer_time7 to set + */ + public void setTimer_time7(byte[] timer_time7) { + this.timer_time7 = timer_time7; + } + + /** + * @return the timer_time8 + */ + public byte[] getTimer_time8() { + return timer_time8; + } + + /** + * @param timer_time8 the timer_time8 to set + */ + public void setTimer_time8(byte[] timer_time8) { + this.timer_time8 = timer_time8; + } + + /** + * @return the heatStatus + */ + public byte getHeatStatus() { + return heatStatus; + } + + /** + * @param heatStatus the heatStatus to set + */ + public void setHeatStatus(byte heatStatus) { + this.heatStatus = heatStatus; + } + + /** + * @return the wendu + */ + public short getWendu() { + return wendu; + } + + /** + * @param wendu the wendu to set + */ + public void setWendu(short wendu) { + this.wendu = wendu; + } + + /** + * @return the heatWendu + */ + public short getHeatWendu() { + return heatWendu; + } + + /** + * @param heatWendu the heatWendu to set + */ + public void setHeatWendu(short heatWendu) { + this.heatWendu = heatWendu; + } + + /** + * @return the sarkLamp + */ + public byte getSarkLamp() { + return sarkLamp; + } + + /** + * @param sarkLamp the sarkLamp to set + */ + public void setSarkLamp(byte sarkLamp) { + this.sarkLamp = sarkLamp; + } + + /** + * @return the warn_onoff + */ + public byte getWarn_onoff() { + return warn_onoff; + } + + /** + * @param warn_onoff the warn_onoff to set + */ + public void setWarn_onoff(byte warn_onoff) { + this.warn_onoff = warn_onoff; + } + + /** + * @return the low_wendu + */ + public short getLow_wendu() { + return low_wendu; + } + + /** + * @param low_wendu the low_wendu to set + */ + public void setLow_wendu(short low_wendu) { + this.low_wendu = low_wendu; + } + + /** + * @return the high_wendu + */ + public short getHigh_wendu() { + return high_wendu; + } + + /** + * @param high_wendu the high_wendu to set + */ + public void setHigh_wendu(short high_wendu) { + this.high_wendu = high_wendu; + } + +} diff --git a/src/main/resources/property.properties b/src/main/resources/property.properties index 01c71c7..6cbb4b9 100644 --- a/src/main/resources/property.properties +++ b/src/main/resources/property.properties @@ -5,6 +5,6 @@ ifish_port=8080 ifish.replay=true ifish_replay=true #\u7535\u5b50\u5382 -ifish.factory=0d -ifish_factory=0d +ifish.factory=0a +ifish_factory=0a diff --git a/src/main/webapp/static/js/socket.js b/src/main/webapp/static/js/socket.js index f581093..ebda3aa 100644 --- a/src/main/webapp/static/js/socket.js +++ b/src/main/webapp/static/js/socket.js @@ -880,7 +880,8 @@ function changeColor() { } function getFactoryInfo() { $.ajax({ - url: "https://bg.zhangxinyanv5.top/page/public/getVenderList.do?rm=" + Math.random() + "&factoryCode=" + $("#factoryCode").val(), + //url: "https://bg.zhangxinyanv5.top/page/public/getVenderList.do?rm=" + Math.random() + "&factoryCode=" + $("#factoryCode").val(), + url: "http://192.168.199.129:7080/page/public/getVenderList.do?rm=" + Math.random() + "&factoryCode=" + $("#factoryCode").val(), //url: "https://bg.ifish7.com/page/public/getVenderList.do?rm=" + Math.random() + "&factoryCode=" + $("#factoryCode").val(), type: "get", dataType: "json",