设备管理

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDevice/controller/ItdmDeviceController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 设备表
  * @Author: jeecg-boot
- * @Date:   2023-05-18
+ * @Date:   2023-05-19
  * @Version: V1.0
  */
 @Api(tags="设备表")

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDevice/entity/ItdmDevice.java

@@ -21,7 +21,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 设备表
  * @Author: jeecg-boot
- * @Date:   2023-05-18
+ * @Date:   2023-05-19
  * @Version: V1.0
  */
 @Data
@@ -59,6 +59,10 @@ public class ItdmDevice implements Serializable {
 	@Excel(name = "设备名称", width = 15)
     @ApiModelProperty(value = "设备名称")
     private java.lang.String deviceName;
+	/**设备类型*/
+	@Excel(name = "设备类型", width = 15)
+    @ApiModelProperty(value = "设备类型")
+    private java.lang.String deviceType;
 	/**设备编号*/
 	@Excel(name = "设备编号", width = 15)
     @ApiModelProperty(value = "设备编号")
@@ -68,10 +72,6 @@ public class ItdmDevice implements Serializable {
 	@Dict(dicCode = "device_status")
     @ApiModelProperty(value = "设备状态")
     private java.lang.Integer deviceStatus;
-	/**设备类型*/
-	@Excel(name = "设备类型", width = 15)
-    @ApiModelProperty(value = "设备类型")
-    private java.lang.String deviceType;
 	/**维护时间*/
 	@Excel(name = "维护时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@@ -82,6 +82,22 @@ public class ItdmDevice implements Serializable {
 	@Excel(name = "维护人", width = 15)
     @ApiModelProperty(value = "维护人")
     private java.lang.String repairer;
+	/**维护记录*/
+	@Excel(name = "维护记录", width = 15)
+    @ApiModelProperty(value = "维护记录")
+    private java.lang.String record;
+	/**设备规格*/
+	@Excel(name = "设备规格", width = 15)
+    @ApiModelProperty(value = "设备规格")
+    private java.lang.String deviceSpecification;
+	/**设备型号*/
+	@Excel(name = "设备型号", width = 15)
+    @ApiModelProperty(value = "设备型号")
+    private java.lang.String deviceModel;
+	/**计量有效期*/
+	@Excel(name = "计量有效期", width = 15)
+    @ApiModelProperty(value = "计量有效期")
+    private java.lang.String deviceLife;
 	/**本次运行开始时间*/
 	@Excel(name = "本次运行开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@@ -102,14 +118,6 @@ public class ItdmDevice implements Serializable {
 	@Excel(name = "设备树id", width = 15)
     @ApiModelProperty(value = "设备树id")
     private java.lang.Integer equipmenttreeid;
-	/**计量有效期*/
-	@Excel(name = "计量有效期", width = 15)
-    @ApiModelProperty(value = "计量有效期")
-    private java.lang.String deviceLife;
-	/**规格型号*/
-	@Excel(name = "规格型号", width = 15)
-    @ApiModelProperty(value = "规格型号")
-    private java.lang.String spec;
 	/**安装地点*/
 	@Excel(name = "安装地点", width = 15)
     @ApiModelProperty(value = "安装地点")

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDevice/mapper/ItdmDeviceMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 设备表
  * @Author: jeecg-boot
- * @Date:   2023-05-18
+ * @Date:   2023-05-19
  * @Version: V1.0
  */
 public interface ItdmDeviceMapper extends BaseMapper<ItdmDevice> {

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDevice/service/IItdmDeviceService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 设备表
  * @Author: jeecg-boot
- * @Date:   2023-05-18
+ * @Date:   2023-05-19
  * @Version: V1.0
  */
 public interface IItdmDeviceService extends IService<ItdmDevice> {

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDevice/service/impl/ItdmDeviceServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 设备表
  * @Author: jeecg-boot
- * @Date:   2023-05-18
+ * @Date:   2023-05-19
  * @Version: V1.0
  */
 @Service