平车1.1

pom.xml

@@ -12,7 +12,7 @@
 <!--        <module>ht</module>-->
         <module>game</module>
         <module>mt</module>
-<!--        <module>wisdomcar</module>-->
+        <module>wisdomcar</module>
         <module>beneficiation</module>
 <!--        <module>form</module>-->
 <!--        <module>signin</module>-->

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;

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<ProjectDto.Start> 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<ProjectVo.Weight> weight(@ApiParam @Validated @RequestBody QueryDto<ProjectDto.Weight> params){
+        log.info("空闲平车查询：{}", params);
+
+//        log.info("空闲平车查询结果：{}",);
+        return JsonResponse.newInstance().ok();
+    }
+}

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<WisdomCarVo.FreeCar> freeCar(@ApiParam @Validated @RequestBody QueryDto<WisdomCarDto.FreeCar> params){
+        log.info("空闲平车查询：{}", params);
+
+//        log.info("空闲平车查询结果：{}",);
+        return JsonResponse.newInstance().ok();
+    }
+}

wisdomcar/src/main/java/com/ccsens/wisdomcar/api/WisdomCatController.java

@@ -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 {
-}

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;
+    }
+}

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{
+
+    }
+}

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 {
+    }
+}

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;
+    }
+}