添加生产基地

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/controller/BigCompanyController.java

@@ -0,0 +1,66 @@
+package com.hwrj.cloud.admin.controller;
+
+import com.hwrj.cloud.admin.dto.PmsProductCategoryDto;
+import com.hwrj.cloud.admin.dto.UmsCompanyDto;
+import com.hwrj.cloud.admin.service.BigCompanyService;
+import com.hwrj.cloud.admin.service.UmsCompanyService;
+import com.hwrj.cloud.admin.service.UmsMemberOriginService;
+import com.hwrj.cloud.common.api.CommonResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/big/company")
+@Api(tags = "BigCompanyController",description ="涉林大屏数据")
+public class BigCompanyController {
+
+    @Autowired
+    private BigCompanyService bigCompanyService;
+
+    @Autowired
+    private UmsCompanyService umsCompanyService;
+
+    @Autowired
+    private UmsMemberOriginService umsMemberOriginService;
+
+    @GetMapping("/lis")
+    @ApiOperation("涉林分布-供应商信息获取")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "catId",value = "分类id",required = false,paramType = "Long"),
+            @ApiImplicitParam(name = "key",value = "关键字",required = false,paramType = "String")
+    })
+    public CommonResult compList(@RequestParam(value = "catId",required = false)Long catId, @RequestParam(value = "key",required = false)String key){
+        List<Map<String, Object>> companyList = bigCompanyService.getCompanyList(catId, key);
+
+        return CommonResult.success(companyList);
+    }
+
+    @GetMapping("/detail")
+    @ApiOperation("涉林分布-供应商信息获取")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "catId",value = "分类id",required = false,paramType = "Long"),
+            @ApiImplicitParam(name = "key",value = "关键字",required = false,paramType = "String")
+    })
+    public CommonResult compDetail(@RequestParam(value = "id",required = true)Long id){
+        UmsCompanyDto detailCompany = umsCompanyService.getDetailCompany(id);
+
+        return CommonResult.success();
+    }
+
+    @GetMapping("/cat")
+    @ApiOperation("涉林分布-产品分类信息（刺梨，竹子，竹笋）")
+    public CommonResult cat(){
+        List<PmsProductCategoryDto> dto = bigCompanyService.getCategoryDto();
+        return CommonResult.success(dto);
+    }
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dao/BigCompanyDao.java

@@ -0,0 +1,11 @@
+package com.hwrj.cloud.admin.dao;
+
+import io.lettuce.core.dynamic.annotation.Param;
+
+import java.util.List;
+import java.util.Map;
+
+public interface BigCompanyDao {
+
+    public List<Map<String,Object>> bigCompanyInfo(@Param("key")String key,@Param("catId")Long catId);
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dto/PmsProductCategoryDto.java

@@ -0,0 +1,12 @@
+package com.hwrj.cloud.admin.dto;
+
+import com.hwrj.cloud.admin.model.PmsProductCategory;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PmsProductCategoryDto extends PmsProductCategory {
+    private List<PmsProductCategoryDto> children;
+
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dto/UmsCompanyDto.java

@@ -1,9 +1,6 @@
 package com.hwrj.cloud.admin.dto;
 
-import com.hwrj.cloud.admin.model.UmsCompanyFile;
-import com.hwrj.cloud.admin.model.UmsCompanyInfo;
-import com.hwrj.cloud.admin.model.UmsCompanyShop;
-import com.hwrj.cloud.admin.model.UmsMemberPlatform;
+import com.hwrj.cloud.admin.model.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -17,6 +14,16 @@ public class UmsCompanyDto extends UmsCompanyInfo  {
 
     @ApiModelProperty(value = "供应商店铺信息")
     private List<UmsCompanyShop> shops;
+    @ApiModelProperty(value = "供应商基地信息")
+    private List<UmsMemberOrigin> origins;
+
+    public List<UmsMemberOrigin> getOrigins() {
+        return origins;
+    }
+
+    public void setOrigins(List<UmsMemberOrigin> origins) {
+        this.origins = origins;
+    }
 
     public List<UmsCompanyFile> getFiles() {
         return files;

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/BigCompanyService.java

@@ -0,0 +1,16 @@
+package com.hwrj.cloud.admin.service;
+
+import com.hwrj.cloud.admin.dto.PmsProductCategoryDto;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 涉林大屏数据
+ */
+public interface BigCompanyService {
+    List<Map<String,Object>> getCompanyList(Long typeId,String key);
+
+    List<PmsProductCategoryDto> getCategoryDto();
+
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/BigCompanyServiceImpl.java

@@ -0,0 +1,50 @@
+package com.hwrj.cloud.admin.service.impl;
+
+import com.hwrj.cloud.admin.dao.BigCompanyDao;
+import com.hwrj.cloud.admin.dto.PmsProductCategoryDto;
+import com.hwrj.cloud.admin.mapper.PmsProductCategoryMapper;
+import com.hwrj.cloud.admin.model.PmsProductCategory;
+import com.hwrj.cloud.admin.model.PmsProductCategoryExample;
+import com.hwrj.cloud.admin.service.BigCompanyService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Service
+public class BigCompanyServiceImpl implements BigCompanyService {
+    @Autowired
+    private PmsProductCategoryMapper pmsProductCategoryMapper;
+
+    @Autowired
+    private BigCompanyDao bigCompanyDao;
+    @Override
+    public List<Map<String, Object>> getCompanyList(Long typeId, String key) {
+        List<Map<String, Object>> maps = bigCompanyDao.bigCompanyInfo(key, typeId);
+        return maps;
+    }
+
+    @Override
+    public List<PmsProductCategoryDto> getCategoryDto() {
+        PmsProductCategoryExample example = new PmsProductCategoryExample();
+        List<PmsProductCategory> categoryList = pmsProductCategoryMapper.selectByExample(example);
+        List<PmsProductCategoryDto> result = categoryList.stream()
+                .filter(item -> item.getParentId().equals(0L))
+                .map(item -> covert(item, categoryList)).collect(Collectors.toList());
+        return result;
+    }
+
+
+    private PmsProductCategoryDto covert(PmsProductCategory item, List<PmsProductCategory> allList) {
+        PmsProductCategoryDto node = new PmsProductCategoryDto();
+        BeanUtils.copyProperties(item, node);
+        List<PmsProductCategoryDto> children = allList.stream()
+                .filter(subItem -> subItem.getParentId().equals(item.getId()))
+                .map(subItem -> covert(subItem, allList)).collect(Collectors.toList());
+        node.setChildren(children);
+        return node;
+    }
+}

forest-admin/admin-server/src/main/resources/dao/BigCompanyDao.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hwrj.cloud.admin.dao.BigCompanyDao">
+    <select id="bigCompanyInfo" resultType="java.util.Map">
+        SELECT
+            a.id,
+            a.comp_name AS compName,
+            a.comp_con_person as comp_con_person,
+            a.comp_con_num as compConNum,
+            a.province_id as provinceId,
+            a.city_id as cityId,
+            a.county_id as countyId,
+            a.longitude as lng,
+            a.latitude as latitude,
+            a.company_type as companyType
+        FROM
+            ums_company_info a
+        WHERE
+            a.comp_status =0
+            <if test="param1 != null and param1 != ''">
+                and a.comp_name like concat('%',#{param1},'%')
+            </if>
+            <if test="param2 != null">
+                and a.id in (
+                select p.ums_company_info_id from pms_product p LEFT JOIN pms_product_category pc on p.product_category_id =#{param2} pc.id where pc.parent_id =  GROUP BY p.ums_company_info_id
+
+                )
+            </if>
+
+    </select>
+</mapper>