From f8c25d1fab78aa4e0a6bdb10f91e61698af434c4 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 01 七月 2022 14:34:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/DemoServiceImpl.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/DemoServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/DemoServiceImpl.java
index 63fe037..16c5b6b 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/DemoServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/DemoServiceImpl.java
@@ -1,6 +1,10 @@
package com.gkhy.safePlatform.emergency.service.impl;
+import com.gkhy.safePlatform.commons.enums.ResultCodes;
+import com.gkhy.safePlatform.commons.vo.ResultVO;
+import com.gkhy.safePlatform.emergency.entity.DemoInfo;
import com.gkhy.safePlatform.emergency.service.DemoService;
+import com.gkhy.safePlatform.emergency.service.baseService.DemoInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -8,10 +12,18 @@
public class DemoServiceImpl implements DemoService {
@Autowired
- private DemoService demoService;
- // 1
+ private DemoInfoService demoInfoService;
- //2
-
- //返回的都是dto 到controller
+ @Override
+ public ResultVO<DemoInfo> getById(Long id) {
+ ResultVO<DemoInfo> resultVO = new ResultVO<>();
+ DemoInfo demoInfo = demoInfoService.getById(id);
+ if(demoInfo != null && demoInfo.getId() > 0){
+ resultVO.setCode(ResultCodes.OK.getCode());
+ resultVO.setData(demoInfo);
+ }else {
+ resultVO.setCode(ResultCodes.OK.getCode());
+ }
+ return resultVO;
+ }
}
--
Gitblit v1.9.2