版本管理移到医学术语维护

config-server/src/main/resources/shared/aipt-service-local.yml

@@ -7,7 +7,7 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.235:3306/med-s?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.235:3306/med-dev?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: diagbot@20180822
       # 连接池的配置信息

config-server/src/main/resources/shared/knowledgeman-service-local.yml

@@ -7,7 +7,7 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.235:3306/med-man?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.235:3306/med-dev?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: diagbot@20180822
       # 连接池的配置信息

icssman-service/src/main/java/com/diagbot/dto/VersionDetailDTO.java

@@ -1,60 +1,60 @@
-package com.diagbot.dto;
-
-import java.util.Date;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 
- * @author wangfeng
- * @Description: TODO
- * @date 2018年11月21日 上午11:12:12
- */
-@Getter
-@Setter
-public class VersionDetailDTO {
-	
-	private Long id;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    //private String creator;
-
-    private String modifierid;
-    /**
-     * 版本主表id
-     */
-    private Long versionId;
-
-    /**
-     * 标题
-     */
-    private String title;
-
-    /**
-     * 描述
-     */
-    private String description;
-
-    /**
-     * 排序号
-     */
-    private String orderNo;
-
-    /**
-     * 1：启动，0：不启用
-     */
-    private String status;
-
-    /**
-     * 备注
-     */
-    private String remark;
-}
+package com.diagbot.dto;
+
+import java.util.Date;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月21日 上午11:12:12
+ */
+@Getter
+@Setter
+public class VersionDetailDTO {
+	
+	private Long id;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    //private String creator;
+
+    private String modifierid;
+    /**
+     * 版本主表id
+     */
+    private Long versionId;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 排序号
+     */
+    private String orderNo;
+
+    /**
+     * 1：启动，0：不启用
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

icssman-service/src/main/java/com/diagbot/dto/VersionWrapperDTO.java

@@ -1,51 +1,51 @@
-package com.diagbot.dto;
-
-import java.util.Date;
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 
- * @author wangfeng
- * @Description: TODO
- * @date 2018年11月21日 上午11:09:33
- */
-@Getter
-@Setter
-public class VersionWrapperDTO {
-	
-	private Long id;
-	/**
-	 * 记录创建时间
-	 */
-	private Date gmtCreate;
-
-	/**
-	 * 创建人，0表示无创建人值
-	 */
-	//private String creator;
-	
-	private String modifierid;
-	/**
-	 * 名称
-	 */
-	private String name;
-	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date refreshTime;
-
-	/**
-	 * 1：启动，0：不启用
-	 */
-	private String status;
-
-	private List<VersionDetailDTO> detail;
-	/**
-	 * 备注
-	 */
-	private String remark;
-
-}
+package com.diagbot.dto;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月21日 上午11:09:33
+ */
+@Getter
+@Setter
+public class VersionWrapperDTO {
+	
+	private Long id;
+	/**
+	 * 记录创建时间
+	 */
+	private Date gmtCreate;
+
+	/**
+	 * 创建人，0表示无创建人值
+	 */
+	//private String creator;
+	
+	private String modifierid;
+	/**
+	 * 名称
+	 */
+	private String name;
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date refreshTime;
+
+	/**
+	 * 1：启动，0：不启用
+	 */
+	private String status;
+
+	private List<VersionDetailDTO> detail;
+	/**
+	 * 备注
+	 */
+	private String remark;
+
+}

icssman-service/src/main/java/com/diagbot/entity/VersionDetail.java

@@ -15,7 +15,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
  * @author wangfeng
  * @since 2018-11-20
  */
-@TableName("icss_version_detail")
+@TableName("kl_version_detail")
 public class VersionDetail implements Serializable {
 
     private static final long serialVersionUID = 1L;

icssman-service/src/main/java/com/diagbot/entity/VersionInfo.java

@@ -15,7 +15,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
  * @author wangfeng
  * @since 2018-11-20
  */
-@TableName("icss_version_info")
+@TableName("kl_version_info")
 public class VersionInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;

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

@@ -1,223 +1,223 @@
-package com.diagbot.facade;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.diagbot.client.UserServiceClient;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.VersionDetailDTO;
-import com.diagbot.entity.VersionDetail;
-import com.diagbot.entity.VersionInfo;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.StatusEnum;
-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.DateUtil;
-import com.diagbot.util.UserUtils;
-import com.diagbot.vo.VersionDetailIdVO;
-import com.diagbot.vo.VersionDetailVO;
-import com.diagbot.vo.VersionInfoAndDetailIdVO;
-
-/**
- * 版本详情
- *
- * @author wangfeng
- * @Description: TODO
- * @date 2018年11月21日 上午11:38:40
- */
-@Component
-public class VersionDetailFacade extends VersionDetailServiceImpl {
-
-    @Autowired
-    VersionDetailServiceImpl versionDetailServiceImpl;
-    @Autowired
-    UserServiceClient userServiceClient;
-    @Autowired
-    VersionInfoServiceImpl versionInfoServiceImpl;
-
-    /**
-     * 根据版本id查询版本详情
-     *
-     * @param id
-     * @return
-     */
-    public List<VersionDetailDTO> getById(Long id) {
-        QueryWrapper<VersionDetail> versionDetailQuery = new QueryWrapper<>();
-
-        versionDetailQuery.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
-                .eq("version_id", id).orderByAsc("order_no");
-
-        VersionDetail versionDetail = new VersionDetail();
-        versionDetail.setVersionId(id);
-        List<VersionDetail> datas = list(versionDetailQuery);
-        // System.out.println("List<VersionDetail>==="+datas.toString());
-        List<VersionDetailDTO> dataNew = new ArrayList<VersionDetailDTO>();
-        // 过滤字段
-        for (VersionDetail versionData : datas) {
-            VersionDetailDTO versionDTO = new VersionDetailDTO();
-            versionDTO.setId(versionData.getId());
-            //versionDTO.setCreator(versionData.getCreator());
-            versionDTO.setDescription(versionData.getDescription());
-            versionDTO.setGmtCreate(versionData.getGmtCreate());
-            versionDTO.setOrderNo(versionData.getOrderNo());
-            versionDTO.setRemark(versionData.getRemark());
-            versionDTO.setStatus(versionData.getStatus());
-            versionDTO.setTitle(versionData.getTitle());
-            versionDTO.setVersionId(versionData.getVersionId());
-            dataNew.add(versionDTO);
-        }
-        return dataNew;
-
-    }
-
-    /**
-     * 根据版本ids查询版本详情
-     *
-     * @param ids
-     * @return
-     */
-    public List<VersionDetailDTO> getByIds(List<Long> ids) {
-        QueryWrapper<VersionDetail> versionDetailQuery = new QueryWrapper<>();
-
-        versionDetailQuery.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
-                .in("version_id", ids).orderByAsc("order_no");
-
-        List<VersionDetail> datas = list(versionDetailQuery);
-        List<VersionDetailDTO> dataNew = new ArrayList<VersionDetailDTO>();
-        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);
-            if (userNamesDTO == null || !CommonErrorCode.OK.getCode().equals(userNamesDTO.code)) {
-                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
-                        "获取所有用户信息失败");
-            }
-            userNames = userNamesDTO.data;
-        }
-		
-		// 过滤字段
-		for (VersionDetail versionData : datas) {
-			VersionDetailDTO versionDTO = new VersionDetailDTO();
-			versionDTO.setId(versionData.getId());
-			//versionDTO.setCreator(versionData.getCreator());
-			versionDTO.setModifierid(userNames.get(versionData.getModifier()));
-			versionDTO.setDescription(versionData.getDescription());
-			versionDTO.setGmtCreate(versionData.getGmtCreate());
-			versionDTO.setOrderNo(versionData.getOrderNo());
-			versionDTO.setRemark(versionData.getRemark());
-			versionDTO.setStatus(versionData.getStatus());
-			versionDTO.setTitle(versionData.getTitle());
-			versionDTO.setVersionId(versionData.getVersionId());
-			dataNew.add(versionDTO);
-		}
-        return dataNew;
-
-    }
-
-    /**
-     * 更新接口
-     *
-     * @param versionDetailVO
-     * @return
-     */
-    public boolean updateVersionDetail(VersionDetailVO versionDetailVO) {
-        // 1.先判断数据是否存在有效
-    	checkExist(versionDetailVO.getDetailId());
-        // 2.修改版本详情信息
-        VersionDetail versionDetail = new VersionDetail();
-
-        versionDetail.setGmtModified(DateUtil.now());// 修改时间
-        versionDetail.setModifier(UserUtils.getCurrentPrincipleID());
-        versionDetail.setTitle(versionDetailVO.getTitle());
-        versionDetail.setOrderNo(versionDetailVO.getOrderNo());
-        versionDetail.setStatus(versionDetailVO.getStatus());
-        versionDetail.setId(versionDetailVO.getDetailId());
-        versionDetail.setDescription(versionDetailVO.getDescription());
-        versionDetail.setRemark(versionDetailVO.getRemark());
-        boolean res = updateById(versionDetail);
-        if (!res) {
-            throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
-        }
-
-        return res;
-    }
-
-    /**
-     * 删除接口
-     *
-     * @param versionDetailIdVO
-     * @return
-     */
-    public boolean cancelVersionDetail(VersionDetailIdVO versionDetailIdVO) {
-    	 // 1.先判断数据是否存在有效
-    	checkExist(versionDetailIdVO.getId());
-        UpdateWrapper<VersionDetail> versionDetailNew = new UpdateWrapper<>();
-        versionDetailNew.in("id", versionDetailIdVO.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 VersionDetail(), versionDetailNew);
-    }
-
-    /**
-     * 增加明细接口
-     *
-     * @param versionDetailIdVO
-     * @return
-     */
-    public boolean addVersionDetail(VersionInfoAndDetailIdVO versionInfoAndDetailIdVO) {
-
-    	//1.增加明细前先判断主版本号的id是否有效
-        QueryWrapper<VersionInfo> VersionInfoFand = new QueryWrapper<>();
-        VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", versionInfoAndDetailIdVO.getVersionInfoId());
-        int sum = versionInfoServiceImpl.count(VersionInfoFand);
-        if (sum == 0) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "主版本号数据不存在");
-        }
-        
-        List<VersionDetail> dataNew = new ArrayList<VersionDetail>();
-        List<VersionDetailVO> datas = versionInfoAndDetailIdVO.getVersionDetail();
-        for (VersionDetailVO data : datas) {
-            VersionDetail versionDetail = new VersionDetail();
-            versionDetail.setCreator(UserUtils.getCurrentPrincipleID());
-            versionDetail.setGmtCreate(DateUtil.now());
-            versionDetail.setGmtModified(DateUtil.now());
-            versionDetail.setModifier(UserUtils.getCurrentPrincipleID());
-            versionDetail.setDescription(data.getDescription());
-            versionDetail.setOrderNo(data.getOrderNo());
-            versionDetail.setTitle(data.getTitle());
-            versionDetail.setVersionId(versionInfoAndDetailIdVO.getVersionInfoId());
-            versionDetail.setRemark(data.getRemark());
-            versionDetail.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
-            dataNew.add(versionDetail);
-
-        }
-
-        boolean res = versionDetailServiceImpl.saveBatch(dataNew);
-
-        return res;
-    }
-    /**
-     * 判断数据是否存在有效
-     *
-     * @param id
-     */
-    private void checkExist(Long id) {
-    	 // 1.先判断数据是否存在有效
-    	 QueryWrapper<VersionDetail> VersionInfoFand = new QueryWrapper<>();
-         VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", id);
-         int sum = count(VersionInfoFand);
-         if (sum == 0) {
-             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
-         }
-    }
-}
+package com.diagbot.facade;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.diagbot.client.UserServiceClient;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.VersionDetailDTO;
+import com.diagbot.entity.VersionDetail;
+import com.diagbot.entity.VersionInfo;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.StatusEnum;
+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.DateUtil;
+import com.diagbot.util.UserUtils;
+import com.diagbot.vo.VersionDetailIdVO;
+import com.diagbot.vo.VersionDetailVO;
+import com.diagbot.vo.VersionInfoAndDetailIdVO;
+
+/**
+ * 版本详情
+ *
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月21日 上午11:38:40
+ */
+@Component
+public class VersionDetailFacade extends VersionDetailServiceImpl {
+
+    @Autowired
+    VersionDetailServiceImpl versionDetailServiceImpl;
+    @Autowired
+    UserServiceClient userServiceClient;
+    @Autowired
+    VersionInfoServiceImpl versionInfoServiceImpl;
+
+    /**
+     * 根据版本id查询版本详情
+     *
+     * @param id
+     * @return
+     */
+    public List<VersionDetailDTO> getById(Long id) {
+        QueryWrapper<VersionDetail> versionDetailQuery = new QueryWrapper<>();
+
+        versionDetailQuery.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
+                .eq("version_id", id).orderByAsc("order_no");
+
+        VersionDetail versionDetail = new VersionDetail();
+        versionDetail.setVersionId(id);
+        List<VersionDetail> datas = list(versionDetailQuery);
+        // System.out.println("List<VersionDetail>==="+datas.toString());
+        List<VersionDetailDTO> dataNew = new ArrayList<VersionDetailDTO>();
+        // 过滤字段
+        for (VersionDetail versionData : datas) {
+            VersionDetailDTO versionDTO = new VersionDetailDTO();
+            versionDTO.setId(versionData.getId());
+            //versionDTO.setCreator(versionData.getCreator());
+            versionDTO.setDescription(versionData.getDescription());
+            versionDTO.setGmtCreate(versionData.getGmtCreate());
+            versionDTO.setOrderNo(versionData.getOrderNo());
+            versionDTO.setRemark(versionData.getRemark());
+            versionDTO.setStatus(versionData.getStatus());
+            versionDTO.setTitle(versionData.getTitle());
+            versionDTO.setVersionId(versionData.getVersionId());
+            dataNew.add(versionDTO);
+        }
+        return dataNew;
+
+    }
+
+    /**
+     * 根据版本ids查询版本详情
+     *
+     * @param ids
+     * @return
+     */
+    public List<VersionDetailDTO> getByIds(List<Long> ids) {
+        QueryWrapper<VersionDetail> versionDetailQuery = new QueryWrapper<>();
+
+        versionDetailQuery.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
+                .in("version_id", ids).orderByAsc("order_no");
+
+        List<VersionDetail> datas = list(versionDetailQuery);
+        List<VersionDetailDTO> dataNew = new ArrayList<VersionDetailDTO>();
+        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);
+            if (userNamesDTO == null || !CommonErrorCode.OK.getCode().equals(userNamesDTO.code)) {
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                        "获取所有用户信息失败");
+            }
+            userNames = userNamesDTO.data;
+        }
+		
+		// 过滤字段
+		for (VersionDetail versionData : datas) {
+			VersionDetailDTO versionDTO = new VersionDetailDTO();
+			versionDTO.setId(versionData.getId());
+			//versionDTO.setCreator(versionData.getCreator());
+			versionDTO.setModifierid(userNames.get(versionData.getModifier()));
+			versionDTO.setDescription(versionData.getDescription());
+			versionDTO.setGmtCreate(versionData.getGmtCreate());
+			versionDTO.setOrderNo(versionData.getOrderNo());
+			versionDTO.setRemark(versionData.getRemark());
+			versionDTO.setStatus(versionData.getStatus());
+			versionDTO.setTitle(versionData.getTitle());
+			versionDTO.setVersionId(versionData.getVersionId());
+			dataNew.add(versionDTO);
+		}
+        return dataNew;
+
+    }
+
+    /**
+     * 更新接口
+     *
+     * @param versionDetailVO
+     * @return
+     */
+    public boolean updateVersionDetail(VersionDetailVO versionDetailVO) {
+        // 1.先判断数据是否存在有效
+    	checkExist(versionDetailVO.getDetailId());
+        // 2.修改版本详情信息
+        VersionDetail versionDetail = new VersionDetail();
+
+        versionDetail.setGmtModified(DateUtil.now());// 修改时间
+        versionDetail.setModifier(UserUtils.getCurrentPrincipleID());
+        versionDetail.setTitle(versionDetailVO.getTitle());
+        versionDetail.setOrderNo(versionDetailVO.getOrderNo());
+        versionDetail.setStatus(versionDetailVO.getStatus());
+        versionDetail.setId(versionDetailVO.getDetailId());
+        versionDetail.setDescription(versionDetailVO.getDescription());
+        versionDetail.setRemark(versionDetailVO.getRemark());
+        boolean res = updateById(versionDetail);
+        if (!res) {
+            throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
+        }
+
+        return res;
+    }
+
+    /**
+     * 删除接口
+     *
+     * @param versionDetailIdVO
+     * @return
+     */
+    public boolean cancelVersionDetail(VersionDetailIdVO versionDetailIdVO) {
+    	 // 1.先判断数据是否存在有效
+    	checkExist(versionDetailIdVO.getId());
+        UpdateWrapper<VersionDetail> versionDetailNew = new UpdateWrapper<>();
+        versionDetailNew.in("id", versionDetailIdVO.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 VersionDetail(), versionDetailNew);
+    }
+
+    /**
+     * 增加明细接口
+     *
+     * @param versionDetailIdVO
+     * @return
+     */
+    public boolean addVersionDetail(VersionInfoAndDetailIdVO versionInfoAndDetailIdVO) {
+
+    	//1.增加明细前先判断主版本号的id是否有效
+        QueryWrapper<VersionInfo> VersionInfoFand = new QueryWrapper<>();
+        VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", versionInfoAndDetailIdVO.getVersionInfoId());
+        int sum = versionInfoServiceImpl.count(VersionInfoFand);
+        if (sum == 0) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "主版本号数据不存在");
+        }
+        
+        List<VersionDetail> dataNew = new ArrayList<VersionDetail>();
+        List<VersionDetailVO> datas = versionInfoAndDetailIdVO.getVersionDetail();
+        for (VersionDetailVO data : datas) {
+            VersionDetail versionDetail = new VersionDetail();
+            versionDetail.setCreator(UserUtils.getCurrentPrincipleID());
+            versionDetail.setGmtCreate(DateUtil.now());
+            versionDetail.setGmtModified(DateUtil.now());
+            versionDetail.setModifier(UserUtils.getCurrentPrincipleID());
+            versionDetail.setDescription(data.getDescription());
+            versionDetail.setOrderNo(data.getOrderNo());
+            versionDetail.setTitle(data.getTitle());
+            versionDetail.setVersionId(versionInfoAndDetailIdVO.getVersionInfoId());
+            versionDetail.setRemark(data.getRemark());
+            versionDetail.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
+            dataNew.add(versionDetail);
+
+        }
+
+        boolean res = versionDetailServiceImpl.saveBatch(dataNew);
+
+        return res;
+    }
+    /**
+     * 判断数据是否存在有效
+     *
+     * @param id
+     */
+    private void checkExist(Long id) {
+    	 // 1.先判断数据是否存在有效
+    	 QueryWrapper<VersionDetail> VersionInfoFand = new QueryWrapper<>();
+         VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", id);
+         int sum = count(VersionInfoFand);
+         if (sum == 0) {
+             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
+         }
+    }
+}

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

@@ -1,248 +1,248 @@
-package com.diagbot.facade;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.diagbot.client.UserServiceClient;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.VersionDetailDTO;
-import com.diagbot.dto.VersionWrapperDTO;
-import com.diagbot.entity.VersionDetail;
-import com.diagbot.entity.VersionInfo;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.StatusEnum;
-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.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.ListUtil;
-import com.diagbot.util.UserUtils;
-import com.diagbot.vo.VersionDetailVO;
-import com.diagbot.vo.VersionInfoAllVO;
-import com.diagbot.vo.VersionInfoIdVO;
-import com.diagbot.vo.VersionInfoVO;
-import com.diagbot.vo.VersionWrapperNameVO;
-
-/**
- * @author wangfeng
- * @Description: 版本信息
- * @date 2018年12月6日 下午2:14:54
- */
-@Component
-public class VersionInfoFacade extends VersionInfoServiceImpl {
-
-    @Autowired
-    VersionDetailFacade versionDetailFacade;
-    @Autowired
-    VersionDetailServiceImpl versionDetailServiceImpl;
-    @Autowired
-    UserServiceClient userServiceClient;
-
-    /**
-     * 查询版本信息
-     *
-     * @return
-     */
-    public IPage<VersionWrapperDTO> getVersionInfoAll(Page page,VersionWrapperNameVO versionWrapperNameVO) {
-        // 模糊查询最新的一条版本信息
-       /* QueryWrapper<VersionInfo> versionInfoQuery = new QueryWrapper<>();
-        versionInfoQuery.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
-                .like("name", name).orderByDesc("refresh_time");
-      
-        // 分页查询
-*/        //IPage<VersionInfo> queryUserInformation = page(page, versionInfoQuery);
-        IPage<VersionWrapperDTO> queryUserInformation = getVersionInfoAPage(page,versionWrapperNameVO);
-        List<VersionWrapperDTO> versionInfos = queryUserInformation.getRecords();
-        List<VersionWrapperDTO> versionLists = new ArrayList<VersionWrapperDTO>();
-        // 取出操作人id
-        List<String> modifierid = new ArrayList<>();
-        modifierid = versionInfos.stream().map(ac -> ac.getModifierid()).collect(Collectors.toList());
-        // 根据操作人的id获取操作人信息
-        Map<String, String> userNames = new HashMap<>();
-        if (ListUtil.isNotEmpty(modifierid)) {
-            RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
-            if (userNamesDTO == null || !CommonErrorCode.OK.getCode().equals(userNamesDTO.code)) {
-                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "获取所有用户信息失败");
-            }
-            userNames = userNamesDTO.data;
-        }
-        // 当查出的数据不为空时，取到版本id，再去版本明细表中查询详细的信息
-		for (VersionWrapperDTO versionInfo : versionInfos) {
-			VersionWrapperDTO versionList = new VersionWrapperDTO();
-			versionList.setId(versionInfo.getId());
-			versionList.setGmtCreate(versionInfo.getGmtCreate());
-			versionList.setName(versionInfo.getName());
-			versionList.setModifierid(userNames.get(versionInfo.getModifierid()));
-			versionList.setRefreshTime(versionInfo.getRefreshTime());
-			versionList.setStatus(versionInfo.getStatus());
-			versionList.setRemark(versionInfo.getRemark());
-			versionLists.add(versionList);
-		}
-        // 取版本id查明细
-        List<Long> ids = new ArrayList<>();
-        if (versionInfos != null) {
-            // 当查出的数据不为空时，取到版本id，再去版本明细表中查询详细的信息
-            for (VersionWrapperDTO versionInfo : versionInfos) {
-                ids.add(versionInfo.getId());
-            }
-            // 获取明细信息
-            List<VersionDetailDTO> details = versionDetailFacade.getByIds(ids);
-            Map<Long, List<VersionDetailDTO>> map = new HashMap<>();
-            // 获取所有用户开通的产品信息
-            map = EntityUtil.makeEntityListMap(details, "versionId");
-            if (map.size() > 0) {
-                for (VersionWrapperDTO versionList : versionLists) {
-                    List<VersionDetailDTO> userAndProdutUDTO = map.get(versionList.getId());
-                    if (ListUtil.isNotEmpty(userAndProdutUDTO)) {
-                        versionList.setDetail(userAndProdutUDTO);
-                    }
-                }
-            }
-        }
-        return queryUserInformation.setRecords(versionLists);
-
-    }
-
-    /**
-     * 保存版本信息
-     *
-     * @param versionInfoVO
-     * @return
-     */
-    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());
-        versionInfo.setName(versionInfoVO.getName());
-        versionInfo.setGmtModified(DateUtil.now());
-        versionInfo.setModifier(UserUtils.getCurrentPrincipleID());
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        try {
-            versionInfo.setRefreshTime(sdf.parse(versionInfoVO.getRefreshTime()));
-        } catch (ParseException e) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "时间格式有误");
-        }
-        versionInfo.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
-        versionInfo.setRemark(versionInfoVO.getRemark());
-        // 优先保存版本号，成功后再保存明细信息
-        boolean res = save(versionInfo);
-        if (res) {
-            List<VersionDetail> dataNew = new ArrayList<VersionDetail>();
-            List<VersionDetailVO> datas = versionInfoVO.getVersionDetail();
-            if (datas != null && datas.size() > 0) {
-                for (VersionDetailVO data : datas) {
-                    VersionDetail versionDetail = new VersionDetail();
-                    versionDetail.setCreator(UserUtils.getCurrentPrincipleID());
-                    versionDetail.setGmtCreate(DateUtil.now());
-                    versionDetail.setGmtModified(DateUtil.now());
-                    versionDetail.setModifier(UserUtils.getCurrentPrincipleID());
-                    versionDetail.setDescription(data.getDescription());
-                    versionDetail.setOrderNo(data.getOrderNo());
-                    versionDetail.setTitle(data.getTitle());
-                    versionDetail.setVersionId(versionInfo.getId());
-                    versionDetail.setRemark(data.getRemark());
-                    versionDetail.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
-                    dataNew.add(versionDetail);
-                }
-
-                res = versionDetailServiceImpl.saveBatch(dataNew);
-            }
-        }
-        return res;
-    }
-
-    /**
-     * 更新
-     *
-     * @param versionInfoVO
-     * @return
-     */
-    public boolean updateVersionInfoAll(VersionInfoAllVO versionInfoVO) {
-        // 1.先判断数据是否存在有效
-    	checkExist(versionInfoVO.getId());
-        // 2.判断该版本号是否存在名字相同的数据
-        QueryWrapper<VersionInfo> templateInfoFand = new QueryWrapper<>();
-        templateInfoFand.eq("name", versionInfoVO.getName()).eq("is_deleted", IsDeleteEnum.N.getKey());
-        VersionInfo dataInfo = getOne(templateInfoFand);
-        if (dataInfo != null && !dataInfo.getId().equals(versionInfoVO.getId())) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该版本号已存在");
-        }
-        // 3.修改版本信息
-        VersionInfo versionInfo = new VersionInfo();
-        versionInfo.setId(versionInfoVO.getId());// 模板id
-        versionInfo.setName(versionInfoVO.getName());// 模板名称
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        if (versionInfoVO.getRefreshTime() != null) {
-            try {
-                versionInfo.setRefreshTime(sdf.parse(versionInfoVO.getRefreshTime()));
-            } catch (ParseException e) {
-                throw new CommonException(CommonErrorCode.NOT_EXISTS, "时间格式有误");
-                // e.printStackTrace();
-            }
-        }
-        versionInfo.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
-        versionInfo.setRemark(versionInfoVO.getRemark());
-        versionInfo.setGmtModified(DateUtil.now());// 修改时间
-        versionInfo.setModifier(UserUtils.getCurrentPrincipleID());
-        boolean res = updateById(versionInfo);
-        if (!res) {
-            throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
-        }
-
-        return res;
-    }
-
-    /**
-     * 删除
-     *
-     * @param versionInfoVO
-     * @return
-     */
-    public boolean cancelVersionInfoAll(VersionInfoIdVO versionInfoVO) {
-    	 // 1.先判断数据是否存在有效
-    	checkExist(versionInfoVO.getId());
-        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());
-        return update(new VersionInfo(), versionInfoNew);
-    }
-
-    /**
-     * 判断数据是否存在有效
-     *
-     * @param id
-     */
-    private void checkExist(Long id) {
-    	 // 1.先判断数据是否存在有效
-        QueryWrapper<VersionInfo> VersionInfoFand = new QueryWrapper<>();
-        VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", id);
-        int sum = count(VersionInfoFand);
-        if (sum == 0) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
-        }
-    }
-}
+package com.diagbot.facade;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diagbot.client.UserServiceClient;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.VersionDetailDTO;
+import com.diagbot.dto.VersionWrapperDTO;
+import com.diagbot.entity.VersionDetail;
+import com.diagbot.entity.VersionInfo;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.StatusEnum;
+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.DateUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.UserUtils;
+import com.diagbot.vo.VersionDetailVO;
+import com.diagbot.vo.VersionInfoAllVO;
+import com.diagbot.vo.VersionInfoIdVO;
+import com.diagbot.vo.VersionInfoVO;
+import com.diagbot.vo.VersionWrapperNameVO;
+
+/**
+ * @author wangfeng
+ * @Description: 版本信息
+ * @date 2018年12月6日 下午2:14:54
+ */
+@Component
+public class VersionInfoFacade extends VersionInfoServiceImpl {
+
+    @Autowired
+    VersionDetailFacade versionDetailFacade;
+    @Autowired
+    VersionDetailServiceImpl versionDetailServiceImpl;
+    @Autowired
+    UserServiceClient userServiceClient;
+
+    /**
+     * 查询版本信息
+     *
+     * @return
+     */
+    public IPage<VersionWrapperDTO> getVersionInfoAll(Page page,VersionWrapperNameVO versionWrapperNameVO) {
+        // 模糊查询最新的一条版本信息
+       /* QueryWrapper<VersionInfo> versionInfoQuery = new QueryWrapper<>();
+        versionInfoQuery.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
+                .like("name", name).orderByDesc("refresh_time");
+      
+        // 分页查询
+*/        //IPage<VersionInfo> queryUserInformation = page(page, versionInfoQuery);
+        IPage<VersionWrapperDTO> queryUserInformation = getVersionInfoAPage(page,versionWrapperNameVO);
+        List<VersionWrapperDTO> versionInfos = queryUserInformation.getRecords();
+        List<VersionWrapperDTO> versionLists = new ArrayList<VersionWrapperDTO>();
+        // 取出操作人id
+        List<String> modifierid = new ArrayList<>();
+        modifierid = versionInfos.stream().map(ac -> ac.getModifierid()).collect(Collectors.toList());
+        // 根据操作人的id获取操作人信息
+        Map<String, String> userNames = new HashMap<>();
+        if (ListUtil.isNotEmpty(modifierid)) {
+            RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
+            if (userNamesDTO == null || !CommonErrorCode.OK.getCode().equals(userNamesDTO.code)) {
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "获取所有用户信息失败");
+            }
+            userNames = userNamesDTO.data;
+        }
+        // 当查出的数据不为空时，取到版本id，再去版本明细表中查询详细的信息
+		for (VersionWrapperDTO versionInfo : versionInfos) {
+			VersionWrapperDTO versionList = new VersionWrapperDTO();
+			versionList.setId(versionInfo.getId());
+			versionList.setGmtCreate(versionInfo.getGmtCreate());
+			versionList.setName(versionInfo.getName());
+			versionList.setModifierid(userNames.get(versionInfo.getModifierid()));
+			versionList.setRefreshTime(versionInfo.getRefreshTime());
+			versionList.setStatus(versionInfo.getStatus());
+			versionList.setRemark(versionInfo.getRemark());
+			versionLists.add(versionList);
+		}
+        // 取版本id查明细
+        List<Long> ids = new ArrayList<>();
+        if (versionInfos != null) {
+            // 当查出的数据不为空时，取到版本id，再去版本明细表中查询详细的信息
+            for (VersionWrapperDTO versionInfo : versionInfos) {
+                ids.add(versionInfo.getId());
+            }
+            // 获取明细信息
+            List<VersionDetailDTO> details = versionDetailFacade.getByIds(ids);
+            Map<Long, List<VersionDetailDTO>> map = new HashMap<>();
+            // 获取所有用户开通的产品信息
+            map = EntityUtil.makeEntityListMap(details, "versionId");
+            if (map.size() > 0) {
+                for (VersionWrapperDTO versionList : versionLists) {
+                    List<VersionDetailDTO> userAndProdutUDTO = map.get(versionList.getId());
+                    if (ListUtil.isNotEmpty(userAndProdutUDTO)) {
+                        versionList.setDetail(userAndProdutUDTO);
+                    }
+                }
+            }
+        }
+        return queryUserInformation.setRecords(versionLists);
+
+    }
+
+    /**
+     * 保存版本信息
+     *
+     * @param versionInfoVO
+     * @return
+     */
+    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());
+        versionInfo.setName(versionInfoVO.getName());
+        versionInfo.setGmtModified(DateUtil.now());
+        versionInfo.setModifier(UserUtils.getCurrentPrincipleID());
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        try {
+            versionInfo.setRefreshTime(sdf.parse(versionInfoVO.getRefreshTime()));
+        } catch (ParseException e) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "时间格式有误");
+        }
+        versionInfo.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
+        versionInfo.setRemark(versionInfoVO.getRemark());
+        // 优先保存版本号，成功后再保存明细信息
+        boolean res = save(versionInfo);
+        if (res) {
+            List<VersionDetail> dataNew = new ArrayList<VersionDetail>();
+            List<VersionDetailVO> datas = versionInfoVO.getVersionDetail();
+            if (datas != null && datas.size() > 0) {
+                for (VersionDetailVO data : datas) {
+                    VersionDetail versionDetail = new VersionDetail();
+                    versionDetail.setCreator(UserUtils.getCurrentPrincipleID());
+                    versionDetail.setGmtCreate(DateUtil.now());
+                    versionDetail.setGmtModified(DateUtil.now());
+                    versionDetail.setModifier(UserUtils.getCurrentPrincipleID());
+                    versionDetail.setDescription(data.getDescription());
+                    versionDetail.setOrderNo(data.getOrderNo());
+                    versionDetail.setTitle(data.getTitle());
+                    versionDetail.setVersionId(versionInfo.getId());
+                    versionDetail.setRemark(data.getRemark());
+                    versionDetail.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
+                    dataNew.add(versionDetail);
+                }
+
+                res = versionDetailServiceImpl.saveBatch(dataNew);
+            }
+        }
+        return res;
+    }
+
+    /**
+     * 更新
+     *
+     * @param versionInfoVO
+     * @return
+     */
+    public boolean updateVersionInfoAll(VersionInfoAllVO versionInfoVO) {
+        // 1.先判断数据是否存在有效
+    	checkExist(versionInfoVO.getId());
+        // 2.判断该版本号是否存在名字相同的数据
+        QueryWrapper<VersionInfo> templateInfoFand = new QueryWrapper<>();
+        templateInfoFand.eq("name", versionInfoVO.getName()).eq("is_deleted", IsDeleteEnum.N.getKey());
+        VersionInfo dataInfo = getOne(templateInfoFand);
+        if (dataInfo != null && !dataInfo.getId().equals(versionInfoVO.getId())) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该版本号已存在");
+        }
+        // 3.修改版本信息
+        VersionInfo versionInfo = new VersionInfo();
+        versionInfo.setId(versionInfoVO.getId());// 模板id
+        versionInfo.setName(versionInfoVO.getName());// 模板名称
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        if (versionInfoVO.getRefreshTime() != null) {
+            try {
+                versionInfo.setRefreshTime(sdf.parse(versionInfoVO.getRefreshTime()));
+            } catch (ParseException e) {
+                throw new CommonException(CommonErrorCode.NOT_EXISTS, "时间格式有误");
+                // e.printStackTrace();
+            }
+        }
+        versionInfo.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
+        versionInfo.setRemark(versionInfoVO.getRemark());
+        versionInfo.setGmtModified(DateUtil.now());// 修改时间
+        versionInfo.setModifier(UserUtils.getCurrentPrincipleID());
+        boolean res = updateById(versionInfo);
+        if (!res) {
+            throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
+        }
+
+        return res;
+    }
+
+    /**
+     * 删除
+     *
+     * @param versionInfoVO
+     * @return
+     */
+    public boolean cancelVersionInfoAll(VersionInfoIdVO versionInfoVO) {
+    	 // 1.先判断数据是否存在有效
+    	checkExist(versionInfoVO.getId());
+        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());
+        return update(new VersionInfo(), versionInfoNew);
+    }
+
+    /**
+     * 判断数据是否存在有效
+     *
+     * @param id
+     */
+    private void checkExist(Long id) {
+    	 // 1.先判断数据是否存在有效
+        QueryWrapper<VersionInfo> VersionInfoFand = new QueryWrapper<>();
+        VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", id);
+        int sum = count(VersionInfoFand);
+        if (sum == 0) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
+        }
+    }
+}

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

@@ -1,21 +1,21 @@
-package com.diagbot.vo;
-
-import java.util.Date;
-
-import javax.validation.constraints.NotNull;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 删除版本详情信息
- * @author wangfeng
- * @Description: TODO
- * @date 2018年12月13日 下午2:35:33
- */
-@Getter
-@Setter
-public class VersionDetailIdVO {
-	@NotNull(message = "请输入id")
-	private Long id;
-}
+package com.diagbot.vo;
+
+import java.util.Date;
+
+import javax.validation.constraints.NotNull;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 删除版本详情信息
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年12月13日 下午2:35:33
+ */
+@Getter
+@Setter
+public class VersionDetailIdVO {
+	@NotNull(message = "请输入id")
+	private Long id;
+}

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

@@ -1,48 +1,48 @@
-package com.diagbot.vo;
-
-import javax.validation.constraints.NotNull;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 更新版本详情信息
- * @author wangfeng
- * @Description: TODO
- * @date 2018年11月27日 上午10:20:56
- */
-@Getter
-@Setter
-public class VersionDetailVO {
-
-	   /**
-     * 版本主表id
-     */
-	@NotNull(message = "请输入id")
-    private Long detailId;
-
-    /**
-     * 标题
-     */
-    private String title;
-
-    /**
-     * 描述
-     */
-    private String description;
-
-    /**
-     * 排序号
-     */
-    private String orderNo;
-
-    /**
-     * 1：启动，0：不启用
-     */
-    private String status;
-
-    /**
-     * 备注
-     */
-    private String remark;
-}
+package com.diagbot.vo;
+
+import javax.validation.constraints.NotNull;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 更新版本详情信息
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月27日 上午10:20:56
+ */
+@Getter
+@Setter
+public class VersionDetailVO {
+
+	   /**
+     * 版本主表id
+     */
+	@NotNull(message = "请输入id")
+    private Long detailId;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 排序号
+     */
+    private String orderNo;
+
+    /**
+     * 1：启动，0：不启用
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

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

@@ -1,44 +1,44 @@
-package com.diagbot.vo;
-
-import java.util.Date;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 更新版本信息
- * @author wangfeng
- * @Description: TODO
- * @date 2018年11月29日 下午4:01:30
- */
-@Getter
-@Setter
-public class VersionInfoAllVO {
-	/**
-	 * 版本id
-	 */
-	@NotNull(message = "请输入id")
-	private Long id;
-	/**
-     * 名称
-     */
-    private String name;
-
-    /**
-     * 时间
-     */
-    private String refreshTime;
-
-    /**
-     * 1：启动，0：不启用
-     */
-   // private String status;
-
-    /**
-     * 备注
-     */
-    private String remark;
-}
+package com.diagbot.vo;
+
+import java.util.Date;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 更新版本信息
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月29日 下午4:01:30
+ */
+@Getter
+@Setter
+public class VersionInfoAllVO {
+	/**
+	 * 版本id
+	 */
+	@NotNull(message = "请输入id")
+	private Long id;
+	/**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 时间
+     */
+    private String refreshTime;
+
+    /**
+     * 1：启动，0：不启用
+     */
+   // private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

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

@@ -1,26 +1,26 @@
-package com.diagbot.vo;
-
-import java.util.List;
-
-import javax.validation.constraints.NotNull;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 增加版本详情信息
- * @author wangfeng
- * @Description: TODO
- * @date 2018年12月13日 下午2:35:41
- */
-@Getter
-@Setter
-public class VersionInfoAndDetailIdVO {
-	/**
-	 * 用户id
-	 */
-	@NotNull(message = "请输入id")
-	private Long versionInfoId;
-	
-    private List<VersionDetailVO> versionDetail;
-}
+package com.diagbot.vo;
+
+import java.util.List;
+
+import javax.validation.constraints.NotNull;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 增加版本详情信息
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年12月13日 下午2:35:41
+ */
+@Getter
+@Setter
+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,19 +1,19 @@
-package com.diagbot.vo;
-
-import javax.validation.constraints.NotNull;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 删除版本信息
- * @author wangfeng
- * @Description: TODO
- * @date 2018年12月13日 下午2:35:02
- */
-@Getter
-@Setter
-public class VersionInfoIdVO {
-	@NotNull(message = "请输入id")
-	private Long id;
-}
+package com.diagbot.vo;
+
+import javax.validation.constraints.NotNull;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 删除版本信息
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年12月13日 下午2:35:02
+ */
+@Getter
+@Setter
+public class VersionInfoIdVO {
+	@NotNull(message = "请输入id")
+	private Long id;
+}

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

@@ -1,49 +1,49 @@
-package com.diagbot.vo;
-
-import java.util.Date;
-import java.util.List;
-
-import javax.validation.constraints.NotBlank;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 
- * 保存版本信息
- * @author wangfeng
- * @Description: TODO
- * @date 2018年11月28日 上午10:55:17
- */
-@Getter
-@Setter
-public class VersionInfoVO {
-
-	/**
-	 * 用户id
-	 */
-	//private Long id;
-	/**
-     * 名称
-     */
-	@NotBlank(message = "标题不能为空")
-    private String name;
-
-    /**
-     * 时间
-     */
-	@NotBlank(message = "请输入时间")
-    private String refreshTime;
-
-    /**
-     * 1：启动，0：不启用
-     */
-   // private String status;
-
-    /**
-     * 备注
-     */
-    private String remark;
-    
-    private List<VersionDetailVO> versionDetail;
-}
+package com.diagbot.vo;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * 保存版本信息
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月28日 上午10:55:17
+ */
+@Getter
+@Setter
+public class VersionInfoVO {
+
+	/**
+	 * 用户id
+	 */
+	//private Long id;
+	/**
+     * 名称
+     */
+	@NotBlank(message = "标题不能为空")
+    private String name;
+
+    /**
+     * 时间
+     */
+	@NotBlank(message = "请输入时间")
+    private String refreshTime;
+
+    /**
+     * 1：启动，0：不启用
+     */
+   // private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+    
+    private List<VersionDetailVO> versionDetail;
+}

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

@@ -1,21 +1,21 @@
-package com.diagbot.vo;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 获取版本信息
- * @author wangfeng
- * @Description: TODO
- * @date 2018年12月13日 下午2:34:35
- */
-@Getter
-@Setter
-public class VersionWrapperNameVO extends Page{
-	/**
-     * 名称
-     */
-    private String name;
-}
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 获取版本信息
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年12月13日 下午2:34:35
+ */
+@Getter
+@Setter
+public class VersionWrapperNameVO extends Page{
+	/**
+     * 名称
+     */
+    private String name;
+}