From 8a33e76f5148316dab9026db6458f3b1f97cbfa6 Mon Sep 17 00:00:00 2001 From: Saisai Liu <1374434128@qq.com> Date: Fri, 3 May 2024 11:40:33 +0800 Subject: [PATCH] =?UTF-8?q?feat():=E8=A7=84=E5=88=99=E5=BC=95=E6=93=8E?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/remote/RemoteUserService.java | 24 ++++ .../factory/RemoteUserFallbackFactory.java | 28 +++- .../muyu-ruleEngine-common/pom.xml | 30 +++++ .../com/muyu/engine/domain/RuleEngine.java | 61 +++++++++ .../muyu-ruleEngine-remote/pom.xml | 20 +++ .../src/main/java/com/muyu/Main.java | 0 .../muyu-ruleEngine-service/pom.xml | 120 ++++++++++++++++++ .../controller/RuleEngineController.java | 98 ++++++++++++++ .../muyu/engine/mapper/RuleEngineMapper.java | 63 +++++++++ .../engine/service/RuleEngineService.java | 63 +++++++++ .../service/impl/RuleEngineServiceImpl.java | 100 +++++++++++++++ .../src/main/resources/bootstrap.yml | 28 ++++ .../resources/mapper/RuleEngineMapper.xml | 108 ++++++++++++++++ muyu-modules/muyu-ruleEngine/pom.xml | 27 ++++ .../system/controller/SysDeptController.java | 2 +- .../com/muyu/etl/domain/AssetImpower.java | 19 ++- .../java/com/muyu/etl/domain/TableInfo.java | 5 + .../muyu/etl/domain/req/AssetImpowerReq.java | 8 +- .../etl/domain/resp/BasicTableInfoResp.java | 63 +++++++++ .../domain/resp/TableInfoStructureResp.java | 4 + muyu-modules/muyv-etl/muyu-etl-remote/pom.xml | 8 ++ .../muyv-etl/muyu-etl-service/pom.xml | 1 + .../java/com/muyu/MuYuEtlApplication.java | 2 + .../controller/AssetImpowerController.java | 15 +++ .../controller/BasicConfigInfoController.java | 12 ++ .../muyu/etl/service/AssetImpowerService.java | 2 + .../etl/service/BasicConfigInfoService.java | 3 + .../service/impl/AssetImpowerServiceImpl.java | 103 ++++++++++++--- .../impl/BasicConfigInfoServiceImpl.java | 50 +++++++- .../resources/mapper/AssetImpowerMapper.xml | 16 ++- .../main/resources/mapper/TableInfoMapper.xml | 22 ++-- muyu-modules/pom.xml | 1 + pom.xml | 7 + 33 files changed, 1067 insertions(+), 46 deletions(-) create mode 100644 muyu-modules/muyu-ruleEngine/muyu-ruleEngine-common/pom.xml create mode 100644 muyu-modules/muyu-ruleEngine/muyu-ruleEngine-common/src/main/java/com/muyu/engine/domain/RuleEngine.java create mode 100644 muyu-modules/muyu-ruleEngine/muyu-ruleEngine-remote/pom.xml rename muyu-modules/{muyv-etl/muyu-etl-remote => muyu-ruleEngine/muyu-ruleEngine-remote}/src/main/java/com/muyu/Main.java (100%) create mode 100644 muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/pom.xml create mode 100644 muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/controller/RuleEngineController.java create mode 100644 muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/mapper/RuleEngineMapper.java create mode 100644 muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/service/RuleEngineService.java create mode 100644 muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/service/impl/RuleEngineServiceImpl.java create mode 100644 muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/resources/bootstrap.yml create mode 100644 muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/resources/mapper/RuleEngineMapper.xml create mode 100644 muyu-modules/muyu-ruleEngine/pom.xml create mode 100644 muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/resp/BasicTableInfoResp.java diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java index cb968e0..c19b868 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java @@ -3,12 +3,16 @@ package com.muyu.common.system.remote; import com.muyu.common.core.constant.SecurityConstants; import com.muyu.common.core.constant.ServiceNameConstants; import com.muyu.common.core.domain.Result; +import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.common.system.domain.SysDept; import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.remote.factory.RemoteUserFallbackFactory; import com.muyu.common.system.domain.LoginUser; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * 用户服务 * @@ -37,4 +41,24 @@ public interface RemoteUserService { */ @PostMapping("/user/register") public Result registerUserInfo (@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + + /** + * 获取用户对象 + * @param user + * @return + */ + @PostMapping("/user/list") + public Result> list (@RequestBody SysUser user, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + /** + * 获取部门 + * @param deptId + * @return + */ + @PostMapping(value = "/dept/{deptId}") + public Result getInfo (@PathVariable("deptId") Long deptId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + @PostMapping(value = "/dept/list") + Result> list(@RequestBody SysDept dept, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); } diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java index b7f4d60..2d25c47 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java @@ -1,14 +1,17 @@ package com.muyu.common.system.remote.factory; import com.muyu.common.core.domain.Result; -import com.muyu.common.system.remote.RemoteUserService; -import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.domain.LoginUser; +import com.muyu.common.system.domain.SysDept; +import com.muyu.common.system.domain.SysUser; +import com.muyu.common.system.remote.RemoteUserService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.stereotype.Component; +import java.util.List; + /** * 用户服务降级处理 * @@ -19,18 +22,33 @@ public class RemoteUserFallbackFactory implements FallbackFactory getUserInfo (String username, String source) { + public Result getUserInfo(String username, String source) { return Result.error("获取用户失败:" + throwable.getMessage()); } @Override - public Result registerUserInfo (SysUser sysUser, String source) { + public Result registerUserInfo(SysUser sysUser, String source) { return Result.error("注册用户失败:" + throwable.getMessage()); } + + @Override + public Result> list(SysUser user, String source) { + return Result.error("用户列表获取失败" + throwable.getMessage()); + } + + @Override + public Result getInfo(Long deptId, String source) { + return Result.error("用户获取失败" + throwable.getMessage()); + } + + @Override + public Result> list(SysDept dept, String source) { + return Result.error("部门列表获取失败" + throwable.getMessage()); + } }; } } diff --git a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-common/pom.xml b/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-common/pom.xml new file mode 100644 index 0000000..06bebaf --- /dev/null +++ b/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-common/pom.xml @@ -0,0 +1,30 @@ + + + 4.0.0 + + com.muyu + muyu-ruleEngine + 3.6.3 + + + muyu-ruleEngine-common + + + 17 + 17 + UTF-8 + + + + + com.muyu + muyu-common-core + + + com.muyu + muyu-common-security + + + diff --git a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-common/src/main/java/com/muyu/engine/domain/RuleEngine.java b/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-common/src/main/java/com/muyu/engine/domain/RuleEngine.java new file mode 100644 index 0000000..e70a2aa --- /dev/null +++ b/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-common/src/main/java/com/muyu/engine/domain/RuleEngine.java @@ -0,0 +1,61 @@ +package com.muyu.engine.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.web.domain.BaseEntity; + +/** + * 规则引擎对象 rule_engine + * + * @author Saisai + * @date 2024-05-03 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@SuperBuilder +public class RuleEngine extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + @TableId(value = "id",type = IdType.AUTO) + private Long id; + + /** 规则名称 */ + @Excel(name = "规则名称") + private String name; + + /** 规则类型 */ + @Excel(name = "规则类型") + private String type; + + /** 规则作用域 */ + @Excel(name = "规则作用域") + private String level; + + /** 引擎编码 */ + @Excel(name = "引擎编码") + private String code; + + /** 描述 */ + @Excel(name = "描述") + private String description; + + /** 是否激活 */ + @Excel(name = "是否激活") + private String isActivate; + + /** 规则状态 */ + @Excel(name = "规则状态") + private String status; + + +} diff --git a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-remote/pom.xml b/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-remote/pom.xml new file mode 100644 index 0000000..b125bcc --- /dev/null +++ b/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-remote/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + com.muyu + muyu-ruleEngine + 3.6.3 + + + muyu-ruleEngine-remote + + + 17 + 17 + UTF-8 + + + diff --git a/muyu-modules/muyv-etl/muyu-etl-remote/src/main/java/com/muyu/Main.java b/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-remote/src/main/java/com/muyu/Main.java similarity index 100% rename from muyu-modules/muyv-etl/muyu-etl-remote/src/main/java/com/muyu/Main.java rename to muyu-modules/muyu-ruleEngine/muyu-ruleEngine-remote/src/main/java/com/muyu/Main.java diff --git a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/pom.xml b/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/pom.xml new file mode 100644 index 0000000..9754afe --- /dev/null +++ b/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/pom.xml @@ -0,0 +1,120 @@ + + + 4.0.0 + + com.muyu + muyu-ruleEngine + 3.6.3 + + + muyu-ruleEngine-service + + + 17 + 17 + UTF-8 + + + + + org.postgresql + postgresql + 42.3.8 + + + + com.muyu + muyu-ruleEngine-common + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + + com.mysql + mysql-connector-j + + + + + com.muyu + muyu-common-datasource + + + + + com.muyu + muyu-common-datascope + + + + + com.muyu + muyu-common-log + + + + + com.muyu + muyu-common-swagger + + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + diff --git a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/controller/RuleEngineController.java b/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/controller/RuleEngineController.java new file mode 100644 index 0000000..31422e6 --- /dev/null +++ b/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/controller/RuleEngineController.java @@ -0,0 +1,98 @@ +package com.muyu.engine.controller; + +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.poi.ExcelUtil; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.common.log.annotation.Log; +import com.muyu.common.log.enums.BusinessType; +import com.muyu.common.security.annotation.RequiresPermissions; +import com.muyu.engine.domain.RuleEngine; +import com.muyu.engine.service.RuleEngineService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 规则引擎Controller + * + * @author Saisai + * @date 2024-05-03 + */ +@RestController +@RequestMapping("/engine") +public class RuleEngineController extends BaseController +{ + @Autowired + private RuleEngineService ruleEngineService; + + /** + * 查询规则引擎列表 + */ + @RequiresPermissions("engine:engine:list") + @GetMapping("/list") + public Result> list(RuleEngine ruleEngine) + { + startPage(); + List list = ruleEngineService.selectRuleEngineList(ruleEngine); + return getDataTable(list); + } + + /** + * 导出规则引擎列表 + */ + @RequiresPermissions("engine:engine:export") + @Log(title = "规则引擎", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, RuleEngine ruleEngine) + { + List list = ruleEngineService.selectRuleEngineList(ruleEngine); + ExcelUtil util = new ExcelUtil(RuleEngine.class); + util.exportExcel(response, list, "规则引擎数据"); + } + + /** + * 获取规则引擎详细信息 + */ + @RequiresPermissions("engine:engine:query") + @GetMapping(value = "/{id}") + public Result getInfo(@PathVariable("id") Long id) + { + return success(ruleEngineService.selectRuleEngineById(id)); + } + + /** + * 新增规则引擎 + */ + @RequiresPermissions("engine:engine:add") + @Log(title = "规则引擎", businessType = BusinessType.INSERT) + @PostMapping + public Result add(@RequestBody RuleEngine ruleEngine) + { + return toAjax(ruleEngineService.insertRuleEngine(ruleEngine)); + } + + /** + * 修改规则引擎 + */ + @RequiresPermissions("engine:engine:edit") + @Log(title = "规则引擎", businessType = BusinessType.UPDATE) + @PutMapping + public Result edit(@RequestBody RuleEngine ruleEngine) + { + return toAjax(ruleEngineService.updateRuleEngine(ruleEngine)); + } + + /** + * 删除规则引擎 + */ + @RequiresPermissions("engine:engine:remove") + @Log(title = "规则引擎", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public Result remove(@PathVariable Long[] ids) + { + return toAjax(ruleEngineService.deleteRuleEngineByIds(ids)); + } +} diff --git a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/mapper/RuleEngineMapper.java b/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/mapper/RuleEngineMapper.java new file mode 100644 index 0000000..1b1956b --- /dev/null +++ b/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/mapper/RuleEngineMapper.java @@ -0,0 +1,63 @@ +package com.muyu.engine.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.engine.domain.RuleEngine; + +import java.util.List; + +/** + * 规则引擎Mapper接口 + * + * @author Saisai + * @date 2024-05-03 + */ +public interface RuleEngineMapper extends BaseMapper +{ + /** + * 查询规则引擎 + * + * @param id 规则引擎主键 + * @return 规则引擎 + */ + public RuleEngine selectRuleEngineById(Long id); + + /** + * 查询规则引擎列表 + * + * @param ruleEngine 规则引擎 + * @return 规则引擎集合 + */ + public List selectRuleEngineList(RuleEngine ruleEngine); + + /** + * 新增规则引擎 + * + * @param ruleEngine 规则引擎 + * @return 结果 + */ + public int insertRuleEngine(RuleEngine ruleEngine); + + /** + * 修改规则引擎 + * + * @param ruleEngine 规则引擎 + * @return 结果 + */ + public int updateRuleEngine(RuleEngine ruleEngine); + + /** + * 删除规则引擎 + * + * @param id 规则引擎主键 + * @return 结果 + */ + public int deleteRuleEngineById(Long id); + + /** + * 批量删除规则引擎 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteRuleEngineByIds(Long[] ids); +} diff --git a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/service/RuleEngineService.java b/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/service/RuleEngineService.java new file mode 100644 index 0000000..6253fdc --- /dev/null +++ b/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/service/RuleEngineService.java @@ -0,0 +1,63 @@ +package com.muyu.engine.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.engine.domain.RuleEngine; + +import java.util.List; + +/** + * 规则引擎Service接口 + * + * @author Saisai + * @date 2024-05-03 + */ +public interface RuleEngineService extends IService +{ + /** + * 查询规则引擎 + * + * @param id 规则引擎主键 + * @return 规则引擎 + */ + public RuleEngine selectRuleEngineById(Long id); + + /** + * 查询规则引擎列表 + * + * @param ruleEngine 规则引擎 + * @return 规则引擎集合 + */ + public List selectRuleEngineList(RuleEngine ruleEngine); + + /** + * 新增规则引擎 + * + * @param ruleEngine 规则引擎 + * @return 结果 + */ + public int insertRuleEngine(RuleEngine ruleEngine); + + /** + * 修改规则引擎 + * + * @param ruleEngine 规则引擎 + * @return 结果 + */ + public int updateRuleEngine(RuleEngine ruleEngine); + + /** + * 批量删除规则引擎 + * + * @param ids 需要删除的规则引擎主键集合 + * @return 结果 + */ + public int deleteRuleEngineByIds(Long[] ids); + + /** + * 删除规则引擎信息 + * + * @param id 规则引擎主键 + * @return 结果 + */ + public int deleteRuleEngineById(Long id); +} diff --git a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/service/impl/RuleEngineServiceImpl.java b/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/service/impl/RuleEngineServiceImpl.java new file mode 100644 index 0000000..0b1635c --- /dev/null +++ b/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/service/impl/RuleEngineServiceImpl.java @@ -0,0 +1,100 @@ +package com.muyu.engine.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.utils.DateUtils; +import com.muyu.engine.domain.RuleEngine; +import com.muyu.engine.mapper.RuleEngineMapper; +import com.muyu.engine.service.RuleEngineService; +import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 规则引擎Service业务层处理 + * + * @author Saisai + * @date 2024-05-03 + */ +@Service +@Log4j2 +public class RuleEngineServiceImpl extends ServiceImpl implements RuleEngineService +{ + @Autowired + private RuleEngineMapper ruleEngineMapper; + + /** + * 查询规则引擎 + * + * @param id 规则引擎主键 + * @return 规则引擎 + */ + @Override + public RuleEngine selectRuleEngineById(Long id) + { + return ruleEngineMapper.selectRuleEngineById(id); + } + + /** + * 查询规则引擎列表 + * + * @param ruleEngine 规则引擎 + * @return 规则引擎 + */ + @Override + public List selectRuleEngineList(RuleEngine ruleEngine) + { + return ruleEngineMapper.selectRuleEngineList(ruleEngine); + } + + /** + * 新增规则引擎 + * + * @param ruleEngine 规则引擎 + * @return 结果 + */ + @Override + public int insertRuleEngine(RuleEngine ruleEngine) + { + ruleEngine.setCreateTime(DateUtils.getNowDate()); + return ruleEngineMapper.insertRuleEngine(ruleEngine); + } + + /** + * 修改规则引擎 + * + * @param ruleEngine 规则引擎 + * @return 结果 + */ + @Override + public int updateRuleEngine(RuleEngine ruleEngine) + { + ruleEngine.setUpdateTime(DateUtils.getNowDate()); + return ruleEngineMapper.updateRuleEngine(ruleEngine); + } + + /** + * 批量删除规则引擎 + * + * @param ids 需要删除的规则引擎主键 + * @return 结果 + */ + @Override + public int deleteRuleEngineByIds(Long[] ids) + { + return ruleEngineMapper.deleteRuleEngineByIds(ids); + } + + /** + * 删除规则引擎信息 + * + * @param id 规则引擎主键 + * @return 结果 + */ + @Override + public int deleteRuleEngineById(Long id) + { + return ruleEngineMapper.deleteRuleEngineById(id); + } +} diff --git a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/resources/bootstrap.yml b/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..83ed317 --- /dev/null +++ b/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/resources/bootstrap.yml @@ -0,0 +1,28 @@ +# Tomcat +server: + port: 9206 + +# Spring +spring: + application: + # 应用名称 + name: muyu-engine + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 43.142.100.73:8848 + config: + # 配置中心地址 + server-addr: 43.142.100.73:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +logging: + level: + com.muyu.etl.mapper: DEBUG diff --git a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/resources/mapper/RuleEngineMapper.xml b/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/resources/mapper/RuleEngineMapper.xml new file mode 100644 index 0000000..262bb95 --- /dev/null +++ b/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/resources/mapper/RuleEngineMapper.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + select id, name, type, level, code,description, isActivate, status, remark, create_by, create_time, update_by, update_time from rule_engine + + + + + + + + insert into rule_engine + + id, + name, + type, + level, + code, + description, + isActivate, + status, + remark, + create_by, + create_time, + update_by, + update_time, + + + #{id}, + #{name}, + #{type}, + #{level}, + #{code}, + #{description}, + #{isActivate}, + #{status}, + #{remark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update rule_engine + + name = #{name}, + type = #{type}, + level = #{level}, + code = #{code}, + description = #{description}, + isActivate = #{isActivate}, + status = #{status}, + remark = #{remark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from rule_engine where id = #{id} + + + + delete from rule_engine where id in + + #{id} + + + diff --git a/muyu-modules/muyu-ruleEngine/pom.xml b/muyu-modules/muyu-ruleEngine/pom.xml new file mode 100644 index 0000000..33b2b1e --- /dev/null +++ b/muyu-modules/muyu-ruleEngine/pom.xml @@ -0,0 +1,27 @@ + + + 4.0.0 + + com.muyu + muyu-modules + 3.6.3 + ../pom.xml + + + muyu-ruleEngine + pom + + muyu-ruleEngine-common + muyu-ruleEngine-remote + muyu-ruleEngine-service + + + + 17 + 17 + UTF-8 + + + diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDeptController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDeptController.java index 1cf3409..158fdfd 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDeptController.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDeptController.java @@ -34,7 +34,7 @@ public class SysDeptController extends BaseController { */ @RequiresPermissions("system:dept:list") @GetMapping("/list") - public Result list (SysDept dept) { + public Result> list (SysDept dept) { List depts = deptService.selectDeptList(dept); return success(depts); } diff --git a/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/AssetImpower.java b/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/AssetImpower.java index e37f934..41abb69 100644 --- a/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/AssetImpower.java +++ b/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/AssetImpower.java @@ -2,6 +2,8 @@ package com.muyu.etl.domain; import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.web.domain.BaseEntity; +import com.muyu.common.system.domain.SysDept; +import com.muyu.common.system.domain.SysUser; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -37,7 +39,13 @@ public class AssetImpower extends BaseEntity { * 部门id */ @Excel(name = "部门id") - private Long typeId; + private Long deptId; + + /** + * 接入id + */ + @Excel(name = "接入id") + private Long basicId; /** * 用户id @@ -45,4 +53,13 @@ public class AssetImpower extends BaseEntity { @Excel(name = "用户id") private Long userId; + public static AssetImpower saveAssetImpower(Long deptId,Long userId,AssetImpower assetImpower){ + return AssetImpower.builder() + .basicId(assetImpower.getBasicId()) + .tableId(assetImpower.getTableId()) + .deptId(deptId) + .userId(userId) + .build(); + } + } diff --git a/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/TableInfo.java b/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/TableInfo.java index f3818bf..9630159 100644 --- a/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/TableInfo.java +++ b/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/TableInfo.java @@ -37,6 +37,11 @@ public class TableInfo extends TreeEntity @Excel(name = "表备注") private String tableRemark; + /** 表备注 */ + @Excel(name = "数据来源类型") + private String type; + + /** 数据量 */ @Excel(name = "数据量") private Long dataNum; diff --git a/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/req/AssetImpowerReq.java b/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/req/AssetImpowerReq.java index 054746b..875f468 100644 --- a/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/req/AssetImpowerReq.java +++ b/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/req/AssetImpowerReq.java @@ -34,11 +34,17 @@ public class AssetImpowerReq { @Excel(name = "表id") private Long tableId; + /** + * 接入id + */ + @Excel(name = "接入id") + private Long basicId; + /** * 部门id */ @Excel(name = "部门id") - private Long typeId; + private Long deptId; /** * 用户id diff --git a/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/resp/BasicTableInfoResp.java b/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/resp/BasicTableInfoResp.java new file mode 100644 index 0000000..1e8e9e6 --- /dev/null +++ b/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/resp/BasicTableInfoResp.java @@ -0,0 +1,63 @@ +package com.muyu.etl.domain.resp; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 接入--表基础信息（授权） + * + * @ClassName BasicTableInfoResp + * @Description 描述 + * @Author SaiSai.Liu + * @Date 2024/4/30 11:58 + */ +@Data +@SuperBuilder +@AllArgsConstructor +@NoArgsConstructor +public class BasicTableInfoResp { + + + /** + * 表id + */ + private Long id; + + /** + * 接入id + */ + private Long basicId; + + /** + * 数据接入名 + */ + private String dataResourceName; + + /** + * 数据接入系统名 + */ + private String dataSourcesSystemName; + + /** + * 数据库名 + */ + private String databaseName; + + /** + * 表名（中文） + */ + private String tableRemark; + + /** + * 表明 + */ + private String tableName; + + /** + * 数据条数 + */ + private Long totalNum; + +} diff --git a/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/resp/TableInfoStructureResp.java b/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/resp/TableInfoStructureResp.java index 6c63dc1..3728810 100644 --- a/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/resp/TableInfoStructureResp.java +++ b/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/resp/TableInfoStructureResp.java @@ -45,10 +45,14 @@ public class TableInfoStructureResp /** 数据量 */ @Excel(name = "数据量") private Long dataNum; + /** 表备注 */ + @Excel(name = "数据来源类型") + private String type; /** 是否核心 'Y'是 'N'不是 */ @Excel(name = "是否核心 'Y'是 'N'不是") private String center; + private String databaseType; private List structureList; diff --git a/muyu-modules/muyv-etl/muyu-etl-remote/pom.xml b/muyu-modules/muyv-etl/muyu-etl-remote/pom.xml index 8ccef2d..544f0f9 100644 --- a/muyu-modules/muyv-etl/muyu-etl-remote/pom.xml +++ b/muyu-modules/muyv-etl/muyu-etl-remote/pom.xml @@ -11,10 +11,18 @@ muyu-etl-remote + 17 17 UTF-8 + + + org.springframework.cloud + spring-cloud-openfeign-core + 3.1.0 + + diff --git a/muyu-modules/muyv-etl/muyu-etl-service/pom.xml b/muyu-modules/muyv-etl/muyu-etl-service/pom.xml index 9fb0594..f24506b 100644 --- a/muyu-modules/muyv-etl/muyu-etl-service/pom.xml +++ b/muyu-modules/muyv-etl/muyu-etl-service/pom.xml @@ -90,6 +90,7 @@ muyu-common-swagger + diff --git a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/MuYuEtlApplication.java b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/MuYuEtlApplication.java index d2c8c59..6128422 100644 --- a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/MuYuEtlApplication.java +++ b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/MuYuEtlApplication.java @@ -5,10 +5,12 @@ import com.muyu.common.security.annotation.EnableMyFeignClients; import com.muyu.common.swagger.annotation.EnableCustomSwagger2; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; @EnableCustomConfig @EnableCustomSwagger2 @EnableMyFeignClients +@EnableFeignClients @SpringBootApplication public class MuYuEtlApplication { public static void main(String[] args) { diff --git a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/controller/AssetImpowerController.java b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/controller/AssetImpowerController.java index 88c1d6b..3c24c4f 100644 --- a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/controller/AssetImpowerController.java +++ b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/controller/AssetImpowerController.java @@ -101,4 +101,19 @@ public class AssetImpowerController extends BaseController { return toAjax(assetImpowerService.deleteAssetImpowerByIds(ids)); } + + + /** + * 删除资产赋权 + */ + @RequiresPermissions("etl:impower:list") + @Log(title = "资产赋权", businessType = BusinessType.DELETE) + @DeleteMapping("getPowerByTableId/{tableId}") + public Result getPowerByTableId(@PathVariable Long tableId) + { + return Result.success(assetImpowerService.getPowerByTableId(tableId)); + } + + + } diff --git a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/controller/BasicConfigInfoController.java b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/controller/BasicConfigInfoController.java index c48e024..ea8bb87 100644 --- a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/controller/BasicConfigInfoController.java +++ b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/controller/BasicConfigInfoController.java @@ -187,6 +187,18 @@ public class BasicConfigInfoController extends BaseController { return Result.success(dictInfoService.insertDictInfo(dictInfo)); } + /** + * 获取具体表的所有基础信息 + * + * @return + */ + @RequiresPermissions("etl:table:list") + @Log(title = "获取具体表的所有基础信息") + @GetMapping("/getBasicTableInfo/{tableId}") + public Result getBasicTableInfo(@PathVariable Long tableId) throws ServletException { + return Result.success(basicConfigInfoService.getBasicTableInfo(tableId)); + } + /** * 修改资产结构中字典信息 * diff --git a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/AssetImpowerService.java b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/AssetImpowerService.java index 9dc3360..fb3295f 100644 --- a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/AssetImpowerService.java +++ b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/AssetImpowerService.java @@ -60,4 +60,6 @@ public interface AssetImpowerService extends IService * @return 结果 */ public int deleteAssetImpowerById(Long id); + + List getPowerByTableId(Long tableId); } diff --git a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/BasicConfigInfoService.java b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/BasicConfigInfoService.java index 23a57d5..061c77c 100644 --- a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/BasicConfigInfoService.java +++ b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/BasicConfigInfoService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.etl.domain.BasicConfigInfo; +import com.muyu.etl.domain.resp.BasicTableInfoResp; import com.muyu.etl.domain.resp.TableInfoStructureResp; import com.muyu.etl.domain.resp.TableTreeResp; @@ -73,4 +74,6 @@ public interface BasicConfigInfoService extends IService List getTableTree(); TableInfoStructureResp getTableInfo(Long tableId); + + BasicTableInfoResp getBasicTableInfo(Long tableId); } diff --git a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/AssetImpowerServiceImpl.java b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/AssetImpowerServiceImpl.java index ad372da..d8f78f3 100644 --- a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/AssetImpowerServiceImpl.java +++ b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/AssetImpowerServiceImpl.java @@ -1,14 +1,23 @@ package com.muyu.etl.service.impl; -import java.util.List; - +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.constant.SecurityConstants; import com.muyu.common.core.utils.DateUtils; +import com.muyu.common.system.domain.SysDept; +import com.muyu.common.system.domain.SysUser; +import com.muyu.common.system.remote.RemoteUserService; +import com.muyu.etl.domain.AssetImpower; +import com.muyu.etl.domain.TableInfo; +import com.muyu.etl.mapper.AssetImpowerMapper; +import com.muyu.etl.service.AssetImpowerService; +import com.muyu.etl.service.TableInfoService; +import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.muyu.etl.mapper.AssetImpowerMapper; -import com.muyu.etl.domain.AssetImpower; -import com.muyu.etl.service.AssetImpowerService; + +import java.util.ArrayList; +import java.util.List; /** * 资产赋权Service业务层处理 @@ -17,10 +26,14 @@ import com.muyu.etl.service.AssetImpowerService; * @date 2024-04-28 */ @Service -public class AssetImpowerServiceImpl extends ServiceImpl implements AssetImpowerService -{ +@Log4j2 +public class AssetImpowerServiceImpl extends ServiceImpl implements AssetImpowerService { @Autowired private AssetImpowerMapper assetImpowerMapper; + @Autowired + private TableInfoService tableInfoService; + @Autowired + private RemoteUserService remoteUserService; /** * 查询资产赋权 @@ -29,8 +42,7 @@ public class AssetImpowerServiceImpl extends ServiceImpl selectAssetImpowerList(AssetImpower assetImpower) - { + public List selectAssetImpowerList(AssetImpower assetImpower) { return assetImpowerMapper.selectAssetImpowerList(assetImpower); } @@ -53,10 +64,58 @@ public class AssetImpowerServiceImpl extends ServiceImpl rows = new ArrayList<>(); assetImpower.setCreateTime(DateUtils.getNowDate()); - return assetImpowerMapper.insertAssetImpower(assetImpower); + //创建一个部门容器和用户容器 + List deptList = remoteUserService.list(new SysDept(), SecurityConstants.INNER).getData(); + System.out.println(remoteUserService.list(new SysDept(), SecurityConstants.INNER)); + //单表单个用户赋权 + if (assetImpower.getTableId() != null && assetImpower.getUserId() != null) { + rows.add(assetImpower); + } + //单表多用户赋权 + if (assetImpower.getTableId() != null) { + //根据id过滤部门 + SysDept dept = remoteUserService.getInfo(assetImpower.getDeptId(), SecurityConstants.INNER).getData(); + deptList.addAll(getChildSysDept(deptList, dept)); + List finalRows = rows; + deptList.stream().distinct().forEach(sysDept -> { + //该部门下的用户列表 + remoteUserService.list(new SysUser() {{ + setDeptId(sysDept.getDeptId()); + }}, SecurityConstants.INNER).getData() + .forEach(sysUser -> finalRows.add(AssetImpower.saveAssetImpower(sysDept.getDeptId(), sysUser.getUserId(), assetImpower))); + }); + rows = rows.stream().distinct().toList(); + } + //多表单用户赋权 + if (assetImpower.getUserId() != null) { + List tableInfoList = tableInfoService.selectTableInfoList(new TableInfo() {{ + setBasicId(assetImpower.getBasicId()); + }}); + List finalRows = rows; + tableInfoList.forEach(tableInfo -> finalRows.add(AssetImpower.saveAssetImpower( + assetImpower.getDeptId(), assetImpower.getUserId(), new AssetImpower() {{ + setBasicId(assetImpower.getBasicId()); + setTableId(tableInfo.getId()); + }}))); + } + boolean b = this.saveBatch(rows); + return 1; + } + + //递归获取子级部门 + public List getChildSysDept(List deptList, SysDept sysDept) { + List list = new ArrayList<>(); + List deptChildList = new ArrayList<>(deptList); + list.addAll(deptChildList.stream() + .distinct() + .filter(dept -> dept.getParentId().equals(sysDept.getDeptId())).toList()); + if (!list.isEmpty()) { + list.forEach(sysDeptChild -> deptChildList.addAll(this.getChildSysDept(deptChildList, sysDeptChild))); + } + return list; } /** @@ -66,8 +125,7 @@ public class AssetImpowerServiceImpl extends ServiceImpl getPowerByTableId(Long tableId) { + return this.selectAssetImpowerList(new AssetImpower() {{ + setTableId(tableId); + }}); + } } diff --git a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java index fd6f72c..457bcdb 100644 --- a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java +++ b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java @@ -7,6 +7,7 @@ import com.muyu.common.security.utils.SecurityUtils; import com.muyu.etl.domain.BasicConfigInfo; import com.muyu.etl.domain.Structure; import com.muyu.etl.domain.TableInfo; +import com.muyu.etl.domain.resp.BasicTableInfoResp; import com.muyu.etl.domain.resp.TableInfoStructureResp; import com.muyu.etl.domain.resp.TableTreeResp; import com.muyu.etl.mapper.BasicConfigInfoMapper; @@ -116,6 +117,7 @@ public class BasicConfigInfoServiceImpl extends ServiceImpl{ + threadPool.submit(() -> { try { syncData(finalConn, databaseName, table); } catch (SQLException e) { @@ -223,6 +227,7 @@ public class BasicConfigInfoServiceImpl extends ServiceImpl { TableInfoStructureResp tableInfoStructureResp = null; Future submit = threadPool.submit(() -> { -// List structureList = structureService.list(new LambdaQueryWrapper().eq(Structure::getTableId, info.getId())); return TableInfoStructureResp.builder() .id(info.getId()) .tableName(info.getTableName()) .center(info.getCenter()) .tableRemark(info.getTableRemark()) + .type(info.getType()) .dataNum(info.getDataNum()) .parentId(info.getParentId()) .databaseType(basicConfigInfo.getDatabaseType()) @@ -362,5 +367,44 @@ public class BasicConfigInfoServiceImpl extends ServiceImpl + - + @@ -17,14 +18,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, table_id, type_id, user_id, remark, create_by, create_time, update_by, update_time from asset_impower + select id,basic_id , table_id, dept_id, user_id, remark, create_by, create_time, update_by, update_time from asset_impower @@ -37,8 +38,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into asset_impower + basic_id, table_id, - type_id, + dept_id, user_id, remark, create_by, @@ -47,8 +49,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, + #{basicId}, #{tableId}, - #{typeId}, + #{deptId}, #{userId}, #{remark}, #{createBy}, @@ -61,8 +64,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update asset_impower + basic_id = #{basicId}, table_id = #{tableId}, - type_id = #{typeId}, + dept_id = #{deptId}, user_id = #{userId}, remark = #{remark}, create_by = #{createBy}, diff --git a/muyu-modules/muyv-etl/muyu-etl-service/src/main/resources/mapper/TableInfoMapper.xml b/muyu-modules/muyv-etl/muyu-etl-service/src/main/resources/mapper/TableInfoMapper.xml index 894931d..bef0344 100644 --- a/muyu-modules/muyv-etl/muyu-etl-service/src/main/resources/mapper/TableInfoMapper.xml +++ b/muyu-modules/muyv-etl/muyu-etl-service/src/main/resources/mapper/TableInfoMapper.xml @@ -12,6 +12,7 @@ + @@ -20,18 +21,18 @@ - select id, parent_id, basic_id,table_name, table_remark, data_num, center, remark, create_by, create_time, update_by, update_time from table_info + select id, parent_id,type, basic_id,table_name, table_remark, data_num, center, remark, create_by, create_time, update_by, update_time from table_info @@ -42,8 +43,8 @@ + where basic_id = #{basicId} and (table_name = #{tableName} or parent_id = #{parentId}) + @@ -51,6 +52,7 @@ parent_id, basic_id, + type, table_name, table_remark, data_num, @@ -64,6 +66,7 @@ #{parentId}, #{basicId}, + #{type}, #{tableName}, #{tableRemark}, #{dataNum}, @@ -81,6 +84,7 @@ parent_id = #{parentId}, basic_id = #{basicId}, + type = #{type}, table_name = #{tableName}, table_remark = #{tableRemark}, data_num = #{dataNum}, diff --git a/muyu-modules/pom.xml b/muyu-modules/pom.xml index a7d2f86..1b901cf 100644 --- a/muyu-modules/pom.xml +++ b/muyu-modules/pom.xml @@ -14,6 +14,7 @@ muyu-job muyu-file muyv-etl + muyu-ruleEngine muyu-modules diff --git a/pom.xml b/pom.xml index debb68d..949907b 100644 --- a/pom.xml +++ b/pom.xml @@ -213,6 +213,13 @@ ${muyu.version} + + + com.muyu + muyu-ruleEngine-common + ${muyu.version} + +