Skip to content

E
energyai_java
Commit 3e552d54 authored by co_dengxiongwen's avatar co_dengxiongwen
Browse files
Options

接口调整

parent 3531f207
Show whitespace changes
Inline Side-by-side
Showing with 1002 additions and 622 deletions
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_FHJLM = "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/SnqxzInfoDay.java → microservice-admin/src/main/java/com/devplatform/admin/modules/eq/bean/SljfgInfoDay.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("snqxz_info_day") @TableName("sljfg_info_day")
public class SnqxzInfoDay implements Serializable { public class SljfgInfoDay 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/SnqxzInfoYear.java → microservice-admin/src/main/java/com/devplatform/admin/modules/eq/bean/SljfgInfoHour.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("snqxz_info_year") @TableName("sljfg_info_hour")
public class SnqxzInfoYear implements Serializable { public class SljfgInfoHour 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/SnqxzInfoMonth.java → microservice-admin/src/main/java/com/devplatform/admin/modules/eq/bean/SljfgInfoMonth.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("snqxz_info_month") @TableName("sljfg_info_month")
public class SnqxzInfoMonth implements Serializable { public class SljfgInfoMonth 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/SwqxzInfoYearDao.java → microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/DlxfsnjInfoDao.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.SwqxzInfoYearModel; import com.devplatform.admin.modules.eq.model.DlxfsnjInfoModel;
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(SwqxzInfoYearModel model); Integer queryPageByCount(DlxfsnjInfoModel 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/SwqxzInfoDayDao.java → microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/SljfgInfoDayDao.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.SwqxzInfoDayModel; import com.devplatform.admin.modules.eq.model.SljfgInfoDayModel;
import com.devplatform.admin.modules.eq.bean.SwqxzInfoDay; import com.devplatform.admin.modules.eq.bean.SljfgInfoDay;
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;
/** /**
* SwqxzInfoDay Mapper * SljfgInfoDay Mapper
* 用于室外气象站信息-天的数据库操作 * 用于室内机风柜信息-天的数据库操作
* @author Administrator * @author Administrator
* *
*/ */
@Mapper @Mapper
public interface SwqxzInfoDayDao extends MyBaseMapper<SwqxzInfoDay> { public interface SljfgInfoDayDao extends MyBaseMapper<SljfgInfoDay> {
/** /**
* 查询分页数量 * 查询分页数量
* @param model * @param model
* @return * @return
*/ */
Integer queryPageByCount(SwqxzInfoDayModel model); Integer queryPageByCount(SljfgInfoDayModel model);
/** /**
* 查询室外气象站信息-天分页数据 * 查询室内机风柜信息-天分页数据
* @param model * @param model
* @return * @return
*/ */
List<SwqxzInfoDay> queryPageList(SwqxzInfoDayModel model); List<SljfgInfoDay> queryPageList(SljfgInfoDayModel 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/SnqxzInfoYearDao.java → microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/SljfgInfoYearDao.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.SnqxzInfoYearModel; import com.devplatform.admin.modules.eq.model.SljfgInfoYearModel;
import com.devplatform.admin.modules.eq.bean.SnqxzInfoYear; import com.devplatform.admin.modules.eq.bean.SljfgInfoYear;
import com.devplatform.common.dao.MyBaseMapper; import com.devplatform.common.dao.MyBaseMapper;
import java.util.List; import java.util.List;
/** /**
* SnqxzInfoYear Mapper * SljfgInfoYear Mapper
* 用于室内气象站信息-年的数据库操作 * 用于室内机风柜信息-年的数据库操作
* @author Administrator * @author Administrator
* *
*/ */
@Mapper @Mapper
public interface SnqxzInfoYearDao extends MyBaseMapper<SnqxzInfoYear> { public interface SljfgInfoYearDao extends MyBaseMapper<SljfgInfoYear> {
/** /**
* 查询分页数量 * 查询分页数量
* @param model * @param model
* @return * @return
*/ */
Integer queryPageByCount(SnqxzInfoYearModel model); Integer queryPageByCount(SljfgInfoYearModel model);
/** /**
* 查询室内气象站信息-年分页数据 * 查询室内机风柜信息-年分页数据
* @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/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/SwqxzInfoYearModel.java → microservice-admin/src/main/java/com/devplatform/admin/modules/eq/model/DlxfsnjInfoModel.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 SwqxzInfoYearModel extends BaseModel { public class DlxfsnjInfoModel 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/SnqxzInfoYearModel.java → microservice-admin/src/main/java/com/devplatform/admin/modules/eq/model/SljfgInfoDayModel.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 SnqxzInfoYearModel extends BaseModel { public class SljfgInfoDayModel 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/SnqxzInfoMonthModel.java → microservice-admin/src/main/java/com/devplatform/admin/modules/eq/model/SljfgInfoHourModel.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 SnqxzInfoMonthModel extends BaseModel { public class SljfgInfoHourModel 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/SnqxzInfoDayModel.java → microservice-admin/src/main/java/com/devplatform/admin/modules/eq/model/SljfgInfoMonthModel.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 SnqxzInfoDayModel extends BaseModel { public class SljfgInfoMonthModel 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/SnqxzInfoMonthService.java → microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/DlxfsnjInfoService.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.SnqxzInfoMonthModel; import com.devplatform.admin.modules.eq.model.DlxfsnjInfoModel;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* 室内气象站信息-月的service接口 * 多联新风处理机室内机信息的service接口
* <br> * <br>
* <b>功能：</b>SnqxzInfoMonthService<br> * <b>功能：</b>DlxfsnjInfoService<br>
* @author 代码生成器产生 * @author 代码生成器产生
*/ */
public interface SnqxzInfoMonthService extends MyBaseService<SnqxzInfoMonth> { public interface DlxfsnjInfoService extends MyBaseService<DlxfsnjInfo> {
/** /**
* 查询室内气象站信息-月分页数据 * 查询多联新风处理机室内机信息分页数据
* @param model * @param model
* @return * @return
*/ */
List<SnqxzInfoMonth> queryPageList(SnqxzInfoMonthModel model); List<DlxfsnjInfo> queryPageList(DlxfsnjInfoModel model);
List<Map<String, Object>> getList();
} }
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/SnqxzInfoDayService.java → microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/SljfgInfoDayService.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.SnqxzInfoDay; import com.devplatform.admin.modules.eq.bean.SljfgInfoDay;
import com.devplatform.admin.modules.eq.model.SnqxzInfoDayModel; import com.devplatform.admin.modules.eq.model.SljfgInfoDayModel;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
* 室内气象站信息-天的service接口 * 室内机风柜信息-天的service接口
* <br> * <br>
* <b>功能：</b>SnqxzInfoDayService<br> * <b>功能：</b>SljfgInfoDayService<br>
* @author 代码生成器产生 * @author 代码生成器产生
*/ */
public interface SnqxzInfoDayService extends MyBaseService<SnqxzInfoDay> { public interface SljfgInfoDayService extends MyBaseService<SljfgInfoDay> {
/** /**
* 查询室内气象站信息-天分页数据 * 查询室内机风柜信息-天分页数据
* @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/SwqxzInfoDayService.java → microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/SljfgInfoHourService.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.SwqxzInfoDay; import com.devplatform.admin.modules.eq.bean.SljfgInfoHour;
import com.devplatform.admin.modules.eq.model.SwqxzInfoDayModel; import com.devplatform.admin.modules.eq.model.SljfgInfoHourModel;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
* 室外气象站信息-天的service接口 * 室内机风柜信息-时的service接口
* <br> * <br>
* <b>功能：</b>SwqxzInfoDayService<br> * <b>功能：</b>SljfgInfoHourService<br>
* @author 代码生成器产生 * @author 代码生成器产生
*/ */
public interface SwqxzInfoDayService extends MyBaseService<SwqxzInfoDay> { public interface SljfgInfoHourService 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/SnqxzInfoYearService.java → microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/SljfgInfoYearService.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.SnqxzInfoYear; import com.devplatform.admin.modules.eq.bean.SljfgInfoYear;
import com.devplatform.admin.modules.eq.model.SnqxzInfoYearModel; import com.devplatform.admin.modules.eq.model.SljfgInfoYearModel;
import java.util.List; import java.util.List;
/** /**
* 室内气象站信息-年的service接口 * 室内机风柜信息-年的service接口
* <br> * <br>
* <b>功能：</b>SnqxzInfoYearService<br> * <b>功能：</b>SljfgInfoYearService<br>
* @author 代码生成器产生 * @author 代码生成器产生
*/ */
public interface SnqxzInfoYearService extends MyBaseService<SnqxzInfoYear> { public interface SljfgInfoYearService extends MyBaseService<SljfgInfoYear> {
/** /**
* 查询室内气象站信息-年分页数据 * 查询室内机风柜信息-年分页数据
* @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_FHJLM.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_FHJLM.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/SwqxzInfoDayServiceImpl.java → microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/DlxfsnjInfoServiceImpl.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>SwqxzInfoDayServiceImpl<br> * <b>功能：</b>DlxfsnjInfoServiceImpl<br>
* @author 代码生成器产生 * @author 代码生成器产生
*/ */
@Service("swqxzInfoDayService") @Service("dlxfsnjInfoService")
public class SwqxzInfoDayServiceImpl extends MyBaseServiceImpl<SwqxzInfoDayDao, SwqxzInfoDay> implements SwqxzInfoDayService { public class DlxfsnjInfoServiceImpl extends MyBaseServiceImpl<DlxfsnjInfoDao, DlxfsnjInfo> implements DlxfsnjInfoService {
@Override @Override
public List<SwqxzInfoDay> queryPageList(SwqxzInfoDayModel model) { public List<DlxfsnjInfo> queryPageList(DlxfsnjInfoModel 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_FHJLM.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/SwqxzInfoMonthServiceImpl.java → microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/SljfgInfoDayServiceImpl.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.SwqxzInfoMonthModel; import com.devplatform.admin.modules.eq.model.SljfgInfoDayModel;
import com.devplatform.admin.modules.eq.bean.SwqxzInfoMonth; import com.devplatform.admin.modules.eq.bean.SljfgInfoDay;
import com.devplatform.admin.modules.eq.dao.SwqxzInfoMonthDao; import com.devplatform.admin.modules.eq.dao.SljfgInfoDayDao;
import com.devplatform.admin.modules.eq.service.SwqxzInfoMonthService; import com.devplatform.admin.modules.eq.service.SljfgInfoDayService;
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>SwqxzInfoMonthServiceImpl<br> * <b>功能：</b>SljfgInfoDayServiceImpl<br>
* @author 代码生成器产生 * @author 代码生成器产生
*/ */
@Service("swqxzInfoMonthService") @Service("sljfgInfoDayService")
public class SwqxzInfoMonthServiceImpl extends MyBaseServiceImpl<SwqxzInfoMonthDao, SwqxzInfoMonth> implements SwqxzInfoMonthService { public class SljfgInfoDayServiceImpl extends MyBaseServiceImpl<SljfgInfoDayDao, SljfgInfoDay> implements SljfgInfoDayService {
@Override @Override
public List<SwqxzInfoMonth> queryPageList(SwqxzInfoMonthModel model) { public List<SljfgInfoDay> queryPageList(SljfgInfoDayModel 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/SwqxzInfoYearServiceImpl.java → microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/SljfgInfoHourServiceImpl.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>SwqxzInfoYearServiceImpl<br> * <b>功能：</b>SljfgInfoHourServiceImpl<br>
* @author 代码生成器产生 * @author 代码生成器产生
*/ */
@Service("swqxzInfoYearService") @Service("sljfgInfoHourService")
public class SwqxzInfoYearServiceImpl extends MyBaseServiceImpl<SwqxzInfoYearDao, SwqxzInfoYear> implements SwqxzInfoYearService { public class SljfgInfoHourServiceImpl extends MyBaseServiceImpl<SljfgInfoHourDao, SljfgInfoHour> implements SljfgInfoHourService {
@Override @Override
public List<SwqxzInfoYear> queryPageList(SwqxzInfoYearModel model) { public List<SljfgInfoHour> queryPageList(SljfgInfoHourModel 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/SnqxzInfoMonthServiceImpl.java → microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/SljfgInfoMonthServiceImpl.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>SnqxzInfoMonthServiceImpl<br> * <b>功能：</b>SljfgInfoMonthServiceImpl<br>
* @author 代码生成器产生 * @author 代码生成器产生
*/ */
@Service("snqxzInfoMonthService") @Service("sljfgInfoMonthService")
public class SnqxzInfoMonthServiceImpl extends MyBaseServiceImpl<SnqxzInfoMonthDao, SnqxzInfoMonth> implements SnqxzInfoMonthService { public class SljfgInfoMonthServiceImpl extends MyBaseServiceImpl<SljfgInfoMonthDao, SljfgInfoMonth> implements SljfgInfoMonthService {
@Override @Override
public List<SnqxzInfoMonth> queryPageList(SnqxzInfoMonthModel model) { public List<SljfgInfoMonth> queryPageList(SljfgInfoMonthModel 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/SnqxzInfoYearServiceImpl.java → microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/SljfgInfoYearServiceImpl.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.SnqxzInfoYear; import com.devplatform.admin.modules.eq.bean.SljfgInfoYear;
import com.devplatform.admin.modules.eq.dao.SnqxzInfoYearDao; import com.devplatform.admin.modules.eq.dao.SljfgInfoYearDao;
import com.devplatform.admin.modules.eq.model.SnqxzInfoYearModel; import com.devplatform.admin.modules.eq.model.SljfgInfoYearModel;
import com.devplatform.admin.modules.eq.service.SnqxzInfoYearService; import com.devplatform.admin.modules.eq.service.SljfgInfoYearService;
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>SnqxzInfoYearServiceImpl<br> * <b>功能：</b>SljfgInfoYearServiceImpl<br>
* @author 代码生成器产生 * @author 代码生成器产生
*/ */
@Service("snqxzInfoYearService") @Service("sljfgInfoYearService")
public class SnqxzInfoYearServiceImpl extends MyBaseServiceImpl<SnqxzInfoYearDao, SnqxzInfoYear> implements SnqxzInfoYearService { public class SljfgInfoYearServiceImpl extends MyBaseServiceImpl<SljfgInfoYearDao, SljfgInfoYear> implements SljfgInfoYearService {
@Override @Override
public List<SnqxzInfoYear> queryPageList(SnqxzInfoYearModel model) { public List<SljfgInfoYear> queryPageList(SljfgInfoYearModel 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/SwqxzInfoDayMapper.xml → microservice-admin/src/main/resources/mapper/eq/DlxfsnjInfoMapper.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.SwqxzInfoDayDao"> <mapper namespace="com.devplatform.admin.modules.eq.dao.DlxfsnjInfoDao">
<!-- 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/SnqxzInfoMonthMapper.xml → microservice-admin/src/main/resources/mapper/eq/SljfgInfoHourMapper.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.SnqxzInfoMonthDao"> <mapper namespace="com.devplatform.admin.modules.eq.dao.SljfgInfoHourDao">
<!-- Result Map --> <!-- Result Map -->
<resultMap id="BaseResultMap" type="com.devplatform.admin.modules.eq.bean.SnqxzInfoMonth"> <resultMap id="BaseResultMap" type="com.devplatform.admin.modules.eq.bean.SljfgInfoHour">
<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>
<!-- snqxz_info_month table all fields --> <!-- sljfg_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 snqxz_info_month t select count(1) from sljfg_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 snqxz_info_month t select t.* from sljfg_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/SnqxzInfoDayMapper.xml → microservice-admin/src/main/resources/mapper/eq/SljfgInfoMonthMapper.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.SnqxzInfoDayDao"> <mapper namespace="com.devplatform.admin.modules.eq.dao.SljfgInfoMonthDao">
<!-- Result Map --> <!-- Result Map -->
<resultMap id="BaseResultMap" type="com.devplatform.admin.modules.eq.bean.SnqxzInfoDay"> <resultMap id="BaseResultMap" type="com.devplatform.admin.modules.eq.bean.SljfgInfoMonth">
<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>
<!-- snqxz_info_day table all fields --> <!-- sljfg_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 snqxz_info_day t select count(1) from sljfg_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 snqxz_info_day t select t.* from sljfg_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/SnqxzInfoYearMapper.xml → microservice-admin/src/main/resources/mapper/eq/SljfgInfoYearMapper.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.SnqxzInfoYearDao"> <mapper namespace="com.devplatform.admin.modules.eq.dao.SljfgInfoYearDao">
<!-- Result Map --> <!-- Result Map -->
<resultMap id="BaseResultMap" type="com.devplatform.admin.modules.eq.bean.SnqxzInfoYear"> <resultMap id="BaseResultMap" type="com.devplatform.admin.modules.eq.bean.SljfgInfoYear">
<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>
<!-- snqxz_info_year table all fields --> <!-- sljfg_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 snqxz_info_year t select count(1) from sljfg_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 snqxz_info_year t select t.* from sljfg_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>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment