Bläddra i källkod

**********************************wx*************************
适配设备类型

weixinVSjinlai 4 år sedan
förälder
incheckning
a0ae5531d8

+ 0 - 30
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/Property.kt

@@ -137,36 +137,6 @@ open class Property : BaseInfo(),Comparator<Property> {
     @Column(name = "equip_id")
     var equipId: String? = null
 
-    /** 品牌型号id */
-    @Schema(description = "品牌型号id")
-    @Column(name = "dp_manufacturer_id")
-    var dpManufacturerID: String? = null
-
-    /** 供应商信息id */
-    @Schema(description = "供应商信息id")
-    @Column(name = "dp_supplier_id")
-    var dpSupplierId: String? = null
-
-    /** 维修商信息id */
-    @Schema(description = "维修商信息id")
-    @Column(name = "dp_maintainer_id")
-    var dpMaintainerId: String? = null
-
-    /** 保险公司信息id */
-    @Schema(description = "保险公司信息id")
-    @Column(name = "dp_insurer_id")
-    var dpInsurerId: String? = null
-
-    /** 设备型号id */
-    @Schema(description = "设备型号id")
-    @Column(name = "dp_specification_id")
-    var dpSpecificationId: String? = null
-
-    /** 品牌id */
-    @Schema(description = "品牌id")
-    @Column(name = "dp_brand_id")
-    var dpBrandId: String? = null
-
     /** 设备序号 */
     @Schema(description = "设备序号 ")
     @Column(name = "equip_serial")

+ 0 - 130
equip-component/src/main/kotlin/com/persagy/server/models/EquipmentDel.kt

@@ -112,11 +112,6 @@ open class EquipmentDel : BaseInfo() {
     @Column(name = "property_id",insertable = false,updatable = false )
     var propertyId: Boolean? = false
 
-    /** 品牌型号id */
-    @Schema(description = "品牌型号id")
-    @Column(name = "dp_manufacturer_id")
-    var dpManufacturerID: String? = null
-
 //    /** Revit族 */
 //    @Schema(description = "Revit族 ")
 //    @Column(name = "family_name")
@@ -127,136 +122,11 @@ open class EquipmentDel : BaseInfo() {
 //    @Column(name = "family_symbol")
 //    var familySymbol: String? = null
 
-    /** 供应商信息id */
-    @Schema(description = "供应商信息id")
-    @Column(name = "dp_supplier_id")
-    var dpSupplierID: String? = null
-
-    /** 维修商信息id */
-    @Schema(description = "维修商信息id")
-    @Column(name = "dp_maintainer_id")
-    var dpMaintainerID: String? = null
-
-    /** 保险公司信息id */
-    @Schema(description = "保险公司信息id")
-    @Column(name = "dp_insurer_id")
-    var dpInsurerID: String? = null
-
-    /** 台账参数 */
-    @Schema(description = "台账参数")
-    @Column(name = "ledger_param")
-    var ledgerParam: HashMap<String,Any?>? = null
-
-    /** 通讯参数 */
-    @Schema(description = "通讯参数")
-    @Column(name = "comm_param")
-    var commParam: HashMap<String,Any?>? = null
-
-    /** 技术参数 */
-    @Schema(description = "技术参数")
-    @Column(name = "tech_param")
-    var techParam: HashMap<String,Any?>? = null
-
-    /** 运行参数 */
-    @Schema(description = "运行参数")
-    @Column(name = "run_param")
-    var runParam: HashMap<String,Any?>? = null
-
-    /** 设定参数 */
-    @Schema(description = "设定参数")
-    @Column(name = "setting_param")
-    var settingParam: HashMap<String,Any?>? = null
-
-    /** 报警信息 */
-    @Schema(description = "报警信息")
-    @Column(name = "alram")
-    var alram: HashMap<String,Any?>? = null
-
-    /** 自定义 */
-    @Schema(description = "自定义")
-    @Column(name = "custom_param")
-    var customParam: HashMap<String,Any?>? = null
-
     /** 部件关联设备id */
     @Schema(description = "部件关联设备id")
     @Column(name = "parent_id")
     var parentId: String? = null
 
-    /** 温度传感器 */
-    @Schema(description = "温度传感器")
-    @Column(name = "temp_sensor")
-    var tempSensor: HashMap<String,Any?>? = null
-
-    /** 技术参数-通用 */
-    @Schema(description = "技术参数-通用")
-    @Column(name = "tech_param_general")
-    var techParamGeneral: HashMap<String,Any?>? = null
-
-    /** 运行参数-通用 */
-    @Schema(description = "运行参数-通用")
-    @Column(name = "run_param_general")
-    var runParamGeneral: HashMap<String,Any?>? = null
-
-    /** 速度传感器 */
-    @Schema(description = "速度传感器")
-    @Column(name = "speed_sensor")
-    var speedSensor: HashMap<String,Any?>? = null
-
-    /** 声音传感器 */
-    @Schema(description = "声音传感器")
-    @Column(name = "sound_sensor")
-    var soundSensor: HashMap<String,Any?>? = null
-
-    /** 湿度传感器 */
-    @Schema(description = "湿度传感器")
-    @Column(name = "humidity_sensor")
-    var humiditySensor: HashMap<String,Any?>? = null
-
-    /** 压力传感器 */
-    @Schema(description = "压力传感器")
-    @Column(name = "press_transd")
-    var pressTransd: HashMap<String,Any?>? = null
-
-    /** 热量传感器 */
-    @Schema(description = "热量传感器")
-    @Column(name = "heat_sensor")
-    var heatSensor: HashMap<String,Any?>? = null
-
-    /** 流量传感器 */
-    @Schema(description = "流量传感器")
-    @Column(name = "flow_sensor")
-    var flowSensor: HashMap<String,Any?>? = null
-
-    /** 电度传感器 */
-    @Schema(description = "电度传感器")
-    @Column(name = "electricity_sensor")
-    var electricitySensor: HashMap<String,Any?>? = null
-
-    /** 位移传感器 */
-    @Schema(description = "位移传感器")
-    @Column(name = "displ_sensor")
-    var displSensor: HashMap<String,Any?>? = null
-
-    /** 浓度传感器 */
-    @Schema(description = "浓度传感器")
-    @Column(name = "concent_sensor")
-    var concentSensor: HashMap<String,Any?>? = null
-
-    /** 图像传感器 */
-    @Schema(description = "图像传感器")
-    @Column(name = "image_sensor")
-    var imageSensor: HashMap<String,Any?>? = null
-
-    /** 对象类型 */
-    @Schema(description = "对象类型")
-    @Column(name = "object_type")
-    override var objectType: String? = "Equipment"
-
-    /** 反馈参数 */
-    @Schema(description = "反馈参数")
-    @Column(name = "feedback_param")
-    var feedbackParam: HashMap<String,Any?>? = null
-
     /** 系统id集合 */
     @Schema(description = "系统id集合")
     var systemList: List<String>? = null

+ 0 - 30
equip-component/src/main/kotlin/com/persagy/server/models/EquipmentProSy.kt

@@ -117,36 +117,6 @@ open class EquipmentProSy : BaseInfo() {
     @Column(name = "property_id",insertable = false,updatable = false )
     var propertyId: Boolean? = false
 
-    /** 品牌型号id */
-    @Schema(description = "品牌型号id")
-    @Column(name = "dp_manufacturer_id")
-    var dpManufacturerID: String? = null
-
-    /** 供应商信息id */
-    @Schema(description = "供应商信息id")
-    @Column(name = "dp_supplier_id")
-    var dpSupplierID: String? = null
-
-    /** 维修商信息id */
-    @Schema(description = "维修商信息id")
-    @Column(name = "dp_maintainer_id")
-    var dpMaintainerID: String? = null
-
-    /** 保险公司信息id */
-    @Schema(description = "保险公司信息id")
-    @Column(name = "dp_insurer_id")
-    var dpInsurerID: String? = null
-
-    /** 设备型号id */
-    @Schema(description = "设备型号id")
-    @Column(name = "dp_specification_id")
-    var dpSpecificationID: String? = null
-
-    /** 品牌id */
-    @Schema(description = "品牌id")
-    @Column(name = "dp_brand_id")
-    var dpBrandID: String? = null
-
     /** 信息点 */
     @Schema(description = "信息点")
     @Column(name = "infos")

+ 0 - 30
equip-component/src/main/kotlin/com/persagy/server/models/PropertySupplement.kt

@@ -141,36 +141,6 @@ open class PropertySupplement : BaseInfo(),Comparator<PropertySupplement> {
     @Column(name = "equip_id")
     var equipId: String? = null
 
-    /** 品牌型号id */
-    @Schema(description = "品牌型号id")
-    @Column(name = "dp_manufacturer_id")
-    var dpManufacturerID: String? = null
-
-    /** 供应商信息id */
-    @Schema(description = "供应商信息id")
-    @Column(name = "dp_supplier_id")
-    var dpSupplierID: String? = null
-
-    /** 维修商信息id */
-    @Schema(description = "维修商信息id")
-    @Column(name = "dp_maintainer_id")
-    var dpMaintainerID: String? = null
-
-    /** 保险公司信息id */
-    @Schema(description = "保险公司信息id")
-    @Column(name = "dp_insurer_id")
-    var dpInsurerID: String? = null
-
-    /** 设备型号id */
-    @Schema(description = "设备型号id")
-    @Column(name = "dp_specification_id")
-    var dpSpecificationID: String? = null
-
-    /** 品牌id */
-    @Schema(description = "品牌id")
-    @Column(name = "dp_brand_id")
-    var dpBrandID: String? = null
-
     /** 设备序号 */
     @Schema(description = "设备序号 ")
     @Column(name = "equip_serial")

+ 0 - 4
equip-component/src/main/kotlin/com/persagy/server/models/VEquipComponentCount.kt

@@ -44,25 +44,21 @@ class VEquipComponentCount : BaseInfo(){
     /** 设备id */
     @Schema(description = "设备id",required = true)
     @Column(name = "id")
-    @JSONField(name = "Id")
     var id: String? = null
 
     /** 分类 */
     @Schema(description = "分类")
     @Column(name = "category")
-    @JSONField(name = "Category")
     var category: String? = null
 
     /** 分类名称 */
     @Schema(description = "分类名称")
     @Column(name = "category_name")
-    @JSONField(name = "CategoryName")
     var categoryName: String? = null
 
     /** 数量 */
     @Schema(description = "数量",required = true)
     @Column(name = "count")
-    @JSONField(name = "count")
     var count:Long? = null
 
 } // class VEquipComponentCount