From 5d46436ae7b4a557d65954b90b975c11050d4cde Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Thu, 4 Jul 2024 17:36:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E8=A1=A8=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=90=88=E4=BD=9C=E5=8D=95=E4=BD=8D=E5=AD=97=E6=AE=B5=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/AntiPressureFoldDev.java | 16 +++++++++++---- .../entity/BridgeErectMachineDev.java | 15 +++++++++----- .../xmgl/modules/car/entity/CarWashDev.java | 16 +++++++++++---- .../concrete/entity/ConcreteMonitorDev.java | 19 ++++++++++++------ .../entity/ConcreteMixStationDev.java | 16 +++++++++++---- .../entity/DischargingPlatformDev.java | 19 ++++++++++++------ .../doublecarbon/entity/DoubleCarbonDev.java | 18 ++++++++++++----- .../entity/PhotovoltaicPowerDev.java | 19 +++++++++++++----- .../electrical/entity/ElectricalDev.java | 18 ++++++++++++----- .../environment/entity/EnvironmentDev.java | 18 ++++++++++++----- .../modules/environment/entity/SprayDev.java | 18 ++++++++++++----- .../entity/FrontierProtectionDev.java | 18 ++++++++++++----- .../entity/FrontierProtectionNoNetDev.java | 14 ++++++++++--- .../modules/gt/entity/GtMaterialDevice.java | 20 ++++++++++++++----- .../hangbasket/entity/HangBasketDev.java | 16 ++++++++++++--- .../entity/HighFormworkMeasureDevice.java | 15 +++++++++++--- .../entity/MassReboundMeasureDev.java | 16 ++++++++++++--- .../mixingstation/entity/MsMixedSoilDev.java | 19 +++++++++++++----- .../pave/entity/PaveCompactionDev.java | 14 ++++++++++--- .../xmgl/modules/pave/entity/PaveDev.java | 14 ++++++++++--- .../entity/PitchMixStationDev.java | 20 ++++++++++++++----- .../poisonous/entity/PoisonousGasDev.java | 18 ++++++++++++----- .../entity/PressureTestMachineDev.java | 14 ++++++++++--- .../safetyhat/entity/SafetyHatDev.java | 18 ++++++++++++----- .../xmgl/modules/sewage/entity/SewageDev.java | 19 +++++++++++++----- .../smartgrout/entity/SmartGroutDev.java | 14 ++++++++++--- .../smarttension/entity/SmartTensionDev.java | 14 ++++++++++--- .../xmgl/modules/smoke/entity/SmokeDev.java | 18 ++++++++++++----- .../modules/sprayrt/entity/SprayRtDev.java | 15 +++++++++++--- .../entity/StableWaterMixStationDev.java | 18 ++++++++++++----- .../modules/standard/entity/StandardDev.java | 18 ++++++++++++----- .../entity/UniversalTestDev.java | 14 ++++++++++--- .../entity/VehiclePositionDev.java | 18 ++++++++++++----- .../xmgl/modules/worker/entity/UfaceDev.java | 18 ++++++++++++----- 34 files changed, 427 insertions(+), 147 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/antipressurefold/entity/AntiPressureFoldDev.java b/src/main/java/com/zhgd/xmgl/modules/antipressurefold/entity/AntiPressureFoldDev.java index 420b25e77..c988faafc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/antipressurefold/entity/AntiPressureFoldDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/antipressurefold/entity/AntiPressureFoldDev.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.Date; 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 lombok.Data; @@ -104,9 +105,16 @@ public class AntiPressureFoldDev implements Serializable { private java.util.Date updateTime; /** - * 合作单位id + * 合作单位ids */ - @Excel(name = "合作单位id", width = 15) - @ApiModelProperty(value = "合作单位id") - private java.lang.String enterpriseId; + @ApiModelProperty(value = "合作单位ids") + private java.lang.String enterpriseIds; + + /** + * 合作单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "合作单位名称") + private java.lang.String enterpriseName; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/entity/BridgeErectMachineDev.java b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/entity/BridgeErectMachineDev.java index 8ba694d9c..a7cd9702d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/entity/BridgeErectMachineDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/entity/BridgeErectMachineDev.java @@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.bridgeerectmachine.entity; import java.io.Serializable; 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 lombok.Data; @@ -95,11 +96,15 @@ public class BridgeErectMachineDev implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新时间 yyyy-MM-dd HH:mm:ss") private java.util.Date updateDate; - /** - * 合作单位id + * 合作单位ids */ - @Excel(name = "合作单位id", width = 15) - @ApiModelProperty(value = "合作单位id") - private java.lang.String enterpriseId; + @ApiModelProperty(value = "合作单位ids") + private java.lang.String enterpriseIds; + /** + * 合作单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "合作单位名称") + private java.lang.String enterpriseName; } diff --git a/src/main/java/com/zhgd/xmgl/modules/car/entity/CarWashDev.java b/src/main/java/com/zhgd/xmgl/modules/car/entity/CarWashDev.java index dc73c8c31..fcea7f173 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/entity/CarWashDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/entity/CarWashDev.java @@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.car.entity; import java.io.Serializable; 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.databind.annotation.JsonSerialize; @@ -57,9 +58,16 @@ public class CarWashDev implements Serializable { private java.lang.Integer devState ; /** - * 合作单位id + * 合作单位ids */ - @Excel(name = "合作单位id", width = 15) - @ApiModelProperty(value = "合作单位id") - private java.lang.String enterpriseId; + @ApiModelProperty(value = "合作单位ids") + private java.lang.String enterpriseIds; + + /** + * 合作单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "合作单位名称") + private java.lang.String enterpriseName; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/entity/ConcreteMonitorDev.java b/src/main/java/com/zhgd/xmgl/modules/concrete/entity/ConcreteMonitorDev.java index 072611454..424dc4dc3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/entity/ConcreteMonitorDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/entity/ConcreteMonitorDev.java @@ -119,12 +119,19 @@ public class ConcreteMonitorDev implements Serializable { @ApiModelProperty(value = "devOnline：设备状态1在线0离线") private Integer devOnline; - /** - * 合作单位id - */ - @Excel(name = "合作单位id", width = 15) - @ApiModelProperty(value = "合作单位id") - private java.lang.String enterpriseId; + /** + * 合作单位ids + */ + @ApiModelProperty(value = "合作单位ids") + private java.lang.String enterpriseIds; + + /** + * 合作单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "合作单位名称") + private java.lang.String enterpriseName; + @TableField(exist = false) @ApiModelProperty(value = "监测点位置") private List pointList; diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/entity/ConcreteMixStationDev.java b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/entity/ConcreteMixStationDev.java index 3428c2235..000905b98 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/entity/ConcreteMixStationDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/entity/ConcreteMixStationDev.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.Date; 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 lombok.Data; @@ -123,9 +124,16 @@ public class ConcreteMixStationDev implements Serializable { private java.util.Date updateDate; /** - * 合作单位id + * 合作单位ids */ - @Excel(name = "合作单位id", width = 15) - @ApiModelProperty(value = "合作单位id") - private java.lang.String enterpriseId; + @ApiModelProperty(value = "合作单位ids") + private java.lang.String enterpriseIds; + + /** + * 合作单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "合作单位名称") + private java.lang.String enterpriseName; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/discharging/entity/DischargingPlatformDev.java b/src/main/java/com/zhgd/xmgl/modules/discharging/entity/DischargingPlatformDev.java index 2f652668f..666d34ada 100644 --- a/src/main/java/com/zhgd/xmgl/modules/discharging/entity/DischargingPlatformDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/discharging/entity/DischargingPlatformDev.java @@ -134,12 +134,19 @@ public class DischargingPlatformDev implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd") private Date playingTime; - /** - * 合作单位id - */ - @Excel(name = "合作单位id", width = 15) - @ApiModelProperty(value = "合作单位id") - private java.lang.String enterpriseId; + /** + * 合作单位ids + */ + @ApiModelProperty(value = "合作单位ids") + private java.lang.String enterpriseIds; + + /** + * 合作单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "合作单位名称") + private java.lang.String enterpriseName; + @TableField(exist = false) @ApiModelProperty(value = "devOnline：设备状态1在线0离线") private Integer devOnline; diff --git a/src/main/java/com/zhgd/xmgl/modules/doublecarbon/entity/DoubleCarbonDev.java b/src/main/java/com/zhgd/xmgl/modules/doublecarbon/entity/DoubleCarbonDev.java index eb6e63e6f..6d96c1991 100644 --- a/src/main/java/com/zhgd/xmgl/modules/doublecarbon/entity/DoubleCarbonDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/doublecarbon/entity/DoubleCarbonDev.java @@ -88,11 +88,19 @@ public class DoubleCarbonDev implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; - /** - * 合作单位id - */ - @ApiModelProperty(value = "合作单位id") - private java.lang.String enterpriseId; + /** + * 合作单位ids + */ + @ApiModelProperty(value = "合作单位ids") + private java.lang.String enterpriseIds; + + /** + * 合作单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "合作单位名称") + private java.lang.String enterpriseName; + /** * 设备加油记录列表 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/doublecarbon/entity/PhotovoltaicPowerDev.java b/src/main/java/com/zhgd/xmgl/modules/doublecarbon/entity/PhotovoltaicPowerDev.java index 18e2e218c..8e65dd65b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/doublecarbon/entity/PhotovoltaicPowerDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/doublecarbon/entity/PhotovoltaicPowerDev.java @@ -143,9 +143,18 @@ public class PhotovoltaicPowerDev implements Serializable { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; - /** - * 合作单位id - */ - @ApiModelProperty(value = "合作单位id") - private java.lang.String enterpriseId;} + /** + * 合作单位ids + */ + @ApiModelProperty(value = "合作单位ids") + private java.lang.String enterpriseIds; + + /** + * 合作单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "合作单位名称") + private java.lang.String enterpriseName; + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/electrical/entity/ElectricalDev.java b/src/main/java/com/zhgd/xmgl/modules/electrical/entity/ElectricalDev.java index d628869e9..097e711c9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/electrical/entity/ElectricalDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/electrical/entity/ElectricalDev.java @@ -132,11 +132,19 @@ public class ElectricalDev implements Serializable { private java.lang.String devScret; - /** - * 合作单位id - */ - @ApiModelProperty(value = "合作单位id") - private java.lang.String enterpriseId; + /** + * 合作单位ids + */ + @ApiModelProperty(value = "合作单位ids") + private java.lang.String enterpriseIds; + + /** + * 合作单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "合作单位名称") + private java.lang.String enterpriseName; + @TableField(exist = false) @ApiModelProperty(value = "是否在线 1为离线 2为在线 ") private java.lang.Integer isClosed; diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/entity/EnvironmentDev.java b/src/main/java/com/zhgd/xmgl/modules/environment/entity/EnvironmentDev.java index a9c085c45..88d12109e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/environment/entity/EnvironmentDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/environment/entity/EnvironmentDev.java @@ -97,11 +97,19 @@ public class EnvironmentDev implements Serializable { private java.lang.Integer createDataType; @ApiModelProperty(value = "喷淋状态（1投运2未投运）") private java.lang.Integer sprayStatus; - /** - * 合作单位id - */ - @ApiModelProperty(value = "合作单位id") - private java.lang.String enterpriseId; + /** + * 合作单位ids + */ + @ApiModelProperty(value = "合作单位ids") + private java.lang.String enterpriseIds; + + /** + * 合作单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "合作单位名称") + private java.lang.String enterpriseName; + @TableField(exist = false) @ApiModelProperty(value = "视频列表") private List videoList; diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/entity/SprayDev.java b/src/main/java/com/zhgd/xmgl/modules/environment/entity/SprayDev.java index f515d4154..8be1bb7d1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/environment/entity/SprayDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/environment/entity/SprayDev.java @@ -57,9 +57,17 @@ public class SprayDev implements Serializable { @Excel(name = "关通道号", width = 15) @ApiModelProperty(value="关通道号") private java.lang.Integer closeChannelNo ; - /** - * 合作单位id - */ - @ApiModelProperty(value = "合作单位id") - private java.lang.String enterpriseId; + /** + * 合作单位ids + */ + @ApiModelProperty(value = "合作单位ids") + private java.lang.String enterpriseIds; + + /** + * 合作单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "合作单位名称") + private java.lang.String enterpriseName; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/frontier/entity/FrontierProtectionDev.java b/src/main/java/com/zhgd/xmgl/modules/frontier/entity/FrontierProtectionDev.java index c88c4a365..df3e2d763 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontier/entity/FrontierProtectionDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/frontier/entity/FrontierProtectionDev.java @@ -102,11 +102,19 @@ public class FrontierProtectionDev implements Serializable { private Integer status; @ApiModelProperty(value = "备注") private String remark; - /** - * 合作单位id - */ - @ApiModelProperty(value = "合作单位id") - private java.lang.String enterpriseId; + /** + * 合作单位ids + */ + @ApiModelProperty(value = "合作单位ids") + private java.lang.String enterpriseIds; + + /** + * 合作单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "合作单位名称") + private java.lang.String enterpriseName; + @TableField(exist = false) @ApiModelProperty(value = "班组名称") private String teamName; diff --git a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/entity/FrontierProtectionNoNetDev.java b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/entity/FrontierProtectionNoNetDev.java index dcdb6f716..6ed4da899 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/entity/FrontierProtectionNoNetDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/entity/FrontierProtectionNoNetDev.java @@ -102,10 +102,18 @@ public class FrontierProtectionNoNetDev implements Serializable { @ApiModelProperty(value = "设备在线状态 0离线；1在线") private Integer onLine; /** - * 合作单位id + * 合作单位ids */ - @ApiModelProperty(value = "合作单位id") - private java.lang.String enterpriseId; + @ApiModelProperty(value = "合作单位ids") + private java.lang.String enterpriseIds; + + /** + * 合作单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "合作单位名称") + private java.lang.String enterpriseName; + @TableField(exist = false) @ApiModelProperty(value = "责任班组名称") private java.lang.String dutyTeamInfoName; diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialDevice.java b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialDevice.java index 5d5b41641..bff11ccb1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialDevice.java +++ b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialDevice.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.gt.entity; 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; @@ -207,8 +208,17 @@ public class GtMaterialDevice implements Serializable { @ApiModelProperty(value = "设备去向") private java.lang.String equipmentWhereabouts; - /** - * 合作单位id - */ - @ApiModelProperty(value = "合作单位id") - private java.lang.String enterpriseId;} + /** + * 合作单位ids + */ + @ApiModelProperty(value = "合作单位ids") + private java.lang.String enterpriseIds; + + /** + * 合作单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "合作单位名称") + private java.lang.String enterpriseName; + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/hangbasket/entity/HangBasketDev.java b/src/main/java/com/zhgd/xmgl/modules/hangbasket/entity/HangBasketDev.java index 17950ec4a..11688ccd7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/hangbasket/entity/HangBasketDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/hangbasket/entity/HangBasketDev.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.Date; 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 lombok.Data; @@ -84,7 +85,16 @@ public class HangBasketDev implements Serializable { @ApiModelProperty(value = "项目sn") private java.lang.String projectSn; /** - * 合作单位id + * 合作单位ids */ - @ApiModelProperty(value = "合作单位id") - private java.lang.String enterpriseId;} + @ApiModelProperty(value = "合作单位ids") + private java.lang.String enterpriseIds; + + /** + * 合作单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "合作单位名称") + private java.lang.String enterpriseName; + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasureDevice.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasureDevice.java index 3bfff8435..b2f234ed1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasureDevice.java +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasureDevice.java @@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.highformwork.entity; import java.io.Serializable; 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.databind.annotation.JsonSerialize; @@ -47,8 +48,16 @@ public class HighFormworkMeasureDevice implements Serializable { @ApiModelProperty(value = "类型：1立杆轴力2水平位移3模板沉降4立杆倾斜5地基沉降") private java.lang.Integer deviceType ; /** - * 合作单位id + * 合作单位ids */ - @ApiModelProperty(value = "合作单位id") - private java.lang.String enterpriseId; + @ApiModelProperty(value = "合作单位ids") + private java.lang.String enterpriseIds; + + /** + * 合作单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "合作单位名称") + private java.lang.String enterpriseName; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/massrebound/entity/MassReboundMeasureDev.java b/src/main/java/com/zhgd/xmgl/modules/massrebound/entity/MassReboundMeasureDev.java index 2a26b602a..e1ba428d7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/massrebound/entity/MassReboundMeasureDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/massrebound/entity/MassReboundMeasureDev.java @@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.massrebound.entity; import java.io.Serializable; 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.databind.annotation.JsonSerialize; @@ -40,7 +41,16 @@ public class MassReboundMeasureDev implements Serializable { @ApiModelProperty(value="设备编号") private java.lang.String devNo ; /** - * 合作单位id + * 合作单位ids */ - @ApiModelProperty(value = "合作单位id") - private java.lang.String enterpriseId;} + @ApiModelProperty(value = "合作单位ids") + private java.lang.String enterpriseIds; + + /** + * 合作单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "合作单位名称") + private java.lang.String enterpriseName; + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/mixingstation/entity/MsMixedSoilDev.java b/src/main/java/com/zhgd/xmgl/modules/mixingstation/entity/MsMixedSoilDev.java index 4d77e81a8..cd2a83f4b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/mixingstation/entity/MsMixedSoilDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/mixingstation/entity/MsMixedSoilDev.java @@ -117,8 +117,17 @@ public class MsMixedSoilDev implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新时间 yyyy-MM-dd HH:mm:ss") private java.util.Date updateDate; - /** - * 合作单位id - */ - @ApiModelProperty(value = "合作单位id") - private java.lang.String enterpriseId;} + /** + * 合作单位ids + */ + @ApiModelProperty(value = "合作单位ids") + private java.lang.String enterpriseIds; + + /** + * 合作单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "合作单位名称") + private java.lang.String enterpriseName; + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveCompactionDev.java b/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveCompactionDev.java index cabad45da..d760b041e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveCompactionDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveCompactionDev.java @@ -104,10 +104,18 @@ public class PaveCompactionDev implements Serializable { @ApiModelProperty(value = "上次数据上传时间 yyyy-MM-dd HH:mm:ss") private java.util.Date lastDataTime; /** - * 合作单位id + * 合作单位ids */ - @ApiModelProperty(value = "合作单位id") - private java.lang.String enterpriseId; + @ApiModelProperty(value = "合作单位ids") + private java.lang.String enterpriseIds; + + /** + * 合作单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "合作单位名称") + private java.lang.String enterpriseName; + @TableField(exist = false) @ApiModelProperty(value = "设备在线状态（0.离线 1.在线）") private java.lang.Integer devOnline; diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveDev.java b/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveDev.java index d309f6e83..8fd043bda 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveDev.java @@ -104,10 +104,18 @@ public class PaveDev implements Serializable { @ApiModelProperty(value = "上次数据上传时间 yyyy-MM-dd HH:mm:ss") private java.util.Date lastDataTime; /** - * 合作单位id + * 合作单位ids */ - @ApiModelProperty(value = "合作单位id") - private java.lang.String enterpriseId; + @ApiModelProperty(value = "合作单位ids") + private java.lang.String enterpriseIds; + + /** + * 合作单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "合作单位名称") + private java.lang.String enterpriseName; + @TableField(exist = false) @ApiModelProperty(value = "设备在线状态（0.离线 1.在线）") private java.lang.Integer devOnline; diff --git a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/entity/PitchMixStationDev.java b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/entity/PitchMixStationDev.java index 92a634964..b39bd5200 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/entity/PitchMixStationDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/entity/PitchMixStationDev.java @@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.pitchmixstation.entity; import java.io.Serializable; 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 lombok.Data; @@ -115,8 +116,17 @@ public class PitchMixStationDev implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新时间 yyyy-MM-dd HH:mm:ss") private java.util.Date updateDate; - /** - * 合作单位id - */ - @ApiModelProperty(value = "合作单位id") - private java.lang.String enterpriseId;} + /** + * 合作单位ids + */ + @ApiModelProperty(value = "合作单位ids") + private java.lang.String enterpriseIds; + + /** + * 合作单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "合作单位名称") + private java.lang.String enterpriseName; + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/poisonous/entity/PoisonousGasDev.java b/src/main/java/com/zhgd/xmgl/modules/poisonous/entity/PoisonousGasDev.java index d3218dd03..f0cab7eaf 100644 --- a/src/main/java/com/zhgd/xmgl/modules/poisonous/entity/PoisonousGasDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/poisonous/entity/PoisonousGasDev.java @@ -102,11 +102,19 @@ public class PoisonousGasDev implements Serializable { private Long dutyTeamInfoId; @ApiModelProperty(value = "图片") private String image; - /** - * 合作单位id - */ - @ApiModelProperty(value = "合作单位id") - private java.lang.String enterpriseId; + /** + * 合作单位ids + */ + @ApiModelProperty(value = "合作单位ids") + private java.lang.String enterpriseIds; + + /** + * 合作单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "合作单位名称") + private java.lang.String enterpriseName; + @ApiModelProperty(value = "责任班组名称") @TableField(exist = false) private String dutyTeamInfoName; diff --git a/src/main/java/com/zhgd/xmgl/modules/pressuretest/entity/PressureTestMachineDev.java b/src/main/java/com/zhgd/xmgl/modules/pressuretest/entity/PressureTestMachineDev.java index 237623313..c2dc19f55 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pressuretest/entity/PressureTestMachineDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/pressuretest/entity/PressureTestMachineDev.java @@ -102,8 +102,16 @@ public class PressureTestMachineDev implements Serializable { @ApiModelProperty(value = "项目sn") private java.lang.String projectSn; /** - * 合作单位id + * 合作单位ids */ - @ApiModelProperty(value = "合作单位id") - private java.lang.String enterpriseId; + @ApiModelProperty(value = "合作单位ids") + private java.lang.String enterpriseIds; + + /** + * 合作单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "合作单位名称") + private java.lang.String enterpriseName; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatDev.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatDev.java index 15c3c4112..18ad54476 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatDev.java @@ -77,11 +77,19 @@ public class SafetyHatDev implements Serializable { private java.lang.Integer online; @ApiModelProperty(value = "安全帽外部user_id") private java.lang.String extUserId; - /** - * 合作单位id - */ - @ApiModelProperty(value = "合作单位id") - private java.lang.String enterpriseId; + /** + * 合作单位ids + */ + @ApiModelProperty(value = "合作单位ids") + private java.lang.String enterpriseIds; + + /** + * 合作单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "合作单位名称") + private java.lang.String enterpriseName; + /** * 人员名称 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageDev.java b/src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageDev.java index b92de9324..2738919a9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageDev.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.sewage.entity; 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; @@ -102,9 +103,17 @@ public class SewageDev implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新时间 yyyy-MM-dd HH:mm:ss") private java.util.Date updateDate; - /** - * 合作单位id - */ - @ApiModelProperty(value = "合作单位id") - private java.lang.String enterpriseId; + /** + * 合作单位ids + */ + @ApiModelProperty(value = "合作单位ids") + private java.lang.String enterpriseIds; + + /** + * 合作单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "合作单位名称") + private java.lang.String enterpriseName; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/smartgrout/entity/SmartGroutDev.java b/src/main/java/com/zhgd/xmgl/modules/smartgrout/entity/SmartGroutDev.java index f25597618..b04537545 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smartgrout/entity/SmartGroutDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/smartgrout/entity/SmartGroutDev.java @@ -110,8 +110,16 @@ public class SmartGroutDev implements Serializable { @ApiModelProperty(value = "更新时间") private java.util.Date updateTime; /** - * 合作单位id + * 合作单位ids */ - @ApiModelProperty(value = "合作单位id") - private java.lang.String enterpriseId; + @ApiModelProperty(value = "合作单位ids") + private java.lang.String enterpriseIds; + + /** + * 合作单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "合作单位名称") + private java.lang.String enterpriseName; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/smarttension/entity/SmartTensionDev.java b/src/main/java/com/zhgd/xmgl/modules/smarttension/entity/SmartTensionDev.java index 29d43fb85..303f25057 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smarttension/entity/SmartTensionDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/smarttension/entity/SmartTensionDev.java @@ -106,8 +106,16 @@ public class SmartTensionDev implements Serializable { @ApiModelProperty(value = "更新时间") private java.util.Date updateTime; /** - * 合作单位id + * 合作单位ids */ - @ApiModelProperty(value = "合作单位id") - private java.lang.String enterpriseId; + @ApiModelProperty(value = "合作单位ids") + private java.lang.String enterpriseIds; + + /** + * 合作单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "合作单位名称") + private java.lang.String enterpriseName; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/smoke/entity/SmokeDev.java b/src/main/java/com/zhgd/xmgl/modules/smoke/entity/SmokeDev.java index 9afd17ec3..a32e783d7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smoke/entity/SmokeDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/smoke/entity/SmokeDev.java @@ -91,11 +91,19 @@ public class SmokeDev implements Serializable { @Excel(name = "备注", width = 15) @ApiModelProperty(value = "备注") private java.lang.String remark; - /** - * 合作单位id - */ - @ApiModelProperty(value = "合作单位id") - private java.lang.String enterpriseId; + /** + * 合作单位ids + */ + @ApiModelProperty(value = "合作单位ids") + private java.lang.String enterpriseIds; + + /** + * 合作单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "合作单位名称") + private java.lang.String enterpriseName; + @ApiModelProperty(value = "责任班组名称") @TableField(exist = false) private String dutyTeamInfoName; diff --git a/src/main/java/com/zhgd/xmgl/modules/sprayrt/entity/SprayRtDev.java b/src/main/java/com/zhgd/xmgl/modules/sprayrt/entity/SprayRtDev.java index e5f569ea0..0f44e0f3e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sprayrt/entity/SprayRtDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/sprayrt/entity/SprayRtDev.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.Date; 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 lombok.Data; @@ -74,8 +75,16 @@ public class SprayRtDev implements Serializable { @ApiModelProperty(value = "更新时间 yyyy-MM-dd HH:mm:ss") private java.util.Date updateDate; /** - * 合作单位id + * 合作单位ids */ - @ApiModelProperty(value = "合作单位id") - private java.lang.String enterpriseId; + @ApiModelProperty(value = "合作单位ids") + private java.lang.String enterpriseIds; + + /** + * 合作单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "合作单位名称") + private java.lang.String enterpriseName; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/stablewater/entity/StableWaterMixStationDev.java b/src/main/java/com/zhgd/xmgl/modules/stablewater/entity/StableWaterMixStationDev.java index 0f4e9b0fc..85e374273 100644 --- a/src/main/java/com/zhgd/xmgl/modules/stablewater/entity/StableWaterMixStationDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/stablewater/entity/StableWaterMixStationDev.java @@ -113,9 +113,17 @@ public class StableWaterMixStationDev implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新时间 yyyy-MM-dd HH:mm:ss") private java.util.Date updateDate; - /** - * 合作单位id - */ - @ApiModelProperty(value = "合作单位id") - private java.lang.String enterpriseId; + /** + * 合作单位ids + */ + @ApiModelProperty(value = "合作单位ids") + private java.lang.String enterpriseIds; + + /** + * 合作单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "合作单位名称") + private java.lang.String enterpriseName; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/standard/entity/StandardDev.java b/src/main/java/com/zhgd/xmgl/modules/standard/entity/StandardDev.java index 1516dcf76..5e924048b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/standard/entity/StandardDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/standard/entity/StandardDev.java @@ -149,11 +149,19 @@ public class StandardDev implements Serializable { @Excel(name = "设备实时温度", width = 15) @ApiModelProperty(value="设备实时温度") private java.lang.String devTemperature ; - /** - * 合作单位id - */ - @ApiModelProperty(value = "合作单位id") - private java.lang.String enterpriseId; + /** + * 合作单位ids + */ + @ApiModelProperty(value = "合作单位ids") + private java.lang.String enterpriseIds; + + /** + * 合作单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "合作单位名称") + private java.lang.String enterpriseName; + @TableField(exist = false) @ApiModelProperty(value="项目名称") private java.lang.String projectName ; diff --git a/src/main/java/com/zhgd/xmgl/modules/universaltest/entity/UniversalTestDev.java b/src/main/java/com/zhgd/xmgl/modules/universaltest/entity/UniversalTestDev.java index a2f9a3f5d..efdbc6fd6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/universaltest/entity/UniversalTestDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/universaltest/entity/UniversalTestDev.java @@ -104,10 +104,18 @@ public class UniversalTestDev implements Serializable { @ApiModelProperty(value = "更新时间") private java.util.Date updateTime; /** - * 合作单位id + * 合作单位ids */ - @ApiModelProperty(value = "合作单位id") - private java.lang.String enterpriseId; + @ApiModelProperty(value = "合作单位ids") + private java.lang.String enterpriseIds; + + /** + * 合作单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "合作单位名称") + private java.lang.String enterpriseName; + @TableField(exist = false) @ApiModelProperty(value = "试验总次数") private Integer testTotalNum; diff --git a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/entity/VehiclePositionDev.java b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/entity/VehiclePositionDev.java index 85c8aada9..7dd340eee 100644 --- a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/entity/VehiclePositionDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/entity/VehiclePositionDev.java @@ -103,11 +103,19 @@ public class VehiclePositionDev implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "新增时间") private java.util.Date addTime; - /** - * 合作单位id - */ - @ApiModelProperty(value = "合作单位id") - private java.lang.String enterpriseId; + /** + * 合作单位ids + */ + @ApiModelProperty(value = "合作单位ids") + private java.lang.String enterpriseIds; + + /** + * 合作单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "合作单位名称") + private java.lang.String enterpriseName; + @TableField(exist = false) @ApiModelProperty(value = "在线状态（0.离线 1.在线）") diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/UfaceDev.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/UfaceDev.java index d81d39e6d..8cf20fc8c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/entity/UfaceDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/UfaceDev.java @@ -136,11 +136,19 @@ public class UfaceDev implements Serializable { @Excel(name = "设备位置归属，1工地区，2生活区，3项目部", width = 15) @ApiModelProperty(value = "设备位置归属，1工地区，2生活区，3项目部") private java.lang.Integer devGroupType; - /** - * 合作单位id - */ - @ApiModelProperty(value = "合作单位id") - private java.lang.String enterpriseId; + /** + * 合作单位ids + */ + @ApiModelProperty(value = "合作单位ids") + private java.lang.String enterpriseIds; + + /** + * 合作单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "合作单位名称") + private java.lang.String enterpriseName; + @ApiModelProperty(value = "设备状态1在线0离线") @TableField(exist = false) private java.lang.Integer devOnline;