From 8d4b968f92ae4716cc45d18ee5d6c8ad0480f9f3 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期四, 21 九月 2023 09:01:00 +0800
Subject: [PATCH] productWebsocket中属性加上ebabled
---
src/main/java/com/whyc/service/ProductService.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/service/ProductService.java b/src/main/java/com/whyc/service/ProductService.java
index 3551fc8..9b76db2 100644
--- a/src/main/java/com/whyc/service/ProductService.java
+++ b/src/main/java/com/whyc/service/ProductService.java
@@ -3,9 +3,11 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.whyc.dto.FileUrlDTO;
import com.whyc.dto.Response;
+import com.whyc.mapper.ProductHistoryMapper;
import com.whyc.mapper.ProductMapper;
import com.whyc.pojo.*;
import com.whyc.util.DateUtil;
@@ -34,6 +36,9 @@
@Autowired(required = false)
private ProductMapper mapper;
+ @Autowired(required = false)
+ private ProductHistoryMapper hisMapper;
+
@Autowired
private ProductHistoryService phService;
@@ -54,8 +59,8 @@
//鏌ヨ鍑烘墍鏈夌殑浜у搧淇℃伅(鍒嗛〉鍔犳ā绯婃煡璇�<浜у搧鐨勭紪鐮侊紝鍨嬪彿锛屽悕瀛楋紝瀹氬埗琛ㄧ紪鍙�>
public Response getAllProduct(String subCode,String parentCode, String parentName, String parentModel, String customCode, int pageCurr, int pageSize) {
- /*PageHelper.startPage(pageCurr,pageSize);
- QueryWrapper wrapper=new QueryWrapper();
+ PageHelper.startPage(pageCurr,pageSize);
+ /*QueryWrapper wrapper=new QueryWrapper();
if(parentCode!=null){
wrapper.like("parent_code",parentCode);
}
@@ -74,7 +79,15 @@
}
wrapper.orderByAsc("id");
List list=mapper.selectList(wrapper);*/
- List list=mapper.getAllProduct(subCode,parentCode,parentName,parentModel,customCode);
+ List<Product> list=mapper.getAllProduct(subCode,parentCode,parentName,parentModel,customCode);
+ list.stream().forEach(product -> {
+ //1.鏌ヨ鏄惁瀛樺湪璇ヨ褰�
+ QueryWrapper qwrapper=new QueryWrapper();
+ qwrapper.eq("id",product.getId());
+ qwrapper.last("limit 1");
+ ProductHistory pHis=hisMapper.selectOne(qwrapper);
+ product.setEnabled(pHis.getEnabled());
+ });
PageInfo pageInfo=new PageInfo(list);
return new Response().setII(1,list.size()>0,pageInfo,"杩斿洖浜у搧淇℃伅");
}
--
Gitblit v1.9.1