feature(*): 公共池站岗联调

- 公共池站岗联调

feature(*): 公共池站岗联调
- 公共池站岗联调
张志伟
1 parent a4aa5516
Showing 13 changed files with 410 additions and 36 deletions
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/db/pub/PubStandStaffInfo.java
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/enums/PubStandType.java
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/vo/pool/PubPoolSimpleVO.java
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/vo/pool/PubStandVO.java
fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/app/PubClueController.java
fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/app/PubStandController.java
fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/PubFollowTask.java
fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/PubStandTask.java
fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/RoleChangeTask.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/component/consumer/FollowResultConsumer.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/pub/PubDistributeBizService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/pub/PubFollowBizService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/pub/PubStandBizService.java
@@ -23,7 +23,7 @@ public class PubStandStaffInfo extends BaseAuditableTimeEntity&lt;PubStandStaffInfo
      */
     private Long staffId;
     /**
-     * 是否处于排队中
+     * 是否处于排队中（即在队列中）
      */
     private Boolean lining;
     /**
@@ -19,7 +19,7 @@ public enum PubStandType implements IEnum&lt;Integer&gt; {
      */
     PUB(1),
     /**
-     * 活动
+     * 市场活动
      */
     ACTIVITY(2),
     ;
+package cn.fw.valhalla.domain.vo.pool;
+
+import cn.fw.valhalla.domain.db.pub.PubCluePool;
+import cn.fw.valhalla.domain.enums.PubStandType;
+import lombok.Data;
+
+import java.time.LocalDate;
+
+/**
+ * 公共池分配线索
+ *
+ * @author : kurisu
+ * @version : 2.0
+ * @className : PubPoolSimpleVO
+ * @description : 公共池分配线索
+ * @date : 2023-04-12 17:00
+ */
+@Data
+public class PubPoolSimpleVO {
+    /**
+     * 档案id
+     */
+    private String vin;
+    /**
+     * 车牌号
+     */
+    private String plateNo;
+    /**
+     * 车辆名称
+     */
+    private String carName;
+    /**
+     * 分配时间
+     */
+    private LocalDate startTime;
+    /**
+     * 来源类型
+     */
+    private PubStandType sourceType;
+    /**
+     * 集团id
+     */
+    private Long groupId;
+
+    public static PubPoolSimpleVO with(PubCluePool pool) {
+        PubPoolSimpleVO vo = new PubPoolSimpleVO();
+        vo.setVin(pool.getVin());
+        vo.setStartTime(pool.getStartTime());
+        vo.setSourceType(pool.getSourceType());
+        vo.setGroupId(pool.getGroupId());
+        return vo;
+    }
+}
+package cn.fw.valhalla.domain.vo.pool;
+
+import cn.fw.valhalla.domain.enums.PubStandRang;
+import cn.fw.valhalla.domain.enums.PubStandType;
+import lombok.Data;
+
+/**
+ * 公共池站岗
+ *
+ * @author : kurisu
+ * @version : 2.0
+ * @className : PubStandVO
+ * @description : 公共池站岗
+ * @date : 2023-04-12 15:17
+ */
+@Data
+public class PubStandVO {
+    private Long id;
+    /**
+     * 是否处于排队中（即在队列中）
+     */
+    private Boolean lining;
+    /**
+     * 是否可站岗
+     */
+    private Boolean queueable;
+    /**
+     * 不参与【员工主动设置】
+     */
+    private Boolean noInvolved;
+    /**
+     * 站岗类型
+     */
+    private PubStandType standType;
+    /**
+     * 站岗标识码「活动类型为活动编号」
+     */
+    private Long idCode;
+    /**
+     * 站岗范围
+     */
+    private PubStandRang standRang;
+    /**
+     * 停止排队的原因
+     */
+    private String reasonOfNoLining;
+}
+package cn.fw.valhalla.controller.app;
+
+import cn.fw.common.web.annotation.ControllerMethod;
+import cn.fw.common.web.auth.LoginAuthBean;
+import cn.fw.common.web.auth.annotation.CurrentUser;
+import cn.fw.data.base.domain.common.Message;
+import cn.fw.security.auth.client.annotation.Authorization;
+import cn.fw.security.auth.client.annotation.IgnoreAuth;
+import cn.fw.security.auth.client.enums.AuthType;
+import cn.fw.valhalla.domain.vo.pool.PubPoolSimpleVO;
+import cn.fw.valhalla.service.bus.pub.PubFollowBizService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+import static cn.fw.common.web.util.ResultBuilder.success;
+
+/**
+ * 公共站岗池
+ *
+ * @author : kurisu
+ * @version : 2.0
+ * @className : PubClueController
+ * @description : 公共站岗池
+ * @date : 2023-04-12 16:42
+ */
+@Slf4j
+@RestController
+@Authorization(AuthType.APP)
+@Validated
+@RequestMapping("/app/pub/pool")
+public class PubClueController {
+
+    private final PubFollowBizService pubFollowBizService;
+
+    @Autowired
+    public PubClueController(final PubFollowBizService pubFollowBizService) {
+        this.pubFollowBizService = pubFollowBizService;
+    }
+
+    @GetMapping("/log")
+    @IgnoreAuth
+    @ControllerMethod("查看分配日志")
+    public Message<List<PubPoolSimpleVO>> info(@CurrentUser final LoginAuthBean user) {
+        return success(pubFollowBizService.log(user.getUserId(), user.getGroupId()));
+    }
+}
+package cn.fw.valhalla.controller.app;
+
+import cn.fw.common.web.annotation.ControllerMethod;
+import cn.fw.common.web.auth.LoginAuthBean;
+import cn.fw.common.web.auth.annotation.CurrentUser;
+import cn.fw.data.base.domain.common.Message;
+import cn.fw.security.auth.client.annotation.Authorization;
+import cn.fw.security.auth.client.annotation.IgnoreAuth;
+import cn.fw.security.auth.client.enums.AuthType;
+import cn.fw.valhalla.domain.vo.pool.PubStandVO;
+import cn.fw.valhalla.service.bus.pub.PubStandBizService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import static cn.fw.common.web.util.ResultBuilder.success;
+
+/**
+ * 公共线索站岗
+ *
+ * @author : kurisu
+ * @version : 2.0
+ * @className : PubStandController
+ * @description : 公共线索站岗
+ * @date : 2023-04-12 14:41
+ */
+@Slf4j
+@RestController
+@Authorization(AuthType.APP)
+@Validated
+@RequestMapping("/app/pub/stand")
+public class PubStandController {
+    private final PubStandBizService pubStandBizService;
+
+    @Autowired
+    public PubStandController(final PubStandBizService pubStandBizService) {
+        this.pubStandBizService = pubStandBizService;
+    }
+
+    @GetMapping("/info")
+    @IgnoreAuth
+    @ControllerMethod("人员站岗信息")
+    public Message<PubStandVO> info(@CurrentUser final LoginAuthBean user) {
+        return success(pubStandBizService.standInfo(user));
+    }
+
+    @PutMapping("/join")
+    @IgnoreAuth
+    @ControllerMethod("加入站岗队列")
+    public Message<Void> join(@CurrentUser final LoginAuthBean user) {
+        pubStandBizService.join(user.getUserId());
+        return success();
+    }
+
+    @PutMapping("/exit")
+    @IgnoreAuth
+    @ControllerMethod("退出站岗队列")
+    public Message<Void> exit(@CurrentUser final LoginAuthBean user) {
+        pubStandBizService.exitStand(user.getUserId(), user.getGroupId());
+        return success();
+    }
+}
 package cn.fw.valhalla.controller.task;
  
 import cn.fw.valhalla.common.utils.StringUtils;
+import cn.fw.valhalla.domain.db.pub.PubCluePool;
+import cn.fw.valhalla.domain.enums.PublicClueStateEnum;
 import cn.fw.valhalla.service.bus.pub.PubFollowBizService;
+import cn.fw.valhalla.service.data.PubCluePoolService;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -31,14 +35,35 @@ import java.util.List;
 public class PubFollowTask {
     private final StringRedisTemplate stringRedisTemplate;
     private final PubFollowBizService pubFollowBizService;
+    private final PubCluePoolService pubCluePoolService;
     @Value("${spring.cache.custom.global-prefix}:role-change-need-close:clue")
     @Getter(AccessLevel.PRIVATE)
     private String roleChangeNeedCloseClueKey;
  
     public PubFollowTask(final StringRedisTemplate stringRedisTemplate,
-                         final PubFollowBizService pubFollowBizService) {
+                         final PubFollowBizService pubFollowBizService,
+                         final PubCluePoolService pubCluePoolService) {
         this.stringRedisTemplate = stringRedisTemplate;
         this.pubFollowBizService = pubFollowBizService;
+        this.pubCluePoolService = pubCluePoolService;
+    }
+
+    /**
+     * 开始任务
+     */
+    @Scheduled(initialDelay = 1000 * 10, fixedRate = 1000 * 10)
+    public void startClue() {
+        List<PubCluePool> list = pubCluePoolService.list(Wrappers.<PubCluePool>lambdaQuery()
+                .eq(PubCluePool::getState, PublicClueStateEnum.ONGOING)
+                .eq(PubCluePool::getBegun, Boolean.FALSE)
+                .last("limit 0, 500")
+        );
+        if (CollectionUtils.isEmpty(list)) {
+            return;
+        }
+        for (PubCluePool cluePool : list) {
+            pubFollowBizService.startClue(cluePool);
+        }
     }
  
     /**
@@ -5,6 +5,7 @@ import cn.fw.valhalla.common.utils.StringUtils;
 import cn.fw.valhalla.rpc.oop.OopService;
 import cn.fw.valhalla.rpc.oop.dto.GroupDTO;
 import cn.fw.valhalla.service.bus.pub.PubDistributeBizService;
+import cn.fw.valhalla.service.bus.pub.PubStandBizService;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -41,6 +42,7 @@ import java.util.concurrent.TimeUnit;
 @RequiredArgsConstructor
 public class PubStandTask {
     private final PubDistributeBizService pubDistributeBizService;
+    private final PubStandBizService pubStandBizService;
     private final StringRedisTemplate redisTemplate;
     private final OopService oopService;
     private final DistributedLocker distributedLocker;
@@ -49,6 +51,14 @@ public class PubStandTask {
     private String keyPrefix;
  
     /**
+     * 重置状态
+     */
+    @Scheduled(cron = "0 30 0 * * *")
+    public void resetStatus() {
+        pubStandBizService.reset();
+    }
+
+    /**
      * 执行分配
      */
     @Scheduled(initialDelay = 1000 * 10, fixedRate = 1000 * 5)
@@ -8,6 +8,7 @@ import cn.fw.valhalla.domain.enums.LeaveReasonEnum;
 import cn.fw.valhalla.domain.enums.LeaveTodoTypeEnum;
 import cn.fw.valhalla.service.bus.LeaveNeedDoBizService;
 import cn.fw.valhalla.service.bus.pub.PubFollowBizService;
+import cn.fw.valhalla.service.bus.pub.PubStandBizService;
 import com.alibaba.fastjson.JSONObject;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -38,6 +39,7 @@ public class RoleChangeTask {
     private final LeaveNeedDoBizService leaveNeedDoBizService;
     private final StringRedisTemplate redisTemplate;
     private final PubFollowBizService pubFollowBizService;
+    private final PubStandBizService pubStandBizService;
  
     @Value("${spring.cache.custom.global-prefix}:mq:role")
     @Getter
@@ -50,10 +52,12 @@ public class RoleChangeTask {
     @Autowired
     public RoleChangeTask(final LeaveNeedDoBizService leaveNeedDoBizService,
                           final StringRedisTemplate redisTemplate,
-                          final PubFollowBizService pubFollowBizService) {
+                          final PubFollowBizService pubFollowBizService,
+                          final PubStandBizService pubStandBizService) {
         this.leaveNeedDoBizService = leaveNeedDoBizService;
         this.redisTemplate = redisTemplate;
         this.pubFollowBizService = pubFollowBizService;
+        this.pubStandBizService = pubStandBizService;
     }
  
  
@@ -71,6 +75,7 @@ public class RoleChangeTask {
             }
             try {
                 CompletableFuture.runAsync(() -> pubFollowBizService.onRoleChange(roleChangeDTO.getUserId(), roleChangeDTO.getShopId()));
+                pubStandBizService.removeStand(roleChangeDTO.getUserId(), roleChangeDTO.getShopId());
                 leaveNeedDoBizService.addLeaveTodo(createDb(roleChangeDTO.getUserId(), roleChangeDTO.getShopId(), roleChangeDTO.getUserName()));
             } catch (Exception e) {
                 if (StringUtils.isValid(jsonStr)) {
@@ -4,6 +4,7 @@ import cn.fw.shirasawa.sdk.enums.DataTypeEnum;
 import cn.fw.shirasawa.sdk.mq.FollowResultDTO;
 import cn.fw.valhalla.domain.db.follow.FollowClue;
 import cn.fw.valhalla.service.bus.follow.FollowBizService;
+import cn.fw.valhalla.service.bus.pub.PubStandBizService;
 import cn.fw.valhalla.service.data.FollowClueService;
 import cn.hutool.core.collection.ListUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -31,13 +32,16 @@ public class FollowResultConsumer implements RocketMQListener&lt;FollowResultDTO&gt; {
  
     private final FollowBizService followBizService;
     private final FollowClueService followClueService;
+    private final PubStandBizService pubStandBizService;
  
  
     @Autowired
     public FollowResultConsumer(final FollowBizService followBizService,
-                                final FollowClueService followClueService) {
+                                final FollowClueService followClueService,
+                                final PubStandBizService pubStandBizService) {
         this.followBizService = followBizService;
         this.followClueService = followClueService;
+        this.pubStandBizService = pubStandBizService;
     }
  
     @Override
@@ -55,6 +59,7 @@ public class FollowResultConsumer implements RocketMQListener&lt;FollowResultDTO&gt; {
             if (!validSet.contains(dto.getType())) {
                 return;
             }
+            pubStandBizService.join(dto.getUserId(), false);
             Long val = Long.valueOf(dto.getDetailId());
             FollowClue clue = followClueService.getById(val);
             if (Objects.isNull(clue)) {
@@ -91,7 +91,14 @@ public class PubDistributeBizService {
             pubStandStaffInfoService.updateById(staffInfo);
             return true;
         }
-        return distribute(staffInfo, count);
+        Boolean distributed = distribute(staffInfo, count);
+        if (Boolean.TRUE.equals(distributed)) {
+            staffInfo.setLining(false);
+            staffInfo.setQueueable(false);
+            staffInfo.setReasonOfNoLining("有未完成的跟进待办,暂停分配");
+            pubStandStaffInfoService.updateById(staffInfo);
+        }
+        return distributed;
     }
  
     /**
@@ -107,7 +114,7 @@ public class PubDistributeBizService {
         if (Boolean.TRUE.equals(aBoolean)) {
             staffInfo.setLining(false);
             staffInfo.setQueueable(false);
-            staffInfo.setReasonOfNoLining("有未完成的跟进待办");
+            staffInfo.setReasonOfNoLining("有未完成的跟进待办,暂停分配");
             pubStandStaffInfoService.updateById(staffInfo);
             return false;
         }
@@ -140,7 +147,7 @@ public class PubDistributeBizService {
     }
  
     /**
-     * 查询分配数量
+     * 查询可分配数量
      *
      * @param userId
      * @param groupId
@@ -165,7 +172,6 @@ public class PubDistributeBizService {
             List<PubCluePool> list = pubCluePoolService.list(Wrappers.<PubCluePool>lambdaQuery()
                     .eq(PubCluePool::getGroupId, groupId)
                     .eq(PubCluePool::getAdviserId, userId)
-                    .eq(PubCluePool::getBegun, Boolean.TRUE)
                     .ge(PubCluePool::getStartTime, LocalDate.now().minusDays(60L).atStartOfDay())
             );
  
 package cn.fw.valhalla.service.bus.pub;
  
+import cn.fw.valhalla.common.utils.StringUtils;
 import cn.fw.valhalla.domain.db.customer.Customer;
 import cn.fw.valhalla.domain.db.customer.CustomerBaseInfo;
 import cn.fw.valhalla.domain.db.follow.ClueTask;
 import cn.fw.valhalla.domain.db.pool.PublicPool;
 import cn.fw.valhalla.domain.db.pub.PubCluePool;
 import cn.fw.valhalla.domain.enums.*;
+import cn.fw.valhalla.domain.vo.pool.PubPoolSimpleVO;
 import cn.fw.valhalla.rpc.oop.OopService;
 import cn.fw.valhalla.rpc.oop.dto.ShopDTO;
 import cn.fw.valhalla.service.bus.follow.strategy.impl.PubFollowStrategy;
-import cn.fw.valhalla.service.bus.setting.SettingBizService;
 import cn.fw.valhalla.service.data.*;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AccessLevel;
@@ -24,9 +25,12 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
  
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
  
 import static cn.fw.common.businessvalidator.Validator.BV;
  
@@ -47,7 +51,6 @@ public class PubFollowBizService {
     private final StammkundePoolService stammkundePoolService;
     private final CustomerService customerService;
     private final CustomerBaseInfoService customerBaseInfoService;
-    private final SettingBizService settingBizService;
     private final ClueTaskService clueTaskService;
     private final StringRedisTemplate stringRedisTemplate;
     private final OopService oopService;
@@ -66,7 +69,6 @@ public class PubFollowBizService {
                                final StammkundePoolService stammkundePoolService,
                                final CustomerService customerService,
                                final CustomerBaseInfoService customerBaseInfoService,
-                               final SettingBizService settingBizService,
                                final ClueTaskService clueTaskService,
                                final StringRedisTemplate stringRedisTemplate,
                                final OopService oopService,
@@ -76,7 +78,6 @@ public class PubFollowBizService {
         this.stammkundePoolService = stammkundePoolService;
         this.customerService = customerService;
         this.customerBaseInfoService = customerBaseInfoService;
-        this.settingBizService = settingBizService;
         this.clueTaskService = clueTaskService;
         this.stringRedisTemplate = stringRedisTemplate;
         this.oopService = oopService;
@@ -105,6 +106,7 @@ public class PubFollowBizService {
  
     /**
      * 开始线索
+     *
      * @param pool
      */
     @Transactional(rollbackFor = Exception.class)
@@ -115,6 +117,46 @@ public class PubFollowBizService {
     }
  
     /**
+     * 查询最近分配的20条线索
+     *
+     * @param userId
+     * @param groupId
+     * @return
+     */
+    public List<PubPoolSimpleVO> log(Long userId, Long groupId) {
+        List<PubCluePool> list = pubCluePoolService.list(Wrappers.<PubCluePool>lambdaQuery()
+                .eq(PubCluePool::getAdviserId, userId)
+                .eq(PubCluePool::getGroupId, groupId)
+                .orderByDesc(PubCluePool::getStartTime)
+                .last(" limit 20")
+        );
+        if (CollectionUtils.isEmpty(list)) {
+            return new ArrayList<>();
+        }
+        List<PubPoolSimpleVO> simpleList = list.stream()
+                .map(PubPoolSimpleVO::with).collect(Collectors.toList());
+        CompletableFuture<Void>[] futureArr = simpleList.stream()
+                .map(pool -> CompletableFuture.runAsync(() -> {
+                    Customer customer = customerService.queryByFrameNo(pool.getVin(), pool.getGroupId());
+                    if (Objects.nonNull(customer)) {
+                        pool.setPlateNo(customer.getPlateNo());
+                        String brandName = StringUtils.isEmpty(customer.getBrandName()) ? "" : customer.getBrandName() + " ";
+                        String seriesName = StringUtils.isEmpty(customer.getSeriesName()) ? "" : customer.getSeriesName() + " ";
+                        String specName = StringUtils.isEmpty(customer.getSpecName()) ? "" : customer.getSpecName();
+                        String carName = String.format("%s%s%s", brandName, seriesName, specName);
+                        pool.setCarName(carName);
+                    }
+                })).<CompletableFuture<Void>>toArray(CompletableFuture[]::new);
+
+        try {
+            CompletableFuture.allOf(futureArr);
+        } catch (Exception e) {
+            log.error("数据查询失败", e);
+        }
+        return simpleList;
+    }
+
+    /**
      * 角色变动结束线索
      *
      * @param id
@@ -2,12 +2,14 @@ package cn.fw.valhalla.service.bus.pub;
  
 import cn.fw.common.exception.BusinessException;
 import cn.fw.common.web.annotation.DisLock;
+import cn.fw.common.web.auth.LoginAuthBean;
 import cn.fw.erp.sdk.api.result.UserRoleDataRange;
 import cn.fw.valhalla.common.constant.RoleCode;
 import cn.fw.valhalla.common.utils.DateUtil;
 import cn.fw.valhalla.domain.db.pub.PubStandStaffInfo;
 import cn.fw.valhalla.domain.enums.PubStandRang;
 import cn.fw.valhalla.domain.enums.PubStandType;
+import cn.fw.valhalla.domain.vo.pool.PubStandVO;
 import cn.fw.valhalla.rpc.ehr.EhrRpcService;
 import cn.fw.valhalla.rpc.erp.UserRoleRpcService;
 import cn.fw.valhalla.rpc.erp.dto.UserInfoDTO;
@@ -16,7 +18,7 @@ import cn.fw.valhalla.rpc.oop.dto.GroupDTO;
 import cn.fw.valhalla.rpc.oop.dto.ShopDTO;
 import cn.fw.valhalla.rpc.shirasawa.ShirasawaRpcService;
 import cn.fw.valhalla.service.data.PubStandStaffInfoService;
-import lombok.AccessLevel;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -60,7 +62,7 @@ public class PubStandBizService {
     private final PlatformTransactionManager platformTransactionManager;
     private final TransactionDefinition transactionDefinition;
     @Value("${spring.cache.custom.global-prefix}:stand:pub")
-    @Getter(AccessLevel.PRIVATE)
+    @Getter
     private String keyPrefix;
  
     /**
@@ -92,28 +94,71 @@ public class PubStandBizService {
     }
  
     /**
+     * 查询用户站岗详情
+     *
+     * @param currentUser
+     * @return
+     */
+    public PubStandVO standInfo(final LoginAuthBean currentUser) {
+        final Long staffId = currentUser.getUserId();
+        final Long groupId = currentUser.getGroupId();
+        final UserInfoDTO user = ehrRpcService.user(staffId);
+        BV.notNull(user, () -> "人员信息读取失败，请稍后重试");
+        List<UserRoleDataRange> range = userRoleRpcService.getUserRoleDataRange(staffId, RoleCode.FWGW);
+        BV.notNull(range, () -> "非服务顾问无法站岗");
+        UserRoleDataRange dataRange = range.get(0);
+        final Long shopId = dataRange.getRangeValue();
+        ShopDTO shop = oopService.shop(shopId);
+        BV.notNull(shop, () -> "门店信息读取失败，请稍后重试");
+        final String shopName = shop.getShortName();
+        final String cityBh = shop.getCityBh();
+
+        Optional<PubStandStaffInfo> staffInfo = pubStandStaffInfoService.queryStaffByGroupId(staffId, groupId);
+        PubStandStaffInfo info = staffInfo.orElseGet(() -> this.generateStandInfo(user));
+        if (Objects.isNull(info.getId())) {
+            info.setShopId(shopId)
+                    .setAreaCode(cityBh)
+                    .setShopName(shopName)
+                    .setQueueable(Boolean.TRUE);
+            pubStandStaffInfoService.save(info);
+        }
+        return createVo(info);
+    }
+
+    /**
      * 加入队列
      *
      * @param staffId
      */
+    @DisLock(prefix = "#this.getKeyPrefix()", key = "#staffId", message = "请勿重复站岗")
     public void join(final Long staffId) {
         this.join(staffId, true);
     }
  
     /**
+     * 重置状态
+     */
+    public void reset() {
+        pubStandStaffInfoService.update(Wrappers.<PubStandStaffInfo>lambdaUpdate()
+                .set(PubStandStaffInfo::getNoInvolved, Boolean.FALSE)
+                .gt(PubStandStaffInfo::getStaffId, 0)
+        );
+    }
+
+    /**
      * 加入队列
      *
      * @param staffId
+     * @param manual  手动站岗
      */
-    @DisLock(prefix = "#this.getKeyPrefix()", key = "#staffId", message = "请勿重复站岗")
-    public boolean join(final Long staffId, final boolean throwError) {
+    public boolean join(final Long staffId, final boolean manual) {
         TransactionStatus transactionStatus = platformTransactionManager.getTransaction(transactionDefinition);
         try {
             final UserInfoDTO user = ehrRpcService.user(staffId);
             BV.notNull(user, () -> "人员信息读取失败，请稍后重试");
             List<UserRoleDataRange> range = userRoleRpcService.getUserRoleDataRange(staffId, RoleCode.FWGW);
             if (CollectionUtils.isEmpty(range)) {
-                if (throwError) {
+                if (manual) {
                     throw new BusinessException("非服务顾问无法站岗");
                 }
                 return false;
@@ -123,21 +168,26 @@ public class PubStandBizService {
             ShopDTO shop = oopService.shop(shopId);
             BV.notNull(shop, () -> "门店信息读取失败，请稍后重试");
             final String shopName = shop.getShortName();
-            boolean hasTodo = Boolean.FALSE.equals(shirasawaRpcService.hasOngoingFollow(staffId));
-            if (hasTodo && throwError) {
-                throw new BusinessException("还有未完成的跟进待办,无法站岗");
-            }
+            final String cityBh = shop.getCityBh();
             final Long groupId = user.getGroupId();
             Optional<PubStandStaffInfo> staffInfo = pubStandStaffInfoService.queryStaffByGroupId(staffId, groupId);
             PubStandStaffInfo info = staffInfo.orElseGet(() -> this.generateStandInfo(user))
                     .setShopId(shopId)
-                    .setShopName(shopName)
-                    .setLining(Boolean.TRUE)
-                    .setQueueable(Boolean.TRUE);
-            if (hasTodo) {
+                    .setAreaCode(cityBh)
+                    .setShopName(shopName);
+            if (manual) {
+                info.setNoInvolved(Boolean.FALSE);
+            }
+            boolean notodo = Boolean.FALSE.equals(shirasawaRpcService.hasOngoingFollow(staffId));
+            if (!notodo && Boolean.FALSE.equals(info.getNoInvolved())) {
                 info.setLining(Boolean.FALSE);
+                info.setQueueable(Boolean.FALSE);
+                info.setReasonOfNoLining("还有未完成的跟进待办,暂停分配");
                 pubStandStaffInfoService.saveOrUpdate(info);
             } else {
+                info.setLining(Boolean.TRUE);
+                info.setQueueable(Boolean.TRUE);
+                info.setReasonOfNoLining("");
                 this.join(info);
             }
             platformTransactionManager.commit(transactionStatus);
@@ -159,7 +209,8 @@ public class PubStandBizService {
         Optional<PubStandStaffInfo> staffInfo = pubStandStaffInfoService.queryStaffByGroupId(userId, groupId);
         staffInfo.ifPresent(r -> {
             r.setLining(Boolean.FALSE);
-            r.setNoInvolved(Boolean.FALSE);
+            r.setNoInvolved(Boolean.TRUE);
+            r.setQueueable(Boolean.FALSE);
             r.setReasonOfNoLining("主动退出");
             boolean updated = pubStandStaffInfoService.updateById(r);
             if (updated) {
@@ -169,20 +220,20 @@ public class PubStandBizService {
     }
  
     /**
-     * 退出队列
+     * 删除人员队列信息
      *
      * @param userId
-     * @param groupId
+     * @param shopId
      */
     @Transactional(rollbackFor = Exception.class)
-    public void exitStand(final Long userId, final Long groupId, final String reason) {
+    public void removeStand(final Long userId, Long shopId) {
+        ShopDTO shop = oopService.shop(shopId);
+        BV.notNull(shop, () -> "门店信息读取失败，请稍后重试");
+        Long groupId = shop.getGroupId();
         Optional<PubStandStaffInfo> staffInfo = pubStandStaffInfoService.queryStaffByGroupId(userId, groupId);
         staffInfo.ifPresent(r -> {
-            r.setLining(Boolean.FALSE);
-            r.setNoInvolved(Boolean.FALSE);
-            r.setReasonOfNoLining(reason);
-            boolean updated = pubStandStaffInfoService.updateById(r);
-            if (updated) {
+            boolean removed = pubStandStaffInfoService.removeById(r.getId());
+            if (removed) {
                 CompletableFuture.runAsync(() -> syncQueue(groupId));
             }
         });
@@ -213,7 +264,6 @@ public class PubStandBizService {
                 return;
             }
         }
-        info.setLining(Boolean.TRUE);
         pubStandStaffInfoService.saveOrUpdate(info);
         ops.rightPush(id);
         Date ashita = DateUtil.localDateTime2Date(LocalDate.now().plusDays(1).atStartOfDay().plusHours(1L));
@@ -241,4 +291,17 @@ public class PubStandBizService {
         String day = MonthDay.now().toString().replace("-", "");
         return String.format("%s:%s:%s", getKeyPrefix(), day, groupId);
     }
+
+    private PubStandVO createVo(PubStandStaffInfo staffInfo) {
+        PubStandVO vo = new PubStandVO();
+        vo.setId(staffInfo.getId());
+        vo.setLining(staffInfo.getLining());
+        vo.setQueueable(staffInfo.getQueueable());
+        vo.setNoInvolved(staffInfo.getNoInvolved());
+        vo.setStandType(staffInfo.getStandType());
+        vo.setIdCode(staffInfo.getIdCode());
+        vo.setStandRang(staffInfo.getStandRang());
+        vo.setReasonOfNoLining(staffInfo.getReasonOfNoLining());
+        return vo;
+    }
 }