From 2368ec97181d3ae81dcbb8313e1f8d26b724b499 Mon Sep 17 00:00:00 2001 From: yinq Date: Wed, 30 Jul 2025 13:28:51 +0800 Subject: [PATCH 1/4] =?UTF-8?q?update=20sys=E6=B7=BB=E5=8A=A0=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E5=88=97=E8=A1=A8=E3=80=81=E6=A8=A1=E6=9D=BF=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E3=80=81=E8=8A=82=E7=82=B9=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SysPrintTemplateInfoController.java | 117 +++++++++++++++ .../SysPrintTemplateListController.java | 116 ++++++++++++++ .../SysPrintTemplateNodeController.java | 116 ++++++++++++++ .../system/domain/SysPrintTemplateInfo.java | 77 ++++++++++ .../system/domain/SysPrintTemplateList.java | 72 +++++++++ .../system/domain/SysPrintTemplateNode.java | 91 +++++++++++ .../domain/bo/SysPrintTemplateInfoBo.java | 69 +++++++++ .../domain/bo/SysPrintTemplateListBo.java | 67 +++++++++ .../domain/bo/SysPrintTemplateNodeBo.java | 90 +++++++++++ .../domain/vo/SysPrintTemplateInfoVo.java | 88 +++++++++++ .../domain/vo/SysPrintTemplateListVo.java | 82 ++++++++++ .../domain/vo/SysPrintTemplateNodeVo.java | 111 ++++++++++++++ .../mapper/SysPrintTemplateInfoMapper.java | 15 ++ .../mapper/SysPrintTemplateListMapper.java | 15 ++ .../mapper/SysPrintTemplateNodeMapper.java | 15 ++ .../service/ISysPrintTemplateInfoService.java | 69 +++++++++ .../service/ISysPrintTemplateListService.java | 69 +++++++++ .../service/ISysPrintTemplateNodeService.java | 69 +++++++++ .../impl/SysPrintTemplateInfoServiceImpl.java | 139 +++++++++++++++++ .../impl/SysPrintTemplateListServiceImpl.java | 138 +++++++++++++++++ .../impl/SysPrintTemplateNodeServiceImpl.java | 142 ++++++++++++++++++ .../system/SysPrintTemplateInfoMapper.xml | 7 + .../system/SysPrintTemplateListMapper.xml | 7 + .../system/SysPrintTemplateNodeMapper.xml | 7 + 24 files changed, 1788 insertions(+) create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysPrintTemplateInfoController.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysPrintTemplateListController.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysPrintTemplateNodeController.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPrintTemplateInfo.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPrintTemplateList.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPrintTemplateNode.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPrintTemplateInfoBo.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPrintTemplateListBo.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPrintTemplateNodeBo.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPrintTemplateInfoVo.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPrintTemplateListVo.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPrintTemplateNodeVo.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPrintTemplateInfoMapper.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPrintTemplateListMapper.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPrintTemplateNodeMapper.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPrintTemplateInfoService.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPrintTemplateListService.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPrintTemplateNodeService.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPrintTemplateInfoServiceImpl.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPrintTemplateListServiceImpl.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPrintTemplateNodeServiceImpl.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPrintTemplateInfoMapper.xml create mode 100644 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPrintTemplateListMapper.xml create mode 100644 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPrintTemplateNodeMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysPrintTemplateInfoController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysPrintTemplateInfoController.java new file mode 100644 index 00000000..ff252e97 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysPrintTemplateInfoController.java @@ -0,0 +1,117 @@ +package org.dromara.system.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.system.domain.vo.SysPrintTemplateInfoVo; +import org.dromara.system.domain.bo.SysPrintTemplateInfoBo; +import org.dromara.system.service.ISysPrintTemplateInfoService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 打印模板信息 + * 前端访问路由地址为:/system/printTemplateInfo + * + * @author Yinq + * @date 2025-07-30 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/printTemplateInfo") +public class SysPrintTemplateInfoController extends BaseController { + + private final ISysPrintTemplateInfoService sysPrintTemplateInfoService; + + /** + * 查询打印模板信息列表 + */ + @SaCheckPermission("system:printTemplateInfo:list") + @GetMapping("/list") + public TableDataInfo list(SysPrintTemplateInfoBo bo, PageQuery pageQuery) { + return sysPrintTemplateInfoService.queryPageList(bo, pageQuery); + } + + /** + * 导出打印模板信息列表 + */ + @SaCheckPermission("system:printTemplateInfo:export") + @Log(title = "打印模板信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(SysPrintTemplateInfoBo bo, HttpServletResponse response) { + List list = sysPrintTemplateInfoService.queryList(bo); + ExcelUtil.exportExcel(list, "打印模板信息", SysPrintTemplateInfoVo.class, response); + } + + /** + * 获取打印模板信息详细信息 + * + * @param templateInfoId 主键 + */ + @SaCheckPermission("system:printTemplateInfo:query") + @GetMapping("/{templateInfoId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long templateInfoId) { + return R.ok(sysPrintTemplateInfoService.queryById(templateInfoId)); + } + + /** + * 新增打印模板信息 + */ +// @SaCheckPermission("system:printTemplateInfo:add") + @Log(title = "打印模板信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody SysPrintTemplateInfoBo bo) { + return toAjax(sysPrintTemplateInfoService.insertByBo(bo)); + } + + /** + * 修改打印模板信息 + */ +// @SaCheckPermission("system:printTemplateInfo:edit") + @Log(title = "打印模板信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody SysPrintTemplateInfoBo bo) { + return toAjax(sysPrintTemplateInfoService.updateByBo(bo)); + } + + /** + * 删除打印模板信息 + * + * @param templateInfoIds 主键串 + */ + @SaCheckPermission("system:printTemplateInfo:remove") + @Log(title = "打印模板信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{templateInfoIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] templateInfoIds) { + return toAjax(sysPrintTemplateInfoService.deleteWithValidByIds(List.of(templateInfoIds), true)); + } + + + /** + * 下拉框查询打印模板信息列表 + */ + + @GetMapping("/getSysPrintTemplateInfoList") + public R> getSysPrintTemplateInfoList(SysPrintTemplateInfoBo bo) { + List list = sysPrintTemplateInfoService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysPrintTemplateListController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysPrintTemplateListController.java new file mode 100644 index 00000000..ebd33a5d --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysPrintTemplateListController.java @@ -0,0 +1,116 @@ +package org.dromara.system.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.system.domain.vo.SysPrintTemplateListVo; +import org.dromara.system.domain.bo.SysPrintTemplateListBo; +import org.dromara.system.service.ISysPrintTemplateListService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 打印模板列表 + * 前端访问路由地址为:/system/printTemplateList + * + * @author Yinq + * @date 2025-07-30 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/printTemplateList") +public class SysPrintTemplateListController extends BaseController { + + private final ISysPrintTemplateListService sysPrintTemplateListService; + + /** + * 查询打印模板列表列表 + */ + @SaCheckPermission("system:printTemplateList:list") + @GetMapping("/list") + public TableDataInfo list(SysPrintTemplateListBo bo, PageQuery pageQuery) { + return sysPrintTemplateListService.queryPageList(bo, pageQuery); + } + + /** + * 导出打印模板列表列表 + */ + @SaCheckPermission("system:printTemplateList:export") + @Log(title = "打印模板列表", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(SysPrintTemplateListBo bo, HttpServletResponse response) { + List list = sysPrintTemplateListService.queryList(bo); + ExcelUtil.exportExcel(list, "打印模板列表", SysPrintTemplateListVo.class, response); + } + + /** + * 获取打印模板列表详细信息 + * + * @param templateListId 主键 + */ + @SaCheckPermission("system:printTemplateList:query") + @GetMapping("/{templateListId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long templateListId) { + return R.ok(sysPrintTemplateListService.queryById(templateListId)); + } + + /** + * 新增打印模板列表 + */ +// @SaCheckPermission("system:printTemplateList:add") + @Log(title = "打印模板列表", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody SysPrintTemplateListBo bo) { + return toAjax(sysPrintTemplateListService.insertByBo(bo)); + } + + /** + * 修改打印模板列表 + */ +// @SaCheckPermission("system:printTemplateList:edit") + @Log(title = "打印模板列表", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody SysPrintTemplateListBo bo) { + return toAjax(sysPrintTemplateListService.updateByBo(bo)); + } + + /** + * 删除打印模板列表 + * + * @param templateListIds 主键串 + */ + @SaCheckPermission("system:printTemplateList:remove") + @Log(title = "打印模板列表", businessType = BusinessType.DELETE) + @DeleteMapping("/{templateListIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] templateListIds) { + return toAjax(sysPrintTemplateListService.deleteWithValidByIds(List.of(templateListIds), true)); + } + + + /** + * 下拉框查询打印模板列表列表 + */ + @GetMapping("/getSysPrintTemplateListList") + public R> getSysPrintTemplateListList(SysPrintTemplateListBo bo) { + List list = sysPrintTemplateListService.queryList(bo); + return R.ok(list); + } +} 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 new file mode 100644 index 00000000..be1e8f75 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysPrintTemplateNodeController.java @@ -0,0 +1,116 @@ +package org.dromara.system.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.system.domain.vo.SysPrintTemplateNodeVo; +import org.dromara.system.domain.bo.SysPrintTemplateNodeBo; +import org.dromara.system.service.ISysPrintTemplateNodeService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 打印节点信息 + * 前端访问路由地址为:/system/printTemplateNode + * + * @author Yinq + * @date 2025-07-30 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/printTemplateNode") +public class SysPrintTemplateNodeController extends BaseController { + + private final ISysPrintTemplateNodeService sysPrintTemplateNodeService; + + /** + * 查询打印节点信息列表 + */ + @SaCheckPermission("system:printTemplateNode:list") + @GetMapping("/list") + public TableDataInfo list(SysPrintTemplateNodeBo bo, PageQuery pageQuery) { + return sysPrintTemplateNodeService.queryPageList(bo, pageQuery); + } + + /** + * 导出打印节点信息列表 + */ + @SaCheckPermission("system:printTemplateNode:export") + @Log(title = "打印节点信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(SysPrintTemplateNodeBo bo, HttpServletResponse response) { + List list = sysPrintTemplateNodeService.queryList(bo); + ExcelUtil.exportExcel(list, "打印节点信息", SysPrintTemplateNodeVo.class, response); + } + + /** + * 获取打印节点信息详细信息 + * + * @param templateNodeId 主键 + */ + @SaCheckPermission("system:printTemplateNode:query") + @GetMapping("/{templateNodeId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long templateNodeId) { + return R.ok(sysPrintTemplateNodeService.queryById(templateNodeId)); + } + + /** + * 新增打印节点信息 + */ +// @SaCheckPermission("system:printTemplateNode:add") + @Log(title = "打印节点信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody SysPrintTemplateNodeBo bo) { + return toAjax(sysPrintTemplateNodeService.insertByBo(bo)); + } + + /** + * 修改打印节点信息 + */ +// @SaCheckPermission("system:printTemplateNode:edit") + @Log(title = "打印节点信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody SysPrintTemplateNodeBo bo) { + return toAjax(sysPrintTemplateNodeService.updateByBo(bo)); + } + + /** + * 删除打印节点信息 + * + * @param templateNodeIds 主键串 + */ + @SaCheckPermission("system:printTemplateNode:remove") + @Log(title = "打印节点信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{templateNodeIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] templateNodeIds) { + return toAjax(sysPrintTemplateNodeService.deleteWithValidByIds(List.of(templateNodeIds), true)); + } + + + /** + * 下拉框查询打印节点信息列表 + */ + @GetMapping("/getSysPrintTemplateNodeList") + public R> getSysPrintTemplateNodeList(SysPrintTemplateNodeBo bo) { + List list = sysPrintTemplateNodeService.queryList(bo); + return R.ok(list); + } +} 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 new file mode 100644 index 00000000..eb4e06f8 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPrintTemplateInfo.java @@ -0,0 +1,77 @@ +package org.dromara.system.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 打印模板信息对象 sys_print_template_info + * + * @author Yinq + * @date 2025-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("sys_print_template_info") +public class SysPrintTemplateInfo extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 模板列表ID + */ + @TableId(value = "template_info_id", type = IdType.AUTO) + private Long templateInfoId; + + /** + * 模板列表ID + */ + private String templateListId; + + /** + * 纸张类型 + */ + private String paperType; + + /** + * 纸张宽度 + */ + private String width; + + /** + * 纸张高度 + */ + private String height; + + /** + * 背景颜色 + */ + private String backgroundColor; + + /** + * 纸张方向 + */ + private String orientation; + + /** + * 版本号 + */ + @Version + private String version; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPrintTemplateList.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPrintTemplateList.java new file mode 100644 index 00000000..c2c52df4 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPrintTemplateList.java @@ -0,0 +1,72 @@ +package org.dromara.system.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 打印模板列表对象 sys_print_template_list + * + * @author Yinq + * @date 2025-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("sys_print_template_list") +public class SysPrintTemplateList extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 模板列表ID + */ + @TableId(value = "template_list_id", type = IdType.AUTO) + private Long templateListId; + + /** + * 模板编号 + */ + private String templateCode; + + /** + * 模板名称 + */ + private String templateName; + + /** + * 模板类型（1打印） + */ + private String templateType; + + /** + * 纸张尺寸 + */ + private String paperSize; + + /** + * 模板描述 + */ + private String templateDescription; + + /** + * 版本号 + */ + @Version + private String version; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + +} 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 new file mode 100644 index 00000000..e7e6fc1a --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPrintTemplateNode.java @@ -0,0 +1,91 @@ +package org.dromara.system.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 打印节点信息对象 sys_print_template_node + * + * @author Yinq + * @date 2025-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("sys_print_template_node") +public class SysPrintTemplateNode extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 模板节点ID + */ + @TableId(value = "template_node_id", type = IdType.AUTO) + private Long templateNodeId; + + /** + * 模板信息ID + */ + private String templateInfoId; + + /** + * 节点名称 + */ + private String name; + + /** + * 节点类型 + */ + private String type; + + /** + * 节点宽度 + */ + private String width; + + /** + * 节点高度 + */ + private String height; + + /** + * x轴位置 + */ + private String x; + + /** + * y轴位置 + */ + private String y; + + /** + * 内部属性 + */ + private String data; + + /** + * 节点ID + */ + private String id; + + /** + * 父节点ID + */ + private String parentNode; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + +} 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 new file mode 100644 index 00000000..7ab66169 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPrintTemplateInfoBo.java @@ -0,0 +1,69 @@ +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 + * + * @author Yinq + * @date 2025-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SysPrintTemplateInfo.class, reverseConvertGenerate = false) +public class SysPrintTemplateInfoBo extends BaseEntity { + + /** + * 模板列表ID + */ + private Long templateInfoId; + + /** + * 模板列表ID + */ + private String templateListId; + + /** + * 纸张类型 + */ + private String paperType; + + /** + * 纸张宽度 + */ + private String width; + + /** + * 纸张高度 + */ + private String height; + + /** + * 背景颜色 + */ + private String backgroundColor; + + /** + * 纸张方向 + */ + private String orientation; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + +} 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 new file mode 100644 index 00000000..51f59c52 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPrintTemplateListBo.java @@ -0,0 +1,67 @@ +package org.dromara.system.domain.bo; + +import org.dromara.system.domain.SysPrintTemplateList; +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_list + * + * @author Yinq + * @date 2025-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SysPrintTemplateList.class, reverseConvertGenerate = false) +public class SysPrintTemplateListBo extends BaseEntity { + + /** + * 模板列表ID + */ + private Long templateListId; + + /** + * 模板编号 + */ + @NotBlank(message = "模板编号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String templateCode; + + /** + * 模板名称 + */ + @NotBlank(message = "模板名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String templateName; + + /** + * 模板类型（1打印） + */ + @NotBlank(message = "模板类型（1打印）不能为空", groups = { AddGroup.class, EditGroup.class }) + private String templateType; + + /** + * 纸张尺寸 + */ + private String paperSize; + + /** + * 模板描述 + */ + private String templateDescription; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + +} 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 new file mode 100644 index 00000000..afa03f3e --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPrintTemplateNodeBo.java @@ -0,0 +1,90 @@ +package org.dromara.system.domain.bo; + +import org.dromara.system.domain.SysPrintTemplateNode; +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_node + * + * @author Yinq + * @date 2025-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SysPrintTemplateNode.class, reverseConvertGenerate = false) +public class SysPrintTemplateNodeBo extends BaseEntity { + + /** + * 模板节点ID + */ + private Long templateNodeId; + + /** + * 模板信息ID + */ + private String templateInfoId; + + /** + * 节点名称 + */ + private String name; + + /** + * 节点类型 + */ + private String type; + + /** + * 节点宽度 + */ + private String width; + + /** + * 节点高度 + */ + private String height; + + /** + * x轴位置 + */ + private String x; + + /** + * y轴位置 + */ + private String y; + + /** + * 内部属性 + */ + private String data; + + /** + * 节点ID + */ + @NotBlank(message = "节点ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private String id; + + /** + * 父节点ID + */ + private String parentNode; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + +} 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 new file mode 100644 index 00000000..f475f006 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPrintTemplateInfoVo.java @@ -0,0 +1,88 @@ +package org.dromara.system.domain.vo; + +import org.dromara.system.domain.SysPrintTemplateInfo; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 打印模板信息视图对象 sys_print_template_info + * + * @author Yinq + * @date 2025-07-30 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = SysPrintTemplateInfo.class) +public class SysPrintTemplateInfoVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 模板列表ID + */ + @ExcelProperty(value = "模板列表ID") + private Long templateInfoId; + + /** + * 模板列表ID + */ + @ExcelProperty(value = "模板列表ID") + private String templateListId; + + /** + * 纸张类型 + */ + @ExcelProperty(value = "纸张类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "mes_paper_type") + private String paperType; + + /** + * 纸张宽度 + */ + @ExcelProperty(value = "纸张宽度") + private String width; + + /** + * 纸张高度 + */ + @ExcelProperty(value = "纸张高度") + private String height; + + /** + * 背景颜色 + */ + @ExcelProperty(value = "背景颜色") + private String backgroundColor; + + /** + * 纸张方向 + */ + @ExcelProperty(value = "纸张方向") + private String orientation; + + /** + * 激活标识（1是 0否） + */ + @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "1=是,0=否") + private String activeFlag; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} 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 new file mode 100644 index 00000000..dee24549 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPrintTemplateListVo.java @@ -0,0 +1,82 @@ +package org.dromara.system.domain.vo; + +import org.dromara.system.domain.SysPrintTemplateList; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 打印模板列表视图对象 sys_print_template_list + * + * @author Yinq + * @date 2025-07-30 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = SysPrintTemplateList.class) +public class SysPrintTemplateListVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 模板列表ID + */ + @ExcelProperty(value = "模板列表ID") + private Long templateListId; + + /** + * 模板编号 + */ + @ExcelProperty(value = "模板编号") + private String templateCode; + + /** + * 模板名称 + */ + @ExcelProperty(value = "模板名称") + private String templateName; + + /** + * 模板类型（1打印） + */ + @ExcelProperty(value = "模板类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "sys_template_type") + private String templateType; + + /** + * 纸张尺寸 + */ + @ExcelProperty(value = "纸张尺寸") + private String paperSize; + + /** + * 模板描述 + */ + @ExcelProperty(value = "模板描述") + private String templateDescription; + + /** + * 激活标识（1是 0否） + */ + @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "1=是,0=否") + private String activeFlag; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} 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 new file mode 100644 index 00000000..827b4dc6 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPrintTemplateNodeVo.java @@ -0,0 +1,111 @@ +package org.dromara.system.domain.vo; + +import org.dromara.system.domain.SysPrintTemplateNode; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 打印节点信息视图对象 sys_print_template_node + * + * @author Yinq + * @date 2025-07-30 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = SysPrintTemplateNode.class) +public class SysPrintTemplateNodeVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 模板节点ID + */ + @ExcelProperty(value = "模板节点ID") + private Long templateNodeId; + + /** + * 模板信息ID + */ + @ExcelProperty(value = "模板信息ID") + private String templateInfoId; + + /** + * 节点名称 + */ + @ExcelProperty(value = "节点名称") + private String name; + + /** + * 节点类型 + */ + @ExcelProperty(value = "节点类型") + private String type; + + /** + * 节点宽度 + */ + @ExcelProperty(value = "节点宽度") + private String width; + + /** + * 节点高度 + */ + @ExcelProperty(value = "节点高度") + private String height; + + /** + * x轴位置 + */ + @ExcelProperty(value = "x轴位置") + private String x; + + /** + * y轴位置 + */ + @ExcelProperty(value = "y轴位置") + private String y; + + /** + * 内部属性 + */ + @ExcelProperty(value = "内部属性") + private String data; + + /** + * 节点ID + */ + @ExcelProperty(value = "节点ID") + private String id; + + /** + * 父节点ID + */ + @ExcelProperty(value = "父节点ID") + private String parentNode; + + /** + * 激活标识（1是 0否） + */ + @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "1=是,0=否") + private String activeFlag; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPrintTemplateInfoMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPrintTemplateInfoMapper.java new file mode 100644 index 00000000..ce56fa98 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPrintTemplateInfoMapper.java @@ -0,0 +1,15 @@ +package org.dromara.system.mapper; + +import org.dromara.system.domain.SysPrintTemplateInfo; +import org.dromara.system.domain.vo.SysPrintTemplateInfoVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 打印模板信息Mapper接口 + * + * @author Yinq + * @date 2025-07-30 + */ +public interface SysPrintTemplateInfoMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPrintTemplateListMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPrintTemplateListMapper.java new file mode 100644 index 00000000..1b3f4dc3 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPrintTemplateListMapper.java @@ -0,0 +1,15 @@ +package org.dromara.system.mapper; + +import org.dromara.system.domain.SysPrintTemplateList; +import org.dromara.system.domain.vo.SysPrintTemplateListVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 打印模板列表Mapper接口 + * + * @author Yinq + * @date 2025-07-30 + */ +public interface SysPrintTemplateListMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPrintTemplateNodeMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPrintTemplateNodeMapper.java new file mode 100644 index 00000000..77ae72fc --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPrintTemplateNodeMapper.java @@ -0,0 +1,15 @@ +package org.dromara.system.mapper; + +import org.dromara.system.domain.SysPrintTemplateNode; +import org.dromara.system.domain.vo.SysPrintTemplateNodeVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 打印节点信息Mapper接口 + * + * @author Yinq + * @date 2025-07-30 + */ +public interface SysPrintTemplateNodeMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPrintTemplateInfoService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPrintTemplateInfoService.java new file mode 100644 index 00000000..5c7ddc9e --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPrintTemplateInfoService.java @@ -0,0 +1,69 @@ +package org.dromara.system.service; + +import org.dromara.system.domain.SysPrintTemplateInfo; +import org.dromara.system.domain.vo.SysPrintTemplateInfoVo; +import org.dromara.system.domain.bo.SysPrintTemplateInfoBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 打印模板信息Service接口 + * + * @author Yinq + * @date 2025-07-30 + */ +public interface ISysPrintTemplateInfoService { + + /** + * 查询打印模板信息 + * + * @param templateInfoId 主键 + * @return 打印模板信息 + */ + SysPrintTemplateInfoVo queryById(Long templateInfoId); + + /** + * 分页查询打印模板信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 打印模板信息分页列表 + */ + TableDataInfo queryPageList(SysPrintTemplateInfoBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的打印模板信息列表 + * + * @param bo 查询条件 + * @return 打印模板信息列表 + */ + List queryList(SysPrintTemplateInfoBo bo); + + /** + * 新增打印模板信息 + * + * @param bo 打印模板信息 + * @return 是否新增成功 + */ + Boolean insertByBo(SysPrintTemplateInfoBo bo); + + /** + * 修改打印模板信息 + * + * @param bo 打印模板信息 + * @return 是否修改成功 + */ + Boolean updateByBo(SysPrintTemplateInfoBo bo); + + /** + * 校验并批量删除打印模板信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPrintTemplateListService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPrintTemplateListService.java new file mode 100644 index 00000000..d18f8ec2 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPrintTemplateListService.java @@ -0,0 +1,69 @@ +package org.dromara.system.service; + +import org.dromara.system.domain.SysPrintTemplateList; +import org.dromara.system.domain.vo.SysPrintTemplateListVo; +import org.dromara.system.domain.bo.SysPrintTemplateListBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 打印模板列表Service接口 + * + * @author Yinq + * @date 2025-07-30 + */ +public interface ISysPrintTemplateListService { + + /** + * 查询打印模板列表 + * + * @param templateListId 主键 + * @return 打印模板列表 + */ + SysPrintTemplateListVo queryById(Long templateListId); + + /** + * 分页查询打印模板列表列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 打印模板列表分页列表 + */ + TableDataInfo queryPageList(SysPrintTemplateListBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的打印模板列表列表 + * + * @param bo 查询条件 + * @return 打印模板列表列表 + */ + List queryList(SysPrintTemplateListBo bo); + + /** + * 新增打印模板列表 + * + * @param bo 打印模板列表 + * @return 是否新增成功 + */ + Boolean insertByBo(SysPrintTemplateListBo bo); + + /** + * 修改打印模板列表 + * + * @param bo 打印模板列表 + * @return 是否修改成功 + */ + Boolean updateByBo(SysPrintTemplateListBo bo); + + /** + * 校验并批量删除打印模板列表信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} 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 new file mode 100644 index 00000000..337fbaf6 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPrintTemplateNodeService.java @@ -0,0 +1,69 @@ +package org.dromara.system.service; + +import org.dromara.system.domain.SysPrintTemplateNode; +import org.dromara.system.domain.vo.SysPrintTemplateNodeVo; +import org.dromara.system.domain.bo.SysPrintTemplateNodeBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 打印节点信息Service接口 + * + * @author Yinq + * @date 2025-07-30 + */ +public interface ISysPrintTemplateNodeService { + + /** + * 查询打印节点信息 + * + * @param templateNodeId 主键 + * @return 打印节点信息 + */ + SysPrintTemplateNodeVo queryById(Long templateNodeId); + + /** + * 分页查询打印节点信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 打印节点信息分页列表 + */ + TableDataInfo queryPageList(SysPrintTemplateNodeBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的打印节点信息列表 + * + * @param bo 查询条件 + * @return 打印节点信息列表 + */ + List queryList(SysPrintTemplateNodeBo bo); + + /** + * 新增打印节点信息 + * + * @param bo 打印节点信息 + * @return 是否新增成功 + */ + Boolean insertByBo(SysPrintTemplateNodeBo bo); + + /** + * 修改打印节点信息 + * + * @param bo 打印节点信息 + * @return 是否修改成功 + */ + Boolean updateByBo(SysPrintTemplateNodeBo bo); + + /** + * 校验并批量删除打印节点信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPrintTemplateInfoServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPrintTemplateInfoServiceImpl.java new file mode 100644 index 00000000..4ba5cd1a --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPrintTemplateInfoServiceImpl.java @@ -0,0 +1,139 @@ +package org.dromara.system.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.system.domain.bo.SysPrintTemplateInfoBo; +import org.dromara.system.domain.vo.SysPrintTemplateInfoVo; +import org.dromara.system.domain.SysPrintTemplateInfo; +import org.dromara.system.mapper.SysPrintTemplateInfoMapper; +import org.dromara.system.service.ISysPrintTemplateInfoService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 打印模板信息Service业务层处理 + * + * @author Yinq + * @date 2025-07-30 + */ +@RequiredArgsConstructor +@Service +public class SysPrintTemplateInfoServiceImpl implements ISysPrintTemplateInfoService { + + private final SysPrintTemplateInfoMapper baseMapper; + + /** + * 查询打印模板信息 + * + * @param templateInfoId 主键 + * @return 打印模板信息 + */ + @Override + public SysPrintTemplateInfoVo queryById(Long templateInfoId){ + return baseMapper.selectVoById(templateInfoId); + } + + /** + * 分页查询打印模板信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 打印模板信息分页列表 + */ + @Override + public TableDataInfo queryPageList(SysPrintTemplateInfoBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的打印模板信息列表 + * + * @param bo 查询条件 + * @return 打印模板信息列表 + */ + @Override + public List queryList(SysPrintTemplateInfoBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(SysPrintTemplateInfoBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(SysPrintTemplateInfo.class) + .selectAll(SysPrintTemplateInfo.class) + .eq(bo.getTemplateInfoId() != null, SysPrintTemplateInfo::getTemplateInfoId, bo.getTemplateInfoId()) + .eq(StringUtils.isNotBlank(bo.getTemplateListId()), SysPrintTemplateInfo::getTemplateListId, bo.getTemplateListId()) + .eq(StringUtils.isNotBlank(bo.getPaperType()), SysPrintTemplateInfo::getPaperType, bo.getPaperType()) + .eq(StringUtils.isNotBlank(bo.getWidth()), SysPrintTemplateInfo::getWidth, bo.getWidth()) + .eq(StringUtils.isNotBlank(bo.getHeight()), SysPrintTemplateInfo::getHeight, bo.getHeight()) + .eq(StringUtils.isNotBlank(bo.getBackgroundColor()), SysPrintTemplateInfo::getBackgroundColor, bo.getBackgroundColor()) + .eq(StringUtils.isNotBlank(bo.getOrientation()), SysPrintTemplateInfo::getOrientation, bo.getOrientation()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), SysPrintTemplateInfo::getActiveFlag, bo.getActiveFlag()) + .orderByAsc(SysPrintTemplateInfo::getCreateTime); + return lqw; + } + + /** + * 新增打印模板信息 + * + * @param bo 打印模板信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(SysPrintTemplateInfoBo bo) { + SysPrintTemplateInfo add = MapstructUtils.convert(bo, SysPrintTemplateInfo.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setTemplateInfoId(add.getTemplateInfoId()); + } + return flag; + } + + /** + * 修改打印模板信息 + * + * @param bo 打印模板信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(SysPrintTemplateInfoBo bo) { + SysPrintTemplateInfo update = MapstructUtils.convert(bo, SysPrintTemplateInfo.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(SysPrintTemplateInfo entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除打印模板信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPrintTemplateListServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPrintTemplateListServiceImpl.java new file mode 100644 index 00000000..f630f929 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPrintTemplateListServiceImpl.java @@ -0,0 +1,138 @@ +package org.dromara.system.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.system.domain.bo.SysPrintTemplateListBo; +import org.dromara.system.domain.vo.SysPrintTemplateListVo; +import org.dromara.system.domain.SysPrintTemplateList; +import org.dromara.system.mapper.SysPrintTemplateListMapper; +import org.dromara.system.service.ISysPrintTemplateListService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 打印模板列表Service业务层处理 + * + * @author Yinq + * @date 2025-07-30 + */ +@RequiredArgsConstructor +@Service +public class SysPrintTemplateListServiceImpl implements ISysPrintTemplateListService { + + private final SysPrintTemplateListMapper baseMapper; + + /** + * 查询打印模板列表 + * + * @param templateListId 主键 + * @return 打印模板列表 + */ + @Override + public SysPrintTemplateListVo queryById(Long templateListId){ + return baseMapper.selectVoById(templateListId); + } + + /** + * 分页查询打印模板列表列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 打印模板列表分页列表 + */ + @Override + public TableDataInfo queryPageList(SysPrintTemplateListBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的打印模板列表列表 + * + * @param bo 查询条件 + * @return 打印模板列表列表 + */ + @Override + public List queryList(SysPrintTemplateListBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(SysPrintTemplateListBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(SysPrintTemplateList.class) + .selectAll(SysPrintTemplateList.class) + .eq(bo.getTemplateListId() != null, SysPrintTemplateList::getTemplateListId, bo.getTemplateListId()) + .eq(StringUtils.isNotBlank(bo.getTemplateCode()), SysPrintTemplateList::getTemplateCode, bo.getTemplateCode()) + .like(StringUtils.isNotBlank(bo.getTemplateName()), SysPrintTemplateList::getTemplateName, bo.getTemplateName()) + .eq(StringUtils.isNotBlank(bo.getTemplateType()), SysPrintTemplateList::getTemplateType, bo.getTemplateType()) + .eq(StringUtils.isNotBlank(bo.getPaperSize()), SysPrintTemplateList::getPaperSize, bo.getPaperSize()) + .eq(StringUtils.isNotBlank(bo.getTemplateDescription()), SysPrintTemplateList::getTemplateDescription, bo.getTemplateDescription()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), SysPrintTemplateList::getActiveFlag, bo.getActiveFlag()) + .orderByAsc(SysPrintTemplateList::getCreateTime); + return lqw; + } + + /** + * 新增打印模板列表 + * + * @param bo 打印模板列表 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(SysPrintTemplateListBo bo) { + SysPrintTemplateList add = MapstructUtils.convert(bo, SysPrintTemplateList.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setTemplateListId(add.getTemplateListId()); + } + return flag; + } + + /** + * 修改打印模板列表 + * + * @param bo 打印模板列表 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(SysPrintTemplateListBo bo) { + SysPrintTemplateList update = MapstructUtils.convert(bo, SysPrintTemplateList.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(SysPrintTemplateList entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除打印模板列表信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} 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 new file mode 100644 index 00000000..b0a77d73 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPrintTemplateNodeServiceImpl.java @@ -0,0 +1,142 @@ +package org.dromara.system.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.system.domain.bo.SysPrintTemplateNodeBo; +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 java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 打印节点信息Service业务层处理 + * + * @author Yinq + * @date 2025-07-30 + */ +@RequiredArgsConstructor +@Service +public class SysPrintTemplateNodeServiceImpl implements ISysPrintTemplateNodeService { + + private final SysPrintTemplateNodeMapper baseMapper; + + /** + * 查询打印节点信息 + * + * @param templateNodeId 主键 + * @return 打印节点信息 + */ + @Override + public SysPrintTemplateNodeVo queryById(Long templateNodeId){ + return baseMapper.selectVoById(templateNodeId); + } + + /** + * 分页查询打印节点信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 打印节点信息分页列表 + */ + @Override + public TableDataInfo queryPageList(SysPrintTemplateNodeBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的打印节点信息列表 + * + * @param bo 查询条件 + * @return 打印节点信息列表 + */ + @Override + public List queryList(SysPrintTemplateNodeBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + 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); + return lqw; + } + + /** + * 新增打印节点信息 + * + * @param bo 打印节点信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(SysPrintTemplateNodeBo bo) { + SysPrintTemplateNode add = MapstructUtils.convert(bo, SysPrintTemplateNode.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setTemplateNodeId(add.getTemplateNodeId()); + } + return flag; + } + + /** + * 修改打印节点信息 + * + * @param bo 打印节点信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(SysPrintTemplateNodeBo bo) { + SysPrintTemplateNode update = MapstructUtils.convert(bo, SysPrintTemplateNode.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(SysPrintTemplateNode entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除打印节点信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPrintTemplateInfoMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPrintTemplateInfoMapper.xml new file mode 100644 index 00000000..71394f21 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPrintTemplateInfoMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPrintTemplateListMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPrintTemplateListMapper.xml new file mode 100644 index 00000000..57490d99 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPrintTemplateListMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPrintTemplateNodeMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPrintTemplateNodeMapper.xml new file mode 100644 index 00000000..07721c40 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPrintTemplateNodeMapper.xml @@ -0,0 +1,7 @@ + + + + + From eeac5de4e8539c09aa46c87614bac714412d8346 Mon Sep 17 00:00:00 2001 From: yinq Date: Wed, 30 Jul 2025 17:20:00 +0800 Subject: [PATCH 2/4] =?UTF-8?q?update=20sys=E6=B7=BB=E5=8A=A0=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E8=8A=82=E7=82=B9=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SysPrintTemplateNodeController.java | 10 ++++ .../system/domain/SysPrintTemplateInfo.java | 8 ++- .../system/domain/SysPrintTemplateNode.java | 6 +- .../domain/bo/SysPrintTemplateInfoBo.java | 10 ++-- .../domain/bo/SysPrintTemplateListBo.java | 2 +- .../domain/bo/SysPrintTemplateNodeBo.java | 5 +- .../domain/vo/SysPrintTemplateInfoVo.java | 11 ++-- .../domain/vo/SysPrintTemplateListVo.java | 2 +- .../domain/vo/SysPrintTemplateNodeVo.java | 8 ++- .../service/ISysPrintTemplateNodeService.java | 8 +++ .../impl/SysPrintTemplateNodeServiceImpl.java | 59 ++++++++++++++----- 11 files changed, 96 insertions(+), 33 deletions(-) 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 be1e8f75..32bf440a 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 eb4e06f8..3bb76954 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 e7e6fc1a..aaa61c70 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 7ab66169..5218139c 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 51f59c52..23ca45be 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 afa03f3e..e858d7d9 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 f475f006..14b9c205 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 dee24549..47ffc063 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 827b4dc6..6a79f337 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 337fbaf6..c335ccf2 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 b0a77d73..9cc4a2c5 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; + } } From 0f6a2601b138399756834c1e9ba2d277f298bffb Mon Sep 17 00:00:00 2001 From: yinq Date: Wed, 30 Jul 2025 17:36:57 +0800 Subject: [PATCH 3/4] =?UTF-8?q?update=20sys=E6=B7=BB=E5=8A=A0=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E8=8A=82=E7=82=B9=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/impl/SysPrintTemplateNodeServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9cc4a2c5..10f29130 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 @@ -161,7 +161,7 @@ public class SysPrintTemplateNodeServiceImpl implements ISysPrintTemplateNodeSer if (nodeVos.isEmpty()) { throw new ServiceException(bo.getId() + "节点不存在！"); } - baseMapper.deleteById(bo.getTemplateNodeId()); + baseMapper.deleteById(nodeVos.get(0).getTemplateNodeId()); this.insertByBo(bo); } return 1; From 426e329d3ea443cd0a86aa5f3570ceffa991dc22 Mon Sep 17 00:00:00 2001 From: yinq Date: Thu, 31 Jul 2025 10:09:59 +0800 Subject: [PATCH 4/4] =?UTF-8?q?update=20sys=E6=89=93=E5=8D=B0=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/SysPrintTemplateInfoController.java | 8 ++++---- .../system/controller/SysPrintTemplateListController.java | 8 ++++---- .../system/controller/SysPrintTemplateNodeController.java | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysPrintTemplateInfoController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysPrintTemplateInfoController.java index ff252e97..7535ad12 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysPrintTemplateInfoController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysPrintTemplateInfoController.java @@ -40,7 +40,7 @@ public class SysPrintTemplateInfoController extends BaseController { /** * 查询打印模板信息列表 */ - @SaCheckPermission("system:printTemplateInfo:list") +// @SaCheckPermission("system:printTemplateInfo:list") @GetMapping("/list") public TableDataInfo list(SysPrintTemplateInfoBo bo, PageQuery pageQuery) { return sysPrintTemplateInfoService.queryPageList(bo, pageQuery); @@ -49,7 +49,7 @@ public class SysPrintTemplateInfoController extends BaseController { /** * 导出打印模板信息列表 */ - @SaCheckPermission("system:printTemplateInfo:export") +// @SaCheckPermission("system:printTemplateInfo:export") @Log(title = "打印模板信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(SysPrintTemplateInfoBo bo, HttpServletResponse response) { @@ -62,7 +62,7 @@ public class SysPrintTemplateInfoController extends BaseController { * * @param templateInfoId 主键 */ - @SaCheckPermission("system:printTemplateInfo:query") +// @SaCheckPermission("system:printTemplateInfo:query") @GetMapping("/{templateInfoId}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long templateInfoId) { @@ -96,7 +96,7 @@ public class SysPrintTemplateInfoController extends BaseController { * * @param templateInfoIds 主键串 */ - @SaCheckPermission("system:printTemplateInfo:remove") +// @SaCheckPermission("system:printTemplateInfo:remove") @Log(title = "打印模板信息", businessType = BusinessType.DELETE) @DeleteMapping("/{templateInfoIds}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysPrintTemplateListController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysPrintTemplateListController.java index ebd33a5d..4b20219c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysPrintTemplateListController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysPrintTemplateListController.java @@ -40,7 +40,7 @@ public class SysPrintTemplateListController extends BaseController { /** * 查询打印模板列表列表 */ - @SaCheckPermission("system:printTemplateList:list") +// @SaCheckPermission("system:printTemplateList:list") @GetMapping("/list") public TableDataInfo list(SysPrintTemplateListBo bo, PageQuery pageQuery) { return sysPrintTemplateListService.queryPageList(bo, pageQuery); @@ -49,7 +49,7 @@ public class SysPrintTemplateListController extends BaseController { /** * 导出打印模板列表列表 */ - @SaCheckPermission("system:printTemplateList:export") +// @SaCheckPermission("system:printTemplateList:export") @Log(title = "打印模板列表", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(SysPrintTemplateListBo bo, HttpServletResponse response) { @@ -62,7 +62,7 @@ public class SysPrintTemplateListController extends BaseController { * * @param templateListId 主键 */ - @SaCheckPermission("system:printTemplateList:query") +// @SaCheckPermission("system:printTemplateList:query") @GetMapping("/{templateListId}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long templateListId) { @@ -96,7 +96,7 @@ public class SysPrintTemplateListController extends BaseController { * * @param templateListIds 主键串 */ - @SaCheckPermission("system:printTemplateList:remove") +// @SaCheckPermission("system:printTemplateList:remove") @Log(title = "打印模板列表", businessType = BusinessType.DELETE) @DeleteMapping("/{templateListIds}") public R remove(@NotEmpty(message = "主键不能为空") 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 32bf440a..b2bafb82 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 @@ -40,7 +40,7 @@ public class SysPrintTemplateNodeController extends BaseController { /** * 查询打印节点信息列表 */ - @SaCheckPermission("system:printTemplateNode:list") +// @SaCheckPermission("system:printTemplateNode:list") @GetMapping("/list") public TableDataInfo list(SysPrintTemplateNodeBo bo, PageQuery pageQuery) { return sysPrintTemplateNodeService.queryPageList(bo, pageQuery); @@ -49,7 +49,7 @@ public class SysPrintTemplateNodeController extends BaseController { /** * 导出打印节点信息列表 */ - @SaCheckPermission("system:printTemplateNode:export") +// @SaCheckPermission("system:printTemplateNode:export") @Log(title = "打印节点信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(SysPrintTemplateNodeBo bo, HttpServletResponse response) { @@ -62,7 +62,7 @@ public class SysPrintTemplateNodeController extends BaseController { * * @param templateNodeId 主键 */ - @SaCheckPermission("system:printTemplateNode:query") +// @SaCheckPermission("system:printTemplateNode:query") @GetMapping("/{templateNodeId}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long templateNodeId) { @@ -96,7 +96,7 @@ public class SysPrintTemplateNodeController extends BaseController { * * @param templateNodeIds 主键串 */ - @SaCheckPermission("system:printTemplateNode:remove") +// @SaCheckPermission("system:printTemplateNode:remove") @Log(title = "打印节点信息", businessType = BusinessType.DELETE) @DeleteMapping("/{templateNodeIds}") public R remove(@NotEmpty(message = "主键不能为空")