Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in
Toggle navigation
E
energyai_java
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
葛齐林
energyai_java
Commits
3e552d54
Commit
3e552d54
authored
Apr 21, 2021
by
co_dengxiongwen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
接口调整
parent
3531f207
Changes
49
Hide whitespace changes
Inline
Side-by-side
Showing
49 changed files
with
1002 additions
and
622 deletions
+1002
-622
Constants.java
...in/java/com/devplatform/admin/common/utils/Constants.java
+9
-4
DlxfsnjInfo.java
...va/com/devplatform/admin/modules/eq/bean/DlxfsnjInfo.java
+46
-0
SljfgInfoDay.java
...a/com/devplatform/admin/modules/eq/bean/SljfgInfoDay.java
+10
-15
SljfgInfoHour.java
.../com/devplatform/admin/modules/eq/bean/SljfgInfoHour.java
+10
-15
SljfgInfoMonth.java
...com/devplatform/admin/modules/eq/bean/SljfgInfoMonth.java
+10
-15
SljfgInfoYear.java
.../com/devplatform/admin/modules/eq/bean/SljfgInfoYear.java
+37
-0
SwqxzInfoMonth.java
...com/devplatform/admin/modules/eq/bean/SwqxzInfoMonth.java
+0
-58
SwqxzInfoYear.java
.../com/devplatform/admin/modules/eq/bean/SwqxzInfoYear.java
+0
-58
EquipmentController.java
...form/admin/modules/eq/controller/EquipmentController.java
+4
-4
DlxfsnjInfoDao.java
.../com/devplatform/admin/modules/eq/dao/DlxfsnjInfoDao.java
+35
-0
SljfgInfoDayDao.java
...com/devplatform/admin/modules/eq/dao/SljfgInfoDayDao.java
+40
-0
SljfgInfoHourDao.java
...om/devplatform/admin/modules/eq/dao/SljfgInfoHourDao.java
+40
-0
SljfgInfoMonthDao.java
...m/devplatform/admin/modules/eq/dao/SljfgInfoMonthDao.java
+40
-0
SljfgInfoYearDao.java
...om/devplatform/admin/modules/eq/dao/SljfgInfoYearDao.java
+32
-0
SnqxzInfoDayDao.java
...com/devplatform/admin/modules/eq/dao/SnqxzInfoDayDao.java
+0
-33
SnqxzInfoMonthDao.java
...m/devplatform/admin/modules/eq/dao/SnqxzInfoMonthDao.java
+0
-32
SwqxzInfoMonthDao.java
...m/devplatform/admin/modules/eq/dao/SwqxzInfoMonthDao.java
+0
-32
DlxfsnjInfoModel.java
.../devplatform/admin/modules/eq/model/DlxfsnjInfoModel.java
+32
-0
SljfgInfoDayModel.java
...devplatform/admin/modules/eq/model/SljfgInfoDayModel.java
+4
-8
SljfgInfoHourModel.java
...evplatform/admin/modules/eq/model/SljfgInfoHourModel.java
+4
-8
SljfgInfoMonthModel.java
...vplatform/admin/modules/eq/model/SljfgInfoMonthModel.java
+4
-11
SljfgInfoYearModel.java
...evplatform/admin/modules/eq/model/SljfgInfoYearModel.java
+26
-0
SwqxzInfoDayModel.java
...devplatform/admin/modules/eq/model/SwqxzInfoDayModel.java
+0
-43
SwqxzInfoMonthModel.java
...vplatform/admin/modules/eq/model/SwqxzInfoMonthModel.java
+0
-40
DlxfsnjInfoService.java
...platform/admin/modules/eq/service/DlxfsnjInfoService.java
+28
-0
SljfgInfoDayService.java
...latform/admin/modules/eq/service/SljfgInfoDayService.java
+31
-0
SljfgInfoHourService.java
...atform/admin/modules/eq/service/SljfgInfoHourService.java
+31
-0
SljfgInfoMonthService.java
...tform/admin/modules/eq/service/SljfgInfoMonthService.java
+31
-0
SljfgInfoService.java
...evplatform/admin/modules/eq/service/SljfgInfoService.java
+5
-0
SljfgInfoYearService.java
...atform/admin/modules/eq/service/SljfgInfoYearService.java
+27
-0
SwqxzInfoMonthService.java
...tform/admin/modules/eq/service/SwqxzInfoMonthService.java
+0
-26
SwqxzInfoYearService.java
...atform/admin/modules/eq/service/SwqxzInfoYearService.java
+0
-26
AnalysisServiceImpl.java
...rm/admin/modules/eq/service/impl/AnalysisServiceImpl.java
+7
-3
DlxfsnjInfoServiceImpl.java
...admin/modules/eq/service/impl/DlxfsnjInfoServiceImpl.java
+34
-0
EquipmentServiceImpl.java
...m/admin/modules/eq/service/impl/EquipmentServiceImpl.java
+5
-0
KanBanServiceImpl.java
...form/admin/modules/eq/service/impl/KanBanServiceImpl.java
+7
-3
SljfgInfoDayServiceImpl.java
...dmin/modules/eq/service/impl/SljfgInfoDayServiceImpl.java
+42
-0
SljfgInfoHourServiceImpl.java
...min/modules/eq/service/impl/SljfgInfoHourServiceImpl.java
+41
-0
SljfgInfoMonthServiceImpl.java
...in/modules/eq/service/impl/SljfgInfoMonthServiceImpl.java
+39
-0
SljfgInfoServiceImpl.java
...m/admin/modules/eq/service/impl/SljfgInfoServiceImpl.java
+40
-0
SljfgInfoYearServiceImpl.java
...min/modules/eq/service/impl/SljfgInfoYearServiceImpl.java
+29
-0
SnqxzInfoDayServiceImpl.java
...dmin/modules/eq/service/impl/SnqxzInfoDayServiceImpl.java
+0
-28
DlxfsnjInfoMapper.xml
...-admin/src/main/resources/mapper/eq/DlxfsnjInfoMapper.xml
+63
-0
SljfgInfoDayMapper.xml
...admin/src/main/resources/mapper/eq/SljfgInfoDayMapper.xml
+81
-0
SljfgInfoHourMapper.xml
...dmin/src/main/resources/mapper/eq/SljfgInfoHourMapper.xml
+35
-12
SljfgInfoMonthMapper.xml
...min/src/main/resources/mapper/eq/SljfgInfoMonthMapper.xml
+35
-12
SljfgInfoYearMapper.xml
...dmin/src/main/resources/mapper/eq/SljfgInfoYearMapper.xml
+8
-12
SwqxzInfoMonthMapper.xml
...min/src/main/resources/mapper/eq/SwqxzInfoMonthMapper.xml
+0
-62
SwqxzInfoYearMapper.xml
...dmin/src/main/resources/mapper/eq/SwqxzInfoYearMapper.xml
+0
-62
No files found.
microservice-admin/src/main/java/com/devplatform/admin/common/utils/Constants.java
View file @
3e552d54
...
@@ -40,9 +40,9 @@ public class Constants {
...
@@ -40,9 +40,9 @@ public class Constants {
*/
*/
public
static
final
String
ID_JFKTG
=
"b47661ca1d454f9792ba5369f3cb2bc5"
;
public
static
final
String
ID_JFKTG
=
"b47661ca1d454f9792ba5369f3cb2bc5"
;
/**
/**
*
防火
卷帘门
*
电动
卷帘门
*/
*/
public
static
final
String
ID_
FH
JLM
=
"c788ce98c1f248f590434394da485ce4"
;
public
static
final
String
ID_JLM
=
"c788ce98c1f248f590434394da485ce4"
;
/**
/**
* 风冷热泵机组
* 风冷热泵机组
*/
*/
...
@@ -77,9 +77,14 @@ public class Constants {
...
@@ -77,9 +77,14 @@ public class Constants {
*/
*/
public
static
final
String
ID_SNQXZ
=
"507ba9ae22174e4dbbf32dbf34dd7139"
;
public
static
final
String
ID_SNQXZ
=
"507ba9ae22174e4dbbf32dbf34dd7139"
;
/**
/**
*
换气扇
*
电动排烟窗
*/
*/
public
static
final
String
ID_HQS
=
"49f5921a6d7f43cfa222c09f0223ae04"
;
public
static
final
String
ID_FYC
=
"49f5921a6d7f43cfa222c09f0223ae04"
;
/**
* 多联新风处理机室内机
*/
public
static
final
String
ID_DLXFSNJ
=
"8f0787103561423887324f8ac3c36b89"
;
/**
/**
* 字典的根节点
* 字典的根节点
...
...
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/bean/
SwqxzInfoDay
.java
→
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/bean/
DlxfsnjInfo
.java
View file @
3e552d54
...
@@ -10,9 +10,9 @@ import com.baomidou.mybatisplus.annotation.TableName;
...
@@ -10,9 +10,9 @@ import com.baomidou.mybatisplus.annotation.TableName;
import
lombok.Data
;
import
lombok.Data
;
@Data
@Data
@ApiModel
(
value
=
"
室外气象站信息-天对象"
,
description
=
"室外气象站信息-天
对象"
)
@ApiModel
(
value
=
"
多联新风处理机室内机信息对象"
,
description
=
"多联新风处理机室内机信息
对象"
)
@TableName
(
"
swqxz_info_day
"
)
@TableName
(
"
dlxfsnj_info
"
)
public
class
SwqxzInfoDay
implements
Serializable
{
public
class
DlxfsnjInfo
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
/** 主键id */
/** 主键id */
...
@@ -22,30 +22,18 @@ public class SwqxzInfoDay implements Serializable {
...
@@ -22,30 +22,18 @@ public class SwqxzInfoDay implements Serializable {
/** 资源点id */
/** 资源点id */
@ApiModelProperty
(
value
=
"资源点id"
,
name
=
"resourceId"
)
@ApiModelProperty
(
value
=
"资源点id"
,
name
=
"resourceId"
)
private
java
.
lang
.
String
resourceId
;
private
java
.
lang
.
String
resourceId
;
/** 温度 */
/** 设定温度 */
@ApiModelProperty
(
value
=
"温度"
,
name
=
"temperature"
)
@ApiModelProperty
(
value
=
"设定温度"
,
name
=
"settingTemperature"
)
private
java
.
lang
.
String
temperature
;
private
java
.
lang
.
String
settingTemperature
;
/** 湿度 */
/** 设定模式 */
@ApiModelProperty
(
value
=
"湿度"
,
name
=
"humidity"
)
@ApiModelProperty
(
value
=
"设定模式"
,
name
=
"settingMode"
)
private
java
.
lang
.
String
humidity
;
private
java
.
lang
.
String
settingMode
;
/** 风速 */
/** 设定风速 */
@ApiModelProperty
(
value
=
"风速"
,
name
=
"windSpeed"
)
@ApiModelProperty
(
value
=
"设定风速"
,
name
=
"settingWindSpeed"
)
private
java
.
lang
.
String
windSpeed
;
private
java
.
lang
.
String
settingWindSpeed
;
/** 风向 */
/** 故障报警 */
@ApiModelProperty
(
value
=
"风向"
,
name
=
"windDirection"
)
@ApiModelProperty
(
value
=
"故障报警"
,
name
=
"faultAlarm"
)
private
java
.
lang
.
String
windDirection
;
private
java
.
lang
.
String
faultAlarm
;
/** 光照度 */
@ApiModelProperty
(
value
=
"光照度"
,
name
=
"illuminance"
)
private
java
.
lang
.
String
illuminance
;
/** CO2 */
@ApiModelProperty
(
value
=
"CO2"
,
name
=
"carbonDioxide"
)
private
java
.
lang
.
String
carbonDioxide
;
/** PM2.5 */
@ApiModelProperty
(
value
=
"PM2.5"
,
name
=
"fineParticles"
)
private
java
.
lang
.
String
fineParticles
;
/** 辐射 */
@ApiModelProperty
(
value
=
"辐射"
,
name
=
"radiation"
)
private
java
.
lang
.
String
radiation
;
/** 类型(1手动,2节能) */
/** 类型(1手动,2节能) */
@ApiModelProperty
(
value
=
"类型(1手动,2节能)"
,
name
=
"type"
)
@ApiModelProperty
(
value
=
"类型(1手动,2节能)"
,
name
=
"type"
)
private
Integer
type
;
private
Integer
type
;
...
...
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/bean/S
nqxz
InfoDay.java
→
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/bean/S
ljfg
InfoDay.java
View file @
3e552d54
package
com
.
devplatform
.
admin
.
modules
.
eq
.
bean
;
package
com
.
devplatform
.
admin
.
modules
.
eq
.
bean
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
lombok.Data
;
@Data
@Data
@ApiModel
(
value
=
"室内
气象站信息-天对象"
,
description
=
"室内气象站
信息-天对象"
)
@ApiModel
(
value
=
"室内
机风柜信息-天对象"
,
description
=
"室内机风柜
信息-天对象"
)
@TableName
(
"s
nqxz
_info_day"
)
@TableName
(
"s
ljfg
_info_day"
)
public
class
S
nqxz
InfoDay
implements
Serializable
{
public
class
S
ljfg
InfoDay
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
/** 主键id */
/** 主键id */
...
@@ -21,15 +22,9 @@ public class SnqxzInfoDay implements Serializable {
...
@@ -21,15 +22,9 @@ public class SnqxzInfoDay implements Serializable {
/** 资源点id */
/** 资源点id */
@ApiModelProperty
(
value
=
"资源点id"
,
name
=
"resourceId"
)
@ApiModelProperty
(
value
=
"资源点id"
,
name
=
"resourceId"
)
private
java
.
lang
.
String
resourceId
;
private
java
.
lang
.
String
resourceId
;
/** 温度 */
/** 电能 */
@ApiModelProperty
(
value
=
"温度"
,
name
=
"temperature"
)
@ApiModelProperty
(
value
=
"电能"
,
name
=
"electricEnergy"
)
private
java
.
lang
.
String
temperature
;
private
java
.
lang
.
String
electricEnergy
;
/** 湿度 */
@ApiModelProperty
(
value
=
"湿度"
,
name
=
"humidity"
)
private
java
.
lang
.
String
humidity
;
/** CO2 */
@ApiModelProperty
(
value
=
"CO2"
,
name
=
"carbonDioxide"
)
private
java
.
lang
.
String
carbonDioxide
;
/** 类型(1手动,2节能) */
/** 类型(1手动,2节能) */
@ApiModelProperty
(
value
=
"类型(1手动,2节能)"
,
name
=
"type"
)
@ApiModelProperty
(
value
=
"类型(1手动,2节能)"
,
name
=
"type"
)
private
Integer
type
;
private
Integer
type
;
...
...
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/bean/S
nqxzInfoYea
r.java
→
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/bean/S
ljfgInfoHou
r.java
View file @
3e552d54
package
com
.
devplatform
.
admin
.
modules
.
eq
.
bean
;
package
com
.
devplatform
.
admin
.
modules
.
eq
.
bean
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
lombok.Data
;
@Data
@Data
@ApiModel
(
value
=
"室内
气象站信息-年对象"
,
description
=
"室内气象站信息-年
对象"
)
@ApiModel
(
value
=
"室内
机风柜信息-时对象"
,
description
=
"室内机风柜信息-时
对象"
)
@TableName
(
"s
nqxz_info_yea
r"
)
@TableName
(
"s
ljfg_info_hou
r"
)
public
class
S
nqxzInfoYea
r
implements
Serializable
{
public
class
S
ljfgInfoHou
r
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
/** 主键id */
/** 主键id */
...
@@ -21,15 +22,9 @@ public class SnqxzInfoYear implements Serializable {
...
@@ -21,15 +22,9 @@ public class SnqxzInfoYear implements Serializable {
/** 资源点id */
/** 资源点id */
@ApiModelProperty
(
value
=
"资源点id"
,
name
=
"resourceId"
)
@ApiModelProperty
(
value
=
"资源点id"
,
name
=
"resourceId"
)
private
java
.
lang
.
String
resourceId
;
private
java
.
lang
.
String
resourceId
;
/** 温度 */
/** 电能 */
@ApiModelProperty
(
value
=
"温度"
,
name
=
"temperature"
)
@ApiModelProperty
(
value
=
"电能"
,
name
=
"electricEnergy"
)
private
java
.
lang
.
String
temperature
;
private
java
.
lang
.
String
electricEnergy
;
/** 湿度 */
@ApiModelProperty
(
value
=
"湿度"
,
name
=
"humidity"
)
private
java
.
lang
.
String
humidity
;
/** CO2 */
@ApiModelProperty
(
value
=
"CO2"
,
name
=
"carbonDioxide"
)
private
java
.
lang
.
String
carbonDioxide
;
/** 类型(1手动,2节能) */
/** 类型(1手动,2节能) */
@ApiModelProperty
(
value
=
"类型(1手动,2节能)"
,
name
=
"type"
)
@ApiModelProperty
(
value
=
"类型(1手动,2节能)"
,
name
=
"type"
)
private
Integer
type
;
private
Integer
type
;
...
...
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/bean/S
nqxz
InfoMonth.java
→
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/bean/S
ljfg
InfoMonth.java
View file @
3e552d54
package
com
.
devplatform
.
admin
.
modules
.
eq
.
bean
;
package
com
.
devplatform
.
admin
.
modules
.
eq
.
bean
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
lombok.Data
;
@Data
@Data
@ApiModel
(
value
=
"室内
气象站信息-月对象"
,
description
=
"室内气象站
信息-月对象"
)
@ApiModel
(
value
=
"室内
机风柜信息-月对象"
,
description
=
"室内机风柜
信息-月对象"
)
@TableName
(
"s
nqxz
_info_month"
)
@TableName
(
"s
ljfg
_info_month"
)
public
class
S
nqxz
InfoMonth
implements
Serializable
{
public
class
S
ljfg
InfoMonth
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
/** 主键id */
/** 主键id */
...
@@ -21,15 +22,9 @@ public class SnqxzInfoMonth implements Serializable {
...
@@ -21,15 +22,9 @@ public class SnqxzInfoMonth implements Serializable {
/** 资源点id */
/** 资源点id */
@ApiModelProperty
(
value
=
"资源点id"
,
name
=
"resourceId"
)
@ApiModelProperty
(
value
=
"资源点id"
,
name
=
"resourceId"
)
private
java
.
lang
.
String
resourceId
;
private
java
.
lang
.
String
resourceId
;
/** 温度 */
/** 电能 */
@ApiModelProperty
(
value
=
"温度"
,
name
=
"temperature"
)
@ApiModelProperty
(
value
=
"电能"
,
name
=
"electricEnergy"
)
private
java
.
lang
.
String
temperature
;
private
java
.
lang
.
String
electricEnergy
;
/** 湿度 */
@ApiModelProperty
(
value
=
"湿度"
,
name
=
"humidity"
)
private
java
.
lang
.
String
humidity
;
/** CO2 */
@ApiModelProperty
(
value
=
"CO2"
,
name
=
"carbonDioxide"
)
private
java
.
lang
.
String
carbonDioxide
;
/** 类型(1手动,2节能) */
/** 类型(1手动,2节能) */
@ApiModelProperty
(
value
=
"类型(1手动,2节能)"
,
name
=
"type"
)
@ApiModelProperty
(
value
=
"类型(1手动,2节能)"
,
name
=
"type"
)
private
Integer
type
;
private
Integer
type
;
...
...
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/bean/SljfgInfoYear.java
0 → 100644
View file @
3e552d54
package
com
.
devplatform
.
admin
.
modules
.
eq
.
bean
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
java.io.Serializable
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
lombok.Data
;
@Data
@ApiModel
(
value
=
"室内机风柜信息-年对象"
,
description
=
"室内机风柜信息-年对象"
)
@TableName
(
"sljfg_info_year"
)
public
class
SljfgInfoYear
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
/** 主键id */
@ApiModelProperty
(
value
=
"主键ID"
,
name
=
"id"
)
@TableId
private
java
.
lang
.
String
id
;
/** 资源点id */
@ApiModelProperty
(
value
=
"资源点id"
,
name
=
"resourceId"
)
private
java
.
lang
.
String
resourceId
;
/** 电能 */
@ApiModelProperty
(
value
=
"电能"
,
name
=
"electricEnergy"
)
private
java
.
lang
.
String
electricEnergy
;
/** 类型(1手动,2节能) */
@ApiModelProperty
(
value
=
"类型(1手动,2节能)"
,
name
=
"type"
)
private
Integer
type
;
/** 站点表id */
@ApiModelProperty
(
value
=
"站点表id"
,
name
=
"stationId"
)
private
java
.
lang
.
String
stationId
;
/** 创建时间 */
@ApiModelProperty
(
value
=
"创建时间"
,
name
=
"createTime"
)
private
java
.
util
.
Date
createTime
;
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/bean/SwqxzInfoMonth.java
deleted
100644 → 0
View file @
3531f207
package
com
.
devplatform
.
admin
.
modules
.
eq
.
bean
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
java.io.Serializable
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
lombok.Data
;
@Data
@ApiModel
(
value
=
"室外气象站信息-月对象"
,
description
=
"室外气象站信息-月对象"
)
@TableName
(
"swqxz_info_month"
)
public
class
SwqxzInfoMonth
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
/** 主键id */
@ApiModelProperty
(
value
=
"主键ID"
,
name
=
"id"
)
@TableId
private
java
.
lang
.
String
id
;
/** 资源点id */
@ApiModelProperty
(
value
=
"资源点id"
,
name
=
"resourceId"
)
private
java
.
lang
.
String
resourceId
;
/** 温度 */
@ApiModelProperty
(
value
=
"温度"
,
name
=
"temperature"
)
private
java
.
lang
.
String
temperature
;
/** 湿度 */
@ApiModelProperty
(
value
=
"湿度"
,
name
=
"humidity"
)
private
java
.
lang
.
String
humidity
;
/** 风速 */
@ApiModelProperty
(
value
=
"风速"
,
name
=
"windSpeed"
)
private
java
.
lang
.
String
windSpeed
;
/** 风向 */
@ApiModelProperty
(
value
=
"风向"
,
name
=
"windDirection"
)
private
java
.
lang
.
String
windDirection
;
/** 光照度 */
@ApiModelProperty
(
value
=
"光照度"
,
name
=
"illuminance"
)
private
java
.
lang
.
String
illuminance
;
/** CO2 */
@ApiModelProperty
(
value
=
"CO2"
,
name
=
"carbonDioxide"
)
private
java
.
lang
.
String
carbonDioxide
;
/** PM2.5 */
@ApiModelProperty
(
value
=
"PM2.5"
,
name
=
"fineParticles"
)
private
java
.
lang
.
String
fineParticles
;
/** 辐射 */
@ApiModelProperty
(
value
=
"辐射"
,
name
=
"radiation"
)
private
java
.
lang
.
String
radiation
;
/** 类型(1手动,2节能) */
@ApiModelProperty
(
value
=
"类型(1手动,2节能)"
,
name
=
"type"
)
private
Integer
type
;
/** 站点表id */
@ApiModelProperty
(
value
=
"站点表id"
,
name
=
"stationId"
)
private
java
.
lang
.
String
stationId
;
/** 创建时间 */
@ApiModelProperty
(
value
=
"创建时间"
,
name
=
"createTime"
)
private
java
.
util
.
Date
createTime
;
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/bean/SwqxzInfoYear.java
deleted
100644 → 0
View file @
3531f207
package
com
.
devplatform
.
admin
.
modules
.
eq
.
bean
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
java.io.Serializable
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
lombok.Data
;
@Data
@ApiModel
(
value
=
"室外气象站信息-年对象"
,
description
=
"室外气象站信息-年对象"
)
@TableName
(
"swqxz_info_year"
)
public
class
SwqxzInfoYear
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
/** 主键id */
@ApiModelProperty
(
value
=
"主键ID"
,
name
=
"id"
)
@TableId
private
java
.
lang
.
String
id
;
/** 资源点id */
@ApiModelProperty
(
value
=
"资源点id"
,
name
=
"resourceId"
)
private
java
.
lang
.
String
resourceId
;
/** 温度 */
@ApiModelProperty
(
value
=
"温度"
,
name
=
"temperature"
)
private
java
.
lang
.
String
temperature
;
/** 湿度 */
@ApiModelProperty
(
value
=
"湿度"
,
name
=
"humidity"
)
private
java
.
lang
.
String
humidity
;
/** 风速 */
@ApiModelProperty
(
value
=
"风速"
,
name
=
"windSpeed"
)
private
java
.
lang
.
String
windSpeed
;
/** 风向 */
@ApiModelProperty
(
value
=
"风向"
,
name
=
"windDirection"
)
private
java
.
lang
.
String
windDirection
;
/** 光照度 */
@ApiModelProperty
(
value
=
"光照度"
,
name
=
"illuminance"
)
private
java
.
lang
.
String
illuminance
;
/** CO2 */
@ApiModelProperty
(
value
=
"CO2"
,
name
=
"carbonDioxide"
)
private
java
.
lang
.
String
carbonDioxide
;
/** PM2.5 */
@ApiModelProperty
(
value
=
"PM2.5"
,
name
=
"fineParticles"
)
private
java
.
lang
.
String
fineParticles
;
/** 辐射 */
@ApiModelProperty
(
value
=
"辐射"
,
name
=
"radiation"
)
private
java
.
lang
.
String
radiation
;
/** 类型(1手动,2节能) */
@ApiModelProperty
(
value
=
"类型(1手动,2节能)"
,
name
=
"type"
)
private
Integer
type
;
/** 站点表id */
@ApiModelProperty
(
value
=
"站点表id"
,
name
=
"stationId"
)
private
java
.
lang
.
String
stationId
;
/** 创建时间 */
@ApiModelProperty
(
value
=
"创建时间"
,
name
=
"createTime"
)
private
java
.
util
.
Date
createTime
;
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/controller/EquipmentController.java
View file @
3e552d54
...
@@ -270,20 +270,20 @@ public class EquipmentController extends AbstractController {
...
@@ -270,20 +270,20 @@ public class EquipmentController extends AbstractController {
@ApiOperation
(
value
=
"切换模式"
,
notes
=
"切换模式"
)
@ApiOperation
(
value
=
"切换模式"
,
notes
=
"切换模式"
)
@ApiImplicitParam
(
name
=
"id"
,
value
=
"主键"
,
required
=
true
,
dataType
=
"String"
)
@ApiImplicitParam
(
name
=
"id"
,
value
=
"主键"
,
required
=
true
,
dataType
=
"String"
)
@PostMapping
(
"/checkModel"
)
@PostMapping
(
"/checkModel"
)
public
R
checkModel
(
Integer
type
)
{
public
R
checkModel
(
Integer
type
,
Integer
status
)
{
SysSystemParams
sysSystemParams
=
sysSystemParamsService
.
getById
(
Constants
.
STRING_1
);
SysSystemParams
sysSystemParams
=
sysSystemParamsService
.
getById
(
Constants
.
STRING_1
);
if
(
type
==
Constants
.
INT_1
){
if
(
type
==
Constants
.
INT_1
){
sysSystemParams
.
setSun
(
Constants
.
INT_1
);
sysSystemParams
.
setSun
(
status
);
sysSystemParams
.
setFan
(
Constants
.
INT_2
);
sysSystemParams
.
setFan
(
Constants
.
INT_2
);
sysSystemParams
.
setNan
(
Constants
.
INT_2
);
sysSystemParams
.
setNan
(
Constants
.
INT_2
);
}
else
if
(
type
==
Constants
.
INT_2
){
}
else
if
(
type
==
Constants
.
INT_2
){
sysSystemParams
.
setSun
(
Constants
.
INT_2
);
sysSystemParams
.
setSun
(
Constants
.
INT_2
);
sysSystemParams
.
setFan
(
Constants
.
INT_1
);
sysSystemParams
.
setFan
(
status
);
sysSystemParams
.
setNan
(
Constants
.
INT_2
);
sysSystemParams
.
setNan
(
Constants
.
INT_2
);
}
else
if
(
type
==
Constants
.
INT_3
){
}
else
if
(
type
==
Constants
.
INT_3
){
sysSystemParams
.
setSun
(
Constants
.
INT_2
);
sysSystemParams
.
setSun
(
Constants
.
INT_2
);
sysSystemParams
.
setFan
(
Constants
.
INT_2
);
sysSystemParams
.
setFan
(
Constants
.
INT_2
);
sysSystemParams
.
setNan
(
Constants
.
INT_1
);
sysSystemParams
.
setNan
(
status
);
}
}
sysSystemParamsService
.
update
(
sysSystemParams
,
new
LambdaQueryWrapper
<
SysSystemParams
>()
sysSystemParamsService
.
update
(
sysSystemParams
,
new
LambdaQueryWrapper
<
SysSystemParams
>()
.
eq
(
SysSystemParams:
:
getId
,
sysSystemParams
.
getId
()));
.
eq
(
SysSystemParams:
:
getId
,
sysSystemParams
.
getId
()));
...
...
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/
SwqxzInfoYear
Dao.java
→
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/
DlxfsnjInfo
Dao.java
View file @
3e552d54
package
com
.
devplatform
.
admin
.
modules
.
eq
.
dao
;
package
com
.
devplatform
.
admin
.
modules
.
eq
.
dao
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Mapper
;
import
com.devplatform.admin.modules.eq.model.
SwqxzInfoYear
Model
;
import
com.devplatform.admin.modules.eq.model.
DlxfsnjInfo
Model
;
import
com.devplatform.admin.modules.eq.bean.
SwqxzInfoYear
;
import
com.devplatform.admin.modules.eq.bean.
DlxfsnjInfo
;
import
com.devplatform.common.dao.MyBaseMapper
;
import
com.devplatform.common.dao.MyBaseMapper
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
/**
/**
*
SwqxzInfoYear
Mapper
*
DlxfsnjInfo
Mapper
* 用于
室外气象站信息-年
的数据库操作
* 用于
多联新风处理机室内机信息
的数据库操作
* @author Administrator
* @author Administrator
*
*
*/
*/
@Mapper
@Mapper
public
interface
SwqxzInfoYearDao
extends
MyBaseMapper
<
SwqxzInfoYear
>
{
public
interface
DlxfsnjInfoDao
extends
MyBaseMapper
<
DlxfsnjInfo
>
{
/**
/**
* 查询分页数量
* 查询分页数量
* @param model
* @param model
* @return
* @return
*/
*/
Integer
queryPageByCount
(
SwqxzInfoYear
Model
model
);
Integer
queryPageByCount
(
DlxfsnjInfo
Model
model
);
/**
/**
* 查询
室外气象站信息-年
分页数据
* 查询
多联新风处理机室内机信息
分页数据
* @param model
* @param model
* @return
* @return
*/
*/
List
<
SwqxzInfoYear
>
queryPageList
(
SwqxzInfoYearModel
model
);
List
<
DlxfsnjInfo
>
queryPageList
(
DlxfsnjInfoModel
model
);
List
<
Map
<
String
,
Object
>>
getList
();
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/S
wqxz
InfoDayDao.java
→
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/S
ljfg
InfoDayDao.java
View file @
3e552d54
...
@@ -2,8 +2,8 @@ package com.devplatform.admin.modules.eq.dao;
...
@@ -2,8 +2,8 @@ package com.devplatform.admin.modules.eq.dao;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Mapper
;
import
com.devplatform.admin.modules.eq.model.S
wqxz
InfoDayModel
;
import
com.devplatform.admin.modules.eq.model.S
ljfg
InfoDayModel
;
import
com.devplatform.admin.modules.eq.bean.S
wqxz
InfoDay
;
import
com.devplatform.admin.modules.eq.bean.S
ljfg
InfoDay
;
import
com.devplatform.common.dao.MyBaseMapper
;
import
com.devplatform.common.dao.MyBaseMapper
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
...
@@ -11,26 +11,30 @@ import java.util.List;
...
@@ -11,26 +11,30 @@ import java.util.List;
import
java.util.Map
;
import
java.util.Map
;
/**
/**
* S
wqxz
InfoDay Mapper
* S
ljfg
InfoDay Mapper
* 用于室
外气象站
信息-天的数据库操作
* 用于室
内机风柜
信息-天的数据库操作
* @author Administrator
* @author Administrator
*
*
*/
*/
@Mapper
@Mapper
public
interface
S
wqxzInfoDayDao
extends
MyBaseMapper
<
Swqxz
InfoDay
>
{
public
interface
S
ljfgInfoDayDao
extends
MyBaseMapper
<
Sljfg
InfoDay
>
{
/**
/**
* 查询分页数量
* 查询分页数量
* @param model
* @param model
* @return
* @return
*/
*/
Integer
queryPageByCount
(
S
wqxz
InfoDayModel
model
);
Integer
queryPageByCount
(
S
ljfg
InfoDayModel
model
);
/**
/**
* 查询室
外气象站
信息-天分页数据
* 查询室
内机风柜
信息-天分页数据
* @param model
* @param model
* @return
* @return
*/
*/
List
<
S
wqxzInfoDay
>
queryPageList
(
Swqxz
InfoDayModel
model
);
List
<
S
ljfgInfoDay
>
queryPageList
(
Sljfg
InfoDayModel
model
);
Page
<
Map
<
String
,
Object
>>
queryPageListByParam
(
@Param
(
"page"
)
Page
<
Map
<
String
,
Object
>>
page
,
@Param
(
"params"
)
Map
<
String
,
Object
>
params
);
List
<
Map
<
String
,
Object
>>
queryListByParam
(
@Param
(
"type"
)
Integer
type
);
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/SljfgInfoHourDao.java
0 → 100644
View file @
3e552d54
package
com
.
devplatform
.
admin
.
modules
.
eq
.
dao
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
org.apache.ibatis.annotations.Mapper
;
import
com.devplatform.admin.modules.eq.model.SljfgInfoHourModel
;
import
com.devplatform.admin.modules.eq.bean.SljfgInfoHour
;
import
com.devplatform.common.dao.MyBaseMapper
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
import
java.util.Map
;
/**
* SljfgInfoHour Mapper
* 用于室内机风柜信息-时的数据库操作
* @author Administrator
*
*/
@Mapper
public
interface
SljfgInfoHourDao
extends
MyBaseMapper
<
SljfgInfoHour
>
{
/**
* 查询分页数量
* @param model
* @return
*/
Integer
queryPageByCount
(
SljfgInfoHourModel
model
);
/**
* 查询室内机风柜信息-时分页数据
* @param model
* @return
*/
List
<
SljfgInfoHour
>
queryPageList
(
SljfgInfoHourModel
model
);
Page
<
Map
<
String
,
Object
>>
queryPageListByParam
(
@Param
(
"page"
)
Page
<
Map
<
String
,
Object
>>
page
,
@Param
(
"params"
)
Map
<
String
,
Object
>
params
);
List
<
Map
<
String
,
Object
>>
queryListByParam
(
@Param
(
"type"
)
Integer
type
);
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/SljfgInfoMonthDao.java
0 → 100644
View file @
3e552d54
package
com
.
devplatform
.
admin
.
modules
.
eq
.
dao
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
org.apache.ibatis.annotations.Mapper
;
import
com.devplatform.admin.modules.eq.model.SljfgInfoMonthModel
;
import
com.devplatform.admin.modules.eq.bean.SljfgInfoMonth
;
import
com.devplatform.common.dao.MyBaseMapper
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
import
java.util.Map
;
/**
* SljfgInfoMonth Mapper
* 用于室内机风柜信息-月的数据库操作
* @author Administrator
*
*/
@Mapper
public
interface
SljfgInfoMonthDao
extends
MyBaseMapper
<
SljfgInfoMonth
>
{
/**
* 查询分页数量
* @param model
* @return
*/
Integer
queryPageByCount
(
SljfgInfoMonthModel
model
);
/**
* 查询室内机风柜信息-月分页数据
* @param model
* @return
*/
List
<
SljfgInfoMonth
>
queryPageList
(
SljfgInfoMonthModel
model
);
Page
<
Map
<
String
,
Object
>>
queryPageListByParam
(
@Param
(
"page"
)
Page
<
Map
<
String
,
Object
>>
page
,
@Param
(
"params"
)
Map
<
String
,
Object
>
params
);
List
<
Map
<
String
,
Object
>>
queryListByParam
(
@Param
(
"type"
)
Integer
type
);
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/S
nqxz
InfoYearDao.java
→
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/S
ljfg
InfoYearDao.java
View file @
3e552d54
package
com
.
devplatform
.
admin
.
modules
.
eq
.
dao
;
package
com
.
devplatform
.
admin
.
modules
.
eq
.
dao
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Mapper
;
import
com.devplatform.admin.modules.eq.model.S
nqxz
InfoYearModel
;
import
com.devplatform.admin.modules.eq.model.S
ljfg
InfoYearModel
;
import
com.devplatform.admin.modules.eq.bean.S
nqxz
InfoYear
;
import
com.devplatform.admin.modules.eq.bean.S
ljfg
InfoYear
;
import
com.devplatform.common.dao.MyBaseMapper
;
import
com.devplatform.common.dao.MyBaseMapper
;
import
java.util.List
;
import
java.util.List
;
/**
/**
* S
nqxz
InfoYear Mapper
* S
ljfg
InfoYear Mapper
* 用于室内
气象站
信息-年的数据库操作
* 用于室内
机风柜
信息-年的数据库操作
* @author Administrator
* @author Administrator
*
*
*/
*/
@Mapper
@Mapper
public
interface
S
nqxzInfoYearDao
extends
MyBaseMapper
<
Snqxz
InfoYear
>
{
public
interface
S
ljfgInfoYearDao
extends
MyBaseMapper
<
Sljfg
InfoYear
>
{
/**
/**
* 查询分页数量
* 查询分页数量
* @param model
* @param model
* @return
* @return
*/
*/
Integer
queryPageByCount
(
S
nqxz
InfoYearModel
model
);
Integer
queryPageByCount
(
S
ljfg
InfoYearModel
model
);
/**
/**
* 查询室内
气象站
信息-年分页数据
* 查询室内
机风柜
信息-年分页数据
* @param model
* @param model
* @return
* @return
*/
*/
List
<
S
nqxzInfoYear
>
queryPageList
(
Snqxz
InfoYearModel
model
);
List
<
S
ljfgInfoYear
>
queryPageList
(
Sljfg
InfoYearModel
model
);
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/SnqxzInfoDayDao.java
deleted
100644 → 0
View file @
3531f207
package
com
.
devplatform
.
admin
.
modules
.
eq
.
dao
;
import
com.devplatform.admin.modules.eq.bean.SnqxzInfoDay
;
import
com.devplatform.admin.modules.eq.model.SnqxzInfoDayModel
;
import
com.devplatform.common.dao.MyBaseMapper
;
import
org.apache.ibatis.annotations.Mapper
;
import
java.util.List
;
/**
* SnqxzInfoDay Mapper
* 用于室内气象站信息-天的数据库操作
* @author Administrator
*
*/
@Mapper
public
interface
SnqxzInfoDayDao
extends
MyBaseMapper
<
SnqxzInfoDay
>
{
/**
* 查询分页数量
* @param model
* @return
*/
Integer
queryPageByCount
(
SnqxzInfoDayModel
model
);
/**
* 查询室内气象站信息-天分页数据
* @param model
* @return
*/
List
<
SnqxzInfoDay
>
queryPageList
(
SnqxzInfoDayModel
model
);
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/SnqxzInfoMonthDao.java
deleted
100644 → 0
View file @
3531f207
package
com
.
devplatform
.
admin
.
modules
.
eq
.
dao
;
import
org.apache.ibatis.annotations.Mapper
;
import
com.devplatform.admin.modules.eq.model.SnqxzInfoMonthModel
;
import
com.devplatform.admin.modules.eq.bean.SnqxzInfoMonth
;
import
com.devplatform.common.dao.MyBaseMapper
;
import
java.util.List
;
/**
* SnqxzInfoMonth Mapper
* 用于室内气象站信息-月的数据库操作
* @author Administrator
*
*/
@Mapper
public
interface
SnqxzInfoMonthDao
extends
MyBaseMapper
<
SnqxzInfoMonth
>
{
/**
* 查询分页数量
* @param model
* @return
*/
Integer
queryPageByCount
(
SnqxzInfoMonthModel
model
);
/**
* 查询室内气象站信息-月分页数据
* @param model
* @return
*/
List
<
SnqxzInfoMonth
>
queryPageList
(
SnqxzInfoMonthModel
model
);
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/SwqxzInfoMonthDao.java
deleted
100644 → 0
View file @
3531f207
package
com
.
devplatform
.
admin
.
modules
.
eq
.
dao
;
import
org.apache.ibatis.annotations.Mapper
;
import
com.devplatform.admin.modules.eq.model.SwqxzInfoMonthModel
;
import
com.devplatform.admin.modules.eq.bean.SwqxzInfoMonth
;
import
com.devplatform.common.dao.MyBaseMapper
;
import
java.util.List
;
/**
* SwqxzInfoMonth Mapper
* 用于室外气象站信息-月的数据库操作
* @author Administrator
*
*/
@Mapper
public
interface
SwqxzInfoMonthDao
extends
MyBaseMapper
<
SwqxzInfoMonth
>
{
/**
* 查询分页数量
* @param model
* @return
*/
Integer
queryPageByCount
(
SwqxzInfoMonthModel
model
);
/**
* 查询室外气象站信息-月分页数据
* @param model
* @return
*/
List
<
SwqxzInfoMonth
>
queryPageList
(
SwqxzInfoMonthModel
model
);
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/model/
SwqxzInfoYear
Model.java
→
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/model/
DlxfsnjInfo
Model.java
View file @
3e552d54
...
@@ -4,33 +4,25 @@ import com.devplatform.admin.common.model.BaseModel;
...
@@ -4,33 +4,25 @@ import com.devplatform.admin.common.model.BaseModel;
import
lombok.Data
;
import
lombok.Data
;
/**
/**
*
室外气象站信息-年
的Model
*
多联新风处理机室内机信息
的Model
* <br>
* <br>
* @author 代码生成器产生
* @author 代码生成器产生
*/
*/
@Data
@Data
public
class
SwqxzInfoYear
Model
extends
BaseModel
{
public
class
DlxfsnjInfo
Model
extends
BaseModel
{
/** 主键id */
/** 主键id */
private
java
.
lang
.
String
id
;
private
java
.
lang
.
String
id
;
/** 资源点id */
/** 资源点id */
private
java
.
lang
.
String
resourceId
;
private
java
.
lang
.
String
resourceId
;
/** 温度 */
/** 设定温度 */
private
java
.
lang
.
String
temperature
;
private
java
.
lang
.
String
settingTemperature
;
/** 湿度 */
/** 设定模式 */
private
java
.
lang
.
String
humidity
;
private
java
.
lang
.
String
settingMode
;
/** 风速 */
/** 设定风速 */
private
java
.
lang
.
String
windSpeed
;
private
java
.
lang
.
String
settingWindSpeed
;
/** 风向 */
/** 故障报警 */
private
java
.
lang
.
String
windDirection
;
private
java
.
lang
.
String
faultAlarm
;
/** 光照度 */
private
java
.
lang
.
String
illuminance
;
/** CO2 */
private
java
.
lang
.
String
carbonDioxide
;
/** PM2.5 */
private
java
.
lang
.
String
fineParticles
;
/** 辐射 */
private
java
.
lang
.
String
radiation
;
/** 类型(1手动,2节能) */
/** 类型(1手动,2节能) */
private
Integer
type
;
private
Integer
type
;
/** 站点表id */
/** 站点表id */
...
...
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/model/S
nqxzInfoYear
Model.java
→
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/model/S
ljfgInfoDay
Model.java
View file @
3e552d54
...
@@ -4,23 +4,19 @@ import com.devplatform.admin.common.model.BaseModel;
...
@@ -4,23 +4,19 @@ import com.devplatform.admin.common.model.BaseModel;
import
lombok.Data
;
import
lombok.Data
;
/**
/**
* 室内
气象站信息-年
的Model
* 室内
机风柜信息-天
的Model
* <br>
* <br>
* @author 代码生成器产生
* @author 代码生成器产生
*/
*/
@Data
@Data
public
class
S
nqxzInfoYear
Model
extends
BaseModel
{
public
class
S
ljfgInfoDay
Model
extends
BaseModel
{
/** 主键id */
/** 主键id */
private
java
.
lang
.
String
id
;
private
java
.
lang
.
String
id
;
/** 资源点id */
/** 资源点id */
private
java
.
lang
.
String
resourceId
;
private
java
.
lang
.
String
resourceId
;
/** 温度 */
/** 电能 */
private
java
.
lang
.
String
temperature
;
private
java
.
lang
.
String
electricEnergy
;
/** 湿度 */
private
java
.
lang
.
String
humidity
;
/** CO2 */
private
java
.
lang
.
String
carbonDioxide
;
/** 类型(1手动,2节能) */
/** 类型(1手动,2节能) */
private
Integer
type
;
private
Integer
type
;
/** 站点表id */
/** 站点表id */
...
...
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/model/S
nqxzInfoMonth
Model.java
→
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/model/S
ljfgInfoHour
Model.java
View file @
3e552d54
...
@@ -4,23 +4,19 @@ import com.devplatform.admin.common.model.BaseModel;
...
@@ -4,23 +4,19 @@ import com.devplatform.admin.common.model.BaseModel;
import
lombok.Data
;
import
lombok.Data
;
/**
/**
* 室内
气象站信息-月
的Model
* 室内
机风柜信息-时
的Model
* <br>
* <br>
* @author 代码生成器产生
* @author 代码生成器产生
*/
*/
@Data
@Data
public
class
S
nqxzInfoMonth
Model
extends
BaseModel
{
public
class
S
ljfgInfoHour
Model
extends
BaseModel
{
/** 主键id */
/** 主键id */
private
java
.
lang
.
String
id
;
private
java
.
lang
.
String
id
;
/** 资源点id */
/** 资源点id */
private
java
.
lang
.
String
resourceId
;
private
java
.
lang
.
String
resourceId
;
/** 温度 */
/** 电能 */
private
java
.
lang
.
String
temperature
;
private
java
.
lang
.
String
electricEnergy
;
/** 湿度 */
private
java
.
lang
.
String
humidity
;
/** CO2 */
private
java
.
lang
.
String
carbonDioxide
;
/** 类型(1手动,2节能) */
/** 类型(1手动,2节能) */
private
Integer
type
;
private
Integer
type
;
/** 站点表id */
/** 站点表id */
...
...
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/model/S
nqxzInfoDay
Model.java
→
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/model/S
ljfgInfoMonth
Model.java
View file @
3e552d54
...
@@ -4,30 +4,23 @@ import com.devplatform.admin.common.model.BaseModel;
...
@@ -4,30 +4,23 @@ import com.devplatform.admin.common.model.BaseModel;
import
lombok.Data
;
import
lombok.Data
;
/**
/**
* 室内
气象站信息-天
的Model
* 室内
机风柜信息-月
的Model
* <br>
* <br>
* @author 代码生成器产生
* @author 代码生成器产生
*/
*/
@Data
@Data
public
class
S
nqxzInfoDay
Model
extends
BaseModel
{
public
class
S
ljfgInfoMonth
Model
extends
BaseModel
{
/** 主键id */
/** 主键id */
private
java
.
lang
.
String
id
;
private
java
.
lang
.
String
id
;
/** 资源点id */
/** 资源点id */
private
java
.
lang
.
String
resourceId
;
private
java
.
lang
.
String
resourceId
;
/** 温度 */
/** 电能 */
private
java
.
lang
.
String
temperature
;
private
java
.
lang
.
String
electricEnergy
;
/** 湿度 */
private
java
.
lang
.
String
humidity
;
/** CO2 */
private
java
.
lang
.
String
carbonDioxide
;
/** 类型(1手动,2节能) */
/** 类型(1手动,2节能) */
private
Integer
type
;
private
Integer
type
;
/** 站点表id */
/** 站点表id */
private
java
.
lang
.
String
stationId
;
private
java
.
lang
.
String
stationId
;
/** 创建时间 */
/** 创建时间 */
private
java
.
util
.
Date
createTime
;
private
java
.
util
.
Date
createTime
;
private
String
startTime
;
private
String
endTime
;
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/model/SljfgInfoYearModel.java
0 → 100644
View file @
3e552d54
package
com
.
devplatform
.
admin
.
modules
.
eq
.
model
;
import
com.devplatform.admin.common.model.BaseModel
;
import
lombok.Data
;
/**
* 室内机风柜信息-年的Model
* <br>
* @author 代码生成器产生
*/
@Data
public
class
SljfgInfoYearModel
extends
BaseModel
{
/** 主键id */
private
java
.
lang
.
String
id
;
/** 资源点id */
private
java
.
lang
.
String
resourceId
;
/** 电能 */
private
java
.
lang
.
String
electricEnergy
;
/** 类型(1手动,2节能) */
private
Integer
type
;
/** 站点表id */
private
java
.
lang
.
String
stationId
;
/** 创建时间 */
private
java
.
util
.
Date
createTime
;
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/model/SwqxzInfoDayModel.java
deleted
100644 → 0
View file @
3531f207
package
com
.
devplatform
.
admin
.
modules
.
eq
.
model
;
import
com.devplatform.admin.common.model.BaseModel
;
import
lombok.Data
;
/**
* 室外气象站信息-天的Model
* <br>
* @author 代码生成器产生
*/
@Data
public
class
SwqxzInfoDayModel
extends
BaseModel
{
/** 主键id */
private
java
.
lang
.
String
id
;
/** 资源点id */
private
java
.
lang
.
String
resourceId
;
/** 温度 */
private
java
.
lang
.
String
temperature
;
/** 湿度 */
private
java
.
lang
.
String
humidity
;
/** 风速 */
private
java
.
lang
.
String
windSpeed
;
/** 风向 */
private
java
.
lang
.
String
windDirection
;
/** 光照度 */
private
java
.
lang
.
String
illuminance
;
/** CO2 */
private
java
.
lang
.
String
carbonDioxide
;
/** PM2.5 */
private
java
.
lang
.
String
fineParticles
;
/** 辐射 */
private
java
.
lang
.
String
radiation
;
/** 类型(1手动,2节能) */
private
Integer
type
;
/** 站点表id */
private
java
.
lang
.
String
stationId
;
/** 创建时间 */
private
java
.
util
.
Date
createTime
;
private
String
startTime
;
private
String
endTime
;
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/model/SwqxzInfoMonthModel.java
deleted
100644 → 0
View file @
3531f207
package
com
.
devplatform
.
admin
.
modules
.
eq
.
model
;
import
com.devplatform.admin.common.model.BaseModel
;
import
lombok.Data
;
/**
* 室外气象站信息-月的Model
* <br>
* @author 代码生成器产生
*/
@Data
public
class
SwqxzInfoMonthModel
extends
BaseModel
{
/** 主键id */
private
java
.
lang
.
String
id
;
/** 资源点id */
private
java
.
lang
.
String
resourceId
;
/** 温度 */
private
java
.
lang
.
String
temperature
;
/** 湿度 */
private
java
.
lang
.
String
humidity
;
/** 风速 */
private
java
.
lang
.
String
windSpeed
;
/** 风向 */
private
java
.
lang
.
String
windDirection
;
/** 光照度 */
private
java
.
lang
.
String
illuminance
;
/** CO2 */
private
java
.
lang
.
String
carbonDioxide
;
/** PM2.5 */
private
java
.
lang
.
String
fineParticles
;
/** 辐射 */
private
java
.
lang
.
String
radiation
;
/** 类型(1手动,2节能) */
private
Integer
type
;
/** 站点表id */
private
java
.
lang
.
String
stationId
;
/** 创建时间 */
private
java
.
util
.
Date
createTime
;
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/
SnqxzInfoMonth
Service.java
→
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/
DlxfsnjInfo
Service.java
View file @
3e552d54
...
@@ -2,25 +2,27 @@ package com.devplatform.admin.modules.eq.service;
...
@@ -2,25 +2,27 @@ package com.devplatform.admin.modules.eq.service;
import
com.devplatform.common.service.MyBaseService
;
import
com.devplatform.common.service.MyBaseService
;
import
com.devplatform.admin.modules.eq.bean.
SnqxzInfoMonth
;
import
com.devplatform.admin.modules.eq.bean.
DlxfsnjInfo
;
import
com.devplatform.admin.modules.eq.model.
SnqxzInfoMonth
Model
;
import
com.devplatform.admin.modules.eq.model.
DlxfsnjInfo
Model
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
/**
/**
*
室内气象站信息-月
的service接口
*
多联新风处理机室内机信息
的service接口
* <br>
* <br>
* <b>功能:</b>
SnqxzInfoMonth
Service<br>
* <b>功能:</b>
DlxfsnjInfo
Service<br>
* @author 代码生成器产生
* @author 代码生成器产生
*/
*/
public
interface
SnqxzInfoMonthService
extends
MyBaseService
<
SnqxzInfoMonth
>
{
public
interface
DlxfsnjInfoService
extends
MyBaseService
<
DlxfsnjInfo
>
{
/**
/**
* 查询
室内气象站信息-月
分页数据
* 查询
多联新风处理机室内机信息
分页数据
* @param model
* @param model
* @return
* @return
*/
*/
List
<
SnqxzInfoMonth
>
queryPageList
(
SnqxzInfoMonth
Model
model
);
List
<
DlxfsnjInfo
>
queryPageList
(
DlxfsnjInfo
Model
model
);
List
<
Map
<
String
,
Object
>>
getList
();
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/S
nqxz
InfoDayService.java
→
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/S
ljfg
InfoDayService.java
View file @
3e552d54
...
@@ -3,25 +3,29 @@ package com.devplatform.admin.modules.eq.service;
...
@@ -3,25 +3,29 @@ package com.devplatform.admin.modules.eq.service;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.devplatform.common.service.MyBaseService
;
import
com.devplatform.common.service.MyBaseService
;
import
com.devplatform.admin.modules.eq.bean.S
nqxz
InfoDay
;
import
com.devplatform.admin.modules.eq.bean.S
ljfg
InfoDay
;
import
com.devplatform.admin.modules.eq.model.S
nqxz
InfoDayModel
;
import
com.devplatform.admin.modules.eq.model.S
ljfg
InfoDayModel
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
/**
/**
* 室内
气象站
信息-天的service接口
* 室内
机风柜
信息-天的service接口
* <br>
* <br>
* <b>功能:</b>S
nqxz
InfoDayService<br>
* <b>功能:</b>S
ljfg
InfoDayService<br>
* @author 代码生成器产生
* @author 代码生成器产生
*/
*/
public
interface
S
nqxzInfoDayService
extends
MyBaseService
<
Snqxz
InfoDay
>
{
public
interface
S
ljfgInfoDayService
extends
MyBaseService
<
Sljfg
InfoDay
>
{
/**
/**
* 查询室内
气象站
信息-天分页数据
* 查询室内
机风柜
信息-天分页数据
* @param model
* @param model
* @return
* @return
*/
*/
List
<
SnqxzInfoDay
>
queryPageList
(
SnqxzInfoDayModel
model
);
List
<
SljfgInfoDay
>
queryPageList
(
SljfgInfoDayModel
model
);
Page
<
Map
<
String
,
Object
>>
queryPageListByParam
(
Page
<
Map
<
String
,
Object
>>
pageTask
,
Map
<
String
,
Object
>
params
);
List
<
Map
<
String
,
Object
>>
queryListByParam
(
Integer
type
);
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/S
wqxzInfoDay
Service.java
→
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/S
ljfgInfoHour
Service.java
View file @
3e552d54
...
@@ -3,24 +3,29 @@ package com.devplatform.admin.modules.eq.service;
...
@@ -3,24 +3,29 @@ package com.devplatform.admin.modules.eq.service;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.devplatform.common.service.MyBaseService
;
import
com.devplatform.common.service.MyBaseService
;
import
com.devplatform.admin.modules.eq.bean.S
wqxzInfoDay
;
import
com.devplatform.admin.modules.eq.bean.S
ljfgInfoHour
;
import
com.devplatform.admin.modules.eq.model.S
wqxzInfoDay
Model
;
import
com.devplatform.admin.modules.eq.model.S
ljfgInfoHour
Model
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
/**
/**
* 室
外气象站信息-天
的service接口
* 室
内机风柜信息-时
的service接口
* <br>
* <br>
* <b>功能:</b>S
wqxzInfoDay
Service<br>
* <b>功能:</b>S
ljfgInfoHour
Service<br>
* @author 代码生成器产生
* @author 代码生成器产生
*/
*/
public
interface
S
wqxzInfoDayService
extends
MyBaseService
<
SwqxzInfoDay
>
{
public
interface
S
ljfgInfoHourService
extends
MyBaseService
<
SljfgInfoHour
>
{
/**
/**
* 查询室
外气象站信息-天
分页数据
* 查询室
内机风柜信息-时
分页数据
* @param model
* @param model
* @return
* @return
*/
*/
List
<
SwqxzInfoDay
>
queryPageList
(
SwqxzInfoDayModel
model
);
List
<
SljfgInfoHour
>
queryPageList
(
SljfgInfoHourModel
model
);
Page
<
Map
<
String
,
Object
>>
queryPageListByParam
(
Page
<
Map
<
String
,
Object
>>
pageTask
,
Map
<
String
,
Object
>
params
);
List
<
Map
<
String
,
Object
>>
queryListByParam
(
Integer
type
);
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/SljfgInfoMonthService.java
0 → 100644
View file @
3e552d54
package
com
.
devplatform
.
admin
.
modules
.
eq
.
service
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.devplatform.common.service.MyBaseService
;
import
com.devplatform.admin.modules.eq.bean.SljfgInfoMonth
;
import
com.devplatform.admin.modules.eq.model.SljfgInfoMonthModel
;
import
java.util.List
;
import
java.util.Map
;
/**
* 室内机风柜信息-月的service接口
* <br>
* <b>功能:</b>SljfgInfoMonthService<br>
* @author 代码生成器产生
*/
public
interface
SljfgInfoMonthService
extends
MyBaseService
<
SljfgInfoMonth
>
{
/**
* 查询室内机风柜信息-月分页数据
* @param model
* @return
*/
List
<
SljfgInfoMonth
>
queryPageList
(
SljfgInfoMonthModel
model
);
Page
<
Map
<
String
,
Object
>>
queryPageListByParam
(
Page
<
Map
<
String
,
Object
>>
pageTask
,
Map
<
String
,
Object
>
params
);
List
<
Map
<
String
,
Object
>>
queryListByParam
(
Integer
type
);
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/SljfgInfoService.java
View file @
3e552d54
package
com
.
devplatform
.
admin
.
modules
.
eq
.
service
;
package
com
.
devplatform
.
admin
.
modules
.
eq
.
service
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.devplatform.admin.modules.eq.bean.SljfgInfo
;
import
com.devplatform.admin.modules.eq.bean.SljfgInfo
;
import
com.devplatform.admin.modules.eq.model.SljfgInfoModel
;
import
com.devplatform.admin.modules.eq.model.SljfgInfoModel
;
import
com.devplatform.common.service.MyBaseService
;
import
com.devplatform.common.service.MyBaseService
;
...
@@ -23,4 +24,8 @@ public interface SljfgInfoService extends MyBaseService<SljfgInfo> {
...
@@ -23,4 +24,8 @@ public interface SljfgInfoService extends MyBaseService<SljfgInfo> {
List
<
SljfgInfo
>
queryPageList
(
SljfgInfoModel
model
);
List
<
SljfgInfo
>
queryPageList
(
SljfgInfoModel
model
);
List
<
Map
<
String
,
Object
>>
getList
();
List
<
Map
<
String
,
Object
>>
getList
();
Page
<
Map
<
String
,
Object
>>
queryPageListByParam
(
Page
<
Map
<
String
,
Object
>>
pageTask
,
Map
<
String
,
Object
>
params
);
List
<
Map
<
String
,
Object
>>
queryListByParam
(
Integer
type
);
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/S
nqxz
InfoYearService.java
→
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/S
ljfg
InfoYearService.java
View file @
3e552d54
...
@@ -2,25 +2,26 @@ package com.devplatform.admin.modules.eq.service;
...
@@ -2,25 +2,26 @@ package com.devplatform.admin.modules.eq.service;
import
com.devplatform.common.service.MyBaseService
;
import
com.devplatform.common.service.MyBaseService
;
import
com.devplatform.admin.modules.eq.bean.S
nqxz
InfoYear
;
import
com.devplatform.admin.modules.eq.bean.S
ljfg
InfoYear
;
import
com.devplatform.admin.modules.eq.model.S
nqxz
InfoYearModel
;
import
com.devplatform.admin.modules.eq.model.S
ljfg
InfoYearModel
;
import
java.util.List
;
import
java.util.List
;
/**
/**
* 室内
气象站
信息-年的service接口
* 室内
机风柜
信息-年的service接口
* <br>
* <br>
* <b>功能:</b>S
nqxz
InfoYearService<br>
* <b>功能:</b>S
ljfg
InfoYearService<br>
* @author 代码生成器产生
* @author 代码生成器产生
*/
*/
public
interface
S
nqxzInfoYearService
extends
MyBaseService
<
Snqxz
InfoYear
>
{
public
interface
S
ljfgInfoYearService
extends
MyBaseService
<
Sljfg
InfoYear
>
{
/**
/**
* 查询室内
气象站
信息-年分页数据
* 查询室内
机风柜
信息-年分页数据
* @param model
* @param model
* @return
* @return
*/
*/
List
<
SnqxzInfoYear
>
queryPageList
(
SnqxzInfoYearModel
model
);
List
<
SljfgInfoYear
>
queryPageList
(
SljfgInfoYearModel
model
);
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/SwqxzInfoMonthService.java
deleted
100644 → 0
View file @
3531f207
package
com
.
devplatform
.
admin
.
modules
.
eq
.
service
;
import
com.devplatform.common.service.MyBaseService
;
import
com.devplatform.admin.modules.eq.bean.SwqxzInfoMonth
;
import
com.devplatform.admin.modules.eq.model.SwqxzInfoMonthModel
;
import
java.util.List
;
/**
* 室外气象站信息-月的service接口
* <br>
* <b>功能:</b>SwqxzInfoMonthService<br>
* @author 代码生成器产生
*/
public
interface
SwqxzInfoMonthService
extends
MyBaseService
<
SwqxzInfoMonth
>
{
/**
* 查询室外气象站信息-月分页数据
* @param model
* @return
*/
List
<
SwqxzInfoMonth
>
queryPageList
(
SwqxzInfoMonthModel
model
);
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/SwqxzInfoYearService.java
deleted
100644 → 0
View file @
3531f207
package
com
.
devplatform
.
admin
.
modules
.
eq
.
service
;
import
com.devplatform.common.service.MyBaseService
;
import
com.devplatform.admin.modules.eq.bean.SwqxzInfoYear
;
import
com.devplatform.admin.modules.eq.model.SwqxzInfoYearModel
;
import
java.util.List
;
/**
* 室外气象站信息-年的service接口
* <br>
* <b>功能:</b>SwqxzInfoYearService<br>
* @author 代码生成器产生
*/
public
interface
SwqxzInfoYearService
extends
MyBaseService
<
SwqxzInfoYear
>
{
/**
* 查询室外气象站信息-年分页数据
* @param model
* @return
*/
List
<
SwqxzInfoYear
>
queryPageList
(
SwqxzInfoYearModel
model
);
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/AnalysisServiceImpl.java
View file @
3e552d54
...
@@ -36,6 +36,8 @@ public class AnalysisServiceImpl implements AnalysisService {
...
@@ -36,6 +36,8 @@ public class AnalysisServiceImpl implements AnalysisService {
private
PfjInfoService
pfjInfoService
;
private
PfjInfoService
pfjInfoService
;
@Autowired
@Autowired
private
DlswjInfoService
dlswjInfoService
;
private
DlswjInfoService
dlswjInfoService
;
@Autowired
private
SljfgInfoService
sljfgInfoService
;
@Override
@Override
public
Map
<
String
,
Object
>
getSyParam
(){
public
Map
<
String
,
Object
>
getSyParam
(){
...
@@ -123,7 +125,7 @@ public class AnalysisServiceImpl implements AnalysisService {
...
@@ -123,7 +125,7 @@ public class AnalysisServiceImpl implements AnalysisService {
page
=
jfktpInfoService
.
queryPageListByParam
(
pageTask
,
params
);
page
=
jfktpInfoService
.
queryPageListByParam
(
pageTask
,
params
);
}
else
if
(
Constants
.
ID_JFKTG
.
equals
(
resourceType
)){
}
else
if
(
Constants
.
ID_JFKTG
.
equals
(
resourceType
)){
page
=
jfktgInfoService
.
queryPageListByParam
(
pageTask
,
params
);
page
=
jfktgInfoService
.
queryPageListByParam
(
pageTask
,
params
);
}
else
if
(
Constants
.
ID_
FH
JLM
.
equals
(
resourceType
)){
}
else
if
(
Constants
.
ID_JLM
.
equals
(
resourceType
)){
}
else
if
(
Constants
.
ID_FLRBJZ
.
equals
(
resourceType
)){
}
else
if
(
Constants
.
ID_FLRBJZ
.
equals
(
resourceType
)){
page
=
flrbInfoService
.
queryPageListByParam
(
pageTask
,
params
);
page
=
flrbInfoService
.
queryPageListByParam
(
pageTask
,
params
);
...
@@ -131,6 +133,8 @@ public class AnalysisServiceImpl implements AnalysisService {
...
@@ -131,6 +133,8 @@ public class AnalysisServiceImpl implements AnalysisService {
}
else
if
(
Constants
.
ID_SLSWJ
.
equals
(
resourceType
)){
}
else
if
(
Constants
.
ID_SLSWJ
.
equals
(
resourceType
)){
page
=
dlswjInfoService
.
queryPageListByParam
(
pageTask
,
params
);
page
=
dlswjInfoService
.
queryPageListByParam
(
pageTask
,
params
);
}
else
if
(
Constants
.
ID_SLJFG
.
equals
(
resourceType
)){
page
=
sljfgInfoService
.
queryPageListByParam
(
pageTask
,
params
);
}
}
List
<
List
<
String
>>
listTj
=
new
ArrayList
<
List
<
String
>>();
List
<
List
<
String
>>
listTj
=
new
ArrayList
<
List
<
String
>>();
...
@@ -160,12 +164,12 @@ public class AnalysisServiceImpl implements AnalysisService {
...
@@ -160,12 +164,12 @@ public class AnalysisServiceImpl implements AnalysisService {
list
=
jfktpInfoService
.
queryListByParam
(
type
);
list
=
jfktpInfoService
.
queryListByParam
(
type
);
}
else
if
(
Constants
.
ID_JFKTG
.
equals
(
resourceType
)){
}
else
if
(
Constants
.
ID_JFKTG
.
equals
(
resourceType
)){
list
=
jfktgInfoService
.
queryListByParam
(
type
);
list
=
jfktgInfoService
.
queryListByParam
(
type
);
}
else
if
(
Constants
.
ID_
FH
JLM
.
equals
(
resourceType
)){
}
else
if
(
Constants
.
ID_JLM
.
equals
(
resourceType
)){
}
else
if
(
Constants
.
ID_FLRBJZ
.
equals
(
resourceType
)){
}
else
if
(
Constants
.
ID_FLRBJZ
.
equals
(
resourceType
)){
list
=
flrbInfoService
.
queryListByParam
(
type
);
list
=
flrbInfoService
.
queryListByParam
(
type
);
}
else
if
(
Constants
.
ID_SLJFG
.
equals
(
resourceType
)){
}
else
if
(
Constants
.
ID_SLJFG
.
equals
(
resourceType
)){
list
=
sljfgInfoService
.
queryListByParam
(
type
);
}
else
if
(
Constants
.
ID_SLSWJ
.
equals
(
resourceType
)){
}
else
if
(
Constants
.
ID_SLSWJ
.
equals
(
resourceType
)){
list
=
dlswjInfoService
.
queryListByParam
(
type
);
list
=
dlswjInfoService
.
queryListByParam
(
type
);
}
}
...
...
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/
SwqxzInfoDay
ServiceImpl.java
→
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/
DlxfsnjInfo
ServiceImpl.java
View file @
3e552d54
package
com
.
devplatform
.
admin
.
modules
.
eq
.
service
.
impl
;
package
com
.
devplatform
.
admin
.
modules
.
eq
.
service
.
impl
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.devplatform.admin.modules.eq.bean.DlxfsnjInfo
;
import
org.springframework.stereotype.Service
;
import
com.devplatform.admin.modules.eq.dao.DlxfsnjInfoDao
;
import
com.devplatform.admin.modules.eq.model.DlxfsnjInfoModel
;
import
com.devplatform.admin.modules.eq.model.SwqxzInfoDayModel
;
import
com.devplatform.admin.modules.eq.service.DlxfsnjInfoService
;
import
com.devplatform.admin.modules.eq.bean.SwqxzInfoDay
;
import
com.devplatform.admin.modules.eq.dao.SwqxzInfoDayDao
;
import
com.devplatform.admin.modules.eq.service.SwqxzInfoDayService
;
import
com.devplatform.common.service.impl.MyBaseServiceImpl
;
import
com.devplatform.common.service.impl.MyBaseServiceImpl
;
import
org.springframework.stereotype.Service
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
/**
/**
*
室外气象站信息-天
的service接口实现类
*
多联新风处理机室内机信息
的service接口实现类
* <br>
* <br>
* <b>功能:</b>
SwqxzInfoDay
ServiceImpl<br>
* <b>功能:</b>
DlxfsnjInfo
ServiceImpl<br>
* @author 代码生成器产生
* @author 代码生成器产生
*/
*/
@Service
(
"
swqxzInfoDay
Service"
)
@Service
(
"
dlxfsnjInfo
Service"
)
public
class
SwqxzInfoDayServiceImpl
extends
MyBaseServiceImpl
<
SwqxzInfoDayDao
,
SwqxzInfoDay
>
implements
SwqxzInfoDay
Service
{
public
class
DlxfsnjInfoServiceImpl
extends
MyBaseServiceImpl
<
DlxfsnjInfoDao
,
DlxfsnjInfo
>
implements
DlxfsnjInfo
Service
{
@Override
@Override
public
List
<
SwqxzInfoDay
>
queryPageList
(
SwqxzInfoDay
Model
model
)
{
public
List
<
DlxfsnjInfo
>
queryPageList
(
DlxfsnjInfo
Model
model
)
{
Integer
rowCount
=
baseMapper
.
queryPageByCount
(
model
);
Integer
rowCount
=
baseMapper
.
queryPageByCount
(
model
);
model
.
getPager
().
setRowCount
(
rowCount
);
model
.
getPager
().
setRowCount
(
rowCount
);
return
baseMapper
.
queryPageList
(
model
);
return
baseMapper
.
queryPageList
(
model
);
}
}
@Override
public
List
<
Map
<
String
,
Object
>>
getList
()
{
return
baseMapper
.
getList
();
}
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/EquipmentServiceImpl.java
View file @
3e552d54
...
@@ -39,6 +39,8 @@ public class EquipmentServiceImpl implements EquipmentService {
...
@@ -39,6 +39,8 @@ public class EquipmentServiceImpl implements EquipmentService {
private
AnalysisService
analysisService
;
private
AnalysisService
analysisService
;
@Autowired
@Autowired
private
SnqxzInfoHourService
snqxzInfoHourService
;
private
SnqxzInfoHourService
snqxzInfoHourService
;
@Autowired
private
DlxfsnjInfoService
dlxfsnjInfoService
;
@Override
@Override
public
Map
<
String
,
Object
>
getList
()
{
public
Map
<
String
,
Object
>
getList
()
{
...
@@ -63,6 +65,8 @@ public class EquipmentServiceImpl implements EquipmentService {
...
@@ -63,6 +65,8 @@ public class EquipmentServiceImpl implements EquipmentService {
List
<
Map
<
String
,
Object
>>
snqxzList
=
snqxzInfoService
.
getList
();
List
<
Map
<
String
,
Object
>>
snqxzList
=
snqxzInfoService
.
getList
();
//室外气象站
//室外气象站
List
<
Map
<
String
,
Object
>>
swqxzList
=
swqxzInfoService
.
getList
();
List
<
Map
<
String
,
Object
>>
swqxzList
=
swqxzInfoService
.
getList
();
//多联新风处理机室内机
List
<
Map
<
String
,
Object
>>
dlxfsnjList
=
dlxfsnjInfoService
.
getList
();
List
<
Map
<
String
,
Object
>>
snqxMaps
=
snqxzInfoHourService
.
getParamGroupByRegion
();
List
<
Map
<
String
,
Object
>>
snqxMaps
=
snqxzInfoHourService
.
getParamGroupByRegion
();
for
(
Map
<
String
,
Object
>
temp
:
snqxMaps
){
for
(
Map
<
String
,
Object
>
temp
:
snqxMaps
){
...
@@ -82,6 +86,7 @@ public class EquipmentServiceImpl implements EquipmentService {
...
@@ -82,6 +86,7 @@ public class EquipmentServiceImpl implements EquipmentService {
map
.
put
(
"sljfgList"
,
sljfgList
);
//室内机风柜
map
.
put
(
"sljfgList"
,
sljfgList
);
//室内机风柜
map
.
put
(
"snqxzList"
,
snqxzList
);
//室内气象站
map
.
put
(
"snqxzList"
,
snqxzList
);
//室内气象站
map
.
put
(
"swqxzList"
,
swqxzList
);
//室外气象站
map
.
put
(
"swqxzList"
,
swqxzList
);
//室外气象站
map
.
put
(
"dlxfsnjList"
,
dlxfsnjList
);
//多联新风处理机室内机
map
.
put
(
"syBean"
,
analysisService
.
getSyParam
());
//首页数据
map
.
put
(
"syBean"
,
analysisService
.
getSyParam
());
//首页数据
return
map
;
return
map
;
}
}
...
...
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/KanBanServiceImpl.java
View file @
3e552d54
...
@@ -28,6 +28,8 @@ public class KanBanServiceImpl implements KanBanService {
...
@@ -28,6 +28,8 @@ public class KanBanServiceImpl implements KanBanService {
private
SwqxzInfoHourService
swqxzInfoHourService
;
private
SwqxzInfoHourService
swqxzInfoHourService
;
@Autowired
@Autowired
private
DlswjInfoService
dlswjInfoService
;
private
DlswjInfoService
dlswjInfoService
;
@Autowired
private
SljfgInfoService
sljfgInfoService
;
@Override
@Override
public
Page
<
Map
<
String
,
Object
>>
getListByTypeAndId
(
Map
<
String
,
Object
>
params
)
{
public
Page
<
Map
<
String
,
Object
>>
getListByTypeAndId
(
Map
<
String
,
Object
>
params
)
{
...
@@ -43,12 +45,12 @@ public class KanBanServiceImpl implements KanBanService {
...
@@ -43,12 +45,12 @@ public class KanBanServiceImpl implements KanBanService {
list
=
jfktpInfoService
.
queryPageListByParam
(
pageTask
,
params
);
list
=
jfktpInfoService
.
queryPageListByParam
(
pageTask
,
params
);
}
else
if
(
Constants
.
ID_JFKTG
.
equals
(
resourceType
)){
}
else
if
(
Constants
.
ID_JFKTG
.
equals
(
resourceType
)){
list
=
jfktgInfoService
.
queryPageListByParam
(
pageTask
,
params
);
list
=
jfktgInfoService
.
queryPageListByParam
(
pageTask
,
params
);
}
else
if
(
Constants
.
ID_
FH
JLM
.
equals
(
resourceType
)){
}
else
if
(
Constants
.
ID_JLM
.
equals
(
resourceType
)){
}
else
if
(
Constants
.
ID_FLRBJZ
.
equals
(
resourceType
)){
}
else
if
(
Constants
.
ID_FLRBJZ
.
equals
(
resourceType
)){
list
=
flrbInfoService
.
queryPageListByParam
(
pageTask
,
params
);
list
=
flrbInfoService
.
queryPageListByParam
(
pageTask
,
params
);
}
else
if
(
Constants
.
ID_SLJFG
.
equals
(
resourceType
)){
}
else
if
(
Constants
.
ID_SLJFG
.
equals
(
resourceType
)){
list
=
sljfgInfoService
.
queryPageListByParam
(
pageTask
,
params
);
}
else
if
(
Constants
.
ID_SB
.
equals
(
resourceType
)){
}
else
if
(
Constants
.
ID_SB
.
equals
(
resourceType
)){
}
else
if
(
Constants
.
ID_SWQXZ
.
equals
(
resourceType
)){
}
else
if
(
Constants
.
ID_SWQXZ
.
equals
(
resourceType
)){
...
@@ -59,7 +61,9 @@ public class KanBanServiceImpl implements KanBanService {
...
@@ -59,7 +61,9 @@ public class KanBanServiceImpl implements KanBanService {
list
=
dlswjInfoService
.
queryPageListByParam
(
pageTask
,
params
);
list
=
dlswjInfoService
.
queryPageListByParam
(
pageTask
,
params
);
}
else
if
(
Constants
.
ID_SNQXZ
.
equals
(
resourceType
)){
}
else
if
(
Constants
.
ID_SNQXZ
.
equals
(
resourceType
)){
list
=
snqxzInfoHourService
.
queryPageListByParam
(
pageTask
,
params
);
list
=
snqxzInfoHourService
.
queryPageListByParam
(
pageTask
,
params
);
}
else
if
(
Constants
.
ID_HQS
.
equals
(
resourceType
)){
}
else
if
(
Constants
.
ID_FYC
.
equals
(
resourceType
)){
}
else
if
(
Constants
.
ID_DLXFSNJ
.
equals
(
resourceType
)){
}
}
return
list
;
return
list
;
...
...
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/S
wqxzInfoMonth
ServiceImpl.java
→
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/S
ljfgInfoDay
ServiceImpl.java
View file @
3e552d54
package
com
.
devplatform
.
admin
.
modules
.
eq
.
service
.
impl
;
package
com
.
devplatform
.
admin
.
modules
.
eq
.
service
.
impl
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
com.devplatform.admin.modules.eq.model.S
wqxzInfoMonth
Model
;
import
com.devplatform.admin.modules.eq.model.S
ljfgInfoDay
Model
;
import
com.devplatform.admin.modules.eq.bean.S
wqxzInfoMonth
;
import
com.devplatform.admin.modules.eq.bean.S
ljfgInfoDay
;
import
com.devplatform.admin.modules.eq.dao.S
wqxzInfoMonth
Dao
;
import
com.devplatform.admin.modules.eq.dao.S
ljfgInfoDay
Dao
;
import
com.devplatform.admin.modules.eq.service.S
wqxzInfoMonth
Service
;
import
com.devplatform.admin.modules.eq.service.S
ljfgInfoDay
Service
;
import
com.devplatform.common.service.impl.MyBaseServiceImpl
;
import
com.devplatform.common.service.impl.MyBaseServiceImpl
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
/**
/**
* 室
外气象站信息-月
的service接口实现类
* 室
内机风柜信息-天
的service接口实现类
* <br>
* <br>
* <b>功能:</b>S
wqxzInfoMonth
ServiceImpl<br>
* <b>功能:</b>S
ljfgInfoDay
ServiceImpl<br>
* @author 代码生成器产生
* @author 代码生成器产生
*/
*/
@Service
(
"s
wqxzInfoMonth
Service"
)
@Service
(
"s
ljfgInfoDay
Service"
)
public
class
S
wqxzInfoMonthServiceImpl
extends
MyBaseServiceImpl
<
SwqxzInfoMonthDao
,
SwqxzInfoMonth
>
implements
SwqxzInfoMonth
Service
{
public
class
S
ljfgInfoDayServiceImpl
extends
MyBaseServiceImpl
<
SljfgInfoDayDao
,
SljfgInfoDay
>
implements
SljfgInfoDay
Service
{
@Override
@Override
public
List
<
S
wqxzInfoMonth
>
queryPageList
(
SwqxzInfoMonth
Model
model
)
{
public
List
<
S
ljfgInfoDay
>
queryPageList
(
SljfgInfoDay
Model
model
)
{
Integer
rowCount
=
baseMapper
.
queryPageByCount
(
model
);
Integer
rowCount
=
baseMapper
.
queryPageByCount
(
model
);
model
.
getPager
().
setRowCount
(
rowCount
);
model
.
getPager
().
setRowCount
(
rowCount
);
return
baseMapper
.
queryPageList
(
model
);
return
baseMapper
.
queryPageList
(
model
);
}
}
@Override
public
Page
<
Map
<
String
,
Object
>>
queryPageListByParam
(
Page
<
Map
<
String
,
Object
>>
pageTask
,
Map
<
String
,
Object
>
params
)
{
return
baseMapper
.
queryPageListByParam
(
pageTask
,
params
);
}
@Override
public
List
<
Map
<
String
,
Object
>>
queryListByParam
(
Integer
type
)
{
return
baseMapper
.
queryListByParam
(
type
);
}
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/S
wqxzInfoYea
rServiceImpl.java
→
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/S
ljfgInfoHou
rServiceImpl.java
View file @
3e552d54
package
com
.
devplatform
.
admin
.
modules
.
eq
.
service
.
impl
;
package
com
.
devplatform
.
admin
.
modules
.
eq
.
service
.
impl
;
import
org.springframework.stereotype.Service
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.devplatform.admin.modules.eq.bean.SljfgInfoHour
;
import
com.devplatform.admin.modules.eq.model.SwqxzInfoYearModel
;
import
com.devplatform.admin.modules.eq.dao.SljfgInfoHourDao
;
import
com.devplatform.admin.modules.eq.bean.SwqxzInfoYear
;
import
com.devplatform.admin.modules.eq.model.SljfgInfoHourModel
;
import
com.devplatform.admin.modules.eq.dao.SwqxzInfoYearDao
;
import
com.devplatform.admin.modules.eq.service.SljfgInfoHourService
;
import
com.devplatform.admin.modules.eq.service.SwqxzInfoYearService
;
import
com.devplatform.common.service.impl.MyBaseServiceImpl
;
import
com.devplatform.common.service.impl.MyBaseServiceImpl
;
import
org.springframework.stereotype.Service
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
/**
/**
* 室
外气象站信息-年
的service接口实现类
* 室
内机风柜信息-时
的service接口实现类
* <br>
* <br>
* <b>功能:</b>S
wqxzInfoYea
rServiceImpl<br>
* <b>功能:</b>S
ljfgInfoHou
rServiceImpl<br>
* @author 代码生成器产生
* @author 代码生成器产生
*/
*/
@Service
(
"s
wqxzInfoYea
rService"
)
@Service
(
"s
ljfgInfoHou
rService"
)
public
class
S
wqxzInfoYearServiceImpl
extends
MyBaseServiceImpl
<
SwqxzInfoYearDao
,
SwqxzInfoYear
>
implements
SwqxzInfoYea
rService
{
public
class
S
ljfgInfoHourServiceImpl
extends
MyBaseServiceImpl
<
SljfgInfoHourDao
,
SljfgInfoHour
>
implements
SljfgInfoHou
rService
{
@Override
@Override
public
List
<
S
wqxzInfoYear
>
queryPageList
(
SwqxzInfoYea
rModel
model
)
{
public
List
<
S
ljfgInfoHour
>
queryPageList
(
SljfgInfoHou
rModel
model
)
{
Integer
rowCount
=
baseMapper
.
queryPageByCount
(
model
);
Integer
rowCount
=
baseMapper
.
queryPageByCount
(
model
);
model
.
getPager
().
setRowCount
(
rowCount
);
model
.
getPager
().
setRowCount
(
rowCount
);
return
baseMapper
.
queryPageList
(
model
);
return
baseMapper
.
queryPageList
(
model
);
}
}
@Override
public
Page
<
Map
<
String
,
Object
>>
queryPageListByParam
(
Page
<
Map
<
String
,
Object
>>
pageTask
,
Map
<
String
,
Object
>
params
)
{
return
baseMapper
.
queryPageListByParam
(
pageTask
,
params
);
}
@Override
public
List
<
Map
<
String
,
Object
>>
queryListByParam
(
Integer
type
)
{
return
baseMapper
.
queryListByParam
(
type
);
}
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/S
nqxz
InfoMonthServiceImpl.java
→
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/S
ljfg
InfoMonthServiceImpl.java
View file @
3e552d54
package
com
.
devplatform
.
admin
.
modules
.
eq
.
service
.
impl
;
package
com
.
devplatform
.
admin
.
modules
.
eq
.
service
.
impl
;
import
com.devplatform.admin.modules.eq.bean.SnqxzInfoMonth
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.devplatform.admin.modules.eq.dao.SnqxzInfoMonthDao
;
import
com.devplatform.admin.modules.eq.bean.SljfgInfoMonth
;
import
com.devplatform.admin.modules.eq.model.SnqxzInfoMonthModel
;
import
com.devplatform.admin.modules.eq.dao.SljfgInfoMonthDao
;
import
com.devplatform.admin.modules.eq.service.SnqxzInfoMonthService
;
import
com.devplatform.admin.modules.eq.model.SljfgInfoMonthModel
;
import
com.devplatform.admin.modules.eq.service.SljfgInfoMonthService
;
import
com.devplatform.common.service.impl.MyBaseServiceImpl
;
import
com.devplatform.common.service.impl.MyBaseServiceImpl
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
/**
/**
* 室内
气象站
信息-月的service接口实现类
* 室内
机风柜
信息-月的service接口实现类
* <br>
* <br>
* <b>功能:</b>S
nqxz
InfoMonthServiceImpl<br>
* <b>功能:</b>S
ljfg
InfoMonthServiceImpl<br>
* @author 代码生成器产生
* @author 代码生成器产生
*/
*/
@Service
(
"s
nqxz
InfoMonthService"
)
@Service
(
"s
ljfg
InfoMonthService"
)
public
class
S
nqxzInfoMonthServiceImpl
extends
MyBaseServiceImpl
<
SnqxzInfoMonthDao
,
SnqxzInfoMonth
>
implements
Snqxz
InfoMonthService
{
public
class
S
ljfgInfoMonthServiceImpl
extends
MyBaseServiceImpl
<
SljfgInfoMonthDao
,
SljfgInfoMonth
>
implements
Sljfg
InfoMonthService
{
@Override
@Override
public
List
<
S
nqxzInfoMonth
>
queryPageList
(
Snqxz
InfoMonthModel
model
)
{
public
List
<
S
ljfgInfoMonth
>
queryPageList
(
Sljfg
InfoMonthModel
model
)
{
Integer
rowCount
=
baseMapper
.
queryPageByCount
(
model
);
Integer
rowCount
=
baseMapper
.
queryPageByCount
(
model
);
model
.
getPager
().
setRowCount
(
rowCount
);
model
.
getPager
().
setRowCount
(
rowCount
);
return
baseMapper
.
queryPageList
(
model
);
return
baseMapper
.
queryPageList
(
model
);
}
}
@Override
public
Page
<
Map
<
String
,
Object
>>
queryPageListByParam
(
Page
<
Map
<
String
,
Object
>>
pageTask
,
Map
<
String
,
Object
>
params
)
{
return
baseMapper
.
queryPageListByParam
(
pageTask
,
params
);
}
@Override
public
List
<
Map
<
String
,
Object
>>
queryListByParam
(
Integer
type
)
{
return
baseMapper
.
queryListByParam
(
type
);
}
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/SljfgInfoServiceImpl.java
View file @
3e552d54
package
com
.
devplatform
.
admin
.
modules
.
eq
.
service
.
impl
;
package
com
.
devplatform
.
admin
.
modules
.
eq
.
service
.
impl
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.devplatform.admin.common.utils.Constants
;
import
com.devplatform.admin.modules.eq.bean.SljfgInfo
;
import
com.devplatform.admin.modules.eq.bean.SljfgInfo
;
import
com.devplatform.admin.modules.eq.dao.SljfgInfoDao
;
import
com.devplatform.admin.modules.eq.dao.SljfgInfoDao
;
import
com.devplatform.admin.modules.eq.model.SljfgInfoModel
;
import
com.devplatform.admin.modules.eq.model.SljfgInfoModel
;
import
com.devplatform.admin.modules.eq.service.SljfgInfoDayService
;
import
com.devplatform.admin.modules.eq.service.SljfgInfoHourService
;
import
com.devplatform.admin.modules.eq.service.SljfgInfoMonthService
;
import
com.devplatform.admin.modules.eq.service.SljfgInfoService
;
import
com.devplatform.admin.modules.eq.service.SljfgInfoService
;
import
com.devplatform.common.service.impl.MyBaseServiceImpl
;
import
com.devplatform.common.service.impl.MyBaseServiceImpl
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -18,6 +25,12 @@ import java.util.Map;
...
@@ -18,6 +25,12 @@ import java.util.Map;
*/
*/
@Service
(
"sljfgInfoService"
)
@Service
(
"sljfgInfoService"
)
public
class
SljfgInfoServiceImpl
extends
MyBaseServiceImpl
<
SljfgInfoDao
,
SljfgInfo
>
implements
SljfgInfoService
{
public
class
SljfgInfoServiceImpl
extends
MyBaseServiceImpl
<
SljfgInfoDao
,
SljfgInfo
>
implements
SljfgInfoService
{
@Autowired
private
SljfgInfoHourService
sljfgInfoHourService
;
@Autowired
private
SljfgInfoDayService
sljfgInfoDayService
;
@Autowired
private
SljfgInfoMonthService
sljfgInfoMonthService
;
@Override
@Override
public
List
<
SljfgInfo
>
queryPageList
(
SljfgInfoModel
model
)
{
public
List
<
SljfgInfo
>
queryPageList
(
SljfgInfoModel
model
)
{
...
@@ -31,4 +44,31 @@ public class SljfgInfoServiceImpl extends MyBaseServiceImpl<SljfgInfoDao, SljfgI
...
@@ -31,4 +44,31 @@ public class SljfgInfoServiceImpl extends MyBaseServiceImpl<SljfgInfoDao, SljfgI
return
baseMapper
.
getList
();
return
baseMapper
.
getList
();
}
}
@Override
public
Page
<
Map
<
String
,
Object
>>
queryPageListByParam
(
Page
<
Map
<
String
,
Object
>>
pageTask
,
Map
<
String
,
Object
>
params
)
{
String
type
=
params
.
get
(
"type"
).
toString
();
Page
<
Map
<
String
,
Object
>>
page
=
new
Page
<
Map
<
String
,
Object
>>();
if
(
Constants
.
STRING_1
.
equals
(
type
)){
page
=
sljfgInfoHourService
.
queryPageListByParam
(
pageTask
,
params
);
}
else
if
(
Constants
.
STRING_2
.
equals
(
type
)
||
Constants
.
STRING_3
.
equals
(
type
)){
page
=
sljfgInfoDayService
.
queryPageListByParam
(
pageTask
,
params
);
}
else
if
(
Constants
.
STRING_4
.
equals
(
type
)){
page
=
sljfgInfoMonthService
.
queryPageListByParam
(
pageTask
,
params
);
}
return
page
;
}
@Override
public
List
<
Map
<
String
,
Object
>>
queryListByParam
(
Integer
type
)
{
List
<
Map
<
String
,
Object
>>
list
=
new
ArrayList
<>();
if
(
type
==
Constants
.
INT_1
){
list
=
sljfgInfoHourService
.
queryListByParam
(
type
);
}
else
if
(
type
==
Constants
.
INT_2
||
type
==
Constants
.
INT_3
){
list
=
sljfgInfoDayService
.
queryListByParam
(
type
);
}
else
if
(
type
==
Constants
.
INT_4
){
list
=
sljfgInfoMonthService
.
queryListByParam
(
type
);
}
return
list
;
}
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/S
nqxz
InfoYearServiceImpl.java
→
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/S
ljfg
InfoYearServiceImpl.java
View file @
3e552d54
package
com
.
devplatform
.
admin
.
modules
.
eq
.
service
.
impl
;
package
com
.
devplatform
.
admin
.
modules
.
eq
.
service
.
impl
;
import
com.devplatform.admin.modules.eq.bean.S
nqxz
InfoYear
;
import
com.devplatform.admin.modules.eq.bean.S
ljfg
InfoYear
;
import
com.devplatform.admin.modules.eq.dao.S
nqxz
InfoYearDao
;
import
com.devplatform.admin.modules.eq.dao.S
ljfg
InfoYearDao
;
import
com.devplatform.admin.modules.eq.model.S
nqxz
InfoYearModel
;
import
com.devplatform.admin.modules.eq.model.S
ljfg
InfoYearModel
;
import
com.devplatform.admin.modules.eq.service.S
nqxz
InfoYearService
;
import
com.devplatform.admin.modules.eq.service.S
ljfg
InfoYearService
;
import
com.devplatform.common.service.impl.MyBaseServiceImpl
;
import
com.devplatform.common.service.impl.MyBaseServiceImpl
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
import
java.util.List
;
/**
/**
* 室内
气象站
信息-年的service接口实现类
* 室内
机风柜
信息-年的service接口实现类
* <br>
* <br>
* <b>功能:</b>S
nqxz
InfoYearServiceImpl<br>
* <b>功能:</b>S
ljfg
InfoYearServiceImpl<br>
* @author 代码生成器产生
* @author 代码生成器产生
*/
*/
@Service
(
"s
nqxz
InfoYearService"
)
@Service
(
"s
ljfg
InfoYearService"
)
public
class
S
nqxzInfoYearServiceImpl
extends
MyBaseServiceImpl
<
SnqxzInfoYearDao
,
SnqxzInfoYear
>
implements
Snqxz
InfoYearService
{
public
class
S
ljfgInfoYearServiceImpl
extends
MyBaseServiceImpl
<
SljfgInfoYearDao
,
SljfgInfoYear
>
implements
Sljfg
InfoYearService
{
@Override
@Override
public
List
<
S
nqxzInfoYear
>
queryPageList
(
Snqxz
InfoYearModel
model
)
{
public
List
<
S
ljfgInfoYear
>
queryPageList
(
Sljfg
InfoYearModel
model
)
{
Integer
rowCount
=
baseMapper
.
queryPageByCount
(
model
);
Integer
rowCount
=
baseMapper
.
queryPageByCount
(
model
);
model
.
getPager
().
setRowCount
(
rowCount
);
model
.
getPager
().
setRowCount
(
rowCount
);
return
baseMapper
.
queryPageList
(
model
);
return
baseMapper
.
queryPageList
(
model
);
}
}
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/SnqxzInfoDayServiceImpl.java
deleted
100644 → 0
View file @
3531f207
package
com
.
devplatform
.
admin
.
modules
.
eq
.
service
.
impl
;
import
com.devplatform.admin.modules.eq.bean.SnqxzInfoDay
;
import
com.devplatform.admin.modules.eq.dao.SnqxzInfoDayDao
;
import
com.devplatform.admin.modules.eq.model.SnqxzInfoDayModel
;
import
com.devplatform.admin.modules.eq.service.SnqxzInfoDayService
;
import
com.devplatform.common.service.impl.MyBaseServiceImpl
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
/**
* 室内气象站信息-天的service接口实现类
* <br>
* <b>功能:</b>SnqxzInfoDayServiceImpl<br>
* @author 代码生成器产生
*/
@Service
(
"snqxzInfoDayService"
)
public
class
SnqxzInfoDayServiceImpl
extends
MyBaseServiceImpl
<
SnqxzInfoDayDao
,
SnqxzInfoDay
>
implements
SnqxzInfoDayService
{
@Override
public
List
<
SnqxzInfoDay
>
queryPageList
(
SnqxzInfoDayModel
model
)
{
Integer
rowCount
=
baseMapper
.
queryPageByCount
(
model
);
model
.
getPager
().
setRowCount
(
rowCount
);
return
baseMapper
.
queryPageList
(
model
);
}
}
microservice-admin/src/main/resources/mapper/eq/
SwqxzInfoDay
Mapper.xml
→
microservice-admin/src/main/resources/mapper/eq/
DlxfsnjInfo
Mapper.xml
View file @
3e552d54
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<!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.devplatform.admin.modules.eq.dao.
SwqxzInfoDay
Dao"
>
<mapper
namespace=
"com.devplatform.admin.modules.eq.dao.
DlxfsnjInfo
Dao"
>
<!-- Result Map -->
<!-- Result Map -->
<resultMap
id=
"BaseResultMap"
type=
"com.devplatform.admin.modules.eq.bean.
SwqxzInfoDay
"
>
<resultMap
id=
"BaseResultMap"
type=
"com.devplatform.admin.modules.eq.bean.
DlxfsnjInfo
"
>
<result
column=
"id"
property=
"id"
/>
<result
column=
"id"
property=
"id"
/>
<result
column=
"resource_id"
property=
"resourceId"
/>
<result
column=
"resource_id"
property=
"resourceId"
/>
<result
column=
"temperature"
property=
"temperature"
/>
<result
column=
"setting_temperature"
property=
"settingTemperature"
/>
<result
column=
"humidity"
property=
"humidity"
/>
<result
column=
"setting_mode"
property=
"settingMode"
/>
<result
column=
"wind_speed"
property=
"windSpeed"
/>
<result
column=
"setting_wind_speed"
property=
"settingWindSpeed"
/>
<result
column=
"wind_direction"
property=
"windDirection"
/>
<result
column=
"fault_alarm"
property=
"faultAlarm"
/>
<result
column=
"illuminance"
property=
"illuminance"
/>
<result
column=
"carbon_dioxide"
property=
"carbonDioxide"
/>
<result
column=
"fine_particles"
property=
"fineParticles"
/>
<result
column=
"radiation"
property=
"radiation"
/>
<result
column=
"type"
property=
"type"
/>
<result
column=
"type"
property=
"type"
/>
<result
column=
"station_id"
property=
"stationId"
/>
<result
column=
"station_id"
property=
"stationId"
/>
<result
column=
"create_time"
property=
"createTime"
/>
<result
column=
"create_time"
property=
"createTime"
/>
</resultMap>
</resultMap>
<!--
swqxz_info_day
table all fields -->
<!--
dlxfsnj_info
table all fields -->
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
id,resource_id,
temperature,humidity,wind_speed,wind_direction,illuminance,carbon_dioxide,fine_particles,radiation
,type,station_id,create_time
id,resource_id,
setting_temperature,setting_mode,setting_wind_speed,fault_alarm
,type,station_id,create_time
</sql>
</sql>
<!-- 公共查询条件 -->
<!-- 公共查询条件 -->
...
@@ -28,26 +24,22 @@
...
@@ -28,26 +24,22 @@
where t.deleted=0
where t.deleted=0
<if
test=
"id!=null and id!=''"
>
and t.id = #{id}
</if>
<if
test=
"id!=null and id!=''"
>
and t.id = #{id}
</if>
<if
test=
"resourceId!=null and resourceId!=''"
>
and t.resource_id = #{resourceId}
</if>
<if
test=
"resourceId!=null and resourceId!=''"
>
and t.resource_id = #{resourceId}
</if>
<if
test=
"temperature!=null and temperature!=''"
>
and t.temperature = #{temperature}
</if>
<if
test=
"settingTemperature!=null and settingTemperature!=''"
>
and t.setting_temperature = #{settingTemperature}
</if>
<if
test=
"humidity!=null and humidity!=''"
>
and t.humidity = #{humidity}
</if>
<if
test=
"settingMode!=null and settingMode!=''"
>
and t.setting_mode = #{settingMode}
</if>
<if
test=
"windSpeed!=null and windSpeed!=''"
>
and t.wind_speed = #{windSpeed}
</if>
<if
test=
"settingWindSpeed!=null and settingWindSpeed!=''"
>
and t.setting_wind_speed = #{settingWindSpeed}
</if>
<if
test=
"windDirection!=null and windDirection!=''"
>
and t.wind_direction = #{windDirection}
</if>
<if
test=
"faultAlarm!=null and faultAlarm!=''"
>
and t.fault_alarm = #{faultAlarm}
</if>
<if
test=
"illuminance!=null and illuminance!=''"
>
and t.illuminance = #{illuminance}
</if>
<if
test=
"carbonDioxide!=null and carbonDioxide!=''"
>
and t.carbon_dioxide = #{carbonDioxide}
</if>
<if
test=
"fineParticles!=null and fineParticles!=''"
>
and t.fine_particles = #{fineParticles}
</if>
<if
test=
"radiation!=null and radiation!=''"
>
and t.radiation = #{radiation}
</if>
<if
test=
"type!=null "
>
and t.type = #{type}
</if>
<if
test=
"type!=null "
>
and t.type = #{type}
</if>
<if
test=
"stationId!=null and stationId!=''"
>
and t.station_id = #{stationId}
</if>
<if
test=
"stationId!=null and stationId!=''"
>
and t.station_id = #{stationId}
</if>
<if
test=
"createTime!=null "
>
and t.create_time = #{createTime}
</if>
<if
test=
"createTime!=null "
>
and t.create_time = #{createTime}
</if>
</sql>
</sql>
<select
id=
"queryPageByCount"
parameterType=
"Object"
resultType=
"java.lang.Integer"
>
<select
id=
"queryPageByCount"
parameterType=
"Object"
resultType=
"java.lang.Integer"
>
select count(1) from
swqxz_info_day
t
select count(1) from
dlxfsnj_info
t
<include
refid=
"Example_Where_Clause"
/>
<include
refid=
"Example_Where_Clause"
/>
</select>
</select>
<select
id=
"queryPageList"
parameterType=
"Object"
resultMap=
"BaseResultMap"
>
<select
id=
"queryPageList"
parameterType=
"Object"
resultMap=
"BaseResultMap"
>
select t.* from
swqxz_info_day
t
select t.* from
dlxfsnj_info
t
<include
refid=
"Example_Where_Clause"
/>
<include
refid=
"Example_Where_Clause"
/>
<if
test=
"pager.orderCondition != null and pager.orderCondition != ''"
>
<if
test=
"pager.orderCondition != null and pager.orderCondition != ''"
>
${pager.orderCondition}
${pager.orderCondition}
...
@@ -56,7 +48,15 @@
...
@@ -56,7 +48,15 @@
${pager.mysqlQueryCondition}
${pager.mysqlQueryCondition}
</if>
</if>
</select>
</select>
<select
id=
"getList"
resultType=
"java.util.Map"
>
SELECT t1.*,li.name as resourceName,li.remark as remark,li.deploy_location as deployLocation,li.status as status,li.region as region
FROM dlxfsnj_info AS t1
INNER JOIN
(SELECT t2.resource_id, MAX(t2.create_time) AS maxdate
FROM dlxfsnj_info AS t2
GROUP BY t2.resource_id) AS t3 ON t1.resource_id = t3.resource_id AND t1.create_time = t3.maxdate
left join li_resource li on li.id = t1.resource_id
</select>
</mapper>
</mapper>
...
...
microservice-admin/src/main/resources/mapper/eq/SljfgInfoDayMapper.xml
0 → 100644
View file @
3e552d54
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.devplatform.admin.modules.eq.dao.SljfgInfoDayDao"
>
<!-- Result Map -->
<resultMap
id=
"BaseResultMap"
type=
"com.devplatform.admin.modules.eq.bean.SljfgInfoDay"
>
<result
column=
"id"
property=
"id"
/>
<result
column=
"resource_id"
property=
"resourceId"
/>
<result
column=
"electric_energy"
property=
"electricEnergy"
/>
<result
column=
"type"
property=
"type"
/>
<result
column=
"station_id"
property=
"stationId"
/>
<result
column=
"create_time"
property=
"createTime"
/>
</resultMap>
<!-- sljfg_info_day table all fields -->
<sql
id=
"Base_Column_List"
>
id,resource_id,electric_energy,type,station_id,create_time
</sql>
<!-- 公共查询条件 -->
<sql
id=
"Example_Where_Clause"
>
where t.deleted=0
<if
test=
"id!=null and id!=''"
>
and t.id = #{id}
</if>
<if
test=
"resourceId!=null and resourceId!=''"
>
and t.resource_id = #{resourceId}
</if>
<if
test=
"electricEnergy!=null and electricEnergy!=''"
>
and t.electric_energy = #{electricEnergy}
</if>
<if
test=
"type!=null "
>
and t.type = #{type}
</if>
<if
test=
"stationId!=null and stationId!=''"
>
and t.station_id = #{stationId}
</if>
<if
test=
"createTime!=null "
>
and t.create_time = #{createTime}
</if>
</sql>
<select
id=
"queryPageByCount"
parameterType=
"Object"
resultType=
"java.lang.Integer"
>
select count(1) from sljfg_info_day t
<include
refid=
"Example_Where_Clause"
/>
</select>
<select
id=
"queryPageList"
parameterType=
"Object"
resultMap=
"BaseResultMap"
>
select t.* from sljfg_info_day t
<include
refid=
"Example_Where_Clause"
/>
<if
test=
"pager.orderCondition != null and pager.orderCondition != ''"
>
${pager.orderCondition}
</if>
<if
test=
"pager.mysqlQueryCondition != null and pager.mysqlQueryCondition != ''"
>
${pager.mysqlQueryCondition}
</if>
</select>
<select
id=
"queryPageListByParam"
resultType=
"java.util.Map"
>
select t.* from sljfg_info_day t
where 1=1
<if
test=
"params.resourceId!=null and params.resourceId!=''"
>
and t.resource_id = #{params.resourceId}
</if>
<if
test=
"params.type == 2"
>
and YEARWEEK(date_format(t.create_time,'%Y-%m-%d'),1) = YEARWEEK(now(),1)
</if>
<if
test=
"params.type == 3"
>
and DATE_FORMAT(t.create_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
</if>
<if
test=
"params.sort != null and params.sort != '' and params.order != null and params.order != ''"
>
ORDER BY ${params.sort} ${params.order}
</if>
<if
test=
"params.sort == null or params.sort == '' or params.order == null or params.order == ''"
>
ORDER BY t.create_time
</if>
</select>
<select
id=
"queryListByParam"
resultType=
"java.util.Map"
>
select create_time,sum(cast(electric_energy as decimal(10, 5))) as electric_energy
from sljfg_info_day
where 1=1
<if
test=
"type == 2"
>
and YEARWEEK(date_format(create_time,'%Y-%m-%d'),1) = YEARWEEK(now(),1)
</if>
<if
test=
"type == 3"
>
and DATE_FORMAT(create_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
</if>
group by create_time
order by create_time
</select>
</mapper>
microservice-admin/src/main/resources/mapper/eq/S
nqxzInfoMonth
Mapper.xml
→
microservice-admin/src/main/resources/mapper/eq/S
ljfgInfoHour
Mapper.xml
View file @
3e552d54
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<!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.devplatform.admin.modules.eq.dao.S
nqxzInfoMonth
Dao"
>
<mapper
namespace=
"com.devplatform.admin.modules.eq.dao.S
ljfgInfoHour
Dao"
>
<!-- Result Map -->
<!-- Result Map -->
<resultMap
id=
"BaseResultMap"
type=
"com.devplatform.admin.modules.eq.bean.S
nqxzInfoMonth
"
>
<resultMap
id=
"BaseResultMap"
type=
"com.devplatform.admin.modules.eq.bean.S
ljfgInfoHour
"
>
<result
column=
"id"
property=
"id"
/>
<result
column=
"id"
property=
"id"
/>
<result
column=
"resource_id"
property=
"resourceId"
/>
<result
column=
"resource_id"
property=
"resourceId"
/>
<result
column=
"temperature"
property=
"temperature"
/>
<result
column=
"electric_energy"
property=
"electricEnergy"
/>
<result
column=
"humidity"
property=
"humidity"
/>
<result
column=
"carbon_dioxide"
property=
"carbonDioxide"
/>
<result
column=
"type"
property=
"type"
/>
<result
column=
"type"
property=
"type"
/>
<result
column=
"station_id"
property=
"stationId"
/>
<result
column=
"station_id"
property=
"stationId"
/>
<result
column=
"create_time"
property=
"createTime"
/>
<result
column=
"create_time"
property=
"createTime"
/>
</resultMap>
</resultMap>
<!-- s
nqxz_info_month
table all fields -->
<!-- s
ljfg_info_hour
table all fields -->
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
id,resource_id,
temperature,humidity,carbon_dioxide
,type,station_id,create_time
id,resource_id,
electric_energy
,type,station_id,create_time
</sql>
</sql>
<!-- 公共查询条件 -->
<!-- 公共查询条件 -->
...
@@ -23,21 +21,19 @@
...
@@ -23,21 +21,19 @@
where t.deleted=0
where t.deleted=0
<if
test=
"id!=null and id!=''"
>
and t.id = #{id}
</if>
<if
test=
"id!=null and id!=''"
>
and t.id = #{id}
</if>
<if
test=
"resourceId!=null and resourceId!=''"
>
and t.resource_id = #{resourceId}
</if>
<if
test=
"resourceId!=null and resourceId!=''"
>
and t.resource_id = #{resourceId}
</if>
<if
test=
"temperature!=null and temperature!=''"
>
and t.temperature = #{temperature}
</if>
<if
test=
"electricEnergy!=null and electricEnergy!=''"
>
and t.electric_energy = #{electricEnergy}
</if>
<if
test=
"humidity!=null and humidity!=''"
>
and t.humidity = #{humidity}
</if>
<if
test=
"carbonDioxide!=null and carbonDioxide!=''"
>
and t.carbon_dioxide = #{carbonDioxide}
</if>
<if
test=
"type!=null "
>
and t.type = #{type}
</if>
<if
test=
"type!=null "
>
and t.type = #{type}
</if>
<if
test=
"stationId!=null and stationId!=''"
>
and t.station_id = #{stationId}
</if>
<if
test=
"stationId!=null and stationId!=''"
>
and t.station_id = #{stationId}
</if>
<if
test=
"createTime!=null "
>
and t.create_time = #{createTime}
</if>
<if
test=
"createTime!=null "
>
and t.create_time = #{createTime}
</if>
</sql>
</sql>
<select
id=
"queryPageByCount"
parameterType=
"Object"
resultType=
"java.lang.Integer"
>
<select
id=
"queryPageByCount"
parameterType=
"Object"
resultType=
"java.lang.Integer"
>
select count(1) from s
nqxz_info_month
t
select count(1) from s
ljfg_info_hour
t
<include
refid=
"Example_Where_Clause"
/>
<include
refid=
"Example_Where_Clause"
/>
</select>
</select>
<select
id=
"queryPageList"
parameterType=
"Object"
resultMap=
"BaseResultMap"
>
<select
id=
"queryPageList"
parameterType=
"Object"
resultMap=
"BaseResultMap"
>
select t.* from s
nqxz_info_month
t
select t.* from s
ljfg_info_hour
t
<include
refid=
"Example_Where_Clause"
/>
<include
refid=
"Example_Where_Clause"
/>
<if
test=
"pager.orderCondition != null and pager.orderCondition != ''"
>
<if
test=
"pager.orderCondition != null and pager.orderCondition != ''"
>
${pager.orderCondition}
${pager.orderCondition}
...
@@ -47,6 +43,33 @@
...
@@ -47,6 +43,33 @@
</if>
</if>
</select>
</select>
<select
id=
"queryPageListByParam"
resultType=
"java.util.Map"
>
select t.* from sljfg_info_hour t
where 1=1
<if
test=
"params.resourceId!=null and params.resourceId!=''"
>
and t.resource_id = #{params.resourceId}
</if>
<if
test=
"params.type == 1"
>
and TO_DAYS(t.create_time) = TO_DAYS(NOW())
</if>
<if
test=
"params.sort != null and params.sort != '' and params.order != null and params.order != ''"
>
ORDER BY ${params.sort} ${params.order}
</if>
<if
test=
"params.sort == null or params.sort == '' or params.order == null or params.order == ''"
>
ORDER BY t.create_time
</if>
</select>
<select
id=
"queryListByParam"
resultType=
"java.util.Map"
>
select create_time,sum(cast(electric_energy as decimal(10, 5))) as electric_energy
from sljfg_info_hour
where 1=1
<if
test=
"type == 1"
>
and TO_DAYS(create_time) = TO_DAYS(NOW())
</if>
group by create_time
order by create_time
</select>
</mapper>
</mapper>
microservice-admin/src/main/resources/mapper/eq/S
nqxzInfoDay
Mapper.xml
→
microservice-admin/src/main/resources/mapper/eq/S
ljfgInfoMonth
Mapper.xml
View file @
3e552d54
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<!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.devplatform.admin.modules.eq.dao.S
nqxzInfoDay
Dao"
>
<mapper
namespace=
"com.devplatform.admin.modules.eq.dao.S
ljfgInfoMonth
Dao"
>
<!-- Result Map -->
<!-- Result Map -->
<resultMap
id=
"BaseResultMap"
type=
"com.devplatform.admin.modules.eq.bean.S
nqxzInfoDay
"
>
<resultMap
id=
"BaseResultMap"
type=
"com.devplatform.admin.modules.eq.bean.S
ljfgInfoMonth
"
>
<result
column=
"id"
property=
"id"
/>
<result
column=
"id"
property=
"id"
/>
<result
column=
"resource_id"
property=
"resourceId"
/>
<result
column=
"resource_id"
property=
"resourceId"
/>
<result
column=
"temperature"
property=
"temperature"
/>
<result
column=
"electric_energy"
property=
"electricEnergy"
/>
<result
column=
"humidity"
property=
"humidity"
/>
<result
column=
"carbon_dioxide"
property=
"carbonDioxide"
/>
<result
column=
"type"
property=
"type"
/>
<result
column=
"type"
property=
"type"
/>
<result
column=
"station_id"
property=
"stationId"
/>
<result
column=
"station_id"
property=
"stationId"
/>
<result
column=
"create_time"
property=
"createTime"
/>
<result
column=
"create_time"
property=
"createTime"
/>
</resultMap>
</resultMap>
<!-- s
nqxz_info_day
table all fields -->
<!-- s
ljfg_info_month
table all fields -->
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
id,resource_id,
temperature,humidity,carbon_dioxide
,type,station_id,create_time
id,resource_id,
electric_energy
,type,station_id,create_time
</sql>
</sql>
<!-- 公共查询条件 -->
<!-- 公共查询条件 -->
...
@@ -23,21 +21,19 @@
...
@@ -23,21 +21,19 @@
where t.deleted=0
where t.deleted=0
<if
test=
"id!=null and id!=''"
>
and t.id = #{id}
</if>
<if
test=
"id!=null and id!=''"
>
and t.id = #{id}
</if>
<if
test=
"resourceId!=null and resourceId!=''"
>
and t.resource_id = #{resourceId}
</if>
<if
test=
"resourceId!=null and resourceId!=''"
>
and t.resource_id = #{resourceId}
</if>
<if
test=
"temperature!=null and temperature!=''"
>
and t.temperature = #{temperature}
</if>
<if
test=
"electricEnergy!=null and electricEnergy!=''"
>
and t.electric_energy = #{electricEnergy}
</if>
<if
test=
"humidity!=null and humidity!=''"
>
and t.humidity = #{humidity}
</if>
<if
test=
"carbonDioxide!=null and carbonDioxide!=''"
>
and t.carbon_dioxide = #{carbonDioxide}
</if>
<if
test=
"type!=null "
>
and t.type = #{type}
</if>
<if
test=
"type!=null "
>
and t.type = #{type}
</if>
<if
test=
"stationId!=null and stationId!=''"
>
and t.station_id = #{stationId}
</if>
<if
test=
"stationId!=null and stationId!=''"
>
and t.station_id = #{stationId}
</if>
<if
test=
"createTime!=null "
>
and t.create_time = #{createTime}
</if>
<if
test=
"createTime!=null "
>
and t.create_time = #{createTime}
</if>
</sql>
</sql>
<select
id=
"queryPageByCount"
parameterType=
"Object"
resultType=
"java.lang.Integer"
>
<select
id=
"queryPageByCount"
parameterType=
"Object"
resultType=
"java.lang.Integer"
>
select count(1) from s
nqxz_info_day
t
select count(1) from s
ljfg_info_month
t
<include
refid=
"Example_Where_Clause"
/>
<include
refid=
"Example_Where_Clause"
/>
</select>
</select>
<select
id=
"queryPageList"
parameterType=
"Object"
resultMap=
"BaseResultMap"
>
<select
id=
"queryPageList"
parameterType=
"Object"
resultMap=
"BaseResultMap"
>
select t.* from s
nqxz_info_day
t
select t.* from s
ljfg_info_month
t
<include
refid=
"Example_Where_Clause"
/>
<include
refid=
"Example_Where_Clause"
/>
<if
test=
"pager.orderCondition != null and pager.orderCondition != ''"
>
<if
test=
"pager.orderCondition != null and pager.orderCondition != ''"
>
${pager.orderCondition}
${pager.orderCondition}
...
@@ -47,6 +43,33 @@
...
@@ -47,6 +43,33 @@
</if>
</if>
</select>
</select>
<select
id=
"queryPageListByParam"
resultType=
"java.util.Map"
>
select t.* from sljfg_info_month t
where 1=1
<if
test=
"params.resourceId!=null and params.resourceId!=''"
>
and t.resource_id = #{params.resourceId}
</if>
<if
test=
"params.type == 4"
>
and DATE_FORMAT(t.create_time, '%Y' ) = DATE_FORMAT( CURDATE( ) , '%Y' )
</if>
<if
test=
"params.sort != null and params.sort != '' and params.order != null and params.order != ''"
>
ORDER BY ${params.sort} ${params.order}
</if>
<if
test=
"params.sort == null or params.sort == '' or params.order == null or params.order == ''"
>
ORDER BY t.create_time
</if>
</select>
<select
id=
"queryListByParam"
resultType=
"java.util.Map"
>
select create_time,sum(cast(electric_energy as decimal(10, 5))) as electric_energy
from sljfg_info_month
where 1=1
<if
test=
"type == 4"
>
and DATE_FORMAT(create_time, '%Y' ) = DATE_FORMAT( CURDATE( ) , '%Y' )
</if>
group by create_time
order by create_time
</select>
</mapper>
</mapper>
microservice-admin/src/main/resources/mapper/eq/S
nqxz
InfoYearMapper.xml
→
microservice-admin/src/main/resources/mapper/eq/S
ljfg
InfoYearMapper.xml
View file @
3e552d54
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<!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.devplatform.admin.modules.eq.dao.S
nqxz
InfoYearDao"
>
<mapper
namespace=
"com.devplatform.admin.modules.eq.dao.S
ljfg
InfoYearDao"
>
<!-- Result Map -->
<!-- Result Map -->
<resultMap
id=
"BaseResultMap"
type=
"com.devplatform.admin.modules.eq.bean.S
nqxz
InfoYear"
>
<resultMap
id=
"BaseResultMap"
type=
"com.devplatform.admin.modules.eq.bean.S
ljfg
InfoYear"
>
<result
column=
"id"
property=
"id"
/>
<result
column=
"id"
property=
"id"
/>
<result
column=
"resource_id"
property=
"resourceId"
/>
<result
column=
"resource_id"
property=
"resourceId"
/>
<result
column=
"temperature"
property=
"temperature"
/>
<result
column=
"electric_energy"
property=
"electricEnergy"
/>
<result
column=
"humidity"
property=
"humidity"
/>
<result
column=
"carbon_dioxide"
property=
"carbonDioxide"
/>
<result
column=
"type"
property=
"type"
/>
<result
column=
"type"
property=
"type"
/>
<result
column=
"station_id"
property=
"stationId"
/>
<result
column=
"station_id"
property=
"stationId"
/>
<result
column=
"create_time"
property=
"createTime"
/>
<result
column=
"create_time"
property=
"createTime"
/>
</resultMap>
</resultMap>
<!-- s
nqxz
_info_year table all fields -->
<!-- s
ljfg
_info_year table all fields -->
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
id,resource_id,
temperature,humidity,carbon_dioxide
,type,station_id,create_time
id,resource_id,
electric_energy
,type,station_id,create_time
</sql>
</sql>
<!-- 公共查询条件 -->
<!-- 公共查询条件 -->
...
@@ -23,21 +21,19 @@
...
@@ -23,21 +21,19 @@
where t.deleted=0
where t.deleted=0
<if
test=
"id!=null and id!=''"
>
and t.id = #{id}
</if>
<if
test=
"id!=null and id!=''"
>
and t.id = #{id}
</if>
<if
test=
"resourceId!=null and resourceId!=''"
>
and t.resource_id = #{resourceId}
</if>
<if
test=
"resourceId!=null and resourceId!=''"
>
and t.resource_id = #{resourceId}
</if>
<if
test=
"temperature!=null and temperature!=''"
>
and t.temperature = #{temperature}
</if>
<if
test=
"electricEnergy!=null and electricEnergy!=''"
>
and t.electric_energy = #{electricEnergy}
</if>
<if
test=
"humidity!=null and humidity!=''"
>
and t.humidity = #{humidity}
</if>
<if
test=
"carbonDioxide!=null and carbonDioxide!=''"
>
and t.carbon_dioxide = #{carbonDioxide}
</if>
<if
test=
"type!=null "
>
and t.type = #{type}
</if>
<if
test=
"type!=null "
>
and t.type = #{type}
</if>
<if
test=
"stationId!=null and stationId!=''"
>
and t.station_id = #{stationId}
</if>
<if
test=
"stationId!=null and stationId!=''"
>
and t.station_id = #{stationId}
</if>
<if
test=
"createTime!=null "
>
and t.create_time = #{createTime}
</if>
<if
test=
"createTime!=null "
>
and t.create_time = #{createTime}
</if>
</sql>
</sql>
<select
id=
"queryPageByCount"
parameterType=
"Object"
resultType=
"java.lang.Integer"
>
<select
id=
"queryPageByCount"
parameterType=
"Object"
resultType=
"java.lang.Integer"
>
select count(1) from s
nqxz
_info_year t
select count(1) from s
ljfg
_info_year t
<include
refid=
"Example_Where_Clause"
/>
<include
refid=
"Example_Where_Clause"
/>
</select>
</select>
<select
id=
"queryPageList"
parameterType=
"Object"
resultMap=
"BaseResultMap"
>
<select
id=
"queryPageList"
parameterType=
"Object"
resultMap=
"BaseResultMap"
>
select t.* from s
nqxz
_info_year t
select t.* from s
ljfg
_info_year t
<include
refid=
"Example_Where_Clause"
/>
<include
refid=
"Example_Where_Clause"
/>
<if
test=
"pager.orderCondition != null and pager.orderCondition != ''"
>
<if
test=
"pager.orderCondition != null and pager.orderCondition != ''"
>
${pager.orderCondition}
${pager.orderCondition}
...
...
microservice-admin/src/main/resources/mapper/eq/SwqxzInfoMonthMapper.xml
deleted
100644 → 0
View file @
3531f207
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.devplatform.admin.modules.eq.dao.SwqxzInfoMonthDao"
>
<!-- Result Map -->
<resultMap
id=
"BaseResultMap"
type=
"com.devplatform.admin.modules.eq.bean.SwqxzInfoMonth"
>
<result
column=
"id"
property=
"id"
/>
<result
column=
"resource_id"
property=
"resourceId"
/>
<result
column=
"temperature"
property=
"temperature"
/>
<result
column=
"humidity"
property=
"humidity"
/>
<result
column=
"wind_speed"
property=
"windSpeed"
/>
<result
column=
"wind_direction"
property=
"windDirection"
/>
<result
column=
"illuminance"
property=
"illuminance"
/>
<result
column=
"carbon_dioxide"
property=
"carbonDioxide"
/>
<result
column=
"fine_particles"
property=
"fineParticles"
/>
<result
column=
"radiation"
property=
"radiation"
/>
<result
column=
"type"
property=
"type"
/>
<result
column=
"station_id"
property=
"stationId"
/>
<result
column=
"create_time"
property=
"createTime"
/>
</resultMap>
<!-- swqxz_info_month table all fields -->
<sql
id=
"Base_Column_List"
>
id,resource_id,temperature,humidity,wind_speed,wind_direction,illuminance,carbon_dioxide,fine_particles,radiation,type,station_id,create_time
</sql>
<!-- 公共查询条件 -->
<sql
id=
"Example_Where_Clause"
>
where t.deleted=0
<if
test=
"id!=null and id!=''"
>
and t.id = #{id}
</if>
<if
test=
"resourceId!=null and resourceId!=''"
>
and t.resource_id = #{resourceId}
</if>
<if
test=
"temperature!=null and temperature!=''"
>
and t.temperature = #{temperature}
</if>
<if
test=
"humidity!=null and humidity!=''"
>
and t.humidity = #{humidity}
</if>
<if
test=
"windSpeed!=null and windSpeed!=''"
>
and t.wind_speed = #{windSpeed}
</if>
<if
test=
"windDirection!=null and windDirection!=''"
>
and t.wind_direction = #{windDirection}
</if>
<if
test=
"illuminance!=null and illuminance!=''"
>
and t.illuminance = #{illuminance}
</if>
<if
test=
"carbonDioxide!=null and carbonDioxide!=''"
>
and t.carbon_dioxide = #{carbonDioxide}
</if>
<if
test=
"fineParticles!=null and fineParticles!=''"
>
and t.fine_particles = #{fineParticles}
</if>
<if
test=
"radiation!=null and radiation!=''"
>
and t.radiation = #{radiation}
</if>
<if
test=
"type!=null "
>
and t.type = #{type}
</if>
<if
test=
"stationId!=null and stationId!=''"
>
and t.station_id = #{stationId}
</if>
<if
test=
"createTime!=null "
>
and t.create_time = #{createTime}
</if>
</sql>
<select
id=
"queryPageByCount"
parameterType=
"Object"
resultType=
"java.lang.Integer"
>
select count(1) from swqxz_info_month t
<include
refid=
"Example_Where_Clause"
/>
</select>
<select
id=
"queryPageList"
parameterType=
"Object"
resultMap=
"BaseResultMap"
>
select t.* from swqxz_info_month t
<include
refid=
"Example_Where_Clause"
/>
<if
test=
"pager.orderCondition != null and pager.orderCondition != ''"
>
${pager.orderCondition}
</if>
<if
test=
"pager.mysqlQueryCondition != null and pager.mysqlQueryCondition != ''"
>
${pager.mysqlQueryCondition}
</if>
</select>
</mapper>
microservice-admin/src/main/resources/mapper/eq/SwqxzInfoYearMapper.xml
deleted
100644 → 0
View file @
3531f207
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.devplatform.admin.modules.eq.dao.SwqxzInfoYearDao"
>
<!-- Result Map -->
<resultMap
id=
"BaseResultMap"
type=
"com.devplatform.admin.modules.eq.bean.SwqxzInfoYear"
>
<result
column=
"id"
property=
"id"
/>
<result
column=
"resource_id"
property=
"resourceId"
/>
<result
column=
"temperature"
property=
"temperature"
/>
<result
column=
"humidity"
property=
"humidity"
/>
<result
column=
"wind_speed"
property=
"windSpeed"
/>
<result
column=
"wind_direction"
property=
"windDirection"
/>
<result
column=
"illuminance"
property=
"illuminance"
/>
<result
column=
"carbon_dioxide"
property=
"carbonDioxide"
/>
<result
column=
"fine_particles"
property=
"fineParticles"
/>
<result
column=
"radiation"
property=
"radiation"
/>
<result
column=
"type"
property=
"type"
/>
<result
column=
"station_id"
property=
"stationId"
/>
<result
column=
"create_time"
property=
"createTime"
/>
</resultMap>
<!-- swqxz_info_year table all fields -->
<sql
id=
"Base_Column_List"
>
id,resource_id,temperature,humidity,wind_speed,wind_direction,illuminance,carbon_dioxide,fine_particles,radiation,type,station_id,create_time
</sql>
<!-- 公共查询条件 -->
<sql
id=
"Example_Where_Clause"
>
where t.deleted=0
<if
test=
"id!=null and id!=''"
>
and t.id = #{id}
</if>
<if
test=
"resourceId!=null and resourceId!=''"
>
and t.resource_id = #{resourceId}
</if>
<if
test=
"temperature!=null and temperature!=''"
>
and t.temperature = #{temperature}
</if>
<if
test=
"humidity!=null and humidity!=''"
>
and t.humidity = #{humidity}
</if>
<if
test=
"windSpeed!=null and windSpeed!=''"
>
and t.wind_speed = #{windSpeed}
</if>
<if
test=
"windDirection!=null and windDirection!=''"
>
and t.wind_direction = #{windDirection}
</if>
<if
test=
"illuminance!=null and illuminance!=''"
>
and t.illuminance = #{illuminance}
</if>
<if
test=
"carbonDioxide!=null and carbonDioxide!=''"
>
and t.carbon_dioxide = #{carbonDioxide}
</if>
<if
test=
"fineParticles!=null and fineParticles!=''"
>
and t.fine_particles = #{fineParticles}
</if>
<if
test=
"radiation!=null and radiation!=''"
>
and t.radiation = #{radiation}
</if>
<if
test=
"type!=null "
>
and t.type = #{type}
</if>
<if
test=
"stationId!=null and stationId!=''"
>
and t.station_id = #{stationId}
</if>
<if
test=
"createTime!=null "
>
and t.create_time = #{createTime}
</if>
</sql>
<select
id=
"queryPageByCount"
parameterType=
"Object"
resultType=
"java.lang.Integer"
>
select count(1) from swqxz_info_year t
<include
refid=
"Example_Where_Clause"
/>
</select>
<select
id=
"queryPageList"
parameterType=
"Object"
resultMap=
"BaseResultMap"
>
select t.* from swqxz_info_year t
<include
refid=
"Example_Where_Clause"
/>
<if
test=
"pager.orderCondition != null and pager.orderCondition != ''"
>
${pager.orderCondition}
</if>
<if
test=
"pager.mysqlQueryCondition != null and pager.mysqlQueryCondition != ''"
>
${pager.mysqlQueryCondition}
</if>
</select>
</mapper>
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