工段级看板接口

Lius

2024-04-02 4bd74ded216856176d47a87f69572084023be329

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentWorkLineServiceImpl.java

@@ -135,7 +135,7 @@
            //待优化
            if ("FANUC".equals(mdcWorkChartVo.getDriveType()) || "SIEMENS840D".equals(mdcWorkChartVo.getDriveType())) {
                Map<String, Object> param = new HashMap<>();
                param.put("columns", ",spindlespeed,spindleload,spindlebeilv,feedrate,feedbeilv");
                param.put("columns", ",spindlespeed,spindleload,spindlebeilv,feedrate,feedbeilv,actualfeedrate,actualspindlespeed");
                param.put("tableName", saveTableName);
                param.put("startTime", startTime);
                param.put("endTime", endTime);
@@ -188,40 +188,16 @@
                        case "feedbeilv":
                            ei.setFeedbeilv(map.get(collentParams.get(i - 1).getEnglishName()) == null ? null : map.get(collentParams.get(i - 1).getEnglishName()).toString());
                            break;
                        case "actualfeedrate":
                            ei.setActualfeedrate(map.get(collentParams.get(i - 1).getEnglishName()) == null ? null : map.get(collentParams.get(i - 1).getEnglishName()).toString());
                            break;
                        case "actualspindlespeed":
                            ei.setActualspindlespeed(map.get(collentParams.get(i - 1).getEnglishName()) == null ? null : map.get(collentParams.get(i - 1).getEnglishName()).toString());
                            break;
                    }
                } catch (Exception e) {
                    e.printStackTrace();
                }
//                try {
//                    switch (i) {
//                        case 1:
//                            ei.setDataLine1(map.get(collentParams.get(i - 1).getEnglishName()) == null ? null : map.get(collentParams.get(i - 1).getEnglishName()).toString());
//                            break;
//                        case 2:
//                            ei.setDataLine2(map.get(collentParams.get(i - 1).getEnglishName()) == null ? null : map.get(collentParams.get(i - 1).getEnglishName()).toString());
//                            break;
//                        case 3:
//                            ei.setDataLine3(map.get(collentParams.get(i - 1).getEnglishName()) == null ? null : map.get(collentParams.get(i - 1).getEnglishName()).toString());
//                            break;
//                        case 4:
//                            ei.setDataLine4(map.get(collentParams.get(i - 1).getEnglishName()) == null ? null : map.get(collentParams.get(i - 1).getEnglishName()).toString());
//                            break;
//                        case 5:
//                            ei.setDataLine5(map.get(collentParams.get(i - 1).getEnglishName()) == null ? null : map.get(collentParams.get(i - 1).getEnglishName()).toString());
//                            break;
//                        case 6:
//                            ei.setDataLine6(map.get(collentParams.get(i - 1).getEnglishName()) == null ? null : map.get(collentParams.get(i - 1).getEnglishName()).toString());
//                            break;
//                        case 7:
//                            ei.setDataLine7(map.get(collentParams.get(i - 1).getEnglishName()) == null ? null : map.get(collentParams.get(i - 1).getEnglishName()).toString());
//                            break;
//                        case 8:
//                            ei.setDataLine8(map.get(collentParams.get(i - 1).getEnglishName()) == null ? null : map.get(collentParams.get(i - 1).getEnglishName()).toString());
//                            break;
//                    }
//                } catch (Exception e) {
//                    e.printStackTrace();
//                }
            }
            dto.add(ei);
        }
@@ -253,6 +229,8 @@
            ei.setSequencenumber(map.get("Sequencenumber") == null ? null : map.get("Sequencenumber").toString());
            ei.setExecutingcode(map.get("executingcode") == null ? null : map.get("executingcode").toString());
            ei.setProductName(map.get("ProductName") == null ? null : map.get("ProductName").toString());
            ei.setActualfeedrate(map.get("actualfeedrate") == null ? null : map.get("actualfeedrate").toString());
            ei.setActualspindlespeed(map.get("actualspindlespeed") == null ? null : map.get("actualspindlespeed").toString());
            dto.add(ei);
        }
        if (dto.isEmpty()) {