From 708d988ac1a4f4b91d744955bfc4f905ac7d4de7 Mon Sep 17 00:00:00 2001 From: ljf Date: Mon, 29 Apr 2024 11:00:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shuili-admin/pom.xml | 8 +- .../kms/web/synchronous/YgSynchronous.java | 88 ++++++++++++------- .../com/kms/yg/dd/domain/AttDiscBase.java | 1 + .../com/kms/yg/xgxd/domain/AttDpdsBase.java | 6 +- 4 files changed, 67 insertions(+), 36 deletions(-) diff --git a/shuili-admin/pom.xml b/shuili-admin/pom.xml index 0070776b..373d16b1 100644 --- a/shuili-admin/pom.xml +++ b/shuili-admin/pom.xml @@ -87,6 +87,12 @@ plexus-component-annotations 1.6 + + org.apache.maven.plugins + maven-assembly-plugin + 3.0.0 + + @@ -119,7 +125,7 @@ maven-assembly-plugin - 2.4 + 3.0.0 ${project.name} false diff --git a/shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java b/shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java index 6ebe6309..e3b3c967 100644 --- a/shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java +++ b/shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java @@ -1,6 +1,7 @@ package com.kms.web.synchronous; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; @@ -18,6 +19,8 @@ import com.kms.yg.sk.service.AttResBaseService; import com.kms.yg.sk.service.AttResRsppService; import com.kms.yg.xgxd.domain.AttDpdsBase; import com.kms.yg.xgxd.service.AttDpdsBaseService; +import io.swagger.models.auth.In; +import lombok.Data; import org.apache.commons.lang.SerializationUtils; import org.checkerframework.checker.units.qual.A; import org.springframework.beans.factory.annotation.Autowired; @@ -29,12 +32,11 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; @Configuration @@ -81,39 +83,59 @@ public class YgSynchronous { static final String xgxdsj = "http://19.25.35.205:31190/ZHSL_ZY/jck/yggx/dws_att_dpds_base" ; //流域基本数据 static final String llsj = "http://19.25.35.205:31190/ZHSL_ZY/jck/ytjgx/dws_att_bas_base" ; + // /** * 同步 */ - @GetMapping("sktz1") - public void synchronous(){ - int pageNum = 1; - int pageSize = 1000; - Boolean f = true; - while (f) { - String s = sendRequest(ddsj + "?pageNum=" + pageNum + "&pageSize=" + pageSize); - String data = JSONObject.parseObject(s).getString("data"); - List attResRspps = JSONObject.parseArray(data, AttDiscBase.class); - if (attResRspps.size() hashMap = new HashMap<>(); +// int i = 1; +// while (f) { +// String s = sendRequest(ddsj + "?pageNum=" + pageNum + "&pageSize=" + pageSize); +// String data = JSONObject.parseObject(s).getString("data"); +// List attResRspps = JSONObject.parseArray(data, AttDiscBase.class); +// if(attResRspps.size() attDiscBases = CollectionUtil.newCopyOnWriteArrayList(attResRspps); +//// executorService.execute(new sktz(attResRspps)); +// pageNum++; +// } +// } + + @Data + class sktz implements Runnable{ + + private List list; + + public sktz(List list){ + this.list = list; + } + + @Override + public void run() { + int a = 1; + for (AttDiscBase attDiscBase : list) { + attDiscBase.preInsert(); +// attResRspp.setId(attResRspp.getDiscCode()); + boolean save = attDiscBaseService.save(attDiscBase); + if(save){ + System.out.println(a++); + if(a>=1000){ + System.out.println("批量处理完成1000条------------------------------------"); + } } } - Runnable runnable = new Runnable() { - @Override - public void run() { - List attDiscBases = new ArrayList(); - synchronized (attResRspps){ - attDiscBases = CollectionUtil.newCopyOnWriteArrayList(attResRspps); - } - attDiscBases.forEach(attResRspp -> { - attResRspp.preInsert(); - attResRspp.setId(attResRspp.getDiscCode()); - attDiscBaseService.save(attResRspp); - }); - } - }; - executorService.execute(runnable); } } @@ -249,4 +271,6 @@ public class YgSynchronous { attBasBaseService.saveOrUpdate(attResRspp); }); } + + } diff --git a/shuili-system/src/main/java/com/kms/yg/dd/domain/AttDiscBase.java b/shuili-system/src/main/java/com/kms/yg/dd/domain/AttDiscBase.java index 9648b637..770ad9d5 100644 --- a/shuili-system/src/main/java/com/kms/yg/dd/domain/AttDiscBase.java +++ b/shuili-system/src/main/java/com/kms/yg/dd/domain/AttDiscBase.java @@ -7,6 +7,7 @@ import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; /** diff --git a/shuili-system/src/main/java/com/kms/yg/xgxd/domain/AttDpdsBase.java b/shuili-system/src/main/java/com/kms/yg/xgxd/domain/AttDpdsBase.java index c2d80be8..40d7e82e 100644 --- a/shuili-system/src/main/java/com/kms/yg/xgxd/domain/AttDpdsBase.java +++ b/shuili-system/src/main/java/com/kms/yg/xgxd/domain/AttDpdsBase.java @@ -67,17 +67,17 @@ public class AttDpdsBase extends BaseEntity /** 出险数量 */ @Excel(name = "出险数量") @ApiModelProperty("出险数量") - private Long dangNum; + private String dangNum; /** $column.columnComment */ @Excel(name = "出险数量") @ApiModelProperty("出险数量") - private Long dpdsStarNum; + private String dpdsStarNum; /** 桩号 */ @Excel(name = "桩号") @ApiModelProperty("桩号") - private Long dpdsEndNum; + private String dpdsEndNum; /** 长度 */ @Excel(name = "长度")