Merge remote-tracking branch 'origin/wb' into qa

jinpengyong

2023-10-26 88efd467e418eda9c57ce38ee248f83445d2efc5

 screen-api/src/main/java/com/moral/api/controller/CruiserController.java

@@ -250,11 +250,11 @@
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }

        Map<String, Object> map = dustldService.dailyDustlds(null,params);
        test(map,response);
        Map<String, Object> map = dustldService.dailyDustlds(params);
        if (ObjectUtils.isEmpty(map)){
            return ResultMessage.fail(ResponseCodeEnum.TARGET_IS_NULL.getCode(), ResponseCodeEnum.TARGET_IS_NULL.getMsg());
        }
        test(map,response);
//        return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(),ResponseCodeEnum.SUCCESS.getMsg(),map);
        return ResultMessage.ok();
    }
@@ -351,9 +351,10 @@
                RowRenderData row = RowRenderData.build(i + 1 + "", map1.get("road").toString(), map1.get("value1").toString(), map1.get("value2").toString(), map1.get("value3").toString());
                rsList3.add(row);
            }

            if (!ObjectUtils.isEmpty(mapArrayList)){
                map.put("table3", new MiniTableRenderData(rsList3));
            }
            map.put("table1", new MiniTableRenderData(header1, rsList1));
            map.put("table3", new MiniTableRenderData(rsList3));
            map.put("data",params.get("data").toString());
            map.put("time",params.get("time").toString());
            map.put("date1",params.get("date1").toString());