From e007c949767cac878faff8e2de0cd1f7b0b90760 Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Mon, 19 Jun 2023 20:25:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 6 +
.../controller/DataImportController.java | 61 ++-
.../IPowerDistributionareaService.java | 6 +-
.../PowerDistributionareaServiceImpl.java | 366 ++++++++++--------
4 files changed, 256 insertions(+), 183 deletions(-)
diff --git a/pom.xml b/pom.xml
index f143831..fa2e47d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,6 +130,12 @@
3.0.10
+
+ org.joda.time
+ joda-time
+ 2.9.9
+
+
com.njcn
common-db
diff --git a/src/main/java/com/njcn/syncdata/controller/DataImportController.java b/src/main/java/com/njcn/syncdata/controller/DataImportController.java
index 38b4527..e704001 100644
--- a/src/main/java/com/njcn/syncdata/controller/DataImportController.java
+++ b/src/main/java/com/njcn/syncdata/controller/DataImportController.java
@@ -1,17 +1,22 @@
package com.njcn.syncdata.controller;
import com.alibaba.fastjson.JSONArray;
+import com.njcn.syncdata.pojo.po.AdsAstXbjcptGetFctgDi;
+import com.njcn.syncdata.pojo.po.PWFeederLinePSR;
import com.njcn.syncdata.pojo.po.PWOPTransformerPSR;
+import com.njcn.syncdata.pojo.po.Substation;
import com.njcn.syncdata.service.IPowerDistributionareaService;
import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@RestController
+@Slf4j
@RequestMapping("/dataImport")
@RequiredArgsConstructor
public class DataImportController {
@@ -20,52 +25,78 @@ public class DataImportController {
/**
* 登录获取token
+ *
* @return
*/
@GetMapping("/token")
- public String token(){
+ public String token() {
return service.LoginToken();
}
/**
* 获取数据中台数据
+ *
* @return
*/
@GetMapping("/getAdsList")
- public String adsList(){
+ public List adsList() {
return service.adsList();
}
/**
- * 获取数据中台返回体
- * @param token
+ * 获取业务中台返回体
+ *
* @param psrType
* @param fieldName
* @param fieldValue
* @return
*/
@GetMapping("/getResource")
- public Map getResource(String token,String psrType, String fieldName,String fieldValue){
- return service.getResourceData(token,psrType,100,fieldName,fieldValue);
+ public Map getResource(String psrType, String fieldName, String fieldValue) {
+ return service.getResourceData(service.LoginToken(), psrType, 100, fieldName, fieldValue);
}
/**
- * 获取数据中台返回数据
- * @param token
+ * 获取业务中台返回数据
+ *
* @param psrType
* @param fieldName
* @param fieldValue
* @return
*/
@GetMapping("/getResourceData")
- public List getResourceData(String token,String psrType, String fieldName,String fieldValue){
- Map map = service.getResourceData(token, psrType,100, fieldName, fieldValue);
+ public List getResourceData(String psrType, String fieldName, String fieldValue) {
+ Map map = service.getResourceData(service.LoginToken(), psrType, 100, fieldName, fieldValue);
List data = JSONArray.parseArray(JSONArray.toJSONString(map.get("result")), PWOPTransformerPSR.class);
return data;
}
- @GetMapping("/insertData")
- public String getResourceData(){
- String s = service.insertData();
+
+ @GetMapping("/getResourceTest")
+ public List getResourceTest(Integer type, String fieldValue) {
+ List> aas = new ArrayList<>();
+ if (type == 1) {
+ Map transformerData = service.getResourceData(service.LoginToken(), "PWOPTransformerPSR", 100, "ACCOUNT_ID", fieldValue);
+ aas = JSONArray.parseArray(JSONArray.toJSONString(transformerData.get("result")), PWOPTransformerPSR.class);
+ } else if (type == 2) {
+ Map feederLineData = service.getResourceData(service.LoginToken(), "PWFeederLinePSR", 100, "ID", fieldValue);
+ aas = JSONArray.parseArray(JSONArray.toJSONString(feederLineData.get("result")), PWFeederLinePSR.class);
+ //查询变电站
+ } else {
+ Map substationData = service.getResourceData(service.LoginToken(), "Substation", 100, "ID", fieldValue);
+ aas = JSONArray.parseArray(JSONArray.toJSONString(substationData.get("result")), Substation.class);
+ }
+ return aas;
+ }
+
+ @PostMapping("/insertData")
+ public String insertData() {
+ String s = service.insertData(1);
+ return s;
+ }
+
+ @PostMapping("/insertDataTest")
+ public String insertDataTest() {
+ String s = service.insertData(0);
return s;
}
}
\ No newline at end of file
diff --git a/src/main/java/com/njcn/syncdata/service/IPowerDistributionareaService.java b/src/main/java/com/njcn/syncdata/service/IPowerDistributionareaService.java
index 9e9263c..72ff6a3 100644
--- a/src/main/java/com/njcn/syncdata/service/IPowerDistributionareaService.java
+++ b/src/main/java/com/njcn/syncdata/service/IPowerDistributionareaService.java
@@ -1,8 +1,10 @@
package com.njcn.syncdata.service;
import com.njcn.db.service.IReplenishMybatisService;
+import com.njcn.syncdata.pojo.po.AdsAstXbjcptGetFctgDi;
import com.njcn.syncdata.pojo.po.PowerDistributionarea;
+import java.util.List;
import java.util.Map;
/**
@@ -25,7 +27,7 @@ public interface IPowerDistributionareaService extends IReplenishMybatisService<
* 获取数据中台数据
* @return
*/
- String adsList();
+ List adsList();
/**
* 通用资源数据中台数据查询
@@ -37,5 +39,5 @@ public interface IPowerDistributionareaService extends IReplenishMybatisService<
*/
Map getResourceData(String token,String psrType,Integer num, String fieldName,String fieldValue);
- String insertData();
+ String insertData(Integer type);
}
diff --git a/src/main/java/com/njcn/syncdata/service/impl/PowerDistributionareaServiceImpl.java b/src/main/java/com/njcn/syncdata/service/impl/PowerDistributionareaServiceImpl.java
index 8e89c88..cc339c4 100644
--- a/src/main/java/com/njcn/syncdata/service/impl/PowerDistributionareaServiceImpl.java
+++ b/src/main/java/com/njcn/syncdata/service/impl/PowerDistributionareaServiceImpl.java
@@ -2,6 +2,9 @@ package com.njcn.syncdata.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.ListUtil;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -17,6 +20,7 @@ import com.njcn.syncdata.pojo.po.*;
import com.njcn.syncdata.service.IPowerDistributionareaService;
import com.njcn.syncdata.utils.RestTemplateUtil;
import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.apache.http.Header;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
@@ -24,8 +28,6 @@ import org.apache.http.client.methods.HttpRequestBase;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import org.springframework.web.util.UriComponentsBuilder;
@@ -46,10 +48,10 @@ import java.util.stream.Collectors;
* @since 2022-10-14
*/
@Service
+@Slf4j
@RequiredArgsConstructor
public class PowerDistributionareaServiceImpl extends ReplenishMybatisServiceImpl implements IPowerDistributionareaService {
- private static Logger logger = LoggerFactory.getLogger(PowerDistributionareaServiceImpl.class);
private final DictDataMapper dictDataMapper;
@Override
@@ -71,7 +73,7 @@ public class PowerDistributionareaServiceImpl extends ReplenishMybatisServiceImp
ResponseEntity