From c40be027ef8068b9a77bb24c94291dee25f563d8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 19 八月 2021 09:28:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/WorkGuideApi.java | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/WorkGuideApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/WorkGuideApi.java
index 41f3ea0..d7351a3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/WorkGuideApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/WorkGuideApi.java
@@ -1,14 +1,26 @@
package com.panzhihua.service_community.api;
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.constants.TokenConstant;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.exceptions.UnAuthenticationException;
+import com.panzhihua.common.model.dtos.community.ComActWorkGuideDTO;
import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActWorkGuideVO;
+import com.panzhihua.common.utlis.AES;
import com.panzhihua.service_community.service.ComActWorkGuideService;
+import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
/**
* @auther llming
@@ -17,29 +29,29 @@
@Slf4j
@RestController
@RequestMapping("/")
-public class WorkGuideApi {
+public class WorkGuideApi extends BaseController {
@Resource
private ComActWorkGuideService workGuideService;
/**
* 办事指南_新增
- * @param workGuideVO 新增信息
+ * @param workGuideDTO 新增信息
* @return 新增结果
*/
@PostMapping("addworkguide")
@Transactional(rollbackFor = Exception.class)
- public R addWorkGuide(@RequestBody ComActWorkGuideVO workGuideVO, @RequestParam("userId")Long userId) {
- return workGuideService.addWorkGuide(workGuideVO,userId);
+ public R addWorkGuide(@RequestBody ComActWorkGuideDTO workGuideDTO, @RequestParam("userId")Long userId) {
+ return workGuideService.addWorkGuide(workGuideDTO,userId);
}
/**
* 办事指南_编辑
- * @param workGuideVO
+ * @param workGuideDTO
* @return 编辑结果
*/
@PostMapping("editworkguide")
@Transactional(rollbackFor = Exception.class)
- public R putWorkGuide(@RequestBody ComActWorkGuideVO workGuideVO, @RequestParam("userId")Long userId) {
- return workGuideService.editWorkGuide(workGuideVO,userId);
+ public R putWorkGuide(@RequestBody ComActWorkGuideDTO workGuideDTO, @RequestParam("userId")Long userId) {
+ return workGuideService.editWorkGuide(workGuideDTO,userId);
}
/**
@@ -48,8 +60,8 @@
* @return 详情
*/
@GetMapping("detailworkguide")
- public R detailWorkGuide(@RequestParam("workGuideId")Long workGuideId) {
- return workGuideService.detailWorkGuide(workGuideId);
+ public R detailWorkGuide(@RequestParam("workGuideId")Long workGuideId , @RequestParam("conmunityId")Long conmunityId) {
+ return workGuideService.detailWorkGuide(workGuideId, conmunityId);
}
/**
--
Gitblit v1.7.1