Merge branch 'refs/heads/xiaolu' into master

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/controller/pc/DiyProductController.java

@@ -5,15 +5,15 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.product.domain.bo.ProductBaseBo;
-import org.dromara.product.domain.bo.ProductBrandBo;
-import org.dromara.product.domain.bo.ProductCategoryBo;
+import org.dromara.product.domain.bo.*;
 import org.dromara.product.domain.vo.PcProductVo;
 import org.dromara.product.domain.vo.ProductBaseVo;
 import org.dromara.product.domain.vo.ProductBrandVo;
+import org.dromara.product.domain.vo.ServiceCaseVo;
 import org.dromara.product.service.IProductBaseService;
 import org.dromara.product.service.IProductBrandService;
 import org.dromara.product.service.IProductCategoryService;
+import org.dromara.product.service.IServiceCaseService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -35,10 +35,8 @@ public class DiyProductController {
 
     //商品
     private final IProductBaseService productBaseService;
-    //商品品牌
-    private final IProductBrandService productBrandService;
-    //商品分类
-    private final IProductCategoryService productCategoryService;
+    //项目案例
+    private final IServiceCaseService serviceCaseService;
 
     /**
      * 获取商品列表
@@ -47,24 +45,18 @@ public class DiyProductController {
      * @return
      */
     @GetMapping("/getDiyProductPage")
-    public TableDataInfo<ProductBaseVo> getDiyProductList(ProductBaseBo bo, PageQuery pageQuery){
-        return productBaseService.queryPageList(bo, pageQuery);
+    public TableDataInfo<PcProductVo> getDiyProductPage(PcProductBo bo, PageQuery pageQuery){
+        return productBaseService.getPcProductPage(bo, pageQuery);
     }
 
     /**
-     * 查询商品分类树
-     * */
-    @GetMapping("/getProductCategoryTree")
-    public R<List<Tree<Long>>> selectCategoryTreeList(ProductCategoryBo bo) {
-        return R.ok(productCategoryService.selectCategoryTreeList(bo));
-    }
-
-    /**
-    * 获取商品品牌列表
-    * */
-    @GetMapping("/getProductBrandPage")
-    public TableDataInfo<ProductBrandVo> getProductBrandPage(ProductBrandBo bo, PageQuery pageQuery) {
-        return productBrandService.queryPageList(bo, pageQuery);
+     * 获取项目案例列表
+     * @param bo
+     * @return
+     */
+    @GetMapping("/getServiceCaseList")
+    public TableDataInfo<ServiceCaseVo> getProjectCaseList(ServiceCaseBo bo, PageQuery pageQuery){
+        return serviceCaseService.queryPageList(bo, pageQuery);
     }
 
 }

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/bo/PcProductBo.java

@@ -10,6 +10,7 @@ import lombok.Data;
 @Data
 public class PcProductBo {
 
+    private String ids;
     /**
      * 搜索关键字
      * */

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/service/impl/ProductBaseServiceImpl.java

@@ -487,7 +487,8 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
      */
     private LambdaEsQueryWrapper<ProductBaseVo> buildEsQueryWrapperForPc(PcProductBo bo) {
         LambdaEsQueryWrapper<ProductBaseVo> wrapper = new LambdaEsQueryWrapper<ProductBaseVo>()
-            .eq(ProductBaseVo::getProductStatus, 1);
+//            .eq(ProductBaseVo::getProductStatus, 1)
+            ;
 
         if(ObjectUtil.isNotEmpty(bo.getProductNo())){
             wrapper.eq(ProductBaseVo::getProductNo, bo.getProductNo());
@@ -1435,9 +1436,12 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
     @Override
     public TableDataInfo<PcProductVo> getPcProductPage(PcProductBo bo, PageQuery pageQuery) {
         QueryWrapper<ProductBase> lqw = Wrappers.query(ProductBase.class);
+        if(ObjectUtil.isNotEmpty( bo.getIds())){
+            lqw.in("b.id", bo.getIds());
+        }
         lqw.ge(ObjectUtil.isNotEmpty(pageQuery.getFirstSeenId()) && pageQuery.getWay() == 0,"b.id", pageQuery.getFirstSeenId());
         lqw.gt(ObjectUtil.isNotEmpty(pageQuery.getLastSeenId()) && pageQuery.getWay() == 1,"b.id", pageQuery.getLastSeenId());
-        lqw.eq("b.product_status", 1);
+//        lqw.eq("b.product_status", 1);
         lqw.and(ObjectUtil.isNotEmpty(bo.getSearchKeyword())
             , (queryWrapper) -> queryWrapper.and(qw ->
                 qw.like("b.item_name", bo.getSearchKeyword())
@@ -1485,7 +1489,9 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
         // 使用ES分页查询
         try {
             LambdaEsQueryWrapper<ProductBaseVo> esQueryWrapper = buildEsQueryWrapperForPc(bo);
-
+            if(ObjectUtil.isNotEmpty(bo.getIds())){
+                esQueryWrapper.in(ProductBaseVo::getId, bo.getIds());
+            }
             // 添加额外的查询条件
             if (ObjectUtil.isNotEmpty(bo.getSearchKeyword())) {
                 esQueryWrapper.and(wrapper -> wrapper

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/pc/DiySystemController.java

@@ -1,10 +1,21 @@
 package org.dromara.system.controller.pc;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.system.domain.PlatformConfig;
+import org.dromara.system.domain.bo.SysAnnouncementBo;
+import org.dromara.system.domain.vo.SysAnnouncementVo;
+import org.dromara.system.service.IPlatformConfigService;
+import org.dromara.system.service.ISysAnnouncementService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * diy系统运营相关接口
  * @author
@@ -15,4 +26,31 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/diySystem")
 public class DiySystemController {
+
+    private final ISysAnnouncementService sysAnnouncementService;
+
+    private final IPlatformConfigService platformConfigService;
+
+
+    /**
+     * 获取公告列表
+     * @param sysAnnouncementBo
+     * @return
+     */
+    @RequestMapping("/getAnnouncementPage")
+    public TableDataInfo<SysAnnouncementVo> getAnnouncementList(SysAnnouncementBo sysAnnouncementBo, PageQuery pageQuery) {
+        return sysAnnouncementService.queryPageList(sysAnnouncementBo, pageQuery);
+    }
+
+    /**
+    * 获取是否使用diy
+    * */
+    @RequestMapping("/getIsUseDiy")
+    public R<List<PlatformConfig>> getIsUseDiy() {
+        List<PlatformConfig> list = platformConfigService.list(Wrappers.<PlatformConfig>lambdaQuery()
+            .in(PlatformConfig::getConfigKey, "platormDiy","industrialDiy","fuliDiy")
+        );
+        return R.ok(list);
+    }
+
 }