来宜人员修改

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

@@ -9,6 +9,7 @@ import com.boman.domain.Czrk;
 import com.boman.domain.TableDataInfo;
 import com.boman.domain.dto.AjaxResult;
 import com.boman.web.core.domain.AccountingData;
+import com.boman.web.core.domain.ToQianshanPersonner;
 import com.boman.web.core.domain.vo.AccountingDataVo;
 import com.boman.web.core.service.TaskService;
 import com.boman.web.core.service.accounting.IAccountingDataService;
@@ -57,19 +58,6 @@ public class AccountingDataController extends BaseController {
         return getDataTable(list);
     }
 
-    /***
-     * 潜山来宜人员数据
-     * @param rc
-     * @param djsjqs
-     * @param djsjjs
-     * @param name
-     * @param sfzhm
-     * @return
-     */
-    @GetMapping("/toQianshan")
-    public AjaxResult toQianshan(String rc, String djsjqs, String djsjjs, String name, String sfzhm) {
-        return accountingDataService.toQianshan(rc,djsjqs,djsjjs,name,sfzhm);
-    }
 
     /**
      *  核酸数据导出(户籍)

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

@@ -1,12 +1,19 @@
 package com.boman.web.core.controller;
 
 import com.boman.common.core.web.controller.BaseController;
+import com.boman.domain.TableDataInfo;
+import com.boman.domain.dto.AjaxResult;
+import com.boman.web.core.domain.ToQianshanPersonner;
+import com.boman.web.core.domain.vo.AccountingDataVo;
 import com.boman.web.core.service.toQianShan.ToQianshanPersonnerService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
 
 
 @RestController
@@ -18,6 +25,16 @@ public class ToQianshanPersonnerController extends BaseController {
     private ToQianshanPersonnerService toQianshanPersonnerService;
 
 
+    /***
+     * 潜山来宜人员数据
+     * @return
+     */
+    @GetMapping("/toQianshan")
+    public TableDataInfo toQianshan(ToQianshanPersonner toQianshanPersonner) {
+
+        List<Map<String,Object>> list = toQianshanPersonnerService.toQianshan(toQianshanPersonner);
+        return getDataTable(list);
+    }
 
 
 }

boman-web-core/src/main/java/com/boman/web/core/domain/ToQianshanPersonner.java

@@ -3,6 +3,8 @@ package com.boman.web.core.domain;
 
 import com.boman.domain.BaseEntity;
 
+import java.util.Map;
+
 public class ToQianshanPersonner  extends BaseEntity {
 
   /***
@@ -85,6 +87,17 @@ public class ToQianshanPersonner  extends BaseEntity {
    */
   private String hiDestinationArea;
 
+  /***
+   * 开始时间
+   */
+  private String startTime;
+
+
+  /***
+   * 结束时间
+   */
+  private String endTime;
+
 
 
   public long getId() {
@@ -226,4 +239,20 @@ public class ToQianshanPersonner  extends BaseEntity {
   public void setHiName(String hiName) {
     this.hiName = hiName;
   }
+
+  public void setStartTime(String startTime) {
+    this.startTime = startTime;
+  }
+
+  public void setEndTime(String endTime) {
+    this.endTime = endTime;
+  }
+
+  public String getStartTime() {
+    return startTime;
+  }
+
+  public String getEndTime() {
+    return endTime;
+  }
 }

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

@@ -3,7 +3,12 @@ package com.boman.web.core.mapper;
 
 import com.boman.web.core.domain.ToQianshanPersonner;
 
+import java.util.List;
+import java.util.Map;
+
 public interface ToQianshanPersonnerMapper {
 
     void insertToQianshanPersonner(ToQianshanPersonner toQianshanPersonner);
+
+    List<Map<String, Object>> toQianshanList(ToQianshanPersonner toQianshanPersonner);
 }

boman-web-core/src/main/java/com/boman/web/core/service/TaskService.java

@@ -924,10 +924,9 @@ public class TaskService {
     }
 
     public void upStarTime(String starTim) {
-        redisService.setCacheObject("startTime", starTim);
+        redisService.setCacheObject("toQianShanStartTime", starTim);
     }
 
-
     /**
      * 新增
      *

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

@@ -22,6 +22,7 @@ import com.boman.domain.dto.AjaxResult;
 import com.boman.system.api.RemoteDeptService;
 import com.boman.web.core.domain.AccountingData;
 import com.boman.web.core.domain.TSampling514;
+import com.boman.web.core.domain.ToQianshanPersonner;
 import com.boman.web.core.domain.vo.AccountingDataVo;
 import com.boman.web.core.mapper.AccountingDataMapper;
 import com.boman.web.core.mapper.CzrkMapper;
@@ -184,73 +185,6 @@ public class AccountingDataServiceImpl implements IAccountingDataService {
         return accountingDataList;
     }
 
-    @Override
-    public AjaxResult toQianshan(String rc, String djsjqs, String djsjjs, String name, String sfzhm) {
-
-        djsjqs = djsjqs.replace(" ", "%20");
-        djsjjs = djsjjs.replace(" ", "%20");
-
-        //查询前先获取tocken
-        String access_token = null;
-        Map<String, String> paramMapT = new HashMap<>();
-        paramMapT.put("client_id", "acdf50bd13be4901b64c62b1fee862c0");
-        paramMapT.put("client_secret", "a3650d67fc034b2d8ea259182b3d99f3");
-        String httpt = "http://60.171.171.235:9090/oauth/token";
-        try {
-            String datas = HttpClientUtils.doGet(httpt, paramMapT);
-            JSONObject jsonT = JSON.parseObject(datas);
-            access_token = (String) jsonT.get("access_token");
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-
-        Map<String, String> paramMap = new HashMap<>();
-        String http = null;
-        //当区划为空的时候根据姓名，身份证查询
-        if (StringUtils.isNotEmpty(sfzhm)) {
-            //潜山来宜人员数据(姓名 身份证 时间段)
-            paramMap.put("client_id", "acdf50bd13be4901b64c62b1fee862c0");
-            paramMap.put("access_token", access_token);
-            paramMap.put("name", name);
-            paramMap.put("sfzhm", sfzhm);
-            paramMap.put("djsjqs", djsjqs);
-            paramMap.put("djsjjs", djsjjs);
-
-            http = "http://60.171.171.235:9090/service/api/rkk/qslyrysjcx";
-        } else {
-            //潜山来宜人员数据(区划 时间段)
-            paramMap.put("client_id", "acdf50bd13be4901b64c62b1fee862c0");
-            paramMap.put("access_token", access_token);
-            if (StringUtils.isEmpty(rc)) {
-                rc = "潜山市";
-            }
-            paramMap.put("rc", rc);
-            paramMap.put("djsjqs", djsjqs);
-            paramMap.put("djsjjs", djsjjs);
-
-            http = "http://60.171.171.235:9090/service/api/rkk/qslyrysj";
-        }
-
-        try {
-            if (StringUtils.isEmpty(http)) {
-                return AjaxResult.error("参数错误");
-            }
-            String data = HttpClientUtils.doGet(http, paramMap);
-
-            //List list = new ArrayList();
-            List<JSONObject> list = JSON.parseArray(data, JSONObject.class);
-            for (JSONObject jsonObject : list) {
-                jsonObject.put("SFZ_ID",jsonObject.get("hi_icd"));
-            }
-
-            return AjaxResult.success("数据返回成功", list);
-        } catch (IOException e) {
-            e.printStackTrace();
-            return AjaxResult.error("数据返回失败");
-        }
-    }
-
 
     @Override
     public AccountingDataVo getAccountingDataOne() {

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

@@ -3,6 +3,7 @@ package com.boman.web.core.service.accounting;
 import com.boman.domain.dto.AjaxResult;
 import com.boman.web.core.domain.AccountingData;
 import com.boman.web.core.domain.TSampling514;
+import com.boman.web.core.domain.ToQianshanPersonner;
 import com.boman.web.core.domain.vo.AccountingDataVo;
 
 import java.io.IOException;
@@ -34,11 +35,10 @@ public interface IAccountingDataService {
      */
     List<AccountingDataVo> getExportHj(AccountingDataVo accountingData);
 
-    AjaxResult toQianshan(String rc, String djsjqs, String djsjjs, String name, String sfzhm);
 
     /**
      * 插入数据
-     * @param accountingDataVoList
+     * @param
      * @return
      */
     //int insertAccountingData(List<AccountingDataVo> accountingDataVoList);

boman-web-core/src/main/java/com/boman/web/core/service/toQianShan/ToQianshanPersonnerService.java

@@ -1,11 +1,15 @@
 package com.boman.web.core.service.toQianShan;
 
+import com.boman.domain.dto.AjaxResult;
 import com.boman.web.core.domain.ToQianshanPersonner;
 
 import java.util.List;
+import java.util.Map;
 
 public interface ToQianshanPersonnerService {
 
+    List<Map<String,Object>> toQianshan(ToQianshanPersonner toQianshanPersonner);
+
 
     void insertToQianshanPersonner(List<ToQianshanPersonner> list);
 }

boman-web-core/src/main/java/com/boman/web/core/service/toQianShan/ToQianshanPersonnerServiceImpl.java

@@ -1,13 +1,21 @@
 package com.boman.web.core.service.toQianShan;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.boman.common.core.utils.StringUtils;
+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.Czrk;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.web.core.domain.ToQianshanPersonner;
 import com.boman.web.core.domain.vo.AccountingDataVo;
 import com.boman.web.core.mapper.AccountingDataMapper;
 import com.boman.web.core.mapper.CzrkMapper;
 import com.boman.web.core.mapper.StandardlyMapper;
 import com.boman.web.core.mapper.ToQianshanPersonnerMapper;
+import com.boman.web.core.utils.HttpClientUtils;
+import com.github.pagehelper.PageHelper;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
@@ -15,7 +23,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 
 @Service
@@ -30,6 +41,91 @@ public class ToQianshanPersonnerServiceImpl implements ToQianshanPersonnerServic
     @Resource
     private CzrkMapper czrkMapper;
 
+
+    @Override
+    public List<Map<String,Object>> toQianshan(ToQianshanPersonner toQianshanPersonner) {
+        startPage();
+        List<Map<String, Object>> qianShanMap = toQianshanPersonnerMapper.toQianshanList(toQianshanPersonner);
+        return qianShanMap;
+    }
+
+
+
+
+        /*djsjqs = djsjqs.replace(" ", "%20");
+        djsjjs = djsjjs.replace(" ", "%20");
+
+        //查询前先获取tocken
+        String access_token = null;
+        Map<String, String> paramMapT = new HashMap<>();
+        paramMapT.put("client_id", "acdf50bd13be4901b64c62b1fee862c0");
+        paramMapT.put("client_secret", "a3650d67fc034b2d8ea259182b3d99f3");
+        String httpt = "http://60.171.171.235:9090/oauth/token";
+        try {
+            String datas = HttpClientUtils.doGet(httpt, paramMapT);
+            JSONObject jsonT = JSON.parseObject(datas);
+            access_token = (String) jsonT.get("access_token");
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+
+        Map<String, String> paramMap = new HashMap<>();
+        String http = null;
+        //当区划为空的时候根据姓名，身份证查询
+        if (StringUtils.isNotEmpty(sfzhm)) {
+            //潜山来宜人员数据(姓名 身份证 时间段)
+            paramMap.put("client_id", "acdf50bd13be4901b64c62b1fee862c0");
+            paramMap.put("access_token", access_token);
+            paramMap.put("name", name);
+            paramMap.put("sfzhm", sfzhm);
+            paramMap.put("djsjqs", djsjqs);
+            paramMap.put("djsjjs", djsjjs);
+
+            http = "http://60.171.171.235:9090/service/api/rkk/qslyrysjcx";
+        } else {
+            //潜山来宜人员数据(区划 时间段)
+            paramMap.put("client_id", "acdf50bd13be4901b64c62b1fee862c0");
+            paramMap.put("access_token", access_token);
+            if (StringUtils.isEmpty(rc)) {
+                rc = "潜山市";
+            }
+            paramMap.put("rc", rc);
+            paramMap.put("djsjqs", djsjqs);
+            paramMap.put("djsjjs", djsjjs);
+
+            http = "http://60.171.171.235:9090/service/api/rkk/qslyrysj";
+        }
+
+        try {
+            if (StringUtils.isEmpty(http)) {
+                return AjaxResult.error("参数错误");
+            }
+            String data = HttpClientUtils.doGet(http, paramMap);
+
+            //List list = new ArrayList();
+            List<JSONObject> list = JSON.parseArray(data, JSONObject.class);
+            for (JSONObject jsonObject : list) {
+                jsonObject.put("SFZ_ID",jsonObject.get("hi_icd"));
+            }
+
+            return AjaxResult.success("数据返回成功", list);
+        } catch (IOException e) {
+            e.printStackTrace();
+            return AjaxResult.error("数据返回失败");
+        }*/
+
+    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);
+        }
+    }
+
+
     @Override
     public void insertToQianshanPersonner(List<ToQianshanPersonner> list) {
         SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false);

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

@@ -66,6 +66,20 @@
             sysdate()
         </trim>
     </insert>
+    <select id="toQianshanList" resultType="java.util.Map">
+        select hi_adress,risk_lv,address,QU,sex,hi_name,hi_destination_street,FXDJ_LY,hi_destination_rc,hi_phone,hi_date,hi_icd as SFZ_ID,SHI,SHENG,hi_destination_area
+        from to_qianshan_personner
+        <where>
+            1=1
+            and DATE_FORMAT(hi_date,'%Y-%m-%d %H:%i:%s') &gt;= DATE_FORMAT(#{startTime},'%Y-%m-%d %H:%i:%s')
+            and DATE_FORMAT(hi_date,'%Y-%m-%d %H:%i:%s') &lt;= DATE_FORMAT(#{endTime},'%Y-%m-%d %H:%i:%s')
+
+            <if test="hiIcd != null  and hiIcd != ''">and hi_icd = #{hiIcd}</if>
+            <if test="hiName != null  and hiName != ''">and hi_name like concat(#{hiName}, '%')</if>
+            <if test="hiDestinationRc != null  and hiDestinationRc != ''">and hi_destination_rc like concat('%', #{hiDestinationRc}, '%')</if>
+        </where>
+        ORDER BY hi_date DESC
+    </select>
 
 
 </mapper>