From f5ded45af697127e43afb37c9af00722169da43e Mon Sep 17 00:00:00 2001 From: chenbingxuan <3581044601@qq.com> Date: Wed, 20 Dec 2023 22:30:31 +0800 Subject: [PATCH] =?UTF-8?q?datax=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/bootstrap.yml | 6 ++ .../src/main/java/net/srt/DevelopmentApp.java | 10 +- .../srt/Fink/controller/FinkController.java | 91 +++++++++++++++++++ .../net/srt/Fink/convert/FinkConvert.java | 9 ++ .../net/srt/Fink/convert/FinkConvertImp.java | 21 +++++ .../java/net/srt/Fink/mapper/FinkMapper.java | 9 ++ .../net/srt/Fink/service/FinkService.java | 22 +++++ .../Fink/service/impl/FinkServiceImpl.java | 76 ++++++++++++++++ .../src/main/java/net/srt/Fink/vo/FinkVo.java | 39 ++++++++ .../java/net/srt/Fink/vo/request/AddFink.java | 13 +++ .../net/srt/Fink/vo/request/FinkRequest.java | 10 ++ .../Hadoop/controller/HadoopController.java | 74 +++++++++++++++ .../net/srt/Hadoop/convert/HadoopConvert.java | 10 ++ .../srt/Hadoop/convert/HadoopConvertImp.java | 23 +++++ .../net/srt/Hadoop/mapper/HadoopMapper.java | 7 ++ .../net/srt/Hadoop/service/HadoopService.java | 21 +++++ .../service/impl/HadoopServiceImpl.java | 62 +++++++++++++ .../main/java/net/srt/Hadoop/vo/HadoopVo.java | 35 +++++++ .../srt/Hadoop/vo/request/HadoopRequest.java | 11 +++ .../src/main/resources/auth.yml | 7 ++ .../src/main/resources/bootstrap.yml | 43 +++++++++ .../src/main/resources/log4j2.xml | 48 ++++++++++ 22 files changed, 645 insertions(+), 2 deletions(-) create mode 100644 srt-data-development/src/main/java/net/srt/Fink/controller/FinkController.java create mode 100644 srt-data-development/src/main/java/net/srt/Fink/convert/FinkConvert.java create mode 100644 srt-data-development/src/main/java/net/srt/Fink/convert/FinkConvertImp.java create mode 100644 srt-data-development/src/main/java/net/srt/Fink/mapper/FinkMapper.java create mode 100644 srt-data-development/src/main/java/net/srt/Fink/service/FinkService.java create mode 100644 srt-data-development/src/main/java/net/srt/Fink/service/impl/FinkServiceImpl.java create mode 100644 srt-data-development/src/main/java/net/srt/Fink/vo/FinkVo.java create mode 100644 srt-data-development/src/main/java/net/srt/Fink/vo/request/AddFink.java create mode 100644 srt-data-development/src/main/java/net/srt/Fink/vo/request/FinkRequest.java create mode 100644 srt-data-development/src/main/java/net/srt/Hadoop/controller/HadoopController.java create mode 100644 srt-data-development/src/main/java/net/srt/Hadoop/convert/HadoopConvert.java create mode 100644 srt-data-development/src/main/java/net/srt/Hadoop/convert/HadoopConvertImp.java create mode 100644 srt-data-development/src/main/java/net/srt/Hadoop/mapper/HadoopMapper.java create mode 100644 srt-data-development/src/main/java/net/srt/Hadoop/service/HadoopService.java create mode 100644 srt-data-development/src/main/java/net/srt/Hadoop/service/impl/HadoopServiceImpl.java create mode 100644 srt-data-development/src/main/java/net/srt/Hadoop/vo/HadoopVo.java create mode 100644 srt-data-development/src/main/java/net/srt/Hadoop/vo/request/HadoopRequest.java create mode 100644 srt-data-development/src/main/resources/auth.yml create mode 100644 srt-data-development/src/main/resources/bootstrap.yml create mode 100644 srt-data-development/src/main/resources/log4j2.xml diff --git a/srt-cloud-gateway/src/main/resources/bootstrap.yml b/srt-cloud-gateway/src/main/resources/bootstrap.yml index e18e43d..f5b5f20 100644 --- a/srt-cloud-gateway/src/main/resources/bootstrap.yml +++ b/srt-cloud-gateway/src/main/resources/bootstrap.yml @@ -84,6 +84,12 @@ spring: - Path=/srt-cloud-datax-service/** # Adjust the path as needed filters: - StripPrefix=1 + - id: srt-data-development # New Gateway + uri: lb://srt-data-development # Update with the correct URI for your new service + predicates: + - Path=/data-development/** # Adjust the path as needed + filters: + - StripPrefix=1 nacos: discovery: diff --git a/srt-data-development/src/main/java/net/srt/DevelopmentApp.java b/srt-data-development/src/main/java/net/srt/DevelopmentApp.java index 273d84d..0518c48 100644 --- a/srt-data-development/src/main/java/net/srt/DevelopmentApp.java +++ b/srt-data-development/src/main/java/net/srt/DevelopmentApp.java @@ -1,11 +1,17 @@ package net.srt; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.cloud.openfeign.EnableFeignClients; -@EnableFeignClients @EnableDiscoveryClient @SpringBootApplication +@MapperScan("net.srt.Fink.mapper") +@MapperScan("net.srt.Hadoop.mapper") public class DevelopmentApp { + public static void main(String[] args) { + SpringApplication.run(DevelopmentApp.class); + System.out.println("数据开发已启动===========>"); + } } diff --git a/srt-data-development/src/main/java/net/srt/Fink/controller/FinkController.java b/srt-data-development/src/main/java/net/srt/Fink/controller/FinkController.java new file mode 100644 index 0000000..98a281a --- /dev/null +++ b/srt-data-development/src/main/java/net/srt/Fink/controller/FinkController.java @@ -0,0 +1,91 @@ +package net.srt.Fink.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.AllArgsConstructor; +import net.srt.Fink.service.FinkService; +import net.srt.Fink.vo.FinkVo; +import net.srt.Fink.vo.request.AddFink; +import net.srt.Fink.vo.request.FinkRequest; +import net.srt.framework.common.page.PageResult; +import net.srt.framework.common.utils.Result; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/cluster") +@AllArgsConstructor +public class FinkController { + + private FinkService finkService; + + /** + * 列表 + * @param page + * @param limit + * @param name + * @param alias + * @return + */ + @GetMapping("/page") + public Result> finkPage( + @RequestParam Integer page, + @RequestParam Integer limit, + @RequestParam(value = "name", required = false) String name, + @RequestParam(value = "alias", required = false) String alias) { + FinkRequest finkRequest = new FinkRequest(); + finkRequest.setAlias(alias); + finkRequest.setPage(page); + finkRequest.setLimit(limit); + finkRequest.setName(name); + PageResult pageResult = finkService.finkPage(finkRequest); + return Result.ok(pageResult); + } + + /** + * 添加 + * @param finkVo + * @return + */ + @PostMapping + public Result devAdd(@RequestBody FinkVo finkVo){ + finkService.add(finkVo); + return Result.ok(); + } + + /** + * 删除 + * @param finkVo + * @return + */ + @PutMapping + public Result devUpd(@RequestBody FinkVo finkVo){ + finkService.upd(finkVo); + return Result.ok(); + } + + /** + * 删除 + * @param finkVo + * @return + */ + @DeleteMapping + public Result devDel(@RequestBody List finkVo){ + finkService.del(finkVo); + return Result.ok(); + } + + /** + * 回显 + * @param id + * @return + */ + @GetMapping("{id}") + public Result finkVoResult(@PathVariable Integer id){ + return Result.ok(finkService.findFinkVo(id)); + } + + + +} diff --git a/srt-data-development/src/main/java/net/srt/Fink/convert/FinkConvert.java b/srt-data-development/src/main/java/net/srt/Fink/convert/FinkConvert.java new file mode 100644 index 0000000..23e57ce --- /dev/null +++ b/srt-data-development/src/main/java/net/srt/Fink/convert/FinkConvert.java @@ -0,0 +1,9 @@ +package net.srt.Fink.convert; + +import net.srt.Fink.vo.FinkVo; + +import java.util.List; + +public interface FinkConvert { + List devList(List list); +} diff --git a/srt-data-development/src/main/java/net/srt/Fink/convert/FinkConvertImp.java b/srt-data-development/src/main/java/net/srt/Fink/convert/FinkConvertImp.java new file mode 100644 index 0000000..a89c99e --- /dev/null +++ b/srt-data-development/src/main/java/net/srt/Fink/convert/FinkConvertImp.java @@ -0,0 +1,21 @@ +package net.srt.Fink.convert; + +import net.srt.Fink.vo.FinkVo; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +@Service +public class FinkConvertImp implements FinkConvert{ + @Override + public List devList(List list) { + if (list==null){ + return null; + } + ArrayList finkVos = new ArrayList<>(); + for (FinkVo finkVo : list) { + finkVos.add(finkVo); + } + return finkVos; + } +} diff --git a/srt-data-development/src/main/java/net/srt/Fink/mapper/FinkMapper.java b/srt-data-development/src/main/java/net/srt/Fink/mapper/FinkMapper.java new file mode 100644 index 0000000..d5bffd2 --- /dev/null +++ b/srt-data-development/src/main/java/net/srt/Fink/mapper/FinkMapper.java @@ -0,0 +1,9 @@ +package net.srt.Fink.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import net.srt.Fink.vo.FinkVo; +import org.springframework.stereotype.Repository; + +public interface FinkMapper extends BaseMapper { + +} diff --git a/srt-data-development/src/main/java/net/srt/Fink/service/FinkService.java b/srt-data-development/src/main/java/net/srt/Fink/service/FinkService.java new file mode 100644 index 0000000..2d30011 --- /dev/null +++ b/srt-data-development/src/main/java/net/srt/Fink/service/FinkService.java @@ -0,0 +1,22 @@ +package net.srt.Fink.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import net.srt.Fink.vo.FinkVo; +import net.srt.Fink.vo.request.AddFink; +import net.srt.Fink.vo.request.FinkRequest; +import net.srt.framework.common.page.PageResult; + +import java.util.List; + +public interface FinkService extends IService { + PageResult finkPage(FinkRequest finkRequest); + + void add(FinkVo finkVo); + + void upd(FinkVo finkVo); + + void del(List finkVo); + + FinkVo findFinkVo(Integer id); +} diff --git a/srt-data-development/src/main/java/net/srt/Fink/service/impl/FinkServiceImpl.java b/srt-data-development/src/main/java/net/srt/Fink/service/impl/FinkServiceImpl.java new file mode 100644 index 0000000..985a55f --- /dev/null +++ b/srt-data-development/src/main/java/net/srt/Fink/service/impl/FinkServiceImpl.java @@ -0,0 +1,76 @@ +package net.srt.Fink.service.impl; + +import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSON; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import net.srt.Fink.convert.FinkConvert; +import net.srt.Fink.mapper.FinkMapper; +import net.srt.Fink.service.FinkService; +import net.srt.Fink.vo.FinkVo; +import net.srt.Fink.vo.request.FinkRequest; +import net.srt.framework.common.page.PageResult; +import net.srt.framework.mybatis.service.impl.BaseServiceImpl; +import net.srt.framework.security.cache.TokenStoreCache; +import net.srt.framework.security.user.UserDetail; +import net.srt.framework.security.utils.TokenUtils; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletRequest; +import java.util.Date; +import java.util.List; + +@Service +@AllArgsConstructor +@Slf4j +public class FinkServiceImpl extends BaseServiceImpl implements FinkService { + + private FinkMapper finkMapper; + + private FinkConvert finkConvert; + @Override + public PageResult finkPage(FinkRequest finkRequest) { + IPage page = finkMapper.selectPage(getPage(finkRequest), getWrapper(finkRequest)); + return new PageResult<>(finkConvert.devList(page.getRecords()), page.getTotal()); + } + + private LambdaQueryWrapper getWrapper(FinkRequest query){ + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.like(StrUtil.isNotBlank(query.getName()), FinkVo::getName, query.getName()); + wrapper.like(StrUtil.isNotBlank(query.getAlias()), FinkVo::getAlias, query.getAlias()); + dataScopeWithoutOrgId(wrapper); + return wrapper; + } + + @Override + public void add(FinkVo finkVo) { + Date date = new Date(); + finkVo.setCreateTime(date); + finkMapper.insert(finkVo); + } + + @Override + public void upd(FinkVo finkVo) { + Date date = new Date(); + finkVo.setCreateTime(date); + finkMapper.updateById(finkVo); + } + + @Override + public void del(List finkVo) { + for (FinkVo vo : finkVo) { + finkMapper.deleteById(vo.getId()); + } + } + + @Override + public FinkVo findFinkVo(Integer id) { + return finkMapper.selectById(id); + } + +} diff --git a/srt-data-development/src/main/java/net/srt/Fink/vo/FinkVo.java b/srt-data-development/src/main/java/net/srt/Fink/vo/FinkVo.java new file mode 100644 index 0000000..5f6b004 --- /dev/null +++ b/srt-data-development/src/main/java/net/srt/Fink/vo/FinkVo.java @@ -0,0 +1,39 @@ +package net.srt.Fink.vo; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +@TableName("cluster_info") +public class FinkVo { + @TableId("id") + private Integer id; + private Integer projectId; + private String name; + private String alias; + private Integer type; + private String hosts; + private String jobManagerHost; + private String flinkVersion; + private Integer status; + private String note; + private Byte autoRegisters; + private Integer clusterConfigurationId; + private Integer taskId; + private boolean enabled; + private Integer version; + private Integer deleted; + private Integer creator; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + private Integer updater; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date updateTime; +} diff --git a/srt-data-development/src/main/java/net/srt/Fink/vo/request/AddFink.java b/srt-data-development/src/main/java/net/srt/Fink/vo/request/AddFink.java new file mode 100644 index 0000000..7e16928 --- /dev/null +++ b/srt-data-development/src/main/java/net/srt/Fink/vo/request/AddFink.java @@ -0,0 +1,13 @@ +package net.srt.Fink.vo.request; + +import lombok.Data; + +@Data +public class AddFink { + private String name; + private String alias; + private Integer type; + private String hosts; + private boolean enabled; + private String note; +} diff --git a/srt-data-development/src/main/java/net/srt/Fink/vo/request/FinkRequest.java b/srt-data-development/src/main/java/net/srt/Fink/vo/request/FinkRequest.java new file mode 100644 index 0000000..4af894c --- /dev/null +++ b/srt-data-development/src/main/java/net/srt/Fink/vo/request/FinkRequest.java @@ -0,0 +1,10 @@ +package net.srt.Fink.vo.request; + +import lombok.Data; +import net.srt.framework.common.query.Query; + +@Data +public class FinkRequest extends Query { + private String name; + private String alias; +} diff --git a/srt-data-development/src/main/java/net/srt/Hadoop/controller/HadoopController.java b/srt-data-development/src/main/java/net/srt/Hadoop/controller/HadoopController.java new file mode 100644 index 0000000..2aaeacf --- /dev/null +++ b/srt-data-development/src/main/java/net/srt/Hadoop/controller/HadoopController.java @@ -0,0 +1,74 @@ +package net.srt.Hadoop.controller; + +import lombok.AllArgsConstructor; +import net.srt.Hadoop.service.HadoopService; +import net.srt.Hadoop.vo.HadoopVo; +import net.srt.Hadoop.vo.request.HadoopRequest; +import net.srt.framework.common.page.PageResult; +import net.srt.framework.common.utils.Result; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@AllArgsConstructor +@RequestMapping("/cluster-configuration") +public class HadoopController { + private HadoopService hadoopService; + @GetMapping("/page") + public Result> finkPage( + @RequestParam Integer page, + @RequestParam Integer limit, + @RequestParam(value = "name", required = false) String name, + @RequestParam(value = "alias", required = false) String alias) { + HadoopRequest hadoopRequest = new HadoopRequest(); + hadoopRequest.setPage(page); + hadoopRequest.setLimit(limit); + hadoopRequest.setName(name); + hadoopRequest.setAlias(alias); + PageResult pageResult = hadoopService.hadoopPage(hadoopRequest); + return Result.ok(pageResult); + } + /** + * 添加 + * @param hadoopVo + * @return + */ + @PostMapping + public Result hadoopAdd(@RequestBody HadoopVo hadoopVo){ + hadoopService.add(hadoopVo); + return Result.ok(); + } + + /** + * 删除 + * @param hadoopVo + * @return + */ + @PutMapping + public Result hadoopUpd(@RequestBody HadoopVo hadoopVo){ + hadoopService.upd(hadoopVo); + return Result.ok(); + } + + /** + * 删除 + * @param hadoopVo + * @return + */ + @DeleteMapping + public Result hadoopDel(@RequestBody List hadoopVo){ + hadoopService.del(hadoopVo); + return Result.ok(); + } + + /** + * 回显 + * @param id + * @return + */ + @GetMapping("{id}") + public Result hadoopVoResult(@PathVariable Integer id){ + return Result.ok(hadoopService.findHadoopVo(id)); + } +} diff --git a/srt-data-development/src/main/java/net/srt/Hadoop/convert/HadoopConvert.java b/srt-data-development/src/main/java/net/srt/Hadoop/convert/HadoopConvert.java new file mode 100644 index 0000000..ab1d41e --- /dev/null +++ b/srt-data-development/src/main/java/net/srt/Hadoop/convert/HadoopConvert.java @@ -0,0 +1,10 @@ +package net.srt.Hadoop.convert; + +import net.srt.Fink.vo.FinkVo; +import net.srt.Hadoop.vo.HadoopVo; + +import java.util.List; + +public interface HadoopConvert { + List hadoopList(List list); +} diff --git a/srt-data-development/src/main/java/net/srt/Hadoop/convert/HadoopConvertImp.java b/srt-data-development/src/main/java/net/srt/Hadoop/convert/HadoopConvertImp.java new file mode 100644 index 0000000..6899c9c --- /dev/null +++ b/srt-data-development/src/main/java/net/srt/Hadoop/convert/HadoopConvertImp.java @@ -0,0 +1,23 @@ +package net.srt.Hadoop.convert; + +import net.srt.Fink.vo.FinkVo; +import net.srt.Hadoop.vo.HadoopVo; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +@Service +public class HadoopConvertImp implements HadoopConvert { + + @Override + public List hadoopList(List list) { + if (list==null){ + return null; + } + ArrayList hadoopVos = new ArrayList<>(); + for (HadoopVo hadoopVo : list) { + hadoopVos.add(hadoopVo); + } + return hadoopVos; + } +} diff --git a/srt-data-development/src/main/java/net/srt/Hadoop/mapper/HadoopMapper.java b/srt-data-development/src/main/java/net/srt/Hadoop/mapper/HadoopMapper.java new file mode 100644 index 0000000..6b3b9f4 --- /dev/null +++ b/srt-data-development/src/main/java/net/srt/Hadoop/mapper/HadoopMapper.java @@ -0,0 +1,7 @@ +package net.srt.Hadoop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import net.srt.Hadoop.vo.HadoopVo; + +public interface HadoopMapper extends BaseMapper { +} diff --git a/srt-data-development/src/main/java/net/srt/Hadoop/service/HadoopService.java b/srt-data-development/src/main/java/net/srt/Hadoop/service/HadoopService.java new file mode 100644 index 0000000..f8e25a4 --- /dev/null +++ b/srt-data-development/src/main/java/net/srt/Hadoop/service/HadoopService.java @@ -0,0 +1,21 @@ +package net.srt.Hadoop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import net.srt.Fink.vo.FinkVo; +import net.srt.Hadoop.vo.HadoopVo; +import net.srt.Hadoop.vo.request.HadoopRequest; +import net.srt.framework.common.page.PageResult; + +import java.util.List; + +public interface HadoopService extends IService { + PageResult hadoopPage(HadoopRequest hadoopRequest); + + void add(HadoopVo hadoopVo); + + HadoopVo findHadoopVo(Integer id); + + void del(List hadoopVo); + + void upd(HadoopVo hadoopVo); +} diff --git a/srt-data-development/src/main/java/net/srt/Hadoop/service/impl/HadoopServiceImpl.java b/srt-data-development/src/main/java/net/srt/Hadoop/service/impl/HadoopServiceImpl.java new file mode 100644 index 0000000..77af576 --- /dev/null +++ b/srt-data-development/src/main/java/net/srt/Hadoop/service/impl/HadoopServiceImpl.java @@ -0,0 +1,62 @@ +package net.srt.Hadoop.service.impl; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.AllArgsConstructor; +import net.srt.Fink.vo.FinkVo; +import net.srt.Fink.vo.request.FinkRequest; +import net.srt.Hadoop.controller.HadoopController; +import net.srt.Hadoop.convert.HadoopConvert; +import net.srt.Hadoop.mapper.HadoopMapper; +import net.srt.Hadoop.service.HadoopService; +import net.srt.Hadoop.vo.HadoopVo; +import net.srt.Hadoop.vo.request.HadoopRequest; +import net.srt.framework.common.page.PageResult; +import net.srt.framework.mybatis.service.impl.BaseServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@AllArgsConstructor +public class HadoopServiceImpl extends BaseServiceImpl implements HadoopService { + private HadoopMapper hadoopMapper; + private HadoopConvert hadoopList; + @Override + public PageResult hadoopPage(HadoopRequest hadoopRequest) { + IPage page = hadoopMapper.selectPage(getPage(hadoopRequest), getWrapper(hadoopRequest)); + return new PageResult<>(hadoopList.hadoopList(page.getRecords()), page.getTotal()); + } + + @Override + public void add(HadoopVo hadoopVo) { + + } + + @Override + public HadoopVo findHadoopVo(Integer id) { + return hadoopMapper.selectById(id); + } + + @Override + public void del(List hadoopVo) { + for (HadoopVo vo : hadoopVo) { + hadoopMapper.deleteById(vo); + } + } + + @Override + public void upd(HadoopVo hadoopVo) { + hadoopMapper.updateById(hadoopVo); + } + + private LambdaQueryWrapper getWrapper(HadoopRequest hadoopRequest){ + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.like(StrUtil.isNotBlank(hadoopRequest.getName()), HadoopVo::getName, hadoopRequest.getName()); + wrapper.like(StrUtil.isNotBlank(hadoopRequest.getAlias()), HadoopVo::getAlias, hadoopRequest.getAlias()); + dataScopeWithoutOrgId(wrapper); + return wrapper; + } +} diff --git a/srt-data-development/src/main/java/net/srt/Hadoop/vo/HadoopVo.java b/srt-data-development/src/main/java/net/srt/Hadoop/vo/HadoopVo.java new file mode 100644 index 0000000..db492df --- /dev/null +++ b/srt-data-development/src/main/java/net/srt/Hadoop/vo/HadoopVo.java @@ -0,0 +1,35 @@ +package net.srt.Hadoop.vo; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +@TableName("hadoop_info") +public class HadoopVo { + @TableId("id") + private Integer id; + private Integer projectId; + private String name; + private String alias; + private String type; + private String configJson; + private Boolean isAvailable; + private String note; + private Boolean enabled; + private Integer version; + private Integer deleted; + private Integer creator; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + private Integer updater; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date updateTime; + private String config; +} diff --git a/srt-data-development/src/main/java/net/srt/Hadoop/vo/request/HadoopRequest.java b/srt-data-development/src/main/java/net/srt/Hadoop/vo/request/HadoopRequest.java new file mode 100644 index 0000000..a13fab0 --- /dev/null +++ b/srt-data-development/src/main/java/net/srt/Hadoop/vo/request/HadoopRequest.java @@ -0,0 +1,11 @@ +package net.srt.Hadoop.vo.request; + +import lombok.Data; +import net.srt.framework.common.query.Query; + +@Data +public class HadoopRequest extends Query { + private String name; + private String alias; + +} diff --git a/srt-data-development/src/main/resources/auth.yml b/srt-data-development/src/main/resources/auth.yml new file mode 100644 index 0000000..0e6a006 --- /dev/null +++ b/srt-data-development/src/main/resources/auth.yml @@ -0,0 +1,7 @@ +auth: + ignore_urls: + - /auth/captcha + - /auth/login + - /auth/send/code + - /auth/mobile + - /upload/** \ No newline at end of file diff --git a/srt-data-development/src/main/resources/bootstrap.yml b/srt-data-development/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..0e95544 --- /dev/null +++ b/srt-data-development/src/main/resources/bootstrap.yml @@ -0,0 +1,43 @@ +server: + port: 8093 + +spring: + mvc: + servlet: + load-on-startup: 1 + application: + name: srt-data-development + profiles: + active: dev + cloud: + nacos: + discovery: + server-addr: 101.34.77.101:8848 + # 命名空间,默认:public + namespace: c5d32e76-b83c-4254-8176-1c6a2cee8e3b + service: ${spring.application.name} + group: srt2.1 + config: + server-addr: ${spring.cloud.nacos.discovery.server-addr} + namespace: ${spring.cloud.nacos.discovery.namespace} + file-extension: yaml + # 指定配置 + extension-configs: + - data-id: datasource.yaml + refresh: true + servlet: + multipart: + max-request-size: 100MB + max-file-size: 1024MB +storage: + enabled: true + config: + # 存储类型:local、aliyun + type: local + # 访问域名 + domain: http://localhost:8082/sys + # 配置访问前缀 + prefix: + local: + # 本地上传路径 + path: D://upload diff --git a/srt-data-development/src/main/resources/log4j2.xml b/srt-data-development/src/main/resources/log4j2.xml new file mode 100644 index 0000000..14461eb --- /dev/null +++ b/srt-data-development/src/main/resources/log4j2.xml @@ -0,0 +1,48 @@ + + + + + ./logs/ + srt-cloud-system + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +