Merge remote-tracking branch 'origin/developer' into developer

amos-boot-biz-common/.factorypath

@@ -51,7 +51,7 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/io/netty/netty-buffer/4.1.65.Final/netty-buffer-4.1.65.Final.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/netty/netty-codec/4.1.65.Final/netty-codec-4.1.65.Final.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/netty/netty-transport/4.1.65.Final/netty-transport-4.1.65.Final.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-core-rdbms/1.1.23-SNAPSHOT/tyboot-core-rdbms-1.1.23-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-core-rdbms/1.1.25-SNAPSHOT/tyboot-core-rdbms-1.1.25-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/zaxxer/HikariCP/3.4.5/HikariCP-3.4.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-logging/2.3.11.RELEASE/spring-boot-starter-logging-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3.jar" enabled="true" runInBatchMode="false"/>
@@ -60,8 +60,9 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/logging/log4j/log4j-api/2.17.0/log4j-api-2.17.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/slf4j/jul-to-slf4j/1.7.30/jul-to-slf4j-1.7.30.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/mysql/mysql-connector-java/8.0.25/mysql-connector-java-8.0.25.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-core-restful/1.1.23-SNAPSHOT/tyboot-core-restful-1.1.23-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-core-auth/1.1.23-SNAPSHOT/tyboot-core-auth-1.1.23-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-core-restful/1.1.25-SNAPSHOT/tyboot-core-restful-1.1.25-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/bouncycastle/bcprov-jdk16/1.46/bcprov-jdk16-1.46.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-core-auth/1.1.25-SNAPSHOT/tyboot-core-auth-1.1.25-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/baomidou/mybatis-plus-generator/3.2.0/mybatis-plus-generator-3.2.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/baomidou/mybatis-plus-extension/3.2.0/mybatis-plus-extension-3.2.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/baomidou/mybatis-plus-core/3.2.0/mybatis-plus-core-3.2.0.jar" enabled="true" runInBatchMode="false"/>

amos-boot-data/amos-boot-data-alarm/.factorypath

@@ -73,7 +73,7 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/io/micrometer/micrometer-core/1.5.14/micrometer-core-1.5.14.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/hdrhistogram/HdrHistogram/2.1.12/HdrHistogram-2.1.12.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/latencyutils/LatencyUtils/2.0.3/LatencyUtils-2.0.3.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-core-foundation/1.1.23-SNAPSHOT/tyboot-core-foundation-1.1.23-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-core-foundation/1.1.25-SNAPSHOT/tyboot-core-foundation-1.1.25-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/belerweb/pinyin4j/2.5.0/pinyin4j-2.5.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/commons-beanutils/commons-beanutils/1.9.2/commons-beanutils-1.9.2.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar" enabled="true" runInBatchMode="false"/>
@@ -91,7 +91,7 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/logging/log4j/log4j-to-slf4j/2.13.3/log4j-to-slf4j-2.13.3.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/logging/log4j/log4j-api/2.17.0/log4j-api-2.17.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/slf4j/jul-to-slf4j/1.7.30/jul-to-slf4j-1.7.30.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-core-restful/1.1.23-SNAPSHOT/tyboot-core-restful-1.1.23-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-core-restful/1.1.25-SNAPSHOT/tyboot-core-restful-1.1.25-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-undertow/2.3.11.RELEASE/spring-boot-starter-undertow-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/undertow/undertow-core/2.1.7.Final/undertow-core-2.1.7.Final.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/jboss/logging/jboss-logging/3.4.1.Final/jboss-logging-3.4.1.Final.jar" enabled="true" runInBatchMode="false"/>
@@ -106,7 +106,8 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/org/jboss/spec/javax/websocket/jboss-websocket-api_1.1_spec/2.0.0.Final/jboss-websocket-api_1.1_spec-2.0.0.Final.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/jakarta/servlet/jakarta.servlet-api/4.0.4/jakarta.servlet-api-4.0.4.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/glassfish/jakarta.el/3.0.3/jakarta.el-3.0.3.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-core-auth/1.1.23-SNAPSHOT/tyboot-core-auth-1.1.23-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/bouncycastle/bcprov-jdk16/1.46/bcprov-jdk16-1.46.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-core-auth/1.1.25-SNAPSHOT/tyboot-core-auth-1.1.25-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/kafka/spring-kafka/2.5.13.RELEASE/spring-kafka-2.5.13.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-context/5.2.15.RELEASE/spring-context-5.2.15.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-aop/5.2.15.RELEASE/spring-aop-5.2.15.RELEASE.jar" enabled="true" runInBatchMode="false"/>
@@ -121,7 +122,7 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-component-emq/1.1.20/tyboot-component-emq-1.1.20.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/eclipse/paho/org.eclipse.paho.client.mqttv3/1.2.2/org.eclipse.paho.client.mqttv3-1.2.2.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/fasterxml/jackson/core/jackson-databind/2.11.4/jackson-databind-2.11.4.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-component-event/1.1.23-SNAPSHOT/tyboot-component-event-1.1.23-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-component-event/1.1.25-SNAPSHOT/tyboot-component-event-1.1.25-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-aop/2.3.11.RELEASE/spring-boot-starter-aop-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/springfox/springfox-swagger2/2.10.5/springfox-swagger2-2.10.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/swagger/swagger-annotations/1.5.20/swagger-annotations-1.5.20.jar" enabled="true" runInBatchMode="false"/>
@@ -137,7 +138,7 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/plugin/spring-plugin-core/2.0.0.RELEASE/spring-plugin-core-2.0.0.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/plugin/spring-plugin-metadata/2.0.0.RELEASE/spring-plugin-metadata-2.0.0.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/mapstruct/mapstruct/1.3.1.Final/mapstruct-1.3.1.Final.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-component-opendata/1.1.23-SNAPSHOT/tyboot-component-opendata-1.1.23-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-component-opendata/1.1.25-SNAPSHOT/tyboot-component-opendata-1.1.25-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/aliyun/aliyun-java-sdk-core/3.2.3/aliyun-java-sdk-core-3.2.3.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/aliyun/aliyun-java-sdk-dysmsapi/1.0.0/aliyun-java-sdk-dysmsapi-1.0.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/qiniu/qiniu-java-sdk/7.0.7/qiniu-java-sdk-7.0.7.jar" enabled="true" runInBatchMode="false"/>
@@ -164,7 +165,7 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/io/zipkin/reporter2/zipkin-reporter/2.15.0/zipkin-reporter-2.15.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/zipkin/zipkin2/zipkin/2.21.1/zipkin-2.21.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-component-config/1.7.10-SNAPSHOT/amos-component-config-1.7.10-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-core-rdbms/1.1.23-SNAPSHOT/tyboot-core-rdbms-1.1.23-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-core-rdbms/1.1.25-SNAPSHOT/tyboot-core-rdbms-1.1.25-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/baomidou/mybatis-plus-boot-starter/3.2.0/mybatis-plus-boot-starter-3.2.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/baomidou/mybatis-plus/3.2.0/mybatis-plus-3.2.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/baomidou/mybatis-plus-extension/3.2.0/mybatis-plus-extension-3.2.0.jar" enabled="true" runInBatchMode="false"/>
@@ -177,7 +178,7 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-jdbc/5.2.15.RELEASE/spring-jdbc-5.2.15.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/mysql/mysql-connector-java/8.0.25/mysql-connector-java-8.0.25.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/zaxxer/HikariCP/3.4.5/HikariCP-3.4.5.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-component-cache/1.1.23-SNAPSHOT/tyboot-component-cache-1.1.23-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-component-cache/1.1.25-SNAPSHOT/tyboot-component-cache-1.1.25-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-redis/1.4.5.RELEASE/spring-boot-starter-redis-1.4.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/data/spring-data-redis/2.3.9.RELEASE/spring-data-redis-2.3.9.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/data/spring-data-keyvalue/2.3.9.RELEASE/spring-data-keyvalue-2.3.9.RELEASE.jar" enabled="true" runInBatchMode="false"/>

amos-boot-data/amos-boot-data-alarm/src/main/java/com/yeejoin/amos/api/alarm/entity/EquipmentSpecificIndex.java

+package com.yeejoin.amos.api.alarm.entity;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@TableName("wl_equipment_specific_index")
+public class EquipmentSpecificIndex {
+	
+	@TableField("id")
+	private Long id;
+
+	@TableField("equipment_specific_id")
+	private Long address;
+
+	@TableField("value")
+	private String value;
+
+	@TableField("create_date")
+	private Date createDate;
+
+	@TableField("equipment_index_id")
+	private Long equipmentIndexId;
+
+	@TableField("update_date")
+	private Date updateDate;
+
+	@TableField("equipment_specific_name")
+	private String equipmentSpecificName;
+
+	@TableField("equipment_index_name")
+	private String equipmentIndexName;
+
+	@TableField("equipment_index_key")
+	private String equipmentIndexKey;
+
+	@TableField("value_label")
+	private String valueLabel;
+
+	@TableField("value_enum")
+	private String valueEnum;
+
+	@TableField("emergency_level_color")
+	private String emergencyLevelColor;
+
+	@TableField("is_alarm")
+	private boolean isAlarm;
+	
+	@TableField("emergency_level")
+	private String emergencyLevel;
+	
+	@TableField("emergency_level_describe")
+	private String emergencyLevelDescribe;
+	
+	@TableField("trace_id")
+	private String traceId;
+	
+	@TableField("index_address")
+	private String indexAddress;
+	
+	@TableField("station")
+	private String station;
+	
+	@TableField("quality")
+	private boolean quality;
+	
+	@TableField("data_type")
+	private String dataType;
+	
+	@TableField("time_stamp")
+	private String timeStamp;
+	
+	@TableField("gateway_id")
+	private String gatewayId;
+	
+	@TableField("unit")
+	private String unit;
+}

amos-boot-data/amos-boot-data-alarm/src/main/java/com/yeejoin/amos/api/alarm/entity/PointSystem.java

@@ -17,35 +17,46 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("dz_point_system")
-@ApiModel(value="PointSystem对象", description="")
+@ApiModel(value = "PointSystem对象", description = "")
 public class PointSystem extends BaseEntity {
 
 	@ApiModelProperty(value = "场站")
 	@TableField("station")
 	private String station;
+	
 	@ApiModelProperty(value = "二维码")
 	@TableField("number")
 	private String number;
+	
 	@ApiModelProperty(value = "类型")
 	@TableField("type")
 	private String type;
+	
 	@ApiModelProperty(value = "'地址'")
 	@TableField("address")
 	private String address;
+	
 	@ApiModelProperty(value = "测点类型")
 	@TableField("point_type")
 	private String pointType;
+	
 	@ApiModelProperty(value = "测点值")
 	@TableField("value")
 	private String value;
+	
 	@ApiModelProperty(value = "功能码")
 	@TableField("function_num")
 	private String functionNum;
+	
 	@ApiModelProperty(value = "kks码")
 	@TableField("kks")
 	private String kks;
-    @ApiModelProperty(value = "網管地址")
+	
+	@ApiModelProperty(value = "网关地址")
 	@TableField("gateway_id")
 	private String gatewayId;
 	
+	@ApiModelProperty(value = "场站缩写")
+	@TableField("station_abbr")
+	private String stationAbbr;
 }

amos-boot-data/amos-boot-data-alarm/src/main/java/com/yeejoin/amos/api/alarm/entity2/KKSData.java

+package com.yeejoin.amos.api.alarm.entity2;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@TableName("sjgl_zsj_zsbtz")
+public class KKSData {
+	@TableField("DBID")
+	private Long DBID;
+
+	@TableField("MACHGENRE")
+	private String MACHGENRE;
+
+	@TableField("SBBM")
+	private String SBBM;
+
+	@TableField("SBMC")
+	private String SBMC;
+
+	@TableField("MACHTYPE")
+	private Long MACHTYPE;
+
+	@TableField("LONGITUDE")
+	private String LONGITUDE;
+
+	@TableField("LATITUDE")
+	private String LATITUDE;
+
+	@TableField("CAPACITYL")
+	private String CAPACITYL;
+
+	@TableField("KKSBM")
+	private String KKSBM;
+
+	@TableField("KKSMS")
+	private String KKSMS;
+
+	@TableField("GGXH")
+	private String GGXH;
+
+	@TableField("SCCJ")
+	private String SCCJ;
+
+	@TableField("TYRQ")
+	private Date TYRQ;
+
+	@TableField("FSB")
+	private Long FSB;
+
+	@TableField("SBFL")
+	private String SBFL;
+
+	@TableField("XTDY")
+	private Long XTDY;
+
+	@TableField("WERKS")
+	private String WERKS;
+
+	@TableField("CREATE_BY")
+	private Long CREATE_BY;
+}

amos-boot-data/amos-boot-data-alarm/src/main/java/com/yeejoin/amos/api/alarm/entity2/StationBasic.java

+package com.yeejoin.amos.api.alarm.entity2;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 场站基础信息表
+ *
+ * @author system_generator
+ * @date 2023-04-20
+ */
+@TableName(value = "station_basic", autoResultMap = true)
+@Data
+public class StationBasic {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 场站名称
+	 */
+	@TableField("station_name")
+	private String stationName;
+
+	/**
+	 * 场站编号
+	 */
+	@TableField("station_code")
+	private String stationCode;
+
+	/**
+	 * 场站类型
+	 */
+	@TableField("station_type")
+	private String stationType;
+
+	@TableField("station_type_name")
+	private String stationTypeName;
+	/**
+	 * 项目状态
+	 */
+	@TableField("station_flag")
+	private String stationFlag;
+
+	@TableField("address")
+	private String address;
+
+	/**
+	 * 站长
+	 */
+	@TableField("station_master_name")
+	private String stationMasterName;
+
+	/**
+	 * 站长id
+	 */
+	@TableField("station_master_id")
+	private Integer stationMasterId;
+
+	/**
+	 * 联系方式（手机）
+	 */
+	@TableField("mobile_phone")
+	private String mobilePhone;
+
+	/**
+	 * 电话
+	 */
+	@TableField("phone")
+	private String phone;
+
+	/**
+	 * 邮箱
+	 */
+	@TableField("email")
+	private String email;
+
+	/**
+	 * 运维开始时间
+	 */
+	@TableField("devops_time")
+	private String devopsTime;
+
+	/**
+	 * 所属地区
+	 */
+	@TableField("belong_area")
+	private String belongArea;
+	/**
+	 * 所属地区名称
+	 */
+	@TableField("area_name")
+	private String areaName;
+
+	@TableField(exist = false)
+	private List<Integer> belongArealist;
+	/**
+	 * 业主单位
+	 */
+	@TableField("owner_unit")
+	private String ownerUnit;
+
+	/**
+	 * 简介
+	 */
+	@TableField("brief_introduction")
+	private String briefIntroduction;
+
+	/**
+	 * 场站log
+	 */
+	@TableField("station_logo")
+	private String stationLogo;
+
+	@TableField("area")
+	private String area;
+	@TableField("area_code")
+	private String areaCode;
+	@TableField("project_org_code")
+	private String projectOrgCode;
+
+	@TableField("platform_station_id")
+	private String platformStationId;
+
+	@TableField("jump_path")
+	private String jumpPath;
+
+	// 新增 场站第三方编号
+	@TableField("station_number")
+	private String stationNumber;
+	// 风机网管
+	@TableField("fan_gateway_id")
+	private String fanGatewayId;
+	// 升压站网管
+	@TableField("booster_gateway_id")
+	private String boosterGatewayId;
+	// 地图偏移量
+	@TableField(value = "title_pos", typeHandler = FastjsonTypeHandler.class)
+	private List<BigDecimal> titlePos;
+	/**
+	 * 赋码颜色
+	 */
+	@TableField("qrcode_color")
+	private String qrcodeColor;
+	/**
+	 * 前置网关配置的场站名称
+	 */
+	@TableField("station_core_name")
+	private String stationCoreName;
+	/**
+	 * 前置配置的升压站名称
+	 */
+	@TableField("booster_core_name")
+	private String boosterCoreName;
+	/**
+	 * 装机容量
+	 */
+	@TableField("installed_capacity")
+	private Double installedCapacity = 0.0;
+	/**
+	 * 装机容量
+	 */
+	@TableField("equip_numbers")
+	private Integer equipNumbers = 0;
+}

amos-boot-data/amos-boot-data-alarm/src/main/java/com/yeejoin/amos/api/alarm/mapper/EquipmentSpecificIndexMapper.java

+package com.yeejoin.amos.api.alarm.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.alarm.entity.EquipmentSpecificIndex;
+
+public interface EquipmentSpecificIndexMapper extends BaseMapper<EquipmentSpecificIndex>{
+
+}

amos-boot-data/amos-boot-data-alarm/src/main/java/com/yeejoin/amos/api/alarm/mapper2/KKSDataMapper.java

+package com.yeejoin.amos.api.alarm.mapper2;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.alarm.entity2.KKSData;
+
+public interface KKSDataMapper extends BaseMapper<KKSData> {
+}

amos-boot-data/amos-boot-data-alarm/src/main/java/com/yeejoin/amos/api/alarm/mapper2/StationBasicMapper.java

+package com.yeejoin.amos.api.alarm.mapper2;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.alarm.entity2.StationBasic;
+
+/**
+ * 场站基础信息表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-04-20
+ */
+public interface StationBasicMapper extends BaseMapper<StationBasic> {
+
+}

amos-boot-data/amos-boot-data-alarm/src/main/java/com/yeejoin/amos/api/alarm/service/IPointSystemService.java

 package com.yeejoin.amos.api.alarm.service;
 
-
 /**
  * @description:
  * @author: tw
@@ -8,7 +7,7 @@ package com.yeejoin.amos.api.alarm.service;
  */
 public interface IPointSystemService {
 
-  //触发风险预警
-public void sendWarning(String address, String value,String valueLabe,String gatewayId);
+	// 触发风险预警
+	public void sendWarning(String address, String value, String valueLabe, String gatewayId, String isAlarm);
 
 }

amos-boot-data/amos-boot-data-alarm/src/main/java/com/yeejoin/amos/api/alarm/service/impl/AlarmKafkaConsumer.java

@@ -2,13 +2,12 @@ package com.yeejoin.amos.api.alarm.service.impl;
 
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.kafka.annotation.KafkaListener;
 import org.springframework.kafka.annotation.TopicPartition;
 import org.springframework.kafka.support.Acknowledgment;
 import org.springframework.stereotype.Service;
 
-
-
 /**
  * @description: 监听设备告警信息
  * @author: tw
@@ -21,25 +20,31 @@ public class AlarmKafkaConsumer {
 	@Autowired
 	PointSystemServiceImpl pointSystemServiceImpl;
 	
-    //消费者来处理消息
-    @KafkaListener(id="alarmInfo" , topics ={"${kafka.equipment.alarm}"})
-    public void message1( String record, Acknowledgment ack){
+	@Value("${warning.wait.time:1000}")
+	private long waitTime;
+
+	// 消费者来处理消息
+	@KafkaListener(id = "alarmInfo", topics = { "${kafka.equipment.alarm}" })
+	public void message1(String record, Acknowledgment ack) throws InterruptedException {
 		// 处理业务
-        String date=record;
-        System.out.println("消息进来了"  +record);
-        //异步触发预警
+		String date = record;
+		
+		// 异步触发预警
 		pointSystemServiceImpl.sendWarningAsync(date);
-        //手动提交
+		
+		// 等待1s
+		Thread.sleep(waitTime);
+		
+		// 手动提交
 		ack.acknowledge();
 	}
 
-    @KafkaListener(id="user2" , topics ={"${kafka.equipment.test}"})
-    public void message2( String record, Acknowledgment ack){
-        String date=record;
-        System.out.println("消息进来了 8888888888888888888888");
+	@KafkaListener(id = "alarmInfo2", topics = { "${kafka.equipment.test}" })
+	public void message2(String record, Acknowledgment ack) {
+		String date = record;
+		System.out.println("收到告警信息" + date);
 	}
 
-
 //    public void message1( ConsumerRecord<?, ?> record, Acknowledgment ack){
 //        // 消费的哪个topic、partition的消息,打印出消息内容
 //

amos-boot-data/amos-boot-data-alarm/src/main/resources/application-dev.properties

 # jdbc_config
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url = jdbc:mysql://172.16.10.220:3306/equipment?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+spring.datasource.url = jdbc:mysql://10.20.1.157:3306/equipment?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
 spring.datasource.username=root
 spring.datasource.password=Yeejoin@2020
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource
@@ -16,7 +16,7 @@ spring.datasource.hikari.connection-test-query= SELECT 1
 
 ## db2-sync_data
 spring.db2.datasource.type: com.alibaba.druid.pool.DruidDataSource
-spring.db2.datasource.url=jdbc:mysql://139.9.173.44:3306/jxiop_sync_data?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.db2.datasource.url=jdbc:mysql://10.20.1.157:3306/jxiop_sync_data?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.db2.datasource.username=root
 spring.db2.datasource.password=Yeejoin@2020
 spring.db2.datasource.driver-class-name: com.mysql.cj.jdbc.Driver
@@ -26,7 +26,7 @@ spring.db2.datasource.driver-class-name: com.mysql.cj.jdbc.Driver
 
 # REDIS (RedisProperties)
 spring.redis.database=1
-spring.redis.host=172.16.10.220
+spring.redis.host=10.20.1.210
 spring.redis.port=6379
 spring.redis.password=yeejoin@2020
 spring.redis.lettuce.pool.max-active=200
@@ -37,7 +37,6 @@ spring.redis.expire.time=30000
 
 
 #注册中心地址
-
 eureka.client.registry-fetch-interval-seconds=5
 management.endpoint.health.show-details=always
 management.endpoints.web.exposure.include=*
@@ -47,19 +46,20 @@ eureka.instance.lease-renewal-interval-in-seconds=5
 eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
 eureka.instance.status-page-url-path=/actuator/info
 eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}${server.servlet.context-path}/doc.html
-eureka.instance.hostname= 172.16.10.220
+eureka.instance.hostname= 10.20.1.160
 eureka.instance.prefer-ip-address = true
-eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@172.16.10.220:10001/eureka/
+eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@${eureka.instance.hostname}:10001/eureka/
 
 spring.security.user.name=admin
 spring.security.user.password=a1234560
 ## emqx
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
-emqx.broker=tcp://172.16.10.220:1883
+emqx.broker=tcp://10.20.1.210:2883
 emqx.user-name=admin
 emqx.password=public
-mqtt.scene.host=mqtt://172.16.10.220:8083/mqtt
+mqtt.scene.host=mqtt://10.20.1.210:8083/mqtt
 mqtt.client.product.id=mqtt
 mqtt.topic=topic_mqtt
 spring.mqtt.completionTimeout=3000
+emqx.max-inflight=1000
\ No newline at end of file

amos-boot-data/amos-boot-data-alarm/src/main/resources/application.properties

@@ -2,7 +2,7 @@ spring.application.name=AMOS-ALARM-WJ
 server.servlet.context-path=/alarm
 server.port=11007
 
-spring.profiles.active=kingbase8
+spring.profiles.active=dev
 server.compression.enabled=true
 spring.jackson.dateFormat=yyyy-MM-dd HH:mm:ss
 
@@ -15,10 +15,9 @@ redis.cache.failure.time=10800
 # mybatis-plus
 mybatis-plus.mapper-locations=classpath:mapper/*Mapper.xml
 
-
 #消费者所在组的名称
 #消费者 的broker地址
-spring.kafka.consumer.bootstrap-servers=47.92.234.253:9092
+spring.kafka.consumer.bootstrap-servers=10.20.0.223:9092,10.20.0.133:9092
 # 是否自动提交
 spring.kafka.consumer.enable-auto-commit=false
 #offset的消费位置
@@ -30,26 +29,19 @@ spring.kafka.consumer.value-deserializer=org.apache.kafka.common.serialization.S
 spring.kafka.listener.ack-mode=manual_immediate
 #监听类型
 spring.kafka.listener.type=single
-# 并发
-#spring.kafka.listener.concurrency=5
-
-# 发生错误后，消息重发的次数。
-spring.kafka.producer.retries=1
-#配置kafak produce的broker地址
-spring.kafka.producer.bootstrap-servers=47.92.234.253:9092
-#默认批处理大小（以字节为单位）
-spring.kafka.producer.batch-size=16384
-#生产者可以用来缓冲等待发送到服务器的记录的内存总字节数
-spring.kafka.producer.buffer-memory=33554432
-# producer配置序列化
-spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer
-# kafka默认的String序列化器
-spring.kafka.producer.value-serializer=org.apache.kafka.common.serialization.StringSerializer
 
 kafka.equipment.alarm=EQUIPMENT_ALARM
 kafka.equipment.test=test88888
-
 #电站对接第三方查询设备kks码
-power.station.url=http://139.9.169.123:5024/prod-api/fdgl/process/DataInterface
+power.station.url=http://172.16.4.29:80/prod-api/fdgl/process/DataInterface
 #电站104采集预警
 power.station.warning=104/data/analysis
+
+#104发送告警间隔时间
+warning.wait.time=100
+#104缓存预警过滤
+warning.redis.use=false
+#104缓存预警过滤过期时间单位秒
+warning.redis.limit.time=3600
+#104升压站预警发送
+warning.SYZ=false
\ No newline at end of file

amos-boot-data/amos-boot-data-housepvapi/.factorypath

@@ -71,7 +71,7 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/io/micrometer/micrometer-core/1.5.14/micrometer-core-1.5.14.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/hdrhistogram/HdrHistogram/2.1.12/HdrHistogram-2.1.12.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/latencyutils/LatencyUtils/2.0.3/LatencyUtils-2.0.3.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-core-foundation/1.1.23-SNAPSHOT/tyboot-core-foundation-1.1.23-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-core-foundation/1.1.25-SNAPSHOT/tyboot-core-foundation-1.1.25-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/belerweb/pinyin4j/2.5.0/pinyin4j-2.5.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/commons-beanutils/commons-beanutils/1.9.2/commons-beanutils-1.9.2.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar" enabled="true" runInBatchMode="false"/>
@@ -90,7 +90,7 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/logging/log4j/log4j-to-slf4j/2.13.3/log4j-to-slf4j-2.13.3.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/logging/log4j/log4j-api/2.17.0/log4j-api-2.17.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/slf4j/jul-to-slf4j/1.7.30/jul-to-slf4j-1.7.30.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-core-restful/1.1.23-SNAPSHOT/tyboot-core-restful-1.1.23-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-core-restful/1.1.25-SNAPSHOT/tyboot-core-restful-1.1.25-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-undertow/2.3.11.RELEASE/spring-boot-starter-undertow-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/undertow/undertow-core/2.1.7.Final/undertow-core-2.1.7.Final.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/jboss/logging/jboss-logging/3.4.1.Final/jboss-logging-3.4.1.Final.jar" enabled="true" runInBatchMode="false"/>
@@ -105,11 +105,12 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/org/jboss/spec/javax/websocket/jboss-websocket-api_1.1_spec/2.0.0.Final/jboss-websocket-api_1.1_spec-2.0.0.Final.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/jakarta/servlet/jakarta.servlet-api/4.0.4/jakarta.servlet-api-4.0.4.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/glassfish/jakarta.el/3.0.3/jakarta.el-3.0.3.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-core-auth/1.1.23-SNAPSHOT/tyboot-core-auth-1.1.23-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-component-emq/1.1.23-SNAPSHOT/tyboot-component-emq-1.1.23-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/bouncycastle/bcprov-jdk16/1.46/bcprov-jdk16-1.46.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-core-auth/1.1.25-SNAPSHOT/tyboot-core-auth-1.1.25-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-component-emq/1.1.25-SNAPSHOT/tyboot-component-emq-1.1.25-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/eclipse/paho/org.eclipse.paho.client.mqttv3/1.2.2/org.eclipse.paho.client.mqttv3-1.2.2.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/fasterxml/jackson/core/jackson-databind/2.11.4/jackson-databind-2.11.4.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-component-opendata/1.1.23-SNAPSHOT/tyboot-component-opendata-1.1.23-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-component-opendata/1.1.25-SNAPSHOT/tyboot-component-opendata-1.1.25-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/aliyun/aliyun-java-sdk-core/3.2.3/aliyun-java-sdk-core-3.2.3.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/aliyun/aliyun-java-sdk-dysmsapi/1.0.0/aliyun-java-sdk-dysmsapi-1.0.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/qiniu/qiniu-java-sdk/7.0.7/qiniu-java-sdk-7.0.7.jar" enabled="true" runInBatchMode="false"/>
@@ -137,7 +138,7 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/io/zipkin/zipkin2/zipkin/2.21.1/zipkin-2.21.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/swagger/swagger-annotations/1.5.13/swagger-annotations-1.5.13.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-component-config/1.7.10-SNAPSHOT/amos-component-config-1.7.10-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-core-rdbms/1.1.23-SNAPSHOT/tyboot-core-rdbms-1.1.23-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-core-rdbms/1.1.25-SNAPSHOT/tyboot-core-rdbms-1.1.25-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/baomidou/mybatis-plus-boot-starter/3.2.0/mybatis-plus-boot-starter-3.2.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/baomidou/mybatis-plus/3.2.0/mybatis-plus-3.2.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/baomidou/mybatis-plus-extension/3.2.0/mybatis-plus-extension-3.2.0.jar" enabled="true" runInBatchMode="false"/>
@@ -147,7 +148,7 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/org/mybatis/mybatis-spring/2.0.2/mybatis-spring-2.0.2.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/mysql/mysql-connector-java/8.0.25/mysql-connector-java-8.0.25.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/zaxxer/HikariCP/3.4.5/HikariCP-3.4.5.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-component-cache/1.1.23-SNAPSHOT/tyboot-component-cache-1.1.23-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-component-cache/1.1.25-SNAPSHOT/tyboot-component-cache-1.1.25-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-redis/1.4.5.RELEASE/spring-boot-starter-redis-1.4.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/data/spring-data-redis/2.3.9.RELEASE/spring-data-redis-2.3.9.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/data/spring-data-keyvalue/2.3.9.RELEASE/spring-data-keyvalue-2.3.9.RELEASE.jar" enabled="true" runInBatchMode="false"/>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpStationMapper.xml

@@ -470,7 +470,7 @@
             <if test="dto.amosCompanyCode!=null">
                 and hygf_jp_station.amos_company_code =#{dto.amosCompanyCode}
             </if>
-            and hygf_jp_station.`on_grid_type`=null and hygf_jp_station.type='家庭户用'
+            and hygf_jp_station.`on_grid_type` is null and hygf_jp_station.type='家庭户用'
         </where>
 
     </select>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PreparationMoneyMapper.xml

@@ -22,7 +22,7 @@ LEFT JOIN  hygf_document_station on hygf_document_station.station_id=hygf_peasan
                 and hygf_preparation_money.amos_unit_name like concat ('%',#{dto.amosUnitName},'%')
             </if>
             <if test="dto.oddNumbers != null and dto.oddNumbers != ''">
-                and hygf_preparation_money.odd_numbers = #{dto.oddNumbers}
+                and hygf_preparation_money.odd_numbers like concat ('%',#{dto.oddNumbers},'%')
             </if>
             <if test="dto.deliveryState != null and dto.deliveryState != ''">
                 and hygf_preparation_money.delivery_state = #{dto.deliveryState}

amos-boot-system-jxiop/amos-boot-module-hygf-biz/pom.xml

@@ -54,7 +54,7 @@
       <dependency>
           <groupId>com.qiyuesuo.sdk</groupId>
           <artifactId>sdk-java</artifactId>
-          <version>3.6.3</version>
+          <version>3.8.3</version>
       </dependency>
       <dependency>
           <groupId>com.yeejoin</groupId>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PeasantHouseholdController.java

@@ -78,7 +78,7 @@ public class PeasantHouseholdController extends BaseController {
 		if(model.getProjectAddress().size() != 0) {
 			for (Integer reg : model.getProjectAddress())
 				for (RegionModel re : list) {
-					if (re.getRegionCode().equals(Integer.valueOf(reg))) {
+					if (re.getRegionCode().equals(reg)) {
 						area = area + re.getRegionName() + "/";
 					}
 				}

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/QiyuesuoController.java

@@ -86,7 +86,6 @@ public class QiyuesuoController extends BaseController {
     @ApiOperation(httpMethod = "POST",value = "个人token",   notes = "个人token")
     @PostMapping (value = "/getUserToken")
     public ResponseModel<Object> getSdkResponse(@RequestBody UserAuthMiniappTicketRequest request) {
-
        SdkResponse<MiniappTicketResult> result=  qiyuesuoService.getSdkResponse(request);
        return  ResponseHelper.buildResponse(result.getResult());
     }
@@ -96,11 +95,10 @@ public class QiyuesuoController extends BaseController {
     @ApiOperation(httpMethod = "POST",value = "合同token",   notes = "合同token")
     @PostMapping (value = "/getContractToken")
     public ResponseModel<Object> getContractSdkResponse(@RequestBody ContractMiniappTicketRequest   request) {
-
         SdkResponse<MiniappTicketResult> result=  qiyuesuoService.getContractSdkResponse(request);
-
         return  ResponseHelper.buildResponse(result.getResult());
     }
+    
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
     @ApiOperation(httpMethod = "POST",value = "合同token",   notes = "合同token")
     @PostMapping (value = "/getContractTokengz/{sequenceNbr}")
@@ -114,6 +112,14 @@ public class QiyuesuoController extends BaseController {
         return  ResponseHelper.buildResponse(result.getResult());
     }
     
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @ApiOperation(httpMethod = "GET",value = "获取合同浏览令牌",   notes = "获取合同浏览令牌")
+    @GetMapping (value = "/getContractTokenTicket/{sequenceNbr}")
+    public ResponseModel<Object> getContractTokenTicket(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        SdkResponse<MiniappTicketResult> result=  qiyuesuoService.getContractTokenTicket(sequenceNbr);
+        return  ResponseHelper.buildResponse(result.getResult());
+    }
+
 
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
     @ApiOperation(httpMethod = "POST",value = "创建合同",   notes = "创建合同")

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application.properties

@@ -22,7 +22,7 @@ spring.liquibase.enabled=true
 
 ## eureka properties:
 eureka.instance.prefer-ip-address=true
-eureka.instance.ip-address=172.16.3.41
+eureka.instance.ip-address=172.16.3.133
 eureka.client.registry-fetch-interval-seconds=5
 eureka.instance.health-check-url-path=/actuator/health
 eureka.instance.lease-expiration-duration-in-seconds=10

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/TestController.java

 package com.yeejoin.amos.boot.module.jxiop.biz.controller;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.DateUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanHealthIndex;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.IndicatorData;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.CommonServiceImpl;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.TdengineTimeServiceImpl;
 import com.yeejoin.amos.boot.module.jxiop.biz.tdMapper2.FanHealthIndexMapper;
-import com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanHealthIndex;
+import com.yeejoin.amos.boot.module.jxiop.biz.tdMapper2.FanWaringRecordMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.tdMapper2.PvWaringRecordMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanWarningRecord;
+import com.yeejoin.amos.boot.module.jxiop.biz.tdengine.PvWarningRecord;
 import com.yeejoin.amos.boot.module.jxiop.biz.tdmapper.IndicatorDataMapper;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.List;
 
 @RestController
 @RequestMapping(value = "/test")
@@ -32,23 +38,23 @@ public class TestController extends BaseController {
 	@Autowired
 	CommonServiceImpl commonService;
 
-    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(httpMethod = "GET", value = "test1", notes = "test1")
 	@GetMapping("/test1")
-    public List<IndicatorData> test1(@RequestParam(value = "startTime") String startTime, @RequestParam(value = "endTime") String endTime, @RequestParam(value = "address") String address, @RequestParam(value = "gatewayId") String gatewayId) {
+	public List<IndicatorData> test1(@RequestParam(value = "startTime") String startTime,
+			@RequestParam(value = "endTime") String endTime, @RequestParam(value = "address") String address,
+			@RequestParam(value = "gatewayId") String gatewayId) {
 
-        List<IndicatorData> indicatorData = indicatorDataMapper.selectDataByAddressAndtime(address, startTime, endTime,gatewayId);
+		List<IndicatorData> indicatorData = indicatorDataMapper.selectDataByAddressAndtime(address, startTime, endTime,
+				gatewayId);
 
 		return indicatorData;
 	}
 
-
-
-
-    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(httpMethod = "GET", value = "test2", notes = "test1")
 	@GetMapping("/test2")
-    public void test2 (@RequestParam(value = "startTime") String startTime, @Param("recDate") String recDate) {
+	public void test2(@RequestParam(value = "startTime") String startTime, @Param("recDate") String recDate) {
 //        List<FanHealthIndex> infoListByGroupByCD = fanHealthIndexMapper.getInfoListByGroupByCdFan(startTime, recDate);
 //        commonService.healthWarningMinuteByFJ();
 //        commonService.healthWarningMinuteByPv();
@@ -61,10 +67,10 @@ public class TestController extends BaseController {
 	@Autowired
 	TdengineTimeServiceImpl tdengineTimeService;
 
-    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(httpMethod = "POST", value = "saveTest", notes = "saveTest")
 	@PostMapping("/saveTest")
-    public void saveTest () {
+	public void saveTest() {
 
 //        QueryWrapper<FanHealthIndex> fanHealthIndexQueryWrapper = new QueryWrapper<>();
 //        List<FanHealthIndex> fanHealthIndices = fanHealthIndexMapper.selectList(fanHealthIndexQueryWrapper);
@@ -109,4 +115,65 @@ public class TestController extends BaseController {
 //        fanHealthIndexMapper.saveBatchHealthIndexList(fanHealthIndices1, "fan_health_index_moment");
 	}
 
+	@Autowired
+	private FanWaringRecordMapper fanWaringRecordMapper;
+
+	@Autowired
+	private PvWaringRecordMapper pvWaringRecordMapper;
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@ApiOperation(httpMethod = "GET", value = "test2", notes = "test1")
+	@GetMapping("/clear-record")
+	public void clearRecord(@RequestParam(value = "startTime", required = false) String startTime) {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		String d = sdf.format(new Date());
+		LambdaQueryWrapper<FanWarningRecord> wf = new LambdaQueryWrapper<>();
+		wf.ne(FanWarningRecord::getDisposotionState, "已确认");
+		List<FanWarningRecord> list = fanWaringRecordMapper.selectList(wf);
+		if (!list.isEmpty()) {
+			list.forEach(i -> {
+				i.setDisposotionState("已确认");
+				i.setDisposotionDate(d);
+			});
+			fanWaringRecordMapper.saveBatchWarningRecords(list);
+		}
+
+		LambdaQueryWrapper<PvWarningRecord> pf = new LambdaQueryWrapper<>();
+		pf.ne(PvWarningRecord::getDisposotionState, "已确认");
+		List<PvWarningRecord> list1 = pvWaringRecordMapper.selectList(pf);
+		if (!list1.isEmpty()) {
+			list1.forEach(i -> {
+				i.setDisposotionState("已确认");
+				i.setDisposotionDate(d);
+			});
+			pvWaringRecordMapper.saveBatchWarningRecords(list1);
+		}
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@ApiOperation(httpMethod = "GET", value = "test2", notes = "test1")
+	@GetMapping("/set-date")
+	public void clearRecord() {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		String d = sdf.format(new Date());
+		LambdaQueryWrapper<FanWarningRecord> wf = new LambdaQueryWrapper<>();
+		wf.isNull(FanWarningRecord::getDisposotionDate);
+		List<FanWarningRecord> list = fanWaringRecordMapper.selectList(wf);
+		if (!list.isEmpty()) {
+			list.forEach(i -> {
+				i.setDisposotionDate(d);
+			});
+			fanWaringRecordMapper.saveBatchWarningRecords(list);
+		}
+
+		LambdaQueryWrapper<PvWarningRecord> pf = new LambdaQueryWrapper<>();
+		pf.isNull(PvWarningRecord::getDisposotionDate);
+		List<PvWarningRecord> list1 = pvWaringRecordMapper.selectList(pf);
+		if (!list1.isEmpty()) {
+			list1.forEach(i -> {
+				i.setDisposotionDate(d);
+			});
+			pvWaringRecordMapper.saveBatchWarningRecords(list1);
+		}
+	}
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/FanHealthIndexDto.java

@@ -46,4 +46,5 @@ public class FanHealthIndexDto implements Serializable {
     private String sortsString;
     private String orgCode;
     private List<String> gatewayIds;
+    private String warningPeriod;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/CommonServiceImpl.java

@@ -2094,7 +2094,7 @@ public class CommonServiceImpl {
                         fanHealthIndex.setAnomaly(idxBizFanHealthIndex.getANOMALY());
                         fanHealthIndex.setRecDate(DateUtil.now());
                         fanHealthIndex.setArea(idxBizFanHealthIndex.getArae());
-                        fanHealthIndex.setAnalysisTime(DateUtil.now());
+                        fanHealthIndex.setAnalysisTime(format);
                         fanHealthIndex.setHealthLevel(fanHealthIndex.getHealthLevel());
                         fanHealthIndex.setKks(idxBizFanHealthIndex.getKks());
                         fanHealthIndex.setRecDate(format);

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/HealthStatusIndicatorServiceImpl.java

@@ -2715,7 +2715,7 @@ public class HealthStatusIndicatorServiceImpl {
             riskBizInfoVo.setSourceAttribution(stationMap.get(idxBizPvWarningRecord.getGatewayId()).getProjectOrgCode());
             riskBizInfoVo.setSourceAttributionDesc(idxBizPvWarningRecord.getStation());
             riskBizInfoVo.setWarningObjectType("equip");
-            riskBizInfoVo.setWarningTime(DateUtil.now());
+            riskBizInfoVo.setWarningTime(idxBizPvWarningRecord.getRecDate());
             riskBizInfoVo.setBussId(String.valueOf(idxBizPvWarningRecord.getTs()));
             riskBizInfoVo.setWarningObjectLinkUrl(getJumpUrlByInfo(idxBizPvWarningRecord.getKks(), jumpConfigs));
             List<RiskDynamicDetailsVo> detailsVos = new ArrayList<>();
@@ -2781,7 +2781,7 @@ public class HealthStatusIndicatorServiceImpl {
             riskBizInfoVo.setSourceAttribution(stationMap.get(idxBizFanWarningRecord.getGatewayId()).getProjectOrgCode());
             riskBizInfoVo.setSourceAttributionDesc(idxBizFanWarningRecord.getStation());
             riskBizInfoVo.setWarningObjectType("equip");
-            riskBizInfoVo.setWarningTime(DateUtil.now());
+            riskBizInfoVo.setWarningTime(idxBizFanWarningRecord.getRecDate());
             riskBizInfoVo.setWarningObjectLinkUrl(getJumpUrlByInfo(idxBizFanWarningRecord.getKks(), jumpConfigs));
             List<RiskDynamicDetailsVo> detailsVos = new ArrayList<>();
             RiskDynamicDetailsVo dynamicDetailsVo = new RiskDynamicDetailsVo();

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/application-dev.properties

@@ -74,7 +74,8 @@ mqtt.client.product.id=mqtt
 mqtt.topic=topic_mqtt
 spring.mqtt.completionTimeout=3000
 emqx.max-inflight=1000
-
+emqx.client-user-name=admin
+emqx.client-password=public
 
 tdengine-server:
 driver-class-name: com.taosdata.jdbc.rs.RestfulDriver

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/application-dev1.properties

@@ -74,7 +74,8 @@ mqtt.client.product.id=mqtt
 mqtt.topic=topic_mqtt
 spring.mqtt.completionTimeout=3000
 emqx.max-inflight=1000
-
+emqx.client-user-name=admin
+emqx.client-password=public
 
 tdengine-server:
 driver-class-name: com.taosdata.jdbc.rs.RestfulDriver

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/tdengine2/FanWarningRecord.xml

@@ -233,6 +233,7 @@
         <if test="dto.subSystem!= null and dto.subSystem!= ''">AND sub_system = #{dto.subSystem} </if>
         <if test="dto.pointName!= null and dto.pointName!= ''">AND point_name = #{dto.pointName} </if>
         <if test="dto.warningName!= null and dto.warningName!= ''">AND warning_name = #{dto.warningName} </if>
+        <if test="dto.warningPeriod!= null and dto.warningPeriod!= ''">AND warning_period = #{dto.warningPeriod} </if>
         <if test="dto.disposotionState!= null and dto.disposotionState!= ''">AND disposotion_state = #{dto.disposotionState} </if>
         <if test="dto.endDate!= null and dto.endDate!= '' ">  and ts &lt;= #{dto.endDate} </if>
         <if test="dto.startDate!= null and dto.startDate!= ''">  and  ts &gt;= #{dto.startDate} </if>
@@ -263,6 +264,7 @@
         <if test="dto.subSystem!= null and dto.subSystem!= ''">AND sub_system = #{dto.subSystem} </if>
         <if test="dto.pointName!= null and dto.pointName!= ''">AND point_name = #{dto.pointName} </if>
         <if test="dto.warningName!= null and dto.warningName!= ''">AND warning_name = #{dto.warningName} </if>
+        <if test="dto.warningPeriod!= null and dto.warningPeriod!= ''">AND warning_period = #{dto.warningPeriod} </if>
         <if test="dto.disposotionState!= null and dto.disposotionState!= ''">AND disposotion_state = #{dto.disposotionState} </if>
         <if test="dto.endDate!= null and dto.endDate!= '' ">  and ts &lt;= #{dto.endDate} </if>
         <if test="dto.startDate!= null and dto.startDate!= ''">  and  ts &gt;= #{dto.startDate} </if>

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/tdengine2/PvWarningRecord.xml

@@ -257,6 +257,7 @@
         <if test="dto.subarray!= null and dto.subarray!= ''">AND subarray = #{dto.subarray} </if>
         <if test="dto.pointName!= null and dto.pointName!= ''">AND point_name = #{dto.pointName} </if>
         <if test="dto.warningName!= null and dto.warningName!= ''">AND warning_name = #{dto.warningName} </if>
+        <if test="dto.warningPeriod!= null and dto.warningPeriod!= ''">AND warning_period = #{dto.warningPeriod} </if>
         <if test="dto.disposotionState!= null and dto.disposotionState!= ''">AND disposotion_state = #{dto.disposotionState} </if>
         <if test="dto.endDate!= null and dto.endDate!= '' ">  and ts &lt;= #{dto.endDate} </if>
         <if test="dto.startDate!= null and dto.startDate!= ''">  and  ts &gt;= #{dto.startDate} </if>
@@ -283,6 +284,7 @@
         <if test="dto.subarray!= null and dto.subarray!= ''">AND subarray = #{dto.subarray} </if>
         <if test="dto.pointName!= null and dto.pointName!= ''">AND point_name = #{dto.pointName} </if>
         <if test="dto.warningName!= null and dto.warningName!= ''">AND warning_name = #{dto.warningName} </if>
+        <if test="dto.warningPeriod!= null and dto.warningPeriod!= ''">AND warning_period = #{dto.warningPeriod} </if>
         <if test="dto.disposotionState!= null and dto.disposotionState!= ''">AND disposotion_state = #{dto.disposotionState} </if>
         <if test="dto.endDate!= null and dto.endDate!= '' ">  and ts &lt;= #{dto.endDate} </if>
         <if test="dto.startDate!= null and dto.startDate!= ''">  and  ts &gt;= #{dto.startDate} </if>

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/service/IMcbWarningService.java

@@ -29,7 +29,7 @@ public interface IMcbWarningService {
 	 * @return 预警信息列表
 	 */
 	Page<Map<String, Object>> queryWarningPage(Page<Map<String, Object>> page, Integer processingStatus,
-			String eventLevel, String createDate,String startTime,String endTime, String warningSourceType,String overView);
+			String eventLevel, String createDate,String startTime,String endTime, String warningSourceType,String objectName,String overView);
 
 
 	Page<OverviewQuestionDto> overviewQuestionList(Integer current, Integer size, String startTime, String endTime);
@@ -39,7 +39,7 @@ public interface IMcbWarningService {
 	 *
 	 * @return 预警信息总数
 	 */
-	Long queryWarningCount(Integer processingStatus, String eventLevel, String createDate,String startTime,String endTime, String warningSourceType,String overView);
+	Long queryWarningCount(Integer processingStatus, String eventLevel, String createDate,String startTime,String endTime, String warningSourceType,String objectName, String overView);
 
 	/**
 	 * 问题信息列表

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/warning/McbWarningMapper.xml

@@ -116,7 +116,10 @@
             log.CONTENT,
             LEVEL.COLOR,
             source.PROVINCE,
-            log.WARNING_SOURCE_TYPE
+            log.WARNING_SOURCE_TYPE,
+            log.OBJECT_NAME,
+            log.PROCESSING_STATUS,
+            log.PROCESSING_STATUS_DESC
         FROM
             amos_mcb.mcb_warning_warning_info log
                 LEFT JOIN amos_mcb.mcb_warning_base_warning_level LEVEL ON log.EVENT_LEVEL = LEVEL.CODE and LEVEL.SEQUENCE_NBR in (1, 2, 3)
@@ -145,7 +148,10 @@
                 AND log.CREATE_DATE <= concat(#{endTime}, ' 23:59:59')
             </if>
             <if test="warningSourceType != null and warningSourceType != ''">
-                AND log.WARNING_SOURCE_TYPE = #{warningSourceType}
+                AND log.WARNING_SOURCE_TYPE like concat('%', #{warningSourceType}, '%')
+            </if>
+            <if test="objectName != null and objectName != ''">
+                AND log.OBJECT_NAME like concat('%', #{objectName}, '%')
             </if>
 	        <if test="overView != null and overView != ''">
                 AND log.WARNING_SOURCE_TYPE_CODE IN (select code from mcb_data_dictionary where remark = 'OVERVIEW')
@@ -153,7 +159,7 @@
         </where>
         ORDER BY
             log.CREATE_DATE DESC
-        LIMIT #{start}, #{offset}
+        LIMIT #{start}, #{size}
     </select>
 
     <select id="queryWarningCount" resultType="java.lang.Long">
@@ -187,7 +193,10 @@
                 AND log.CREATE_DATE &lt;= concat(#{endTime}, ' 23:59:59')
             </if>
             <if test="warningSourceType != null and warningSourceType != ''">
-                AND log.WARNING_SOURCE_TYPE = #{warningSourceType}
+                AND log.WARNING_SOURCE_TYPE like concat('%', #{warningSourceType}, '%')
+            </if>
+            <if test="objectName != null and objectName != ''">
+                AND log.OBJECT_NAME like concat('%', #{objectName}, '%')
             </if>
             <if test="overView != null and overView != ''">
                 AND log.WARNING_SOURCE_TYPE_CODE IN (select code from mcb_data_dictionary where remark = 'OVERVIEW')
@@ -199,13 +208,39 @@
         SELECT
         warning.SEQUENCE_NBR warningId,
         question.CREATE_DATE createDate,
-        question.CONTENT content,
+        warning.CONTENT content,
         question.COMPLETION_STATUS_DESC completionStatusDesc,
         question.SOURCE_ATTRIBUTION_DESC sourceAttributionDesc
         FROM
         mcb_warning_question_info question,
         mcb_warning_warning_info warning
-        <where>
+      where
+            question.NUM IS NOT NULL
+            AND question.NUM = warning.QUESTION_NUM
+            AND question.COMPLETION_STATUS != '1'
+            AND warning.WARNING_SOURCE_TYPE in (select mcb_data_dictionary.name from mcb_data_dictionary WHERE mcb_data_dictionary.remark = 'OVERVIEW' )
+            <if test="startTime != null and startTime != ''">
+                AND question.CREATE_DATE >= #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND question.CREATE_DATE &lt;= #{endTime}
+            </if>
+            <if test="projectOrgCodes != null and projectOrgCodes.size() > 0">
+                AND question.SOURCE_ATTRIBUTION IN
+                <foreach collection="projectOrgCodes" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        ORDER BY question.CREATE_DATE DESC Limit #{offset}, #{size}
+    </select>
+
+    <select id="overviewQuestionListTotal" resultType="int">
+        SELECT
+        count(1)
+        FROM
+        mcb_warning_question_info question,
+        mcb_warning_warning_info warning
+        where
         question.NUM IS NOT NULL
         AND question.NUM = warning.QUESTION_NUM
         AND question.COMPLETION_STATUS != '1'
@@ -222,8 +257,6 @@
                 #{item}
             </foreach>
         </if>
-        </where>
-        ORDER BY question.CREATE_DATE DESC
     </select>
 
     <select id="queryQuestionList" resultType="java.util.Map">

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitoringServiceImpl.java

@@ -24,8 +24,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.component.emq.EmqKeeper;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
-import org.unbescape.css.CssIdentifierEscapeLevel;
-
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/resources/application-dev.properties

@@ -71,7 +71,8 @@ mqtt.client.product.id=mqtt
 mqtt.topic=topic_mqtt
 spring.mqtt.completionTimeout=3000
 emqx.max-inflight=1000
-
+emqx.client-user-name=admin
+emqx.client-password=public
 
 ## influxDB
 #spring.influx.url= http://172.16.3.155:18186

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/resources/application-dev1.properties

@@ -71,7 +71,8 @@ mqtt.client.product.id=mqtt
 mqtt.topic=topic_mqtt
 spring.mqtt.completionTimeout=3000
 emqx.max-inflight=1000
-
+emqx.client-user-name=admin
+emqx.client-password=public
 
 ## influxDB
 #spring.influx.url= http://172.16.3.155:18186
@@ -146,3 +147,5 @@ pictureUrl=upload/jxiop/syz/
 
 # Ԥ
 idx.predict.serviceUrl=http://10.20.1.157:8095/jxdj/predict-data
+
+forecast.url=
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/resources/mapper/cluster/SjglZsjZsbtzMapper.xml

@@ -155,6 +155,7 @@
         ifnull(a.qrcode_color, '') AS qrCodeColor,
         ifnull(b.COMPANY_NAME, '') AS stationName,
         ifnull(a.CREATE_TIME, '') as recDate,
+        ifnull(a.UPDATE_STAMP, '') as updateTime,
         a.DBID AS objectId,
         c.SBBM as jobId,
         case when a.QRCODE_COLOR = 'red' then 1

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/McbWarningController.java

@@ -67,10 +67,12 @@ public class McbWarningController {
 			@RequestParam(value = "startTime", required = false) String startTime,
 			@RequestParam(value = "endTime", required = false) String endTime,
 			@RequestParam(value = "overView", required = false) String overView,
-			@RequestParam(value = "warningSourceType", required = false) String warningSourceType) {
+			@RequestParam(value = "warningSourceType", required = false) String warningSourceType,
+			@RequestParam(value = "objectName", required = false) String objectName
+	) {
 		Page<Map<String, Object>> page = new Page<>(pageNumber, pageSize);
 		return ResponseHelper.buildResponse(
-				mcbWarningService.queryWarningPage(page, processingStatus, eventLevel, createDate, startTime,endTime,  warningSourceType,overView));
+				mcbWarningService.queryWarningPage(page, processingStatus, eventLevel, createDate, startTime,endTime,  warningSourceType,objectName, overView));
 	}
 
 	/**
@@ -103,8 +105,10 @@ public class McbWarningController {
 			@RequestParam(value = "startTime", required = false) String startTime,
 			@RequestParam(value = "endTime", required = false) String endTime,
 			@RequestParam(value = "overView", required = false) String overView,
-			@RequestParam(value = "warningSourceType", required = false) String warningSourceType) {
-		Long count = mcbWarningService.queryWarningCount(processingStatus, eventLevel,createDate, startTime,endTime, warningSourceType,overView);
+			@RequestParam(value = "warningSourceType", required = false) String warningSourceType,
+			@RequestParam(value = "objectName", required = false) String objectName
+	) {
+		Long count = mcbWarningService.queryWarningCount(processingStatus, eventLevel,createDate, startTime,endTime, warningSourceType, objectName, overView);
 		Map<String, Object> result = new HashMap<String, Object>() {
 			{
 				this.put("count", count);

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mcbwarningmapper/McbWarningMapper.java

@@ -36,7 +36,7 @@ public interface McbWarningMapper extends BaseMapper {
      */
     List<Map<String, Object>> queryWarningList(
             @Param("start") Long start,
-            @Param("offset") Long offset,
+            @Param("size") Long size,
             @Param("projectOrgCodes") List<String> projectOrgCodes,
             @Param("processingStatus") Integer processingStatus,
             @Param("eventLevel") String eventLevel,
@@ -44,16 +44,10 @@ public interface McbWarningMapper extends BaseMapper {
             @Param("startTime") String startTime,
             @Param("endTime") String endTime,
             @Param("warningSourceType") String warningSourceType,
+            @Param("objectName") String objectName,
             @Param("overView") String overView
     );
 
-
-    List<OverviewQuestionDto> overviewQuestionList(
-            @Param("projectOrgCodes") List<String> projectOrgCodes,
-            @Param("startTime") String startTime,
-            @Param("endTime") String endTime
-    );
-
     /**
      * 预警总数
      *
@@ -67,9 +61,27 @@ public interface McbWarningMapper extends BaseMapper {
             @Param("startTime") String startTime,
             @Param("endTime") String endTime,
             @Param("warningSourceType") String warningSourceType,
+            @Param("objectName") String objectName,
             @Param("overView") String overView
     );
 
+
+    List<OverviewQuestionDto> overviewQuestionList(
+            Integer offset,
+            Integer size,
+            List<String> projectOrgCodes,
+            String startTime,
+            String endTime
+    );
+
+    Integer overviewQuestionListTotal(
+            List<String> projectOrgCodes,
+            String startTime,
+            String endTime
+    );
+
+
+
     /**
      * 问题列表
      *

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/McbWarningServiceImpl.java

@@ -75,17 +75,17 @@ public class McbWarningServiceImpl implements IMcbWarningService {
 	 */
 	@Override
 	public Page<Map<String, Object>> queryWarningPage(Page<Map<String, Object>> page, Integer processingStatus,
-			String eventLevel, String createDate,String startTime,String endTime, String warningSourceType,String overView) {
+			String eventLevel, String createDate,String startTime,String endTime, String warningSourceType,String objectName, String overView) {
 		List<String> projectOrgCodes = this.getProjectOrgCodes();
-		long start = page.getCurrent() - 1;
-		long offset = page.getSize() * page.getCurrent();
+		long start = (page.getCurrent() - 1) * page.getSize();
+		long size = page.getSize();
 		if (projectOrgCodes.isEmpty()) {
 			projectOrgCodes.add("NULL");
 		}
-		List<Map<String, Object>> records = mcbWarningMapper.queryWarningList(start, offset, projectOrgCodes,
-				processingStatus, eventLevel, createDate,startTime,endTime, warningSourceType,overView);
+		List<Map<String, Object>> records = mcbWarningMapper.queryWarningList(start, size, projectOrgCodes,
+				processingStatus, eventLevel, createDate,startTime,endTime, warningSourceType,objectName, overView);
 		Long total = mcbWarningMapper.queryWarningCount(projectOrgCodes, processingStatus, eventLevel, createDate,startTime,endTime,
-				warningSourceType,overView);
+				warningSourceType,objectName, overView);
 		page.setRecords(records);
 		page.setTotal(total);
 		return page;
@@ -104,15 +104,13 @@ public class McbWarningServiceImpl implements IMcbWarningService {
 			endTime+= " 23:59:59";
 		}
 
-
-		PageHelper.startPage(current, size);
-		List<OverviewQuestionDto> list = mcbWarningMapper.overviewQuestionList(projectOrgCodes, startTime, endTime);
-		PageInfo<OverviewQuestionDto> page = new PageInfo(list);
+		List<OverviewQuestionDto> list = mcbWarningMapper.overviewQuestionList( (current -1) * size, size ,projectOrgCodes, startTime, endTime);
+		Integer total = mcbWarningMapper.overviewQuestionListTotal(projectOrgCodes, startTime, endTime);
 		Page<OverviewQuestionDto> pagenew = new Page<>();
 		pagenew.setCurrent(current);
-		pagenew.setTotal(page.getTotal());
+		pagenew.setTotal(total);
 		pagenew.setSize(size);
-		pagenew.setRecords(page.getList());
+		pagenew.setRecords(list);
 
 		return pagenew;
 	}
@@ -125,13 +123,13 @@ public class McbWarningServiceImpl implements IMcbWarningService {
 	 */
 	@Override
 	public Long queryWarningCount(Integer processingStatus, String eventLevel, String createDate,String startTime,String endTime,
-			String warningSourceType,String overView) {
+			String warningSourceType,String objectName, String overView) {
 		List<String> projectOrgCodes = this.getProjectOrgCodes();
 		if (projectOrgCodes.isEmpty()) {
 			projectOrgCodes.add("NULL");
 		}
 		return mcbWarningMapper.queryWarningCount(projectOrgCodes, processingStatus, eventLevel, createDate,startTime,endTime,
-				warningSourceType,overView);
+				warningSourceType,objectName,overView);
 	}
 
 	/**

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitorFanIdxController.java

@@ -438,7 +438,7 @@ public class MonitorFanIdxController extends BaseController {
     @ApiOperation(value = "集电线路图左侧 集电线列表")
     @GetMapping("/jdTree")
     @Scheduled(cron = "0/10 * * * * ? ")
-    public ResponseModel<IPage<Map<String, Object>>> getStatusJDX() {
+    public ResponseModel<Object> getStatusJDX() {
         LambdaQueryWrapper<StationBasic> wrapper = new LambdaQueryWrapper<>();
         List<StationBasic> stationBasics = stationBasicMapper.selectList(wrapper);
         for (StationBasic stationBasic : stationBasics) {
@@ -458,7 +458,7 @@ public class MonitorFanIdxController extends BaseController {
     @ApiOperation(value = "集电线路图右侧 风机列表")
     @GetMapping("/fjList")
     @Scheduled(cron = "0/10 * * * * ? ")
-    public ResponseModel getListByFJ() {
+    public ResponseModel<Object> getListByFJ() {
 
 
         LambdaQueryWrapper<StationBasic> wrapper = new LambdaQueryWrapper<>();
@@ -515,7 +515,7 @@ public class MonitorFanIdxController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "模拟量列表消息")
     @GetMapping("/getAnalogQuantityInfo")
-    public ResponseModel getAnalogQuantityInfo(@RequestParam(value = "stationId") String stationId, @RequestParam(value = "routeName") String routeName) {
+    public ResponseModel<Object> getAnalogQuantityInfo(@RequestParam(value = "stationId") String stationId, @RequestParam(value = "routeName") String routeName) {
         StationBasic stationBasic = stationBasicMapper.selectById(stationId);
         String gatewayId = stationBasic.getBoosterGatewayId();
         monitorFanIndicator.getAnalogQuantityInfo(gatewayId, stationBasic.getSequenceNbr().toString(), routeName);
@@ -526,7 +526,7 @@ public class MonitorFanIdxController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "升压站主屏消息接口")
     @GetMapping("/getMajorAnalogQuantityByPage")
-    public ResponseModel getMajorAnalogQuantityByPage(@RequestParam(required = false) String stationId) {
+    public ResponseModel<Object> getMajorAnalogQuantityByPage(@RequestParam(required = false) String stationId) {
         StationBasic stationBasic = stationBasicMapper.selectById(stationId);
         String gatewayId = stationBasic.getBoosterGatewayId();
         if (stationBasic.getStationName().contains("夏造")) {
@@ -579,7 +579,7 @@ public class MonitorFanIdxController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "开关图片API/消息")
     @GetMapping("/switchUrl")
-    public ResponseModel<Map<String, Object>> getElectricQuantityList(
+    public ResponseModel<Object> getElectricQuantityList(
             @RequestParam(value = "stationId") String stationId
     ) {
 
@@ -596,7 +596,7 @@ public class MonitorFanIdxController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "动态面板页面消息")
     @GetMapping("/pageTopic")
-    public ResponseModel<Map<String, Object>> sendPageTopic(
+    public ResponseModel<Object> sendPageTopic(
             @RequestParam(value = "stationId") String stationId, @RequestParam(value = "equipName") String equipName
     ) {
 
@@ -779,7 +779,7 @@ public class MonitorFanIdxController extends BaseController {
     @ApiOperation(value = "箱变实时开关状态")
     @GetMapping("/equipSwitchStatus")
     @Scheduled(cron = "0/10 * * * * ? ")
-    public ResponseModel<Map<String, Object>> getEquipSwitchStatus() {
+    public ResponseModel<Object> getEquipSwitchStatus() {
 
 
         LambdaQueryWrapper<StationBasic> wrapper = new LambdaQueryWrapper<>();
@@ -853,7 +853,7 @@ public class MonitorFanIdxController extends BaseController {
     @ApiOperation(value = "集电线路图右侧 光伏列表")
     @GetMapping("/gfList")
     @Scheduled(cron = "0/10 * * * * ? ")
-    public ResponseModel getListByNbq() {
+    public ResponseModel<Object> getListByNbq() {
 
 
         LambdaQueryWrapper<StationBasic> wrapper = new LambdaQueryWrapper<>();

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/resources/application-dev.properties

@@ -82,7 +82,8 @@ mqtt.client.product.id=mqtt
 mqtt.topic=topic_mqtt
 spring.mqtt.completionTimeout=3000
 emqx.max-inflight=1000
-
+emqx.client-user-name=admin
+emqx.client-password=public
 
 ## influxDB
 #spring.influx.url= http://172.16.3.155:8186

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/resources/application-dev1.properties

@@ -83,7 +83,8 @@ mqtt.topic=topic_mqtt
 spring.mqtt.completionTimeout=3000
 emqx.max-inflight=1000
 
-
+emqx.client-user-name=admin
+emqx.client-password=public
 ## influxDB
 #spring.influx.url= http://172.16.3.155:8186
 #spring.influx.password=admin

amos-boot-system-jxiop/pom.xml

@@ -109,7 +109,20 @@
 	      <artifactId>kingbase8</artifactId>
 	      <version>8.6.0</version>
 	   </dependency>
-	   
+	   <dependency>
+		  <groupId>org.typroject</groupId>
+		  <artifactId>tyboot-component-emq</artifactId>
+		  <version>${tyboot-version}</version>
+		</dependency>
+		<dependency>
+		  <groupId>org.elasticsearch</groupId>
+          <artifactId>elasticsearch</artifactId>
+          <version>${elasticsearch.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-elasticsearch</artifactId>
+		</dependency>
     </dependencies>
 
 </project>

pom.xml

@@ -26,7 +26,7 @@
 		<springboot.version>2.3.11.RELEASE</springboot.version>
 		<springcloud.version>Hoxton.SR8</springcloud.version>
 		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
-		<tyboot-version>1.1.23-SNAPSHOT</tyboot-version>
+		<tyboot-version>1.1.25-SNAPSHOT</tyboot-version>
 		<amos.version>1.7.10-SNAPSHOT</amos.version>
 		<itext.version>7.1.1</itext.version>
 		<elasticsearch.version>7.15.2</elasticsearch.version>