diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/TemplateDetailResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/TemplateDetailResultDTO.java new file mode 100644 index 0000000000..6f5fb03c8d --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/TemplateDetailResultDTO.java @@ -0,0 +1,19 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2022/4/25 16:25 + */ +@Data +public class TemplateDetailResultDTO implements Serializable { + private static final long serialVersionUID = 8954669603105326916L; + private String id; + private String label; + private List children; +} diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcExportTemplateController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcExportTemplateController.java index 739f3f4a08..94a6981a05 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcExportTemplateController.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcExportTemplateController.java @@ -1,7 +1,9 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -12,6 +14,7 @@ import com.epmet.dto.form.IcExportTemplateQueryFormDTO; import com.epmet.dto.form.IcExportTemplateSaveFormDTO; import com.epmet.dto.result.IcCustomExportResultDTO; import com.epmet.dto.result.IcExportTemplateForExportResultDTO; +import com.epmet.dto.result.TemplateDetailResultDTO; import com.epmet.service.IcExportTemplateService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -74,5 +77,23 @@ public class IcExportTemplateController { return new Result().ok(icExportTemplateService.getTemplateConfigForExport(param)); } + /** + * 获取模板列表 + * + * @Param tokenDto + * @Return {@link Result< List< IcExportTemplateDTO>>} + * @Author zhaoqifeng + * @Date 2022/4/25 14:28 + */ + @PostMapping("templateList") + public Result> getTemplateList(@LoginUser TokenDto tokenDto, @RequestBody IcExportTemplateDTO formDTO) { + return new Result>().ok(icExportTemplateService.getTemplateList(tokenDto, formDTO)); + } + + @PostMapping("templateDetail") + public Result> getTemplateDetail(@RequestBody IcExportTemplateDTO formDTO) { + return new Result>().ok(icExportTemplateService.getTemplateDetail(formDTO)); + } + } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcExportTemplateDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcExportTemplateDao.java index 710faced60..fdf33b6754 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcExportTemplateDao.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcExportTemplateDao.java @@ -4,6 +4,7 @@ import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.IcExportTemplateDTO; import com.epmet.dto.form.IcExportTemplateQueryFormDTO; import com.epmet.dto.result.IcExportTemplateForExportResultDTO; +import com.epmet.dto.result.TemplateDetailResultDTO; import com.epmet.entity.IcExportTemplateEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -22,4 +23,16 @@ public interface IcExportTemplateDao extends BaseDao { List getTemplateConfigForExport(IcExportTemplateQueryFormDTO param); List selectByAgencyId(@Param("agencyId") String agencyId); + + /** + * 获取模板详情 + * + * @Param tempId + * @Return {@link List< TemplateDetailResultDTO>} + * @Author zhaoqifeng + * @Date 2022/4/25 16:33 + */ + List getTemplateDetail(@Param("tempId") String tempId); + + List getChildrenTemplateDetail(@Param("pid") String pid); } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcExportTemplateService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcExportTemplateService.java index 0a9c6cc258..38e79c1ce7 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcExportTemplateService.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcExportTemplateService.java @@ -2,11 +2,13 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dto.IcExportTemplateDTO; import com.epmet.dto.form.IcExportTemplateQueryFormDTO; import com.epmet.dto.form.IcExportTemplateSaveFormDTO; import com.epmet.dto.result.IcCustomExportResultDTO; import com.epmet.dto.result.IcExportTemplateForExportResultDTO; +import com.epmet.dto.result.TemplateDetailResultDTO; import com.epmet.entity.IcExportTemplateEntity; import java.util.List; @@ -79,4 +81,24 @@ public interface IcExportTemplateService extends BaseService} + * @Author zhaoqifeng + * @Date 2022/4/25 14:29 + */ + List getTemplateList(TokenDto tokenDto, IcExportTemplateDTO formDTO); + + /** + * 获取模板详情 + * + * @Param formDTO + * @Return {@link List< TemplateDetailResultDTO>} + * @Author zhaoqifeng + * @Date 2022/4/25 16:29 + */ + List getTemplateDetail(IcExportTemplateDTO formDTO); } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java index 4fea6e27c4..a66db7ffa1 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java @@ -1,5 +1,6 @@ package com.epmet.service.impl; +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.epmet.commons.mybatis.service.impl.BaseServiceImpl; @@ -14,6 +15,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.dao.IcExportTemplateDao; @@ -25,6 +27,7 @@ import com.epmet.dto.form.IcExportTemplateSaveFormDTO; import com.epmet.dto.result.ConditionResultDTO; import com.epmet.dto.result.IcCustomExportResultDTO; import com.epmet.dto.result.IcExportTemplateForExportResultDTO; +import com.epmet.dto.result.TemplateDetailResultDTO; import com.epmet.entity.IcExportTemplateConfigEntity; import com.epmet.entity.IcExportTemplateEntity; import com.epmet.service.IcExportTemplateConfigService; @@ -213,6 +216,43 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl} + * @Author zhaoqifeng + * @Date 2022/4/25 14:29 + */ + @Override + public List getTemplateList(TokenDto tokenDto, IcExportTemplateDTO formDTO) { + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); + if (null == staffInfo) { + throw new EpmetException("获取工作人员信息失败"); + } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcExportTemplateEntity::getAgencyId, staffInfo.getAgencyId()); + wrapper.eq(IcExportTemplateEntity::getFormCode, formDTO.getFormCode()); + wrapper.orderByAsc(IcExportTemplateEntity::getSort); + List list = baseDao.selectList(wrapper); + return ConvertUtils.sourceToTarget(list, IcExportTemplateDTO.class); + } + + /** + * 获取模板详情 + * + * @param formDTO + * @Param formDTO + * @Return {@link List< TemplateDetailResultDTO >} + * @Author zhaoqifeng + * @Date 2022/4/25 16:29 + */ + @Override + public List getTemplateDetail(IcExportTemplateDTO formDTO) { + return baseDao.getTemplateDetail(formDTO.getId()); + } + private void digui(Map> resultTemp, IcExportTemplateForExportResultDTO root, List> headerList, List showSqlColumns, List hiddenSqlColumns, Set hasExistColumnSet) { if (StringUtils.isNotBlank(root.getColumnName())) { showSqlColumns.add(new IcCustomExportResultDTO.SqlColumn(root.getItemId(),root.getTableName(), root.getColumnName(),root.getOptionSourceType(),root.getOptionSourceValue())); diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml index 6504800ca6..29b847ff64 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml @@ -28,6 +28,37 @@ WHERE TEMP_ID = #{tempId} and c.CUSTOMER_ID = #{customerId} and c.DEL_FLAG = '0' ORDER BY c.PID,c.SORT + + + + + + + + + + +