diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparameter/SysReportParameter.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparameter/SysReportParameter.java index 29ffd41ff1..29d0d7073b 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparameter/SysReportParameter.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparameter/SysReportParameter.java @@ -11,4 +11,11 @@ import lombok.Data; @Data public class SysReportParameter extends BaseEntity { private static final long serialVersionUID = 2003257890384098592L; + + private String tableNameKey; + private String tableNameValue; + + private String colName; + private String colText; + private String mainSid; } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparameter/SysReportParameterColumn.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparameter/SysReportParameterColumn.java new file mode 100644 index 0000000000..3808806124 --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparameter/SysReportParameterColumn.java @@ -0,0 +1,16 @@ +package com.yxt.anrui.portal.api.sysreportparameter; + +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/11/6 + **/ +@Data +public class SysReportParameterColumn { + + private String colName; + + private String colText; +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparameter/SysReportParameterFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparameter/SysReportParameterFeign.java index 9b1a556052..b6a3d4a140 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparameter/SysReportParameterFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparameter/SysReportParameterFeign.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -26,4 +27,8 @@ public interface SysReportParameterFeign { @ApiOperation("根据表名查询表里的列及注释") @PostMapping("/selectList") ResultBean> selectList(@RequestParam("tableKey") String tableKey); + + @ApiOperation("保存") + @PostMapping("/saveOrUpdate") + ResultBean saveOrUpdate(@RequestBody SysReportParameterQuery query); } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparameter/SysReportParameterList.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparameter/SysReportParameterList.java new file mode 100644 index 0000000000..977d058883 --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparameter/SysReportParameterList.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.portal.api.sysreportparameter; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/11/6 + **/ +@Data +public class SysReportParameterList { + + private String tableNameKey; + + private String tableNameValue; + + private List list = new ArrayList<>(); +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparameter/SysReportParameterQuery.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparameter/SysReportParameterQuery.java new file mode 100644 index 0000000000..b3bd28b54d --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparameter/SysReportParameterQuery.java @@ -0,0 +1,24 @@ +package com.yxt.anrui.portal.api.sysreportparameter; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/11/6 + **/ +@Data +public class SysReportParameterQuery implements Query { + private static final long serialVersionUID = -4341462338073397914L; + + private String sid; + + private List list = new ArrayList<>(); + + + +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparametermain/SysReportParameterMainFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparametermain/SysReportParameterMainFeign.java index b0b95ae264..bcff58be5b 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparametermain/SysReportParameterMainFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparametermain/SysReportParameterMainFeign.java @@ -6,8 +6,10 @@ import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; /** * @description: @@ -26,4 +28,8 @@ public interface SysReportParameterMainFeign { @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") ResultBean> listPage(@RequestBody PagerQuery pagerQuery); + + @ApiOperation("初始化") + @GetMapping("/getInit") + ResultBean getInit(@RequestParam("sid") String sid); } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparametermain/SysReportParameterMainInitVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparametermain/SysReportParameterMainInitVo.java new file mode 100644 index 0000000000..ad215016b8 --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparametermain/SysReportParameterMainInitVo.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.portal.api.sysreportparametermain; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/11/6 + **/ +@Data +public class SysReportParameterMainInitVo implements Vo { + private static final long serialVersionUID = -2829739921484847842L; + + private String useOrgName; + + private List list = new ArrayList<>(); +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparametermain/SysReportParameterMainInitsVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparametermain/SysReportParameterMainInitsVo.java new file mode 100644 index 0000000000..acb4b97c82 --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysreportparametermain/SysReportParameterMainInitsVo.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.portal.api.sysreportparametermain; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/11/6 + **/ +@Data +public class SysReportParameterMainInitsVo implements Vo { + private static final long serialVersionUID = 6976785085297583938L; + + private String tableNameKey; + private String tableNameValue; + + private String colTextString; +} diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparameter/SysReportParameterMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparameter/SysReportParameterMapper.java index 41a4a9e356..bbf6c9d2f5 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparameter/SysReportParameterMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparameter/SysReportParameterMapper.java @@ -16,4 +16,6 @@ import java.util.List; @Mapper public interface SysReportParameterMapper extends BaseMapper { List selectListOne(@Param("table_schema") String table_schema, @Param("table_name") String table_name); + + int deleteByMainSid(String sid); } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparameter/SysReportParameterMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparameter/SysReportParameterMapper.xml index 41109e9ccd..c8a519f7cf 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparameter/SysReportParameterMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparameter/SysReportParameterMapper.xml @@ -7,4 +7,10 @@ WHERE table_schema = #{table_schema} and TABLE_NAME = #{table_name} + + + delete + from sys_report_parameter + where mainSid = #{sid} + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparameter/SysReportParameterRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparameter/SysReportParameterRest.java index 17029a660b..2f31062687 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparameter/SysReportParameterRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparameter/SysReportParameterRest.java @@ -2,6 +2,7 @@ package com.yxt.anrui.portal.biz.sysreportparameter; import com.yxt.anrui.portal.api.sysreportparameter.ParameterVo; import com.yxt.anrui.portal.api.sysreportparameter.SysReportParameterFeign; +import com.yxt.anrui.portal.api.sysreportparameter.SysReportParameterQuery; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; @@ -27,4 +28,9 @@ public class SysReportParameterRest implements SysReportParameterFeign { public ResultBean> selectList(String tableKey) { return sysReportParameterService.selectList(tableKey); } + + @Override + public ResultBean saveOrUpdate(SysReportParameterQuery query) { + return sysReportParameterService.saveOrUpdates(query); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparameter/SysReportParameterService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparameter/SysReportParameterService.java index 908325088b..dd9fddbc17 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparameter/SysReportParameterService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparameter/SysReportParameterService.java @@ -1,13 +1,13 @@ package com.yxt.anrui.portal.biz.sysreportparameter; -import com.yxt.anrui.portal.api.sysreportparameter.ParameterVo; -import com.yxt.anrui.portal.api.sysreportparameter.SysReportParameter; +import com.yxt.anrui.portal.api.sysreportparameter.*; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.result.ResultBean; import org.springframework.stereotype.Service; import java.util.Arrays; +import java.util.Collections; import java.util.List; /** @@ -27,4 +27,32 @@ public class SysReportParameterService extends MybatisBaseService parameterVoList = baseMapper.selectListOne(table_schema, table_name); return rb.success().setData(parameterVoList); } + + public ResultBean saveOrUpdates(SysReportParameterQuery query) { + ResultBean rb = ResultBean.fireFail(); + String sid = query.getSid(); + baseMapper.deleteByMainSid(sid); + List list = query.getList(); + list.removeAll(Collections.singleton(null)); + if (!list.isEmpty()) { + for (int i = 0; i < list.size(); i++) { + SysReportParameter sysReportParameter = new SysReportParameter(); + SysReportParameterList sysReportParameterList = list.get(i); + sysReportParameter.setMainSid(sid); + sysReportParameter.setTableNameKey(sysReportParameterList.getTableNameKey()); + sysReportParameter.setTableNameValue(sysReportParameterList.getTableNameValue()); + List lists = sysReportParameterList.getList(); + lists.removeAll(Collections.singleton(null)); + if (!lists.isEmpty()) { + for (int j = 0; j < lists.size(); j++) { + SysReportParameterColumn sysReportParameterColumn = lists.get(j); + sysReportParameter.setColName(sysReportParameterColumn.getColName()); + sysReportParameter.setColText(sysReportParameterColumn.getColText()); + baseMapper.insert(sysReportParameter); + } + } + } + } + return rb.success(); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainMapper.java index f74d64fd5e..b6ce706183 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.portal.api.sysreportparametermain.SysReportParameterMain; +import com.yxt.anrui.portal.api.sysreportparametermain.SysReportParameterMainInitsVo; import com.yxt.anrui.portal.api.sysreportparametermain.SysReportParameterMainVo; import com.yxt.anrui.portal.api.sysuser.SysUser; import org.apache.ibatis.annotations.Mapper; @@ -22,4 +23,6 @@ public interface SysReportParameterMainMapper extends BaseMapper selectPageVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); SysReportParameterMain selectByUseOrgSid(String sid); + + List selectGroup(String sid); } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainMapper.xml index d67b8d126a..49ba96dd9d 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainMapper.xml @@ -29,4 +29,12 @@ from sys_report_parameter_main where useOrgSid = #{sid} + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainRest.java index 028afa4407..cc0782ee75 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainRest.java @@ -1,6 +1,7 @@ package com.yxt.anrui.portal.biz.sysreportparametermain; import com.yxt.anrui.portal.api.sysreportparametermain.SysReportParameterMainFeign; +import com.yxt.anrui.portal.api.sysreportparametermain.SysReportParameterMainInitVo; import com.yxt.anrui.portal.api.sysreportparametermain.SysReportParameterMainQuery; import com.yxt.anrui.portal.api.sysreportparametermain.SysReportParameterMainVo; import com.yxt.common.core.query.PagerQuery; @@ -30,4 +31,9 @@ public class SysReportParameterMainRest implements SysReportParameterMainFeign { PagerVo pv = sysReportParameterMainService.listPageVo(pagerQuery); return rb.success().setData(pv); } + + @Override + public ResultBean getInit(String sid) { + return sysReportParameterMainService.getInit(sid); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainService.java index 9278d6b864..f90f957fb3 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainService.java @@ -3,15 +3,14 @@ package com.yxt.anrui.portal.biz.sysreportparametermain; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; -import com.yxt.anrui.portal.api.sysreportparametermain.SysReportParameterMain; -import com.yxt.anrui.portal.api.sysreportparametermain.SysReportParameterMainQuery; -import com.yxt.anrui.portal.api.sysreportparametermain.SysReportParameterMainVo; +import com.yxt.anrui.portal.api.sysreportparametermain.*; import com.yxt.anrui.portal.biz.sysorganization.SysOrganizationService; import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -40,7 +39,7 @@ public class SysReportParameterMainService extends MybatisBaseService qw = new QueryWrapper<>(); if (query != null) { if (StringUtils.isNotBlank(query.getUseOrgName())) {//分公司 - qw.like("spm.useOrgName",query.getUseOrgName()); + qw.like("spm.useOrgName", query.getUseOrgName()); } } if (stringList.size() <= 2) { @@ -58,10 +57,10 @@ public class SysReportParameterMainService extends MybatisBaseService page = PagerUtil.queryToPage(pagerQuery); IPage pagging = baseMapper.selectPageVo(page, qw); @@ -77,4 +76,14 @@ public class SysReportParameterMainService extends MybatisBaseService getInit(String sid) { + ResultBean rb = ResultBean.fireFail(); + SysReportParameterMainInitVo sysReportParameterMainInitVo = new SysReportParameterMainInitVo(); + SysReportParameterMain sysReportParameterMain = fetchBySid(sid); + sysReportParameterMainInitVo.setUseOrgName(sysReportParameterMain.getUseOrgName()); + List list = baseMapper.selectGroup(sid); + sysReportParameterMainInitVo.setList(list); + return rb.success().setData(sysReportParameterMainInitVo); + } }