代码优化

aipt-service/src/main/java/com/diagbot/entity/Lexicon.java

@@ -1,120 +0,0 @@
-package com.diagbot.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-
-/**
- * <p>
- * 术语分类表
- * </p>
- *
- * @author wangyu
- * @since 2019-05-07
- */
-@TableName("kl_lexicon")
-public class Lexicon implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private LocalDateTime gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private LocalDateTime gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-
-    /**
-     * 类型名称
-     */
-    private String name;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public LocalDateTime getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(LocalDateTime gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public LocalDateTime getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(LocalDateTime gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public String toString() {
-        return "Lexicon{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", name=" + name +
-        "}";
-    }
-}

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

@@ -4,20 +4,21 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.ConceptBaseDTO;
 import com.diagbot.dto.ConceptWithOrderRes;
 import com.diagbot.entity.Concept;
-import com.diagbot.entity.Lexicon;
 import com.diagbot.entity.wrapper.ConceptWrapper;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.LexiconTypeEnum;
 import com.diagbot.enums.QuestionTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.ConceptServiceImpl;
+import com.diagbot.util.EnumEntriesBuilder;
 import com.diagbot.vo.ConceptBaseVO;
 import com.diagbot.vo.ConceptUsualVO;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description:
@@ -26,8 +27,6 @@ import java.util.List;
  */
 @Component
 public class ConceptFacade extends ConceptServiceImpl {
-    @Autowired
-    LexiconFacade lexiconFacade;
 
     /**
      * 验证存在并且获取概念基本信息
@@ -54,17 +53,20 @@ public class ConceptFacade extends ConceptServiceImpl {
      * @return
      */
     public List<ConceptBaseDTO> getConceptUsual(ConceptUsualVO conceptUsualVO){
-        //将标签类型转换成类型id
-        QueryWrapper<Lexicon> lexiconQueryWrapper = new QueryWrapper<>();
-        lexiconQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey())
-                .eq("name",QuestionTypeEnum.getName(conceptUsualVO.getType()));
-        Lexicon lexicon = lexiconFacade.getOne(lexiconQueryWrapper);
         //获取标签内容
         ConceptWrapper conceptWrapper = new ConceptWrapper();
         conceptWrapper.setEndAge(conceptUsualVO.getAge());//年龄
         conceptWrapper.setStartId(conceptUsualVO.getDeptId());//科室概念id
         conceptWrapper.setEndSex(conceptUsualVO.getSexType());//性别
-        conceptWrapper.setEndType(Integer.parseInt(lexicon.getId().toString()));//标签类型
+        //找出标签类型对应的类型id
+        Map<String,List<EnumEntriesBuilder.Entry>> strings = new  EnumEntriesBuilder()
+                .addEnums("lexiconTypeEnum",LexiconTypeEnum.values()).build();
+        List<EnumEntriesBuilder.Entry> lexiconTypeEnum = strings.get("lexiconTypeEnum");
+        for (EnumEntriesBuilder.Entry entry : lexiconTypeEnum) {
+            if(entry.getName().equals(QuestionTypeEnum.getName(conceptUsualVO.getType()))){
+                conceptWrapper.setEndType(Integer.parseInt(entry.getKey().toString()));//标签类型
+            }
+        }
         List<ConceptWithOrderRes> concepts = this.getConceptWithOrder(conceptWrapper);
         List<ConceptBaseDTO> list = new ArrayList();
         //封装

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

@@ -1,14 +0,0 @@
-package com.diagbot.facade;
-
-import com.diagbot.service.impl.LexiconServiceImpl;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description:
- * @author: wangyu
- * @time: 2019/5/7 14:47
- */
-@Component
-public class LexiconFacade extends LexiconServiceImpl {
-
-}

aipt-service/src/main/java/com/diagbot/mapper/LexiconMapper.java

@@ -1,16 +0,0 @@
-package com.diagbot.mapper;
-
-import com.diagbot.entity.Lexicon;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 术语分类表 Mapper 接口
- * </p>
- *
- * @author wangyu
- * @since 2019-05-07
- */
-public interface LexiconMapper extends BaseMapper<Lexicon> {
-
-}

aipt-service/src/main/java/com/diagbot/service/LexiconService.java

@@ -1,16 +0,0 @@
-package com.diagbot.service;
-
-import com.diagbot.entity.Lexicon;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 术语分类表 服务类
- * </p>
- *
- * @author wangyu
- * @since 2019-05-07
- */
-public interface LexiconService extends IService<Lexicon> {
-
-}

aipt-service/src/main/java/com/diagbot/service/impl/LexiconServiceImpl.java

@@ -1,20 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.diagbot.entity.Lexicon;
-import com.diagbot.mapper.LexiconMapper;
-import com.diagbot.service.LexiconService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 术语分类表 服务实现类
- * </p>
- *
- * @author wangyu
- * @since 2019-05-07
- */
-@Service
-public class LexiconServiceImpl extends ServiceImpl<LexiconMapper, Lexicon> implements LexiconService {
-
-}

aipt-service/src/main/resources/mapper/LexiconMapper.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.LexiconMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.Lexicon">
-        <id column="id" property="id" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-        <result column="name" property="name" />
-    </resultMap>
-
-</mapper>