1.线表增加版本号比对数据获取功能,数据显示暂未实现

src/main/java/com/dsic/gj_erp/controller/jhgk/DmXbjhController.java

@@ -1,6 +1,9 @@
 package com.dsic.gj_erp.controller.jhgk;
 
 
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.jhgk.DmXbjh;
@@ -11,7 +14,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -44,6 +50,16 @@ public class DmXbjhController {
         return new ResultBean(dmXbjhs);
     }
 
+    @GetMapping("getVersion")
+    public ResultBean<?> getVersion(String nf){
+        return new ResultBean<>(dmXbjhService.getVersion(nf));
+    }
+
+    @GetMapping("getByVersion")
+    public ResultBean<?> getByVersion(String nf,String version){
+        return new ResultBean<>(dmXbjhService.getByVersion(nf,version));
+    }
+
     @ApiOperation(value = "批量保存")
     @PostMapping(value = "/save")
     public ResultBean save(@RequestBody JSONObject dmXbjhs) {
@@ -57,5 +73,6 @@ public class DmXbjhController {
         dmXbjhService.tj(dmXbjhs);
         return new ResultBean();
     }
+
 }
 

src/main/java/com/dsic/gj_erp/service/jhgk/DmXbjhService.java

@@ -6,6 +6,8 @@ import com.dsic.gj_erp.bean.jhgk.DmXbjh;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -25,4 +27,8 @@ public interface DmXbjhService extends IService<DmXbjh> {
     void save(JSONObject dmXbjhs);
 
     void tj(List<DmXbjh> dmXbjhs);
+
+    List<HashMap<String, Object>> getVersion(String nf);
+
+    Map<String, List<DmXbjh>> getByVersion(String startTime, String _version);
 }

src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmXbjhServiceImpl.java

@@ -3,7 +3,6 @@ package com.dsic.gj_erp.service.jhgk.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
@@ -48,6 +47,7 @@ public class DmXbjhServiceImpl extends ServiceImpl<DmXbjhMapper, DmXbjh> impleme
 
     @Override
     public Map<String, List<DmXbjh>> getList(JSONObject json) {
+
         QueryWrapper<DmXbjh> queryWrapper = new QueryWrapper<>();
         if (StringUtils.isNotEmpty(json.getString("dcCh"))) {
             queryWrapper.eq("dc_ch", json.getString("dcCh"));
@@ -55,6 +55,7 @@ public class DmXbjhServiceImpl extends ServiceImpl<DmXbjhMapper, DmXbjh> impleme
         if (StringUtils.isNotEmpty(json.getString("Zt"))) {
             queryWrapper.eq("zt", json.getString("Zt"));
         }
+
         if (StringUtils.isNotEmpty(json.getString("nf"))) {
             String nf = json.getString("nf");
             String startTime = nf.split("~")[0];
@@ -77,6 +78,64 @@ public class DmXbjhServiceImpl extends ServiceImpl<DmXbjhMapper, DmXbjh> impleme
         return collect;
     }
 
+    public Map<String, List<DmXbjh>> getByVersion(String startTime,String _version){
+        List<HashMap<String, Object>> version = this.getVersion(startTime);
+        if (ObjectUtil.isNotEmpty(version)&&!version.get(version.size()-1).get("version").equals(_version)) {
+            List<DmXbjh> dmXbjhs = new ArrayList<>();
+            for (HashMap<String, Object> map : version) {
+                if (map.get("version").equals(_version)) {
+                    String fileName = (String) map.get("fileName");
+                    File file = FileUtil.file(xbjhPath, fileName);
+                    if (file.exists()) {
+                        JSONObject jsonObject = this.readFile(file);
+                        for (String key : jsonObject.keySet()) {
+                            JSONArray jsonArray = jsonObject.getJSONArray(key);
+                            for (Object object : jsonArray) {
+                                DmXbjh dmXbjh = modelMapper.map(object, DmXbjh.class);
+                                dmXbjh.setDcCh(key);
+                                dmXbjhs.add(dmXbjh);
+                            }
+                        }
+                    }
+                }
+            }
+            Map<String, List<DmXbjh>> map = dmXbjhs.stream()
+                    .collect(Collectors.groupingBy(DmXbjh::getDcCh));
+
+            //对map的value进行排序，并返回降序以后的map集合
+            LinkedHashMap<String, List<DmXbjh>> collect = map.entrySet().stream().sorted((entry1, entry2) -> {
+                Double zl1 = entry1.getValue().stream().filter(l -> ObjectUtil.isNotEmpty(l.getZl())).mapToDouble(DmXbjh::getZl).sum();
+                Double zl2 = entry2.getValue().stream().filter(l -> ObjectUtil.isNotEmpty(l.getZl())).mapToDouble(DmXbjh::getZl).sum();
+                //降序排序
+                return zl2.compareTo(zl1);
+            }).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, LinkedHashMap::new));
+            return collect;
+        }
+        return null;
+    }
+
+    public List<HashMap<String, Object>> getVersion(String nf){
+        if (nf==null){
+            return null;
+        }
+        File[] files = FileUtil.ls(xbjhPath);
+        List<HashMap<String, Object>> versions = new ArrayList<>();
+        for (File file : files) {
+            String name = FileUtil.getPrefix(file.getName());
+            String[] s = name.split("_");
+            if (nf.equals(s[0])){
+                HashMap<String, Object> map = new HashMap<>();
+                map.put("fileName", file.getName());
+                map.put("version", s[1]);
+                versions.add(map);
+            }
+        }
+        return versions;
+    }
+
+    public JSONObject readFile(File file){
+        return ExcelUtil.readDmXbjh(file);
+    }
 
     @Override
     @Transactional

src/main/java/com/dsic/gj_erp/util/ExcelUtil.java

@@ -1,5 +1,6 @@
 package com.dsic.gj_erp.util;
 
+import cn.hutool.core.io.FileUtil;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
@@ -9,6 +10,7 @@ import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.File;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -187,6 +189,23 @@ public class ExcelUtil {
     public static JSONObject readDmXbjh(MultipartFile file) {
         try {
             Workbook workbook=isWorkBook(file);
+            return read(workbook);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+
+    public static JSONObject readDmXbjh(File file) {
+        try {
+            Workbook workbook=isWorkBook(file);
+            return read(workbook);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    private static JSONObject read(Workbook workbook){
         // 获取第一张表
         Sheet sheet = workbook.getSheetAt(0);
         Row monthRow=sheet.getRow(2);
@@ -249,12 +268,6 @@ public class ExcelUtil {
             jsonObject.put(dcch,mapList);
         }
         return jsonObject;
-//            return mapList;
-          //  return dmXbjhs;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
     }
 
     public static String date(String strDate){
@@ -300,6 +313,20 @@ public class ExcelUtil {
         }
         return workbook;
     }
+
+    public static Workbook isWorkBook(File file) throws IOException {
+        Workbook workbook;// = new XSSFWorkbook(inputStream);
+        // 截取路径名 . 后面的后缀名，判断是xls还是xlsx
+        // 如果这个判断不对，就把equals换成 equalsIgnoreCase()
+        Pattern pattern = Pattern.compile(".*\\.xls");
+        Matcher matcher = pattern.matcher(FileUtil.getSuffix(file.getName()));
+        if (matcher.matches()){
+            workbook = new HSSFWorkbook(FileUtil.getInputStream(file));
+        }else{
+            workbook = new XSSFWorkbook(FileUtil.getInputStream(file));
+        }
+        return workbook;
+    }
     /**
      * 获取合并单元格的值
      * @param sheet