pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java
@@ -165,7 +165,22 @@ /** * å¾å°å ³å¼éç±»ååç§° * å¼å ³éç±»å(1:å·å¡å¼éï¼2:å·å¡å ³éï¼3:ä¸å¿ç«å¼éï¼4:ä¸å¿ç«å ³éï¼5:æ¬ è´¹å ³éï¼6:æµé计æ éå ³éï¼7:ç´§æ¥å ³éï¼8:ç¨æ·è¿ç¨å¼éï¼9:ç¨æ·è¿ç¨å ³éï¼10:å¼å ³éå¡å ³éï¼11:å¼å ³éå¡å·å¡å¡å¼éï¼) * å¼å ³éç±»å( * 1:å·å¡å¼éï¼ * 2:å·å¡å ³éï¼ * 3:ä¸å¿ç«å¼éï¼ * 4:ä¸å¿ç«å ³éï¼ * 5:æ¬ è´¹å ³éï¼ * 6:æµé计æ éå ³éï¼ * 7:ç´§æ¥å ³éï¼ * 8:ç¨æ·è¿ç¨å¼éï¼ * 9:ç¨æ·è¿ç¨å ³éï¼ * 10:å¼å ³éå¡å ³éï¼ * 11:å¼å ³éå¡å·å¡å¡å¼éï¼ * 12:é»ååå½ä»¤å ³éï¼ * 13:ç¨æ·è¿ç¨å®æ¶å ³éï¼ * 14:ç¨æ·è¿ç¨å®éå ³éï¼ * ) * @param type åè * @return åç§° */ @@ -182,64 +197,19 @@ case 9 -> "ç¨æ·è¿ç¨å ³é"; case 10 -> "å¼å ³éå¡å ³é"; case 11 -> "å¼å ³éå¡å¼é"; case 12 -> "é»ååå½ä»¤å ³é"; case 13 -> "ç¨æ·è¿ç¨å®æ¶å ³é"; case 14 -> "ç¨æ·è¿ç¨å®éå ³é"; default -> "æªç¥"; }; } public static Boolean isCloseValveType(byte type){ return switch (type) { case 1 -> false ; case 2 -> true ; case 3 -> false ; case 4 -> true ; case 5 -> true ; case 6 -> true ; case 7 -> true ; case 8 -> false ; case 9 -> true ; case 10 -> true ; case 11 -> false ; case 1, 3, 8, 11 -> false ; case 2, 4, 5, 6, 7, 9, 10, 12, 13, 14 -> true ; default -> null ; }; } // /** // * å¤çICå¡ç¼å·ï¼é³æ»å¶å®çåè®®è¦æ±10ä½ICå¡ç¼å· // * @param icCardNo // * @return // */ // public static String[] dealIcCardNo(String icCardNo){ // if(icCardNo.length() > 10){ // String tail = icCardNo.substring(icCardNo.length() - 10) ; // String head = icCardNo.substring(0, icCardNo.length() - 10) ; // return new String[]{head , tail} ; // }else if(icCardNo.length() < 10){ // while(icCardNo.length() != 10){ // icCardNo = "0" + icCardNo ; // } // return new String[]{null , icCardNo} ; // }else{ // return new String[]{null , icCardNo} ; // } // } /* * åæçæ¬å· * @param bs ä¸è¡åèæ°ç» * @return çæ¬å· * @throws Exception å¼å¸¸ public String parseVersion(byte[] bs)throws Exception{ short ver = ByteUtilUnsigned.byte2Byte(bs, ProtocolConstantV206V1_0_0.versionIndex) ; char[] cs = ("" + ver).toCharArray() ; StringBuilder vs = new StringBuilder() ; for(byte i = 0 ; i < cs.length; i++){ if(i == 0){ vs.append(cs[i]) ; }else{ vs.append(".").append(cs[i]) ; } } return vs.toString() ; } */ } pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd83CloseVo.java
@@ -5,9 +5,7 @@ @Data public class DataCd83CloseVo { // å¼å ³éç±»åï¼ // 1ãå·å¡å¼éï¼2å·å¡å ³éï¼3ãä¸å¿ç«å¼éï¼4ãä¸å¿ç«å ³éï¼5ãæ¬ è´¹å ³éï¼ // 6ãæµé计æ éå ³éï¼7ãç´§æ¥å ³éï¼8ãç¨æ·è¿ç¨å¼éï¼9ãç¨æ·è¿ç¨å ³éï¼ // å¼å ³éç±»åï¼è§CommonV1_0_1.openCloseValveType() public Byte type ; public Double totalAmount; //累计æµéï¼5åèBCDç ï¼åå¼èå´0~9999999999ï¼åä½ä¸ºm3ã public String icCardNo;//ICå¡ç¼å· pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd83OpenVo.java
@@ -6,10 +6,7 @@ @Data public class DataCd83OpenVo { // å¼å ³éç±»åï¼ // 1ãå·å¡å¼éï¼2å·å¡å ³éï¼3ãä¸å¿ç«å¼éï¼4ãä¸å¿ç«å ³éï¼5ãæ¬ è´¹å ³éï¼ // 6ãæµé计æ éå ³éï¼7ãç´§æ¥å ³éï¼8ãç¨æ·è¿ç¨å¼éï¼9ãç¨æ·è¿ç¨å ³éï¼ // 16ï¼ç¨æ·å¼éå管éå æ²¡ææ°´ï¼èªå¨å ³éã管éä¸åºæ°´èªå¨å ³é // å¼å ³éç±»åï¼è§CommonV1_0_1.openCloseValveType() public Byte type ; public Double totalAmount; //累计æµéï¼5åèBCDç ï¼åå¼èå´0~9999999999ï¼åä½ä¸ºm3ã public String icCardNo;//ICå¡ç¼å· pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -161,5 +161,5 @@ - /wx/comRes/receive #èªå¨ç»è®¡é ç½®ï¼èªå¨ç»è®¡å®æ¶ä»»å¡ä¼æ¯å¤©å®æ¶è¿è¡ auto-statistics: startHour: 9 #å¼å§å°æ¶ 0 startMinute: 51 #å¼å§åé 5 startHour: 17 #å¼å§å°æ¶ 0 startMinute: 19 #å¼å§åé 5 pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/PipIrrStatisticsApplication.java
@@ -18,7 +18,11 @@ }) } ) @MapperScan(basePackages={"com.dy.pipIrrGlobal.daoRm", "com.dy.pipIrrGlobal.daoPr", "com.dy.pipIrrGlobal.daoSe", "com.dy.pipIrrGlobal.daoBa"}) @MapperScan(basePackages={"com.dy.pipIrrGlobal.daoRm", "com.dy.pipIrrGlobal.daoPr", "com.dy.pipIrrGlobal.daoSe", "com.dy.pipIrrGlobal.daoBa", "com.dy.pipIrrGlobal.daoSt"}) public class PipIrrStatisticsApplication { public static void main(String[] args) { pipIrr-platform/Îĵµ/Ôö¼ÓÒ»¸öÓ¦Óûú¹¹.docxBinary files differ