From 01eaefa7609913a5f1604c7f7c7f6ea437b3ecaa Mon Sep 17 00:00:00 2001 From: zhizhi wu <2377881365@qq.com> Date: Tue, 1 Jun 2021 15:10:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E8=BD=A61.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../ccsens/tcm/service/PatientService.java | 2 +- .../wisdomcar/api/ProjectController.java | 45 +++++++++++++++++++ .../wisdomcar/api/WisdomCarController.java | 38 ++++++++++++++++ .../wisdomcar/api/WisdomCatController.java | 16 ------- .../ccsens/wisdomcar/bean/dto/ProjectDto.java | 33 ++++++++++++++ .../wisdomcar/bean/dto/WisdomCarDto.java | 18 ++++++++ .../ccsens/wisdomcar/bean/vo/ProjectVo.java | 19 ++++++++ .../ccsens/wisdomcar/bean/vo/WisdomCarVo.java | 21 +++++++++ 9 files changed, 176 insertions(+), 18 deletions(-) create mode 100644 wisdomcar/src/main/java/com/ccsens/wisdomcar/api/ProjectController.java create mode 100644 wisdomcar/src/main/java/com/ccsens/wisdomcar/api/WisdomCarController.java delete mode 100644 wisdomcar/src/main/java/com/ccsens/wisdomcar/api/WisdomCatController.java create mode 100644 wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/ProjectDto.java create mode 100644 wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/WisdomCarDto.java create mode 100644 wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/ProjectVo.java create mode 100644 wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/WisdomCarVo.java diff --git a/pom.xml b/pom.xml index 6cdeb874..6a98bbc6 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ game mt - + wisdomcar beneficiation diff --git a/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java b/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java index 5e4c9ff1..0d5c1aec 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java @@ -292,7 +292,7 @@ public class PatientService implements IPatientService { public StatisticVo.SelCountS countCase(StatisticDto.SelCount param, Long userId) { StatisticVo.SelCountS selCountS=new StatisticVo.SelCountS(); - selCountS.setNewNums(patientDao.countCase(param,(byte)0)); + selCountS.setNewNums(patientDao.countCase(param,(byte)0,(byte)1)); selCountS.setOverNums(patientDao.countCase(param,(byte)2,(byte)5,(byte)6)); return selCountS; diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/ProjectController.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/ProjectController.java new file mode 100644 index 00000000..2ab05623 --- /dev/null +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/ProjectController.java @@ -0,0 +1,45 @@ +package com.ccsens.wisdomcar.api; + +import com.ccsens.util.JsonResponse; +import com.ccsens.util.bean.dto.QueryDto; +import com.ccsens.wisdomcar.bean.dto.ProjectDto; +import com.ccsens.wisdomcar.bean.dto.WisdomCarDto; +import com.ccsens.wisdomcar.bean.vo.ProjectVo; +import com.ccsens.wisdomcar.bean.vo.WisdomCarVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; +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; + +/** + * @description: 项目页面的操作 + * @author: whj + * @time: 2021/6/1 13:31 + */ +@Slf4j +@Api(tags = "页面相关api" , description = "") +@RestController +@RequestMapping("/project") +public class ProjectController { + @ApiOperation(value = "点击开始", notes = "whj") + @RequestMapping(value = "/start", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse start(@ApiParam @Validated @RequestBody QueryDto params){ + log.info("空闲平车查询：{}", params); + +// log.info("空闲平车查询结果：{}",); + return JsonResponse.newInstance().ok(); + } + @ApiOperation(value = "称重和剂量", notes = "whj") + @RequestMapping(value = "/weight", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse weight(@ApiParam @Validated @RequestBody QueryDto params){ + log.info("空闲平车查询：{}", params); + +// log.info("空闲平车查询结果：{}",); + return JsonResponse.newInstance().ok(); + } +} diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/WisdomCarController.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/WisdomCarController.java new file mode 100644 index 00000000..bd57b430 --- /dev/null +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/WisdomCarController.java @@ -0,0 +1,38 @@ +package com.ccsens.wisdomcar.api; + +import com.ccsens.util.JsonResponse; +import com.ccsens.util.bean.dto.QueryDto; +import com.ccsens.wisdomcar.bean.dto.RecordDto; +import com.ccsens.wisdomcar.bean.dto.WisdomCarDto; +import com.ccsens.wisdomcar.bean.vo.RecordVo; +import com.ccsens.wisdomcar.bean.vo.WisdomCarVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; +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; + +/** + * @author 逗 + */ +@Slf4j +@Api(tags = "平车相关api" , description = "") +@RestController +@RequestMapping("/car") +public class WisdomCarController { + + @ApiOperation(value = "空闲平车查询", notes = "whj") + @RequestMapping(value = "/free", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse freeCar(@ApiParam @Validated @RequestBody QueryDto params){ + log.info("空闲平车查询：{}", params); + +// log.info("空闲平车查询结果：{}",); + return JsonResponse.newInstance().ok(); + } +} diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/WisdomCatController.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/WisdomCatController.java deleted file mode 100644 index 7587cc22..00000000 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/WisdomCatController.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.ccsens.wisdomcar.api; - -import io.swagger.annotations.Api; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @author 逗 - */ -@Slf4j -@Api(tags = "平车相关api" , description = "") -@RestController -@RequestMapping("/car") -public class WisdomCatController { -} diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/ProjectDto.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/ProjectDto.java new file mode 100644 index 00000000..23521dc3 --- /dev/null +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/ProjectDto.java @@ -0,0 +1,33 @@ +package com.ccsens.wisdomcar.bean.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @description:页面上操作 + * @author: whj + * @time: 2021/6/1 13:34 + */ +public class ProjectDto { + + @Data + @ApiModel("点击开始-请求") + public static class Start { + @ApiModelProperty("开始时间") + private Long startTime = System.currentTimeMillis(); + @NotNull(message="请说明您的任务") + @ApiModelProperty("分解任务ID") + private Long taskSubId; + } + + @Data + @ApiModel("查询称重和剂量--请求") + public static class Weight { + @NotNull(message="请说明您的任务") + @ApiModelProperty("分解任务ID") + private Long taskSubId; + } +} diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/WisdomCarDto.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/WisdomCarDto.java new file mode 100644 index 00000000..1696a99b --- /dev/null +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/WisdomCarDto.java @@ -0,0 +1,18 @@ +package com.ccsens.wisdomcar.bean.dto; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @description: 平车相关 + * @author: whj + * @time: 2021/6/1 13:01 + */ +public class WisdomCarDto { + + @Data + @ApiModel("查询空闲平车--请求参数") + public static class FreeCar{ + + } +} diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/ProjectVo.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/ProjectVo.java new file mode 100644 index 00000000..fe3f2219 --- /dev/null +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/ProjectVo.java @@ -0,0 +1,19 @@ +package com.ccsens.wisdomcar.bean.vo; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @description: + * @author: whj + * @time: 2021/6/1 13:34 + */ +public class ProjectVo { + public static class Start { + } + + @Data + @ApiModel("查询称重和剂量--响应") + public class Weight { + } +} diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/WisdomCarVo.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/WisdomCarVo.java new file mode 100644 index 00000000..7ac38120 --- /dev/null +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/WisdomCarVo.java @@ -0,0 +1,21 @@ +package com.ccsens.wisdomcar.bean.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: 平车相关 + * @author: whj + * @time: 2021/6/1 13:02 + */ +public class WisdomCarVo { + @Data + @ApiModel("查询空闲平车--请求参数") + public static class FreeCar{ + @ApiModelProperty("平车ID") + private Long id; + @ApiModelProperty("平车编号") + private String carNumber; + } +}