Merge remote-tracking branch 'origin/dev/KLBstand' into dev/KLBstand

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

@@ -19,6 +19,12 @@ public class GetConceptInfoDetailDTO {
 	@ApiModelProperty(value="名称")
     private String name;
     
+    /**
+     * 类型id
+     */
+	@ApiModelProperty(value="类型id")
+	private Long typeId;
+	
     /**
      * 类型
      */

knowledgeman-service/src/main/java/com/diagbot/entity/LibraryInfo.java

@@ -13,7 +13,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
  * </p>
  *
  * @author gaodm
- * @since 2019-05-09
+ * @since 2019-05-13
  */
 @TableName("kl_library_info")
 public class LibraryInfo implements Serializable {
@@ -71,11 +71,6 @@ public class LibraryInfo implements Serializable {
      */
     private Long typeId;
 
-    /**
-     * 词性
-     */
-    private String type;
-
     /**
      * 拼音
      */
@@ -156,13 +151,6 @@ public class LibraryInfo implements Serializable {
     public void setTypeId(Long typeId) {
         this.typeId = typeId;
     }
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
     public String getSpell() {
         return spell;
     }
@@ -191,7 +179,6 @@ public class LibraryInfo implements Serializable {
         ", conceptId=" + conceptId +
         ", isConcept=" + isConcept +
         ", typeId=" + typeId +
-        ", type=" + type +
         ", spell=" + spell +
         ", remark=" + remark +
         "}";

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

@@ -262,15 +262,24 @@ public class ConceptFacade extends ConceptServiceImpl {
      */
     public GetConceptInfoDTO getConceptInfoDetail(GetConceptInfoDetailVO getConceptInfoDetailVO) {
         GetConceptInfoDTO getConceptInfoDTO = new GetConceptInfoDTO();
+        
+        Concept concept = this.getById(getConceptInfoDetailVO.getConceptId());
+        if (concept == null) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS);
+        }
 
         QueryWrapper<LibraryInfo> libraryInfoQe = new QueryWrapper<LibraryInfo>();
         libraryInfoQe.eq("concept_id", getConceptInfoDetailVO.getConceptId());
-        List<LibraryInfo> libraryInfoList = libraryinfoFacade.list(libraryInfoQe);
+        List<GetConceptInfoDetailDTO> getConceptInfoDetailDTOList = BeanUtil.listCopyTo(libraryinfoFacade.list(libraryInfoQe), GetConceptInfoDetailDTO.class);
+        getConceptInfoDetailDTOList.forEach(i->{
+        	i.setType(LexiconTypeEnum.getName(i.getTypeId().intValue()));
+        });
 
-        getConceptInfoDTO.setLibName(BeanUtil.listCopyTo(libraryInfoList.stream().filter(i -> i.getIsConcept() != null && i.getIsConcept() == 1).collect(Collectors.toList()), GetConceptInfoDetailDTO.class));
-        getConceptInfoDTO.setOtherNames(BeanUtil.listCopyTo(libraryInfoList.stream().filter(i -> i.getIsConcept() == null || i.getIsConcept() == 0).collect(Collectors.toList()), GetConceptInfoDetailDTO.class));
+        getConceptInfoDTO.setLibName(getConceptInfoDetailDTOList.stream().filter(i -> i.getIsConcept() != null && i.getIsConcept() == 1).collect(Collectors.toList()));
+        getConceptInfoDTO.setOtherNames(getConceptInfoDetailDTOList.stream().filter(i -> i.getIsConcept() == null || i.getIsConcept() == 0).collect(Collectors.toList()));
 
-        Integer isHasCommon = lexiconFacade.getById(libraryInfoList.get(0).getTypeId()).getIsHasCommon();
+        Integer isHasCommon = lexiconFacade.getById(concept.getLibType()).getIsHasCommon();
+        getConceptInfoDTO.setIsHasCommon(isHasCommon);
         if (isHasCommon == 1) {
             QueryWrapper<ConceptCommon> conceptCommonQe = new QueryWrapper<>();
             conceptCommonQe.eq("concept_id", getConceptInfoDetailVO.getConceptId());
@@ -345,7 +354,6 @@ public class ConceptFacade extends ConceptServiceImpl {
             BeanUtil.copyProperties(addConceptInfoDetailVOMain, libraryInfoMain);
             libraryInfoMain.setGmtCreate(now);
             libraryInfoMain.setCreator(currentUser);
-            libraryInfoMain.setType(addConceptInfoVO.getType());
             libraryInfoMain.setTypeId(lexicon.getId());
             libraryinfoFacade.save(libraryInfoMain);
             concept.setLibId(libraryInfoMain.getId());
@@ -412,7 +420,6 @@ public class ConceptFacade extends ConceptServiceImpl {
         for (LibraryInfo i : saveOrUpdateLibraryInfoList) {
             i.setId(null);
             i.setConceptId(conceptId);
-            i.setType(addConceptInfoVO.getType());
             i.setTypeId(lexicon.getId());
         }
         libraryInfoMain.setIsConcept(1);

knowledgeman-service/src/main/resources/mapper/LibraryInfoMapper.xml

@@ -14,7 +14,6 @@
         <result column="concept_id" property="conceptId" />
         <result column="is_concept" property="isConcept" />
         <result column="type_id" property="typeId" />
-        <result column="type" property="type" />
         <result column="spell" property="spell" />
         <result column="remark" property="remark" />
     </resultMap>

knowledgeman-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -56,7 +56,7 @@ public class CodeGeneration {
         StrategyConfig strategy = new StrategyConfig();
         strategy.setTablePrefix(new String[] { "kl_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "kl_lexicon"}); // 需要生成的表
+        strategy.setInclude(new String[] { "kl_library_info"}); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);