Browse Source

[feat]

1、对接首页预警,并且优化接口响应速度。
2、对接预警管理中预警统计
pull/1/head
杨威 3 months ago
parent
commit
9c6911f298
  1. 6
      dk-api/api-workflow/src/main/java/org/dromara/workflow/api/RemoteWorkflowService.java
  2. 2
      dk-api/api-workflow/src/main/java/org/dromara/workflow/api/domain/FlowLabelVo.java
  3. 22
      dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java
  4. 1
      dk-modules/sample/pom.xml
  5. 1
      dk-modules/system/src/main/java/org/dromara/system/controller/system/AiLabelController.java
  6. 18
      dk-modules/workflow/src/main/java/org/dromara/workflow/controller/FlwLabelController.java
  7. 13
      dk-modules/workflow/src/main/java/org/dromara/workflow/domain/FlowLabel.java
  8. 2
      dk-modules/workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java
  9. 8
      dk-modules/workflow/src/main/java/org/dromara/workflow/dubbo/RemoteWorkflowServiceImpl.java
  10. 15
      dk-modules/workflow/src/main/java/org/dromara/workflow/mapper/FlwDepartMapper.java
  11. 13
      dk-modules/workflow/src/main/java/org/dromara/workflow/mapper/FlwLabelMapper.java
  12. 11
      dk-modules/workflow/src/main/java/org/dromara/workflow/service/FlwDepartService.java
  13. 11
      dk-modules/workflow/src/main/java/org/dromara/workflow/service/FlwLabelService.java
  14. 11
      dk-modules/workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java
  15. 10
      dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java
  16. 49
      dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwDepartServiceImpl.java
  17. 47
      dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwLabelServiceImpl.java
  18. 21
      dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java
  19. 22
      dk-modules/workflow/src/main/resources/mapper/workflow/FlwDepartMapper.xml
  20. 22
      dk-modules/workflow/src/main/resources/mapper/workflow/FlwLabelMapper.xml
  21. 10
      pom.xml

6
dk-api/api-workflow/src/main/java/org/dromara/workflow/api/RemoteWorkflowService.java

@ -1,15 +1,13 @@
package org.dromara.workflow.api;
import org.dromara.system.api.domain.vo.RemoteUserVo;
import org.dromara.workflow.api.domain.FlowDepartVo;
import org.dromara.workflow.api.domain.FlowLabelVo;
import org.dromara.workflow.api.domain.RemoteCompleteTask;
import org.dromara.workflow.api.domain.RemoteStartProcess;
import org.dromara.workflow.api.domain.RemoteStartProcessReturn;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
/**
* 通用 工作流服务
@ -128,6 +126,6 @@ public interface RemoteWorkflowService {
*/
List<RemoteUserVo> currentTaskAllUser(Long taskId);
FlowDepartVo getFlowDepart(Long deptId);
FlowLabelVo getFlowLabel(String labelId);
}

2
dk-api/api-workflow/src/main/java/org/dromara/workflow/api/domain/FlowDepartVo.java → dk-api/api-workflow/src/main/java/org/dromara/workflow/api/domain/FlowLabelVo.java

@ -3,7 +3,7 @@ package org.dromara.workflow.api.domain;
import lombok.Data;
@Data
public class FlowDepartVo {
public class FlowLabelVo {
private Long id;

22
dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java

@ -398,12 +398,12 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist
List<StatObj> result = new ArrayList<>();
AtomicInteger number = new AtomicInteger(90);
AtomicInteger number1 = new AtomicInteger(5);
// AtomicInteger number = new AtomicInteger(90);
//
// AtomicInteger number1 = new AtomicInteger(5);
postVoList.forEach(postVo -> {
number.getAndIncrement();
// number.getAndIncrement();
StatObj statObj = new StatObj();
statObj.setStatKey(postVo.getPostName());
@ -415,22 +415,22 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist
if (ObjectUtil.isEmpty(labelList)){
monthList.forEach(month -> {
data.add(number.get() + 10.0);
data.add(0.0);
});
}else {
businessAlertBo.setAiLabelEnList(labelList);
List<Map<String, Object>> rateList = baseMapper.handlerRate(businessAlertBo,monthList);
if (ObjectUtil.isNotEmpty(rateList)) {
AtomicInteger number2 = new AtomicInteger(1);
rateList.forEach(rate -> {
number2.getAndIncrement();
rate.put("avgInfo",number.get() + number1.get() + number2.get());
});
// AtomicInteger number2 = new AtomicInteger(1);
// rateList.forEach(rate -> {
// number2.getAndIncrement();
// rate.put("avgInfo",number.get() + number1.get() + number2.get());
// });
data.addAll(rateList.stream().map(p-> p.get("avgInfo")).toList());
}else {
monthList.forEach(month -> {
data.add(number.get() + 10.0);
data.add(0.0);
});
}
}

1
dk-modules/sample/pom.xml

@ -132,5 +132,4 @@
<version>1.12.261</version>
</dependency>
</dependencies>
</project>

1
dk-modules/system/src/main/java/org/dromara/system/controller/system/AiLabelController.java

@ -46,6 +46,7 @@ public class AiLabelController extends BaseController {
return aiLabelService.queryPageList(bo, pageQuery);
}
/**
* 下拉框集合
*/

18
dk-modules/workflow/src/main/java/org/dromara/workflow/controller/FlwDepartController.java → dk-modules/workflow/src/main/java/org/dromara/workflow/controller/FlwLabelController.java

@ -7,8 +7,8 @@ import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.workflow.common.ConditionalOnEnable;
import org.dromara.workflow.domain.FlowDepart;
import org.dromara.workflow.service.FlwDepartService;
import org.dromara.workflow.domain.FlowLabel;
import org.dromara.workflow.service.FlwLabelService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@ -17,11 +17,11 @@ import org.springframework.web.bind.annotation.*;
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/depart")
public class FlwDepartController {
@RequestMapping("/flow/label")
public class FlwLabelController {
private final FlwDepartService flwDepartService;
private final FlwLabelService flwDepartService;
/**
* 查询流程部门关系
@ -29,7 +29,7 @@ public class FlwDepartController {
*/
@Operation(summary = "查询流程部门关系",description = "查询流程部门关系")
@GetMapping("/{flowCode}/getInfo")
public R<FlowDepart> getInfo(@PathVariable String flowCode) {
public R<FlowLabel> getInfo(@PathVariable String flowCode) {
return R.ok(flwDepartService.getInfo(flowCode));
}
@ -39,8 +39,8 @@ public class FlwDepartController {
* flowCode
*/
@Operation(summary = "绑定流程部门关系",description = "绑定流程部门关系")
@PostMapping("/bind/depart")
public R<FlowDepart> bindDepart(@Validated({AddGroup.class}) @RequestBody FlowDepart flowDepart) {
return R.ok(flwDepartService.bindDepart(flowDepart));
@PostMapping("/bind/label")
public R<FlowLabel> bindLabel(@Validated({AddGroup.class}) @RequestBody FlowLabel flowLabel) {
return R.ok(flwDepartService.bindLabel(flowLabel));
}
}

13
dk-modules/workflow/src/main/java/org/dromara/workflow/domain/FlowDepart.java → dk-modules/workflow/src/main/java/org/dromara/workflow/domain/FlowLabel.java

@ -15,18 +15,13 @@ import java.util.List;
* 部门流程关系表
*/
@Data
@TableName(value = "flow_depart",autoResultMap = true)
public class FlowDepart {
@TableName(value = "flow_label",autoResultMap = true)
public class FlowLabel {
@TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
* 流程类型
*/
// @NotNull(message = "流程类型不能为空", groups = AddGroup.class)
// private String flowType;
/**
* 流程编码
@ -43,6 +38,6 @@ public class FlowDepart {
* 部门id集合
*/
@NotNull(message = "部门id不能为空", groups = AddGroup.class)
@TableField(value = "dept_ids",typeHandler = ListTypeHandler.class)
List<Long> departIds;
@TableField(value = "label_ids",typeHandler = ListTypeHandler.class)
List<String> labelIds;
}

2
dk-modules/workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java

@ -103,5 +103,5 @@ public class FlowDefinitionVo implements Serializable {
*/
private String ext;
private List<Long> deptIds;
private List<String> labelIds;
}

8
dk-modules/workflow/src/main/java/org/dromara/workflow/dubbo/RemoteWorkflowServiceImpl.java

@ -1,11 +1,10 @@
package org.dromara.workflow.dubbo;
import cn.dev33.satoken.stp.StpUtil;
import lombok.RequiredArgsConstructor;
import org.apache.dubbo.config.annotation.DubboService;
import org.dromara.system.api.domain.vo.RemoteUserVo;
import org.dromara.workflow.api.RemoteWorkflowService;
import org.dromara.workflow.api.domain.FlowDepartVo;
import org.dromara.workflow.api.domain.FlowLabelVo;
import org.dromara.workflow.api.domain.RemoteCompleteTask;
import org.dromara.workflow.api.domain.RemoteStartProcess;
import org.dromara.workflow.api.domain.RemoteStartProcessReturn;
@ -15,7 +14,6 @@ import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@ -102,8 +100,8 @@ public class RemoteWorkflowServiceImpl implements RemoteWorkflowService {
}
@Override
public FlowDepartVo getFlowDepart(Long deptId) {
return flwTaskService.getFlowDepart(deptId);
public FlowLabelVo getFlowLabel(String labelId) {
return flwTaskService.getFlowLabel(labelId);
}
@Override

15
dk-modules/workflow/src/main/java/org/dromara/workflow/mapper/FlwDepartMapper.java

@ -1,15 +0,0 @@
package org.dromara.workflow.mapper;
import jakarta.validation.constraints.NotNull;
import org.apache.ibatis.annotations.Param;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.workflow.domain.FlowDepart;
import java.util.List;
import java.util.Map;
public interface FlwDepartMapper extends BaseMapperPlus<FlowDepart, FlowDepart> {
FlowDepart getFlowDepart(@Param("deptId") Long deptId);
Integer checkFlowDepart(@Param("deptIds") List<Long> departIds);
}

13
dk-modules/workflow/src/main/java/org/dromara/workflow/mapper/FlwLabelMapper.java

@ -0,0 +1,13 @@
package org.dromara.workflow.mapper;
import org.apache.ibatis.annotations.Param;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.workflow.domain.FlowLabel;
import java.util.List;
public interface FlwLabelMapper extends BaseMapperPlus<FlowLabel, FlowLabel> {
FlowLabel getFlowLabel(@Param("labelId") String labelId);
Integer checkFlowLabel(@Param("labelIds") List<String> labelIds);
}

11
dk-modules/workflow/src/main/java/org/dromara/workflow/service/FlwDepartService.java

@ -1,11 +0,0 @@
package org.dromara.workflow.service;
import org.dromara.workflow.domain.FlowDepart;
public interface FlwDepartService {
FlowDepart getInfo(String flowCode);
FlowDepart bindDepart(FlowDepart flowDepart);
FlowDepart getFlowDepart(Long deptId);
}

11
dk-modules/workflow/src/main/java/org/dromara/workflow/service/FlwLabelService.java

@ -0,0 +1,11 @@
package org.dromara.workflow.service;
import org.dromara.workflow.domain.FlowLabel;
public interface FlwLabelService {
FlowLabel getInfo(String flowCode);
FlowLabel bindLabel(FlowLabel flowDepart);
FlowLabel getFlowLabel(String labelId);
}

11
dk-modules/workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java

@ -3,20 +3,15 @@ package org.dromara.workflow.service;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.system.api.domain.vo.RemoteUserVo;
import org.dromara.warm.flow.core.dto.FlowParams;
import org.dromara.warm.flow.core.entity.Node;
import org.dromara.warm.flow.core.entity.Task;
import org.dromara.warm.flow.core.service.impl.TaskServiceImpl;
import org.dromara.warm.flow.orm.entity.FlowHisTask;
import org.dromara.warm.flow.orm.entity.FlowNode;
import org.dromara.warm.flow.orm.entity.FlowTask;
import org.dromara.workflow.api.domain.FlowDepartVo;
import org.dromara.workflow.api.domain.FlowLabelVo;
import org.dromara.workflow.api.domain.RemoteStartProcessReturn;
import org.dromara.workflow.domain.bo.*;
import org.dromara.workflow.domain.vo.FlowHisTaskVo;
import org.dromara.workflow.domain.vo.FlowTaskVo;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@ -214,8 +209,8 @@ public interface IFlwTaskService {
/**
* 根据部门获取流程
* @param deptId
* @param labelId
* @return
*/
FlowDepartVo getFlowDepart(Long deptId);
FlowLabelVo getFlowLabel(String labelId);
}

10
dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java

@ -32,10 +32,10 @@ import org.dromara.warm.flow.orm.mapper.FlowSkipMapper;
import org.dromara.workflow.common.ConditionalOnEnable;
import org.dromara.workflow.common.constant.FlowConstant;
import org.dromara.workflow.domain.FlowCategory;
import org.dromara.workflow.domain.FlowDepart;
import org.dromara.workflow.domain.FlowLabel;
import org.dromara.workflow.domain.vo.FlowDefinitionVo;
import org.dromara.workflow.mapper.FlwCategoryMapper;
import org.dromara.workflow.service.FlwDepartService;
import org.dromara.workflow.service.FlwLabelService;
import org.dromara.workflow.service.IFlwDefinitionService;
import org.dromara.workflow.utils.WorkflowUtils;
import org.springframework.stereotype.Service;
@ -67,7 +67,7 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService {
private final FlowNodeMapper flowNodeMapper;
private final FlowSkipMapper flowSkipMapper;
private final FlwCategoryMapper flwCategoryMapper;
private final FlwDepartService flwDepartService;
private final FlwLabelService flwDepartService;
/**
* 查询流程定义列表
@ -85,9 +85,9 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService {
build.setRows(BeanUtil.copyToList(page.getRecords(), FlowDefinitionVo.class));
build.setTotal(page.getTotal());
build.getRows().forEach(p ->{
FlowDepart info = flwDepartService.getInfo(p.getFlowCode());
FlowLabel info = flwDepartService.getInfo(p.getFlowCode());
if(ObjectUtil.isNotEmpty(info)){
p.setDeptIds(info.getDepartIds());
p.setLabelIds(info.getLabelIds());
}
});
return build;

49
dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwDepartServiceImpl.java

@ -1,49 +0,0 @@
package org.dromara.workflow.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.workflow.domain.FlowDepart;
import org.dromara.workflow.mapper.FlwDepartMapper;
import org.dromara.workflow.service.FlwDepartService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Map;
@Service
@RequiredArgsConstructor
public class FlwDepartServiceImpl extends ServiceImpl<FlwDepartMapper, FlowDepart> implements FlwDepartService {
@Override
public FlowDepart getInfo(String flowCode) {
LambdaQueryWrapper<FlowDepart> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(FlowDepart::getFlowCode, flowCode);
return this.baseMapper.selectOne(wrapper);
}
@Transactional(rollbackFor = Exception.class)
@Override
public FlowDepart bindDepart(FlowDepart flowDepart) {
LambdaQueryWrapper<FlowDepart> updateWrapper = new LambdaQueryWrapper<>();
updateWrapper.eq(FlowDepart::getFlowCode, flowDepart.getFlowCode());
this.baseMapper.delete(updateWrapper);
//查询部门是否还存在别的流程
if (this.baseMapper.checkFlowDepart(flowDepart.getDepartIds()) > 0){
throw new ServiceException("所选的部门中,已存在在其他流程中,请检查后在提交!");
}
this.baseMapper.insert(flowDepart);
return flowDepart;
}
@Override
public FlowDepart getFlowDepart(Long deptId) {
return this.baseMapper.getFlowDepart(deptId);
}
}

47
dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwLabelServiceImpl.java

@ -0,0 +1,47 @@
package org.dromara.workflow.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.workflow.domain.FlowLabel;
import org.dromara.workflow.mapper.FlwLabelMapper;
import org.dromara.workflow.service.FlwLabelService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@Service
@RequiredArgsConstructor
public class FlwLabelServiceImpl extends ServiceImpl<FlwLabelMapper, FlowLabel> implements FlwLabelService {
@Override
public FlowLabel getInfo(String flowCode) {
LambdaQueryWrapper<FlowLabel> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(FlowLabel::getFlowCode, flowCode);
return this.baseMapper.selectOne(wrapper);
}
@Transactional(rollbackFor = Exception.class)
@Override
public FlowLabel bindLabel(FlowLabel flowDepart) {
LambdaQueryWrapper<FlowLabel> updateWrapper = new LambdaQueryWrapper<>();
updateWrapper.eq(FlowLabel::getFlowCode, flowDepart.getFlowCode());
this.baseMapper.delete(updateWrapper);
//查询部门是否还存在别的流程
if (this.baseMapper.checkFlowLabel(flowDepart.getLabelIds()) > 0){
throw new ServiceException("所选的标签中,已存在在其他流程中,请检查后在提交!");
}
this.baseMapper.insert(flowDepart);
return flowDepart;
}
@Override
public FlowLabel getFlowLabel(String labelId) {
return this.baseMapper.getFlowLabel(labelId);
}
}

21
dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java

@ -13,7 +13,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference;
import org.dromara.business.api.RemoteBusinessAlertService;
import org.dromara.common.core.enums.BusinessStatusEnum;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.SpringUtils;
@ -22,13 +21,9 @@ import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.core.utils.ValidatorUtils;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mail.utils.MailUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.sse.dto.SseMessageDto;
import org.dromara.common.sse.utils.SseMessageUtils;
import org.dromara.resource.api.RemoteMessageService;
import org.dromara.system.api.RemoteUserService;
import org.dromara.system.api.domain.vo.RemoteUserVo;
import org.dromara.warm.flow.core.dto.FlowParams;
@ -40,13 +35,13 @@ import org.dromara.warm.flow.orm.entity.*;
import org.dromara.warm.flow.orm.mapper.FlowHisTaskMapper;
import org.dromara.warm.flow.orm.mapper.FlowInstanceMapper;
import org.dromara.warm.flow.orm.mapper.FlowTaskMapper;
import org.dromara.workflow.api.domain.FlowDepartVo;
import org.dromara.workflow.api.domain.FlowLabelVo;
import org.dromara.workflow.api.domain.RemoteStartProcessReturn;
import org.dromara.workflow.common.ConditionalOnEnable;
import org.dromara.workflow.common.enums.MessageTypeEnum;
import org.dromara.workflow.common.enums.TaskAssigneeType;
import org.dromara.workflow.common.enums.TaskStatusEnum;
import org.dromara.workflow.domain.FlowDepart;
import org.dromara.workflow.domain.FlowLabel;
import org.dromara.workflow.domain.bo.*;
import org.dromara.workflow.domain.vo.FlowHisTaskVo;
import org.dromara.workflow.domain.vo.FlowTaskVo;
@ -54,7 +49,7 @@ import org.dromara.workflow.handler.FlowProcessEventHandler;
import org.dromara.workflow.handler.WorkflowPermissionHandler;
import org.dromara.workflow.mapper.FlwCategoryMapper;
import org.dromara.workflow.mapper.FlwTaskMapper;
import org.dromara.workflow.service.FlwDepartService;
import org.dromara.workflow.service.FlwLabelService;
import org.dromara.workflow.service.IFlwTaskService;
import org.dromara.workflow.utils.WorkflowUtils;
import org.springframework.beans.BeanUtils;
@ -65,8 +60,6 @@ import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.*;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import static org.dromara.workflow.common.constant.FlowConstant.*;
@ -94,7 +87,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
private final FlowProcessEventHandler flowProcessEventHandler;
private final FlwTaskMapper flwTaskMapper;
private final FlwCategoryMapper flwCategoryMapper;
private final FlwDepartService flwDepartService;
private final FlwLabelService flwDepartService;
@DubboReference
private RemoteUserService remoteUserService;
@ -329,9 +322,9 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
}
@Override
public FlowDepartVo getFlowDepart(Long deptId) {
FlowDepart flowDepart = flwDepartService.getFlowDepart(deptId);
FlowDepartVo flowDepartVo = new FlowDepartVo();
public FlowLabelVo getFlowLabel(String labelId) {
FlowLabel flowDepart = flwDepartService.getFlowLabel(labelId);
FlowLabelVo flowDepartVo = new FlowLabelVo();
BeanUtils.copyProperties(flowDepart, flowDepartVo);
return flowDepartVo;
}

22
dk-modules/workflow/src/main/resources/mapper/workflow/FlwDepartMapper.xml

@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.workflow.mapper.FlwDepartMapper">
<select id="getFlowDepart" resultType="org.dromara.workflow.domain.FlowDepart">
select fd.* from flow_depart fd where JSON_CONTAINS(fd.dept_ids, #{deptId})
</select>
<select id="checkFlowDepart" resultType="java.lang.Integer">
SELECT
count(1)
FROM flow_depart fd
where
<foreach collection="deptIds" item="item" open="(" separator=" OR " close=")">
JSON_CONTAINS(fd.dept_ids, CONCAT('"', #{item}, '"'))
</foreach>
</select>
</mapper>

22
dk-modules/workflow/src/main/resources/mapper/workflow/FlwLabelMapper.xml

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.workflow.mapper.FlwLabelMapper">
<select id="getFlowLabel" resultType="org.dromara.workflow.domain.FlowLabel">
select fd.* from flow_depart fd where JSON_CONTAINS(fd.label_ids, #{labelId})
</select>
<select id="checkFlowLabel" resultType="java.lang.Integer">
SELECT
count(1)
FROM flow_depart fd
where
<foreach collection="labelIds" item="item" open="(" separator=" OR " close=")">
JSON_CONTAINS(fd.label_ids, CONCAT('"', #{item}, '"'))
</foreach>
</select>
</mapper>

10
pom.xml

@ -16,7 +16,7 @@
<revision>2.2.2</revision>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>21</java.version>
<java.version>17</java.version>
<spring-boot.version>3.2.11</spring-boot.version>
<spring-cloud.version>2023.0.3</spring-cloud.version>
<spring-boot-admin.version>3.2.3</spring-boot-admin.version>
@ -85,7 +85,7 @@
<id>dev</id>
<properties>
<!-- 环境标识,需要与配置文件的名称相对应 -->
<profiles.active>wuyuan</profiles.active>
<profiles.active>dev</profiles.active>
<nacos.server>127.0.0.1:8848</nacos.server>
<nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
<nacos.config.group>DEFAULT_GROUP</nacos.config.group>
@ -511,6 +511,10 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
<resources>
<resource>
@ -600,5 +604,7 @@
</pluginRepository>
</pluginRepositories>
</project>

Loading…
Cancel
Save