修改bug

liurunyu

2025-08-21 9ba987e9232b71cefbb800114dd09985d7fef888

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
package com.dy.rtuMw.server.rtuData.p206V202404;
 
import com.dy.common.mw.protocol.Data;
import com.dy.common.mw.protocol.UpComResVo;
import com.dy.common.mw.protocol.p206V202404.DataV202404;
import com.dy.common.util.DateTime;
import com.dy.pipIrrGlobal.pojoRm.RmCommandHistory;
import com.dy.rtuMw.server.rtuData.TaskSurpport;
import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
 
/**
 * @Author liurunyu
 * @Date 2024/5/8 14:18
 * @Description 处理命令响应上报
 */
public class TkRtuDealCommandResponseV202404 extends TaskSurpport {
 
    private static final Logger log = LogManager.getLogger(TkRtuDealCommandResponseV202404.class.getName()) ;
 
    //类ID，一定与Tree.xml配置文件中配置一致
    public static final String taskId = "TkRtuDealCommandResponseV202404" ;
 
    /**
     * 执行节点任务：处理命令响应上报
     * @param data 需要处理的数据
     */
    @Override
    public void execute(Object data) {
        Data d = (Data)data ;
        Object protocolData = d.getSubData() ;
        if(protocolData != null){
            DataV202404 dV202404 = (DataV202404)protocolData ;
            if(dV202404 != null) {
                Object[] objs = this.getTaskResults(TkPreGenObjsV202404.taskId);
                DbSv sv = (DbSv) objs[0];
                //PrController controller = (PrController) objs[1];
                try{
                    RmCommandHistory po = sv.getCommandLog(d.commandId) ;
                    if(po != null){
                        po = this.updateCommandLogPo(po, d.code, dV202404, dV202404.subData) ;
                        sv.updateCommandLog(po);
                    }else{
                        log.error("未得到命令日志（" + d.getCommandId() + ")");
                    }
                }catch (Exception e){
                    log.error("保存控制器命令结果时发生异常", e);
                }
            }
        }
    }
 
    public RmCommandHistory updateCommandLogPo(RmCommandHistory po, String code, DataV202404 dV202404, Object obj) throws Exception{
        po.setResultTime(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV202404.dt==null?DateTime.yyyy_MM_dd_HH_mm_ss():dV202404.dt));
        if(obj instanceof UpComResVo){
            UpComResVo vo = (UpComResVo)obj ;
            po.setResult((byte)1);
            po.setResultText(vo.comLog()!=null?vo.comLog():vo.comLog(code));
            log.info("----------------------------------\n" + (vo.comLog()!=null?vo.comLog():vo.comLog(code)));
        }
        return po ;
    }
}