From ebb130c8c4df45f3dcc8517e4b0e2fc58dc819b6 Mon Sep 17 00:00:00 2001 From: Wang XinLong <2142993385@qq.com> Date: Sun, 28 Apr 2024 22:41:37 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E8=B5=84=E4=BA=A7=E6=8E=88=E6=9D=83?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- muyu-modules/muyu-source/pom.xml | 1 - .../controller/AssetAccreditController.java | 52 +++++++++++++++++++ .../controller/DataSourceController.java | 11 ---- .../com/muyu/source/domain/AssetAccredit.java | 44 ++++++++++++++++ .../java/com/muyu/source/domain/DictType.java | 1 - .../domain/req/AssetAccreditQueryReq.java | 21 ++++++++ .../source/mapper/AssetAccreditMapper.java | 14 +++++ .../source/service/AssetAccreditService.java | 18 +++++++ .../source/service/DataSourceService.java | 4 -- .../impl/AssetAccreditServiceImpl.java | 41 +++++++++++++++ .../service/impl/DataSourceServiceImpl.java | 16 +----- .../service/impl/DictTypeServiceImpl.java | 1 - .../mapper/source/AssetAccreditMapper.xml | 7 +++ pom.xml | 8 +++ 14 files changed, 206 insertions(+), 33 deletions(-) create mode 100644 muyu-modules/muyu-source/src/main/java/com/muyu/source/controller/AssetAccreditController.java create mode 100644 muyu-modules/muyu-source/src/main/java/com/muyu/source/domain/AssetAccredit.java create mode 100644 muyu-modules/muyu-source/src/main/java/com/muyu/source/domain/req/AssetAccreditQueryReq.java create mode 100644 muyu-modules/muyu-source/src/main/java/com/muyu/source/mapper/AssetAccreditMapper.java create mode 100644 muyu-modules/muyu-source/src/main/java/com/muyu/source/service/AssetAccreditService.java create mode 100644 muyu-modules/muyu-source/src/main/java/com/muyu/source/service/impl/AssetAccreditServiceImpl.java create mode 100644 muyu-modules/muyu-source/src/main/resources/mapper/source/AssetAccreditMapper.xml diff --git a/muyu-modules/muyu-source/pom.xml b/muyu-modules/muyu-source/pom.xml index e99f389..ed79505 100644 --- a/muyu-modules/muyu-source/pom.xml +++ b/muyu-modules/muyu-source/pom.xml @@ -90,7 +90,6 @@ org.postgresql postgresql - 42.5.0 diff --git a/muyu-modules/muyu-source/src/main/java/com/muyu/source/controller/AssetAccreditController.java b/muyu-modules/muyu-source/src/main/java/com/muyu/source/controller/AssetAccreditController.java new file mode 100644 index 0000000..f04b344 --- /dev/null +++ b/muyu-modules/muyu-source/src/main/java/com/muyu/source/controller/AssetAccreditController.java @@ -0,0 +1,52 @@ +package com.muyu.source.controller; + +import com.muyu.common.core.domain.Result; +import com.muyu.source.domain.AssetAccredit; +import com.muyu.source.domain.req.AssetAccreditQueryReq; +import com.muyu.source.service.AssetAccreditService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 资产授权控制层 + * + * @author CHX + * on 2024/4/28 星期日 + */ +@RestController +@RequestMapping("/assetAccredit") +public class AssetAccreditController { + + @Autowired + private AssetAccreditService assetAccreditService; + + /** + * 查询资产授权列表 + * @param assetAccreditQueryReq + * @return + */ + @PostMapping("/list") + public Result list(@RequestBody AssetAccreditQueryReq assetAccreditQueryReq) { + List assetAccreditList = assetAccreditService.getList(assetAccreditQueryReq); + return Result.success(assetAccreditList); + } + + /** + * 添加资产授权 + * @param assetAccredit + * @return + */ + @PostMapping("/addAccredit") + public Result addAccredit(@RequestBody AssetAccredit assetAccredit) { + assetAccreditService.save(assetAccredit); + return Result.success(); + } + + @GetMapping("/delAccredit/{id}") + public Result delAccredit(@PathVariable("id") Integer id) { + assetAccreditService.removeById(id); + return Result.success(); + } +} diff --git a/muyu-modules/muyu-source/src/main/java/com/muyu/source/controller/DataSourceController.java b/muyu-modules/muyu-source/src/main/java/com/muyu/source/controller/DataSourceController.java index d290153..efe54e8 100644 --- a/muyu-modules/muyu-source/src/main/java/com/muyu/source/controller/DataSourceController.java +++ b/muyu-modules/muyu-source/src/main/java/com/muyu/source/controller/DataSourceController.java @@ -154,17 +154,6 @@ public class DataSourceController extends BaseController { return Result.success(list); } - /** - * 获取表下的字段描述 - * @param showTableReq - * @return - */ -// @PostMapping("/addTableData") -// public Result addTableData(@RequestBody ShowTableReq showTableReq){ -// dataSourceService.addTableData(showTableReq); -// return Result.success(); -// } - /** * 查询表数据总数 * @return diff --git a/muyu-modules/muyu-source/src/main/java/com/muyu/source/domain/AssetAccredit.java b/muyu-modules/muyu-source/src/main/java/com/muyu/source/domain/AssetAccredit.java new file mode 100644 index 0000000..d6d5dbd --- /dev/null +++ b/muyu-modules/muyu-source/src/main/java/com/muyu/source/domain/AssetAccredit.java @@ -0,0 +1,44 @@ +package com.muyu.source.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 资产授权 + * + * @author CHX + * on 2024/4/28 星期日 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName(value = "asset_accredit") +public class AssetAccredit { + /** + * 编号 + */ + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + /** + * 授权编号 + */ + private Integer accreditId; + /** + * 编号类型 dept/user + */ + private String idType; + /** + * 授权数据 + */ + private Integer dataId; + /** + * 授权数据类型 source/table + */ + private String dataType; +} diff --git a/muyu-modules/muyu-source/src/main/java/com/muyu/source/domain/DictType.java b/muyu-modules/muyu-source/src/main/java/com/muyu/source/domain/DictType.java index 3bcef27..a2c6f1c 100644 --- a/muyu-modules/muyu-source/src/main/java/com/muyu/source/domain/DictType.java +++ b/muyu-modules/muyu-source/src/main/java/com/muyu/source/domain/DictType.java @@ -10,7 +10,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import java.util.Date; import java.util.List; /** diff --git a/muyu-modules/muyu-source/src/main/java/com/muyu/source/domain/req/AssetAccreditQueryReq.java b/muyu-modules/muyu-source/src/main/java/com/muyu/source/domain/req/AssetAccreditQueryReq.java new file mode 100644 index 0000000..2c9b722 --- /dev/null +++ b/muyu-modules/muyu-source/src/main/java/com/muyu/source/domain/req/AssetAccreditQueryReq.java @@ -0,0 +1,21 @@ +package com.muyu.source.domain.req; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 资产授权查询对象 + * + * @author CHX + * on 2024/4/28 星期日 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class AssetAccreditQueryReq { + private String idType; + private String dataType; +} diff --git a/muyu-modules/muyu-source/src/main/java/com/muyu/source/mapper/AssetAccreditMapper.java b/muyu-modules/muyu-source/src/main/java/com/muyu/source/mapper/AssetAccreditMapper.java new file mode 100644 index 0000000..e8274e4 --- /dev/null +++ b/muyu-modules/muyu-source/src/main/java/com/muyu/source/mapper/AssetAccreditMapper.java @@ -0,0 +1,14 @@ +package com.muyu.source.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.source.domain.AssetAccredit; + +/** + * 资产授权mapper层 + * + * @author CHX + * on 2024/4/28 星期日 + */ +public interface AssetAccreditMapper extends BaseMapper { + +} diff --git a/muyu-modules/muyu-source/src/main/java/com/muyu/source/service/AssetAccreditService.java b/muyu-modules/muyu-source/src/main/java/com/muyu/source/service/AssetAccreditService.java new file mode 100644 index 0000000..d92a2b5 --- /dev/null +++ b/muyu-modules/muyu-source/src/main/java/com/muyu/source/service/AssetAccreditService.java @@ -0,0 +1,18 @@ +package com.muyu.source.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.source.domain.AssetAccredit; +import com.muyu.source.domain.req.AssetAccreditQueryReq; + +import java.util.List; + +/** + * 资产授权业务层 + * + * @author CHX + * on 2024/4/28 星期日 + */ +public interface AssetAccreditService extends IService { + + List getList(AssetAccreditQueryReq assetAccreditQueryReq); +} diff --git a/muyu-modules/muyu-source/src/main/java/com/muyu/source/service/DataSourceService.java b/muyu-modules/muyu-source/src/main/java/com/muyu/source/service/DataSourceService.java index 4dff750..ec9fe4d 100644 --- a/muyu-modules/muyu-source/src/main/java/com/muyu/source/service/DataSourceService.java +++ b/muyu-modules/muyu-source/src/main/java/com/muyu/source/service/DataSourceService.java @@ -3,7 +3,6 @@ package com.muyu.source.service; import java.sql.SQLException; import java.util.List; -import com.muyu.common.core.domain.Result; import com.muyu.source.domain.AssetDataSource; import com.muyu.source.domain.Children; import com.muyu.source.domain.DataSource; @@ -38,9 +37,6 @@ public interface DataSourceService extends IService { List getAssetList(); -// List getChildrenList(AssetDataSource assetDataSource); -// void addTableData(ShowTableReq showTableReq); - List getChildrenList(Integer id); CountResp selectTableDataCount(); diff --git a/muyu-modules/muyu-source/src/main/java/com/muyu/source/service/impl/AssetAccreditServiceImpl.java b/muyu-modules/muyu-source/src/main/java/com/muyu/source/service/impl/AssetAccreditServiceImpl.java new file mode 100644 index 0000000..af4d101 --- /dev/null +++ b/muyu-modules/muyu-source/src/main/java/com/muyu/source/service/impl/AssetAccreditServiceImpl.java @@ -0,0 +1,41 @@ +package com.muyu.source.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.exception.ServiceException; +import com.muyu.source.domain.AssetAccredit; +import com.muyu.source.domain.req.AssetAccreditQueryReq; +import com.muyu.source.mapper.AssetAccreditMapper; +import com.muyu.source.service.AssetAccreditService; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Objects; + +/** + * 资产授权实现层 + * + * @author CHX + * on 2024/4/28 星期日 + */ +@Service +public class AssetAccreditServiceImpl extends ServiceImpl + implements AssetAccreditService { + + @Override + public List getList(AssetAccreditQueryReq assetAccreditQueryReq) { + if (Objects.isNull(assetAccreditQueryReq.getIdType())){ + throw new ServiceException("id类型不能为空"); + } + if (Objects.isNull(assetAccreditQueryReq.getDataType())){ + throw new ServiceException("授权类型不能为空"); + } + + List assetAccreditList = list(new LambdaQueryWrapper<>() {{ + eq(AssetAccredit::getIdType, assetAccreditQueryReq.getIdType()); + eq(AssetAccredit::getDataType, assetAccreditQueryReq.getDataType()); + }}); + + return assetAccreditList; + } +} diff --git a/muyu-modules/muyu-source/src/main/java/com/muyu/source/service/impl/DataSourceServiceImpl.java b/muyu-modules/muyu-source/src/main/java/com/muyu/source/service/impl/DataSourceServiceImpl.java index 26f4a67..3915b02 100644 --- a/muyu-modules/muyu-source/src/main/java/com/muyu/source/service/impl/DataSourceServiceImpl.java +++ b/muyu-modules/muyu-source/src/main/java/com/muyu/source/service/impl/DataSourceServiceImpl.java @@ -2,17 +2,13 @@ package com.muyu.source.service.impl; import java.sql.*; import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.StringUtils; import com.muyu.source.domain.*; import com.muyu.source.domain.resp.CountResp; import com.muyu.source.service.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import com.muyu.source.mapper.DataSourceMapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -349,6 +345,7 @@ public class DataSourceServiceImpl extends ServiceImpl + + + + diff --git a/pom.xml b/pom.xml index fc97f1d..8797e89 100644 --- a/pom.xml +++ b/pom.xml @@ -35,6 +35,7 @@ 8.2.2 4.1.2 2.14.3 + 42.5.0 @@ -206,6 +207,13 @@ ${muyu.version} + + + org.postgresql + postgresql + ${postgresql.version} + +