diff --git a/cloud-etl-server/src/main/java/com/muyu/controller/EngIneController.java b/cloud-etl-server/src/main/java/com/muyu/controller/EngIneController.java index d92453d..93aa52f 100644 --- a/cloud-etl-server/src/main/java/com/muyu/controller/EngIneController.java +++ b/cloud-etl-server/src/main/java/com/muyu/controller/EngIneController.java @@ -44,6 +44,9 @@ public class EngIneController extends BaseController { */ @PostMapping("/getMaintenanceList") public Result> getMaintenanceList(@RequestBody EngineMaintenanceQueryReq engineMaintenanceQueryReq) { + //使用mabits-plus-plus的查询方法 +// engineMaintenanceQueryReq.setPageNum(engineMaintenanceQueryReq.getPageNum()); +// engineMaintenanceQueryReq.setPageSize(engineMaintenanceQueryReq.getPageSize()); return engIneService.getMaintenanceList(engineMaintenanceQueryReq); } @@ -55,6 +58,8 @@ public class EngIneController extends BaseController { */ @PostMapping("/delete/{id}") public Integer remove(@PathVariable Long id) { + //使用mabits-plusplus的删除方法 +// engIneService.delete(id); return engIneService.deletes(id); } @@ -66,6 +71,8 @@ public class EngIneController extends BaseController { */ @PostMapping("/update") public Result update(@RequestBody EngineMaintenance engineMaintenance) { + //使用mabits-plusplus的修改方法 +// engIneService.updateMsg(engineMaintenance); return engIneService.updateMsg(engineMaintenance); } @@ -77,6 +84,8 @@ public class EngIneController extends BaseController { */ @PostMapping("/insert") public Result insert(@RequestBody EngineMaintenance engineMaintenance) { + //使用mabits-plus-plus的添加方法 +// engIneService.add(engineMaintenance); return engIneService.add(engineMaintenance); } @@ -85,6 +94,8 @@ public class EngIneController extends BaseController { */ @PutMapping("/getRuleEngineInfo/{id}") public Result getRuleEngineInfo(@PathVariable(name = "id") Long id) { + //使用mabits-plus-plus的查询方法 +// engIneService.getRuleEngineInfo(id); EngineVersionListResp engineConfigListResp = engIneService.getRuleEngineInfo(id); return Result.success(engineConfigListResp); } @@ -104,6 +115,8 @@ public class EngIneController extends BaseController { */ @PostMapping("/forbiddenEngine/{id}") public Result forbiddenEngine(@PathVariable Integer id) { + //使用mybatis-plus的禁用方法 +// engIneService.forbiddenEngine(id); return engIneService.forbiddenEngine(id); } @@ -112,6 +125,8 @@ public class EngIneController extends BaseController { */ @PostMapping("/onEngine/{id}") public Result onEngine(@PathVariable Integer id) { + //使用mybatis-plus的开启方法 +// engIneService.onEngine(id); engIneService.onEngine(id); return Result.success(); } @@ -121,6 +136,8 @@ public class EngIneController extends BaseController { */ @PostMapping("/closeEngine/{id}") public Result closeEngine(@PathVariable Integer id) { + //使用mybatis-plus的关闭方法 +// engIneService.closeEngine(id); engIneService.closeEngine(id); return Result.success(); } @@ -130,6 +147,8 @@ public class EngIneController extends BaseController { */ @PostMapping("/activateEngine/{id}") public Result activateEngine(@PathVariable Integer id) { + //使用mybatis-plus的激活方法 +// engIneService.activateEngine(id); engIneService.activateEngine(id); return Result.success(); } @@ -142,6 +161,11 @@ public class EngIneController extends BaseController { */ @GetMapping("/findById/{id}") public Result findById(@PathVariable Long id) { + //使用mybatis-plus的查询方法 + //List list = engIneService.list(); + //List list = engIneService.list(new LambdaQueryWrapper<>() {{ + // eq(EngineMaintenance::getId, id); + //}}); List list = engIneService.list(new LambdaQueryWrapper<>() {{ eq(EngineMaintenance::getId, id); }}); @@ -156,6 +180,8 @@ public class EngIneController extends BaseController { */ @GetMapping("/findByIds/{id}") public Result findVersionByIds(@PathVariable("id") Long id) { + //使用mybatis-plus的查询方法 +// return Result.success(engineVersionService.getByIds(id)); return Result.success(engineVersionService.list(new LambdaQueryWrapper<>() {{ eq(EngineVersion::getId, id); }})); @@ -166,6 +192,10 @@ public class EngIneController extends BaseController { */ @PostMapping("/selectEngineById/{versionId}") public List selectEngineById(@PathVariable Integer versionId) { + //使用mybatis-plus的查询方法 +// List engineMaintenances = engIneService.list(new LambdaQueryWrapper<>() {{ +// eq(EngineMaintenance::getVersionId, versionId); +// }}); List engineMaintenances = engineVersionService.getByIds(versionId); return engineMaintenances; } diff --git a/cloud-etl-server/src/main/java/com/muyu/controller/EngineLevelController.java b/cloud-etl-server/src/main/java/com/muyu/controller/EngineLevelController.java index 25066a2..0b8171f 100644 --- a/cloud-etl-server/src/main/java/com/muyu/controller/EngineLevelController.java +++ b/cloud-etl-server/src/main/java/com/muyu/controller/EngineLevelController.java @@ -1,6 +1,7 @@ package com.muyu.controller; import com.muyu.common.core.utils.poi.ExcelUtil; +import com.muyu.common.core.web.controller.BaseController; import com.muyu.domain.EngineLevelEntity; import com.muyu.domain.EngineMaintenance; import com.muyu.domain.EngineVersion; @@ -21,7 +22,7 @@ import java.util.List; */ @RestController @RequestMapping("/level") -public class EngineLevelController { +public class EngineLevelController extends BaseController { @Autowired EngineLevelService engineLevelService; @@ -31,6 +32,8 @@ public class EngineLevelController { */ @PostMapping("/selectLevelList") public List selectLevelList() { + //使用mybatis-plus查询 +// List lists = engineLevelService.selectLevelList(); return engineLevelService.selectLevelLists(); } @@ -39,6 +42,8 @@ public class EngineLevelController { */ @PostMapping("/insert") public Result insert(EngineLevelEntity engineLevelEntity) { + //使用mybatis-plus新增 +// engineLevelService.insert(engineLevelEntity); return engineLevelService.insert(engineLevelEntity); } @@ -47,6 +52,8 @@ public class EngineLevelController { */ @PostMapping("/update") public Result update(EngineLevelEntity engineLevelEntity) { + //使用mybatis-plus修改 +// engineLevelService.update(engineLevelEntity); return engineLevelService.update(engineLevelEntity); } @@ -55,6 +62,8 @@ public class EngineLevelController { */ @PostMapping("/delete/{id}") public Result delete(@PathVariable Integer id) { + //使用mybatis-plus删除 +// return engineLevelService.delete(id); return engineLevelService.delete(id); } @@ -71,6 +80,8 @@ public class EngineLevelController { */ @PostMapping("/selectById/{id}") public Result selectById(@PathVariable Integer id) { + //使用mybatis-plus回显 +// return engineLevelService.selectById(id); return engineLevelService.selectById(id); } } diff --git a/cloud-etl-server/src/main/java/com/muyu/controller/EngineVersionController.java b/cloud-etl-server/src/main/java/com/muyu/controller/EngineVersionController.java index 9b44cfc..881df42 100644 --- a/cloud-etl-server/src/main/java/com/muyu/controller/EngineVersionController.java +++ b/cloud-etl-server/src/main/java/com/muyu/controller/EngineVersionController.java @@ -2,6 +2,7 @@ package com.muyu.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.security.annotation.RequiresPermissions; import com.muyu.domain.EngineVersion; import com.muyu.domain.model.TestData; @@ -25,7 +26,7 @@ import java.util.List; */ @RestController @RequestMapping("/version") -public class EngineVersionController { +public class EngineVersionController extends BaseController { @Autowired EngineVersionService engineVersionService; @@ -44,6 +45,8 @@ public class EngineVersionController { */ @GetMapping("/selectVersionList") public Result> selectVersionList() { + //使用mybatis-plus 查询所有 +// return Result.success(engineVersionService.list()); return Result.success(engineVersionService.list()); } @@ -54,6 +57,8 @@ public class EngineVersionController { */ @PostMapping("/insert") public Result insert(@RequestBody EngineVersion engineVersion) { + //使用mybatis-plus 添加 +// engineVersionService.save(engineVersion); return engineVersionService.add(engineVersion); } @@ -64,6 +69,8 @@ public class EngineVersionController { */ @PostMapping("/update") public EngineVersion update(@RequestBody EngineVersion engineVersion) { + //使用mybatis-plus 修改 +// engineVersionService.updateById(engineVersion); return engineVersionService.updateMsg(engineVersion); } @@ -74,6 +81,8 @@ public class EngineVersionController { */ @PostMapping("/delete/{id}") public Result delete(@PathVariable Long id) { + //使用mybatis-plus 删除 +// engineVersionService.removeById(id); boolean b = engineVersionService.removeById(id); return Result.success(b); } @@ -85,6 +94,8 @@ public class EngineVersionController { */ @GetMapping("/getVersion/{id}") public Result getVersion(@PathVariable("id") Long id) { + //使用mybatis-plus 查询 +// engineVersionService.getById(id); EngineVersion engineVersion = engineVersionService.getById(id); return Result.success(engineVersion); } @@ -94,6 +105,8 @@ public class EngineVersionController { */ @GetMapping("/getScopeList") public Result> getScopeList() { + //使用mybatis-plus 查询 + //return Result.success(engineVersionService.getScopeList()); return Result.success(engineVersionService.getScopeList()); } @@ -103,6 +116,8 @@ public class EngineVersionController { @RequiresPermissions("rule-engine:version:list") @GetMapping("/getScopeInfo/{id}") public Result getScopeInfoById(@PathVariable Integer id) { + //使用mybatis-plus 查询 + //return Result.success(engineVersionService.getScopeInfoById(id)); return Result.success(engineVersionService.getScopeInfoById(id)); } @@ -111,6 +126,8 @@ public class EngineVersionController { */ @PostMapping(value = "/test") public Result ruleTest(@RequestBody TestData testData) { + //使用mybatis-plus 测试 +// testData.setId(1L); return Result.success(engineVersionService.ruleTest(testData)); } @@ -140,6 +157,8 @@ public class EngineVersionController { */ @PostMapping("/selectListById/{id}") public Result selectListById(@PathVariable Long id){ + //使用mybatis-plus 查询 +// return Result.success(engineVersionService.getByIds(id)); return Result.success(engineVersionService.getById(id)); } @@ -149,6 +168,8 @@ public class EngineVersionController { */ @PostMapping("/insertVersion") public boolean insertVersion(@RequestBody EngineVersion engineVersion) { + //使用mybatis-plus 添加 +// engineVersionService.add(engineVersion); return engineVersionService.save(engineVersion); } } diff --git a/cloud-etl-server/src/main/java/com/muyu/controller/TypeController.java b/cloud-etl-server/src/main/java/com/muyu/controller/TypeController.java index 08abcec..d520ba0 100644 --- a/cloud-etl-server/src/main/java/com/muyu/controller/TypeController.java +++ b/cloud-etl-server/src/main/java/com/muyu/controller/TypeController.java @@ -1,6 +1,7 @@ package com.muyu.controller; import com.muyu.common.core.utils.poi.ExcelUtil; +import com.muyu.common.core.web.controller.BaseController; import com.muyu.domain.EngineType; import com.muyu.domain.constants.Result; import com.muyu.service.TypeService; @@ -20,7 +21,7 @@ import java.util.List; */ @RestController @RequestMapping("/type") -public class TypeController { +public class TypeController extends BaseController { @Autowired TypeService typeService; diff --git a/cloud-etl-server/src/main/java/com/muyu/mapper/EnginLevelMapper.java b/cloud-etl-server/src/main/java/com/muyu/mapper/EnginLevelMapper.java index b06ec23..bcaba6f 100644 --- a/cloud-etl-server/src/main/java/com/muyu/mapper/EnginLevelMapper.java +++ b/cloud-etl-server/src/main/java/com/muyu/mapper/EnginLevelMapper.java @@ -1,5 +1,6 @@ package com.muyu.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.EngineLevelEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -14,10 +15,10 @@ import java.util.List; * @Date:2024/8/25 18:54 */ @Mapper -public interface EnginLevelMapper { +public interface EnginLevelMapper extends BaseMapper { List selectLevelList(); - Integer insert(EngineLevelEntity engineLevelEntity); +// Integer insert(EngineLevelEntity engineLevelEntity); Integer update(EngineLevelEntity engineLevelEntity); diff --git a/cloud-etl-server/src/main/java/com/muyu/mapper/TypseMapper.java b/cloud-etl-server/src/main/java/com/muyu/mapper/TypseMapper.java index 3fe80d2..803883d 100644 --- a/cloud-etl-server/src/main/java/com/muyu/mapper/TypseMapper.java +++ b/cloud-etl-server/src/main/java/com/muyu/mapper/TypseMapper.java @@ -1,5 +1,6 @@ package com.muyu.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.EngineType; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -14,7 +15,7 @@ import java.util.List; * @Date:2024/8/23 22:36 */ @Mapper -public interface TypseMapper { +public interface TypseMapper extends BaseMapper { List list(); diff --git a/cloud-etl-server/src/main/java/com/muyu/service/EngineLevelService.java b/cloud-etl-server/src/main/java/com/muyu/service/EngineLevelService.java index e098d13..29212d1 100644 --- a/cloud-etl-server/src/main/java/com/muyu/service/EngineLevelService.java +++ b/cloud-etl-server/src/main/java/com/muyu/service/EngineLevelService.java @@ -1,5 +1,6 @@ package com.muyu.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.controller.EngineLevelController; import com.muyu.domain.EngineLevelEntity; import com.muyu.domain.constants.Result; @@ -13,7 +14,7 @@ import java.util.List; * @name:EngineLevelService * @Date:2024/8/25 18:52 */ -public interface EngineLevelService { +public interface EngineLevelService extends IService { List selectLevelList(); Result insert(EngineLevelEntity engineLevelEntity); diff --git a/cloud-etl-server/src/main/java/com/muyu/service/TypeService.java b/cloud-etl-server/src/main/java/com/muyu/service/TypeService.java index 738b450..08c2835 100644 --- a/cloud-etl-server/src/main/java/com/muyu/service/TypeService.java +++ b/cloud-etl-server/src/main/java/com/muyu/service/TypeService.java @@ -1,5 +1,7 @@ package com.muyu.service; +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.domain.EngineMaintenance; import com.muyu.domain.EngineType; import com.muyu.domain.constants.Result; @@ -13,7 +15,7 @@ import java.util.List; * @name:TypeService * @Date:2024/8/23 22:35 */ -public interface TypeService { +public interface TypeService extends IService { List list(); Result add(EngineType type); diff --git a/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EngineLevelServiceImpl.java b/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EngineLevelServiceImpl.java index 29ee30d..39a1b9c 100644 --- a/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EngineLevelServiceImpl.java +++ b/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EngineLevelServiceImpl.java @@ -1,13 +1,17 @@ package com.muyu.service.serviceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.domain.EngineLevelEntity; import com.muyu.domain.constants.Result; import com.muyu.mapper.EnginLevelMapper; +import com.muyu.mapper.EngineMapper; import com.muyu.service.EngineLevelService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Collection; import java.util.List; +import java.util.Map; /** * @Author:qdm @@ -17,7 +21,7 @@ import java.util.List; * @Date:2024/8/25 18:52 */ @Service -public class EngineLevelServiceImpl implements EngineLevelService { +public class EngineLevelServiceImpl extends ServiceImpl implements EngineLevelService { @Autowired EnginLevelMapper enginLevelMapper; @@ -78,4 +82,29 @@ public class EngineLevelServiceImpl implements EngineLevelService { List list = enginLevelMapper.lists(); return list; } + + @Override + public boolean save(EngineLevelEntity entity) { + return super.save(entity); + } + + @Override + public boolean saveBatch(Collection entityList) { + return super.saveBatch(entityList); + } + + @Override + public boolean saveOrUpdateBatch(Collection entityList) { + return super.saveOrUpdateBatch(entityList); + } + + @Override + public boolean removeById(EngineLevelEntity entity) { + return super.removeById(entity); + } + + @Override + public boolean removeByMap(Map columnMap) { + return super.removeByMap(columnMap); + } } diff --git a/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/TypeServiceImpl.java b/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/TypeServiceImpl.java index 7214f38..c64ddc3 100644 --- a/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/TypeServiceImpl.java +++ b/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/TypeServiceImpl.java @@ -1,5 +1,6 @@ package com.muyu.service.serviceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; import com.muyu.domain.EngineType; import com.muyu.domain.constants.Result; @@ -18,7 +19,7 @@ import java.util.List; * @Date:2024/8/23 22:35 */ @Service -public class TypeServiceImpl implements TypeService { +public class TypeServiceImpl extends ServiceImpl implements TypeService { @Autowired TypseMapper typseMapper; diff --git a/elt-data-access/pom.xml b/elt-data-access/pom.xml deleted file mode 100644 index daaa19c..0000000 --- a/elt-data-access/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - 4.0.0 - - com.muyu - cloud-etl-engine - 1.0.0 - - - elt-data-access - - - 17 - 17 - UTF-8 - - - - - com.muyu - cloud-common-core - - - com.muyu - cloud-etl-client - 1.0.0 - - - - diff --git a/elt-data-access/src/main/java/com/bwie/muyu/EngIneTest.java b/elt-data-access/src/main/java/com/bwie/muyu/EngIneTest.java deleted file mode 100644 index febd97a..0000000 --- a/elt-data-access/src/main/java/com/bwie/muyu/EngIneTest.java +++ /dev/null @@ -1,39 +0,0 @@ -//package com.bwie.muyu; -// -//import com.bwie.muyu.base.EngineException; -//import com.muyu.config.EngineConfig; -//import lombok.Data; -//import lombok.extern.log4j.Log4j2; -//import org.springframework.stereotype.Component; -// -//import java.util.HashMap; -//import java.util.Map; -// -///** -// * @Author:qdm -// * @Package:com.bwie.muyu -// * @Project:cloud-etl-engine -// * @name:EngIneTest -// * @Date:2024/8/30 9:27 -// */ -//@Component -//@Log4j2 -//@Data -//public class EngIneTest { -// -// private static Object SouRceCodeCompiler; -// -// public static void main(String[] args) { -// EngineConfig engineConfig = new EngineConfig(); -// //扫描源码进行注释 -// SouRceCodeCompiler.javaCompilerPath(engineConfig.getLocation()); -// Map> stringClassMap = JavaBinaryClassLoader.loadClassByLocation(engineConfig.getPack(), engineConfig, getLocation); -// stringClassMap.forEach((key, value) -> { -// EngineContainer.loadEngineInstance(key, value); -// }); jn -// HashMap params = new HashMap<>(); -// params.put("idCard", "142021200212215977"); -// EngineException.engineExe("Engine_2020_11_3_2347", params); -// System.out.println("Engine_2020_11_3_2347"); -// } -//} diff --git a/elt-data-access/src/main/java/com/bwie/muyu/MuyuApplication.java b/elt-data-access/src/main/java/com/bwie/muyu/MuyuApplication.java deleted file mode 100644 index c56f049..0000000 --- a/elt-data-access/src/main/java/com/bwie/muyu/MuyuApplication.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.bwie.muyu; - -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * @Author:qdm - * @Package:com.bwie.muyu - * @Project:cloud-etl-engine - * @name:MuyuApplication - * @Date:2024/8/29 20:19 - */ -@SpringBootApplication -public class MuyuApplication { - public static void main(String[] args) { - org.springframework.boot.SpringApplication.run(MuyuApplication.class, args); - } -} diff --git a/elt-data-access/src/main/java/com/bwie/muyu/base/BaseEngine.java b/elt-data-access/src/main/java/com/bwie/muyu/base/BaseEngine.java deleted file mode 100644 index 0fd22dc..0000000 --- a/elt-data-access/src/main/java/com/bwie/muyu/base/BaseEngine.java +++ /dev/null @@ -1,12 +0,0 @@ -//package com.bwie.muyu.base; -// -///** -// * @Author:qdm -// * @Package:com.bwie.muyu.base -// * @Project:cloud-etl-engine -// * @name:BaseEngine -// * @Date:2024/8/29 20:23 -// */ -//public interface BaseEngine { -// -//} diff --git a/elt-data-access/src/main/java/com/bwie/muyu/base/EngineContainer.java b/elt-data-access/src/main/java/com/bwie/muyu/base/EngineContainer.java deleted file mode 100644 index 6568e37..0000000 --- a/elt-data-access/src/main/java/com/bwie/muyu/base/EngineContainer.java +++ /dev/null @@ -1,24 +0,0 @@ -//package com.bwie.muyu.base; -// -//import lombok.AllArgsConstructor; -//import lombok.Builder; -//import lombok.Data; -//import lombok.NoArgsConstructor; -// -///** -// * @Author:qdm -// * @Package:com.bwie.muyu.base -// * @Project:cloud-etl-engine -// * @name:EngineContainer -// * @Date:2024/8/30 11:32 -// */ -//@Data -//@AllArgsConstructor -//@NoArgsConstructor -//@Builder -//public class EngineContainer { -// -// public static Integer getSumEngine() { -// return null; -// } -//} diff --git a/elt-data-access/src/main/java/com/bwie/muyu/base/EngineException.java b/elt-data-access/src/main/java/com/bwie/muyu/base/EngineException.java deleted file mode 100644 index 662c70d..0000000 --- a/elt-data-access/src/main/java/com/bwie/muyu/base/EngineException.java +++ /dev/null @@ -1,20 +0,0 @@ -//package com.bwie.muyu.base; -// -//import java.util.HashMap; -// -///** -// * @Author:qdm -// * @Package:com.bwie.muyu.base -// * @Project:cloud-etl-engine -// * @name:EngineExcepion -// * @Date:2024/8/30 10:50 -// */ -//public class EngineException { -//// public engineException(String message){ -//// super.(message); -//// } -// -// public static void engineExe(String engine20201132347, HashMap params) { -// -// } -//} diff --git a/elt-data-access/src/main/java/com/bwie/muyu/base/EngineParam.java b/elt-data-access/src/main/java/com/bwie/muyu/base/EngineParam.java deleted file mode 100644 index 2f50a0b..0000000 --- a/elt-data-access/src/main/java/com/bwie/muyu/base/EngineParam.java +++ /dev/null @@ -1,22 +0,0 @@ -//package com.bwie.muyu.base; -// -//import java.lang.annotation.ElementType; -//import java.lang.annotation.Retention; -//import java.lang.annotation.RetentionPolicy; -//import java.lang.annotation.Target; -// -///** -// * @Author:qdm -// * @Package:com.bwie.muyu.base -// * @Project:cloud-etl-engine -// * @name:EngineParam -// * @Date:2024/8/30 10:46 -// */ -//@Retention(RetentionPolicy.RUNTIME) -//@Target(ElementType.PARAMETER) -//public @interface EngineParam { -// /** -// * 输入字段名称 -// */ -// public String name(); -//} diff --git a/elt-data-access/src/main/java/com/bwie/muyu/base/Engine_2020_11_3_2347.java b/elt-data-access/src/main/java/com/bwie/muyu/base/Engine_2020_11_3_2347.java deleted file mode 100644 index e765720..0000000 --- a/elt-data-access/src/main/java/com/bwie/muyu/base/Engine_2020_11_3_2347.java +++ /dev/null @@ -1,34 +0,0 @@ -//package com.bwie.muyu.base; -// -//import com.muyu.common.core.utils.SpringUtils; -//import org.springframework.boot.autoconfigure.security.SecurityProperties; -// -//import java.util.Date; -// -///** -// * @Author:qdm -// * @Package:com.bwie.muyu.base -// * @Project:cloud-etl-engine -// * @name:Engine_2020_11_3_2347 -// * @Date:2024/8/30 10:32 -// */ -//public class Engine_2020_11_3_2347 { -// public String execute(@EngineParam(name="idCard")String idCard){ -// String msg = ""; -// Integer year = Integer.valueOf(idCard.substring(6, 10)); -// Date date = new Date(); -// int thisYear = date.getYear() + 1900; -// msg = "这个身份证的年龄是:"+ (thisYear - year); -// Integer two = Integer.valueOf(idCard.substring(16, 17)); -// if (two % 2 == 0){ -// msg += ",这个身份证是男生"; -// }else { -// msg += ",这个身份证是女生"; -// } -// Integer sumEngine = EngineContainer.getSumEngine(); -// System.out.println("项目中规则引擎数量为:"+sumEngine); -// User bean = SpringUtils.getBean(User.class); -// System.out.println(bean.getName()+"--"+bean.getAge); -// return msg; -// } -//} diff --git a/elt-data-access/src/main/java/com/bwie/muyu/base/Test.java b/elt-data-access/src/main/java/com/bwie/muyu/base/Test.java deleted file mode 100644 index de61f9d..0000000 --- a/elt-data-access/src/main/java/com/bwie/muyu/base/Test.java +++ /dev/null @@ -1,17 +0,0 @@ -//package com.bwie.muyu.base; -// -//import com.muyu.config.EngineConfig; -// -///** -// * @Author:qdm -// * @Package:com.bwie.muyu.base -// * @Project:cloud-etl-engine -// * @name:Test -// * @Date:2024/8/30 11:16 -// */ -//public class Test { -// public static void main(String[] args) { -// EngineConfig engineConfig = new EngineConfig(); -// -// } -//} diff --git a/elt-data-access/src/main/java/com/bwie/muyu/base/User.java b/elt-data-access/src/main/java/com/bwie/muyu/base/User.java deleted file mode 100644 index b59b44c..0000000 --- a/elt-data-access/src/main/java/com/bwie/muyu/base/User.java +++ /dev/null @@ -1,22 +0,0 @@ -//package com.bwie.muyu.base; -// -//import lombok.AllArgsConstructor; -//import lombok.Builder; -//import lombok.Data; -//import lombok.NoArgsConstructor; -// -///** -// * @Author:qdm -// * @Package:com.bwie.muyu.base -// * @Project:cloud-etl-engine -// * @name:User -// * @Date:2024/8/30 11:33 -// */ -//@Data -//@AllArgsConstructor -//@NoArgsConstructor -//@Builder -//public class User { -// public String getAge; -// private String name; -//} diff --git a/elt-data-access/src/main/java/com/bwie/muyu/base/hander/DataEngineHandler.java b/elt-data-access/src/main/java/com/bwie/muyu/base/hander/DataEngineHandler.java deleted file mode 100644 index 3358958..0000000 --- a/elt-data-access/src/main/java/com/bwie/muyu/base/hander/DataEngineHandler.java +++ /dev/null @@ -1,23 +0,0 @@ -//package com.bwie.muyu.base.hander; -// -//import lombok.Data; -// -///** -// * @Author:qdm -// * @Package:com.bwie.muyu.base.hander -// * @Project:cloud-etl-engine -// * @name:DataEngineHandler -// * @Date:2024/8/29 20:26 -// */ -//@Data -//public class DataEngineHandler { -// public static final ThreadLocal DataEngineHandler = new ThreadLocal<>(); -// -// public static void set(final Object handler) { -// DataEngineHandler.set(handler); -// } -// -// public static T get() { -// return (T) DataEngineHandler.get(); -// } -//} diff --git a/elt-data-access/src/main/java/com/bwie/muyu/base/hander/DataEngineValue.java b/elt-data-access/src/main/java/com/bwie/muyu/base/hander/DataEngineValue.java deleted file mode 100644 index eaec237..0000000 --- a/elt-data-access/src/main/java/com/bwie/muyu/base/hander/DataEngineValue.java +++ /dev/null @@ -1,28 +0,0 @@ -//package com.bwie.muyu.base.hander; -// -///** -// * @Author:qdm -// * @Package:com.bwie.muyu.base.hander -// * @Project:cloud-etl-engine -// * @name:DataEngineValue -// * @Date:2024/8/29 20:31 -// */ -// -//public class DataEngineValue { -// -// public static void set(DataEngineValue dataEngineValue) { -// DataEngineHandler.set(dataEngineValue); -// } -// -// public static DataEngineValue get() { -// return DataEngineHandler.get(); -// } -// -// public static Object getValue() { -// return get().getValue(); -// } -// -// public static Integer getIntegerValue() { -// return get().getIntegerValue(); -// } -//} diff --git a/pom.xml b/pom.xml index 9c84cdb..66816b4 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,6 @@ cloud-etl-common cloud-etl-remote cloud-etl-server - elt-data-access 1.8