From 1ef7f7e09c462db0792fa0960da0bd5d2b119a93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Fri, 2 Aug 2024 11:14:54 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=9D=A5=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/api/PushWorkflowIntegrationAPI.java | 9 +++++++++ .../system/controller/SysUserController.java | 16 ++++++++++++---- .../com/jero/modules/system/entity/SysUser.java | 7 +++++++ .../service/impl/UnifiedTodoServiceImpl.java | 10 +++++++--- .../activiti/listener/MyGlobalEventListener.java | 6 ++++++ .../LawsMarketStandardDetailServiceImpl.java | 6 ++---- 6 files changed, 43 insertions(+), 11 deletions(-) diff --git a/laws-base/laws-base-core/src/main/java/com/jero/common/api/PushWorkflowIntegrationAPI.java b/laws-base/laws-base-core/src/main/java/com/jero/common/api/PushWorkflowIntegrationAPI.java index 2ba71ba1..c6f40b89 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/common/api/PushWorkflowIntegrationAPI.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/common/api/PushWorkflowIntegrationAPI.java @@ -20,4 +20,13 @@ public interface PushWorkflowIntegrationAPI { * @return*/ void sendTodoTask(List unifiedTodoVOList); + + /** + * @Author: + * @Date: 2023/10/13 15:12 + * @Description: 发送飞书 + * + * @return*/ + void sendTodoTaskByFeiShu(List unifiedTodoVOList); + } diff --git a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index e0c13171..8173ddad 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -189,7 +189,7 @@ public class SysUserController { String rsaPublicKey = jsonObject.getString(RSA_PUBLIC_KEY); String rsaPrivateKey = String.valueOf(redisUtil.get(rsaPublicKey)); SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class); - + user.setSource("1"); this.setUserInfo(rsaPrivateKey, user); // 保存用户走一个service 保证事务 @@ -288,10 +288,18 @@ public class SysUserController { if(StringUtils.isBlank(id)){ return Result.error("参数不识别！"); } - baseCommonService.addLog("删除用户，id： " +id ,CommonConstant.LOG_TYPE_2, 3); - this.sysUserService.deleteUser(id); - return Result.OK("删除用户成功"); + baseCommonService.addLog("删除用户，id： " +id ,CommonConstant.LOG_TYPE_2, 3); + // 验证是否为系统新增 + SysUser sysUser = sysUserService.getById(id); + if(Objects.isNull(sysUser)){ + return Result.error("数据不存在！"); } + if(!Objects.equals(sysUser.getSource(),"1")){ + return Result.error("数据不允许删除！"); + } + this.sysUserService.deleteUser(id); + return Result.OK("删除用户成功"); + } @PostMapping("/deleteBatch") @RequiresPermissions("sys:user:sel") diff --git a/laws-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java b/laws-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java index 7c9cad96..6692e215 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java @@ -264,6 +264,13 @@ public class SysUser implements Serializable { @ApiModelProperty(value = "飞书的id") private String feishuId; + /** + * 数据来源，1：系统新增 其他：IAM对接 + */ + @ApiModelProperty(value = "数据来源，1：系统新增 其他：IAM对接") + private String source; + + /** * 拼接真实姓名和工号形成唯一的用户信息可用户查看 * 不能用get开头，否则会造成初始化queryWrapper的bug diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/UnifiedTodoServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/UnifiedTodoServiceImpl.java index e1b9833f..9b995f38 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/UnifiedTodoServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/UnifiedTodoServiceImpl.java @@ -91,9 +91,6 @@ public class UnifiedTodoServiceImpl implements PushWorkflowIntegrationAPI { * @return*/ @Override public void sendTodoTask(List unifiedTodoVOList) { - // 发送飞书 - sendFeiShuService.sendTodoTask(unifiedTodoVOList); - if(!isWorkflow){ return; } @@ -118,6 +115,12 @@ public class UnifiedTodoServiceImpl implements PushWorkflowIntegrationAPI { } } + @Override + public void sendTodoTaskByFeiShu(List unifiedTodoVOList) { + // 发送飞书 + sendFeiShuService.sendTodoTask(unifiedTodoVOList); + } + private void push(String url, String jsonString, String title) { // 设置最大重试次数 int maxRetries = 3; @@ -251,6 +254,7 @@ public class UnifiedTodoServiceImpl implements PushWorkflowIntegrationAPI { unifiedTodo.setIsremark(isremark); unifiedTodo.setReceivets(String.valueOf(System.currentTimeMillis())); unifiedTodo.setRequestlevel("0"); + unifiedTodo.setViewtype("0"); unifiedTodoList.add(unifiedTodo); } return unifiedTodoList; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java index a2b82a7f..7394857e 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java @@ -195,6 +195,7 @@ public class MyGlobalEventListener implements ActivitiEventListener { unifiedTodoVO.setIsRemark(CommonConstant.TODO_TYPE_0); list.add(unifiedTodoVO); pushWorkflowIntegrationAPI.sendTodoTask(list); + pushWorkflowIntegrationAPI.sendTodoTaskByFeiShu(list); } private void taskAssigned(ActivitiEvent event) { @@ -225,6 +226,7 @@ public class MyGlobalEventListener implements ActivitiEventListener { unifiedTodoVO.setProcessDefinitionId(processDefinitionId); list.add(unifiedTodoVO); pushWorkflowIntegrationAPI.sendTodoTask(list); + pushWorkflowIntegrationAPI.sendTodoTaskByFeiShu(list); //更新转办任务id LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); @@ -237,6 +239,7 @@ public class MyGlobalEventListener implements ActivitiEventListener { unifiedTodoVO.setIsRemark(CommonConstant.TODO_TYPE_0); list.add(unifiedTodoVO); pushWorkflowIntegrationAPI.sendTodoTask(list); + pushWorkflowIntegrationAPI.sendTodoTaskByFeiShu(list); } } @@ -323,6 +326,7 @@ public class MyGlobalEventListener implements ActivitiEventListener { unifiedTodoVO.setIsRemark(CommonConstant.TODO_TYPE_2); list.add(unifiedTodoVO); pushWorkflowIntegrationAPI.sendTodoTask(list); + pushWorkflowIntegrationAPI.sendTodoTaskByFeiShu(list); } private void entityDeleted(ActivitiEvent event) { @@ -373,6 +377,7 @@ public class MyGlobalEventListener implements ActivitiEventListener { todoAddList.add(unifiedTodoVO); pushWorkflowIntegrationAPI.sendTodoTask(todoAddList); + pushWorkflowIntegrationAPI.sendTodoTaskByFeiShu(todoAddList); } @@ -464,6 +469,7 @@ public class MyGlobalEventListener implements ActivitiEventListener { list.add(unifiedTodoVO); } pushWorkflowIntegrationAPI.sendTodoTask(list); + pushWorkflowIntegrationAPI.sendTodoTaskByFeiShu(list); } log.info("id = " + execution.getId()); log.info("name = " + execution.getName()); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java index 6129d243..50a412cf 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java @@ -24,11 +24,11 @@ import com.jero.modules.laws.marketStandard.service.ILawsMarketStandardService; import com.jero.modules.laws.utils.DateValidateUtil; import com.jero.modules.laws.utils.ValidUtil; import com.jero.modules.quartz.entity.QuartzJob; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ImportParams; @@ -36,7 +36,6 @@ import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.core.io.ClassPathResource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -46,11 +45,9 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.validation.ConstraintViolation; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.lang.reflect.Field; import java.util.*; import java.util.stream.Collectors; @@ -60,6 +57,7 @@ import java.util.stream.Collectors; * @createDate 2024-06-29 11:34:34 */ @Service +@Slf4j public class LawsMarketStandardDetailServiceImpl extends ServiceImpl implements ILawsMarketStandardDetailService {