小程序增加租戶

zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonServiceImpl.java

@@ -1347,6 +1347,10 @@ public class IotCommonServiceImpl {
 
                 todayDataCounts = nowDay.getDayOfMonth();
                 yesterDataCounts = todayDataCounts;
+
+                int lastDayOfMonth = yesterMonth.with(TemporalAdjusters.lastDayOfMonth()).getDayOfMonth();
+
+                if(todayDataCounts < lastDayOfMonth) {//查询的日期大于上个月的总天数时，不需要截取
                     String newTimes = yesterMonth.format(monthdtf);
                     voSurvIntegrateParam.setStartTime(newTimes);
                     voSurvIntegrateParam.setEndTime(newTimes);
@@ -1375,6 +1379,7 @@ public class IotCommonServiceImpl {
                     timeList.addAll(yesterData.getIndexs().subList(yesterDataCounts, yesterData.getIndexs().size()));
                 }
             }
+        }
 
         timeList.addAll(survIntegrateResult.getIndexs().subList(0,todayDataCounts));
         List<String> t1 = survResult.get(PollutionEnum.dataWaterTnSy.getCode());

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 = "租户号")

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;
+
     /**
      * 排序
      */