diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcExportTemplateDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcExportTemplateDTO.java index 95805207fd..b17950a528 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcExportTemplateDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcExportTemplateDTO.java @@ -3,7 +3,6 @@ package com.epmet.dto; import lombok.Data; import java.io.Serializable; -import java.util.Date; /** @@ -52,34 +51,4 @@ public class IcExportTemplateDTO implements Serializable { */ private Integer sort; - /** - * 0未删除，1已删除 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - } diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateQueryFormDTO.java similarity index 91% rename from epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateFormDTO.java rename to epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateQueryFormDTO.java index a7d52bf75b..9c97e6a75b 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateFormDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateQueryFormDTO.java @@ -14,7 +14,7 @@ import java.io.Serializable; * @since v1.0.0 2022-04-21 */ @Data -public class IcExportTemplateFormDTO implements Serializable { +public class IcExportTemplateQueryFormDTO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java new file mode 100644 index 0000000000..9f872327d9 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateSaveFormDTO.java @@ -0,0 +1,65 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.AddGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + + +/** + * 自定义表单导出模板 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-04-21 + */ +@Data +public class IcExportTemplateSaveFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 表单CODE，从字典获取 + */ + private String formCode; + + /** + * 模板名称 + */ + @NotBlank(message = "模板名称不能为空",groups = AddGroup.class) + private String name; + + /** + * 0:动态；1:文件 + */ + private Integer type; + + /** + * 父id + */ + private String pid; + + /** + * ic_form_item.id + */ + @NotBlank(message = "itemId不能为空",groups = AddGroup.class) + private String itemId; + + /** + * 表头宽度 + */ + private Integer width; + + /** + * 项标签 + */ + @NotBlank(message = "名称不能为空",groups = AddGroup.class) + private String label; + + /** + * 排序 + */ + private Integer sort; + + +} diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FormItemResult.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FormItemResult.java index dfe0b85ffa..2aad76f805 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FormItemResult.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FormItemResult.java @@ -16,7 +16,7 @@ public class FormItemResult implements Serializable { private static final long serialVersionUID = 7443085469505238040L; /** - * 父项ID + * ID */ private String itemId; diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java index 7c6922e69c..fbf479ac9a 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java @@ -168,5 +168,5 @@ public interface OperCustomizeOpenFeignClient { * @return */ @PostMapping("/oper/customize/icExportTemplate/getExcelHeaderAndSqlColumnForExport") - Result getExcelHeaderAndSqlColumnForExport(@RequestBody IcExportTemplateFormDTO param); + Result getExcelHeaderAndSqlColumnForExport(@RequestBody IcExportTemplateQueryFormDTO param); } diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java index 19a01082cc..e55eb3bb92 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java @@ -126,7 +126,7 @@ public class OperCustomizeOpenFeignClientFallback implements OperCustomizeOpenFe } @Override - public Result getExcelHeaderAndSqlColumnForExport(IcExportTemplateFormDTO param) { + public Result getExcelHeaderAndSqlColumnForExport(IcExportTemplateQueryFormDTO param) { return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "getExcelHeaderAndSqlColumnForExport", param); } } 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 7804e07bb8..e9343b87af 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 @@ -6,10 +6,10 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.ExportGroup; import com.epmet.dto.IcExportTemplateDTO; -import com.epmet.dto.form.IcExportTemplateFormDTO; +import com.epmet.dto.form.IcExportTemplateQueryFormDTO; +import com.epmet.dto.form.IcExportTemplateSaveFormDTO; import com.epmet.dto.result.IcCustomExportResultDTO; import com.epmet.service.IcExportTemplateService; import org.springframework.beans.factory.annotation.Autowired; @@ -45,9 +45,9 @@ public class IcExportTemplateController { @NoRepeatSubmit @PostMapping("save") - public Result save(@RequestBody IcExportTemplateDTO dto) { + public Result save(@RequestBody IcExportTemplateSaveFormDTO dto) { //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + ValidatorUtils.validateEntity(dto, AddGroup.class); icExportTemplateService.save(dto); return new Result(); } @@ -68,7 +68,7 @@ public class IcExportTemplateController { * @return */ @PostMapping("getExcelHeaderAndSqlColumnForExport") - public Result getExcelHeaderAndSqlColumnForExport(@RequestBody IcExportTemplateFormDTO param) { + public Result getExcelHeaderAndSqlColumnForExport(@RequestBody IcExportTemplateQueryFormDTO param) { ValidatorUtils.validateEntity(param, ExportGroup.class); return new Result().ok(icExportTemplateService.getTemplateConfigForExport(param)); } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemController.java index 49c54f3d21..80d6f47037 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemController.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemController.java @@ -21,6 +21,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.EditIFormItemFormDTO; import com.epmet.dto.result.ColumnTableNameResultDTO; +import com.epmet.dto.result.FormItemResult; import com.epmet.dto.result.ResiCategoryItemResultDTO; import com.epmet.service.IcFormItemService; import org.springframework.beans.factory.annotation.Autowired; @@ -88,4 +89,14 @@ public class IcFormItemController { icFormItemService.initQueryBuilder(customerId); return new Result(); } + + /** + * 根据分组id 获取分组下的item + * @return + */ + @PostMapping("getItemList/{groupId}") + public Result> getItemListByGroupId(@RequestHeader String customerId, @PathVariable("groupId") String groupId){ + List list = icFormItemService.getItemListByGroupId(customerId,groupId); + return new Result().ok(list); + } } 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 8cf3df7aa5..32eaa6d723 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 @@ -1,7 +1,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.dto.form.IcExportTemplateFormDTO; +import com.epmet.dto.form.IcExportTemplateQueryFormDTO; import com.epmet.dto.result.IcExportTemplateForExportResultDTO; import com.epmet.entity.IcExportTemplateEntity; import org.apache.ibatis.annotations.Mapper; @@ -17,5 +17,5 @@ import java.util.List; @Mapper public interface IcExportTemplateDao extends BaseDao { - List getTemplateConfigForExport(IcExportTemplateFormDTO param); + List getTemplateConfigForExport(IcExportTemplateQueryFormDTO param); } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java index bb02a5425c..2647805d6f 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java @@ -91,8 +91,18 @@ public interface IcFormItemDao extends BaseDao { /** * desc:根据Id获取item对应的表名和item属性 + * * @param itemId * @return */ ConditionResultDTO getConditionItem(@Param("itemId") String itemId); + + /** + * desc:根据客户Id 和groupId 获取item配置项 + * + * @param customerId + * @param groupId + * @return + */ + List getItemListByGroupId(@Param("customerId") String customerId, @Param("groupId") String groupId); } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcExportTemplateConfigEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcExportTemplateConfigEntity.java index 338164da26..60a8094221 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcExportTemplateConfigEntity.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcExportTemplateConfigEntity.java @@ -41,7 +41,7 @@ public class IcExportTemplateConfigEntity extends BaseEpmetEntity { /** * ic_form_item.id */ - private String formItemId; + private String itemId; /** * 表头宽度 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 cc6e7fdd1c..1d2f22c0de 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 @@ -3,7 +3,8 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.IcExportTemplateDTO; -import com.epmet.dto.form.IcExportTemplateFormDTO; +import com.epmet.dto.form.IcExportTemplateQueryFormDTO; +import com.epmet.dto.form.IcExportTemplateSaveFormDTO; import com.epmet.dto.result.IcCustomExportResultDTO; import com.epmet.entity.IcExportTemplateEntity; @@ -56,17 +57,7 @@ public interface IcExportTemplateService extends BaseService { * @param customerId */ void initQueryBuilder(String customerId); + + /** + * desc:根据groupId 获取itemlist + * @param customerId + * @param groupId + * @return + */ + List getItemListByGroupId(String customerId, String groupId); } 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 d5bdca582f..df4303fe3e 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 @@ -11,7 +11,8 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dao.IcExportTemplateDao; import com.epmet.dao.IcFormItemDao; import com.epmet.dto.IcExportTemplateDTO; -import com.epmet.dto.form.IcExportTemplateFormDTO; +import com.epmet.dto.form.IcExportTemplateQueryFormDTO; +import com.epmet.dto.form.IcExportTemplateSaveFormDTO; import com.epmet.dto.result.ConditionResultDTO; import com.epmet.dto.result.IcCustomExportResultDTO; import com.epmet.dto.result.IcExportTemplateForExportResultDTO; @@ -75,18 +76,12 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl list = icExportTemplateDao.getTemplateConfigForExport(param); if (CollectionUtils.isEmpty(list)) { return null; diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java index 0fee230ef5..c8f91539e2 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java @@ -256,6 +256,11 @@ public class IcFormItemServiceImpl extends BaseServiceImpl getItemListByGroupId(String customerId, String groupId) { + return baseDao.getItemListByGroupId(customerId,groupId); + } + private String queryType(String itemType) { String queryType; diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateConfigDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateConfigDao.xml index 7d3e620e9d..0c92cd18e0 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateConfigDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateConfigDao.xml @@ -8,7 +8,7 @@ - + @@ -21,4 +21,4 @@ - \ No newline at end of file + diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml index f8d80c96ac..876f98f972 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml @@ -252,4 +252,15 @@ and ifi.DEL_FLAG = '0' AND ifig.DEL_FLAG = '0' + + diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java index 561f654358..2e0383ccd4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java @@ -12,7 +12,7 @@ import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.poi.excel.FreezeAndFilter; import com.epmet.constant.IcResiUserConstant; -import com.epmet.dto.form.IcExportTemplateFormDTO; +import com.epmet.dto.form.IcExportTemplateQueryFormDTO; import com.epmet.dto.form.IcResiUserPageFormDTO; import com.epmet.dto.result.IcCustomExportResultDTO; import com.epmet.feign.OperCustomizeOpenFeignClient; @@ -62,7 +62,7 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService { ExcelWriter excelWriter = null; try { //获取模板条件 - IcExportTemplateFormDTO param = new IcExportTemplateFormDTO(); + IcExportTemplateQueryFormDTO param = new IcExportTemplateQueryFormDTO(); param.setCustomerId(loginUserUtil.getLoginUserCustomerId()); param.setCustomerId("default"); param.setTempId(pageFormDTO.getTemplateId());