修改报表，界面添加查询流程卡个数，调整推送数据到前端的间隔

ZengTao

2025-03-28 f68d3c71819feb59e7a227a5d992b059b900916c

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java

@@ -334,22 +334,22 @@
        for (int i = 1; i <= groupBy.keySet().size(); i++) {
            String key = i + "";
            if (key != null) {
                List<Map<String, Object>> galssInfo=groupBy.get(key);//当前钢化版图内玻璃小片集合
                if(!galssInfo.isEmpty()){
                    Map<String, Object> item=new HashMap<>();//新格式编排
                List<Map<String, Object>> galssInfo = groupBy.get(key);//当前钢化版图内玻璃小片集合
                if (!galssInfo.isEmpty()) {
                    Map<String, Object> item = new HashMap<>();//新格式编排
                    //以下为同层  {key:"groupBy.get(key)",olLayoutRate:"小片集合"}
                    //          {key:"groupBy.get(key)",olLayoutRate:[{},{},{},{}]}


                    item.put("listGlass",groupBy.get(key));
                    item.put("LayoutId",key);
                    item.put("olWidth",galssInfo.get(0).get("olWidth").toString());
                    item.put("olHeight",galssInfo.get(0).get("olHeight").toString());
                    item.put("olLayoutRate",galssInfo.get(0).get("olLayoutRate").toString());
                    item.put("listGlass", groupBy.get(key));
                    item.put("LayoutId", key);
                    item.put("olWidth", galssInfo.get(0).get("olWidth").toString());
                    item.put("olHeight", galssInfo.get(0).get("olHeight").toString());
                    item.put("olLayoutRate", galssInfo.get(0).get("olLayoutRate").toString());
                    result.add(item);
                }else{
                    log.info("当前钢化版图不存在小片数据请检查，版图号:{}"+key);
                    return null ;
                } else {
                    log.info("当前钢化版图不存在小片数据请检查，版图号:{}" + key);
                    return null;
                }
            }
        }
@@ -478,7 +478,7 @@
        BeanUtils.copyProperties(request, damage);
        damage.setType(request.getState());
        damage.setRemark("");
        damage.setStatus(0);
        damage.setStatus(1);
        damageService.insertDamage(damage);
        return "success";
    }
@@ -490,7 +490,7 @@
        BeanUtils.copyProperties(request, damage);
        damage.setType(request.getState());
        damage.setRemark("");
        damage.setStatus(0);
        damage.setStatus(1);
        damageService.insertDamage(damage);
        //修改磨边队列数据状态
        edgGlassTaskInfoService.update(new LambdaUpdateWrapper<EdgGlassTaskInfo>()
@@ -523,4 +523,9 @@
        }
        return false;
    }

    @Override
    public EdgStorageCageDetails queryEdgStorageDetailsBySize(int deviceId, int currentSlot, double width, double height) {
        return baseMapper.queryEdgStorageDetailsBySize(deviceId, currentSlot, width, height);
    }
}