From acbc880eafe34dcc4524c41722a13609da820adf Mon Sep 17 00:00:00 2001 From: chenbingxuan <3581044601@qq.com> Date: Thu, 21 Dec 2023 22:36:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/net/srt/DevelopmentApp.java | 1 + .../srt/Fink/controller/FinkController.java | 49 ++++++---------- .../net/srt/Fink/convert/FinkConvert.java | 15 ++++- .../net/srt/Fink/convert/FinkConvertImp.java | 21 ------- .../java/net/srt/Fink/dto/FinkAddDto.java | 34 +++++++++++ .../FinkRequest.java => dto/FinkDto.java} | 4 +- .../java/net/srt/Fink/entity/FinkEntity.java | 30 ++++++++++ .../java/net/srt/Fink/mapper/FinkMapper.java | 4 +- .../net/srt/Fink/service/FinkService.java | 18 +++--- .../Fink/service/impl/FinkServiceImpl.java | 56 ++++++++----------- .../src/main/java/net/srt/Fink/vo/FinkVo.java | 2 - .../java/net/srt/Fink/vo/request/AddFink.java | 13 ----- .../Hadoop/controller/HadoopController.java | 25 +++++---- .../net/srt/Hadoop/convert/HadoopConvert.java | 19 ++++++- .../srt/Hadoop/convert/HadoopConvertImp.java | 23 -------- .../java/net/srt/Hadoop/dto/HadoopAddDto.java | 31 ++++++++++ .../HadoopRequest.java => dto/HadoopDto.java} | 4 +- .../net/srt/Hadoop/entity/HadoopEntity.java | 24 ++++++++ .../net/srt/Hadoop/mapper/HadoopMapper.java | 4 +- .../net/srt/Hadoop/service/HadoopService.java | 15 ++--- .../service/impl/HadoopServiceImpl.java | 49 ++++++++-------- .../main/java/net/srt/Hadoop/vo/HadoopVo.java | 2 - .../DataProductionTreeController.java | 26 +++++++++ .../controller/DispositionController.java | 30 ++++++++++ .../convert/DataProductionTreeConvert.java | 15 +++++ .../convert/DispositionConvert.java | 15 +++++ .../srt/disposition/dto/DispositionDto.java | 20 +++++++ .../entity/DataProductionTreeEntity.java | 25 +++++++++ .../disposition/entity/DispositionEntity.java | 20 +++++++ .../mapper/DataProductionMapper.java | 7 +++ .../disposition/mapper/DispositionMapper.java | 7 +++ .../service/DataProductionService.java | 12 ++++ .../service/DispositionService.java | 13 +++++ .../impl/DataProductionServiceImpl.java | 38 +++++++++++++ .../service/impl/DispositionServiceImpl.java | 28 ++++++++++ .../disposition/vo/DataProductionTreeVo.java | 35 ++++++++++++ .../net/srt/disposition/vo/DispositionVo.java | 18 ++++++ 37 files changed, 562 insertions(+), 190 deletions(-) delete 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/dto/FinkAddDto.java rename srt-data-development/src/main/java/net/srt/Fink/{vo/request/FinkRequest.java => dto/FinkDto.java} (63%) create mode 100644 srt-data-development/src/main/java/net/srt/Fink/entity/FinkEntity.java delete mode 100644 srt-data-development/src/main/java/net/srt/Fink/vo/request/AddFink.java delete 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/dto/HadoopAddDto.java rename srt-data-development/src/main/java/net/srt/Hadoop/{vo/request/HadoopRequest.java => dto/HadoopDto.java} (61%) create mode 100644 srt-data-development/src/main/java/net/srt/Hadoop/entity/HadoopEntity.java create mode 100644 srt-data-development/src/main/java/net/srt/disposition/controller/DataProductionTreeController.java create mode 100644 srt-data-development/src/main/java/net/srt/disposition/controller/DispositionController.java create mode 100644 srt-data-development/src/main/java/net/srt/disposition/convert/DataProductionTreeConvert.java create mode 100644 srt-data-development/src/main/java/net/srt/disposition/convert/DispositionConvert.java create mode 100644 srt-data-development/src/main/java/net/srt/disposition/dto/DispositionDto.java create mode 100644 srt-data-development/src/main/java/net/srt/disposition/entity/DataProductionTreeEntity.java create mode 100644 srt-data-development/src/main/java/net/srt/disposition/entity/DispositionEntity.java create mode 100644 srt-data-development/src/main/java/net/srt/disposition/mapper/DataProductionMapper.java create mode 100644 srt-data-development/src/main/java/net/srt/disposition/mapper/DispositionMapper.java create mode 100644 srt-data-development/src/main/java/net/srt/disposition/service/DataProductionService.java create mode 100644 srt-data-development/src/main/java/net/srt/disposition/service/DispositionService.java create mode 100644 srt-data-development/src/main/java/net/srt/disposition/service/impl/DataProductionServiceImpl.java create mode 100644 srt-data-development/src/main/java/net/srt/disposition/service/impl/DispositionServiceImpl.java create mode 100644 srt-data-development/src/main/java/net/srt/disposition/vo/DataProductionTreeVo.java create mode 100644 srt-data-development/src/main/java/net/srt/disposition/vo/DispositionVo.java 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 0518c48..0dab29a 100644 --- a/srt-data-development/src/main/java/net/srt/DevelopmentApp.java +++ b/srt-data-development/src/main/java/net/srt/DevelopmentApp.java @@ -9,6 +9,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient; @SpringBootApplication @MapperScan("net.srt.Fink.mapper") @MapperScan("net.srt.Hadoop.mapper") +@MapperScan("net.srt.disposition.mapper") public class DevelopmentApp { public static void main(String[] args) { SpringApplication.run(DevelopmentApp.class); 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 index 98a281a..91ef632 100644 --- 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 @@ -1,16 +1,16 @@ package net.srt.Fink.controller; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.AllArgsConstructor; +import net.srt.Fink.dto.FinkAddDto; +import net.srt.Fink.dto.FinkDto; +import net.srt.Fink.entity.FinkEntity; 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 javax.validation.Valid; import java.util.List; @RestController @@ -22,57 +22,44 @@ public class FinkController { /** * 列表 - * @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); + public Result> finkPage(@Valid FinkDto finkDto) { + PageResult pageResult = finkService.finkPage(finkDto); return Result.ok(pageResult); } /** * 添加 - * @param finkVo + * @param finkAddDto * @return */ @PostMapping - public Result devAdd(@RequestBody FinkVo finkVo){ - finkService.add(finkVo); + public Result devAdd(@RequestBody FinkAddDto finkAddDto){ + finkService.add(finkAddDto); return Result.ok(); } /** - * 删除 - * @param finkVo + * 修改 + * @param finkAddDto * @return */ @PutMapping - public Result devUpd(@RequestBody FinkVo finkVo){ - finkService.upd(finkVo); + public Result devUpd(@RequestBody FinkAddDto finkAddDto){ + finkService.upd(finkAddDto); return Result.ok(); } /** * 删除 - * @param finkVo + * @param ids * @return */ @DeleteMapping - public Result devDel(@RequestBody List finkVo){ - finkService.del(finkVo); + public Result devDel(@RequestBody List ids){ + finkService.del(ids); return Result.ok(); } @@ -82,8 +69,8 @@ public class FinkController { * @return */ @GetMapping("{id}") - public Result finkVoResult(@PathVariable Integer id){ - return Result.ok(finkService.findFinkVo(id)); + public Result FinkEntityResult(@PathVariable Integer id){ + return Result.ok(finkService.findFinkEntity(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 index 23e57ce..d77d602 100644 --- 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 @@ -1,9 +1,20 @@ package net.srt.Fink.convert; +import net.srt.Fink.dto.FinkAddDto; +import net.srt.Fink.dto.FinkDto; +import net.srt.Fink.entity.FinkEntity; import net.srt.Fink.vo.FinkVo; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; import java.util.List; - +@Mapper public interface FinkConvert { - List devList(List list); + FinkConvert INSTANCE = Mappers.getMapper(FinkConvert.class); + + List devList(List list); + + FinkEntity convert(FinkAddDto vo); + + FinkVo convert(FinkEntity entity); } 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 deleted file mode 100644 index a89c99e..0000000 --- a/srt-data-development/src/main/java/net/srt/Fink/convert/FinkConvertImp.java +++ /dev/null @@ -1,21 +0,0 @@ -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/dto/FinkAddDto.java b/srt-data-development/src/main/java/net/srt/Fink/dto/FinkAddDto.java new file mode 100644 index 0000000..cd40e48 --- /dev/null +++ b/srt-data-development/src/main/java/net/srt/Fink/dto/FinkAddDto.java @@ -0,0 +1,34 @@ +package net.srt.Fink.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; +@Data +public class FinkAddDto { + 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/FinkRequest.java b/srt-data-development/src/main/java/net/srt/Fink/dto/FinkDto.java similarity index 63% rename from srt-data-development/src/main/java/net/srt/Fink/vo/request/FinkRequest.java rename to srt-data-development/src/main/java/net/srt/Fink/dto/FinkDto.java index 4af894c..cefa725 100644 --- a/srt-data-development/src/main/java/net/srt/Fink/vo/request/FinkRequest.java +++ b/srt-data-development/src/main/java/net/srt/Fink/dto/FinkDto.java @@ -1,10 +1,10 @@ -package net.srt.Fink.vo.request; +package net.srt.Fink.dto; import lombok.Data; import net.srt.framework.common.query.Query; @Data -public class FinkRequest extends Query { +public class FinkDto extends Query { private String name; private String alias; } diff --git a/srt-data-development/src/main/java/net/srt/Fink/entity/FinkEntity.java b/srt-data-development/src/main/java/net/srt/Fink/entity/FinkEntity.java new file mode 100644 index 0000000..ef126e0 --- /dev/null +++ b/srt-data-development/src/main/java/net/srt/Fink/entity/FinkEntity.java @@ -0,0 +1,30 @@ +package net.srt.Fink.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.EqualsAndHashCode; +import net.srt.framework.mybatis.entity.BaseEntity; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; +@Data +@TableName("cluster_info") +@EqualsAndHashCode(callSuper=false) +public class FinkEntity extends BaseEntity { + + 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; +} 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 index d5bffd2..579b139 100644 --- 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 @@ -1,9 +1,9 @@ package net.srt.Fink.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import net.srt.Fink.entity.FinkEntity; import net.srt.Fink.vo.FinkVo; -import org.springframework.stereotype.Repository; -public interface FinkMapper extends BaseMapper { +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 index 2d30011..1cfe3c5 100644 --- 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 @@ -1,22 +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.dto.FinkAddDto; +import net.srt.Fink.dto.FinkDto; +import net.srt.Fink.entity.FinkEntity; 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); +public interface FinkService extends IService { + PageResult finkPage(FinkDto finkRequest); - void add(FinkVo finkVo); + void add(FinkAddDto finkAddDto); - void upd(FinkVo finkVo); + void upd(FinkAddDto finkAddDto); - void del(List finkVo); + void del(List finkDtos); - FinkVo findFinkVo(Integer id); + FinkEntity findFinkEntity(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 index 985a55f..9100534 100644 --- 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 @@ -1,76 +1,66 @@ 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.dto.FinkAddDto; +import net.srt.Fink.dto.FinkDto; +import net.srt.Fink.entity.FinkEntity; 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 { +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()); - } + public PageResult finkPage(FinkDto finkRequest) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.like(StrUtil.isNotBlank(finkRequest.getName()), FinkEntity::getName, finkRequest.getName()); + wrapper.like(StrUtil.isNotBlank(finkRequest.getAlias()), FinkEntity::getAlias, finkRequest.getAlias()); + IPage page = baseMapper.selectPage(getPage(finkRequest), wrapper); + return new PageResult<>(FinkConvert.INSTANCE.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) { + public void add(FinkAddDto finkAddDto) { Date date = new Date(); - finkVo.setCreateTime(date); - finkMapper.insert(finkVo); + finkAddDto.setCreateTime(date); + FinkEntity finkEntity = FinkConvert.INSTANCE.convert(finkAddDto); + baseMapper.insert(finkEntity); } @Override - public void upd(FinkVo finkVo) { + public void upd(FinkAddDto finkAddDto) { Date date = new Date(); - finkVo.setCreateTime(date); - finkMapper.updateById(finkVo); + finkAddDto.setCreateTime(date); + FinkEntity finkEntity = FinkConvert.INSTANCE.convert(finkAddDto); + baseMapper.updateById(finkEntity); } @Override - public void del(List finkVo) { - for (FinkVo vo : finkVo) { - finkMapper.deleteById(vo.getId()); + public void del(List finkAddDtoList) { + for (Long l : finkAddDtoList) { + baseMapper.deleteById(l); } } @Override - public FinkVo findFinkVo(Integer id) { - return finkMapper.selectById(id); + public FinkEntity findFinkEntity(Integer id) { + return baseMapper.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 index 5f6b004..f881a94 100644 --- 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 @@ -9,9 +9,7 @@ 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; 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 deleted file mode 100644 index 7e16928..0000000 --- a/srt-data-development/src/main/java/net/srt/Fink/vo/request/AddFink.java +++ /dev/null @@ -1,13 +0,0 @@ -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/Hadoop/controller/HadoopController.java b/srt-data-development/src/main/java/net/srt/Hadoop/controller/HadoopController.java index 2aaeacf..b4ff453 100644 --- 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 @@ -1,9 +1,10 @@ package net.srt.Hadoop.controller; import lombok.AllArgsConstructor; +import net.srt.Hadoop.dto.HadoopAddDto; import net.srt.Hadoop.service.HadoopService; +import net.srt.Hadoop.dto.HadoopDto; 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.*; @@ -21,7 +22,7 @@ public class HadoopController { @RequestParam Integer limit, @RequestParam(value = "name", required = false) String name, @RequestParam(value = "alias", required = false) String alias) { - HadoopRequest hadoopRequest = new HadoopRequest(); + HadoopDto hadoopRequest = new HadoopDto(); hadoopRequest.setPage(page); hadoopRequest.setLimit(limit); hadoopRequest.setName(name); @@ -31,34 +32,34 @@ public class HadoopController { } /** * 添加 - * @param hadoopVo + * @param HadoopAddDto * @return */ @PostMapping - public Result hadoopAdd(@RequestBody HadoopVo hadoopVo){ - hadoopService.add(hadoopVo); + public Result hadoopAdd(@RequestBody HadoopAddDto HadoopAddDto){ + hadoopService.add(HadoopAddDto); return Result.ok(); } /** * 删除 - * @param hadoopVo + * @param HadoopAddDto * @return */ @PutMapping - public Result hadoopUpd(@RequestBody HadoopVo hadoopVo){ - hadoopService.upd(hadoopVo); + public Result hadoopUpd(@RequestBody HadoopAddDto HadoopAddDto){ + hadoopService.upd(HadoopAddDto); return Result.ok(); } /** * 删除 - * @param hadoopVo + * @param ids * @return */ @DeleteMapping - public Result hadoopDel(@RequestBody List hadoopVo){ - hadoopService.del(hadoopVo); + public Result hadoopDel(@RequestBody List ids){ + hadoopService.del(ids); return Result.ok(); } @@ -68,7 +69,7 @@ public class HadoopController { * @return */ @GetMapping("{id}") - public Result hadoopVoResult(@PathVariable Integer id){ + public Result HadoopAddDtoResult(@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 index ab1d41e..05d33d7 100644 --- 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 @@ -1,10 +1,25 @@ package net.srt.Hadoop.convert; +import net.srt.Fink.convert.FinkConvert; +import net.srt.Fink.dto.FinkAddDto; +import net.srt.Fink.entity.FinkEntity; import net.srt.Fink.vo.FinkVo; +import net.srt.Hadoop.dto.HadoopAddDto; +import net.srt.Hadoop.dto.HadoopDto; +import net.srt.Hadoop.entity.HadoopEntity; import net.srt.Hadoop.vo.HadoopVo; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; import java.util.List; - +@Mapper public interface HadoopConvert { - List hadoopList(List list); + HadoopConvert INSTANCE = Mappers.getMapper(HadoopConvert.class); + List hadoopList(List list); + + HadoopEntity convert(HadoopAddDto dto); + + HadoopVo convert(HadoopEntity entity); + + } 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 deleted file mode 100644 index 6899c9c..0000000 --- a/srt-data-development/src/main/java/net/srt/Hadoop/convert/HadoopConvertImp.java +++ /dev/null @@ -1,23 +0,0 @@ -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/dto/HadoopAddDto.java b/srt-data-development/src/main/java/net/srt/Hadoop/dto/HadoopAddDto.java new file mode 100644 index 0000000..22026d6 --- /dev/null +++ b/srt-data-development/src/main/java/net/srt/Hadoop/dto/HadoopAddDto.java @@ -0,0 +1,31 @@ +package net.srt.Hadoop.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +public class HadoopAddDto { + 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/dto/HadoopDto.java similarity index 61% rename from srt-data-development/src/main/java/net/srt/Hadoop/vo/request/HadoopRequest.java rename to srt-data-development/src/main/java/net/srt/Hadoop/dto/HadoopDto.java index a13fab0..63540b7 100644 --- a/srt-data-development/src/main/java/net/srt/Hadoop/vo/request/HadoopRequest.java +++ b/srt-data-development/src/main/java/net/srt/Hadoop/dto/HadoopDto.java @@ -1,10 +1,10 @@ -package net.srt.Hadoop.vo.request; +package net.srt.Hadoop.dto; import lombok.Data; import net.srt.framework.common.query.Query; @Data -public class HadoopRequest extends Query { +public class HadoopDto extends Query { private String name; private String alias; diff --git a/srt-data-development/src/main/java/net/srt/Hadoop/entity/HadoopEntity.java b/srt-data-development/src/main/java/net/srt/Hadoop/entity/HadoopEntity.java new file mode 100644 index 0000000..c1a5d07 --- /dev/null +++ b/srt-data-development/src/main/java/net/srt/Hadoop/entity/HadoopEntity.java @@ -0,0 +1,24 @@ +package net.srt.Hadoop.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import net.srt.framework.mybatis.entity.BaseEntity; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +@TableName("hadoop_info") +public class HadoopEntity extends BaseEntity { + 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 String config; +} 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 index 6b3b9f4..e943720 100644 --- 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 @@ -1,7 +1,9 @@ package net.srt.Hadoop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import net.srt.Hadoop.entity.HadoopEntity; import net.srt.Hadoop.vo.HadoopVo; +import org.apache.ibatis.annotations.Mapper; -public interface HadoopMapper extends BaseMapper { +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 index f8e25a4..ebde7f5 100644 --- 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 @@ -1,21 +1,22 @@ package net.srt.Hadoop.service; import com.baomidou.mybatisplus.extension.service.IService; -import net.srt.Fink.vo.FinkVo; +import net.srt.Hadoop.dto.HadoopAddDto; +import net.srt.Hadoop.entity.HadoopEntity; import net.srt.Hadoop.vo.HadoopVo; -import net.srt.Hadoop.vo.request.HadoopRequest; +import net.srt.Hadoop.dto.HadoopDto; import net.srt.framework.common.page.PageResult; import java.util.List; -public interface HadoopService extends IService { - PageResult hadoopPage(HadoopRequest hadoopRequest); +public interface HadoopService extends IService { + PageResult hadoopPage(HadoopDto hadoopRequest); - void add(HadoopVo hadoopVo); + void add(HadoopAddDto HadoopAddDto); HadoopVo findHadoopVo(Integer id); - void del(List hadoopVo); + void del(List ids); - void upd(HadoopVo hadoopVo); + void upd(HadoopAddDto HadoopAddDto); } 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 index 77af576..e6264e3 100644 --- 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 @@ -5,14 +5,14 @@ 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.Fink.convert.FinkConvert; import net.srt.Hadoop.convert.HadoopConvert; +import net.srt.Hadoop.dto.HadoopAddDto; +import net.srt.Hadoop.entity.HadoopEntity; 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.Hadoop.dto.HadoopDto; import net.srt.framework.common.page.PageResult; import net.srt.framework.mybatis.service.impl.BaseServiceImpl; import org.springframework.stereotype.Service; @@ -21,42 +21,39 @@ import java.util.List; @Service @AllArgsConstructor -public class HadoopServiceImpl extends BaseServiceImpl implements HadoopService { - private HadoopMapper hadoopMapper; - private HadoopConvert hadoopList; +public class HadoopServiceImpl extends BaseServiceImpl implements HadoopService { @Override - public PageResult hadoopPage(HadoopRequest hadoopRequest) { - IPage page = hadoopMapper.selectPage(getPage(hadoopRequest), getWrapper(hadoopRequest)); - return new PageResult<>(hadoopList.hadoopList(page.getRecords()), page.getTotal()); + public PageResult hadoopPage(HadoopDto hadoopRequest) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.like(StrUtil.isNotBlank(hadoopRequest.getName()), HadoopEntity::getName, hadoopRequest.getName()); + wrapper.like(StrUtil.isNotBlank(hadoopRequest.getAlias()), HadoopEntity::getAlias, hadoopRequest.getAlias()); + IPage page = baseMapper.selectPage(getPage(hadoopRequest), wrapper); + return new PageResult<>(HadoopConvert.INSTANCE.hadoopList(page.getRecords()), page.getTotal()); } @Override - public void add(HadoopVo hadoopVo) { - + public void add(HadoopAddDto hadoopAddDto) { + HadoopEntity convert = HadoopConvert.INSTANCE.convert(hadoopAddDto); + baseMapper.insert(convert); } @Override public HadoopVo findHadoopVo(Integer id) { - return hadoopMapper.selectById(id); + HadoopEntity hadoopEntity = baseMapper.selectById(id); + HadoopVo convert = HadoopConvert.INSTANCE.convert(hadoopEntity); + return convert; } @Override - public void del(List hadoopVo) { - for (HadoopVo vo : hadoopVo) { - hadoopMapper.deleteById(vo); + public void del(List ids) { + for (Long id : ids) { + baseMapper.deleteById(id); } } @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; + public void upd(HadoopAddDto hadoopAddDto) { + HadoopEntity convert = HadoopConvert.INSTANCE.convert(hadoopAddDto); + baseMapper.updateById(convert); } } 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 index db492df..bcbf906 100644 --- 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 @@ -9,9 +9,7 @@ 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; diff --git a/srt-data-development/src/main/java/net/srt/disposition/controller/DataProductionTreeController.java b/srt-data-development/src/main/java/net/srt/disposition/controller/DataProductionTreeController.java new file mode 100644 index 0000000..a104c12 --- /dev/null +++ b/srt-data-development/src/main/java/net/srt/disposition/controller/DataProductionTreeController.java @@ -0,0 +1,26 @@ +package net.srt.disposition.controller; + +import lombok.AllArgsConstructor; +import net.srt.disposition.service.DataProductionService; +import net.srt.disposition.vo.DataProductionTreeVo; +import net.srt.disposition.vo.DispositionVo; +import net.srt.framework.common.utils.Result; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@AllArgsConstructor +@RequestMapping("/catalogue") +public class DataProductionTreeController { + + private DataProductionService dataProductionService; + + @GetMapping + public Result> listResult(){ + List dispositionVos=dataProductionService.dataTreeList(); + return Result.ok(dispositionVos); + } +} diff --git a/srt-data-development/src/main/java/net/srt/disposition/controller/DispositionController.java b/srt-data-development/src/main/java/net/srt/disposition/controller/DispositionController.java new file mode 100644 index 0000000..7b1d4dc --- /dev/null +++ b/srt-data-development/src/main/java/net/srt/disposition/controller/DispositionController.java @@ -0,0 +1,30 @@ +package net.srt.disposition.controller; + +import lombok.AllArgsConstructor; +import net.srt.disposition.dto.DispositionDto; +import net.srt.disposition.service.DispositionService; +import net.srt.disposition.vo.DispositionVo; +import net.srt.framework.common.utils.Result; +import org.springframework.web.bind.annotation.*; + +@RestController +@AllArgsConstructor +@RequestMapping("sys-config") +public class DispositionController { + + private DispositionService dispositionService; + + @GetMapping("/getAll") + public Result getAll() { + DispositionVo dispositionVo=dispositionService.getAll(); + return Result.ok(dispositionVo); + } + + @PostMapping("/updateSysConfigByJson") + public Result upd(@RequestBody DispositionDto dispositionDto) { + dispositionService.upd(dispositionDto); + return Result.ok(); + } + + +} diff --git a/srt-data-development/src/main/java/net/srt/disposition/convert/DataProductionTreeConvert.java b/srt-data-development/src/main/java/net/srt/disposition/convert/DataProductionTreeConvert.java new file mode 100644 index 0000000..ead7b57 --- /dev/null +++ b/srt-data-development/src/main/java/net/srt/disposition/convert/DataProductionTreeConvert.java @@ -0,0 +1,15 @@ +package net.srt.disposition.convert; + +import net.srt.disposition.dto.DispositionDto; +import net.srt.disposition.entity.DispositionEntity; +import net.srt.disposition.vo.DispositionVo; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +@Mapper +public interface DataProductionTreeConvert { + DataProductionTreeConvert INSTANCE = Mappers.getMapper(DataProductionTreeConvert.class); + DispositionVo convert(DispositionEntity entity); + + DispositionEntity convert(DispositionDto vo); +} diff --git a/srt-data-development/src/main/java/net/srt/disposition/convert/DispositionConvert.java b/srt-data-development/src/main/java/net/srt/disposition/convert/DispositionConvert.java new file mode 100644 index 0000000..7d4a99d --- /dev/null +++ b/srt-data-development/src/main/java/net/srt/disposition/convert/DispositionConvert.java @@ -0,0 +1,15 @@ +package net.srt.disposition.convert; + +import net.srt.disposition.dto.DispositionDto; +import net.srt.disposition.entity.DispositionEntity; +import net.srt.disposition.vo.DispositionVo; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +@Mapper +public interface DispositionConvert { + DispositionConvert INSTANCE = Mappers.getMapper(DispositionConvert.class); + DispositionVo convert(DispositionEntity entity); + + DispositionEntity convert(DispositionDto vo); +} diff --git a/srt-data-development/src/main/java/net/srt/disposition/dto/DispositionDto.java b/srt-data-development/src/main/java/net/srt/disposition/dto/DispositionDto.java new file mode 100644 index 0000000..2d28d20 --- /dev/null +++ b/srt-data-development/src/main/java/net/srt/disposition/dto/DispositionDto.java @@ -0,0 +1,20 @@ +package net.srt.disposition.dto; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@TableName("flink_job_configuration") +@EqualsAndHashCode(callSuper=false) +public class DispositionDto { + @TableId + private Integer id; + private String sqlSeparator; + private String sqlSubmitJarPath; + private String sqlSubmitJarMainAppClass; + private boolean useRestAPI; + private String jobIdWait; + private String sqlSubmitJarParas; +} diff --git a/srt-data-development/src/main/java/net/srt/disposition/entity/DataProductionTreeEntity.java b/srt-data-development/src/main/java/net/srt/disposition/entity/DataProductionTreeEntity.java new file mode 100644 index 0000000..6622a6f --- /dev/null +++ b/srt-data-development/src/main/java/net/srt/disposition/entity/DataProductionTreeEntity.java @@ -0,0 +1,25 @@ +package net.srt.disposition.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import net.srt.framework.mybatis.entity.BaseEntity; + +@Data +@TableName("data_production_tree") +public class DataProductionTreeEntity extends BaseEntity { + private Long parentId; + private Integer ifLeaf; + private Long taskId; + private String taskType; + private String parentPath; + private String path; + private Integer orderNo; + private String label; + private Long metamodelId; + private String name; + private String icon; + private String code; + private Boolean builtin; + private String description; + private Long projectId; +} diff --git a/srt-data-development/src/main/java/net/srt/disposition/entity/DispositionEntity.java b/srt-data-development/src/main/java/net/srt/disposition/entity/DispositionEntity.java new file mode 100644 index 0000000..059383c --- /dev/null +++ b/srt-data-development/src/main/java/net/srt/disposition/entity/DispositionEntity.java @@ -0,0 +1,20 @@ +package net.srt.disposition.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@TableName("flink_job_configuration") +@EqualsAndHashCode(callSuper=false) +public class DispositionEntity { + @TableId("id") + private Integer id; + private String sqlSeparator; + private String sqlSubmitJarPath; + private String sqlSubmitJarMainAppClass; + private boolean useRestAPI; + private String jobIdWait; + private String sqlSubmitJarParas; +} diff --git a/srt-data-development/src/main/java/net/srt/disposition/mapper/DataProductionMapper.java b/srt-data-development/src/main/java/net/srt/disposition/mapper/DataProductionMapper.java new file mode 100644 index 0000000..15c512c --- /dev/null +++ b/srt-data-development/src/main/java/net/srt/disposition/mapper/DataProductionMapper.java @@ -0,0 +1,7 @@ +package net.srt.disposition.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import net.srt.disposition.entity.DataProductionTreeEntity; + +public interface DataProductionMapper extends BaseMapper { +} diff --git a/srt-data-development/src/main/java/net/srt/disposition/mapper/DispositionMapper.java b/srt-data-development/src/main/java/net/srt/disposition/mapper/DispositionMapper.java new file mode 100644 index 0000000..cc3cb28 --- /dev/null +++ b/srt-data-development/src/main/java/net/srt/disposition/mapper/DispositionMapper.java @@ -0,0 +1,7 @@ +package net.srt.disposition.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import net.srt.disposition.entity.DispositionEntity; + +public interface DispositionMapper extends BaseMapper { +} diff --git a/srt-data-development/src/main/java/net/srt/disposition/service/DataProductionService.java b/srt-data-development/src/main/java/net/srt/disposition/service/DataProductionService.java new file mode 100644 index 0000000..85a507b --- /dev/null +++ b/srt-data-development/src/main/java/net/srt/disposition/service/DataProductionService.java @@ -0,0 +1,12 @@ +package net.srt.disposition.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import net.srt.disposition.entity.DataProductionTreeEntity; +import net.srt.disposition.vo.DataProductionTreeVo; + +import java.util.List; + +public interface DataProductionService extends IService { + List dataTreeList(); + +} diff --git a/srt-data-development/src/main/java/net/srt/disposition/service/DispositionService.java b/srt-data-development/src/main/java/net/srt/disposition/service/DispositionService.java new file mode 100644 index 0000000..79b03f8 --- /dev/null +++ b/srt-data-development/src/main/java/net/srt/disposition/service/DispositionService.java @@ -0,0 +1,13 @@ +package net.srt.disposition.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import net.srt.disposition.dto.DispositionDto; +import net.srt.disposition.entity.DispositionEntity; +import net.srt.disposition.vo.DispositionVo; + +public interface DispositionService extends IService { + DispositionVo getAll(); + + void upd(DispositionDto dispositionDto); + +} diff --git a/srt-data-development/src/main/java/net/srt/disposition/service/impl/DataProductionServiceImpl.java b/srt-data-development/src/main/java/net/srt/disposition/service/impl/DataProductionServiceImpl.java new file mode 100644 index 0000000..6cffcaf --- /dev/null +++ b/srt-data-development/src/main/java/net/srt/disposition/service/impl/DataProductionServiceImpl.java @@ -0,0 +1,38 @@ +package net.srt.disposition.service.impl; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.AllArgsConstructor; +import net.srt.Fink.entity.FinkEntity; +import net.srt.disposition.entity.DataProductionTreeEntity; +import net.srt.disposition.mapper.DataProductionMapper; +import net.srt.disposition.service.DataProductionService; +import net.srt.disposition.vo.DataProductionTreeVo; +import net.srt.framework.mybatis.service.impl.BaseServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +@Service +@AllArgsConstructor +public class DataProductionServiceImpl extends BaseServiceImpl implements DataProductionService { + @Override + public List dataTreeList() { + List dataProductionTreeEntities = baseMapper.selectList(null); + for (DataProductionTreeEntity dataProductionTreeEntity : dataProductionTreeEntities) { + List dataProductionTreeVos=findDataProductTreeVoList(dataProductionTreeEntity); + } + return null; + } + + private List findDataProductTreeVoList(DataProductionTreeEntity dataProductionTreeEntity) { + List dataProductionTreeVos=new ArrayList<>(); + QueryWrapper dataProductionTreeEntityQueryWrapper = new QueryWrapper<>(); + dataProductionTreeEntityQueryWrapper.eq("parent_id",dataProductionTreeEntity.getId()); + List dataProductionTreeEntities = baseMapper.selectList(dataProductionTreeEntityQueryWrapper); + + return null; + } +} diff --git a/srt-data-development/src/main/java/net/srt/disposition/service/impl/DispositionServiceImpl.java b/srt-data-development/src/main/java/net/srt/disposition/service/impl/DispositionServiceImpl.java new file mode 100644 index 0000000..cdcae25 --- /dev/null +++ b/srt-data-development/src/main/java/net/srt/disposition/service/impl/DispositionServiceImpl.java @@ -0,0 +1,28 @@ +package net.srt.disposition.service.impl; + +import lombok.AllArgsConstructor; +import net.srt.disposition.convert.DispositionConvert; +import net.srt.disposition.dto.DispositionDto; +import net.srt.disposition.entity.DispositionEntity; +import net.srt.disposition.mapper.DispositionMapper; +import net.srt.disposition.service.DispositionService; +import net.srt.disposition.vo.DispositionVo; +import net.srt.framework.mybatis.service.impl.BaseServiceImpl; +import org.springframework.stereotype.Service; + +@Service +@AllArgsConstructor +public class DispositionServiceImpl extends BaseServiceImpl implements DispositionService { + @Override + public DispositionVo getAll() { + DispositionEntity dispositionEntity = baseMapper.selectOne(null); + DispositionVo convert = DispositionConvert.INSTANCE.convert(dispositionEntity); + return convert; + } + + @Override + public void upd(DispositionDto dispositionDto) { + DispositionEntity convert = DispositionConvert.INSTANCE.convert(dispositionDto); + baseMapper.updateById(convert); + } +} diff --git a/srt-data-development/src/main/java/net/srt/disposition/vo/DataProductionTreeVo.java b/srt-data-development/src/main/java/net/srt/disposition/vo/DataProductionTreeVo.java new file mode 100644 index 0000000..d1e4ae4 --- /dev/null +++ b/srt-data-development/src/main/java/net/srt/disposition/vo/DataProductionTreeVo.java @@ -0,0 +1,35 @@ +package net.srt.disposition.vo; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import net.srt.framework.mybatis.entity.BaseEntity; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; +import java.util.List; + +@Data +public class DataProductionTreeVo { + private Long id; + private Long parentId; + private Integer ifLeaf; + private Long taskId; + private String taskType; + private String parentPath; + private String path; + private Integer orderNo; + private String label; + private Long metamodelId; + private String name; + private String icon; + private String code; + private Boolean builtin; + private String description; + private Long projectId; + private Long creator; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private Date createTime; + private List dataProductionTreeVos; +} diff --git a/srt-data-development/src/main/java/net/srt/disposition/vo/DispositionVo.java b/srt-data-development/src/main/java/net/srt/disposition/vo/DispositionVo.java new file mode 100644 index 0000000..235a0f1 --- /dev/null +++ b/srt-data-development/src/main/java/net/srt/disposition/vo/DispositionVo.java @@ -0,0 +1,18 @@ +package net.srt.disposition.vo; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@EqualsAndHashCode(callSuper=false) +public class DispositionVo { + private Integer id; + private String sqlSeparator; + private String sqlSubmitJarPath; + private String sqlSubmitJarMainAppClass; + private boolean useRestAPI; + private String jobIdWait; + private String sqlSubmitJarParas; +} From 030298942b4be39ccba9665da0bfe4311fec3f95 Mon Sep 17 00:00:00 2001 From: zmyYYDS <864398951@qq.com> Date: Thu, 21 Dec 2023 22:38:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9C=80=E6=96=B0=E4=B8=80=E7=89=883.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/net/srt/GovernanceApplication.java | 1 + 1 file changed, 1 insertion(+) diff --git a/srt-cloud-data-governance/src/main/java/net/srt/GovernanceApplication.java b/srt-cloud-data-governance/src/main/java/net/srt/GovernanceApplication.java index 5ac636d..00deed4 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/GovernanceApplication.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/GovernanceApplication.java @@ -17,5 +17,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients; public class GovernanceApplication { public static void main(String[] args) { SpringApplication.run(GovernanceApplication.class, args); + } } From d5cf5a96f6c79484db18eaa71197c249531d7e52 Mon Sep 17 00:00:00 2001 From: fjj <–1066869486@qq.com> Date: Fri, 22 Dec 2023 08:00:08 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=A0=87=E5=87=86=E7=AE=A1=E7=90=862.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../net/srt/convert/DatastandardConvert.java | 27 +++++++++ .../java/net/srt/dao/DatastandardDao.java | 18 ++++++ .../net/srt/entity/DatastandardEntity.java | 43 ++++++++++++++ .../net/srt/service/DatastandardService.java | 25 ++++++++ .../service/impl/DatastandardServiceImpl.java | 58 +++++++++++++++++++ 5 files changed, 171 insertions(+) create mode 100644 srt-cloud-data-governance/src/main/java/net/srt/convert/DatastandardConvert.java create mode 100644 srt-cloud-data-governance/src/main/java/net/srt/dao/DatastandardDao.java create mode 100644 srt-cloud-data-governance/src/main/java/net/srt/entity/DatastandardEntity.java create mode 100644 srt-cloud-data-governance/src/main/java/net/srt/service/DatastandardService.java create mode 100644 srt-cloud-data-governance/src/main/java/net/srt/service/impl/DatastandardServiceImpl.java diff --git a/srt-cloud-data-governance/src/main/java/net/srt/convert/DatastandardConvert.java b/srt-cloud-data-governance/src/main/java/net/srt/convert/DatastandardConvert.java new file mode 100644 index 0000000..587c6e6 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/convert/DatastandardConvert.java @@ -0,0 +1,27 @@ +package net.srt.convert; + +import net.srt.entity.DatastandardEntity; +import net.srt.vo.StandardManagementVo; + +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +import java.util.List; + +/** + * @BelongsProject: srt_cloud + * @BelongsPackage: net.srt.convert + * @Author: jpz + * @CreateTime: 2023/12/20 19:50 + */ + +@Mapper +public interface DatastandardConvert { + DatastandardConvert INSTANCE = Mappers.getMapper(DatastandardConvert.class); + + + List convertList(List list); + + StandardManagementVo convert(DatastandardEntity entity); + +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/dao/DatastandardDao.java b/srt-cloud-data-governance/src/main/java/net/srt/dao/DatastandardDao.java new file mode 100644 index 0000000..ea42d8b --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/dao/DatastandardDao.java @@ -0,0 +1,18 @@ +package net.srt.dao; + +import net.srt.entity.DatastandardEntity; +import net.srt.framework.mybatis.dao.BaseDao; +import net.srt.vo.StandardManagementVo; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @ClassName : DatastandardDao + * @Description : + * @Author : FJJ + * @Date: 2023-12-21 11:09 + */ +@Mapper +public interface DatastandardDao extends BaseDao { +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/entity/DatastandardEntity.java b/srt-cloud-data-governance/src/main/java/net/srt/entity/DatastandardEntity.java new file mode 100644 index 0000000..03ea5c8 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/entity/DatastandardEntity.java @@ -0,0 +1,43 @@ +package net.srt.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.EqualsAndHashCode; +import net.srt.framework.mybatis.entity.BaseEntity; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * @ClassName : DatastandardEntity + * @Description : + * @Author : FJJ + * @Date: 2023-12-21 11:09 + */ +@EqualsAndHashCode(callSuper = false) +@Data +@TableName("standard_management") +public class DatastandardEntity extends BaseEntity { + private static final long serialVersionUID = 1L; + @TableId("id") + private Long id; + private Integer categoryId; + private String engName; + private String cnName; + private Integer codeNum; + private String dataType; + private Integer dataLength; + private Integer dataPrecision; + private Integer nullable; + private Integer standardCodeId; + private Integer type; + private String note; + private Integer projectId; + private Integer status; + private Integer version; + private Integer deleted; + private Integer ifStandardRel; + +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/service/DatastandardService.java b/srt-cloud-data-governance/src/main/java/net/srt/service/DatastandardService.java new file mode 100644 index 0000000..d70b19b --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/service/DatastandardService.java @@ -0,0 +1,25 @@ +package net.srt.service; + +import net.srt.entity.DatastandardEntity; +import net.srt.framework.common.page.PageResult; +import net.srt.framework.mybatis.service.BaseService; +import net.srt.query.StandardManagementQuery; +import net.srt.vo.StandardManagementVo; +import org.apache.ibatis.annotations.Mapper; +import org.mybatis.spring.annotation.MapperScan; + +import java.util.List; + +/** + * @ClassName : DatastandardService + * @Description : + * @Author : FJJ + * @Date: 2023-12-21 11:21 + */ +@MapperScan("net.srt.service.DatastandardService") +public interface DatastandardService extends BaseService { + PageResult page(StandardManagementQuery query); + + List getTableCode(); + +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/service/impl/DatastandardServiceImpl.java b/srt-cloud-data-governance/src/main/java/net/srt/service/impl/DatastandardServiceImpl.java new file mode 100644 index 0000000..ec4f942 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/service/impl/DatastandardServiceImpl.java @@ -0,0 +1,58 @@ +package net.srt.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +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.convert.DatastandardConvert; +import net.srt.dao.DatastandardDao; +import net.srt.entity.DatastandardEntity; +import net.srt.framework.common.constant.Constant; +import net.srt.framework.common.page.PageResult; +import net.srt.framework.mybatis.service.impl.BaseServiceImpl; +import net.srt.query.StandardManagementQuery; +import net.srt.service.DatastandardService; +import net.srt.vo.StandardManagementVo; +import org.springframework.stereotype.Service; +import srt.cloud.framework.dbswitch.common.util.StringUtil; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @ClassName : DatastandardServiceImpl + * @Description : + * @Author : FJJ + * @Date: 2023-12-21 11:21 + */ +@Service +@AllArgsConstructor +public class DatastandardServiceImpl extends BaseServiceImpl implements DatastandardService { + private final DatastandardDao datastandardDao; + @Override + public PageResult page(StandardManagementQuery query) { + IPage page = baseMapper.selectPage(getPage(query), getWrapper(query)); + return new PageResult<>(DatastandardConvert.INSTANCE.convertList(page.getRecords()), page.getTotal()); + } + + @Override + public List getTableCode() { + List list= datastandardDao.selectList(Wrappers.lambdaQuery()); + return list; + } + + + + + private LambdaQueryWrapper getWrapper(StandardManagementQuery query) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.like(StringUtil.isNotBlank(query.getCnName()), DatastandardEntity::getCnName, query.getCnName()); + wrapper.like(StringUtil.isNotBlank(query.getEngName()), DatastandardEntity::getEngName, query.getEngName()); + wrapper.eq(query.getCategoryId() != null, DatastandardEntity::getCategoryId, query.getCategoryId()); + dataScopeWithOrgId(wrapper); + return wrapper; + } + +}