From ed0fb1e88b2851234052b503c2390750044645dd Mon Sep 17 00:00:00 2001 From: aijinhui <aijinhui> Date: 星期四, 12 十月 2023 09:28:50 +0800 Subject: [PATCH] mq测试 --- ard-work/src/main/java/com/ruoyi/statistical/service/impl/StatisticalServiceImpl.java | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/statistical/service/impl/StatisticalServiceImpl.java b/ard-work/src/main/java/com/ruoyi/statistical/service/impl/StatisticalServiceImpl.java index d655e27..2275bda 100644 --- a/ard-work/src/main/java/com/ruoyi/statistical/service/impl/StatisticalServiceImpl.java +++ b/ard-work/src/main/java/com/ruoyi/statistical/service/impl/StatisticalServiceImpl.java @@ -212,67 +212,67 @@ @Override public List<CountVo> stealelecMonth(ESParam esParam) { List<CountVo> list = stealelecMapper.stealelecMonth(esParam); - return esMonth(list,esParam.getEnd()); + return esMonth(list,esParam); } @Override public List<CountVo> cameraMonth(ESParam esParam) { List<CountVo> list = cameraMapper.cameraMonth(esParam); - return esMonth(list,esParam.getEnd()); + return esMonth(list,esParam); } @Override public List<CountVo> moveMonth(ESParam esParam) { List<CountVo> list = moveMapper.moveMonth(esParam); - return esMonth(list,esParam.getEnd()); + return esMonth(list,esParam); } @Override public List<CountVo> fireMonth(ESParam esParam) { List<CountVo> list = fireMapper.fileMonth(esParam); - return esMonth(list,esParam.getEnd()); + return esMonth(list,esParam); } @Override public List<CountVo> externalMonth(ESParam esParam) { List<CountVo> list = externalMapper.externalMonth(esParam); - return esMonth(list,esParam.getEnd()); + return esMonth(list,esParam); } @Override public List<CountVo> accessMonth(ESParam esParam) { List<CountVo> list = accessMapper.accessMonth(esParam); - return esMonth(list,esParam.getEnd()); + return esMonth(list,esParam); } @Override public List<CountVo> apponekeyMonth(ESParam esParam) { List<CountVo> list = apponekeyMapper.apponekeyMonth(esParam); - return esMonth(list,esParam.getEnd()); + return esMonth(list,esParam); } @Override public List<CountVo> pumpMonth(ESParam esParam) { List<CountVo> list = pumpMapper.pumpMonth(esParam); - return esMonth(list,esParam.getEnd()); + return esMonth(list,esParam); } @Override public List<CountVo> wallMonth(ESParam esParam) { List<CountVo> list = wallMapper.wallMonth(esParam); - return esMonth(list,esParam.getEnd()); + return esMonth(list,esParam); } @Override public List<CountVo> digitizationMonth(ESParam esParam) { List<CountVo> list = digitization3Mapper.digitizationMonth(esParam); - return esMonth(list,esParam.getEnd()); + return esMonth(list,esParam); } @Override public List<CountVo> tubeMonth(ESParam esParam) { List<CountVo> list = tubeMapper.tubeMonth(esParam); - return esMonth(list,esParam.getEnd()); + return esMonth(list,esParam); } @Override @@ -421,17 +421,17 @@ return countVoList; } - public List<CountVo> esMonth(List<CountVo> list,String end){ + public List<CountVo> esMonth(List<CountVo> list,ESParam esParam){ List<CountVo> countVoList = new ArrayList<>(); - Integer day = Integer.valueOf(end.substring(end.length() - 2)); - String month = end.substring(5,7); + Integer day = Integer.valueOf(esParam.getEnd().substring(esParam.getEnd().length() - 2)); + Integer month = esParam.getMonth(); for (int i = 1; i <= day ; i++) { CountVo vo = new CountVo(); - String d = month + "鏈�" + i + "鏃�"; + String d = month + "-" + i ; Boolean bo = false; for (int j = 0; j < list.size(); j++) { CountVo countVo = list.get(j); - String mon = month + "鏈�" + Integer.valueOf(countVo.getDate()) + "鏃�"; + String mon = month + "-" + Integer.valueOf(countVo.getDate()); if(mon.equals(d)){ bo = true; vo.setDate(mon); -- Gitblit v1.9.3