From d1545cdd30f60f91bd9cb33dd1b900380f00a658 Mon Sep 17 00:00:00 2001 From: zhangye <654600784@qq.com> Date: Mon, 16 Mar 2020 17:20:42 +0800 Subject: [PATCH] =?UTF-8?q?health=E5=90=8E=E5=8F=B0=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccsens/health/api/AbnormalController.java | 76 +++++++++++ .../ccsens/health/api/ClockController.java | 18 +++ .../ccsens/health/api/JourneyController.java | 36 ++++++ .../ccsens/health/api/StudentController.java | 49 +++++++ .../com/ccsens/health/api/UserController.java | 9 ++ .../ccsens/health/bean/dto/AbnormalDto.java | 96 ++++++++++++++ .../ccsens/health/bean/dto/JourneyDto.java | 86 +++++++++++++ .../ccsens/health/bean/dto/StudentDto.java | 39 ++++++ .../com/ccsens/health/bean/dto/UserDto.java | 13 ++ .../com/ccsens/health/bean/vo/AbnormalVo.java | 46 +++++++ .../com/ccsens/health/bean/vo/JourneyVo.java | 17 ++- .../com/ccsens/health/bean/vo/StudentVo.java | 120 ++++++++++++++++++ .../com/ccsens/health/bean/vo/UserVo.java | 26 ++++ .../health/service/AbnormalService.java | 56 ++++++++ .../ccsens/health/service/ClockService.java | 18 +++ .../health/service/IAbnormalService.java | 19 +++ .../ccsens/health/service/IClockService.java | 4 + .../health/service/IJourneyService.java | 8 ++ .../health/service/IStudentService.java | 13 ++ .../ccsens/health/service/IUserService.java | 2 + .../ccsens/health/service/JourneyService.java | 35 +++++ .../ccsens/health/service/StudentService.java | 32 +++++ .../ccsens/health/service/UserService.java | 24 ++-- 23 files changed, 826 insertions(+), 16 deletions(-) create mode 100644 health/src/main/java/com/ccsens/health/api/AbnormalController.java create mode 100644 health/src/main/java/com/ccsens/health/api/StudentController.java create mode 100644 health/src/main/java/com/ccsens/health/bean/dto/AbnormalDto.java create mode 100644 health/src/main/java/com/ccsens/health/bean/dto/StudentDto.java create mode 100644 health/src/main/java/com/ccsens/health/bean/vo/AbnormalVo.java create mode 100644 health/src/main/java/com/ccsens/health/bean/vo/StudentVo.java create mode 100644 health/src/main/java/com/ccsens/health/service/AbnormalService.java create mode 100644 health/src/main/java/com/ccsens/health/service/IAbnormalService.java create mode 100644 health/src/main/java/com/ccsens/health/service/IStudentService.java create mode 100644 health/src/main/java/com/ccsens/health/service/StudentService.java diff --git a/health/src/main/java/com/ccsens/health/api/AbnormalController.java b/health/src/main/java/com/ccsens/health/api/AbnormalController.java new file mode 100644 index 00000000..cd81e391 --- /dev/null +++ b/health/src/main/java/com/ccsens/health/api/AbnormalController.java @@ -0,0 +1,76 @@ +package com.ccsens.health.api; + +import com.ccsens.cloudutil.annotation.MustLogin; +import com.ccsens.health.bean.dto.AbnormalDto; +import com.ccsens.health.bean.dto.ClockDto; +import com.ccsens.health.bean.vo.AbnormalVo; +import com.ccsens.health.service.IAbnormalService; +import com.ccsens.util.JsonResponse; +import com.ccsens.util.bean.dto.QueryDto; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@Slf4j +@Api(tags = "打卡签到相关" , description = "") +@RestController +@RequestMapping("/abnormal") +public class AbnormalController { + @Autowired + private IAbnormalService abnormalService; + + @MustLogin + @ApiOperation(value = "疫情概览", notes = "") + @RequestMapping(value = "", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> abnormalOverview(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { + log.info("疫情概览：{}",params); + List abnormalOverviewList = abnormalService.abnormalOverview(params); + return JsonResponse.newInstance().ok(abnormalOverviewList); + } + + @MustLogin + @ApiOperation(value = "异常人员添加", notes = "") + @RequestMapping(value = "add", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse addAbnormal(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { + log.info("异常人员添加：{}",params); + abnormalService.AddAbnormal(params); + return JsonResponse.newInstance().ok(); + } + + @MustLogin + @ApiOperation(value = "异常人员统计", notes = "") + @RequestMapping(value = "statistics", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> abnormalStatistics( + @ApiParam @Validated @RequestBody QueryDto params) throws Exception { + log.info("异常人员添加：{}",params); + List abnormalStatisticsVoList = abnormalService.AbnormalStatistics(params); + return JsonResponse.newInstance().ok(); + } + + @MustLogin + @ApiOperation(value = "修改异常人员信息", notes = "") + @RequestMapping(value = "update", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse updateAbnormal(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { + log.info("异常人员添加：{}",params); + abnormalService.updateAbnormal(params); + return JsonResponse.newInstance().ok(); + } + + @MustLogin + @ApiOperation(value = "删除异常人员信息", notes = "") + @RequestMapping(value = "delAbnormal", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse deleteAbnormal(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { + log.info("异常人员添加：{}",params); + abnormalService.delAbnormal(params); + return JsonResponse.newInstance().ok(); + } +} diff --git a/health/src/main/java/com/ccsens/health/api/ClockController.java b/health/src/main/java/com/ccsens/health/api/ClockController.java index 667c4c9e..44d9f345 100644 --- a/health/src/main/java/com/ccsens/health/api/ClockController.java +++ b/health/src/main/java/com/ccsens/health/api/ClockController.java @@ -93,4 +93,22 @@ public class ClockController { clockService.addSite(params.getParam().toSite()); return JsonResponse.newInstance().ok(); } + + @MustLogin + @ApiOperation(value = "删除场所", notes = "") + @RequestMapping(value = "delSite", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse delSite(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { + log.info("删除场所：{}", params); + clockService.delSite(params.getParam().getId()); + return JsonResponse.newInstance().ok(); + } + + @MustLogin + @ApiOperation(value = "修改场所信息", notes = "") + @RequestMapping(value = "updateSite", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse updateSite(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { + log.info("修改场所信息：{}", params); + clockService.updateSite(params.getParam()); + return JsonResponse.newInstance().ok(); + } } diff --git a/health/src/main/java/com/ccsens/health/api/JourneyController.java b/health/src/main/java/com/ccsens/health/api/JourneyController.java index a329ec8d..014305e1 100644 --- a/health/src/main/java/com/ccsens/health/api/JourneyController.java +++ b/health/src/main/java/com/ccsens/health/api/JourneyController.java @@ -47,4 +47,40 @@ public class JourneyController { List journeyInfoList = journeyService.getJourney(params); return JsonResponse.newInstance().ok(journeyInfoList); } + + @MustLogin + @ApiOperation(value = "添加异常行程信息", notes = "") + @RequestMapping(value = "addAbnormalJourney", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse addAbnormalJourney(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { + log.info("添加异常行程信息：{}",params); + journeyService.addAbnormalJourney(params); + return JsonResponse.newInstance().ok(); + } + + @MustLogin + @ApiOperation(value = "查询异常行程（管理员输入的异常行程）", notes = "") + @RequestMapping(value = "selectAbnormal", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> selectAbnormalJourney(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { + log.info("查询异常行程：{}",params); + List addAbnormalJourneyList = journeyService.selectAbnormalJourney(params); + return JsonResponse.newInstance().ok(addAbnormalJourneyList); + } + + @MustLogin + @ApiOperation(value = "修改异常行程信息", notes = "") + @RequestMapping(value = "updateAbnormal", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse updateAbnormalJourney(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { + log.info("修改异常行程信息：{}",params); + journeyService.updateAbnormalJourney(params); + return JsonResponse.newInstance().ok(); + } + + @MustLogin + @ApiOperation(value = "删除异常行程信息", notes = "") + @RequestMapping(value = "delAbnormal", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse deleteAbnormalJourney(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { + log.info("修改异常行程信息：{}",params); + journeyService.deleteAbnormalJourney(params); + return JsonResponse.newInstance().ok(); + } } diff --git a/health/src/main/java/com/ccsens/health/api/StudentController.java b/health/src/main/java/com/ccsens/health/api/StudentController.java new file mode 100644 index 00000000..bf5ac39f --- /dev/null +++ b/health/src/main/java/com/ccsens/health/api/StudentController.java @@ -0,0 +1,49 @@ +package com.ccsens.health.api; + +import com.ccsens.cloudutil.annotation.MustLogin; +import com.ccsens.health.bean.dto.JourneyDto; +import com.ccsens.health.bean.dto.StudentDto; +import com.ccsens.health.bean.vo.StudentVo; +import com.ccsens.health.bean.vo.UserVo; +import com.ccsens.health.service.IStudentService; +import com.ccsens.util.JsonResponse; +import com.ccsens.util.bean.dto.QueryDto; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@Slf4j +@Api(tags = "个人信息相关" , description = "") +@RestController +@RequestMapping("/students") +public class StudentController { + @Autowired + private IStudentService studentService; + + @MustLogin + @ApiOperation(value = "学生健康列表", notes = "") + @RequestMapping(value = "", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> getStudentHealthList(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { + log.info("查询个人信息：{}",params); + List studentHealthList = studentService.getStudentHealthList(params); + return JsonResponse.newInstance().ok(studentHealthList); + } + + @MustLogin + @ApiOperation(value = "接触病患学生统计", notes = "") + @RequestMapping(value = "contactPatient", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse getContactPatient(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { + log.info("查询个人信息：{}",params); + StudentVo.ContactPatientVo contactPatientVo = studentService.getContactPatient(params); + return JsonResponse.newInstance().ok(contactPatientVo); + } +} diff --git a/health/src/main/java/com/ccsens/health/api/UserController.java b/health/src/main/java/com/ccsens/health/api/UserController.java index 3c958cca..8bfae35a 100644 --- a/health/src/main/java/com/ccsens/health/api/UserController.java +++ b/health/src/main/java/com/ccsens/health/api/UserController.java @@ -44,4 +44,13 @@ public class UserController { UserVo.UserInfo userInfo = userService.addUserInfo(params); return JsonResponse.newInstance().ok(userInfo); } + + @MustLogin + @ApiOperation(value = "个人轨迹查询", notes = "") + @RequestMapping(value = "track", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse selectTrack(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { + log.info("个人轨迹查询：{}",params); + UserVo.TrackInfo trackInfo = userService.selectTrack(params); + return JsonResponse.newInstance().ok(trackInfo); + } } diff --git a/health/src/main/java/com/ccsens/health/bean/dto/AbnormalDto.java b/health/src/main/java/com/ccsens/health/bean/dto/AbnormalDto.java new file mode 100644 index 00000000..5024900e --- /dev/null +++ b/health/src/main/java/com/ccsens/health/bean/dto/AbnormalDto.java @@ -0,0 +1,96 @@ +package com.ccsens.health.bean.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.math.BigDecimal; + +@Data +public class AbnormalDto { + + @Data + @ApiModel("疫情概览查询") + public static class SelectAbnormal{ + @ApiModelProperty("班级（所在机构）") + private String department; + @ApiModelProperty("开始时间") + private Long startTime; + @ApiModelProperty("结束时间") + private Long endTime; + } + + @Data + @ApiModel("异常人员统计") + public static class AbnormalStatisticsDto{ + @ApiModelProperty("身份 0学生 1老师 2其他") + private int post; + @ApiModelProperty("班级（所在机构）") + private String department; + @ApiModelProperty("状态 0:健康 1:治愈 2:隔离 3:疑似 4:确诊") + private int healthType; + @ApiModelProperty("分页") + private int page; + } + + + + @Data + @ApiModel("新增异常人员信息") + public static class AddAbnormal{ + @NotNull + @ApiModelProperty("学号") + private String wkno; + @NotNull + @ApiModelProperty("姓名") + private String name; + @NotNull + @ApiModelProperty("班级（所在机构）") + private String department; + @NotNull + @ApiModelProperty("体温") + private BigDecimal animalHeat; + @NotNull + @ApiModelProperty("原因") + private String reason; + @NotNull + @ApiModelProperty("状态 0:健康 1:治愈 2:隔离 3:疑似 4:确诊") + private int healthType; + @NotNull + @ApiModelProperty("开始确诊时间") + private Long startTime; + @ApiModelProperty("结束时间") + private Long endTime; + } + + @Data + @ApiModel("修改异常人员信息") + public static class UpdateAbnormal{ + @ApiModelProperty("异常信息id") + private Long id; + @ApiModelProperty("学号") + private String wkno; + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("班级（所在机构）") + private String department; + @ApiModelProperty("体温") + private BigDecimal animalHeat; + @ApiModelProperty("原因") + private String reason; + @ApiModelProperty("状态 0:健康 1:治愈 2:隔离 3:疑似 4:确诊") + private int healthType; + @ApiModelProperty("开始确诊时间") + private Long startTime; + @ApiModelProperty("结束时间") + private Long endTime; + } + + @Data + @ApiModel("修改异常人员信息") + public static class DelAbnormal { + @ApiModelProperty("异常信息id") + private Long id; + } +} diff --git a/health/src/main/java/com/ccsens/health/bean/dto/JourneyDto.java b/health/src/main/java/com/ccsens/health/bean/dto/JourneyDto.java index 81216ac2..35f935f7 100644 --- a/health/src/main/java/com/ccsens/health/bean/dto/JourneyDto.java +++ b/health/src/main/java/com/ccsens/health/bean/dto/JourneyDto.java @@ -112,4 +112,90 @@ public class JourneyDto { return site; } } + + @Data + @ApiModel("修改场所信息") + public static class UpdateSite { + @NotNull + @ApiModelProperty("场所id") + private Long id; + @ApiModelProperty("场所名字") + private String siteName; + @ApiModelProperty("场所code") + private String siteCode; + @ApiModelProperty("经度") + private BigDecimal longitude; + @ApiModelProperty("纬度") + private BigDecimal latitude; + @ApiModelProperty("上级") + private String parentCode; + } + + @Data + @ApiModel("删除场所") + public static class DeleteSite{ + @NotNull + @ApiModelProperty("场所id") + private Long id; + } + + @Data + @ApiModel("添加异常行程") + public static class AddAbnormalJourney { + @NotNull + @ApiModelProperty("出行方式 0铁路 1飞机 2客运车辆 3自驾 4船 5其他") + private int tripMode; + @NotNull + @ApiModelProperty("车次号") + private String carNo; + @NotNull + @ApiModelProperty("出发时间") + private Long startTime; + @NotNull + @ApiModelProperty("到达时间") + private Long endTime; + @ApiModelProperty("备注") + private String description; + } + + @Data + @ApiModel("查询异常行程") + public static class SelectAbnormalJourney { + @ApiModelProperty("出行方式 0铁路 1飞机 2客运车辆 3自驾 4船 5其他") + private int tripMode; + @ApiModelProperty("车次号") + private String carNo; + @ApiModelProperty("出发时间") + private Long startTime; + @ApiModelProperty("到达时间") + private Long endTime; + @ApiModelProperty("分页") + private int page; + } + + @Data + @ApiModel("修改异常行程信息") + public static class UpdateAbnormalJourney { + @NotNull + @ApiModelProperty("id") + private Long id; + @ApiModelProperty("出行方式 0铁路 1飞机 2客运车辆 3自驾 4船 5其他") + private int tripMode; + @ApiModelProperty("车次号") + private String carNo; + @ApiModelProperty("出发时间") + private Long startTime; + @ApiModelProperty("到达时间") + private Long endTime; + @ApiModelProperty("备注") + private String description; + } + + @Data + @ApiModel("修改异常行程信息") + public static class DeleteAbnormalJourney { + @NotNull + @ApiModelProperty("id") + private Long id; + } } diff --git a/health/src/main/java/com/ccsens/health/bean/dto/StudentDto.java b/health/src/main/java/com/ccsens/health/bean/dto/StudentDto.java new file mode 100644 index 00000000..fb597323 --- /dev/null +++ b/health/src/main/java/com/ccsens/health/bean/dto/StudentDto.java @@ -0,0 +1,39 @@ +package com.ccsens.health.bean.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class StudentDto { + + @Data + @ApiModel("查询学生健康列表") + public static class StudentHealth { + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("学号") + private String mkno; + @ApiModelProperty("班级（所在机构）") + private String department; + @ApiModelProperty("开始时间") + private String startTime; + @ApiModelProperty("结束时间") + private String endTime; + } + + @Data + @ApiModel("接触病患的学生统计") + public static class ContactPatientDto { + @ApiModelProperty("病患姓名") + private String patientName; + @ApiModelProperty("病患学号") + private String patientMkno; + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("学号") + private String mkno; + @ApiModelProperty("车次号") + private String carNo; + } +} diff --git a/health/src/main/java/com/ccsens/health/bean/dto/UserDto.java b/health/src/main/java/com/ccsens/health/bean/dto/UserDto.java index f86038f2..955e3453 100644 --- a/health/src/main/java/com/ccsens/health/bean/dto/UserDto.java +++ b/health/src/main/java/com/ccsens/health/bean/dto/UserDto.java @@ -22,4 +22,17 @@ public class UserDto { private String phone; } + + @Data + @ApiModel("查询个人轨迹") + public static class selectTrack { + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("学号") + private String mkno; + @ApiModelProperty("开始时间") + private String startTime; + @ApiModelProperty("结束时间") + private String endTime; + } } diff --git a/health/src/main/java/com/ccsens/health/bean/vo/AbnormalVo.java b/health/src/main/java/com/ccsens/health/bean/vo/AbnormalVo.java new file mode 100644 index 00000000..b6a12a87 --- /dev/null +++ b/health/src/main/java/com/ccsens/health/bean/vo/AbnormalVo.java @@ -0,0 +1,46 @@ +package com.ccsens.health.bean.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.math.BigDecimal; + +@Data +public class AbnormalVo { + + @Data + @ApiModel("疫情概览") + public static class AbnormalOverview{ + @ApiModelProperty("异常状态名称") + private String abnormalName; + @ApiModelProperty("数量") + private Long number; + } + + @Data + @ApiModel("异常人员统计") + public static class AbnormalStatisticsVo{ + @ApiModelProperty("id") + private String id; + @ApiModelProperty("学号") + private String wkno; + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("班级（所在机构）") + private String department; + @ApiModelProperty("体温") + private BigDecimal animalHeat; + @ApiModelProperty("原因") + private String reason; + @ApiModelProperty("状态 0:健康 1:治愈 2:隔离 3:疑似 4:确诊") + private int healthType; + @ApiModelProperty("开始确诊时间") + private Long startTime; + @ApiModelProperty("结束时间") + private Long endTime; + } + + +} diff --git a/health/src/main/java/com/ccsens/health/bean/vo/JourneyVo.java b/health/src/main/java/com/ccsens/health/bean/vo/JourneyVo.java index 1b787922..e3c80a5b 100644 --- a/health/src/main/java/com/ccsens/health/bean/vo/JourneyVo.java +++ b/health/src/main/java/com/ccsens/health/bean/vo/JourneyVo.java @@ -28,5 +28,20 @@ public class JourneyVo { private String together; } - + @Data + @ApiModel("查询异常行程返回") + public static class AddAbnormalJourney { + @ApiModelProperty("id") + private Long id; + @ApiModelProperty("出行方式 0铁路 1飞机 2客运车辆 3自驾 4船 5其他") + private int tripMode; + @ApiModelProperty("车次号") + private String carNo; + @ApiModelProperty("出发时间") + private Long startTime; + @ApiModelProperty("到达时间") + private Long endTime; + @ApiModelProperty("备注") + private String description; + } } diff --git a/health/src/main/java/com/ccsens/health/bean/vo/StudentVo.java b/health/src/main/java/com/ccsens/health/bean/vo/StudentVo.java new file mode 100644 index 00000000..56641388 --- /dev/null +++ b/health/src/main/java/com/ccsens/health/bean/vo/StudentVo.java @@ -0,0 +1,120 @@ +package com.ccsens.health.bean.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.Max; +import java.math.BigDecimal; +import java.util.List; + +@Data +public class StudentVo { + + @Data + @ApiModel("学生健康信息列表") + public static class StudentHealthVo { + @ApiModelProperty("id") + private Long id; + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("学号") + private String mkno; + @ApiModelProperty("班级（所在机构）") + private String department; + @ApiModelProperty("上报健康的时间") + private Long time; + @ApiModelProperty("有无湖北武汉接触史 0没有 1有") + private int touchHubei; + @ApiModelProperty("有无接触患者 0无 1有") + private int touchSick; + @ApiModelProperty("体温") + private BigDecimal animalHeat; + @ApiModelProperty("状态 0:健康 1:治愈 2:隔离 3:疑似 4:确诊") + private int healthType; + @ApiModelProperty("就诊医院") + private String hospital; + @ApiModelProperty("上报时详细地址") + private String address; + } + + @Data + @ApiModel("接触病患学生列表") + public static class ContactPatientVo { + @ApiModelProperty("校内打卡") + private List contactPatientInsideList; + @ApiModelProperty("校外行程") + private List contactPatientOutsideList; + } + + @Data + @ApiModel("接触病患学生列表(校内打卡)") + public static class ContactPatientInside { + @ApiModelProperty("id") + private Long id; + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("学号") + private String mkno; + @ApiModelProperty("班级（所在机构）") + private String department; + @ApiModelProperty("上报健康的时间") + private Long time; + @ApiModelProperty("有无湖北武汉接触史 0没有 1有") + private int touchHubei; + @ApiModelProperty("有无接触患者 0无 1有") + private int touchSick; + @ApiModelProperty("体温") + private BigDecimal animalHeat; + @ApiModelProperty("状态 0:健康 1:治愈 2:隔离 3:疑似 4:确诊") + private int healthType; + @ApiModelProperty("就诊医院") + private String hospital; + @ApiModelProperty("上报时详细地址") + private String address; + @ApiModelProperty("接触场所") + private List contactSiteList; + @ApiModelProperty("接触病人") + private List contactPatientList; + @ApiModelProperty("打卡场所") + private List clockInSiteList; + } + + @Data + @ApiModel("打卡场所列表") + public static class ClockInSite { + @ApiModelProperty("场所id") + private Long siteId; + @ApiModelProperty("场所名称") + private String siteName; + @ApiModelProperty("进入时间") + private Long inSiteTime; + @ApiModelProperty("离开时间") + private Long outSiteTime; + } + + @Data + @ApiModel("接触病患学生列表（校外行程）") + public static class ContactPatientOutside { + @ApiModelProperty("id") + private Long id; + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("学号") + private String mkno; + @ApiModelProperty("班级（所在机构）") + private String department; + @ApiModelProperty("'出行方式'") + private int tripMode; + @ApiModelProperty("车次号") + private String carNo; + @ApiModelProperty("行程类型 0未填写 1返校行程 2日常外出") + private int journeyType; + @ApiModelProperty("出发时间") + private Long startTime; + @ApiModelProperty("到达时间") + private Long endTime; + @ApiModelProperty("同行人员") + private String together; + } +} diff --git a/health/src/main/java/com/ccsens/health/bean/vo/UserVo.java b/health/src/main/java/com/ccsens/health/bean/vo/UserVo.java index b1c33b8e..61834a41 100644 --- a/health/src/main/java/com/ccsens/health/bean/vo/UserVo.java +++ b/health/src/main/java/com/ccsens/health/bean/vo/UserVo.java @@ -38,4 +38,30 @@ public class UserVo { private String healthCode; } + @Data + @ApiModel("个人轨迹信息") + public static class TrackInfo { + @ApiModelProperty("学生id") + private Long id; + @ApiModelProperty("学生姓名") + private String name; + @ApiModelProperty("学号") + private String mkno; + @ApiModelProperty("打卡记录") + private ClockIn clockInList; + } + + @Data + @ApiModel("个人轨迹场所打卡信息") + public static class ClockIn { + @ApiModelProperty("场所id") + private Long id; + @ApiModelProperty("场所名称") + private String name; + @ApiModelProperty("打卡时间") + private Long time; + @ApiModelProperty("打卡类型 0进 1出") + private int type; + } + } diff --git a/health/src/main/java/com/ccsens/health/service/AbnormalService.java b/health/src/main/java/com/ccsens/health/service/AbnormalService.java new file mode 100644 index 00000000..37d39a92 --- /dev/null +++ b/health/src/main/java/com/ccsens/health/service/AbnormalService.java @@ -0,0 +1,56 @@ +package com.ccsens.health.service; + +import com.ccsens.health.bean.dto.AbnormalDto; +import com.ccsens.health.bean.vo.AbnormalVo; +import com.ccsens.util.bean.dto.QueryDto; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class AbnormalService implements IAbnormalService{ + /** + * 疫情概览 + * @param params + * @return + */ + @Override + public List abnormalOverview(QueryDto params) { + return null; + } + + /** + * 异常人员添加 + * @param params + */ + @Override + public void AddAbnormal(QueryDto params) { + + } + + /** + * 异常人员统计 + */ + @Override + public List AbnormalStatistics(QueryDto params) { + return null; + } + + /** + * 修改异常人员信息 + * @param params + */ + @Override + public void updateAbnormal(QueryDto params) { + + } + + /** + * 删除异常人员信息 + * @param params + */ + @Override + public void delAbnormal(QueryDto params) { + + } +} diff --git a/health/src/main/java/com/ccsens/health/service/ClockService.java b/health/src/main/java/com/ccsens/health/service/ClockService.java index 68329218..4119e5ca 100644 --- a/health/src/main/java/com/ccsens/health/service/ClockService.java +++ b/health/src/main/java/com/ccsens/health/service/ClockService.java @@ -187,6 +187,24 @@ public class ClockService implements IClockService { siteDao.insertSelective(site); } + /** + * 删除场所 + * @param id + */ + @Override + public void delSite(Long id) { + + } + + /** + * 修改场所信息 + * @param param + */ + @Override + public void updateSite(JourneyDto.UpdateSite param) { + + } + @Override public ClockVo.SiteInfo getSiteInfoById(Long siteQrcodeId) { SiteQrcode siteQrcode = siteQrcodeDao.selectByPrimaryKey(siteQrcodeId); diff --git a/health/src/main/java/com/ccsens/health/service/IAbnormalService.java b/health/src/main/java/com/ccsens/health/service/IAbnormalService.java new file mode 100644 index 00000000..00944b18 --- /dev/null +++ b/health/src/main/java/com/ccsens/health/service/IAbnormalService.java @@ -0,0 +1,19 @@ +package com.ccsens.health.service; + +import com.ccsens.health.bean.dto.AbnormalDto; +import com.ccsens.health.bean.vo.AbnormalVo; +import com.ccsens.util.bean.dto.QueryDto; + +import java.util.List; + +public interface IAbnormalService { + List abnormalOverview(QueryDto params); + + void AddAbnormal(QueryDto params); + + List AbnormalStatistics(QueryDto params); + + void updateAbnormal(QueryDto params); + + void delAbnormal(QueryDto params); +} diff --git a/health/src/main/java/com/ccsens/health/service/IClockService.java b/health/src/main/java/com/ccsens/health/service/IClockService.java index ea975cfc..b90ca3ff 100644 --- a/health/src/main/java/com/ccsens/health/service/IClockService.java +++ b/health/src/main/java/com/ccsens/health/service/IClockService.java @@ -24,4 +24,8 @@ public interface IClockService { ClockVo.SiteInfo getSiteInfoById(Long id); void addSite(Site site); + + void delSite(Long id); + + void updateSite(JourneyDto.UpdateSite param); } diff --git a/health/src/main/java/com/ccsens/health/service/IJourneyService.java b/health/src/main/java/com/ccsens/health/service/IJourneyService.java index e4fdfba5..b08d0a9c 100644 --- a/health/src/main/java/com/ccsens/health/service/IJourneyService.java +++ b/health/src/main/java/com/ccsens/health/service/IJourneyService.java @@ -11,4 +11,12 @@ public interface IJourneyService { JourneyVo.JourneyInfo addJourney(QueryDto params); List getJourney(QueryDto params) throws Exception; + + void addAbnormalJourney(QueryDto params); + + List selectAbnormalJourney(QueryDto params); + + void updateAbnormalJourney(QueryDto params); + + void deleteAbnormalJourney(QueryDto params); } diff --git a/health/src/main/java/com/ccsens/health/service/IStudentService.java b/health/src/main/java/com/ccsens/health/service/IStudentService.java new file mode 100644 index 00000000..c76ea663 --- /dev/null +++ b/health/src/main/java/com/ccsens/health/service/IStudentService.java @@ -0,0 +1,13 @@ +package com.ccsens.health.service; + +import com.ccsens.health.bean.dto.StudentDto; +import com.ccsens.health.bean.vo.StudentVo; +import com.ccsens.util.bean.dto.QueryDto; + +import java.util.List; + +public interface IStudentService { + List getStudentHealthList(QueryDto params); + + StudentVo.ContactPatientVo getContactPatient(QueryDto params); +} diff --git a/health/src/main/java/com/ccsens/health/service/IUserService.java b/health/src/main/java/com/ccsens/health/service/IUserService.java index b7521151..71d65213 100644 --- a/health/src/main/java/com/ccsens/health/service/IUserService.java +++ b/health/src/main/java/com/ccsens/health/service/IUserService.java @@ -11,5 +11,7 @@ public interface IUserService { UserVo.UserInfo addUserInfo(QueryDto params); + UserVo.TrackInfo selectTrack(QueryDto params); + // Employee getEmployeeByUserId(Long userId); } diff --git a/health/src/main/java/com/ccsens/health/service/JourneyService.java b/health/src/main/java/com/ccsens/health/service/JourneyService.java index 1ba1139e..9f48ad59 100644 --- a/health/src/main/java/com/ccsens/health/service/JourneyService.java +++ b/health/src/main/java/com/ccsens/health/service/JourneyService.java @@ -86,5 +86,40 @@ public class JourneyService implements IJourneyService{ } + /** + * 添加异常行程 + * @param params + */ + @Override + public void addAbnormalJourney(QueryDto params) { + + } + + /** + * 查询异常行程 + * @param params + * @return + */ + @Override + public List selectAbnormalJourney(QueryDto params) { + return null; + } + /** + * 修改异常行程信息 + * @param params + */ + @Override + public void updateAbnormalJourney(QueryDto params) { + + } + + /** + * 删除异常行程信息 + * @param params + */ + @Override + public void deleteAbnormalJourney(QueryDto params) { + + } } diff --git a/health/src/main/java/com/ccsens/health/service/StudentService.java b/health/src/main/java/com/ccsens/health/service/StudentService.java new file mode 100644 index 00000000..7bfe2859 --- /dev/null +++ b/health/src/main/java/com/ccsens/health/service/StudentService.java @@ -0,0 +1,32 @@ +package com.ccsens.health.service; + +import com.ccsens.health.bean.dto.StudentDto; +import com.ccsens.health.bean.vo.StudentVo; +import com.ccsens.util.bean.dto.QueryDto; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class StudentService implements IStudentService{ + + /** + * 查询学生健康信息列表 + * @param params + * @return + */ + @Override + public List getStudentHealthList(QueryDto params) { + return null; + } + + /** + * 查询接触病患的学生列表 + * @param params + * @return + */ + @Override + public StudentVo.ContactPatientVo getContactPatient(QueryDto params) { + return null; + } +} diff --git a/health/src/main/java/com/ccsens/health/service/UserService.java b/health/src/main/java/com/ccsens/health/service/UserService.java index 16ba3723..692d9d5e 100644 --- a/health/src/main/java/com/ccsens/health/service/UserService.java +++ b/health/src/main/java/com/ccsens/health/service/UserService.java @@ -115,19 +115,13 @@ public class UserService implements IUserService{ return userInfoVo; } - -// /** -// * 通过userid获取employeeId -// */ -// @Override -// public Employee getEmployeeByUserId(Long userId){ -// EmployeeExample employeeExample = new EmployeeExample(); -// employeeExample.createCriteria().andTallUserIdEqualTo(userId); -// List employeeList = employeeDao.selectByExample(employeeExample); -// if(CollectionUtil.isEmpty(employeeList)){ -// throw new BaseException(CodeEnum.NOT_EMPLOYEE); -// } -// return employeeList.get(0); -// } - + /** + * 查询个人轨迹 + * @param params + * @return + */ + @Override + public UserVo.TrackInfo selectTrack(QueryDto params) { + return null; + } }