feature(*): 修改人员站岗信息

- 修改人员站岗信息

feature(*): 修改人员站岗信息
- 修改人员站岗信息
张志伟
1 parent efdaf957
Showing 4 changed files with 87 additions and 10 deletions
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/dto/PubStandDTO.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-service/src/main/java/cn/fw/valhalla/service/bus/pub/PubStandBizService.java
+package cn.fw.valhalla.domain.dto;
+
+import cn.fw.common.validator.EnumValue;
+import cn.fw.valhalla.domain.enums.PubStandType;
+import lombok.Data;
+import org.hibernate.validator.constraints.ScriptAssert;
+
+import javax.validation.constraints.NotNull;
+import java.util.Objects;
+
+/**
+ * 公共池站岗
+ *
+ * @author : kurisu
+ * @version : 2.0
+ * @className : PubStandDTO
+ * @description : 公共池站岗
+ * @date : 2023-04-13 19:19
+ */
+@Data
+@ScriptAssert.List({
+        @ScriptAssert(lang = "javascript", script = "_this.checkMktNo()", message = "活动信息不能为空"),
+})
+public class PubStandDTO {
+    private Long id;
+    /**
+     * 站岗类型
+     */
+    @EnumValue(enumClass = PubStandType.class, message = "站岗类型不正确")
+    @NotNull(message = "站岗类型不能为空")
+    private Integer standType;
+    /**
+     * 站岗标识码「活动类型为活动编号」
+     */
+    private Long idCode;
+    /**
+     * 站岗范围
+     */
+    @EnumValue(enumClass = PubStandType.class, message = "站岗范围不正确")
+    @NotNull(message = "站岗范围不能为空")
+    private Integer standRang;
+
+    public boolean checkMktNo() {
+        if (PubStandType.ACTIVITY.getValue().equals(standType)) {
+            return Objects.nonNull(idCode) && idCode > 0;
+        }
+        return true;
+    }
+}
@@ -5,7 +5,6 @@ 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;
@@ -44,7 +43,6 @@ public class PubClueController {
     }
  
     @GetMapping("/log")
-    @IgnoreAuth
     @ControllerMethod("查看分配日志")
     public Message<List<PubPoolSimpleVO>> info(@CurrentUser final LoginAuthBean user) {
         return success(pubFollowBizService.log(user.getUserId(), user.getGroupId()));
@@ -5,17 +5,14 @@ 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.dto.PubStandDTO;
 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 org.springframework.web.bind.annotation.*;
  
 import static cn.fw.common.web.util.ResultBuilder.success;
  
@@ -42,14 +39,19 @@ public class PubStandController {
     }
  
     @GetMapping("/info")
-    @IgnoreAuth
     @ControllerMethod("人员站岗信息")
     public Message<PubStandVO> info(@CurrentUser final LoginAuthBean user) {
         return success(pubStandBizService.standInfo(user));
     }
  
+    @PostMapping("/update")
+    @ControllerMethod("人员站岗信息")
+    public Message<Void> update(@CurrentUser final LoginAuthBean user, @Validated @RequestBody PubStandDTO standDTO) {
+        pubStandBizService.updateInfo(user, standDTO);
+        return success();
+    }
+
     @PutMapping("/join")
-    @IgnoreAuth
     @ControllerMethod("加入站岗队列")
     public Message<Void> join(@CurrentUser final LoginAuthBean user) {
         pubStandBizService.join(user.getUserId());
@@ -57,7 +59,6 @@ public class PubStandController {
     }
  
     @PutMapping("/exit")
-    @IgnoreAuth
     @ControllerMethod("退出站岗队列")
     public Message<Void> exit(@CurrentUser final LoginAuthBean user) {
         pubStandBizService.exitStand(user.getUserId(), user.getGroupId());
@@ -7,6 +7,7 @@ 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.dto.PubStandDTO;
 import cn.fw.valhalla.domain.enums.PubStandRang;
 import cn.fw.valhalla.domain.enums.PubStandType;
 import cn.fw.valhalla.domain.vo.pool.PubStandVO;
@@ -99,6 +100,7 @@ public class PubStandBizService {
      * @param currentUser
      * @return
      */
+    @Transactional(rollbackFor = Exception.class)
     public PubStandVO standInfo(final LoginAuthBean currentUser) {
         final Long staffId = currentUser.getUserId();
         final Long groupId = currentUser.getGroupId();
@@ -126,6 +128,33 @@ public class PubStandBizService {
     }
  
     /**
+     * 查询用户站岗详情
+     *
+     * @param currentUser
+     * @param standDTO
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void updateInfo(final LoginAuthBean currentUser, final PubStandDTO standDTO) {
+        final Long staffId = currentUser.getUserId();
+        final Long groupId = currentUser.getGroupId();
+        final UserInfoDTO user = ehrRpcService.user(staffId);
+        BV.notNull(user, () -> "人员信息读取失败，请稍后重试");
+        PubStandStaffInfo staffInfo = null;
+        if (Objects.nonNull(standDTO.getId())) {
+            staffInfo = pubStandStaffInfoService.getById(standDTO.getId());
+        }
+        if (Objects.isNull(staffInfo)) {
+            staffInfo = pubStandStaffInfoService.queryStaffByGroupId(staffId, groupId).orElse(null);
+        }
+        BV.notNull(staffInfo, () -> "修改失败，请刷新后重试");
+        staffInfo.setStandType(PubStandType.ofValue(standDTO.getStandType()));
+        staffInfo.setStandRang(PubStandRang.ofValue(standDTO.getStandRang()));
+        staffInfo.setIdCode(standDTO.getIdCode());
+        pubStandStaffInfoService.updateById(staffInfo);
+    }
+
+    /**
      * 加入队列
      *
      * @param staffId