From 34981c30a78e8bbd7791131059a9210f9928b62c Mon Sep 17 00:00:00 2001
From: 刘光辉 <347230014@qq.com>
Date: 星期四, 17 九月 2026 09:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
jnpf-flowable/jnpf-flowable-controller/src/main/java/jnpf/flowable/controller/DelegateController.java | 303 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 303 insertions(+), 0 deletions(-)
diff --git a/jnpf-flowable/jnpf-flowable-controller/src/main/java/jnpf/flowable/controller/DelegateController.java b/jnpf-flowable/jnpf-flowable-controller/src/main/java/jnpf/flowable/controller/DelegateController.java
new file mode 100644
index 0000000..9085b63
--- /dev/null
+++ b/jnpf-flowable/jnpf-flowable-controller/src/main/java/jnpf/flowable/controller/DelegateController.java
@@ -0,0 +1,303 @@
+package jnpf.flowable.controller;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.google.common.collect.ImmutableList;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+import jnpf.base.ActionResult;
+import jnpf.base.UserInfo;
+import jnpf.base.controller.SuperController;
+import jnpf.base.vo.ListVO;
+import jnpf.base.vo.PageListVO;
+import jnpf.base.vo.PaginationVO;
+import jnpf.constant.MsgCode;
+import jnpf.exception.WorkFlowException;
+import jnpf.flowable.entity.DelegateEntity;
+import jnpf.flowable.entity.DelegateInfoEntity;
+import jnpf.flowable.model.candidates.CandidateUserVo;
+import jnpf.flowable.model.delegate.*;
+import jnpf.flowable.service.DelegateInfoService;
+import jnpf.flowable.service.DelegateService;
+import jnpf.flowable.util.ServiceUtil;
+import jnpf.util.JsonUtil;
+import jnpf.util.JsonUtilEx;
+import jnpf.util.StringUtil;
+import jnpf.util.UserProvider;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 绫荤殑鎻忚堪
+ *
+ * @author JNPF@YinMai Info. Co., Ltd
+ * @version 5.0.x
+ * @since 2024/5/13 17:27
+ */
+@Tag(name = "娴佺▼濮旀墭", description = "DelegateController")
+@RestController
+@RequestMapping("/delegate")
+@RequiredArgsConstructor
+public class DelegateController extends SuperController<DelegateService, DelegateEntity> {
+
+
+ private final ServiceUtil serviceUtil;
+
+
+ private final DelegateService delegateService;
+
+ private final DelegateInfoService delegateInfoService;
+
+ /**
+ * 鑾峰彇娴佺▼濮旀墭鍒楄〃
+ *
+ * @param pagination 鍒嗛〉鍙傛暟
+ */
+ @Operation(summary = "鑾峰彇娴佺▼濮旀墭鍒楄〃")
+ @GetMapping
+ public ActionResult<PageListVO<DelegateListVO>> list(DelegatePagination pagination) {
+ List<DelegateListVO> voList;
+ if (ObjectUtil.equals(pagination.getType(), 2) || ObjectUtil.equals(pagination.getType(), 4)) {
+ voList = delegateInfoService.getList(pagination);
+ } else {
+ voList = delegateService.getList(pagination);
+ }
+ PaginationVO paginationVO = JsonUtil.getJsonToBean(pagination, PaginationVO.class);
+ return ActionResult.page(voList, paginationVO);
+ }
+
+ /**
+ * 濮旀墭淇℃伅鍒楄〃
+ *
+ * @param delegateId 濮旀墭涓婚敭
+ */
+ @Operation(summary = "濮旀墭淇℃伅鍒楄〃")
+ @GetMapping("/Info/{delegateId}")
+ public ActionResult<Object> getDelegateInfo(@PathVariable("delegateId") String delegateId) {
+ List<DelegateInfoEntity> list = delegateInfoService.getList(delegateId);
+ return ActionResult.success(JsonUtil.getJsonToList(list, DelegateListVO.class));
+ }
+
+ /**
+ * 鑾峰彇娴佺▼濮旀墭淇℃伅
+ *
+ * @param id 涓婚敭
+ */
+ @Operation(summary = "鑾峰彇娴佺▼濮旀墭淇℃伅")
+ @GetMapping("/{id}")
+ public ActionResult<Object> info(@PathVariable("id") String id) throws WorkFlowException {
+ DelegateEntity entity = delegateService.getInfo(id);
+ if (null == entity) {
+ throw new WorkFlowException(MsgCode.FA001.get());
+ }
+ DelegateInfoVO vo = JsonUtilEx.getJsonToBeanEx(entity, DelegateInfoVO.class);
+ List<DelegateInfoEntity> infoList = delegateInfoService.getList(entity.getId());
+ if (CollUtil.isNotEmpty(infoList)) {
+ List<String> toUserNameList = infoList.stream().map(DelegateInfoEntity::getToUserName).collect(Collectors.toList());
+ vo.setToUserName(String.join(",", toUserNameList));
+ List<String> toUserIdList = infoList.stream().map(DelegateInfoEntity::getToUserId).collect(Collectors.toList());
+ vo.setToUserId(toUserIdList);
+ }
+ return ActionResult.success(vo);
+ }
+
+ /**
+ * 鏂板缓娴佺▼濮旀墭
+ *
+ * @param fo 鍙傛暟
+ */
+ @Operation(summary = "鏂板缓娴佺▼濮旀墭")
+ @PostMapping
+ public ActionResult<Object> create(@RequestBody @Valid DelegateCrForm fo) {
+ // 瓒呯鍜岀鐞嗗憳涓嶈兘鏂板濮旀墭/浠ｇ悊锛堝嵆锛氬彧鏈夋櫘閫氱敤鎴疯韩浠芥墠鑳芥柊寤哄鎵�/浠ｇ悊锛屾彁绀猴細鈥滅鐞嗗憳涓嶈兘鏂板缓濮旀墭/浠ｇ悊鈥濓級
+ if (!serviceUtil.isCommonUser(UserProvider.getLoginUserId())) {
+ return ActionResult.fail(MsgCode.WF130.get());
+ }
+ if (StringUtils.isBlank(fo.getUserId())) {
+ UserInfo userInfo = UserProvider.getUser();
+ fo.setUserId(userInfo.getUserId());
+ fo.setUserName(userInfo.getUserName() + "/" + userInfo.getUserAccount());
+ }
+ boolean isDelegate = ObjectUtil.equals(fo.getType(), "0");
+ if (fo.getToUserId().contains(fo.getUserId())) {
+ return ActionResult.fail(isDelegate ? MsgCode.WF017.get() : MsgCode.WF137.get());
+ }
+ // 鍙楁墭浜�/浠ｇ悊浜轰笉鑳介�夋嫨admin鍜屾湰浜�
+ List<String> toUserList = fo.getToUserId();
+ String admin = serviceUtil.getAdmin();
+ for (String toUser : toUserList) {
+ if (ObjectUtil.equals(toUser, admin)) {
+ return ActionResult.fail(MsgCode.WF131.get());
+ }
+ }
+ if (this.alreadyDelegate(fo, null)) {
+ return ActionResult.fail(isDelegate ? MsgCode.WF018.get() : MsgCode.WF144.get());
+ }
+ DelegateCrForm reverse = new DelegateCrForm();
+ BeanUtils.copyProperties(fo, reverse);
+ reverse.setUserIdList(fo.getToUserId());
+ reverse.setToUserId(ImmutableList.of(fo.getUserId()));
+ if (this.alreadyDelegate(reverse, null)) {
+ return ActionResult.fail(isDelegate ? MsgCode.WF019.get() : MsgCode.WF145.get());
+ }
+ delegateService.create(fo);
+ return ActionResult.success(MsgCode.SU001.get());
+ }
+
+ /**
+ * 鏇存柊娴佺▼濮旀墭
+ *
+ * @param id 涓婚敭
+ * @param fo 鍙傛暟
+ */
+ @Operation(summary = "鏇存柊娴佺▼濮旀墭")
+ @PutMapping("/{id}")
+ public ActionResult<Object> update(@PathVariable("id") String id, @RequestBody @Valid DelegateUpForm fo) throws WorkFlowException {
+ DelegateEntity entity = delegateService.getInfo(id);
+ if (null == entity) {
+ throw new WorkFlowException(MsgCode.FA001.get());
+ }
+ fo.setUserId(entity.getUserId());
+ boolean isDelegate = ObjectUtil.equals(fo.getType(), "0");
+ if (fo.getToUserId().contains(fo.getUserId())) {
+ return ActionResult.fail(isDelegate ? MsgCode.WF017.get() : MsgCode.WF137.get());
+ }
+ if (this.alreadyDelegate(fo, id)) {
+ return ActionResult.fail(isDelegate ? MsgCode.WF018.get() : MsgCode.WF144.get());
+ }
+ // 鍒ゆ柇鏄惁鏈変汉鎺ュ彈
+ List<DelegateInfoEntity> infoList = delegateInfoService.getList(id);
+ if (CollUtil.isNotEmpty(infoList)) {
+ DelegateInfoEntity delegateInfoEntity = infoList.stream().filter(e -> ObjectUtil.equals(e.getStatus(), 1)).findFirst().orElse(null);
+ if (null != delegateInfoEntity) {
+ return ActionResult.fail(MsgCode.WF132.get());
+ }
+ }
+ DelegateCrForm reverse = new DelegateCrForm();
+ BeanUtils.copyProperties(fo, reverse);
+ reverse.setUserIdList(fo.getToUserId());
+ reverse.setToUserId(ImmutableList.of(fo.getUserId()));
+ if (this.alreadyDelegate(reverse, id)) {
+ return ActionResult.fail(isDelegate ? MsgCode.WF019.get() : MsgCode.WF145.get());
+ }
+ if (delegateService.update(entity, fo)) {
+ return ActionResult.success(MsgCode.SU004.get());
+ }
+ return ActionResult.success(MsgCode.FA002.get());
+ }
+
+ // 鍒ゆ柇鏄惁宸叉湁濮旀墭
+ private boolean alreadyDelegate(DelegateCrForm form, String id) {
+ List<DelegateEntity> delegateEntities = new ArrayList<>();
+ if (CollUtil.isNotEmpty(form.getUserIdList())) {
+ for (String userId : form.getUserIdList()) {
+ form.setUserId(userId);
+ List<DelegateEntity> list = delegateService.selectSameParamAboutDelaget(form);
+ delegateEntities.addAll(list);
+ }
+ } else {
+ delegateEntities = delegateService.selectSameParamAboutDelaget(form);
+ }
+ for (DelegateEntity delegate : delegateEntities) {
+ if (delegate.getId().equals(id)) {
+ continue;
+ }
+ //鏃堕棿浜ゅ弶
+ if ((form.getStartTime() <= delegate.getStartTime().getTime() && form.getEndTime() >= delegate.getStartTime().getTime()) ||
+ (form.getStartTime() >= delegate.getStartTime().getTime() && form.getStartTime() <= delegate.getEndTime().getTime())) {
+ if (StringUtil.isEmpty(form.getFlowId())) {
+ return true;
+ } else {
+ if (StringUtil.isEmpty(delegate.getFlowId())) {
+ return true;
+ } else {
+ List<String> split = Arrays.asList(delegate.getFlowId().split(","));
+ List<String> split1 = Arrays.asList(form.getFlowId().split(","));
+ for (String srt : split) {
+ if (split1.contains(srt)) {
+ return true;
+ }
+ }
+ }
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
+ * 缁撴潫濮旀墭
+ *
+ * @param id 涓婚敭
+ */
+ @Operation(summary = "缁撴潫濮旀墭")
+ @PutMapping("/Stop/{id}")
+ public ActionResult<Object> stop(@PathVariable("id") String id) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(new Date());
+ calendar.add(Calendar.SECOND, -1);
+ Date date = calendar.getTime();
+ DelegateEntity entity = delegateService.getInfo(id);
+ if (null != entity) {
+ entity.setStartTime(date);
+ entity.setEndTime(date);
+ delegateService.updateStop(id, entity);
+ return ActionResult.success(MsgCode.SU008.get());
+ }
+ return ActionResult.fail(MsgCode.FA002.get());
+ }
+
+ /**
+ * 鍒犻櫎娴佺▼濮旀墭
+ *
+ * @param id 涓婚敭
+ */
+ @Operation(summary = "鍒犻櫎娴佺▼濮旀墭")
+ @DeleteMapping("/{id}")
+ public ActionResult<Object> delete(@PathVariable("id") String id) {
+ DelegateEntity entity = delegateService.getInfo(id);
+ if (null != entity) {
+ delegateService.delete(entity);
+ delegateInfoService.delete(entity.getId());
+ return ActionResult.success(MsgCode.SU003.get());
+ }
+ return ActionResult.fail(MsgCode.FA003.get());
+ }
+
+
+ /**
+ * 鑾峰彇濮旀墭浜�
+ * 鏍规嵁琚鎵樹汉鏌ヨ鍙彂璧风殑娴佺▼鍒楄〃
+ */
+ @Operation(summary = "鑾峰彇濮旀墭浜�")
+ @GetMapping("/UserList")
+ public ActionResult<Object> getUserListByFlowId(@RequestParam("templateId") String templateId) throws WorkFlowException {
+ ListVO<CandidateUserVo> userList = delegateService.getUserList(templateId);
+ return ActionResult.success(userList);
+ }
+
+ /**
+ * 纭
+ *
+ * @param id 濮旀墭淇℃伅涓婚敭
+ * @param type 绫诲瀷锛�1.鎺ュ彈 2.鎷掔粷
+ */
+ @Operation(summary = "纭")
+ @PostMapping("/Notarize/{id}")
+ public ActionResult<Object> accept(@PathVariable("id") String id, @RequestParam("type") Integer type) throws WorkFlowException {
+ DelegateInfoEntity delegateInfo = delegateInfoService.getById(id == null ? "" : id);
+ if (null == delegateInfo) {
+ throw new WorkFlowException(MsgCode.FA001.get());
+ }
+ delegateInfo.setStatus(type);
+ delegateService.notarize(delegateInfo);
+ return ActionResult.success(MsgCode.SU004.get());
+ }
+
+}
--
Gitblit v1.8.0