fix 新增每10分钟抓取一次核酸数据

boman-web-core/src/main/java/com/boman/web/core/controller/AccountingDataController.java

@@ -41,13 +41,22 @@ public class AccountingDataController extends BaseController {
      *  潜山核酸数据列表页(根据户籍地)
      * @return
      */
-    @PostMapping("/nucleicAcid/hj")
-    public TableDataInfo nucleicAcidHj(@RequestBody AccountingDataVo accountingData) {
-        startPage();
+    @GetMapping("/nucleicAcid/hj")
+    public TableDataInfo nucleicAcidHj( AccountingDataVo accountingData) {
         List<AccountingDataVo> list = accountingDataService.nucleicAcidHJList(accountingData);
         return getDataTable(list);
     }
 
+    /***
+     *  潜山核酸数据列表页(根据居住地址)
+     * @return
+     */
+    @GetMapping("/nucleicAcid/jzdz")
+    public TableDataInfo nucleicAcidJzdz( AccountingDataVo accountingData) {
+        List<AccountingDataVo> list = accountingDataService.nucleicAcidJzdzList(accountingData);
+        return getDataTable(list);
+    }
+
     /***
      * 潜山来宜人员数据
      * @param rc
@@ -78,17 +87,6 @@ public class AccountingDataController extends BaseController {
         util.exportExcel(response, accountingDataList, "核酸数据");
     }
 
-    /***
-     *  潜山核酸数据列表页(根据居住地址)
-     * @return
-     */
-    @PostMapping("/nucleicAcid/jzdz")
-    public TableDataInfo nucleicAcidJzdz(@RequestBody AccountingDataVo accountingData) {
-        startPage();
-        List<AccountingDataVo> list = accountingDataService.nucleicAcidJzdzList(accountingData);
-        return getDataTable(list);
-    }
-
     @GetMapping("/nucleicAcid/zz")
     public void nucleicAci() {
         taskService.insertAccountingData();

boman-web-core/src/main/java/com/boman/web/core/mapper/AccountingDataMapper.java

@@ -16,7 +16,6 @@ import java.util.List;
  * @author tjf
  * @Date: 2022/05/13/10:27
  */
-@Mapper
 public interface AccountingDataMapper {
     /**
      *潜山核酸数据列表页(根据户籍地)

boman-web-core/src/main/java/com/boman/web/core/service/accounting/AccountingDataServiceImpl.java

@@ -7,6 +7,9 @@ package com.boman.web.core.service.accounting;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.boman.common.core.exception.BaseException;
+import com.boman.common.core.utils.sql.SqlUtil;
+import com.boman.common.core.web.page.PageDomain;
+import com.boman.common.core.web.page.TableSupport;
 import com.boman.domain.*;
 import com.alibaba.fastjson.JSON;
 import com.boman.common.core.utils.DateUtils;
@@ -22,6 +25,7 @@ import com.boman.web.core.mapper.CzrkMapper;
 import com.boman.web.core.utils.*;
 import com.boman.web.core.utils.AuthUtils;
 import com.boman.web.core.utils.CzrkUtils;
+import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
@@ -82,12 +86,8 @@ public class AccountingDataServiceImpl implements IAccountingDataService {
 
         //设置查询列表权限
         setQueryRole(accountingData, sysUser, Czrk.HJ);
+        startPage();
         List<AccountingDataVo> list = accountingDataMapper.selectAccountingDataHjList(accountingData);
-        list.forEach(e -> {
-            if (StringUtils.isNotBlank(e.getJcsj())) {
-                e.setIsNucleicAcid("Y");
-            }
-        });
         CzrkUtils.packAddrNucleicAcid(list);
         return list;
     }
@@ -116,11 +116,22 @@ public class AccountingDataServiceImpl implements IAccountingDataService {
         }
         //设置查询列表权限
         setQueryRole(accountingData, sysUser, Czrk.CZ);
+        startPage();
         List<AccountingDataVo> list = accountingDataMapper.selectAccountingDataJzdzList(accountingData);
         CzrkUtils.packAddrNucleicAcid(list);
         return list;
     }
 
+    private void startPage() {
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) {
+            String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
+            PageHelper.startPage(pageNum, pageSize, orderBy);
+        }
+    }
+
     /**
      * 核酸数据导出
      *

boman-web-core/src/main/resources/mapper/AccountingDateMapper.xml

@@ -65,11 +65,10 @@
         <where>
             r.is_del = 'N'
             and r.status = '1'
-            and d.is_del = 'N'
             <if test="zjhm != null  and zjhm != ''">and r.id_card = #{zjhm}</if>
             <if test="xm != null  and xm != ''">and r.user_name like concat(#{xm}, '%')</if>
-            <if test="params.startTime != null  and params.startTime != ''">and DATE_FORMAT(d.cjsj,'%Y-%m-%d %H:%i:%s') &gt;= DATE_FORMAT(#{params.startTime},'%Y-%m-%d %H:%i:%s')</if>
-            <if test="params.endTime != null  and params.endTime != ''">and DATE_FORMAT(d.cjsj,'%Y-%m-%d %H:%i:%s') &lt;= DATE_FORMAT(#{params.endTime},'%Y-%m-%d %H:%i:%s')</if>
+            <if test="params.startTime != null  and params.startTime != '' and params.startTime != 'null'">and DATE_FORMAT(d.cjsj,'%Y-%m-%d %H:%i:%s') &gt;= DATE_FORMAT(#{params.startTime},'%Y-%m-%d %H:%i:%s')</if>
+            <if test="params.endTime != null  and params.endTime != ''  and params.endTime != 'null'">and DATE_FORMAT(d.cjsj,'%Y-%m-%d %H:%i:%s') &lt;= DATE_FORMAT(#{params.endTime},'%Y-%m-%d %H:%i:%s')</if>
             <if test="isNucleicAcid != null  and isNucleicAcid != ''">and r.is_nucleicAcid = #{isNucleicAcid}</if>
             <if test="provinceId != null  and provinceId != ''">and r.province_id = #{provinceId}</if>
             <if test="cityId != null  and cityId != ''">and r.city_id = #{cityId}</if>
@@ -89,11 +88,10 @@
         <where>
             r.is_del = 'N'
             and r.status = '1'
-            and d.is_del = 'N'
             <if test="zjhm != null  and zjhm != ''">and r.id_card = #{zjhm}</if>
             <if test="xm != null  and xm != ''">and r.user_name like concat(#{xm}, '%')</if>
-            <if test="params.startTime != null  and params.startTime != ''">and DATE_FORMAT(d.cjsj,'%Y-%m-%d %H:%i:%s') &gt;= DATE_FORMAT(#{params.startTime},'%Y-%m-%d %H:%i:%s')</if>
-            <if test="params.endTime != null  and params.endTime != ''">and DATE_FORMAT(d.cjsj,'%Y-%m-%d %H:%i:%s') &lt;= DATE_FORMAT(#{params.endTime},'%Y-%m-%d %H:%i:%s')</if>
+            <if test="params.startTime != null  and params.startTime != '' and params.startTime != 'null'">and DATE_FORMAT(d.cjsj,'%Y-%m-%d %H:%i:%s') &gt;= DATE_FORMAT(#{params.startTime},'%Y-%m-%d %H:%i:%s')</if>
+            <if test="params.endTime != null  and params.endTime != '' and params.endTime != 'null'">and DATE_FORMAT(d.cjsj,'%Y-%m-%d %H:%i:%s') &lt;= DATE_FORMAT(#{params.endTime},'%Y-%m-%d %H:%i:%s')</if>
             <if test="isNucleicAcid != null  and isNucleicAcid != ''">and r.is_nucleicAcid = #{isNucleicAcid}</if>
             <if test="provinceIdXjd != null and provinceIdXjd != ''">and z.province_id = #{provinceIdXjd}</if>
             <if test="cityIdXjd != null and cityIdXjd != ''">and z.city_id = #{cityIdXjd}</if>