From 0f9b18e68ab00401a5821942788b94baff30eef9 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期四, 14 三月 2024 07:50:52 +0800
Subject: [PATCH] 优化RBD识别算法：串联、旁联、表决的节点顺序
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
index 4f5143d..cee7108 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
@@ -5,23 +5,26 @@
import com.zt.common.service.BaseService;
import com.zt.common.utils.TreeUtils;
import com.zt.life.modules.mainPart.basicInfo.dao.XhProductModelDao;
+import com.zt.life.modules.mainPart.basicInfo.model.ProductImg;
import com.zt.life.modules.mainPart.basicInfo.model.TyProductModel;
import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
+import com.zt.life.modules.sysPictureBase.model.SysPictureBase;
import com.zt.modules.sys.model.SysMenu;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
+
import javax.annotation.Resource;
import java.util.List;
/**
- * xh_product_model
+ * product_model
*
- * @author zt generator
+ * @author zt generator
* @since 1.0.0 2024-02-29
*/
@Service
-public class XhProductModelService extends BaseService<XhProductModelDao, XhProductModel> {
+public class XhProductModelService extends BaseService<XhProductModelDao, XhProductModel> {
/**
* 鍒嗛〉鏌ヨ
@@ -30,7 +33,16 @@
* @return
*/
public List<XhProductModel> page(QueryFilter queryFilter) {
- return baseDao.getList(queryFilter.getQueryParams());
+ List<XhProductModel> list = baseDao.getList(queryFilter.getQueryParams());
+ for (XhProductModel productModel : list) {
+ if (productModel.getProductType().equals("1")) {
+ productModel.setDefaultImg(baseDao.getDefaultImg());
+ if (productModel.getId() != null) {
+ this.update(productModel);
+ }
+ }
+ }
+ return list;
}
/**
@@ -43,19 +55,24 @@
}
public List<XhProductModel> getAllTree() {
- List<XhProductModel> productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
- Constant.Bool.NO) .gt("node_type", 1).orderByAsc(Constant.TableColumn.SORT));
- return TreeUtils.build(productList);
+ List<XhProductModel> productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
+ Constant.Bool.NO).gt("product_type", 1).orderByAsc(Constant.TableColumn.SORT));
+ return TreeUtils.build(productList);
}
public Integer getNo(Long pid) {
- if (baseDao.getNo(pid) == null){
+ if (baseDao.getNo(pid) == null) {
return 0;
}
return baseDao.getNo(pid);
}
+
public List<XhProductModel> getProductList() {
List<XhProductModel> ProductList = baseDao.getProductList();
return TreeUtils.build(ProductList);
}
+
+ public List<ProductImg> getProduct(Long productId) {
+ return baseDao.getProduct(productId);
+ }
}
--
Gitblit v1.9.1