Merge branch 'master' of http://git.helou.vip:8088/ly/ypc_manager

 Conflicts:

	basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbMdjfjxxxbServiceImpl.java

	basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/TbMdjfjxxxbController.java

basepro-manager/basepro-manager-dao/src/main/java/basepro/manager/mapper/TbChryxxbMapper.java

@@ -2,6 +2,7 @@ package basepro.manager.mapper;
 
 import basepro.manager.pojo.TbChryxxb;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -26,6 +27,7 @@ public interface TbChryxxbMapper
      * @return 检查站查获人员信息
      */
     public TbChryxxb selectTbChryxxbByHcrybh(String HCRYBH);
+    public Date selectMaxJcsj();
 
     /**
      * 查询检查站查获人员信息列表

basepro-manager/basepro-manager-dao/src/main/resources/mybatis/mapper/TbChryxxbMapper.xml

@@ -49,6 +49,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where HCRYBH = #{HCRYBH}
     </select>
 
+    <select id="selectMaxJcsj"  resultType="java.util.Date" >
+        select max(jcsj) from tb_chryxxb
+    </select>
 
     <select id="selectTbChryxxbListFromTbCheckPerson" parameterType="String" resultMap="TbChryxxbResult">
         SELECT HCRYBH, XZQHDM, GAJGDM, GAJGMC, JCZDM, JCZMC, JCSJ, ZJHM,HCRYLB FROM (
@@ -60,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 s.name as JCZMC,s.id,s.dept_id as GAJGDM,s.dept_name as GAJGMC FROM (
                 select p.sfz,p.people_status,p.check_time,p.police_id_card,p.point_x,p.point_y from `tb_check_person` p where p.point_x is not null and p.point_x != ''
                 and p.people_status != 0
-                and  DATE_FORMAT(p.check_time, '%Y-%m-%d') = DATE_FORMAT(#{date}, '%Y-%m-%d')
+                and  DATE_FORMAT(p.check_time, '%Y-%m-%d') > DATE_FORMAT(#{date}, '%Y-%m-%d')
                 ) t  inner join `tb_stuck` s   on (s.point_x = t.point_x and s.point_y = t.point_y)
         ) n order by n.JCSJ asc;
     </select>
@@ -73,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertTbChryxxb" parameterType="basepro.manager.pojo.TbChryxxb"  useGeneratedKeys="true" keyProperty="HCRYBH">
         insert into tb_chryxxb
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null  and id != ''">id,</if>
             <if test="HCRYBH != null  and HCRYBH != ''">HCRYBH,</if>
             <if test="XZQHDM != null  and XZQHDM != ''">XZQHDM,</if>
             <if test="XZQHMC != null  and XZQHMC != ''">XZQHMC,</if>
@@ -85,6 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="HCRYLB != null  and HCRYLB != ''">HCRYLB,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null  and id != ''">#{id},</if>
             <if test="HCRYBH != null  and HCRYBH != ''">#{HCRYBH},</if>
             <if test="XZQHDM != null  and XZQHDM != ''">#{XZQHDM},</if>
             <if test="XZQHMC != null  and XZQHMC != ''">#{XZQHMC},</if>

basepro-manager/basepro-manager-interface/src/main/java/basepro/manager/service/ITbChryxxbService.java

@@ -3,6 +3,7 @@ package basepro.manager.service;
 import basepro.manager.pojo.TbChryxxb;
 import guo.ping.e3mall.common.page.TableDataInfo;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -27,6 +28,7 @@ public interface ITbChryxxbService
      * @return 检查站查获人员信息
      */
     public TbChryxxb selectTbChryxxbByHcrybh(String HCRYBH);
+    public Date selectMaxJcsj();
 
     /**
      * 查询检查站查获人员信息列表
@@ -44,6 +46,7 @@ public interface ITbChryxxbService
      * @return 结果
      */
     public int insertTbChryxxb(TbChryxxb tbChryxxb);
+    public int insertTbChryxxbGs(TbChryxxb tbChryxxb);
 
     /**
      * 修改检查站查获人员信息
@@ -52,6 +55,7 @@ public interface ITbChryxxbService
      * @return 结果
      */
     public int updateTbChryxxb(TbChryxxb tbChryxxb);
+    public int updateTbChryxxbGs(TbChryxxb tbChryxxb);
 
     /**
      * 删除检查站查获人员信息

basepro-manager/basepro-manager-interface/src/main/java/basepro/manager/service/ITbMdjfjxxxbService.java

@@ -47,6 +47,7 @@ public interface ITbMdjfjxxxbService
      * @return 结果
      */
     public int updateTbMdjfjxxxb(TbMdjfjxxxb tbMdjfjxxxb);
+    public int updateTbMdjfjxxxbGs(TbMdjfjxxxb tbMdjfjxxxb);
 
     /**
      * 批量删除矛盾纠纷简项信息

basepro-manager/basepro-manager-pojo/src/main/java/basepro/manager/pojo/TbChryxxb.java

@@ -18,7 +18,7 @@ public class TbChryxxb extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    private Integer id;
+    private String id;
     /** 检查站核查人员编号 */
     @Excel(name = "检查站核查人员编号")
     private String HCRYBH;
@@ -73,11 +73,11 @@ public class TbChryxxb extends BaseEntity
     @Excel(name = "查获人员类别(1：抓获在逃人员，2：劝返涉访人员，3：其他)",readConverterExp = "1=抓获在逃人员,2=劝返涉访人员,3=其他")
     private String HCRYLB;
 
-    public Integer getId() {
+    public String getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(String id) {
         this.id = id;
     }
 

basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbChryxxbServiceImpl.java

@@ -1,7 +1,9 @@
 package basepro.manager.service.impl;
 
+import java.util.Date;
 import java.util.List;
 
+import basepro.manager.config.DataSourceUtil;
 import basepro.manager.mapper.TbChryxxbMapper;
 import basepro.manager.pojo.TbChryxxb;
 import basepro.manager.service.ITbChryxxbService;
@@ -46,6 +48,9 @@ public class TbChryxxbServiceImpl implements ITbChryxxbService
         return tbChryxxbMapper.selectTbChryxxbByHcrybh(HCRYBH);
     }
 
+    public Date selectMaxJcsj(){
+        return tbChryxxbMapper.selectMaxJcsj();
+    }
     /**
      * 查询检查站查获人员信息列表
      * 
@@ -77,6 +82,13 @@ public class TbChryxxbServiceImpl implements ITbChryxxbService
         return tbChryxxbMapper.insertTbChryxxb(tbChryxxb);
     }
 
+
+    public int insertTbChryxxbGs(TbChryxxb tbChryxxb)
+    {
+        DataSourceUtil.setDB("db2");
+        return tbChryxxbMapper.insertTbChryxxb(tbChryxxb);
+    }
+
     /**
      * 修改检查站查获人员信息
      * 
@@ -88,6 +100,11 @@ public class TbChryxxbServiceImpl implements ITbChryxxbService
     {
         return tbChryxxbMapper.updateTbChryxxb(tbChryxxb);
     }
+    public int updateTbChryxxbGs(TbChryxxb tbChryxxb)
+    {
+        DataSourceUtil.setDB("db2");
+        return tbChryxxbMapper.updateTbChryxxb(tbChryxxb);
+    }
 
     /**
      * 删除检查站查获人员信息对象

basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbMdjfjxxxbServiceImpl.java

@@ -11,7 +11,6 @@ import basepro.manager.pojo.TbXjxdzhxxb;
 import basepro.manager.service.ITbMdjfjxxxbService;
 import com.alibaba.dubbo.config.annotation.Service;
 import com.github.pagehelper.PageHelper;
-import guo.ping.e3mall.common.annotation.DataSource;
 import guo.ping.e3mall.common.page.TableDataInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import basepro.manager.common.core.text.Convert;
@@ -78,12 +77,10 @@ public class TbMdjfjxxxbServiceImpl implements ITbMdjfjxxxbService
         }catch (Exception e){
             e.printStackTrace();
         }
-
         return tbMdjfjxxxbMapper.insertTbMdjfjxxxb(tbMdjfjxxxb);
     }
-
+    public int insertTbMdjfjxxxbGs(TbMdjfjxxxb tbMdjfjxxxb)
-    @Override
+    {
-    public int insertTbMdjfjxxxbGs(TbMdjfjxxxb tbMdjfjxxxb) {
         DataSourceUtil.setDB("db2");
         try {
             tbMdjfjxxxb.setFssj(DateUtils.parseDate(tbMdjfjxxxb.getFssjStr(),"yyyy-MM-dd HH:mm:ss"));
@@ -114,6 +111,21 @@ public class TbMdjfjxxxbServiceImpl implements ITbMdjfjxxxbService
         }catch (Exception e){
             e.printStackTrace();
         }
+        tbMdjfjxxxbMapper.updateTbMdjfjxxxb(tbMdjfjxxxb);
+        return tbMdjfjxxxbMapper.updateTbMdjfjxxxb(tbMdjfjxxxb);
+    }
+    public int updateTbMdjfjxxxbGs(TbMdjfjxxxb tbMdjfjxxxb)
+    {
+        try {
+            DataSourceUtil.setDB("db2");
+            tbMdjfjxxxb.setFssj(DateUtils.parseDate(tbMdjfjxxxb.getFssjStr(),"yyyy-MM-dd HH:mm:ss"));
+            tbMdjfjxxxb.setDjsj(DateUtils.parseDate(tbMdjfjxxxb.getDjsjStr(),"yyyy-MM-dd HH:mm:ss"));
+            tbMdjfjxxxb.setTcsj(DateUtils.parseDate(tbMdjfjxxxb.getTcsjStr(),"yyyy-MM-dd HH:mm:ss"));
+            tbMdjfjxxxb.setJlgxsj(DateUtils.parseDate(tbMdjfjxxxb.getJlgxsjStr(),"yyyy-MM-dd HH:mm:ss"));
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        tbMdjfjxxxbMapper.updateTbMdjfjxxxb(tbMdjfjxxxb);
         return tbMdjfjxxxbMapper.updateTbMdjfjxxxb(tbMdjfjxxxb);
     }
 

basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/InsertChryTask.java

@@ -12,6 +12,7 @@ import java.time.LocalDate;
 import java.time.Month;
 import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 
 @Component
 public class InsertChryTask {
@@ -21,28 +22,25 @@ public class InsertChryTask {
     @Reference
     private ISysDictDataService sysDictDataService;
 
-//    @Scheduled(cron = "0 * * * * *") // 每分钟执行一次
+    @Scheduled(cron = "4 11/5 * ? * *") // 每5分钟执行一次
-    @Scheduled(cron = "0 0 1 * * ?") // 每天凌晨1点执行异一次
+//    @Scheduled(cron = "0 0 1 * * ?") // 每天凌晨1点执行异一次
     public void executeEveryMinute() {
-        /**
-         * 获取前一天的日期 LocalDate.now()——今天  minusDays(1)——减1天 默认格式：yyyy-MM-dd
-         */
-        LocalDate yesterday = LocalDate.now().minusDays(1);
-//        2021-03-07
-//        LocalDate specificDate = LocalDate.of(2021, Month.MARCH, 7);
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String now = formatter.format(new Date());
         System.out.println("抽取查获人员信息任务执行："+now);
-
+        Date maxDate = tbChryxxbService.selectMaxJcsj();
-        List<TbChryxxb> chryxxbList = tbChryxxbService.selectTbChryxxbListFromTbCheckPerson(yesterday.toString());
+        System.out.println("数据库最大时间："+formatter.format(maxDate));
+        List<TbChryxxb> chryxxbList = tbChryxxbService.selectTbChryxxbListFromTbCheckPerson(formatter.format(maxDate));
+//        List<TbChryxxb> chryxxbList = tbChryxxbService.selectTbChryxxbListFromTbCheckPerson("2021-07-04");
         if(chryxxbList!=null&&chryxxbList.size()>0){
             for (TbChryxxb tbChryxxb : chryxxbList) {
+                String uuid = UUID.randomUUID().toString();
+                tbChryxxb.setId(uuid);
                 String xzqhmc = sysDictDataService.selectDictLabel("anhui_code", tbChryxxb.getXZQHDM());
                 tbChryxxb.setXZQHMC(xzqhmc);
                 tbChryxxbService.insertTbChryxxb(tbChryxxb);
+                tbChryxxbService.insertTbChryxxbGs(tbChryxxb);
             }
         }
-
-        System.out.println("抽取查获人员信息任务执行完成："+chryxxbList);
     }
 }

basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/TbChryxxbController.java

@@ -5,6 +5,7 @@ import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 
 import basepro.manager.common.utils.poi.ExcelUtil;
 import basepro.manager.pojo.TbChryxxb;
@@ -94,6 +95,8 @@ public class TbChryxxbController extends BaseController
     @ResponseBody
     public AjaxResult addSave(TbChryxxb tbChryxxb)
     {
+        String uuid = UUID.randomUUID().toString();
+        tbChryxxb.setId(uuid);
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Calendar today = Calendar.getInstance();
         today.add(Calendar.DATE,-1);
@@ -105,6 +108,7 @@ public class TbChryxxbController extends BaseController
         }
         tbChryxxb.setJcsj(jcsj);
         int insertTbChryxxb = tbChryxxbService.insertTbChryxxb(tbChryxxb);
+        tbChryxxbService.insertTbChryxxbGs(tbChryxxb);
         return toAjax(insertTbChryxxb);
     }
 
@@ -149,6 +153,7 @@ public class TbChryxxbController extends BaseController
             throw new RuntimeException(e);
         }
         tbChryxxb.setJcsj(jcsj);
+        tbChryxxbService.updateTbChryxxbGs(tbChryxxb);
         return toAjax(tbChryxxbService.updateTbChryxxb(tbChryxxb));
     }
 

basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/TbMdjfjxxxbController.java

@@ -96,6 +96,7 @@ public class TbMdjfjxxxbController extends BaseController
     {
         String uuid = UUID.randomUUID().toString();
         tbMdjfjxxxb.setMdjfbh(uuid);
+        tbMdjfjxxxbService.insertTbMdjfjxxxbGs(tbMdjfjxxxb);
         return toAjax(tbMdjfjxxxbService.insertTbMdjfjxxxb(tbMdjfjxxxb));
     }
 
@@ -119,6 +120,7 @@ public class TbMdjfjxxxbController extends BaseController
     @ResponseBody
     public AjaxResult editSave(TbMdjfjxxxb tbMdjfjxxxb)
     {
+        tbMdjfjxxxbService.updateTbMdjfjxxxbGs(tbMdjfjxxxb);
         return toAjax(tbMdjfjxxxbService.updateTbMdjfjxxxb(tbMdjfjxxxb));
     }
 

basepro-manager/basepro-manager-web/src/main/resources/application-dev.yml

@@ -45,7 +45,7 @@ spring:
     druid:
         # 主库数据源
         master:
-            url: jdbc:mysql://192.168.0.112:3306/e3?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+            url: jdbc:mysql://192.168.0.107:3306/e3?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
             username: root
             password: root
         # 从库数据源