From bbe76086f95dfb34e942d9f2801e17db38391c68 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 21 十一月 2023 21:34:05 +0800
Subject: [PATCH] 接口测试
---
ycl-platform/src/main/java/com/ycl/service/unlawful/impl/UnlawfulServiceImpl.java | 106 +++++++++++++++++++++++++++-------------------------
1 files changed, 55 insertions(+), 51 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/service/unlawful/impl/UnlawfulServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/unlawful/impl/UnlawfulServiceImpl.java
index 9c21b2c..e4f97a1 100644
--- a/ycl-platform/src/main/java/com/ycl/service/unlawful/impl/UnlawfulServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/unlawful/impl/UnlawfulServiceImpl.java
@@ -1,18 +1,22 @@
package com.ycl.service.unlawful.impl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.dto.statistics.CategoryDto;
import com.ycl.dto.statistics.StatusDto;
+import com.ycl.dto.statistics.TimeDto;
import com.ycl.dto.statistics.UnlawfulDto;
import com.ycl.mapper.unlawful.UnlawfulMapper;
import com.ycl.service.unlawful.UnlawfulService;
+import com.ycl.utils.StringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.RoundingMode;
import java.text.NumberFormat;
+import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
-import java.util.function.Consumer;
@Service
public class UnlawfulServiceImpl implements UnlawfulService {
@@ -21,61 +25,61 @@
private UnlawfulMapper unlawfuldao;
+ /**
+ * 鎸夌被鍨�
+ */
@Override
- public List<UnlawfulDto> getUnlawfulByType(Integer currentPage, Integer pageSize, String startTime, String endTime) {
- List<UnlawfulDto> res = new ArrayList<>();
- Double total = unlawfuldao.getTotal().doubleValue();
- List<CategoryDto> data = unlawfuldao.getDataByType(currentPage, pageSize, startTime, endTime);
- data.forEach(categoryDto -> {
- Double checkedRatio; //瀹℃牳鐜�
- Double registerRatio; //绔嬫鐜�
- StatusDto statusData = unlawfuldao.getStatusDataByType(startTime, endTime, categoryDto.getId());
- UnlawfulDto build = new UnlawfulDto().builder().name(categoryDto.getName()) //绫诲瀷鍚嶇О
- .count(statusData.getTotal()) //浜嬩欢鎬绘暟
- .ratio(changeFormat(statusData.getTotal().doubleValue() / total)) //鍗犳瘮
- .register(statusData.getRegister()) //绔嬫
- .notRegister(statusData.getNotRegister()) //鏆備笉绔嬫
- .closing(statusData.getClosing()) //缁撴
- .relearn(statusData.getRelearn()) //鍦ㄥ涔�
- .checked(statusData.getChecked()) //宸插鏍�
- .checkedRatio(changeFormat(statusData.getChecked().doubleValue() / statusData.getTotal().doubleValue())) //瀹℃牳鐜�
- .registerRatio(changeFormat(statusData.getRegister().doubleValue() / statusData.getTotal().doubleValue())) //绔嬫鐜�
- .build();
- res.add(build);
- });
- return res;
+ public IPage<UnlawfulDto> getUnlawfulByType(Integer currentPage, Integer pageSize, String startTime, String endTime) {
+ Page<UnlawfulDto> page = new Page<>(currentPage, pageSize);
+
+ Double total = unlawfuldao.getTotal(startTime, endTime, true, false, false).doubleValue();
+ IPage<UnlawfulDto> page1 = unlawfuldao.getDataByType(page, startTime, endTime);
+ return getUnlawfulDtoIPage(total, page1);
}
- @Override
- public List<UnlawfulDto> getUnlawfulByTypeExport() {
- List<UnlawfulDto> res = new ArrayList<>();
- Double total = unlawfuldao.getTotal().doubleValue();
- List<CategoryDto> data = unlawfuldao.getDataByTypeExp();
- data.forEach(categoryDto -> {
- Double checkedRatio; //瀹℃牳鐜�
- Double registerRatio; //绔嬫鐜�
- StatusDto statusData = unlawfuldao.getStatusDataByType(null, null, categoryDto.getId());
- UnlawfulDto build = new UnlawfulDto().builder().name(categoryDto.getName()) //绫诲瀷鍚嶇О
- .count(statusData.getTotal()) //浜嬩欢鎬绘暟
- .ratio(changeFormat(statusData.getTotal().doubleValue() / total)) //鍗犳瘮
- .register(statusData.getRegister()) //绔嬫
- .notRegister(statusData.getNotRegister()) //鏆備笉绔嬫
- .closing(statusData.getClosing()) //缁撴
- .relearn(statusData.getRelearn()) //鍦ㄥ涔�
- .checked(statusData.getChecked()) //宸插鏍�
- .checkedRatio(changeFormat(statusData.getChecked().doubleValue() / statusData.getTotal().doubleValue())) //瀹℃牳鐜�
- .registerRatio(changeFormat(statusData.getRegister().doubleValue() / statusData.getTotal().doubleValue())) //绔嬫鐜�
- .build();
- res.add(build);
+ private IPage<UnlawfulDto> getUnlawfulDtoIPage(Double total, IPage<UnlawfulDto> page1) {
+ page1.getRecords().forEach(dto -> {
+ dto.setRatio(StringUtils.doubleTwo((double) dto.getCount() * 100 / total) + "%");
+ dto.setRegisterRatio(StringUtils.doubleTwo((double) dto.getRegister() * 100 / (double) dto.getCount()) + "%");
+ dto.setCheckedRatio(StringUtils.doubleTwo((double) dto.getChecked() * 100 / (double) dto.getCount()) + "%");
+ dto.setAccuracyRatio(StringUtils.doubleTwo(1.0 - (double) dto.getRelearn() * 100 / (double) dto.getCount()) + "%");
+
});
- return res;
+ return page1;
}
- private Double changeFormat(Double previous){
- NumberFormat numberInstance = NumberFormat.getNumberInstance();
- numberInstance.setMaximumFractionDigits(2);
- numberInstance.setRoundingMode(RoundingMode.HALF_UP);
- String format = numberInstance.format(previous);
- return Double.parseDouble(format);
+ /**
+ * 鎸夊尯鍩�
+ */
+ @Override
+ public IPage<UnlawfulDto> getUnlawfulByStreet(Integer currentPage, Integer pageSize, String startTime, String endTime) {
+ Page<UnlawfulDto> page = new Page<>(currentPage, pageSize);
+
+ Double total = unlawfuldao.getTotal(startTime, endTime, false, true, false).doubleValue();
+ IPage<UnlawfulDto> page1 = unlawfuldao.getDataByStreet(page, startTime, endTime);
+ return getUnlawfulDtoIPage(total, page1);
}
+
+
+ @Override
+ public IPage<UnlawfulDto> getUnlawfulByTime(Integer currentPage, Integer pageSize, String startTime, String endTime) {
+ Page<UnlawfulDto> page = new Page<>(currentPage, pageSize);
+
+ Double total = unlawfuldao.getTotal(startTime, endTime, false, false, false).doubleValue();
+ IPage<UnlawfulDto> page1 = unlawfuldao.getDataByTime(page, startTime, endTime);
+ return getUnlawfulDtoIPage(total, page1);
+ }
+
+
+ @Override
+ public IPage<UnlawfulDto> getUnlawfulByPoint(Integer currentPage, Integer pageSize, String startTime, String endTime) {
+
+ Page<UnlawfulDto> page = new Page<>(currentPage, pageSize);
+
+ Double total = unlawfuldao.getTotal(startTime, endTime, false, false, true).doubleValue();
+ IPage<UnlawfulDto> page1 = unlawfuldao.getDataByPoint(page, startTime, endTime);
+ return getUnlawfulDtoIPage(total, page1);
+
+ }
+
}
--
Gitblit v1.8.0