From 99b21729b606839f350da841caaa3b45b3143369 Mon Sep 17 00:00:00 2001 From: Limy <1353020654@qq.com> Date: Sun, 7 Mar 2021 17:11:10 +0800 Subject: [PATCH] 2021.3.5 18:18 --- .../nanjing/ReportDataController.java | 44 +++++- .../nanjing/TBdSubstationController.java | 11 +- .../templates/nanjing/Report/Report.html | 137 +++++++++++++----- .../StationParaInfo/StationParaInfo.html | 3 - .../templates/nanjing/SubStation/add.html | 21 ++- .../nanjing/mapper/TBdSubstationMapper.java | 2 +- .../service/ITBdSubstationService.java | 2 +- .../impl/TBdSubstationServiceImpl.java | 4 +- .../mapper/nanjing/TBdSubstationMapper.xml | 2 +- 9 files changed, 171 insertions(+), 55 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 31351761..a19cc2b1 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 @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.nanjing; +import com.alibaba.fastjson.JSONArray; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.nanjing.domain.ReportData; import com.ruoyi.nanjing.domain.TBdProductinfo; @@ -13,9 +14,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.stream.Collectors; @Controller @RequestMapping("/nanjing/reportData") @@ -28,19 +28,49 @@ public class ReportDataController extends BaseController { @GetMapping() public String reportData(ModelMap map) { -// return prefix + "/Report"; - return "redirect:"+"http://127.0.0.1:18080/RDP-SERVER/rdppage/main/d354a3beb6dae7938155b3f9a962e479"; + return prefix + "/Report"; +// return "redirect:"+"http://127.0.0.1:18080/RDP-SERVER/rdppage/main/d354a3beb6dae7938155b3f9a962e479"; } @PostMapping("/report") @ResponseBody - public List reportData(String begin,String end,String barcode) + public String reportData(String begin,String end,String barcode) { Map map = new HashMap(); map.put("begin",begin); map.put("end",end); map.put("barcode",barcode); List reportDataList = producttypeService.selectReport(map); - return reportDataList; + + List paraName = new ArrayList<>(); + List barcodelist = new ArrayList<>(); + //取出参数名 + reportDataList.forEach(x->barcodelist.add(x.getBarcode())); + reportDataList.forEach(x->paraName.add(x.getParameaning())); + //去重 + List barcodeList = barcodelist.stream().distinct().collect(Collectors.toList()); + List paraNameList = paraName.stream().distinct().collect(Collectors.toList()); + //定义结果集合 + List> list = new ArrayList<>(); + //定义结果集map + Map map1 = new HashMap<>(); + for(String item:barcodeList){ + map1.put("barcode",item); + for (String param:paraNameList) { + for (ReportData rpd:reportDataList) { + if (rpd.getBarcode().equals(item)&&rpd.getParameaning().equals(param)){ + map1.put(param,rpd.getParameaning()); + map1.put(param+"value",rpd.getValue()); + break; + } + } + } + //排序的作用 + TreeMap treeMap = new TreeMap<>(map1); + list.add(treeMap); + } + String info = JSONArray.toJSONString(list); +// System.out.println(info); + return info; } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TBdSubstationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TBdSubstationController.java index ce2f7819..871bfc7b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TBdSubstationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TBdSubstationController.java @@ -133,14 +133,21 @@ public class TBdSubstationController extends BaseController @ResponseBody public AjaxResult addSave(TBdSubstation tBdSubstation) { + String res = ""; Map map = new HashMap(); map.put("tableName",tBdSubstation.getTableName()); map.put("ParaAmount",tBdSubstation.getParaCount()); - tBdSubstationService.createTable(map); + String msg = tBdSubstationService.createTable(map); tBdSubstation.setUniteID(0L); tBdSubstation.setUserID(ShiroUtils.getUserId().toString()); - return toAjax(tBdSubstationService.insertTBdSubstation(tBdSubstation)); + int insertStation = tBdSubstationService.insertTBdSubstation(tBdSubstation); + if(insertStation>0){ + res = "工位创建成功;"+msg; + }else { + res = "工位创建失败；"+msg; + } + return AjaxResult.success(res); } /** diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/Report/Report.html b/ruoyi-admin/src/main/resources/templates/nanjing/Report/Report.html index 82c60e45..7d0f44fb 100644 --- a/ruoyi-admin/src/main/resources/templates/nanjing/Report/Report.html +++ b/ruoyi-admin/src/main/resources/templates/nanjing/Report/Report.html @@ -21,7 +21,7 @@
  • -  搜索 +  搜索
    • @@ -34,44 +34,107 @@ diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/StationParaInfo/StationParaInfo.html b/ruoyi-admin/src/main/resources/templates/nanjing/StationParaInfo/StationParaInfo.html index a276e11a..81f2b366 100644 --- a/ruoyi-admin/src/main/resources/templates/nanjing/StationParaInfo/StationParaInfo.html +++ b/ruoyi-admin/src/main/resources/templates/nanjing/StationParaInfo/StationParaInfo.html @@ -65,9 +65,6 @@ success: function (json) { console.log(json); - - - var columnsArray1 = []; columnsArray1.push({field : "系统条码",title : "系统条码",colspan: 1,rowspan: 1}); columnsArray1.push({field : "semiBarcode" ,title : "产品码",colspan: 1,rowspan: 1}); diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/SubStation/add.html b/ruoyi-admin/src/main/resources/templates/nanjing/SubStation/add.html index 274fe584..5855db56 100644 --- a/ruoyi-admin/src/main/resources/templates/nanjing/SubStation/add.html +++ b/ruoyi-admin/src/main/resources/templates/nanjing/SubStation/add.html @@ -79,7 +79,26 @@ function submitHandler() { if ($.validate.form()) { - $.operate.save(prefix + "/add", $('#form-SubStation-add').serialize()); + // $.operate.save(prefix + "/add", $('#form-SubStation-add').serialize()); + + $.ajax({ + url: prefix + "/add", + type: "post", + dataType: "json", + data: $('#form-SubStation-add').serialize(), + beforeSend: function () { + $.modal.loading("正在处理中，请稍后..."); + $.modal.disable(); + }, + success: function (result) { + // if (typeof callback == "function") { + // callback(result); + // } + console.log(result.msg); + alert(result.msg); + $.operate.successCallback(result); + } + }); } } function fillTableName() { diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TBdSubstationMapper.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TBdSubstationMapper.java index e3462a5d..f5e91344 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TBdSubstationMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TBdSubstationMapper.java @@ -65,7 +65,7 @@ public interface TBdSubstationMapper List selectOrderid(); - void createTable(Map map); + String createTable(Map map); void updateTable(Map map); diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITBdSubstationService.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITBdSubstationService.java index 18eff01c..2806e3a6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITBdSubstationService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITBdSubstationService.java @@ -67,7 +67,7 @@ public interface ITBdSubstationService List selectOrderid(); - void createTable(Map map); + String createTable(Map map); void updateTable(Map map); diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TBdSubstationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TBdSubstationServiceImpl.java index a29966e6..cefc5042 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TBdSubstationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TBdSubstationServiceImpl.java @@ -110,8 +110,8 @@ public class TBdSubstationServiceImpl implements ITBdSubstationService } @Override - public void createTable(Map map) { - tBdSubstationMapper.createTable(map); + public String createTable(Map map) { + return tBdSubstationMapper.createTable(map); } @Override diff --git a/ruoyi-system/src/main/resources/mapper/nanjing/TBdSubstationMapper.xml b/ruoyi-system/src/main/resources/mapper/nanjing/TBdSubstationMapper.xml index 10b12069..27655cff 100644 --- a/ruoyi-system/src/main/resources/mapper/nanjing/TBdSubstationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/nanjing/TBdSubstationMapper.xml @@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select top 1 * from T_BD_SubStation order by OrderID desc - { call SP_SY_CreatStationTableByStationCode( #{tableName,mode=IN,jdbcType=VARCHAR},