Browse Source

20201215修改平车消息

recovery
zy_Java 5 years ago
parent
commit
50d3263b20
  1. 19
      wisdomcar/src/main/java/com/ccsens/wisdomcar/api/StatisticsController.java
  2. 2
      wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/StatisticsDto.java
  3. 12
      wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RecordService.java
  4. 4
      wisdomcar/src/main/resources/application.yml

19
wisdomcar/src/main/java/com/ccsens/wisdomcar/api/StatisticsController.java

@ -29,14 +29,15 @@ public class StatisticsController {
@Resource
private IStatisticsService statisticsService;
@ApiOperation(value = "查看测评结果", notes = "")
@RequestMapping(value = "/get/result", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<StatisticsVo.FastEdResult> getResult(@ApiParam @Validated @RequestBody QueryDto<StatisticsDto.Hospital> params) {
log.info("查看测评结果:{}",params);
StatisticsVo.FastEdResult fastEdResult = statisticsService.getResult(params.getParam());
log.info("查看测评结果");
return JsonResponse.newInstance().ok(fastEdResult);
}
// @ApiOperation(value = "查看测评结果", notes = "")
// @RequestMapping(value = "/get/result", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
// public JsonResponse<StatisticsVo.FastEdResult> getResult(@ApiParam @Validated @RequestBody QueryDto<StatisticsDto.Hospital> params) {
// log.info("查看测评结果:{}",params);
// StatisticsVo.FastEdResult fastEdResult = statisticsService.getResult(params.getParam());
// log.info("查看测评结果");
// return JsonResponse.newInstance().ok(fastEdResult);
// }
@ApiOperation(value = "统计医院中小车得使用情况", notes = "")
@RequestMapping(value = "/get/selResult", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<StatisticsVo.UseNumsVo> selResult(@ApiParam @Validated @RequestBody QueryDto<StatisticsDto.UseNum> params) {
@ -50,7 +51,7 @@ public class StatisticsController {
@ApiOperation(value = "急救各个节点时间统计", notes = "")
@RequestMapping(value = "/getPointTime", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse getPointTime(@ApiParam @Validated @RequestBody QueryDto<StatisticsDto.Hospital> params) {
public JsonResponse<StatisticsVo.PointTimeList> getPointTime(@ApiParam @Validated @RequestBody QueryDto<StatisticsDto.Hospital> params) {
log.info("急救各个节点时间统计:{}",params);
StatisticsVo.PointTimeList pointTime = statisticsService.getPointTime(params.getParam());
log.info("急救各个节点时间统计");

2
wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/StatisticsDto.java

@ -13,7 +13,7 @@ import javax.validation.constraints.NotNull;
@Data
public class StatisticsDto {
@Data
@ApiModel("查询小车本年和往年使用次数")
@ApiModel("医院id和年份")
public static class UseNum{
@NotBlank
@ApiModelProperty("year,比如直接传入 2020 即可")

12
wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RecordService.java

@ -129,28 +129,28 @@ public class RecordService implements IRecordService{
//第一个传感器
CarRecordMessageDto sensorMessage1 = new CarRecordMessageDto();
BeanUtil.copyProperties(carRecordMessageDto,sensor1);
BeanUtil.copyProperties(carRecordMessageDto,sensorMessage1);
sensorMessage1.setType(Constant.WEIGHT_SENSOR_1);
sensorMessage1.setValue(sensor1 + "");
//发送消息
sendRecordMessage(sensorMessage1,userIdSet);
//第二个传感器
CarRecordMessageDto sensorMessage2 = new CarRecordMessageDto();
BeanUtil.copyProperties(carRecordMessageDto,sensor1);
BeanUtil.copyProperties(carRecordMessageDto,sensorMessage2);
sensorMessage2.setType(Constant.WEIGHT_SENSOR_2);
sensorMessage2.setValue(sensor2 + "");
//发送消息
sendRecordMessage(sensorMessage2,userIdSet);
//第三个传感器
CarRecordMessageDto sensorMessage3 = new CarRecordMessageDto();
BeanUtil.copyProperties(carRecordMessageDto,sensor1);
BeanUtil.copyProperties(carRecordMessageDto,sensorMessage3);
sensorMessage3.setType(Constant.WEIGHT_SENSOR_3);
sensorMessage3.setValue(sensor3 + "");
//发送消息
sendRecordMessage(sensorMessage3,userIdSet);
//第四个传感器
CarRecordMessageDto sensorMessage4 = new CarRecordMessageDto();
BeanUtil.copyProperties(carRecordMessageDto,sensor1);
BeanUtil.copyProperties(carRecordMessageDto,sensorMessage4);
sensorMessage4.setType(Constant.WEIGHT_SENSOR_4);
sensorMessage4.setValue(sensor4 + "");
//发送消息
@ -161,9 +161,9 @@ public class RecordService implements IRecordService{
int shakeX = random.nextInt(65535);
int shakeY = random.nextInt(65535);
int shakeZ = random.nextInt(65535);
//第四个传感器
//震动传感器
CarRecordMessageDto shakeMessage = new CarRecordMessageDto();
BeanUtil.copyProperties(carRecordMessageDto,sensor1);
BeanUtil.copyProperties(carRecordMessageDto,shakeMessage);
shakeMessage.setType(Constant.WEIGHT_SENSOR_4);
shakeMessage.setValue(shakeX + "," + shakeY + "," + shakeZ);
//发送消息

4
wisdomcar/src/main/resources/application.yml

@ -1,6 +1,6 @@
spring:
profiles:
active: dev
include: common, util-dev
active: test
include: common, util-test

Loading…
Cancel
Save