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
0a82ac1c
Commit
0a82ac1c
authored
Jul 04, 2024
by
wujiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交level修改
parent
634a9939
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
7 deletions
+10
-7
MonitoringMapController.java
.../module/jxiop/biz/controller/MonitoringMapController.java
+1
-1
MonitorServiceImpl.java
...oot/module/jxiop/biz/service/impl/MonitorServiceImpl.java
+2
-1
MonitoringServiceImpl.java
.../module/jxiop/biz/service/impl/MonitoringServiceImpl.java
+3
-3
RegionServiceImpl.java
...boot/module/jxiop/biz/service/impl/RegionServiceImpl.java
+4
-2
No files found.
amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitoringMapController.java
View file @
0a82ac1c
...
...
@@ -276,7 +276,7 @@ public class MonitoringMapController extends BaseController {
ArrayList
<
String
>
stringArrayList
=
mapRegion
.
getProvince
();
//变量获取所有的场站信息
for
(
int
i
=
0
;
i
<
stringArrayList
.
size
();
i
++)
{
Region
region
=
regionMapper
.
selectOne
(
new
QueryWrapper
<
Region
>().
eq
(
"LEVEL_"
,
1
).
like
(
"REGION_NAME"
,
stringArrayList
.
get
(
i
)));
Region
region
=
regionMapper
.
selectOne
(
new
LambdaQueryWrapper
<
Region
>().
eq
(
Region:
:
getLevel
,
1
).
like
(
Region:
:
getRegionName
,
stringArrayList
.
get
(
i
)));
List
<
StationBasic
>
stationBasicList
=
stationBasicMapper
.
selectList
(
new
QueryWrapper
<
StationBasic
>().
like
(
"belong_area"
,
region
.
getRegionCode
()));
stationBasicListAll
.
addAll
(
stationBasicList
);
}
...
...
amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorServiceImpl.java
View file @
0a82ac1c
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jxiop
.
biz
.
service
.
impl
;
import
com.alibaba.fastjson.JSON
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
...
...
@@ -140,7 +141,7 @@ public class MonitorServiceImpl implements MonitorService {
*/
public
List
<
StationCacheInfoDto
>
getListStationCacheInfoDto
()
{
List
<
StationCacheInfoDto
>
stationCacheInfoDtos
=
new
ArrayList
<>();
List
<
Region
>
regionList
=
regionMapper
.
selectList
(
new
QueryWrapper
<
Region
>().
eq
(
"LEVEL_"
,
1
));
List
<
Region
>
regionList
=
regionMapper
.
selectList
(
new
LambdaQueryWrapper
<
Region
>().
eq
(
Region:
:
getLevel
,
1
));
List
<
MapRegion
>
mapRegionList
=
mapRegionMapper
.
selectList
(
new
QueryWrapper
<
MapRegion
>().
isNotNull
(
"name"
));
List
<
StationBasic
>
stationBasicList
=
stationBasicMapper
.
selectList
(
new
QueryWrapper
<
StationBasic
>().
isNotNull
(
"belong_area"
).
isNotNull
(
"fan_gateway_id"
));
for
(
int
i
=
0
;
i
<
stationBasicList
.
size
();
i
++)
{
...
...
amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitoringServiceImpl.java
View file @
0a82ac1c
...
...
@@ -421,7 +421,7 @@ public class MonitoringServiceImpl {
List
<
StationBasic
>
stationBasicList
=
stationBasicMapper
.
selectList
(
new
QueryWrapper
<
StationBasic
>().
isNotNull
(
"belong_area"
));
List
<
MapRegion
>
mapRegionList
=
mapRegionMapper
.
selectList
(
new
QueryWrapper
<
MapRegion
>().
isNotNull
(
"name"
));
List
<
Region
>
regionList
=
regionMapper
.
selectList
(
new
QueryWrapper
<
Region
>().
eq
(
"LEVEL"
,
1
));
List
<
Region
>
regionList
=
regionMapper
.
selectList
(
new
LambdaQueryWrapper
<
Region
>().
eq
(
Region:
:
getLevel
,
1
));
mapRegionList
.
forEach
(
mapRegion
->
{
MapAreaInfoDto
mapAreaInfoDto
=
new
MapAreaInfoDto
();
// 开始处理省份名称-三维与二维的名称有差异
...
...
@@ -772,7 +772,7 @@ public class MonitoringServiceImpl {
// 变量获取所有的场站信息
for
(
int
i
=
0
;
i
<
stringArrayList
.
size
();
i
++)
{
Region
region
=
regionMapper
.
selectOne
(
new
QueryWrapper
<
Region
>().
eq
(
"LEVEL_"
,
1
).
like
(
"REGION_NAME"
,
stringArrayList
.
get
(
i
)));
.
selectOne
(
new
LambdaQueryWrapper
<
Region
>().
eq
(
Region:
:
getLevel
,
1
).
like
(
Region:
:
getRegionName
,
stringArrayList
.
get
(
i
)));
List
<
StationBasic
>
stationBasicList
=
stationBasicMapper
.
selectList
(
new
QueryWrapper
<
StationBasic
>().
like
(
"belong_area"
,
region
.
getRegionCode
()));
stationBasicListAll
.
addAll
(
stationBasicList
);
...
...
@@ -1188,7 +1188,7 @@ public class MonitoringServiceImpl {
List
<
HashMap
<
String
,
Object
>>
hashMapList
=
new
ArrayList
<>();
List
<
StationBasic
>
stationBasicList
=
stationBasicMapper
.
selectList
(
new
QueryWrapper
<
StationBasic
>().
isNotNull
(
"belong_area"
).
isNotNull
(
"fan_gateway_id"
));
List
<
Region
>
regionList
=
this
.
regionMapper
.
selectList
(
new
QueryWrapper
<
Region
>().
eq
(
"level_"
,
1
));
List
<
Region
>
regionList
=
this
.
regionMapper
.
selectList
(
new
LambdaQueryWrapper
<
Region
>().
eq
(
Region:
:
getLevel
,
1
));
regionList
.
forEach
(
region
->
{
HashMap
<
String
,
Object
>
hashMap
=
new
HashMap
<>();
hashMap
.
put
(
"label"
,
region
.
getRegionName
());
...
...
amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/RegionServiceImpl.java
View file @
0a82ac1c
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jxiop
.
biz
.
service
.
impl
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yeejoin.amos.boot.module.jxiop.api.dto.RegionDto
;
...
...
@@ -34,10 +35,10 @@ public class RegionServiceImpl extends BaseService<RegionDto,Region,RegionMapper
}
public
Region
getRegionByRegionCode
(
String
regionCode
){
return
this
.
getOne
(
new
QueryWrapper
<
Region
>().
eq
(
"REGION_CODE"
,
regionCode
));
return
this
.
getOne
(
new
LambdaQueryWrapper
<
Region
>().
eq
(
Region:
:
getRegionCode
,
regionCode
));
}
//根据regionName获取regionCode
public
Region
getRegionCodeByRegionName
(
String
regionName
)
{
return
this
.
getOne
(
new
QueryWrapper
<
Region
>().
like
(
"REGION_NAME"
,
regionName
).
eq
(
"LEVEL"
,
1
));
return
this
.
getOne
(
new
LambdaQueryWrapper
<
Region
>().
like
(
Region:
:
getRegionName
,
regionName
).
eq
(
Region:
:
getLevel
,
1
));
}
}
\ No newline at end of file
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