From 41445b32cdc8662ecaaba8fe2768780f551065b2 Mon Sep 17 00:00:00 2001 From: chenhao <852066789@qq.com> Date: Wed, 21 May 2025 10:54:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat(sip):=20=E4=BC=98=E5=8C=96=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E5=8D=95=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增发货单编码生成逻辑 - 修改发货单列表导出功能 -调整订单编辑页面字段显示- 优化模板下载功能 --- .../src/main/resources/templates/index.html | 2 +- .../resources/templates/manage/order/add.html | 27 ++++----- .../templates/manage/order/edit.html | 32 +++++----- .../sip/controller/OrderInfoController.java | 2 +- .../com/ruoyi/sip/domain/OrderDelivery.java | 1 + .../ruoyi/sip/mapper/OrderDeliveryMapper.java | 3 + .../impl/OrderDeliveryServiceImpl.java | 7 +++ .../ruoyi/sip/utils/CodeGeneratorUtil.java | 59 +++++++++++++++++++ .../mapper/manage/OrderDeliveryMapper.xml | 14 +++++ 9 files changed, 114 insertions(+), 33 deletions(-) create mode 100644 ruoyi-sip/src/main/java/com/ruoyi/sip/utils/CodeGeneratorUtil.java diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html index 6b9a4264..da436479 100644 --- a/ruoyi-admin/src/main/resources/templates/index.html +++ b/ruoyi-admin/src/main/resources/templates/index.html @@ -26,7 +26,7 @@
diff --git a/ruoyi-admin/src/main/resources/templates/manage/order/add.html b/ruoyi-admin/src/main/resources/templates/manage/order/add.html index 81d04235..dd81353c 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/order/add.html +++ b/ruoyi-admin/src/main/resources/templates/manage/order/add.html @@ -388,20 +388,19 @@ function downloadTem() { var xhr = new XMLHttpRequest(); // 创建XMLHttpRequest对象 - xhr.open('post', prefix + '/list/export', true); // 设置请求类型和URL - // 当请求完成时执行的回调函数 - $.modal.loading("正在下载，请稍候..."); - xhr.onload = function (data) { - const url = window.URL.createObjectURL(data.currentTarget.response) - const a=document.createElement('a') - a.href= url - a.download='合同清单模板.xlsx' - document.append(a) - a.click() - a.remove() - $.modal.closeLoading(); - } - xhr.send(); + window.location.href =prefix + "/list/export" + $.modal.closeLoading(); + // $.post(prefix + "/list/export", {}, function (result) { + // if (result.code == web_status.SUCCESS) { + // window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true; + // } else if (result.code == web_status.WARNING) { + // $.modal.alertWarning(result.msg) + // } else { + // $.modal.alertError(result.msg); + // } + // $.modal.closeLoading(); + // }) + } document.getElementById('uploadInput').addEventListener('change', function (event) { diff --git a/ruoyi-admin/src/main/resources/templates/manage/order/edit.html b/ruoyi-admin/src/main/resources/templates/manage/order/edit.html index e1ed2577..2b00786c 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/order/edit.html +++ b/ruoyi-admin/src/main/resources/templates/manage/order/edit.html @@ -104,7 +104,7 @@
- +
- +
@@ -234,7 +234,7 @@ width: "680", url: url, height:'600', - + callBack: doSubmitPartner }; $.modal.openOptions(options); @@ -324,21 +324,19 @@ }); function downloadTem() { - var xhr = new XMLHttpRequest(); // 创建XMLHttpRequest对象 - xhr.open('post', prefix + '/list/export', true); // 设置请求类型和URL - // 当请求完成时执行的回调函数 $.modal.loading("正在下载，请稍候..."); - xhr.onload = function (data) { - const url = window.URL.createObjectURL(data.currentTarget.response) - const a=document.createElement('a') - a.href= url - a.download='合同清单模板.xlsx' - document.append(a) - a.click() - a.remove() - $.modal.closeLoading(); - } - xhr.send(); + window.location.href=prefix + "/list/export" + $.modal.closeLoading(); + // $.post(prefix + "/list/export", {}, function (result) { + // if (result.code == web_status.SUCCESS) { + // window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true; + // } else if (result.code == web_status.WARNING) { + // $.modal.alertWarning(result.msg) + // } else { + // $.modal.alertError(result.msg); + // } + // $.modal.closeLoading(); + // }) } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OrderInfoController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OrderInfoController.java index 786b0c8d..1dda344c 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OrderInfoController.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OrderInfoController.java @@ -178,7 +178,7 @@ public class OrderInfoController extends BaseController } @RequiresPermissions("sip:list:export") @Log(title = "发货清单", businessType = BusinessType.EXPORT) - @PostMapping("/list/export") + @GetMapping("/list/export") public void listExport(HttpServletRequest request, HttpServletResponse response) { try { diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderDelivery.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderDelivery.java index cbb0ecbb..8384f5ef 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderDelivery.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderDelivery.java @@ -75,5 +75,6 @@ public class OrderDelivery extends BaseEntity /** 删除时间 */ private Date deletedAt; private String total; + private Integer status; } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OrderDeliveryMapper.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OrderDeliveryMapper.java index 5eb24800..3929b874 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OrderDeliveryMapper.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OrderDeliveryMapper.java @@ -1,5 +1,6 @@ package com.ruoyi.sip.mapper; +import java.util.Date; import java.util.List; import com.ruoyi.sip.domain.OrderDelivery; @@ -58,4 +59,6 @@ public interface OrderDeliveryMapper * @return 结果 */ public int deleteOrderDeliveryByIds(String[] ids); + + int count(OrderDelivery orderDelivery); } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderDeliveryServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderDeliveryServiceImpl.java index 0fa9c9bc..83218d41 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderDeliveryServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderDeliveryServiceImpl.java @@ -1,6 +1,9 @@ package com.ruoyi.sip.service.impl; import java.util.List; + +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.sip.utils.CodeGeneratorUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.sip.mapper.OrderDeliveryMapper; @@ -53,6 +56,10 @@ public class OrderDeliveryServiceImpl implements IOrderDeliveryService @Override public int insertOrderDelivery(OrderDelivery orderDelivery) { + OrderDelivery queryCountParam = new OrderDelivery(); + queryCountParam.setCreatedAt(DateUtils.getNowDate()); + String deliveryCode = CodeGeneratorUtil.generateUniqueCode("OD", () -> orderDeliveryMapper.count(queryCountParam)); + orderDelivery.setDeliveryCode(deliveryCode); return orderDeliveryMapper.insertOrderDelivery(orderDelivery); } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/utils/CodeGeneratorUtil.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/utils/CodeGeneratorUtil.java new file mode 100644 index 00000000..ddb1c8d1 --- /dev/null +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/utils/CodeGeneratorUtil.java @@ -0,0 +1,59 @@ +package com.ruoyi.sip.utils; + +import cn.hutool.core.collection.CollUtil; +import com.ruoyi.common.utils.DateUtils; + +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.AtomicLong; +import java.util.function.IntSupplier; + +/** + * @author : ch + * @version : 1.0 + * @ClassName : CodeGeneratorUtil + * @Description : + * @DATE : Created in 9:55 2025/5/21 + * 
       Copyright: Copyright(c) 2025
+ * 
       Company :   	紫光汇智信息技术有限公司
+ * Modification History: + * Date Author Version Discription + * -------------------------------------------------------------------------- + * 2025/05/21 ch 1.0 Why & What is modified: <修改原因描述> * + */ +public class CodeGeneratorUtil { + + private static final String DELIMITER = "-"; + private static final Map SEQUENCE_MAP = new ConcurrentHashMap<>(); + private static final Map DATE_MAP = new ConcurrentHashMap<>(); + + /** + * 生成唯一编码 + * + * @param prefix 编码前缀 + * @param defaultValueSupplier 函数式接口，返回默认值 + * @return 唯一编码 + */ + public static String generateUniqueCode(String prefix, IntSupplier defaultValueSupplier) { + // 获取当前日期（yyyyMMdd格式） + String currentDate = DateUtils.dateTime(); + if (!DATE_MAP.containsKey(currentDate)) { + DATE_MAP.clear(); + SEQUENCE_MAP.clear(); + DATE_MAP.put(currentDate, currentDate); + } + // 获取当前流水号并递增 + AtomicLong sequence = SEQUENCE_MAP.computeIfAbsent(prefix, k -> { + if (CollUtil.isEmpty(SEQUENCE_MAP)) { + return new AtomicLong(defaultValueSupplier.getAsInt()); + } else { + return new AtomicLong(0); + } + }); + long currentSequence = sequence.incrementAndGet(); + // 生成编码 + return prefix + DELIMITER + currentDate + DELIMITER + String.format("%04d", currentSequence); + } +} \ No newline at end of file diff --git a/ruoyi-sip/src/main/resources/mapper/manage/OrderDeliveryMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/OrderDeliveryMapper.xml index d496c791..279325fa 100644 --- a/ruoyi-sip/src/main/resources/mapper/manage/OrderDeliveryMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/manage/OrderDeliveryMapper.xml @@ -50,6 +50,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} + insert into order_delivery From 3623c5564fe265d517b725b208a2be360e5d07a7 Mon Sep 17 00:00:00 2001 From: chenhao <852066789@qq.com> Date: Wed, 21 May 2025 16:31:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat(sip):=20=E5=AE=9E=E7=8E=B0=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 CodeGenTable 实体类，用于存储代码生成规则 - 添加 CodeGenTableMapper 接口和 XML 文件，实现代码生成规则的持久化 - 实现 CodeGenTableServiceImpl 服务类，提供代码生成逻辑 - 在 OrderDeliveryServiceImpl 中集成代码生成功能，用于生成发货记录代码- 在生产配置中添加 demoEnabled 属性，控制是否启用演示模式 --- .../src/main/resources/application-prod.yml | 1 + .../com/ruoyi/sip/domain/CodeGenTable.java | 95 +++++++ .../ruoyi/sip/mapper/CodeGenTableMapper.java | 52 ++++ .../sip/service/ICodeGenTableService.java | 49 ++++ .../service/impl/CodeGenTableServiceImpl.java | 114 ++++++++ .../impl/OrderDeliveryServiceImpl.java | 9 +- .../CodeGenTable/CodeGenTableMapper.xml | 245 ++++++++++++++++++ 7 files changed, 562 insertions(+), 3 deletions(-) create mode 100644 ruoyi-sip/src/main/java/com/ruoyi/sip/domain/CodeGenTable.java create mode 100644 ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/CodeGenTableMapper.java create mode 100644 ruoyi-sip/src/main/java/com/ruoyi/sip/service/ICodeGenTableService.java create mode 100644 ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/CodeGenTableServiceImpl.java create mode 100644 ruoyi-sip/src/main/resources/mapper/CodeGenTable/CodeGenTableMapper.xml diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index 3e2ad313..97c2b144 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -1,4 +1,5 @@ ruoyi: + demoEnabled: false excelTemplate: /home/application/excelTemplate server: # 服务器的HTTP端口，默认为80 diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/CodeGenTable.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/CodeGenTable.java new file mode 100644 index 00000000..0636fb62 --- /dev/null +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/CodeGenTable.java @@ -0,0 +1,95 @@ +package com.ruoyi.sip.domain; + +import java.util.Date; + + +import lombok.Data; +import lombok.Getter; + + +/** + * 代码生成业务表(CodeGenTable)实体类 + * + * @author ch + * @since 2025-05-21 14:39:07 + */ +@Data +public class CodeGenTable { + /** + * 编号 + */ + + private Long id; + /** + * 表名称 + */ + + private String tableName; + /** + * 表描述 + */ + + private String tableComment; + /** + * code前缀 + */ + + private String prefix; + /** + * 流水号 + */ + + private Integer number; + /** + * code生成日期 + */ + + private Date genDate; + private String dateFormat; + /** + * 流水号长度 + */ + + private Integer numberLength; + /** + * 创建者 + */ + + private String createBy; + /** + * 创建时间 + */ + + private Date createTime; + /** + * 更新者 + */ + + private String updateBy; + /** + * 更新时间 + */ + + private Date updateTime; + /** + * 备注 + */ + + private String remark; + private Long version; + + @Getter + public enum TableNameEnum{ + ORDER_DELIVERY("order_delivery", "发货记录"), + ; + private final String name; + private final String desc; + TableNameEnum(String type, String desc) { + this.name = type; + this.desc = desc; + } + } +} + + + diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/CodeGenTableMapper.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/CodeGenTableMapper.java new file mode 100644 index 00000000..89c6ea56 --- /dev/null +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/CodeGenTableMapper.java @@ -0,0 +1,52 @@ +package com.ruoyi.sip.mapper; + +import com.ruoyi.sip.domain.CodeGenTable; + +import java.util.List; + +/** + * @Author ch + * @Desc 代码生成业务表(CodeGenTable)表数据库访问层 + * @Date 2025-05-21 14:39:07 + */ +public interface CodeGenTableMapper { + + /** + * 通过实体作为筛选条件查询 + * + * @param codeGenTable 实例对象 + * @return 对象列表 + */ + List queryAll(CodeGenTable codeGenTable); + + /** + * 根据ID查详情 + */ + CodeGenTable queryById(Long id); + + + /** + * 新增数据 + */ + int insert(CodeGenTable codeGenTable); + + + /** + * 修改数据 + */ + int update(CodeGenTable codeGenTable); + + /** + * 通过主键删除数据 + */ + int deleteById(Long id); + + /** + * 通过id批量删除代码生成业务表 + */ + int batchRemove(Long[] ids); + + CodeGenTable selectByTableName(String tableName); + + int updateNumber(CodeGenTable codeGeneratorConfig); +} diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/ICodeGenTableService.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/ICodeGenTableService.java new file mode 100644 index 00000000..0dc1d49b --- /dev/null +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/ICodeGenTableService.java @@ -0,0 +1,49 @@ +package com.ruoyi.sip.service; + +import com.ruoyi.sip.domain.CodeGenTable; + +import java.util.List; + +/** + * @Author ch + * @Desc 代码生成业务表(CodeGenTable)表服务接口 + * @Date 2025-05-21 14:39:07 + */ +public interface ICodeGenTableService { + + /** + * 通过实体作为筛选条件查询 + */ + List queryAll(CodeGenTable codeGenTable); + + + /** + * 根据ID查详情 + */ + CodeGenTable queryById(Long id); + + /** + * 新增数据 + */ + int insert(CodeGenTable codeGenTable); + + /** + * 修改数据 + */ + int update(CodeGenTable codeGenTable); + + /** + * 通过主键删除数据 + */ + int deleteById(Long id); + + /** + * 通过id批量删除代码生成业务表 + */ + int batchRemove(Long[] ids); + + String generateCode(String tableName); +} + + + diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/CodeGenTableServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/CodeGenTableServiceImpl.java new file mode 100644 index 00000000..824d3fea --- /dev/null +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/CodeGenTableServiceImpl.java @@ -0,0 +1,114 @@ +package com.ruoyi.sip.service.impl; + +import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.sip.domain.CodeGenTable; +import com.ruoyi.sip.mapper.CodeGenTableMapper; +import com.ruoyi.sip.service.ICodeGenTableService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @Author ch + * @Desc 代码生成业务表(CodeGenTable)表服务实现类 + * @Date 2025-05-21 14:39:08 + */ + +@Service +public class CodeGenTableServiceImpl implements ICodeGenTableService { + + @Resource + private CodeGenTableMapper codeGenTableMapper; + public static final String DELIMIT = "-"; + + /** + * 查询列表数据 + * + * @param codeGenTable 实例对象 + * @return 对象列表 + */ + @Override + public List queryAll(CodeGenTable codeGenTable) { + List dataList = codeGenTableMapper.queryAll(codeGenTable); + return dataList; + } + + @Override + public CodeGenTable queryById(Long id) { + return codeGenTableMapper.queryById(id); + } + + + @Override + public int insert(CodeGenTable codeGenTable) { + return codeGenTableMapper.insert(codeGenTable); + } + + + @Override + public int update(CodeGenTable codeGenTable) { + return codeGenTableMapper.update(codeGenTable); + } + + + @Override + public int deleteById(Long id) { + return codeGenTableMapper.deleteById(id); + } + + /** + * 通过id批量删除代码生成业务表 + */ + @Override + public int batchRemove(Long[] ids) { + return codeGenTableMapper.batchRemove(ids); + } + + @Override + public String generateCode(String tableName) { + CodeGenTable codeGeneratorConfig = codeGenTableMapper.selectByTableName(tableName); + + if (codeGeneratorConfig == null) { + throw new ServiceException(StringUtils.format("未找到[{}]对应编码生成规则", tableName)); + } + + // 根据表字段动态获取生成规则 + String prefix = codeGeneratorConfig.getPrefix(); + int numberLength = codeGeneratorConfig.getNumberLength(); + + + CodeGenTable updateDto = new CodeGenTable(); + updateDto.setTableName(tableName); + updateDto.setVersion(codeGeneratorConfig.getVersion()); + + if (!DateUtils.isSameDay(codeGeneratorConfig.getGenDate(), DateUtils.getNowDate())) { + updateDto.setNumber(0); + updateDto.setGenDate(DateUtils.getNowDate()); + } else { + updateDto.setNumber(codeGeneratorConfig.getNumber()); + } + String datePart = DateUtils.parseDateToStr(codeGeneratorConfig.getDateFormat(), DateUtils.getNowDate()); + // 使用乐观锁机制更新 number + int currentSequence = updateDto.getNumber(); + String sequenceStr = String.format("%0" + numberLength + "d", currentSequence); + + // 构造唯一 code + String generatedCode = prefix + DELIMIT + datePart + DELIMIT + sequenceStr; + + // 更新数据库中的 number 字段，确保并发安全性 + int updatedRows = codeGenTableMapper.updateNumber(updateDto); + if (updatedRows == 0) { + throw new ServiceException("系统繁忙,请重试"); + } + + return generatedCode; + } + +} + + + diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderDeliveryServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderDeliveryServiceImpl.java index 83218d41..9f1acc3e 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderDeliveryServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderDeliveryServiceImpl.java @@ -3,6 +3,8 @@ package com.ruoyi.sip.service.impl; import java.util.List; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.sip.domain.CodeGenTable; +import com.ruoyi.sip.service.ICodeGenTableService; import com.ruoyi.sip.utils.CodeGeneratorUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -23,6 +25,8 @@ public class OrderDeliveryServiceImpl implements IOrderDeliveryService @Autowired private OrderDeliveryMapper orderDeliveryMapper; + @Autowired + private ICodeGenTableService codeGenTableService; /** * 查询发货记录 * @@ -56,9 +60,8 @@ public class OrderDeliveryServiceImpl implements IOrderDeliveryService @Override public int insertOrderDelivery(OrderDelivery orderDelivery) { - OrderDelivery queryCountParam = new OrderDelivery(); - queryCountParam.setCreatedAt(DateUtils.getNowDate()); - String deliveryCode = CodeGeneratorUtil.generateUniqueCode("OD", () -> orderDeliveryMapper.count(queryCountParam)); + + String deliveryCode =codeGenTableService.generateCode(CodeGenTable.TableNameEnum.ORDER_DELIVERY.getName()); orderDelivery.setDeliveryCode(deliveryCode); return orderDeliveryMapper.insertOrderDelivery(orderDelivery); } diff --git a/ruoyi-sip/src/main/resources/mapper/CodeGenTable/CodeGenTableMapper.xml b/ruoyi-sip/src/main/resources/mapper/CodeGenTable/CodeGenTableMapper.xml new file mode 100644 index 00000000..b8d1e135 --- /dev/null +++ b/ruoyi-sip/src/main/resources/mapper/CodeGenTable/CodeGenTableMapper.xml @@ -0,0 +1,245 @@ + + + + + + + + + + + + + + + + + + + + + + + + id, table_name, table_comment, prefix, number, gen_date, number_length, create_by, create_time, update_by, update_time, remark,version,date_format + + + + + + + + + + + + + + INSERT INTO code_gen_table + + + table_name, + + + table_comment, + + + prefix, + + + number, + + + gen_date, + + + number_length, + + + create_by, + + + create_time, + + + update_by, + + + update_time, + + + remark, + + + + + #{tableName}, + + + #{tableComment}, + + + #{prefix}, + + + #{number}, + + + #{genDate}, + + + #{numberLength}, + + + #{createBy}, + + + #{createTime}, + + + #{updateBy}, + + + #{updateTime}, + + + #{remark}, + + + + + + + UPDATE code_gen_table + + version=version+1 + + table_name = #{tableName}, + + + table_comment = #{tableComment}, + + + prefix = #{prefix}, + + + number = #{number}, + + + gen_date = #{genDate}, + + + number_length = #{numberLength}, + + + create_by = #{createBy}, + + + create_time = #{createTime}, + + + update_by = #{updateBy}, + + + update_time = #{updateTime}, + + + remark = #{remark}, + + + WHERE id = #{id} and version=#{version} + + + update code_gen_table + set number=#{number} + 1, + version=version + 1 + + ,gen_date = #{genDate} + + where table_name = #{tableName} + and version = #{version} + + + + + DELETE + FROM code_gen_table + WHERE id = #{id} + + + + + delete from code_gen_table where id in + + #{id} + + + + + + + From e20f2bbad49f19c957841dd28f96d0ef7d7d41f1 Mon Sep 17 00:00:00 2001 From: chenhao <852066789@qq.com> Date: Wed, 21 May 2025 17:01:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?refactor(sip):=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 ApiDataQueryDto 中添加 serialNumber 字段 - 在 DeliveryListMapper.xml 中添加 serialNumber 的查询条件 - 修改 IMaintenanceService 接口，返回类型变更为 List - 重构 MaintenanceServiceImpl 中的 query 方法，使用 DeliveryListService 获取数据 - 更新前端模板，显示新的服务信息字段 --- .../templates/manage/service/service.html | 10 +++++----- .../com/ruoyi/sip/dto/ApiDataQueryDto.java | 1 + .../sip/service/IMaintenanceService.java | 3 ++- .../service/impl/MaintenanceServiceImpl.java | 19 +++++++++++++++++-- .../mapper/manage/DeliveryListMapper.xml | 3 +++ 5 files changed, 28 insertions(+), 8 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/manage/service/service.html b/ruoyi-admin/src/main/resources/templates/manage/service/service.html index db42353f..30cc920a 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/service/service.html +++ b/ruoyi-admin/src/main/resources/templates/manage/service/service.html @@ -209,11 +209,11 @@ str=`` res.data.forEach((ele)=>{ str+=` - - - ${ele.startDate} - ${ele.endDate} - ${ele.status == 0 ? '有效' : '无效'} + ${ele.serviceLevel} + ${ele.serviceDescribe} + ${ele.serviceStartTime} + ${ele.serviceEndTime} + 有效 ` }) } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/dto/ApiDataQueryDto.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/dto/ApiDataQueryDto.java index 6fc8bab8..7f4233af 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/dto/ApiDataQueryDto.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/dto/ApiDataQueryDto.java @@ -28,5 +28,6 @@ public class ApiDataQueryDto { @NotNull(message = "查询结束时间不能为空") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date queryEndTime; + private String serialNumber; } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IMaintenanceService.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IMaintenanceService.java index b49e68c4..fe1282a0 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IMaintenanceService.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IMaintenanceService.java @@ -2,9 +2,10 @@ package com.ruoyi.sip.service; import com.ruoyi.sip.domain.MaintenanceRecord; import com.ruoyi.sip.domain.MaintenanceRecordsDto; +import com.ruoyi.sip.vo.DeliveryInfoVo; import java.util.List; public interface IMaintenanceService { - List query(MaintenanceRecordsDto dto); + List query(MaintenanceRecordsDto dto); } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/MaintenanceServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/MaintenanceServiceImpl.java index a3c89f65..3d7138f4 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/MaintenanceServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/MaintenanceServiceImpl.java @@ -1,14 +1,20 @@ package com.ruoyi.sip.service.impl; +import cn.hutool.core.collection.CollUtil; import com.ruoyi.sip.domain.MaintenanceRecord; import com.ruoyi.sip.domain.MaintenanceRecordsDto; +import com.ruoyi.sip.dto.ApiDataQueryDto; import com.ruoyi.sip.mapper.MaintenanceMapper; +import com.ruoyi.sip.service.IDeliveryListService; import com.ruoyi.sip.service.IMaintenanceService; +import com.ruoyi.sip.vo.DeliveryInfoVo; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.Collections; import java.util.List; /** @@ -30,10 +36,19 @@ public class MaintenanceServiceImpl implements IMaintenanceService { @Resource private MaintenanceMapper mapper; + @Autowired + private IDeliveryListService deliveryListService; @Override - public List query(MaintenanceRecordsDto dto) { - return mapper.query(dto); + public List query(MaintenanceRecordsDto dto) { + + ApiDataQueryDto apiDataQueryDto = new ApiDataQueryDto(); + apiDataQueryDto.setSerialNumber(dto.getSerialNumber()); + List numberInfo = deliveryListService.getNumberInfo(apiDataQueryDto); + if (CollUtil.isEmpty(numberInfo)){ + return Collections.emptyList(); + } + return numberInfo.get(0).getServiceInfo(); } } diff --git a/ruoyi-sip/src/main/resources/mapper/manage/DeliveryListMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/DeliveryListMapper.xml index 395d880a..555b2191 100644 --- a/ruoyi-sip/src/main/resources/mapper/manage/DeliveryListMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/manage/DeliveryListMapper.xml @@ -79,6 +79,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and t1.updated_at #{queryEndTime} + + and t1.serial_number = #{serialNumber} +