From 50d3263b2065ff854d076ac40e84a180ca0b629d Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Tue, 15 Dec 2020 10:55:49 +0800 Subject: [PATCH] =?UTF-8?q?20201215=E4=BF=AE=E6=94=B9=E5=B9=B3=E8=BD=A6?= =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wisdomcar/api/StatisticsController.java | 19 ++++++++++--------- .../wisdomcar/bean/dto/StatisticsDto.java | 2 +- .../wisdomcar/service/RecordService.java | 12 ++++++------ wisdomcar/src/main/resources/application.yml | 4 ++-- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/StatisticsController.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/StatisticsController.java index 2a200399..30a6d4da 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/StatisticsController.java +++ b/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 getResult(@ApiParam @Validated @RequestBody QueryDto 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 getResult(@ApiParam @Validated @RequestBody QueryDto 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 selResult(@ApiParam @Validated @RequestBody QueryDto 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 params) { + public JsonResponse getPointTime(@ApiParam @Validated @RequestBody QueryDto params) { log.info("急救各个节点时间统计：{}",params); StatisticsVo.PointTimeList pointTime = statisticsService.getPointTime(params.getParam()); log.info("急救各个节点时间统计"); diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/StatisticsDto.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/StatisticsDto.java index 89a91716..333b589f 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/StatisticsDto.java +++ b/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 即可") diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RecordService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RecordService.java index 9d75d3cd..29ee248b 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RecordService.java +++ b/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); //发送消息 diff --git a/wisdomcar/src/main/resources/application.yml b/wisdomcar/src/main/resources/application.yml index a47f2a7b..ac92adb9 100644 --- a/wisdomcar/src/main/resources/application.yml +++ b/wisdomcar/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: dev - include: common, util-dev + active: test + include: common, util-test