From d9adbadd9fa14cb7174f6167c438a45e8176fd26 Mon Sep 17 00:00:00 2001 From: SZH <szh_hello@163.com> Date: 星期四, 23 二月 2023 15:22:04 +0800 Subject: [PATCH] 数据库连接池移除druid atomikos分布式事务使用com.mysql.cj.jdbc.MysqlXADataSource --- equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/MaterialClassifyService.java | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/MaterialClassifyService.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/MaterialClassifyService.java index 538ff9b..f6d538b 100644 --- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/MaterialClassifyService.java +++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/MaterialClassifyService.java @@ -1,11 +1,11 @@ package com.gkhy.safePlatform.equipment.service; import com.gkhy.safePlatform.commons.co.ContextCacheUser; +import com.gkhy.safePlatform.commons.query.PageQuery; import com.gkhy.safePlatform.commons.vo.ResultVO; +import com.gkhy.safePlatform.commons.vo.SearchResultVO; import com.gkhy.safePlatform.equipment.entity.SafeMaterialClassifyDO; -import com.gkhy.safePlatform.equipment.model.dto.req.SafeMaterialClassifyAddReq; -import com.gkhy.safePlatform.equipment.model.dto.req.SafeMaterialClassifyModReq; -import com.gkhy.safePlatform.equipment.model.dto.req.SafeMaterialClassifyQuery; +import com.gkhy.safePlatform.equipment.model.dto.req.*; import com.gkhy.safePlatform.equipment.model.dto.resp.SafeMaterialClassifyDto; import com.gkhy.safePlatform.equipment.model.dto.resp.SafeMaterialClassifyStockDto; @@ -18,13 +18,15 @@ ResultVO update(ContextCacheUser currentUser, SafeMaterialClassifyModReq req); - ResultVO delete(Long id); + ResultVO delete(ContextCacheUser currentUser,Long id); - SafeMaterialClassifyDto queryById(Long id); + SafeMaterialClassifyDto queryById(ContextCacheUser currentUser,Long id); SafeMaterialClassifyDO getBigAndSmallClassifyInfo(Long smallClassifyId); List<SafeMaterialClassifyDto> getClassifyListByIds(List<Long> ids); List<SafeMaterialClassifyDO> getTraceabilityClassifyList(List<Long> smallClassifyIds); + SearchResultVO<List<SafeMaterialClassifyDto>> listByPage(ContextCacheUser currentUser,PageQuery<MaterialClassifyQuery> pageQuery); + } -- Gitblit v1.9.2