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/controller/healthcodeController.java | 44 +++++++++++++++++++++++++++-----------------
1 files changed, 27 insertions(+), 17 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 5bb808c..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));
}
@@ -134,8 +145,8 @@
/**
* 统计接口
*/
- @PostMapping("/selectCount")
- public R selectCount(@RequestBody String type,HttpServletResponse response) {
+ @GetMapping("/selectCount")
+ public R selectCount(Integer type,HttpServletResponse response) {
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
response.setHeader("Access-Control-Allow-Credentials","true");
@@ -150,15 +161,14 @@
if (1 == dayWeek) {
cal.add(Calendar.DAY_OF_MONTH, -1);
}
- String dataType = JacksonUtil.parseString(type, "type");
- switch(dataType){
- case "0" :
+ switch(type){
+ case 0 :
//日
String times = sdf.format(cal.getTime());
System.out.println("times = " + times);
list=ihealthcodeService.selectCountr(times);
break;
- case "1" :
+ case 1 :
System.out.println("要计算日期为:" + sdf.format(cal.getTime())); // 输出要计算日期
// 设置一个星期的第一天，按中国的习惯一个星期的第一天是星期一
cal.setFirstDayOfWeek(Calendar.MONDAY);
--
Gitblit v1.9.3