From 5b766beb6a9fb1b77aba45437c17d2c477adcd8d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 17 Mar 2021 20:07:50 +0800
Subject: [PATCH] 健康码分页数据接口ok
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/vo/HealthcodeVO.java | 21 ++++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/wrapper/healthcodeWrapper.java | 10 +-
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/controller/healthcodeController.java | 33 +++++++---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/dto/healthcodeDTO.java | 4
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/service/impl/HealthcodeServiceImpl.java | 19 ++++-
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/entity/Healthcode.java | 2
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/mapper/healthcodeMapper.java | 13 +++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/mapper/healthcodeMapper.xml | 22 +++++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/service/IhealthcodeService.java | 15 +++-
9 files changed, 106 insertions(+), 33 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/controller/healthcodeController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/controller/healthcodeController.java
index d78e4ac..3035c01 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/controller/healthcodeController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/controller/healthcodeController.java
@@ -16,7 +16,6 @@
*/
package org.springblade.jfpt.healthcode.controller;
-import com.alibaba.nacos.common.utils.JacksonUtils;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
@@ -28,11 +27,10 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
-import org.springblade.jfpt.healthcode.entity.healthcode;
+import org.springblade.jfpt.healthcode.entity.Healthcode;
import org.springblade.jfpt.healthcode.service.IhealthcodeService;
-import org.springblade.jfpt.healthcode.vo.healthcodeVO;
+import org.springblade.jfpt.healthcode.vo.HealthcodeVO;
import org.springblade.jfpt.healthcode.wrapper.healthcodeWrapper;
-import org.springblade.jfpt.parcel.util.JacksonUtil;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -61,8 +59,8 @@
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入lx")
- public R<healthcodeVO> detail(healthcode healthcode) {
- healthcode detail = ihealthcodeService.getOne(Condition.getQueryWrapper(healthcode));
+ public R<HealthcodeVO> detail(Healthcode healthcode) {
+ Healthcode detail = ihealthcodeService.getOne(Condition.getQueryWrapper(healthcode));
return R.data(healthcodeWrapper.build().entityVO(detail));
}
@@ -72,9 +70,22 @@
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入lx")
- public R<IPage<healthcodeVO>> list(healthcode healthcode, Query query) {
- IPage<healthcode> pages = ihealthcodeService.page(Condition.getPage(query), Condition.getQueryWrapper(healthcode));
+ public R<IPage<HealthcodeVO>> list(Healthcode healthcode, Query query) {
+ IPage<Healthcode> pages = ihealthcodeService.page(Condition.getPage(query), Condition.getQueryWrapper(healthcode));
return R.data(healthcodeWrapper.build().pageVO(pages));
+ }
+
+ /**
+ * 自定义健康码分页/健康码统计图表点击事件
+ * @param healthcodeVO 健康码对象
+ * @param query 分页对象（页码）
+ * @return
+ */
+ @GetMapping("/page")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "自定义分页", notes = "传入lx")
+ public R<IPage<Healthcode>> page(HealthcodeVO healthcodeVO, Query query) {
+ return R.data(ihealthcodeService.selectHealthcodeListPage(Condition.getPage(query),healthcodeVO));
}
@@ -84,7 +95,7 @@
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入lx")
- public R save(@Valid @RequestBody healthcode healthcode) {
+ public R save(@Valid @RequestBody Healthcode healthcode) {
return R.status(ihealthcodeService.save(healthcode));
}
@@ -94,7 +105,7 @@
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入lx")
- public R update(@Valid @RequestBody healthcode healthcode) {
+ public R update(@Valid @RequestBody Healthcode healthcode) {
return R.status(ihealthcodeService.updateById(healthcode));
}
@@ -104,7 +115,7 @@
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入lx")
- public R submit(@Valid @RequestBody healthcode healthcode) {
+ public R submit(@Valid @RequestBody Healthcode healthcode) {
return R.status(ihealthcodeService.saveOrUpdate(healthcode));
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/dto/healthcodeDTO.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/dto/healthcodeDTO.java
index 2f67903..2952d71 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/dto/healthcodeDTO.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/dto/healthcodeDTO.java
@@ -18,7 +18,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
-import org.springblade.jfpt.healthcode.entity.healthcode;
+import org.springblade.jfpt.healthcode.entity.Healthcode;
/**
@@ -29,7 +29,7 @@
*/
@Data
@EqualsAndHashCode(callSuper = true)
-public class healthcodeDTO extends healthcode {
+public class healthcodeDTO extends Healthcode {
private static final long serialVersionUID = 1L;
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/entity/healthcode.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/entity/Healthcode.java
similarity index 97%
rename from blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/entity/healthcode.java
rename to blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/entity/Healthcode.java
index 817d3b9..0900ec8 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/entity/healthcode.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/entity/Healthcode.java
@@ -34,7 +34,7 @@
@Data
@TableName("healthcode")
@ApiModel(value = "healthcode对象", description = "healthcode对象")
-public class healthcode implements Serializable {
+public class Healthcode implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/mapper/healthcodeMapper.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/mapper/healthcodeMapper.java
index 5fa3a1a..2194e07 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/mapper/healthcodeMapper.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/mapper/healthcodeMapper.java
@@ -18,7 +18,9 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.jfpt.healthcode.entity.healthcode;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.jfpt.healthcode.entity.Healthcode;
+import org.springblade.jfpt.healthcode.vo.HealthcodeVO;
import java.util.List;
import java.util.Map;
@@ -29,7 +31,7 @@
* @author BladeX
* @since 2020-07-19
*/
-public interface healthcodeMapper extends BaseMapper<healthcode> {
+public interface healthcodeMapper extends BaseMapper<Healthcode> {
int insert(String type, String sex, String province, String city,String district, String dtime);
List<Map<String, Object>> selectCountr(String time);
List<Map<String, Object>> selectCountz(String beginTime,String endTime);
@@ -39,4 +41,11 @@
* @return
*/
List<Integer> selectRedCodeDataStatis();
+
+ /**
+ * 自定义健康码分页/健康码统计图表点击事件
+ * @param healthcodeVO 健康码对象
+ * @return
+ */
+ List<Healthcode> selectHealthcodeListPage(IPage<Healthcode> page,@Param("healthcodeVO") HealthcodeVO healthcodeVO);
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/mapper/healthcodeMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/mapper/healthcodeMapper.xml
index 825cc94..aa5f3e4 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/mapper/healthcodeMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/mapper/healthcodeMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="org.springblade.jfpt.healthcode.mapper.healthcodeMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="healthcodeResultMap" type="org.springblade.jfpt.healthcode.entity.healthcode">
+ <resultMap id="healthcodeResultMap" type="org.springblade.jfpt.healthcode.entity.Healthcode">
<id column="id" property="id"/>
<result column="type" property="type"/>
<result column="sex" property="sex"/>
@@ -120,4 +120,24 @@
a.click_date = b.datetime
</select>
+
+ <!--自定义健康码分页/健康码统计图表点击事件-->
+ <select id="selectHealthcodeListPage" resultType="org.springblade.jfpt.healthcode.entity.Healthcode">
+ SELECT * FROM healthcode
+ where 1=1
+ <if test="healthcodeVO.status==0">
+ and to_days(dtime)=to_days(now())
+ </if>
+ <if test="healthcodeVO.status==1">
+ and YEARWEEK(date_format(dtime,'%Y-%m-%d'),1) = YEARWEEK(now(),1)
+ </if>
+ <if test="healthcodeVO.status==2">
+ and date_format(dtime,'%Y%m') = date_format(now(),'%Y%m')
+ </if>
+ <if test="healthcodeVO.type!=null">
+ and type=#{healthcodeVO.type}
+ </if>
+ ORDER BY dtime asc
+ </select>
+
</mapper>
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/service/IhealthcodeService.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/service/IhealthcodeService.java
index b393185..eba8253 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/service/IhealthcodeService.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/service/IhealthcodeService.java
@@ -18,9 +18,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.jfpt.healthcode.entity.healthcode;
-import org.springblade.jfpt.lx.entity.Lx;
-import org.springblade.jfpt.lx.vo.LxVO;
+import org.springblade.jfpt.healthcode.entity.Healthcode;
+import org.springblade.jfpt.healthcode.vo.HealthcodeVO;
import java.util.List;
import java.util.Map;
@@ -31,7 +30,7 @@
* @author BladeX
* @since 2020-07-19
*/
-public interface IhealthcodeService extends IService<healthcode> {
+public interface IhealthcodeService extends IService<Healthcode> {
int insert(String type, String sex, String province, String city,String district, String dtime);
List<Map<String, Object>> selectCountr(String time);
List<Map<String, Object>> selectCountz(String beginTime,String endTime);
@@ -41,4 +40,12 @@
* @return
*/
Map<String, Object> selectHealthcodeData();
+
+ /**
+ * 自定义健康码分页/健康码统计图表点击事件
+ * @param healthcodeVO 健康码对象
+ * @param page 分页对象（页码）
+ * @return
+ */
+ IPage<Healthcode> selectHealthcodeListPage(IPage<Healthcode> page, HealthcodeVO healthcodeVO);
}
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 dd3f5df..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,12 +18,10 @@
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;
@@ -37,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) {
@@ -68,4 +66,15 @@
//返回数据
return map;
}
+
+ /**
+ * 自定义健康码分页/健康码统计图表点击事件
+ * @param healthcodeVO 健康码对象
+ * @param page 分页对象（页码）
+ * @return
+ */
+ @Override
+ public IPage<Healthcode> selectHealthcodeListPage(IPage<Healthcode> page, HealthcodeVO healthcodeVO) {
+ return page.setRecords(baseMapper.selectHealthcodeListPage(page,healthcodeVO));
+ }
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/vo/healthcodeVO.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/vo/HealthcodeVO.java
similarity index 78%
rename from blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/vo/healthcodeVO.java
rename to blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/vo/HealthcodeVO.java
index 97b522d..d9c10f6 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/vo/healthcodeVO.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/vo/HealthcodeVO.java
@@ -19,7 +19,9 @@
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import org.springblade.jfpt.healthcode.entity.healthcode;
+import org.springblade.jfpt.healthcode.entity.Healthcode;
+
+import java.util.Date;
/**
* 视图实体类
@@ -30,7 +32,22 @@
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "healthcode对象", description = "healthcode对象")
-public class healthcodeVO extends healthcode {
+public class HealthcodeVO extends Healthcode {
private static final long serialVersionUID = 1L;
+ /**
+ *开始时间
+ */
+ private Date begTime;
+
+ /**
+ * 结束时间
+ */
+ private Date endTime;
+
+ /**
+ * 状态 0： 当天时间统计数据 1： 本周内的数据统计
+ */
+ private Integer status;
+
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/wrapper/healthcodeWrapper.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/wrapper/healthcodeWrapper.java
index 922b7de..cf95796 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/wrapper/healthcodeWrapper.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/wrapper/healthcodeWrapper.java
@@ -18,8 +18,8 @@
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.jfpt.healthcode.entity.healthcode;
-import org.springblade.jfpt.healthcode.vo.healthcodeVO;
+import org.springblade.jfpt.healthcode.entity.Healthcode;
+import org.springblade.jfpt.healthcode.vo.HealthcodeVO;
import java.util.Objects;
@@ -29,15 +29,15 @@
* @author BladeX
* @since 2020-07-19
*/
-public class healthcodeWrapper extends BaseEntityWrapper<healthcode, healthcodeVO> {
+public class healthcodeWrapper extends BaseEntityWrapper<Healthcode, HealthcodeVO> {
public static healthcodeWrapper build() {
return new healthcodeWrapper();
}
@Override
- public healthcodeVO entityVO(healthcode healthcode) {
- healthcodeVO healthcodeVO = Objects.requireNonNull(BeanUtil.copy(healthcode, healthcodeVO.class));
+ public HealthcodeVO entityVO(Healthcode healthcode) {
+ HealthcodeVO healthcodeVO = Objects.requireNonNull(BeanUtil.copy(healthcode, HealthcodeVO.class));
return healthcodeVO;
}
--
Gitblit v1.9.3