liurunyu
2024-06-27 000b82432810fbbecfa0f857286248d4932a1f47
靳总协议功能码35+3C协议解析调整
3 文件已重命名
1个文件已修改
20 ■■■■ 已修改文件
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_3C_Down.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_3C_Up.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_65_Up.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3CAnd65Vo.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_3C_Down.java
File was renamed from pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_35_Down.java
@@ -16,9 +16,9 @@
 * @Description 设置水价
 */
@AnnotationCodeDown(ifAny={
        CodeV1_0_1.cd_35
        CodeV1_0_1.cd_3C
})
public class Cd_35_Down implements CodeParse {
public class Cd_3C_Down implements CodeParse {
    @Override
    public MidResult[] parse(Boolean isLowPower, CodeParseParams params, CodeParseCallback callback) throws Exception {
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_3C_Up.java
File was renamed from pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_35_Up.java
@@ -2,7 +2,7 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd35And65Vo;
import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd3CAnd65Vo;
import com.dy.common.util.ByteUtilUnsigned;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -14,11 +14,11 @@
 * @Description
 */
@AnnotationCodeUp(ifAny={
        CodeV1_0_1.cd_35
        CodeV1_0_1.cd_3C
})
public class Cd_35_Up implements CodeParse {
public class Cd_3C_Up implements CodeParse {
    private static final Logger log = LogManager.getLogger(Cd_35_Up.class);
    private static final Logger log = LogManager.getLogger(Cd_3C_Up.class);
    /**
     * 分析上行数据
@@ -58,7 +58,7 @@
     */
    protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
        DataV1_0_1 dV1 = (DataV1_0_1)data.getSubData() ;
        DataCd35And65Vo cdData = new DataCd35And65Vo() ;
        DataCd3CAnd65Vo cdData = new DataCd3CAnd65Vo() ;
        dV1.subData = cdData ;
        int minute = ByteUtilUnsigned.bytes2Short_LE(bs, ProtocolConstantV206V1_0_0.dataIndex) ;
        cdData.minute = minute;
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_65_Up.java
@@ -2,7 +2,7 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd35And65Vo;
import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd3CAnd65Vo;
import com.dy.common.util.ByteUtilUnsigned;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -58,7 +58,7 @@
     */
    protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
        DataV1_0_1 dV1 = (DataV1_0_1)data.getSubData() ;
        DataCd35And65Vo cdData = new DataCd35And65Vo() ;
        DataCd3CAnd65Vo cdData = new DataCd3CAnd65Vo() ;
        dV1.subData = cdData ;
        int minute = ByteUtilUnsigned.bytes2Short_LE(bs, ProtocolConstantV206V1_0_0.dataIndex) ;
        cdData.minute =minute ;
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3CAnd65Vo.java
File was renamed from pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd35And65Vo.java
@@ -9,7 +9,7 @@
 * @Description
 */
@Data
public class DataCd35And65Vo {
public class DataCd3CAnd65Vo {
    public Integer minute ;
    public String toString(){