From 4cfec7b29741fc15edb19ddd554cb32afae883c3 Mon Sep 17 00:00:00 2001 From: yangwl <1726150332@qq.com> Date: Sat, 13 Mar 2021 10:38:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=90=97=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nanjing/ReportDataController.java | 154 ------------------ 1 file changed, 154 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/ReportDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/ReportDataController.java index 1c79efb3..43c5d89f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/ReportDataController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/ReportDataController.java @@ -59,163 +59,9 @@ public class ReportDataController extends BaseController { map.put("begin", begin); map.put("end", end); map.put("barcode", barcode); -// List> mapList=producttypeService.selectReport(map); List> reportDataList = producttypeService.selectReport(map); -// List list = new ArrayList<>(); -// for (ReportData data : reportDataList) { -// DemoData demoData = new DemoData(data.getBarcode()); -// String datetime= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(data.getBeginTime()); -// demoData.setDate(datetime); -// Map v_map = new HashMap<>(); -// v_map.put(data.getParameaning(), data.getValue());//最后一层添加值 -// if (list.contains(demoData)) { -// //包含的情况，继续判断Map的key是否存在 -// //真实值 -// DemoData demoData_r = list.get(list.indexOf(demoData)); -// //huoqu -// Map>> map1 = demoData_r.getMap(); -// if (map1 == null) map1 = new HashMap<>(); -// //包不包含都要添加，主要是看v的创建方式 -// -// List> strings; -// if (map1.containsKey(data.getStationName())) { -// //包含压装工位的情况，就用v的集合添加 -// strings = map1.get(data.getStationName()); -// -// } else { -// strings = new ArrayList<>(); -// -// } -// strings.add(v_map); -// map1.put(data.getStationName(), strings); -// -// } else { -// Map>> map1 = new HashMap<>(); -// List> list1 = new ArrayList<>(); -// list1.add(v_map); -// map1.put(data.getStationName(), list1); -// demoData.setMap(map1); -// list.add(demoData); -// -// } -// } -// JSONObject jsonObject=new JSONObject(); -// System.out.println(jsonObject.toJSONString(list)); -// List paraName = new ArrayList<>(); -// List barcodes = new ArrayList<>(); -// List stations = new ArrayList<>(); -// //取出参数名 -// for (int i = 0; i < mapList.size(); i++) { -// barcodes.add((String) mapList.get(i).get("Barcode")); -//// mapList.forEach(x->barcodes.add()); -// } -// -// for (int i = 0; i < mapList.size(); i++) { -// paraName.add((String) mapList.get(i).get("parameaning")); -// } -// -// for (int i = 0; i < mapList.size(); i++) { -// stations.add((String) mapList.get(i).get("stationname")); -// } -//// reportDataList.forEach(x->paraName.add(x.getParameaning())); -//// reportDataList.forEach(x->stations.add(x.getStationName())); -// //去重 -// //条码List -// List barcodeList = barcodes.stream().distinct().collect(Collectors.toList()); -// //参数List -// List paraNameList = paraName.stream().distinct().collect(Collectors.toList()); -// //工位名集合 -// List stationList = stations.stream().distinct().collect(Collectors.toList()); -//// -//// //定义结果集合 -// List> list = new ArrayList<>(); -//// //定义结果集map -// Map map1 = new HashMap<>(); -// System.out.println(barcodeList); -// int number=0; -// -// for (String item:barcodeList) { -// for (String station : stationList) { -// for (String param : paraNameList) { -// for (Map map2:mapList){ -// System.out.println(map2.get("Barcode")); -//// if (map2.get("Barcode").equals(item) && map2.get("stationname").equals(station)&& map2.get("parameaning").equals(param)){ -//// String paramName = map2.get("stationname") + "-" + map2.get("parameaning"); -//// map1.put(paramName, map2.get("value")); -//// break; -//// } -// } -// } -// } -// -// -// } -// for(String item:barcodeList) { - -// number = number + 1; -// map1.put("产品条码", item); -// map1.put("序号", number); -// for (String station : stationList) { -// for (String param : paraNameList) { -// for (Map map2 : mapList) { -// map1.put("时间", map2.get("begintime")); -// map1.put("状态", map2.get("stationname")); -// if (map2.get("Barcode").equals(item) && map2.get("stationname").equals(station) && map2.get("parameaning").equals(param)) { -// if (map2.get("value") == null) { -// map2.put("value", "-"); -// -// } -// String paramName = map2.get("stationname") + "-" + map2.get("parameaning"); -// map1.put(paramName, map2.get("value")); -// break; -// } -// } -// } -// } -// } -// int number=0; -// for(String item:barcodeList){ -// number=number+1; -// map1.put("产品条码",item); -// map1.put("序号",number); -// for (String station:stationList) { -// for(String param:paraNameList){ -// for (ReportData rpd:reportDataList) { -// map1.put("时间",rpd.getBeginTime()); -// map1.put("状态",rpd.getState()); -// if (rpd.getBarcode().equals(item)&&rpd.getStationName().equals(station)&&rpd.getParameaning().equals(param)){ -// if(rpd.getValue()==null){ -// rpd.setValue("-"); -// } -// String paramName = rpd.getStationName()+"-"+rpd.getParameaning(); -//// map1.put(station,param); -// map1.put(paramName,rpd.getValue()); -// break; -// } -// } -// } -// } -// for (String param:paraNameList) { -// for (ReportData rpd:reportDataList) { -// if (rpd.getBarcode().equals(item)&&rpd.getParameaning().equals(param)){ -// if(rpd.getValue()==null){ -// rpd.setValue("-"); -// } -// map1.put(param,rpd.getValue()); -//// map1.put(param+"value",rpd.getValue()); -// break; -// } -// } -// } - //排序的作用 -// TreeMap treeMap = new TreeMap<>(map1); -// list.add(treeMap); -// } -// String info = JSONArray.toJSONString(list); -//// System.out.println(info); -// System.out.println("条码信息查询Json格式："+info); return getDataTable(reportDataList); }