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

aipt-service/src/main/java/com/diagbot/facade/VersionDetailFacaed.java

@@ -22,7 +22,7 @@ import java.util.Map;
  * @date 2018年11月21日 上午11:38:40
  */
 @Component
-public class VersionDetailFacaed extends VersionDetailServiceImpl {
+public class VersionDetailFacade extends VersionDetailServiceImpl {
 
     /**
      * 根据版本id查询版本详情

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

@@ -25,7 +25,7 @@ import java.util.List;
 public class VersionInfoFacade extends VersionInfoServiceImpl {
 
     @Autowired
-    VersionDetailFacaed versionDetailFacaed;
+    VersionDetailFacade versionDetailFacade;
 
 
     /**
@@ -55,7 +55,7 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
         if (versionInfo != null) {
             //当查出的数据不为空时，取到版本id，再去版本明细表中查询详细的信息
             long id = versionInfo.getId();
-            List<VersionDetailDTO> detail = versionDetailFacaed.getById(id);
+            List<VersionDetailDTO> detail = versionDetailFacade.getById(id);
             //System.out.println(detail.toString());
             versionList.setId(versionInfo.getId());
             versionList.setName(versionInfo.getName());

common/src/main/java/com/diagbot/enums/ProductTypeEnum.java

@@ -12,7 +12,7 @@ import lombok.Setter;
  */
 public enum ProductTypeEnum implements KeyedNamed {
     DIAGBOTCLOUD_INNER(1, "云平台内部"),
-    DIAGBOTCLOUD_OUTTER(2, "云平台外部"),
+    DIAGBOTCLOUD_OUTER(2, "云平台外部"),
     ICSS(3, "ICSS"),
     TRIAGE(4, "智能分诊"),
     DATA(5, "数据服务模式"),

knowledgeman-service/src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -36,6 +36,8 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/commonconcept/getConceptMapByNameAndType").permitAll()
                 .antMatchers("/commonconcept/index").permitAll()
                 .antMatchers("/commonconcept/indexByLexicon").permitAll()
+                .antMatchers("/versionInfo/getVersionInfoInner").permitAll()
+                .antMatchers("/versionInfo/getVersionInfoOuter").permitAll()
                 .antMatchers("/**").authenticated();
 //                .antMatchers("/**").permitAll();
     }

knowledgeman-service/src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -99,6 +99,8 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/commonconcept/getConceptMapByNameAndType", request)
                 || matchers("/commonconcept/index", request)
                 || matchers("/commonconcept/indexByLexicon", request)
+                || matchers("/versionInfo/getVersionInfoInner", request)
+                || matchers("/versionInfo/getVersionInfoOuter", request)
                 || matchers("/", request)) {
             return true;
         }

knowledgeman-service/src/main/java/com/diagbot/dto/VersionDetailSpecDTO.java

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

knowledgeman-service/src/main/java/com/diagbot/dto/VersionSpecDTO.java

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

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

@@ -6,6 +6,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.diagbot.dto.VersionDetailSpecDTO;
+import com.diagbot.util.BeanUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -45,6 +47,7 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
     @Autowired
     VersionInfoServiceImpl versionInfoServiceImpl;
 
+
     /**
      * 根据版本id查询版本详情
      *
@@ -80,6 +83,30 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
 
     }
 
+    /**
+     * 根据版本id查询版本详情
+     *
+     * @param id
+     * @return
+     */
+    public List<VersionDetailSpecDTO> getById2(Long id) {
+        QueryWrapper<VersionDetail> versionDetailQuery = new QueryWrapper<>();
+        Map<String, Object> mapAll = new HashMap<>();
+        mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
+        mapAll.put("version_id", id);
+        mapAll.put("STATUS", StatusEnum.Enable.getKey());
+        versionDetailQuery.allEq(mapAll).orderByAsc("order_no");
+
+        VersionDetail versionDetail = new VersionDetail();
+        versionDetail.setVersionId(id);
+        List<VersionDetail> datas = list(versionDetailQuery);
+        List<VersionDetailSpecDTO> dataNew = new ArrayList<>();
+        //过滤字段
+        dataNew = BeanUtil.listCopyTo(datas, VersionDetailSpecDTO.class);
+        return dataNew;
+
+    }
+
     /**
      * 根据版本ids查询版本详情
      *

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

@@ -1,16 +1,5 @@
 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;
@@ -18,6 +7,8 @@ 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.VersionDetailSpecDTO;
+import com.diagbot.dto.VersionSpecDTO;
 import com.diagbot.dto.VersionWrapperDTO;
 import com.diagbot.entity.VersionDetail;
 import com.diagbot.entity.VersionInfo;
@@ -29,13 +20,25 @@ 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.IntegerUtil;
 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.VersionVO;
 import com.diagbot.vo.VersionWrapperNameVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+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;
 
 /**
  * @author wangfeng
@@ -57,7 +60,7 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
      *
      * @return
      */
-    public IPage<VersionWrapperDTO> getVersionInfoAll(Page page,VersionWrapperNameVO versionWrapperNameVO) {
+    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())
@@ -65,7 +68,7 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
       
         // 分页查询
 */        //IPage<VersionInfo> queryUserInformation = page(page, versionInfoQuery);
-        IPage<VersionWrapperDTO> queryUserInformation = getVersionInfoAPage(page,versionWrapperNameVO);
+        IPage<VersionWrapperDTO> queryUserInformation = getVersionInfoAPage(page, versionWrapperNameVO);
         List<VersionWrapperDTO> versionInfos = queryUserInformation.getRecords();
         List<VersionWrapperDTO> versionLists = new ArrayList<VersionWrapperDTO>();
         // 取出操作人id
@@ -81,17 +84,17 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
             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);
-		}
+        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) {
@@ -182,7 +185,7 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
      */
     public boolean updateVersionInfoAll(VersionInfoAllVO versionInfoVO) {
         // 1.先判断数据是否存在有效
-    	checkExist(versionInfoVO.getId());
+        checkExist(versionInfoVO.getId());
         // 2.判断该版本号是否存在名字相同的数据
         QueryWrapper<VersionInfo> templateInfoFand = new QueryWrapper<>();
         templateInfoFand.eq("name", versionInfoVO.getName()).eq("is_deleted", IsDeleteEnum.N.getKey());
@@ -222,8 +225,8 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
      * @return
      */
     public boolean cancelVersionInfoAll(VersionInfoIdVO versionInfoVO) {
-    	 // 1.先判断数据是否存在有效
-    	checkExist(versionInfoVO.getId());
+        // 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())
@@ -237,7 +240,7 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
      * @param id
      */
     private void checkExist(Long id) {
-    	 // 1.先判断数据是否存在有效
+        // 1.先判断数据是否存在有效
         QueryWrapper<VersionInfo> VersionInfoFand = new QueryWrapper<>();
         VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", id);
         int sum = count(VersionInfoFand);
@@ -245,4 +248,43 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
         }
     }
+
+    /**
+     * 查询版本信息
+     *
+     * @return
+     */
+    public VersionSpecDTO getVersionInfo(VersionVO versionVO) {
+        //入参配置验证
+        if (null == versionVO) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL);
+        }
+
+        if (IntegerUtil.isNull(versionVO.getProductType())) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "产品类型不能为空！");
+        }
+        //查询最新的一条版本信息
+        QueryWrapper<VersionInfo> versionInfoQuery = new QueryWrapper<>();
+        versionInfoQuery.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("product_type", versionVO.getProductType())
+                .eq("STATUS", StatusEnum.Enable.getKey())
+                .orderByDesc("gmt_modified");
+
+        VersionInfo versionInfo = getOne(versionInfoQuery);
+        VersionSpecDTO versionList = new VersionSpecDTO();
+
+        if (versionInfo != null) {
+            //当查出的数据不为空时，取到版本id，再去版本明细表中查询详细的信息
+            long id = versionInfo.getId();
+            List<VersionDetailSpecDTO> detail = versionDetailFacade.getById2(id);
+            //System.out.println(detail.toString());
+            versionList.setId(versionInfo.getId());
+            versionList.setName(versionInfo.getName());
+            versionList.setRefreshTime(versionInfo.getRefreshTime());
+            versionList.setStatus(versionInfo.getStatus());
+            versionList.setDetail(detail);
+        }
+
+        return versionList;
+    }
 }

knowledgeman-service/src/main/java/com/diagbot/vo/VersionVO.java

@@ -0,0 +1,18 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 版本信息
+ * @author: gaodm
+ * @time: 2019/8/7 13:26
+ */
+@Getter
+@Setter
+public class VersionVO {
+    /**
+     * 产品类型（1：云平台内部；2：云平台外部；3：icss；4：智能分诊；5：数据服务模式；6：智能预问诊）
+     */
+    private Integer productType;
+}

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

@@ -3,11 +3,14 @@ package com.diagbot.web;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.VersionSpecDTO;
 import com.diagbot.dto.VersionWrapperDTO;
+import com.diagbot.enums.ProductTypeEnum;
 import com.diagbot.facade.VersionInfoFacade;
 import com.diagbot.vo.VersionInfoAllVO;
 import com.diagbot.vo.VersionInfoIdVO;
 import com.diagbot.vo.VersionInfoVO;
+import com.diagbot.vo.VersionVO;
 import com.diagbot.vo.VersionWrapperNameVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -78,4 +81,24 @@ public class VersionInfoController {
 
         return RespDTO.onSuc(res);
     }
+
+    @ApiOperation(value = "获取内部用户版本信息[by:wangfeng]", notes = "获取内部用户版本信息")
+    @PostMapping("/getVersionInfoInner")
+    @SysLogger("getVersionInfoInner")
+    public RespDTO<VersionSpecDTO> getVersionInfoInner() {
+        VersionVO versionVO = new VersionVO();
+        versionVO.setProductType(ProductTypeEnum.DIAGBOTCLOUD_INNER.getKey());
+        VersionSpecDTO data = versionInfoFacade.getVersionInfo(versionVO);
+        return RespDTO.onSuc(data);
+    }
+
+    @ApiOperation(value = "获取外部用户版本信息[by:wangfeng]", notes = "获取外部用户版本信息")
+    @PostMapping("/getVersionInfoOuter")
+    @SysLogger("getVersionInfoOuter")
+    public RespDTO<VersionSpecDTO> getVersionInfoOuter() {
+        VersionVO versionVO = new VersionVO();
+        versionVO.setProductType(ProductTypeEnum.DIAGBOTCLOUD_OUTER.getKey());
+        VersionSpecDTO data = versionInfoFacade.getVersionInfo(versionVO);
+        return RespDTO.onSuc(data);
+    }
 }