优化代码，增加校验

icssman-service/src/main/java/com/diagbot/facade/VersionDetailFacade.java

@@ -20,6 +20,7 @@ import com.diagbot.enums.StatusEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.VersionDetailServiceImpl;
+import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.VersionDetailIdVO;
@@ -88,14 +89,9 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
 				.in("version_id", ids).orderByAsc("order_no");
 
 		List<VersionDetail> datas = list(versionDetailQuery);
-		// System.out.println("List<VersionDetail>==="+datas.toString());
 		List<VersionDetailDTO> dataNew = new ArrayList<VersionDetailDTO>();
-		/*List<String> modifierid = datas.stream().map(ac->ac.getModifier()).collect(Collectors.toList());
-		RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
-		Map<String, String> userNames = userNamesDTO.data;*/
 		List<String> modifierid = new ArrayList<>();
 		modifierid = datas.stream().map(ac -> ac.getModifier()).collect(Collectors.toList());
-		
 		Map<String, String> userNames = new HashMap<>();
 		if(modifierid.size()>0){
 			RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);	
@@ -106,7 +102,7 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
 			userNames = userNamesDTO.data;
 		}
 		
-		// 过滤字段
+	/*	// 过滤字段
 		for (VersionDetail versionData : datas) {
 			VersionDetailDTO versionDTO = new VersionDetailDTO();
 			versionDTO.setId(versionData.getId());
@@ -120,7 +116,9 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
 			versionDTO.setTitle(versionData.getTitle());
 			versionDTO.setVersionId(versionData.getVersionId());
 			dataNew.add(versionDTO);
-		}
+		}*/
+		// 过滤字段
+		dataNew = BeanUtil.listCopyTo(datas, VersionDetailDTO.class);
 		return dataNew;
 
 	}

icssman-service/src/main/java/com/diagbot/facade/VersionInfoFacade.java

@@ -27,6 +27,7 @@ import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.VersionDetailServiceImpl;
 import com.diagbot.service.impl.VersionInfoServiceImpl;
+import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
@@ -80,7 +81,7 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
 			userNames = userNamesDTO.data;
 		}
 		// 当查出的数据不为空时，取到版本id，再去版本明细表中查询详细的信息
-		for (VersionInfo versionInfo : versionInfos) {
+		/*for (VersionInfo versionInfo : versionInfos) {
 			VersionWrapperDTO versionList = new VersionWrapperDTO();
 			versionList.setId(versionInfo.getId());
 			versionList.setName(versionInfo.getName());
@@ -88,8 +89,8 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
 			versionList.setRefreshTime(versionInfo.getRefreshTime());
 			versionList.setStatus(versionInfo.getStatus());
 			versionLists.add(versionList);
-		}
-
+		}*/
+		versionLists = BeanUtil.listCopyTo(versionInfos, VersionWrapperDTO.class);
 		// 取版本id查明细
 		List<Long> ids = new ArrayList<>();
 		if (versionInfos != null) {

icssman-service/src/main/java/com/diagbot/vo/DisclaimerInformationAllVO.java

@@ -1,5 +1,8 @@
 package com.diagbot.vo;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 import lombok.Getter;
 import lombok.Setter;
 
@@ -13,7 +16,7 @@ import lombok.Setter;
 @Setter
 public class DisclaimerInformationAllVO {
 	
-	
+	@NotNull(message = "请输入id")
 	private Long id;
     /**
      * 主表id

icssman-service/src/main/java/com/diagbot/vo/DisclaimerInformationIdVO.java

@@ -1,5 +1,7 @@
 package com.diagbot.vo;
 
+import javax.validation.constraints.NotNull;
+
 import lombok.Getter;
 import lombok.Setter;
 
@@ -13,5 +15,6 @@ import lombok.Setter;
 @Setter
 public class DisclaimerInformationIdVO {
 
+	@NotNull(message = "请输入id")
 	private Long id;
 }

icssman-service/src/main/java/com/diagbot/vo/DisclaimerInformationVO.java

@@ -1,5 +1,7 @@
 package com.diagbot.vo;
 
+import javax.validation.constraints.NotBlank;
+
 import lombok.Getter;
 import lombok.Setter;
 
@@ -20,11 +22,13 @@ public class DisclaimerInformationVO {
     /**
      * 标题
      */
+	@NotBlank(message = "请输入标题")
     private String title;
 
     /**
      * 描述
      */
+	@NotBlank(message = "请输入描述")
     private String description;
 
     /**

icssman-service/src/main/java/com/diagbot/vo/VersionDetailIdVO.java

@@ -2,6 +2,8 @@ package com.diagbot.vo;
 
 import java.util.Date;
 
+import javax.validation.constraints.NotNull;
+
 import lombok.Getter;
 import lombok.Setter;
 
@@ -14,5 +16,6 @@ import lombok.Setter;
 @Getter
 @Setter
 public class VersionDetailIdVO {
+	@NotNull(message = "请输入id")
 	private Long id;
 }

icssman-service/src/main/java/com/diagbot/vo/VersionDetailVO.java

@@ -1,5 +1,7 @@
 package com.diagbot.vo;
 
+import javax.validation.constraints.NotNull;
+
 import lombok.Getter;
 import lombok.Setter;
 
@@ -16,6 +18,7 @@ public class VersionDetailVO {
 	   /**
      * 版本主表id
      */
+	@NotNull(message = "请输入id")
     private Long detailId;
 
     /**

icssman-service/src/main/java/com/diagbot/vo/VersionInfoAllVO.java

@@ -2,6 +2,9 @@ package com.diagbot.vo;
 
 import java.util.Date;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 import lombok.Getter;
 import lombok.Setter;
 
@@ -17,6 +20,7 @@ public class VersionInfoAllVO {
 	/**
 	 * 版本id
 	 */
+	@NotNull(message = "请输入id")
 	private Long id;
 	/**
      * 名称

icssman-service/src/main/java/com/diagbot/vo/VersionInfoAndDetailIdVO.java

@@ -2,6 +2,8 @@ package com.diagbot.vo;
 
 import java.util.List;
 
+import javax.validation.constraints.NotNull;
+
 import lombok.Getter;
 import lombok.Setter;
 
@@ -17,6 +19,7 @@ public class VersionInfoAndDetailIdVO {
 	/**
 	 * 用户id
 	 */
+	@NotNull(message = "请输入id")
 	private Long versionInfoId;
 	
     private List<VersionDetailVO> versionDetail;

icssman-service/src/main/java/com/diagbot/vo/VersionInfoIdVO.java

@@ -1,5 +1,7 @@
 package com.diagbot.vo;
 
+import javax.validation.constraints.NotNull;
+
 import lombok.Getter;
 import lombok.Setter;
 
@@ -12,5 +14,6 @@ import lombok.Setter;
 @Getter
 @Setter
 public class VersionInfoIdVO {
+	@NotNull(message = "请输入id")
 	private Long id;
 }

icssman-service/src/main/java/com/diagbot/vo/VersionInfoVO.java

@@ -3,6 +3,8 @@ package com.diagbot.vo;
 import java.util.Date;
 import java.util.List;
 
+import javax.validation.constraints.NotBlank;
+
 import lombok.Getter;
 import lombok.Setter;
 
@@ -24,11 +26,13 @@ public class VersionInfoVO {
 	/**
      * 名称
      */
+	@NotBlank(message = "请输入名称")
     private String name;
 
     /**
      * 时间
      */
+	@NotBlank(message = "请输入时间")
     private String refreshTime;
 
     /**

icssman-service/src/main/java/com/diagbot/web/DisclaimerInformationController.java

@@ -3,6 +3,8 @@ package com.diagbot.web;
 
 import java.util.List;
 
+import javax.validation.Valid;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -53,7 +55,7 @@ public class DisclaimerInformationController {
 	@PostMapping("/addDisclaimerInformations")
 	@SysLogger("addDisclaimerInformations")
 	@Transactional
-	public RespDTO<Boolean> addDisclaimerInformations(@RequestBody DisclaimerInformationVO disclaimerInformationVO) {
+	public RespDTO<Boolean> addDisclaimerInformations(@Valid @RequestBody DisclaimerInformationVO disclaimerInformationVO) {
 
 		boolean res = disclaimerInformationFacaed.addDisclaimerInformation(disclaimerInformationVO);
 		
@@ -64,7 +66,7 @@ public class DisclaimerInformationController {
 	@PostMapping("/updateDisclaimerInformations")
 	@SysLogger("updateDisclaimerInformations")
 	@Transactional
-	public RespDTO<Boolean> updateDisclaimerInformations(@RequestBody DisclaimerInformationAllVO disclaimerInformationAllVO) {
+	public RespDTO<Boolean> updateDisclaimerInformations(@Valid @RequestBody DisclaimerInformationAllVO disclaimerInformationAllVO) {
 
 		boolean res = disclaimerInformationFacaed.updateDisclaimerInformation(disclaimerInformationAllVO);
 		
@@ -75,7 +77,7 @@ public class DisclaimerInformationController {
 	@PostMapping("/cancelDisclaimerInformations")
 	@SysLogger("cancelDisclaimerInformations")
 	@Transactional
-	public RespDTO<Boolean> cancelDisclaimerInformations(@RequestBody DisclaimerInformationIdVO disclaimerInformationIdVO) {
+	public RespDTO<Boolean> cancelDisclaimerInformations(@Valid @RequestBody DisclaimerInformationIdVO disclaimerInformationIdVO) {
 
 		boolean res = disclaimerInformationFacaed.cancelDisclaimerInformation(disclaimerInformationIdVO);
 		
@@ -85,7 +87,7 @@ public class DisclaimerInformationController {
 	@PostMapping("/startDisclaimerInformations")
 	@SysLogger("startDisclaimerInformations")
 	@Transactional
-	public RespDTO<Boolean> startDisclaimerInformations(@RequestBody DisclaimerInformationIdVO disclaimerInformationIdVO){
+	public RespDTO<Boolean> startDisclaimerInformations(@Valid @RequestBody DisclaimerInformationIdVO disclaimerInformationIdVO){
 		
 		boolean res = disclaimerInformationFacaed.startDisclaimerInformations(disclaimerInformationIdVO);
 		
@@ -96,7 +98,7 @@ public class DisclaimerInformationController {
 	@PostMapping("/endDisclaimerInformations")
 	@SysLogger("endDisclaimerInformations")
 	@Transactional
-	public RespDTO<Boolean> endDisclaimerInformations(@RequestBody DisclaimerInformationIdVO disclaimerInformationIdVO){
+	public RespDTO<Boolean> endDisclaimerInformations(@Valid @RequestBody DisclaimerInformationIdVO disclaimerInformationIdVO){
 		
 		boolean res = disclaimerInformationFacaed.endDisclaimerInformations(disclaimerInformationIdVO);
 		

icssman-service/src/main/java/com/diagbot/web/VersionDetailController.java

@@ -1,6 +1,8 @@
 package com.diagbot.web;
 
 
+import javax.validation.Valid;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -37,7 +39,7 @@ public class VersionDetailController {
 	@PostMapping("/updateVersionDetails")
 	@SysLogger("updateVersionDetails")
 	@Transactional
-	public RespDTO<Boolean> updateVersionDetails(@RequestBody VersionDetailVO versionDetailVO) {
+	public RespDTO<Boolean> updateVersionDetails(@Valid @RequestBody VersionDetailVO versionDetailVO) {
 
 		boolean res = versionDetailFacade.updateVersionDetail(versionDetailVO);
 
@@ -48,7 +50,7 @@ public class VersionDetailController {
 	@PostMapping("/cancelVersionDetails")
 	@SysLogger("cancelVersionDetails")
 	@Transactional
-	public RespDTO<Boolean> cancelVersionDetails(@RequestBody VersionDetailIdVO versionDetailIdVO) {
+	public RespDTO<Boolean> cancelVersionDetails(@Valid @RequestBody VersionDetailIdVO versionDetailIdVO) {
 
 		boolean res = versionDetailFacade.cancelVersionDetail(versionDetailIdVO);
 
@@ -59,7 +61,7 @@ public class VersionDetailController {
 	@PostMapping("/addVersionDetails")
 	@SysLogger("addVersionDetails")
 	@Transactional
-	public RespDTO<Boolean> addVersionDetails(@RequestBody VersionInfoAndDetailIdVO versionInfoAndDetailIdVO) {
+	public RespDTO<Boolean> addVersionDetails(@Valid @RequestBody VersionInfoAndDetailIdVO versionInfoAndDetailIdVO) {
 
 		boolean res = versionDetailFacade.addVersionDetail(versionInfoAndDetailIdVO);
 

icssman-service/src/main/java/com/diagbot/web/VersionInfoController.java

@@ -2,6 +2,8 @@ package com.diagbot.web;
 
 import java.util.List;
 
+import javax.validation.Valid;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -51,7 +53,7 @@ public class VersionInfoController {
 	@PostMapping("/saveVersionInfoAlls")
 	@SysLogger("saveVersionInfoAlls")
 	@Transactional
-	public RespDTO<Boolean> saveVersionInfoAlls(@RequestBody VersionInfoVO versionInfoVO) {
+	public RespDTO<Boolean> saveVersionInfoAlls(@Valid @RequestBody VersionInfoVO versionInfoVO) {
 
 		boolean res = versionInfoFacade.saveVersionInfoAll(versionInfoVO);
 
@@ -62,7 +64,7 @@ public class VersionInfoController {
 	@PostMapping("/updateVersionInfoAlls")
 	@SysLogger("updateVersionInfoAlls")
 	@Transactional
-	public RespDTO<Boolean> updateVersionInfoAlls(@RequestBody VersionInfoAllVO versionInfoVO) {
+	public RespDTO<Boolean> updateVersionInfoAlls(@Valid @RequestBody VersionInfoAllVO versionInfoVO) {
 
 		boolean res = versionInfoFacade.updateVersionInfoAll(versionInfoVO);
 
@@ -73,7 +75,7 @@ public class VersionInfoController {
 	@PostMapping("/cancelVersionInfoAlls")
 	@SysLogger("cancelVersionInfoAlls")
 	@Transactional
-	public RespDTO<Boolean> cancelVersionInfoAlls(@RequestBody VersionInfoIdVO versionInfoVO) {
+	public RespDTO<Boolean> cancelVersionInfoAlls(@Valid @RequestBody VersionInfoIdVO versionInfoVO) {
 
 		boolean res = versionInfoFacade.cancelVersionInfoAll(versionInfoVO);