zhubaomin
2024-10-31 bac51596a78abb6d9411b9ad2b7f49d6849af710
Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
2个文件已修改
10 ■■■■ 已修改文件
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealLoss.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java
@@ -185,7 +185,10 @@
     * @param type 字节
     * @return 名称
     */
    public static String openCloseValveType(byte type){
    public static String openCloseValveType(Byte type){
        if(type == null){
            return "" ;
        }
        return switch (type) {
            case 1 -> "刷卡开阀";
            case 2 -> "刷卡关阀";
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealLoss.java
@@ -98,7 +98,10 @@
                    sv.updateRmLossHistory(poHistory);
                }else if(DateTime.dateFrom_yyyy_MM_dd1(dV1_0_1.dt).after(poLast.dt)){
                    //新的日期
                    poLast = this.newRmLossLast(controller, rtuAddr, dV1_0_1, dataCdC0Vo);
                    poLast.lossAmount = dataCdC0Vo.lossAmount ;
                    poLast.dt = DateTime.dateFrom_yyyy_MM_dd1(dataCdC0Vo.rtuDt);
                    poLast.dtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt) ;
                    poLast.dtRtu = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCdC0Vo.rtuDt) ;
                    this.newAndSaveHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataCdC0Vo, poLast);
                    sv.updateRmLossLast(poLast);
                }else{