diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysPrintTemplateNodeController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysPrintTemplateNodeController.java index be1e8f7..32bf440 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysPrintTemplateNodeController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysPrintTemplateNodeController.java @@ -113,4 +113,14 @@ public class SysPrintTemplateNodeController extends BaseController { List list = sysPrintTemplateNodeService.queryList(bo); return R.ok(list); } + + /** + * 更新节点信息列表 + * @param bos + * @return + */ + @PostMapping("updateNode") + public R updateNode(@Validated(EditGroup.class) @RequestBody List bos) { + return toAjax(sysPrintTemplateNodeService.updateNode(bos)); + } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPrintTemplateInfo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPrintTemplateInfo.java index eb4e06f..3bb7695 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPrintTemplateInfo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPrintTemplateInfo.java @@ -22,7 +22,7 @@ public class SysPrintTemplateInfo extends TenantEntity { private static final long serialVersionUID = 1L; /** - * 模板列表ID + * 模板信息ID */ @TableId(value = "template_info_id", type = IdType.AUTO) private Long templateInfoId; @@ -73,5 +73,9 @@ public class SysPrintTemplateInfo extends TenantEntity { */ private String remark; - + /** + * 模板名称 + */ + @TableField(exist = false) + private String templateName; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPrintTemplateNode.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPrintTemplateNode.java index e7e6fc1..aaa61c7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPrintTemplateNode.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPrintTemplateNode.java @@ -87,5 +87,9 @@ public class SysPrintTemplateNode extends TenantEntity { */ private String remark; - + /** + * 模板名称 + */ + @TableField(exist = false) + private String templateName; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPrintTemplateInfoBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPrintTemplateInfoBo.java index 7ab6616..5218139 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPrintTemplateInfoBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPrintTemplateInfoBo.java @@ -2,12 +2,9 @@ package org.dromara.system.domain.bo; import org.dromara.system.domain.SysPrintTemplateInfo; import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; /** * 打印模板信息业务对象 sys_print_template_info @@ -21,7 +18,7 @@ import jakarta.validation.constraints.*; public class SysPrintTemplateInfoBo extends BaseEntity { /** - * 模板列表ID + * 模板信息ID */ private Long templateInfoId; @@ -65,5 +62,8 @@ public class SysPrintTemplateInfoBo extends BaseEntity { */ private String remark; - + /** + * 模板名称 + */ + private String templateName; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPrintTemplateListBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPrintTemplateListBo.java index 51f59c5..23ca45b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPrintTemplateListBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPrintTemplateListBo.java @@ -40,7 +40,7 @@ public class SysPrintTemplateListBo extends BaseEntity { /** * 模板类型（1打印） */ - @NotBlank(message = "模板类型（1打印）不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotBlank(message = "模板类型不能为空", groups = { AddGroup.class, EditGroup.class }) private String templateType; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPrintTemplateNodeBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPrintTemplateNodeBo.java index afa03f3..e858d7d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPrintTemplateNodeBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPrintTemplateNodeBo.java @@ -86,5 +86,8 @@ public class SysPrintTemplateNodeBo extends BaseEntity { */ private String remark; - + /** + * 模板名称 + */ + private String templateName; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPrintTemplateInfoVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPrintTemplateInfoVo.java index f475f00..14b9c20 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPrintTemplateInfoVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPrintTemplateInfoVo.java @@ -29,9 +29,9 @@ public class SysPrintTemplateInfoVo implements Serializable { private static final long serialVersionUID = 1L; /** - * 模板列表ID + * 模板信息ID */ - @ExcelProperty(value = "模板列表ID") + @ExcelProperty(value = "模板信息ID") private Long templateInfoId; /** @@ -75,7 +75,7 @@ public class SysPrintTemplateInfoVo implements Serializable { * 激活标识（1是 0否） */ @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "1=是,0=否") + @ExcelDictFormat(readConverterExp = "active_flag") private String activeFlag; /** @@ -84,5 +84,8 @@ public class SysPrintTemplateInfoVo implements Serializable { @ExcelProperty(value = "备注") private String remark; - + /** + * 模板名称 + */ + private String templateName; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPrintTemplateListVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPrintTemplateListVo.java index dee2454..47ffc06 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPrintTemplateListVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPrintTemplateListVo.java @@ -69,7 +69,7 @@ public class SysPrintTemplateListVo implements Serializable { * 激活标识（1是 0否） */ @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "1=是,0=否") + @ExcelDictFormat(readConverterExp = "active_flag") private String activeFlag; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPrintTemplateNodeVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPrintTemplateNodeVo.java index 827b4dc..6a79f33 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPrintTemplateNodeVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPrintTemplateNodeVo.java @@ -1,5 +1,6 @@ package org.dromara.system.domain.vo; +import com.baomidou.mybatisplus.annotation.TableField; import org.dromara.system.domain.SysPrintTemplateNode; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; @@ -98,7 +99,7 @@ public class SysPrintTemplateNodeVo implements Serializable { * 激活标识（1是 0否） */ @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "1=是,0=否") + @ExcelDictFormat(readConverterExp = "active_flag") private String activeFlag; /** @@ -107,5 +108,8 @@ public class SysPrintTemplateNodeVo implements Serializable { @ExcelProperty(value = "备注") private String remark; - + /** + * 模板名称 + */ + private String templateName; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPrintTemplateNodeService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPrintTemplateNodeService.java index 337fbaf..c335ccf 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPrintTemplateNodeService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPrintTemplateNodeService.java @@ -66,4 +66,12 @@ public interface ISysPrintTemplateNodeService { * @return 是否删除成功 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 更新节点信息列表 + * @param bos + * @return + */ + int updateNode(List bos); + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPrintTemplateNodeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPrintTemplateNodeServiceImpl.java index b0a77d7..9cc4a2c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPrintTemplateNodeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPrintTemplateNodeServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.system.service.impl; +import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -15,6 +16,7 @@ import org.dromara.system.domain.vo.SysPrintTemplateNodeVo; import org.dromara.system.domain.SysPrintTemplateNode; import org.dromara.system.mapper.SysPrintTemplateNodeMapper; import org.dromara.system.service.ISysPrintTemplateNodeService; +import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Map; @@ -39,7 +41,7 @@ public class SysPrintTemplateNodeServiceImpl implements ISysPrintTemplateNodeSer * @return 打印节点信息 */ @Override - public SysPrintTemplateNodeVo queryById(Long templateNodeId){ + public SysPrintTemplateNodeVo queryById(Long templateNodeId) { return baseMapper.selectVoById(templateNodeId); } @@ -72,19 +74,19 @@ public class SysPrintTemplateNodeServiceImpl implements ISysPrintTemplateNodeSer private MPJLambdaWrapper buildQueryWrapper(SysPrintTemplateNodeBo bo) { Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(SysPrintTemplateNode.class) - .selectAll(SysPrintTemplateNode.class) - .eq(bo.getTemplateNodeId() != null, SysPrintTemplateNode::getTemplateNodeId, bo.getTemplateNodeId()) - .eq(StringUtils.isNotBlank(bo.getTemplateInfoId()), SysPrintTemplateNode::getTemplateInfoId, bo.getTemplateInfoId()) - .like(StringUtils.isNotBlank(bo.getName()), SysPrintTemplateNode::getName, bo.getName()) - .eq(StringUtils.isNotBlank(bo.getType()), SysPrintTemplateNode::getType, bo.getType()) - .eq(StringUtils.isNotBlank(bo.getWidth()), SysPrintTemplateNode::getWidth, bo.getWidth()) - .eq(StringUtils.isNotBlank(bo.getHeight()), SysPrintTemplateNode::getHeight, bo.getHeight()) - .eq(StringUtils.isNotBlank(bo.getX()), SysPrintTemplateNode::getX, bo.getX()) - .eq(StringUtils.isNotBlank(bo.getY()), SysPrintTemplateNode::getY, bo.getY()) - .eq(StringUtils.isNotBlank(bo.getData()), SysPrintTemplateNode::getData, bo.getData()) - .eq(StringUtils.isNotBlank(bo.getParentNode()), SysPrintTemplateNode::getParentNode, bo.getParentNode()) - .eq(StringUtils.isNotBlank(bo.getActiveFlag()), SysPrintTemplateNode::getActiveFlag, bo.getActiveFlag()) - .orderByAsc(SysPrintTemplateNode::getCreateTime); + .selectAll(SysPrintTemplateNode.class) + .eq(bo.getTemplateNodeId() != null, SysPrintTemplateNode::getTemplateNodeId, bo.getTemplateNodeId()) + .eq(StringUtils.isNotBlank(bo.getTemplateInfoId()), SysPrintTemplateNode::getTemplateInfoId, bo.getTemplateInfoId()) + .like(StringUtils.isNotBlank(bo.getName()), SysPrintTemplateNode::getName, bo.getName()) + .eq(StringUtils.isNotBlank(bo.getType()), SysPrintTemplateNode::getType, bo.getType()) + .eq(StringUtils.isNotBlank(bo.getWidth()), SysPrintTemplateNode::getWidth, bo.getWidth()) + .eq(StringUtils.isNotBlank(bo.getHeight()), SysPrintTemplateNode::getHeight, bo.getHeight()) + .eq(StringUtils.isNotBlank(bo.getX()), SysPrintTemplateNode::getX, bo.getX()) + .eq(StringUtils.isNotBlank(bo.getY()), SysPrintTemplateNode::getY, bo.getY()) + .eq(StringUtils.isNotBlank(bo.getData()), SysPrintTemplateNode::getData, bo.getData()) + .eq(StringUtils.isNotBlank(bo.getParentNode()), SysPrintTemplateNode::getParentNode, bo.getParentNode()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), SysPrintTemplateNode::getActiveFlag, bo.getActiveFlag()) + .orderByAsc(SysPrintTemplateNode::getCreateTime); return lqw; } @@ -121,7 +123,7 @@ public class SysPrintTemplateNodeServiceImpl implements ISysPrintTemplateNodeSer /** * 保存前的数据校验 */ - private void validEntityBeforeSave(SysPrintTemplateNode entity){ + private void validEntityBeforeSave(SysPrintTemplateNode entity) { //TODO 做一些数据校验,如唯一约束 } @@ -134,9 +136,34 @@ public class SysPrintTemplateNodeServiceImpl implements ISysPrintTemplateNodeSer */ @Override public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if(isValid){ + if (isValid) { //TODO 做一些业务上的校验,判断是否需要校验 } return baseMapper.deleteByIds(ids) > 0; } + + /** + * 更新节点信息列表 + * @param bos + * @return + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int updateNode(List bos) { + for (SysPrintTemplateNodeBo bo : bos) { + String id = bo.getId(); + if (StringUtils.isEmpty(id)) { + throw new ServiceException(bo.getId() + "节点不可为空！"); + } + SysPrintTemplateNodeBo selectNodeBo = new SysPrintTemplateNodeBo(); + selectNodeBo.setId(bo.getId()); + List nodeVos = this.queryList(selectNodeBo); + if (nodeVos.isEmpty()) { + throw new ServiceException(bo.getId() + "节点不存在！"); + } + baseMapper.deleteById(bo.getTemplateNodeId()); + this.insertByBo(bo); + } + return 1; + } }