From 195194eaa2f8e643ce6b1d696e6288404f1a06cd Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 28 六月 2024 15:48:44 +0800
Subject: [PATCH] 修改模型识别算法，以适应界面上新的画图方法。
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java | 46 ++++++++++++++++++++++++++++++++--------------
1 files changed, 32 insertions(+), 14 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..5bb44b6 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,22 @@
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.TyProductModel;
+import com.zt.life.modules.mainPart.basicInfo.model.ProductImg;
import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
-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 +29,8 @@
* @return
*/
public List<XhProductModel> page(QueryFilter queryFilter) {
- return baseDao.getList(queryFilter.getQueryParams());
+ List<XhProductModel> list = baseDao.getList(queryFilter.getQueryParams());
+ return list;
}
/**
@@ -42,20 +42,38 @@
super.deleteLogic(ids);
}
- 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);
+ public List<XhProductModel> getAllTree(Boolean showXdy) {
+ List<XhProductModel> productList;
+ if (showXdy) {
+ productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
+ Constant.Bool.NO).gt("product_type", 1).orderByAsc(Constant.TableColumn.SORT));
+ } else {
+ productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
+ Constant.Bool.NO).gt("product_type", 1).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
+
+ }
+ return TreeUtils.build(productList);
}
- public Integer getNo(Long pid) {
- if (baseDao.getNo(pid) == null){
+ public Integer getNo(Long pid, String productType) {
+ if (baseDao.getNo(pid, productType) == null) {
return 0;
}
- return baseDao.getNo(pid);
+ return baseDao.getNo(pid,productType);
}
+
public List<XhProductModel> getProductList() {
List<XhProductModel> ProductList = baseDao.getProductList();
return TreeUtils.build(ProductList);
}
+
+ public List<ProductImg> getProduct(Long productId) {
+ XhProductModel model =this.get(productId);
+ Long parentId = model.getPid();
+ return baseDao.getProduct(productId,parentId);
+ }
+
+ public List<XhProductModel> getTaskProductList() {
+ return baseDao.getTaskProductList();
+ }
}
--
Gitblit v1.9.1