From 87acf017f10810ce89eb06e4ecc15fab694fe89a Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Mon, 17 Jul 2023 13:48:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E6=9C=9F=E5=93=8D=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../item/result/ReplyTotalLineResultDTO.java | 32 +++++++++++ .../result/ResponseTotalLineResultDTO.java | 32 +++++++++++ .../result/ResponseTotalPieResultDTO.java | 30 +++++++++++ .../controller/ItemScreenCountController.java | 27 ++++++++++ .../esua/epdc/modules/item/dao/ItemDao.java | 4 ++ .../modules/item/service/ItemService.java | 4 ++ .../item/service/impl/ItemServiceImpl.java | 30 +++++++++++ .../main/resources/mapper/item/ItemDao.xml | 54 +++++++++++++++++++ 8 files changed, 213 insertions(+) create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReplyTotalLineResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ResponseTotalLineResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ResponseTotalPieResultDTO.java diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReplyTotalLineResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReplyTotalLineResultDTO.java new file mode 100644 index 000000000..7b5400337 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReplyTotalLineResultDTO.java @@ -0,0 +1,32 @@ +package com.elink.esua.epdc.dto.item.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 大屏-回复趋势-返回值DTO + * @Author wgf + * @Date 2022-10-11 + */ +@Data +public class ReplyTotalLineResultDTO implements Serializable { + private static final long serialVersionUID = -2494874960456321677L; + + /** + * 横坐标 + */ + private List xValue; + + /** + * 回复 + */ + private List hfArr; + + /** + * 未回复 + */ + private List whfArr; + +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ResponseTotalLineResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ResponseTotalLineResultDTO.java new file mode 100644 index 000000000..c456093a6 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ResponseTotalLineResultDTO.java @@ -0,0 +1,32 @@ +package com.elink.esua.epdc.dto.item.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 大屏-响应趋势-返回值DTO + * @Author wgf + * @Date 2022-10-11 + */ +@Data +public class ResponseTotalLineResultDTO implements Serializable { + private static final long serialVersionUID = -2494874960456321677L; + + /** + * 横坐标 + */ + private List xValue; + + /** + * 响应 + */ + private List xyArr; + + /** + * 未响应 + */ + private List wxyArr; + +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ResponseTotalPieResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ResponseTotalPieResultDTO.java new file mode 100644 index 000000000..3e3e6749c --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ResponseTotalPieResultDTO.java @@ -0,0 +1,30 @@ +package com.elink.esua.epdc.dto.item.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 大屏-响应率-返回值DTO + * @Author wgf + * @Date 2022-10-10 + */ +@Data +public class ResponseTotalPieResultDTO implements Serializable { + private static final long serialVersionUID = -2494874960456321677L; + + /** + * 名称 + */ + private String name; + + /** + * 值 + */ + private String value; + + /** + * 占比 + */ + private String proportion; +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemScreenCountController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemScreenCountController.java index d5498719d..7c060a88b 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemScreenCountController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemScreenCountController.java @@ -17,6 +17,7 @@ package com.elink.esua.epdc.modules.item.controller; +import com.baomidou.mybatisplus.extension.api.R; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -143,6 +144,32 @@ public class ItemScreenCountController { return new Result().ok(list); } + /** + * @Description: 大屏-6小时维度响应率 + * @param formDTO: + * @Return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: lichao + * @Date: 2023/7/14 15:36 + */ + @GetMapping("responseSixHoursTotal") + public Result> responseSixHoursTotal(ScreenTotalFormDTO formDTO) { + List list = itemService.responseSixHoursTotal(formDTO); + return new Result>().ok(list); + } + + /** + * @Description: 大屏-按时回复率 + * @param formDTO: + * @Return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: lichao + * @Date: 2023/7/17 10:02 + */ + @GetMapping("replyTotal") + public Result> replyTotal(ScreenTotalFormDTO formDTO) { + List list = itemService.replyTotal(formDTO); + return new Result>().ok(list); + } + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java index f6b1d0f0e..eb4cbab17 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java @@ -550,4 +550,8 @@ public interface ItemDao extends BaseDao { List getevaluationList(Map params); List getsolutionList(Map params); + + ResponseTotalPieResultDTO responseSixHoursTotal(ScreenTotalFormDTO formDTO); + + ResponseTotalPieResultDTO replyTotal(ScreenTotalFormDTO formDTO); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java index f4cda473a..928c57857 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java @@ -804,4 +804,8 @@ public interface ItemService extends BaseService { ResolveTotalLineResultDTO resolveTrend(ScreenTotalFormDTO formDTO); AcceptPlantformProcessDTO evaluationIssue(EvaluationIssueformDTO formDto, TokenDto userDetail); + + List responseSixHoursTotal(ScreenTotalFormDTO formDTO); + + List replyTotal(ScreenTotalFormDTO formDTO); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index acf61f309..98e8db55b 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -5344,6 +5344,36 @@ public class ItemServiceImpl extends BaseServiceImpl implem return acceptPlantformProcessDTO; } + @Override + public List responseSixHoursTotal(ScreenTotalFormDTO formDTO) { + List list = new ArrayList<>(); + ResponseTotalPieResultDTO dtoResonse = baseDao.responseSixHoursTotal(formDTO); + ResponseTotalPieResultDTO dtoResonseNo = new ResponseTotalPieResultDTO(); + dtoResonseNo.setName("未按期响应率"); + if (dtoResonse.getValue()!=null){ + dtoResonse.setValue(String.valueOf((1-Double.valueOf(dtoResonse.getValue()))*100)); + } + dtoResonse.setValue(String.valueOf(Double.valueOf(dtoResonse.getValue())*100)); + list.add(dtoResonse); + list.add(dtoResonseNo); + return list; + } + + @Override + public List replyTotal(ScreenTotalFormDTO formDTO) { + List list = new ArrayList<>(); + ResponseTotalPieResultDTO dtoResonse = baseDao.replyTotal(formDTO); + ResponseTotalPieResultDTO dtoResonseNo = new ResponseTotalPieResultDTO(); + dtoResonseNo.setName("未按时恢复率"); + if (dtoResonse.getValue()!=null){ + dtoResonse.setValue(String.valueOf((1-Double.valueOf(dtoResonse.getValue()))*100)); + } + dtoResonse.setValue(String.valueOf(Double.valueOf(dtoResonse.getValue())*100)); + list.add(dtoResonse); + list.add(dtoResonseNo); + return list; + } + /** * 重新上报 * diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index e75edb440..e97b1bfa2 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -3211,6 +3211,60 @@ ORDER BY count(item.ID) desc + + +