bug

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmAlarm/entity/ItdmAlarm.java

@@ -33,9 +33,8 @@ public class ItdmAlarm implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
-    private java.lang.String id;
+    private java.lang.Integer id;
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataNow/entity/ItdmAlarmNow.java

@@ -35,25 +35,11 @@ public class ItdmAlarmNow implements Serializable {
 	/**实时报警id*/
     @ApiModelProperty(value = "实时报警id")
     private java.lang.Integer id;
-	/**创建人*/
-    @ApiModelProperty(value = "创建人")
-    private java.lang.String createBy;
 	/**创建日期*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建日期")
     private java.util.Date createTime;
-	/**更新人*/
-    @ApiModelProperty(value = "更新人")
-    private java.lang.String updateBy;
-	/**更新日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "更新日期")
-    private java.util.Date updateTime;
-	/**所属部门*/
-    @ApiModelProperty(value = "所属部门")
-    private java.lang.String sysOrgCode;
 	/**设备id*/
 	@Excel(name = "设备id", width = 15, dictTable = "itdm_device", dicText = "device_name", dicCode = "id")
 	@Dict(dictTable = "itdm_device", dicText = "device_name", dicCode = "id")

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataNow/entity/ItdmEnvironmentQuyuNow.java

@@ -53,8 +53,8 @@ public class ItdmEnvironmentQuyuNow implements Serializable {
     @ApiModelProperty(value = "气压")
     private java.math.BigDecimal airPrassure;
 	/**采集时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "采集时间")
     private java.util.Date createTime;
 

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataNow/entity/ItdmEnvironmentWaterNow.java

@@ -49,8 +49,8 @@ public class ItdmEnvironmentWaterNow implements Serializable {
     @ApiModelProperty(value = "水压")
     private java.math.BigDecimal waterPressure;
 	/**采集时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "采集时间")
     private java.util.Date createTime;
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataNow/entity/ItdmEnvironmentYeweiNow.java

@@ -41,8 +41,8 @@ public class ItdmEnvironmentYeweiNow implements Serializable {
     @ApiModelProperty(value = "水液位")
     private java.math.BigDecimal waterLevel;
 	/**采集时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "采集时间")
     private java.util.Date createTime;
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataNow/entity/ItdmWenxiangNow.java

@@ -93,8 +93,8 @@ public class ItdmWenxiangNow implements Serializable {
     @ApiModelProperty(value = "B相电流报警（0正常1报警）")
     private java.lang.Integer currentBAlarm;
 	/**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")
     private java.util.Date createTime;
 	/**A相电流*/

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataNow/entity/ItdmWenxiangVoltageNow.java

@@ -45,8 +45,8 @@ public class ItdmWenxiangVoltageNow implements Serializable {
     @ApiModelProperty(value = "C线电压上限")
     private java.math.BigDecimal voltageCMax;
 	/**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")
     private java.util.Date createTime;
 	/**B线电压*/

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDeviceRun/entity/ItdmDeviceRun.java

@@ -33,9 +33,8 @@ public class ItdmDeviceRun implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
-    private java.lang.String id;
+    private java.lang.Integer id;
 	/**所属部门*/
     @ApiModelProperty(value = "所属部门")
     private java.lang.String sysOrgCode;
@@ -43,7 +42,7 @@ public class ItdmDeviceRun implements Serializable {
 //	@Excel(name = "设备id", width = 15, dictTable = "itdm_device", dicText = "device_name", dicCode = "id")
 	@Dict(dictTable = "itdm_device", dicText = "device_name", dicCode = "id")
     @ApiModelProperty(value = "设备id")
-    private java.lang.Integer deviceId;
+    private java.lang.String deviceId;
 	/**设备名称*/
 	@Excel(name = "设备名称", width = 15)
     @ApiModelProperty(value = "设备名称")

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDeviceStart/entity/ItdmDeviceStart.java

@@ -33,9 +33,8 @@ public class ItdmDeviceStart implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
-    private java.lang.String id;
+    private java.lang.Integer id;
 	/**设备id*/
 	@Excel(name = "设备id", width = 15, dictTable = "itdm_device", dicText = "device_name", dicCode = "id")
 	@Dict(dictTable = "itdm_device", dicText = "device_name", dicCode = "id")

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/largeScreen/vo/ItdmAlarmNowWSVO.java

@@ -46,11 +46,11 @@ public class ItdmAlarmNowWSVO implements Serializable {
     @Excel(name = "报警信息", width = 15)
     @ApiModelProperty(value = "报警信息")
     private java.lang.String alarmMessage;
-    /**更新日期*/
+    /**修改日期*/
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "更新日期")
-    private java.util.Date updateTime;
+    @ApiModelProperty(value = "修改日期")
+    private java.util.Date createTime;
     /**是否语音播报 0关闭1开启*/
     @Excel(name = "是否语音播报", width = 15, dicCode = "voice_status")
     @Dict(dicCode = "voice_status")

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/largeScreen/vo/ItdmWenxiangNowWSVO.java

@@ -42,8 +42,8 @@ public class ItdmWenxiangNowWSVO implements Serializable {
     @ApiModelProperty(value = "C相电流")
     private java.math.BigDecimal currentC;
     /**创建时间*/
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")
     private java.util.Date createTime;
 }