2024-07-12 朱宝民 开卡传入协议，补卡返回协议

Administrator

2024-07-12 3dae16069f7f6572750f028a48ca291f449bbb44

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java

@@ -19,7 +19,6 @@
import com.dy.pipIrrGlobal.pojoSe.SeVirtualCard;
import jakarta.annotation.PostConstruct;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
@@ -46,7 +45,7 @@
 */

public class ComSupport {
    @Value("${mw.comSendUrl}")
    //@Value("${mw.comSendUrl}")
    private String comSendUrl;

    protected static String controllerType = null;
@@ -256,6 +255,7 @@
            // 创建命令日志对象并添加到数据库中
            RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, commandName, intakeId, rtuAddr, protocol, param, operator);
            rmCommandHistoryMapper.insert(rmCommandHistory);
            comId = rmCommandHistory.getId();

            // 回调异常
            if(!response_CallBack.getCode().equals("0001")) {
@@ -289,12 +289,24 @@
            System.out.println(job_subData);
            Boolean dealResult = job_subData.getBoolean("success");
            if(!dealResult) {
                /**
                 * 执行失败
                 * 更新执行结果、返回结果时间、结果内容
                 */
                rmCommandHistory = new RmCommandHistory();
                rmCommandHistory.setId(comId);
                rmCommandHistory.setResult((byte)0);
                rmCommandHistory.setResultTime(new Date());
                rmCommandHistory.setResultText((JSONObject)JSON.toJSON(response_CallBack.getContent()));
                rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);
                return BaseResponseUtils.buildErrorMsg(response_CallBack.getContent().toString());
            }

            /**
             * 执行成功，返回回调内容
             * 执行成功
             * 如果是开关阀：更改虚拟卡状态：是否使用中、最后操作、最后操作时间
             * 更新执行结果、返回结果时间、结果内容
             * 返回回调内容
             */
            if(comType != null) {
                SeVirtualCard virtualCard = new SeVirtualCard();
@@ -311,6 +323,15 @@

            // 回调返回的内容
            Data myData = (Data)response_CallBack.getContent();

            // 更新命令日志：执行结果、返回结果时间、结果内容
            rmCommandHistory = new RmCommandHistory();
            rmCommandHistory.setId(comId);
            rmCommandHistory.setResult((byte)1);
            rmCommandHistory.setResultTime(new Date());
            rmCommandHistory.setResultText((JSONObject)JSON.toJSON(myData));
            rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);

            return BaseResponseUtils.buildSuccess(myData) ;
        } else {
            // 请求失败