diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonServiceImpl.java index 3133fd2..4ded0a7 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonServiceImpl.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonServiceImpl.java @@ -1347,32 +1347,37 @@ public class IotCommonServiceImpl { todayDataCounts = nowDay.getDayOfMonth(); yesterDataCounts = todayDataCounts; - String newTimes = yesterMonth.format(monthdtf); - voSurvIntegrateParam.setStartTime(newTimes); - voSurvIntegrateParam.setEndTime(newTimes); - VOSurvIntegrateResult yesterData = WaterIntegrateStatistic(voSurvIntegrateParam); - LinkedHashMap> yesterResult = yesterData.getSurvResult(); - List y1 = yesterResult.get(PollutionEnum.dataWaterTnSy.getCode()); - if(y1!=null){ - tnDatas.addAll(y1.subList(yesterDataCounts,y1.size())); + + int lastDayOfMonth = yesterMonth.with(TemporalAdjusters.lastDayOfMonth()).getDayOfMonth(); + + if(todayDataCounts < lastDayOfMonth) {//查询的日期大于上个月的总天数时，不需要截取 + String newTimes = yesterMonth.format(monthdtf); + voSurvIntegrateParam.setStartTime(newTimes); + voSurvIntegrateParam.setEndTime(newTimes); + VOSurvIntegrateResult yesterData = WaterIntegrateStatistic(voSurvIntegrateParam); + LinkedHashMap> yesterResult = yesterData.getSurvResult(); + List y1 = yesterResult.get(PollutionEnum.dataWaterTnSy.getCode()); + if (y1 != null) { + tnDatas.addAll(y1.subList(yesterDataCounts, y1.size())); + } + List y2 = yesterResult.get(PollutionEnum.dataWaterTpSy.getCode()); + if (y2 != null) { + tpDatas.addAll(y2.subList(yesterDataCounts, y2.size())); + } + List y3 = yesterResult.get(PollutionEnum.dataWaterNoSy.getCode()); + if (y3 != null) { + noDatas.addAll(y3.subList(yesterDataCounts, y3.size())); + } + List y4 = yesterResult.get(PollutionEnum.dataWaterCodSy.getCode()); + if (y4 != null) { + codDatas.addAll(y4.subList(yesterDataCounts, y4.size())); + } + List y5 = yesterResult.get(PollutionEnum.dataWaterNhSy.getCode()); + if (y5 != null) { + nhDatas.addAll(y5.subList(yesterDataCounts, y5.size())); + } + timeList.addAll(yesterData.getIndexs().subList(yesterDataCounts, yesterData.getIndexs().size())); } - List y2= yesterResult.get(PollutionEnum.dataWaterTpSy.getCode()); - if(y2!=null){ - tpDatas.addAll(y2.subList(yesterDataCounts,y2.size())); - } - List y3 = yesterResult.get(PollutionEnum.dataWaterNoSy.getCode()); - if(y3!=null){ - noDatas.addAll(y3.subList(yesterDataCounts,y3.size())); - } - List y4 = yesterResult.get(PollutionEnum.dataWaterCodSy.getCode()); - if(y4!=null) { - codDatas.addAll(y4.subList(yesterDataCounts,y4.size())); - } - List y5 = yesterResult.get(PollutionEnum.dataWaterNhSy.getCode()); - if(y5!=null){ - nhDatas.addAll(y5.subList(yesterDataCounts,y5.size())); - } - timeList.addAll(yesterData.getIndexs().subList(yesterDataCounts,yesterData.getIndexs().size())); } } diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvIotManufacturerConfig.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvIotManufacturerConfig.java index 6e230ce..609cc84 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvIotManufacturerConfig.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvIotManufacturerConfig.java @@ -48,6 +48,21 @@ public class SurvIotManufacturerConfig implements Serializable { @ApiModelProperty(value = "协议编号") private String protocolCode; + /**协议名称*/ + @Excel(name = "协议名称", width = 15) + @ApiModelProperty(value = "协议名称") + private java.lang.String protocolName; + + /**协议备注*/ + @Excel(name = "协议备注", width = 15) + @ApiModelProperty(value = "协议备注") + private java.lang.String protocolNotes; + + /**协议应用类型，1=初始化协议，2=拉取数据协议，3=通用协议*/ + @Excel(name = "协议应用类型", width = 15) + @ApiModelProperty(value = "协议应用类型") + private java.lang.Integer protocolApplyType; + /**配置类型;1=模型配置，2=其他*/ @Excel(name = "配置类型;1=模型配置，2=其他", width = 15) @ApiModelProperty(value = "配置类型;1=模型配置，2=其他") @@ -59,6 +74,27 @@ public class SurvIotManufacturerConfig implements Serializable { @TableField(typeHandler = JsonTypeHandler.class, jdbcType = JdbcType.VARCHAR, value = "config_json") private JSONObject configJson; + /**协议类型，http=http，mqtt=mqtt*/ + @Excel(name = "协议类型，http=http，mqtt=mqtt", width = 15) + @ApiModelProperty(value = "协议类型，http=http，mqtt=mqtt") + private java.lang.String protocolType; + + + /**是否为默认协议*/ + @Excel(name = "是否为默认协议", width = 15) + @ApiModelProperty(value = "是否为默认协议") + private java.lang.Integer isDefault; + + /**是否启用*/ + @Excel(name = "是否启用", width = 15) + @ApiModelProperty(value = "是否启用") + private java.lang.Integer isEnable; + + /**排序*/ + @Excel(name = "排序", width = 15) + @ApiModelProperty(value = "排序") + private java.lang.Integer sortNo; + /**租户号*/ @Excel(name = "租户号", width = 15) @ApiModelProperty(value = "租户号") diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvIotManufacturerInfo.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvIotManufacturerInfo.java index d9bda36..a53349a 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvIotManufacturerInfo.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvIotManufacturerInfo.java @@ -1,6 +1,8 @@ package org.jeecg.common.entity; +import cn.hutool.json.JSONObject; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -9,6 +11,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.apache.ibatis.type.JdbcType; +import org.jeecg.common.mybatis.typehandler.JsonTypeHandler; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; @@ -21,7 +25,7 @@ import java.util.Date; * @Version: V1.06 */ @Data -@TableName("f_iot_manufacturer_info") +@TableName("surv_iot_manufacturer_info") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="厂家信息", description="厂家信息") @@ -44,6 +48,11 @@ public class SurvIotManufacturerInfo implements Serializable { @ApiModelProperty(value = "厂家编号") private String maCode; + /**厂家对接代号，用于识别设备密钥*/ + @Excel(name = "厂家对接代号", width = 15) + @ApiModelProperty(value = "厂家对接代号") + private java.lang.String maAccessCode; + /**厂家名称地址*/ @Excel(name = "厂家名称地址", width = 15) @ApiModelProperty(value = "厂家名称地址") @@ -59,6 +68,27 @@ public class SurvIotManufacturerInfo implements Serializable { @ApiModelProperty(value = "备注") private String maNotes; + /**是否可自主添加;0=禁用，1=启用*/ + @Excel(name = "是否可自主添加;0=禁用，1=启用", width = 15) + @ApiModelProperty(value = "是否可自主添加;0=禁用，1=启用") + private java.lang.Integer isSelfAdd; + + /**是否启用;0=禁用，1=启用*/ + @Excel(name = "是否启用;0=禁用，1=启用", width = 15) + @ApiModelProperty(value = "是否启用;0=禁用，1=启用") + private java.lang.Integer isEnable; + + /**分发配置*/ + @Excel(name = "分发配置", width = 15) + @ApiModelProperty(value = "分发配置") + @TableField(typeHandler = JsonTypeHandler.class, jdbcType = JdbcType.VARCHAR, value = "DISPATCH_RULE") + private JSONObject dispatchRule; + + /**默认密钥configId*/ + @Excel(name = "默认密钥configId", width = 15) + @ApiModelProperty(value = "默认密钥configId") + private java.lang.String defaultConfigId; + /** * 排序 */