Merge branch 'dev' of https://git.yingcaibx.com/tl/api into dev

pom.xml

@@ -65,6 +65,7 @@
         <license.version>2.0</license.version>
         <easy.captcha.version>1.6.2</easy.captcha.version>
         <paho.mqttv5.version>1.2.5</paho.mqttv5.version>
+        <liteflow.version>2.11.2</liteflow.version>
     </properties>
 
     <dependencies>
@@ -91,6 +92,13 @@
             <version>${paho.mqttv5.version}</version>
         </dependency>
 
+        <!--规则引擎-->
+        <dependency>
+            <groupId>com.yomahub</groupId>
+            <artifactId>liteflow-spring-boot-starter</artifactId>
+            <version>${liteflow.version}</version>
+        </dependency>
+
         <!--Java图形验证码，支持gif、中文、算术等类型:https://gitee.com/ele-admin/EasyCaptcha-->
         <dependency>
             <groupId>com.github.whvcse</groupId>

src/main/java/com/xjrsoft/module/liteflow/controller/XjrLiteflowChainController.java

@@ -0,0 +1,137 @@
+package com.xjrsoft.module.liteflow.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.xjrsoft.common.constant.GlobalConstant;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.liteflow.dto.AddXjrLiteflowChainDto;
+import com.xjrsoft.module.liteflow.dto.UpdateXjrLiteflowChainDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+
+import com.xjrsoft.module.liteflow.dto.XjrLiteflowChainListDto;
+import com.xjrsoft.module.liteflow.dto.XjrLiteflowChainPageDto;
+import com.xjrsoft.module.liteflow.entity.XjrLiteflowChain;
+import com.xjrsoft.module.liteflow.service.IXjrLiteflowChainService;
+import com.xjrsoft.module.liteflow.vo.XjrLiteflowChainListVo;
+import com.xjrsoft.module.liteflow.vo.XjrLiteflowChainOptionsVo;
+import com.xjrsoft.module.liteflow.vo.XjrLiteflowChainPageVo;
+
+import com.xjrsoft.module.liteflow.vo.XjrLiteflowChainVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+* @title: 规则表
+* @Author fanxp
+* @Date: 2023-11-02
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/liteflow" + "/chain")
+@Api(value = "/liteflow"  + "/chain",tags = "规则表代码")
+@AllArgsConstructor
+public class XjrLiteflowChainController {
+
+
+    private final IXjrLiteflowChainService xjrLiteflowChainService;
+
+    @GetMapping(value = "/list")
+    @ApiOperation(value="规则表列表(不分页)")
+    @SaCheckPermission("xjrliteflowchain:detail")
+    public RT<List<XjrLiteflowChainListVo>> list(@Valid XjrLiteflowChainListDto dto){
+
+        LambdaQueryWrapper<XjrLiteflowChain> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                .orderByDesc(XjrLiteflowChain::getId)
+                .select(XjrLiteflowChain.class,x -> VoToColumnUtil.fieldsToColumns(XjrLiteflowChainListVo.class).contains(x.getProperty()));
+
+        List<XjrLiteflowChain> list = xjrLiteflowChainService.list(queryWrapper);
+        List<XjrLiteflowChainListVo> listVos = BeanUtil.copyToList(list, XjrLiteflowChainListVo.class);
+        return RT.ok(listVos);
+    }
+
+    @GetMapping(value = "/options")
+    @ApiOperation(value="规则下拉选项")
+    @SaCheckPermission("xjrliteflowchain:detail")
+    public RT<List<XjrLiteflowChainOptionsVo>> options(){
+
+        LambdaQueryWrapper<XjrLiteflowChain> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                .orderByDesc(XjrLiteflowChain::getId)
+                .select(XjrLiteflowChain.class,x -> VoToColumnUtil.fieldsToColumns(XjrLiteflowChainOptionsVo.class).contains(x.getProperty()));
+
+        List<XjrLiteflowChain> list = xjrLiteflowChainService.list(queryWrapper);
+        List<XjrLiteflowChainOptionsVo> listVos = BeanUtil.copyToList(list, XjrLiteflowChainOptionsVo.class);
+        return RT.ok(listVos);
+    }
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="规则表列表(分页)")
+    @SaCheckPermission("xjrliteflowchain:detail")
+    public RT<PageOutput<XjrLiteflowChainPageVo>> page(@Valid XjrLiteflowChainPageDto dto){
+
+        LambdaQueryWrapper<XjrLiteflowChain> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(XjrLiteflowChain::getId)
+                .select(XjrLiteflowChain.class,x -> VoToColumnUtil.fieldsToColumns(XjrLiteflowChainPageVo.class).contains(x.getProperty()));
+        IPage<XjrLiteflowChain> page = xjrLiteflowChainService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<XjrLiteflowChainPageVo> pageOutput = ConventPage.getPageOutput(page, XjrLiteflowChainPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询规则表信息")
+    @SaCheckPermission("xjrliteflowchain:detail")
+    public RT<XjrLiteflowChainVo> info(@RequestParam Long id){
+        XjrLiteflowChain xjrLiteflowChain = xjrLiteflowChainService.getById(id);
+        if (xjrLiteflowChain == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(xjrLiteflowChain, XjrLiteflowChainVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增规则表")
+    @SaCheckPermission("xjrliteflowchain:add")
+    public RT<Boolean> add(@Valid @RequestBody AddXjrLiteflowChainDto dto){
+        XjrLiteflowChain xjrLiteflowChain = BeanUtil.toBean(dto, XjrLiteflowChain.class);
+        xjrLiteflowChain.setCreateTime(LocalDateTime.now());
+        boolean isSuccess = xjrLiteflowChainService.save(xjrLiteflowChain);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改规则表")
+    @SaCheckPermission("xjrliteflowchain:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateXjrLiteflowChainDto dto){
+
+        XjrLiteflowChain xjrLiteflowChain = BeanUtil.toBean(dto, XjrLiteflowChain.class);
+        return RT.ok(xjrLiteflowChainService.updateById(xjrLiteflowChain));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除规则表")
+    @SaCheckPermission("xjrliteflowchain:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(xjrLiteflowChainService.removeBatchByIds(ids));
+
+    }
+
+}

src/main/java/com/xjrsoft/module/liteflow/dto/AddXjrLiteflowChainDto.java

@@ -0,0 +1,58 @@
+package com.xjrsoft.module.liteflow.dto;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import javax.validation.constraints.NotNull;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+
+
+/**
+ * @title: 规则表
+ * @Author fanxp
+ * @Date: 2023-11-02
+ * @Version 1.0
+ */
+@Data
+public class AddXjrLiteflowChainDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 应用名
+     */
+    @ApiModelProperty("应用名")
+    @NotNull(message = "应用名不能为空！")
+    private String applicationName;
+    /**
+     * 规则名
+     */
+    @ApiModelProperty("规则名")
+    @NotNull(message = "主规则名不能为空！")
+    private String chainName;
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    private String chainDesc;
+    /**
+     * 规则文件
+     */
+    @ApiModelProperty("规则文件")
+    @NotNull(message = "规则文件不能为空！")
+    private String elData;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", hidden = true)
+    private LocalDateTime createTime;
+
+}

src/main/java/com/xjrsoft/module/liteflow/dto/UpdateXjrLiteflowChainDto.java

@@ -0,0 +1,31 @@
+package com.xjrsoft.module.liteflow.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.List;
+
+
+
+/**
+* @title: 规则表
+* @Author fanxp
+* @Date: 2023-11-02
+* @Version 1.0
+*/
+@Data
+public class UpdateXjrLiteflowChainDto extends AddXjrLiteflowChainDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long id;
+}

src/main/java/com/xjrsoft/module/liteflow/dto/XjrLiteflowChainListDto.java

@@ -0,0 +1,25 @@
+package com.xjrsoft.module.liteflow.dto;
+
+import com.xjrsoft.common.page.ListInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+
+
+/**
+* @title: 规则表列表查询入参
+* @Author fanxp
+* @Date: 2023-11-02
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class XjrLiteflowChainListDto extends ListInput {
+
+
+}

src/main/java/com/xjrsoft/module/liteflow/dto/XjrLiteflowChainPageDto.java

@@ -0,0 +1,25 @@
+package com.xjrsoft.module.liteflow.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+
+
+/**
+* @title: 规则表分页查询入参
+* @Author fanxp
+* @Date: 2023-11-02
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class XjrLiteflowChainPageDto extends PageInput {
+
+
+}

src/main/java/com/xjrsoft/module/liteflow/entity/XjrLiteflowChain.java

@@ -0,0 +1,65 @@
+package com.xjrsoft.module.liteflow.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.yulichang.annotation.EntityMapping;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+
+
+/**
+* @title: 规则表
+* @Author fanxp
+* @Date: 2023-11-02
+* @Version 1.0
+*/
+@Data
+@TableName("xjr_liteflow_chain")
+@ApiModel(value = "规则表对象", description = "规则表")
+public class XjrLiteflowChain implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @TableId
+    private Long id;
+    /**
+    * 应用名
+    */
+    @ApiModelProperty("应用名")
+    private String applicationName;
+    /**
+    * 规则名
+    */
+    @ApiModelProperty("规则名")
+    private String chainName;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String chainDesc;
+    /**
+    * 规则文件
+    */
+    @ApiModelProperty("规则文件")
+    private String elData;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+
+}

src/main/java/com/xjrsoft/module/liteflow/mapper/XjrLiteflowChainMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.liteflow.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.liteflow.entity.XjrLiteflowChain;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 规则表
+* @Author fanxp
+* @Date: 2023-11-02
+* @Version 1.0
+*/
+@Mapper
+public interface XjrLiteflowChainMapper extends BaseMapper<XjrLiteflowChain> {
+
+}

src/main/java/com/xjrsoft/module/liteflow/service/IXjrLiteflowChainService.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.liteflow.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.liteflow.entity.XjrLiteflowChain;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 规则表
+* @Author fanxp
+* @Date: 2023-11-02
+* @Version 1.0
+*/
+
+public interface IXjrLiteflowChainService extends IService<XjrLiteflowChain> {
+}

src/main/java/com/xjrsoft/module/liteflow/service/impl/XjrLiteflowChainServiceImpl.java

@@ -0,0 +1,25 @@
+package com.xjrsoft.module.liteflow.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.liteflow.entity.XjrLiteflowChain;
+import com.xjrsoft.module.liteflow.mapper.XjrLiteflowChainMapper;
+import com.xjrsoft.module.liteflow.service.IXjrLiteflowChainService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+/**
+* @title: 规则表
+* @Author fanxp
+* @Date: 2023-11-02
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class XjrLiteflowChainServiceImpl extends ServiceImpl<XjrLiteflowChainMapper, XjrLiteflowChain> implements IXjrLiteflowChainService {
+}

src/main/java/com/xjrsoft/module/liteflow/vo/XjrLiteflowChainListVo.java

@@ -0,0 +1,53 @@
+package com.xjrsoft.module.liteflow.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import com.xjrsoft.common.annotation.Trans;
+import com.xjrsoft.common.enums.TransType;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+
+/**
+* @title: 规则表列表列表入参
+* @Author fanxp
+* @Date: 2023-11-02
+* @Version 1.0
+*/
+@Data
+public class XjrLiteflowChainListVo {
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String id;
+    /**
+    * 应用名
+    */
+    @ApiModelProperty("应用名")
+    private String applicationName;
+    /**
+    * 规则名
+    */
+    @ApiModelProperty("规则名")
+    private String chainName;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String chainDesc;
+    /**
+    * 规则文件
+    */
+    @ApiModelProperty("规则文件")
+    private String elData;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

src/main/java/com/xjrsoft/module/liteflow/vo/XjrLiteflowChainOptionsVo.java

@@ -0,0 +1,32 @@
+package com.xjrsoft.module.liteflow.vo;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+* @title: 规则下拉选项
+* @Author fanxp
+* @Date: 2023-11-02
+* @Version 1.0
+*/
+@Data
+public class XjrLiteflowChainOptionsVo {
+
+    /**
+     *
+     */
+    @ApiModelProperty("")
+    @JsonProperty("value")
+    private String id;
+    /**
+     * 应用名
+     */
+    @ApiModelProperty("应用名")
+    @JsonProperty("label")
+    private String applicationName;
+
+}

src/main/java/com/xjrsoft/module/liteflow/vo/XjrLiteflowChainPageVo.java

@@ -0,0 +1,53 @@
+package com.xjrsoft.module.liteflow.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import com.xjrsoft.common.annotation.Trans;
+import com.xjrsoft.common.enums.TransType;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+
+/**
+* @title: 规则表分页列表出参
+* @Author fanxp
+* @Date: 2023-11-02
+* @Version 1.0
+*/
+@Data
+public class XjrLiteflowChainPageVo {
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String id;
+    /**
+    * 应用名
+    */
+    @ApiModelProperty("应用名")
+    private String applicationName;
+    /**
+    * 规则名
+    */
+    @ApiModelProperty("规则名")
+    private String chainName;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String chainDesc;
+    /**
+    * 规则文件
+    */
+    @ApiModelProperty("规则文件")
+    private String elData;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

src/main/java/com/xjrsoft/module/liteflow/vo/XjrLiteflowChainVo.java

@@ -0,0 +1,53 @@
+package com.xjrsoft.module.liteflow.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+* @title: 规则表表单出参
+* @Author fanxp
+* @Date: 2023-11-02
+* @Version 1.0
+*/
+@Data
+public class XjrLiteflowChainVo {
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long id;
+    /**
+    * 应用名
+    */
+    @ApiModelProperty("应用名")
+    private String applicationName;
+    /**
+    * 规则名
+    */
+    @ApiModelProperty("规则名")
+    private String chainName;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String chainDesc;
+    /**
+    * 规则文件
+    */
+    @ApiModelProperty("规则文件")
+    private String elData;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+
+
+}

src/main/java/com/xjrsoft/module/workflow/listener/ExecutionDelegate.java

@@ -794,8 +794,7 @@ public class ExecutionDelegate implements ExecutionListener {
             }
             //如果是规则引擎
             else {
-
-
+                System.out.println("规则引擎");
             }
 
         }

src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

@@ -213,6 +213,33 @@ public class FreeMarkerGeneratorTest {
         params.setDs(ds);
 
 
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
+
+    @Test
+    public void gcLiteFlowTest() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("xjr_liteflow_chain");
+        mainTable.setIsMain(true);
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);
+
+        tableConfigs.add(mainTable);
+
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("fanxp");
+        params.setPackageName("liteflow");
+        params.setTableConfigs(tableConfigs);
+        params.setPage(false);
+        params.setImport(false);
+        params.setExport(false);
+        params.setOutMainDir(false);
+        params.setDs(ds);
+
+
         IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
 
         apiGeneratorService.generateCodes(params);