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
f359b5a3
Commit
f359b5a3
authored
Nov 15, 2023
by
chenzhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改代码
parent
cf29606c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
TdHYGFInverterYearGenerateMapper.xml
...rces/mapper/tdengine/TdHYGFInverterYearGenerateMapper.xml
+4
-4
JpInverterServiceImpl.java
...t/module/hygf/biz/service/impl/JpInverterServiceImpl.java
+3
-3
No files found.
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/TdHYGFInverterYearGenerateMapper.xml
View file @
f359b5a3
...
@@ -4,13 +4,13 @@
...
@@ -4,13 +4,13 @@
<select
id=
"selectYearTrend"
resultType=
"map"
>
<select
id=
"selectYearTrend"
resultType=
"map"
>
SELECT
SELECT
day_time as dayT
ime,
month_time as dayt
ime,
generate,
generate,
fullhour
fullhour
from
from
house_pv_data.td_hygf_inverter_year_generate
house_pv_data.td_hygf_inverter_year_generate
<where>
<where>
year_month
= #{time}
`year`
= #{time}
<if
test=
"snCode != null and snCode !=''"
>
<if
test=
"snCode != null and snCode !=''"
>
and sn_code = #{snCode}
and sn_code = #{snCode}
</if>
</if>
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
<select
id=
"selectTotalTrend"
resultType=
"map"
>
<select
id=
"selectTotalTrend"
resultType=
"map"
>
SELECT
SELECT
day
_time as dayTime,
year
_time as dayTime,
generate,
generate,
fullhour
fullhour
from
from
...
@@ -66,7 +66,7 @@
...
@@ -66,7 +66,7 @@
generate,
generate,
fullhour
fullhour
from
from
house_pv_data.td_hygf_inverter_
year
_generate
house_pv_data.td_hygf_inverter_
total
_generate
<where>
<where>
<if
test=
"time != null and time !=''"
>
<if
test=
"time != null and time !=''"
>
year_time = #{time}
year_time = #{time}
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/JpInverterServiceImpl.java
View file @
f359b5a3
...
@@ -258,7 +258,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
...
@@ -258,7 +258,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
Map
<
String
,
Object
>
map1
=
new
HashMap
<>();
Map
<
String
,
Object
>
map1
=
new
HashMap
<>();
map1
.
put
(
"name"
,
"发电量"
);
map1
.
put
(
"name"
,
"发电量"
);
map1
.
put
(
"unit"
,
"
K
w"
);
map1
.
put
(
"unit"
,
"
k
w"
);
map1
.
put
(
"data"
,
value1
);
map1
.
put
(
"data"
,
value1
);
yData
.
add
(
map1
);
yData
.
add
(
map1
);
Map
<
String
,
Object
>
map2
=
new
HashMap
<>();
Map
<
String
,
Object
>
map2
=
new
HashMap
<>();
...
@@ -285,7 +285,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
...
@@ -285,7 +285,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
Map
<
String
,
Object
>
map1
=
new
HashMap
<>();
Map
<
String
,
Object
>
map1
=
new
HashMap
<>();
map1
.
put
(
"name"
,
"发电量"
);
map1
.
put
(
"name"
,
"发电量"
);
map1
.
put
(
"unit"
,
"
K
w"
);
map1
.
put
(
"unit"
,
"
k
w"
);
map1
.
put
(
"data"
,
value1
);
map1
.
put
(
"data"
,
value1
);
yData
.
add
(
map1
);
yData
.
add
(
map1
);
Map
<
String
,
Object
>
map2
=
new
HashMap
<>();
Map
<
String
,
Object
>
map2
=
new
HashMap
<>();
...
@@ -312,7 +312,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
...
@@ -312,7 +312,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
Map
<
String
,
Object
>
map1
=
new
HashMap
<>();
Map
<
String
,
Object
>
map1
=
new
HashMap
<>();
map1
.
put
(
"name"
,
"发电量"
);
map1
.
put
(
"name"
,
"发电量"
);
map1
.
put
(
"unit"
,
"
K
w"
);
map1
.
put
(
"unit"
,
"
k
w"
);
map1
.
put
(
"data"
,
value1
);
map1
.
put
(
"data"
,
value1
);
yData
.
add
(
map1
);
yData
.
add
(
map1
);
Map
<
String
,
Object
>
map2
=
new
HashMap
<>();
Map
<
String
,
Object
>
map2
=
new
HashMap
<>();
...
...
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