|
@@ -1,10 +1,12 @@
|
|
|
package com.ruoyi.demo.controller;
|
|
|
|
|
|
+import cn.dev33.satoken.stp.StpUtil;
|
|
|
import com.github.pagehelper.PageInfo;
|
|
|
|
|
|
import com.ruoyi.common.core.domain.R;
|
|
|
import com.ruoyi.demo.entity.bo.AttentionPoolBo;
|
|
|
import com.ruoyi.demo.entity.bo.AttentionPoolStatisticsBo;
|
|
|
+import com.ruoyi.demo.entity.bo.WorkTableBo;
|
|
|
import com.ruoyi.demo.entity.vo.AddFollowRecordVo;
|
|
|
import com.ruoyi.demo.entity.vo.TurnBusinessOpportunitiesVo;
|
|
|
import com.ruoyi.demo.entity.vo.WorkTableSearchVo;
|
|
@@ -32,23 +34,27 @@ public class WorkTableController {
|
|
|
|
|
|
// 获取数据概览
|
|
|
@GetMapping("/databack/about")
|
|
|
- public R about(){
|
|
|
+ public R about(@RequestBody WorkTableBo vo){
|
|
|
// 获取用户id
|
|
|
- String userId = "1";
|
|
|
+ String loginId = String.valueOf(StpUtil.getLoginId());
|
|
|
+ Long userid = Long.valueOf(loginId.split(":")[1]);
|
|
|
+ String userId = userid.toString();
|
|
|
if (userId == null || userId.equals(""))
|
|
|
return R.fail("请登录");
|
|
|
- AttentionPoolStatisticsBo bo = databackService.searchAbout(userId);
|
|
|
+ AttentionPoolStatisticsBo bo = databackService.searchAbout(userId,vo);
|
|
|
return R.ok(bo);
|
|
|
}
|
|
|
|
|
|
// 获取客户数量变化趋势
|
|
|
@GetMapping("/databack/trend")
|
|
|
- public R trend(){
|
|
|
+ public R trend(String condition){
|
|
|
// 获取用户id
|
|
|
- String userId = "1";
|
|
|
+ String loginId = String.valueOf(StpUtil.getLoginId());
|
|
|
+ Long userid = Long.valueOf(loginId.split(":")[1]);
|
|
|
+ String userId = userid.toString();
|
|
|
if (userId == null || userId.equals(""))
|
|
|
return R.fail("请登录");
|
|
|
- List<AttentionPoolStatisticsBo> bos = databackService.searchTrand(userId);
|
|
|
+ List<AttentionPoolStatisticsBo> bos = databackService.searchTrand(userId,condition);
|
|
|
return R.ok(bos);
|
|
|
}
|
|
|
|
|
@@ -56,7 +62,9 @@ public class WorkTableController {
|
|
|
@PostMapping("/pool/list")
|
|
|
public R poolList(WorkTableSearchVo workTableSearchVo){
|
|
|
// 获取用户id
|
|
|
- String userId = "1";
|
|
|
+ String loginId = String.valueOf(StpUtil.getLoginId());
|
|
|
+ Long userid = Long.valueOf(loginId.split(":")[1]);
|
|
|
+ String userId = userid.toString();
|
|
|
if (userId == null || userId.equals(""))
|
|
|
return R.fail("请登录");
|
|
|
PageInfo<List<AttentionPoolBo>> listPageInfo = attentionPoolService.searchList(workTableSearchVo, userId);
|
|
@@ -67,7 +75,9 @@ public class WorkTableController {
|
|
|
@DeleteMapping("/pool")
|
|
|
public R cancel(String attentionId){
|
|
|
// 获取用户id
|
|
|
- String userId = "1";
|
|
|
+ String loginId = String.valueOf(StpUtil.getLoginId());
|
|
|
+ Long userid = Long.valueOf(loginId.split(":")[1]);
|
|
|
+ String userId = userid.toString();
|
|
|
if (userId == null || userId.equals(""))
|
|
|
return R.fail("请登录");
|
|
|
if (attentionId == null || attentionId.equals(""))
|
|
@@ -82,7 +92,9 @@ public class WorkTableController {
|
|
|
@PostMapping("/pool")
|
|
|
public R turn(TurnBusinessOpportunitiesVo turnVo){
|
|
|
// 获取用户id
|
|
|
- String userId = "1";
|
|
|
+ String loginId = String.valueOf(StpUtil.getLoginId());
|
|
|
+ Long userid = Long.valueOf(loginId.split(":")[1]);
|
|
|
+ String userId = userid.toString();
|
|
|
if (userId == null || userId.equals(""))
|
|
|
return R.fail("请登录");
|
|
|
int flag = attentionPoolService.turnBusinessOpportunities(turnVo, userId);
|
|
@@ -97,7 +109,9 @@ public class WorkTableController {
|
|
|
@PostMapping("/clue/list")
|
|
|
public R clueList(WorkTableSearchVo vo){
|
|
|
// 获取用户id
|
|
|
- String userId = "1";
|
|
|
+ String loginId = String.valueOf(StpUtil.getLoginId());
|
|
|
+ Long userid = Long.valueOf(loginId.split(":")[1]);
|
|
|
+ String userId = userid.toString();
|
|
|
if (userId == null || userId.equals(""))
|
|
|
return R.fail("请登录");
|
|
|
return R.ok(businessOpportunitiesService.searchList(vo,userId));
|
|
@@ -107,7 +121,9 @@ public class WorkTableController {
|
|
|
@PostMapping("/follow/list")
|
|
|
public R followList(WorkTableSearchVo vo){
|
|
|
// 获取用户id
|
|
|
- String userId = "1";
|
|
|
+ String loginId = String.valueOf(StpUtil.getLoginId());
|
|
|
+ Long userid = Long.valueOf(loginId.split(":")[1]);
|
|
|
+ String userId = userid.toString();
|
|
|
if (userId == null || userId.equals(""))
|
|
|
return R.fail("请登录");
|
|
|
return R.ok(businessOpportunitiesService.searchFollowList(vo,userId));
|
|
@@ -117,7 +133,9 @@ public class WorkTableController {
|
|
|
@PostMapping("/follow")
|
|
|
public R followAdd(AddFollowRecordVo addVo){
|
|
|
// 获取用户id
|
|
|
- String userId = "1";
|
|
|
+ String loginId = String.valueOf(StpUtil.getLoginId());
|
|
|
+ Long userid = Long.valueOf(loginId.split(":")[1]);
|
|
|
+ String userId = userid.toString();
|
|
|
if (userId == null || userId.equals(""))
|
|
|
return R.fail("请登录");
|
|
|
int flag = businessOpportunitiesService.addFollow(addVo, userId);
|
|
@@ -129,7 +147,9 @@ public class WorkTableController {
|
|
|
// 品牌关注
|
|
|
@PostMapping("/brand")
|
|
|
public R brandAttention(String brandId){
|
|
|
- String userId = "1";
|
|
|
+ String loginId = String.valueOf(StpUtil.getLoginId());
|
|
|
+ Long userid = Long.valueOf(loginId.split(":")[1]);
|
|
|
+ String userId = userid.toString();
|
|
|
if (userId == null || userId.equals(""))
|
|
|
return R.fail("请登录");
|
|
|
int flag = attentionPoolService.attentionBrand(brandId, userId);
|
|
@@ -146,7 +166,9 @@ public class WorkTableController {
|
|
|
// 品牌取消关注
|
|
|
@DeleteMapping("/brand")
|
|
|
public R brandCancel(String brandId){
|
|
|
- String userId = "1";
|
|
|
+ String loginId = String.valueOf(StpUtil.getLoginId());
|
|
|
+ Long userid = Long.valueOf(loginId.split(":")[1]);
|
|
|
+ String userId = userid.toString();
|
|
|
if (userId == null || userId.equals(""))
|
|
|
return R.fail("请登录");
|
|
|
int flag = attentionPoolService.cancelBrand(brandId, userId);
|
|
@@ -159,7 +181,9 @@ public class WorkTableController {
|
|
|
// 网点关注
|
|
|
@PostMapping("/wdInfo")
|
|
|
public R wdInfoAttention(String wdId){
|
|
|
- String userId = "1";
|
|
|
+ String loginId = String.valueOf(StpUtil.getLoginId());
|
|
|
+ Long userid = Long.valueOf(loginId.split(":")[1]);
|
|
|
+ String userId = userid.toString();
|
|
|
if (userId == null || userId.equals(""))
|
|
|
return R.fail("请登录");
|
|
|
int flag = attentionPoolService.attentionWdInfo(wdId,userId);
|
|
@@ -176,7 +200,9 @@ public class WorkTableController {
|
|
|
// 网点取消关注
|
|
|
@DeleteMapping("/wdInfo")
|
|
|
public R wdInfoCancel(String wdId){
|
|
|
- String userId = "1";
|
|
|
+ String loginId = String.valueOf(StpUtil.getLoginId());
|
|
|
+ Long userid = Long.valueOf(loginId.split(":")[1]);
|
|
|
+ String userId = userid.toString();
|
|
|
if (userId == null || userId.equals(""))
|
|
|
return R.fail("请登录");
|
|
|
int flag = attentionPoolService.cancelWdInfo(wdId, userId);
|