Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-zx-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Jobs
Commits
Open sidebar
项目统一框架
一体化_户用光伏项目代码
amos-boot-zx-biz
Commits
9bfb81c7
Commit
9bfb81c7
authored
May 24, 2024
by
wujiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改采集问题
parent
8f3f8ec6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
7 deletions
+5
-7
ImasterUtils.java
...com/yeejoin/amos/api/householdapi/Utils/ImasterUtils.java
+0
-0
KsolarRequestUtil.java
...eejoin/amos/api/householdapi/Utils/KsolarRequestUtil.java
+1
-1
GoodWeDataAcquisitionServiceImpl.java
...i/face/service/impl/GoodWeDataAcquisitionServiceImpl.java
+2
-2
SunlightServiceImpl.java
...i/householdapi/face/service/impl/SunlightServiceImpl.java
+2
-4
No files found.
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/Utils/ImasterUtils.java
View file @
9bfb81c7
This diff is collapsed.
Click to expand it.
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/Utils/KsolarRequestUtil.java
View file @
9bfb81c7
...
...
@@ -70,7 +70,7 @@ public class KsolarRequestUtil {
String
url
=
KSolarConstant
.
baseurl
+
apiurl
;
respone
=
sendRequest
(
requestMethod
,
url
,
requestParmInfo
,
headMap
);
jsonArray
=
handlerResponseByResultResolverule
(
ResultResolveRule
,
respone
);
log
.
info
(
"原始数据:{}"
,
jsonArray
);
//
log.info("原始数据:{}", jsonArray);
if
(!
ObjectUtils
.
isEmpty
(
jsonArray
))
{
result
=
JSONArray
.
parseArray
(
jsonArray
.
toJSONString
(),
tClass
);
}
...
...
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/GoodWeDataAcquisitionServiceImpl.java
View file @
9bfb81c7
...
...
@@ -320,7 +320,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
@Async
public
void
stationDetail
()
{
long
ts
=
System
.
currentTimeMillis
();
logger
.
info
(
"-------固德威同步场站
和告警
开始"
+
ts
+
"------- "
+
sdf
.
format
(
new
Date
()));
logger
.
info
(
"-------固德威同步场站
详情
开始"
+
ts
+
"------- "
+
sdf
.
format
(
new
Date
()));
List
<
String
>
stationIds
=
goodWeStationMonitorListMapper
.
getStationIds
();
stationIds
.
forEach
(
stationId
->
{
HashMap
<
String
,
Object
>
requestInfo
=
new
HashMap
<>();
...
...
@@ -349,7 +349,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
});
}
});
logger
.
info
(
"-------固德威同步场站
和告警
结束"
+
ts
+
"------- "
+
sdf
.
format
(
new
Date
()));
logger
.
info
(
"-------固德威同步场站
详情
结束"
+
ts
+
"------- "
+
sdf
.
format
(
new
Date
()));
}
@Override
...
...
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/SunlightServiceImpl.java
View file @
9bfb81c7
...
...
@@ -495,10 +495,8 @@ public class SunlightServiceImpl implements SunlightService {
if
(
device
!=
null
)
{
// 获取逆变器信息存库
JpInverter
jpInverter
=
jpInverterMapper
.
selectOne
(
new
QueryWrapper
<
JpInverter
>().
eq
(
"third_station_id"
,
device
.
getPs_id
().
toString
())
.
eq
(
"third_code"
,
PVProducerInfoEnum
.
YG
.
getCode
())
.
eq
(
"ID"
,
device
.
getUuid
().
toString
()));
new
QueryWrapper
<
JpInverter
>().
eq
(
"sn_code"
,
device
.
getDevice_sn
().
toString
())
.
eq
(
"third_code"
,
PVProducerInfoEnum
.
YG
.
getCode
()));
if
(
ObjectUtils
.
isEmpty
(
jpInverter
))
{
jpInverter
=
new
JpInverter
();
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment