添加上传文件

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

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.math.BigDecimal;
 import java.util.*;
 
 @RestController
@@ -35,12 +36,8 @@ public class BigCompanyController {
 
     @GetMapping("/list")
     @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);
+    public CommonResult compList(@RequestParam(value = "id",required = false)Long id, @RequestParam(value = "key",required = false)String key){
+        List<Map<String, Object>> companyList = bigCompanyService.getCompanyList(id, key);
         List<Map<String,Object>> sh = new ArrayList<>();
         for (Map<String,Object> map:companyList){
             List<String> strings = new LinkedList<>();
@@ -139,6 +136,8 @@ public class BigCompanyController {
         String[] title = {"id","type","num"};
         List<String> dto = bigCompanyService.getCat();
         List<Map<String, Object>> title1 = getTitle(dto, title);
+        Map<String,Object> list = new HashMap<>();
+        list.put("list",title1);
         return CommonResult.success(title1);
     }
 
@@ -152,17 +151,47 @@ public class BigCompanyController {
         if (strings == null|| strings.size()<1){
             return null;
         }
+        Map<String,Object> maps = new HashMap<>();
+        maps.put("id",null);
+        maps.put("type","全部");
+
         List<Map<String,Object>> list = new ArrayList<>();
+        BigDecimal bigDecimal = new BigDecimal("0");
         for (String str:strings) {
             Map<String,Object> map = new HashMap<>();
             String[] split = str.split("---");
+            String titles = null;
+            BigDecimal decimal = new BigDecimal("0");
             for (int i = 0;i<split.length;i++){
                 String param = params[i];
                 String s = split[i];
                 map.put(param,s);
+                if ("num".equals(param)){
+                    try {
+                        decimal = new BigDecimal(s);
+                        bigDecimal =bigDecimal.add(decimal);
+                    }catch (Exception e){
+
+                    }
+
+                }
+                if ("type".equals(param)){
+                    titles=s;
+                }
+
+            }
+
+            if (Integer.valueOf(decimal.toString())>0){
+                map.put("title",titles+"涉林企统计");
+                list.add(map);
             }
-            list.add(map);
+
         }
-        return list;
+        maps.put("num",bigDecimal);
+        maps.put("title","全部涉林企业分布");
+        List<Map<String,Object>> list1 = new ArrayList<>();
+        list1.add(maps);
+        list1.addAll(list);
+        return list1;
     }
 }

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

@@ -56,6 +56,7 @@ public class BigScreamController  {
     @GetMapping("/1/data3")
     public CommonResult data13(){
         List<Map<String, Object>> map = bigScreamService.data4();
+        List<Map<String,Object>>  list = new ArrayList<>();
         return CommonResult.success(map);
     }
 
@@ -130,14 +131,17 @@ public class BigScreamController  {
         has.put("tabHeader",tabHeader);
         List<List<Map<String,Object>>> list = new ArrayList<>();
         for (String str:strings) {
-            String[] split = str.split("---");
-            List<Map<String,Object>> maps = new LinkedList<>();
-            for (int i = 0;i<split.length;i++){
-                Map<String,Object> map = new HashMap<>();
-                map.put("value",split[i]);
-                maps.add(map);
+            if (!StringUtils.isEmpty(str)){
+                String[] split = str.split("---");
+                List<Map<String,Object>> maps = new LinkedList<>();
+                for (int i = 0;i<split.length;i++){
+                    Map<String,Object> map = new HashMap<>();
+                    map.put("value",split[i]);
+                    maps.add(map);
+                }
+                list.add(maps);
             }
-            list.add(maps);
+
         }
         has.put("list",list);
         return has;

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

@@ -8,6 +8,7 @@ import com.hwrj.cloud.admin.service.PmsProductService;
 import com.hwrj.cloud.common.api.CommonPage;
 import com.hwrj.cloud.common.api.CommonResult;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import net.sf.jsqlparser.statement.select.SelectBody;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -19,22 +20,26 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/bigData")
+@Api(tags = "产品大屏接口",description = "获取大屏数据")
 public class PmsProductBigDataController {
     @Autowired
     private PmsProductService productService;
 
+    @ApiOperation("产品列表查询")
     @GetMapping(value = "/product/list")
     public CommonResult<CommonPage<BigDataListVo>> bigDataList(BigDataListParam bigDataListParam) throws IOException {
         List<BigDataListVo> list = productService.bigDataList(bigDataListParam);
         return CommonResult.success(CommonPage.restPage(list));
     }
 
+    @ApiOperation("产品类别查询")
     @GetMapping(value = "/product/type")
     public CommonResult<List<SelectVo> > bigDataType() throws IOException {
         List<SelectVo> list = productService.bigDataType();
         return CommonResult.success(list);
     }
 
+    @ApiOperation("产品详细信息查询")
     @GetMapping(value = "/product/info")
     public CommonResult<BigDataListInfoVo> bigDatainfo(Long id) {
         BigDataListInfoVo bigDataListInfoVo = productService.bigDatainfo(id);

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

@@ -27,6 +27,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.entity.ContentType;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -321,6 +322,23 @@ public class UploadCompanyInfoAndProductController {
 
 
 
+    }
+    
+    @Test
+    public void productImg(){
+//        List<String> directory = getDirectory(forestPath.getPath());
+//        Long aLong = companyId(companyName);
+        List<String> directory = getDirectory("D:\\developerUtil\\code\\hwrj\\forest\\到数据\\上传\\石阡县猫寨农林专业合作社\\产品");
+        List<PmsProduct> products = selectProduct("石阡县猫寨农林专业合作");
+        if (products != null&&directory != null&& products.size()>0&&directory.size()>0&&products.size()==directory.size()){
+            for (int i = 0;i<directory.size();i++){
+                updateFile("D:\\developerUtil\\code\\hwrj\\forest\\到数据\\上传\\石阡县猫寨农林专业合作社\\产品",products.get(i).getId(),directory.get(i));
+            }
+        }
+
+
+
+
     }
 
 

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

@@ -15,12 +15,12 @@
             ums_company_info a
         WHERE
             a.comp_status =0
-            <if test="param1 != null and param1 != ''">
-                and a.comp_name like concat('%',#{param1},'%')
+            <if test="key != null and key != ''">
+                and a.comp_name like concat('%',#{key},'%')
             </if>
-            <if test="param2 != null">
+            <if test="catId != 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
+                select p.ums_company_info_id from pms_product p LEFT JOIN pms_product_category pc on p.product_category_id = pc.id  where pc.parent_id = #{catId} GROUP BY p.ums_company_info_id
 
                 )
             </if>

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

@@ -188,6 +188,7 @@
         WHERE
         a.show_status = 1
         AND a.parent_id = 0
+        order by a.sort ASC
     </select>
     <select id="checkOne" resultType="java.lang.Long">
         SELECT

forest-admin/admin-server/src/test/java/com/hwrj/cloud/admin/FirstUploadForestData.java

@@ -325,6 +325,22 @@ private int i = 1;
 
 
 
+    }
+
+    @Test
+    public void productImg(){
+        List<String> directory = getDirectory("D:\\developerUtil\\code\\hwrj\\forest\\到数据\\上传\\石阡县猫寨农林专业合作社\\产品");
+        Long aLong = 111l;
+        List<PmsProduct> products = selectProduct("石阡县猫寨农林专业合作");
+        if (products != null&&directory != null&& products.size()>0&&directory.size()>0&&products.size()==directory.size()){
+            for (int i = 0;i<directory.size();i++){
+                updateFile("D:\\developerUtil\\code\\hwrj\\forest\\到数据\\上传\\石阡县猫寨农林专业合作社\\产品",products.get(i).getId(),directory.get(i));
+            }
+        }
+
+
+
+
     }
 
 

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/service/impl/PmsPortalProductServiceImpl.java

@@ -112,6 +112,7 @@ public class PmsPortalProductServiceImpl implements PmsPortalProductService {
     public List<PmsProductCategoryNode> categoryTreeList() {
         PmsProductCategoryExample example = new PmsProductCategoryExample();
         List<PmsProductCategory> allList = productCategoryMapper.selectByExample(example);
+        example.setOrderByClause("sort ASC");
         List<PmsProductCategoryNode> result = allList.stream()
                 .filter(item -> item.getParentId().equals(0L))
                 .map(item -> covert(item, allList)).collect(Collectors.toList());
@@ -122,6 +123,7 @@ public class PmsPortalProductServiceImpl implements PmsPortalProductService {
     public List<PmsProductCategoryNode> categorySearchTreeList(String key) {
         List<PmsProductCategory> pms = new ArrayList<>();
         PmsProductCategoryExample example = new PmsProductCategoryExample();
+        example.setOrderByClause("sort ASC");
         PmsProductCategoryExample.Criteria criteria = example.createCriteria();
         criteria.andParentIdNotEqualTo(0l);
         if (!StringUtils.isEmpty(key)){