基础术语和基础关系类型翻页显示

cdssman-service/src/main/java/com/diagbot/dto/KlLexiconDTO.java

@@ -0,0 +1,67 @@
+package com.diagbot.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2021/3/2 11:25
+ */
+@Getter
+@Setter
+public class KlLexiconDTO {
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    @JsonFormat(timezone="GMT+8",pattern ="yyyy-MM-dd HH:mm:ss")
+    private Date gmtModified;
+
+    /**
+     * 操作人
+     */
+    private String operName;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 类型名称
+     */
+    private String name;
+
+    /**
+     * 数字编码（100~500）
+     */
+    private Integer code;
+
+    /**
+     * 是否有通用扩展(0:无;1:有)
+     */
+    private Integer isHasCommon;
+
+    /**
+     * 是否只有一个(0:否;1:是)
+     */
+    private Integer onlyOne;
+
+    /**
+     * 是否允许修改(0:否;1:是)
+     */
+    private Integer canChange;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

cdssman-service/src/main/java/com/diagbot/dto/KlLexiconRelationshipDTO.java

@@ -0,0 +1,48 @@
+package com.diagbot.dto;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2021/3/2 11:29
+ */
+@Getter
+@Setter
+public class KlLexiconRelationshipDTO extends Page {
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    @JsonFormat(timezone="GMT+8",pattern ="yyyy-MM-dd HH:mm:ss")
+    private Date gmtModified;
+
+    /**
+     * 操作人
+     */
+    private String operName;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 类型名称
+     */
+    private String name;
+
+    /**
+     * 数字编码（100~500）
+     */
+    private Integer code;
+}

cdssman-service/src/main/java/com/diagbot/facade/KlLexiconFacade.java

@@ -0,0 +1,38 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.client.UserServiceClient;
+import com.diagbot.dto.KlLexiconDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.service.impl.KlLexiconServiceImpl;
+import com.diagbot.util.RespDTOUtil;
+import com.diagbot.vo.KlLexiconVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2021/3/2 11:24
+ */
+@Component
+public class KlLexiconFacade extends KlLexiconServiceImpl {
+    @Autowired
+    private UserServiceClient userServiceClient;
+
+    public IPage<KlLexiconDTO> getPageFac(KlLexiconVO lexiconVO) {
+        IPage<KlLexiconDTO> iPage = this.getPage(lexiconVO);
+        List<String> userIds = iPage.getRecords().stream()
+                .map(i -> i.getModifier()).distinct().collect(Collectors.toList());
+        RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(userIds);
+        RespDTOUtil.respNGDealCover(respDTO, "获取用户信息失败");
+        iPage.getRecords().forEach(i -> {
+            i.setOperName(respDTO.data.get(i.getModifier()));
+        });
+        return iPage;
+    }
+}

cdssman-service/src/main/java/com/diagbot/facade/KlLexiconRelationshipFacade.java

@@ -0,0 +1,38 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.client.UserServiceClient;
+import com.diagbot.dto.KlLexiconRelationshipDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.service.impl.KlLexiconRelationshipServiceImpl;
+import com.diagbot.util.RespDTOUtil;
+import com.diagbot.vo.KlLexiconRelationshipVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2021/3/2 11:24
+ */
+@Component
+public class KlLexiconRelationshipFacade extends KlLexiconRelationshipServiceImpl {
+    @Autowired
+    private UserServiceClient userServiceClient;
+
+    public IPage<KlLexiconRelationshipDTO> getPageFac(KlLexiconRelationshipVO klLexiconRelationshipVO) {
+        IPage<KlLexiconRelationshipDTO> iPage = this.getPage(klLexiconRelationshipVO);
+        List<String> userIds = iPage.getRecords().stream()
+                .map(i -> i.getModifier()).distinct().collect(Collectors.toList());
+        RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(userIds);
+        RespDTOUtil.respNGDealCover(respDTO, "获取用户信息失败");
+        iPage.getRecords().forEach(i -> {
+            i.setOperName(respDTO.data.get(i.getModifier()));
+        });
+        return iPage;
+    }
+}

cdssman-service/src/main/java/com/diagbot/mapper/KlLexiconMapper.java

@@ -1,7 +1,10 @@
 package com.diagbot.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.KlLexiconDTO;
 import com.diagbot.entity.KlLexicon;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.vo.KlLexiconVO;
 
 /**
  * <p>
@@ -12,5 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2021-03-01
  */
 public interface KlLexiconMapper extends BaseMapper<KlLexicon> {
-
+    IPage<KlLexiconDTO> getPage(KlLexiconVO lexiconVO);
 }

cdssman-service/src/main/java/com/diagbot/mapper/KlLexiconRelationshipMapper.java

@@ -1,7 +1,10 @@
 package com.diagbot.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.KlLexiconRelationshipDTO;
 import com.diagbot.entity.KlLexiconRelationship;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.vo.KlLexiconRelationshipVO;
 
 /**
  * <p>
@@ -12,5 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2021-03-01
  */
 public interface KlLexiconRelationshipMapper extends BaseMapper<KlLexiconRelationship> {
-
+    IPage<KlLexiconRelationshipDTO> getPage(KlLexiconRelationshipVO klLexiconRelationshipVO);
 }

cdssman-service/src/main/java/com/diagbot/service/KlLexiconRelationshipService.java

@@ -1,7 +1,10 @@
 package com.diagbot.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.KlLexiconRelationshipDTO;
 import com.diagbot.entity.KlLexiconRelationship;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.vo.KlLexiconRelationshipVO;
 
 /**
  * <p>
@@ -12,5 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2021-03-01
  */
 public interface KlLexiconRelationshipService extends IService<KlLexiconRelationship> {
-
+    IPage<KlLexiconRelationshipDTO> getPage(KlLexiconRelationshipVO klLexiconRelationshipVO);
 }

cdssman-service/src/main/java/com/diagbot/service/KlLexiconService.java

@@ -1,7 +1,10 @@
 package com.diagbot.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.KlLexiconDTO;
 import com.diagbot.entity.KlLexicon;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.vo.KlLexiconVO;
 
 /**
  * <p>
@@ -12,5 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2021-03-01
  */
 public interface KlLexiconService extends IService<KlLexicon> {
-
+    IPage<KlLexiconDTO> getPage(KlLexiconVO lexiconVO);
 }

cdssman-service/src/main/java/com/diagbot/service/impl/KlLexiconRelationshipServiceImpl.java

@@ -1,10 +1,13 @@
 package com.diagbot.service.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.KlLexiconRelationshipDTO;
 import com.diagbot.entity.KlLexiconRelationship;
 import com.diagbot.mapper.KlLexiconRelationshipMapper;
 import com.diagbot.service.KlLexiconRelationshipService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.vo.KlLexiconRelationshipVO;
 import org.springframework.stereotype.Service;
 
 /**
@@ -18,5 +21,8 @@ import org.springframework.stereotype.Service;
 @Service
 @DS("med")
 public class KlLexiconRelationshipServiceImpl extends ServiceImpl<KlLexiconRelationshipMapper, KlLexiconRelationship> implements KlLexiconRelationshipService {
-
+    @Override
+    public IPage<KlLexiconRelationshipDTO> getPage(KlLexiconRelationshipVO klLexiconRelationshipVO){
+        return baseMapper.getPage(klLexiconRelationshipVO);
+    }
 }

cdssman-service/src/main/java/com/diagbot/service/impl/KlLexiconServiceImpl.java

@@ -1,10 +1,13 @@
 package com.diagbot.service.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.KlLexiconDTO;
 import com.diagbot.entity.KlLexicon;
 import com.diagbot.mapper.KlLexiconMapper;
 import com.diagbot.service.KlLexiconService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.vo.KlLexiconVO;
 import org.springframework.stereotype.Service;
 
 /**
@@ -18,5 +21,8 @@ import org.springframework.stereotype.Service;
 @Service
 @DS("med")
 public class KlLexiconServiceImpl extends ServiceImpl<KlLexiconMapper, KlLexicon> implements KlLexiconService {
-
+    @Override
+    public IPage<KlLexiconDTO> getPage(KlLexiconVO lexiconVO){
+        return baseMapper.getPage(lexiconVO);
+    }
 }

cdssman-service/src/main/java/com/diagbot/vo/KlLexiconRelationshipVO.java

@@ -0,0 +1,24 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2021/3/2 11:29
+ */
+@Getter
+@Setter
+public class KlLexiconRelationshipVO extends Page {
+    /**
+     * 关系名称
+     */
+    private String name;
+
+    /**
+     * 数字编码（501~999）
+     */
+    private Integer code;
+}

cdssman-service/src/main/java/com/diagbot/vo/KlLexiconVO.java

@@ -0,0 +1,24 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2021/3/2 11:29
+ */
+@Getter
+@Setter
+public class KlLexiconVO extends Page {
+    /**
+     * 类型名称
+     */
+    private String name;
+
+    /**
+     * 数字编码（100~500）
+     */
+    private Integer code;
+}

cdssman-service/src/main/java/com/diagbot/web/KlLexiconController.java

@@ -1,9 +1,19 @@
 package com.diagbot.web;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.KlLexiconDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.KlLexiconFacade;
+import com.diagbot.vo.KlLexiconVO;
+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.RequestMapping;
-
-import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -13,8 +23,20 @@ import org.springframework.stereotype.Controller;
  * @author wangfeng
  * @since 2021-03-01
  */
-@Controller
-@RequestMapping("/klLexicon")
+@RestController
+@RequestMapping("/kl/lexicon")
+@Api(value = "基础词性类型维护相关API", tags = { "基础词性类型维护相关API" })
+@SuppressWarnings("unchecked")
 public class KlLexiconController {
+    @Autowired
+    private KlLexiconFacade klLexiconFacade;
 
+    @ApiOperation(value = "基础词性类型列表[by:gaodm]",
+            notes = "name： 名称 <br>" +
+                    "code： 编码<br>")
+    @PostMapping("/getPage")
+    @SysLogger("getPage")
+    public RespDTO<IPage<KlLexiconDTO>> getPage(@RequestBody KlLexiconVO lexiconVO) {
+        return RespDTO.onSuc(klLexiconFacade.getPageFac(lexiconVO));
+    }
 }

cdssman-service/src/main/java/com/diagbot/web/KlLexiconRelationshipController.java

@@ -1,9 +1,19 @@
 package com.diagbot.web;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.KlLexiconRelationshipDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.KlLexiconRelationshipFacade;
+import com.diagbot.vo.KlLexiconRelationshipVO;
+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.RequestMapping;
-
-import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -13,8 +23,20 @@ import org.springframework.stereotype.Controller;
  * @author wangfeng
  * @since 2021-03-01
  */
-@Controller
-@RequestMapping("/klLexiconRelationship")
+@RestController
+@RequestMapping("/kl/lexiconRelationship")
+@Api(value = "基础关系类型维护相关API", tags = { "基础关系类型维护相关API" })
+@SuppressWarnings("unchecked")
 public class KlLexiconRelationshipController {
+    @Autowired
+    private KlLexiconRelationshipFacade klLexiconRelationshipFacade;
 
+    @ApiOperation(value = "基础关系类型列表[by:gaodm]",
+            notes = "name： 名称 <br>" +
+                    "code： 编码<br>")
+    @PostMapping("/getPage")
+    @SysLogger("getPage")
+    public RespDTO<IPage<KlLexiconRelationshipDTO>> getPage(@RequestBody KlLexiconRelationshipVO klLexiconRelationshipVO) {
+        return RespDTO.onSuc(klLexiconRelationshipFacade.getPageFac(klLexiconRelationshipVO));
+    }
 }

cdssman-service/src/main/resources/mapper/KlLexiconMapper.xml

@@ -1,21 +1,41 @@
 <?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">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.diagbot.mapper.KlLexiconMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.KlLexicon">
-        <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="name" property="name" />
-        <result column="code" property="code" />
-        <result column="is_has_common" property="isHasCommon" />
-        <result column="only_one" property="onlyOne" />
-        <result column="can_change" property="canChange" />
-        <result column="remark" property="remark" />
+        <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="name" property="name"/>
+        <result column="code" property="code"/>
+        <result column="is_has_common" property="isHasCommon"/>
+        <result column="only_one" property="onlyOne"/>
+        <result column="can_change" property="canChange"/>
+        <result column="remark" property="remark"/>
     </resultMap>
 
+    <select id="getPage"
+            parameterType="com.diagbot.vo.KlLexiconVO"
+            resultType="com.diagbot.dto.KlLexiconDTO">
+        SELECT
+            *
+        FROM
+            `kl_lexicon`
+        WHERE
+            is_deleted = "N"
+        <if test="name!=null and name!=''">
+            AND UPPER(name) LIKE CONCAT('%', UPPER(trim(#{name})), '%')
+        </if>
+        <if test="code!=null">
+            AND UPPER(code) LIKE CONCAT('%', UPPER(trim(#{code})), '%')
+        </if>
+        ORDER BY
+            gmt_modified DESC
+    </select>
+
 </mapper>

cdssman-service/src/main/resources/mapper/KlLexiconRelationshipMapper.xml

@@ -15,4 +15,22 @@
         <result column="remark" property="remark" />
     </resultMap>
 
+    <select id="getPage"
+            parameterType="com.diagbot.vo.KlLexiconRelationshipVO"
+            resultType="com.diagbot.dto.KlLexiconRelationshipDTO">
+        SELECT
+        *
+        FROM
+        `kl_lexicon_relationship`
+        WHERE
+        is_deleted = "N"
+        <if test="name!=null and name!=''">
+            AND UPPER(name) LIKE CONCAT('%', UPPER(trim(#{name})), '%')
+        </if>
+        <if test="code!=null">
+            AND UPPER(code) LIKE CONCAT('%', UPPER(trim(#{code})), '%')
+        </if>
+        ORDER BY
+        gmt_modified DESC
+    </select>
 </mapper>