代码优化

icss-service/src/main/java/com/diagbot/client/TranServiceClient.java

@@ -3,6 +3,8 @@ package com.diagbot.client;
 import java.util.List;
 import java.util.Map;
 
+import javax.validation.Valid;
+
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -206,14 +208,14 @@ public interface TranServiceClient {
     RespDTO<Map<String, List<String>>> getPacsConfigByUniqueNameAndHosCode(@RequestBody HosCodeVO hosCodeVO);
     
     @PostMapping("/lisDockingImports/lisDockingImports")
-    public RespDTO<LisRetrieveListAllDTO> getLisDatas(LisArgumentsVO lisArgumentsVO);
+    public RespDTO<LisRetrieveListAllDTO> getLisDatas(@RequestBody @Valid LisArgumentsVO lisArgumentsVO);
 
     @PostMapping("/lisDockingImports/getByGroupNameLisData")
-	public RespDTO<LisDataDTO> getByGroupNameLisData(LisGroupNameVO lisGroupNameVO);
+	public RespDTO<LisDataDTO> getByGroupNameLisData(@RequestBody @Valid LisGroupNameVO lisGroupNameVO);
 
     @PostMapping("/lisDockingImports/pacsDockingImport")
-	RespDTO<PacsRetrieveListAllDTO> pacsDockingImports(PacsArgumentsVO pacsArgumentsVO);
+	RespDTO<PacsRetrieveListAllDTO> pacsDockingImports(@RequestBody @Valid PacsArgumentsVO pacsArgumentsVO);
 
     @PostMapping("/lisDockingImports/getByCheckItemPacsData")
-	RespDTO<PacsDataDTO> getByCheckItemPacsDatas(PacsCheckItemVO pacsGroupNameVO);
+	RespDTO<PacsDataDTO> getByCheckItemPacsDatas(@RequestBody @Valid PacsCheckItemVO pacsGroupNameVO);
 }

icss-service/src/main/java/com/diagbot/client/hystrix/TranServiceHystrix.java

@@ -204,25 +204,25 @@ public class TranServiceHystrix implements TranServiceClient {
     }
 
 	@Override
-	public RespDTO<LisRetrieveListAllDTO> getLisDatas(LisArgumentsVO lisArgumentsVO) {
+	public RespDTO<LisRetrieveListAllDTO> getLisDatas(@RequestBody @Valid LisArgumentsVO lisArgumentsVO) {
 		log.error("【hystrix】调用{}异常", "getLisDatas");
 		return null;
 	}
 
 	@Override
-	public RespDTO<LisDataDTO> getByGroupNameLisData(LisGroupNameVO lisGroupNameVO) {
+	public RespDTO<LisDataDTO> getByGroupNameLisData(@RequestBody @Valid LisGroupNameVO lisGroupNameVO) {
 		log.error("【hystrix】调用{}异常", "getByGroupNameLisData");
 		return null;
 	}
 
 	@Override
-	public RespDTO<PacsRetrieveListAllDTO> pacsDockingImports(PacsArgumentsVO pacsArgumentsVO) {
+	public RespDTO<PacsRetrieveListAllDTO> pacsDockingImports(@RequestBody @Valid PacsArgumentsVO pacsArgumentsVO) {
 		log.error("【hystrix】调用{}异常", "pacsDockingImports");
 		return null;
 	}
 
 	@Override
-	public RespDTO<PacsDataDTO> getByCheckItemPacsDatas(PacsCheckItemVO pacsGroupNameVO) {
+	public RespDTO<PacsDataDTO> getByCheckItemPacsDatas(@RequestBody @Valid PacsCheckItemVO pacsGroupNameVO) {
 		log.error("【hystrix】调用{}异常", "getByCheckItemPacsDatas");
 		return null;
 	}

icss-service/src/main/java/com/diagbot/web/DockingImportController.java

@@ -13,8 +13,12 @@ import com.diagbot.vo.PacsArgumentsVO;
 import com.diagbot.vo.PacsCheckItemVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+
+import javax.validation.Valid;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -36,28 +40,28 @@ public class DockingImportController {
     @ApiOperation(value = "ICSS三期-导入化验数据检索:[by:wangfeng]", notes = "导入化验数据检索")
     @PostMapping("/lisDockingImports")
     @SysLogger("lisDockingImports")
-    public RespDTO<LisRetrieveListAllDTO> lisDockingImports(LisArgumentsVO lisArgumentsVO) {
+    public RespDTO<LisRetrieveListAllDTO> lisDockingImports(@RequestBody @Valid LisArgumentsVO lisArgumentsVO) {
         return RespDTO.onSuc(dockingImportFacade.lisDockingImport(lisArgumentsVO));
     }
 
     @ApiOperation(value = "ICSS三期-根据组名称获取化验数据:[by:wangfeng]", notes = "根据组名称获取化验数据")
     @PostMapping("/getByGroupNameLisData")
     @SysLogger("getByGroupNameLisData")
-    public RespDTO<LisDataDTO> getByGroupNameLisDatas(LisGroupNameVO lisGroupNameVO) {
+    public RespDTO<LisDataDTO> getByGroupNameLisDatas(@RequestBody @Valid LisGroupNameVO lisGroupNameVO) {
         return RespDTO.onSuc(dockingImportFacade.getByGroupNameLisDatas(lisGroupNameVO));
     }
 
     @ApiOperation(value = "ICSS三期-导入辅件数据检索:[by:wangfeng]", notes = "导入辅件数据检索")
     @PostMapping("/pacsDockingImport")
     @SysLogger("pacsDockingImport")
-    public RespDTO<PacsRetrieveListAllDTO> pacsDockingImports(PacsArgumentsVO pacsArgumentsVO) {
+    public RespDTO<PacsRetrieveListAllDTO> pacsDockingImports(@RequestBody @Valid PacsArgumentsVO pacsArgumentsVO) {
         return RespDTO.onSuc(dockingImportFacade.pacsDockingImports(pacsArgumentsVO));
     }
 
     @ApiOperation(value = "ICSS三期-根据组名称获取辅件数据:[by:wangfeng]", notes = "根据组名称获取辅件数据")
     @PostMapping("/getByCheckItemPacsData")
     @SysLogger("getByCheckItemPacsData")
-    public RespDTO<PacsDataDTO> getByCheckItemPacsDatas(PacsCheckItemVO pacsGroupNameVO) {
+    public RespDTO<PacsDataDTO> getByCheckItemPacsDatas(@RequestBody @Valid PacsCheckItemVO pacsGroupNameVO) {
         return RespDTO.onSuc(dockingImportFacade.getByCheckItemPacsDatas(pacsGroupNameVO));
     }
 

tran-service/src/main/java/com/diagbot/vo/LisExcelWrapperVO.java

@@ -8,25 +8,25 @@ import lombok.Setter;
 @Getter
 public class LisExcelWrapperVO {
 
-    private String mealName;
+    private String mealName;//套餐名
 	
-    private String uniquemealName;
+    private String uniquemealName;//套餐公表明
     
-	private String itemName;
+	private String itemName;//小项名
 	
-	private String uniqueName;
+	private String uniqueName;//小项名公表明
 	
-	private String unit;
+	private String unit;//单位
 	
-	private String value;
+	private String value;//值
 	
-	private String max;
+	private String max;//最大值
 	
-	private String min;
+	private String min;//最小值
 	
-	private String time;
+	private String time;//时间
 	
-	private String type;
+	private String type;//异常类型
 
 	@Override
 	public String toString() {

tran-service/src/main/java/com/diagbot/web/DockingImportController.java

@@ -13,8 +13,12 @@ import com.diagbot.vo.PacsArgumentsVO;
 import com.diagbot.vo.PacsCheckItemVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+
+import javax.validation.Valid;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -30,28 +34,28 @@ public class DockingImportController {
     @ApiOperation(value = "导入化验数据检索:[by:wangfeng]", notes = "导入化验数据检索")
     @PostMapping("/lisDockingImports")
     @SysLogger("lisDockingImports")
-    public RespDTO<LisRetrieveListAllDTO> lisDockingImports(LisArgumentsVO lisArgumentsVO) {
+    public RespDTO<LisRetrieveListAllDTO> lisDockingImports(@RequestBody @Valid LisArgumentsVO lisArgumentsVO) {
         return RespDTO.onSuc(dockingImportFacade.lisDockingImport(lisArgumentsVO));
     }
 
     @ApiOperation(value = "根据组名称获取化验数据:[by:wangfeng]", notes = "根据组名称获取化验数据")
     @PostMapping("/getByGroupNameLisData")
     @SysLogger("getByGroupNameLisData")
-    public RespDTO<LisDataDTO> getByGroupNameLisDatas(LisGroupNameVO lisGroupNameVO) {
+    public RespDTO<LisDataDTO> getByGroupNameLisDatas(@RequestBody @Valid LisGroupNameVO lisGroupNameVO) {
         return RespDTO.onSuc(dockingImportFacade.getByGroupNameLisDatas(lisGroupNameVO));
     }
 
     @ApiOperation(value = "导入辅件数据检索:[by:wangfeng]", notes = "导入辅件数据检索")
     @PostMapping("/pacsDockingImport")
     @SysLogger("pacsDockingImport")
-    public RespDTO<PacsRetrieveListAllDTO> pacsDockingImports(PacsArgumentsVO pacsArgumentsVO) {
+    public RespDTO<PacsRetrieveListAllDTO> pacsDockingImports(@RequestBody @Valid PacsArgumentsVO pacsArgumentsVO) {
         return RespDTO.onSuc(dockingImportFacade.pacsDockingImports(pacsArgumentsVO));
     }
 
     @ApiOperation(value = "根据组名称获取辅件数据:[by:wangfeng]", notes = "根据组名称获取辅件数据")
     @PostMapping("/getByCheckItemPacsData")
     @SysLogger("getByCheckItemPacsData")
-    public RespDTO<PacsDataDTO> getByCheckItemPacsDatas(PacsCheckItemVO pacsGroupNameVO) {
+    public RespDTO<PacsDataDTO> getByCheckItemPacsDatas(@RequestBody @Valid PacsCheckItemVO pacsGroupNameVO) {
         return RespDTO.onSuc(dockingImportFacade.getByCheckItemPacsDatas(pacsGroupNameVO));
     }
 }