Browse Source

量表内容代码删除

zhoutg 6 years ago
parent
commit
d3fceafb33

+ 0 - 37
icssman-service/src/main/java/com/diagbot/facade/QuestionFacade.java

@@ -20,7 +20,6 @@ import com.diagbot.entity.QuestionDetail;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.entity.QuestionMapping;
 import com.diagbot.entity.RetrievalMapping;
-import com.diagbot.entity.ScaleContent;
 import com.diagbot.entity.wrapper.QuestionInfoWrapper;
 import com.diagbot.entity.wrapper.QuestionMappingWrapper;
 import com.diagbot.entity.wrapper.QuestionWrapper;
@@ -62,7 +61,6 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -104,8 +102,6 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
     DisTypeFacade disTypeFacade;
     @Autowired
     DisScaleFacade disScaleFacade;
-    @Autowired
-    ScaleContentFacade scaleContentFacade;
 
     /**
      * 标签保存
@@ -545,23 +541,6 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
                         .set("modifier", person)
                         .set("is_deleted", IsDeleteEnum.Y.getKey()));
             }
-            //如果是量表
-            if (deleteQuestionVO.getType() == QuestionTypeEnum.Scale.getKey()) {
-                //删除诊断和量表的映射关系
-                disScaleFacade.update(new DisScale(), new UpdateWrapper<DisScale>()
-                        .eq("scale_id", id)
-                        .eq("is_deleted", IsDeleteEnum.N.getKey())
-                        .set("gmt_modified", now)
-                        .set("modifier", person)
-                        .set("is_deleted", IsDeleteEnum.Y.getKey()));
-
-                scaleContentFacade.update(new ScaleContent(), new UpdateWrapper<ScaleContent>()
-                        .eq("scale_id", id)
-                        .eq("is_deleted", IsDeleteEnum.N.getKey())
-                        .set("gmt_modified", now)
-                        .set("modifier", person)
-                        .set("is_deleted", IsDeleteEnum.Y.getKey()));
-            }
 
             //TODO 删除映射关系或检查抛异常
 
@@ -589,18 +568,6 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         paramMap.put("notTagType", questionIndexVO.getNotTagType());
         paramMap.put("notControlType", questionIndexVO.getNotControlType());
         List<QuestionInfo> res = this.index(paramMap);
-        //过滤出没有量表内容标签
-        if (ListUtil.isNotEmpty(questionIndexVO.getFilterList()) &&
-                questionIndexVO.getFilterList().contains("scale")) {
-            List<ScaleContent> scaleContents = scaleContentFacade.list(new QueryWrapper<ScaleContent>()
-                    .eq("is_deleted", IsDeleteEnum.N.getKey()));
-            Set<Long> ids = scaleContents.stream().map(row -> row.getScaleId()).collect(Collectors.toSet());
-            for (int i = 0; i < res.size(); i++) {
-                if (ids.contains(res.get(i).getId())) {
-                    res.remove(i--);
-                }
-            }
-        }
         return res;
     }
 
@@ -756,10 +723,6 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
                     .eq("dis_id", questionInfo.getId()));
             res.setDisType(disType == null ? DisTypeEnum.COMMON.getKey() : disType.getType());
         }
-        //如果是量表内容,添加量表内容
-        if (questionInfo.getType() == QuestionTypeEnum.Scale.getKey()) {
-            res.setScale(scaleContentFacade.getByParamFac(questionInfo.getId()));
-        }
         //获取明细项
         List<QuestionDetail> questionDetailList = questionDetailFacade.getByQuestionId(questionVO.getId());
         res.setQuestionDetailList(questionDetailList);

+ 0 - 147
icssman-service/src/main/java/com/diagbot/facade/ScaleContentFacade.java

@@ -1,147 +0,0 @@
-/**
- *
- */
-package com.diagbot.facade;
-
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.client.UserServiceClient;
-import com.diagbot.dto.QuestionPageDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.ScaleContentDTO;
-import com.diagbot.entity.QuestionInfo;
-import com.diagbot.entity.ScaleContent;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
-import com.diagbot.service.ScaleContentService;
-import com.diagbot.service.impl.ScaleContentServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.UserUtils;
-import com.diagbot.vo.DeleteScaleVO;
-import com.diagbot.vo.QuestionPageVO;
-import com.diagbot.vo.ScaleContentSaveVO;
-import com.diagbot.vo.ScaleContentVO;
-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.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * @author zhoutg
- * @Description
- * @time 2018年12月5日下午4:53:59
- */
-@Component
-public class ScaleContentFacade extends ScaleContentServiceImpl {
-
-    @Autowired
-    @Qualifier("scaleContentServiceImpl")
-    ScaleContentService scaleContentService;
-    @Autowired
-    UserServiceClient userServiceClient;
-    @Autowired
-    QuestionFacade questionFacade;
-
-    /**
-     * 量表内容新增或更新
-     *
-     * @param scaleContentSaveVO
-     */
-    public void insertOrUpdate(ScaleContentSaveVO scaleContentSaveVO) {
-        Long scaleId = scaleContentSaveVO.getScaleId();
-        Date now = DateUtil.now();
-        String userId = UserUtils.getCurrentPrincipleID();
-
-        // 更新修改信息
-        questionFacade.update(new QuestionInfo(), new UpdateWrapper<QuestionInfo>()
-                .eq("id", scaleId)
-                .set("gmt_modified", now)
-                .set("modifier", userId)
-        );
-        // 删除原关联内容
-        if (scaleId != null) {
-            this.update(new ScaleContent(), new UpdateWrapper<ScaleContent>()
-                    .eq("scale_id", scaleId)
-                    .eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .set("gmt_modified", now)
-                    .set("modifier", userId)
-                    .set("is_deleted", IsDeleteEnum.Y.getKey()));
-        }
-        // 新增关联内容
-        List<ScaleContent> list = new ArrayList<>();
-        List<ScaleContentVO> scaleContentVOS = scaleContentSaveVO.getContent();
-        for (ScaleContentVO scaleContentVO : scaleContentVOS) {
-            ScaleContent bean = new ScaleContent();
-            BeanUtil.copyProperties(scaleContentVO, bean);
-            bean.setScaleId(scaleId);
-            bean.setModifier(userId);
-            bean.setCreator(userId);
-            bean.setGmtCreate(now);
-            bean.setGmtModified(now);
-            list.add(bean);
-        }
-        scaleContentService.saveBatch(list);
-    }
-
-
-    /**
-     * 量表列表
-     *
-     * @param questionPageVO
-     * @return
-     */
-    public IPage<QuestionPageDTO> getListFac(QuestionPageVO questionPageVO) {
-        IPage<QuestionPageDTO> res = this.getList(questionPageVO);
-        if (res.getTotal() <= 0) {
-            return res;
-        }
-        List<String> personIds = res.getRecords().stream().map(row -> row.getModifier()).collect(Collectors.toList());
-        RespDTO<Map<String, String>> mapRespDTO = userServiceClient.getUserInfoByIds(personIds);
-        if (mapRespDTO == null || !CommonErrorCode.OK.getCode().equals(mapRespDTO.code)) {
-            throw new CommonException(CommonErrorCode.RPC_ERROR, "获取操作人失败");
-        }
-        for (QuestionPageDTO bean : res.getRecords()) {
-            bean.setModifier(mapRespDTO.data.get(bean.getModifier()));
-        }
-        return res;
-    }
-
-
-    /**
-     * 量表列表
-     *
-     * @param scaleId
-     * @return
-     */
-    public List<ScaleContentDTO> getByParamFac(Long scaleId) {
-        return this.getByParam(scaleId);
-    }
-
-
-    /**
-     * 量表列表
-     *
-     * @param deleteScaleVO
-     * @return
-     */
-    public void delete(DeleteScaleVO deleteScaleVO) {
-        Date now = DateUtil.now();
-        String person = UserUtils.getCurrentPrincipleID();
-        List<Long> ids = deleteScaleVO.getIds();
-        for(Long id : ids) {
-            this.update(new ScaleContent(), new UpdateWrapper<ScaleContent>()
-                    .eq("scale_id", id)
-                    .eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .set("gmt_modified", now)
-                    .set("modifier", person)
-                    .set("is_deleted", IsDeleteEnum.Y.getKey()));
-        }
-    }
-}

+ 0 - 39
icssman-service/src/main/java/com/diagbot/mapper/ScaleContentMapper.java

@@ -1,39 +0,0 @@
-package com.diagbot.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.dto.QuestionPageDTO;
-import com.diagbot.dto.ScaleContentDTO;
-import com.diagbot.entity.ScaleContent;
-import com.diagbot.vo.QuestionPageVO;
-import com.diagbot.vo.ScaleContentVO;
-
-import java.util.List;
-
-/**
- * <p>
- * 量表内容表 Mapper 接口
- * </p>
- *
- * @author zhoutg
- * @since 2019-04-08
- */
-public interface ScaleContentMapper extends BaseMapper<ScaleContent> {
-
-    /**
-     * 获取标签列表
-     *
-     * @param questionPageVO
-     * @return
-     */
-    public IPage<QuestionPageDTO> getList(QuestionPageVO questionPageVO);
-
-
-    /**
-     * 返回量表内容
-     *
-     * @param scaleId
-     * @return
-     */
-    public List<ScaleContentDTO> getByParam(Long scaleId);
-}

+ 0 - 38
icssman-service/src/main/java/com/diagbot/service/ScaleContentService.java

@@ -1,38 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.dto.QuestionPageDTO;
-import com.diagbot.dto.ScaleContentDTO;
-import com.diagbot.entity.ScaleContent;
-import com.diagbot.vo.QuestionPageVO;
-
-import java.util.List;
-
-/**
- * <p>
- * 量表内容表 服务类
- * </p>
- *
- * @author zhoutg
- * @since 2019-04-08
- */
-public interface ScaleContentService extends IService<ScaleContent> {
-
-    /**
-     * 获取标签列表
-     *
-     * @param questionPageVO
-     * @return
-     */
-    IPage<QuestionPageDTO> getList(QuestionPageVO questionPageVO);
-
-
-    /**
-     * 返回量表内容
-     *
-     * @param scaleId
-     * @return
-     */
-    public List<ScaleContentDTO> getByParam(Long scaleId);
-}

+ 0 - 35
icssman-service/src/main/java/com/diagbot/service/impl/ScaleContentServiceImpl.java

@@ -1,35 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.dto.QuestionPageDTO;
-import com.diagbot.dto.ScaleContentDTO;
-import com.diagbot.entity.ScaleContent;
-import com.diagbot.mapper.ScaleContentMapper;
-import com.diagbot.service.ScaleContentService;
-import com.diagbot.vo.QuestionPageVO;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 量表内容表 服务实现类
- * </p>
- *
- * @author zhoutg
- * @since 2019-04-08
- */
-@Service
-public class ScaleContentServiceImpl extends ServiceImpl<ScaleContentMapper, ScaleContent> implements ScaleContentService {
-
-    @Override
-    public IPage<QuestionPageDTO> getList(QuestionPageVO questionPageVO) {
-        return baseMapper.getList(questionPageVO);
-    }
-
-    @Override
-    public List<ScaleContentDTO> getByParam(Long scaleId) {
-        return baseMapper.getByParam(scaleId);
-    }
-}

+ 0 - 65
icssman-service/src/main/java/com/diagbot/web/ScaleContentController.java

@@ -1,65 +0,0 @@
-package com.diagbot.web;
-
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.QuestionPageDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.facade.ScaleContentFacade;
-import com.diagbot.vo.DeleteScaleVO;
-import com.diagbot.vo.QuestionPageVO;
-import com.diagbot.vo.ScaleContentSaveVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 量表内容表 前端控制器
- * </p>
- *
- * @author zhoutg
- * @since 2019-04-08
- */
-@RestController
-@RequestMapping("/scaleContent")
-@Api(value = "2期-量表内容相关API", tags = { "2期-量表内容相关API" })
-public class ScaleContentController {
-
-    @Autowired
-    ScaleContentFacade scaleContentFacade;
-
-    @ApiOperation(value = "2期-量表内容新增或更新[by:zhoutg]")
-    @PostMapping("/insertOrUpdate")
-    @SysLogger("insertOrUpdate")
-    @Transactional
-    public RespDTO<Boolean> insertOrUpdate(@RequestBody ScaleContentSaveVO scaleContentSaveVO) {
-        scaleContentFacade.insertOrUpdate(scaleContentSaveVO);
-        return RespDTO.onSuc(true);
-    }
-
-
-    @ApiOperation(value = "2期-量表列表[by:zhoutg]",
-            notes = "")
-    @PostMapping("/list")
-    @SysLogger("list")
-    public RespDTO<IPage<QuestionPageDTO>> list(@RequestBody QuestionPageVO questionPageVO) {
-        IPage<QuestionPageDTO> data = scaleContentFacade.getListFac(questionPageVO);
-        return RespDTO.onSuc(data);
-    }
-
-
-    @ApiOperation(value = "2期-量表内容删除[by:zhoutg]",
-            notes = "")
-    @PostMapping("/delete")
-    @SysLogger("delete")
-    public  RespDTO<Boolean> delete(@RequestBody DeleteScaleVO deleteScaleVO) {
-        scaleContentFacade.delete(deleteScaleVO);
-        return RespDTO.onSuc(true);
-    }
-}

+ 0 - 55
icssman-service/src/main/resources/mapper/ScaleContentMapper.xml

@@ -1,55 +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.ScaleContentMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.ScaleContent">
-        <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="scale_id" property="scaleId" />
-        <result column="content" property="content" />
-        <result column="type" property="type" />
-        <result column="order_no" property="orderNo" />
-        <result column="remark" property="remark" />
-    </resultMap>
-
-    <select id="getList" resultType="com.diagbot.dto.QuestionPageDTO">
-        SELECT a.* FROM `icss_question_info` a where
-        EXISTS (select 1 from icss_scale_content b where a.id = b.scale_id and b.is_deleted = 'N')
-        and a.is_deleted = 'N'
-        <if test="type != null and type != ''">
-            AND a.type = #{type}
-        </if>
-        <if test="tagName != null and tagName != ''">
-            AND a.tag_name like concat ('%', #{tagName}, '%')
-        </if>
-        <if test="notTypeList != null and notTypeList.size() > 0 ">
-            and a.type not in
-            <foreach  collection="notTypeList" item="notType" open="("  separator=","  close=")">
-                #{notType}
-            </foreach>
-        </if>
-        <if test="tagTypeList != null and tagTypeList.size() > 0 ">
-            and a.tag_type in
-            <foreach  collection="tagTypeList" item="tagType" open="("  separator=","  close=")">
-                #{tagType}
-            </foreach>
-        </if>
-        <if test="controlTypeList != null and controlTypeList.size() > 0 ">
-            and a.control_type in
-            <foreach  collection="controlTypeList" item="controlType" open="("  separator=","  close=")">
-                #{controlType}
-            </foreach>
-        </if>
-        order by a.gmt_modified desc
-    </select>
-
-    <select id="getByParam" resultType="com.diagbot.dto.ScaleContentDTO">
-        SELECT a.* FROM `icss_scale_content` a where a.is_deleted = 'N' and a.scale_id = #{scaleId}
-    </select>
-
-</mapper>