icssman删除无用代码

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

@@ -1,39 +0,0 @@
-package com.diagbot.facade;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.entity.ModuleDeptMapping;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.service.impl.ModuleDeptMappingServiceImpl;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * @Description:
- * @author: wangyu
- * @time: 2019/3/15 9:27
- */
-@Component
-public class ModuleDeptMappingFacade extends ModuleDeptMappingServiceImpl {
-
-    /**
-     * 根据科室id获取模板id
-     *
-     * @param deptId
-     * @return
-     */
-    public List<ModuleDeptMapping> getModuleIdByDept(Long deptId){
-        QueryWrapper<ModuleDeptMapping> moduleDeptMappingQueryWrapper = new QueryWrapper();
-        moduleDeptMappingQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("dept_id", deptId);
-        return this.list(moduleDeptMappingQueryWrapper);
-    }
-
-    public ModuleDeptMapping geModuleDeptInfo(Long deptId,Long moduleId){
-        QueryWrapper<ModuleDeptMapping> moduleDeptMappingQueryWrapper = new QueryWrapper<>();
-        moduleDeptMappingQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey())
-                .eq("dept_id",deptId)
-                .eq("module_id",moduleId);
-        return this.getOne(moduleDeptMappingQueryWrapper);
-    }
-}

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

@@ -44,10 +44,7 @@ public class ModuleDetailFacade extends ModuleDetailServiceImpl {
     @Autowired
     @Qualifier("questionInfoServiceImpl")
     private QuestionInfoService questionInfoService;
-    @Autowired
-    private ModuleDiseaseMappingFacade moduleDiseaseMappingFacade;
-    @Autowired
-    private ModuleDeptMappingFacade moduleDeptMappingFacade;
+
     /**
      * 根据questionId删除明细
      *
@@ -75,21 +72,21 @@ public class ModuleDetailFacade extends ModuleDetailServiceImpl {
      * @param addModuleInfoVO
      * @return
      */
-    public Boolean saveOrUpdateInfos(AddModuleInfoVO addModuleInfoVO,Long moduleId){
+    public Boolean saveOrUpdateInfos(AddModuleInfoVO addModuleInfoVO, Long moduleId) {
         String userId = UserUtils.getCurrentPrincipleID();
         Date now = DateUtil.now();
         //如果该模板添加过明细，先删除
         UpdateWrapper<ModuleDetail> moduleDetailUpdateWrapper = new UpdateWrapper<>();
         moduleDetailUpdateWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("module_id",moduleId)
-                .set("is_deleted",IsDeleteEnum.Y.getKey())
-                .set("modifier",userId)
-                .set("gmt_modified",now);
-        this.update(new ModuleDetail(),moduleDetailUpdateWrapper);
+                .eq("module_id", moduleId)
+                .set("is_deleted", IsDeleteEnum.Y.getKey())
+                .set("modifier", userId)
+                .set("gmt_modified", now);
+        this.update(new ModuleDetail(), moduleDetailUpdateWrapper);
         //查询自定义标签的id
         List<String> textList = new ArrayList<>();
-        for(AddModuleDetailVO addModuleDetailVO:addModuleInfoVO.getModelDetils()){
-            if(StringUtil.isNotEmpty(addModuleDetailVO.getText())){
+        for (AddModuleDetailVO addModuleDetailVO : addModuleInfoVO.getModelDetils()) {
+            if (StringUtil.isNotEmpty(addModuleDetailVO.getText())) {
                 textList.add(addModuleDetailVO.getText());
             }
         }
@@ -97,23 +94,23 @@ public class ModuleDetailFacade extends ModuleDetailServiceImpl {
         questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("tag_type", TagTypeEnum.T8.getKey())
                 .eq("type", addModuleInfoVO.getTextType())
-                .in("name",textList);
+                .in("name", textList);
         List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
         //将标签id放入map
-        Map<String,Long> questionIdMap = new HashMap<>();
-        for (AddModuleDetailVO addModuleDetailVO: addModuleInfoVO.getModelDetils()) {
-            if(StringUtil.isNotEmpty(addModuleDetailVO.getText())){
-                questionIdMap = questionInfoList.stream().collect(Collectors.toMap(QuestionInfo::getTagName,questionInfo -> questionInfo.getId()));
+        Map<String, Long> questionIdMap = new HashMap<>();
+        for (AddModuleDetailVO addModuleDetailVO : addModuleInfoVO.getModelDetils()) {
+            if (StringUtil.isNotEmpty(addModuleDetailVO.getText())) {
+                questionIdMap = questionInfoList.stream().collect(Collectors.toMap(QuestionInfo::getTagName, questionInfo -> questionInfo.getId()));
             }
         }
         QuestionInfo addquestionInfo = null;
         List<QuestionInfo> addQuestionInfoList = new ArrayList<>();
         List<String> textExistList = new ArrayList<>();
         //循环给questionId赋值，如果遇到赋值失败的则是没有questionID，执行添加
-        for (AddModuleDetailVO addModuleDetailVO:addModuleInfoVO.getModelDetils()) {
-            if (StringUtil.isNotEmpty(addModuleDetailVO.getText())){
+        for (AddModuleDetailVO addModuleDetailVO : addModuleInfoVO.getModelDetils()) {
+            if (StringUtil.isNotEmpty(addModuleDetailVO.getText())) {
                 addModuleDetailVO.setQuestionId(questionIdMap.get(addModuleDetailVO.getText()));
-                if(addModuleDetailVO.getQuestionId() == null && addModuleDetailVO.getText() != null){
+                if (addModuleDetailVO.getQuestionId() == null && addModuleDetailVO.getText() != null) {
                     addquestionInfo = new QuestionInfo();
                     addquestionInfo.setModifier(userId);
                     addquestionInfo.setCreator(userId);
@@ -125,7 +122,7 @@ public class ModuleDetailFacade extends ModuleDetailServiceImpl {
                     addquestionInfo.setType(addModuleInfoVO.getTextType());
                     addquestionInfo.setSubType(1);
                     addquestionInfo.setName(addModuleDetailVO.getText());
-                    if(!textExistList.contains(addModuleDetailVO.getText())){
+                    if (!textExistList.contains(addModuleDetailVO.getText())) {
                         textExistList.add(addModuleDetailVO.getText());
                         addQuestionInfoList.add(addquestionInfo);
                     }
@@ -139,40 +136,40 @@ public class ModuleDetailFacade extends ModuleDetailServiceImpl {
                 .eq("type", addModuleInfoVO.getTextType())
                 .eq("tag_type", TagTypeEnum.T8.getKey());
         List<QuestionInfo> questionInfoList1 = questionFacade.list(questionInfoQueryWrapper1);
-        if(ListUtil.isNotEmpty(questionInfoList1)){
-            for (QuestionInfo questionInfo:questionInfoList1) {
-                if(StringUtil.isNotEmpty(questionInfo.getTagName())){
-                    questionIdMap.put(questionInfo.getTagName(),questionInfo.getId());
+        if (ListUtil.isNotEmpty(questionInfoList1)) {
+            for (QuestionInfo questionInfo : questionInfoList1) {
+                if (StringUtil.isNotEmpty(questionInfo.getTagName())) {
+                    questionIdMap.put(questionInfo.getTagName(), questionInfo.getId());
                 }
             }
         }
         //二次赋值保证每一个questionId都有值
         ModuleDetail moduleDetail = null;
         List<ModuleDetail> moduleDetailList = new ArrayList<>();
-        for(int i = 0; i < addModuleInfoVO.getModelDetils().size(); i++){
+        for (int i = 0; i < addModuleInfoVO.getModelDetils().size(); i++) {
             moduleDetail = new ModuleDetail();
             moduleDetail.setModuleId(moduleId);
             moduleDetail.setCreator(userId);
             moduleDetail.setModifier(userId);
             moduleDetail.setGmtCreate(now);
             moduleDetail.setGmtModified(now);
-            moduleDetail.setOrderNo(i+1);
-            if(addModuleInfoVO.getModelDetils().get(i).getRelationModule() != null){
+            moduleDetail.setOrderNo(i + 1);
+            if (addModuleInfoVO.getModelDetils().get(i).getRelationModule() != null) {
                 moduleDetail.setRelationModule(addModuleInfoVO.getModelDetils().get(i).getRelationModule());
             }
-            if (StringUtil.isNotEmpty(addModuleInfoVO.getModelDetils().get(i).getText())){
+            if (StringUtil.isNotEmpty(addModuleInfoVO.getModelDetils().get(i).getText())) {
                 moduleDetail.setQuestionId(questionIdMap.get(addModuleInfoVO.getModelDetils().get(i).getText()));
-            }else {
+            } else {
                 moduleDetail.setQuestionId(addModuleInfoVO.getModelDetils().get(i).getQuestionId());
             }
-            if(StringUtil.isNotEmpty(addModuleInfoVO.getModelDetils().get(i).getFlag())){
+            if (StringUtil.isNotEmpty(addModuleInfoVO.getModelDetils().get(i).getFlag())) {
                 moduleDetail.setFlag(addModuleInfoVO.getModelDetils().get(i).getFlag());
             }
             //判断是否是有效数据
-            if(addModuleInfoVO.getModelDetils().get(i).getRelationModule() != null
-                || StringUtil.isNotEmpty(addModuleInfoVO.getModelDetils().get(i).getText())
-                || StringUtil.isNotEmpty(addModuleInfoVO.getModelDetils().get(i).getFlag())
-                || addModuleInfoVO.getModelDetils().get(i).getQuestionId() != null ){
+            if (addModuleInfoVO.getModelDetils().get(i).getRelationModule() != null
+                    || StringUtil.isNotEmpty(addModuleInfoVO.getModelDetils().get(i).getText())
+                    || StringUtil.isNotEmpty(addModuleInfoVO.getModelDetils().get(i).getFlag())
+                    || addModuleInfoVO.getModelDetils().get(i).getQuestionId() != null) {
                 moduleDetailList.add(moduleDetail);
             }
         }

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

@@ -1,39 +0,0 @@
-package com.diagbot.facade;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.entity.ModuleDiseaseMapping;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.service.impl.ModuleDiseaseMappingServiceImpl;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * @Description:
- * @author: wangyu
- * @time: 2019/3/15 14:20
- */
-@Component
-public class ModuleDiseaseMappingFacade extends ModuleDiseaseMappingServiceImpl {
-
-    /**
-     * 根据疾病id获取模板id
-     *
-     * @param diseaseId
-     * @return
-     */
-    public List<ModuleDiseaseMapping> getModuleIdByDisease(Long diseaseId){
-        QueryWrapper<ModuleDiseaseMapping> moduleDiseaseMappingQueryWrapper = new QueryWrapper();
-        moduleDiseaseMappingQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("dis_id", diseaseId);
-        return this.list(moduleDiseaseMappingQueryWrapper);
-    }
-
-    public ModuleDiseaseMapping geModuleDiseaseInfo(Long disId, Long moduleId){
-        QueryWrapper<ModuleDiseaseMapping> moduleDiseaseMappingQueryWrapper = new QueryWrapper<>();
-        moduleDiseaseMappingQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey())
-                .eq("dis_id",disId)
-                .eq("module_id",moduleId);
-        return this.getOne(moduleDiseaseMappingQueryWrapper);
-    }
-}

icssman-service/src/main/java/com/diagbot/mapper/ModuleDeptMappingMapper.java

@@ -1,16 +0,0 @@
-package com.diagbot.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.entity.ModuleDeptMapping;
-
-/**
- * <p>
- * 模板科室映射表 Mapper 接口
- * </p>
- *
- * @author wangyu
- * @since 2019-03-15
- */
-public interface ModuleDeptMappingMapper extends BaseMapper<ModuleDeptMapping> {
-
-}

icssman-service/src/main/java/com/diagbot/mapper/ModuleDiseaseMappingMapper.java

@@ -1,16 +0,0 @@
-package com.diagbot.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.entity.ModuleDiseaseMapping;
-
-/**
- * <p>
- * 模板疾病映射表 Mapper 接口
- * </p>
- *
- * @author wangyu
- * @since 2019-03-15
- */
-public interface ModuleDiseaseMappingMapper extends BaseMapper<ModuleDiseaseMapping> {
-
-}

icssman-service/src/main/java/com/diagbot/service/ModuleDeptMappingService.java

@@ -1,16 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.ModuleDeptMapping;
-
-/**
- * <p>
- * 模板科室映射表 服务类
- * </p>
- *
- * @author wangyu
- * @since 2019-03-15
- */
-public interface ModuleDeptMappingService extends IService<ModuleDeptMapping> {
-
-}

icssman-service/src/main/java/com/diagbot/service/ModuleDiseaseMappingService.java

@@ -1,16 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.ModuleDiseaseMapping;
-
-/**
- * <p>
- * 模板疾病映射表 服务类
- * </p>
- *
- * @author wangyu
- * @since 2019-03-15
- */
-public interface ModuleDiseaseMappingService extends IService<ModuleDiseaseMapping> {
-
-}

icssman-service/src/main/java/com/diagbot/service/impl/ModuleDeptMappingServiceImpl.java

@@ -1,20 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.entity.ModuleDeptMapping;
-import com.diagbot.mapper.ModuleDeptMappingMapper;
-import com.diagbot.service.ModuleDeptMappingService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 模板科室映射表 服务实现类
- * </p>
- *
- * @author wangyu
- * @since 2019-03-15
- */
-@Service
-public class ModuleDeptMappingServiceImpl extends ServiceImpl<ModuleDeptMappingMapper, ModuleDeptMapping> implements ModuleDeptMappingService {
-
-}

icssman-service/src/main/java/com/diagbot/service/impl/ModuleDiseaseMappingServiceImpl.java

@@ -1,20 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.entity.ModuleDiseaseMapping;
-import com.diagbot.mapper.ModuleDiseaseMappingMapper;
-import com.diagbot.service.ModuleDiseaseMappingService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 模板疾病映射表 服务实现类
- * </p>
- *
- * @author wangyu
- * @since 2019-03-15
- */
-@Service
-public class ModuleDiseaseMappingServiceImpl extends ServiceImpl<ModuleDiseaseMappingMapper, ModuleDiseaseMapping> implements ModuleDiseaseMappingService {
-
-}

icssman-service/src/main/resources/mapper/ModuleDeptMappingMapper.xml

@@ -1,17 +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.ModuleDeptMappingMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.ModuleDeptMapping">
-        <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="dept_id" property="deptId" />
-        <result column="module_id" property="moduleId" />
-    </resultMap>
-
-</mapper>

icssman-service/src/main/resources/mapper/ModuleDiseaseMappingMapper.xml

@@ -1,17 +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.ModuleDiseaseMappingMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.ModuleDiseaseMapping">
-        <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="dis_id" property="disId" />
-        <result column="module_id" property="moduleId" />
-    </resultMap>
-
-</mapper>