Skip to content

A
amos-boot-biz
Commit 96ba5615 authored by KeYong's avatar KeYong
Browse files
Options

更新实体

parent 60c2b067
Hide whitespace changes
Inline Side-by-side
Showing with 79 additions and 138 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/dto/ESEquipmentSpecificDto.java
View file @ 96ba5615
package com.yeejoin.equipmanage.dto; package com.yeejoin.equipmanage.dto;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yeejoin.equipmanage.common.entity.Stock;
import com.yeejoin.equipmanage.common.entity.StockDetail;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import org.springframework.data.annotation.Id;
import org.springframework.data.elasticsearch.annotations.Document; import org.springframework.data.elasticsearch.annotations.Document;
import org.springframework.data.elasticsearch.annotations.Field; import org.springframework.data.elasticsearch.annotations.Field;
import org.springframework.data.elasticsearch.annotations.FieldType; import org.springframework.data.elasticsearch.annotations.FieldType;
import java.util.Date;
import java.util.List;
import java.util.Map;
/** /**
* @author keyong * @author keyong
* @title: ESEquipmentSpecificDto * @title: ESEquipmentSpecificDto
...@@ -30,183 +20,130 @@ import java.util.Map; ...@@ -30,183 +20,130 @@ import java.util.Map;
@Document(indexName = "equipment_specific", shards = 1, replicas = 0) @Document(indexName = "equipment_specific", shards = 1, replicas = 0)
public class ESEquipmentSpecificDto { public class ESEquipmentSpecificDto {
@Id @Field(type = FieldType.Text)
private Long id; @ApiModelProperty(value = "id")
private String id;
@ApiModelProperty(value = "设备id") @Field(type = FieldType.Text)
@Field(type = FieldType.Long) @ApiModelProperty(value = "数量")
private Long equipmentDetailId; private String amount;
@ApiModelProperty(value = "二维码")
@Field(type = FieldType.Text) @Field(type = FieldType.Text)
@ApiModelProperty(value = "显示二维码")
private String qrCode; private String qrCode;
@ApiModelProperty(value = "管理方式(默认单件)")
@Field(type = FieldType.Boolean)
private Boolean single;
@ApiModelProperty(value = "所属系统")
@Field(type = FieldType.Text) @Field(type = FieldType.Text)
private String systemId; @ApiModelProperty(value = "生成图片二维码")
private String fullqrCode;
@ApiModelProperty(value = "物联编码")
@Field(type = FieldType.Keyword)
private String iotCode;
@ApiModelProperty(value = "批量录入数量")
@Field(type = FieldType.Float)
private Float num;
@ApiModelProperty(value = "单位编码")
@Field(type = FieldType.Text) @Field(type = FieldType.Text)
private String orgCode; @ApiModelProperty(value = "设备名称")
private String equipmentName;
@ApiModelProperty(value = "设备编码")
@Field(type = FieldType.Text) @Field(type = FieldType.Text)
@ApiModelProperty(value = "设备编码")
private String code; private String code;
@ApiModelProperty(value = "录入方式")
@Field(type = FieldType.Integer)
private Integer inputWay;
@ApiModelProperty(value = "所属单位id(来源于平台)")
@Field(type = FieldType.Text) @Field(type = FieldType.Text)
private String agencyId; @ApiModelProperty(value = "物联编码")
private String iotCode;
@ApiModelProperty(value = "所属单位名称(来源于平台)")
@Field(type = FieldType.Text) @Field(type = FieldType.Text)
private String agencyName; @ApiModelProperty(value = "单位数量名称")
private String unitName;
@ApiModelProperty(value = "所属队伍id(来源于平台)")
@Field(type = FieldType.Text) @Field(type = FieldType.Text)
private String teamId; @ApiModelProperty(value = "单位Id")
private String unitId;
@ApiModelProperty(value = "队伍名称(冗余字段来源于平台)")
@Field(type = FieldType.Text) @Field(type = FieldType.Text)
private String teamName; @ApiModelProperty(value = "规格型号")
private String standard;
@ApiModelProperty(value = "实时指标名称")
@Field(type = FieldType.Text) @Field(type = FieldType.Text)
private String realtimeIotIndexName; @ApiModelProperty(value = "图片")
private String img;
@ApiModelProperty(value = "实时指标编码")
@Field(type = FieldType.Text) @Field(type = FieldType.Text)
private String realtimeIotIndexKey; @ApiModelProperty(value = "位置")
private String warehouseStructureName;
@ApiModelProperty(value = "实时指标值")
@Field(type = FieldType.Text) @Field(type = FieldType.Text)
private String realtimeIotIndexValue; @ApiModelProperty(value = "系统名")
private String systemName;
@ApiModelProperty(value = "实时指标id（wl_equipment_specific_index_id）")
@Field(type = FieldType.Long)
private Long realtimeIotEsIndexId;
@ApiModelProperty(value = "指标id（wl_equipment_index_id）")
@Field(type = FieldType.Long)
private Long realtimeIotIndexId;
@ApiModelProperty(value = "实时指标更新时间") @Field(type = FieldType.Text)
@Field(type = FieldType.Date) @ApiModelProperty(value = "供应商名")
private Date realtimeIotIndexUpdateDate; private String manufacturerName;
@ApiModelProperty(value = "物联设备实时状态，默认0表示正常（绿色#00ff00），1为故障类（黄色 #ffd500），2为火警类（红色#ff0000）")
@Field(type = FieldType.Text) @Field(type = FieldType.Text)
private String equipStatus="0"; @ApiModelProperty(value = "供应商Id")
private String manufacturerId;
@ApiModelProperty(value = "完整二维码")
@Field(type = FieldType.Text) @Field(type = FieldType.Text)
private String fullqrCode; @ApiModelProperty(value = "状态:在位。。。")
private String status;
@Field(type = FieldType.Text) @Field(type = FieldType.Text)
private Stock stock; @ApiModelProperty(value = "装备类型")
private String type;
@Field(type = FieldType.Object) @Field(type = FieldType.Boolean)
private StockDetail stockDetail; @ApiModelProperty(value = "是否维保")
private Boolean isMaintenance;
@Field(type = FieldType.Boolean)
@ApiModelProperty(value = "是否巡检")
private Boolean isinspection;
//新加
@ApiModelProperty(value = "机构/部门名称")
@Field(type = FieldType.Text) @Field(type = FieldType.Text)
private String bizOrgName; private String eqtype;
@ApiModelProperty(value = "机构编码")
@Field(type = FieldType.Text) @Field(type = FieldType.Text)
private String bizOrgCode; @ApiModelProperty(value = "库存明细id")
private String stockDetailId;
/**
* 所属部门
*/
@Field(type = FieldType.Long)
private Long departmentId;
/**
* 物理区域id,数据来源于wl_area
*/
@Field(type = FieldType.Long)
private Long areaId;
/**
* 设备名称
*/
@Field(type = FieldType.Text) @Field(type = FieldType.Text)
private String name; @ApiModelProperty(value = "单位部门名陈")
private String bizOrgName;
/**
* 设备位置
*/
@Field(type = FieldType.Text) @Field(type = FieldType.Text)
private String position; @ApiModelProperty(value = "单位部门org")
private String bizOrgCode;
/**
* 设备detail编码
*/
@Field(type = FieldType.Text) @Field(type = FieldType.Text)
private String equipmentCode; @ApiModelProperty(value = "所在建筑")
private String belongBuildName;
/** @Field(type = FieldType.Double)
* 存放位置冗余字段 @ApiModelProperty(value = "经度")
*/ private Double longitude;
@Field(type = FieldType.Long)
private Long warehouseStructureId;
@ApiModelProperty(value = "告警状态") @Field(type = FieldType.Double)
@Field(type = FieldType.Integer) @ApiModelProperty(value = "纬度")
private Integer status; private Double latitude;
@ApiModelProperty(value = "系统名称") @Field(type = FieldType.Double)
@Field(type = FieldType.Text) @ApiModelProperty(value = "物联设备实时状态")
private String systemName; private Double equipStatus;
@ApiModelProperty(value = "设备值说明")
@Field(type = FieldType.Text) @Field(type = FieldType.Text)
private String valueLabel; @ApiModelProperty(value = "车牌号")
private String carNum;
@ApiModelProperty(value = "质保信息")
@Field(type = FieldType.Text) @Field(type = FieldType.Text)
private String warrantyInfo; @ApiModelProperty(value = "分类名称/车或者装备")
private String systemType;
@ApiModelProperty(value = "指标类型编码")
@Field(type = FieldType.Text) @Field(type = FieldType.Text)
private String typeCode; @ApiModelProperty(value = "状态评估")
private String other;
@ApiModelProperty(value = "质保周期")
@JsonFormat(pattern = "yyyy-MM-dd")
@Field(type = FieldType.Date)
private Date warrantyPeriod;
@Field(type = FieldType.Text) @Field(type = FieldType.Text)
private String equipCondition; @ApiModelProperty(value = "日常运维")
private String equip;
@ApiModelProperty(value = "是否遥测")
@Field(type = FieldType.Boolean)
private Boolean isTrend;
@ApiModelProperty(value = "指标单位")
@Field(type = FieldType.Text) @Field(type = FieldType.Text)
private String unit; @ApiModelProperty(value = "系统IDs")
private String systemId;
@ApiModelProperty(value = "指标参数")
@Field(type = FieldType.Object)
private List<Map<String, Object>> indexParameter;
} }
amos-boot-system-equip/src/main/resources/application-dev.properties
View file @ 96ba5615
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url = jdbc:mysql://172.16.10.216:3306/dl_business_v3.0.1.3?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai spring.datasource.url = jdbc:mysql://172.16.10.227:3306/dl_business_v3.0.1.3?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username=root spring.datasource.username=root
spring.datasource.password=ENC(ooSbV2vO5UUB3BuAVYjYxm4OVY4rCv275/HxXJNz+Nbf2I8EjuylP9tTh30s2j7g) spring.datasource.password=ENC(ooSbV2vO5UUB3BuAVYjYxm4OVY4rCv275/HxXJNz+Nbf2I8EjuylP9tTh30s2j7g)
spring.datasource.type=com.zaxxer.hikari.HikariDataSource spring.datasource.type=com.zaxxer.hikari.HikariDataSource
...@@ -17,7 +17,7 @@ eureka.instance.prefer-ip-address = true ...@@ -17,7 +17,7 @@ eureka.instance.prefer-ip-address = true
#服务实例ip地址，若eureka.instance.prefer-ip-address=false,ip-address设置失效，一般情况不用设置。 #服务实例ip地址，若eureka.instance.prefer-ip-address=false,ip-address设置失效，一般情况不用设置。
#eureka.instance.ip-address= 172.16.3.135 #eureka.instance.ip-address= 172.16.3.135
#eureka服务ip配置，可填写固定ip地址 #eureka服务ip配置，可填写固定ip地址
eureka.instance.hostname=172.16.10.216 eureka.instance.hostname=172.16.11.201
#eureka服务配置的校验账号及密码,配置需和eureka服务后台配置文件中一致 #eureka服务配置的校验账号及密码,配置需和eureka服务后台配置文件中一致
#eureka????????????,????eureka??????????? #eureka????????????,????eureka???????????
spring.security.user.name=admin spring.security.user.name=admin
...@@ -28,7 +28,7 @@ eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${sprin ...@@ -28,7 +28,7 @@ eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${sprin
#redis #redis
spring.redis.database=1 spring.redis.database=1
spring.redis.host=172.16.10.216 spring.redis.host=172.16.11.201
spring.redis.port=6379 spring.redis.port=6379
spring.redis.password=ENC(/T7d22Zy0QgL+Ff1+FC81syDFAVOpo4CoWrDVUELyjR2XEXuk+gmNnzkyK3B5ibi) spring.redis.password=ENC(/T7d22Zy0QgL+Ff1+FC81syDFAVOpo4CoWrDVUELyjR2XEXuk+gmNnzkyK3B5ibi)
spring.redis.lettuce.pool.max-active=200 spring.redis.lettuce.pool.max-active=200
...@@ -40,17 +40,17 @@ spring.redis.expire.time=30000 ...@@ -40,17 +40,17 @@ spring.redis.expire.time=30000
## emqx ## emqx
emqx.clean-session=true emqx.clean-session=true
emqx.client-id=${spring.application.name}-${security-random-int} emqx.client-id=${spring.application.name}-${security-random-int}
emqx.broker=tcp://172.16.10.216:1883 emqx.broker=tcp://172.16.11.201:1883
emqx.user-name=admin emqx.user-name=admin
emqx.password=ENC(GGQmxuyl6uOxAsDhjRo+USgUybWC8Ns4Q7mlnyq3JqJE9LsFgYBNK8gzJ7H/Znw+) emqx.password=ENC(GGQmxuyl6uOxAsDhjRo+USgUybWC8Ns4Q7mlnyq3JqJE9LsFgYBNK8gzJ7H/Znw+)
emqx.client-user-name=admin emqx.client-user-name=admin
emqx.client-password=ENC(GGQmxuyl6uOxAsDhjRo+USgUybWC8Ns4Q7mlnyq3JqJE9LsFgYBNK8gzJ7H/Znw+) emqx.client-password=ENC(GGQmxuyl6uOxAsDhjRo+USgUybWC8Ns4Q7mlnyq3JqJE9LsFgYBNK8gzJ7H/Znw+)
mqtt.scene.host=mqtt://172.16.10.216:8083/mqtt mqtt.scene.host=mqtt://172.16.11.201:8083/mqtt
mqtt.client.product.id=mqtt mqtt.client.product.id=mqtt
mqtt.topic=topic_mqtt mqtt.topic=topic_mqtt
spring.mqtt.completionTimeout=3000 spring.mqtt.completionTimeout=3000
# influxDB # influxDB
spring.influx.url=http://172.16.10.216:8086 spring.influx.url=http://172.16.11.201:8086
spring.influx.password=ENC(ooSbV2vO5UUB3BuAVYjYxm4OVY4rCv275/HxXJNz+Nbf2I8EjuylP9tTh30s2j7g) spring.influx.password=ENC(ooSbV2vO5UUB3BuAVYjYxm4OVY4rCv275/HxXJNz+Nbf2I8EjuylP9tTh30s2j7g)
spring.influx.user=root spring.influx.user=root
spring.influx.database=iot_platform spring.influx.database=iot_platform
......
pom.xml
View file @ 96ba5615
...@@ -297,6 +297,10 @@ ...@@ -297,6 +297,10 @@
<artifactId>log4j-api</artifactId> <artifactId>log4j-api</artifactId>
<version>2.17.0</version> <version>2.17.0</version>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-elasticsearch</artifactId>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<repositories> <repositories>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment