From ba2a4a453142f8990c24582650b2262a626c13c3 Mon Sep 17 00:00:00 2001 From: hp <2969694837@qq.com> Date: Wed, 28 Sep 2022 16:22:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=A0=E5=B0=84=E8=AF=A6=E6=83=85=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/sysmapping/SysMappingFeign.java | 5 + .../sysmapping/SysMappingFeignFallback.java | 5 + .../api/sysmapping/SysMappingInfoQuery.java | 25 +++++ .../api/sysmapping/SysMappingInfoVo.java | 27 ++++++ .../api/sysmapping/SysMappingQuery.java | 3 +- .../biz/sysmapping/SysMappingMapper.java | 21 +++-- .../biz/sysmapping/SysMappingMapper.xml | 17 ++++ .../portal/biz/sysmapping/SysMappingRest.java | 93 ++++++++++--------- .../biz/sysmapping/SysMappingService.java | 29 ++++-- 9 files changed, 163 insertions(+), 62 deletions(-) create mode 100644 anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoQuery.java create mode 100644 anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoVo.java diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java index 498c13190f..d710445e2d 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java @@ -80,4 +80,9 @@ public interface SysMappingFeign { @PostMapping("/saveMappingList") @ResponseBody public ResultBean saveMappingList(@RequestBody List dto); + + @ApiOperation("根据条件查询详情") + @PostMapping("/selectMappingInfo") + @ResponseBody + public ResultBean selectMappingInfo(@RequestBody SysMappingInfoQuery query); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java index 7da2d7bd81..1aa609b3c8 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java @@ -74,4 +74,9 @@ public class SysMappingFeignFallback implements SysMappingFeign { public ResultBean saveMappingList(List dto) { return null; } + + @Override + public ResultBean selectMappingInfo(SysMappingInfoQuery query) { + return null; + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoQuery.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoQuery.java new file mode 100644 index 0000000000..91a82748bd --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoQuery.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.portal.api.sysmapping; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class SysMappingInfoQuery implements Query { + private static final long serialVersionUID = 5179141159925489016L; + + @ApiModelProperty("映射来源，如CWXT等") + private String map_sourceKey; // 映射来源，如CWXT等 + + @ApiModelProperty("映射实体，如付款单") + private String map_object; // 映射实体，如付款单 + + @ApiModelProperty("映射项目类别，如应付类别") + private String map_item; // 映射项目类别，如应付类别 + + @ApiModelProperty("数据字典类别编码") + private String dictTypeCode; // 数据字典类别编码 + + @ApiModelProperty("数据key") + private String dictKey; // 数据key +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoVo.java new file mode 100644 index 0000000000..f6aa7a47d1 --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoVo.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.portal.api.sysmapping; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class SysMappingInfoVo implements Vo { + + + private static final long serialVersionUID = -4909774998558087805L; + + @ApiModelProperty("数据字典sid") + private String dictSid; // 数据字典sid + @ApiModelProperty("映射来源，如CWXT等") + private String map_sourceKey; // 映射来源，如CWXT等 + @ApiModelProperty("映射来源，如财务系统等") + private String map_sourceValue; // 映射来源，如财务系统等 + @ApiModelProperty("映射实体，如付款单") + private String map_object; // 映射实体，如付款单 + @ApiModelProperty("映射项目类别，如应付类别") + private String map_item; // 映射项目类别，如应付类别 + @ApiModelProperty("项目key，如002") + private String map_itemKey; // 项目key，如002 + @ApiModelProperty("项目value，如外采") + private String map_itemValue; // 项目value，如外采 +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingQuery.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingQuery.java index 8f2ae3a302..4c770a10f5 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingQuery.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingQuery.java @@ -49,7 +49,8 @@ import lombok.Data; @ApiModel(value = "数据映射 查询条件", description = "数据映射 查询条件") public class SysMappingQuery implements Query { - @ApiModelProperty("数据字典sid") + private static final long serialVersionUID = -546734185535363676L; + @ApiModelProperty("数据字典sid") private String dictSid; // 数据字典sid @ApiModelProperty("映射来源，如CWXT等") private String map_sourceKey; // 映射来源，如CWXT等 diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.java index b450288b48..0020c83dea 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.java @@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoVo; import com.yxt.anrui.portal.api.sysmapping.SysMappingQuery; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -55,13 +56,15 @@ import java.util.List; @Mapper public interface SysMappingMapper extends BaseMapper { - //@Update("update sys_mapping set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from sys_mapping") - List selectListVo(); + //@Update("update sys_mapping set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from sys_mapping") + List selectListVo(); + + SysMappingInfoVo selectMappingInfo(@Param(Constants.WRAPPER) QueryWrapper qw); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.xml index c9ff246464..a596f7a84b 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.xml @@ -28,4 +28,21 @@ SELECT * FROM sys_mapping ${ew.sqlSegment} + + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingRest.java index 8167fd0dc7..19db2ebc09 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingRest.java @@ -26,6 +26,7 @@ package com.yxt.anrui.portal.biz.sysmapping; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.portal.api.sysmapping.*; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -36,12 +37,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; -import com.yxt.anrui.portal.api.sysmapping.SysMapping; -import com.yxt.anrui.portal.api.sysmapping.SysMappingQuery; -import com.yxt.anrui.portal.api.sysmapping.SysMappingVo; -import com.yxt.anrui.portal.api.sysmapping.SysMappingDetailsVo; -import com.yxt.anrui.portal.api.sysmapping.SysMappingDto; -import com.yxt.anrui.portal.api.sysmapping.SysMappingFeign; /** * Project: sysmapping(sysmapping)
@@ -61,52 +56,58 @@ import com.yxt.anrui.portal.api.sysmapping.SysMappingFeign; @RequestMapping("v1/sysmapping") public class SysMappingRest implements SysMappingFeign { - @Autowired - private SysMappingService sysMappingService; + @Autowired + private SysMappingService sysMappingService; - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo page = new PagerVo<>(); - IPage iPage = sysMappingService.listPageVo(pq); - PagerVo pagerVo = PagerUtil.pageToVo(iPage, page); - return new ResultBean>().success().setData(pagerVo); + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + PagerVo page = new PagerVo<>(); + IPage iPage = sysMappingService.listPageVo(pq); + PagerVo pagerVo = PagerUtil.pageToVo(iPage, page); + return new ResultBean>().success().setData(pagerVo); - } + } - @Override - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody SysMappingDto dto){ - ResultBean rb = ResultBean.fireFail(); - sysMappingService.saveOrUpdateDto(dto); - return rb.success(); - } + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody SysMappingDto dto) { + ResultBean rb = ResultBean.fireFail(); + sysMappingService.saveOrUpdateDto(dto); + return rb.success(); + } - @Override - @ApiOperation("根据sid批量删除") + @Override + @ApiOperation("根据sid批量删除") @PostMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - sysMappingService.delBySids(sids); - return rb.success(); - } + public ResultBean delBySids(@RequestBody String[] sids) { + ResultBean rb = ResultBean.fireFail(); + sysMappingService.delBySids(sids); + return rb.success(); + } - @Override - @ApiOperation("根据SID获取一条记录") + @Override + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - SysMappingDetailsVo vo = sysMappingService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + SysMappingDetailsVo vo = sysMappingService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } - @Override - public ResultBean saveMappingList(List dto) { - ResultBean rb = ResultBean.fireFail(); - sysMappingService.saveMappingList(dto); - return rb.success(); - } + @Override + public ResultBean saveMappingList(List dto) { + ResultBean rb = ResultBean.fireFail(); + sysMappingService.saveMappingList(dto); + return rb.success(); + } + + @Override + public ResultBean selectMappingInfo(SysMappingInfoQuery query) { + ResultBean rb = ResultBean.fireFail(); + SysMappingInfoVo vo = sysMappingService.selectMappingInfo(query); + return rb.success().setData(vo); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java index 2bec9b3548..57398f04a7 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java @@ -28,15 +28,11 @@ package com.yxt.anrui.portal.biz.sysmapping; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.portal.api.sysmapping.*; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; -import com.yxt.anrui.portal.api.sysmapping.SysMapping; -import com.yxt.anrui.portal.api.sysmapping.SysMappingQuery; -import com.yxt.anrui.portal.api.sysmapping.SysMappingVo; -import com.yxt.anrui.portal.api.sysmapping.SysMappingDetailsVo; -import com.yxt.anrui.portal.api.sysmapping.SysMappingDto; import org.springframework.stereotype.Service; import java.util.List; @@ -71,7 +67,7 @@ public class SysMappingService extends MybatisBaseService queryWrapper(SysMappingQuery query) { - QueryWrapper qw = queryWrapper(query); + QueryWrapper qw = new QueryWrapper<>(); if (StringUtils.isNotBlank(query.getMap_sourceKey())) { qw.eq("sm.map_sourceKey", query.getMap_sourceKey()); } @@ -146,4 +142,25 @@ public class SysMappingService extends MybatisBaseService qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getMap_sourceKey())) { + qw.eq("sm.map_sourceKey", query.getMap_sourceKey()); + } + if (StringUtils.isNotBlank(query.getMap_object())) { + qw.eq("sm.map_object", query.getMap_object()); + } + if (StringUtils.isNotBlank(query.getMap_item())) { + qw.eq("sm.map_item", query.getMap_item()); + } + if (StringUtils.isNotBlank(query.getDictTypeCode())) { + qw.eq("dt.dictTypeCode", query.getDictTypeCode()); + } + if (StringUtils.isNotBlank(query.getDictKey())) { + qw.eq("dc.dictKey", query.getDictKey()); + } + SysMappingInfoVo vo = baseMapper.selectMappingInfo(qw); + return vo; + } } \ No newline at end of file