【制度查询】模块分页查询测试代码

ruoyi-zzb/src/main/java/com/ruoyi/zzb/zdcx/config/AutoPaginationInnerInterceptor.java

@@ -4,13 +4,11 @@ import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerIntercept
 import com.baomidou.mybatisplus.extension.plugins.pagination.DialectFactory;
 import com.baomidou.mybatisplus.extension.plugins.pagination.dialects.IDialect;
 import com.baomidou.mybatisplus.extension.toolkit.JdbcUtils;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.executor.Executor;
 
 /**
  * 配置动态数据库方言
  */
-@Slf4j
 public class AutoPaginationInnerInterceptor extends PaginationInnerInterceptor {
 
     @Override

ruoyi-zzb/src/main/java/com/ruoyi/zzb/zdcx/config/MyBatisPlusConfig.java

@@ -18,11 +18,11 @@ public class MyBatisPlusConfig {
     public MybatisPlusInterceptor mybatisPlusInterceptor() {
         MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
         // 分页插件
-        PaginationInnerInterceptor pi = new PaginationInnerInterceptor(DbType.ORACLE_12C);
+//        PaginationInnerInterceptor pi = new PaginationInnerInterceptor(DbType.ORACLE);
         // 设置最大查询数量，防止一次查询太多数据，给数据库压力过大
-        pi.setMaxLimit(1000L);
+//        pi.setMaxLimit(1000L);
         // 添加分页插件
-        interceptor.addInnerInterceptor(pi);
+        interceptor.addInnerInterceptor(new AutoPaginationInnerInterceptor());
         return interceptor;
     }
 

ruoyi-zzb/src/main/java/com/ruoyi/zzb/zdcx/controller/ZdcxController.java

@@ -4,13 +4,11 @@ import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.zzb.common.RspResult;
 import com.ruoyi.zzb.study.domain.BasePersonInfo;
 import com.ruoyi.zzb.zdcx.domain.Zdcx;
-import com.ruoyi.zzb.zdcx.dto.QueryParamsDTO;
 import com.ruoyi.zzb.zdcx.service.ZdcxService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import java.util.Date;
-import java.util.UUID;
 
 @Slf4j
 @RestController
@@ -21,20 +19,24 @@ public class ZdcxController {
     private ZdcxService zdcxService;
 
     /**
-     * 根据查询条件匹配一/多条制度信息
+     * 根据条件分页查询一/多条制度信息
      * @param zdcx
      * @return
      */
     @PostMapping("/query")
     public JSONObject query(@RequestBody Zdcx zdcx){
         if(null == zdcx.getQueryFlag()){
-            log.error("查询标志位非法");
-            return RspResult.error("查询标志位非法");
+            log.error("查询标志参数为空");
+            return RspResult.error("查询标志参数为空");
+        }
+        if(null == zdcx.getPageNo() || null == zdcx.getPageSize()){
+            log.error("分页查询参数非法");
+            return RspResult.error("分页查询参数非法");
         }
         try {
             return RspResult.success(zdcxService.getDataByPage(zdcx));
         }catch (Exception e){
-            log.error("条件查询制度信息发生异常", e);
+            log.error("根据条件分页查询制度信息发生异常", e);
             return RspResult.error(e.getMessage());
         }
     }
@@ -46,9 +48,14 @@ public class ZdcxController {
      */
     @PostMapping("/save")
     public JSONObject save(@RequestBody JSONObject reqBody){
-        //根据警号查询当前用户信息
-        BasePersonInfo basePersonInfo = zdcxService.getDataByParams(reqBody.getString("policeNo"));
-        boolean flag = zdcxService.insert(reqBody, basePersonInfo);
+        String policeNo = reqBody.getString("policeNo");
+        if(StringUtils.isBlank(policeNo)){
+            log.error("用户警号参数为空");
+            return RspResult.error("用户警号参数为空");
+        }
+        // 根据警号查询当前登录用户信息，警号为前端传入
+        BasePersonInfo basePersonInfo = zdcxService.getDataByParams(policeNo);
+        boolean flag = zdcxService.insertStandardInfo(reqBody, basePersonInfo);
         if(flag){
             return RspResult.success();
         }

ruoyi-zzb/src/main/java/com/ruoyi/zzb/zdcx/domain/Zdcx.java

@@ -61,6 +61,7 @@ public class Zdcx {
     private Integer isDelete;
     @TableField("FLAG")
     private Integer flag;
+
     private Integer pageNo;
     private Integer pageSize;
     private Integer queryFlag;

ruoyi-zzb/src/main/java/com/ruoyi/zzb/zdcx/mapper/ZdcxMapper.java

@@ -17,11 +17,11 @@ public interface ZdcxMapper extends BaseMapper<Zdcx> {
 //    @Select("select * from ( select row_.*, rownum rownum_ from ( select * from STANDARD_DOC_INFO ) row_ where rownum <= #{pageNo} * #{pageSize} ) a where rownum_ > ( #{pageNo} - 1) * #{pageSize}")
 //    List<Zdcx> getDataByPage(@Param("pageNo") Integer pageNo, @Param("pageSize") Integer PageSize);
 
-    /**带参数查询制度规范信息*/
-    List<Zdcx> getDataByPage(Zdcx zdcx);
+    /**按照条件查询制度信息*/
+//    List<Zdcx> getDataByPage(Zdcx zdcx);
 
-    /**带参数查询制度规范信息总数据条数*/
-    Long getDataCount(Zdcx zdcx);
+    /**按照参数查询制度信息总数据条数*/
+//    Long getDataCount(Zdcx zdcx);
 
 
 

ruoyi-zzb/src/main/java/com/ruoyi/zzb/zdcx/service/ZdcxService.java

@@ -2,6 +2,8 @@ package com.ruoyi.zzb.zdcx.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.zzb.study.domain.BasePersonInfo;
@@ -9,6 +11,7 @@ import com.ruoyi.zzb.study.mapper.BasePersonInfoMapper;
 import com.ruoyi.zzb.zdcx.domain.Zdcx;
 import com.ruoyi.zzb.zdcx.mapper.ZdcxMapper;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -24,16 +27,22 @@ public class ZdcxService {
     @Autowired
     private BasePersonInfoMapper basePersonInfoMapper;
 
+    /**
+     * 根据条件分页查询制度信息
+     * @param zdcx
+     * @return
+     */
     public Map<String, Object> getDataByPage(Zdcx zdcx){
         Map<String, Object> rspMap = new HashMap<>();
-        /*String docId = reqBody.getString("docId");
-        String title = reqBody.getString("title");
-        String zhidingDept = reqBody.getString("zhidingDept");
-        String createTime = reqBody.getString("createTime");
-        String content = reqBody.getString("content");
-        Integer queryFlag = reqBody.getInteger("queryFlag");
-        Integer pageNo = reqBody.getInteger("pageNo");
-        Integer pageSize = reqBody.getInteger("pageSize");
+        String docId = zdcx.getDocId();
+        String title = zdcx.getTitle();
+        String publishDept = zdcx.getPublishDept();
+        String createTime = zdcx.getCreateTime();
+        String content = zdcx.getContent();
+        // 查询标志位  0：and，1：or
+        Integer queryFlag = zdcx.getQueryFlag();
+        Integer pageNo = zdcx.getPageNo();
+        Integer pageSize = zdcx.getPageSize();
 
         QueryWrapper<Zdcx> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("FLAG", 1);
@@ -44,19 +53,19 @@ public class ZdcxService {
             queryWrapper.eq("DOC_ID", docId);
         }
         if(StringUtils.isNotBlank(title)){
-            if (queryFlag != 0){              // or
+            if (queryFlag != 0){
                 queryWrapper.or();
             }
             queryWrapper.eq("TITLE", title);
         }
-        if(StringUtils.isNotBlank(zhidingDept)){
-            if (queryFlag != 0){              // or
+        if(StringUtils.isNotBlank(publishDept)){
+            if (queryFlag != 0){
                 queryWrapper.or();
             }
-            queryWrapper.eq("ZHIDINGDEPT", zhidingDept);
+            queryWrapper.eq("PUBLISH_DEPT", publishDept);
         }
         if(StringUtils.isNotBlank(content)){
-            if (queryFlag != 0){              // or
+            if (queryFlag != 0){
                 queryWrapper.or();
             }
             queryWrapper.like("CONTENT", content);
@@ -64,30 +73,53 @@ public class ZdcxService {
         Page<Zdcx> page = new Page<>(pageNo, pageSize);
         IPage<Zdcx> zdcxPage = zdcxMapper.selectPage(page, queryWrapper);
         rspMap.put("list", zdcxPage.getRecords());
-        rspMap.put("count", zdcxPage.getTotal());*/
+        rspMap.put("count", zdcxPage.getTotal());
 
-        List<Zdcx> dataList = zdcxMapper.getDataByPage(zdcx);
+        /*List<Zdcx> dataList = zdcxMapper.getDataByPage(zdcx);
         Long count = zdcxMapper.getDataCount(zdcx);
         rspMap.put("list", dataList);
-        rspMap.put("count", count);
+        rspMap.put("count", count);*/
         return rspMap;
     }
 
+    /**
+     * 根据警号查询当前用户信息
+     * @param policeNo
+     * @return
+     */
     public BasePersonInfo getDataByParams(String policeNo){
         QueryWrapper<BasePersonInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("POLICE_NO", policeNo);
         return basePersonInfoMapper.selectOne(queryWrapper);
     }
 
-    public boolean insert(JSONObject reqBody, BasePersonInfo basePersonInfo){
+    /**
+     * 根据参数保存一条制度规范信息
+     * @param reqBody
+     * @param basePersonInfo
+     * @return
+     */
+    public boolean insertStandardInfo(JSONObject reqBody, BasePersonInfo basePersonInfo){
         Zdcx zdcx = new Zdcx();
+        // 制度信息
         zdcx.setId(UUID.randomUUID().toString().replace("-", ""));
+        zdcx.setDocId(reqBody.getString("docId"));
+        zdcx.setTitle(reqBody.getString("title"));
+        zdcx.setPublishDept(reqBody.getString("publishDept"));
+        zdcx.setContent(reqBody.getString("content"));
         zdcx.setIsDelete(0);
         zdcx.setFlag(1);
-        // ......
+        // 录入人信息
+        zdcx.setCreateUserId(basePersonInfo.getUserId());
+        zdcx.setCreateUserName(basePersonInfo.getName());
+        zdcx.setCreateUserPoliceNo(basePersonInfo.getPoliceNo());
+        zdcx.setCreateDeptName(basePersonInfo.getDeptName());
+        zdcx.setCreateDeptCode(basePersonInfo.getDeptCode());
+        zdcx.setCreateParentDeptName(basePersonInfo.getParentDeptName());
+        zdcx.setCreateParentDeptCode(basePersonInfo.getParentDeptCode());
         try {
-            int rows = zdcxMapper.insert(zdcx);
-            if (rows > 0) {
+            if (zdcxMapper.insert(zdcx) > 0) {
+                log.info("制度规范信息保存成功");
                 return true;
             }
         }catch (Exception e){

ruoyi-zzb/src/main/resources/mapper/ZdcxMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.zzb.zdcx.mapper.ZdcxMapper">
 
-	<resultMap id="ZdcxResultMap" type="Zdcx" >
+	<!--<resultMap id="ZdcxResultMap" type="Zdcx" >
 		<id property="id" jdbcType="VARCHAR" column="id"/>
 		<result property="docId" jdbcType="VARCHAR" column="DOC_ID"/>
 		<result property="title" jdbcType="VARCHAR" column="TITLE"/>
@@ -22,8 +22,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="flag" jdbcType="INTEGER" column="FLAG"/>
 	</resultMap>
 
-	<select id="getDataByPage" parameterType="Map" resultMap="ZdcxResultMap">
-		select * from ( select t.*, rownum rownum_ from (select DOC_ID, TITLE, PUBLISH_DEPT, CONTENT, CREATE_TIME from 'STANDARD_DOC_INFO'
+	<select id="getDataByPage" parameterType="Zdcx" resultMap="ZdcxResultMap">
+		select * from (select t.*, rownum rownum_ from (select DOC_ID, TITLE, PUBLISH_DEPT, CONTENT, CREATE_TIME from 'STANDARD_DOC_INFO'
 		<where>
 		    1 = 1
 			<if test="queryFlag == 0 and docId != null">
@@ -83,18 +83,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				or content like #{content}
 			</if>
 		</where>
-	</select>
-
-
-
-
-
-
-
-
-
-
-
-
+	</select>-->
 
 </mapper>