优化代码1.0

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

@@ -57,34 +57,38 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
 	 * 
 	 * @return
 	 */
-	public List<VersionWrapperDTO> getVersionInfoAll(Page page,String name) {
+	public List<VersionWrapperDTO> getVersionInfoAll(Page page, String name) {
 		// 查询最新的一条版本信息
 		QueryWrapper<VersionInfo> versionInfoQuery = new QueryWrapper<>();
-		versionInfoQuery.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey()).like("name",name)
-					.orderByDesc("refresh_time");	
-		
-		//List<VersionInfo> versionInfos =list(versionInfoQuery);// getOne(versionInfoQuery);
-		IPage<VersionInfo> queryUserInformation = page(page,versionInfoQuery);
-		
+		versionInfoQuery.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
+				.like("name", name).orderByDesc("refresh_time");
+
+		// List<VersionInfo> versionInfos =list(versionInfoQuery);//
+		// getOne(versionInfoQuery);
+		IPage<VersionInfo> queryUserInformation = page(page, versionInfoQuery);
+
 		List<VersionInfo> versionInfos = queryUserInformation.getRecords();
-		
+
 		List<VersionWrapperDTO> versionLists = new ArrayList<VersionWrapperDTO>();
-		/*List<String> modifierid = versionInfos.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 =
+		 * versionInfos.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 = versionInfos.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);	
-			 if (userNamesDTO == null || !"0".equals(userNamesDTO.code)) {
-	                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
-	                        "获取所有用户信息失败");
-	            }
+		if (modifierid.size() > 0) {
+			RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
+			if (userNamesDTO == null || !"0".equals(userNamesDTO.code)) {
+				throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "获取所有用户信息失败");
+			}
 			userNames = userNamesDTO.data;
 		}
-	
+
 		// 当查出的数据不为空时，取到版本id，再去版本明细表中查询详细的信息
 		// System.out.println(detail.toString());
 		for (VersionInfo versionInfo : versionInfos) {
@@ -122,6 +126,15 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
 	}
 
 	public boolean saveVersionInfoAll(VersionInfoVO versionInfoVO) {
+		// 1.判断该版本号是否存在名字相同的数据
+		QueryWrapper<VersionInfo> templateInfoFand = new QueryWrapper<>();
+		templateInfoFand.eq("name", versionInfoVO.getName()).eq("is_deleted", IsDeleteEnum.N.getKey());
+		VersionInfo dataInfo = getOne(templateInfoFand);
+		if (dataInfo != null) {
+			throw new CommonException(CommonErrorCode.NOT_EXISTS, "该版本号已存在");
+		}
+
+		//增加版本数据
 		VersionInfo versionInfo = new VersionInfo();
 		versionInfo.setCreator(UserUtils.getCurrentPrincipleID());
 		versionInfo.setGmtCreate(DateUtil.now());
@@ -133,7 +146,7 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
 			versionInfo.setRefreshTime(sdf.parse(versionInfoVO.getRefreshTime()));
 		} catch (ParseException e) {
 			throw new CommonException(CommonErrorCode.NOT_EXISTS, "时间格式有误");
-			//e.printStackTrace();
+			// e.printStackTrace();
 		}
 		versionInfo.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
 		versionInfo.setRemark(versionInfoVO.getRemark());
@@ -141,7 +154,7 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
 		if (res) {
 			List<VersionDetail> dataNew = new ArrayList<VersionDetail>();
 			List<VersionDetailVO> datas = versionInfoVO.getVersionDetail();
-			if(datas!=null && datas.size()>0){
+			if (datas != null && datas.size() > 0) {
 				for (VersionDetailVO data : datas) {
 					VersionDetail versionDetail = new VersionDetail();
 					versionDetail.setCreator(UserUtils.getCurrentPrincipleID());
@@ -152,16 +165,17 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
 					versionDetail.setOrderNo(data.getOrderNo());
 					versionDetail.setTitle(data.getTitle());
 					versionDetail.setVersionId(versionInfo.getId());
-					//System.out.println("========versionInfo.getId()======" + versionInfo.getId());
+					// System.out.println("========versionInfo.getId()======" +
+					// versionInfo.getId());
 					versionDetail.setRemark(data.getRemark());
 					versionDetail.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
 					dataNew.add(versionDetail);
 				}
 
-				res = versionDetailServiceImpl.saveBatch(dataNew);	
+				res = versionDetailServiceImpl.saveBatch(dataNew);
 			}
-			
-			//System.out.println(res);
+
+			// System.out.println(res);
 		}
 		return res;
 	}
@@ -184,15 +198,15 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
 		versionInfo.setId(versionInfoVO.getId());// 模板id
 		versionInfo.setName(versionInfoVO.getName());// 模板名称
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-		if(versionInfoVO.getRefreshTime() != null){
+		if (versionInfoVO.getRefreshTime() != null) {
 			try {
 				versionInfo.setRefreshTime(sdf.parse(versionInfoVO.getRefreshTime()));
 			} catch (ParseException e) {
 				throw new CommonException(CommonErrorCode.NOT_EXISTS, "时间格式有误");
-				//e.printStackTrace();
+				// e.printStackTrace();
 			}
 		}
-		
+
 		versionInfo.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
 		versionInfo.setRemark(versionInfoVO.getRemark());
 		versionInfo.setGmtModified(DateUtil.now());// 修改时间
@@ -213,8 +227,9 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
 	 */
 	public boolean cancelVersionInfoAll(VersionInfoIdVO versionInfoVO) {
 		UpdateWrapper<VersionInfo> versionInfoNew = new UpdateWrapper<>();
-		versionInfoNew.in("id", versionInfoVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey()).set("is_deleted",
-				IsDeleteEnum.Y.getKey()).set("modifier",UserUtils.getCurrentPrincipleID()).set("gmt_modified",DateUtil.now());
+		versionInfoNew.in("id", versionInfoVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey())
+				.set("is_deleted", IsDeleteEnum.Y.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
+				.set("gmt_modified", DateUtil.now());
 		return update(new VersionInfo(), versionInfoNew);
 	}