QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

用户管理添加数据来源

Browse Source
This commit is contained in:
梁琦涛
2024-08-02 11:14:54 +08:00
parent d623d89e94
commit 1ef7f7e09c
6 changed files with 43 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-base/laws-base-core/src/main/java/com/jero/common/api/PushWorkflowIntegrationAPI.java
+9
View File
@@ -20,4 +20,13 @@ public interface PushWorkflowIntegrationAPI {
* @return*/
void sendTodoTask(List<UnifiedTodoVO> unifiedTodoVOList);
/**
* @Author:
* @Date: 2023/10/13 15:12
* @Description: 发送飞书
*
* @return*/
void sendTodoTaskByFeiShu(List<UnifiedTodoVO> unifiedTodoVOList);
}
laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+12 -4
View File
@@ -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")
laws-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java
+7
View File
@@ -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
laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/UnifiedTodoServiceImpl.java
+7 -3
View File
@@ -91,9 +91,6 @@ public class UnifiedTodoServiceImpl implements PushWorkflowIntegrationAPI {
* @return*/
@Override
public void sendTodoTask(List<UnifiedTodoVO> unifiedTodoVOList) {
// 发送飞书
sendFeiShuService.sendTodoTask(unifiedTodoVOList);
if(!isWorkflow){
return;
}
@@ -118,6 +115,12 @@ public class UnifiedTodoServiceImpl implements PushWorkflowIntegrationAPI {
}
}
@Override
public void sendTodoTaskByFeiShu(List<UnifiedTodoVO> 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;
laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java
+6
View File
@@ -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<ProcessApprovalRecord> 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());
laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java
+2 -4
View File
@@ -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<LawsMarketStandardDetailMapper,
LawsMarketStandardDetail> implements ILawsMarketStandardDetailService {