diff --git a/srt-cloud-framework/srt-cloud-flink/build/app/flink-app-1.14-2.0.0-jar-with-dependencies.jar b/srt-cloud-framework/srt-cloud-flink/build/app/flink-app-1.14-2.0.0-jar-with-dependencies.jar index 5cd6c03..1e9b525 100644 Binary files a/srt-cloud-framework/srt-cloud-flink/build/app/flink-app-1.14-2.0.0-jar-with-dependencies.jar and b/srt-cloud-framework/srt-cloud-flink/build/app/flink-app-1.14-2.0.0-jar-with-dependencies.jar differ diff --git a/srt-cloud-framework/srt-cloud-flink/build/extends/flink-catalog-mysql-1.14-2.0.0.jar b/srt-cloud-framework/srt-cloud-flink/build/extends/flink-catalog-mysql-1.14-2.0.0.jar index ead00a4..84f6a83 100644 Binary files a/srt-cloud-framework/srt-cloud-flink/build/extends/flink-catalog-mysql-1.14-2.0.0.jar and b/srt-cloud-framework/srt-cloud-flink/build/extends/flink-catalog-mysql-1.14-2.0.0.jar differ diff --git a/srt-cloud-framework/srt-cloud-flink/build/extends/flink-client-1.14-2.0.0.jar b/srt-cloud-framework/srt-cloud-flink/build/extends/flink-client-1.14-2.0.0.jar index d7118bd..22b00f9 100644 Binary files a/srt-cloud-framework/srt-cloud-flink/build/extends/flink-client-1.14-2.0.0.jar and b/srt-cloud-framework/srt-cloud-flink/build/extends/flink-client-1.14-2.0.0.jar differ diff --git a/srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/controllor/DataxController.java b/srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/controllor/DataxController.java index f342b93..b635fde 100644 --- a/srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/controllor/DataxController.java +++ b/srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/controllor/DataxController.java @@ -22,40 +22,33 @@ import java.util.List; @AllArgsConstructor public class DataxController { @Autowired - private DataxService stuService; - - @Operation(summary = "执行同步") - @PostMapping("/json/{id}") - public Result json(@PathVariable Long id) { - stuService.json(id); - return Result.ok(); - } + private DataxService dataxService; @Operation(summary = "查询列表") - @PostMapping("/dataxList") + @PostMapping("/list") public Result> stuList() { - List stuList = stuService.dataxList(); + List stuList = dataxService.dataxList(); return Result.ok(stuList); } @Operation(summary = "新增") - @PostMapping("/addDatax") + @PostMapping("/add") public Result add(@RequestBody StrDatax strDatax) { - stuService.add(strDatax); + dataxService.add(strDatax); return Result.ok(); } @Operation(summary = "修改列表") - @PostMapping("/updateDatax") + @PostMapping("/update") public Result updateDatax(@RequestBody StrDatax strDatax) { - stuService.updateDatax(strDatax); + dataxService.updateStrDatax(strDatax); return Result.ok(); } @Operation(summary = "删除列表") - @PostMapping("/delStudent/{id}") + @PostMapping("/del/{id}") public Result delDatax(@PathVariable Long id) { - stuService.delDatax(id); + dataxService.delStrDatax(id); return Result.ok(); } @@ -63,7 +56,7 @@ public class DataxController { @PostMapping("/findById/{id}") public Result findById(@PathVariable Integer id) { if (id!= null) { - return Result.ok(stuService.findById(id)); + return Result.ok(dataxService.findById(id)); } return Result.ok(); } diff --git a/srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/server/DataxService.java b/srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/server/DataxService.java new file mode 100644 index 0000000..4deea46 --- /dev/null +++ b/srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/server/DataxService.java @@ -0,0 +1,27 @@ +package net.srt.datax.server; + +import com.baomidou.mybatisplus.extension.service.IService; +import net.srt.datax.vo.StrDatax; + +import java.util.List; + +/** + * @ClassName StrDataxService + * @Description 描述 + * @Author 栗永斌 + */ +public interface DataxService extends IService { + + + + void add(StrDatax StrDatax); + + List dataxList(); + + void delStrDatax(Long id); + + void updateStrDatax(StrDatax StrDatax); + + StrDatax findById(Integer id); + +} diff --git a/srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/server/StuService.java b/srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/server/StuService.java deleted file mode 100644 index 7c9b40c..0000000 --- a/srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/server/StuService.java +++ /dev/null @@ -1,26 +0,0 @@ -package net.srt.datax.server; - -import com.baomidou.mybatisplus.extension.service.IService; -import net.srt.datax.vo.Stu; - -import java.util.List; - -/** - * @ClassName StuService - * @Description 描述 - * @Author 栗永斌 - */ -public interface StuService extends IService { - - - - void add(Stu stu); - - List stuList(); - - void delStudent(Long id); - - void updateStudent(Stu stu); - - Stu findById(Integer id); -} diff --git a/srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/server/impl/StrDataxServiceImpl.java b/srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/server/impl/StrDataxServiceImpl.java new file mode 100644 index 0000000..fd4ff93 --- /dev/null +++ b/srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/server/impl/StrDataxServiceImpl.java @@ -0,0 +1,51 @@ +package net.srt.datax.server.impl; + +import lombok.AllArgsConstructor; +import net.srt.datax.mapper.DataxMapper; +import net.srt.datax.server.DataxService; +import net.srt.datax.vo.StrDatax; +import net.srt.framework.mybatis.service.impl.BaseServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @ClassName StrDataxServiceImpl + * @Description 描述 + * @Author 栗永斌 + */ +@Service +@AllArgsConstructor +public class StrDataxServiceImpl extends BaseServiceImpl implements DataxService { + + @Autowired + private DataxMapper dataxMapper; + + @Override + public void add(StrDatax StrDatax) { + dataxMapper.insert(StrDatax); + } + + @Override + public List dataxList() { + List StrDataxs = dataxMapper.selectList(null); + return StrDataxs; + } + + @Override + public void delStrDatax(Long id) { + dataxMapper.deleteById(id); + } + + @Override + public void updateStrDatax(StrDatax StrDatax) { + dataxMapper.updateById(StrDatax); + } + + @Override + public StrDatax findById(Integer id) { + StrDatax StrDatax = dataxMapper.selectById(id); + return StrDatax; + } +} diff --git a/srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/server/impl/StuServiceImpl.java b/srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/server/impl/StuServiceImpl.java deleted file mode 100644 index b5ce00b..0000000 --- a/srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/server/impl/StuServiceImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package net.srt.datax.server.impl; - -import lombok.AllArgsConstructor; -import net.srt.datax.mapper.StuMapper; -import net.srt.datax.server.StuService; -import net.srt.datax.vo.Stu; -import net.srt.framework.mybatis.service.impl.BaseServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; -/** - * @ClassName StuServiceImpl - * @Description 描述 - * @Author 栗永斌 - */ -@Service -@AllArgsConstructor -public class StuServiceImpl extends BaseServiceImpl implements StuService { - - @Autowired - private StuMapper stuMapper; - - - - - @Override - public void add(Stu stu) { - stuMapper.insert(stu); - } - - @Override - public List stuList() { - List stus = stuMapper.selectList(null); - return stus; - } - - @Override - public void delStudent(Long id) { - stuMapper.deleteById(id); - } - - @Override - public void updateStudent(Stu stu) { - stuMapper.updateById(stu); - } - - @Override - public Stu findById(Integer id) { - Stu stu = stuMapper.selectById(id); - return stu; - } -}