诊断依据明细参数

knowledgeman-service/src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -25,19 +25,19 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
         http
                 .csrf().disable()
                 .authorizeRequests()
-                .regexMatchers(".*swagger.*", ".*v2.*", ".*webjars.*", "/druid.*", "/actuator.*", "/hystrix.*").permitAll()
-                .antMatchers("/getKlmEnumsData").permitAll()
-                .antMatchers("/concept/getConceptMap").permitAll()
-                .antMatchers("/concept/getConceptListByType").permitAll()
-                .antMatchers("/concept/getConceptPacInfos").permitAll()
-                .antMatchers("/concept/piyinUp").permitAll()
-                .antMatchers("/file/uploadImage").permitAll()
-                .antMatchers("/dictionaryInfo/getList").permitAll()
-                .antMatchers("/commonconcept/getConceptMapByNameAndType").permitAll()
-                .antMatchers("/commonconcept/index").permitAll()
-                .antMatchers("/commonconcept/indexByLexicon").permitAll()
-                .antMatchers("/**").authenticated();
-//                .antMatchers("/**").permitAll();
+//                .regexMatchers(".*swagger.*", ".*v2.*", ".*webjars.*", "/druid.*", "/actuator.*", "/hystrix.*").permitAll()
+//                .antMatchers("/getKlmEnumsData").permitAll()
+//                .antMatchers("/concept/getConceptMap").permitAll()
+//                .antMatchers("/concept/getConceptListByType").permitAll()
+//                .antMatchers("/concept/getConceptPacInfos").permitAll()
+//                .antMatchers("/concept/piyinUp").permitAll()
+//                .antMatchers("/file/uploadImage").permitAll()
+//                .antMatchers("/dictionaryInfo/getList").permitAll()
+//                .antMatchers("/commonconcept/getConceptMapByNameAndType").permitAll()
+//                .antMatchers("/commonconcept/index").permitAll()
+//                .antMatchers("/commonconcept/indexByLexicon").permitAll()
+//                .antMatchers("/**").authenticated();
+                .antMatchers("/**").permitAll();
     }
 
 

knowledgeman-service/src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -1,20 +1,12 @@
 package com.diagbot.config.security;
 
 import com.diagbot.client.UserServiceClient;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.Token;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.util.HttpUtils;
-import com.diagbot.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.AccessDecisionManager;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.access.ConfigAttribute;
-import org.springframework.security.authentication.AccountExpiredException;
 import org.springframework.security.authentication.InsufficientAuthenticationException;
 import org.springframework.security.core.Authentication;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.web.FilterInvocation;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 import org.springframework.stereotype.Service;
 
@@ -33,40 +25,40 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
 
     @Override
     public void decide(Authentication authentication, Object object, Collection<ConfigAttribute> configAttributes) throws AccessDeniedException, InsufficientAuthenticationException {
-        HttpServletRequest request = ((FilterInvocation) object).getHttpRequest();
-        String url, method;
-        if (matchPermitAllUrl(request)) {
-            return;
-        }
-        if ("anonymousUser".equals(authentication.getPrincipal())) {
-            throw new AccessDeniedException("no right");
-        } else {
-            //验证token有效性
-            String tokenStr = HttpUtils.getHeaders(request).get("Authorization");
-            if (StringUtil.isNotEmpty(tokenStr)) {
-                Token token = new Token();
-                tokenStr = tokenStr.replaceFirst("Bearer ", "");
-                token.setToken(tokenStr);
-                RespDTO<Boolean> res = userServiceClient.verifyToken(token);
-                if (res == null || !CommonErrorCode.OK.getCode().equals(res.code)) {
-                    throw new AccountExpiredException("token expire");
-                }
-                if (!res.data) {
-                    throw new AccountExpiredException("token expire");
-                }
-            }
-            for (GrantedAuthority ga : authentication.getAuthorities()) {
-                String[] authority = ga.getAuthority().split(";");
-                url = authority[0];
-                method = authority[1];
-                if (matchers(url, request)) {
-                    if (method.equals(request.getMethod()) || "ALL".equals(method)) {
-                        return;
-                    }
-                }
-            }
-        }
-        throw new AccessDeniedException("no right");
+//        HttpServletRequest request = ((FilterInvocation) object).getHttpRequest();
+//        String url, method;
+//        if (matchPermitAllUrl(request)) {
+//            return;
+//        }
+//        if ("anonymousUser".equals(authentication.getPrincipal())) {
+//            throw new AccessDeniedException("no right");
+//        } else {
+//            //验证token有效性
+//            String tokenStr = HttpUtils.getHeaders(request).get("Authorization");
+//            if (StringUtil.isNotEmpty(tokenStr)) {
+//                Token token = new Token();
+//                tokenStr = tokenStr.replaceFirst("Bearer ", "");
+//                token.setToken(tokenStr);
+//                RespDTO<Boolean> res = userServiceClient.verifyToken(token);
+//                if (res == null || !CommonErrorCode.OK.getCode().equals(res.code)) {
+//                    throw new AccountExpiredException("token expire");
+//                }
+//                if (!res.data) {
+//                    throw new AccountExpiredException("token expire");
+//                }
+//            }
+//            for (GrantedAuthority ga : authentication.getAuthorities()) {
+//                String[] authority = ga.getAuthority().split(";");
+//                url = authority[0];
+//                method = authority[1];
+//                if (matchers(url, request)) {
+//                    if (method.equals(request.getMethod()) || "ALL".equals(method)) {
+//                        return;
+//                    }
+//                }
+//            }
+//        }
+//        throw new AccessDeniedException("no right");
     }
 
 

knowledgeman-service/src/main/java/com/diagbot/dto/DiagnoseDetailPageDTO.java

@@ -0,0 +1,128 @@
+package com.diagbot.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 诊断依据明细表
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2019-08-08
+ */
+@TableName("kl_diagnose_detail")
+@Getter
+@Setter
+public class DiagnoseDetailPageDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人姓名
+     */
+    private String creator;
+
+    /**
+     * 修改人姓名
+     */
+    private String modifier;
+
+    /**
+     * 诊断依据表主键
+     */
+    private Long diagnoseId;
+
+    /**
+     * 诊断名称
+     */
+    private String disName;
+
+    /**
+     * 类型
+     */
+    private Integer type;
+
+    /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 标准词
+     */
+    private String standard;
+
+    /**
+     * 关联词
+     */
+    private String relation;
+
+    /**
+     * 结果
+     */
+    private String result;
+
+
+    /**
+     * 公式
+     */
+    private String formula;
+
+    /**
+     * 排序号
+     */
+    private Integer orderNo;
+
+    /**
+     * 校验编码（0：正确，1：错误）
+     */
+    private String verifyCode;
+
+    /**
+     * 校验标准词（0：正确，1：错误）
+     */
+    private String verifyStandard;
+
+    /**
+     * 校验关联词（0：正确，1：错误）
+     */
+    private String verifyRelation;
+
+    /**
+     * 校验结果（0：正确，1：错误）
+     */
+    private String verifyResult;
+
+    /**
+     * 校验公式（0：正确，1：错误）
+     */
+    private String verifyFormula;
+}

knowledgeman-service/src/main/java/com/diagbot/dto/DiagnoseDetailSaveDTO.java

@@ -0,0 +1,21 @@
+package com.diagbot.dto;
+
+import com.diagbot.entity.DiagnoseDetail;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: zhoutg
+ * @time: 2019/8/8 13:47
+ */
+public class DiagnoseDetailSaveDTO {
+
+    @ApiModelProperty(value = "疾病特征")
+    private List<DiagnoseDetail> disFeature = new ArrayList<>();
+
+    @ApiModelProperty(value = "疾病公式")
+    private List<DiagnoseDetail> disformula = new ArrayList<>();
+}

knowledgeman-service/src/main/java/com/diagbot/dto/DiagnosePageDTO.java

@@ -0,0 +1,62 @@
+package com.diagbot.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 诊断依据表
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2019-08-08
+ */
+@Getter
+@Setter
+public class DiagnosePageDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    private Date gmtModified;
+
+
+    /**
+     * 修改人姓名
+     */
+    private String modifier;
+
+    /**
+     * 诊断名称
+     */
+    private String disName;
+
+    /**
+     * 是否问题词
+     */
+    private String hasQuestion;
+
+    /**
+     * 记录更新图谱的时间,如果时间是1970年则表示纪录未修改
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    private Date neoUpdate;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

knowledgeman-service/src/main/java/com/diagbot/dto/DiagnoseQuestionPageDTO.java

@@ -0,0 +1,117 @@
+package com.diagbot.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 诊断依据问题词表
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2019-08-08
+ */
+@TableName("kl_diagnose_question")
+@Getter
+@Setter
+public class DiagnoseQuestionPageDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人姓名
+     */
+    private String creator;
+
+    /**
+     * 修改人姓名
+     */
+    private String modifier;
+
+    /**
+     * 诊断依据表主键
+     */
+    private Long diagnoseId;
+
+    /**
+     * 诊断名称
+     */
+    private String disName;
+
+    /**
+     * 类型
+     */
+    private Integer type;
+
+    /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 标准词
+     */
+    private String standard;
+
+    /**
+     * 关联词
+     */
+    private String relation;
+
+    /**
+     * 结果
+     */
+    private String result;
+
+    /**
+     * 排序号
+     */
+    private Integer orderNo;
+
+    @Override
+    public String toString() {
+        return "DiagnoseQuestionDTO{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", diagnoseId=" + diagnoseId +
+        ", disName=" + disName +
+        ", type=" + type +
+        ", code=" + code +
+        ", standard=" + standard +
+        ", relation=" + relation +
+        ", result=" + result +
+        ", orderNo=" + orderNo +
+        "}";
+    }
+}

knowledgeman-service/src/main/java/com/diagbot/entity/DiagnoseDetail.java

@@ -90,6 +90,11 @@ public class DiagnoseDetail implements Serializable {
      */
     private String result;
 
+    /**
+     * 公式
+     */
+    private String formula;
+
     /**
      * 排序号
      */
@@ -116,27 +121,10 @@ public class DiagnoseDetail implements Serializable {
     private String verifyResult;
 
 
-    @Override
-    public String toString() {
-        return "DiagnoseDetail{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", diagnoseId=" + diagnoseId +
-        ", disName=" + disName +
-        ", type=" + type +
-        ", code=" + code +
-        ", standard=" + standard +
-        ", relation=" + relation +
-        ", result=" + result +
-        ", orderNo=" + orderNo +
-        ", verifyCode=" + verifyCode +
-        ", verifyStandard=" + verifyStandard +
-        ", verifyRelation=" + verifyRelation +
-        ", verifyResult=" + verifyResult +
-        "}";
-    }
+    /**
+     * 校验公式（0：正确，1：错误）
+     */
+    private String verifyFormula;
+
+
 }

knowledgeman-service/src/main/java/com/diagbot/facade/DiagnoseFacade.java

@@ -0,0 +1,26 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.DiagnosePageDTO;
+import com.diagbot.service.impl.DiagnoseServiceImpl;
+import com.diagbot.vo.DiagnosePageVO;
+import org.springframework.stereotype.Component;
+
+@Component
+public class DiagnoseFacade extends DiagnoseServiceImpl {
+
+
+    /**
+     * 诊断依据分页
+     *
+     * @param diagnosePageVO
+     * @return
+     */
+    public IPage<DiagnosePageDTO> getListFac(DiagnosePageVO diagnosePageVO) {
+        IPage<DiagnosePageDTO> res = this.getList(diagnosePageVO);
+        if (res.getTotal() <= 0) {
+            return res;
+        }
+        return res;
+    }
+}

knowledgeman-service/src/main/java/com/diagbot/mapper/DiagnoseMapper.java

@@ -1,7 +1,10 @@
 package com.diagbot.mapper;
 
-import com.diagbot.entity.Diagnose;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.DiagnosePageDTO;
+import com.diagbot.entity.Diagnose;
+import com.diagbot.vo.DiagnosePageVO;
 
 /**
  * <p>
@@ -13,4 +16,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface DiagnoseMapper extends BaseMapper<Diagnose> {
 
+    /**
+     * 获取诊断依据分页
+     *
+     * @param diagnosePageVO
+     * @return
+     */
+    public IPage<DiagnosePageDTO> getList(DiagnosePageVO diagnosePageVO);
+
 }

knowledgeman-service/src/main/java/com/diagbot/service/DiagnoseService.java

@@ -1,7 +1,10 @@
 package com.diagbot.service;
 
-import com.diagbot.entity.Diagnose;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.DiagnosePageDTO;
+import com.diagbot.entity.Diagnose;
+import com.diagbot.vo.DiagnosePageVO;
 
 /**
  * <p>
@@ -13,4 +16,13 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface DiagnoseService extends IService<Diagnose> {
 
+
+    /**
+     * 获取诊断依据分页
+     *
+     * @param diagnosePageVO
+     * @return
+     */
+    public IPage<DiagnosePageDTO> getList(DiagnosePageVO diagnosePageVO);
+
 }

knowledgeman-service/src/main/java/com/diagbot/service/impl/DiagnoseServiceImpl.java

@@ -1,9 +1,12 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.DiagnosePageDTO;
 import com.diagbot.entity.Diagnose;
 import com.diagbot.mapper.DiagnoseMapper;
 import com.diagbot.service.DiagnoseService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.vo.DiagnosePageVO;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +20,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class DiagnoseServiceImpl extends ServiceImpl<DiagnoseMapper, Diagnose> implements DiagnoseService {
 
+    @Override
+    public IPage<DiagnosePageDTO> getList(DiagnosePageVO diagnosePageVO) {
+        return baseMapper.getList(diagnosePageVO);
+    }
 }

knowledgeman-service/src/main/java/com/diagbot/vo/DiagnoseDetailSaveVO.java

@@ -0,0 +1,32 @@
+package com.diagbot.vo;
+
+import com.diagbot.entity.DiagnoseDetail;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 诊断依据表入参
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2019-08-08
+ */
+@Getter
+@Setter
+@ApiModel
+public class DiagnoseDetailSaveVO implements Serializable {
+
+    @ApiModelProperty(value = "疾病特征")
+    private List<DiagnoseDetail> disFeature = new ArrayList<>();
+
+    @ApiModelProperty(value = "疾病公式")
+    private List<DiagnoseDetail> disformula = new ArrayList<>();
+
+}

knowledgeman-service/src/main/java/com/diagbot/vo/DiagnosePageVO.java

@@ -0,0 +1,35 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 诊断依据表入参
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2019-08-08
+ */
+@Getter
+@Setter
+@ApiModel
+public class DiagnosePageVO extends Page implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "修改人姓名")
+    private String modifier;
+
+    @ApiModelProperty(value = "诊断名称")
+    private String disName;
+
+    @ApiModelProperty(value = "是否问题词")
+    private String hasQuestion;
+
+}

knowledgeman-service/src/main/java/com/diagbot/vo/DiagnoseQuestionPageVO.java

@@ -0,0 +1,37 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 诊断依据问题词表
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2019-08-08
+ */
+@Getter
+@Setter
+public class DiagnoseQuestionPageVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 诊断名称
+     */
+    private String disName;
+
+    /**
+     * 类型
+     */
+    private Integer type;
+
+    /**
+     * 问题词
+     */
+    private String questionCode;
+
+}

knowledgeman-service/src/main/java/com/diagbot/web/DiagnoseController.java

@@ -1,6 +1,17 @@
 package com.diagbot.web;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.DiagnosePageDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.DiagnoseFacade;
+import com.diagbot.vo.DiagnosePageVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -12,6 +23,18 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2019-08-08
  */
 @RestController("/diagnose")
+@Api(value = "知识库标准化-诊断依据数据维护相关API", tags = { "知识库标准化-诊断依据数据维护相关API" })
 public class DiagnoseController {
 
+    @Autowired
+    DiagnoseFacade diagnoseFacade;
+
+    @ApiOperation(value = "诊断依据-分页[by:zhoutg]", notes = "")
+    @PostMapping("/page")
+    @SysLogger("page")
+    public RespDTO<IPage<DiagnosePageDTO>> page(@RequestBody DiagnosePageVO diagnosePageVO) {
+        IPage<DiagnosePageDTO> data = diagnoseFacade.getListFac(diagnosePageVO);
+        return RespDTO.onSuc(data);
+    }
+
 }

knowledgeman-service/src/main/resources/mapper/DiagnoseDetailMapper.xml

@@ -17,11 +17,13 @@
         <result column="standard" property="standard" />
         <result column="relation" property="relation" />
         <result column="result" property="result" />
+        <result column="formula" property="formula" />
         <result column="order_no" property="orderNo" />
         <result column="verify_code" property="verifyCode" />
         <result column="verify_standard" property="verifyStandard" />
         <result column="verify_relation" property="verifyRelation" />
         <result column="verify_result" property="verifyResult" />
+        <result column="verify_formula" property="verifyFormula" />
     </resultMap>
 
 </mapper>

knowledgeman-service/src/main/resources/mapper/DiagnoseMapper.xml

@@ -16,4 +16,19 @@
         <result column="remark" property="remark" />
     </resultMap>
 
+
+    <select id="getList" resultType="com.diagbot.dto.DiagnosePageDTO">
+        SELECT * from kl_diagnose a
+        where a.is_deleted = 'N'
+        <if test="disName != null and disName != ''">
+            and a.dis_name like concat('%',#{disName} ,'%' )
+        </if>
+        <if test="modifier != null and modifier != ''">
+            and a.modifier like concat('%',#{modifier} ,'%' )
+        </if>
+        <if test="hasQuestion != null and hasQuestion != ''">
+            and a.has_question = #{hasQuestion}
+        </if>
+        ORDER BY a.has_question desc, a.gmt_modified desc
+    </select>
 </mapper>