From 1ba9dcd09a4a3bc26e82ff69c09016c758654163 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期一, 24 二月 2025 17:39:17 +0800
Subject: [PATCH] 标准库查询优化
---
/dev/null | 12 ------
basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java | 6 ---
basic-server/src/main/resources/mapper/StandardProductListMapper.xml | 13 ++++++
cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalMeetingController.java | 2
basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListMapper.java | 6 +++
cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalImplementController.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCorrectController.java | 2
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java | 40 +++++++------------
8 files changed, 37 insertions(+), 46 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListMapper.java
index f25f673..05c0fdf 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListMapper.java
@@ -62,6 +62,12 @@
@Param("endIndex") Integer endIndex,
@Param("methodId") Integer methodId,
@Param("tree") String tree);
+
+ /**
+ * 鎵归噺娣诲姞鏍囧噯
+ * @param productLists
+ */
+ void saveBatchProductLists(@Param("productLists") List<StandardProductList> productLists);
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java b/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java
index 392fe36..fd0d620 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java
@@ -219,10 +219,4 @@
*/
@ApiModelProperty("瀵间綋绫诲瀷")
private String conductorType;
-
- @ApiModelProperty("structure_test_object琛╥d")
- private Integer structureTestObjectId;
-
- @ApiModelProperty("product 浜у搧id")
- private Integer productId;
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService2.java b/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService2.java
deleted file mode 100644
index 4f54fe6..0000000
--- a/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService2.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.ruoyi.basic.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.basic.pojo.StandardProductList;
-
-/**
-* @author Administrator
-* @description 閽堝琛ㄣ�恠tandard_product_list(鏍囧噯鏍戜笅鐨勬楠岄」鐩�)銆戠殑鏁版嵁搴撴搷浣淪ervice
-* @createDate 2024-03-05 10:33:29
-*/
-public interface StandardProductListService2 extends IService<StandardProductList> {
-
-}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListService2Impl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListService2Impl.java
deleted file mode 100644
index eae1bc2..0000000
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListService2Impl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.ruoyi.basic.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.basic.mapper.StandardProductListMapper;
-import com.ruoyi.basic.pojo.StandardProductList;
-import com.ruoyi.basic.service.StandardProductListService2;
-import org.springframework.stereotype.Service;
-
-@Service
-public class StandardProductListService2Impl extends ServiceImpl<StandardProductListMapper, StandardProductList>
- implements StandardProductListService2 {
-}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
index bafa2a1..4bc4557 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
@@ -20,7 +20,6 @@
import com.ruoyi.basic.pojo.StandardProductListSupplierAsk;
import com.ruoyi.basic.pojo.StandardTree;
import com.ruoyi.basic.service.StandardProductListService;
-import com.ruoyi.basic.service.StandardProductListService2;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -44,8 +43,6 @@
private StandardProductListMapper standardProductListMapper;
private StandardTreeMapper standardTreeMapper;
-
- private StandardProductListService2 standardProductListService2;
private IfsInventoryQuantityMapper ifsInventoryQuantityMapper;
@@ -403,10 +400,6 @@
if (sp.getTemplateId() != null && !sp.getTemplateId().equals("")) {
pl.setTemplateId(sp.getTemplateId());
}
- //鍥犱负杩樻湁涓骇鍝佸彨鑰愬紶绾垮す 鎺ョ画閲戝叿 ,杩欎袱涓」鐩殑鏁版嵁瀹屽叏涓�鏍�,鐗规畩澶勭悊
- if (sp.getTree() != null && !sp.getTree().equals("") && !pl.getTree().equals("涓ぉ绉戞妧妫�娴嬩腑蹇� - 鐢靛姏浜у搧瀹為獙瀹� - 閲戝叿 - 鑰愬紶绾垮す - null")) {
- pl.setTree(sp.getTree());
- }
break;
}
}
@@ -423,23 +416,20 @@
.like(StandardProductList::getTree, tree));
}
- try {
- List<StandardProductList> productLists = list.stream().map(a -> {
- a.setFactory(trees[0]);
- a.setLaboratory(trees[1]);
- a.setSampleType(trees[2]);
- a.setCreateUser(userId);
- a.setUpdateUser(userId);
- a.setStandardMethodListId(id);
- return a;
- }).collect(Collectors.toList());
- standardProductListService2.saveBatch(productLists);
- } catch (Exception e) {
- // 澶勭悊閲嶅 ID 鐨勮褰曪紝閲嶆柊鐢熸垚 ID 骞剁户缁皾璇曟彃鍏�
- for (StandardProductList productList : list) {
- productList.setId(IdWorker.getId());
- }
- }
+
+ List<StandardProductList> productLists = list.stream().map(a -> {
+ a.setFactory(trees[0]);
+ a.setLaboratory(trees[1]);
+ a.setSampleType(trees[2]);
+ a.setCreateUser(userId);
+ a.setUpdateUser(userId);
+ a.setStandardMethodListId(id);
+ return a;
+ }).collect(Collectors.toList());
+// this.saveBatch(productLists);
+ // 鎵归噺娣诲姞鏍囧噯
+ baseMapper.saveBatchProductLists(productLists);
+
Collections.sort(list, (o1, o2) -> {
String field1 = o1.getManHourGroup();
@@ -562,7 +552,7 @@
@Override
public void resetTreeDragBatch(List<StandardProductList> standardProductLists) {
- standardProductListService2.updateBatchById(standardProductLists);
+ this.updateBatchById(standardProductLists);
}
/**
diff --git a/basic-server/src/main/resources/mapper/StandardProductListMapper.xml b/basic-server/src/main/resources/mapper/StandardProductListMapper.xml
index 52d6bfe..cd27a11 100644
--- a/basic-server/src/main/resources/mapper/StandardProductListMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardProductListMapper.xml
@@ -27,6 +27,19 @@
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
+
+ <!-- 鎵归噺娣诲姞妫�娴嬫爣鍑� -->
+ <insert id="saveBatchProductLists">
+ INSERT INTO standard_product_list (id, inspection_item, inspection_item_en, inspection_item_subclass, inspection_item_subclass_en, factory, laboratory, sample_type, sample, model, son_laboratory, unit, price, man_hour, man_hour_group, inspection_item_type, inspection_value_type, checkout_number, section, cores, method, method_s, man_day, bsm, ask, tell, standard_method_list_id, template_id, state, dic, tree, structure_item_parameter_id, inspection_item_class, inspection_item_class_en, radius, radius_list, rates, sort, conductor_material, conductor_type)
+ VALUES
+ <foreach item="item" collection="productLists" open="(" separator="),(" close=")">
+ #{item.id}, #{item.inspectionItem}, #{item.inspectionItemEn}, #{item.inspectionItemSubclass}, #{item.inspectionItemSubclassEn}, #{item.factory}, #{item.sonLaboratory}, #{item.sampleType}, #{item.sample}, #{item.model}, #{item.sonLaboratory}, #{item.unit}, #{item.price}, #{item.manHour}, #{item.manHourGroup}, #{item.inspectionItemType}, #{item.inspectionValueType}, #{item.checkoutNumber}, #{item.section}, #{item.cores}, #{item.method}, #{item.methodS}, #{item.manDay}, #{item.bsm}, #{item.ask}, #{item.tell}, #{item.standardMethodListId}, #{item.templateId}, #{item.state}, #{item.dic}, #{item.tree}, #{item.structureItemParameterId},
+ #{item.inspectionItemClass}, #{item.inspectionItemClassEn}, #{item.radius}, #{item.radiusList}, #{item.rates}, #{item.sort}, #{item.conductorMaterial}, #{item.conductorType}
+ </foreach>
+
+ </insert>
+
+
<update id="updateSection">
UPDATE standard_product_list
SET price=#{productList.price},
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCorrectController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCorrectController.java
index 05cd164..9a715e1 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCorrectController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCorrectController.java
@@ -102,7 +102,7 @@
*/
@ApiOperation(value = "鍒犻櫎鍐呭绠＄悊绾犳鎺柦闄勪欢")
- @GetMapping("/delInternalCorrectFile")
+ @DeleteMapping("/delInternalCorrectFile")
public Result delInternalCorrectFile(Integer correctFileId){
return Result.success(internalCorrectFileMapper.deleteById(correctFileId));
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalImplementController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalImplementController.java
index 5e1b8d8..9a2b833 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalImplementController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalImplementController.java
@@ -76,7 +76,7 @@
*/
@ApiOperation(value = "鍐呭瀹炴柦璁″垝鍒犻櫎")
- @GetMapping("/delInternalImplement")
+ @DeleteMapping("/delInternalImplement")
public Result delInternalImplement(Integer implementId){
return Result.success(internalImplementService.delInternalImplement(implementId));
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalMeetingController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalMeetingController.java
index f43c27e..705bd42 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalMeetingController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalMeetingController.java
@@ -74,7 +74,7 @@
*/
@ApiOperation(value = "鍐呭浼氳鍒犻櫎")
- @GetMapping("/delInternalMeeting")
+ @DeleteMapping("/delInternalMeeting")
public Result delInternalMeeting(Integer meetingId){
return Result.success(internalMeetingService.delInternalMeeting(meetingId));
}
--
Gitblit v1.9.3