From e9fce2f45de6d6a37b230094b5607a73dde4a1be Mon Sep 17 00:00:00 2001 From: baize <3533151373@qq.com> Date: Sun, 5 May 2024 15:19:45 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=20=20=20=20=E8=A7=84=E5=88=99=E5=BC=95?= =?UTF-8?q?=E6=93=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DictionaryController.java | 27 ++- .../data/source/mapper/DictionaryMapper.java | 8 + .../source/service/DictionaryService.java | 8 + .../service/impl/DictionaryServiceImpl.java | 20 +++ .../mapper/dataSource/DictionaryMapper.xml | 17 ++ .../com/muyu/job/config/ScheduleConfig.java | 4 +- .../muyu-rule_engine-common/pom.xml | 25 +++ .../muyu/ruleEngine/domain/EngineConfig.java | 97 +++++++++++ .../ruleEngine/domain/EngineMaintenance.java | 119 +++++++++++++ .../ruleEngine/domain/model/TestData.java | 23 +++ .../domain/req/EngineConfigEditReq.java | 38 +++++ .../domain/req/EngineConfigQueryReq.java | 38 +++++ .../domain/req/EngineConfigSaveReq.java | 46 +++++ .../domain/req/EngineMaintenanceEditReq.java | 49 ++++++ .../domain/req/EngineMaintenanceQueryReq.java | 49 ++++++ .../domain/req/EngineMaintenanceSaveReq.java | 60 +++++++ .../domain/resp/EngineConfigScopeResp.java | 27 +++ .../muyu-rule_engine-remote/pom.xml | 19 +++ .../muyu-rule_engine-server/pom.xml | 124 ++++++++++++++ .../ruleEngine/MuYuRuleEngineApplication.java | 23 +++ .../controller/EngineConfigController.java | 111 ++++++++++++ .../EngineMaintenanceController.java | 112 ++++++++++++ .../ruleEngine/dynamicLoad/DynamicLoader.java | 78 +++++++++ .../dynamicLoad/MemoryJavaFileManager.java | 143 ++++++++++++++++ .../ruleEngine/mapper/EngineConfigMapper.java | 14 ++ .../mapper/EngineMaintenanceMapper.java | 14 ++ .../scope/DataModelContextHolder.java | 19 +++ .../scope/DataSetContextHolder.java | 19 +++ .../ruleEngine/scope/RecordContextHolder.java | 19 +++ .../ruleEngine/scope/TaskContextHolder.java | 14 ++ .../com/muyu/ruleEngine/scope/TestClass.txt | 10 ++ .../service/EngineConfigService.java | 43 +++++ .../service/EngineMaintenanceService.java | 35 ++++ .../service/impl/EngineConfigServiceImpl.java | 161 ++++++++++++++++++ .../impl/EngineMaintenanceServiceImpl.java | 105 ++++++++++++ .../src/main/resources/banner.txt | 8 + .../src/main/resources/bootstrap.yml | 29 ++++ .../src/main/resources/logback.xml | 74 ++++++++ muyu-modules/muyu-rule_engine/pom.xml | 26 +++ muyu-modules/muyu-system/pom.xml | 15 +- .../controller/AsUserDeptController.java | 113 ------------ .../system/controller/SysMenuController.java | 3 - .../controller/SysNoticeController.java | 7 - .../system/controller/SysUserController.java | 27 +-- .../com/muyu/system/domain/AsUserDept.java | 84 --------- .../com/muyu/system/domain/SysNotice.java | 11 -- .../system/domain/req/SysNoticeRequest.java | 26 --- .../domain/resp/AsUserDeptNumResponse.java | 24 --- .../system/domain/resp/SysNoticeResponse.java | 34 ---- .../muyu/system/mapper/AsUserDeptMapper.java | 71 -------- .../com/muyu/system/mapper/SysMenuMapper.java | 3 - .../muyu/system/mapper/SysNoticeMapper.java | 7 - .../com/muyu/system/mapper/SysUserMapper.java | 3 - .../system/service/IAsUserDeptService.java | 69 -------- .../muyu/system/service/SysMenuService.java | 2 - .../muyu/system/service/SysNoticeService.java | 5 - .../muyu/system/service/SysUserService.java | 2 - .../service/impl/AsUserDeptServiceImpl.java | 119 ------------- .../service/impl/SysMenuServiceImpl.java | 46 ----- .../service/impl/SysNoticeServiceImpl.java | 80 +-------- .../service/impl/SysUserServiceImpl.java | 13 +- .../mapper/system/AsUserDeptMapper.xml | 104 ----------- .../resources/mapper/system/SysMenuMapper.xml | 32 ---- .../mapper/system/SysNoticeMapper.xml | 16 +- .../resources/mapper/system/SysUserMapper.xml | 10 +- muyu-modules/pom.xml | 1 + 66 files changed, 1873 insertions(+), 909 deletions(-) create mode 100644 muyu-modules/muyu-rule_engine/muyu-rule_engine-common/pom.xml create mode 100644 muyu-modules/muyu-rule_engine/muyu-rule_engine-common/src/main/java/com/muyu/ruleEngine/domain/EngineConfig.java create mode 100644 muyu-modules/muyu-rule_engine/muyu-rule_engine-common/src/main/java/com/muyu/ruleEngine/domain/EngineMaintenance.java create mode 100644 muyu-modules/muyu-rule_engine/muyu-rule_engine-common/src/main/java/com/muyu/ruleEngine/domain/model/TestData.java create mode 100644 muyu-modules/muyu-rule_engine/muyu-rule_engine-common/src/main/java/com/muyu/ruleEngine/domain/req/EngineConfigEditReq.java create mode 100644 muyu-modules/muyu-rule_engine/muyu-rule_engine-common/src/main/java/com/muyu/ruleEngine/domain/req/EngineConfigQueryReq.java create mode 100644 muyu-modules/muyu-rule_engine/muyu-rule_engine-common/src/main/java/com/muyu/ruleEngine/domain/req/EngineConfigSaveReq.java create mode 100644 muyu-modules/muyu-rule_engine/muyu-rule_engine-common/src/main/java/com/muyu/ruleEngine/domain/req/EngineMaintenanceEditReq.java create mode 100644 muyu-modules/muyu-rule_engine/muyu-rule_engine-common/src/main/java/com/muyu/ruleEngine/domain/req/EngineMaintenanceQueryReq.java create mode 100644 muyu-modules/muyu-rule_engine/muyu-rule_engine-common/src/main/java/com/muyu/ruleEngine/domain/req/EngineMaintenanceSaveReq.java create mode 100644 muyu-modules/muyu-rule_engine/muyu-rule_engine-common/src/main/java/com/muyu/ruleEngine/domain/resp/EngineConfigScopeResp.java create mode 100644 muyu-modules/muyu-rule_engine/muyu-rule_engine-remote/pom.xml create mode 100644 muyu-modules/muyu-rule_engine/muyu-rule_engine-server/pom.xml create mode 100644 muyu-modules/muyu-rule_engine/muyu-rule_engine-server/src/main/java/com/muyu/ruleEngine/MuYuRuleEngineApplication.java create mode 100644 muyu-modules/muyu-rule_engine/muyu-rule_engine-server/src/main/java/com/muyu/ruleEngine/controller/EngineConfigController.java create mode 100644 muyu-modules/muyu-rule_engine/muyu-rule_engine-server/src/main/java/com/muyu/ruleEngine/controller/EngineMaintenanceController.java create mode 100644 muyu-modules/muyu-rule_engine/muyu-rule_engine-server/src/main/java/com/muyu/ruleEngine/dynamicLoad/DynamicLoader.java create mode 100644 muyu-modules/muyu-rule_engine/muyu-rule_engine-server/src/main/java/com/muyu/ruleEngine/dynamicLoad/MemoryJavaFileManager.java create mode 100644 muyu-modules/muyu-rule_engine/muyu-rule_engine-server/src/main/java/com/muyu/ruleEngine/mapper/EngineConfigMapper.java create mode 100644 muyu-modules/muyu-rule_engine/muyu-rule_engine-server/src/main/java/com/muyu/ruleEngine/mapper/EngineMaintenanceMapper.java create mode 100644 muyu-modules/muyu-rule_engine/muyu-rule_engine-server/src/main/java/com/muyu/ruleEngine/scope/DataModelContextHolder.java create mode 100644 muyu-modules/muyu-rule_engine/muyu-rule_engine-server/src/main/java/com/muyu/ruleEngine/scope/DataSetContextHolder.java create mode 100644 muyu-modules/muyu-rule_engine/muyu-rule_engine-server/src/main/java/com/muyu/ruleEngine/scope/RecordContextHolder.java create mode 100644 muyu-modules/muyu-rule_engine/muyu-rule_engine-server/src/main/java/com/muyu/ruleEngine/scope/TaskContextHolder.java create mode 100644 muyu-modules/muyu-rule_engine/muyu-rule_engine-server/src/main/java/com/muyu/ruleEngine/scope/TestClass.txt create mode 100644 muyu-modules/muyu-rule_engine/muyu-rule_engine-server/src/main/java/com/muyu/ruleEngine/service/EngineConfigService.java create mode 100644 muyu-modules/muyu-rule_engine/muyu-rule_engine-server/src/main/java/com/muyu/ruleEngine/service/EngineMaintenanceService.java create mode 100644 muyu-modules/muyu-rule_engine/muyu-rule_engine-server/src/main/java/com/muyu/ruleEngine/service/impl/EngineConfigServiceImpl.java create mode 100644 muyu-modules/muyu-rule_engine/muyu-rule_engine-server/src/main/java/com/muyu/ruleEngine/service/impl/EngineMaintenanceServiceImpl.java create mode 100644 muyu-modules/muyu-rule_engine/muyu-rule_engine-server/src/main/resources/banner.txt create mode 100644 muyu-modules/muyu-rule_engine/muyu-rule_engine-server/src/main/resources/bootstrap.yml create mode 100644 muyu-modules/muyu-rule_engine/muyu-rule_engine-server/src/main/resources/logback.xml create mode 100644 muyu-modules/muyu-rule_engine/pom.xml delete mode 100644 muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/AsUserDeptController.java delete mode 100644 muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/AsUserDept.java delete mode 100644 muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/req/SysNoticeRequest.java delete mode 100644 muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/AsUserDeptNumResponse.java delete mode 100644 muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/SysNoticeResponse.java delete mode 100644 muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/AsUserDeptMapper.java delete mode 100644 muyu-modules/muyu-system/src/main/java/com/muyu/system/service/IAsUserDeptService.java delete mode 100644 muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/AsUserDeptServiceImpl.java delete mode 100644 muyu-modules/muyu-system/src/main/resources/mapper/system/AsUserDeptMapper.xml diff --git a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/controller/DictionaryController.java b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/controller/DictionaryController.java index 1cbce9b..f6381ae 100644 --- a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/controller/DictionaryController.java +++ b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/controller/DictionaryController.java @@ -7,9 +7,7 @@ import com.muyu.data.source.service.DictionaryService; import io.swagger.annotations.Api; import lombok.Data; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.Dictionary; import java.util.List; @@ -29,7 +27,28 @@ public class DictionaryController { private DictionaryService dictionaryService; @GetMapping("/findDictionaryByStructureId") - public Result> findDictionaryByStructureId(Integer id) { + public Result> findDictionaryByStructureId(@RequestParam Integer id) { return dictionaryService.findDictionaryByStructureId(id); } + + @PostMapping("/addDictionaryType") + public Result addDictionaryType(@RequestBody DictionaryType dictionaryType) { + return dictionaryService.addDictionaryType(dictionaryType); + } + + @PostMapping("/addDictionaryData") + public Result addDictionaryData(@RequestBody DictionaryData dictionaryData) { + return dictionaryService.addDictionaryData(dictionaryData); + } + + @PostMapping("/deleteDictionaryData") + public Result deleteDictionaryData(@RequestParam Integer id) { + return dictionaryService.deleteDictionaryData(id); + } + + @PostMapping("/updateDictionaryData") + public Result updateDictionaryData(@RequestBody DictionaryData dictionaryData) { + return dictionaryService.updateDictionaryData(dictionaryData); + } + } diff --git a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/mapper/DictionaryMapper.java b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/mapper/DictionaryMapper.java index 10f23e4..c7732d3 100644 --- a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/mapper/DictionaryMapper.java +++ b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/mapper/DictionaryMapper.java @@ -18,4 +18,12 @@ public interface DictionaryMapper { List selectDictionaryByStructureId(Integer id); List selectDictionaryDataByType(@Param("dictionaryType") String dictionaryType); + + int addDictionaryType(DictionaryType dictionaryType); + + int addDictionaryData(DictionaryData dictionaryData); + + int deleteDictionaryData(@Param("id") Integer id); + + int updateDictionaryData(DictionaryData dictionaryData); } diff --git a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/DictionaryService.java b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/DictionaryService.java index 865a9fd..b33d9c3 100644 --- a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/DictionaryService.java +++ b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/DictionaryService.java @@ -14,4 +14,12 @@ import java.util.List; */ public interface DictionaryService { Result> findDictionaryByStructureId(Integer id); + + Result addDictionaryType(DictionaryType dictionaryType); + + Result addDictionaryData(DictionaryData dictionaryData); + + Result deleteDictionaryData(Integer id); + + Result updateDictionaryData(DictionaryData dictionaryData); } diff --git a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/impl/DictionaryServiceImpl.java b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/impl/DictionaryServiceImpl.java index af5d49d..0bdc456 100644 --- a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/impl/DictionaryServiceImpl.java +++ b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/impl/DictionaryServiceImpl.java @@ -47,4 +47,24 @@ public class DictionaryServiceImpl implements DictionaryService { }).toList(); return Result.success(list); } + + @Override + public Result addDictionaryType(DictionaryType dictionaryType) { + return dictionaryMapper.addDictionaryType(dictionaryType) > 0 ? Result.success("上传成功") : Result.error("添加失败"); + } + + @Override + public Result addDictionaryData(DictionaryData dictionaryData) { + return dictionaryMapper.addDictionaryData(dictionaryData) > 0 ? Result.success("添加成功") : Result.error("添加失败"); + } + + @Override + public Result deleteDictionaryData(Integer id) { + return dictionaryMapper.deleteDictionaryData(id) > 0 ? Result.success("删除成功") : Result.error("删除失败"); + } + + @Override + public Result updateDictionaryData(DictionaryData dictionaryData) { + return dictionaryMapper.updateDictionaryData(dictionaryData) > 0 ? Result.success("修改成功") : Result.error("修改失败"); + } } diff --git a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/resources/mapper/dataSource/DictionaryMapper.xml b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/resources/mapper/dataSource/DictionaryMapper.xml index 89626de..02cc423 100644 --- a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/resources/mapper/dataSource/DictionaryMapper.xml +++ b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/resources/mapper/dataSource/DictionaryMapper.xml @@ -3,6 +3,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + insert into dictionary_type(structure_id,dictionary_type,dictionary_name,create_time,update_time) + values(#{structureId},#{dictionaryType},#{dictionaryName},#{createTime},#{updateTime}) + + + insert into dictionary_data(dictionary_type,dictionary_label,dictionary_value) + values(#{dictionaryType},#{dictionaryLabel},#{dictionaryValue}) + + + update dictionary_data + set + dictionary_label = #{dictionaryLabel}, + dictionary_value = #{dictionaryValue} where id = #{id} + + + delete from dictionary_data where id = #{id} + - - - and user_id = #{userId} - and notice_id = #{noticeId} - and is_read = #{isRead} - - - - - - - - - insert into as_user_dept - - user_id, - notice_id, - is_read, - create_by, - create_time, - update_by, - update_time, - remark, - - - #{userId}, - #{noticeId}, - #{isRead}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{remark}, - - - - INSERT INTO `as_user_dept` (`user_id`, `notice_id`, `create_by`, `create_time`) - VALUES - - (#{asUserDept.userId}, #{asUserDept.noticeId}, #{asUserDept.createBy}, #{asUserDept.createTime}) - - - - - - - update as_user_dept - - user_id = #{userId}, - notice_id = #{noticeId}, - is_read = #{isRead}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - remark = #{remark}, - - where id = #{id} - - - update as_user_dept set is_read = 0 where id=#{id} - - - - delete from as_user_dept where id = #{id} - - - - delete from as_user_dept where id in - - #{id} - - - diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysMenuMapper.xml b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysMenuMapper.xml index a9a261e..1dac5c4 100644 --- a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -185,38 +185,6 @@ where menu_name=#{menuName} and parent_id = #{parentId} limit 1 - - - update sys_menu diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysNoticeMapper.xml index eb4397e..0687403 100644 --- a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysNoticeMapper.xml +++ b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -50,22 +50,8 @@ - - - + insert into sys_notice ( notice_title, notice_type, diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml index 540b0ca..6f633b7 100644 --- a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -152,7 +152,7 @@ - - insert into sys_user( diff --git a/muyu-modules/pom.xml b/muyu-modules/pom.xml index f3df8bf..8c53cf3 100644 --- a/muyu-modules/pom.xml +++ b/muyu-modules/pom.xml @@ -14,6 +14,7 @@ muyu-job muyu-file muyu-data-source + muyu-rule_engine muyu-modules