1.remark非空判断

2.接收预警数据不修改商品信息

ruoyi-common/pom.xml

@@ -159,6 +159,11 @@
             <artifactId>bcprov-jdk15to18</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ZsOperationWarnresultServiceImpl.java

@@ -96,17 +96,18 @@ public class ZsOperationWarnresultServiceImpl implements IZsOperationWarnresultS
         return TableDataInfo.build(result);
     }
 
-    private List<ZsOperationWarnresultVo> getRemark(List<ZsOperationWarnresultVo> warns,List<ZsOperationGoods> goods) {
-        // 先将listB转为URL为key的Map
+    private List<ZsOperationWarnresultVo> getRemark(List<ZsOperationWarnresultVo> warns, List<ZsOperationGoods> goods) {
+        // 使用Optional处理null值
         Map<String, String> goodsMap = goods.stream()
-            .collect(Collectors.toMap(ZsOperationGoods::getGoodsSkuUrl, ZsOperationGoods::getRemark));
+            .collect(Collectors.toMap(
+                ZsOperationGoods::getGoodsSkuUrl,
+                item -> Optional.ofNullable(item.getRemark()).orElse("")
+            ));
 
-        // 遍历listA进行匹配和赋值
+        // 安全遍历赋值
         warns.forEach(warn -> {
             String remark = goodsMap.get(warn.getGoodsSkuUrl());
-            if (remark != null) {
-                warn.setRemark(remark);
-            }
+            warn.setRemark(remark != null && !remark.isEmpty() ? remark : warn.getRemark());
         });
         return warns;
     }
@@ -190,13 +191,6 @@ public class ZsOperationWarnresultServiceImpl implements IZsOperationWarnresultS
             String curUrl = (String)dataMap.get("url");
             String newName = (String)dataMap.get("title");
             String newSn = (String)dataMap.get("sku");
-            String newRemark = (String)dataMap.get("remark");
-            UpdateWrapper goodsUpdateWrapper = new UpdateWrapper<>();
-            goodsUpdateWrapper.eq("goods_sku_url",curUrl);
-            goodsUpdateWrapper.set("goods_sku_name",newName);
-            goodsUpdateWrapper.set("goods_sku_sn",newSn);
-            goodsUpdateWrapper.set("remark",newRemark);
-            int j = zsOperationGoodsMapper.update(null,goodsUpdateWrapper);
             UpdateWrapper<ZsOperationWarnresult> updateWrapper = new UpdateWrapper<>();
             updateWrapper.eq("goods_sku_url",curUrl);
             updateWrapper.set("goods_sku_name",newName);