From f33cf34f0eca98e815016cc54233262d980dfc09 Mon Sep 17 00:00:00 2001 From: hcc Date: Mon, 15 Jul 2024 15:35:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 2 +- .../basepro-manager-web/src/main/resources/application-dev.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/basepro-manager/basepro-manager-service/src/main/resources/application-dev.yml b/basepro-manager/basepro-manager-service/src/main/resources/application-dev.yml index 5bda0c3..be4daea 100644 --- a/basepro-manager/basepro-manager-service/src/main/resources/application-dev.yml +++ b/basepro-manager/basepro-manager-service/src/main/resources/application-dev.yml @@ -8,7 +8,7 @@ spring: datasource: username: root password: root - 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 driver-class-name: com.mysql.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource devtools: diff --git a/basepro-manager/basepro-manager-web/src/main/resources/application-dev.yml b/basepro-manager/basepro-manager-web/src/main/resources/application-dev.yml index 2bb1ce7..0f0ec48 100644 --- a/basepro-manager/basepro-manager-web/src/main/resources/application-dev.yml +++ b/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 # 从库数据源 From 1530b2e63b02744600a23b327b8e1f4171e25cd0 Mon Sep 17 00:00:00 2001 From: hcc Date: Mon, 15 Jul 2024 17:31:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9F=A5=E8=8E=B7=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=92=8C=E7=9F=9B=E7=9B=BE=E7=BA=A0=E7=BA=B7=E5=85=A52?= =?UTF-8?q?=E5=BA=93=EF=BC=8C5=E5=88=86=E9=92=9F=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E6=8A=BD=E6=9F=A5=E8=8E=B7=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/mapper/TbChryxxbMapper.java | 2 ++ .../mybatis/mapper/TbChryxxbMapper.xml | 7 +++- .../manager/service/ITbChryxxbService.java | 4 +++ .../manager/service/ITbMdjfjxxxbService.java | 3 ++ .../java/basepro/manager/pojo/TbChryxxb.java | 6 ++-- .../service/impl/TbChryxxbServiceImpl.java | 17 ++++++++++ .../service/impl/TbMdjfjxxxbServiceImpl.java | 32 +++++++++++++++++-- .../manager/controller/InsertChryTask.java | 22 ++++++------- .../controller/TbChryxxbController.java | 5 +++ .../controller/TbMdjfjxxxbController.java | 7 +++- 10 files changed, 85 insertions(+), 20 deletions(-) diff --git a/basepro-manager/basepro-manager-dao/src/main/java/basepro/manager/mapper/TbChryxxbMapper.java b/basepro-manager/basepro-manager-dao/src/main/java/basepro/manager/mapper/TbChryxxbMapper.java index 3dc4b5f..a81cb03 100644 --- a/basepro-manager/basepro-manager-dao/src/main/java/basepro/manager/mapper/TbChryxxbMapper.java +++ b/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(); /** * 查询检查站查获人员信息列表 diff --git a/basepro-manager/basepro-manager-dao/src/main/resources/mybatis/mapper/TbChryxxbMapper.xml b/basepro-manager/basepro-manager-dao/src/main/resources/mybatis/mapper/TbChryxxbMapper.xml index efd0026..935a2f1 100644 --- a/basepro-manager/basepro-manager-dao/src/main/resources/mybatis/mapper/TbChryxxbMapper.xml +++ b/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} + @@ -73,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into tb_chryxxb + id, HCRYBH, XZQHDM, XZQHMC, @@ -85,6 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" HCRYLB, + #{id}, #{HCRYBH}, #{XZQHDM}, #{XZQHMC}, diff --git a/basepro-manager/basepro-manager-interface/src/main/java/basepro/manager/service/ITbChryxxbService.java b/basepro-manager/basepro-manager-interface/src/main/java/basepro/manager/service/ITbChryxxbService.java index 1ad0a57..e3d5053 100644 --- a/basepro-manager/basepro-manager-interface/src/main/java/basepro/manager/service/ITbChryxxbService.java +++ b/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); /** * 删除检查站查获人员信息 diff --git a/basepro-manager/basepro-manager-interface/src/main/java/basepro/manager/service/ITbMdjfjxxxbService.java b/basepro-manager/basepro-manager-interface/src/main/java/basepro/manager/service/ITbMdjfjxxxbService.java index 54b9f76..5858863 100644 --- a/basepro-manager/basepro-manager-interface/src/main/java/basepro/manager/service/ITbMdjfjxxxbService.java +++ b/basepro-manager/basepro-manager-interface/src/main/java/basepro/manager/service/ITbMdjfjxxxbService.java @@ -38,6 +38,8 @@ public interface ITbMdjfjxxxbService */ public int insertTbMdjfjxxxb(TbMdjfjxxxb tbMdjfjxxxb); + public int insertTbMdjfjxxxbGs(TbMdjfjxxxb tbMdjfjxxxb); + /** * 修改矛盾纠纷简项信息 * @@ -45,6 +47,7 @@ public interface ITbMdjfjxxxbService * @return 结果 */ public int updateTbMdjfjxxxb(TbMdjfjxxxb tbMdjfjxxxb); + public int updateTbMdjfjxxxbGs(TbMdjfjxxxb tbMdjfjxxxb); /** * 批量删除矛盾纠纷简项信息 diff --git a/basepro-manager/basepro-manager-pojo/src/main/java/basepro/manager/pojo/TbChryxxb.java b/basepro-manager/basepro-manager-pojo/src/main/java/basepro/manager/pojo/TbChryxxb.java index 95ba7ac..0d40c36 100644 --- a/basepro-manager/basepro-manager-pojo/src/main/java/basepro/manager/pojo/TbChryxxb.java +++ b/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; } diff --git a/basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbChryxxbServiceImpl.java b/basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbChryxxbServiceImpl.java index a5fb618..71b94b3 100644 --- a/basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbChryxxbServiceImpl.java +++ b/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); + } /** * 删除检查站查获人员信息对象 diff --git a/basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbMdjfjxxxbServiceImpl.java b/basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbMdjfjxxxbServiceImpl.java index de0a661..b050099 100644 --- a/basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbMdjfjxxxbServiceImpl.java +++ b/basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbMdjfjxxxbServiceImpl.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.UUID; import basepro.manager.common.utils.DateUtils; +import basepro.manager.config.DataSourceUtil; import basepro.manager.mapper.TbMdjfjxxxbMapper; import basepro.manager.pojo.TbMdjfjxxxb; import basepro.manager.pojo.TbXjxdzhxxb; @@ -68,8 +69,6 @@ public class TbMdjfjxxxbServiceImpl implements ITbMdjfjxxxbService @Override public int insertTbMdjfjxxxb(TbMdjfjxxxb tbMdjfjxxxb) { - UUID uuid = UUID.randomUUID(); - tbMdjfjxxxb.setMdjfbh(uuid.toString()); try { tbMdjfjxxxb.setFssj(DateUtils.parseDate(tbMdjfjxxxb.getFssjStr(),"yyyy-MM-dd HH:mm:ss")); tbMdjfjxxxb.setDjsj(DateUtils.parseDate(tbMdjfjxxxb.getDjsjStr(),"yyyy-MM-dd HH:mm:ss")); @@ -78,7 +77,19 @@ public class TbMdjfjxxxbServiceImpl implements ITbMdjfjxxxbService }catch (Exception e){ e.printStackTrace(); } - + return tbMdjfjxxxbMapper.insertTbMdjfjxxxb(tbMdjfjxxxb); + } + public int insertTbMdjfjxxxbGs(TbMdjfjxxxb tbMdjfjxxxb) + { + DataSourceUtil.setDB("db2"); + try { + 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(); + } return tbMdjfjxxxbMapper.insertTbMdjfjxxxb(tbMdjfjxxxb); } @@ -99,6 +110,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); } diff --git a/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/InsertChryTask.java b/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/InsertChryTask.java index 9f91785..cffd129 100644 --- a/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/InsertChryTask.java +++ b/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 = "0 0 1 * * ?") // 每天凌晨1点执行异一次 + @Scheduled(cron = "4 11/5 * ? * *") // 每5分钟执行一次 +// @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); - - List chryxxbList = tbChryxxbService.selectTbChryxxbListFromTbCheckPerson(yesterday.toString()); + Date maxDate = tbChryxxbService.selectMaxJcsj(); + System.out.println("数据库最大时间："+formatter.format(maxDate)); + List chryxxbList = tbChryxxbService.selectTbChryxxbListFromTbCheckPerson(formatter.format(maxDate)); +// List 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); } } diff --git a/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/TbChryxxbController.java b/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/TbChryxxbController.java index b8cf3b4..d048bfe 100644 --- a/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/TbChryxxbController.java +++ b/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)); } diff --git a/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/TbMdjfjxxxbController.java b/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/TbMdjfjxxxbController.java index 51bb1c0..01533cd 100644 --- a/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/TbMdjfjxxxbController.java +++ b/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/TbMdjfjxxxbController.java @@ -1,6 +1,7 @@ package basepro.manager.controller; import java.util.List; +import java.util.UUID; import basepro.manager.common.annotation.DataScope; import basepro.manager.common.utils.poi.ExcelUtil; @@ -85,7 +86,7 @@ public class TbMdjfjxxxbController extends BaseController } /** - * 新增保存矛盾纠纷简项信息 + * 新增保存矛盾纠纷简项信息fe2a6503-9b6e-4c36-a147-6961514ca185 */ @RequiresPermissions("system:mdjfjxxxb:add") // @Log(title = "矛盾纠纷简项信息", businessType = BusinessType.INSERT) @@ -93,6 +94,9 @@ public class TbMdjfjxxxbController extends BaseController @ResponseBody public AjaxResult addSave(TbMdjfjxxxb tbMdjfjxxxb) { + String uuid = UUID.randomUUID().toString(); + tbMdjfjxxxb.setMdjfbh(uuid); + tbMdjfjxxxbService.insertTbMdjfjxxxbGs(tbMdjfjxxxb); return toAjax(tbMdjfjxxxbService.insertTbMdjfjxxxb(tbMdjfjxxxb)); } @@ -116,6 +120,7 @@ public class TbMdjfjxxxbController extends BaseController @ResponseBody public AjaxResult editSave(TbMdjfjxxxb tbMdjfjxxxb) { + tbMdjfjxxxbService.updateTbMdjfjxxxbGs(tbMdjfjxxxb); return toAjax(tbMdjfjxxxbService.updateTbMdjfjxxxb(tbMdjfjxxxb)); }