pipIrr-SV.git - Gitblit

			@@ -4,8 +4,8 @@
			import com.alibaba.fastjson2.JSONObject;
			import com.dy.common.aop.SsoAop;
			import com.dy.common.mw.protocol.Command;
			import com.dy.common.mw.protocol.p206V202404.CodeV202404;
			import com.dy.common.mw.protocol.p206V202404.upVos.DataCdXyVo;
			import com.dy.common.util.Callback;
			import com.dy.common.util.NumUtil;
			import com.dy.common.webUtil.BaseResponse;
			import com.dy.common.webUtil.BaseResponseUtils;
			@@ -33,7 +33,7 @@
			*/
			@Slf4j
			@Tag(name = "远程命令", description = "远程用户充值")
			@RestController("cd15Ctrl")
			@RestController("p202404V201Cd15Ctrl")
			@RequestMapping(path = "p202404V201/cd15")
			@RequiredArgsConstructor
			@Scope("prototype") //因为有对象类属性，所以采用原型模式，每次请求新建一个实例对象
			@@ -64,7 +64,7 @@
			//发送命令前-3：保存命令日志
			SeClientCard icPo = sv.selectClientIcCardById(Long.parseLong(dto.icCardId.trim())) ;
			if(icPo == null){
			return BaseResponseUtils.buildError("服务端出错，未得到农户IC卡") ;
			return BaseResponseUtils.buildErrorMsg("服务端出错，未得到农户IC卡") ;
			}
			CdParam comParam = CdParam.builder().commandCode(ComCode).projectNo(projectNo).controllerType(controllerType)
			.icCardAddr(icPo.getCardaddr())//IC卡地址(8位数字或字母)
			@@ -86,7 +86,7 @@
			res = super.doSend(sv, com);
			if (res == null) {
			//发送命令后
			res = super.after(ComCode);
			res = super.after(ComCode, null);
			}
			} catch (Exception e) {
			res = BaseResponseUtils.buildFail("服务端构造并向通信中间件发送请求时异常" + (e.getMessage() == null ? "" : e.getMessage()));
			@@ -121,7 +121,7 @@
			}

			@Override
			protected String createRtnMsg(String code, JSONObject resultData){
			protected String dealComResult(String code, JSONObject resultData, Callback callback){
			String msg;
			if(resultData != null){
			JSONObject codeData = resultData.getJSONObject("data") ;