Przeglądaj źródła

icssman删除无用代码

gaodm 6 lat temu
rodzic
commit
0d015538ac

+ 2 - 3
icssman-service/src/main/java/com/diagbot/facade/ConceptFacade.java

@@ -3,7 +3,6 @@ package com.diagbot.facade;
 import com.diagbot.client.KnowledgemanServiceClient;
 import com.diagbot.dto.ConceptBaseDTO;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.service.impl.DisTypeServiceImpl;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.ConceptExistVO;
 import com.diagbot.vo.IndexVO;
@@ -19,7 +18,7 @@ import java.util.Map;
  * @time: 2018/11/23 11:37
  */
 @Component
-public class ConceptFacade extends DisTypeServiceImpl {
+public class ConceptFacade {
 
     @Autowired
     KnowledgemanServiceClient knowledgemanServiceClient;
@@ -31,7 +30,7 @@ public class ConceptFacade extends DisTypeServiceImpl {
     }
 
 
-    public Map<String, List<Integer>> getConceptMap(ConceptExistVO conceptExistVO){
+    public Map<String, List<Integer>> getConceptMap(ConceptExistVO conceptExistVO) {
         RespDTO<Map<String, List<Integer>>> res = knowledgemanServiceClient.getConceptMap(conceptExistVO);
         RespDTOUtil.respNGDeal(res, "远程调用获取概念列表失败");
         return res.data;

+ 0 - 188
icssman-service/src/main/java/com/diagbot/facade/DisScaleFacade.java

@@ -1,188 +0,0 @@
-package com.diagbot.facade;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.client.UserServiceClient;
-import com.diagbot.dto.GetDisScaleAllInfoDTO;
-import com.diagbot.dto.GetDisScaleByDisIdDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.DisScale;
-import com.diagbot.entity.QuestionInfo;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
-import com.diagbot.service.DisScaleService;
-import com.diagbot.service.impl.DisScaleServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.ListUtil;
-import com.diagbot.util.RespDTOUtil;
-import com.diagbot.util.UserUtils;
-import com.diagbot.vo.AddDisScaleInfoVO;
-import com.diagbot.vo.DelDisScaleInfoVO;
-import com.diagbot.vo.GetDisScaleAllInfoVO;
-import com.diagbot.vo.GetDisScaleByDisIdVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * @Description:
- * @author: wangyu
- * @time: 2019/4/1 13:29
- */
-@Component
-public class DisScaleFacade extends DisScaleServiceImpl {
-    @Autowired
-    private QuestionFacade questionFacade;
-    @Autowired
-    @Qualifier("disScaleServiceImpl")
-    private DisScaleService disScaleService;
-    @Autowired
-    private UserServiceClient userServiceClient;
-
-    /**
-     * 添加诊断量表关联信息
-     *
-     * @param addDisScaleInfoVO
-     * @return
-     */
-    public Boolean addDisScaleInfo(AddDisScaleInfoVO addDisScaleInfoVO) {
-        String userId = UserUtils.getCurrentPrincipleID();
-        Date now = DateUtil.now();
-        //判断诊断是否已被删除
-        QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
-        questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("id", addDisScaleInfoVO.getDisId());
-        if (questionFacade.count(questionInfoQueryWrapper) == 0) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS,
-                    "关联诊断标签已删除");
-        }
-        //判断该诊断是否关联过量表
-        QueryWrapper<DisScale> disScaleQueryWrapper = new QueryWrapper<>();
-        disScaleQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("dis_id", addDisScaleInfoVO.getDisId());
-        //如果添加过将原来的标签删除
-        if (this.count(disScaleQueryWrapper) != 0) {
-            UpdateWrapper<DisScale> updateWrapper = new UpdateWrapper();
-            updateWrapper.eq("dis_id", addDisScaleInfoVO.getDisId())
-                    .set("is_deleted", IsDeleteEnum.Y.getKey())
-                    .set("modifier", userId)
-                    .set("gmt_modified", now);
-            this.update(new DisScale(), updateWrapper);
-        }
-        //重新添加标签
-        DisScale disScale = new DisScale();
-        List<DisScale> addList = new ArrayList<>();
-        for (int i = 0; i < addDisScaleInfoVO.getScaleId().size(); i++) {
-            disScale = new DisScale();
-            disScale.setCreator(userId);
-            disScale.setModifier(userId);
-            disScale.setGmtCreate(now);
-            disScale.setGmtModified(now);
-            disScale.setScaleId(addDisScaleInfoVO.getScaleId().get(i));
-            disScale.setDisId(addDisScaleInfoVO.getDisId());
-            disScale.setOrderNo(i + 1);
-            addList.add(disScale);
-        }
-        disScaleService.saveBatch(addList);
-        return true;
-    }
-
-    /**
-     * 分页获取诊断关联量表信息
-     *
-     * @param getDisScaleAllInfoVO
-     * @return
-     */
-    public IPage<GetDisScaleAllInfoDTO> getDisScaleAllInfo(GetDisScaleAllInfoVO getDisScaleAllInfoVO) {
-        IPage<GetDisScaleAllInfoDTO> data = this.getDisScaleInfo(getDisScaleAllInfoVO);
-        List<String> userIds = new ArrayList<>();
-        for (GetDisScaleAllInfoDTO getDisScaleAllInfoDTO : data.getRecords()) {
-            userIds.add(getDisScaleAllInfoDTO.getModifier());
-        }
-        if(ListUtil.isNotEmpty(userIds)){
-            RespDTO<Map<String, String>> userMap = userServiceClient.getUserInfoByIds(userIds);
-            if (RespDTOUtil.respIsNG(userMap)) {
-                throw new CommonException(CommonErrorCode.RPC_ERROR,
-                        "获取用户信息失败");
-            }
-            for (GetDisScaleAllInfoDTO getDisScaleAllInfoDTO : data.getRecords()) {
-                getDisScaleAllInfoDTO.setUserName(userMap.data.get(getDisScaleAllInfoDTO.getModifier()));
-            }
-        }
-        return data;
-    }
-
-    /**
-     * 修改时获取已经添加过得诊断量表关联信息
-     *
-     * @param getDisScaleByDisIdVO
-     * @return
-     */
-    public List<GetDisScaleByDisIdDTO> getDisScaleByDisId(GetDisScaleByDisIdVO getDisScaleByDisIdVO) {
-        //查询诊断量表关联信息
-        QueryWrapper<DisScale> disScaleQueryWrapper = new QueryWrapper<>();
-        disScaleQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("dis_id", getDisScaleByDisIdVO.getDisId());
-        List<DisScale> disScales = this.list(disScaleQueryWrapper);
-        //如果查不到则关联信息已被删除
-        if(ListUtil.isEmpty(disScales)){
-            throw new CommonException(CommonErrorCode.NOT_EXISTS,
-                    "关联信息系不存在,请添加关联");
-        }
-        List<Long> questionIds = new ArrayList<>();
-        List<GetDisScaleByDisIdDTO> getDisScaleAllInfoDTOS = BeanUtil.listCopyTo(disScales, GetDisScaleByDisIdDTO.class);
-        for (DisScale disScale : disScales) {
-            questionIds.add(disScale.getDisId());
-            questionIds.add(disScale.getScaleId());
-        }
-        //查询相关标签名称
-        QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
-        questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .in("id", questionIds);
-        List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
-        Map<Long, QuestionInfo> questionInfoMap
-                = questionInfoList.stream().collect(Collectors.toMap(QuestionInfo::getId, questionInfo -> questionInfo));
-        //将标签名称放入出参
-        for (GetDisScaleByDisIdDTO getDisScaleByDisIdDTO : getDisScaleAllInfoDTOS) {
-            getDisScaleByDisIdDTO.setDisName(questionInfoMap.get(getDisScaleByDisIdDTO.getDisId()).getName());
-            getDisScaleByDisIdDTO.setScaleName(questionInfoMap.get(getDisScaleByDisIdDTO.getScaleId()).getName());
-        }
-        return getDisScaleAllInfoDTOS;
-    }
-
-    /**
-     * 删除诊断关联量表信息
-     *
-     * @param delDisScaleInfoVO
-     * @return
-     */
-    public Boolean delDisScaleInfo(DelDisScaleInfoVO delDisScaleInfoVO){
-        //判断关联信息是否已经被删除
-        List<String> delIds = Arrays.asList(delDisScaleInfoVO.getDelId().split(","));
-        QueryWrapper<DisScale> disScaleQueryWrapper = new QueryWrapper<>();
-        disScaleQueryWrapper.in("id",delIds)
-                .eq("is_deleted",IsDeleteEnum.Y.getKey());
-        if(this.count(disScaleQueryWrapper) > 0){
-            throw new CommonException(CommonErrorCode.IS_EXISTS,
-                    "此条关联已删除");
-        }
-        //如果没有则执行删除
-        UpdateWrapper<DisScale> disScaleUpdateWrapper = new UpdateWrapper<>();
-        disScaleUpdateWrapper.in("id",delIds)
-                .set("is_deleted",IsDeleteEnum.Y.getKey())
-                .set("modifier",UserUtils.getCurrentPrincipleID())
-                .set("gmt_modified",DateUtil.now());
-        this.update(new DisScale(),disScaleUpdateWrapper);
-        return true;
-    }
-}

+ 0 - 14
icssman-service/src/main/java/com/diagbot/facade/DisTypeFacade.java

@@ -1,14 +0,0 @@
-package com.diagbot.facade;
-
-import com.diagbot.service.impl.DisTypeServiceImpl;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description:
- * @Author:zhoutg
- * @time: 2018/11/23 11:37
- */
-@Component
-public class DisTypeFacade extends DisTypeServiceImpl {
-
-}

+ 0 - 27
icssman-service/src/main/java/com/diagbot/mapper/DisScaleMapper.java

@@ -1,27 +0,0 @@
-package com.diagbot.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.dto.GetDisScaleAllInfoDTO;
-import com.diagbot.entity.DisScale;
-import com.diagbot.vo.GetDisScaleAllInfoVO;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 诊断量表映射表 Mapper 接口
- * </p>
- *
- * @author wangyu
- * @since 2019-04-01
- */
-public interface DisScaleMapper extends BaseMapper<DisScale> {
-
-    /**
-     * 分页获取诊断关联量表信息
-     *
-     * @param getDisScaleAllInfoVO
-     * @return
-     */
-    public IPage<GetDisScaleAllInfoDTO> getDisScaleInfo(@Param("getDisScaleAllInfoVO") GetDisScaleAllInfoVO getDisScaleAllInfoVO);
-}

+ 0 - 16
icssman-service/src/main/java/com/diagbot/mapper/DisTypeMapper.java

@@ -1,16 +0,0 @@
-package com.diagbot.mapper;
-
-import com.diagbot.entity.DisType;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 诊断类型表 Mapper 接口
- * </p>
- *
- * @author zhoutg
- * @since 2019-03-28
- */
-public interface DisTypeMapper extends BaseMapper<DisType> {
-
-}

+ 0 - 26
icssman-service/src/main/java/com/diagbot/service/DisScaleService.java

@@ -1,26 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.dto.GetDisScaleAllInfoDTO;
-import com.diagbot.entity.DisScale;
-import com.diagbot.vo.GetDisScaleAllInfoVO;
-
-/**
- * <p>
- * 诊断量表映射表 服务类
- * </p>
- *
- * @author wangyu
- * @since 2019-04-01
- */
-public interface DisScaleService extends IService<DisScale> {
-
-    /**
-     * 分页获取诊断关联量表信息
-     *
-     * @param getDisScaleAllInfoVO
-     * @return
-     */
-    public IPage<GetDisScaleAllInfoDTO> getDisScaleInfo(GetDisScaleAllInfoVO getDisScaleAllInfoVO);
-}

+ 0 - 16
icssman-service/src/main/java/com/diagbot/service/DisTypeService.java

@@ -1,16 +0,0 @@
-package com.diagbot.service;
-
-import com.diagbot.entity.DisType;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 诊断类型表 服务类
- * </p>
- *
- * @author zhoutg
- * @since 2019-03-28
- */
-public interface DisTypeService extends IService<DisType> {
-
-}

+ 0 - 27
icssman-service/src/main/java/com/diagbot/service/impl/DisScaleServiceImpl.java

@@ -1,27 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.dto.GetDisScaleAllInfoDTO;
-import com.diagbot.entity.DisScale;
-import com.diagbot.mapper.DisScaleMapper;
-import com.diagbot.service.DisScaleService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.vo.GetDisScaleAllInfoVO;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 诊断量表映射表 服务实现类
- * </p>
- *
- * @author wangyu
- * @since 2019-04-01
- */
-@Service
-public class DisScaleServiceImpl extends ServiceImpl<DisScaleMapper, DisScale> implements DisScaleService {
-
-    @Override
-    public IPage<GetDisScaleAllInfoDTO> getDisScaleInfo(GetDisScaleAllInfoVO getDisScaleAllInfoVO) {
-        return baseMapper.getDisScaleInfo(getDisScaleAllInfoVO);
-    }
-}

+ 0 - 20
icssman-service/src/main/java/com/diagbot/service/impl/DisTypeServiceImpl.java

@@ -1,20 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.diagbot.entity.DisType;
-import com.diagbot.mapper.DisTypeMapper;
-import com.diagbot.service.DisTypeService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 诊断类型表 服务实现类
- * </p>
- *
- * @author zhoutg
- * @since 2019-03-28
- */
-@Service
-public class DisTypeServiceImpl extends ServiceImpl<DisTypeMapper, DisType> implements DisTypeService {
-
-}

+ 0 - 59
icssman-service/src/main/resources/mapper/DisScaleMapper.xml

@@ -1,59 +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.DisScaleMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.DisScale">
-        <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="scale_id" property="scaleId" />
-        <result column="order_no" property="orderNo" />
-        <result column="remark" property="remark" />
-    </resultMap>
-
-    <select id="getDisScaleInfo" resultType="com.diagbot.dto.GetDisScaleAllInfoDTO">
-        SELECT
-        t.id,
-        t.modifier,
-        t.gmt_modified,
-        t.dis_id,
-        t.dis_name,
-        GROUP_CONCAT(t.scale_name) scale_name,
-        GROUP_CONCAT(t.id) del_id
-        FROM
-        (
-        SELECT
-        a.modifier,
-        a.gmt_modified,
-        a.id,
-        a.dis_id,
-        a.scale_id,
-        b.`name` AS dis_name,
-        c.`name` AS scale_name
-        FROM
-        `icss_dis_scale` a
-        LEFT JOIN icss_question_info b ON a.dis_id = b.id
-        LEFT JOIN icss_question_info c ON a.scale_id = c.id
-        WHERE
-        a.is_deleted = 'N'
-        AND b.is_deleted = 'N'
-        AND c.is_deleted = 'N'
-        <if test="getDisScaleAllInfoVO.disName != null and getDisScaleAllInfoVO.disName != ''">
-            and b.`name` LIKE CONCAT('%',#{getDisScaleAllInfoVO.disName},'%')
-        </if>
-        <if test="getDisScaleAllInfoVO.scaleName != null and getDisScaleAllInfoVO.scaleName != ''">
-            and c.`name` LIKE CONCAT('%',#{getDisScaleAllInfoVO.scaleName},'%')
-        </if>
-        ) t
-        GROUP BY
-        t.dis_name
-        ORDER BY
-        t.gmt_modified DESC
-    </select>
-
-</mapper>

+ 0 - 19
icssman-service/src/main/resources/mapper/DisTypeMapper.xml

@@ -1,19 +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.DisTypeMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.DisType">
-        <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="parent_id" property="parentId" />
-        <result column="type" property="type" />
-        <result column="remark" property="remark" />
-    </resultMap>
-
-</mapper>