Merge branch 'master' of https://gitee.com/ccsens_s/ccsenscloud

health/src/main/java/com/ccsens/health/api/ClockController.java

@@ -0,0 +1,59 @@
+package com.ccsens.health.api;
+
+import com.ccsens.cloudutil.annotation.MustLogin;
+import com.ccsens.health.bean.dto.ClockDto;
+import com.ccsens.health.bean.dto.HealthDto;
+import com.ccsens.health.bean.dto.JourneyDto;
+import com.ccsens.health.bean.vo.ClockVo;
+import com.ccsens.health.bean.vo.HealthVo;
+import com.ccsens.health.service.IClockService;
+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.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+@Slf4j
+@Api(tags = "打卡签到相关" , description = "")
+@RestController
+@RequestMapping("/sites")
+public class ClockController {
+    @Autowired
+    private IClockService clockService;
+
+    @MustLogin
+    @ApiOperation(value = "扫码打卡", notes = "")
+    @RequestMapping(value = "upload", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse siteClockIn(@ApiParam @Validated @RequestBody QueryDto<ClockDto.SiteDto> params) throws Exception {
+        log.info("扫码打卡：{}",params);
+        clockService.siteClockIn(params);
+        return JsonResponse.newInstance().ok();
+    }
+
+    @MustLogin
+    @ApiOperation(value = "查看自己打卡记录", notes = "")
+    @RequestMapping(value = "info", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<ClockVo.SiteClockInfo> getSiteClock(@ApiParam @Validated @RequestBody QueryDto<JourneyDto.SelectDate> params) throws Exception {
+        log.info("扫码打卡：{}",params);
+        List<ClockVo.SiteClockInfo> siteClockInfoList = clockService.getSiteClock(params);
+        return JsonResponse.newInstance().ok(siteClockInfoList);
+    }
+
+
+    @MustLogin
+    @ApiOperation(value = "扫码统计", notes = "")
+    @RequestMapping(value = "statistics", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<List<ClockVo.SiteClockStatistics>> getSiteClickStatistics(HttpServletRequest request,
+                                                                              @RequestParam String date) throws Exception {
+        log.info("扫码统计");
+        List<ClockVo.SiteClockStatistics> siteClockStatisticsList = clockService.getSiteClickStatistics(date);
+        return JsonResponse.newInstance().ok(siteClockStatisticsList);
+    }
+}

health/src/main/java/com/ccsens/health/api/DebugController.java

@@ -0,0 +1,28 @@
+package com.ccsens.health.api;
+
+import com.ccsens.util.JsonResponse;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Api(tags = "DEBUG" , description = "DebugController | ")
+@RestController
+@RequestMapping("/debug")
+public class DebugController {
+
+    @ApiOperation(value = "/测试",notes = "")
+    @ApiImplicitParams({
+    })
+    @RequestMapping(value="",method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"})
+    public JsonResponse getSmsCode(HttpServletRequest request) throws Exception {
+
+        return JsonResponse.newInstance().ok("测试");
+    }
+
+
+}

health/src/main/java/com/ccsens/health/api/HealthController.java

@@ -0,0 +1,70 @@
+package com.ccsens.health.api;
+
+import com.ccsens.cloudutil.annotation.MustLogin;
+import com.ccsens.health.bean.dto.HealthDto;
+import com.ccsens.health.bean.dto.JourneyDto;
+import com.ccsens.health.bean.vo.HealthVo;
+import com.ccsens.health.bean.vo.JourneyVo;
+import com.ccsens.health.bean.vo.UserVo;
+import com.ccsens.health.service.IHealthService;
+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.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+@Slf4j
+@Api(tags = "健康相关" , description = "")
+@RestController
+@RequestMapping("/health")
+public class HealthController {
+
+    @Autowired
+    private IHealthService healthService;
+
+    @MustLogin
+    @ApiOperation(value = "健康打卡", notes = "")
+    @RequestMapping(value = "upload", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<HealthVo.HealthInfo> addHealthInfo(@ApiParam @Validated @RequestBody QueryDto<HealthDto.healthInfo> params) throws Exception {
+        log.info("健康打卡：{}",params);
+        HealthVo.HealthInfo healthInfo = healthService.addHealthInfo(params);
+        return JsonResponse.newInstance().ok(healthInfo);
+    }
+
+
+    @MustLogin
+    @ApiOperation(value = "获取个人健康打卡记录", notes = "")
+    @RequestMapping(value = "info", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<HealthVo.HealthInfo> getHealthInfo(@ApiParam @Validated @RequestBody QueryDto<JourneyDto.SelectDate> params) throws Exception {
+        log.info("获取个人健康打卡记录：{}",params);
+        HealthVo.HealthInfo healthInfo = healthService.getHealthInfo(params);
+        return JsonResponse.newInstance().ok(healthInfo);
+    }
+
+    @MustLogin
+    @ApiOperation(value = "查询健康状态类型", notes = "")
+    @RequestMapping(value = "type", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<List<HealthVo.HealthType>> getHealthType() throws Exception {
+        log.info("查询健康状态类型");
+        List<HealthVo.HealthType> healthTypeList = healthService.getHealthType();
+        return JsonResponse.newInstance().ok(healthTypeList);
+    }
+
+    @MustLogin
+    @ApiOperation(value = "健康类型统计", notes = "")
+    @RequestMapping(value = "statistics", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<List<HealthVo.HealthTypeStatistics>> getHealthTypeStatistics(HttpServletRequest request,
+                                                                                @RequestParam String date) throws Exception {
+        log.info("健康类型统计");
+        List<HealthVo.HealthTypeStatistics> healthTypeStatisticsList = healthService.getHealthTypeStatistics(date);
+        return JsonResponse.newInstance().ok(healthTypeStatisticsList);
+    }
+
+}

health/src/main/java/com/ccsens/health/api/JourneyController.java

@@ -0,0 +1,48 @@
+package com.ccsens.health.api;
+
+import com.ccsens.cloudutil.annotation.MustLogin;
+import com.ccsens.health.bean.dto.JourneyDto;
+import com.ccsens.health.bean.vo.JourneyVo;
+import com.ccsens.health.bean.vo.UserVo;
+import com.ccsens.health.service.IJourneyService;
+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;
+
+@Slf4j
+@Api(tags = "行程相关" , description = "")
+@RestController
+@RequestMapping("/journeys")
+public class JourneyController {
+
+    @Autowired
+    private IJourneyService journeyService;
+
+    @MustLogin
+    @ApiOperation(value = "上报行程", notes = "")
+    @RequestMapping(value = "upload", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<JourneyVo.JourneyInfo> addJourney(@ApiParam @Validated @RequestBody QueryDto<JourneyDto.JourneyInfo> params) throws Exception {
+        log.info("上报行程：{}",params);
+        JourneyVo.JourneyInfo journeyInfo = journeyService.addJourney(params);
+        return JsonResponse.newInstance().ok(journeyInfo);
+    }
+
+
+    @MustLogin
+    @ApiOperation(value = "查询行程", notes = "")
+    @RequestMapping(value = "info", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<JourneyVo.JourneyInfo> getJourney(@ApiParam @Validated @RequestBody QueryDto<JourneyDto.SelectDate> params) throws Exception {
+        log.info("查询行程：{}",params);
+        JourneyVo.JourneyInfo journeyInfo = journeyService.getJourney(params);
+        return JsonResponse.newInstance().ok(journeyInfo);
+    }
+}

health/src/main/java/com/ccsens/health/api/UserController.java

@@ -0,0 +1,46 @@
+package com.ccsens.health.api;
+
+import com.ccsens.cloudutil.annotation.MustLogin;
+import com.ccsens.health.bean.dto.UserDto;
+import com.ccsens.health.bean.vo.UserVo;
+import com.ccsens.health.service.IUserService;
+import com.ccsens.util.JsonResponse;
+import com.ccsens.util.bean.dto.QueryDto;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+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;
+
+@Slf4j
+@Api(tags = "个人信息相关" , description = "")
+@RestController
+@RequestMapping("/users")
+public class UserController {
+    @Autowired
+    private IUserService userService;
+
+    @MustLogin
+    @ApiOperation(value = "查询个人信息", notes = "")
+    @RequestMapping(value = "info", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<UserVo.UserInfo> getUserInfo(@ApiParam @Validated @RequestBody QueryDto params) throws Exception {
+        log.info("查询个人信息：{}",params);
+        UserVo.UserInfo  userInfo = userService.getUserInfo(params);
+        return JsonResponse.newInstance().ok(userInfo);
+    }
+
+    @MustLogin
+    @ApiOperation(value = "保存个人信息", notes = "")
+    @RequestMapping(value = "addInfo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<UserVo.UserInfo> addUserInfo(@ApiParam @Validated @RequestBody QueryDto<UserDto.UserInfo> params) throws Exception {
+        log.info("保存个人信息：{}",params);
+        UserVo.UserInfo  userInfo = userService.addUserInfo(params);
+        return JsonResponse.newInstance().ok(userInfo);
+    }
+}

health/src/main/java/com/ccsens/health/bean/dto/ClockDto.java

@@ -0,0 +1,15 @@
+package com.ccsens.health.bean.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ClockDto {
+    @Data
+    @ApiModel("场景id")
+    public static class SiteDto{
+        @ApiModelProperty("场景id")
+        private Long siteId;
+    }
+}

health/src/main/java/com/ccsens/health/bean/dto/HealthDto.java

@@ -0,0 +1,31 @@
+package com.ccsens.health.bean.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class HealthDto {
+
+
+    @Data
+    @ApiModel("上报健康状况")
+    public static class healthInfo{
+        @ApiModelProperty("日期")
+        private Long time;
+        @ApiModelProperty("当前所在地区")
+        private String district;
+        @ApiModelProperty("当前所在详细地址")
+        private String address;
+        @ApiModelProperty("当前身体状态")
+        private Long healthTypeId;
+        @ApiModelProperty("就诊医院")
+        private Long hospital;
+        @ApiModelProperty("有无湖北武汉接触史 0没有 1有")
+        private int touchHuBei;
+        @ApiModelProperty("有无接触患者 0无 1有")
+        private Long touchSick;
+        @ApiModelProperty("体温")
+        private Long animalHeat;
+    }
+}

health/src/main/java/com/ccsens/health/bean/dto/JourneyDto.java

@@ -0,0 +1,35 @@
+package com.ccsens.health.bean.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class JourneyDto {
+
+    @Data
+    @ApiModel("上报行程")
+    public static class JourneyInfo{
+        @ApiModelProperty("'出行方式'")
+        private String tripMode;
+        @ApiModelProperty("车次号")
+        private String carNo;
+        @ApiModelProperty("行程类型 0未填写 1返校行程 2日常外出")
+        private int journeyType;
+        @ApiModelProperty("出发时间")
+        private Long startTime;
+        @ApiModelProperty("到达时间")
+        private Long endTime;
+        @ApiModelProperty("同行人员")
+        private String together;
+    }
+
+    @Data
+    @ApiModel("查询的时间范围")
+    public static class SelectDate{
+        @ApiModelProperty("开始时间 默认今天零点")
+        private Long startTime;
+        @ApiModelProperty("结束时间 默认当前时间")
+        private Long endTime;
+    }
+}

health/src/main/java/com/ccsens/health/bean/dto/UserDto.java

@@ -0,0 +1,29 @@
+package com.ccsens.health.bean.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class UserDto {
+
+    @Data
+    @ApiModel("保存的信息")
+    public static class UserInfo{
+        @ApiModelProperty("微信建立的部门id")
+        private Long weixinId;
+        @ApiModelProperty("姓名")
+        private String name;
+        @ApiModelProperty("性别 0男 1女")
+        private int gender;
+        @ApiModelProperty("状态 0激活 1禁用 2未激活")
+        private int status;
+        @ApiModelProperty("'地址'")
+        private String address;
+        @ApiModelProperty("是否隐藏手机号 0隐藏 1不隐藏")
+        private int hideMobile;
+        @ApiModelProperty("英文名")
+        private String englishName;
+    }
+
+}

health/src/main/java/com/ccsens/health/bean/vo/ClockVo.java

@@ -0,0 +1,37 @@
+package com.ccsens.health.bean.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ClockVo {
+
+    @Data
+    @ApiModel("获取个人打卡记录")
+    public static class SiteClockInfo{
+        @ApiModelProperty("场景id")
+        private Long siteId;
+        @ApiModelProperty("场所名称")
+        private String siteName;
+        @ApiModelProperty("打卡时间")
+        private Long time;
+        @ApiModelProperty("经度")
+        private Long longitude;
+        @ApiModelProperty("纬度")
+        private Long latitude;
+    }
+
+
+    @Data
+    @ApiModel("场景打卡统计")
+    public static class SiteClockStatistics{
+        @ApiModelProperty("场景id")
+        private Long siteId;
+        @ApiModelProperty("场所名称")
+        private String siteName;
+        @ApiModelProperty("人数")
+        private Integer number;
+    }
+
+}

health/src/main/java/com/ccsens/health/bean/vo/HealthVo.java

@@ -0,0 +1,57 @@
+package com.ccsens.health.bean.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class HealthVo {
+
+    @Data
+    @ApiModel("获取个人健康打卡信息")
+    public static class HealthInfo{
+        @ApiModelProperty("打卡记录的id")
+        private Long id;
+        @ApiModelProperty("成员id")
+        private Long userId;
+        @ApiModelProperty("日期")
+        private Long time;
+        @ApiModelProperty("当前所在地区")
+        private String district;
+        @ApiModelProperty("当前所在详细地址")
+        private String address;
+        @ApiModelProperty("当前身体状态")
+        private Long healthTypeId;
+        @ApiModelProperty("就诊医院")
+        private Long hospital;
+        @ApiModelProperty("有无湖北武汉接触史 0没有 1有")
+        private int touchHuBei;
+        @ApiModelProperty("有无接触患者 0无 1有")
+        private int touchSick;
+        @ApiModelProperty("体温")
+        private BigDecimal animalHeat;
+    }
+
+    @Data
+    @ApiModel("健康状态")
+    public static class HealthType{
+        @ApiModelProperty("id")
+        private Long id;
+        @ApiModelProperty("状态名")
+        private String name;
+    }
+
+    @Data
+    @ApiModel("健康状态")
+    public static class HealthTypeStatistics{
+        @ApiModelProperty("id")
+        private Long id;
+        @ApiModelProperty("状态名")
+        private String name;
+        @ApiModelProperty("人数")
+        private Integer number;
+    }
+
+}

health/src/main/java/com/ccsens/health/bean/vo/JourneyVo.java

@@ -0,0 +1,30 @@
+package com.ccsens.health.bean.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class JourneyVo {
+
+    @Data
+    @ApiModel("获取行程信息")
+    public static class JourneyInfo{
+        @ApiModelProperty("Id")
+        private Long id;
+        @ApiModelProperty("'出行方式'")
+        private String tripMode;
+        @ApiModelProperty("车次号")
+        private String carNo;
+        @ApiModelProperty("行程类型 0未填写 1返校行程 2日常外出")
+        private int journeyType;
+        @ApiModelProperty("出发时间")
+        private Long startTime;
+        @ApiModelProperty("到达时间")
+        private Long endTime;
+        @ApiModelProperty("同行人员")
+        private String together;
+    }
+
+
+}

health/src/main/java/com/ccsens/health/bean/vo/UserVo.java

@@ -0,0 +1,33 @@
+package com.ccsens.health.bean.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class UserVo {
+
+    @Data
+    @ApiModel("查询个人信息")
+    public static class UserInfo{
+        @ApiModelProperty("Id")
+        private Long id;
+        @ApiModelProperty("微信建立的部门id")
+        private Long weixinId;
+        @ApiModelProperty("姓名")
+        private String name;
+        @ApiModelProperty("性别 0男 1女")
+        private int gender;
+        @ApiModelProperty("状态 0激活 1禁用 2未激活")
+        private int status;
+        @ApiModelProperty("'地址'")
+        private String address;
+        @ApiModelProperty("是否隐藏手机号 0隐藏 1不隐藏")
+        private int hideMobile;
+        @ApiModelProperty("英文名")
+        private String englishName;
+        @ApiModelProperty("tall里的userId")
+        private Long tallUserId;
+
+    }
+}

health/src/main/java/com/ccsens/health/service/ClockService.java

@@ -0,0 +1,43 @@
+package com.ccsens.health.service;
+
+import com.ccsens.health.bean.dto.ClockDto;
+import com.ccsens.health.bean.dto.JourneyDto;
+import com.ccsens.health.bean.vo.ClockVo;
+import com.ccsens.util.bean.dto.QueryDto;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class ClockService implements IClockService {
+
+
+    /**
+     * 场景扫码打卡
+     * @param params
+     */
+    @Override
+    public void siteClockIn(QueryDto<ClockDto.SiteDto> params) {
+
+    }
+
+    /**
+     * 查看自身打卡记录
+     * @param params
+     * @return
+     */
+    @Override
+    public List<ClockVo.SiteClockInfo> getSiteClock(QueryDto<JourneyDto.SelectDate> params) {
+        return null;
+    }
+
+    /**
+     * 场所扫码统计
+     * @param date
+     * @return
+     */
+    @Override
+    public List<ClockVo.SiteClockStatistics> getSiteClickStatistics(String date) {
+        return null;
+    }
+}

health/src/main/java/com/ccsens/health/service/HealthService.java

@@ -0,0 +1,52 @@
+package com.ccsens.health.service;
+
+import com.ccsens.health.bean.dto.HealthDto;
+import com.ccsens.health.bean.dto.JourneyDto;
+import com.ccsens.health.bean.vo.HealthVo;
+import com.ccsens.util.bean.dto.QueryDto;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class HealthService implements IHealthService{
+
+    /**
+     * 上报健康信息
+     * @param params
+     * @return
+     */
+    @Override
+    public HealthVo.HealthInfo addHealthInfo(QueryDto<HealthDto.healthInfo> params) {
+        return null;
+    }
+
+    /**
+     * 获取个人健康信息
+     * @param params
+     * @return
+     */
+    @Override
+    public HealthVo.HealthInfo getHealthInfo(QueryDto<JourneyDto.SelectDate> params) {
+        return null;
+    }
+
+    /**
+     * 获取健康类型
+     * @return
+     */
+    @Override
+    public List<HealthVo.HealthType> getHealthType() {
+        return null;
+    }
+
+    /**
+     * 健康状态统计
+     * @param date
+     * @return
+     */
+    @Override
+    public List<HealthVo.HealthTypeStatistics> getHealthTypeStatistics(String date) {
+        return null;
+    }
+}

health/src/main/java/com/ccsens/health/service/IClockService.java

@@ -0,0 +1,16 @@
+package com.ccsens.health.service;
+
+import com.ccsens.health.bean.dto.ClockDto;
+import com.ccsens.health.bean.dto.JourneyDto;
+import com.ccsens.health.bean.vo.ClockVo;
+import com.ccsens.util.bean.dto.QueryDto;
+
+import java.util.List;
+
+public interface IClockService {
+    void siteClockIn(QueryDto<ClockDto.SiteDto> params);
+
+    List<ClockVo.SiteClockInfo> getSiteClock(QueryDto<JourneyDto.SelectDate> params);
+
+    List<ClockVo.SiteClockStatistics> getSiteClickStatistics(String date);
+}

health/src/main/java/com/ccsens/health/service/IHealthService.java

@@ -0,0 +1,18 @@
+package com.ccsens.health.service;
+
+import com.ccsens.health.bean.dto.HealthDto;
+import com.ccsens.health.bean.dto.JourneyDto;
+import com.ccsens.health.bean.vo.HealthVo;
+import com.ccsens.util.bean.dto.QueryDto;
+
+import java.util.List;
+
+public interface IHealthService {
+    HealthVo.HealthInfo addHealthInfo(QueryDto<HealthDto.healthInfo> params);
+
+    HealthVo.HealthInfo getHealthInfo(QueryDto<JourneyDto.SelectDate> params);
+
+    List<HealthVo.HealthType> getHealthType();
+
+    List<HealthVo.HealthTypeStatistics> getHealthTypeStatistics(String date);
+}

health/src/main/java/com/ccsens/health/service/IJourneyService.java

@@ -0,0 +1,12 @@
+package com.ccsens.health.service;
+
+import com.ccsens.health.bean.dto.JourneyDto;
+import com.ccsens.health.bean.vo.JourneyVo;
+import com.ccsens.health.bean.vo.UserVo;
+import com.ccsens.util.bean.dto.QueryDto;
+
+public interface IJourneyService {
+    JourneyVo.JourneyInfo addJourney(QueryDto<JourneyDto.JourneyInfo> params);
+
+    JourneyVo.JourneyInfo getJourney(QueryDto<JourneyDto.SelectDate> params);
+}

health/src/main/java/com/ccsens/health/service/IUserService.java

@@ -0,0 +1,11 @@
+package com.ccsens.health.service;
+
+import com.ccsens.health.bean.dto.UserDto;
+import com.ccsens.health.bean.vo.UserVo;
+import com.ccsens.util.bean.dto.QueryDto;
+
+public interface IUserService {
+    UserVo.UserInfo getUserInfo(QueryDto params);
+
+    UserVo.UserInfo addUserInfo(QueryDto<UserDto.UserInfo> params);
+}

health/src/main/java/com/ccsens/health/service/JourneyService.java

@@ -0,0 +1,32 @@
+package com.ccsens.health.service;
+
+import com.ccsens.health.bean.dto.JourneyDto;
+import com.ccsens.health.bean.vo.JourneyVo;
+import com.ccsens.health.bean.vo.UserVo;
+import com.ccsens.util.bean.dto.QueryDto;
+import org.springframework.stereotype.Service;
+
+@Service
+public class JourneyService implements IJourneyService{
+
+
+    /**
+     * 上报行程
+     * @param params
+     * @return
+     */
+    @Override
+    public JourneyVo.JourneyInfo addJourney(QueryDto<JourneyDto.JourneyInfo> params) {
+        return null;
+    }
+
+    /**
+     * 查询行程
+     * @param params
+     * @return
+     */
+    @Override
+    public JourneyVo.JourneyInfo getJourney(QueryDto<JourneyDto.SelectDate> params) {
+        return null;
+    }
+}

health/src/main/java/com/ccsens/health/service/UserService.java

@@ -0,0 +1,31 @@
+package com.ccsens.health.service;
+
+import com.ccsens.health.bean.dto.UserDto;
+import com.ccsens.health.bean.vo.UserVo;
+import com.ccsens.util.bean.dto.QueryDto;
+import org.springframework.stereotype.Service;
+
+@Service
+public class UserService implements IUserService{
+
+
+    /**
+     * 查询个人信息
+     * @param params
+     * @return
+     */
+    @Override
+    public UserVo.UserInfo getUserInfo(QueryDto params) {
+        return null;
+    }
+
+    /**
+     * 保存个人信息
+     * @param params
+     * @return
+     */
+    @Override
+    public UserVo.UserInfo addUserInfo(QueryDto<UserDto.UserInfo> params) {
+        return null;
+    }
+}