From f34a510629676ebf22d75bde2e89e2fe4a2f56be Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 24 Mar 2021 18:22:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/service/impl/HealthcodeServiceImpl.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/service/impl/HealthcodeServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/service/impl/HealthcodeServiceImpl.java
index d2bd1ea..59c4427 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/service/impl/HealthcodeServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/service/impl/HealthcodeServiceImpl.java
@@ -18,14 +18,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.jfpt.healthcode.entity.healthcode;
+import org.springblade.jfpt.healthcode.entity.Healthcode;
import org.springblade.jfpt.healthcode.mapper.healthcodeMapper;
import org.springblade.jfpt.healthcode.service.IhealthcodeService;
-import org.springblade.jfpt.lx.entity.Lx;
-import org.springblade.jfpt.lx.mapper.LxMapper;
-import org.springblade.jfpt.lx.vo.LxVO;
+import org.springblade.jfpt.healthcode.vo.HealthcodeVO;
import org.springframework.stereotype.Service;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -36,7 +35,7 @@
* @since 2020-07-19
*/
@Service
-public class HealthcodeServiceImpl extends ServiceImpl<healthcodeMapper, healthcode> implements IhealthcodeService {
+public class HealthcodeServiceImpl extends ServiceImpl<healthcodeMapper, Healthcode> implements IhealthcodeService {
@Override
public int insert(String type, String jname, String province, String city, String district, String dtime) {
@@ -51,4 +50,31 @@
public List<Map<String, Object>> selectCountz(String beginTime, String endTime) {
return baseMapper.selectCountz(beginTime, endTime);
}
+
+ /**
+ * 统计7天内每天红色健康码人数数量数据
+ * @return
+ */
+ @Override
+ public Map<String, Object> selectHealthcodeData() {
+ //创建map对象
+ Map<String, Object> map = new HashMap<>();
+ //查询统计数据
+ List<Integer> list = baseMapper.selectRedCodeDataStatis();
+ //封装数据
+ map.put("healthcodeData",list);
+ //返回数据
+ return map;
+ }
+
+ /**
+ * 自定义健康码分页/健康码统计图表点击事件
+ * @param healthcodeVO 健康码对象
+ * @param page 分页对象（页码）
+ * @return
+ */
+ @Override
+ public IPage<Healthcode> selectHealthcodeListPage(IPage<Healthcode> page, HealthcodeVO healthcodeVO) {
+ return page.setRecords(baseMapper.selectHealthcodeListPage(page,healthcodeVO));
+ }
}
--
Gitblit v1.9.3