framework

src/main/java/com/qizhen/healsphere/Application.java

@@ -13,7 +13,7 @@ import org.springframework.data.neo4j.repository.config.EnableNeo4jRepositories;
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
         JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class },scanBasePackages = "com.qizhen.healsphere")
 @ConfigurationPropertiesScan
-@MapperScan("com.qizhen.healsphere.mapper")
+@MapperScan("com.qizhen.healsphere.repository.mapper")
 @EnableNeo4jRepositories
 public class Application {
 

src/main/java/com/qizhen/healsphere/ai/BaidubceUtil.java

@@ -1,6 +1,5 @@
-package com.qizhen.healsphere.ai;
+package com.qizhen.healsphere.common.ai;
 
-import com.alibaba.excel.EasyExcel;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.web.client.RestTemplate;
 

src/main/java/com/qizhen/healsphere/ai/BaidubceUtilTest.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.ai;
+package com.qizhen.healsphere.common.ai;
 
 import com.alibaba.fastjson.JSONArray;
 import org.apache.commons.lang3.StringUtils;

src/main/java/com/qizhen/healsphere/ai/BaidubceUtilTest2.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.ai;
+package com.qizhen.healsphere.common.ai;
 
 import com.alibaba.fastjson.JSONArray;
 import org.apache.commons.lang3.StringUtils;

src/main/java/com/qizhen/healsphere/ai/BaidubceUtilTest3.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.ai;
+package com.qizhen.healsphere.common.ai;
 
 import com.alibaba.fastjson.JSONArray;
 import org.apache.commons.lang3.StringUtils;

src/main/java/com/qizhen/healsphere/ai/BaikeUtilTest.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.ai;
+package com.qizhen.healsphere.common.ai;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Cell;

src/main/java/com/qizhen/healsphere/ai/Knowlege.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.ai;
+package com.qizhen.healsphere.common.ai;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.AllArgsConstructor;

src/main/java/com/qizhen/healsphere/ai/QizhenAssistant.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.ai;
+package com.qizhen.healsphere.common.ai;
 
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpUtil;

src/main/java/com/qizhen/healsphere/enums/IsDeleteEnum.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.enums;
+package com.qizhen.healsphere.common.enums;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/qizhen/healsphere/excel/ExcelProcess.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.excel;
+package com.qizhen.healsphere.common.excel;
 
 
 import cn.hutool.core.date.DatePattern;
@@ -6,7 +6,7 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.qizhen.healsphere.ai.BaidubceUtil;
+import com.qizhen.healsphere.common.ai.BaidubceUtil;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;

src/main/java/com/qizhen/healsphere/exception/CommonErrorCode.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.exception;
+package com.qizhen.healsphere.common.exception;
 
 /**
  * @Description: 通用错误码

src/main/java/com/qizhen/healsphere/exception/CommonException.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.exception;
+package com.qizhen.healsphere.common.exception;
 
 
 /**

src/main/java/com/qizhen/healsphere/exception/CommonExceptionHandler.java

@@ -1,7 +1,7 @@
-package com.qizhen.healsphere.exception;
+package com.qizhen.healsphere.common.exception;
 
 import cn.hutool.json.JSONUtil;
-import com.qizhen.healsphere.dto.RespDTO;
+import com.qizhen.healsphere.web.dto.RespDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

src/main/java/com/qizhen/healsphere/exception/ErrorCode.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.exception;
+package com.qizhen.healsphere.common.exception;
 
 import java.io.Serializable;
 

src/main/java/com/qizhen/healsphere/exception/ServiceErrorCode.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.exception;
+package com.qizhen.healsphere.common.exception;
 
 /**
  * @Description: 本服务错误码

src/main/java/com/qizhen/healsphere/hyw/AlexanderMcqueenGoodsProcessor.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.hyw;
+package com.qizhen.healsphere.common.hyw;
 
 import us.codecraft.webmagic.Page;
 import us.codecraft.webmagic.Site;

src/main/java/com/qizhen/healsphere/hyw/Doctor.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.hyw;
+package com.qizhen.healsphere.common.hyw;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/qizhen/healsphere/hyw/GithubRepo.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.hyw;
+package com.qizhen.healsphere.common.hyw;
 
 /**
  * @author code4crafer@gmail.com

src/main/java/com/qizhen/healsphere/hyw/GithubRepoPageProcessor.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.hyw;
+package com.qizhen.healsphere.common.hyw;
 
 import us.codecraft.webmagic.Page;
 import us.codecraft.webmagic.Site;

src/main/java/com/qizhen/healsphere/hyw/ZhihuPageProcessor.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.hyw;
+package com.qizhen.healsphere.common.hyw;
 
 import us.codecraft.webmagic.Page;
 import us.codecraft.webmagic.Site;

src/main/java/com/qizhen/healsphere/hyw/hbrmHospital/HubeiMainDoctorNewPageProcessor.java

@@ -1,6 +1,6 @@
-package com.qizhen.healsphere.hyw.hbrmHospital;
+package com.qizhen.healsphere.common.hyw.hbrmHospital;
 
-import com.qizhen.healsphere.pipeline.ExcelPipeline;
+import com.qizhen.healsphere.common.pipeline.ExcelPipeline;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.util.CollectionUtils;
 import us.codecraft.webmagic.Page;

src/main/java/com/qizhen/healsphere/hyw/tongjihospital/DepartmentPageProcessor.java

@@ -1,6 +1,6 @@
-package com.qizhen.healsphere.hyw.tongjihospital;
+package com.qizhen.healsphere.common.hyw.tongjihospital;
 
-import com.qizhen.healsphere.pipeline.ExcelPipeline;
+import com.qizhen.healsphere.common.pipeline.ExcelPipeline;
 import org.jsoup.internal.StringUtil;
 import us.codecraft.webmagic.Page;
 import us.codecraft.webmagic.Site;

src/main/java/com/qizhen/healsphere/hyw/tongjihospital/DoctorDataProcessor.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.hyw.tongjihospital;
+package com.qizhen.healsphere.common.hyw.tongjihospital;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
@@ -10,7 +10,7 @@ import cn.hutool.poi.excel.ExcelWriter;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.qizhen.healsphere.hyw.Doctor;
+import com.qizhen.healsphere.common.hyw.Doctor;
 
 import java.net.URLDecoder;
 import java.text.SimpleDateFormat;

src/main/java/com/qizhen/healsphere/hyw/wenzhang/WenzhangPageProcessor.java

@@ -1,6 +1,6 @@
-package com.qizhen.healsphere.hyw.wenzhang;
+package com.qizhen.healsphere.common.hyw.wenzhang;
 
-import com.qizhen.healsphere.pipeline.ExcelPipeline;
+import com.qizhen.healsphere.common.pipeline.ExcelPipeline;
 import us.codecraft.webmagic.Page;
 import us.codecraft.webmagic.Site;
 import us.codecraft.webmagic.Spider;

src/main/java/com/qizhen/healsphere/hyw/whdxznhospital/DepartmentPageProcessor.java

@@ -1,6 +1,6 @@
-package com.qizhen.healsphere.hyw.whdxznhospital;
+package com.qizhen.healsphere.common.hyw.whdxznhospital;
 
-import com.qizhen.healsphere.pipeline.ExcelPipeline;
+import com.qizhen.healsphere.common.pipeline.ExcelPipeline;
 import org.jsoup.internal.StringUtil;
 import us.codecraft.webmagic.Page;
 import us.codecraft.webmagic.Site;

src/main/java/com/qizhen/healsphere/hyw/whdxznhospital/DoctorPageProcessor.java

@@ -1,6 +1,6 @@
-package com.qizhen.healsphere.hyw.whdxznhospital;
+package com.qizhen.healsphere.common.hyw.whdxznhospital;
 
-import com.qizhen.healsphere.pipeline.ExcelPipeline;
+import com.qizhen.healsphere.common.pipeline.ExcelPipeline;
 import org.jsoup.internal.StringUtil;
 import org.springframework.util.CollectionUtils;
 import us.codecraft.webmagic.Page;

src/main/java/com/qizhen/healsphere/pipeline/ExcelPipeline.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.pipeline;
+package com.qizhen.healsphere.common.pipeline;
 
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;

src/main/java/com/qizhen/healsphere/util/BeanUtil.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.util;
+package com.qizhen.healsphere.common.util;
 
 
 import org.springframework.beans.BeanUtils;

src/main/java/com/qizhen/healsphere/util/EntityUtil.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.util;
+package com.qizhen.healsphere.common.util;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;

src/main/java/com/qizhen/healsphere/facade/KgFacade.java

@@ -4,14 +4,14 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.qizhen.healsphere.dto.*;
-import com.qizhen.healsphere.entity.PresetInfo;
-import com.qizhen.healsphere.enums.IsDeleteEnum;
-import com.qizhen.healsphere.exception.CommonErrorCode;
-import com.qizhen.healsphere.exception.CommonException;
+import com.qizhen.healsphere.repository.mapper.entity.PresetInfo;
+import com.qizhen.healsphere.common.enums.IsDeleteEnum;
+import com.qizhen.healsphere.common.exception.CommonErrorCode;
+import com.qizhen.healsphere.common.exception.CommonException;
 import com.qizhen.healsphere.service.impl.KgServiceImpl;
-import com.qizhen.healsphere.vo.KgQueryVO;
-import com.qizhen.healsphere.vo.KgTreeVO;
+import com.qizhen.healsphere.web.dto.*;
+import com.qizhen.healsphere.web.param.KgQuery;
+import com.qizhen.healsphere.web.param.KgTree;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -30,12 +30,12 @@ public class KgFacade extends KgServiceImpl {
     @Autowired
     private PresetInfoFacade presetInfoFacade;
 
-    public GraphLabelDTO getGraphFac(KgQueryVO kgQueryVO) {
+    public GraphLabelDTO getGraphFac(KgQuery kgQuery) {
         GraphLabelDTO graphLabelDTO = new GraphLabelDTO();
         List<CategorieDTO> categories = new ArrayList<>();
         List<GNodeDTO> node = new ArrayList<>();
         List<LinkDTO> links = new ArrayList<>();
-        List<GraphDTO> res = this.getGraph(kgQueryVO);
+        List<GraphDTO> res = this.getGraph(kgQuery);
         if (CollUtil.isEmpty(res)) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS);
         } else {
@@ -88,22 +88,22 @@ public class KgFacade extends KgServiceImpl {
         return graphLabelDTO;
     }
 
-    public TreeDTO getTreeFac(KgTreeVO kgTreeVO) {
+    public TreeDTO getTreeFac(KgTree kgTree) {
         TreeDTO treeDTO = new TreeDTO();
-        if ((kgTreeVO.getType() == 1
-                && (kgTreeVO.getSubType() == 1 || kgTreeVO.getSubType() == 2 || kgTreeVO.getSubType() == 3))
-                || (kgTreeVO.getType() == 2 && (kgTreeVO.getSubType() == 0))
-                || (kgTreeVO.getType() == 3 && (kgTreeVO.getSubType() == 0))
-                || (kgTreeVO.getType() == 4 && (kgTreeVO.getSubType() == 0))
-                || (kgTreeVO.getType() == 5 && (kgTreeVO.getSubType() == 0))
-                || (kgTreeVO.getType() == 6 && (kgTreeVO.getSubType() == 0))) {
+        if ((kgTree.getType() == 1
+                && (kgTree.getSubType() == 1 || kgTree.getSubType() == 2 || kgTree.getSubType() == 3))
+                || (kgTree.getType() == 2 && (kgTree.getSubType() == 0))
+                || (kgTree.getType() == 3 && (kgTree.getSubType() == 0))
+                || (kgTree.getType() == 4 && (kgTree.getSubType() == 0))
+                || (kgTree.getType() == 5 && (kgTree.getSubType() == 0))
+                || (kgTree.getType() == 6 && (kgTree.getSubType() == 0))) {
             // KgQueryVO kgQueryVO = new KgQueryVO();
             // kgQueryVO.setLabelName("诊断依据");
             // kgQueryVO.setInputStr("诊断依据");
             // String tree = this.getTree(kgQueryVO);
             PresetInfo presetInfo = presetInfoFacade.getOne(new QueryWrapper<PresetInfo>()
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .eq("type", (kgTreeVO.getType() * 10 + kgTreeVO.getSubType())), false);
+                    .eq("type", (kgTree.getType() * 10 + kgTree.getSubType())), false);
             String tree = "";
             if (null != presetInfo){
                 tree = presetInfo.getContent();

src/main/java/com/qizhen/healsphere/mapper/KgMapper.java

@@ -1,8 +1,7 @@
-package com.qizhen.healsphere.mapper;
+package com.qizhen.healsphere.repository.mapper;
 
-import com.qizhen.healsphere.dto.GraphDTO;
-import com.qizhen.healsphere.vo.KgQueryVO;
-import org.springframework.data.neo4j.repository.query.Query;
+import com.qizhen.healsphere.web.dto.GraphDTO;
+import com.qizhen.healsphere.web.param.KgQuery;
 
 import java.util.List;
 
@@ -16,7 +15,7 @@ import java.util.List;
  */
 public interface KgMapper {
 
-    List<GraphDTO> getGraph(KgQueryVO kgQueryVO);
+    List<GraphDTO> getGraph(KgQuery kgQuery);
 
 //    @Query("MATCH (n:`{0}`)-[r]->(m) where n.name = {1} RETURN head(Labels(n)) as sLabel,n.name as sName,Type (r) as rType, head(Labels(m)) as eLabel,m.name as eName" +
 //            "        ORDER BY rType")

src/main/java/com/qizhen/healsphere/mapper/PresetInfoMapper.java

@@ -1,7 +1,7 @@
-package com.qizhen.healsphere.mapper;
+package com.qizhen.healsphere.repository.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qizhen.healsphere.entity.PresetInfo;
+import com.qizhen.healsphere.repository.mapper.entity.PresetInfo;
 
 /**
  * <p>

src/main/java/com/qizhen/healsphere/entity/PresetInfo.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.entity;
+package com.qizhen.healsphere.repository.mapper.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

src/main/java/com/qizhen/healsphere/repository/DiseaseRepository.java

@@ -1,9 +1,8 @@
-package com.qizhen.healsphere.repository;
+package com.qizhen.healsphere.repository.neo4j;
 
 
-import com.qizhen.healsphere.model.Disease;
+import com.qizhen.healsphere.repository.neo4j.entity.Disease;
 import org.springframework.data.neo4j.repository.Neo4jRepository;
-import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository

src/main/java/com/qizhen/healsphere/repository/ZbyyRepository.java

@@ -1,6 +1,6 @@
-package com.qizhen.healsphere.repository;
+package com.qizhen.healsphere.repository.neo4j;
 
-import com.qizhen.healsphere.model.Zbyy;
+import com.qizhen.healsphere.repository.neo4j.entity.Zbyy;
 import org.springframework.data.neo4j.repository.Neo4jRepository;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/qizhen/healsphere/repository/ZczzbfbzRepository.java

@@ -1,6 +1,6 @@
-package com.qizhen.healsphere.repository;
+package com.qizhen.healsphere.repository.neo4j;
 
-import com.qizhen.healsphere.model.Zczzbfbz;
+import com.qizhen.healsphere.repository.neo4j.entity.Zczzbfbz;
 import org.springframework.data.repository.CrudRepository;
 
 public interface ZczzbfbzRepository extends CrudRepository<Zczzbfbz, Long> {

src/main/java/com/qizhen/healsphere/repository/ZdbzRepository.java

@@ -1,6 +1,6 @@
-package com.qizhen.healsphere.repository;
+package com.qizhen.healsphere.repository.neo4j;
 
-import com.qizhen.healsphere.model.Zdbz;
+import com.qizhen.healsphere.repository.neo4j.entity.Zdbz;
 import org.springframework.data.repository.CrudRepository;
 
 public interface ZdbzRepository extends CrudRepository<Zdbz, Long> {

src/main/java/com/qizhen/healsphere/repository/ZdxgjcRepository.java

@@ -1,6 +1,6 @@
-package com.qizhen.healsphere.repository;
+package com.qizhen.healsphere.repository.neo4j;
 
-import com.qizhen.healsphere.model.Zdxgjc;
+import com.qizhen.healsphere.repository.neo4j.entity.Zdxgjc;
 import org.springframework.data.repository.CrudRepository;
 
 public interface ZdxgjcRepository extends CrudRepository<Zdxgjc, Long> {

src/main/java/com/qizhen/healsphere/repository/ZlRepository.java

@@ -1,6 +1,6 @@
-package com.qizhen.healsphere.repository;
+package com.qizhen.healsphere.repository.neo4j;
 
-import com.qizhen.healsphere.model.Zl;
+import com.qizhen.healsphere.repository.neo4j.entity.Zl;
 import org.springframework.data.repository.CrudRepository;
 
 public interface ZlRepository extends CrudRepository<Zl, Long> {

src/main/java/com/qizhen/healsphere/repository/ZlcsRepository.java

@@ -1,6 +1,6 @@
-package com.qizhen.healsphere.repository;
+package com.qizhen.healsphere.repository.neo4j;
 
-import com.qizhen.healsphere.model.Zlcs;
+import com.qizhen.healsphere.repository.neo4j.entity.Zlcs;
 import org.springframework.data.repository.CrudRepository;
 
 public interface ZlcsRepository extends CrudRepository<Zlcs, Long> {

src/main/java/com/qizhen/healsphere/repository/ZlczRepository.java

@@ -1,6 +1,6 @@
-package com.qizhen.healsphere.repository;
+package com.qizhen.healsphere.repository.neo4j;
 
-import com.qizhen.healsphere.model.Zlcz;
+import com.qizhen.healsphere.repository.neo4j.entity.Zlcz;
 import org.springframework.data.repository.CrudRepository;
 
 public interface ZlczRepository extends CrudRepository<Zlcz, Long> {

src/main/java/com/qizhen/healsphere/repository/ZlfaRepository.java

@@ -1,6 +1,6 @@
-package com.qizhen.healsphere.repository;
+package com.qizhen.healsphere.repository.neo4j;
 
-import com.qizhen.healsphere.model.Zlfa;
+import com.qizhen.healsphere.repository.neo4j.entity.Zlfa;
 import org.springframework.data.repository.CrudRepository;
 
 public interface ZlfaRepository extends CrudRepository<Zlfa, Long> {

src/main/java/com/qizhen/healsphere/repository/ZlfsRepository.java

@@ -1,6 +1,6 @@
-package com.qizhen.healsphere.repository;
+package com.qizhen.healsphere.repository.neo4j;
 
-import com.qizhen.healsphere.model.Zlfs;
+import com.qizhen.healsphere.repository.neo4j.entity.Zlfs;
 import org.springframework.data.repository.CrudRepository;
 
 public interface ZlfsRepository extends CrudRepository<Zlfs, Long> {

src/main/java/com/qizhen/healsphere/repository/ZlmbRepository.java

@@ -1,6 +1,6 @@
-package com.qizhen.healsphere.repository;
+package com.qizhen.healsphere.repository.neo4j;
 
-import com.qizhen.healsphere.model.Zlmb;
+import com.qizhen.healsphere.repository.neo4j.entity.Zlmb;
 import org.springframework.data.repository.CrudRepository;
 
 public interface ZlmbRepository extends CrudRepository<Zlmb, Long> {

src/main/java/com/qizhen/healsphere/repository/ZlqxRepository.java

@@ -1,6 +1,6 @@
-package com.qizhen.healsphere.repository;
+package com.qizhen.healsphere.repository.neo4j;
 
-import com.qizhen.healsphere.model.Zlqx;
+import com.qizhen.healsphere.repository.neo4j.entity.Zlqx;
 import org.springframework.data.repository.CrudRepository;
 
 public interface ZlqxRepository extends CrudRepository<Zlqx, Long> {

src/main/java/com/qizhen/healsphere/repository/ZlxgjcRepository.java

@@ -1,6 +1,6 @@
-package com.qizhen.healsphere.repository;
+package com.qizhen.healsphere.repository.neo4j;
 
-import com.qizhen.healsphere.model.Zlxgjc;
+import com.qizhen.healsphere.repository.neo4j.entity.Zlxgjc;
 import org.springframework.data.repository.CrudRepository;
 
 public interface ZlxgjcRepository extends CrudRepository<Zlxgjc, Long> {

src/main/java/com/qizhen/healsphere/repository/ZlyjRepository.java

@@ -1,6 +1,6 @@
-package com.qizhen.healsphere.repository;
+package com.qizhen.healsphere.repository.neo4j;
 
-import com.qizhen.healsphere.model.Zlyj;
+import com.qizhen.healsphere.repository.neo4j.entity.Zlyj;
 import org.springframework.data.repository.CrudRepository;
 
 public interface ZlyjRepository extends CrudRepository<Zlyj, Long> {

src/main/java/com/qizhen/healsphere/repository/ZlywRepository.java

@@ -1,6 +1,6 @@
-package com.qizhen.healsphere.repository;
+package com.qizhen.healsphere.repository.neo4j;
 
-import com.qizhen.healsphere.model.Zlyw;
+import com.qizhen.healsphere.repository.neo4j.entity.Zlyw;
 import org.springframework.data.repository.CrudRepository;
 
 public interface ZlywRepository extends CrudRepository<Zlyw, Long> {

src/main/java/com/qizhen/healsphere/repository/ZlyzRepository.java

@@ -1,6 +1,6 @@
-package com.qizhen.healsphere.repository;
+package com.qizhen.healsphere.repository.neo4j;
 
-import com.qizhen.healsphere.model.Zlyz;
+import com.qizhen.healsphere.repository.neo4j.entity.Zlyz;
 import org.springframework.data.repository.CrudRepository;
 
 public interface ZlyzRepository extends CrudRepository<Zlyz, Long> {

src/main/java/com/qizhen/healsphere/repository/ZzRepository.java

@@ -1,6 +1,6 @@
-package com.qizhen.healsphere.repository;
+package com.qizhen.healsphere.repository.neo4j;
 
-import com.qizhen.healsphere.model.Zz;
+import com.qizhen.healsphere.repository.neo4j.entity.Zz;
 import org.springframework.data.repository.CrudRepository;
 
 public interface ZzRepository extends CrudRepository<Zz, Long> {

src/main/java/com/qizhen/healsphere/model/Disease.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.model;
+package com.qizhen.healsphere.repository.neo4j.entity;
 
 import org.springframework.data.neo4j.core.schema.GeneratedValue;
 import org.springframework.data.neo4j.core.schema.Id;

src/main/java/com/qizhen/healsphere/model/Zbyy.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.model;
+package com.qizhen.healsphere.repository.neo4j.entity;
 
 
 import org.springframework.data.neo4j.core.schema.GeneratedValue;

src/main/java/com/qizhen/healsphere/model/Zczzbfbz.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.model;
+package com.qizhen.healsphere.repository.neo4j.entity;
 
 
 import org.springframework.data.neo4j.core.schema.GeneratedValue;

src/main/java/com/qizhen/healsphere/model/Zdbz.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.model;
+package com.qizhen.healsphere.repository.neo4j.entity;
 
 
 import org.springframework.data.neo4j.core.schema.GeneratedValue;

src/main/java/com/qizhen/healsphere/model/Zdxgjc.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.model;
+package com.qizhen.healsphere.repository.neo4j.entity;
 
 
 import org.springframework.data.neo4j.core.schema.GeneratedValue;

src/main/java/com/qizhen/healsphere/model/Zl.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.model;
+package com.qizhen.healsphere.repository.neo4j.entity;
 
 
 import org.springframework.data.neo4j.core.schema.GeneratedValue;

src/main/java/com/qizhen/healsphere/model/Zlcs.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.model;
+package com.qizhen.healsphere.repository.neo4j.entity;
 
 
 import org.springframework.data.neo4j.core.schema.GeneratedValue;

src/main/java/com/qizhen/healsphere/model/Zlcz.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.model;
+package com.qizhen.healsphere.repository.neo4j.entity;
 
 
 import org.springframework.data.neo4j.core.schema.GeneratedValue;

src/main/java/com/qizhen/healsphere/model/Zlfa.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.model;
+package com.qizhen.healsphere.repository.neo4j.entity;
 
 
 import org.springframework.data.neo4j.core.schema.GeneratedValue;

src/main/java/com/qizhen/healsphere/model/Zlfs.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.model;
+package com.qizhen.healsphere.repository.neo4j.entity;
 
 
 import org.springframework.data.neo4j.core.schema.GeneratedValue;

src/main/java/com/qizhen/healsphere/model/Zlmb.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.model;
+package com.qizhen.healsphere.repository.neo4j.entity;
 
 
 import org.springframework.data.neo4j.core.schema.GeneratedValue;

src/main/java/com/qizhen/healsphere/model/Zlqx.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.model;
+package com.qizhen.healsphere.repository.neo4j.entity;
 
 
 import org.springframework.data.neo4j.core.schema.GeneratedValue;

src/main/java/com/qizhen/healsphere/model/Zlxgjc.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.model;
+package com.qizhen.healsphere.repository.neo4j.entity;
 
 
 import org.springframework.data.neo4j.core.schema.GeneratedValue;

src/main/java/com/qizhen/healsphere/model/Zlyj.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.model;
+package com.qizhen.healsphere.repository.neo4j.entity;
 
 
 import org.springframework.data.neo4j.core.schema.GeneratedValue;

src/main/java/com/qizhen/healsphere/model/Zlyw.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.model;
+package com.qizhen.healsphere.repository.neo4j.entity;
 
 
 import org.springframework.data.neo4j.core.schema.GeneratedValue;

src/main/java/com/qizhen/healsphere/model/Zlyz.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.model;
+package com.qizhen.healsphere.repository.neo4j.entity;
 
 import org.springframework.data.neo4j.core.schema.GeneratedValue;
 import org.springframework.data.neo4j.core.schema.Id;

src/main/java/com/qizhen/healsphere/model/Zz.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.model;
+package com.qizhen.healsphere.repository.neo4j.entity;
 
 
 import org.springframework.data.neo4j.core.schema.GeneratedValue;

src/main/java/com/qizhen/healsphere/service/KgService.java

@@ -1,7 +1,7 @@
 package com.qizhen.healsphere.service;
 
-import com.qizhen.healsphere.dto.GraphDTO;
-import com.qizhen.healsphere.vo.KgQueryVO;
+import com.qizhen.healsphere.web.dto.GraphDTO;
+import com.qizhen.healsphere.web.param.KgQuery;
 
 import java.util.List;
 
@@ -15,5 +15,5 @@ import java.util.List;
  */
 public interface KgService {
 
-    List<GraphDTO> getGraph(KgQueryVO kgQueryVO);
+    List<GraphDTO> getGraph(KgQuery kgQuery);
 }

src/main/java/com/qizhen/healsphere/service/PresetInfoService.java

@@ -2,7 +2,7 @@ package com.qizhen.healsphere.service;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qizhen.healsphere.entity.PresetInfo;
+import com.qizhen.healsphere.repository.mapper.entity.PresetInfo;
 
 /**
  * <p>

src/main/java/com/qizhen/healsphere/service/impl/KgServiceImpl.java

@@ -1,9 +1,9 @@
 package com.qizhen.healsphere.service.impl;
 
-import com.qizhen.healsphere.dto.GraphDTO;
-import com.qizhen.healsphere.mapper.KgMapper;
+import com.qizhen.healsphere.web.dto.GraphDTO;
+import com.qizhen.healsphere.repository.mapper.KgMapper;
 import com.qizhen.healsphere.service.KgService;
-import com.qizhen.healsphere.vo.KgQueryVO;
+import com.qizhen.healsphere.web.param.KgQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -23,7 +23,7 @@ public class KgServiceImpl implements KgService {
     private KgMapper kgMapper;
 
     @Override
-    public List<GraphDTO> getGraph(KgQueryVO kgQueryVO){
-        return kgMapper.getGraph(kgQueryVO);
+    public List<GraphDTO> getGraph(KgQuery kgQuery){
+        return kgMapper.getGraph(kgQuery);
     }
 }

src/main/java/com/qizhen/healsphere/service/impl/PresetInfoServiceImpl.java

@@ -1,8 +1,8 @@
 package com.qizhen.healsphere.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qizhen.healsphere.entity.PresetInfo;
-import com.qizhen.healsphere.mapper.PresetInfoMapper;
+import com.qizhen.healsphere.repository.mapper.entity.PresetInfo;
+import com.qizhen.healsphere.repository.mapper.PresetInfoMapper;
 import com.qizhen.healsphere.service.PresetInfoService;
 import org.springframework.stereotype.Service;
 

src/main/java/com/qizhen/healsphere/web/demo/BasicController.java

@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-package com.qizhen.healsphere.web.demo;
+package com.qizhen.healsphere.web;
 
+import com.qizhen.healsphere.web.param.User;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/com/qizhen/healsphere/web/demo/KgController.java

@@ -1,11 +1,11 @@
-package com.qizhen.healsphere.web.demo;
+package com.qizhen.healsphere.web;
 
-import com.qizhen.healsphere.dto.GraphLabelDTO;
-import com.qizhen.healsphere.dto.RespDTO;
-import com.qizhen.healsphere.dto.TreeDTO;
+import com.qizhen.healsphere.web.dto.GraphLabelDTO;
+import com.qizhen.healsphere.web.dto.RespDTO;
+import com.qizhen.healsphere.web.dto.TreeDTO;
 import com.qizhen.healsphere.facade.KgFacade;
-import com.qizhen.healsphere.vo.KgQueryVO;
-import com.qizhen.healsphere.vo.KgTreeVO;
+import com.qizhen.healsphere.web.param.KgQuery;
+import com.qizhen.healsphere.web.param.KgTree;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -36,8 +36,8 @@ public class KgController {
 
     @ApiOperation(value = "获取图谱", notes = "获取图谱")
     @PostMapping("/getGraph")
-    public RespDTO<GraphLabelDTO> getGraph(@RequestBody @Valid KgQueryVO kgQueryVO) {
-        return RespDTO.onSuc(kgFacade.getGraphFac(kgQueryVO));
+    public RespDTO<GraphLabelDTO> getGraph(@RequestBody @Valid KgQuery kgQuery) {
+        return RespDTO.onSuc(kgFacade.getGraphFac(kgQuery));
     }
 
     @ApiOperation(value = "获取树形分类",
@@ -49,10 +49,10 @@ public class KgController {
                     "(实验室检查：t：5，st：0)<br>" +
                     "(辅助检查：t：6，st：0)<br>")
     @PostMapping("/getTree")
-    @Cacheable(value = KGTREECACHE, key = "'kgtree:t_' + #kgTreeVO.type + '_st_' + #kgTreeVO.subType")
-    public RespDTO<TreeDTO> getTree(@RequestBody @Valid KgTreeVO kgTreeVO) {
+    @Cacheable(value = KGTREECACHE, key = "'kgtree:t_' + #kgTree.type + '_st_' + #kgTree.subType")
+    public RespDTO<TreeDTO> getTree(@RequestBody @Valid KgTree kgTree) {
         log.info("获取树形分类缓存成功");
-        return RespDTO.onSuc(kgFacade.getTreeFac(kgTreeVO));
+        return RespDTO.onSuc(kgFacade.getTreeFac(kgTree));
     }
 }
 

src/main/java/com/qizhen/healsphere/web/demo/PathVariableController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.qizhen.healsphere.web.demo;
+package com.qizhen.healsphere.web;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;

src/main/java/com/qizhen/healsphere/dto/BaseNodeDTO.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.dto;
+package com.qizhen.healsphere.web.dto;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/qizhen/healsphere/dto/BaseNodeRSDTO.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.dto;
+package com.qizhen.healsphere.web.dto;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/qizhen/healsphere/dto/CategorieDTO.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.dto;
+package com.qizhen.healsphere.web.dto;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/qizhen/healsphere/dto/GNodeDTO.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.dto;
+package com.qizhen.healsphere.web.dto;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/qizhen/healsphere/dto/GraphDTO.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.dto;
+package com.qizhen.healsphere.web.dto;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/qizhen/healsphere/dto/GraphLabelDTO.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.dto;
+package com.qizhen.healsphere.web.dto;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/qizhen/healsphere/dto/LinkDTO.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.dto;
+package com.qizhen.healsphere.web.dto;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/qizhen/healsphere/dto/NextNodeDTO.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.dto;
+package com.qizhen.healsphere.web.dto;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/qizhen/healsphere/dto/RespDTO.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.dto;
+package com.qizhen.healsphere.web.dto;
 
 import java.io.Serializable;
 

src/main/java/com/qizhen/healsphere/dto/Tree.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.dto;
+package com.qizhen.healsphere.web.dto;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/qizhen/healsphere/dto/TreeDTO.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.dto;
+package com.qizhen.healsphere.web.dto;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/qizhen/healsphere/dto/TreeNodeDTO.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.dto;
+package com.qizhen.healsphere.web.dto;
 
 /**
  * @Description:

src/main/java/com/qizhen/healsphere/vo/KgQueryVO.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.vo;
+package com.qizhen.healsphere.web.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -13,7 +13,7 @@ import javax.validation.constraints.NotBlank;
  */
 @Getter
 @Setter
-public class KgQueryVO {
+public class KgQuery {
     @ApiModelProperty(value = "标签名")
     @NotBlank(message = "标签名不能为空")
     private String labelName;

src/main/java/com/qizhen/healsphere/vo/KgTreeVO.java

@@ -1,4 +1,4 @@
-package com.qizhen.healsphere.vo;
+package com.qizhen.healsphere.web.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -13,7 +13,7 @@ import javax.validation.constraints.NotNull;
  */
 @Getter
 @Setter
-public class KgTreeVO {
+public class KgTree {
     @ApiModelProperty(value = "类型")
     @NotNull(message = "类型不能为空")
     private Integer type;

src/main/java/com/qizhen/healsphere/web/demo/User.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.qizhen.healsphere.web.demo;
+package com.qizhen.healsphere.web.param;
 
 
 import javax.validation.constraints.NotBlank;

src/main/resources/application.yml

@@ -31,7 +31,7 @@ spring:
 
 #mybatis
 mybatis:
-  type-aliases-package: com.qizhen.healsphere.entity
+  type-aliases-package: com.qizhen.healsphere.repository.entity
   mapper-locations: classpath:mapper/*.xml
 
 #mybatis-plus

src/main/resources/mapper/KgMapper.xml

@@ -1,14 +1,14 @@
 <?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.qizhen.healsphere.mapper.KgMapper">
+<mapper namespace="com.qizhen.healsphere.repository.mapper.KgMapper">
 
-    <resultMap id="GraphResultMap" type="com.qizhen.healsphere.dto.GraphDTO">
+    <resultMap id="GraphResultMap" type="com.qizhen.healsphere.web.dto.GraphDTO">
         <result column="sName" property="name"/>
         <result column="sLabel" property="label"/>
-        <collection property="eNodeRSDTOS" ofType="com.qizhen.healsphere.dto.BaseNodeRSDTO">
+        <collection property="eNodeRSDTOS" ofType="com.qizhen.healsphere.web.dto.BaseNodeRSDTO">
             <result column="rType" property="rType"/>
-            <collection property="eNodeDTOS" ofType="com.qizhen.healsphere.dto.NextNodeDTO">
+            <collection property="eNodeDTOS" ofType="com.qizhen.healsphere.web.dto.NextNodeDTO">
                 <result column="eName" property="name"/>
                 <result column="eLabel" property="label"/>
                 <result column="pCount" property="pCount"/>
@@ -16,7 +16,7 @@
         </collection>
     </resultMap>
 
-    <select id="getGraph" parameterType='com.qizhen.healsphere.vo.KgQueryVO' resultMap="GraphResultMap">
+    <select id="getGraph" parameterType='com.qizhen.healsphere.web.param.KgQuery' resultMap="GraphResultMap">
         MATCH (n:${labelName})-[r]->(m)
         where n.name = #{inputStr}
         OPTIONAL MATCH p=(m)-[]->(o) where head(Labels(m)) in ["疾病","症状","药品通用名","手术和操作","实验室检查","辅助检查"]

src/main/resources/mapper/PresetInfoMapper.xml

@@ -1,9 +1,9 @@
 <?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.qizhen.healsphere.mapper.PresetInfoMapper">
+<mapper namespace="com.qizhen.healsphere.repository.mapper.PresetInfoMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.qizhen.healsphere.entity.PresetInfo">
+    <resultMap id="BaseResultMap" type="com.qizhen.healsphere.repository.mapper.entity.PresetInfo">
         <id column="id" property="id" />
         <result column="is_deleted" property="isDeleted" />
         <result column="gmt_create" property="gmtCreate" />

src/test/java/com/qizhen/healsphere/DiseaseTests.java

@@ -3,8 +3,8 @@ package com.qizhen.healsphere;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import com.qizhen.healsphere.model.*;
-import com.qizhen.healsphere.repository.*;
+import com.qizhen.healsphere.repository.neo4j.*;
+import com.qizhen.healsphere.repository.neo4j.entity.*;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
@@ -14,7 +14,6 @@ import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.stereotype.Component;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.io.IOException;