From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VaccinesApi.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VaccinesApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VaccinesApi.java
index e7995c7..390be52 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VaccinesApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VaccinesApi.java
@@ -1,5 +1,12 @@
package com.panzhihua.applets.api;
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAppDTO;
import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollUserByAppDTO;
@@ -9,15 +16,10 @@
import com.panzhihua.common.model.vos.vaccines.VaccinesEnrollUserByAppVO;
import com.panzhihua.common.model.vos.vaccines.VaccinesUserInoculationByAppVO;
import com.panzhihua.common.service.community.CommunityService;
+
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
/**
* @auther lyq
@@ -28,22 +30,22 @@
@RestController
@RequestMapping("/vaccines/")
@Api(tags = {"疫苗服务"})
-public class VaccinesApi extends BaseController{
+public class VaccinesApi extends BaseController {
@Resource
private CommunityService communityService;
- @ApiOperation(value = "疫苗分类列表" , response = VaccinesByAppVO.class)
+ @ApiOperation(value = "疫苗分类列表", response = VaccinesByAppVO.class)
@PostMapping("list")
public R getVaccinesListByApp() {
return communityService.getVaccinesListByApp();
}
- @ApiOperation(value = "疫苗类型对应家庭成员接种列表" , response = VaccinesEnrollUserByAppVO.class)
+ @ApiOperation(value = "疫苗类型对应家庭成员接种列表", response = VaccinesEnrollUserByAppVO.class)
@PostMapping("user/list")
public R getVaccinesUserListByApp(@RequestBody VaccinesEnrollUserByAppDTO enrollUserByAppDTO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
- if(loginUserInfo == null){
+ if (loginUserInfo == null) {
return R.fail("请先登录");
}
enrollUserByAppDTO.setUserId(loginUserInfo.getUserId());
@@ -52,9 +54,9 @@
@ApiOperation(value = "用户疫苗报名")
@PostMapping("enroll")
- public R VaccinesEnrollByApp(@RequestBody VaccinesEnrollByAppDTO enrollByAppDTO){
+ public R VaccinesEnrollByApp(@RequestBody VaccinesEnrollByAppDTO enrollByAppDTO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
- if(loginUserInfo == null){
+ if (loginUserInfo == null) {
return R.fail("请先登录");
}
enrollByAppDTO.setUserId(loginUserInfo.getUserId());
@@ -62,11 +64,11 @@
return communityService.VaccinesEnrollByApp(enrollByAppDTO);
}
- @ApiOperation(value = "用户家庭接种记录" , response = VaccinesUserInoculationByAppVO.class)
+ @ApiOperation(value = "用户家庭接种记录", response = VaccinesUserInoculationByAppVO.class)
@PostMapping("user/inoculation/list")
public R getVaccinesUserInoculationListByApp() {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
- if(loginUserInfo == null){
+ if (loginUserInfo == null) {
return R.fail("请先登录");
}
return communityService.getVaccinesUserInoculationListByApp(loginUserInfo.getUserId());
--
Gitblit v1.7.1