From 3fe9275853e50f6ac76d75a7ddd666150bacab23 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期六, 12 十一月 2022 17:26:58 +0800
Subject: [PATCH] token获取物业id处理
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java
index e34cf9c..0df398a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java
@@ -10,6 +10,7 @@
import com.panzhihua.common.model.vos.sanshuo.ComEventConciliationVO;
import com.panzhihua.common.model.vos.sanshuo.ComEventVO;
import com.panzhihua.common.model.vos.sanshuo.ComSanRequestVO;
+import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.CopyUtil;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.entity.ComEvent;
@@ -19,6 +20,7 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
@@ -29,6 +31,7 @@
import java.util.List;
import static java.util.Objects.isNull;
+import static java.util.Objects.nonNull;
/**
* ClassName ComEventController
@@ -45,6 +48,8 @@
@Resource
private IComEventService comEventService;
+ @Resource
+ private UserService userService;
/**
@@ -66,6 +71,9 @@
comEvent.setRequestUserId(loginUser.getUserId());
comEvent.setRequestUserName(loginUser.getName());
comEvent.setRequestUserTel(loginUser.getPhone());
+ if (isNull(comEventVO.getAppId())){
+ comEvent.setAppId(loginUser.getAppId());
+ }
return comEventService.insertComEvent(comEvent);
}
@@ -155,7 +163,11 @@
@PostMapping("/page")
public R page(@RequestBody ComEventVO comEventVO, Long pageNo, Long pageSize) {
Page pagination = new Page(pageNo, pageSize);
- ComEvent comEvent = CopyUtil.copyProperties(comEventVO, ComEvent.class);
+ ComEvent comEvent=new ComEvent();
+ BeanUtils.copyProperties(comEventVO, comEvent);
+ LoginUserInfoVO loginUserInfo = getLoginUserInfo();
+ String appId = loginUserInfo.getAppId();
+ comEvent.setAppId(appId);
return comEventService.pageByComEvent(comEvent, pagination,this.getLoginUserInfo());
}
@@ -316,8 +328,7 @@
@ApiOperation("事件各种状态(处理状态1待处理2待验证3专家已受理4专家未受理，拒绝5调解中6已结案归档7调解取消8 已删除)数据统计")
@GetMapping("/status/calculate")
public R calculate() {
- comEventService.calculate(getLoginUserInfo());
- return R.ok();
+ return comEventService.calculate(getLoginUserInfo());
}
/**
@@ -337,4 +348,22 @@
public R eventIndexData(@RequestParam Integer type) {
return comEventService.eventIndexData(type);
}
+
+
+ /**
+ *可选街道列表
+ * */
+ @GetMapping("/streetList")
+ public R getStreetId(){
+ return comEventService.listStreetScreen();
+ }
+
+ /**
+ *可选社区列表
+ * */
+ @GetMapping("/communityList")
+ public R getCommunityList(){
+ return comEventService.listCommunityScreen();
+ }
+
}
--
Gitblit v1.7.1