zgty/zt-base
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

模版编制相关实现

Browse Source
This commit is contained in:
潘荣晟
2025-09-26 16:41:11 +08:00
parent eab5668023
commit 7507a53c8a
6 changed files with 88 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TemplateInstanceController.java
View File

@@ -55,6 +55,7 @@ public class TemplateInstanceController extends AbstractFileUploadController {
setFileUploadInfo(annotation);
}
}
@Resource
private TemplateInstanceService templateInstanceService;
@@ -105,6 +106,9 @@ public class TemplateInstanceController extends AbstractFileUploadController {
public CommonResult<TemplateInstanceRespVO> getTemplateInstance(@RequestParam("id") Long id) {
TemplateInstanceDO templateInstance = templateInstanceService.getTemplateInstance(id);
TemplateInstanceRespVO templateInstanceRespVO = BeanUtils.toBean(templateInstance, TemplateInstanceRespVO.class);
if (templateInstance == null) {
return success(templateInstanceRespVO);
}
templateInstanceService.getDetailedInfo(templateInstanceRespVO);
return success(templateInstanceRespVO);
}
@@ -116,7 +120,9 @@ public class TemplateInstanceController extends AbstractFileUploadController {
PageResult<TemplateInstanceDO> pageResult = templateInstanceService.getTemplateInstancePage(pageReqVO);
PageResult<TemplateInstanceRespVO> templateInstanceRespVOPageResult = BeanUtils.toBean(pageResult, TemplateInstanceRespVO.class);
templateInstanceRespVOPageResult.getList().forEach(templateInstanceRespVO -> {
if (templateInstanceRespVO != null) {
templateInstanceService.getDetailedInfo(templateInstanceRespVO);
}
});
return success(templateInstanceRespVOPageResult);
}
@@ -150,8 +156,12 @@ public class TemplateInstanceController extends AbstractFileUploadController {
public CommonResult<PageResult<TemplateInstanceRespVO>> listExcludingDisabled(@Valid TemplateInstancePageReqVO pageReqVO) {
PageResult<TemplateInstanceRespVO> templateInstanceRespVOPageResult = BeanUtils.toBean(templateInstanceService.listExcludingDisabled(pageReqVO), TemplateInstanceRespVO.class);
templateInstanceRespVOPageResult.getList().forEach(
templateInstanceRespVO ->
templateInstanceService.getDetailedInfo(templateInstanceRespVO));
templateInstanceRespVO -> {
if (templateInstanceRespVO != null) {
templateInstanceService.getDetailedInfo(templateInstanceRespVO);
}
}
);
return success(templateInstanceRespVOPageResult);
}
@@ -163,6 +173,7 @@ public class TemplateInstanceController extends AbstractFileUploadController {
templateInstanceService.setDisableOrEnable(reqVO);
return success(true);
}
//根据id获取实例版本号
@GetMapping("/get-version")
@Operation(summary = "根据id获取实例版本号")

37
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/onlyoffice/service/OnlyOfficeCallbackServiceImpl.java
View File

File diff suppressed because it is too large Load Diff

12
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TemplateInstanceRespVO.java
View File

@@ -1,5 +1,7 @@
package com.zt.plat.module.base.controller.admin.templtp.vo;
import com.zt.plat.module.system.api.dept.dto.DeptDetailRespDTO;
import com.zt.plat.module.system.api.dept.dto.DeptRespDTO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
@@ -59,12 +61,18 @@ public class TemplateInstanceRespVO {
@Schema(description = "发布时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("发布时间")
private LocalDateTime publishTime;
@Schema(description = "使用部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "")
private List<String> deptIds;
@Schema(description = "实例字段;这个是实例字段绑定的字段", requiredMode = Schema.RequiredMode.REQUIRED, example = "")
private List<TemplateInstanceDataRespVO> templateInstanceDataRespVOS;
@Schema(description = "实例条款；这个是实例条款绑定的条款;", requiredMode = Schema.RequiredMode.REQUIRED, example = "")
private List<TemplateInstanceItemRespVO> instanceItemRespVOS;
@Schema(description = "使用部门编", requiredMode = Schema.RequiredMode.REQUIRED, example = "")
private List<DeptRespDTO> DeptRespVOS;
@Schema(description = "模版分类名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "测试分类名称")
@ExcelProperty("模版分类名称")
private String tpName;
}

2
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/framework/rpc/config/RpcConfiguration.java
View File

@@ -6,6 +6,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.annotation.Configuration;
@Configuration(value = "baseRpcConfiguration", proxyBeanMethods = false)
@EnableFeignClients(clients = {DeptApi.class, FileApi.class})
@EnableFeignClients(clients = {DeptApi.class, FileApi.class,DeptApi.class})
public class RpcConfiguration {
}

4
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceService.java
View File

@@ -7,9 +7,7 @@ import com.zt.plat.module.base.dal.dataobject.tmpltp.TemplateInstanceDO;
import jakarta.validation.*;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.pojo.PageParam;
import jakarta.validation.constraints.NotEmpty;
import org.springframework.web.multipart.MultipartFile;
/**
* 模板实例 Service 接口
@@ -86,5 +84,5 @@ public interface TemplateInstanceService {
//
// Map<String, Object> saveFile(MultipartFile file, String id);
boolean updateTemplateInstanceFileUrlByInstanceId(@Valid @NotEmpty(message = "模版实例id不能为空") String id, @Valid @NotEmpty(message = "文件参数不能为空") String params);
void updateTemplateInstanceFileUrlByInstanceId(@Valid @NotEmpty(message = "模版实例id不能为空") String id, @Valid @NotEmpty(message = "文件参数不能为空") String params);
}

22
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceServiceImpl.java
View File

@@ -13,7 +13,8 @@ import com.zt.plat.framework.tenant.core.context.CompanyContextHolder;
import com.zt.plat.module.base.controller.admin.templtp.vo.*;
import com.zt.plat.module.base.dal.dataobject.tmpltp.*;
import com.zt.plat.module.base.dal.mysql.tmpltp.*;
import com.zt.plat.module.infra.api.file.FileApi;
import com.zt.plat.module.system.api.dept.DeptApi;
import com.zt.plat.module.system.api.dept.dto.DeptRespDTO;
import com.zt.plat.module.tmpltp.enums.DeleteStatusEnum;
import com.zt.plat.module.tmpltp.enums.PublishStatusEnum;
import com.zt.plat.module.tmpltp.enums.TmplStsEnum;
@@ -23,7 +24,6 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.multipart.MultipartFile;
import java.time.LocalDateTime;
import java.util.*;
@@ -45,7 +45,7 @@ import static com.zt.plat.module.tmpltp.enums.ErrorCodeConstants.*;
@Validated
public class TemplateInstanceServiceImpl implements TemplateInstanceService {
@Resource
private FileApi fileApi;
private DeptApi deptApi;
@Resource
private TemplateInstanceMapper templateInstanceMapper;
@Resource
@@ -55,6 +55,9 @@ public class TemplateInstanceServiceImpl implements TemplateInstanceService {
@Resource
private TemplateInstanceItemMapper templateInstanceItemMapper;
@Resource
private TmplTpService tmplTpService;
private static final Pattern VERSION_PATTERN = Pattern.compile("^(.*?)([0-9]+(?:\\.[0-9]+)*)(.*)$");
@Override
@@ -312,6 +315,7 @@ public class TemplateInstanceServiceImpl implements TemplateInstanceService {
newTpInstanceDO.setId(null);
newTpInstanceDO.setVer(incrementVersion(templateInstanceDO.getVer()));
newTpInstanceDO.setPublishTime(LocalDateTime.now());
newTpInstanceDO.setOrigCntt(templateInstanceDO.getCntt());
newTpInstanceDO.setCreateTime(null);
newTpInstanceDO.setUpdateTime(null);
templateInstanceMapper.insert(newTpInstanceDO);
@@ -391,14 +395,22 @@ public class TemplateInstanceServiceImpl implements TemplateInstanceService {
templateInstanceRespVO.setDeptIds(getDeptByInstanId(templateInstanceRespVO.getId())); // 部门
templateInstanceRespVO.setInstanceItemRespVOS(setInstanceItemRespVOS(templateInstanceRespVO.getId())); // 条款
templateInstanceRespVO.setTemplateInstanceDataRespVOS(setTemplateInstanceDataRespVOS(templateInstanceRespVO.getId())); // 实例字段
if (!templateInstanceRespVO.getDeptIds().isEmpty()){
templateInstanceRespVO.setDeptRespVOS(deptApi.getDeptList(templateInstanceRespVO.getDeptIds().stream().map(Long::valueOf).toList()).getData()); // 部门详情
}
TmplTpDO tmplTp = tmplTpService.getTmplTp(templateInstanceRespVO.getTpId());
if (tmplTp != null){
templateInstanceRespVO.setTpName(!tmplTp.getName().isEmpty()?tmplTp.getName():"分类未命名");
}
}
@Override
public boolean updateTemplateInstanceFileUrlByInstanceId(String id, String params) {
public void updateTemplateInstanceFileUrlByInstanceId(String id, String params) {
validateTemplateInstanceExists(Long.valueOf(id));
LambdaUpdateWrapper<TemplateInstanceDO> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(TemplateInstanceDO::getId, id).set(TemplateInstanceDO::getCntt, params);
return templateInstanceMapper.update(updateWrapper)>0;
templateInstanceMapper.update(updateWrapper);
}
// 实例条款值
private List<TemplateInstanceItemRespVO> setInstanceItemRespVOS(Long id) {