From c210e36a84f564dd80673148f615dd8f9ae67673 Mon Sep 17 00:00:00 2001 From: haown <454902499@qq.com> Date: Tue, 2 Jan 2024 16:56:36 +0800 Subject: [PATCH] =?UTF-8?q?update=3D=3D=3D>:=E8=8E=B7=E5=8F=96=E4=BD=93?= =?UTF-8?q?=E5=BE=81=E6=A3=80=E6=B5=8B=E6=95=B0=E6=8D=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../familydoctor/PhysicalSignController.java | 27 ++++++++++++------- .../familydoctor/dto/PhysicalSignDto.java | 26 ++++++++++++++++++ .../service/PhysicalSignService.java | 3 ++- .../service/impl/PhysicalSignServiceImpl.java | 16 ++++++----- .../framework/config/SecurityConfig.java | 2 +- 5 files changed, 57 insertions(+), 17 deletions(-) create mode 100644 xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/dto/PhysicalSignDto.java diff --git a/xinelu-admin/src/main/java/com/xinelu/web/controller/familydoctor/PhysicalSignController.java b/xinelu-admin/src/main/java/com/xinelu/web/controller/familydoctor/PhysicalSignController.java index 7b9d6b3..6a2821f 100644 --- a/xinelu-admin/src/main/java/com/xinelu/web/controller/familydoctor/PhysicalSignController.java +++ b/xinelu-admin/src/main/java/com/xinelu/web/controller/familydoctor/PhysicalSignController.java @@ -4,18 +4,29 @@ import com.xinelu.common.core.controller.BaseController; import com.xinelu.common.core.domain.R; import com.xinelu.common.core.domain.SelectVo; import com.xinelu.common.core.domain.TimelineVo; -import com.xinelu.familydoctor.entity.*; +import com.xinelu.familydoctor.dto.PhysicalSignDto; +import com.xinelu.familydoctor.entity.DeviceBfRecord; +import com.xinelu.familydoctor.entity.DeviceBgRecord; +import com.xinelu.familydoctor.entity.DeviceBmiRecord; +import com.xinelu.familydoctor.entity.DeviceBoRecord; +import com.xinelu.familydoctor.entity.DeviceBpRecord; +import com.xinelu.familydoctor.entity.DeviceHrRecord; +import com.xinelu.familydoctor.entity.DeviceTempRecord; import com.xinelu.familydoctor.service.PhysicalSignService; import com.xinelu.familydoctor.vo.PhysicalLastRecordVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; import java.util.List; import java.util.Map; +import javax.annotation.Resource; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * @author gaoyu @@ -113,11 +124,9 @@ public class PhysicalSignController extends BaseController { } @GetMapping("/getList") - @ApiOperation(value = "获取体征检测记录列表", response = TimelineVo.class, notes = "获取体征检测记录列表", httpMethod = "GET") - @ApiImplicitParams({@ApiImplicitParam(name = "identity", value = "身份证号", required = true), - @ApiImplicitParam(name = "label", value = "查询标识1：血糖2：血压、心率", required = true)}) - public R getList(String identity, String label) { - Map map = physicalSignService.getList(identity, label); + @ApiOperation(value = "分页查询体征检测记录列表", response = TimelineVo.class, notes = "分页查询体征检测记录列表", httpMethod = "GET") + public R getList(PhysicalSignDto physicalSignDto) { + Map map = physicalSignService.getList(physicalSignDto); return R.ok(map); } } diff --git a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/dto/PhysicalSignDto.java b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/dto/PhysicalSignDto.java new file mode 100644 index 0000000..72bd9a2 --- /dev/null +++ b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/dto/PhysicalSignDto.java @@ -0,0 +1,26 @@ +package com.xinelu.familydoctor.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: 体征检测查询传输对象 + * @author: haown + * @create: 2024-01-02 16:05 + **/ +@ApiModel("体征检测查询传输对象") +@Data +public class PhysicalSignDto { + @ApiModelProperty("身份证号") + private String identity; + + @ApiModelProperty("查询标识1：血糖2：血压3：血脂4：bmi5：血氧6：心率7：体温") + private String label; + + @ApiModelProperty("页码") + private Integer pageNum; + + @ApiModelProperty("每页显示记录数") + private Integer pageSize; +} diff --git a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/service/PhysicalSignService.java b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/service/PhysicalSignService.java index 4107571..2f2ebf4 100644 --- a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/service/PhysicalSignService.java +++ b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/service/PhysicalSignService.java @@ -1,6 +1,7 @@ package com.xinelu.familydoctor.service; import com.xinelu.common.core.domain.SelectVo; +import com.xinelu.familydoctor.dto.PhysicalSignDto; import com.xinelu.familydoctor.entity.*; import com.xinelu.familydoctor.vo.PhysicalLastRecordVO; @@ -39,5 +40,5 @@ public interface PhysicalSignService { Map getById(Integer id, String label); - Map getList(String identity, String label); + Map getList(PhysicalSignDto physicalSignDto); } diff --git a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/service/impl/PhysicalSignServiceImpl.java b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/service/impl/PhysicalSignServiceImpl.java index f062c8b..398be13 100644 --- a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/service/impl/PhysicalSignServiceImpl.java +++ b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/service/impl/PhysicalSignServiceImpl.java @@ -1,8 +1,11 @@ package com.xinelu.familydoctor.service.impl; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.xinelu.common.core.domain.SelectVo; import com.xinelu.common.core.domain.TimelineVo; import com.xinelu.common.utils.DateUtils; +import com.xinelu.familydoctor.dto.PhysicalSignDto; import com.xinelu.familydoctor.entity.*; import com.xinelu.familydoctor.mapper.*; import com.xinelu.familydoctor.service.PhysicalSignService; @@ -194,16 +197,17 @@ public class PhysicalSignServiceImpl implements PhysicalSignService { return map; } - @Override public Map getList(String identity, String label) { + @Override public Map getList(PhysicalSignDto physicalSignDto) { Map map = new HashMap<>(); - switch (label) { + PageHelper.startPage(physicalSignDto.getPageNum(), physicalSignDto.getPageSize()); + switch (physicalSignDto.getLabel()) { case "1": - List bgList = deviceBgRecordMapper.getBgList(identity); - map.put("list", bgList); + List bgList = deviceBgRecordMapper.getBgList(physicalSignDto.getIdentity()); + map.put("list", new PageInfo<>(bgList)); break; case "2": - List bpList = deviceBpRecordMapper.getBpList(identity); - map.put("list", bpList); + List bpList = deviceBpRecordMapper.getBpList(physicalSignDto.getIdentity()); + map.put("list", new PageInfo<>(bpList)); break; default: break; diff --git a/xinelu-framework/src/main/java/com/xinelu/framework/config/SecurityConfig.java b/xinelu-framework/src/main/java/com/xinelu/framework/config/SecurityConfig.java index 7d90a52..290b61e 100644 --- a/xinelu-framework/src/main/java/com/xinelu/framework/config/SecurityConfig.java +++ b/xinelu-framework/src/main/java/com/xinelu/framework/config/SecurityConfig.java @@ -115,7 +115,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { .antMatchers("/login", "/register", "/captchaImage").anonymous() // 静态资源，可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() - .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**", "/nurseApplet/**", "/nurseApp/**", "/specialDisease/getUserInfo", "/monitor/payTask/handCloseOrder", "/newApp/login/**", "/system/hospitalPerson/**", "/evaluate/**", "/webSocket/**", "/nurseApplet/nursingOrder/getConsultationOrder").permitAll() + .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**", "/nurseApplet/**", "/nurseApp/**", "/specialDisease/getUserInfo", "/monitor/payTask/handCloseOrder", "/newApp/login/**", "/system/hospitalPerson/**", "/evaluate/**", "/webSocket/**", "/nurseApplet/nursingOrder/getConsultationOrder","/fd/ps/getList/**").permitAll() .antMatchers(antMatchers.split(",")).permitAll() // 除上面外的所有请求全部需要鉴权认证 .anyRequest().authenticated()