Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
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
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
36eb09d1
Commit
36eb09d1
authored
Apr 18, 2024
by
zhangkuo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复 18305 【web端-设备列表】逆变器列表,所属电站取值不对的问题
parent
fea573c4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
GoodWeDataAcquisitionServiceImpl.java
...i/face/service/impl/GoodWeDataAcquisitionServiceImpl.java
+6
-1
No files found.
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/GoodWeDataAcquisitionServiceImpl.java
View file @
36eb09d1
...
@@ -3,10 +3,12 @@ package com.yeejoin.amos.api.householdapi.face.service.impl;
...
@@ -3,10 +3,12 @@ package com.yeejoin.amos.api.householdapi.face.service.impl;
import
cn.hutool.core.bean.BeanUtil
;
import
cn.hutool.core.bean.BeanUtil
;
import
cn.hutool.core.date.DatePattern
;
import
cn.hutool.core.date.DatePattern
;
import
cn.hutool.core.date.DateUtil
;
import
cn.hutool.core.date.DateUtil
;
import
cn.hutool.core.util.ObjectUtil
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.toolkit.ObjectUtils
;
import
com.baomidou.mybatisplus.core.toolkit.ObjectUtils
;
import
com.baomidou.mybatisplus.core.toolkit.StringUtils
;
import
com.google.common.collect.Lists
;
import
com.google.common.collect.Lists
;
import
com.qiniu.util.Json
;
import
com.qiniu.util.Json
;
import
com.yeejoin.amos.api.householdapi.Utils.GoodWeRequestUtil
;
import
com.yeejoin.amos.api.householdapi.Utils.GoodWeRequestUtil
;
...
@@ -388,6 +390,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
...
@@ -388,6 +390,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
requestInfo
.
put
(
"page_index"
,
1
);
requestInfo
.
put
(
"page_index"
,
1
);
requestInfo
.
put
(
"page_size"
,
100
);
requestInfo
.
put
(
"page_size"
,
100
);
requestInfo
.
put
(
"pw_id"
,
stationId
);
requestInfo
.
put
(
"pw_id"
,
stationId
);
JpStation
jpStation
=
jpStationMapper
.
selectOne
(
new
QueryWrapper
<
JpStation
>().
eq
(
"third_station_id"
,
stationId
).
orderByDesc
(
"create_time"
));
String
requstParam
=
JSON
.
toJSONString
(
requestInfo
);
String
requstParam
=
JSON
.
toJSONString
(
requestInfo
);
List
<
GoodWeINverterDetailDto
>
inverterDetailDtoList
=
goodWeRequestUtil
.
getResPonse
(
GoodWeConstant
.
queryInventerUrl
List
<
GoodWeINverterDetailDto
>
inverterDetailDtoList
=
goodWeRequestUtil
.
getResPonse
(
GoodWeConstant
.
queryInventerUrl
,
GoodWeConstant
.
requestPost
,
requstParam
,
GoodWeConstant
.
resovleRule_data_list
,
GoodWeINverterDetailDto
.
class
);
,
GoodWeConstant
.
requestPost
,
requstParam
,
GoodWeConstant
.
resovleRule_data_list
,
GoodWeINverterDetailDto
.
class
);
...
@@ -407,7 +410,9 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
...
@@ -407,7 +410,9 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
jpInverter
.
setCapacity
(
goodWeINverterDetailDto
.
getIt_capacity
());
jpInverter
.
setCapacity
(
goodWeINverterDetailDto
.
getIt_capacity
());
jpInverter
.
setThirdStationId
(
goodWeINverterDetailDto
.
getPw_id
());
jpInverter
.
setThirdStationId
(
goodWeINverterDetailDto
.
getPw_id
());
jpInverter
.
setThirdCode
(
PVProducerInfoEnum
.
GDW
.
getCode
());
jpInverter
.
setThirdCode
(
PVProducerInfoEnum
.
GDW
.
getCode
());
jpInverter
.
setStationName
(
goodWeINverterDetailDto
.
getIt_name
());
if
(
ObjectUtil
.
isNotEmpty
(
jpStation
)
&&
StringUtils
.
isNotEmpty
(
jpStation
.
getName
())){
jpInverter
.
setStationName
(
jpStation
.
getName
());
}
jpInverter
.
setRecDate
(
new
Date
());
jpInverter
.
setRecDate
(
new
Date
());
if
(!
org
.
springframework
.
util
.
ObjectUtils
.
isEmpty
(
jpInverter
.
getSequenceNbr
()))
{
if
(!
org
.
springframework
.
util
.
ObjectUtils
.
isEmpty
(
jpInverter
.
getSequenceNbr
()))
{
jpInverterMapper
.
updateById
(
jpInverter
);
jpInverterMapper
.
updateById
(
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