From 42cfcb449a3c40305866fc09a8731f96ff50e7c1 Mon Sep 17 00:00:00 2001
From: 10001392 <1055202292@qq.com>
Date: Wed, 22 Jan 2025 16:40:50 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E3=80=91=E8=8E=B7=E5=8F=96=E9=87=87=E8=B4=AD=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/user/material/MaterialMainApi.java    |  4 +--
 .../material/job/SaticScheduleTask.java       |  9 +++---
 .../mapper/master/MaterialMainMapper.java     |  2 ++
 .../material/service/MaterialMainService.java | 30 +++++++++++--------
 .../mapper/master/MaterialMainMapper.xml      | 11 +++++++
 5 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialMainApi.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialMainApi.java
index d0bdd249..1ab8c81c 100644
--- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialMainApi.java
+++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialMainApi.java
@@ -459,7 +459,7 @@ public class MaterialMainApi extends BaseApi {
      * @throws Exception
      */
     @GetMapping("syncMaterialPurchasePropInfo")
-    public void syncMaterialPurchasePropInfo() throws Exception {
-        materialMainService.syncMaterialPurchasePropInfo();
+    public void syncMaterialPurchasePropInfo(@RequestBody MaterialMainQuery query) throws Exception {
+        materialMainService.syncMaterialPurchasePropInfo(query);
     }
 }
diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/job/SaticScheduleTask.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/job/SaticScheduleTask.java
index 0548ea0a..87d48826 100644
--- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/job/SaticScheduleTask.java
+++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/job/SaticScheduleTask.java
@@ -167,9 +167,10 @@ public class SaticScheduleTask {
      * 只针对物料状态material_state为1:激活   2:禁止采购 3:售后专用
      *      * 流程状态：15：已审核  100: 历史正式物料(已审核)
      */
-    @Scheduled(cron = "0 0 7 * * ?")
+    // 全量更新几十万条数据太慢，暂且注释
+//    @Scheduled(cron = "0 0 7 * * ?")
 //    @Scheduled(cron = "0 0/2 * * * ? ") // 测试使用，每2分钟
-    public void syncMaterialPurchasePropInfo() throws Exception {
-        materialMainService.syncMaterialPurchasePropInfo();
-    }
+//    public void syncMaterialPurchasePropInfo() throws Exception {
+//        materialMainService.syncMaterialPurchasePropInfo(null);
+//    }
 }
diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/mapper/master/MaterialMainMapper.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/mapper/master/MaterialMainMapper.java
index d39dc683..e4f8930e 100644
--- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/mapper/master/MaterialMainMapper.java
+++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/mapper/master/MaterialMainMapper.java
@@ -82,4 +82,6 @@ public interface MaterialMainMapper extends BaseMapper<MaterialMainEntity> {
     List<LanguageTranslationEntity> getKeyLanguage(@Param("languageCode")String languageCode);
 
     void updateBatchTwoYearsUsage(@Param("list") List<MaterialMainEntity> list);
+
+    List<Map<String,Object>> getMaterialNoListDataMap(@Param("query") MaterialMainQuery query, @Param("startIndex") Long startIndex, @Param("pageSize")Long pageSize );
 }
diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java
index 4c016a9a..de2505d4 100644
--- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java
+++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java
@@ -2986,21 +2986,22 @@ public class MaterialMainService extends ServiceImpl<MaterialMainMapper, Materia
         return rlist;
     }
 
-    public void syncMaterialPurchasePropInfo() {
+    public void syncMaterialPurchasePropInfo(MaterialMainQuery query) {
         log.info("获取采购属性信息开始");
         long startTime = System.currentTimeMillis();
-        MaterialMainQuery query = new MaterialMainQuery();
+        if (ObjectUtil.isEmpty(query)) {
+            query = new MaterialMainQuery();
+        }
         // 所有大类的物料
 //        query.setMaterialStates(Arrays.asList(1, 2, 3));
 //        query.setFirstMaterialCategoryCode("10");
-        query.setPage(1L).setPageSize(10000L);
         query.setMaterialClass(0); // 接口用途：0：物料查看
-
+        query.setPage(1L).setPageSize(10000L);
         int pageCount = this.downExcelGetListPages(query) + 1;
-
+        List<MaterialMainAttrEntity> existsList = materialMainAttrMapper.selectList(null);
         for (int i = 1; i <= pageCount; i++) {
             query.setPage((long) i);
-            List<Map<String, Object>> result = this.getBaseMapper().getListDataMap(query, (query.getPage() - 1) * query.getPageSize(), query.getPageSize());
+            List<Map<String, Object>> result = this.getBaseMapper().getMaterialNoListDataMap(query, (query.getPage() - 1) * query.getPageSize(), query.getPageSize());
 
             if (result == null || result.size() <= 0) {
                 continue;
@@ -3019,18 +3020,17 @@ public class MaterialMainService extends ServiceImpl<MaterialMainMapper, Materia
             if (CollectionUtil.isEmpty(filterList)) {
                 continue;
             }
-            this.updateMaterialPropInfo(filterList);
+            this.updateMaterialPropInfo(filterList, existsList);
         }
         long endTime = System.currentTimeMillis();
         log.info("获取采购属性信息结束，耗时（ms）: {}", (endTime - startTime));
 
     }
 
-    private void updateMaterialPropInfo(List<MaterialMainAttrEntity> filterList) {
+    private void updateMaterialPropInfo(List<MaterialMainAttrEntity> filterList, List<MaterialMainAttrEntity> existsList) {
         if (CollUtil.isEmpty(filterList)) {
             return;
         }
-        List<MaterialMainAttrEntity> existsList = materialMainAttrMapper.selectList(null);
         if (CollUtil.isNotEmpty(existsList)) {
             for (MaterialMainAttrEntity materialMainAttrEntity : filterList) {
                 try {
@@ -3038,10 +3038,14 @@ public class MaterialMainService extends ServiceImpl<MaterialMainMapper, Materia
                             && item.getFactory().equals(materialMainAttrEntity.getFactory())).collect(Collectors.toList());
                     if (CollUtil.isNotEmpty(sameList)) {
                         MaterialMainAttrEntity update = sameList.get(0);
-                        update.setPurchaseType(materialMainAttrEntity.getPurchaseType());
-                        update.setSpecialPurchaseType(materialMainAttrEntity.getSpecialPurchaseType());
-                        update.setPlanDeliveryTime(materialMainAttrEntity.getPlanDeliveryTime());
-                        materialMainAttrMapper.updateById(materialMainAttrEntity);
+                        if (!update.getPurchaseType().equals(materialMainAttrEntity.getPurchaseType())
+                                || !update.getSpecialPurchaseType().equals(materialMainAttrEntity.getSpecialPurchaseType())
+                                || update.getPlanDeliveryTime().intValue() != materialMainAttrEntity.getPlanDeliveryTime().intValue()) {
+                            update.setPurchaseType(materialMainAttrEntity.getPurchaseType());
+                            update.setSpecialPurchaseType(materialMainAttrEntity.getSpecialPurchaseType());
+                            update.setPlanDeliveryTime(materialMainAttrEntity.getPlanDeliveryTime());
+                            materialMainAttrMapper.updateById(materialMainAttrEntity);
+                        }
                     } else {
                         this.saveMaterialMainAttr(materialMainAttrEntity);
                     }
diff --git a/nflg_project_dev/material/src/main/resources/mapper/master/MaterialMainMapper.xml b/nflg_project_dev/material/src/main/resources/mapper/master/MaterialMainMapper.xml
index dcadabc9..4d77bed8 100644
--- a/nflg_project_dev/material/src/main/resources/mapper/master/MaterialMainMapper.xml
+++ b/nflg_project_dev/material/src/main/resources/mapper/master/MaterialMainMapper.xml
@@ -573,4 +573,15 @@
             WHERE material_no = #{item.materialNo}
         </foreach>
     </update>
+
+    <select id="getMaterialNoListDataMap" resultType="java.util.Map">
+        SELECT
+        `row_id` AS rowId,
+        `material_no` AS materialNo
+        FROM t_material_main
+        WHERE 1 = 1
+        <include refid="get_list_where"/>
+        order by rowId desc
+        limit #{startIndex} ,#{pageSize}
+    </select>
 </mapper>