diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 99a3a6ca3..5c51151e9 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -1179,7 +1179,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsCollectManifestIdList = Arrays.asList(paramsCollectManifestIds.split(",")); ParamsManifestEO paramsManifestEO = paramsManifestEOService.getById(paramsManifestId); - // 根据收集库清单id 的是否上报过 - boolean isSync = paramsReportEOService.isSync(paramsManifestId); + // 根据收集库清单id和版本，判断当前版本是否上报过 + boolean isSync = paramsReportEOService.isSync(paramsManifestId, paramsManifestEO.getVersion()); String reportId = null; - if (!isSync) { + if (!isSync) { // 未上报过 reportId = UUID.randomUUID().toString().replace("-",""); - } else { - ParamsReportEO paramsReportEO = paramsReportEOService.queryByOldParamsManifestId(paramsManifestId); + } else { // 上报过 + ParamsReportEO paramsReportEO = paramsReportEOService.queryByOldParamsManifestId(paramsManifestId, paramsManifestEO.getVersion()); reportId = paramsReportEO.getId(); } @@ -1285,15 +1285,24 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); List addReportConfigEOList = new ArrayList<>(); List addReportCertCategoryParamsInfoEOList = new ArrayList<>(); + Map configIdMap = new HashMap<>(); // 存放新旧 configId 关系 if (!isSync) { // 未上报 // 复制配置 for (ParamsConfigEO configEO : paramsConfigEOList) { ParamsReportConfigEO addReportConfigEO = new ParamsReportConfigEO(); - BeanUtils.copyProperties(configEO, addReportConfigEO); // 全盘复制,包括id + BeanUtils.copyProperties(configEO, addReportConfigEO); addReportConfigEO.setParamsManifestId(reportId); + String addReportConfigId = UUID.randomUUID().toString().replace("-",""); + addReportConfigEO.setId(addReportConfigId); + addReportConfigEO.setOldParamsConfigId(configEO.getId()); addReportConfigEOList.add(addReportConfigEO); + + configIdMap.put(configEO.getId(), addReportConfigId); } + } else { + List paramsReportConfigEOList = paramsReportConfigEOService.queryList(reportId); + configIdMap = paramsReportConfigEOList.stream().collect(Collectors.toMap(ParamsReportConfigEO::getOldParamsConfigId, ParamsReportConfigEO::getId)); } // 添加参数项到上报库 @@ -1316,6 +1325,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl certCategoryParamsInfoPublishEOS = certCategoryParamsInfoPublishEOService.queryListByVersionAndNio(paramsManifestEO.getParamsTemplateId(), paramsManifestEO.getParamsTemplatePublishVersion(), nioNumberList); for (CertCategoryParamsInfoPublishEO ccpi : certCategoryParamsInfoPublishEOS) { ReportCertCategoryParamsInfoEO addCcpi = new ReportCertCategoryParamsInfoEO(); - BeanUtils.copyProperties(ccpi, addCcpi); // 全盘复制,包括id + BeanUtils.copyProperties(ccpi, addCcpi); + addCcpi.setId(UUID.randomUUID().toString().replace("-","")); addReportCertCategoryParamsInfoEOList.add(addCcpi); } @@ -1337,18 +1349,22 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl updateEOList = new ArrayList<>(); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java index dbeda896e..e5d6841d8 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java @@ -18,6 +18,8 @@ import com.jero.modules.cert.collect.service.IParamsConfigHistoryEOService; import com.jero.modules.cert.collect.vo.ParamsConfigDataVO; import com.jero.modules.cert.template.enums.ControlTypeEnum; import com.jero.modules.ocr.util.LineHumpUtil; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.service.ISysDictItemService; import org.apache.commons.lang3.StringUtils; @@ -52,6 +54,9 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl configIdList = new ArrayList<>(); // 配置列名 + Map manifestMap = objectToMap(collectManifestEO); // 对象转map String controlType = collectManifestEO.getControlType(); String paramsCollectManifestId = collectManifestEO.getId(); @@ -126,10 +133,12 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl configMap = new HashMap<>(); String paramsConfigId = paramsConfigEO.getId(); ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataHistoryEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据 - List paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 + List paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 configMap.put("controlType", controlType); configMap.put("list", paramsConfigDataVOList); manifestMap.put(paramsConfigEO.getId(), configMap); + + configIdList.add(paramsConfigEO.getId()); }); } @@ -141,6 +150,9 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl getConfigDataVOList(String controlType, ParamsConfigDataEO paramsConfigDataEO, ParamsCollectManifestHistoryEO paramsCollectManifestEO) { + private List getConfigDataVOList(String controlType, ParamsConfigEO paramsConfigEO, ParamsConfigDataEO paramsConfigDataEO, ParamsCollectManifestHistoryEO paramsCollectManifestEO) { List paramsConfigDataVOList = new ArrayList<>(); + String templateId = null; + String templateName = null; + if (StringUtils.isNotEmpty(paramsCollectManifestEO.getFileTemplateConnectId())) { + List ossFiles = ossFileService.getFileInfosByConnectId(paramsCollectManifestEO.getFileTemplateConnectId()); + if (CollectionUtil.isNotEmpty(ossFiles)) { + templateId = ossFiles.get(0).getId(); + templateName = ossFiles.get(0).getFileName(); + } + } if (ControlTypeEnum.TEXT.getValue().equals(controlType)) { ParamsConfigDataVO configDataVO = new ParamsConfigDataVO(); configDataVO.setType(ConfigDataTypeEnum.TEXT.getValue()); configDataVO.setIsMust(paramsCollectManifestEO.getIsMust()); + configDataVO.setIsLock(paramsConfigEO.getIsLock()); configDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify()); if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) { configDataVO.setDataValue(paramsConfigDataEO.getTextData()); @@ -173,6 +195,7 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.like(StringUtils.isNotEmpty(paramsExportTemplateEO.getTemplateName()), ParamsExportTemplateEO::getTemplateName, paramsExportTemplateEO.getTemplateName()); + queryWrapper.like(StringUtils.isNotEmpty(paramsExportTemplateEO.getTemplateName()), ParamsExportTemplateEO::getTemplateName, paramsExportTemplateEO.getTemplateName()) + .orderByDesc(ParamsExportTemplateEO::getCreateTime); Page page = new Page(pageNo, pageSize); IPage pageList = paramsExportTemplateEOService.page(page, queryWrapper); List rows = pageList.getRecords(); + // 处理 状态 中英文 Map stateMap = ExportTemplateStateEnum.toMap(cut); rows.forEach(exportTemplateEO -> { exportTemplateEO.setState(stateMap.get(exportTemplateEO.getState())); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java index be73a96d3..11e698743 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java @@ -104,7 +104,7 @@ public class ParamsReportEOController extends JeroController edit(@Validated @RequestBody ParamsReportEO paramsReportEO) { paramsReportEOService.editById(paramsReportEO); return Result.OK("编辑成功!"); @@ -118,7 +118,7 @@ public class ParamsReportEOController extends JeroController delete(@RequestParam(name="id",required=true) String id) { paramsReportEOService.deleteById(id); return Result.OK("删除成功!"); @@ -132,7 +132,7 @@ public class ParamsReportEOController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.paramsReportEOService.deleteByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java index 084f3be64..0bdd40ab1 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java @@ -1,6 +1,7 @@ package com.jero.modules.cert.report.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -78,4 +79,7 @@ public class ParamsExportTemplateEO implements Serializable { @ApiModelProperty(value = "附件上传") private String fileConnectId; + @TableField(exist = false) + private String cut; + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigEO.java index 14a5fed4c..cc93e55fa 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigEO.java @@ -3,9 +3,11 @@ package com.jero.modules.cert.report.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.jero.modules.cert.collect.entity.ParamsConfigEO; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; import java.io.Serializable; @@ -24,4 +26,9 @@ import java.io.Serializable; public class ParamsReportConfigEO extends ParamsConfigEO implements Serializable { private static final long serialVersionUID = 1L; + /**收集库参数配置id*/ + @Excel(name = "收集库参数配置id", width = 15) + @ApiModelProperty(value = "收集库参数配置id") + private String oldParamsConfigId; + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigEOMapper.xml index a58059d08..8dc02628a 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigEOMapper.xml @@ -16,5 +16,6 @@ + \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml index c386f672d..ac6fd652e 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml @@ -59,6 +59,6 @@ select * from params_report_detail - order by create_time asc + order by sync_time asc \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java index 7d8471009..ff7746e6f 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java @@ -63,8 +63,8 @@ public interface IParamsReportEOService extends IService { IPage pageInfo(IPage page, ParamsReportEO paramsReportEO); - boolean isSync(String oldParamsManifestId); + boolean isSync(String oldParamsManifestId, Integer version); - ParamsReportEO queryByOldParamsManifestId(String oldParamsManifestId); + ParamsReportEO queryByOldParamsManifestId(String oldParamsManifestId, Integer version); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsExportTemplateEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsExportTemplateEOServiceImpl.java index 51815b94e..b53290e5c 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsExportTemplateEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsExportTemplateEOServiceImpl.java @@ -3,6 +3,8 @@ package com.jero.modules.cert.report.service.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.constant.enums.CutEnum; +import com.jero.common.exception.JeroBootException; import com.jero.modules.cert.report.entity.ParamsExportTemplateEO; import com.jero.modules.cert.report.mapper.ParamsExportTemplateEOMapper; import com.jero.modules.cert.report.service.IParamsExportTemplateEOService; @@ -36,6 +38,16 @@ public class ParamsExportTemplateEOServiceImpl extends ServiceImpl 0) { - return false; - } else { return true; + } else { + return false; } } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java index b9b2d1e7e..53676b424 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java @@ -21,6 +21,8 @@ import com.jero.modules.cert.report.service.IParamsReportConfigEOService; import com.jero.modules.cert.report.service.IParamsReportDetailEOService; import com.jero.modules.cert.template.enums.ControlTypeEnum; import com.jero.modules.ocr.util.LineHumpUtil; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.service.ISysDictItemService; import org.apache.commons.lang3.StringUtils; @@ -55,6 +57,9 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl configIdList = new ArrayList<>(); // 配置列名 + Map manifestMap = objectToMap(collectManifestEO); // 对象转map String controlType = collectManifestEO.getControlType(); String paramsCollectManifestId = collectManifestEO.getId(); @@ -129,13 +136,26 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl configMap = new HashMap<>(); String paramsConfigId = paramsConfigEO.getId(); ParamsReportConfigDataEO paramsConfigDataEO = paramsReportConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据 - List paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 + List paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 configMap.put("controlType", controlType); configMap.put("list", paramsConfigDataVOList); manifestMap.put(paramsConfigEO.getId(), configMap); + + configIdList.add(paramsConfigEO.getId()); }); } + // 处理工程接口人 +// Map sdtMap = new HashMap<>(); +// sdtMap.put("id", collectManifestEO.getId()); +// sdtMap.put("state", collectManifestEO.getState()); +// sdtMap.put("dutyTerritory", StringUtils.join(dutyTerritory, ",")); +// sdtMap.put("dataValue", collectManifestEO.getSdt()); +// manifestMap.put("sdt", sdtMap); + + // 配置列名数组 + manifestMap.put("configIds", configIdList); + listMap.add(manifestMap); }); @@ -149,14 +169,24 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl getConfigDataVOList(String controlType, ParamsConfigDataEO paramsConfigDataEO, ParamsReportDetailEO paramsCollectManifestEO) { + private List getConfigDataVOList(String controlType, ParamsConfigEO paramsConfigEO, ParamsConfigDataEO paramsConfigDataEO, ParamsReportDetailEO paramsCollectManifestEO) { List paramsConfigDataVOList = new ArrayList<>(); + String templateId = null; + String templateName = null; + if (StringUtils.isNotEmpty(paramsCollectManifestEO.getFileTemplateConnectId())) { + List ossFiles = ossFileService.getFileInfosByConnectId(paramsCollectManifestEO.getFileTemplateConnectId()); + if (CollectionUtil.isNotEmpty(ossFiles)) { + templateId = ossFiles.get(0).getId(); + templateName = ossFiles.get(0).getFileName(); + } + } if (ControlTypeEnum.TEXT.getValue().equals(controlType)) { ParamsConfigDataVO configDataVO = new ParamsConfigDataVO(); configDataVO.setType(ConfigDataTypeEnum.TEXT.getValue()); configDataVO.setIsMust(paramsCollectManifestEO.getIsMust()); + configDataVO.setIsLock(paramsConfigEO.getIsLock()); configDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify()); if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) { configDataVO.setDataValue(paramsConfigDataEO.getTextData()); @@ -168,6 +198,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl controlValueMap = new HashMap<>(); - controlValueMap.put("lable", controlValueStr[i]); + controlValueMap.put("label", controlValueStr[i]); controlValueMap.put("value", controlValueStr[i]); controlValueMapList.add(controlValueMap); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java index 8c9398eea..b53905e06 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.modules.cert.report.entity.ParamsReportEO; import com.jero.modules.cert.report.mapper.ParamsReportEOMapper; import com.jero.modules.cert.report.service.IParamsReportEOService; +import io.swagger.models.auth.In; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -100,9 +101,10 @@ public class ParamsReportEOServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(ParamsReportEO::getOldParamsManifestId, oldParamsManifestId); + queryWrapper.eq(ParamsReportEO::getOldParamsManifestId, oldParamsManifestId) + .eq(ParamsReportEO::getVersion, version); int num = count(queryWrapper); if (num > 0) { return true; // 上报过 @@ -113,9 +115,10 @@ public class ParamsReportEOServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(ParamsReportEO::getOldParamsManifestId, oldParamsManifestId); + queryWrapper.eq(ParamsReportEO::getOldParamsManifestId, oldParamsManifestId) + .eq(ParamsReportEO::getVersion, version); return getOne(queryWrapper); } } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java index 6f0941db9..fbe30a3ec 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.base.controller.JeroController; import com.jero.modules.cert.template.entity.ParamsInfoEO; import com.jero.modules.cert.template.service.IParamsInfoEOService; @@ -231,9 +232,14 @@ public class ParamsInfoEOController extends JeroController publish(@RequestParam(name="paramsTemplateId") String paramsTemplateId) { + public Result publish(@RequestParam(name="paramsTemplateId") String paramsTemplateId, + @RequestParam(name="cut") String cut) { int publishVersion = paramsInfoPublishEOService.publishTemplate(paramsTemplateId); - return Result.OK("发布版本：" + publishVersion + "成功!"); + if (CutEnum.CN.equals(cut)) { + return Result.OK("发布版本：" + publishVersion + "成功！"); + } else { + return Result.OK("Publish version:" + publishVersion + "success!"); + } } /**