From 8c6849d98fc168369d6de2d94d2f42a6d67cd9c5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 26 五月 2025 11:51:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/controller/UPWarnMsgAdptInfoController.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/controller/UPWarnMsgAdptInfoController.java b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/controller/UPWarnMsgAdptInfoController.java
index 8ee19d0..4f3ca64 100644
--- a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/controller/UPWarnMsgAdptInfoController.java
+++ b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/controller/UPWarnMsgAdptInfoController.java
@@ -1,5 +1,6 @@
package com.ruoyi.dataInterchange.controller;
+import com.alibaba.fastjson2.JSON;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.dataInterchange.api.vo.UPWarnMsgAdptInfoVo;
@@ -7,10 +8,9 @@
import com.ruoyi.dataInterchange.dao.UPWarnMsgUrgeTodoAckDao;
import com.ruoyi.dataInterchange.model.UPWarnMsgAdptInfo;
import com.ruoyi.dataInterchange.model.UPWarnMsgUrgeTodoAck;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.dataInterchange.util.haikang.model.SubscriptionEvent;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.ArrayList;
@@ -23,6 +23,7 @@
* @author zhibing.pu
* @Date 2025/4/2 10:08
*/
+@Slf4j
@RestController
@RequestMapping("/warnMsgAdptInfo")
public class UPWarnMsgAdptInfoController {
@@ -82,8 +83,13 @@
@PostMapping("/findByInfoId")
public R<UPWarnMsgAdptInfoVo> findByInfoId(@RequestParam("infoId") Integer infoId) {
UPWarnMsgAdptInfo warnMsgAdptInfo = upWarnMsgAdptInfoDao.findByInfoIdIs(infoId);
- UPWarnMsgAdptInfoVo vo = new UPWarnMsgAdptInfoVo();
- BeanUtils.copyProperties(warnMsgAdptInfo, vo);
- return R.ok(vo);
+ if(null != warnMsgAdptInfo){
+ UPWarnMsgAdptInfoVo vo = new UPWarnMsgAdptInfoVo();
+ BeanUtils.copyProperties(warnMsgAdptInfo, vo);
+ return R.ok(vo);
+ }
+ return R.ok();
}
+
+
}
--
Gitblit v1.7.1