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
d994b4a5
Commit
d994b4a5
authored
Sep 20, 2023
by
tangwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
解决报错
parent
bf1a96c7
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
62 additions
and
19 deletions
+62
-19
JpInvertorElecHistoryAllDto.java
...boot/module/hygf/api/dto/JpInvertorElecHistoryAllDto.java
+2
-5
JpInvertorElecHistoryMonthDto.java
...ot/module/hygf/api/dto/JpInvertorElecHistoryMonthDto.java
+7
-6
JpInvertorElecHistoryYearDto.java
...oot/module/hygf/api/dto/JpInvertorElecHistoryYearDto.java
+1
-6
MonthPowerDto.java
.../yeejoin/amos/boot/module/hygf/api/dto/MonthPowerDto.java
+18
-0
IMonthPowerService.java
...amos/boot/module/hygf/api/service/IMonthPowerService.java
+5
-1
MonthPowerMapper.java
...boot/module/hygf/api/tdenginemapper/MonthPowerMapper.java
+3
-0
MonthPowerMapper.xml
...i/src/main/resources/mapper/tdengine/MonthPowerMapper.xml
+9
-0
JpStationController.java
.../boot/module/hygf/biz/controller/JpStationController.java
+1
-1
MonthPowerServiceImpl.java
...t/module/hygf/biz/service/impl/MonthPowerServiceImpl.java
+16
-0
No files found.
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/JpInvertorElecHistoryAllDto.java
View file @
d994b4a5
package
com
.
yeejoin
.
amos
.
boot
.
module
.
hygf
.
api
.
dto
;
package
com
.
yeejoin
.
amos
.
boot
.
module
.
hygf
.
api
.
dto
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
com.yeejoin.amos.boot.biz.common.dto.BaseDto
;
import
com.yeejoin.amos.boot.biz.common.dto.BaseDto
;
...
@@ -25,15 +26,13 @@ public class JpInvertorElecHistoryAllDto extends BaseDto {
...
@@ -25,15 +26,13 @@ public class JpInvertorElecHistoryAllDto extends BaseDto {
private
String
snCode
;
private
String
snCode
;
@ApiModelProperty
(
value
=
"U交流电压"
)
@ApiModelProperty
(
value
=
"U交流电压"
)
@TableField
(
"U_AC_voltage"
)
private
Double
uAcVoltage
;
private
Double
uAcVoltage
;
@ApiModelProperty
(
value
=
"V交流电压"
)
@ApiModelProperty
(
value
=
"V交流电压"
)
@TableField
(
"V_AC_voltage"
)
private
Double
vAcVoltage
;
private
Double
vAcVoltage
;
@ApiModelProperty
(
value
=
"W交流电压"
)
@ApiModelProperty
(
value
=
"W交流电压"
)
@TableField
(
"W_AC_voltage"
)
private
Double
wAcVoltage
;
private
Double
wAcVoltage
;
@ApiModelProperty
(
value
=
"U交流电流"
)
@ApiModelProperty
(
value
=
"U交流电流"
)
...
@@ -41,11 +40,9 @@ public class JpInvertorElecHistoryAllDto extends BaseDto {
...
@@ -41,11 +40,9 @@ public class JpInvertorElecHistoryAllDto extends BaseDto {
private
Double
uAcCurrent
;
private
Double
uAcCurrent
;
@ApiModelProperty
(
value
=
"V交流电流"
)
@ApiModelProperty
(
value
=
"V交流电流"
)
@TableField
(
"V_AC_current"
)
private
Double
vAcCurrent
;
private
Double
vAcCurrent
;
@ApiModelProperty
(
value
=
"W交流电流"
)
@ApiModelProperty
(
value
=
"W交流电流"
)
@TableField
(
"W_AC_current"
)
private
Double
wAcCurrent
;
private
Double
wAcCurrent
;
@ApiModelProperty
(
value
=
"第三方电站id"
)
@ApiModelProperty
(
value
=
"第三方电站id"
)
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/JpInvertorElecHistoryMonthDto.java
View file @
d994b4a5
package
com
.
yeejoin
.
amos
.
boot
.
module
.
hygf
.
api
.
dto
;
package
com
.
yeejoin
.
amos
.
boot
.
module
.
hygf
.
api
.
dto
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
com.yeejoin.amos.boot.biz.common.dto.BaseDto
;
import
com.yeejoin.amos.boot.biz.common.dto.BaseDto
;
...
@@ -25,27 +26,27 @@ public class JpInvertorElecHistoryMonthDto extends BaseDto {
...
@@ -25,27 +26,27 @@ public class JpInvertorElecHistoryMonthDto extends BaseDto {
private
String
snCode
;
private
String
snCode
;
@ApiModelProperty
(
value
=
"U交流电压"
)
@ApiModelProperty
(
value
=
"U交流电压"
)
@TableField
(
"U_AC_voltage"
)
private
Double
uAcVoltage
;
private
Double
uAcVoltage
;
@ApiModelProperty
(
value
=
"V交流电压"
)
@ApiModelProperty
(
value
=
"V交流电压"
)
@TableField
(
"V_AC_voltage"
)
private
Double
vAcVoltage
;
private
Double
vAcVoltage
;
@ApiModelProperty
(
value
=
"W交流电压"
)
@ApiModelProperty
(
value
=
"W交流电压"
)
@TableField
(
"W_AC_voltage"
)
private
Double
wAcVoltage
;
private
Double
wAcVoltage
;
@ApiModelProperty
(
value
=
"U交流电流"
)
@ApiModelProperty
(
value
=
"U交流电流"
)
@TableField
(
"U_AC_current"
)
private
Double
uAcCurrent
;
private
Double
uAcCurrent
;
@ApiModelProperty
(
value
=
"V交流电流"
)
@ApiModelProperty
(
value
=
"V交流电流"
)
@TableField
(
"V_AC_current"
)
private
Double
vAcCurrent
;
private
Double
vAcCurrent
;
@ApiModelProperty
(
value
=
"W交流电流"
)
@ApiModelProperty
(
value
=
"W交流电流"
)
@TableField
(
"W_AC_current"
)
private
Double
wAcCurrent
;
private
Double
wAcCurrent
;
@ApiModelProperty
(
value
=
"第三方电站id"
)
@ApiModelProperty
(
value
=
"第三方电站id"
)
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/JpInvertorElecHistoryYearDto.java
View file @
d994b4a5
package
com
.
yeejoin
.
amos
.
boot
.
module
.
hygf
.
api
.
dto
;
package
com
.
yeejoin
.
amos
.
boot
.
module
.
hygf
.
api
.
dto
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
com.yeejoin.amos.boot.biz.common.dto.BaseDto
;
import
com.yeejoin.amos.boot.biz.common.dto.BaseDto
;
...
@@ -25,27 +26,21 @@ public class JpInvertorElecHistoryYearDto extends BaseDto {
...
@@ -25,27 +26,21 @@ public class JpInvertorElecHistoryYearDto extends BaseDto {
private
String
snCode
;
private
String
snCode
;
@ApiModelProperty
(
value
=
"U交流电压"
)
@ApiModelProperty
(
value
=
"U交流电压"
)
@TableField
(
"U_AC_voltage"
)
private
Double
uAcVoltage
;
private
Double
uAcVoltage
;
@ApiModelProperty
(
value
=
"V交流电压"
)
@ApiModelProperty
(
value
=
"V交流电压"
)
@TableField
(
"V_AC_voltage"
)
private
Double
vAcVoltage
;
private
Double
vAcVoltage
;
@ApiModelProperty
(
value
=
"W交流电压"
)
@ApiModelProperty
(
value
=
"W交流电压"
)
@TableField
(
"W_AC_voltage"
)
private
Double
wAcVoltage
;
private
Double
wAcVoltage
;
@ApiModelProperty
(
value
=
"U交流电流"
)
@ApiModelProperty
(
value
=
"U交流电流"
)
@TableField
(
"U_AC_current"
)
private
Double
uAcCurrent
;
private
Double
uAcCurrent
;
@ApiModelProperty
(
value
=
"V交流电流"
)
@ApiModelProperty
(
value
=
"V交流电流"
)
@TableField
(
"V_AC_current"
)
private
Double
vAcCurrent
;
private
Double
vAcCurrent
;
@ApiModelProperty
(
value
=
"W交流电流"
)
@ApiModelProperty
(
value
=
"W交流电流"
)
@TableField
(
"W_AC_current"
)
private
Double
wAcCurrent
;
private
Double
wAcCurrent
;
@ApiModelProperty
(
value
=
"第三方电站id"
)
@ApiModelProperty
(
value
=
"第三方电站id"
)
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/MonthPowerDto.java
View file @
d994b4a5
...
@@ -5,6 +5,9 @@ import io.swagger.annotations.ApiModelProperty;
...
@@ -5,6 +5,9 @@ import io.swagger.annotations.ApiModelProperty;
import
com.yeejoin.amos.boot.biz.common.dto.BaseDto
;
import
com.yeejoin.amos.boot.biz.common.dto.BaseDto
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.EqualsAndHashCode
;
import
java.time.LocalDateTime
;
import
java.time.format.DateTimeFormatter
;
import
java.util.Date
;
import
java.util.Date
;
/**
/**
...
@@ -32,4 +35,19 @@ public class MonthPowerDto {
...
@@ -32,4 +35,19 @@ public class MonthPowerDto {
@ApiModelProperty
(
value
=
"平均功率"
)
@ApiModelProperty
(
value
=
"平均功率"
)
private
Double
power
;
private
Double
power
;
public
void
setDay
(
String
day
)
{
LocalDateTime
now
=
LocalDateTime
.
now
();
DateTimeFormatter
formatter
=
DateTimeFormatter
.
ofPattern
(
"YYYY-MM-dd"
);
String
formattedDate
=
now
.
format
(
formatter
);
this
.
day
=
formattedDate
;
}
public
void
setYearMonth
(
String
yearMonth
)
{
LocalDateTime
now
=
LocalDateTime
.
now
();
DateTimeFormatter
formatter
=
DateTimeFormatter
.
ofPattern
(
"YYYY-MM"
);
String
formattedDate
=
now
.
format
(
formatter
);
this
.
yearMonth
=
formattedDate
;
}
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IMonthPowerService.java
View file @
d994b4a5
package
com
.
yeejoin
.
amos
.
boot
.
module
.
hygf
.
api
.
service
;
package
com
.
yeejoin
.
amos
.
boot
.
module
.
hygf
.
api
.
service
;
import
com.yeejoin.amos.boot.module.hygf.api.entity.MonthPower
;
import
java.util.List
;
/**
/**
* 按月统计接口类
* 按月统计接口类
*
*
...
@@ -8,5 +12,5 @@ package com.yeejoin.amos.boot.module.hygf.api.service;
...
@@ -8,5 +12,5 @@ package com.yeejoin.amos.boot.module.hygf.api.service;
* @date 2023-09-20
* @date 2023-09-20
*/
*/
public
interface
IMonthPowerService
{
public
interface
IMonthPowerService
{
void
getMonthPower
();
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/tdenginemapper/MonthPowerMapper.java
View file @
d994b4a5
...
@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.hygf.api.tdenginemapper;
...
@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.hygf.api.tdenginemapper;
import
com.yeejoin.amos.boot.module.hygf.api.entity.MonthPower
;
import
com.yeejoin.amos.boot.module.hygf.api.entity.MonthPower
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
java.util.List
;
/**
/**
* 按月统计 Mapper 接口
* 按月统计 Mapper 接口
*
*
...
@@ -11,4 +13,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
...
@@ -11,4 +13,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
*/
public
interface
MonthPowerMapper
extends
BaseMapper
<
MonthPower
>
{
public
interface
MonthPowerMapper
extends
BaseMapper
<
MonthPower
>
{
List
<
MonthPower
>
getMonthPower
();
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/MonthPowerMapper.xml
View file @
d994b4a5
...
@@ -2,4 +2,13 @@
...
@@ -2,4 +2,13 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.MonthPowerMapper"
>
<mapper
namespace=
"com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.MonthPowerMapper"
>
<select
id=
"getMonthPower"
resultType=
"com.yeejoin.amos.boot.module.hygf.api.dto.MonthPowerDto"
>
SELECT
avg(power) power,
third_station_id thirdStationId
FROM house_pv_data.td_hygf_jp_station_power_history where created_time
<![CDATA[>=]]>
today()-8h and created_time
<![CDATA[<]]>
today()+1d-8h GROUP BY third_station_id
</select>
</mapper>
</mapper>
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpStationController.java
View file @
d994b4a5
...
@@ -210,7 +210,7 @@ public class JpStationController extends BaseController {
...
@@ -210,7 +210,7 @@ public class JpStationController extends BaseController {
}
}
return
ResponseHelper
.
buildResponse
(
data
);
return
ResponseHelper
.
buildResponse
(
data
);
}
}
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"电站监控电量收益"
,
notes
=
"电站监控电量收益"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"电站监控电量收益"
,
notes
=
"电站监控电量收益"
)
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/MonthPowerServiceImpl.java
View file @
d994b4a5
...
@@ -4,6 +4,8 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.MonthPower;
...
@@ -4,6 +4,8 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.MonthPower;
import
com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.MonthPowerMapper
;
import
com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.MonthPowerMapper
;
import
com.yeejoin.amos.boot.module.hygf.api.service.IMonthPowerService
;
import
com.yeejoin.amos.boot.module.hygf.api.service.IMonthPowerService
;
import
com.yeejoin.amos.boot.module.hygf.api.dto.MonthPowerDto
;
import
com.yeejoin.amos.boot.module.hygf.api.dto.MonthPowerDto
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.scheduling.annotation.Async
;
import
org.typroject.tyboot.core.rdbms.service.BaseService
;
import
org.typroject.tyboot.core.rdbms.service.BaseService
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
...
@@ -17,6 +19,10 @@ import java.util.List;
...
@@ -17,6 +19,10 @@ import java.util.List;
*/
*/
@Service
@Service
public
class
MonthPowerServiceImpl
extends
BaseService
<
MonthPowerDto
,
MonthPower
,
MonthPowerMapper
>
implements
IMonthPowerService
{
public
class
MonthPowerServiceImpl
extends
BaseService
<
MonthPowerDto
,
MonthPower
,
MonthPowerMapper
>
implements
IMonthPowerService
{
@Autowired
MonthPowerMapper
monthPowerMapper
;
/**
/**
* 分页查询
* 分页查询
*/
*/
...
@@ -30,4 +36,13 @@ public class MonthPowerServiceImpl extends BaseService<MonthPowerDto,MonthPower,
...
@@ -30,4 +36,13 @@ public class MonthPowerServiceImpl extends BaseService<MonthPowerDto,MonthPower,
public
List
<
MonthPowerDto
>
queryForMonthPowerList
()
{
public
List
<
MonthPowerDto
>
queryForMonthPowerList
()
{
return
this
.
queryForList
(
""
,
false
);
return
this
.
queryForList
(
""
,
false
);
}
}
@Override
@Async
public
void
getMonthPower
()
{
List
<
MonthPower
>
list
=
monthPowerMapper
.
getMonthPower
();
this
.
saveBatch
(
list
);
}
}
}
\ 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