diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..814888c
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,321 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ * 报警工单表
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_job")
+public class AlarmJob extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 工单编号
+ */
+ @TableField("JOBCODE")
+ private String jobcode;
+ /**
+ * 工单类型
+ */
+ @TableField("JOG_TYPE")
+ private String jobType;
+ /**
+ * 井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 工单创建时间
+ */
+ @TableField("CREATE_TIME")
+ private Date createTime;
+ /**
+ * 工单状态（0待处理，1待确认，2处理中，3完成）
+ */
+ @TableField("JOB_STATUS")
+ private String jobStatus;
+ /**
+ * 接单人员
+ */
+ @TableField("GET_JOB_PERSON")
+ private Long getJobPerson;
+ /**
+ * 接单时间
+ */
+ @TableField("GET_JOB_TIME")
+ private Date getJobTime;
+ /**
+ * 应接单时间
+ */
+ @TableField("SHOULD_GET_TIME")
+ private Date shouldGetTime;
+ /**
+ * 第一现场情况
+ */
+ @TableField("FIRST_STATE")
+ private String firstState;
+ /**
+ * 第一现场照片
+ */
+ @TableField("FIRST_STATE_PHOTOS")
+ private String firstStatePhotos;
+ /**
+ * 确认人员
+ */
+ @TableField("CONFIRM_JOB_PERSON")
+ private Long confirmJobPerson;
+ /**
+ * 确认时间
+ */
+ @TableField("CONFRIM_JOB_TIME")
+ private Date confrimJobTime;
+ /**
+ * 处理人员
+ */
+ @TableField("HANDLE_JOB_Person")
+ private Long handleJobPerson;
+ /**
+ * 处理时间
+ */
+ @TableField("HANDLE_JOB_TIME")
+ private Date handleJobTime;
+ /**
+ * 维护情况记录
+ */
+ @TableField("HANDLE_MESSAGE")
+ private String handleMessage;
+ /**
+ * 维护图片
+ */
+ @TableField("HANDLE_PHOTOS")
+ private String handlePhotos;
+ /**
+ * 工单流转记录
+ */
+ @TableField("FLOW")
+ private String flow;
+
+ @TableField("JOB_BELONG_TO")
+ private Long jobBelongTo;
+
+ @TableField("JOB_FLAG_DELAY")
+ private String jobFlagDelay;
+
+ @TableField("JOB_FLAG_1")
+ private String jobFlag1;
+
+ @TableField(exist = false)
+ private String alarmValue;
+
+ @TableField(exist = false)
+ private String alarmContentName;
+
+ @TableField(exist = false)
+ private Integer recordId;
+
+ @Override
+ public String toString() {
+ return "AlarmJob{" +
+ "id=" + id +
+ ", jobcode=" + jobcode +
+ ", jogType=" + jobType +
+ ", wellCode=" + wellCode +
+ ", devcode=" + devcode +
+ ", createTime=" + createTime +
+ ", jobStatus=" + jobStatus +
+ ", getJobPerson=" + getJobPerson +
+ ", getJobTime=" + getJobTime +
+ ", firstState=" + firstState +
+ ", firstStatePhotos=" + firstStatePhotos +
+ ", confirmJobPerson=" + confirmJobPerson +
+ ", confrimJobTime=" + confrimJobTime +
+ ", handleJobPerson=" + handleJobPerson +
+ ", handleJobTime=" + handleJobTime +
+ ", handleMessage=" + handleMessage +
+ ", handlePhotos=" + handlePhotos +
+ ", flow=" + flow +
+ ", recordId=" + recordId +
+ "}";
+ }
+}
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..814888c
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,321 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ * 报警工单表
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_job")
+public class AlarmJob extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 工单编号
+ */
+ @TableField("JOBCODE")
+ private String jobcode;
+ /**
+ * 工单类型
+ */
+ @TableField("JOG_TYPE")
+ private String jobType;
+ /**
+ * 井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 工单创建时间
+ */
+ @TableField("CREATE_TIME")
+ private Date createTime;
+ /**
+ * 工单状态（0待处理，1待确认，2处理中，3完成）
+ */
+ @TableField("JOB_STATUS")
+ private String jobStatus;
+ /**
+ * 接单人员
+ */
+ @TableField("GET_JOB_PERSON")
+ private Long getJobPerson;
+ /**
+ * 接单时间
+ */
+ @TableField("GET_JOB_TIME")
+ private Date getJobTime;
+ /**
+ * 应接单时间
+ */
+ @TableField("SHOULD_GET_TIME")
+ private Date shouldGetTime;
+ /**
+ * 第一现场情况
+ */
+ @TableField("FIRST_STATE")
+ private String firstState;
+ /**
+ * 第一现场照片
+ */
+ @TableField("FIRST_STATE_PHOTOS")
+ private String firstStatePhotos;
+ /**
+ * 确认人员
+ */
+ @TableField("CONFIRM_JOB_PERSON")
+ private Long confirmJobPerson;
+ /**
+ * 确认时间
+ */
+ @TableField("CONFRIM_JOB_TIME")
+ private Date confrimJobTime;
+ /**
+ * 处理人员
+ */
+ @TableField("HANDLE_JOB_Person")
+ private Long handleJobPerson;
+ /**
+ * 处理时间
+ */
+ @TableField("HANDLE_JOB_TIME")
+ private Date handleJobTime;
+ /**
+ * 维护情况记录
+ */
+ @TableField("HANDLE_MESSAGE")
+ private String handleMessage;
+ /**
+ * 维护图片
+ */
+ @TableField("HANDLE_PHOTOS")
+ private String handlePhotos;
+ /**
+ * 工单流转记录
+ */
+ @TableField("FLOW")
+ private String flow;
+
+ @TableField("JOB_BELONG_TO")
+ private Long jobBelongTo;
+
+ @TableField("JOB_FLAG_DELAY")
+ private String jobFlagDelay;
+
+ @TableField("JOB_FLAG_1")
+ private String jobFlag1;
+
+ @TableField(exist = false)
+ private String alarmValue;
+
+ @TableField(exist = false)
+ private String alarmContentName;
+
+ @TableField(exist = false)
+ private Integer recordId;
+
+ @Override
+ public String toString() {
+ return "AlarmJob{" +
+ "id=" + id +
+ ", jobcode=" + jobcode +
+ ", jogType=" + jobType +
+ ", wellCode=" + wellCode +
+ ", devcode=" + devcode +
+ ", createTime=" + createTime +
+ ", jobStatus=" + jobStatus +
+ ", getJobPerson=" + getJobPerson +
+ ", getJobTime=" + getJobTime +
+ ", firstState=" + firstState +
+ ", firstStatePhotos=" + firstStatePhotos +
+ ", confirmJobPerson=" + confirmJobPerson +
+ ", confrimJobTime=" + confrimJobTime +
+ ", handleJobPerson=" + handleJobPerson +
+ ", handleJobTime=" + handleJobTime +
+ ", handleMessage=" + handleMessage +
+ ", handlePhotos=" + handlePhotos +
+ ", flow=" + flow +
+ ", recordId=" + recordId +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/AlarmRecords.java b/src/main/java/com/casic/entity/AlarmRecords.java
new file mode 100644
index 0000000..88b0b26
--- /dev/null
+++ b/src/main/java/com/casic/entity/AlarmRecords.java
@@ -0,0 +1,108 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_records")
+public class AlarmRecords extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 设备ID
+ */
+ @TableField("DEVICE_ID")
+ private Long deviceId;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 闸井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 告警类型
+ */
+ @TableField("ALARM_TYPE")
+ private String alarmType;
+ /**
+ * 告警内容
+ */
+ @TableField("ALARM_CONTENT")
+ private String alarmContent;
+ /**
+ * 告警数值
+ */
+ @TableField("ALARM_VALUE")
+ private String alarmValue;
+ /**
+ * 告警等级
+ */
+ @TableField("ALARM_LEVEL")
+ private Integer alarmLevel;
+ /**
+ * 告警详情
+ */
+ @TableField("ALARM_MSG")
+ private String alarmMessage;
+ /**
+ * 告警时间
+ */
+ @TableField("ALARM_TIME")
+ private Date alarmTime;
+ /**
+ * 告警状态
+ */
+ @TableField("STATUS")
+ private String status;
+ /**
+ * 工单编号
+ */
+ @TableField("JOB_ID")
+ private Long jobId;
+
+ @TableField(exist = false)
+ private Integer jobStatus;
+
+ @Override
+ public String toString() {
+ return "AlarmRecords{" +
+ "id=" + id +
+ ", deviceId=" + deviceId +
+ ", devcode=" + devcode +
+ ", wellCode=" + wellCode +
+ ", alarmType=" + alarmType +
+ ", alarmContent=" + alarmContent +
+ ", alarmValue=" + alarmValue +
+ ", alarmLevel=" + alarmLevel +
+ ", alarmMessage=" + alarmMessage +
+ ", alarmTime=" + alarmTime +
+ ", status=" + status +
+ ", jobId=" + jobId +
+ ", jobStatus=" + jobStatus +
+ "}";
+ }
+}
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..814888c
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,321 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ * 报警工单表
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_job")
+public class AlarmJob extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 工单编号
+ */
+ @TableField("JOBCODE")
+ private String jobcode;
+ /**
+ * 工单类型
+ */
+ @TableField("JOG_TYPE")
+ private String jobType;
+ /**
+ * 井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 工单创建时间
+ */
+ @TableField("CREATE_TIME")
+ private Date createTime;
+ /**
+ * 工单状态（0待处理，1待确认，2处理中，3完成）
+ */
+ @TableField("JOB_STATUS")
+ private String jobStatus;
+ /**
+ * 接单人员
+ */
+ @TableField("GET_JOB_PERSON")
+ private Long getJobPerson;
+ /**
+ * 接单时间
+ */
+ @TableField("GET_JOB_TIME")
+ private Date getJobTime;
+ /**
+ * 应接单时间
+ */
+ @TableField("SHOULD_GET_TIME")
+ private Date shouldGetTime;
+ /**
+ * 第一现场情况
+ */
+ @TableField("FIRST_STATE")
+ private String firstState;
+ /**
+ * 第一现场照片
+ */
+ @TableField("FIRST_STATE_PHOTOS")
+ private String firstStatePhotos;
+ /**
+ * 确认人员
+ */
+ @TableField("CONFIRM_JOB_PERSON")
+ private Long confirmJobPerson;
+ /**
+ * 确认时间
+ */
+ @TableField("CONFRIM_JOB_TIME")
+ private Date confrimJobTime;
+ /**
+ * 处理人员
+ */
+ @TableField("HANDLE_JOB_Person")
+ private Long handleJobPerson;
+ /**
+ * 处理时间
+ */
+ @TableField("HANDLE_JOB_TIME")
+ private Date handleJobTime;
+ /**
+ * 维护情况记录
+ */
+ @TableField("HANDLE_MESSAGE")
+ private String handleMessage;
+ /**
+ * 维护图片
+ */
+ @TableField("HANDLE_PHOTOS")
+ private String handlePhotos;
+ /**
+ * 工单流转记录
+ */
+ @TableField("FLOW")
+ private String flow;
+
+ @TableField("JOB_BELONG_TO")
+ private Long jobBelongTo;
+
+ @TableField("JOB_FLAG_DELAY")
+ private String jobFlagDelay;
+
+ @TableField("JOB_FLAG_1")
+ private String jobFlag1;
+
+ @TableField(exist = false)
+ private String alarmValue;
+
+ @TableField(exist = false)
+ private String alarmContentName;
+
+ @TableField(exist = false)
+ private Integer recordId;
+
+ @Override
+ public String toString() {
+ return "AlarmJob{" +
+ "id=" + id +
+ ", jobcode=" + jobcode +
+ ", jogType=" + jobType +
+ ", wellCode=" + wellCode +
+ ", devcode=" + devcode +
+ ", createTime=" + createTime +
+ ", jobStatus=" + jobStatus +
+ ", getJobPerson=" + getJobPerson +
+ ", getJobTime=" + getJobTime +
+ ", firstState=" + firstState +
+ ", firstStatePhotos=" + firstStatePhotos +
+ ", confirmJobPerson=" + confirmJobPerson +
+ ", confrimJobTime=" + confrimJobTime +
+ ", handleJobPerson=" + handleJobPerson +
+ ", handleJobTime=" + handleJobTime +
+ ", handleMessage=" + handleMessage +
+ ", handlePhotos=" + handlePhotos +
+ ", flow=" + flow +
+ ", recordId=" + recordId +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/AlarmRecords.java b/src/main/java/com/casic/entity/AlarmRecords.java
new file mode 100644
index 0000000..88b0b26
--- /dev/null
+++ b/src/main/java/com/casic/entity/AlarmRecords.java
@@ -0,0 +1,108 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_records")
+public class AlarmRecords extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 设备ID
+ */
+ @TableField("DEVICE_ID")
+ private Long deviceId;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 闸井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 告警类型
+ */
+ @TableField("ALARM_TYPE")
+ private String alarmType;
+ /**
+ * 告警内容
+ */
+ @TableField("ALARM_CONTENT")
+ private String alarmContent;
+ /**
+ * 告警数值
+ */
+ @TableField("ALARM_VALUE")
+ private String alarmValue;
+ /**
+ * 告警等级
+ */
+ @TableField("ALARM_LEVEL")
+ private Integer alarmLevel;
+ /**
+ * 告警详情
+ */
+ @TableField("ALARM_MSG")
+ private String alarmMessage;
+ /**
+ * 告警时间
+ */
+ @TableField("ALARM_TIME")
+ private Date alarmTime;
+ /**
+ * 告警状态
+ */
+ @TableField("STATUS")
+ private String status;
+ /**
+ * 工单编号
+ */
+ @TableField("JOB_ID")
+ private Long jobId;
+
+ @TableField(exist = false)
+ private Integer jobStatus;
+
+ @Override
+ public String toString() {
+ return "AlarmRecords{" +
+ "id=" + id +
+ ", deviceId=" + deviceId +
+ ", devcode=" + devcode +
+ ", wellCode=" + wellCode +
+ ", alarmType=" + alarmType +
+ ", alarmContent=" + alarmContent +
+ ", alarmValue=" + alarmValue +
+ ", alarmLevel=" + alarmLevel +
+ ", alarmMessage=" + alarmMessage +
+ ", alarmTime=" + alarmTime +
+ ", status=" + status +
+ ", jobId=" + jobId +
+ ", jobStatus=" + jobStatus +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/DataGasDector.java b/src/main/java/com/casic/entity/DataGasDector.java
new file mode 100644
index 0000000..537789a
--- /dev/null
+++ b/src/main/java/com/casic/entity/DataGasDector.java
@@ -0,0 +1,42 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author cz
+ * @date 2022-7-1
+ */
+@Data
+@TableName("data_gas_dector")
+public class DataGasDector {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ private String devcode;
+ private String wellCode;
+ private String strength;
+
+ private String descn;
+ /**
+ * --信号与干扰加噪声比
+ */
+ private String sinr;
+ /**
+ * --参考信号接收功率
+ */
+ private String rsrp;
+ /**
+ * --物理小区标识
+ */
+ private String pci;
+ private Date uptime;
+ private Date logtime;
+}
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..814888c
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,321 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ * 报警工单表
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_job")
+public class AlarmJob extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 工单编号
+ */
+ @TableField("JOBCODE")
+ private String jobcode;
+ /**
+ * 工单类型
+ */
+ @TableField("JOG_TYPE")
+ private String jobType;
+ /**
+ * 井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 工单创建时间
+ */
+ @TableField("CREATE_TIME")
+ private Date createTime;
+ /**
+ * 工单状态（0待处理，1待确认，2处理中，3完成）
+ */
+ @TableField("JOB_STATUS")
+ private String jobStatus;
+ /**
+ * 接单人员
+ */
+ @TableField("GET_JOB_PERSON")
+ private Long getJobPerson;
+ /**
+ * 接单时间
+ */
+ @TableField("GET_JOB_TIME")
+ private Date getJobTime;
+ /**
+ * 应接单时间
+ */
+ @TableField("SHOULD_GET_TIME")
+ private Date shouldGetTime;
+ /**
+ * 第一现场情况
+ */
+ @TableField("FIRST_STATE")
+ private String firstState;
+ /**
+ * 第一现场照片
+ */
+ @TableField("FIRST_STATE_PHOTOS")
+ private String firstStatePhotos;
+ /**
+ * 确认人员
+ */
+ @TableField("CONFIRM_JOB_PERSON")
+ private Long confirmJobPerson;
+ /**
+ * 确认时间
+ */
+ @TableField("CONFRIM_JOB_TIME")
+ private Date confrimJobTime;
+ /**
+ * 处理人员
+ */
+ @TableField("HANDLE_JOB_Person")
+ private Long handleJobPerson;
+ /**
+ * 处理时间
+ */
+ @TableField("HANDLE_JOB_TIME")
+ private Date handleJobTime;
+ /**
+ * 维护情况记录
+ */
+ @TableField("HANDLE_MESSAGE")
+ private String handleMessage;
+ /**
+ * 维护图片
+ */
+ @TableField("HANDLE_PHOTOS")
+ private String handlePhotos;
+ /**
+ * 工单流转记录
+ */
+ @TableField("FLOW")
+ private String flow;
+
+ @TableField("JOB_BELONG_TO")
+ private Long jobBelongTo;
+
+ @TableField("JOB_FLAG_DELAY")
+ private String jobFlagDelay;
+
+ @TableField("JOB_FLAG_1")
+ private String jobFlag1;
+
+ @TableField(exist = false)
+ private String alarmValue;
+
+ @TableField(exist = false)
+ private String alarmContentName;
+
+ @TableField(exist = false)
+ private Integer recordId;
+
+ @Override
+ public String toString() {
+ return "AlarmJob{" +
+ "id=" + id +
+ ", jobcode=" + jobcode +
+ ", jogType=" + jobType +
+ ", wellCode=" + wellCode +
+ ", devcode=" + devcode +
+ ", createTime=" + createTime +
+ ", jobStatus=" + jobStatus +
+ ", getJobPerson=" + getJobPerson +
+ ", getJobTime=" + getJobTime +
+ ", firstState=" + firstState +
+ ", firstStatePhotos=" + firstStatePhotos +
+ ", confirmJobPerson=" + confirmJobPerson +
+ ", confrimJobTime=" + confrimJobTime +
+ ", handleJobPerson=" + handleJobPerson +
+ ", handleJobTime=" + handleJobTime +
+ ", handleMessage=" + handleMessage +
+ ", handlePhotos=" + handlePhotos +
+ ", flow=" + flow +
+ ", recordId=" + recordId +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/AlarmRecords.java b/src/main/java/com/casic/entity/AlarmRecords.java
new file mode 100644
index 0000000..88b0b26
--- /dev/null
+++ b/src/main/java/com/casic/entity/AlarmRecords.java
@@ -0,0 +1,108 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_records")
+public class AlarmRecords extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 设备ID
+ */
+ @TableField("DEVICE_ID")
+ private Long deviceId;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 闸井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 告警类型
+ */
+ @TableField("ALARM_TYPE")
+ private String alarmType;
+ /**
+ * 告警内容
+ */
+ @TableField("ALARM_CONTENT")
+ private String alarmContent;
+ /**
+ * 告警数值
+ */
+ @TableField("ALARM_VALUE")
+ private String alarmValue;
+ /**
+ * 告警等级
+ */
+ @TableField("ALARM_LEVEL")
+ private Integer alarmLevel;
+ /**
+ * 告警详情
+ */
+ @TableField("ALARM_MSG")
+ private String alarmMessage;
+ /**
+ * 告警时间
+ */
+ @TableField("ALARM_TIME")
+ private Date alarmTime;
+ /**
+ * 告警状态
+ */
+ @TableField("STATUS")
+ private String status;
+ /**
+ * 工单编号
+ */
+ @TableField("JOB_ID")
+ private Long jobId;
+
+ @TableField(exist = false)
+ private Integer jobStatus;
+
+ @Override
+ public String toString() {
+ return "AlarmRecords{" +
+ "id=" + id +
+ ", deviceId=" + deviceId +
+ ", devcode=" + devcode +
+ ", wellCode=" + wellCode +
+ ", alarmType=" + alarmType +
+ ", alarmContent=" + alarmContent +
+ ", alarmValue=" + alarmValue +
+ ", alarmLevel=" + alarmLevel +
+ ", alarmMessage=" + alarmMessage +
+ ", alarmTime=" + alarmTime +
+ ", status=" + status +
+ ", jobId=" + jobId +
+ ", jobStatus=" + jobStatus +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/DataGasDector.java b/src/main/java/com/casic/entity/DataGasDector.java
new file mode 100644
index 0000000..537789a
--- /dev/null
+++ b/src/main/java/com/casic/entity/DataGasDector.java
@@ -0,0 +1,42 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author cz
+ * @date 2022-7-1
+ */
+@Data
+@TableName("data_gas_dector")
+public class DataGasDector {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ private String devcode;
+ private String wellCode;
+ private String strength;
+
+ private String descn;
+ /**
+ * --信号与干扰加噪声比
+ */
+ private String sinr;
+ /**
+ * --参考信号接收功率
+ */
+ private String rsrp;
+ /**
+ * --物理小区标识
+ */
+ private String pci;
+ private Date uptime;
+ private Date logtime;
+}
diff --git a/src/main/java/com/casic/entity/DataGasReport.java b/src/main/java/com/casic/entity/DataGasReport.java
deleted file mode 100644
index c43ccdf..0000000
--- a/src/main/java/com/casic/entity/DataGasReport.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.casic.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author cz
- * @date 2022-7-1
- */
-@Data
-@TableName("data_gas_dector")
-public class DataGasReport {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @TableField("devcode")
- private String imei;
- private String wellcode;
-
- private String imsi;
- /**
- * --事件类型 0正常 1低报 2高报
- */
- private String gasSensorState;
- /**
- * --浓度值
- */
- private String gasSampleValue;
- /**
- * --信号与干扰加噪声比
- */
- private String sinr;
- /**
- * --参考信号接收功率
- */
- private String rsrp;
- /**
- * --物理小区标识
- */
- private String pci;
- /**
- * --心跳周期
- */
- private String heartbeatTime;
-
- /**
- * --小区位置信息
- */
- private String cellId;
- /**
- * --电池电压
- */
- private String batteryVoltage;
- /**
- * --电池电量
- */
- private String batteryValue;
- private String iccid;
- private Date uptime;
- private Date logtime;
-}
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..814888c
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,321 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ * 报警工单表
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_job")
+public class AlarmJob extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 工单编号
+ */
+ @TableField("JOBCODE")
+ private String jobcode;
+ /**
+ * 工单类型
+ */
+ @TableField("JOG_TYPE")
+ private String jobType;
+ /**
+ * 井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 工单创建时间
+ */
+ @TableField("CREATE_TIME")
+ private Date createTime;
+ /**
+ * 工单状态（0待处理，1待确认，2处理中，3完成）
+ */
+ @TableField("JOB_STATUS")
+ private String jobStatus;
+ /**
+ * 接单人员
+ */
+ @TableField("GET_JOB_PERSON")
+ private Long getJobPerson;
+ /**
+ * 接单时间
+ */
+ @TableField("GET_JOB_TIME")
+ private Date getJobTime;
+ /**
+ * 应接单时间
+ */
+ @TableField("SHOULD_GET_TIME")
+ private Date shouldGetTime;
+ /**
+ * 第一现场情况
+ */
+ @TableField("FIRST_STATE")
+ private String firstState;
+ /**
+ * 第一现场照片
+ */
+ @TableField("FIRST_STATE_PHOTOS")
+ private String firstStatePhotos;
+ /**
+ * 确认人员
+ */
+ @TableField("CONFIRM_JOB_PERSON")
+ private Long confirmJobPerson;
+ /**
+ * 确认时间
+ */
+ @TableField("CONFRIM_JOB_TIME")
+ private Date confrimJobTime;
+ /**
+ * 处理人员
+ */
+ @TableField("HANDLE_JOB_Person")
+ private Long handleJobPerson;
+ /**
+ * 处理时间
+ */
+ @TableField("HANDLE_JOB_TIME")
+ private Date handleJobTime;
+ /**
+ * 维护情况记录
+ */
+ @TableField("HANDLE_MESSAGE")
+ private String handleMessage;
+ /**
+ * 维护图片
+ */
+ @TableField("HANDLE_PHOTOS")
+ private String handlePhotos;
+ /**
+ * 工单流转记录
+ */
+ @TableField("FLOW")
+ private String flow;
+
+ @TableField("JOB_BELONG_TO")
+ private Long jobBelongTo;
+
+ @TableField("JOB_FLAG_DELAY")
+ private String jobFlagDelay;
+
+ @TableField("JOB_FLAG_1")
+ private String jobFlag1;
+
+ @TableField(exist = false)
+ private String alarmValue;
+
+ @TableField(exist = false)
+ private String alarmContentName;
+
+ @TableField(exist = false)
+ private Integer recordId;
+
+ @Override
+ public String toString() {
+ return "AlarmJob{" +
+ "id=" + id +
+ ", jobcode=" + jobcode +
+ ", jogType=" + jobType +
+ ", wellCode=" + wellCode +
+ ", devcode=" + devcode +
+ ", createTime=" + createTime +
+ ", jobStatus=" + jobStatus +
+ ", getJobPerson=" + getJobPerson +
+ ", getJobTime=" + getJobTime +
+ ", firstState=" + firstState +
+ ", firstStatePhotos=" + firstStatePhotos +
+ ", confirmJobPerson=" + confirmJobPerson +
+ ", confrimJobTime=" + confrimJobTime +
+ ", handleJobPerson=" + handleJobPerson +
+ ", handleJobTime=" + handleJobTime +
+ ", handleMessage=" + handleMessage +
+ ", handlePhotos=" + handlePhotos +
+ ", flow=" + flow +
+ ", recordId=" + recordId +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/AlarmRecords.java b/src/main/java/com/casic/entity/AlarmRecords.java
new file mode 100644
index 0000000..88b0b26
--- /dev/null
+++ b/src/main/java/com/casic/entity/AlarmRecords.java
@@ -0,0 +1,108 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_records")
+public class AlarmRecords extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 设备ID
+ */
+ @TableField("DEVICE_ID")
+ private Long deviceId;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 闸井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 告警类型
+ */
+ @TableField("ALARM_TYPE")
+ private String alarmType;
+ /**
+ * 告警内容
+ */
+ @TableField("ALARM_CONTENT")
+ private String alarmContent;
+ /**
+ * 告警数值
+ */
+ @TableField("ALARM_VALUE")
+ private String alarmValue;
+ /**
+ * 告警等级
+ */
+ @TableField("ALARM_LEVEL")
+ private Integer alarmLevel;
+ /**
+ * 告警详情
+ */
+ @TableField("ALARM_MSG")
+ private String alarmMessage;
+ /**
+ * 告警时间
+ */
+ @TableField("ALARM_TIME")
+ private Date alarmTime;
+ /**
+ * 告警状态
+ */
+ @TableField("STATUS")
+ private String status;
+ /**
+ * 工单编号
+ */
+ @TableField("JOB_ID")
+ private Long jobId;
+
+ @TableField(exist = false)
+ private Integer jobStatus;
+
+ @Override
+ public String toString() {
+ return "AlarmRecords{" +
+ "id=" + id +
+ ", deviceId=" + deviceId +
+ ", devcode=" + devcode +
+ ", wellCode=" + wellCode +
+ ", alarmType=" + alarmType +
+ ", alarmContent=" + alarmContent +
+ ", alarmValue=" + alarmValue +
+ ", alarmLevel=" + alarmLevel +
+ ", alarmMessage=" + alarmMessage +
+ ", alarmTime=" + alarmTime +
+ ", status=" + status +
+ ", jobId=" + jobId +
+ ", jobStatus=" + jobStatus +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/DataGasDector.java b/src/main/java/com/casic/entity/DataGasDector.java
new file mode 100644
index 0000000..537789a
--- /dev/null
+++ b/src/main/java/com/casic/entity/DataGasDector.java
@@ -0,0 +1,42 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author cz
+ * @date 2022-7-1
+ */
+@Data
+@TableName("data_gas_dector")
+public class DataGasDector {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ private String devcode;
+ private String wellCode;
+ private String strength;
+
+ private String descn;
+ /**
+ * --信号与干扰加噪声比
+ */
+ private String sinr;
+ /**
+ * --参考信号接收功率
+ */
+ private String rsrp;
+ /**
+ * --物理小区标识
+ */
+ private String pci;
+ private Date uptime;
+ private Date logtime;
+}
diff --git a/src/main/java/com/casic/entity/DataGasReport.java b/src/main/java/com/casic/entity/DataGasReport.java
deleted file mode 100644
index c43ccdf..0000000
--- a/src/main/java/com/casic/entity/DataGasReport.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.casic.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author cz
- * @date 2022-7-1
- */
-@Data
-@TableName("data_gas_dector")
-public class DataGasReport {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @TableField("devcode")
- private String imei;
- private String wellcode;
-
- private String imsi;
- /**
- * --事件类型 0正常 1低报 2高报
- */
- private String gasSensorState;
- /**
- * --浓度值
- */
- private String gasSampleValue;
- /**
- * --信号与干扰加噪声比
- */
- private String sinr;
- /**
- * --参考信号接收功率
- */
- private String rsrp;
- /**
- * --物理小区标识
- */
- private String pci;
- /**
- * --心跳周期
- */
- private String heartbeatTime;
-
- /**
- * --小区位置信息
- */
- private String cellId;
- /**
- * --电池电压
- */
- private String batteryVoltage;
- /**
- * --电池电量
- */
- private String batteryValue;
- private String iccid;
- private Date uptime;
- private Date logtime;
-}
diff --git a/src/main/java/com/casic/entity/DeviceSatatus.java b/src/main/java/com/casic/entity/DeviceSatatus.java
new file mode 100644
index 0000000..bab7903
--- /dev/null
+++ b/src/main/java/com/casic/entity/DeviceSatatus.java
@@ -0,0 +1,19 @@
+package com.casic.entity;
+
+import lombok.Data;
+
+/**
+ * 不使用了
+ *
+ */
+@Data
+public class DeviceSatatus {
+ private String deviceId;
+ private String cell;
+ private String cellTs;
+ private String onlineState;
+ private String onlineTs;
+ private String lastDataId;
+ private String lastDataJson;
+ private String lastDataTs;
+}
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..814888c
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,321 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ * 报警工单表
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_job")
+public class AlarmJob extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 工单编号
+ */
+ @TableField("JOBCODE")
+ private String jobcode;
+ /**
+ * 工单类型
+ */
+ @TableField("JOG_TYPE")
+ private String jobType;
+ /**
+ * 井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 工单创建时间
+ */
+ @TableField("CREATE_TIME")
+ private Date createTime;
+ /**
+ * 工单状态（0待处理，1待确认，2处理中，3完成）
+ */
+ @TableField("JOB_STATUS")
+ private String jobStatus;
+ /**
+ * 接单人员
+ */
+ @TableField("GET_JOB_PERSON")
+ private Long getJobPerson;
+ /**
+ * 接单时间
+ */
+ @TableField("GET_JOB_TIME")
+ private Date getJobTime;
+ /**
+ * 应接单时间
+ */
+ @TableField("SHOULD_GET_TIME")
+ private Date shouldGetTime;
+ /**
+ * 第一现场情况
+ */
+ @TableField("FIRST_STATE")
+ private String firstState;
+ /**
+ * 第一现场照片
+ */
+ @TableField("FIRST_STATE_PHOTOS")
+ private String firstStatePhotos;
+ /**
+ * 确认人员
+ */
+ @TableField("CONFIRM_JOB_PERSON")
+ private Long confirmJobPerson;
+ /**
+ * 确认时间
+ */
+ @TableField("CONFRIM_JOB_TIME")
+ private Date confrimJobTime;
+ /**
+ * 处理人员
+ */
+ @TableField("HANDLE_JOB_Person")
+ private Long handleJobPerson;
+ /**
+ * 处理时间
+ */
+ @TableField("HANDLE_JOB_TIME")
+ private Date handleJobTime;
+ /**
+ * 维护情况记录
+ */
+ @TableField("HANDLE_MESSAGE")
+ private String handleMessage;
+ /**
+ * 维护图片
+ */
+ @TableField("HANDLE_PHOTOS")
+ private String handlePhotos;
+ /**
+ * 工单流转记录
+ */
+ @TableField("FLOW")
+ private String flow;
+
+ @TableField("JOB_BELONG_TO")
+ private Long jobBelongTo;
+
+ @TableField("JOB_FLAG_DELAY")
+ private String jobFlagDelay;
+
+ @TableField("JOB_FLAG_1")
+ private String jobFlag1;
+
+ @TableField(exist = false)
+ private String alarmValue;
+
+ @TableField(exist = false)
+ private String alarmContentName;
+
+ @TableField(exist = false)
+ private Integer recordId;
+
+ @Override
+ public String toString() {
+ return "AlarmJob{" +
+ "id=" + id +
+ ", jobcode=" + jobcode +
+ ", jogType=" + jobType +
+ ", wellCode=" + wellCode +
+ ", devcode=" + devcode +
+ ", createTime=" + createTime +
+ ", jobStatus=" + jobStatus +
+ ", getJobPerson=" + getJobPerson +
+ ", getJobTime=" + getJobTime +
+ ", firstState=" + firstState +
+ ", firstStatePhotos=" + firstStatePhotos +
+ ", confirmJobPerson=" + confirmJobPerson +
+ ", confrimJobTime=" + confrimJobTime +
+ ", handleJobPerson=" + handleJobPerson +
+ ", handleJobTime=" + handleJobTime +
+ ", handleMessage=" + handleMessage +
+ ", handlePhotos=" + handlePhotos +
+ ", flow=" + flow +
+ ", recordId=" + recordId +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/AlarmRecords.java b/src/main/java/com/casic/entity/AlarmRecords.java
new file mode 100644
index 0000000..88b0b26
--- /dev/null
+++ b/src/main/java/com/casic/entity/AlarmRecords.java
@@ -0,0 +1,108 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_records")
+public class AlarmRecords extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 设备ID
+ */
+ @TableField("DEVICE_ID")
+ private Long deviceId;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 闸井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 告警类型
+ */
+ @TableField("ALARM_TYPE")
+ private String alarmType;
+ /**
+ * 告警内容
+ */
+ @TableField("ALARM_CONTENT")
+ private String alarmContent;
+ /**
+ * 告警数值
+ */
+ @TableField("ALARM_VALUE")
+ private String alarmValue;
+ /**
+ * 告警等级
+ */
+ @TableField("ALARM_LEVEL")
+ private Integer alarmLevel;
+ /**
+ * 告警详情
+ */
+ @TableField("ALARM_MSG")
+ private String alarmMessage;
+ /**
+ * 告警时间
+ */
+ @TableField("ALARM_TIME")
+ private Date alarmTime;
+ /**
+ * 告警状态
+ */
+ @TableField("STATUS")
+ private String status;
+ /**
+ * 工单编号
+ */
+ @TableField("JOB_ID")
+ private Long jobId;
+
+ @TableField(exist = false)
+ private Integer jobStatus;
+
+ @Override
+ public String toString() {
+ return "AlarmRecords{" +
+ "id=" + id +
+ ", deviceId=" + deviceId +
+ ", devcode=" + devcode +
+ ", wellCode=" + wellCode +
+ ", alarmType=" + alarmType +
+ ", alarmContent=" + alarmContent +
+ ", alarmValue=" + alarmValue +
+ ", alarmLevel=" + alarmLevel +
+ ", alarmMessage=" + alarmMessage +
+ ", alarmTime=" + alarmTime +
+ ", status=" + status +
+ ", jobId=" + jobId +
+ ", jobStatus=" + jobStatus +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/DataGasDector.java b/src/main/java/com/casic/entity/DataGasDector.java
new file mode 100644
index 0000000..537789a
--- /dev/null
+++ b/src/main/java/com/casic/entity/DataGasDector.java
@@ -0,0 +1,42 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author cz
+ * @date 2022-7-1
+ */
+@Data
+@TableName("data_gas_dector")
+public class DataGasDector {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ private String devcode;
+ private String wellCode;
+ private String strength;
+
+ private String descn;
+ /**
+ * --信号与干扰加噪声比
+ */
+ private String sinr;
+ /**
+ * --参考信号接收功率
+ */
+ private String rsrp;
+ /**
+ * --物理小区标识
+ */
+ private String pci;
+ private Date uptime;
+ private Date logtime;
+}
diff --git a/src/main/java/com/casic/entity/DataGasReport.java b/src/main/java/com/casic/entity/DataGasReport.java
deleted file mode 100644
index c43ccdf..0000000
--- a/src/main/java/com/casic/entity/DataGasReport.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.casic.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author cz
- * @date 2022-7-1
- */
-@Data
-@TableName("data_gas_dector")
-public class DataGasReport {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @TableField("devcode")
- private String imei;
- private String wellcode;
-
- private String imsi;
- /**
- * --事件类型 0正常 1低报 2高报
- */
- private String gasSensorState;
- /**
- * --浓度值
- */
- private String gasSampleValue;
- /**
- * --信号与干扰加噪声比
- */
- private String sinr;
- /**
- * --参考信号接收功率
- */
- private String rsrp;
- /**
- * --物理小区标识
- */
- private String pci;
- /**
- * --心跳周期
- */
- private String heartbeatTime;
-
- /**
- * --小区位置信息
- */
- private String cellId;
- /**
- * --电池电压
- */
- private String batteryVoltage;
- /**
- * --电池电量
- */
- private String batteryValue;
- private String iccid;
- private Date uptime;
- private Date logtime;
-}
diff --git a/src/main/java/com/casic/entity/DeviceSatatus.java b/src/main/java/com/casic/entity/DeviceSatatus.java
new file mode 100644
index 0000000..bab7903
--- /dev/null
+++ b/src/main/java/com/casic/entity/DeviceSatatus.java
@@ -0,0 +1,19 @@
+package com.casic.entity;
+
+import lombok.Data;
+
+/**
+ * 不使用了
+ *
+ */
+@Data
+public class DeviceSatatus {
+ private String deviceId;
+ private String cell;
+ private String cellTs;
+ private String onlineState;
+ private String onlineTs;
+ private String lastDataId;
+ private String lastDataJson;
+ private String lastDataTs;
+}
diff --git a/src/main/java/com/casic/model/DataContentParam.java b/src/main/java/com/casic/model/DataContentParam.java
new file mode 100644
index 0000000..46d298a
--- /dev/null
+++ b/src/main/java/com/casic/model/DataContentParam.java
@@ -0,0 +1,19 @@
+package com.casic.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DataContentParam {
+ private String msg_type;
+ private String error_val;
+ private String ch_cnt;
+ private String erro_cnt;
+ private String alarm_low_cnt;
+ private String alarm_high_cnt;
+ private String offline_cnt;
+ private List rtd_val;
+ private List adc_val;
+ private List status_val;
+}
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..814888c
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,321 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ * 报警工单表
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_job")
+public class AlarmJob extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 工单编号
+ */
+ @TableField("JOBCODE")
+ private String jobcode;
+ /**
+ * 工单类型
+ */
+ @TableField("JOG_TYPE")
+ private String jobType;
+ /**
+ * 井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 工单创建时间
+ */
+ @TableField("CREATE_TIME")
+ private Date createTime;
+ /**
+ * 工单状态（0待处理，1待确认，2处理中，3完成）
+ */
+ @TableField("JOB_STATUS")
+ private String jobStatus;
+ /**
+ * 接单人员
+ */
+ @TableField("GET_JOB_PERSON")
+ private Long getJobPerson;
+ /**
+ * 接单时间
+ */
+ @TableField("GET_JOB_TIME")
+ private Date getJobTime;
+ /**
+ * 应接单时间
+ */
+ @TableField("SHOULD_GET_TIME")
+ private Date shouldGetTime;
+ /**
+ * 第一现场情况
+ */
+ @TableField("FIRST_STATE")
+ private String firstState;
+ /**
+ * 第一现场照片
+ */
+ @TableField("FIRST_STATE_PHOTOS")
+ private String firstStatePhotos;
+ /**
+ * 确认人员
+ */
+ @TableField("CONFIRM_JOB_PERSON")
+ private Long confirmJobPerson;
+ /**
+ * 确认时间
+ */
+ @TableField("CONFRIM_JOB_TIME")
+ private Date confrimJobTime;
+ /**
+ * 处理人员
+ */
+ @TableField("HANDLE_JOB_Person")
+ private Long handleJobPerson;
+ /**
+ * 处理时间
+ */
+ @TableField("HANDLE_JOB_TIME")
+ private Date handleJobTime;
+ /**
+ * 维护情况记录
+ */
+ @TableField("HANDLE_MESSAGE")
+ private String handleMessage;
+ /**
+ * 维护图片
+ */
+ @TableField("HANDLE_PHOTOS")
+ private String handlePhotos;
+ /**
+ * 工单流转记录
+ */
+ @TableField("FLOW")
+ private String flow;
+
+ @TableField("JOB_BELONG_TO")
+ private Long jobBelongTo;
+
+ @TableField("JOB_FLAG_DELAY")
+ private String jobFlagDelay;
+
+ @TableField("JOB_FLAG_1")
+ private String jobFlag1;
+
+ @TableField(exist = false)
+ private String alarmValue;
+
+ @TableField(exist = false)
+ private String alarmContentName;
+
+ @TableField(exist = false)
+ private Integer recordId;
+
+ @Override
+ public String toString() {
+ return "AlarmJob{" +
+ "id=" + id +
+ ", jobcode=" + jobcode +
+ ", jogType=" + jobType +
+ ", wellCode=" + wellCode +
+ ", devcode=" + devcode +
+ ", createTime=" + createTime +
+ ", jobStatus=" + jobStatus +
+ ", getJobPerson=" + getJobPerson +
+ ", getJobTime=" + getJobTime +
+ ", firstState=" + firstState +
+ ", firstStatePhotos=" + firstStatePhotos +
+ ", confirmJobPerson=" + confirmJobPerson +
+ ", confrimJobTime=" + confrimJobTime +
+ ", handleJobPerson=" + handleJobPerson +
+ ", handleJobTime=" + handleJobTime +
+ ", handleMessage=" + handleMessage +
+ ", handlePhotos=" + handlePhotos +
+ ", flow=" + flow +
+ ", recordId=" + recordId +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/AlarmRecords.java b/src/main/java/com/casic/entity/AlarmRecords.java
new file mode 100644
index 0000000..88b0b26
--- /dev/null
+++ b/src/main/java/com/casic/entity/AlarmRecords.java
@@ -0,0 +1,108 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_records")
+public class AlarmRecords extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 设备ID
+ */
+ @TableField("DEVICE_ID")
+ private Long deviceId;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 闸井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 告警类型
+ */
+ @TableField("ALARM_TYPE")
+ private String alarmType;
+ /**
+ * 告警内容
+ */
+ @TableField("ALARM_CONTENT")
+ private String alarmContent;
+ /**
+ * 告警数值
+ */
+ @TableField("ALARM_VALUE")
+ private String alarmValue;
+ /**
+ * 告警等级
+ */
+ @TableField("ALARM_LEVEL")
+ private Integer alarmLevel;
+ /**
+ * 告警详情
+ */
+ @TableField("ALARM_MSG")
+ private String alarmMessage;
+ /**
+ * 告警时间
+ */
+ @TableField("ALARM_TIME")
+ private Date alarmTime;
+ /**
+ * 告警状态
+ */
+ @TableField("STATUS")
+ private String status;
+ /**
+ * 工单编号
+ */
+ @TableField("JOB_ID")
+ private Long jobId;
+
+ @TableField(exist = false)
+ private Integer jobStatus;
+
+ @Override
+ public String toString() {
+ return "AlarmRecords{" +
+ "id=" + id +
+ ", deviceId=" + deviceId +
+ ", devcode=" + devcode +
+ ", wellCode=" + wellCode +
+ ", alarmType=" + alarmType +
+ ", alarmContent=" + alarmContent +
+ ", alarmValue=" + alarmValue +
+ ", alarmLevel=" + alarmLevel +
+ ", alarmMessage=" + alarmMessage +
+ ", alarmTime=" + alarmTime +
+ ", status=" + status +
+ ", jobId=" + jobId +
+ ", jobStatus=" + jobStatus +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/DataGasDector.java b/src/main/java/com/casic/entity/DataGasDector.java
new file mode 100644
index 0000000..537789a
--- /dev/null
+++ b/src/main/java/com/casic/entity/DataGasDector.java
@@ -0,0 +1,42 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author cz
+ * @date 2022-7-1
+ */
+@Data
+@TableName("data_gas_dector")
+public class DataGasDector {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ private String devcode;
+ private String wellCode;
+ private String strength;
+
+ private String descn;
+ /**
+ * --信号与干扰加噪声比
+ */
+ private String sinr;
+ /**
+ * --参考信号接收功率
+ */
+ private String rsrp;
+ /**
+ * --物理小区标识
+ */
+ private String pci;
+ private Date uptime;
+ private Date logtime;
+}
diff --git a/src/main/java/com/casic/entity/DataGasReport.java b/src/main/java/com/casic/entity/DataGasReport.java
deleted file mode 100644
index c43ccdf..0000000
--- a/src/main/java/com/casic/entity/DataGasReport.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.casic.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author cz
- * @date 2022-7-1
- */
-@Data
-@TableName("data_gas_dector")
-public class DataGasReport {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @TableField("devcode")
- private String imei;
- private String wellcode;
-
- private String imsi;
- /**
- * --事件类型 0正常 1低报 2高报
- */
- private String gasSensorState;
- /**
- * --浓度值
- */
- private String gasSampleValue;
- /**
- * --信号与干扰加噪声比
- */
- private String sinr;
- /**
- * --参考信号接收功率
- */
- private String rsrp;
- /**
- * --物理小区标识
- */
- private String pci;
- /**
- * --心跳周期
- */
- private String heartbeatTime;
-
- /**
- * --小区位置信息
- */
- private String cellId;
- /**
- * --电池电压
- */
- private String batteryVoltage;
- /**
- * --电池电量
- */
- private String batteryValue;
- private String iccid;
- private Date uptime;
- private Date logtime;
-}
diff --git a/src/main/java/com/casic/entity/DeviceSatatus.java b/src/main/java/com/casic/entity/DeviceSatatus.java
new file mode 100644
index 0000000..bab7903
--- /dev/null
+++ b/src/main/java/com/casic/entity/DeviceSatatus.java
@@ -0,0 +1,19 @@
+package com.casic.entity;
+
+import lombok.Data;
+
+/**
+ * 不使用了
+ *
+ */
+@Data
+public class DeviceSatatus {
+ private String deviceId;
+ private String cell;
+ private String cellTs;
+ private String onlineState;
+ private String onlineTs;
+ private String lastDataId;
+ private String lastDataJson;
+ private String lastDataTs;
+}
diff --git a/src/main/java/com/casic/model/DataContentParam.java b/src/main/java/com/casic/model/DataContentParam.java
new file mode 100644
index 0000000..46d298a
--- /dev/null
+++ b/src/main/java/com/casic/model/DataContentParam.java
@@ -0,0 +1,19 @@
+package com.casic.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DataContentParam {
+ private String msg_type;
+ private String error_val;
+ private String ch_cnt;
+ private String erro_cnt;
+ private String alarm_low_cnt;
+ private String alarm_high_cnt;
+ private String offline_cnt;
+ private List rtd_val;
+ private List adc_val;
+ private List status_val;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/DataReportParam.java b/src/main/java/com/casic/model/DataReportParam.java
index 082814c..754f330 100644
--- a/src/main/java/com/casic/model/DataReportParam.java
+++ b/src/main/java/com/casic/model/DataReportParam.java
@@ -11,25 +11,12 @@
*/
@Data
public class DataReportParam {
- private String upPacketSN;
- private String upDataSN;
- private String topic;
- private String timestamp;
- private String tenantId;
- private String serviceId;
- private String protocol;
- private String productId;
- /**
- * gas_sensor_state = 1, --事件类型 0 正常 1 低报 2 高报
- * gas_sample_value = 11-- 浓度值
- */
- private Map payload;
- private String messageType;
private String deviceType;
- private String deviceId;
- private String assocAssetId;
- @JsonProperty(value = "IMSI", required = true)
- private String IMSI;
- @JsonProperty(value = "IMEI", required = true)
- private String IMEI;
+ private String iotId;
+ private String requestId;
+ private Object checkFailedData;
+ private String productKey;
+ private String gmtCreate;
+ private String deviceName;
+ private Object items;
}
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..814888c
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,321 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ * 报警工单表
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_job")
+public class AlarmJob extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 工单编号
+ */
+ @TableField("JOBCODE")
+ private String jobcode;
+ /**
+ * 工单类型
+ */
+ @TableField("JOG_TYPE")
+ private String jobType;
+ /**
+ * 井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 工单创建时间
+ */
+ @TableField("CREATE_TIME")
+ private Date createTime;
+ /**
+ * 工单状态（0待处理，1待确认，2处理中，3完成）
+ */
+ @TableField("JOB_STATUS")
+ private String jobStatus;
+ /**
+ * 接单人员
+ */
+ @TableField("GET_JOB_PERSON")
+ private Long getJobPerson;
+ /**
+ * 接单时间
+ */
+ @TableField("GET_JOB_TIME")
+ private Date getJobTime;
+ /**
+ * 应接单时间
+ */
+ @TableField("SHOULD_GET_TIME")
+ private Date shouldGetTime;
+ /**
+ * 第一现场情况
+ */
+ @TableField("FIRST_STATE")
+ private String firstState;
+ /**
+ * 第一现场照片
+ */
+ @TableField("FIRST_STATE_PHOTOS")
+ private String firstStatePhotos;
+ /**
+ * 确认人员
+ */
+ @TableField("CONFIRM_JOB_PERSON")
+ private Long confirmJobPerson;
+ /**
+ * 确认时间
+ */
+ @TableField("CONFRIM_JOB_TIME")
+ private Date confrimJobTime;
+ /**
+ * 处理人员
+ */
+ @TableField("HANDLE_JOB_Person")
+ private Long handleJobPerson;
+ /**
+ * 处理时间
+ */
+ @TableField("HANDLE_JOB_TIME")
+ private Date handleJobTime;
+ /**
+ * 维护情况记录
+ */
+ @TableField("HANDLE_MESSAGE")
+ private String handleMessage;
+ /**
+ * 维护图片
+ */
+ @TableField("HANDLE_PHOTOS")
+ private String handlePhotos;
+ /**
+ * 工单流转记录
+ */
+ @TableField("FLOW")
+ private String flow;
+
+ @TableField("JOB_BELONG_TO")
+ private Long jobBelongTo;
+
+ @TableField("JOB_FLAG_DELAY")
+ private String jobFlagDelay;
+
+ @TableField("JOB_FLAG_1")
+ private String jobFlag1;
+
+ @TableField(exist = false)
+ private String alarmValue;
+
+ @TableField(exist = false)
+ private String alarmContentName;
+
+ @TableField(exist = false)
+ private Integer recordId;
+
+ @Override
+ public String toString() {
+ return "AlarmJob{" +
+ "id=" + id +
+ ", jobcode=" + jobcode +
+ ", jogType=" + jobType +
+ ", wellCode=" + wellCode +
+ ", devcode=" + devcode +
+ ", createTime=" + createTime +
+ ", jobStatus=" + jobStatus +
+ ", getJobPerson=" + getJobPerson +
+ ", getJobTime=" + getJobTime +
+ ", firstState=" + firstState +
+ ", firstStatePhotos=" + firstStatePhotos +
+ ", confirmJobPerson=" + confirmJobPerson +
+ ", confrimJobTime=" + confrimJobTime +
+ ", handleJobPerson=" + handleJobPerson +
+ ", handleJobTime=" + handleJobTime +
+ ", handleMessage=" + handleMessage +
+ ", handlePhotos=" + handlePhotos +
+ ", flow=" + flow +
+ ", recordId=" + recordId +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/AlarmRecords.java b/src/main/java/com/casic/entity/AlarmRecords.java
new file mode 100644
index 0000000..88b0b26
--- /dev/null
+++ b/src/main/java/com/casic/entity/AlarmRecords.java
@@ -0,0 +1,108 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_records")
+public class AlarmRecords extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 设备ID
+ */
+ @TableField("DEVICE_ID")
+ private Long deviceId;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 闸井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 告警类型
+ */
+ @TableField("ALARM_TYPE")
+ private String alarmType;
+ /**
+ * 告警内容
+ */
+ @TableField("ALARM_CONTENT")
+ private String alarmContent;
+ /**
+ * 告警数值
+ */
+ @TableField("ALARM_VALUE")
+ private String alarmValue;
+ /**
+ * 告警等级
+ */
+ @TableField("ALARM_LEVEL")
+ private Integer alarmLevel;
+ /**
+ * 告警详情
+ */
+ @TableField("ALARM_MSG")
+ private String alarmMessage;
+ /**
+ * 告警时间
+ */
+ @TableField("ALARM_TIME")
+ private Date alarmTime;
+ /**
+ * 告警状态
+ */
+ @TableField("STATUS")
+ private String status;
+ /**
+ * 工单编号
+ */
+ @TableField("JOB_ID")
+ private Long jobId;
+
+ @TableField(exist = false)
+ private Integer jobStatus;
+
+ @Override
+ public String toString() {
+ return "AlarmRecords{" +
+ "id=" + id +
+ ", deviceId=" + deviceId +
+ ", devcode=" + devcode +
+ ", wellCode=" + wellCode +
+ ", alarmType=" + alarmType +
+ ", alarmContent=" + alarmContent +
+ ", alarmValue=" + alarmValue +
+ ", alarmLevel=" + alarmLevel +
+ ", alarmMessage=" + alarmMessage +
+ ", alarmTime=" + alarmTime +
+ ", status=" + status +
+ ", jobId=" + jobId +
+ ", jobStatus=" + jobStatus +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/DataGasDector.java b/src/main/java/com/casic/entity/DataGasDector.java
new file mode 100644
index 0000000..537789a
--- /dev/null
+++ b/src/main/java/com/casic/entity/DataGasDector.java
@@ -0,0 +1,42 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author cz
+ * @date 2022-7-1
+ */
+@Data
+@TableName("data_gas_dector")
+public class DataGasDector {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ private String devcode;
+ private String wellCode;
+ private String strength;
+
+ private String descn;
+ /**
+ * --信号与干扰加噪声比
+ */
+ private String sinr;
+ /**
+ * --参考信号接收功率
+ */
+ private String rsrp;
+ /**
+ * --物理小区标识
+ */
+ private String pci;
+ private Date uptime;
+ private Date logtime;
+}
diff --git a/src/main/java/com/casic/entity/DataGasReport.java b/src/main/java/com/casic/entity/DataGasReport.java
deleted file mode 100644
index c43ccdf..0000000
--- a/src/main/java/com/casic/entity/DataGasReport.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.casic.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author cz
- * @date 2022-7-1
- */
-@Data
-@TableName("data_gas_dector")
-public class DataGasReport {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @TableField("devcode")
- private String imei;
- private String wellcode;
-
- private String imsi;
- /**
- * --事件类型 0正常 1低报 2高报
- */
- private String gasSensorState;
- /**
- * --浓度值
- */
- private String gasSampleValue;
- /**
- * --信号与干扰加噪声比
- */
- private String sinr;
- /**
- * --参考信号接收功率
- */
- private String rsrp;
- /**
- * --物理小区标识
- */
- private String pci;
- /**
- * --心跳周期
- */
- private String heartbeatTime;
-
- /**
- * --小区位置信息
- */
- private String cellId;
- /**
- * --电池电压
- */
- private String batteryVoltage;
- /**
- * --电池电量
- */
- private String batteryValue;
- private String iccid;
- private Date uptime;
- private Date logtime;
-}
diff --git a/src/main/java/com/casic/entity/DeviceSatatus.java b/src/main/java/com/casic/entity/DeviceSatatus.java
new file mode 100644
index 0000000..bab7903
--- /dev/null
+++ b/src/main/java/com/casic/entity/DeviceSatatus.java
@@ -0,0 +1,19 @@
+package com.casic.entity;
+
+import lombok.Data;
+
+/**
+ * 不使用了
+ *
+ */
+@Data
+public class DeviceSatatus {
+ private String deviceId;
+ private String cell;
+ private String cellTs;
+ private String onlineState;
+ private String onlineTs;
+ private String lastDataId;
+ private String lastDataJson;
+ private String lastDataTs;
+}
diff --git a/src/main/java/com/casic/model/DataContentParam.java b/src/main/java/com/casic/model/DataContentParam.java
new file mode 100644
index 0000000..46d298a
--- /dev/null
+++ b/src/main/java/com/casic/model/DataContentParam.java
@@ -0,0 +1,19 @@
+package com.casic.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DataContentParam {
+ private String msg_type;
+ private String error_val;
+ private String ch_cnt;
+ private String erro_cnt;
+ private String alarm_low_cnt;
+ private String alarm_high_cnt;
+ private String offline_cnt;
+ private List rtd_val;
+ private List adc_val;
+ private List status_val;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/DataReportParam.java b/src/main/java/com/casic/model/DataReportParam.java
index 082814c..754f330 100644
--- a/src/main/java/com/casic/model/DataReportParam.java
+++ b/src/main/java/com/casic/model/DataReportParam.java
@@ -11,25 +11,12 @@
*/
@Data
public class DataReportParam {
- private String upPacketSN;
- private String upDataSN;
- private String topic;
- private String timestamp;
- private String tenantId;
- private String serviceId;
- private String protocol;
- private String productId;
- /**
- * gas_sensor_state = 1, --事件类型 0 正常 1 低报 2 高报
- * gas_sample_value = 11-- 浓度值
- */
- private Map payload;
- private String messageType;
private String deviceType;
- private String deviceId;
- private String assocAssetId;
- @JsonProperty(value = "IMSI", required = true)
- private String IMSI;
- @JsonProperty(value = "IMEI", required = true)
- private String IMEI;
+ private String iotId;
+ private String requestId;
+ private Object checkFailedData;
+ private String productKey;
+ private String gmtCreate;
+ private String deviceName;
+ private Object items;
}
diff --git a/src/main/java/com/casic/service/DeviceDataService.java b/src/main/java/com/casic/service/DeviceDataService.java
index d883fe4..457d710 100644
--- a/src/main/java/com/casic/service/DeviceDataService.java
+++ b/src/main/java/com/casic/service/DeviceDataService.java
@@ -3,25 +3,18 @@
import com.casic.model.DataReportParam;
import com.casic.model.HeartbeatParam;
import com.casic.model.ResponseData;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* @author cz
* @date 2022
*/
public interface DeviceDataService {
-
/**
*
* @param dataReportParam
* @return
*/
- ResponseData DeviceDataCommit(DataReportParam dataReportParam);
-
- /**
- *
- * @param heartbeatParam
- * @return
- */
- ResponseData heartBeatSave(HeartbeatParam heartbeatParam);
+ ResponseData gasReceiver(DataReportParam dataReportParam);
}
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..814888c
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,321 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ * 报警工单表
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_job")
+public class AlarmJob extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 工单编号
+ */
+ @TableField("JOBCODE")
+ private String jobcode;
+ /**
+ * 工单类型
+ */
+ @TableField("JOG_TYPE")
+ private String jobType;
+ /**
+ * 井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 工单创建时间
+ */
+ @TableField("CREATE_TIME")
+ private Date createTime;
+ /**
+ * 工单状态（0待处理，1待确认，2处理中，3完成）
+ */
+ @TableField("JOB_STATUS")
+ private String jobStatus;
+ /**
+ * 接单人员
+ */
+ @TableField("GET_JOB_PERSON")
+ private Long getJobPerson;
+ /**
+ * 接单时间
+ */
+ @TableField("GET_JOB_TIME")
+ private Date getJobTime;
+ /**
+ * 应接单时间
+ */
+ @TableField("SHOULD_GET_TIME")
+ private Date shouldGetTime;
+ /**
+ * 第一现场情况
+ */
+ @TableField("FIRST_STATE")
+ private String firstState;
+ /**
+ * 第一现场照片
+ */
+ @TableField("FIRST_STATE_PHOTOS")
+ private String firstStatePhotos;
+ /**
+ * 确认人员
+ */
+ @TableField("CONFIRM_JOB_PERSON")
+ private Long confirmJobPerson;
+ /**
+ * 确认时间
+ */
+ @TableField("CONFRIM_JOB_TIME")
+ private Date confrimJobTime;
+ /**
+ * 处理人员
+ */
+ @TableField("HANDLE_JOB_Person")
+ private Long handleJobPerson;
+ /**
+ * 处理时间
+ */
+ @TableField("HANDLE_JOB_TIME")
+ private Date handleJobTime;
+ /**
+ * 维护情况记录
+ */
+ @TableField("HANDLE_MESSAGE")
+ private String handleMessage;
+ /**
+ * 维护图片
+ */
+ @TableField("HANDLE_PHOTOS")
+ private String handlePhotos;
+ /**
+ * 工单流转记录
+ */
+ @TableField("FLOW")
+ private String flow;
+
+ @TableField("JOB_BELONG_TO")
+ private Long jobBelongTo;
+
+ @TableField("JOB_FLAG_DELAY")
+ private String jobFlagDelay;
+
+ @TableField("JOB_FLAG_1")
+ private String jobFlag1;
+
+ @TableField(exist = false)
+ private String alarmValue;
+
+ @TableField(exist = false)
+ private String alarmContentName;
+
+ @TableField(exist = false)
+ private Integer recordId;
+
+ @Override
+ public String toString() {
+ return "AlarmJob{" +
+ "id=" + id +
+ ", jobcode=" + jobcode +
+ ", jogType=" + jobType +
+ ", wellCode=" + wellCode +
+ ", devcode=" + devcode +
+ ", createTime=" + createTime +
+ ", jobStatus=" + jobStatus +
+ ", getJobPerson=" + getJobPerson +
+ ", getJobTime=" + getJobTime +
+ ", firstState=" + firstState +
+ ", firstStatePhotos=" + firstStatePhotos +
+ ", confirmJobPerson=" + confirmJobPerson +
+ ", confrimJobTime=" + confrimJobTime +
+ ", handleJobPerson=" + handleJobPerson +
+ ", handleJobTime=" + handleJobTime +
+ ", handleMessage=" + handleMessage +
+ ", handlePhotos=" + handlePhotos +
+ ", flow=" + flow +
+ ", recordId=" + recordId +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/AlarmRecords.java b/src/main/java/com/casic/entity/AlarmRecords.java
new file mode 100644
index 0000000..88b0b26
--- /dev/null
+++ b/src/main/java/com/casic/entity/AlarmRecords.java
@@ -0,0 +1,108 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_records")
+public class AlarmRecords extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 设备ID
+ */
+ @TableField("DEVICE_ID")
+ private Long deviceId;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 闸井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 告警类型
+ */
+ @TableField("ALARM_TYPE")
+ private String alarmType;
+ /**
+ * 告警内容
+ */
+ @TableField("ALARM_CONTENT")
+ private String alarmContent;
+ /**
+ * 告警数值
+ */
+ @TableField("ALARM_VALUE")
+ private String alarmValue;
+ /**
+ * 告警等级
+ */
+ @TableField("ALARM_LEVEL")
+ private Integer alarmLevel;
+ /**
+ * 告警详情
+ */
+ @TableField("ALARM_MSG")
+ private String alarmMessage;
+ /**
+ * 告警时间
+ */
+ @TableField("ALARM_TIME")
+ private Date alarmTime;
+ /**
+ * 告警状态
+ */
+ @TableField("STATUS")
+ private String status;
+ /**
+ * 工单编号
+ */
+ @TableField("JOB_ID")
+ private Long jobId;
+
+ @TableField(exist = false)
+ private Integer jobStatus;
+
+ @Override
+ public String toString() {
+ return "AlarmRecords{" +
+ "id=" + id +
+ ", deviceId=" + deviceId +
+ ", devcode=" + devcode +
+ ", wellCode=" + wellCode +
+ ", alarmType=" + alarmType +
+ ", alarmContent=" + alarmContent +
+ ", alarmValue=" + alarmValue +
+ ", alarmLevel=" + alarmLevel +
+ ", alarmMessage=" + alarmMessage +
+ ", alarmTime=" + alarmTime +
+ ", status=" + status +
+ ", jobId=" + jobId +
+ ", jobStatus=" + jobStatus +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/DataGasDector.java b/src/main/java/com/casic/entity/DataGasDector.java
new file mode 100644
index 0000000..537789a
--- /dev/null
+++ b/src/main/java/com/casic/entity/DataGasDector.java
@@ -0,0 +1,42 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author cz
+ * @date 2022-7-1
+ */
+@Data
+@TableName("data_gas_dector")
+public class DataGasDector {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ private String devcode;
+ private String wellCode;
+ private String strength;
+
+ private String descn;
+ /**
+ * --信号与干扰加噪声比
+ */
+ private String sinr;
+ /**
+ * --参考信号接收功率
+ */
+ private String rsrp;
+ /**
+ * --物理小区标识
+ */
+ private String pci;
+ private Date uptime;
+ private Date logtime;
+}
diff --git a/src/main/java/com/casic/entity/DataGasReport.java b/src/main/java/com/casic/entity/DataGasReport.java
deleted file mode 100644
index c43ccdf..0000000
--- a/src/main/java/com/casic/entity/DataGasReport.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.casic.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author cz
- * @date 2022-7-1
- */
-@Data
-@TableName("data_gas_dector")
-public class DataGasReport {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @TableField("devcode")
- private String imei;
- private String wellcode;
-
- private String imsi;
- /**
- * --事件类型 0正常 1低报 2高报
- */
- private String gasSensorState;
- /**
- * --浓度值
- */
- private String gasSampleValue;
- /**
- * --信号与干扰加噪声比
- */
- private String sinr;
- /**
- * --参考信号接收功率
- */
- private String rsrp;
- /**
- * --物理小区标识
- */
- private String pci;
- /**
- * --心跳周期
- */
- private String heartbeatTime;
-
- /**
- * --小区位置信息
- */
- private String cellId;
- /**
- * --电池电压
- */
- private String batteryVoltage;
- /**
- * --电池电量
- */
- private String batteryValue;
- private String iccid;
- private Date uptime;
- private Date logtime;
-}
diff --git a/src/main/java/com/casic/entity/DeviceSatatus.java b/src/main/java/com/casic/entity/DeviceSatatus.java
new file mode 100644
index 0000000..bab7903
--- /dev/null
+++ b/src/main/java/com/casic/entity/DeviceSatatus.java
@@ -0,0 +1,19 @@
+package com.casic.entity;
+
+import lombok.Data;
+
+/**
+ * 不使用了
+ *
+ */
+@Data
+public class DeviceSatatus {
+ private String deviceId;
+ private String cell;
+ private String cellTs;
+ private String onlineState;
+ private String onlineTs;
+ private String lastDataId;
+ private String lastDataJson;
+ private String lastDataTs;
+}
diff --git a/src/main/java/com/casic/model/DataContentParam.java b/src/main/java/com/casic/model/DataContentParam.java
new file mode 100644
index 0000000..46d298a
--- /dev/null
+++ b/src/main/java/com/casic/model/DataContentParam.java
@@ -0,0 +1,19 @@
+package com.casic.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DataContentParam {
+ private String msg_type;
+ private String error_val;
+ private String ch_cnt;
+ private String erro_cnt;
+ private String alarm_low_cnt;
+ private String alarm_high_cnt;
+ private String offline_cnt;
+ private List rtd_val;
+ private List adc_val;
+ private List status_val;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/DataReportParam.java b/src/main/java/com/casic/model/DataReportParam.java
index 082814c..754f330 100644
--- a/src/main/java/com/casic/model/DataReportParam.java
+++ b/src/main/java/com/casic/model/DataReportParam.java
@@ -11,25 +11,12 @@
*/
@Data
public class DataReportParam {
- private String upPacketSN;
- private String upDataSN;
- private String topic;
- private String timestamp;
- private String tenantId;
- private String serviceId;
- private String protocol;
- private String productId;
- /**
- * gas_sensor_state = 1, --事件类型 0 正常 1 低报 2 高报
- * gas_sample_value = 11-- 浓度值
- */
- private Map payload;
- private String messageType;
private String deviceType;
- private String deviceId;
- private String assocAssetId;
- @JsonProperty(value = "IMSI", required = true)
- private String IMSI;
- @JsonProperty(value = "IMEI", required = true)
- private String IMEI;
+ private String iotId;
+ private String requestId;
+ private Object checkFailedData;
+ private String productKey;
+ private String gmtCreate;
+ private String deviceName;
+ private Object items;
}
diff --git a/src/main/java/com/casic/service/DeviceDataService.java b/src/main/java/com/casic/service/DeviceDataService.java
index d883fe4..457d710 100644
--- a/src/main/java/com/casic/service/DeviceDataService.java
+++ b/src/main/java/com/casic/service/DeviceDataService.java
@@ -3,25 +3,18 @@
import com.casic.model.DataReportParam;
import com.casic.model.HeartbeatParam;
import com.casic.model.ResponseData;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* @author cz
* @date 2022
*/
public interface DeviceDataService {
-
/**
*
* @param dataReportParam
* @return
*/
- ResponseData DeviceDataCommit(DataReportParam dataReportParam);
-
- /**
- *
- * @param heartbeatParam
- * @return
- */
- ResponseData heartBeatSave(HeartbeatParam heartbeatParam);
+ ResponseData gasReceiver(DataReportParam dataReportParam);
}
diff --git a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
index 93f0685..e473f0c 100644
--- a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
+++ b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
@@ -1,58 +1,49 @@
package com.casic.service.impl;
-import com.casic.dao.impl.DeviceDataMapper;
+import com.alibaba.druid.util.StringUtils;
+import com.alibaba.fastjson.JSON;
import com.casic.model.*;
import com.casic.service.DeviceDataService;
+import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.stereotype.Service;
+import java.util.Map;
+
/**
* @author cz
- * @date 2022-6-20
+ * @date 2022-9-26
*/
@Slf4j
@Service
public class DeviceDataServiceImpl implements DeviceDataService {
- @Autowired
- DeviceDataMapper deviceDataMapper;
+ private final NormalDataProcessor normalDataProcessor;
- /**
- * @param dataReportParam
- * @return
- */
- public ResponseData DeviceDataCommit(DataReportParam dataReportParam) {
- ResponseData responseData = new ResponseData();
- try {
- deviceDataMapper.addDeviceData(dataReportParam);
- responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
- responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
- } catch (DataAccessException sqlex) {
- responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
- responseData.setMessage("请求数据异常");
- responseData.setSuccess(true);
- log.error("主题:数据上报保存出现错误,异常信息为{}", sqlex);
- }
- return responseData;
+ public DeviceDataServiceImpl(NormalDataProcessor normalDataProcessor) {
+ this.normalDataProcessor = normalDataProcessor;
}
- /**
- * @param heartbeatParam
- * @return
- */
- public ResponseData heartBeatSave(HeartbeatParam heartbeatParam) {
+ public ResponseData gasReceiver(DataReportParam dataReportParam) {
ResponseData responseData = new ResponseData();
try {
- deviceDataMapper.editDeviceData(heartbeatParam);
+ Map> updDataMap = new ObjectMapper().convertValue(dataReportParam.getItems(), Map.class);
+ DataContentParam dataContentParam = JSON.parseObject(updDataMap.get("updData").get("value"), DataContentParam.class);
+ Long uptime = Long.valueOf(String.valueOf(updDataMap.get("updData").get("time")));
+ if (StringUtils.isEmpty(dataReportParam.getDeviceName())) {
+ responseData.setCode(200);
+ responseData.setMessage("没有设备编号");
+ return responseData;
+ }
+ normalDataProcessor.normalDataProvider(dataContentParam, uptime, dataReportParam.getDeviceName());
responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
} catch (DataAccessException sqlex) {
responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
responseData.setMessage("请求数据异常");
responseData.setSuccess(true);
- log.error("主题:数据心跳出现错误,异常信息为{}", sqlex);
+ log.error("主题:设备数据上报出现错误,异常信息为{}", sqlex);
}
return responseData;
}
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..814888c
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,321 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ * 报警工单表
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_job")
+public class AlarmJob extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 工单编号
+ */
+ @TableField("JOBCODE")
+ private String jobcode;
+ /**
+ * 工单类型
+ */
+ @TableField("JOG_TYPE")
+ private String jobType;
+ /**
+ * 井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 工单创建时间
+ */
+ @TableField("CREATE_TIME")
+ private Date createTime;
+ /**
+ * 工单状态（0待处理，1待确认，2处理中，3完成）
+ */
+ @TableField("JOB_STATUS")
+ private String jobStatus;
+ /**
+ * 接单人员
+ */
+ @TableField("GET_JOB_PERSON")
+ private Long getJobPerson;
+ /**
+ * 接单时间
+ */
+ @TableField("GET_JOB_TIME")
+ private Date getJobTime;
+ /**
+ * 应接单时间
+ */
+ @TableField("SHOULD_GET_TIME")
+ private Date shouldGetTime;
+ /**
+ * 第一现场情况
+ */
+ @TableField("FIRST_STATE")
+ private String firstState;
+ /**
+ * 第一现场照片
+ */
+ @TableField("FIRST_STATE_PHOTOS")
+ private String firstStatePhotos;
+ /**
+ * 确认人员
+ */
+ @TableField("CONFIRM_JOB_PERSON")
+ private Long confirmJobPerson;
+ /**
+ * 确认时间
+ */
+ @TableField("CONFRIM_JOB_TIME")
+ private Date confrimJobTime;
+ /**
+ * 处理人员
+ */
+ @TableField("HANDLE_JOB_Person")
+ private Long handleJobPerson;
+ /**
+ * 处理时间
+ */
+ @TableField("HANDLE_JOB_TIME")
+ private Date handleJobTime;
+ /**
+ * 维护情况记录
+ */
+ @TableField("HANDLE_MESSAGE")
+ private String handleMessage;
+ /**
+ * 维护图片
+ */
+ @TableField("HANDLE_PHOTOS")
+ private String handlePhotos;
+ /**
+ * 工单流转记录
+ */
+ @TableField("FLOW")
+ private String flow;
+
+ @TableField("JOB_BELONG_TO")
+ private Long jobBelongTo;
+
+ @TableField("JOB_FLAG_DELAY")
+ private String jobFlagDelay;
+
+ @TableField("JOB_FLAG_1")
+ private String jobFlag1;
+
+ @TableField(exist = false)
+ private String alarmValue;
+
+ @TableField(exist = false)
+ private String alarmContentName;
+
+ @TableField(exist = false)
+ private Integer recordId;
+
+ @Override
+ public String toString() {
+ return "AlarmJob{" +
+ "id=" + id +
+ ", jobcode=" + jobcode +
+ ", jogType=" + jobType +
+ ", wellCode=" + wellCode +
+ ", devcode=" + devcode +
+ ", createTime=" + createTime +
+ ", jobStatus=" + jobStatus +
+ ", getJobPerson=" + getJobPerson +
+ ", getJobTime=" + getJobTime +
+ ", firstState=" + firstState +
+ ", firstStatePhotos=" + firstStatePhotos +
+ ", confirmJobPerson=" + confirmJobPerson +
+ ", confrimJobTime=" + confrimJobTime +
+ ", handleJobPerson=" + handleJobPerson +
+ ", handleJobTime=" + handleJobTime +
+ ", handleMessage=" + handleMessage +
+ ", handlePhotos=" + handlePhotos +
+ ", flow=" + flow +
+ ", recordId=" + recordId +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/AlarmRecords.java b/src/main/java/com/casic/entity/AlarmRecords.java
new file mode 100644
index 0000000..88b0b26
--- /dev/null
+++ b/src/main/java/com/casic/entity/AlarmRecords.java
@@ -0,0 +1,108 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_records")
+public class AlarmRecords extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 设备ID
+ */
+ @TableField("DEVICE_ID")
+ private Long deviceId;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 闸井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 告警类型
+ */
+ @TableField("ALARM_TYPE")
+ private String alarmType;
+ /**
+ * 告警内容
+ */
+ @TableField("ALARM_CONTENT")
+ private String alarmContent;
+ /**
+ * 告警数值
+ */
+ @TableField("ALARM_VALUE")
+ private String alarmValue;
+ /**
+ * 告警等级
+ */
+ @TableField("ALARM_LEVEL")
+ private Integer alarmLevel;
+ /**
+ * 告警详情
+ */
+ @TableField("ALARM_MSG")
+ private String alarmMessage;
+ /**
+ * 告警时间
+ */
+ @TableField("ALARM_TIME")
+ private Date alarmTime;
+ /**
+ * 告警状态
+ */
+ @TableField("STATUS")
+ private String status;
+ /**
+ * 工单编号
+ */
+ @TableField("JOB_ID")
+ private Long jobId;
+
+ @TableField(exist = false)
+ private Integer jobStatus;
+
+ @Override
+ public String toString() {
+ return "AlarmRecords{" +
+ "id=" + id +
+ ", deviceId=" + deviceId +
+ ", devcode=" + devcode +
+ ", wellCode=" + wellCode +
+ ", alarmType=" + alarmType +
+ ", alarmContent=" + alarmContent +
+ ", alarmValue=" + alarmValue +
+ ", alarmLevel=" + alarmLevel +
+ ", alarmMessage=" + alarmMessage +
+ ", alarmTime=" + alarmTime +
+ ", status=" + status +
+ ", jobId=" + jobId +
+ ", jobStatus=" + jobStatus +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/DataGasDector.java b/src/main/java/com/casic/entity/DataGasDector.java
new file mode 100644
index 0000000..537789a
--- /dev/null
+++ b/src/main/java/com/casic/entity/DataGasDector.java
@@ -0,0 +1,42 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author cz
+ * @date 2022-7-1
+ */
+@Data
+@TableName("data_gas_dector")
+public class DataGasDector {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ private String devcode;
+ private String wellCode;
+ private String strength;
+
+ private String descn;
+ /**
+ * --信号与干扰加噪声比
+ */
+ private String sinr;
+ /**
+ * --参考信号接收功率
+ */
+ private String rsrp;
+ /**
+ * --物理小区标识
+ */
+ private String pci;
+ private Date uptime;
+ private Date logtime;
+}
diff --git a/src/main/java/com/casic/entity/DataGasReport.java b/src/main/java/com/casic/entity/DataGasReport.java
deleted file mode 100644
index c43ccdf..0000000
--- a/src/main/java/com/casic/entity/DataGasReport.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.casic.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author cz
- * @date 2022-7-1
- */
-@Data
-@TableName("data_gas_dector")
-public class DataGasReport {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @TableField("devcode")
- private String imei;
- private String wellcode;
-
- private String imsi;
- /**
- * --事件类型 0正常 1低报 2高报
- */
- private String gasSensorState;
- /**
- * --浓度值
- */
- private String gasSampleValue;
- /**
- * --信号与干扰加噪声比
- */
- private String sinr;
- /**
- * --参考信号接收功率
- */
- private String rsrp;
- /**
- * --物理小区标识
- */
- private String pci;
- /**
- * --心跳周期
- */
- private String heartbeatTime;
-
- /**
- * --小区位置信息
- */
- private String cellId;
- /**
- * --电池电压
- */
- private String batteryVoltage;
- /**
- * --电池电量
- */
- private String batteryValue;
- private String iccid;
- private Date uptime;
- private Date logtime;
-}
diff --git a/src/main/java/com/casic/entity/DeviceSatatus.java b/src/main/java/com/casic/entity/DeviceSatatus.java
new file mode 100644
index 0000000..bab7903
--- /dev/null
+++ b/src/main/java/com/casic/entity/DeviceSatatus.java
@@ -0,0 +1,19 @@
+package com.casic.entity;
+
+import lombok.Data;
+
+/**
+ * 不使用了
+ *
+ */
+@Data
+public class DeviceSatatus {
+ private String deviceId;
+ private String cell;
+ private String cellTs;
+ private String onlineState;
+ private String onlineTs;
+ private String lastDataId;
+ private String lastDataJson;
+ private String lastDataTs;
+}
diff --git a/src/main/java/com/casic/model/DataContentParam.java b/src/main/java/com/casic/model/DataContentParam.java
new file mode 100644
index 0000000..46d298a
--- /dev/null
+++ b/src/main/java/com/casic/model/DataContentParam.java
@@ -0,0 +1,19 @@
+package com.casic.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DataContentParam {
+ private String msg_type;
+ private String error_val;
+ private String ch_cnt;
+ private String erro_cnt;
+ private String alarm_low_cnt;
+ private String alarm_high_cnt;
+ private String offline_cnt;
+ private List rtd_val;
+ private List adc_val;
+ private List status_val;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/DataReportParam.java b/src/main/java/com/casic/model/DataReportParam.java
index 082814c..754f330 100644
--- a/src/main/java/com/casic/model/DataReportParam.java
+++ b/src/main/java/com/casic/model/DataReportParam.java
@@ -11,25 +11,12 @@
*/
@Data
public class DataReportParam {
- private String upPacketSN;
- private String upDataSN;
- private String topic;
- private String timestamp;
- private String tenantId;
- private String serviceId;
- private String protocol;
- private String productId;
- /**
- * gas_sensor_state = 1, --事件类型 0 正常 1 低报 2 高报
- * gas_sample_value = 11-- 浓度值
- */
- private Map payload;
- private String messageType;
private String deviceType;
- private String deviceId;
- private String assocAssetId;
- @JsonProperty(value = "IMSI", required = true)
- private String IMSI;
- @JsonProperty(value = "IMEI", required = true)
- private String IMEI;
+ private String iotId;
+ private String requestId;
+ private Object checkFailedData;
+ private String productKey;
+ private String gmtCreate;
+ private String deviceName;
+ private Object items;
}
diff --git a/src/main/java/com/casic/service/DeviceDataService.java b/src/main/java/com/casic/service/DeviceDataService.java
index d883fe4..457d710 100644
--- a/src/main/java/com/casic/service/DeviceDataService.java
+++ b/src/main/java/com/casic/service/DeviceDataService.java
@@ -3,25 +3,18 @@
import com.casic.model.DataReportParam;
import com.casic.model.HeartbeatParam;
import com.casic.model.ResponseData;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* @author cz
* @date 2022
*/
public interface DeviceDataService {
-
/**
*
* @param dataReportParam
* @return
*/
- ResponseData DeviceDataCommit(DataReportParam dataReportParam);
-
- /**
- *
- * @param heartbeatParam
- * @return
- */
- ResponseData heartBeatSave(HeartbeatParam heartbeatParam);
+ ResponseData gasReceiver(DataReportParam dataReportParam);
}
diff --git a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
index 93f0685..e473f0c 100644
--- a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
+++ b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
@@ -1,58 +1,49 @@
package com.casic.service.impl;
-import com.casic.dao.impl.DeviceDataMapper;
+import com.alibaba.druid.util.StringUtils;
+import com.alibaba.fastjson.JSON;
import com.casic.model.*;
import com.casic.service.DeviceDataService;
+import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.stereotype.Service;
+import java.util.Map;
+
/**
* @author cz
- * @date 2022-6-20
+ * @date 2022-9-26
*/
@Slf4j
@Service
public class DeviceDataServiceImpl implements DeviceDataService {
- @Autowired
- DeviceDataMapper deviceDataMapper;
+ private final NormalDataProcessor normalDataProcessor;
- /**
- * @param dataReportParam
- * @return
- */
- public ResponseData DeviceDataCommit(DataReportParam dataReportParam) {
- ResponseData responseData = new ResponseData();
- try {
- deviceDataMapper.addDeviceData(dataReportParam);
- responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
- responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
- } catch (DataAccessException sqlex) {
- responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
- responseData.setMessage("请求数据异常");
- responseData.setSuccess(true);
- log.error("主题:数据上报保存出现错误,异常信息为{}", sqlex);
- }
- return responseData;
+ public DeviceDataServiceImpl(NormalDataProcessor normalDataProcessor) {
+ this.normalDataProcessor = normalDataProcessor;
}
- /**
- * @param heartbeatParam
- * @return
- */
- public ResponseData heartBeatSave(HeartbeatParam heartbeatParam) {
+ public ResponseData gasReceiver(DataReportParam dataReportParam) {
ResponseData responseData = new ResponseData();
try {
- deviceDataMapper.editDeviceData(heartbeatParam);
+ Map> updDataMap = new ObjectMapper().convertValue(dataReportParam.getItems(), Map.class);
+ DataContentParam dataContentParam = JSON.parseObject(updDataMap.get("updData").get("value"), DataContentParam.class);
+ Long uptime = Long.valueOf(String.valueOf(updDataMap.get("updData").get("time")));
+ if (StringUtils.isEmpty(dataReportParam.getDeviceName())) {
+ responseData.setCode(200);
+ responseData.setMessage("没有设备编号");
+ return responseData;
+ }
+ normalDataProcessor.normalDataProvider(dataContentParam, uptime, dataReportParam.getDeviceName());
responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
} catch (DataAccessException sqlex) {
responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
responseData.setMessage("请求数据异常");
responseData.setSuccess(true);
- log.error("主题:数据心跳出现错误,异常信息为{}", sqlex);
+ log.error("主题:设备数据上报出现错误,异常信息为{}", sqlex);
}
return responseData;
}
diff --git a/src/main/java/com/casic/service/impl/NormalDataProcessor.java b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
new file mode 100644
index 0000000..3f7630a
--- /dev/null
+++ b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
@@ -0,0 +1,164 @@
+package com.casic.service.impl;
+
+import com.alibaba.druid.util.StringUtils;
+import com.casic.dao.AlarmRecordsMapper;
+import com.casic.dao.DataGasMapper;
+import com.casic.dao.impl.AlarmJobDao;
+import com.casic.entity.AlarmJob;
+import com.casic.entity.AlarmRecords;
+import com.casic.entity.DataGasDector;
+import com.casic.model.DataContentParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+import xyz.downgoon.snowflake.Snowflake;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class NormalDataProcessor {
+
+ public static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd");
+
+ @Value("${casic.device.gas-dector.type}")
+ private Long deviceType;
+ @Value("${casic.device.gas-dector.minutes}")
+ private String minutes;
+ @Value("${casic.device.gas-dector.enable-local}")
+ private Boolean enableLocal;
+ @Resource
+ private DataGasMapper dataGasMapper;
+ @Autowired
+ private AlarmJobDao alarmJobDao;
+ @Resource
+ private AlarmRecordsMapper alarmRecordsMapper;
+ private static Snowflake snowflake = new Snowflake(0, 2);
+
+ public void normalDataProvider(DataContentParam dataReportParam, Long timeStamp, String devcode) {
+ Map gasMap = dataGasMapper.getWellCode(devcode);
+ if (ObjectUtils.isEmpty(gasMap)) {
+ log.info("没有该设备编号录入" + devcode);
+ if (enableLocal) {
+ return;
+ }
+ }
+ Boolean updateFlag = false;
+ if (ObjectUtils.isEmpty(dataGasMapper.getLastData(minutes, devcode))) {
+ updateFlag = this.saveNormalData(dataReportParam, timeStamp, devcode, gasMap);
+ }
+ this.dataTaskJudge(dataReportParam, devcode, timeStamp, gasMap, updateFlag);
+ return;
+ }
+
+ /**
+ * 自定义时间存库
+ *
+ * @param dataReportParam
+ * @param timeStamp
+ * @param devcode
+ * @param gasMap
+ */
+ private Boolean saveNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap) {
+ Boolean updateFlag = false;
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ List dataReportFilter = dataReportParam.getRtd_val().stream().filter(
+ data -> {
+ return data != -1;
+ }
+ ).collect(Collectors.toList());
+ if (dataReportFilter.size() > 0 && dataReportFilter.get(dataReportFilter.size() - 1) != 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 1);
+ updateFlag = true;
+ } else if (dataReportFilter.get(dataReportFilter.size() - 1) == 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 0);
+ }
+ dataReportFilter.forEach(
+ data -> {
+ if (data != 65535) {
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+ }
+ );
+ return updateFlag;
+ }
+
+ /**
+ * 报警就存库
+ *
+ * @param dataReportParam
+ * @param devcode
+ * @param timeStamp
+ * @param gasMap
+ */
+ private void dataTaskJudge(DataContentParam dataReportParam, String devcode, Long timeStamp, Map gasMap, Boolean updateFlag) {
+ List> alarmLevelList = dataGasMapper.getAlarmLevelList(deviceType);
+ String wellCode = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "";
+ Long deviceId = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? Long.valueOf(String.valueOf(gasMap.get("deviceId"))) : -1;
+ final String gasMsgContent=dataGasMapper.getGasMsgContent(deviceType);
+ dataReportParam.getRtd_val().stream().filter(
+ dataReport -> {
+ return dataReport != -1 && dataReport != 65535;
+ }
+ ).forEach(
+ dataReport -> {
+ for (Map alarmLevelMap : alarmLevelList) {
+ if (dataReport > Float.valueOf(String.valueOf(alarmLevelMap.get("high_value")))) {
+ AlarmRecords alarmRecord = new AlarmRecords();
+ alarmRecord.setId(snowflake.nextId());
+ alarmRecord.setDeviceId(deviceId);
+ alarmRecord.setDevcode(devcode);
+ alarmRecord.setWellCode(wellCode);
+ alarmRecord.setAlarmType("1"); // 业务报警
+ alarmRecord.setAlarmContent("燃气报警");
+ alarmRecord.setAlarmValue(String.valueOf(dataReport));
+ alarmRecord.setAlarmTime(new Date());
+ alarmRecord.setStatus("1");
+ alarmRecord.setAlarmLevel(Integer.valueOf(alarmLevelMap.get("level").toString()));
+ alarmRecord.setAlarmMessage("燃气报警");
+ String jobId = alarmRecordsMapper.isOldAlarmRecord(devcode, "燃气报警");
+ // 超出报警阈值 生成一条报警消息
+ if (!StringUtils.isEmpty(jobId)) {
+ alarmRecordsMapper.updateOldAlarmRecord(devcode, "燃气报警");
+ alarmRecord.setJobId(Long.valueOf(jobId));
+ } else {
+ AlarmJob alarmJob = alarmJobDao.saveData(devcode, wellCode, "RQZD", "1");
+ alarmRecord.setJobId(alarmJob.getId());
+ }
+ alarmRecordsMapper.insert(alarmRecord);
+ if (!updateFlag) {
+ alarmNormalData(dataReportParam, timeStamp, devcode, gasMap, dataReport);
+ }
+ break;
+ }
+ }
+ }
+ );
+ }
+
+ private void alarmNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap, Integer data) {
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+
+}
+
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..814888c
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,321 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ * 报警工单表
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_job")
+public class AlarmJob extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 工单编号
+ */
+ @TableField("JOBCODE")
+ private String jobcode;
+ /**
+ * 工单类型
+ */
+ @TableField("JOG_TYPE")
+ private String jobType;
+ /**
+ * 井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 工单创建时间
+ */
+ @TableField("CREATE_TIME")
+ private Date createTime;
+ /**
+ * 工单状态（0待处理，1待确认，2处理中，3完成）
+ */
+ @TableField("JOB_STATUS")
+ private String jobStatus;
+ /**
+ * 接单人员
+ */
+ @TableField("GET_JOB_PERSON")
+ private Long getJobPerson;
+ /**
+ * 接单时间
+ */
+ @TableField("GET_JOB_TIME")
+ private Date getJobTime;
+ /**
+ * 应接单时间
+ */
+ @TableField("SHOULD_GET_TIME")
+ private Date shouldGetTime;
+ /**
+ * 第一现场情况
+ */
+ @TableField("FIRST_STATE")
+ private String firstState;
+ /**
+ * 第一现场照片
+ */
+ @TableField("FIRST_STATE_PHOTOS")
+ private String firstStatePhotos;
+ /**
+ * 确认人员
+ */
+ @TableField("CONFIRM_JOB_PERSON")
+ private Long confirmJobPerson;
+ /**
+ * 确认时间
+ */
+ @TableField("CONFRIM_JOB_TIME")
+ private Date confrimJobTime;
+ /**
+ * 处理人员
+ */
+ @TableField("HANDLE_JOB_Person")
+ private Long handleJobPerson;
+ /**
+ * 处理时间
+ */
+ @TableField("HANDLE_JOB_TIME")
+ private Date handleJobTime;
+ /**
+ * 维护情况记录
+ */
+ @TableField("HANDLE_MESSAGE")
+ private String handleMessage;
+ /**
+ * 维护图片
+ */
+ @TableField("HANDLE_PHOTOS")
+ private String handlePhotos;
+ /**
+ * 工单流转记录
+ */
+ @TableField("FLOW")
+ private String flow;
+
+ @TableField("JOB_BELONG_TO")
+ private Long jobBelongTo;
+
+ @TableField("JOB_FLAG_DELAY")
+ private String jobFlagDelay;
+
+ @TableField("JOB_FLAG_1")
+ private String jobFlag1;
+
+ @TableField(exist = false)
+ private String alarmValue;
+
+ @TableField(exist = false)
+ private String alarmContentName;
+
+ @TableField(exist = false)
+ private Integer recordId;
+
+ @Override
+ public String toString() {
+ return "AlarmJob{" +
+ "id=" + id +
+ ", jobcode=" + jobcode +
+ ", jogType=" + jobType +
+ ", wellCode=" + wellCode +
+ ", devcode=" + devcode +
+ ", createTime=" + createTime +
+ ", jobStatus=" + jobStatus +
+ ", getJobPerson=" + getJobPerson +
+ ", getJobTime=" + getJobTime +
+ ", firstState=" + firstState +
+ ", firstStatePhotos=" + firstStatePhotos +
+ ", confirmJobPerson=" + confirmJobPerson +
+ ", confrimJobTime=" + confrimJobTime +
+ ", handleJobPerson=" + handleJobPerson +
+ ", handleJobTime=" + handleJobTime +
+ ", handleMessage=" + handleMessage +
+ ", handlePhotos=" + handlePhotos +
+ ", flow=" + flow +
+ ", recordId=" + recordId +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/AlarmRecords.java b/src/main/java/com/casic/entity/AlarmRecords.java
new file mode 100644
index 0000000..88b0b26
--- /dev/null
+++ b/src/main/java/com/casic/entity/AlarmRecords.java
@@ -0,0 +1,108 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_records")
+public class AlarmRecords extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 设备ID
+ */
+ @TableField("DEVICE_ID")
+ private Long deviceId;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 闸井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 告警类型
+ */
+ @TableField("ALARM_TYPE")
+ private String alarmType;
+ /**
+ * 告警内容
+ */
+ @TableField("ALARM_CONTENT")
+ private String alarmContent;
+ /**
+ * 告警数值
+ */
+ @TableField("ALARM_VALUE")
+ private String alarmValue;
+ /**
+ * 告警等级
+ */
+ @TableField("ALARM_LEVEL")
+ private Integer alarmLevel;
+ /**
+ * 告警详情
+ */
+ @TableField("ALARM_MSG")
+ private String alarmMessage;
+ /**
+ * 告警时间
+ */
+ @TableField("ALARM_TIME")
+ private Date alarmTime;
+ /**
+ * 告警状态
+ */
+ @TableField("STATUS")
+ private String status;
+ /**
+ * 工单编号
+ */
+ @TableField("JOB_ID")
+ private Long jobId;
+
+ @TableField(exist = false)
+ private Integer jobStatus;
+
+ @Override
+ public String toString() {
+ return "AlarmRecords{" +
+ "id=" + id +
+ ", deviceId=" + deviceId +
+ ", devcode=" + devcode +
+ ", wellCode=" + wellCode +
+ ", alarmType=" + alarmType +
+ ", alarmContent=" + alarmContent +
+ ", alarmValue=" + alarmValue +
+ ", alarmLevel=" + alarmLevel +
+ ", alarmMessage=" + alarmMessage +
+ ", alarmTime=" + alarmTime +
+ ", status=" + status +
+ ", jobId=" + jobId +
+ ", jobStatus=" + jobStatus +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/DataGasDector.java b/src/main/java/com/casic/entity/DataGasDector.java
new file mode 100644
index 0000000..537789a
--- /dev/null
+++ b/src/main/java/com/casic/entity/DataGasDector.java
@@ -0,0 +1,42 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author cz
+ * @date 2022-7-1
+ */
+@Data
+@TableName("data_gas_dector")
+public class DataGasDector {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ private String devcode;
+ private String wellCode;
+ private String strength;
+
+ private String descn;
+ /**
+ * --信号与干扰加噪声比
+ */
+ private String sinr;
+ /**
+ * --参考信号接收功率
+ */
+ private String rsrp;
+ /**
+ * --物理小区标识
+ */
+ private String pci;
+ private Date uptime;
+ private Date logtime;
+}
diff --git a/src/main/java/com/casic/entity/DataGasReport.java b/src/main/java/com/casic/entity/DataGasReport.java
deleted file mode 100644
index c43ccdf..0000000
--- a/src/main/java/com/casic/entity/DataGasReport.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.casic.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author cz
- * @date 2022-7-1
- */
-@Data
-@TableName("data_gas_dector")
-public class DataGasReport {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @TableField("devcode")
- private String imei;
- private String wellcode;
-
- private String imsi;
- /**
- * --事件类型 0正常 1低报 2高报
- */
- private String gasSensorState;
- /**
- * --浓度值
- */
- private String gasSampleValue;
- /**
- * --信号与干扰加噪声比
- */
- private String sinr;
- /**
- * --参考信号接收功率
- */
- private String rsrp;
- /**
- * --物理小区标识
- */
- private String pci;
- /**
- * --心跳周期
- */
- private String heartbeatTime;
-
- /**
- * --小区位置信息
- */
- private String cellId;
- /**
- * --电池电压
- */
- private String batteryVoltage;
- /**
- * --电池电量
- */
- private String batteryValue;
- private String iccid;
- private Date uptime;
- private Date logtime;
-}
diff --git a/src/main/java/com/casic/entity/DeviceSatatus.java b/src/main/java/com/casic/entity/DeviceSatatus.java
new file mode 100644
index 0000000..bab7903
--- /dev/null
+++ b/src/main/java/com/casic/entity/DeviceSatatus.java
@@ -0,0 +1,19 @@
+package com.casic.entity;
+
+import lombok.Data;
+
+/**
+ * 不使用了
+ *
+ */
+@Data
+public class DeviceSatatus {
+ private String deviceId;
+ private String cell;
+ private String cellTs;
+ private String onlineState;
+ private String onlineTs;
+ private String lastDataId;
+ private String lastDataJson;
+ private String lastDataTs;
+}
diff --git a/src/main/java/com/casic/model/DataContentParam.java b/src/main/java/com/casic/model/DataContentParam.java
new file mode 100644
index 0000000..46d298a
--- /dev/null
+++ b/src/main/java/com/casic/model/DataContentParam.java
@@ -0,0 +1,19 @@
+package com.casic.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DataContentParam {
+ private String msg_type;
+ private String error_val;
+ private String ch_cnt;
+ private String erro_cnt;
+ private String alarm_low_cnt;
+ private String alarm_high_cnt;
+ private String offline_cnt;
+ private List rtd_val;
+ private List adc_val;
+ private List status_val;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/DataReportParam.java b/src/main/java/com/casic/model/DataReportParam.java
index 082814c..754f330 100644
--- a/src/main/java/com/casic/model/DataReportParam.java
+++ b/src/main/java/com/casic/model/DataReportParam.java
@@ -11,25 +11,12 @@
*/
@Data
public class DataReportParam {
- private String upPacketSN;
- private String upDataSN;
- private String topic;
- private String timestamp;
- private String tenantId;
- private String serviceId;
- private String protocol;
- private String productId;
- /**
- * gas_sensor_state = 1, --事件类型 0 正常 1 低报 2 高报
- * gas_sample_value = 11-- 浓度值
- */
- private Map payload;
- private String messageType;
private String deviceType;
- private String deviceId;
- private String assocAssetId;
- @JsonProperty(value = "IMSI", required = true)
- private String IMSI;
- @JsonProperty(value = "IMEI", required = true)
- private String IMEI;
+ private String iotId;
+ private String requestId;
+ private Object checkFailedData;
+ private String productKey;
+ private String gmtCreate;
+ private String deviceName;
+ private Object items;
}
diff --git a/src/main/java/com/casic/service/DeviceDataService.java b/src/main/java/com/casic/service/DeviceDataService.java
index d883fe4..457d710 100644
--- a/src/main/java/com/casic/service/DeviceDataService.java
+++ b/src/main/java/com/casic/service/DeviceDataService.java
@@ -3,25 +3,18 @@
import com.casic.model.DataReportParam;
import com.casic.model.HeartbeatParam;
import com.casic.model.ResponseData;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* @author cz
* @date 2022
*/
public interface DeviceDataService {
-
/**
*
* @param dataReportParam
* @return
*/
- ResponseData DeviceDataCommit(DataReportParam dataReportParam);
-
- /**
- *
- * @param heartbeatParam
- * @return
- */
- ResponseData heartBeatSave(HeartbeatParam heartbeatParam);
+ ResponseData gasReceiver(DataReportParam dataReportParam);
}
diff --git a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
index 93f0685..e473f0c 100644
--- a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
+++ b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
@@ -1,58 +1,49 @@
package com.casic.service.impl;
-import com.casic.dao.impl.DeviceDataMapper;
+import com.alibaba.druid.util.StringUtils;
+import com.alibaba.fastjson.JSON;
import com.casic.model.*;
import com.casic.service.DeviceDataService;
+import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.stereotype.Service;
+import java.util.Map;
+
/**
* @author cz
- * @date 2022-6-20
+ * @date 2022-9-26
*/
@Slf4j
@Service
public class DeviceDataServiceImpl implements DeviceDataService {
- @Autowired
- DeviceDataMapper deviceDataMapper;
+ private final NormalDataProcessor normalDataProcessor;
- /**
- * @param dataReportParam
- * @return
- */
- public ResponseData DeviceDataCommit(DataReportParam dataReportParam) {
- ResponseData responseData = new ResponseData();
- try {
- deviceDataMapper.addDeviceData(dataReportParam);
- responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
- responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
- } catch (DataAccessException sqlex) {
- responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
- responseData.setMessage("请求数据异常");
- responseData.setSuccess(true);
- log.error("主题:数据上报保存出现错误,异常信息为{}", sqlex);
- }
- return responseData;
+ public DeviceDataServiceImpl(NormalDataProcessor normalDataProcessor) {
+ this.normalDataProcessor = normalDataProcessor;
}
- /**
- * @param heartbeatParam
- * @return
- */
- public ResponseData heartBeatSave(HeartbeatParam heartbeatParam) {
+ public ResponseData gasReceiver(DataReportParam dataReportParam) {
ResponseData responseData = new ResponseData();
try {
- deviceDataMapper.editDeviceData(heartbeatParam);
+ Map> updDataMap = new ObjectMapper().convertValue(dataReportParam.getItems(), Map.class);
+ DataContentParam dataContentParam = JSON.parseObject(updDataMap.get("updData").get("value"), DataContentParam.class);
+ Long uptime = Long.valueOf(String.valueOf(updDataMap.get("updData").get("time")));
+ if (StringUtils.isEmpty(dataReportParam.getDeviceName())) {
+ responseData.setCode(200);
+ responseData.setMessage("没有设备编号");
+ return responseData;
+ }
+ normalDataProcessor.normalDataProvider(dataContentParam, uptime, dataReportParam.getDeviceName());
responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
} catch (DataAccessException sqlex) {
responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
responseData.setMessage("请求数据异常");
responseData.setSuccess(true);
- log.error("主题:数据心跳出现错误,异常信息为{}", sqlex);
+ log.error("主题:设备数据上报出现错误,异常信息为{}", sqlex);
}
return responseData;
}
diff --git a/src/main/java/com/casic/service/impl/NormalDataProcessor.java b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
new file mode 100644
index 0000000..3f7630a
--- /dev/null
+++ b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
@@ -0,0 +1,164 @@
+package com.casic.service.impl;
+
+import com.alibaba.druid.util.StringUtils;
+import com.casic.dao.AlarmRecordsMapper;
+import com.casic.dao.DataGasMapper;
+import com.casic.dao.impl.AlarmJobDao;
+import com.casic.entity.AlarmJob;
+import com.casic.entity.AlarmRecords;
+import com.casic.entity.DataGasDector;
+import com.casic.model.DataContentParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+import xyz.downgoon.snowflake.Snowflake;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class NormalDataProcessor {
+
+ public static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd");
+
+ @Value("${casic.device.gas-dector.type}")
+ private Long deviceType;
+ @Value("${casic.device.gas-dector.minutes}")
+ private String minutes;
+ @Value("${casic.device.gas-dector.enable-local}")
+ private Boolean enableLocal;
+ @Resource
+ private DataGasMapper dataGasMapper;
+ @Autowired
+ private AlarmJobDao alarmJobDao;
+ @Resource
+ private AlarmRecordsMapper alarmRecordsMapper;
+ private static Snowflake snowflake = new Snowflake(0, 2);
+
+ public void normalDataProvider(DataContentParam dataReportParam, Long timeStamp, String devcode) {
+ Map gasMap = dataGasMapper.getWellCode(devcode);
+ if (ObjectUtils.isEmpty(gasMap)) {
+ log.info("没有该设备编号录入" + devcode);
+ if (enableLocal) {
+ return;
+ }
+ }
+ Boolean updateFlag = false;
+ if (ObjectUtils.isEmpty(dataGasMapper.getLastData(minutes, devcode))) {
+ updateFlag = this.saveNormalData(dataReportParam, timeStamp, devcode, gasMap);
+ }
+ this.dataTaskJudge(dataReportParam, devcode, timeStamp, gasMap, updateFlag);
+ return;
+ }
+
+ /**
+ * 自定义时间存库
+ *
+ * @param dataReportParam
+ * @param timeStamp
+ * @param devcode
+ * @param gasMap
+ */
+ private Boolean saveNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap) {
+ Boolean updateFlag = false;
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ List dataReportFilter = dataReportParam.getRtd_val().stream().filter(
+ data -> {
+ return data != -1;
+ }
+ ).collect(Collectors.toList());
+ if (dataReportFilter.size() > 0 && dataReportFilter.get(dataReportFilter.size() - 1) != 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 1);
+ updateFlag = true;
+ } else if (dataReportFilter.get(dataReportFilter.size() - 1) == 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 0);
+ }
+ dataReportFilter.forEach(
+ data -> {
+ if (data != 65535) {
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+ }
+ );
+ return updateFlag;
+ }
+
+ /**
+ * 报警就存库
+ *
+ * @param dataReportParam
+ * @param devcode
+ * @param timeStamp
+ * @param gasMap
+ */
+ private void dataTaskJudge(DataContentParam dataReportParam, String devcode, Long timeStamp, Map gasMap, Boolean updateFlag) {
+ List> alarmLevelList = dataGasMapper.getAlarmLevelList(deviceType);
+ String wellCode = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "";
+ Long deviceId = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? Long.valueOf(String.valueOf(gasMap.get("deviceId"))) : -1;
+ final String gasMsgContent=dataGasMapper.getGasMsgContent(deviceType);
+ dataReportParam.getRtd_val().stream().filter(
+ dataReport -> {
+ return dataReport != -1 && dataReport != 65535;
+ }
+ ).forEach(
+ dataReport -> {
+ for (Map alarmLevelMap : alarmLevelList) {
+ if (dataReport > Float.valueOf(String.valueOf(alarmLevelMap.get("high_value")))) {
+ AlarmRecords alarmRecord = new AlarmRecords();
+ alarmRecord.setId(snowflake.nextId());
+ alarmRecord.setDeviceId(deviceId);
+ alarmRecord.setDevcode(devcode);
+ alarmRecord.setWellCode(wellCode);
+ alarmRecord.setAlarmType("1"); // 业务报警
+ alarmRecord.setAlarmContent("燃气报警");
+ alarmRecord.setAlarmValue(String.valueOf(dataReport));
+ alarmRecord.setAlarmTime(new Date());
+ alarmRecord.setStatus("1");
+ alarmRecord.setAlarmLevel(Integer.valueOf(alarmLevelMap.get("level").toString()));
+ alarmRecord.setAlarmMessage("燃气报警");
+ String jobId = alarmRecordsMapper.isOldAlarmRecord(devcode, "燃气报警");
+ // 超出报警阈值 生成一条报警消息
+ if (!StringUtils.isEmpty(jobId)) {
+ alarmRecordsMapper.updateOldAlarmRecord(devcode, "燃气报警");
+ alarmRecord.setJobId(Long.valueOf(jobId));
+ } else {
+ AlarmJob alarmJob = alarmJobDao.saveData(devcode, wellCode, "RQZD", "1");
+ alarmRecord.setJobId(alarmJob.getId());
+ }
+ alarmRecordsMapper.insert(alarmRecord);
+ if (!updateFlag) {
+ alarmNormalData(dataReportParam, timeStamp, devcode, gasMap, dataReport);
+ }
+ break;
+ }
+ }
+ }
+ );
+ }
+
+ private void alarmNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap, Integer data) {
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+
+}
+
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index fac2afe..f8a06a6 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,40 +1,19 @@
server:
- port: 11556
+ port: 11320
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
- username: root
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell_zq_cs
+ username: postgres
password: Casic203
session:
store-type: redis
- redis:
- host: 111.198.10.15
- port: 11412
- password: ew5T4K3#203lwh
- redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
jms:
pub-sub-domain: true
- # session:
- # store-type: redis
- activemq:
- user:
- password:
- broker-url: tcp://192.168.0.203:61616
-#flowable数据源和多数据源配置
-casic:
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- #kaptcha-open: false #是否开启登录时验证码 (true/false)
- no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
- db:
- init:
- enable: false
- file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
- spring-session-open: false #开启spring session
logging:
level.root: error
- level.com.casic: error
+ level.com.casic: info
file:
path: logs/
name: missiles.log
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..814888c
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,321 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ * 报警工单表
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_job")
+public class AlarmJob extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 工单编号
+ */
+ @TableField("JOBCODE")
+ private String jobcode;
+ /**
+ * 工单类型
+ */
+ @TableField("JOG_TYPE")
+ private String jobType;
+ /**
+ * 井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 工单创建时间
+ */
+ @TableField("CREATE_TIME")
+ private Date createTime;
+ /**
+ * 工单状态（0待处理，1待确认，2处理中，3完成）
+ */
+ @TableField("JOB_STATUS")
+ private String jobStatus;
+ /**
+ * 接单人员
+ */
+ @TableField("GET_JOB_PERSON")
+ private Long getJobPerson;
+ /**
+ * 接单时间
+ */
+ @TableField("GET_JOB_TIME")
+ private Date getJobTime;
+ /**
+ * 应接单时间
+ */
+ @TableField("SHOULD_GET_TIME")
+ private Date shouldGetTime;
+ /**
+ * 第一现场情况
+ */
+ @TableField("FIRST_STATE")
+ private String firstState;
+ /**
+ * 第一现场照片
+ */
+ @TableField("FIRST_STATE_PHOTOS")
+ private String firstStatePhotos;
+ /**
+ * 确认人员
+ */
+ @TableField("CONFIRM_JOB_PERSON")
+ private Long confirmJobPerson;
+ /**
+ * 确认时间
+ */
+ @TableField("CONFRIM_JOB_TIME")
+ private Date confrimJobTime;
+ /**
+ * 处理人员
+ */
+ @TableField("HANDLE_JOB_Person")
+ private Long handleJobPerson;
+ /**
+ * 处理时间
+ */
+ @TableField("HANDLE_JOB_TIME")
+ private Date handleJobTime;
+ /**
+ * 维护情况记录
+ */
+ @TableField("HANDLE_MESSAGE")
+ private String handleMessage;
+ /**
+ * 维护图片
+ */
+ @TableField("HANDLE_PHOTOS")
+ private String handlePhotos;
+ /**
+ * 工单流转记录
+ */
+ @TableField("FLOW")
+ private String flow;
+
+ @TableField("JOB_BELONG_TO")
+ private Long jobBelongTo;
+
+ @TableField("JOB_FLAG_DELAY")
+ private String jobFlagDelay;
+
+ @TableField("JOB_FLAG_1")
+ private String jobFlag1;
+
+ @TableField(exist = false)
+ private String alarmValue;
+
+ @TableField(exist = false)
+ private String alarmContentName;
+
+ @TableField(exist = false)
+ private Integer recordId;
+
+ @Override
+ public String toString() {
+ return "AlarmJob{" +
+ "id=" + id +
+ ", jobcode=" + jobcode +
+ ", jogType=" + jobType +
+ ", wellCode=" + wellCode +
+ ", devcode=" + devcode +
+ ", createTime=" + createTime +
+ ", jobStatus=" + jobStatus +
+ ", getJobPerson=" + getJobPerson +
+ ", getJobTime=" + getJobTime +
+ ", firstState=" + firstState +
+ ", firstStatePhotos=" + firstStatePhotos +
+ ", confirmJobPerson=" + confirmJobPerson +
+ ", confrimJobTime=" + confrimJobTime +
+ ", handleJobPerson=" + handleJobPerson +
+ ", handleJobTime=" + handleJobTime +
+ ", handleMessage=" + handleMessage +
+ ", handlePhotos=" + handlePhotos +
+ ", flow=" + flow +
+ ", recordId=" + recordId +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/AlarmRecords.java b/src/main/java/com/casic/entity/AlarmRecords.java
new file mode 100644
index 0000000..88b0b26
--- /dev/null
+++ b/src/main/java/com/casic/entity/AlarmRecords.java
@@ -0,0 +1,108 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_records")
+public class AlarmRecords extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 设备ID
+ */
+ @TableField("DEVICE_ID")
+ private Long deviceId;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 闸井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 告警类型
+ */
+ @TableField("ALARM_TYPE")
+ private String alarmType;
+ /**
+ * 告警内容
+ */
+ @TableField("ALARM_CONTENT")
+ private String alarmContent;
+ /**
+ * 告警数值
+ */
+ @TableField("ALARM_VALUE")
+ private String alarmValue;
+ /**
+ * 告警等级
+ */
+ @TableField("ALARM_LEVEL")
+ private Integer alarmLevel;
+ /**
+ * 告警详情
+ */
+ @TableField("ALARM_MSG")
+ private String alarmMessage;
+ /**
+ * 告警时间
+ */
+ @TableField("ALARM_TIME")
+ private Date alarmTime;
+ /**
+ * 告警状态
+ */
+ @TableField("STATUS")
+ private String status;
+ /**
+ * 工单编号
+ */
+ @TableField("JOB_ID")
+ private Long jobId;
+
+ @TableField(exist = false)
+ private Integer jobStatus;
+
+ @Override
+ public String toString() {
+ return "AlarmRecords{" +
+ "id=" + id +
+ ", deviceId=" + deviceId +
+ ", devcode=" + devcode +
+ ", wellCode=" + wellCode +
+ ", alarmType=" + alarmType +
+ ", alarmContent=" + alarmContent +
+ ", alarmValue=" + alarmValue +
+ ", alarmLevel=" + alarmLevel +
+ ", alarmMessage=" + alarmMessage +
+ ", alarmTime=" + alarmTime +
+ ", status=" + status +
+ ", jobId=" + jobId +
+ ", jobStatus=" + jobStatus +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/DataGasDector.java b/src/main/java/com/casic/entity/DataGasDector.java
new file mode 100644
index 0000000..537789a
--- /dev/null
+++ b/src/main/java/com/casic/entity/DataGasDector.java
@@ -0,0 +1,42 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author cz
+ * @date 2022-7-1
+ */
+@Data
+@TableName("data_gas_dector")
+public class DataGasDector {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ private String devcode;
+ private String wellCode;
+ private String strength;
+
+ private String descn;
+ /**
+ * --信号与干扰加噪声比
+ */
+ private String sinr;
+ /**
+ * --参考信号接收功率
+ */
+ private String rsrp;
+ /**
+ * --物理小区标识
+ */
+ private String pci;
+ private Date uptime;
+ private Date logtime;
+}
diff --git a/src/main/java/com/casic/entity/DataGasReport.java b/src/main/java/com/casic/entity/DataGasReport.java
deleted file mode 100644
index c43ccdf..0000000
--- a/src/main/java/com/casic/entity/DataGasReport.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.casic.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author cz
- * @date 2022-7-1
- */
-@Data
-@TableName("data_gas_dector")
-public class DataGasReport {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @TableField("devcode")
- private String imei;
- private String wellcode;
-
- private String imsi;
- /**
- * --事件类型 0正常 1低报 2高报
- */
- private String gasSensorState;
- /**
- * --浓度值
- */
- private String gasSampleValue;
- /**
- * --信号与干扰加噪声比
- */
- private String sinr;
- /**
- * --参考信号接收功率
- */
- private String rsrp;
- /**
- * --物理小区标识
- */
- private String pci;
- /**
- * --心跳周期
- */
- private String heartbeatTime;
-
- /**
- * --小区位置信息
- */
- private String cellId;
- /**
- * --电池电压
- */
- private String batteryVoltage;
- /**
- * --电池电量
- */
- private String batteryValue;
- private String iccid;
- private Date uptime;
- private Date logtime;
-}
diff --git a/src/main/java/com/casic/entity/DeviceSatatus.java b/src/main/java/com/casic/entity/DeviceSatatus.java
new file mode 100644
index 0000000..bab7903
--- /dev/null
+++ b/src/main/java/com/casic/entity/DeviceSatatus.java
@@ -0,0 +1,19 @@
+package com.casic.entity;
+
+import lombok.Data;
+
+/**
+ * 不使用了
+ *
+ */
+@Data
+public class DeviceSatatus {
+ private String deviceId;
+ private String cell;
+ private String cellTs;
+ private String onlineState;
+ private String onlineTs;
+ private String lastDataId;
+ private String lastDataJson;
+ private String lastDataTs;
+}
diff --git a/src/main/java/com/casic/model/DataContentParam.java b/src/main/java/com/casic/model/DataContentParam.java
new file mode 100644
index 0000000..46d298a
--- /dev/null
+++ b/src/main/java/com/casic/model/DataContentParam.java
@@ -0,0 +1,19 @@
+package com.casic.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DataContentParam {
+ private String msg_type;
+ private String error_val;
+ private String ch_cnt;
+ private String erro_cnt;
+ private String alarm_low_cnt;
+ private String alarm_high_cnt;
+ private String offline_cnt;
+ private List rtd_val;
+ private List adc_val;
+ private List status_val;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/DataReportParam.java b/src/main/java/com/casic/model/DataReportParam.java
index 082814c..754f330 100644
--- a/src/main/java/com/casic/model/DataReportParam.java
+++ b/src/main/java/com/casic/model/DataReportParam.java
@@ -11,25 +11,12 @@
*/
@Data
public class DataReportParam {
- private String upPacketSN;
- private String upDataSN;
- private String topic;
- private String timestamp;
- private String tenantId;
- private String serviceId;
- private String protocol;
- private String productId;
- /**
- * gas_sensor_state = 1, --事件类型 0 正常 1 低报 2 高报
- * gas_sample_value = 11-- 浓度值
- */
- private Map payload;
- private String messageType;
private String deviceType;
- private String deviceId;
- private String assocAssetId;
- @JsonProperty(value = "IMSI", required = true)
- private String IMSI;
- @JsonProperty(value = "IMEI", required = true)
- private String IMEI;
+ private String iotId;
+ private String requestId;
+ private Object checkFailedData;
+ private String productKey;
+ private String gmtCreate;
+ private String deviceName;
+ private Object items;
}
diff --git a/src/main/java/com/casic/service/DeviceDataService.java b/src/main/java/com/casic/service/DeviceDataService.java
index d883fe4..457d710 100644
--- a/src/main/java/com/casic/service/DeviceDataService.java
+++ b/src/main/java/com/casic/service/DeviceDataService.java
@@ -3,25 +3,18 @@
import com.casic.model.DataReportParam;
import com.casic.model.HeartbeatParam;
import com.casic.model.ResponseData;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* @author cz
* @date 2022
*/
public interface DeviceDataService {
-
/**
*
* @param dataReportParam
* @return
*/
- ResponseData DeviceDataCommit(DataReportParam dataReportParam);
-
- /**
- *
- * @param heartbeatParam
- * @return
- */
- ResponseData heartBeatSave(HeartbeatParam heartbeatParam);
+ ResponseData gasReceiver(DataReportParam dataReportParam);
}
diff --git a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
index 93f0685..e473f0c 100644
--- a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
+++ b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
@@ -1,58 +1,49 @@
package com.casic.service.impl;
-import com.casic.dao.impl.DeviceDataMapper;
+import com.alibaba.druid.util.StringUtils;
+import com.alibaba.fastjson.JSON;
import com.casic.model.*;
import com.casic.service.DeviceDataService;
+import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.stereotype.Service;
+import java.util.Map;
+
/**
* @author cz
- * @date 2022-6-20
+ * @date 2022-9-26
*/
@Slf4j
@Service
public class DeviceDataServiceImpl implements DeviceDataService {
- @Autowired
- DeviceDataMapper deviceDataMapper;
+ private final NormalDataProcessor normalDataProcessor;
- /**
- * @param dataReportParam
- * @return
- */
- public ResponseData DeviceDataCommit(DataReportParam dataReportParam) {
- ResponseData responseData = new ResponseData();
- try {
- deviceDataMapper.addDeviceData(dataReportParam);
- responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
- responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
- } catch (DataAccessException sqlex) {
- responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
- responseData.setMessage("请求数据异常");
- responseData.setSuccess(true);
- log.error("主题:数据上报保存出现错误,异常信息为{}", sqlex);
- }
- return responseData;
+ public DeviceDataServiceImpl(NormalDataProcessor normalDataProcessor) {
+ this.normalDataProcessor = normalDataProcessor;
}
- /**
- * @param heartbeatParam
- * @return
- */
- public ResponseData heartBeatSave(HeartbeatParam heartbeatParam) {
+ public ResponseData gasReceiver(DataReportParam dataReportParam) {
ResponseData responseData = new ResponseData();
try {
- deviceDataMapper.editDeviceData(heartbeatParam);
+ Map> updDataMap = new ObjectMapper().convertValue(dataReportParam.getItems(), Map.class);
+ DataContentParam dataContentParam = JSON.parseObject(updDataMap.get("updData").get("value"), DataContentParam.class);
+ Long uptime = Long.valueOf(String.valueOf(updDataMap.get("updData").get("time")));
+ if (StringUtils.isEmpty(dataReportParam.getDeviceName())) {
+ responseData.setCode(200);
+ responseData.setMessage("没有设备编号");
+ return responseData;
+ }
+ normalDataProcessor.normalDataProvider(dataContentParam, uptime, dataReportParam.getDeviceName());
responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
} catch (DataAccessException sqlex) {
responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
responseData.setMessage("请求数据异常");
responseData.setSuccess(true);
- log.error("主题:数据心跳出现错误,异常信息为{}", sqlex);
+ log.error("主题:设备数据上报出现错误,异常信息为{}", sqlex);
}
return responseData;
}
diff --git a/src/main/java/com/casic/service/impl/NormalDataProcessor.java b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
new file mode 100644
index 0000000..3f7630a
--- /dev/null
+++ b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
@@ -0,0 +1,164 @@
+package com.casic.service.impl;
+
+import com.alibaba.druid.util.StringUtils;
+import com.casic.dao.AlarmRecordsMapper;
+import com.casic.dao.DataGasMapper;
+import com.casic.dao.impl.AlarmJobDao;
+import com.casic.entity.AlarmJob;
+import com.casic.entity.AlarmRecords;
+import com.casic.entity.DataGasDector;
+import com.casic.model.DataContentParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+import xyz.downgoon.snowflake.Snowflake;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class NormalDataProcessor {
+
+ public static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd");
+
+ @Value("${casic.device.gas-dector.type}")
+ private Long deviceType;
+ @Value("${casic.device.gas-dector.minutes}")
+ private String minutes;
+ @Value("${casic.device.gas-dector.enable-local}")
+ private Boolean enableLocal;
+ @Resource
+ private DataGasMapper dataGasMapper;
+ @Autowired
+ private AlarmJobDao alarmJobDao;
+ @Resource
+ private AlarmRecordsMapper alarmRecordsMapper;
+ private static Snowflake snowflake = new Snowflake(0, 2);
+
+ public void normalDataProvider(DataContentParam dataReportParam, Long timeStamp, String devcode) {
+ Map gasMap = dataGasMapper.getWellCode(devcode);
+ if (ObjectUtils.isEmpty(gasMap)) {
+ log.info("没有该设备编号录入" + devcode);
+ if (enableLocal) {
+ return;
+ }
+ }
+ Boolean updateFlag = false;
+ if (ObjectUtils.isEmpty(dataGasMapper.getLastData(minutes, devcode))) {
+ updateFlag = this.saveNormalData(dataReportParam, timeStamp, devcode, gasMap);
+ }
+ this.dataTaskJudge(dataReportParam, devcode, timeStamp, gasMap, updateFlag);
+ return;
+ }
+
+ /**
+ * 自定义时间存库
+ *
+ * @param dataReportParam
+ * @param timeStamp
+ * @param devcode
+ * @param gasMap
+ */
+ private Boolean saveNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap) {
+ Boolean updateFlag = false;
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ List dataReportFilter = dataReportParam.getRtd_val().stream().filter(
+ data -> {
+ return data != -1;
+ }
+ ).collect(Collectors.toList());
+ if (dataReportFilter.size() > 0 && dataReportFilter.get(dataReportFilter.size() - 1) != 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 1);
+ updateFlag = true;
+ } else if (dataReportFilter.get(dataReportFilter.size() - 1) == 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 0);
+ }
+ dataReportFilter.forEach(
+ data -> {
+ if (data != 65535) {
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+ }
+ );
+ return updateFlag;
+ }
+
+ /**
+ * 报警就存库
+ *
+ * @param dataReportParam
+ * @param devcode
+ * @param timeStamp
+ * @param gasMap
+ */
+ private void dataTaskJudge(DataContentParam dataReportParam, String devcode, Long timeStamp, Map gasMap, Boolean updateFlag) {
+ List> alarmLevelList = dataGasMapper.getAlarmLevelList(deviceType);
+ String wellCode = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "";
+ Long deviceId = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? Long.valueOf(String.valueOf(gasMap.get("deviceId"))) : -1;
+ final String gasMsgContent=dataGasMapper.getGasMsgContent(deviceType);
+ dataReportParam.getRtd_val().stream().filter(
+ dataReport -> {
+ return dataReport != -1 && dataReport != 65535;
+ }
+ ).forEach(
+ dataReport -> {
+ for (Map alarmLevelMap : alarmLevelList) {
+ if (dataReport > Float.valueOf(String.valueOf(alarmLevelMap.get("high_value")))) {
+ AlarmRecords alarmRecord = new AlarmRecords();
+ alarmRecord.setId(snowflake.nextId());
+ alarmRecord.setDeviceId(deviceId);
+ alarmRecord.setDevcode(devcode);
+ alarmRecord.setWellCode(wellCode);
+ alarmRecord.setAlarmType("1"); // 业务报警
+ alarmRecord.setAlarmContent("燃气报警");
+ alarmRecord.setAlarmValue(String.valueOf(dataReport));
+ alarmRecord.setAlarmTime(new Date());
+ alarmRecord.setStatus("1");
+ alarmRecord.setAlarmLevel(Integer.valueOf(alarmLevelMap.get("level").toString()));
+ alarmRecord.setAlarmMessage("燃气报警");
+ String jobId = alarmRecordsMapper.isOldAlarmRecord(devcode, "燃气报警");
+ // 超出报警阈值 生成一条报警消息
+ if (!StringUtils.isEmpty(jobId)) {
+ alarmRecordsMapper.updateOldAlarmRecord(devcode, "燃气报警");
+ alarmRecord.setJobId(Long.valueOf(jobId));
+ } else {
+ AlarmJob alarmJob = alarmJobDao.saveData(devcode, wellCode, "RQZD", "1");
+ alarmRecord.setJobId(alarmJob.getId());
+ }
+ alarmRecordsMapper.insert(alarmRecord);
+ if (!updateFlag) {
+ alarmNormalData(dataReportParam, timeStamp, devcode, gasMap, dataReport);
+ }
+ break;
+ }
+ }
+ }
+ );
+ }
+
+ private void alarmNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap, Integer data) {
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+
+}
+
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index fac2afe..f8a06a6 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,40 +1,19 @@
server:
- port: 11556
+ port: 11320
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
- username: root
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell_zq_cs
+ username: postgres
password: Casic203
session:
store-type: redis
- redis:
- host: 111.198.10.15
- port: 11412
- password: ew5T4K3#203lwh
- redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
jms:
pub-sub-domain: true
- # session:
- # store-type: redis
- activemq:
- user:
- password:
- broker-url: tcp://192.168.0.203:61616
-#flowable数据源和多数据源配置
-casic:
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- #kaptcha-open: false #是否开启登录时验证码 (true/false)
- no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
- db:
- init:
- enable: false
- file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
- spring-session-open: false #开启spring session
logging:
level.root: error
- level.com.casic: error
+ level.com.casic: info
file:
path: logs/
name: missiles.log
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 86411e6..ffc01e9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -19,18 +19,11 @@
mapper-locations: classpath:mapper/*.xml
#mybatis-plus:
# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
-################### mybatis-plus配置 ###################
-################### casic配置 ###################
-flowable:
- checkProcessDefinitions: false #不校验process文件
casic:
- swagger-open: false #是否开启swagger (true/false)
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- muti-datasource-open: false #是否开启多数据源(true/false)
- spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
- session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
- session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
- extUrl: sys
- config:
- export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
- config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
+ device:
+ gas-dector:
+ type: 101
+ minutes: 60
+ enable-local: false
+# type 可燃气体的设备类型
+# minutes: 燃气外协设备上传数据的分钟数
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..814888c
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,321 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ * 报警工单表
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_job")
+public class AlarmJob extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 工单编号
+ */
+ @TableField("JOBCODE")
+ private String jobcode;
+ /**
+ * 工单类型
+ */
+ @TableField("JOG_TYPE")
+ private String jobType;
+ /**
+ * 井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 工单创建时间
+ */
+ @TableField("CREATE_TIME")
+ private Date createTime;
+ /**
+ * 工单状态（0待处理，1待确认，2处理中，3完成）
+ */
+ @TableField("JOB_STATUS")
+ private String jobStatus;
+ /**
+ * 接单人员
+ */
+ @TableField("GET_JOB_PERSON")
+ private Long getJobPerson;
+ /**
+ * 接单时间
+ */
+ @TableField("GET_JOB_TIME")
+ private Date getJobTime;
+ /**
+ * 应接单时间
+ */
+ @TableField("SHOULD_GET_TIME")
+ private Date shouldGetTime;
+ /**
+ * 第一现场情况
+ */
+ @TableField("FIRST_STATE")
+ private String firstState;
+ /**
+ * 第一现场照片
+ */
+ @TableField("FIRST_STATE_PHOTOS")
+ private String firstStatePhotos;
+ /**
+ * 确认人员
+ */
+ @TableField("CONFIRM_JOB_PERSON")
+ private Long confirmJobPerson;
+ /**
+ * 确认时间
+ */
+ @TableField("CONFRIM_JOB_TIME")
+ private Date confrimJobTime;
+ /**
+ * 处理人员
+ */
+ @TableField("HANDLE_JOB_Person")
+ private Long handleJobPerson;
+ /**
+ * 处理时间
+ */
+ @TableField("HANDLE_JOB_TIME")
+ private Date handleJobTime;
+ /**
+ * 维护情况记录
+ */
+ @TableField("HANDLE_MESSAGE")
+ private String handleMessage;
+ /**
+ * 维护图片
+ */
+ @TableField("HANDLE_PHOTOS")
+ private String handlePhotos;
+ /**
+ * 工单流转记录
+ */
+ @TableField("FLOW")
+ private String flow;
+
+ @TableField("JOB_BELONG_TO")
+ private Long jobBelongTo;
+
+ @TableField("JOB_FLAG_DELAY")
+ private String jobFlagDelay;
+
+ @TableField("JOB_FLAG_1")
+ private String jobFlag1;
+
+ @TableField(exist = false)
+ private String alarmValue;
+
+ @TableField(exist = false)
+ private String alarmContentName;
+
+ @TableField(exist = false)
+ private Integer recordId;
+
+ @Override
+ public String toString() {
+ return "AlarmJob{" +
+ "id=" + id +
+ ", jobcode=" + jobcode +
+ ", jogType=" + jobType +
+ ", wellCode=" + wellCode +
+ ", devcode=" + devcode +
+ ", createTime=" + createTime +
+ ", jobStatus=" + jobStatus +
+ ", getJobPerson=" + getJobPerson +
+ ", getJobTime=" + getJobTime +
+ ", firstState=" + firstState +
+ ", firstStatePhotos=" + firstStatePhotos +
+ ", confirmJobPerson=" + confirmJobPerson +
+ ", confrimJobTime=" + confrimJobTime +
+ ", handleJobPerson=" + handleJobPerson +
+ ", handleJobTime=" + handleJobTime +
+ ", handleMessage=" + handleMessage +
+ ", handlePhotos=" + handlePhotos +
+ ", flow=" + flow +
+ ", recordId=" + recordId +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/AlarmRecords.java b/src/main/java/com/casic/entity/AlarmRecords.java
new file mode 100644
index 0000000..88b0b26
--- /dev/null
+++ b/src/main/java/com/casic/entity/AlarmRecords.java
@@ -0,0 +1,108 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_records")
+public class AlarmRecords extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 设备ID
+ */
+ @TableField("DEVICE_ID")
+ private Long deviceId;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 闸井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 告警类型
+ */
+ @TableField("ALARM_TYPE")
+ private String alarmType;
+ /**
+ * 告警内容
+ */
+ @TableField("ALARM_CONTENT")
+ private String alarmContent;
+ /**
+ * 告警数值
+ */
+ @TableField("ALARM_VALUE")
+ private String alarmValue;
+ /**
+ * 告警等级
+ */
+ @TableField("ALARM_LEVEL")
+ private Integer alarmLevel;
+ /**
+ * 告警详情
+ */
+ @TableField("ALARM_MSG")
+ private String alarmMessage;
+ /**
+ * 告警时间
+ */
+ @TableField("ALARM_TIME")
+ private Date alarmTime;
+ /**
+ * 告警状态
+ */
+ @TableField("STATUS")
+ private String status;
+ /**
+ * 工单编号
+ */
+ @TableField("JOB_ID")
+ private Long jobId;
+
+ @TableField(exist = false)
+ private Integer jobStatus;
+
+ @Override
+ public String toString() {
+ return "AlarmRecords{" +
+ "id=" + id +
+ ", deviceId=" + deviceId +
+ ", devcode=" + devcode +
+ ", wellCode=" + wellCode +
+ ", alarmType=" + alarmType +
+ ", alarmContent=" + alarmContent +
+ ", alarmValue=" + alarmValue +
+ ", alarmLevel=" + alarmLevel +
+ ", alarmMessage=" + alarmMessage +
+ ", alarmTime=" + alarmTime +
+ ", status=" + status +
+ ", jobId=" + jobId +
+ ", jobStatus=" + jobStatus +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/DataGasDector.java b/src/main/java/com/casic/entity/DataGasDector.java
new file mode 100644
index 0000000..537789a
--- /dev/null
+++ b/src/main/java/com/casic/entity/DataGasDector.java
@@ -0,0 +1,42 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author cz
+ * @date 2022-7-1
+ */
+@Data
+@TableName("data_gas_dector")
+public class DataGasDector {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ private String devcode;
+ private String wellCode;
+ private String strength;
+
+ private String descn;
+ /**
+ * --信号与干扰加噪声比
+ */
+ private String sinr;
+ /**
+ * --参考信号接收功率
+ */
+ private String rsrp;
+ /**
+ * --物理小区标识
+ */
+ private String pci;
+ private Date uptime;
+ private Date logtime;
+}
diff --git a/src/main/java/com/casic/entity/DataGasReport.java b/src/main/java/com/casic/entity/DataGasReport.java
deleted file mode 100644
index c43ccdf..0000000
--- a/src/main/java/com/casic/entity/DataGasReport.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.casic.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author cz
- * @date 2022-7-1
- */
-@Data
-@TableName("data_gas_dector")
-public class DataGasReport {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @TableField("devcode")
- private String imei;
- private String wellcode;
-
- private String imsi;
- /**
- * --事件类型 0正常 1低报 2高报
- */
- private String gasSensorState;
- /**
- * --浓度值
- */
- private String gasSampleValue;
- /**
- * --信号与干扰加噪声比
- */
- private String sinr;
- /**
- * --参考信号接收功率
- */
- private String rsrp;
- /**
- * --物理小区标识
- */
- private String pci;
- /**
- * --心跳周期
- */
- private String heartbeatTime;
-
- /**
- * --小区位置信息
- */
- private String cellId;
- /**
- * --电池电压
- */
- private String batteryVoltage;
- /**
- * --电池电量
- */
- private String batteryValue;
- private String iccid;
- private Date uptime;
- private Date logtime;
-}
diff --git a/src/main/java/com/casic/entity/DeviceSatatus.java b/src/main/java/com/casic/entity/DeviceSatatus.java
new file mode 100644
index 0000000..bab7903
--- /dev/null
+++ b/src/main/java/com/casic/entity/DeviceSatatus.java
@@ -0,0 +1,19 @@
+package com.casic.entity;
+
+import lombok.Data;
+
+/**
+ * 不使用了
+ *
+ */
+@Data
+public class DeviceSatatus {
+ private String deviceId;
+ private String cell;
+ private String cellTs;
+ private String onlineState;
+ private String onlineTs;
+ private String lastDataId;
+ private String lastDataJson;
+ private String lastDataTs;
+}
diff --git a/src/main/java/com/casic/model/DataContentParam.java b/src/main/java/com/casic/model/DataContentParam.java
new file mode 100644
index 0000000..46d298a
--- /dev/null
+++ b/src/main/java/com/casic/model/DataContentParam.java
@@ -0,0 +1,19 @@
+package com.casic.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DataContentParam {
+ private String msg_type;
+ private String error_val;
+ private String ch_cnt;
+ private String erro_cnt;
+ private String alarm_low_cnt;
+ private String alarm_high_cnt;
+ private String offline_cnt;
+ private List rtd_val;
+ private List adc_val;
+ private List status_val;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/DataReportParam.java b/src/main/java/com/casic/model/DataReportParam.java
index 082814c..754f330 100644
--- a/src/main/java/com/casic/model/DataReportParam.java
+++ b/src/main/java/com/casic/model/DataReportParam.java
@@ -11,25 +11,12 @@
*/
@Data
public class DataReportParam {
- private String upPacketSN;
- private String upDataSN;
- private String topic;
- private String timestamp;
- private String tenantId;
- private String serviceId;
- private String protocol;
- private String productId;
- /**
- * gas_sensor_state = 1, --事件类型 0 正常 1 低报 2 高报
- * gas_sample_value = 11-- 浓度值
- */
- private Map payload;
- private String messageType;
private String deviceType;
- private String deviceId;
- private String assocAssetId;
- @JsonProperty(value = "IMSI", required = true)
- private String IMSI;
- @JsonProperty(value = "IMEI", required = true)
- private String IMEI;
+ private String iotId;
+ private String requestId;
+ private Object checkFailedData;
+ private String productKey;
+ private String gmtCreate;
+ private String deviceName;
+ private Object items;
}
diff --git a/src/main/java/com/casic/service/DeviceDataService.java b/src/main/java/com/casic/service/DeviceDataService.java
index d883fe4..457d710 100644
--- a/src/main/java/com/casic/service/DeviceDataService.java
+++ b/src/main/java/com/casic/service/DeviceDataService.java
@@ -3,25 +3,18 @@
import com.casic.model.DataReportParam;
import com.casic.model.HeartbeatParam;
import com.casic.model.ResponseData;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* @author cz
* @date 2022
*/
public interface DeviceDataService {
-
/**
*
* @param dataReportParam
* @return
*/
- ResponseData DeviceDataCommit(DataReportParam dataReportParam);
-
- /**
- *
- * @param heartbeatParam
- * @return
- */
- ResponseData heartBeatSave(HeartbeatParam heartbeatParam);
+ ResponseData gasReceiver(DataReportParam dataReportParam);
}
diff --git a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
index 93f0685..e473f0c 100644
--- a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
+++ b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
@@ -1,58 +1,49 @@
package com.casic.service.impl;
-import com.casic.dao.impl.DeviceDataMapper;
+import com.alibaba.druid.util.StringUtils;
+import com.alibaba.fastjson.JSON;
import com.casic.model.*;
import com.casic.service.DeviceDataService;
+import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.stereotype.Service;
+import java.util.Map;
+
/**
* @author cz
- * @date 2022-6-20
+ * @date 2022-9-26
*/
@Slf4j
@Service
public class DeviceDataServiceImpl implements DeviceDataService {
- @Autowired
- DeviceDataMapper deviceDataMapper;
+ private final NormalDataProcessor normalDataProcessor;
- /**
- * @param dataReportParam
- * @return
- */
- public ResponseData DeviceDataCommit(DataReportParam dataReportParam) {
- ResponseData responseData = new ResponseData();
- try {
- deviceDataMapper.addDeviceData(dataReportParam);
- responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
- responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
- } catch (DataAccessException sqlex) {
- responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
- responseData.setMessage("请求数据异常");
- responseData.setSuccess(true);
- log.error("主题:数据上报保存出现错误,异常信息为{}", sqlex);
- }
- return responseData;
+ public DeviceDataServiceImpl(NormalDataProcessor normalDataProcessor) {
+ this.normalDataProcessor = normalDataProcessor;
}
- /**
- * @param heartbeatParam
- * @return
- */
- public ResponseData heartBeatSave(HeartbeatParam heartbeatParam) {
+ public ResponseData gasReceiver(DataReportParam dataReportParam) {
ResponseData responseData = new ResponseData();
try {
- deviceDataMapper.editDeviceData(heartbeatParam);
+ Map> updDataMap = new ObjectMapper().convertValue(dataReportParam.getItems(), Map.class);
+ DataContentParam dataContentParam = JSON.parseObject(updDataMap.get("updData").get("value"), DataContentParam.class);
+ Long uptime = Long.valueOf(String.valueOf(updDataMap.get("updData").get("time")));
+ if (StringUtils.isEmpty(dataReportParam.getDeviceName())) {
+ responseData.setCode(200);
+ responseData.setMessage("没有设备编号");
+ return responseData;
+ }
+ normalDataProcessor.normalDataProvider(dataContentParam, uptime, dataReportParam.getDeviceName());
responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
} catch (DataAccessException sqlex) {
responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
responseData.setMessage("请求数据异常");
responseData.setSuccess(true);
- log.error("主题:数据心跳出现错误,异常信息为{}", sqlex);
+ log.error("主题:设备数据上报出现错误,异常信息为{}", sqlex);
}
return responseData;
}
diff --git a/src/main/java/com/casic/service/impl/NormalDataProcessor.java b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
new file mode 100644
index 0000000..3f7630a
--- /dev/null
+++ b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
@@ -0,0 +1,164 @@
+package com.casic.service.impl;
+
+import com.alibaba.druid.util.StringUtils;
+import com.casic.dao.AlarmRecordsMapper;
+import com.casic.dao.DataGasMapper;
+import com.casic.dao.impl.AlarmJobDao;
+import com.casic.entity.AlarmJob;
+import com.casic.entity.AlarmRecords;
+import com.casic.entity.DataGasDector;
+import com.casic.model.DataContentParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+import xyz.downgoon.snowflake.Snowflake;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class NormalDataProcessor {
+
+ public static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd");
+
+ @Value("${casic.device.gas-dector.type}")
+ private Long deviceType;
+ @Value("${casic.device.gas-dector.minutes}")
+ private String minutes;
+ @Value("${casic.device.gas-dector.enable-local}")
+ private Boolean enableLocal;
+ @Resource
+ private DataGasMapper dataGasMapper;
+ @Autowired
+ private AlarmJobDao alarmJobDao;
+ @Resource
+ private AlarmRecordsMapper alarmRecordsMapper;
+ private static Snowflake snowflake = new Snowflake(0, 2);
+
+ public void normalDataProvider(DataContentParam dataReportParam, Long timeStamp, String devcode) {
+ Map gasMap = dataGasMapper.getWellCode(devcode);
+ if (ObjectUtils.isEmpty(gasMap)) {
+ log.info("没有该设备编号录入" + devcode);
+ if (enableLocal) {
+ return;
+ }
+ }
+ Boolean updateFlag = false;
+ if (ObjectUtils.isEmpty(dataGasMapper.getLastData(minutes, devcode))) {
+ updateFlag = this.saveNormalData(dataReportParam, timeStamp, devcode, gasMap);
+ }
+ this.dataTaskJudge(dataReportParam, devcode, timeStamp, gasMap, updateFlag);
+ return;
+ }
+
+ /**
+ * 自定义时间存库
+ *
+ * @param dataReportParam
+ * @param timeStamp
+ * @param devcode
+ * @param gasMap
+ */
+ private Boolean saveNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap) {
+ Boolean updateFlag = false;
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ List dataReportFilter = dataReportParam.getRtd_val().stream().filter(
+ data -> {
+ return data != -1;
+ }
+ ).collect(Collectors.toList());
+ if (dataReportFilter.size() > 0 && dataReportFilter.get(dataReportFilter.size() - 1) != 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 1);
+ updateFlag = true;
+ } else if (dataReportFilter.get(dataReportFilter.size() - 1) == 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 0);
+ }
+ dataReportFilter.forEach(
+ data -> {
+ if (data != 65535) {
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+ }
+ );
+ return updateFlag;
+ }
+
+ /**
+ * 报警就存库
+ *
+ * @param dataReportParam
+ * @param devcode
+ * @param timeStamp
+ * @param gasMap
+ */
+ private void dataTaskJudge(DataContentParam dataReportParam, String devcode, Long timeStamp, Map gasMap, Boolean updateFlag) {
+ List> alarmLevelList = dataGasMapper.getAlarmLevelList(deviceType);
+ String wellCode = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "";
+ Long deviceId = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? Long.valueOf(String.valueOf(gasMap.get("deviceId"))) : -1;
+ final String gasMsgContent=dataGasMapper.getGasMsgContent(deviceType);
+ dataReportParam.getRtd_val().stream().filter(
+ dataReport -> {
+ return dataReport != -1 && dataReport != 65535;
+ }
+ ).forEach(
+ dataReport -> {
+ for (Map alarmLevelMap : alarmLevelList) {
+ if (dataReport > Float.valueOf(String.valueOf(alarmLevelMap.get("high_value")))) {
+ AlarmRecords alarmRecord = new AlarmRecords();
+ alarmRecord.setId(snowflake.nextId());
+ alarmRecord.setDeviceId(deviceId);
+ alarmRecord.setDevcode(devcode);
+ alarmRecord.setWellCode(wellCode);
+ alarmRecord.setAlarmType("1"); // 业务报警
+ alarmRecord.setAlarmContent("燃气报警");
+ alarmRecord.setAlarmValue(String.valueOf(dataReport));
+ alarmRecord.setAlarmTime(new Date());
+ alarmRecord.setStatus("1");
+ alarmRecord.setAlarmLevel(Integer.valueOf(alarmLevelMap.get("level").toString()));
+ alarmRecord.setAlarmMessage("燃气报警");
+ String jobId = alarmRecordsMapper.isOldAlarmRecord(devcode, "燃气报警");
+ // 超出报警阈值 生成一条报警消息
+ if (!StringUtils.isEmpty(jobId)) {
+ alarmRecordsMapper.updateOldAlarmRecord(devcode, "燃气报警");
+ alarmRecord.setJobId(Long.valueOf(jobId));
+ } else {
+ AlarmJob alarmJob = alarmJobDao.saveData(devcode, wellCode, "RQZD", "1");
+ alarmRecord.setJobId(alarmJob.getId());
+ }
+ alarmRecordsMapper.insert(alarmRecord);
+ if (!updateFlag) {
+ alarmNormalData(dataReportParam, timeStamp, devcode, gasMap, dataReport);
+ }
+ break;
+ }
+ }
+ }
+ );
+ }
+
+ private void alarmNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap, Integer data) {
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+
+}
+
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index fac2afe..f8a06a6 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,40 +1,19 @@
server:
- port: 11556
+ port: 11320
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
- username: root
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell_zq_cs
+ username: postgres
password: Casic203
session:
store-type: redis
- redis:
- host: 111.198.10.15
- port: 11412
- password: ew5T4K3#203lwh
- redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
jms:
pub-sub-domain: true
- # session:
- # store-type: redis
- activemq:
- user:
- password:
- broker-url: tcp://192.168.0.203:61616
-#flowable数据源和多数据源配置
-casic:
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- #kaptcha-open: false #是否开启登录时验证码 (true/false)
- no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
- db:
- init:
- enable: false
- file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
- spring-session-open: false #开启spring session
logging:
level.root: error
- level.com.casic: error
+ level.com.casic: info
file:
path: logs/
name: missiles.log
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 86411e6..ffc01e9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -19,18 +19,11 @@
mapper-locations: classpath:mapper/*.xml
#mybatis-plus:
# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
-################### mybatis-plus配置 ###################
-################### casic配置 ###################
-flowable:
- checkProcessDefinitions: false #不校验process文件
casic:
- swagger-open: false #是否开启swagger (true/false)
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- muti-datasource-open: false #是否开启多数据源(true/false)
- spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
- session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
- session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
- extUrl: sys
- config:
- export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
- config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
+ device:
+ gas-dector:
+ type: 101
+ minutes: 60
+ enable-local: false
+# type 可燃气体的设备类型
+# minutes: 燃气外协设备上传数据的分钟数
\ No newline at end of file
diff --git a/target/classes/application-dev.yml b/target/classes/application-dev.yml
new file mode 100644
index 0000000..fac2afe
--- /dev/null
+++ b/target/classes/application-dev.yml
@@ -0,0 +1,40 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
+ username: root
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+logging:
+ level.root: error
+ level.com.casic: error
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..814888c
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,321 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ * 报警工单表
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_job")
+public class AlarmJob extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 工单编号
+ */
+ @TableField("JOBCODE")
+ private String jobcode;
+ /**
+ * 工单类型
+ */
+ @TableField("JOG_TYPE")
+ private String jobType;
+ /**
+ * 井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 工单创建时间
+ */
+ @TableField("CREATE_TIME")
+ private Date createTime;
+ /**
+ * 工单状态（0待处理，1待确认，2处理中，3完成）
+ */
+ @TableField("JOB_STATUS")
+ private String jobStatus;
+ /**
+ * 接单人员
+ */
+ @TableField("GET_JOB_PERSON")
+ private Long getJobPerson;
+ /**
+ * 接单时间
+ */
+ @TableField("GET_JOB_TIME")
+ private Date getJobTime;
+ /**
+ * 应接单时间
+ */
+ @TableField("SHOULD_GET_TIME")
+ private Date shouldGetTime;
+ /**
+ * 第一现场情况
+ */
+ @TableField("FIRST_STATE")
+ private String firstState;
+ /**
+ * 第一现场照片
+ */
+ @TableField("FIRST_STATE_PHOTOS")
+ private String firstStatePhotos;
+ /**
+ * 确认人员
+ */
+ @TableField("CONFIRM_JOB_PERSON")
+ private Long confirmJobPerson;
+ /**
+ * 确认时间
+ */
+ @TableField("CONFRIM_JOB_TIME")
+ private Date confrimJobTime;
+ /**
+ * 处理人员
+ */
+ @TableField("HANDLE_JOB_Person")
+ private Long handleJobPerson;
+ /**
+ * 处理时间
+ */
+ @TableField("HANDLE_JOB_TIME")
+ private Date handleJobTime;
+ /**
+ * 维护情况记录
+ */
+ @TableField("HANDLE_MESSAGE")
+ private String handleMessage;
+ /**
+ * 维护图片
+ */
+ @TableField("HANDLE_PHOTOS")
+ private String handlePhotos;
+ /**
+ * 工单流转记录
+ */
+ @TableField("FLOW")
+ private String flow;
+
+ @TableField("JOB_BELONG_TO")
+ private Long jobBelongTo;
+
+ @TableField("JOB_FLAG_DELAY")
+ private String jobFlagDelay;
+
+ @TableField("JOB_FLAG_1")
+ private String jobFlag1;
+
+ @TableField(exist = false)
+ private String alarmValue;
+
+ @TableField(exist = false)
+ private String alarmContentName;
+
+ @TableField(exist = false)
+ private Integer recordId;
+
+ @Override
+ public String toString() {
+ return "AlarmJob{" +
+ "id=" + id +
+ ", jobcode=" + jobcode +
+ ", jogType=" + jobType +
+ ", wellCode=" + wellCode +
+ ", devcode=" + devcode +
+ ", createTime=" + createTime +
+ ", jobStatus=" + jobStatus +
+ ", getJobPerson=" + getJobPerson +
+ ", getJobTime=" + getJobTime +
+ ", firstState=" + firstState +
+ ", firstStatePhotos=" + firstStatePhotos +
+ ", confirmJobPerson=" + confirmJobPerson +
+ ", confrimJobTime=" + confrimJobTime +
+ ", handleJobPerson=" + handleJobPerson +
+ ", handleJobTime=" + handleJobTime +
+ ", handleMessage=" + handleMessage +
+ ", handlePhotos=" + handlePhotos +
+ ", flow=" + flow +
+ ", recordId=" + recordId +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/AlarmRecords.java b/src/main/java/com/casic/entity/AlarmRecords.java
new file mode 100644
index 0000000..88b0b26
--- /dev/null
+++ b/src/main/java/com/casic/entity/AlarmRecords.java
@@ -0,0 +1,108 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_records")
+public class AlarmRecords extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 设备ID
+ */
+ @TableField("DEVICE_ID")
+ private Long deviceId;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 闸井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 告警类型
+ */
+ @TableField("ALARM_TYPE")
+ private String alarmType;
+ /**
+ * 告警内容
+ */
+ @TableField("ALARM_CONTENT")
+ private String alarmContent;
+ /**
+ * 告警数值
+ */
+ @TableField("ALARM_VALUE")
+ private String alarmValue;
+ /**
+ * 告警等级
+ */
+ @TableField("ALARM_LEVEL")
+ private Integer alarmLevel;
+ /**
+ * 告警详情
+ */
+ @TableField("ALARM_MSG")
+ private String alarmMessage;
+ /**
+ * 告警时间
+ */
+ @TableField("ALARM_TIME")
+ private Date alarmTime;
+ /**
+ * 告警状态
+ */
+ @TableField("STATUS")
+ private String status;
+ /**
+ * 工单编号
+ */
+ @TableField("JOB_ID")
+ private Long jobId;
+
+ @TableField(exist = false)
+ private Integer jobStatus;
+
+ @Override
+ public String toString() {
+ return "AlarmRecords{" +
+ "id=" + id +
+ ", deviceId=" + deviceId +
+ ", devcode=" + devcode +
+ ", wellCode=" + wellCode +
+ ", alarmType=" + alarmType +
+ ", alarmContent=" + alarmContent +
+ ", alarmValue=" + alarmValue +
+ ", alarmLevel=" + alarmLevel +
+ ", alarmMessage=" + alarmMessage +
+ ", alarmTime=" + alarmTime +
+ ", status=" + status +
+ ", jobId=" + jobId +
+ ", jobStatus=" + jobStatus +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/DataGasDector.java b/src/main/java/com/casic/entity/DataGasDector.java
new file mode 100644
index 0000000..537789a
--- /dev/null
+++ b/src/main/java/com/casic/entity/DataGasDector.java
@@ -0,0 +1,42 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author cz
+ * @date 2022-7-1
+ */
+@Data
+@TableName("data_gas_dector")
+public class DataGasDector {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ private String devcode;
+ private String wellCode;
+ private String strength;
+
+ private String descn;
+ /**
+ * --信号与干扰加噪声比
+ */
+ private String sinr;
+ /**
+ * --参考信号接收功率
+ */
+ private String rsrp;
+ /**
+ * --物理小区标识
+ */
+ private String pci;
+ private Date uptime;
+ private Date logtime;
+}
diff --git a/src/main/java/com/casic/entity/DataGasReport.java b/src/main/java/com/casic/entity/DataGasReport.java
deleted file mode 100644
index c43ccdf..0000000
--- a/src/main/java/com/casic/entity/DataGasReport.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.casic.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author cz
- * @date 2022-7-1
- */
-@Data
-@TableName("data_gas_dector")
-public class DataGasReport {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @TableField("devcode")
- private String imei;
- private String wellcode;
-
- private String imsi;
- /**
- * --事件类型 0正常 1低报 2高报
- */
- private String gasSensorState;
- /**
- * --浓度值
- */
- private String gasSampleValue;
- /**
- * --信号与干扰加噪声比
- */
- private String sinr;
- /**
- * --参考信号接收功率
- */
- private String rsrp;
- /**
- * --物理小区标识
- */
- private String pci;
- /**
- * --心跳周期
- */
- private String heartbeatTime;
-
- /**
- * --小区位置信息
- */
- private String cellId;
- /**
- * --电池电压
- */
- private String batteryVoltage;
- /**
- * --电池电量
- */
- private String batteryValue;
- private String iccid;
- private Date uptime;
- private Date logtime;
-}
diff --git a/src/main/java/com/casic/entity/DeviceSatatus.java b/src/main/java/com/casic/entity/DeviceSatatus.java
new file mode 100644
index 0000000..bab7903
--- /dev/null
+++ b/src/main/java/com/casic/entity/DeviceSatatus.java
@@ -0,0 +1,19 @@
+package com.casic.entity;
+
+import lombok.Data;
+
+/**
+ * 不使用了
+ *
+ */
+@Data
+public class DeviceSatatus {
+ private String deviceId;
+ private String cell;
+ private String cellTs;
+ private String onlineState;
+ private String onlineTs;
+ private String lastDataId;
+ private String lastDataJson;
+ private String lastDataTs;
+}
diff --git a/src/main/java/com/casic/model/DataContentParam.java b/src/main/java/com/casic/model/DataContentParam.java
new file mode 100644
index 0000000..46d298a
--- /dev/null
+++ b/src/main/java/com/casic/model/DataContentParam.java
@@ -0,0 +1,19 @@
+package com.casic.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DataContentParam {
+ private String msg_type;
+ private String error_val;
+ private String ch_cnt;
+ private String erro_cnt;
+ private String alarm_low_cnt;
+ private String alarm_high_cnt;
+ private String offline_cnt;
+ private List rtd_val;
+ private List adc_val;
+ private List status_val;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/DataReportParam.java b/src/main/java/com/casic/model/DataReportParam.java
index 082814c..754f330 100644
--- a/src/main/java/com/casic/model/DataReportParam.java
+++ b/src/main/java/com/casic/model/DataReportParam.java
@@ -11,25 +11,12 @@
*/
@Data
public class DataReportParam {
- private String upPacketSN;
- private String upDataSN;
- private String topic;
- private String timestamp;
- private String tenantId;
- private String serviceId;
- private String protocol;
- private String productId;
- /**
- * gas_sensor_state = 1, --事件类型 0 正常 1 低报 2 高报
- * gas_sample_value = 11-- 浓度值
- */
- private Map payload;
- private String messageType;
private String deviceType;
- private String deviceId;
- private String assocAssetId;
- @JsonProperty(value = "IMSI", required = true)
- private String IMSI;
- @JsonProperty(value = "IMEI", required = true)
- private String IMEI;
+ private String iotId;
+ private String requestId;
+ private Object checkFailedData;
+ private String productKey;
+ private String gmtCreate;
+ private String deviceName;
+ private Object items;
}
diff --git a/src/main/java/com/casic/service/DeviceDataService.java b/src/main/java/com/casic/service/DeviceDataService.java
index d883fe4..457d710 100644
--- a/src/main/java/com/casic/service/DeviceDataService.java
+++ b/src/main/java/com/casic/service/DeviceDataService.java
@@ -3,25 +3,18 @@
import com.casic.model.DataReportParam;
import com.casic.model.HeartbeatParam;
import com.casic.model.ResponseData;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* @author cz
* @date 2022
*/
public interface DeviceDataService {
-
/**
*
* @param dataReportParam
* @return
*/
- ResponseData DeviceDataCommit(DataReportParam dataReportParam);
-
- /**
- *
- * @param heartbeatParam
- * @return
- */
- ResponseData heartBeatSave(HeartbeatParam heartbeatParam);
+ ResponseData gasReceiver(DataReportParam dataReportParam);
}
diff --git a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
index 93f0685..e473f0c 100644
--- a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
+++ b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
@@ -1,58 +1,49 @@
package com.casic.service.impl;
-import com.casic.dao.impl.DeviceDataMapper;
+import com.alibaba.druid.util.StringUtils;
+import com.alibaba.fastjson.JSON;
import com.casic.model.*;
import com.casic.service.DeviceDataService;
+import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.stereotype.Service;
+import java.util.Map;
+
/**
* @author cz
- * @date 2022-6-20
+ * @date 2022-9-26
*/
@Slf4j
@Service
public class DeviceDataServiceImpl implements DeviceDataService {
- @Autowired
- DeviceDataMapper deviceDataMapper;
+ private final NormalDataProcessor normalDataProcessor;
- /**
- * @param dataReportParam
- * @return
- */
- public ResponseData DeviceDataCommit(DataReportParam dataReportParam) {
- ResponseData responseData = new ResponseData();
- try {
- deviceDataMapper.addDeviceData(dataReportParam);
- responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
- responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
- } catch (DataAccessException sqlex) {
- responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
- responseData.setMessage("请求数据异常");
- responseData.setSuccess(true);
- log.error("主题:数据上报保存出现错误,异常信息为{}", sqlex);
- }
- return responseData;
+ public DeviceDataServiceImpl(NormalDataProcessor normalDataProcessor) {
+ this.normalDataProcessor = normalDataProcessor;
}
- /**
- * @param heartbeatParam
- * @return
- */
- public ResponseData heartBeatSave(HeartbeatParam heartbeatParam) {
+ public ResponseData gasReceiver(DataReportParam dataReportParam) {
ResponseData responseData = new ResponseData();
try {
- deviceDataMapper.editDeviceData(heartbeatParam);
+ Map> updDataMap = new ObjectMapper().convertValue(dataReportParam.getItems(), Map.class);
+ DataContentParam dataContentParam = JSON.parseObject(updDataMap.get("updData").get("value"), DataContentParam.class);
+ Long uptime = Long.valueOf(String.valueOf(updDataMap.get("updData").get("time")));
+ if (StringUtils.isEmpty(dataReportParam.getDeviceName())) {
+ responseData.setCode(200);
+ responseData.setMessage("没有设备编号");
+ return responseData;
+ }
+ normalDataProcessor.normalDataProvider(dataContentParam, uptime, dataReportParam.getDeviceName());
responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
} catch (DataAccessException sqlex) {
responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
responseData.setMessage("请求数据异常");
responseData.setSuccess(true);
- log.error("主题:数据心跳出现错误,异常信息为{}", sqlex);
+ log.error("主题:设备数据上报出现错误,异常信息为{}", sqlex);
}
return responseData;
}
diff --git a/src/main/java/com/casic/service/impl/NormalDataProcessor.java b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
new file mode 100644
index 0000000..3f7630a
--- /dev/null
+++ b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
@@ -0,0 +1,164 @@
+package com.casic.service.impl;
+
+import com.alibaba.druid.util.StringUtils;
+import com.casic.dao.AlarmRecordsMapper;
+import com.casic.dao.DataGasMapper;
+import com.casic.dao.impl.AlarmJobDao;
+import com.casic.entity.AlarmJob;
+import com.casic.entity.AlarmRecords;
+import com.casic.entity.DataGasDector;
+import com.casic.model.DataContentParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+import xyz.downgoon.snowflake.Snowflake;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class NormalDataProcessor {
+
+ public static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd");
+
+ @Value("${casic.device.gas-dector.type}")
+ private Long deviceType;
+ @Value("${casic.device.gas-dector.minutes}")
+ private String minutes;
+ @Value("${casic.device.gas-dector.enable-local}")
+ private Boolean enableLocal;
+ @Resource
+ private DataGasMapper dataGasMapper;
+ @Autowired
+ private AlarmJobDao alarmJobDao;
+ @Resource
+ private AlarmRecordsMapper alarmRecordsMapper;
+ private static Snowflake snowflake = new Snowflake(0, 2);
+
+ public void normalDataProvider(DataContentParam dataReportParam, Long timeStamp, String devcode) {
+ Map gasMap = dataGasMapper.getWellCode(devcode);
+ if (ObjectUtils.isEmpty(gasMap)) {
+ log.info("没有该设备编号录入" + devcode);
+ if (enableLocal) {
+ return;
+ }
+ }
+ Boolean updateFlag = false;
+ if (ObjectUtils.isEmpty(dataGasMapper.getLastData(minutes, devcode))) {
+ updateFlag = this.saveNormalData(dataReportParam, timeStamp, devcode, gasMap);
+ }
+ this.dataTaskJudge(dataReportParam, devcode, timeStamp, gasMap, updateFlag);
+ return;
+ }
+
+ /**
+ * 自定义时间存库
+ *
+ * @param dataReportParam
+ * @param timeStamp
+ * @param devcode
+ * @param gasMap
+ */
+ private Boolean saveNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap) {
+ Boolean updateFlag = false;
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ List dataReportFilter = dataReportParam.getRtd_val().stream().filter(
+ data -> {
+ return data != -1;
+ }
+ ).collect(Collectors.toList());
+ if (dataReportFilter.size() > 0 && dataReportFilter.get(dataReportFilter.size() - 1) != 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 1);
+ updateFlag = true;
+ } else if (dataReportFilter.get(dataReportFilter.size() - 1) == 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 0);
+ }
+ dataReportFilter.forEach(
+ data -> {
+ if (data != 65535) {
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+ }
+ );
+ return updateFlag;
+ }
+
+ /**
+ * 报警就存库
+ *
+ * @param dataReportParam
+ * @param devcode
+ * @param timeStamp
+ * @param gasMap
+ */
+ private void dataTaskJudge(DataContentParam dataReportParam, String devcode, Long timeStamp, Map gasMap, Boolean updateFlag) {
+ List> alarmLevelList = dataGasMapper.getAlarmLevelList(deviceType);
+ String wellCode = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "";
+ Long deviceId = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? Long.valueOf(String.valueOf(gasMap.get("deviceId"))) : -1;
+ final String gasMsgContent=dataGasMapper.getGasMsgContent(deviceType);
+ dataReportParam.getRtd_val().stream().filter(
+ dataReport -> {
+ return dataReport != -1 && dataReport != 65535;
+ }
+ ).forEach(
+ dataReport -> {
+ for (Map alarmLevelMap : alarmLevelList) {
+ if (dataReport > Float.valueOf(String.valueOf(alarmLevelMap.get("high_value")))) {
+ AlarmRecords alarmRecord = new AlarmRecords();
+ alarmRecord.setId(snowflake.nextId());
+ alarmRecord.setDeviceId(deviceId);
+ alarmRecord.setDevcode(devcode);
+ alarmRecord.setWellCode(wellCode);
+ alarmRecord.setAlarmType("1"); // 业务报警
+ alarmRecord.setAlarmContent("燃气报警");
+ alarmRecord.setAlarmValue(String.valueOf(dataReport));
+ alarmRecord.setAlarmTime(new Date());
+ alarmRecord.setStatus("1");
+ alarmRecord.setAlarmLevel(Integer.valueOf(alarmLevelMap.get("level").toString()));
+ alarmRecord.setAlarmMessage("燃气报警");
+ String jobId = alarmRecordsMapper.isOldAlarmRecord(devcode, "燃气报警");
+ // 超出报警阈值 生成一条报警消息
+ if (!StringUtils.isEmpty(jobId)) {
+ alarmRecordsMapper.updateOldAlarmRecord(devcode, "燃气报警");
+ alarmRecord.setJobId(Long.valueOf(jobId));
+ } else {
+ AlarmJob alarmJob = alarmJobDao.saveData(devcode, wellCode, "RQZD", "1");
+ alarmRecord.setJobId(alarmJob.getId());
+ }
+ alarmRecordsMapper.insert(alarmRecord);
+ if (!updateFlag) {
+ alarmNormalData(dataReportParam, timeStamp, devcode, gasMap, dataReport);
+ }
+ break;
+ }
+ }
+ }
+ );
+ }
+
+ private void alarmNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap, Integer data) {
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+
+}
+
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index fac2afe..f8a06a6 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,40 +1,19 @@
server:
- port: 11556
+ port: 11320
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
- username: root
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell_zq_cs
+ username: postgres
password: Casic203
session:
store-type: redis
- redis:
- host: 111.198.10.15
- port: 11412
- password: ew5T4K3#203lwh
- redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
jms:
pub-sub-domain: true
- # session:
- # store-type: redis
- activemq:
- user:
- password:
- broker-url: tcp://192.168.0.203:61616
-#flowable数据源和多数据源配置
-casic:
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- #kaptcha-open: false #是否开启登录时验证码 (true/false)
- no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
- db:
- init:
- enable: false
- file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
- spring-session-open: false #开启spring session
logging:
level.root: error
- level.com.casic: error
+ level.com.casic: info
file:
path: logs/
name: missiles.log
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 86411e6..ffc01e9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -19,18 +19,11 @@
mapper-locations: classpath:mapper/*.xml
#mybatis-plus:
# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
-################### mybatis-plus配置 ###################
-################### casic配置 ###################
-flowable:
- checkProcessDefinitions: false #不校验process文件
casic:
- swagger-open: false #是否开启swagger (true/false)
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- muti-datasource-open: false #是否开启多数据源(true/false)
- spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
- session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
- session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
- extUrl: sys
- config:
- export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
- config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
+ device:
+ gas-dector:
+ type: 101
+ minutes: 60
+ enable-local: false
+# type 可燃气体的设备类型
+# minutes: 燃气外协设备上传数据的分钟数
\ No newline at end of file
diff --git a/target/classes/application-dev.yml b/target/classes/application-dev.yml
new file mode 100644
index 0000000..fac2afe
--- /dev/null
+++ b/target/classes/application-dev.yml
@@ -0,0 +1,40 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
+ username: root
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+logging:
+ level.root: error
+ level.com.casic: error
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/target/classes/application-postgre.yml b/target/classes/application-postgre.yml
new file mode 100644
index 0000000..2b7f69c
--- /dev/null
+++ b/target/classes/application-postgre.yml
@@ -0,0 +1,62 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell
+ username: postgres
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ redis-config:
+ host: 127.0.0.1
+ port: 6379
+ password:
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+smartcity:
+ config:
+ export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+ #export-path: D:\export\
+ image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\
+ config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\
+ download-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\download\
+ device:
+ redis:
+ invalid-time: 86400
+ host: 127.0.0.1
+ port: 6379
+ password: ew5T4K3#203lwh
+ config-prefix: 'Casic:'
+ getui:
+ appId: H9jSTE2bAt8QWq2K2GNOB3
+ appKey: bhPeCutJVdAyOasevQFtN9
+ masterSecret: lChudND74A89WRiHLkedb5
+logging:
+ level.root: info
+ level.com.casic: info
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..814888c
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,321 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ * 报警工单表
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_job")
+public class AlarmJob extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 工单编号
+ */
+ @TableField("JOBCODE")
+ private String jobcode;
+ /**
+ * 工单类型
+ */
+ @TableField("JOG_TYPE")
+ private String jobType;
+ /**
+ * 井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 工单创建时间
+ */
+ @TableField("CREATE_TIME")
+ private Date createTime;
+ /**
+ * 工单状态（0待处理，1待确认，2处理中，3完成）
+ */
+ @TableField("JOB_STATUS")
+ private String jobStatus;
+ /**
+ * 接单人员
+ */
+ @TableField("GET_JOB_PERSON")
+ private Long getJobPerson;
+ /**
+ * 接单时间
+ */
+ @TableField("GET_JOB_TIME")
+ private Date getJobTime;
+ /**
+ * 应接单时间
+ */
+ @TableField("SHOULD_GET_TIME")
+ private Date shouldGetTime;
+ /**
+ * 第一现场情况
+ */
+ @TableField("FIRST_STATE")
+ private String firstState;
+ /**
+ * 第一现场照片
+ */
+ @TableField("FIRST_STATE_PHOTOS")
+ private String firstStatePhotos;
+ /**
+ * 确认人员
+ */
+ @TableField("CONFIRM_JOB_PERSON")
+ private Long confirmJobPerson;
+ /**
+ * 确认时间
+ */
+ @TableField("CONFRIM_JOB_TIME")
+ private Date confrimJobTime;
+ /**
+ * 处理人员
+ */
+ @TableField("HANDLE_JOB_Person")
+ private Long handleJobPerson;
+ /**
+ * 处理时间
+ */
+ @TableField("HANDLE_JOB_TIME")
+ private Date handleJobTime;
+ /**
+ * 维护情况记录
+ */
+ @TableField("HANDLE_MESSAGE")
+ private String handleMessage;
+ /**
+ * 维护图片
+ */
+ @TableField("HANDLE_PHOTOS")
+ private String handlePhotos;
+ /**
+ * 工单流转记录
+ */
+ @TableField("FLOW")
+ private String flow;
+
+ @TableField("JOB_BELONG_TO")
+ private Long jobBelongTo;
+
+ @TableField("JOB_FLAG_DELAY")
+ private String jobFlagDelay;
+
+ @TableField("JOB_FLAG_1")
+ private String jobFlag1;
+
+ @TableField(exist = false)
+ private String alarmValue;
+
+ @TableField(exist = false)
+ private String alarmContentName;
+
+ @TableField(exist = false)
+ private Integer recordId;
+
+ @Override
+ public String toString() {
+ return "AlarmJob{" +
+ "id=" + id +
+ ", jobcode=" + jobcode +
+ ", jogType=" + jobType +
+ ", wellCode=" + wellCode +
+ ", devcode=" + devcode +
+ ", createTime=" + createTime +
+ ", jobStatus=" + jobStatus +
+ ", getJobPerson=" + getJobPerson +
+ ", getJobTime=" + getJobTime +
+ ", firstState=" + firstState +
+ ", firstStatePhotos=" + firstStatePhotos +
+ ", confirmJobPerson=" + confirmJobPerson +
+ ", confrimJobTime=" + confrimJobTime +
+ ", handleJobPerson=" + handleJobPerson +
+ ", handleJobTime=" + handleJobTime +
+ ", handleMessage=" + handleMessage +
+ ", handlePhotos=" + handlePhotos +
+ ", flow=" + flow +
+ ", recordId=" + recordId +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/AlarmRecords.java b/src/main/java/com/casic/entity/AlarmRecords.java
new file mode 100644
index 0000000..88b0b26
--- /dev/null
+++ b/src/main/java/com/casic/entity/AlarmRecords.java
@@ -0,0 +1,108 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_records")
+public class AlarmRecords extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 设备ID
+ */
+ @TableField("DEVICE_ID")
+ private Long deviceId;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 闸井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 告警类型
+ */
+ @TableField("ALARM_TYPE")
+ private String alarmType;
+ /**
+ * 告警内容
+ */
+ @TableField("ALARM_CONTENT")
+ private String alarmContent;
+ /**
+ * 告警数值
+ */
+ @TableField("ALARM_VALUE")
+ private String alarmValue;
+ /**
+ * 告警等级
+ */
+ @TableField("ALARM_LEVEL")
+ private Integer alarmLevel;
+ /**
+ * 告警详情
+ */
+ @TableField("ALARM_MSG")
+ private String alarmMessage;
+ /**
+ * 告警时间
+ */
+ @TableField("ALARM_TIME")
+ private Date alarmTime;
+ /**
+ * 告警状态
+ */
+ @TableField("STATUS")
+ private String status;
+ /**
+ * 工单编号
+ */
+ @TableField("JOB_ID")
+ private Long jobId;
+
+ @TableField(exist = false)
+ private Integer jobStatus;
+
+ @Override
+ public String toString() {
+ return "AlarmRecords{" +
+ "id=" + id +
+ ", deviceId=" + deviceId +
+ ", devcode=" + devcode +
+ ", wellCode=" + wellCode +
+ ", alarmType=" + alarmType +
+ ", alarmContent=" + alarmContent +
+ ", alarmValue=" + alarmValue +
+ ", alarmLevel=" + alarmLevel +
+ ", alarmMessage=" + alarmMessage +
+ ", alarmTime=" + alarmTime +
+ ", status=" + status +
+ ", jobId=" + jobId +
+ ", jobStatus=" + jobStatus +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/DataGasDector.java b/src/main/java/com/casic/entity/DataGasDector.java
new file mode 100644
index 0000000..537789a
--- /dev/null
+++ b/src/main/java/com/casic/entity/DataGasDector.java
@@ -0,0 +1,42 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author cz
+ * @date 2022-7-1
+ */
+@Data
+@TableName("data_gas_dector")
+public class DataGasDector {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ private String devcode;
+ private String wellCode;
+ private String strength;
+
+ private String descn;
+ /**
+ * --信号与干扰加噪声比
+ */
+ private String sinr;
+ /**
+ * --参考信号接收功率
+ */
+ private String rsrp;
+ /**
+ * --物理小区标识
+ */
+ private String pci;
+ private Date uptime;
+ private Date logtime;
+}
diff --git a/src/main/java/com/casic/entity/DataGasReport.java b/src/main/java/com/casic/entity/DataGasReport.java
deleted file mode 100644
index c43ccdf..0000000
--- a/src/main/java/com/casic/entity/DataGasReport.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.casic.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author cz
- * @date 2022-7-1
- */
-@Data
-@TableName("data_gas_dector")
-public class DataGasReport {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @TableField("devcode")
- private String imei;
- private String wellcode;
-
- private String imsi;
- /**
- * --事件类型 0正常 1低报 2高报
- */
- private String gasSensorState;
- /**
- * --浓度值
- */
- private String gasSampleValue;
- /**
- * --信号与干扰加噪声比
- */
- private String sinr;
- /**
- * --参考信号接收功率
- */
- private String rsrp;
- /**
- * --物理小区标识
- */
- private String pci;
- /**
- * --心跳周期
- */
- private String heartbeatTime;
-
- /**
- * --小区位置信息
- */
- private String cellId;
- /**
- * --电池电压
- */
- private String batteryVoltage;
- /**
- * --电池电量
- */
- private String batteryValue;
- private String iccid;
- private Date uptime;
- private Date logtime;
-}
diff --git a/src/main/java/com/casic/entity/DeviceSatatus.java b/src/main/java/com/casic/entity/DeviceSatatus.java
new file mode 100644
index 0000000..bab7903
--- /dev/null
+++ b/src/main/java/com/casic/entity/DeviceSatatus.java
@@ -0,0 +1,19 @@
+package com.casic.entity;
+
+import lombok.Data;
+
+/**
+ * 不使用了
+ *
+ */
+@Data
+public class DeviceSatatus {
+ private String deviceId;
+ private String cell;
+ private String cellTs;
+ private String onlineState;
+ private String onlineTs;
+ private String lastDataId;
+ private String lastDataJson;
+ private String lastDataTs;
+}
diff --git a/src/main/java/com/casic/model/DataContentParam.java b/src/main/java/com/casic/model/DataContentParam.java
new file mode 100644
index 0000000..46d298a
--- /dev/null
+++ b/src/main/java/com/casic/model/DataContentParam.java
@@ -0,0 +1,19 @@
+package com.casic.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DataContentParam {
+ private String msg_type;
+ private String error_val;
+ private String ch_cnt;
+ private String erro_cnt;
+ private String alarm_low_cnt;
+ private String alarm_high_cnt;
+ private String offline_cnt;
+ private List rtd_val;
+ private List adc_val;
+ private List status_val;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/DataReportParam.java b/src/main/java/com/casic/model/DataReportParam.java
index 082814c..754f330 100644
--- a/src/main/java/com/casic/model/DataReportParam.java
+++ b/src/main/java/com/casic/model/DataReportParam.java
@@ -11,25 +11,12 @@
*/
@Data
public class DataReportParam {
- private String upPacketSN;
- private String upDataSN;
- private String topic;
- private String timestamp;
- private String tenantId;
- private String serviceId;
- private String protocol;
- private String productId;
- /**
- * gas_sensor_state = 1, --事件类型 0 正常 1 低报 2 高报
- * gas_sample_value = 11-- 浓度值
- */
- private Map payload;
- private String messageType;
private String deviceType;
- private String deviceId;
- private String assocAssetId;
- @JsonProperty(value = "IMSI", required = true)
- private String IMSI;
- @JsonProperty(value = "IMEI", required = true)
- private String IMEI;
+ private String iotId;
+ private String requestId;
+ private Object checkFailedData;
+ private String productKey;
+ private String gmtCreate;
+ private String deviceName;
+ private Object items;
}
diff --git a/src/main/java/com/casic/service/DeviceDataService.java b/src/main/java/com/casic/service/DeviceDataService.java
index d883fe4..457d710 100644
--- a/src/main/java/com/casic/service/DeviceDataService.java
+++ b/src/main/java/com/casic/service/DeviceDataService.java
@@ -3,25 +3,18 @@
import com.casic.model.DataReportParam;
import com.casic.model.HeartbeatParam;
import com.casic.model.ResponseData;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* @author cz
* @date 2022
*/
public interface DeviceDataService {
-
/**
*
* @param dataReportParam
* @return
*/
- ResponseData DeviceDataCommit(DataReportParam dataReportParam);
-
- /**
- *
- * @param heartbeatParam
- * @return
- */
- ResponseData heartBeatSave(HeartbeatParam heartbeatParam);
+ ResponseData gasReceiver(DataReportParam dataReportParam);
}
diff --git a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
index 93f0685..e473f0c 100644
--- a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
+++ b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
@@ -1,58 +1,49 @@
package com.casic.service.impl;
-import com.casic.dao.impl.DeviceDataMapper;
+import com.alibaba.druid.util.StringUtils;
+import com.alibaba.fastjson.JSON;
import com.casic.model.*;
import com.casic.service.DeviceDataService;
+import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.stereotype.Service;
+import java.util.Map;
+
/**
* @author cz
- * @date 2022-6-20
+ * @date 2022-9-26
*/
@Slf4j
@Service
public class DeviceDataServiceImpl implements DeviceDataService {
- @Autowired
- DeviceDataMapper deviceDataMapper;
+ private final NormalDataProcessor normalDataProcessor;
- /**
- * @param dataReportParam
- * @return
- */
- public ResponseData DeviceDataCommit(DataReportParam dataReportParam) {
- ResponseData responseData = new ResponseData();
- try {
- deviceDataMapper.addDeviceData(dataReportParam);
- responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
- responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
- } catch (DataAccessException sqlex) {
- responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
- responseData.setMessage("请求数据异常");
- responseData.setSuccess(true);
- log.error("主题:数据上报保存出现错误,异常信息为{}", sqlex);
- }
- return responseData;
+ public DeviceDataServiceImpl(NormalDataProcessor normalDataProcessor) {
+ this.normalDataProcessor = normalDataProcessor;
}
- /**
- * @param heartbeatParam
- * @return
- */
- public ResponseData heartBeatSave(HeartbeatParam heartbeatParam) {
+ public ResponseData gasReceiver(DataReportParam dataReportParam) {
ResponseData responseData = new ResponseData();
try {
- deviceDataMapper.editDeviceData(heartbeatParam);
+ Map> updDataMap = new ObjectMapper().convertValue(dataReportParam.getItems(), Map.class);
+ DataContentParam dataContentParam = JSON.parseObject(updDataMap.get("updData").get("value"), DataContentParam.class);
+ Long uptime = Long.valueOf(String.valueOf(updDataMap.get("updData").get("time")));
+ if (StringUtils.isEmpty(dataReportParam.getDeviceName())) {
+ responseData.setCode(200);
+ responseData.setMessage("没有设备编号");
+ return responseData;
+ }
+ normalDataProcessor.normalDataProvider(dataContentParam, uptime, dataReportParam.getDeviceName());
responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
} catch (DataAccessException sqlex) {
responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
responseData.setMessage("请求数据异常");
responseData.setSuccess(true);
- log.error("主题:数据心跳出现错误,异常信息为{}", sqlex);
+ log.error("主题:设备数据上报出现错误,异常信息为{}", sqlex);
}
return responseData;
}
diff --git a/src/main/java/com/casic/service/impl/NormalDataProcessor.java b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
new file mode 100644
index 0000000..3f7630a
--- /dev/null
+++ b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
@@ -0,0 +1,164 @@
+package com.casic.service.impl;
+
+import com.alibaba.druid.util.StringUtils;
+import com.casic.dao.AlarmRecordsMapper;
+import com.casic.dao.DataGasMapper;
+import com.casic.dao.impl.AlarmJobDao;
+import com.casic.entity.AlarmJob;
+import com.casic.entity.AlarmRecords;
+import com.casic.entity.DataGasDector;
+import com.casic.model.DataContentParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+import xyz.downgoon.snowflake.Snowflake;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class NormalDataProcessor {
+
+ public static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd");
+
+ @Value("${casic.device.gas-dector.type}")
+ private Long deviceType;
+ @Value("${casic.device.gas-dector.minutes}")
+ private String minutes;
+ @Value("${casic.device.gas-dector.enable-local}")
+ private Boolean enableLocal;
+ @Resource
+ private DataGasMapper dataGasMapper;
+ @Autowired
+ private AlarmJobDao alarmJobDao;
+ @Resource
+ private AlarmRecordsMapper alarmRecordsMapper;
+ private static Snowflake snowflake = new Snowflake(0, 2);
+
+ public void normalDataProvider(DataContentParam dataReportParam, Long timeStamp, String devcode) {
+ Map gasMap = dataGasMapper.getWellCode(devcode);
+ if (ObjectUtils.isEmpty(gasMap)) {
+ log.info("没有该设备编号录入" + devcode);
+ if (enableLocal) {
+ return;
+ }
+ }
+ Boolean updateFlag = false;
+ if (ObjectUtils.isEmpty(dataGasMapper.getLastData(minutes, devcode))) {
+ updateFlag = this.saveNormalData(dataReportParam, timeStamp, devcode, gasMap);
+ }
+ this.dataTaskJudge(dataReportParam, devcode, timeStamp, gasMap, updateFlag);
+ return;
+ }
+
+ /**
+ * 自定义时间存库
+ *
+ * @param dataReportParam
+ * @param timeStamp
+ * @param devcode
+ * @param gasMap
+ */
+ private Boolean saveNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap) {
+ Boolean updateFlag = false;
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ List dataReportFilter = dataReportParam.getRtd_val().stream().filter(
+ data -> {
+ return data != -1;
+ }
+ ).collect(Collectors.toList());
+ if (dataReportFilter.size() > 0 && dataReportFilter.get(dataReportFilter.size() - 1) != 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 1);
+ updateFlag = true;
+ } else if (dataReportFilter.get(dataReportFilter.size() - 1) == 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 0);
+ }
+ dataReportFilter.forEach(
+ data -> {
+ if (data != 65535) {
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+ }
+ );
+ return updateFlag;
+ }
+
+ /**
+ * 报警就存库
+ *
+ * @param dataReportParam
+ * @param devcode
+ * @param timeStamp
+ * @param gasMap
+ */
+ private void dataTaskJudge(DataContentParam dataReportParam, String devcode, Long timeStamp, Map gasMap, Boolean updateFlag) {
+ List> alarmLevelList = dataGasMapper.getAlarmLevelList(deviceType);
+ String wellCode = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "";
+ Long deviceId = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? Long.valueOf(String.valueOf(gasMap.get("deviceId"))) : -1;
+ final String gasMsgContent=dataGasMapper.getGasMsgContent(deviceType);
+ dataReportParam.getRtd_val().stream().filter(
+ dataReport -> {
+ return dataReport != -1 && dataReport != 65535;
+ }
+ ).forEach(
+ dataReport -> {
+ for (Map alarmLevelMap : alarmLevelList) {
+ if (dataReport > Float.valueOf(String.valueOf(alarmLevelMap.get("high_value")))) {
+ AlarmRecords alarmRecord = new AlarmRecords();
+ alarmRecord.setId(snowflake.nextId());
+ alarmRecord.setDeviceId(deviceId);
+ alarmRecord.setDevcode(devcode);
+ alarmRecord.setWellCode(wellCode);
+ alarmRecord.setAlarmType("1"); // 业务报警
+ alarmRecord.setAlarmContent("燃气报警");
+ alarmRecord.setAlarmValue(String.valueOf(dataReport));
+ alarmRecord.setAlarmTime(new Date());
+ alarmRecord.setStatus("1");
+ alarmRecord.setAlarmLevel(Integer.valueOf(alarmLevelMap.get("level").toString()));
+ alarmRecord.setAlarmMessage("燃气报警");
+ String jobId = alarmRecordsMapper.isOldAlarmRecord(devcode, "燃气报警");
+ // 超出报警阈值 生成一条报警消息
+ if (!StringUtils.isEmpty(jobId)) {
+ alarmRecordsMapper.updateOldAlarmRecord(devcode, "燃气报警");
+ alarmRecord.setJobId(Long.valueOf(jobId));
+ } else {
+ AlarmJob alarmJob = alarmJobDao.saveData(devcode, wellCode, "RQZD", "1");
+ alarmRecord.setJobId(alarmJob.getId());
+ }
+ alarmRecordsMapper.insert(alarmRecord);
+ if (!updateFlag) {
+ alarmNormalData(dataReportParam, timeStamp, devcode, gasMap, dataReport);
+ }
+ break;
+ }
+ }
+ }
+ );
+ }
+
+ private void alarmNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap, Integer data) {
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+
+}
+
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index fac2afe..f8a06a6 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,40 +1,19 @@
server:
- port: 11556
+ port: 11320
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
- username: root
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell_zq_cs
+ username: postgres
password: Casic203
session:
store-type: redis
- redis:
- host: 111.198.10.15
- port: 11412
- password: ew5T4K3#203lwh
- redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
jms:
pub-sub-domain: true
- # session:
- # store-type: redis
- activemq:
- user:
- password:
- broker-url: tcp://192.168.0.203:61616
-#flowable数据源和多数据源配置
-casic:
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- #kaptcha-open: false #是否开启登录时验证码 (true/false)
- no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
- db:
- init:
- enable: false
- file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
- spring-session-open: false #开启spring session
logging:
level.root: error
- level.com.casic: error
+ level.com.casic: info
file:
path: logs/
name: missiles.log
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 86411e6..ffc01e9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -19,18 +19,11 @@
mapper-locations: classpath:mapper/*.xml
#mybatis-plus:
# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
-################### mybatis-plus配置 ###################
-################### casic配置 ###################
-flowable:
- checkProcessDefinitions: false #不校验process文件
casic:
- swagger-open: false #是否开启swagger (true/false)
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- muti-datasource-open: false #是否开启多数据源(true/false)
- spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
- session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
- session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
- extUrl: sys
- config:
- export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
- config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
+ device:
+ gas-dector:
+ type: 101
+ minutes: 60
+ enable-local: false
+# type 可燃气体的设备类型
+# minutes: 燃气外协设备上传数据的分钟数
\ No newline at end of file
diff --git a/target/classes/application-dev.yml b/target/classes/application-dev.yml
new file mode 100644
index 0000000..fac2afe
--- /dev/null
+++ b/target/classes/application-dev.yml
@@ -0,0 +1,40 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
+ username: root
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+logging:
+ level.root: error
+ level.com.casic: error
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/target/classes/application-postgre.yml b/target/classes/application-postgre.yml
new file mode 100644
index 0000000..2b7f69c
--- /dev/null
+++ b/target/classes/application-postgre.yml
@@ -0,0 +1,62 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell
+ username: postgres
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ redis-config:
+ host: 127.0.0.1
+ port: 6379
+ password:
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+smartcity:
+ config:
+ export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+ #export-path: D:\export\
+ image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\
+ config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\
+ download-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\download\
+ device:
+ redis:
+ invalid-time: 86400
+ host: 127.0.0.1
+ port: 6379
+ password: ew5T4K3#203lwh
+ config-prefix: 'Casic:'
+ getui:
+ appId: H9jSTE2bAt8QWq2K2GNOB3
+ appKey: bhPeCutJVdAyOasevQFtN9
+ masterSecret: lChudND74A89WRiHLkedb5
+logging:
+ level.root: info
+ level.com.casic: info
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/target/classes/application.yml b/target/classes/application.yml
new file mode 100644
index 0000000..86411e6
--- /dev/null
+++ b/target/classes/application.yml
@@ -0,0 +1,36 @@
+##########################################################
+################## 所有profile共有的配置 #################
+##########################################################
+spring:
+ profiles:
+ active: dev
+ servlet:
+ multipart:
+ max-file-size: 50MB
+ max-request-size: 80MB
+mybatis-plus:
+ global-config:
+ enable-sql-runner: true
+ configuration:
+ # 配置结果集属性为空时 是否映射返回结果
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
+ mapper-locations: classpath:mapper/*.xml
+mybatis:
+ mapper-locations: classpath:mapper/*.xml
+#mybatis-plus:
+# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
+################### mybatis-plus配置 ###################
+################### casic配置 ###################
+flowable:
+ checkProcessDefinitions: false #不校验process文件
+casic:
+ swagger-open: false #是否开启swagger (true/false)
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ muti-datasource-open: false #是否开启多数据源(true/false)
+ spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
+ session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
+ session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
+ extUrl: sys
+ config:
+ export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+ config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..814888c
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,321 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ * 报警工单表
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_job")
+public class AlarmJob extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 工单编号
+ */
+ @TableField("JOBCODE")
+ private String jobcode;
+ /**
+ * 工单类型
+ */
+ @TableField("JOG_TYPE")
+ private String jobType;
+ /**
+ * 井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 工单创建时间
+ */
+ @TableField("CREATE_TIME")
+ private Date createTime;
+ /**
+ * 工单状态（0待处理，1待确认，2处理中，3完成）
+ */
+ @TableField("JOB_STATUS")
+ private String jobStatus;
+ /**
+ * 接单人员
+ */
+ @TableField("GET_JOB_PERSON")
+ private Long getJobPerson;
+ /**
+ * 接单时间
+ */
+ @TableField("GET_JOB_TIME")
+ private Date getJobTime;
+ /**
+ * 应接单时间
+ */
+ @TableField("SHOULD_GET_TIME")
+ private Date shouldGetTime;
+ /**
+ * 第一现场情况
+ */
+ @TableField("FIRST_STATE")
+ private String firstState;
+ /**
+ * 第一现场照片
+ */
+ @TableField("FIRST_STATE_PHOTOS")
+ private String firstStatePhotos;
+ /**
+ * 确认人员
+ */
+ @TableField("CONFIRM_JOB_PERSON")
+ private Long confirmJobPerson;
+ /**
+ * 确认时间
+ */
+ @TableField("CONFRIM_JOB_TIME")
+ private Date confrimJobTime;
+ /**
+ * 处理人员
+ */
+ @TableField("HANDLE_JOB_Person")
+ private Long handleJobPerson;
+ /**
+ * 处理时间
+ */
+ @TableField("HANDLE_JOB_TIME")
+ private Date handleJobTime;
+ /**
+ * 维护情况记录
+ */
+ @TableField("HANDLE_MESSAGE")
+ private String handleMessage;
+ /**
+ * 维护图片
+ */
+ @TableField("HANDLE_PHOTOS")
+ private String handlePhotos;
+ /**
+ * 工单流转记录
+ */
+ @TableField("FLOW")
+ private String flow;
+
+ @TableField("JOB_BELONG_TO")
+ private Long jobBelongTo;
+
+ @TableField("JOB_FLAG_DELAY")
+ private String jobFlagDelay;
+
+ @TableField("JOB_FLAG_1")
+ private String jobFlag1;
+
+ @TableField(exist = false)
+ private String alarmValue;
+
+ @TableField(exist = false)
+ private String alarmContentName;
+
+ @TableField(exist = false)
+ private Integer recordId;
+
+ @Override
+ public String toString() {
+ return "AlarmJob{" +
+ "id=" + id +
+ ", jobcode=" + jobcode +
+ ", jogType=" + jobType +
+ ", wellCode=" + wellCode +
+ ", devcode=" + devcode +
+ ", createTime=" + createTime +
+ ", jobStatus=" + jobStatus +
+ ", getJobPerson=" + getJobPerson +
+ ", getJobTime=" + getJobTime +
+ ", firstState=" + firstState +
+ ", firstStatePhotos=" + firstStatePhotos +
+ ", confirmJobPerson=" + confirmJobPerson +
+ ", confrimJobTime=" + confrimJobTime +
+ ", handleJobPerson=" + handleJobPerson +
+ ", handleJobTime=" + handleJobTime +
+ ", handleMessage=" + handleMessage +
+ ", handlePhotos=" + handlePhotos +
+ ", flow=" + flow +
+ ", recordId=" + recordId +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/AlarmRecords.java b/src/main/java/com/casic/entity/AlarmRecords.java
new file mode 100644
index 0000000..88b0b26
--- /dev/null
+++ b/src/main/java/com/casic/entity/AlarmRecords.java
@@ -0,0 +1,108 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_records")
+public class AlarmRecords extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 设备ID
+ */
+ @TableField("DEVICE_ID")
+ private Long deviceId;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 闸井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 告警类型
+ */
+ @TableField("ALARM_TYPE")
+ private String alarmType;
+ /**
+ * 告警内容
+ */
+ @TableField("ALARM_CONTENT")
+ private String alarmContent;
+ /**
+ * 告警数值
+ */
+ @TableField("ALARM_VALUE")
+ private String alarmValue;
+ /**
+ * 告警等级
+ */
+ @TableField("ALARM_LEVEL")
+ private Integer alarmLevel;
+ /**
+ * 告警详情
+ */
+ @TableField("ALARM_MSG")
+ private String alarmMessage;
+ /**
+ * 告警时间
+ */
+ @TableField("ALARM_TIME")
+ private Date alarmTime;
+ /**
+ * 告警状态
+ */
+ @TableField("STATUS")
+ private String status;
+ /**
+ * 工单编号
+ */
+ @TableField("JOB_ID")
+ private Long jobId;
+
+ @TableField(exist = false)
+ private Integer jobStatus;
+
+ @Override
+ public String toString() {
+ return "AlarmRecords{" +
+ "id=" + id +
+ ", deviceId=" + deviceId +
+ ", devcode=" + devcode +
+ ", wellCode=" + wellCode +
+ ", alarmType=" + alarmType +
+ ", alarmContent=" + alarmContent +
+ ", alarmValue=" + alarmValue +
+ ", alarmLevel=" + alarmLevel +
+ ", alarmMessage=" + alarmMessage +
+ ", alarmTime=" + alarmTime +
+ ", status=" + status +
+ ", jobId=" + jobId +
+ ", jobStatus=" + jobStatus +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/DataGasDector.java b/src/main/java/com/casic/entity/DataGasDector.java
new file mode 100644
index 0000000..537789a
--- /dev/null
+++ b/src/main/java/com/casic/entity/DataGasDector.java
@@ -0,0 +1,42 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author cz
+ * @date 2022-7-1
+ */
+@Data
+@TableName("data_gas_dector")
+public class DataGasDector {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ private String devcode;
+ private String wellCode;
+ private String strength;
+
+ private String descn;
+ /**
+ * --信号与干扰加噪声比
+ */
+ private String sinr;
+ /**
+ * --参考信号接收功率
+ */
+ private String rsrp;
+ /**
+ * --物理小区标识
+ */
+ private String pci;
+ private Date uptime;
+ private Date logtime;
+}
diff --git a/src/main/java/com/casic/entity/DataGasReport.java b/src/main/java/com/casic/entity/DataGasReport.java
deleted file mode 100644
index c43ccdf..0000000
--- a/src/main/java/com/casic/entity/DataGasReport.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.casic.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author cz
- * @date 2022-7-1
- */
-@Data
-@TableName("data_gas_dector")
-public class DataGasReport {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @TableField("devcode")
- private String imei;
- private String wellcode;
-
- private String imsi;
- /**
- * --事件类型 0正常 1低报 2高报
- */
- private String gasSensorState;
- /**
- * --浓度值
- */
- private String gasSampleValue;
- /**
- * --信号与干扰加噪声比
- */
- private String sinr;
- /**
- * --参考信号接收功率
- */
- private String rsrp;
- /**
- * --物理小区标识
- */
- private String pci;
- /**
- * --心跳周期
- */
- private String heartbeatTime;
-
- /**
- * --小区位置信息
- */
- private String cellId;
- /**
- * --电池电压
- */
- private String batteryVoltage;
- /**
- * --电池电量
- */
- private String batteryValue;
- private String iccid;
- private Date uptime;
- private Date logtime;
-}
diff --git a/src/main/java/com/casic/entity/DeviceSatatus.java b/src/main/java/com/casic/entity/DeviceSatatus.java
new file mode 100644
index 0000000..bab7903
--- /dev/null
+++ b/src/main/java/com/casic/entity/DeviceSatatus.java
@@ -0,0 +1,19 @@
+package com.casic.entity;
+
+import lombok.Data;
+
+/**
+ * 不使用了
+ *
+ */
+@Data
+public class DeviceSatatus {
+ private String deviceId;
+ private String cell;
+ private String cellTs;
+ private String onlineState;
+ private String onlineTs;
+ private String lastDataId;
+ private String lastDataJson;
+ private String lastDataTs;
+}
diff --git a/src/main/java/com/casic/model/DataContentParam.java b/src/main/java/com/casic/model/DataContentParam.java
new file mode 100644
index 0000000..46d298a
--- /dev/null
+++ b/src/main/java/com/casic/model/DataContentParam.java
@@ -0,0 +1,19 @@
+package com.casic.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DataContentParam {
+ private String msg_type;
+ private String error_val;
+ private String ch_cnt;
+ private String erro_cnt;
+ private String alarm_low_cnt;
+ private String alarm_high_cnt;
+ private String offline_cnt;
+ private List rtd_val;
+ private List adc_val;
+ private List status_val;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/DataReportParam.java b/src/main/java/com/casic/model/DataReportParam.java
index 082814c..754f330 100644
--- a/src/main/java/com/casic/model/DataReportParam.java
+++ b/src/main/java/com/casic/model/DataReportParam.java
@@ -11,25 +11,12 @@
*/
@Data
public class DataReportParam {
- private String upPacketSN;
- private String upDataSN;
- private String topic;
- private String timestamp;
- private String tenantId;
- private String serviceId;
- private String protocol;
- private String productId;
- /**
- * gas_sensor_state = 1, --事件类型 0 正常 1 低报 2 高报
- * gas_sample_value = 11-- 浓度值
- */
- private Map payload;
- private String messageType;
private String deviceType;
- private String deviceId;
- private String assocAssetId;
- @JsonProperty(value = "IMSI", required = true)
- private String IMSI;
- @JsonProperty(value = "IMEI", required = true)
- private String IMEI;
+ private String iotId;
+ private String requestId;
+ private Object checkFailedData;
+ private String productKey;
+ private String gmtCreate;
+ private String deviceName;
+ private Object items;
}
diff --git a/src/main/java/com/casic/service/DeviceDataService.java b/src/main/java/com/casic/service/DeviceDataService.java
index d883fe4..457d710 100644
--- a/src/main/java/com/casic/service/DeviceDataService.java
+++ b/src/main/java/com/casic/service/DeviceDataService.java
@@ -3,25 +3,18 @@
import com.casic.model.DataReportParam;
import com.casic.model.HeartbeatParam;
import com.casic.model.ResponseData;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* @author cz
* @date 2022
*/
public interface DeviceDataService {
-
/**
*
* @param dataReportParam
* @return
*/
- ResponseData DeviceDataCommit(DataReportParam dataReportParam);
-
- /**
- *
- * @param heartbeatParam
- * @return
- */
- ResponseData heartBeatSave(HeartbeatParam heartbeatParam);
+ ResponseData gasReceiver(DataReportParam dataReportParam);
}
diff --git a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
index 93f0685..e473f0c 100644
--- a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
+++ b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
@@ -1,58 +1,49 @@
package com.casic.service.impl;
-import com.casic.dao.impl.DeviceDataMapper;
+import com.alibaba.druid.util.StringUtils;
+import com.alibaba.fastjson.JSON;
import com.casic.model.*;
import com.casic.service.DeviceDataService;
+import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.stereotype.Service;
+import java.util.Map;
+
/**
* @author cz
- * @date 2022-6-20
+ * @date 2022-9-26
*/
@Slf4j
@Service
public class DeviceDataServiceImpl implements DeviceDataService {
- @Autowired
- DeviceDataMapper deviceDataMapper;
+ private final NormalDataProcessor normalDataProcessor;
- /**
- * @param dataReportParam
- * @return
- */
- public ResponseData DeviceDataCommit(DataReportParam dataReportParam) {
- ResponseData responseData = new ResponseData();
- try {
- deviceDataMapper.addDeviceData(dataReportParam);
- responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
- responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
- } catch (DataAccessException sqlex) {
- responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
- responseData.setMessage("请求数据异常");
- responseData.setSuccess(true);
- log.error("主题:数据上报保存出现错误,异常信息为{}", sqlex);
- }
- return responseData;
+ public DeviceDataServiceImpl(NormalDataProcessor normalDataProcessor) {
+ this.normalDataProcessor = normalDataProcessor;
}
- /**
- * @param heartbeatParam
- * @return
- */
- public ResponseData heartBeatSave(HeartbeatParam heartbeatParam) {
+ public ResponseData gasReceiver(DataReportParam dataReportParam) {
ResponseData responseData = new ResponseData();
try {
- deviceDataMapper.editDeviceData(heartbeatParam);
+ Map> updDataMap = new ObjectMapper().convertValue(dataReportParam.getItems(), Map.class);
+ DataContentParam dataContentParam = JSON.parseObject(updDataMap.get("updData").get("value"), DataContentParam.class);
+ Long uptime = Long.valueOf(String.valueOf(updDataMap.get("updData").get("time")));
+ if (StringUtils.isEmpty(dataReportParam.getDeviceName())) {
+ responseData.setCode(200);
+ responseData.setMessage("没有设备编号");
+ return responseData;
+ }
+ normalDataProcessor.normalDataProvider(dataContentParam, uptime, dataReportParam.getDeviceName());
responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
} catch (DataAccessException sqlex) {
responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
responseData.setMessage("请求数据异常");
responseData.setSuccess(true);
- log.error("主题:数据心跳出现错误,异常信息为{}", sqlex);
+ log.error("主题:设备数据上报出现错误,异常信息为{}", sqlex);
}
return responseData;
}
diff --git a/src/main/java/com/casic/service/impl/NormalDataProcessor.java b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
new file mode 100644
index 0000000..3f7630a
--- /dev/null
+++ b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
@@ -0,0 +1,164 @@
+package com.casic.service.impl;
+
+import com.alibaba.druid.util.StringUtils;
+import com.casic.dao.AlarmRecordsMapper;
+import com.casic.dao.DataGasMapper;
+import com.casic.dao.impl.AlarmJobDao;
+import com.casic.entity.AlarmJob;
+import com.casic.entity.AlarmRecords;
+import com.casic.entity.DataGasDector;
+import com.casic.model.DataContentParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+import xyz.downgoon.snowflake.Snowflake;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class NormalDataProcessor {
+
+ public static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd");
+
+ @Value("${casic.device.gas-dector.type}")
+ private Long deviceType;
+ @Value("${casic.device.gas-dector.minutes}")
+ private String minutes;
+ @Value("${casic.device.gas-dector.enable-local}")
+ private Boolean enableLocal;
+ @Resource
+ private DataGasMapper dataGasMapper;
+ @Autowired
+ private AlarmJobDao alarmJobDao;
+ @Resource
+ private AlarmRecordsMapper alarmRecordsMapper;
+ private static Snowflake snowflake = new Snowflake(0, 2);
+
+ public void normalDataProvider(DataContentParam dataReportParam, Long timeStamp, String devcode) {
+ Map gasMap = dataGasMapper.getWellCode(devcode);
+ if (ObjectUtils.isEmpty(gasMap)) {
+ log.info("没有该设备编号录入" + devcode);
+ if (enableLocal) {
+ return;
+ }
+ }
+ Boolean updateFlag = false;
+ if (ObjectUtils.isEmpty(dataGasMapper.getLastData(minutes, devcode))) {
+ updateFlag = this.saveNormalData(dataReportParam, timeStamp, devcode, gasMap);
+ }
+ this.dataTaskJudge(dataReportParam, devcode, timeStamp, gasMap, updateFlag);
+ return;
+ }
+
+ /**
+ * 自定义时间存库
+ *
+ * @param dataReportParam
+ * @param timeStamp
+ * @param devcode
+ * @param gasMap
+ */
+ private Boolean saveNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap) {
+ Boolean updateFlag = false;
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ List dataReportFilter = dataReportParam.getRtd_val().stream().filter(
+ data -> {
+ return data != -1;
+ }
+ ).collect(Collectors.toList());
+ if (dataReportFilter.size() > 0 && dataReportFilter.get(dataReportFilter.size() - 1) != 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 1);
+ updateFlag = true;
+ } else if (dataReportFilter.get(dataReportFilter.size() - 1) == 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 0);
+ }
+ dataReportFilter.forEach(
+ data -> {
+ if (data != 65535) {
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+ }
+ );
+ return updateFlag;
+ }
+
+ /**
+ * 报警就存库
+ *
+ * @param dataReportParam
+ * @param devcode
+ * @param timeStamp
+ * @param gasMap
+ */
+ private void dataTaskJudge(DataContentParam dataReportParam, String devcode, Long timeStamp, Map gasMap, Boolean updateFlag) {
+ List> alarmLevelList = dataGasMapper.getAlarmLevelList(deviceType);
+ String wellCode = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "";
+ Long deviceId = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? Long.valueOf(String.valueOf(gasMap.get("deviceId"))) : -1;
+ final String gasMsgContent=dataGasMapper.getGasMsgContent(deviceType);
+ dataReportParam.getRtd_val().stream().filter(
+ dataReport -> {
+ return dataReport != -1 && dataReport != 65535;
+ }
+ ).forEach(
+ dataReport -> {
+ for (Map alarmLevelMap : alarmLevelList) {
+ if (dataReport > Float.valueOf(String.valueOf(alarmLevelMap.get("high_value")))) {
+ AlarmRecords alarmRecord = new AlarmRecords();
+ alarmRecord.setId(snowflake.nextId());
+ alarmRecord.setDeviceId(deviceId);
+ alarmRecord.setDevcode(devcode);
+ alarmRecord.setWellCode(wellCode);
+ alarmRecord.setAlarmType("1"); // 业务报警
+ alarmRecord.setAlarmContent("燃气报警");
+ alarmRecord.setAlarmValue(String.valueOf(dataReport));
+ alarmRecord.setAlarmTime(new Date());
+ alarmRecord.setStatus("1");
+ alarmRecord.setAlarmLevel(Integer.valueOf(alarmLevelMap.get("level").toString()));
+ alarmRecord.setAlarmMessage("燃气报警");
+ String jobId = alarmRecordsMapper.isOldAlarmRecord(devcode, "燃气报警");
+ // 超出报警阈值 生成一条报警消息
+ if (!StringUtils.isEmpty(jobId)) {
+ alarmRecordsMapper.updateOldAlarmRecord(devcode, "燃气报警");
+ alarmRecord.setJobId(Long.valueOf(jobId));
+ } else {
+ AlarmJob alarmJob = alarmJobDao.saveData(devcode, wellCode, "RQZD", "1");
+ alarmRecord.setJobId(alarmJob.getId());
+ }
+ alarmRecordsMapper.insert(alarmRecord);
+ if (!updateFlag) {
+ alarmNormalData(dataReportParam, timeStamp, devcode, gasMap, dataReport);
+ }
+ break;
+ }
+ }
+ }
+ );
+ }
+
+ private void alarmNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap, Integer data) {
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+
+}
+
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index fac2afe..f8a06a6 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,40 +1,19 @@
server:
- port: 11556
+ port: 11320
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
- username: root
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell_zq_cs
+ username: postgres
password: Casic203
session:
store-type: redis
- redis:
- host: 111.198.10.15
- port: 11412
- password: ew5T4K3#203lwh
- redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
jms:
pub-sub-domain: true
- # session:
- # store-type: redis
- activemq:
- user:
- password:
- broker-url: tcp://192.168.0.203:61616
-#flowable数据源和多数据源配置
-casic:
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- #kaptcha-open: false #是否开启登录时验证码 (true/false)
- no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
- db:
- init:
- enable: false
- file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
- spring-session-open: false #开启spring session
logging:
level.root: error
- level.com.casic: error
+ level.com.casic: info
file:
path: logs/
name: missiles.log
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 86411e6..ffc01e9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -19,18 +19,11 @@
mapper-locations: classpath:mapper/*.xml
#mybatis-plus:
# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
-################### mybatis-plus配置 ###################
-################### casic配置 ###################
-flowable:
- checkProcessDefinitions: false #不校验process文件
casic:
- swagger-open: false #是否开启swagger (true/false)
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- muti-datasource-open: false #是否开启多数据源(true/false)
- spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
- session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
- session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
- extUrl: sys
- config:
- export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
- config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
+ device:
+ gas-dector:
+ type: 101
+ minutes: 60
+ enable-local: false
+# type 可燃气体的设备类型
+# minutes: 燃气外协设备上传数据的分钟数
\ No newline at end of file
diff --git a/target/classes/application-dev.yml b/target/classes/application-dev.yml
new file mode 100644
index 0000000..fac2afe
--- /dev/null
+++ b/target/classes/application-dev.yml
@@ -0,0 +1,40 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
+ username: root
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+logging:
+ level.root: error
+ level.com.casic: error
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/target/classes/application-postgre.yml b/target/classes/application-postgre.yml
new file mode 100644
index 0000000..2b7f69c
--- /dev/null
+++ b/target/classes/application-postgre.yml
@@ -0,0 +1,62 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell
+ username: postgres
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ redis-config:
+ host: 127.0.0.1
+ port: 6379
+ password:
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+smartcity:
+ config:
+ export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+ #export-path: D:\export\
+ image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\
+ config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\
+ download-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\download\
+ device:
+ redis:
+ invalid-time: 86400
+ host: 127.0.0.1
+ port: 6379
+ password: ew5T4K3#203lwh
+ config-prefix: 'Casic:'
+ getui:
+ appId: H9jSTE2bAt8QWq2K2GNOB3
+ appKey: bhPeCutJVdAyOasevQFtN9
+ masterSecret: lChudND74A89WRiHLkedb5
+logging:
+ level.root: info
+ level.com.casic: info
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/target/classes/application.yml b/target/classes/application.yml
new file mode 100644
index 0000000..86411e6
--- /dev/null
+++ b/target/classes/application.yml
@@ -0,0 +1,36 @@
+##########################################################
+################## 所有profile共有的配置 #################
+##########################################################
+spring:
+ profiles:
+ active: dev
+ servlet:
+ multipart:
+ max-file-size: 50MB
+ max-request-size: 80MB
+mybatis-plus:
+ global-config:
+ enable-sql-runner: true
+ configuration:
+ # 配置结果集属性为空时 是否映射返回结果
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
+ mapper-locations: classpath:mapper/*.xml
+mybatis:
+ mapper-locations: classpath:mapper/*.xml
+#mybatis-plus:
+# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
+################### mybatis-plus配置 ###################
+################### casic配置 ###################
+flowable:
+ checkProcessDefinitions: false #不校验process文件
+casic:
+ swagger-open: false #是否开启swagger (true/false)
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ muti-datasource-open: false #是否开启多数据源(true/false)
+ spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
+ session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
+ session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
+ extUrl: sys
+ config:
+ export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+ config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
diff --git a/target/classes/com/casic/CasicApplication.class b/target/classes/com/casic/CasicApplication.class
new file mode 100644
index 0000000..68c2f95
--- /dev/null
+++ b/target/classes/com/casic/CasicApplication.class
Binary files differ
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..814888c
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,321 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ * 报警工单表
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_job")
+public class AlarmJob extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 工单编号
+ */
+ @TableField("JOBCODE")
+ private String jobcode;
+ /**
+ * 工单类型
+ */
+ @TableField("JOG_TYPE")
+ private String jobType;
+ /**
+ * 井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 工单创建时间
+ */
+ @TableField("CREATE_TIME")
+ private Date createTime;
+ /**
+ * 工单状态（0待处理，1待确认，2处理中，3完成）
+ */
+ @TableField("JOB_STATUS")
+ private String jobStatus;
+ /**
+ * 接单人员
+ */
+ @TableField("GET_JOB_PERSON")
+ private Long getJobPerson;
+ /**
+ * 接单时间
+ */
+ @TableField("GET_JOB_TIME")
+ private Date getJobTime;
+ /**
+ * 应接单时间
+ */
+ @TableField("SHOULD_GET_TIME")
+ private Date shouldGetTime;
+ /**
+ * 第一现场情况
+ */
+ @TableField("FIRST_STATE")
+ private String firstState;
+ /**
+ * 第一现场照片
+ */
+ @TableField("FIRST_STATE_PHOTOS")
+ private String firstStatePhotos;
+ /**
+ * 确认人员
+ */
+ @TableField("CONFIRM_JOB_PERSON")
+ private Long confirmJobPerson;
+ /**
+ * 确认时间
+ */
+ @TableField("CONFRIM_JOB_TIME")
+ private Date confrimJobTime;
+ /**
+ * 处理人员
+ */
+ @TableField("HANDLE_JOB_Person")
+ private Long handleJobPerson;
+ /**
+ * 处理时间
+ */
+ @TableField("HANDLE_JOB_TIME")
+ private Date handleJobTime;
+ /**
+ * 维护情况记录
+ */
+ @TableField("HANDLE_MESSAGE")
+ private String handleMessage;
+ /**
+ * 维护图片
+ */
+ @TableField("HANDLE_PHOTOS")
+ private String handlePhotos;
+ /**
+ * 工单流转记录
+ */
+ @TableField("FLOW")
+ private String flow;
+
+ @TableField("JOB_BELONG_TO")
+ private Long jobBelongTo;
+
+ @TableField("JOB_FLAG_DELAY")
+ private String jobFlagDelay;
+
+ @TableField("JOB_FLAG_1")
+ private String jobFlag1;
+
+ @TableField(exist = false)
+ private String alarmValue;
+
+ @TableField(exist = false)
+ private String alarmContentName;
+
+ @TableField(exist = false)
+ private Integer recordId;
+
+ @Override
+ public String toString() {
+ return "AlarmJob{" +
+ "id=" + id +
+ ", jobcode=" + jobcode +
+ ", jogType=" + jobType +
+ ", wellCode=" + wellCode +
+ ", devcode=" + devcode +
+ ", createTime=" + createTime +
+ ", jobStatus=" + jobStatus +
+ ", getJobPerson=" + getJobPerson +
+ ", getJobTime=" + getJobTime +
+ ", firstState=" + firstState +
+ ", firstStatePhotos=" + firstStatePhotos +
+ ", confirmJobPerson=" + confirmJobPerson +
+ ", confrimJobTime=" + confrimJobTime +
+ ", handleJobPerson=" + handleJobPerson +
+ ", handleJobTime=" + handleJobTime +
+ ", handleMessage=" + handleMessage +
+ ", handlePhotos=" + handlePhotos +
+ ", flow=" + flow +
+ ", recordId=" + recordId +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/AlarmRecords.java b/src/main/java/com/casic/entity/AlarmRecords.java
new file mode 100644
index 0000000..88b0b26
--- /dev/null
+++ b/src/main/java/com/casic/entity/AlarmRecords.java
@@ -0,0 +1,108 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_records")
+public class AlarmRecords extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 设备ID
+ */
+ @TableField("DEVICE_ID")
+ private Long deviceId;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 闸井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 告警类型
+ */
+ @TableField("ALARM_TYPE")
+ private String alarmType;
+ /**
+ * 告警内容
+ */
+ @TableField("ALARM_CONTENT")
+ private String alarmContent;
+ /**
+ * 告警数值
+ */
+ @TableField("ALARM_VALUE")
+ private String alarmValue;
+ /**
+ * 告警等级
+ */
+ @TableField("ALARM_LEVEL")
+ private Integer alarmLevel;
+ /**
+ * 告警详情
+ */
+ @TableField("ALARM_MSG")
+ private String alarmMessage;
+ /**
+ * 告警时间
+ */
+ @TableField("ALARM_TIME")
+ private Date alarmTime;
+ /**
+ * 告警状态
+ */
+ @TableField("STATUS")
+ private String status;
+ /**
+ * 工单编号
+ */
+ @TableField("JOB_ID")
+ private Long jobId;
+
+ @TableField(exist = false)
+ private Integer jobStatus;
+
+ @Override
+ public String toString() {
+ return "AlarmRecords{" +
+ "id=" + id +
+ ", deviceId=" + deviceId +
+ ", devcode=" + devcode +
+ ", wellCode=" + wellCode +
+ ", alarmType=" + alarmType +
+ ", alarmContent=" + alarmContent +
+ ", alarmValue=" + alarmValue +
+ ", alarmLevel=" + alarmLevel +
+ ", alarmMessage=" + alarmMessage +
+ ", alarmTime=" + alarmTime +
+ ", status=" + status +
+ ", jobId=" + jobId +
+ ", jobStatus=" + jobStatus +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/DataGasDector.java b/src/main/java/com/casic/entity/DataGasDector.java
new file mode 100644
index 0000000..537789a
--- /dev/null
+++ b/src/main/java/com/casic/entity/DataGasDector.java
@@ -0,0 +1,42 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author cz
+ * @date 2022-7-1
+ */
+@Data
+@TableName("data_gas_dector")
+public class DataGasDector {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ private String devcode;
+ private String wellCode;
+ private String strength;
+
+ private String descn;
+ /**
+ * --信号与干扰加噪声比
+ */
+ private String sinr;
+ /**
+ * --参考信号接收功率
+ */
+ private String rsrp;
+ /**
+ * --物理小区标识
+ */
+ private String pci;
+ private Date uptime;
+ private Date logtime;
+}
diff --git a/src/main/java/com/casic/entity/DataGasReport.java b/src/main/java/com/casic/entity/DataGasReport.java
deleted file mode 100644
index c43ccdf..0000000
--- a/src/main/java/com/casic/entity/DataGasReport.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.casic.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author cz
- * @date 2022-7-1
- */
-@Data
-@TableName("data_gas_dector")
-public class DataGasReport {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @TableField("devcode")
- private String imei;
- private String wellcode;
-
- private String imsi;
- /**
- * --事件类型 0正常 1低报 2高报
- */
- private String gasSensorState;
- /**
- * --浓度值
- */
- private String gasSampleValue;
- /**
- * --信号与干扰加噪声比
- */
- private String sinr;
- /**
- * --参考信号接收功率
- */
- private String rsrp;
- /**
- * --物理小区标识
- */
- private String pci;
- /**
- * --心跳周期
- */
- private String heartbeatTime;
-
- /**
- * --小区位置信息
- */
- private String cellId;
- /**
- * --电池电压
- */
- private String batteryVoltage;
- /**
- * --电池电量
- */
- private String batteryValue;
- private String iccid;
- private Date uptime;
- private Date logtime;
-}
diff --git a/src/main/java/com/casic/entity/DeviceSatatus.java b/src/main/java/com/casic/entity/DeviceSatatus.java
new file mode 100644
index 0000000..bab7903
--- /dev/null
+++ b/src/main/java/com/casic/entity/DeviceSatatus.java
@@ -0,0 +1,19 @@
+package com.casic.entity;
+
+import lombok.Data;
+
+/**
+ * 不使用了
+ *
+ */
+@Data
+public class DeviceSatatus {
+ private String deviceId;
+ private String cell;
+ private String cellTs;
+ private String onlineState;
+ private String onlineTs;
+ private String lastDataId;
+ private String lastDataJson;
+ private String lastDataTs;
+}
diff --git a/src/main/java/com/casic/model/DataContentParam.java b/src/main/java/com/casic/model/DataContentParam.java
new file mode 100644
index 0000000..46d298a
--- /dev/null
+++ b/src/main/java/com/casic/model/DataContentParam.java
@@ -0,0 +1,19 @@
+package com.casic.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DataContentParam {
+ private String msg_type;
+ private String error_val;
+ private String ch_cnt;
+ private String erro_cnt;
+ private String alarm_low_cnt;
+ private String alarm_high_cnt;
+ private String offline_cnt;
+ private List rtd_val;
+ private List adc_val;
+ private List status_val;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/DataReportParam.java b/src/main/java/com/casic/model/DataReportParam.java
index 082814c..754f330 100644
--- a/src/main/java/com/casic/model/DataReportParam.java
+++ b/src/main/java/com/casic/model/DataReportParam.java
@@ -11,25 +11,12 @@
*/
@Data
public class DataReportParam {
- private String upPacketSN;
- private String upDataSN;
- private String topic;
- private String timestamp;
- private String tenantId;
- private String serviceId;
- private String protocol;
- private String productId;
- /**
- * gas_sensor_state = 1, --事件类型 0 正常 1 低报 2 高报
- * gas_sample_value = 11-- 浓度值
- */
- private Map payload;
- private String messageType;
private String deviceType;
- private String deviceId;
- private String assocAssetId;
- @JsonProperty(value = "IMSI", required = true)
- private String IMSI;
- @JsonProperty(value = "IMEI", required = true)
- private String IMEI;
+ private String iotId;
+ private String requestId;
+ private Object checkFailedData;
+ private String productKey;
+ private String gmtCreate;
+ private String deviceName;
+ private Object items;
}
diff --git a/src/main/java/com/casic/service/DeviceDataService.java b/src/main/java/com/casic/service/DeviceDataService.java
index d883fe4..457d710 100644
--- a/src/main/java/com/casic/service/DeviceDataService.java
+++ b/src/main/java/com/casic/service/DeviceDataService.java
@@ -3,25 +3,18 @@
import com.casic.model.DataReportParam;
import com.casic.model.HeartbeatParam;
import com.casic.model.ResponseData;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* @author cz
* @date 2022
*/
public interface DeviceDataService {
-
/**
*
* @param dataReportParam
* @return
*/
- ResponseData DeviceDataCommit(DataReportParam dataReportParam);
-
- /**
- *
- * @param heartbeatParam
- * @return
- */
- ResponseData heartBeatSave(HeartbeatParam heartbeatParam);
+ ResponseData gasReceiver(DataReportParam dataReportParam);
}
diff --git a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
index 93f0685..e473f0c 100644
--- a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
+++ b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
@@ -1,58 +1,49 @@
package com.casic.service.impl;
-import com.casic.dao.impl.DeviceDataMapper;
+import com.alibaba.druid.util.StringUtils;
+import com.alibaba.fastjson.JSON;
import com.casic.model.*;
import com.casic.service.DeviceDataService;
+import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.stereotype.Service;
+import java.util.Map;
+
/**
* @author cz
- * @date 2022-6-20
+ * @date 2022-9-26
*/
@Slf4j
@Service
public class DeviceDataServiceImpl implements DeviceDataService {
- @Autowired
- DeviceDataMapper deviceDataMapper;
+ private final NormalDataProcessor normalDataProcessor;
- /**
- * @param dataReportParam
- * @return
- */
- public ResponseData DeviceDataCommit(DataReportParam dataReportParam) {
- ResponseData responseData = new ResponseData();
- try {
- deviceDataMapper.addDeviceData(dataReportParam);
- responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
- responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
- } catch (DataAccessException sqlex) {
- responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
- responseData.setMessage("请求数据异常");
- responseData.setSuccess(true);
- log.error("主题:数据上报保存出现错误,异常信息为{}", sqlex);
- }
- return responseData;
+ public DeviceDataServiceImpl(NormalDataProcessor normalDataProcessor) {
+ this.normalDataProcessor = normalDataProcessor;
}
- /**
- * @param heartbeatParam
- * @return
- */
- public ResponseData heartBeatSave(HeartbeatParam heartbeatParam) {
+ public ResponseData gasReceiver(DataReportParam dataReportParam) {
ResponseData responseData = new ResponseData();
try {
- deviceDataMapper.editDeviceData(heartbeatParam);
+ Map> updDataMap = new ObjectMapper().convertValue(dataReportParam.getItems(), Map.class);
+ DataContentParam dataContentParam = JSON.parseObject(updDataMap.get("updData").get("value"), DataContentParam.class);
+ Long uptime = Long.valueOf(String.valueOf(updDataMap.get("updData").get("time")));
+ if (StringUtils.isEmpty(dataReportParam.getDeviceName())) {
+ responseData.setCode(200);
+ responseData.setMessage("没有设备编号");
+ return responseData;
+ }
+ normalDataProcessor.normalDataProvider(dataContentParam, uptime, dataReportParam.getDeviceName());
responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
} catch (DataAccessException sqlex) {
responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
responseData.setMessage("请求数据异常");
responseData.setSuccess(true);
- log.error("主题:数据心跳出现错误,异常信息为{}", sqlex);
+ log.error("主题:设备数据上报出现错误,异常信息为{}", sqlex);
}
return responseData;
}
diff --git a/src/main/java/com/casic/service/impl/NormalDataProcessor.java b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
new file mode 100644
index 0000000..3f7630a
--- /dev/null
+++ b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
@@ -0,0 +1,164 @@
+package com.casic.service.impl;
+
+import com.alibaba.druid.util.StringUtils;
+import com.casic.dao.AlarmRecordsMapper;
+import com.casic.dao.DataGasMapper;
+import com.casic.dao.impl.AlarmJobDao;
+import com.casic.entity.AlarmJob;
+import com.casic.entity.AlarmRecords;
+import com.casic.entity.DataGasDector;
+import com.casic.model.DataContentParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+import xyz.downgoon.snowflake.Snowflake;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class NormalDataProcessor {
+
+ public static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd");
+
+ @Value("${casic.device.gas-dector.type}")
+ private Long deviceType;
+ @Value("${casic.device.gas-dector.minutes}")
+ private String minutes;
+ @Value("${casic.device.gas-dector.enable-local}")
+ private Boolean enableLocal;
+ @Resource
+ private DataGasMapper dataGasMapper;
+ @Autowired
+ private AlarmJobDao alarmJobDao;
+ @Resource
+ private AlarmRecordsMapper alarmRecordsMapper;
+ private static Snowflake snowflake = new Snowflake(0, 2);
+
+ public void normalDataProvider(DataContentParam dataReportParam, Long timeStamp, String devcode) {
+ Map gasMap = dataGasMapper.getWellCode(devcode);
+ if (ObjectUtils.isEmpty(gasMap)) {
+ log.info("没有该设备编号录入" + devcode);
+ if (enableLocal) {
+ return;
+ }
+ }
+ Boolean updateFlag = false;
+ if (ObjectUtils.isEmpty(dataGasMapper.getLastData(minutes, devcode))) {
+ updateFlag = this.saveNormalData(dataReportParam, timeStamp, devcode, gasMap);
+ }
+ this.dataTaskJudge(dataReportParam, devcode, timeStamp, gasMap, updateFlag);
+ return;
+ }
+
+ /**
+ * 自定义时间存库
+ *
+ * @param dataReportParam
+ * @param timeStamp
+ * @param devcode
+ * @param gasMap
+ */
+ private Boolean saveNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap) {
+ Boolean updateFlag = false;
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ List dataReportFilter = dataReportParam.getRtd_val().stream().filter(
+ data -> {
+ return data != -1;
+ }
+ ).collect(Collectors.toList());
+ if (dataReportFilter.size() > 0 && dataReportFilter.get(dataReportFilter.size() - 1) != 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 1);
+ updateFlag = true;
+ } else if (dataReportFilter.get(dataReportFilter.size() - 1) == 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 0);
+ }
+ dataReportFilter.forEach(
+ data -> {
+ if (data != 65535) {
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+ }
+ );
+ return updateFlag;
+ }
+
+ /**
+ * 报警就存库
+ *
+ * @param dataReportParam
+ * @param devcode
+ * @param timeStamp
+ * @param gasMap
+ */
+ private void dataTaskJudge(DataContentParam dataReportParam, String devcode, Long timeStamp, Map gasMap, Boolean updateFlag) {
+ List> alarmLevelList = dataGasMapper.getAlarmLevelList(deviceType);
+ String wellCode = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "";
+ Long deviceId = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? Long.valueOf(String.valueOf(gasMap.get("deviceId"))) : -1;
+ final String gasMsgContent=dataGasMapper.getGasMsgContent(deviceType);
+ dataReportParam.getRtd_val().stream().filter(
+ dataReport -> {
+ return dataReport != -1 && dataReport != 65535;
+ }
+ ).forEach(
+ dataReport -> {
+ for (Map alarmLevelMap : alarmLevelList) {
+ if (dataReport > Float.valueOf(String.valueOf(alarmLevelMap.get("high_value")))) {
+ AlarmRecords alarmRecord = new AlarmRecords();
+ alarmRecord.setId(snowflake.nextId());
+ alarmRecord.setDeviceId(deviceId);
+ alarmRecord.setDevcode(devcode);
+ alarmRecord.setWellCode(wellCode);
+ alarmRecord.setAlarmType("1"); // 业务报警
+ alarmRecord.setAlarmContent("燃气报警");
+ alarmRecord.setAlarmValue(String.valueOf(dataReport));
+ alarmRecord.setAlarmTime(new Date());
+ alarmRecord.setStatus("1");
+ alarmRecord.setAlarmLevel(Integer.valueOf(alarmLevelMap.get("level").toString()));
+ alarmRecord.setAlarmMessage("燃气报警");
+ String jobId = alarmRecordsMapper.isOldAlarmRecord(devcode, "燃气报警");
+ // 超出报警阈值 生成一条报警消息
+ if (!StringUtils.isEmpty(jobId)) {
+ alarmRecordsMapper.updateOldAlarmRecord(devcode, "燃气报警");
+ alarmRecord.setJobId(Long.valueOf(jobId));
+ } else {
+ AlarmJob alarmJob = alarmJobDao.saveData(devcode, wellCode, "RQZD", "1");
+ alarmRecord.setJobId(alarmJob.getId());
+ }
+ alarmRecordsMapper.insert(alarmRecord);
+ if (!updateFlag) {
+ alarmNormalData(dataReportParam, timeStamp, devcode, gasMap, dataReport);
+ }
+ break;
+ }
+ }
+ }
+ );
+ }
+
+ private void alarmNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap, Integer data) {
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+
+}
+
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index fac2afe..f8a06a6 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,40 +1,19 @@
server:
- port: 11556
+ port: 11320
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
- username: root
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell_zq_cs
+ username: postgres
password: Casic203
session:
store-type: redis
- redis:
- host: 111.198.10.15
- port: 11412
- password: ew5T4K3#203lwh
- redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
jms:
pub-sub-domain: true
- # session:
- # store-type: redis
- activemq:
- user:
- password:
- broker-url: tcp://192.168.0.203:61616
-#flowable数据源和多数据源配置
-casic:
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- #kaptcha-open: false #是否开启登录时验证码 (true/false)
- no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
- db:
- init:
- enable: false
- file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
- spring-session-open: false #开启spring session
logging:
level.root: error
- level.com.casic: error
+ level.com.casic: info
file:
path: logs/
name: missiles.log
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 86411e6..ffc01e9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -19,18 +19,11 @@
mapper-locations: classpath:mapper/*.xml
#mybatis-plus:
# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
-################### mybatis-plus配置 ###################
-################### casic配置 ###################
-flowable:
- checkProcessDefinitions: false #不校验process文件
casic:
- swagger-open: false #是否开启swagger (true/false)
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- muti-datasource-open: false #是否开启多数据源(true/false)
- spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
- session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
- session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
- extUrl: sys
- config:
- export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
- config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
+ device:
+ gas-dector:
+ type: 101
+ minutes: 60
+ enable-local: false
+# type 可燃气体的设备类型
+# minutes: 燃气外协设备上传数据的分钟数
\ No newline at end of file
diff --git a/target/classes/application-dev.yml b/target/classes/application-dev.yml
new file mode 100644
index 0000000..fac2afe
--- /dev/null
+++ b/target/classes/application-dev.yml
@@ -0,0 +1,40 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
+ username: root
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+logging:
+ level.root: error
+ level.com.casic: error
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/target/classes/application-postgre.yml b/target/classes/application-postgre.yml
new file mode 100644
index 0000000..2b7f69c
--- /dev/null
+++ b/target/classes/application-postgre.yml
@@ -0,0 +1,62 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell
+ username: postgres
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ redis-config:
+ host: 127.0.0.1
+ port: 6379
+ password:
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+smartcity:
+ config:
+ export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+ #export-path: D:\export\
+ image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\
+ config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\
+ download-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\download\
+ device:
+ redis:
+ invalid-time: 86400
+ host: 127.0.0.1
+ port: 6379
+ password: ew5T4K3#203lwh
+ config-prefix: 'Casic:'
+ getui:
+ appId: H9jSTE2bAt8QWq2K2GNOB3
+ appKey: bhPeCutJVdAyOasevQFtN9
+ masterSecret: lChudND74A89WRiHLkedb5
+logging:
+ level.root: info
+ level.com.casic: info
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/target/classes/application.yml b/target/classes/application.yml
new file mode 100644
index 0000000..86411e6
--- /dev/null
+++ b/target/classes/application.yml
@@ -0,0 +1,36 @@
+##########################################################
+################## 所有profile共有的配置 #################
+##########################################################
+spring:
+ profiles:
+ active: dev
+ servlet:
+ multipart:
+ max-file-size: 50MB
+ max-request-size: 80MB
+mybatis-plus:
+ global-config:
+ enable-sql-runner: true
+ configuration:
+ # 配置结果集属性为空时 是否映射返回结果
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
+ mapper-locations: classpath:mapper/*.xml
+mybatis:
+ mapper-locations: classpath:mapper/*.xml
+#mybatis-plus:
+# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
+################### mybatis-plus配置 ###################
+################### casic配置 ###################
+flowable:
+ checkProcessDefinitions: false #不校验process文件
+casic:
+ swagger-open: false #是否开启swagger (true/false)
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ muti-datasource-open: false #是否开启多数据源(true/false)
+ spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
+ session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
+ session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
+ extUrl: sys
+ config:
+ export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+ config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
diff --git a/target/classes/com/casic/CasicApplication.class b/target/classes/com/casic/CasicApplication.class
new file mode 100644
index 0000000..68c2f95
--- /dev/null
+++ b/target/classes/com/casic/CasicApplication.class
Binary files differ
diff --git a/target/classes/com/casic/controller/DeviceController.class b/target/classes/com/casic/controller/DeviceController.class
new file mode 100644
index 0000000..478d6ae
--- /dev/null
+++ b/target/classes/com/casic/controller/DeviceController.class
Binary files differ
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..814888c
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,321 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ * 报警工单表
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_job")
+public class AlarmJob extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 工单编号
+ */
+ @TableField("JOBCODE")
+ private String jobcode;
+ /**
+ * 工单类型
+ */
+ @TableField("JOG_TYPE")
+ private String jobType;
+ /**
+ * 井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 工单创建时间
+ */
+ @TableField("CREATE_TIME")
+ private Date createTime;
+ /**
+ * 工单状态（0待处理，1待确认，2处理中，3完成）
+ */
+ @TableField("JOB_STATUS")
+ private String jobStatus;
+ /**
+ * 接单人员
+ */
+ @TableField("GET_JOB_PERSON")
+ private Long getJobPerson;
+ /**
+ * 接单时间
+ */
+ @TableField("GET_JOB_TIME")
+ private Date getJobTime;
+ /**
+ * 应接单时间
+ */
+ @TableField("SHOULD_GET_TIME")
+ private Date shouldGetTime;
+ /**
+ * 第一现场情况
+ */
+ @TableField("FIRST_STATE")
+ private String firstState;
+ /**
+ * 第一现场照片
+ */
+ @TableField("FIRST_STATE_PHOTOS")
+ private String firstStatePhotos;
+ /**
+ * 确认人员
+ */
+ @TableField("CONFIRM_JOB_PERSON")
+ private Long confirmJobPerson;
+ /**
+ * 确认时间
+ */
+ @TableField("CONFRIM_JOB_TIME")
+ private Date confrimJobTime;
+ /**
+ * 处理人员
+ */
+ @TableField("HANDLE_JOB_Person")
+ private Long handleJobPerson;
+ /**
+ * 处理时间
+ */
+ @TableField("HANDLE_JOB_TIME")
+ private Date handleJobTime;
+ /**
+ * 维护情况记录
+ */
+ @TableField("HANDLE_MESSAGE")
+ private String handleMessage;
+ /**
+ * 维护图片
+ */
+ @TableField("HANDLE_PHOTOS")
+ private String handlePhotos;
+ /**
+ * 工单流转记录
+ */
+ @TableField("FLOW")
+ private String flow;
+
+ @TableField("JOB_BELONG_TO")
+ private Long jobBelongTo;
+
+ @TableField("JOB_FLAG_DELAY")
+ private String jobFlagDelay;
+
+ @TableField("JOB_FLAG_1")
+ private String jobFlag1;
+
+ @TableField(exist = false)
+ private String alarmValue;
+
+ @TableField(exist = false)
+ private String alarmContentName;
+
+ @TableField(exist = false)
+ private Integer recordId;
+
+ @Override
+ public String toString() {
+ return "AlarmJob{" +
+ "id=" + id +
+ ", jobcode=" + jobcode +
+ ", jogType=" + jobType +
+ ", wellCode=" + wellCode +
+ ", devcode=" + devcode +
+ ", createTime=" + createTime +
+ ", jobStatus=" + jobStatus +
+ ", getJobPerson=" + getJobPerson +
+ ", getJobTime=" + getJobTime +
+ ", firstState=" + firstState +
+ ", firstStatePhotos=" + firstStatePhotos +
+ ", confirmJobPerson=" + confirmJobPerson +
+ ", confrimJobTime=" + confrimJobTime +
+ ", handleJobPerson=" + handleJobPerson +
+ ", handleJobTime=" + handleJobTime +
+ ", handleMessage=" + handleMessage +
+ ", handlePhotos=" + handlePhotos +
+ ", flow=" + flow +
+ ", recordId=" + recordId +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/AlarmRecords.java b/src/main/java/com/casic/entity/AlarmRecords.java
new file mode 100644
index 0000000..88b0b26
--- /dev/null
+++ b/src/main/java/com/casic/entity/AlarmRecords.java
@@ -0,0 +1,108 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_records")
+public class AlarmRecords extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 设备ID
+ */
+ @TableField("DEVICE_ID")
+ private Long deviceId;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 闸井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 告警类型
+ */
+ @TableField("ALARM_TYPE")
+ private String alarmType;
+ /**
+ * 告警内容
+ */
+ @TableField("ALARM_CONTENT")
+ private String alarmContent;
+ /**
+ * 告警数值
+ */
+ @TableField("ALARM_VALUE")
+ private String alarmValue;
+ /**
+ * 告警等级
+ */
+ @TableField("ALARM_LEVEL")
+ private Integer alarmLevel;
+ /**
+ * 告警详情
+ */
+ @TableField("ALARM_MSG")
+ private String alarmMessage;
+ /**
+ * 告警时间
+ */
+ @TableField("ALARM_TIME")
+ private Date alarmTime;
+ /**
+ * 告警状态
+ */
+ @TableField("STATUS")
+ private String status;
+ /**
+ * 工单编号
+ */
+ @TableField("JOB_ID")
+ private Long jobId;
+
+ @TableField(exist = false)
+ private Integer jobStatus;
+
+ @Override
+ public String toString() {
+ return "AlarmRecords{" +
+ "id=" + id +
+ ", deviceId=" + deviceId +
+ ", devcode=" + devcode +
+ ", wellCode=" + wellCode +
+ ", alarmType=" + alarmType +
+ ", alarmContent=" + alarmContent +
+ ", alarmValue=" + alarmValue +
+ ", alarmLevel=" + alarmLevel +
+ ", alarmMessage=" + alarmMessage +
+ ", alarmTime=" + alarmTime +
+ ", status=" + status +
+ ", jobId=" + jobId +
+ ", jobStatus=" + jobStatus +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/DataGasDector.java b/src/main/java/com/casic/entity/DataGasDector.java
new file mode 100644
index 0000000..537789a
--- /dev/null
+++ b/src/main/java/com/casic/entity/DataGasDector.java
@@ -0,0 +1,42 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author cz
+ * @date 2022-7-1
+ */
+@Data
+@TableName("data_gas_dector")
+public class DataGasDector {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ private String devcode;
+ private String wellCode;
+ private String strength;
+
+ private String descn;
+ /**
+ * --信号与干扰加噪声比
+ */
+ private String sinr;
+ /**
+ * --参考信号接收功率
+ */
+ private String rsrp;
+ /**
+ * --物理小区标识
+ */
+ private String pci;
+ private Date uptime;
+ private Date logtime;
+}
diff --git a/src/main/java/com/casic/entity/DataGasReport.java b/src/main/java/com/casic/entity/DataGasReport.java
deleted file mode 100644
index c43ccdf..0000000
--- a/src/main/java/com/casic/entity/DataGasReport.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.casic.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author cz
- * @date 2022-7-1
- */
-@Data
-@TableName("data_gas_dector")
-public class DataGasReport {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @TableField("devcode")
- private String imei;
- private String wellcode;
-
- private String imsi;
- /**
- * --事件类型 0正常 1低报 2高报
- */
- private String gasSensorState;
- /**
- * --浓度值
- */
- private String gasSampleValue;
- /**
- * --信号与干扰加噪声比
- */
- private String sinr;
- /**
- * --参考信号接收功率
- */
- private String rsrp;
- /**
- * --物理小区标识
- */
- private String pci;
- /**
- * --心跳周期
- */
- private String heartbeatTime;
-
- /**
- * --小区位置信息
- */
- private String cellId;
- /**
- * --电池电压
- */
- private String batteryVoltage;
- /**
- * --电池电量
- */
- private String batteryValue;
- private String iccid;
- private Date uptime;
- private Date logtime;
-}
diff --git a/src/main/java/com/casic/entity/DeviceSatatus.java b/src/main/java/com/casic/entity/DeviceSatatus.java
new file mode 100644
index 0000000..bab7903
--- /dev/null
+++ b/src/main/java/com/casic/entity/DeviceSatatus.java
@@ -0,0 +1,19 @@
+package com.casic.entity;
+
+import lombok.Data;
+
+/**
+ * 不使用了
+ *
+ */
+@Data
+public class DeviceSatatus {
+ private String deviceId;
+ private String cell;
+ private String cellTs;
+ private String onlineState;
+ private String onlineTs;
+ private String lastDataId;
+ private String lastDataJson;
+ private String lastDataTs;
+}
diff --git a/src/main/java/com/casic/model/DataContentParam.java b/src/main/java/com/casic/model/DataContentParam.java
new file mode 100644
index 0000000..46d298a
--- /dev/null
+++ b/src/main/java/com/casic/model/DataContentParam.java
@@ -0,0 +1,19 @@
+package com.casic.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DataContentParam {
+ private String msg_type;
+ private String error_val;
+ private String ch_cnt;
+ private String erro_cnt;
+ private String alarm_low_cnt;
+ private String alarm_high_cnt;
+ private String offline_cnt;
+ private List rtd_val;
+ private List adc_val;
+ private List status_val;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/DataReportParam.java b/src/main/java/com/casic/model/DataReportParam.java
index 082814c..754f330 100644
--- a/src/main/java/com/casic/model/DataReportParam.java
+++ b/src/main/java/com/casic/model/DataReportParam.java
@@ -11,25 +11,12 @@
*/
@Data
public class DataReportParam {
- private String upPacketSN;
- private String upDataSN;
- private String topic;
- private String timestamp;
- private String tenantId;
- private String serviceId;
- private String protocol;
- private String productId;
- /**
- * gas_sensor_state = 1, --事件类型 0 正常 1 低报 2 高报
- * gas_sample_value = 11-- 浓度值
- */
- private Map payload;
- private String messageType;
private String deviceType;
- private String deviceId;
- private String assocAssetId;
- @JsonProperty(value = "IMSI", required = true)
- private String IMSI;
- @JsonProperty(value = "IMEI", required = true)
- private String IMEI;
+ private String iotId;
+ private String requestId;
+ private Object checkFailedData;
+ private String productKey;
+ private String gmtCreate;
+ private String deviceName;
+ private Object items;
}
diff --git a/src/main/java/com/casic/service/DeviceDataService.java b/src/main/java/com/casic/service/DeviceDataService.java
index d883fe4..457d710 100644
--- a/src/main/java/com/casic/service/DeviceDataService.java
+++ b/src/main/java/com/casic/service/DeviceDataService.java
@@ -3,25 +3,18 @@
import com.casic.model.DataReportParam;
import com.casic.model.HeartbeatParam;
import com.casic.model.ResponseData;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* @author cz
* @date 2022
*/
public interface DeviceDataService {
-
/**
*
* @param dataReportParam
* @return
*/
- ResponseData DeviceDataCommit(DataReportParam dataReportParam);
-
- /**
- *
- * @param heartbeatParam
- * @return
- */
- ResponseData heartBeatSave(HeartbeatParam heartbeatParam);
+ ResponseData gasReceiver(DataReportParam dataReportParam);
}
diff --git a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
index 93f0685..e473f0c 100644
--- a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
+++ b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
@@ -1,58 +1,49 @@
package com.casic.service.impl;
-import com.casic.dao.impl.DeviceDataMapper;
+import com.alibaba.druid.util.StringUtils;
+import com.alibaba.fastjson.JSON;
import com.casic.model.*;
import com.casic.service.DeviceDataService;
+import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.stereotype.Service;
+import java.util.Map;
+
/**
* @author cz
- * @date 2022-6-20
+ * @date 2022-9-26
*/
@Slf4j
@Service
public class DeviceDataServiceImpl implements DeviceDataService {
- @Autowired
- DeviceDataMapper deviceDataMapper;
+ private final NormalDataProcessor normalDataProcessor;
- /**
- * @param dataReportParam
- * @return
- */
- public ResponseData DeviceDataCommit(DataReportParam dataReportParam) {
- ResponseData responseData = new ResponseData();
- try {
- deviceDataMapper.addDeviceData(dataReportParam);
- responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
- responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
- } catch (DataAccessException sqlex) {
- responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
- responseData.setMessage("请求数据异常");
- responseData.setSuccess(true);
- log.error("主题:数据上报保存出现错误,异常信息为{}", sqlex);
- }
- return responseData;
+ public DeviceDataServiceImpl(NormalDataProcessor normalDataProcessor) {
+ this.normalDataProcessor = normalDataProcessor;
}
- /**
- * @param heartbeatParam
- * @return
- */
- public ResponseData heartBeatSave(HeartbeatParam heartbeatParam) {
+ public ResponseData gasReceiver(DataReportParam dataReportParam) {
ResponseData responseData = new ResponseData();
try {
- deviceDataMapper.editDeviceData(heartbeatParam);
+ Map> updDataMap = new ObjectMapper().convertValue(dataReportParam.getItems(), Map.class);
+ DataContentParam dataContentParam = JSON.parseObject(updDataMap.get("updData").get("value"), DataContentParam.class);
+ Long uptime = Long.valueOf(String.valueOf(updDataMap.get("updData").get("time")));
+ if (StringUtils.isEmpty(dataReportParam.getDeviceName())) {
+ responseData.setCode(200);
+ responseData.setMessage("没有设备编号");
+ return responseData;
+ }
+ normalDataProcessor.normalDataProvider(dataContentParam, uptime, dataReportParam.getDeviceName());
responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
} catch (DataAccessException sqlex) {
responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
responseData.setMessage("请求数据异常");
responseData.setSuccess(true);
- log.error("主题:数据心跳出现错误,异常信息为{}", sqlex);
+ log.error("主题:设备数据上报出现错误,异常信息为{}", sqlex);
}
return responseData;
}
diff --git a/src/main/java/com/casic/service/impl/NormalDataProcessor.java b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
new file mode 100644
index 0000000..3f7630a
--- /dev/null
+++ b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
@@ -0,0 +1,164 @@
+package com.casic.service.impl;
+
+import com.alibaba.druid.util.StringUtils;
+import com.casic.dao.AlarmRecordsMapper;
+import com.casic.dao.DataGasMapper;
+import com.casic.dao.impl.AlarmJobDao;
+import com.casic.entity.AlarmJob;
+import com.casic.entity.AlarmRecords;
+import com.casic.entity.DataGasDector;
+import com.casic.model.DataContentParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+import xyz.downgoon.snowflake.Snowflake;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class NormalDataProcessor {
+
+ public static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd");
+
+ @Value("${casic.device.gas-dector.type}")
+ private Long deviceType;
+ @Value("${casic.device.gas-dector.minutes}")
+ private String minutes;
+ @Value("${casic.device.gas-dector.enable-local}")
+ private Boolean enableLocal;
+ @Resource
+ private DataGasMapper dataGasMapper;
+ @Autowired
+ private AlarmJobDao alarmJobDao;
+ @Resource
+ private AlarmRecordsMapper alarmRecordsMapper;
+ private static Snowflake snowflake = new Snowflake(0, 2);
+
+ public void normalDataProvider(DataContentParam dataReportParam, Long timeStamp, String devcode) {
+ Map gasMap = dataGasMapper.getWellCode(devcode);
+ if (ObjectUtils.isEmpty(gasMap)) {
+ log.info("没有该设备编号录入" + devcode);
+ if (enableLocal) {
+ return;
+ }
+ }
+ Boolean updateFlag = false;
+ if (ObjectUtils.isEmpty(dataGasMapper.getLastData(minutes, devcode))) {
+ updateFlag = this.saveNormalData(dataReportParam, timeStamp, devcode, gasMap);
+ }
+ this.dataTaskJudge(dataReportParam, devcode, timeStamp, gasMap, updateFlag);
+ return;
+ }
+
+ /**
+ * 自定义时间存库
+ *
+ * @param dataReportParam
+ * @param timeStamp
+ * @param devcode
+ * @param gasMap
+ */
+ private Boolean saveNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap) {
+ Boolean updateFlag = false;
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ List dataReportFilter = dataReportParam.getRtd_val().stream().filter(
+ data -> {
+ return data != -1;
+ }
+ ).collect(Collectors.toList());
+ if (dataReportFilter.size() > 0 && dataReportFilter.get(dataReportFilter.size() - 1) != 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 1);
+ updateFlag = true;
+ } else if (dataReportFilter.get(dataReportFilter.size() - 1) == 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 0);
+ }
+ dataReportFilter.forEach(
+ data -> {
+ if (data != 65535) {
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+ }
+ );
+ return updateFlag;
+ }
+
+ /**
+ * 报警就存库
+ *
+ * @param dataReportParam
+ * @param devcode
+ * @param timeStamp
+ * @param gasMap
+ */
+ private void dataTaskJudge(DataContentParam dataReportParam, String devcode, Long timeStamp, Map gasMap, Boolean updateFlag) {
+ List> alarmLevelList = dataGasMapper.getAlarmLevelList(deviceType);
+ String wellCode = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "";
+ Long deviceId = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? Long.valueOf(String.valueOf(gasMap.get("deviceId"))) : -1;
+ final String gasMsgContent=dataGasMapper.getGasMsgContent(deviceType);
+ dataReportParam.getRtd_val().stream().filter(
+ dataReport -> {
+ return dataReport != -1 && dataReport != 65535;
+ }
+ ).forEach(
+ dataReport -> {
+ for (Map alarmLevelMap : alarmLevelList) {
+ if (dataReport > Float.valueOf(String.valueOf(alarmLevelMap.get("high_value")))) {
+ AlarmRecords alarmRecord = new AlarmRecords();
+ alarmRecord.setId(snowflake.nextId());
+ alarmRecord.setDeviceId(deviceId);
+ alarmRecord.setDevcode(devcode);
+ alarmRecord.setWellCode(wellCode);
+ alarmRecord.setAlarmType("1"); // 业务报警
+ alarmRecord.setAlarmContent("燃气报警");
+ alarmRecord.setAlarmValue(String.valueOf(dataReport));
+ alarmRecord.setAlarmTime(new Date());
+ alarmRecord.setStatus("1");
+ alarmRecord.setAlarmLevel(Integer.valueOf(alarmLevelMap.get("level").toString()));
+ alarmRecord.setAlarmMessage("燃气报警");
+ String jobId = alarmRecordsMapper.isOldAlarmRecord(devcode, "燃气报警");
+ // 超出报警阈值 生成一条报警消息
+ if (!StringUtils.isEmpty(jobId)) {
+ alarmRecordsMapper.updateOldAlarmRecord(devcode, "燃气报警");
+ alarmRecord.setJobId(Long.valueOf(jobId));
+ } else {
+ AlarmJob alarmJob = alarmJobDao.saveData(devcode, wellCode, "RQZD", "1");
+ alarmRecord.setJobId(alarmJob.getId());
+ }
+ alarmRecordsMapper.insert(alarmRecord);
+ if (!updateFlag) {
+ alarmNormalData(dataReportParam, timeStamp, devcode, gasMap, dataReport);
+ }
+ break;
+ }
+ }
+ }
+ );
+ }
+
+ private void alarmNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap, Integer data) {
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+
+}
+
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index fac2afe..f8a06a6 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,40 +1,19 @@
server:
- port: 11556
+ port: 11320
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
- username: root
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell_zq_cs
+ username: postgres
password: Casic203
session:
store-type: redis
- redis:
- host: 111.198.10.15
- port: 11412
- password: ew5T4K3#203lwh
- redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
jms:
pub-sub-domain: true
- # session:
- # store-type: redis
- activemq:
- user:
- password:
- broker-url: tcp://192.168.0.203:61616
-#flowable数据源和多数据源配置
-casic:
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- #kaptcha-open: false #是否开启登录时验证码 (true/false)
- no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
- db:
- init:
- enable: false
- file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
- spring-session-open: false #开启spring session
logging:
level.root: error
- level.com.casic: error
+ level.com.casic: info
file:
path: logs/
name: missiles.log
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 86411e6..ffc01e9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -19,18 +19,11 @@
mapper-locations: classpath:mapper/*.xml
#mybatis-plus:
# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
-################### mybatis-plus配置 ###################
-################### casic配置 ###################
-flowable:
- checkProcessDefinitions: false #不校验process文件
casic:
- swagger-open: false #是否开启swagger (true/false)
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- muti-datasource-open: false #是否开启多数据源(true/false)
- spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
- session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
- session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
- extUrl: sys
- config:
- export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
- config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
+ device:
+ gas-dector:
+ type: 101
+ minutes: 60
+ enable-local: false
+# type 可燃气体的设备类型
+# minutes: 燃气外协设备上传数据的分钟数
\ No newline at end of file
diff --git a/target/classes/application-dev.yml b/target/classes/application-dev.yml
new file mode 100644
index 0000000..fac2afe
--- /dev/null
+++ b/target/classes/application-dev.yml
@@ -0,0 +1,40 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
+ username: root
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+logging:
+ level.root: error
+ level.com.casic: error
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/target/classes/application-postgre.yml b/target/classes/application-postgre.yml
new file mode 100644
index 0000000..2b7f69c
--- /dev/null
+++ b/target/classes/application-postgre.yml
@@ -0,0 +1,62 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell
+ username: postgres
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ redis-config:
+ host: 127.0.0.1
+ port: 6379
+ password:
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+smartcity:
+ config:
+ export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+ #export-path: D:\export\
+ image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\
+ config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\
+ download-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\download\
+ device:
+ redis:
+ invalid-time: 86400
+ host: 127.0.0.1
+ port: 6379
+ password: ew5T4K3#203lwh
+ config-prefix: 'Casic:'
+ getui:
+ appId: H9jSTE2bAt8QWq2K2GNOB3
+ appKey: bhPeCutJVdAyOasevQFtN9
+ masterSecret: lChudND74A89WRiHLkedb5
+logging:
+ level.root: info
+ level.com.casic: info
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/target/classes/application.yml b/target/classes/application.yml
new file mode 100644
index 0000000..86411e6
--- /dev/null
+++ b/target/classes/application.yml
@@ -0,0 +1,36 @@
+##########################################################
+################## 所有profile共有的配置 #################
+##########################################################
+spring:
+ profiles:
+ active: dev
+ servlet:
+ multipart:
+ max-file-size: 50MB
+ max-request-size: 80MB
+mybatis-plus:
+ global-config:
+ enable-sql-runner: true
+ configuration:
+ # 配置结果集属性为空时 是否映射返回结果
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
+ mapper-locations: classpath:mapper/*.xml
+mybatis:
+ mapper-locations: classpath:mapper/*.xml
+#mybatis-plus:
+# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
+################### mybatis-plus配置 ###################
+################### casic配置 ###################
+flowable:
+ checkProcessDefinitions: false #不校验process文件
+casic:
+ swagger-open: false #是否开启swagger (true/false)
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ muti-datasource-open: false #是否开启多数据源(true/false)
+ spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
+ session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
+ session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
+ extUrl: sys
+ config:
+ export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+ config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
diff --git a/target/classes/com/casic/CasicApplication.class b/target/classes/com/casic/CasicApplication.class
new file mode 100644
index 0000000..68c2f95
--- /dev/null
+++ b/target/classes/com/casic/CasicApplication.class
Binary files differ
diff --git a/target/classes/com/casic/controller/DeviceController.class b/target/classes/com/casic/controller/DeviceController.class
new file mode 100644
index 0000000..478d6ae
--- /dev/null
+++ b/target/classes/com/casic/controller/DeviceController.class
Binary files differ
diff --git a/target/classes/com/casic/controller/DeviceDataController.class b/target/classes/com/casic/controller/DeviceDataController.class
new file mode 100644
index 0000000..1f4400c
--- /dev/null
+++ b/target/classes/com/casic/controller/DeviceDataController.class
Binary files differ
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..814888c
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,321 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ * 报警工单表
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_job")
+public class AlarmJob extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 工单编号
+ */
+ @TableField("JOBCODE")
+ private String jobcode;
+ /**
+ * 工单类型
+ */
+ @TableField("JOG_TYPE")
+ private String jobType;
+ /**
+ * 井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 工单创建时间
+ */
+ @TableField("CREATE_TIME")
+ private Date createTime;
+ /**
+ * 工单状态（0待处理，1待确认，2处理中，3完成）
+ */
+ @TableField("JOB_STATUS")
+ private String jobStatus;
+ /**
+ * 接单人员
+ */
+ @TableField("GET_JOB_PERSON")
+ private Long getJobPerson;
+ /**
+ * 接单时间
+ */
+ @TableField("GET_JOB_TIME")
+ private Date getJobTime;
+ /**
+ * 应接单时间
+ */
+ @TableField("SHOULD_GET_TIME")
+ private Date shouldGetTime;
+ /**
+ * 第一现场情况
+ */
+ @TableField("FIRST_STATE")
+ private String firstState;
+ /**
+ * 第一现场照片
+ */
+ @TableField("FIRST_STATE_PHOTOS")
+ private String firstStatePhotos;
+ /**
+ * 确认人员
+ */
+ @TableField("CONFIRM_JOB_PERSON")
+ private Long confirmJobPerson;
+ /**
+ * 确认时间
+ */
+ @TableField("CONFRIM_JOB_TIME")
+ private Date confrimJobTime;
+ /**
+ * 处理人员
+ */
+ @TableField("HANDLE_JOB_Person")
+ private Long handleJobPerson;
+ /**
+ * 处理时间
+ */
+ @TableField("HANDLE_JOB_TIME")
+ private Date handleJobTime;
+ /**
+ * 维护情况记录
+ */
+ @TableField("HANDLE_MESSAGE")
+ private String handleMessage;
+ /**
+ * 维护图片
+ */
+ @TableField("HANDLE_PHOTOS")
+ private String handlePhotos;
+ /**
+ * 工单流转记录
+ */
+ @TableField("FLOW")
+ private String flow;
+
+ @TableField("JOB_BELONG_TO")
+ private Long jobBelongTo;
+
+ @TableField("JOB_FLAG_DELAY")
+ private String jobFlagDelay;
+
+ @TableField("JOB_FLAG_1")
+ private String jobFlag1;
+
+ @TableField(exist = false)
+ private String alarmValue;
+
+ @TableField(exist = false)
+ private String alarmContentName;
+
+ @TableField(exist = false)
+ private Integer recordId;
+
+ @Override
+ public String toString() {
+ return "AlarmJob{" +
+ "id=" + id +
+ ", jobcode=" + jobcode +
+ ", jogType=" + jobType +
+ ", wellCode=" + wellCode +
+ ", devcode=" + devcode +
+ ", createTime=" + createTime +
+ ", jobStatus=" + jobStatus +
+ ", getJobPerson=" + getJobPerson +
+ ", getJobTime=" + getJobTime +
+ ", firstState=" + firstState +
+ ", firstStatePhotos=" + firstStatePhotos +
+ ", confirmJobPerson=" + confirmJobPerson +
+ ", confrimJobTime=" + confrimJobTime +
+ ", handleJobPerson=" + handleJobPerson +
+ ", handleJobTime=" + handleJobTime +
+ ", handleMessage=" + handleMessage +
+ ", handlePhotos=" + handlePhotos +
+ ", flow=" + flow +
+ ", recordId=" + recordId +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/AlarmRecords.java b/src/main/java/com/casic/entity/AlarmRecords.java
new file mode 100644
index 0000000..88b0b26
--- /dev/null
+++ b/src/main/java/com/casic/entity/AlarmRecords.java
@@ -0,0 +1,108 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_records")
+public class AlarmRecords extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 设备ID
+ */
+ @TableField("DEVICE_ID")
+ private Long deviceId;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 闸井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 告警类型
+ */
+ @TableField("ALARM_TYPE")
+ private String alarmType;
+ /**
+ * 告警内容
+ */
+ @TableField("ALARM_CONTENT")
+ private String alarmContent;
+ /**
+ * 告警数值
+ */
+ @TableField("ALARM_VALUE")
+ private String alarmValue;
+ /**
+ * 告警等级
+ */
+ @TableField("ALARM_LEVEL")
+ private Integer alarmLevel;
+ /**
+ * 告警详情
+ */
+ @TableField("ALARM_MSG")
+ private String alarmMessage;
+ /**
+ * 告警时间
+ */
+ @TableField("ALARM_TIME")
+ private Date alarmTime;
+ /**
+ * 告警状态
+ */
+ @TableField("STATUS")
+ private String status;
+ /**
+ * 工单编号
+ */
+ @TableField("JOB_ID")
+ private Long jobId;
+
+ @TableField(exist = false)
+ private Integer jobStatus;
+
+ @Override
+ public String toString() {
+ return "AlarmRecords{" +
+ "id=" + id +
+ ", deviceId=" + deviceId +
+ ", devcode=" + devcode +
+ ", wellCode=" + wellCode +
+ ", alarmType=" + alarmType +
+ ", alarmContent=" + alarmContent +
+ ", alarmValue=" + alarmValue +
+ ", alarmLevel=" + alarmLevel +
+ ", alarmMessage=" + alarmMessage +
+ ", alarmTime=" + alarmTime +
+ ", status=" + status +
+ ", jobId=" + jobId +
+ ", jobStatus=" + jobStatus +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/DataGasDector.java b/src/main/java/com/casic/entity/DataGasDector.java
new file mode 100644
index 0000000..537789a
--- /dev/null
+++ b/src/main/java/com/casic/entity/DataGasDector.java
@@ -0,0 +1,42 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author cz
+ * @date 2022-7-1
+ */
+@Data
+@TableName("data_gas_dector")
+public class DataGasDector {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ private String devcode;
+ private String wellCode;
+ private String strength;
+
+ private String descn;
+ /**
+ * --信号与干扰加噪声比
+ */
+ private String sinr;
+ /**
+ * --参考信号接收功率
+ */
+ private String rsrp;
+ /**
+ * --物理小区标识
+ */
+ private String pci;
+ private Date uptime;
+ private Date logtime;
+}
diff --git a/src/main/java/com/casic/entity/DataGasReport.java b/src/main/java/com/casic/entity/DataGasReport.java
deleted file mode 100644
index c43ccdf..0000000
--- a/src/main/java/com/casic/entity/DataGasReport.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.casic.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author cz
- * @date 2022-7-1
- */
-@Data
-@TableName("data_gas_dector")
-public class DataGasReport {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @TableField("devcode")
- private String imei;
- private String wellcode;
-
- private String imsi;
- /**
- * --事件类型 0正常 1低报 2高报
- */
- private String gasSensorState;
- /**
- * --浓度值
- */
- private String gasSampleValue;
- /**
- * --信号与干扰加噪声比
- */
- private String sinr;
- /**
- * --参考信号接收功率
- */
- private String rsrp;
- /**
- * --物理小区标识
- */
- private String pci;
- /**
- * --心跳周期
- */
- private String heartbeatTime;
-
- /**
- * --小区位置信息
- */
- private String cellId;
- /**
- * --电池电压
- */
- private String batteryVoltage;
- /**
- * --电池电量
- */
- private String batteryValue;
- private String iccid;
- private Date uptime;
- private Date logtime;
-}
diff --git a/src/main/java/com/casic/entity/DeviceSatatus.java b/src/main/java/com/casic/entity/DeviceSatatus.java
new file mode 100644
index 0000000..bab7903
--- /dev/null
+++ b/src/main/java/com/casic/entity/DeviceSatatus.java
@@ -0,0 +1,19 @@
+package com.casic.entity;
+
+import lombok.Data;
+
+/**
+ * 不使用了
+ *
+ */
+@Data
+public class DeviceSatatus {
+ private String deviceId;
+ private String cell;
+ private String cellTs;
+ private String onlineState;
+ private String onlineTs;
+ private String lastDataId;
+ private String lastDataJson;
+ private String lastDataTs;
+}
diff --git a/src/main/java/com/casic/model/DataContentParam.java b/src/main/java/com/casic/model/DataContentParam.java
new file mode 100644
index 0000000..46d298a
--- /dev/null
+++ b/src/main/java/com/casic/model/DataContentParam.java
@@ -0,0 +1,19 @@
+package com.casic.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DataContentParam {
+ private String msg_type;
+ private String error_val;
+ private String ch_cnt;
+ private String erro_cnt;
+ private String alarm_low_cnt;
+ private String alarm_high_cnt;
+ private String offline_cnt;
+ private List rtd_val;
+ private List adc_val;
+ private List status_val;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/DataReportParam.java b/src/main/java/com/casic/model/DataReportParam.java
index 082814c..754f330 100644
--- a/src/main/java/com/casic/model/DataReportParam.java
+++ b/src/main/java/com/casic/model/DataReportParam.java
@@ -11,25 +11,12 @@
*/
@Data
public class DataReportParam {
- private String upPacketSN;
- private String upDataSN;
- private String topic;
- private String timestamp;
- private String tenantId;
- private String serviceId;
- private String protocol;
- private String productId;
- /**
- * gas_sensor_state = 1, --事件类型 0 正常 1 低报 2 高报
- * gas_sample_value = 11-- 浓度值
- */
- private Map payload;
- private String messageType;
private String deviceType;
- private String deviceId;
- private String assocAssetId;
- @JsonProperty(value = "IMSI", required = true)
- private String IMSI;
- @JsonProperty(value = "IMEI", required = true)
- private String IMEI;
+ private String iotId;
+ private String requestId;
+ private Object checkFailedData;
+ private String productKey;
+ private String gmtCreate;
+ private String deviceName;
+ private Object items;
}
diff --git a/src/main/java/com/casic/service/DeviceDataService.java b/src/main/java/com/casic/service/DeviceDataService.java
index d883fe4..457d710 100644
--- a/src/main/java/com/casic/service/DeviceDataService.java
+++ b/src/main/java/com/casic/service/DeviceDataService.java
@@ -3,25 +3,18 @@
import com.casic.model.DataReportParam;
import com.casic.model.HeartbeatParam;
import com.casic.model.ResponseData;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* @author cz
* @date 2022
*/
public interface DeviceDataService {
-
/**
*
* @param dataReportParam
* @return
*/
- ResponseData DeviceDataCommit(DataReportParam dataReportParam);
-
- /**
- *
- * @param heartbeatParam
- * @return
- */
- ResponseData heartBeatSave(HeartbeatParam heartbeatParam);
+ ResponseData gasReceiver(DataReportParam dataReportParam);
}
diff --git a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
index 93f0685..e473f0c 100644
--- a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
+++ b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
@@ -1,58 +1,49 @@
package com.casic.service.impl;
-import com.casic.dao.impl.DeviceDataMapper;
+import com.alibaba.druid.util.StringUtils;
+import com.alibaba.fastjson.JSON;
import com.casic.model.*;
import com.casic.service.DeviceDataService;
+import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.stereotype.Service;
+import java.util.Map;
+
/**
* @author cz
- * @date 2022-6-20
+ * @date 2022-9-26
*/
@Slf4j
@Service
public class DeviceDataServiceImpl implements DeviceDataService {
- @Autowired
- DeviceDataMapper deviceDataMapper;
+ private final NormalDataProcessor normalDataProcessor;
- /**
- * @param dataReportParam
- * @return
- */
- public ResponseData DeviceDataCommit(DataReportParam dataReportParam) {
- ResponseData responseData = new ResponseData();
- try {
- deviceDataMapper.addDeviceData(dataReportParam);
- responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
- responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
- } catch (DataAccessException sqlex) {
- responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
- responseData.setMessage("请求数据异常");
- responseData.setSuccess(true);
- log.error("主题:数据上报保存出现错误,异常信息为{}", sqlex);
- }
- return responseData;
+ public DeviceDataServiceImpl(NormalDataProcessor normalDataProcessor) {
+ this.normalDataProcessor = normalDataProcessor;
}
- /**
- * @param heartbeatParam
- * @return
- */
- public ResponseData heartBeatSave(HeartbeatParam heartbeatParam) {
+ public ResponseData gasReceiver(DataReportParam dataReportParam) {
ResponseData responseData = new ResponseData();
try {
- deviceDataMapper.editDeviceData(heartbeatParam);
+ Map> updDataMap = new ObjectMapper().convertValue(dataReportParam.getItems(), Map.class);
+ DataContentParam dataContentParam = JSON.parseObject(updDataMap.get("updData").get("value"), DataContentParam.class);
+ Long uptime = Long.valueOf(String.valueOf(updDataMap.get("updData").get("time")));
+ if (StringUtils.isEmpty(dataReportParam.getDeviceName())) {
+ responseData.setCode(200);
+ responseData.setMessage("没有设备编号");
+ return responseData;
+ }
+ normalDataProcessor.normalDataProvider(dataContentParam, uptime, dataReportParam.getDeviceName());
responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
} catch (DataAccessException sqlex) {
responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
responseData.setMessage("请求数据异常");
responseData.setSuccess(true);
- log.error("主题:数据心跳出现错误,异常信息为{}", sqlex);
+ log.error("主题:设备数据上报出现错误,异常信息为{}", sqlex);
}
return responseData;
}
diff --git a/src/main/java/com/casic/service/impl/NormalDataProcessor.java b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
new file mode 100644
index 0000000..3f7630a
--- /dev/null
+++ b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
@@ -0,0 +1,164 @@
+package com.casic.service.impl;
+
+import com.alibaba.druid.util.StringUtils;
+import com.casic.dao.AlarmRecordsMapper;
+import com.casic.dao.DataGasMapper;
+import com.casic.dao.impl.AlarmJobDao;
+import com.casic.entity.AlarmJob;
+import com.casic.entity.AlarmRecords;
+import com.casic.entity.DataGasDector;
+import com.casic.model.DataContentParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+import xyz.downgoon.snowflake.Snowflake;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class NormalDataProcessor {
+
+ public static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd");
+
+ @Value("${casic.device.gas-dector.type}")
+ private Long deviceType;
+ @Value("${casic.device.gas-dector.minutes}")
+ private String minutes;
+ @Value("${casic.device.gas-dector.enable-local}")
+ private Boolean enableLocal;
+ @Resource
+ private DataGasMapper dataGasMapper;
+ @Autowired
+ private AlarmJobDao alarmJobDao;
+ @Resource
+ private AlarmRecordsMapper alarmRecordsMapper;
+ private static Snowflake snowflake = new Snowflake(0, 2);
+
+ public void normalDataProvider(DataContentParam dataReportParam, Long timeStamp, String devcode) {
+ Map gasMap = dataGasMapper.getWellCode(devcode);
+ if (ObjectUtils.isEmpty(gasMap)) {
+ log.info("没有该设备编号录入" + devcode);
+ if (enableLocal) {
+ return;
+ }
+ }
+ Boolean updateFlag = false;
+ if (ObjectUtils.isEmpty(dataGasMapper.getLastData(minutes, devcode))) {
+ updateFlag = this.saveNormalData(dataReportParam, timeStamp, devcode, gasMap);
+ }
+ this.dataTaskJudge(dataReportParam, devcode, timeStamp, gasMap, updateFlag);
+ return;
+ }
+
+ /**
+ * 自定义时间存库
+ *
+ * @param dataReportParam
+ * @param timeStamp
+ * @param devcode
+ * @param gasMap
+ */
+ private Boolean saveNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap) {
+ Boolean updateFlag = false;
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ List dataReportFilter = dataReportParam.getRtd_val().stream().filter(
+ data -> {
+ return data != -1;
+ }
+ ).collect(Collectors.toList());
+ if (dataReportFilter.size() > 0 && dataReportFilter.get(dataReportFilter.size() - 1) != 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 1);
+ updateFlag = true;
+ } else if (dataReportFilter.get(dataReportFilter.size() - 1) == 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 0);
+ }
+ dataReportFilter.forEach(
+ data -> {
+ if (data != 65535) {
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+ }
+ );
+ return updateFlag;
+ }
+
+ /**
+ * 报警就存库
+ *
+ * @param dataReportParam
+ * @param devcode
+ * @param timeStamp
+ * @param gasMap
+ */
+ private void dataTaskJudge(DataContentParam dataReportParam, String devcode, Long timeStamp, Map gasMap, Boolean updateFlag) {
+ List> alarmLevelList = dataGasMapper.getAlarmLevelList(deviceType);
+ String wellCode = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "";
+ Long deviceId = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? Long.valueOf(String.valueOf(gasMap.get("deviceId"))) : -1;
+ final String gasMsgContent=dataGasMapper.getGasMsgContent(deviceType);
+ dataReportParam.getRtd_val().stream().filter(
+ dataReport -> {
+ return dataReport != -1 && dataReport != 65535;
+ }
+ ).forEach(
+ dataReport -> {
+ for (Map alarmLevelMap : alarmLevelList) {
+ if (dataReport > Float.valueOf(String.valueOf(alarmLevelMap.get("high_value")))) {
+ AlarmRecords alarmRecord = new AlarmRecords();
+ alarmRecord.setId(snowflake.nextId());
+ alarmRecord.setDeviceId(deviceId);
+ alarmRecord.setDevcode(devcode);
+ alarmRecord.setWellCode(wellCode);
+ alarmRecord.setAlarmType("1"); // 业务报警
+ alarmRecord.setAlarmContent("燃气报警");
+ alarmRecord.setAlarmValue(String.valueOf(dataReport));
+ alarmRecord.setAlarmTime(new Date());
+ alarmRecord.setStatus("1");
+ alarmRecord.setAlarmLevel(Integer.valueOf(alarmLevelMap.get("level").toString()));
+ alarmRecord.setAlarmMessage("燃气报警");
+ String jobId = alarmRecordsMapper.isOldAlarmRecord(devcode, "燃气报警");
+ // 超出报警阈值 生成一条报警消息
+ if (!StringUtils.isEmpty(jobId)) {
+ alarmRecordsMapper.updateOldAlarmRecord(devcode, "燃气报警");
+ alarmRecord.setJobId(Long.valueOf(jobId));
+ } else {
+ AlarmJob alarmJob = alarmJobDao.saveData(devcode, wellCode, "RQZD", "1");
+ alarmRecord.setJobId(alarmJob.getId());
+ }
+ alarmRecordsMapper.insert(alarmRecord);
+ if (!updateFlag) {
+ alarmNormalData(dataReportParam, timeStamp, devcode, gasMap, dataReport);
+ }
+ break;
+ }
+ }
+ }
+ );
+ }
+
+ private void alarmNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap, Integer data) {
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+
+}
+
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index fac2afe..f8a06a6 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,40 +1,19 @@
server:
- port: 11556
+ port: 11320
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
- username: root
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell_zq_cs
+ username: postgres
password: Casic203
session:
store-type: redis
- redis:
- host: 111.198.10.15
- port: 11412
- password: ew5T4K3#203lwh
- redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
jms:
pub-sub-domain: true
- # session:
- # store-type: redis
- activemq:
- user:
- password:
- broker-url: tcp://192.168.0.203:61616
-#flowable数据源和多数据源配置
-casic:
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- #kaptcha-open: false #是否开启登录时验证码 (true/false)
- no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
- db:
- init:
- enable: false
- file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
- spring-session-open: false #开启spring session
logging:
level.root: error
- level.com.casic: error
+ level.com.casic: info
file:
path: logs/
name: missiles.log
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 86411e6..ffc01e9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -19,18 +19,11 @@
mapper-locations: classpath:mapper/*.xml
#mybatis-plus:
# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
-################### mybatis-plus配置 ###################
-################### casic配置 ###################
-flowable:
- checkProcessDefinitions: false #不校验process文件
casic:
- swagger-open: false #是否开启swagger (true/false)
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- muti-datasource-open: false #是否开启多数据源(true/false)
- spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
- session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
- session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
- extUrl: sys
- config:
- export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
- config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
+ device:
+ gas-dector:
+ type: 101
+ minutes: 60
+ enable-local: false
+# type 可燃气体的设备类型
+# minutes: 燃气外协设备上传数据的分钟数
\ No newline at end of file
diff --git a/target/classes/application-dev.yml b/target/classes/application-dev.yml
new file mode 100644
index 0000000..fac2afe
--- /dev/null
+++ b/target/classes/application-dev.yml
@@ -0,0 +1,40 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
+ username: root
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+logging:
+ level.root: error
+ level.com.casic: error
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/target/classes/application-postgre.yml b/target/classes/application-postgre.yml
new file mode 100644
index 0000000..2b7f69c
--- /dev/null
+++ b/target/classes/application-postgre.yml
@@ -0,0 +1,62 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell
+ username: postgres
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ redis-config:
+ host: 127.0.0.1
+ port: 6379
+ password:
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+smartcity:
+ config:
+ export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+ #export-path: D:\export\
+ image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\
+ config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\
+ download-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\download\
+ device:
+ redis:
+ invalid-time: 86400
+ host: 127.0.0.1
+ port: 6379
+ password: ew5T4K3#203lwh
+ config-prefix: 'Casic:'
+ getui:
+ appId: H9jSTE2bAt8QWq2K2GNOB3
+ appKey: bhPeCutJVdAyOasevQFtN9
+ masterSecret: lChudND74A89WRiHLkedb5
+logging:
+ level.root: info
+ level.com.casic: info
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/target/classes/application.yml b/target/classes/application.yml
new file mode 100644
index 0000000..86411e6
--- /dev/null
+++ b/target/classes/application.yml
@@ -0,0 +1,36 @@
+##########################################################
+################## 所有profile共有的配置 #################
+##########################################################
+spring:
+ profiles:
+ active: dev
+ servlet:
+ multipart:
+ max-file-size: 50MB
+ max-request-size: 80MB
+mybatis-plus:
+ global-config:
+ enable-sql-runner: true
+ configuration:
+ # 配置结果集属性为空时 是否映射返回结果
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
+ mapper-locations: classpath:mapper/*.xml
+mybatis:
+ mapper-locations: classpath:mapper/*.xml
+#mybatis-plus:
+# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
+################### mybatis-plus配置 ###################
+################### casic配置 ###################
+flowable:
+ checkProcessDefinitions: false #不校验process文件
+casic:
+ swagger-open: false #是否开启swagger (true/false)
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ muti-datasource-open: false #是否开启多数据源(true/false)
+ spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
+ session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
+ session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
+ extUrl: sys
+ config:
+ export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+ config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
diff --git a/target/classes/com/casic/CasicApplication.class b/target/classes/com/casic/CasicApplication.class
new file mode 100644
index 0000000..68c2f95
--- /dev/null
+++ b/target/classes/com/casic/CasicApplication.class
Binary files differ
diff --git a/target/classes/com/casic/controller/DeviceController.class b/target/classes/com/casic/controller/DeviceController.class
new file mode 100644
index 0000000..478d6ae
--- /dev/null
+++ b/target/classes/com/casic/controller/DeviceController.class
Binary files differ
diff --git a/target/classes/com/casic/controller/DeviceDataController.class b/target/classes/com/casic/controller/DeviceDataController.class
new file mode 100644
index 0000000..1f4400c
--- /dev/null
+++ b/target/classes/com/casic/controller/DeviceDataController.class
Binary files differ
diff --git a/target/classes/com/casic/dao/DataGasMapper.class b/target/classes/com/casic/dao/DataGasMapper.class
new file mode 100644
index 0000000..557d539
--- /dev/null
+++ b/target/classes/com/casic/dao/DataGasMapper.class
Binary files differ
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..814888c
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,321 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ * 报警工单表
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_job")
+public class AlarmJob extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 工单编号
+ */
+ @TableField("JOBCODE")
+ private String jobcode;
+ /**
+ * 工单类型
+ */
+ @TableField("JOG_TYPE")
+ private String jobType;
+ /**
+ * 井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 工单创建时间
+ */
+ @TableField("CREATE_TIME")
+ private Date createTime;
+ /**
+ * 工单状态（0待处理，1待确认，2处理中，3完成）
+ */
+ @TableField("JOB_STATUS")
+ private String jobStatus;
+ /**
+ * 接单人员
+ */
+ @TableField("GET_JOB_PERSON")
+ private Long getJobPerson;
+ /**
+ * 接单时间
+ */
+ @TableField("GET_JOB_TIME")
+ private Date getJobTime;
+ /**
+ * 应接单时间
+ */
+ @TableField("SHOULD_GET_TIME")
+ private Date shouldGetTime;
+ /**
+ * 第一现场情况
+ */
+ @TableField("FIRST_STATE")
+ private String firstState;
+ /**
+ * 第一现场照片
+ */
+ @TableField("FIRST_STATE_PHOTOS")
+ private String firstStatePhotos;
+ /**
+ * 确认人员
+ */
+ @TableField("CONFIRM_JOB_PERSON")
+ private Long confirmJobPerson;
+ /**
+ * 确认时间
+ */
+ @TableField("CONFRIM_JOB_TIME")
+ private Date confrimJobTime;
+ /**
+ * 处理人员
+ */
+ @TableField("HANDLE_JOB_Person")
+ private Long handleJobPerson;
+ /**
+ * 处理时间
+ */
+ @TableField("HANDLE_JOB_TIME")
+ private Date handleJobTime;
+ /**
+ * 维护情况记录
+ */
+ @TableField("HANDLE_MESSAGE")
+ private String handleMessage;
+ /**
+ * 维护图片
+ */
+ @TableField("HANDLE_PHOTOS")
+ private String handlePhotos;
+ /**
+ * 工单流转记录
+ */
+ @TableField("FLOW")
+ private String flow;
+
+ @TableField("JOB_BELONG_TO")
+ private Long jobBelongTo;
+
+ @TableField("JOB_FLAG_DELAY")
+ private String jobFlagDelay;
+
+ @TableField("JOB_FLAG_1")
+ private String jobFlag1;
+
+ @TableField(exist = false)
+ private String alarmValue;
+
+ @TableField(exist = false)
+ private String alarmContentName;
+
+ @TableField(exist = false)
+ private Integer recordId;
+
+ @Override
+ public String toString() {
+ return "AlarmJob{" +
+ "id=" + id +
+ ", jobcode=" + jobcode +
+ ", jogType=" + jobType +
+ ", wellCode=" + wellCode +
+ ", devcode=" + devcode +
+ ", createTime=" + createTime +
+ ", jobStatus=" + jobStatus +
+ ", getJobPerson=" + getJobPerson +
+ ", getJobTime=" + getJobTime +
+ ", firstState=" + firstState +
+ ", firstStatePhotos=" + firstStatePhotos +
+ ", confirmJobPerson=" + confirmJobPerson +
+ ", confrimJobTime=" + confrimJobTime +
+ ", handleJobPerson=" + handleJobPerson +
+ ", handleJobTime=" + handleJobTime +
+ ", handleMessage=" + handleMessage +
+ ", handlePhotos=" + handlePhotos +
+ ", flow=" + flow +
+ ", recordId=" + recordId +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/AlarmRecords.java b/src/main/java/com/casic/entity/AlarmRecords.java
new file mode 100644
index 0000000..88b0b26
--- /dev/null
+++ b/src/main/java/com/casic/entity/AlarmRecords.java
@@ -0,0 +1,108 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_records")
+public class AlarmRecords extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 设备ID
+ */
+ @TableField("DEVICE_ID")
+ private Long deviceId;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 闸井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 告警类型
+ */
+ @TableField("ALARM_TYPE")
+ private String alarmType;
+ /**
+ * 告警内容
+ */
+ @TableField("ALARM_CONTENT")
+ private String alarmContent;
+ /**
+ * 告警数值
+ */
+ @TableField("ALARM_VALUE")
+ private String alarmValue;
+ /**
+ * 告警等级
+ */
+ @TableField("ALARM_LEVEL")
+ private Integer alarmLevel;
+ /**
+ * 告警详情
+ */
+ @TableField("ALARM_MSG")
+ private String alarmMessage;
+ /**
+ * 告警时间
+ */
+ @TableField("ALARM_TIME")
+ private Date alarmTime;
+ /**
+ * 告警状态
+ */
+ @TableField("STATUS")
+ private String status;
+ /**
+ * 工单编号
+ */
+ @TableField("JOB_ID")
+ private Long jobId;
+
+ @TableField(exist = false)
+ private Integer jobStatus;
+
+ @Override
+ public String toString() {
+ return "AlarmRecords{" +
+ "id=" + id +
+ ", deviceId=" + deviceId +
+ ", devcode=" + devcode +
+ ", wellCode=" + wellCode +
+ ", alarmType=" + alarmType +
+ ", alarmContent=" + alarmContent +
+ ", alarmValue=" + alarmValue +
+ ", alarmLevel=" + alarmLevel +
+ ", alarmMessage=" + alarmMessage +
+ ", alarmTime=" + alarmTime +
+ ", status=" + status +
+ ", jobId=" + jobId +
+ ", jobStatus=" + jobStatus +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/DataGasDector.java b/src/main/java/com/casic/entity/DataGasDector.java
new file mode 100644
index 0000000..537789a
--- /dev/null
+++ b/src/main/java/com/casic/entity/DataGasDector.java
@@ -0,0 +1,42 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author cz
+ * @date 2022-7-1
+ */
+@Data
+@TableName("data_gas_dector")
+public class DataGasDector {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ private String devcode;
+ private String wellCode;
+ private String strength;
+
+ private String descn;
+ /**
+ * --信号与干扰加噪声比
+ */
+ private String sinr;
+ /**
+ * --参考信号接收功率
+ */
+ private String rsrp;
+ /**
+ * --物理小区标识
+ */
+ private String pci;
+ private Date uptime;
+ private Date logtime;
+}
diff --git a/src/main/java/com/casic/entity/DataGasReport.java b/src/main/java/com/casic/entity/DataGasReport.java
deleted file mode 100644
index c43ccdf..0000000
--- a/src/main/java/com/casic/entity/DataGasReport.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.casic.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author cz
- * @date 2022-7-1
- */
-@Data
-@TableName("data_gas_dector")
-public class DataGasReport {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @TableField("devcode")
- private String imei;
- private String wellcode;
-
- private String imsi;
- /**
- * --事件类型 0正常 1低报 2高报
- */
- private String gasSensorState;
- /**
- * --浓度值
- */
- private String gasSampleValue;
- /**
- * --信号与干扰加噪声比
- */
- private String sinr;
- /**
- * --参考信号接收功率
- */
- private String rsrp;
- /**
- * --物理小区标识
- */
- private String pci;
- /**
- * --心跳周期
- */
- private String heartbeatTime;
-
- /**
- * --小区位置信息
- */
- private String cellId;
- /**
- * --电池电压
- */
- private String batteryVoltage;
- /**
- * --电池电量
- */
- private String batteryValue;
- private String iccid;
- private Date uptime;
- private Date logtime;
-}
diff --git a/src/main/java/com/casic/entity/DeviceSatatus.java b/src/main/java/com/casic/entity/DeviceSatatus.java
new file mode 100644
index 0000000..bab7903
--- /dev/null
+++ b/src/main/java/com/casic/entity/DeviceSatatus.java
@@ -0,0 +1,19 @@
+package com.casic.entity;
+
+import lombok.Data;
+
+/**
+ * 不使用了
+ *
+ */
+@Data
+public class DeviceSatatus {
+ private String deviceId;
+ private String cell;
+ private String cellTs;
+ private String onlineState;
+ private String onlineTs;
+ private String lastDataId;
+ private String lastDataJson;
+ private String lastDataTs;
+}
diff --git a/src/main/java/com/casic/model/DataContentParam.java b/src/main/java/com/casic/model/DataContentParam.java
new file mode 100644
index 0000000..46d298a
--- /dev/null
+++ b/src/main/java/com/casic/model/DataContentParam.java
@@ -0,0 +1,19 @@
+package com.casic.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DataContentParam {
+ private String msg_type;
+ private String error_val;
+ private String ch_cnt;
+ private String erro_cnt;
+ private String alarm_low_cnt;
+ private String alarm_high_cnt;
+ private String offline_cnt;
+ private List rtd_val;
+ private List adc_val;
+ private List status_val;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/DataReportParam.java b/src/main/java/com/casic/model/DataReportParam.java
index 082814c..754f330 100644
--- a/src/main/java/com/casic/model/DataReportParam.java
+++ b/src/main/java/com/casic/model/DataReportParam.java
@@ -11,25 +11,12 @@
*/
@Data
public class DataReportParam {
- private String upPacketSN;
- private String upDataSN;
- private String topic;
- private String timestamp;
- private String tenantId;
- private String serviceId;
- private String protocol;
- private String productId;
- /**
- * gas_sensor_state = 1, --事件类型 0 正常 1 低报 2 高报
- * gas_sample_value = 11-- 浓度值
- */
- private Map payload;
- private String messageType;
private String deviceType;
- private String deviceId;
- private String assocAssetId;
- @JsonProperty(value = "IMSI", required = true)
- private String IMSI;
- @JsonProperty(value = "IMEI", required = true)
- private String IMEI;
+ private String iotId;
+ private String requestId;
+ private Object checkFailedData;
+ private String productKey;
+ private String gmtCreate;
+ private String deviceName;
+ private Object items;
}
diff --git a/src/main/java/com/casic/service/DeviceDataService.java b/src/main/java/com/casic/service/DeviceDataService.java
index d883fe4..457d710 100644
--- a/src/main/java/com/casic/service/DeviceDataService.java
+++ b/src/main/java/com/casic/service/DeviceDataService.java
@@ -3,25 +3,18 @@
import com.casic.model.DataReportParam;
import com.casic.model.HeartbeatParam;
import com.casic.model.ResponseData;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* @author cz
* @date 2022
*/
public interface DeviceDataService {
-
/**
*
* @param dataReportParam
* @return
*/
- ResponseData DeviceDataCommit(DataReportParam dataReportParam);
-
- /**
- *
- * @param heartbeatParam
- * @return
- */
- ResponseData heartBeatSave(HeartbeatParam heartbeatParam);
+ ResponseData gasReceiver(DataReportParam dataReportParam);
}
diff --git a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
index 93f0685..e473f0c 100644
--- a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
+++ b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
@@ -1,58 +1,49 @@
package com.casic.service.impl;
-import com.casic.dao.impl.DeviceDataMapper;
+import com.alibaba.druid.util.StringUtils;
+import com.alibaba.fastjson.JSON;
import com.casic.model.*;
import com.casic.service.DeviceDataService;
+import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.stereotype.Service;
+import java.util.Map;
+
/**
* @author cz
- * @date 2022-6-20
+ * @date 2022-9-26
*/
@Slf4j
@Service
public class DeviceDataServiceImpl implements DeviceDataService {
- @Autowired
- DeviceDataMapper deviceDataMapper;
+ private final NormalDataProcessor normalDataProcessor;
- /**
- * @param dataReportParam
- * @return
- */
- public ResponseData DeviceDataCommit(DataReportParam dataReportParam) {
- ResponseData responseData = new ResponseData();
- try {
- deviceDataMapper.addDeviceData(dataReportParam);
- responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
- responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
- } catch (DataAccessException sqlex) {
- responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
- responseData.setMessage("请求数据异常");
- responseData.setSuccess(true);
- log.error("主题:数据上报保存出现错误,异常信息为{}", sqlex);
- }
- return responseData;
+ public DeviceDataServiceImpl(NormalDataProcessor normalDataProcessor) {
+ this.normalDataProcessor = normalDataProcessor;
}
- /**
- * @param heartbeatParam
- * @return
- */
- public ResponseData heartBeatSave(HeartbeatParam heartbeatParam) {
+ public ResponseData gasReceiver(DataReportParam dataReportParam) {
ResponseData responseData = new ResponseData();
try {
- deviceDataMapper.editDeviceData(heartbeatParam);
+ Map> updDataMap = new ObjectMapper().convertValue(dataReportParam.getItems(), Map.class);
+ DataContentParam dataContentParam = JSON.parseObject(updDataMap.get("updData").get("value"), DataContentParam.class);
+ Long uptime = Long.valueOf(String.valueOf(updDataMap.get("updData").get("time")));
+ if (StringUtils.isEmpty(dataReportParam.getDeviceName())) {
+ responseData.setCode(200);
+ responseData.setMessage("没有设备编号");
+ return responseData;
+ }
+ normalDataProcessor.normalDataProvider(dataContentParam, uptime, dataReportParam.getDeviceName());
responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
} catch (DataAccessException sqlex) {
responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
responseData.setMessage("请求数据异常");
responseData.setSuccess(true);
- log.error("主题:数据心跳出现错误,异常信息为{}", sqlex);
+ log.error("主题:设备数据上报出现错误,异常信息为{}", sqlex);
}
return responseData;
}
diff --git a/src/main/java/com/casic/service/impl/NormalDataProcessor.java b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
new file mode 100644
index 0000000..3f7630a
--- /dev/null
+++ b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
@@ -0,0 +1,164 @@
+package com.casic.service.impl;
+
+import com.alibaba.druid.util.StringUtils;
+import com.casic.dao.AlarmRecordsMapper;
+import com.casic.dao.DataGasMapper;
+import com.casic.dao.impl.AlarmJobDao;
+import com.casic.entity.AlarmJob;
+import com.casic.entity.AlarmRecords;
+import com.casic.entity.DataGasDector;
+import com.casic.model.DataContentParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+import xyz.downgoon.snowflake.Snowflake;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class NormalDataProcessor {
+
+ public static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd");
+
+ @Value("${casic.device.gas-dector.type}")
+ private Long deviceType;
+ @Value("${casic.device.gas-dector.minutes}")
+ private String minutes;
+ @Value("${casic.device.gas-dector.enable-local}")
+ private Boolean enableLocal;
+ @Resource
+ private DataGasMapper dataGasMapper;
+ @Autowired
+ private AlarmJobDao alarmJobDao;
+ @Resource
+ private AlarmRecordsMapper alarmRecordsMapper;
+ private static Snowflake snowflake = new Snowflake(0, 2);
+
+ public void normalDataProvider(DataContentParam dataReportParam, Long timeStamp, String devcode) {
+ Map gasMap = dataGasMapper.getWellCode(devcode);
+ if (ObjectUtils.isEmpty(gasMap)) {
+ log.info("没有该设备编号录入" + devcode);
+ if (enableLocal) {
+ return;
+ }
+ }
+ Boolean updateFlag = false;
+ if (ObjectUtils.isEmpty(dataGasMapper.getLastData(minutes, devcode))) {
+ updateFlag = this.saveNormalData(dataReportParam, timeStamp, devcode, gasMap);
+ }
+ this.dataTaskJudge(dataReportParam, devcode, timeStamp, gasMap, updateFlag);
+ return;
+ }
+
+ /**
+ * 自定义时间存库
+ *
+ * @param dataReportParam
+ * @param timeStamp
+ * @param devcode
+ * @param gasMap
+ */
+ private Boolean saveNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap) {
+ Boolean updateFlag = false;
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ List dataReportFilter = dataReportParam.getRtd_val().stream().filter(
+ data -> {
+ return data != -1;
+ }
+ ).collect(Collectors.toList());
+ if (dataReportFilter.size() > 0 && dataReportFilter.get(dataReportFilter.size() - 1) != 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 1);
+ updateFlag = true;
+ } else if (dataReportFilter.get(dataReportFilter.size() - 1) == 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 0);
+ }
+ dataReportFilter.forEach(
+ data -> {
+ if (data != 65535) {
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+ }
+ );
+ return updateFlag;
+ }
+
+ /**
+ * 报警就存库
+ *
+ * @param dataReportParam
+ * @param devcode
+ * @param timeStamp
+ * @param gasMap
+ */
+ private void dataTaskJudge(DataContentParam dataReportParam, String devcode, Long timeStamp, Map gasMap, Boolean updateFlag) {
+ List> alarmLevelList = dataGasMapper.getAlarmLevelList(deviceType);
+ String wellCode = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "";
+ Long deviceId = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? Long.valueOf(String.valueOf(gasMap.get("deviceId"))) : -1;
+ final String gasMsgContent=dataGasMapper.getGasMsgContent(deviceType);
+ dataReportParam.getRtd_val().stream().filter(
+ dataReport -> {
+ return dataReport != -1 && dataReport != 65535;
+ }
+ ).forEach(
+ dataReport -> {
+ for (Map alarmLevelMap : alarmLevelList) {
+ if (dataReport > Float.valueOf(String.valueOf(alarmLevelMap.get("high_value")))) {
+ AlarmRecords alarmRecord = new AlarmRecords();
+ alarmRecord.setId(snowflake.nextId());
+ alarmRecord.setDeviceId(deviceId);
+ alarmRecord.setDevcode(devcode);
+ alarmRecord.setWellCode(wellCode);
+ alarmRecord.setAlarmType("1"); // 业务报警
+ alarmRecord.setAlarmContent("燃气报警");
+ alarmRecord.setAlarmValue(String.valueOf(dataReport));
+ alarmRecord.setAlarmTime(new Date());
+ alarmRecord.setStatus("1");
+ alarmRecord.setAlarmLevel(Integer.valueOf(alarmLevelMap.get("level").toString()));
+ alarmRecord.setAlarmMessage("燃气报警");
+ String jobId = alarmRecordsMapper.isOldAlarmRecord(devcode, "燃气报警");
+ // 超出报警阈值 生成一条报警消息
+ if (!StringUtils.isEmpty(jobId)) {
+ alarmRecordsMapper.updateOldAlarmRecord(devcode, "燃气报警");
+ alarmRecord.setJobId(Long.valueOf(jobId));
+ } else {
+ AlarmJob alarmJob = alarmJobDao.saveData(devcode, wellCode, "RQZD", "1");
+ alarmRecord.setJobId(alarmJob.getId());
+ }
+ alarmRecordsMapper.insert(alarmRecord);
+ if (!updateFlag) {
+ alarmNormalData(dataReportParam, timeStamp, devcode, gasMap, dataReport);
+ }
+ break;
+ }
+ }
+ }
+ );
+ }
+
+ private void alarmNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap, Integer data) {
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+
+}
+
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index fac2afe..f8a06a6 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,40 +1,19 @@
server:
- port: 11556
+ port: 11320
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
- username: root
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell_zq_cs
+ username: postgres
password: Casic203
session:
store-type: redis
- redis:
- host: 111.198.10.15
- port: 11412
- password: ew5T4K3#203lwh
- redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
jms:
pub-sub-domain: true
- # session:
- # store-type: redis
- activemq:
- user:
- password:
- broker-url: tcp://192.168.0.203:61616
-#flowable数据源和多数据源配置
-casic:
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- #kaptcha-open: false #是否开启登录时验证码 (true/false)
- no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
- db:
- init:
- enable: false
- file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
- spring-session-open: false #开启spring session
logging:
level.root: error
- level.com.casic: error
+ level.com.casic: info
file:
path: logs/
name: missiles.log
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 86411e6..ffc01e9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -19,18 +19,11 @@
mapper-locations: classpath:mapper/*.xml
#mybatis-plus:
# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
-################### mybatis-plus配置 ###################
-################### casic配置 ###################
-flowable:
- checkProcessDefinitions: false #不校验process文件
casic:
- swagger-open: false #是否开启swagger (true/false)
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- muti-datasource-open: false #是否开启多数据源(true/false)
- spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
- session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
- session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
- extUrl: sys
- config:
- export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
- config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
+ device:
+ gas-dector:
+ type: 101
+ minutes: 60
+ enable-local: false
+# type 可燃气体的设备类型
+# minutes: 燃气外协设备上传数据的分钟数
\ No newline at end of file
diff --git a/target/classes/application-dev.yml b/target/classes/application-dev.yml
new file mode 100644
index 0000000..fac2afe
--- /dev/null
+++ b/target/classes/application-dev.yml
@@ -0,0 +1,40 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
+ username: root
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+logging:
+ level.root: error
+ level.com.casic: error
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/target/classes/application-postgre.yml b/target/classes/application-postgre.yml
new file mode 100644
index 0000000..2b7f69c
--- /dev/null
+++ b/target/classes/application-postgre.yml
@@ -0,0 +1,62 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell
+ username: postgres
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ redis-config:
+ host: 127.0.0.1
+ port: 6379
+ password:
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+smartcity:
+ config:
+ export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+ #export-path: D:\export\
+ image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\
+ config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\
+ download-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\download\
+ device:
+ redis:
+ invalid-time: 86400
+ host: 127.0.0.1
+ port: 6379
+ password: ew5T4K3#203lwh
+ config-prefix: 'Casic:'
+ getui:
+ appId: H9jSTE2bAt8QWq2K2GNOB3
+ appKey: bhPeCutJVdAyOasevQFtN9
+ masterSecret: lChudND74A89WRiHLkedb5
+logging:
+ level.root: info
+ level.com.casic: info
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/target/classes/application.yml b/target/classes/application.yml
new file mode 100644
index 0000000..86411e6
--- /dev/null
+++ b/target/classes/application.yml
@@ -0,0 +1,36 @@
+##########################################################
+################## 所有profile共有的配置 #################
+##########################################################
+spring:
+ profiles:
+ active: dev
+ servlet:
+ multipart:
+ max-file-size: 50MB
+ max-request-size: 80MB
+mybatis-plus:
+ global-config:
+ enable-sql-runner: true
+ configuration:
+ # 配置结果集属性为空时 是否映射返回结果
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
+ mapper-locations: classpath:mapper/*.xml
+mybatis:
+ mapper-locations: classpath:mapper/*.xml
+#mybatis-plus:
+# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
+################### mybatis-plus配置 ###################
+################### casic配置 ###################
+flowable:
+ checkProcessDefinitions: false #不校验process文件
+casic:
+ swagger-open: false #是否开启swagger (true/false)
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ muti-datasource-open: false #是否开启多数据源(true/false)
+ spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
+ session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
+ session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
+ extUrl: sys
+ config:
+ export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+ config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
diff --git a/target/classes/com/casic/CasicApplication.class b/target/classes/com/casic/CasicApplication.class
new file mode 100644
index 0000000..68c2f95
--- /dev/null
+++ b/target/classes/com/casic/CasicApplication.class
Binary files differ
diff --git a/target/classes/com/casic/controller/DeviceController.class b/target/classes/com/casic/controller/DeviceController.class
new file mode 100644
index 0000000..478d6ae
--- /dev/null
+++ b/target/classes/com/casic/controller/DeviceController.class
Binary files differ
diff --git a/target/classes/com/casic/controller/DeviceDataController.class b/target/classes/com/casic/controller/DeviceDataController.class
new file mode 100644
index 0000000..1f4400c
--- /dev/null
+++ b/target/classes/com/casic/controller/DeviceDataController.class
Binary files differ
diff --git a/target/classes/com/casic/dao/DataGasMapper.class b/target/classes/com/casic/dao/DataGasMapper.class
new file mode 100644
index 0000000..557d539
--- /dev/null
+++ b/target/classes/com/casic/dao/DataGasMapper.class
Binary files differ
diff --git a/target/classes/com/casic/dao/DeviceMapper.class b/target/classes/com/casic/dao/DeviceMapper.class
new file mode 100644
index 0000000..3ddcd2b
--- /dev/null
+++ b/target/classes/com/casic/dao/DeviceMapper.class
Binary files differ
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..814888c
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,321 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ * 报警工单表
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_job")
+public class AlarmJob extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 工单编号
+ */
+ @TableField("JOBCODE")
+ private String jobcode;
+ /**
+ * 工单类型
+ */
+ @TableField("JOG_TYPE")
+ private String jobType;
+ /**
+ * 井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 工单创建时间
+ */
+ @TableField("CREATE_TIME")
+ private Date createTime;
+ /**
+ * 工单状态（0待处理，1待确认，2处理中，3完成）
+ */
+ @TableField("JOB_STATUS")
+ private String jobStatus;
+ /**
+ * 接单人员
+ */
+ @TableField("GET_JOB_PERSON")
+ private Long getJobPerson;
+ /**
+ * 接单时间
+ */
+ @TableField("GET_JOB_TIME")
+ private Date getJobTime;
+ /**
+ * 应接单时间
+ */
+ @TableField("SHOULD_GET_TIME")
+ private Date shouldGetTime;
+ /**
+ * 第一现场情况
+ */
+ @TableField("FIRST_STATE")
+ private String firstState;
+ /**
+ * 第一现场照片
+ */
+ @TableField("FIRST_STATE_PHOTOS")
+ private String firstStatePhotos;
+ /**
+ * 确认人员
+ */
+ @TableField("CONFIRM_JOB_PERSON")
+ private Long confirmJobPerson;
+ /**
+ * 确认时间
+ */
+ @TableField("CONFRIM_JOB_TIME")
+ private Date confrimJobTime;
+ /**
+ * 处理人员
+ */
+ @TableField("HANDLE_JOB_Person")
+ private Long handleJobPerson;
+ /**
+ * 处理时间
+ */
+ @TableField("HANDLE_JOB_TIME")
+ private Date handleJobTime;
+ /**
+ * 维护情况记录
+ */
+ @TableField("HANDLE_MESSAGE")
+ private String handleMessage;
+ /**
+ * 维护图片
+ */
+ @TableField("HANDLE_PHOTOS")
+ private String handlePhotos;
+ /**
+ * 工单流转记录
+ */
+ @TableField("FLOW")
+ private String flow;
+
+ @TableField("JOB_BELONG_TO")
+ private Long jobBelongTo;
+
+ @TableField("JOB_FLAG_DELAY")
+ private String jobFlagDelay;
+
+ @TableField("JOB_FLAG_1")
+ private String jobFlag1;
+
+ @TableField(exist = false)
+ private String alarmValue;
+
+ @TableField(exist = false)
+ private String alarmContentName;
+
+ @TableField(exist = false)
+ private Integer recordId;
+
+ @Override
+ public String toString() {
+ return "AlarmJob{" +
+ "id=" + id +
+ ", jobcode=" + jobcode +
+ ", jogType=" + jobType +
+ ", wellCode=" + wellCode +
+ ", devcode=" + devcode +
+ ", createTime=" + createTime +
+ ", jobStatus=" + jobStatus +
+ ", getJobPerson=" + getJobPerson +
+ ", getJobTime=" + getJobTime +
+ ", firstState=" + firstState +
+ ", firstStatePhotos=" + firstStatePhotos +
+ ", confirmJobPerson=" + confirmJobPerson +
+ ", confrimJobTime=" + confrimJobTime +
+ ", handleJobPerson=" + handleJobPerson +
+ ", handleJobTime=" + handleJobTime +
+ ", handleMessage=" + handleMessage +
+ ", handlePhotos=" + handlePhotos +
+ ", flow=" + flow +
+ ", recordId=" + recordId +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/AlarmRecords.java b/src/main/java/com/casic/entity/AlarmRecords.java
new file mode 100644
index 0000000..88b0b26
--- /dev/null
+++ b/src/main/java/com/casic/entity/AlarmRecords.java
@@ -0,0 +1,108 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_records")
+public class AlarmRecords extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 设备ID
+ */
+ @TableField("DEVICE_ID")
+ private Long deviceId;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 闸井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 告警类型
+ */
+ @TableField("ALARM_TYPE")
+ private String alarmType;
+ /**
+ * 告警内容
+ */
+ @TableField("ALARM_CONTENT")
+ private String alarmContent;
+ /**
+ * 告警数值
+ */
+ @TableField("ALARM_VALUE")
+ private String alarmValue;
+ /**
+ * 告警等级
+ */
+ @TableField("ALARM_LEVEL")
+ private Integer alarmLevel;
+ /**
+ * 告警详情
+ */
+ @TableField("ALARM_MSG")
+ private String alarmMessage;
+ /**
+ * 告警时间
+ */
+ @TableField("ALARM_TIME")
+ private Date alarmTime;
+ /**
+ * 告警状态
+ */
+ @TableField("STATUS")
+ private String status;
+ /**
+ * 工单编号
+ */
+ @TableField("JOB_ID")
+ private Long jobId;
+
+ @TableField(exist = false)
+ private Integer jobStatus;
+
+ @Override
+ public String toString() {
+ return "AlarmRecords{" +
+ "id=" + id +
+ ", deviceId=" + deviceId +
+ ", devcode=" + devcode +
+ ", wellCode=" + wellCode +
+ ", alarmType=" + alarmType +
+ ", alarmContent=" + alarmContent +
+ ", alarmValue=" + alarmValue +
+ ", alarmLevel=" + alarmLevel +
+ ", alarmMessage=" + alarmMessage +
+ ", alarmTime=" + alarmTime +
+ ", status=" + status +
+ ", jobId=" + jobId +
+ ", jobStatus=" + jobStatus +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/DataGasDector.java b/src/main/java/com/casic/entity/DataGasDector.java
new file mode 100644
index 0000000..537789a
--- /dev/null
+++ b/src/main/java/com/casic/entity/DataGasDector.java
@@ -0,0 +1,42 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author cz
+ * @date 2022-7-1
+ */
+@Data
+@TableName("data_gas_dector")
+public class DataGasDector {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ private String devcode;
+ private String wellCode;
+ private String strength;
+
+ private String descn;
+ /**
+ * --信号与干扰加噪声比
+ */
+ private String sinr;
+ /**
+ * --参考信号接收功率
+ */
+ private String rsrp;
+ /**
+ * --物理小区标识
+ */
+ private String pci;
+ private Date uptime;
+ private Date logtime;
+}
diff --git a/src/main/java/com/casic/entity/DataGasReport.java b/src/main/java/com/casic/entity/DataGasReport.java
deleted file mode 100644
index c43ccdf..0000000
--- a/src/main/java/com/casic/entity/DataGasReport.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.casic.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author cz
- * @date 2022-7-1
- */
-@Data
-@TableName("data_gas_dector")
-public class DataGasReport {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @TableField("devcode")
- private String imei;
- private String wellcode;
-
- private String imsi;
- /**
- * --事件类型 0正常 1低报 2高报
- */
- private String gasSensorState;
- /**
- * --浓度值
- */
- private String gasSampleValue;
- /**
- * --信号与干扰加噪声比
- */
- private String sinr;
- /**
- * --参考信号接收功率
- */
- private String rsrp;
- /**
- * --物理小区标识
- */
- private String pci;
- /**
- * --心跳周期
- */
- private String heartbeatTime;
-
- /**
- * --小区位置信息
- */
- private String cellId;
- /**
- * --电池电压
- */
- private String batteryVoltage;
- /**
- * --电池电量
- */
- private String batteryValue;
- private String iccid;
- private Date uptime;
- private Date logtime;
-}
diff --git a/src/main/java/com/casic/entity/DeviceSatatus.java b/src/main/java/com/casic/entity/DeviceSatatus.java
new file mode 100644
index 0000000..bab7903
--- /dev/null
+++ b/src/main/java/com/casic/entity/DeviceSatatus.java
@@ -0,0 +1,19 @@
+package com.casic.entity;
+
+import lombok.Data;
+
+/**
+ * 不使用了
+ *
+ */
+@Data
+public class DeviceSatatus {
+ private String deviceId;
+ private String cell;
+ private String cellTs;
+ private String onlineState;
+ private String onlineTs;
+ private String lastDataId;
+ private String lastDataJson;
+ private String lastDataTs;
+}
diff --git a/src/main/java/com/casic/model/DataContentParam.java b/src/main/java/com/casic/model/DataContentParam.java
new file mode 100644
index 0000000..46d298a
--- /dev/null
+++ b/src/main/java/com/casic/model/DataContentParam.java
@@ -0,0 +1,19 @@
+package com.casic.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DataContentParam {
+ private String msg_type;
+ private String error_val;
+ private String ch_cnt;
+ private String erro_cnt;
+ private String alarm_low_cnt;
+ private String alarm_high_cnt;
+ private String offline_cnt;
+ private List rtd_val;
+ private List adc_val;
+ private List status_val;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/DataReportParam.java b/src/main/java/com/casic/model/DataReportParam.java
index 082814c..754f330 100644
--- a/src/main/java/com/casic/model/DataReportParam.java
+++ b/src/main/java/com/casic/model/DataReportParam.java
@@ -11,25 +11,12 @@
*/
@Data
public class DataReportParam {
- private String upPacketSN;
- private String upDataSN;
- private String topic;
- private String timestamp;
- private String tenantId;
- private String serviceId;
- private String protocol;
- private String productId;
- /**
- * gas_sensor_state = 1, --事件类型 0 正常 1 低报 2 高报
- * gas_sample_value = 11-- 浓度值
- */
- private Map payload;
- private String messageType;
private String deviceType;
- private String deviceId;
- private String assocAssetId;
- @JsonProperty(value = "IMSI", required = true)
- private String IMSI;
- @JsonProperty(value = "IMEI", required = true)
- private String IMEI;
+ private String iotId;
+ private String requestId;
+ private Object checkFailedData;
+ private String productKey;
+ private String gmtCreate;
+ private String deviceName;
+ private Object items;
}
diff --git a/src/main/java/com/casic/service/DeviceDataService.java b/src/main/java/com/casic/service/DeviceDataService.java
index d883fe4..457d710 100644
--- a/src/main/java/com/casic/service/DeviceDataService.java
+++ b/src/main/java/com/casic/service/DeviceDataService.java
@@ -3,25 +3,18 @@
import com.casic.model.DataReportParam;
import com.casic.model.HeartbeatParam;
import com.casic.model.ResponseData;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* @author cz
* @date 2022
*/
public interface DeviceDataService {
-
/**
*
* @param dataReportParam
* @return
*/
- ResponseData DeviceDataCommit(DataReportParam dataReportParam);
-
- /**
- *
- * @param heartbeatParam
- * @return
- */
- ResponseData heartBeatSave(HeartbeatParam heartbeatParam);
+ ResponseData gasReceiver(DataReportParam dataReportParam);
}
diff --git a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
index 93f0685..e473f0c 100644
--- a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
+++ b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
@@ -1,58 +1,49 @@
package com.casic.service.impl;
-import com.casic.dao.impl.DeviceDataMapper;
+import com.alibaba.druid.util.StringUtils;
+import com.alibaba.fastjson.JSON;
import com.casic.model.*;
import com.casic.service.DeviceDataService;
+import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.stereotype.Service;
+import java.util.Map;
+
/**
* @author cz
- * @date 2022-6-20
+ * @date 2022-9-26
*/
@Slf4j
@Service
public class DeviceDataServiceImpl implements DeviceDataService {
- @Autowired
- DeviceDataMapper deviceDataMapper;
+ private final NormalDataProcessor normalDataProcessor;
- /**
- * @param dataReportParam
- * @return
- */
- public ResponseData DeviceDataCommit(DataReportParam dataReportParam) {
- ResponseData responseData = new ResponseData();
- try {
- deviceDataMapper.addDeviceData(dataReportParam);
- responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
- responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
- } catch (DataAccessException sqlex) {
- responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
- responseData.setMessage("请求数据异常");
- responseData.setSuccess(true);
- log.error("主题:数据上报保存出现错误,异常信息为{}", sqlex);
- }
- return responseData;
+ public DeviceDataServiceImpl(NormalDataProcessor normalDataProcessor) {
+ this.normalDataProcessor = normalDataProcessor;
}
- /**
- * @param heartbeatParam
- * @return
- */
- public ResponseData heartBeatSave(HeartbeatParam heartbeatParam) {
+ public ResponseData gasReceiver(DataReportParam dataReportParam) {
ResponseData responseData = new ResponseData();
try {
- deviceDataMapper.editDeviceData(heartbeatParam);
+ Map> updDataMap = new ObjectMapper().convertValue(dataReportParam.getItems(), Map.class);
+ DataContentParam dataContentParam = JSON.parseObject(updDataMap.get("updData").get("value"), DataContentParam.class);
+ Long uptime = Long.valueOf(String.valueOf(updDataMap.get("updData").get("time")));
+ if (StringUtils.isEmpty(dataReportParam.getDeviceName())) {
+ responseData.setCode(200);
+ responseData.setMessage("没有设备编号");
+ return responseData;
+ }
+ normalDataProcessor.normalDataProvider(dataContentParam, uptime, dataReportParam.getDeviceName());
responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
} catch (DataAccessException sqlex) {
responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
responseData.setMessage("请求数据异常");
responseData.setSuccess(true);
- log.error("主题:数据心跳出现错误,异常信息为{}", sqlex);
+ log.error("主题:设备数据上报出现错误,异常信息为{}", sqlex);
}
return responseData;
}
diff --git a/src/main/java/com/casic/service/impl/NormalDataProcessor.java b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
new file mode 100644
index 0000000..3f7630a
--- /dev/null
+++ b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
@@ -0,0 +1,164 @@
+package com.casic.service.impl;
+
+import com.alibaba.druid.util.StringUtils;
+import com.casic.dao.AlarmRecordsMapper;
+import com.casic.dao.DataGasMapper;
+import com.casic.dao.impl.AlarmJobDao;
+import com.casic.entity.AlarmJob;
+import com.casic.entity.AlarmRecords;
+import com.casic.entity.DataGasDector;
+import com.casic.model.DataContentParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+import xyz.downgoon.snowflake.Snowflake;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class NormalDataProcessor {
+
+ public static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd");
+
+ @Value("${casic.device.gas-dector.type}")
+ private Long deviceType;
+ @Value("${casic.device.gas-dector.minutes}")
+ private String minutes;
+ @Value("${casic.device.gas-dector.enable-local}")
+ private Boolean enableLocal;
+ @Resource
+ private DataGasMapper dataGasMapper;
+ @Autowired
+ private AlarmJobDao alarmJobDao;
+ @Resource
+ private AlarmRecordsMapper alarmRecordsMapper;
+ private static Snowflake snowflake = new Snowflake(0, 2);
+
+ public void normalDataProvider(DataContentParam dataReportParam, Long timeStamp, String devcode) {
+ Map gasMap = dataGasMapper.getWellCode(devcode);
+ if (ObjectUtils.isEmpty(gasMap)) {
+ log.info("没有该设备编号录入" + devcode);
+ if (enableLocal) {
+ return;
+ }
+ }
+ Boolean updateFlag = false;
+ if (ObjectUtils.isEmpty(dataGasMapper.getLastData(minutes, devcode))) {
+ updateFlag = this.saveNormalData(dataReportParam, timeStamp, devcode, gasMap);
+ }
+ this.dataTaskJudge(dataReportParam, devcode, timeStamp, gasMap, updateFlag);
+ return;
+ }
+
+ /**
+ * 自定义时间存库
+ *
+ * @param dataReportParam
+ * @param timeStamp
+ * @param devcode
+ * @param gasMap
+ */
+ private Boolean saveNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap) {
+ Boolean updateFlag = false;
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ List dataReportFilter = dataReportParam.getRtd_val().stream().filter(
+ data -> {
+ return data != -1;
+ }
+ ).collect(Collectors.toList());
+ if (dataReportFilter.size() > 0 && dataReportFilter.get(dataReportFilter.size() - 1) != 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 1);
+ updateFlag = true;
+ } else if (dataReportFilter.get(dataReportFilter.size() - 1) == 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 0);
+ }
+ dataReportFilter.forEach(
+ data -> {
+ if (data != 65535) {
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+ }
+ );
+ return updateFlag;
+ }
+
+ /**
+ * 报警就存库
+ *
+ * @param dataReportParam
+ * @param devcode
+ * @param timeStamp
+ * @param gasMap
+ */
+ private void dataTaskJudge(DataContentParam dataReportParam, String devcode, Long timeStamp, Map gasMap, Boolean updateFlag) {
+ List> alarmLevelList = dataGasMapper.getAlarmLevelList(deviceType);
+ String wellCode = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "";
+ Long deviceId = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? Long.valueOf(String.valueOf(gasMap.get("deviceId"))) : -1;
+ final String gasMsgContent=dataGasMapper.getGasMsgContent(deviceType);
+ dataReportParam.getRtd_val().stream().filter(
+ dataReport -> {
+ return dataReport != -1 && dataReport != 65535;
+ }
+ ).forEach(
+ dataReport -> {
+ for (Map alarmLevelMap : alarmLevelList) {
+ if (dataReport > Float.valueOf(String.valueOf(alarmLevelMap.get("high_value")))) {
+ AlarmRecords alarmRecord = new AlarmRecords();
+ alarmRecord.setId(snowflake.nextId());
+ alarmRecord.setDeviceId(deviceId);
+ alarmRecord.setDevcode(devcode);
+ alarmRecord.setWellCode(wellCode);
+ alarmRecord.setAlarmType("1"); // 业务报警
+ alarmRecord.setAlarmContent("燃气报警");
+ alarmRecord.setAlarmValue(String.valueOf(dataReport));
+ alarmRecord.setAlarmTime(new Date());
+ alarmRecord.setStatus("1");
+ alarmRecord.setAlarmLevel(Integer.valueOf(alarmLevelMap.get("level").toString()));
+ alarmRecord.setAlarmMessage("燃气报警");
+ String jobId = alarmRecordsMapper.isOldAlarmRecord(devcode, "燃气报警");
+ // 超出报警阈值 生成一条报警消息
+ if (!StringUtils.isEmpty(jobId)) {
+ alarmRecordsMapper.updateOldAlarmRecord(devcode, "燃气报警");
+ alarmRecord.setJobId(Long.valueOf(jobId));
+ } else {
+ AlarmJob alarmJob = alarmJobDao.saveData(devcode, wellCode, "RQZD", "1");
+ alarmRecord.setJobId(alarmJob.getId());
+ }
+ alarmRecordsMapper.insert(alarmRecord);
+ if (!updateFlag) {
+ alarmNormalData(dataReportParam, timeStamp, devcode, gasMap, dataReport);
+ }
+ break;
+ }
+ }
+ }
+ );
+ }
+
+ private void alarmNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap, Integer data) {
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+
+}
+
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index fac2afe..f8a06a6 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,40 +1,19 @@
server:
- port: 11556
+ port: 11320
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
- username: root
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell_zq_cs
+ username: postgres
password: Casic203
session:
store-type: redis
- redis:
- host: 111.198.10.15
- port: 11412
- password: ew5T4K3#203lwh
- redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
jms:
pub-sub-domain: true
- # session:
- # store-type: redis
- activemq:
- user:
- password:
- broker-url: tcp://192.168.0.203:61616
-#flowable数据源和多数据源配置
-casic:
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- #kaptcha-open: false #是否开启登录时验证码 (true/false)
- no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
- db:
- init:
- enable: false
- file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
- spring-session-open: false #开启spring session
logging:
level.root: error
- level.com.casic: error
+ level.com.casic: info
file:
path: logs/
name: missiles.log
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 86411e6..ffc01e9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -19,18 +19,11 @@
mapper-locations: classpath:mapper/*.xml
#mybatis-plus:
# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
-################### mybatis-plus配置 ###################
-################### casic配置 ###################
-flowable:
- checkProcessDefinitions: false #不校验process文件
casic:
- swagger-open: false #是否开启swagger (true/false)
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- muti-datasource-open: false #是否开启多数据源(true/false)
- spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
- session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
- session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
- extUrl: sys
- config:
- export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
- config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
+ device:
+ gas-dector:
+ type: 101
+ minutes: 60
+ enable-local: false
+# type 可燃气体的设备类型
+# minutes: 燃气外协设备上传数据的分钟数
\ No newline at end of file
diff --git a/target/classes/application-dev.yml b/target/classes/application-dev.yml
new file mode 100644
index 0000000..fac2afe
--- /dev/null
+++ b/target/classes/application-dev.yml
@@ -0,0 +1,40 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
+ username: root
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+logging:
+ level.root: error
+ level.com.casic: error
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/target/classes/application-postgre.yml b/target/classes/application-postgre.yml
new file mode 100644
index 0000000..2b7f69c
--- /dev/null
+++ b/target/classes/application-postgre.yml
@@ -0,0 +1,62 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell
+ username: postgres
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ redis-config:
+ host: 127.0.0.1
+ port: 6379
+ password:
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+smartcity:
+ config:
+ export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+ #export-path: D:\export\
+ image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\
+ config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\
+ download-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\download\
+ device:
+ redis:
+ invalid-time: 86400
+ host: 127.0.0.1
+ port: 6379
+ password: ew5T4K3#203lwh
+ config-prefix: 'Casic:'
+ getui:
+ appId: H9jSTE2bAt8QWq2K2GNOB3
+ appKey: bhPeCutJVdAyOasevQFtN9
+ masterSecret: lChudND74A89WRiHLkedb5
+logging:
+ level.root: info
+ level.com.casic: info
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/target/classes/application.yml b/target/classes/application.yml
new file mode 100644
index 0000000..86411e6
--- /dev/null
+++ b/target/classes/application.yml
@@ -0,0 +1,36 @@
+##########################################################
+################## 所有profile共有的配置 #################
+##########################################################
+spring:
+ profiles:
+ active: dev
+ servlet:
+ multipart:
+ max-file-size: 50MB
+ max-request-size: 80MB
+mybatis-plus:
+ global-config:
+ enable-sql-runner: true
+ configuration:
+ # 配置结果集属性为空时 是否映射返回结果
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
+ mapper-locations: classpath:mapper/*.xml
+mybatis:
+ mapper-locations: classpath:mapper/*.xml
+#mybatis-plus:
+# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
+################### mybatis-plus配置 ###################
+################### casic配置 ###################
+flowable:
+ checkProcessDefinitions: false #不校验process文件
+casic:
+ swagger-open: false #是否开启swagger (true/false)
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ muti-datasource-open: false #是否开启多数据源(true/false)
+ spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
+ session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
+ session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
+ extUrl: sys
+ config:
+ export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+ config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
diff --git a/target/classes/com/casic/CasicApplication.class b/target/classes/com/casic/CasicApplication.class
new file mode 100644
index 0000000..68c2f95
--- /dev/null
+++ b/target/classes/com/casic/CasicApplication.class
Binary files differ
diff --git a/target/classes/com/casic/controller/DeviceController.class b/target/classes/com/casic/controller/DeviceController.class
new file mode 100644
index 0000000..478d6ae
--- /dev/null
+++ b/target/classes/com/casic/controller/DeviceController.class
Binary files differ
diff --git a/target/classes/com/casic/controller/DeviceDataController.class b/target/classes/com/casic/controller/DeviceDataController.class
new file mode 100644
index 0000000..1f4400c
--- /dev/null
+++ b/target/classes/com/casic/controller/DeviceDataController.class
Binary files differ
diff --git a/target/classes/com/casic/dao/DataGasMapper.class b/target/classes/com/casic/dao/DataGasMapper.class
new file mode 100644
index 0000000..557d539
--- /dev/null
+++ b/target/classes/com/casic/dao/DataGasMapper.class
Binary files differ
diff --git a/target/classes/com/casic/dao/DeviceMapper.class b/target/classes/com/casic/dao/DeviceMapper.class
new file mode 100644
index 0000000..3ddcd2b
--- /dev/null
+++ b/target/classes/com/casic/dao/DeviceMapper.class
Binary files differ
diff --git a/target/classes/com/casic/dao/impl/DeviceDataMapper.class b/target/classes/com/casic/dao/impl/DeviceDataMapper.class
new file mode 100644
index 0000000..d73ed15
--- /dev/null
+++ b/target/classes/com/casic/dao/impl/DeviceDataMapper.class
Binary files differ
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..814888c
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,321 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ * 报警工单表
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_job")
+public class AlarmJob extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 工单编号
+ */
+ @TableField("JOBCODE")
+ private String jobcode;
+ /**
+ * 工单类型
+ */
+ @TableField("JOG_TYPE")
+ private String jobType;
+ /**
+ * 井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 工单创建时间
+ */
+ @TableField("CREATE_TIME")
+ private Date createTime;
+ /**
+ * 工单状态（0待处理，1待确认，2处理中，3完成）
+ */
+ @TableField("JOB_STATUS")
+ private String jobStatus;
+ /**
+ * 接单人员
+ */
+ @TableField("GET_JOB_PERSON")
+ private Long getJobPerson;
+ /**
+ * 接单时间
+ */
+ @TableField("GET_JOB_TIME")
+ private Date getJobTime;
+ /**
+ * 应接单时间
+ */
+ @TableField("SHOULD_GET_TIME")
+ private Date shouldGetTime;
+ /**
+ * 第一现场情况
+ */
+ @TableField("FIRST_STATE")
+ private String firstState;
+ /**
+ * 第一现场照片
+ */
+ @TableField("FIRST_STATE_PHOTOS")
+ private String firstStatePhotos;
+ /**
+ * 确认人员
+ */
+ @TableField("CONFIRM_JOB_PERSON")
+ private Long confirmJobPerson;
+ /**
+ * 确认时间
+ */
+ @TableField("CONFRIM_JOB_TIME")
+ private Date confrimJobTime;
+ /**
+ * 处理人员
+ */
+ @TableField("HANDLE_JOB_Person")
+ private Long handleJobPerson;
+ /**
+ * 处理时间
+ */
+ @TableField("HANDLE_JOB_TIME")
+ private Date handleJobTime;
+ /**
+ * 维护情况记录
+ */
+ @TableField("HANDLE_MESSAGE")
+ private String handleMessage;
+ /**
+ * 维护图片
+ */
+ @TableField("HANDLE_PHOTOS")
+ private String handlePhotos;
+ /**
+ * 工单流转记录
+ */
+ @TableField("FLOW")
+ private String flow;
+
+ @TableField("JOB_BELONG_TO")
+ private Long jobBelongTo;
+
+ @TableField("JOB_FLAG_DELAY")
+ private String jobFlagDelay;
+
+ @TableField("JOB_FLAG_1")
+ private String jobFlag1;
+
+ @TableField(exist = false)
+ private String alarmValue;
+
+ @TableField(exist = false)
+ private String alarmContentName;
+
+ @TableField(exist = false)
+ private Integer recordId;
+
+ @Override
+ public String toString() {
+ return "AlarmJob{" +
+ "id=" + id +
+ ", jobcode=" + jobcode +
+ ", jogType=" + jobType +
+ ", wellCode=" + wellCode +
+ ", devcode=" + devcode +
+ ", createTime=" + createTime +
+ ", jobStatus=" + jobStatus +
+ ", getJobPerson=" + getJobPerson +
+ ", getJobTime=" + getJobTime +
+ ", firstState=" + firstState +
+ ", firstStatePhotos=" + firstStatePhotos +
+ ", confirmJobPerson=" + confirmJobPerson +
+ ", confrimJobTime=" + confrimJobTime +
+ ", handleJobPerson=" + handleJobPerson +
+ ", handleJobTime=" + handleJobTime +
+ ", handleMessage=" + handleMessage +
+ ", handlePhotos=" + handlePhotos +
+ ", flow=" + flow +
+ ", recordId=" + recordId +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/AlarmRecords.java b/src/main/java/com/casic/entity/AlarmRecords.java
new file mode 100644
index 0000000..88b0b26
--- /dev/null
+++ b/src/main/java/com/casic/entity/AlarmRecords.java
@@ -0,0 +1,108 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_records")
+public class AlarmRecords extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 设备ID
+ */
+ @TableField("DEVICE_ID")
+ private Long deviceId;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 闸井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 告警类型
+ */
+ @TableField("ALARM_TYPE")
+ private String alarmType;
+ /**
+ * 告警内容
+ */
+ @TableField("ALARM_CONTENT")
+ private String alarmContent;
+ /**
+ * 告警数值
+ */
+ @TableField("ALARM_VALUE")
+ private String alarmValue;
+ /**
+ * 告警等级
+ */
+ @TableField("ALARM_LEVEL")
+ private Integer alarmLevel;
+ /**
+ * 告警详情
+ */
+ @TableField("ALARM_MSG")
+ private String alarmMessage;
+ /**
+ * 告警时间
+ */
+ @TableField("ALARM_TIME")
+ private Date alarmTime;
+ /**
+ * 告警状态
+ */
+ @TableField("STATUS")
+ private String status;
+ /**
+ * 工单编号
+ */
+ @TableField("JOB_ID")
+ private Long jobId;
+
+ @TableField(exist = false)
+ private Integer jobStatus;
+
+ @Override
+ public String toString() {
+ return "AlarmRecords{" +
+ "id=" + id +
+ ", deviceId=" + deviceId +
+ ", devcode=" + devcode +
+ ", wellCode=" + wellCode +
+ ", alarmType=" + alarmType +
+ ", alarmContent=" + alarmContent +
+ ", alarmValue=" + alarmValue +
+ ", alarmLevel=" + alarmLevel +
+ ", alarmMessage=" + alarmMessage +
+ ", alarmTime=" + alarmTime +
+ ", status=" + status +
+ ", jobId=" + jobId +
+ ", jobStatus=" + jobStatus +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/DataGasDector.java b/src/main/java/com/casic/entity/DataGasDector.java
new file mode 100644
index 0000000..537789a
--- /dev/null
+++ b/src/main/java/com/casic/entity/DataGasDector.java
@@ -0,0 +1,42 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author cz
+ * @date 2022-7-1
+ */
+@Data
+@TableName("data_gas_dector")
+public class DataGasDector {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ private String devcode;
+ private String wellCode;
+ private String strength;
+
+ private String descn;
+ /**
+ * --信号与干扰加噪声比
+ */
+ private String sinr;
+ /**
+ * --参考信号接收功率
+ */
+ private String rsrp;
+ /**
+ * --物理小区标识
+ */
+ private String pci;
+ private Date uptime;
+ private Date logtime;
+}
diff --git a/src/main/java/com/casic/entity/DataGasReport.java b/src/main/java/com/casic/entity/DataGasReport.java
deleted file mode 100644
index c43ccdf..0000000
--- a/src/main/java/com/casic/entity/DataGasReport.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.casic.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author cz
- * @date 2022-7-1
- */
-@Data
-@TableName("data_gas_dector")
-public class DataGasReport {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @TableField("devcode")
- private String imei;
- private String wellcode;
-
- private String imsi;
- /**
- * --事件类型 0正常 1低报 2高报
- */
- private String gasSensorState;
- /**
- * --浓度值
- */
- private String gasSampleValue;
- /**
- * --信号与干扰加噪声比
- */
- private String sinr;
- /**
- * --参考信号接收功率
- */
- private String rsrp;
- /**
- * --物理小区标识
- */
- private String pci;
- /**
- * --心跳周期
- */
- private String heartbeatTime;
-
- /**
- * --小区位置信息
- */
- private String cellId;
- /**
- * --电池电压
- */
- private String batteryVoltage;
- /**
- * --电池电量
- */
- private String batteryValue;
- private String iccid;
- private Date uptime;
- private Date logtime;
-}
diff --git a/src/main/java/com/casic/entity/DeviceSatatus.java b/src/main/java/com/casic/entity/DeviceSatatus.java
new file mode 100644
index 0000000..bab7903
--- /dev/null
+++ b/src/main/java/com/casic/entity/DeviceSatatus.java
@@ -0,0 +1,19 @@
+package com.casic.entity;
+
+import lombok.Data;
+
+/**
+ * 不使用了
+ *
+ */
+@Data
+public class DeviceSatatus {
+ private String deviceId;
+ private String cell;
+ private String cellTs;
+ private String onlineState;
+ private String onlineTs;
+ private String lastDataId;
+ private String lastDataJson;
+ private String lastDataTs;
+}
diff --git a/src/main/java/com/casic/model/DataContentParam.java b/src/main/java/com/casic/model/DataContentParam.java
new file mode 100644
index 0000000..46d298a
--- /dev/null
+++ b/src/main/java/com/casic/model/DataContentParam.java
@@ -0,0 +1,19 @@
+package com.casic.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DataContentParam {
+ private String msg_type;
+ private String error_val;
+ private String ch_cnt;
+ private String erro_cnt;
+ private String alarm_low_cnt;
+ private String alarm_high_cnt;
+ private String offline_cnt;
+ private List rtd_val;
+ private List adc_val;
+ private List status_val;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/DataReportParam.java b/src/main/java/com/casic/model/DataReportParam.java
index 082814c..754f330 100644
--- a/src/main/java/com/casic/model/DataReportParam.java
+++ b/src/main/java/com/casic/model/DataReportParam.java
@@ -11,25 +11,12 @@
*/
@Data
public class DataReportParam {
- private String upPacketSN;
- private String upDataSN;
- private String topic;
- private String timestamp;
- private String tenantId;
- private String serviceId;
- private String protocol;
- private String productId;
- /**
- * gas_sensor_state = 1, --事件类型 0 正常 1 低报 2 高报
- * gas_sample_value = 11-- 浓度值
- */
- private Map payload;
- private String messageType;
private String deviceType;
- private String deviceId;
- private String assocAssetId;
- @JsonProperty(value = "IMSI", required = true)
- private String IMSI;
- @JsonProperty(value = "IMEI", required = true)
- private String IMEI;
+ private String iotId;
+ private String requestId;
+ private Object checkFailedData;
+ private String productKey;
+ private String gmtCreate;
+ private String deviceName;
+ private Object items;
}
diff --git a/src/main/java/com/casic/service/DeviceDataService.java b/src/main/java/com/casic/service/DeviceDataService.java
index d883fe4..457d710 100644
--- a/src/main/java/com/casic/service/DeviceDataService.java
+++ b/src/main/java/com/casic/service/DeviceDataService.java
@@ -3,25 +3,18 @@
import com.casic.model.DataReportParam;
import com.casic.model.HeartbeatParam;
import com.casic.model.ResponseData;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* @author cz
* @date 2022
*/
public interface DeviceDataService {
-
/**
*
* @param dataReportParam
* @return
*/
- ResponseData DeviceDataCommit(DataReportParam dataReportParam);
-
- /**
- *
- * @param heartbeatParam
- * @return
- */
- ResponseData heartBeatSave(HeartbeatParam heartbeatParam);
+ ResponseData gasReceiver(DataReportParam dataReportParam);
}
diff --git a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
index 93f0685..e473f0c 100644
--- a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
+++ b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
@@ -1,58 +1,49 @@
package com.casic.service.impl;
-import com.casic.dao.impl.DeviceDataMapper;
+import com.alibaba.druid.util.StringUtils;
+import com.alibaba.fastjson.JSON;
import com.casic.model.*;
import com.casic.service.DeviceDataService;
+import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.stereotype.Service;
+import java.util.Map;
+
/**
* @author cz
- * @date 2022-6-20
+ * @date 2022-9-26
*/
@Slf4j
@Service
public class DeviceDataServiceImpl implements DeviceDataService {
- @Autowired
- DeviceDataMapper deviceDataMapper;
+ private final NormalDataProcessor normalDataProcessor;
- /**
- * @param dataReportParam
- * @return
- */
- public ResponseData DeviceDataCommit(DataReportParam dataReportParam) {
- ResponseData responseData = new ResponseData();
- try {
- deviceDataMapper.addDeviceData(dataReportParam);
- responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
- responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
- } catch (DataAccessException sqlex) {
- responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
- responseData.setMessage("请求数据异常");
- responseData.setSuccess(true);
- log.error("主题:数据上报保存出现错误,异常信息为{}", sqlex);
- }
- return responseData;
+ public DeviceDataServiceImpl(NormalDataProcessor normalDataProcessor) {
+ this.normalDataProcessor = normalDataProcessor;
}
- /**
- * @param heartbeatParam
- * @return
- */
- public ResponseData heartBeatSave(HeartbeatParam heartbeatParam) {
+ public ResponseData gasReceiver(DataReportParam dataReportParam) {
ResponseData responseData = new ResponseData();
try {
- deviceDataMapper.editDeviceData(heartbeatParam);
+ Map> updDataMap = new ObjectMapper().convertValue(dataReportParam.getItems(), Map.class);
+ DataContentParam dataContentParam = JSON.parseObject(updDataMap.get("updData").get("value"), DataContentParam.class);
+ Long uptime = Long.valueOf(String.valueOf(updDataMap.get("updData").get("time")));
+ if (StringUtils.isEmpty(dataReportParam.getDeviceName())) {
+ responseData.setCode(200);
+ responseData.setMessage("没有设备编号");
+ return responseData;
+ }
+ normalDataProcessor.normalDataProvider(dataContentParam, uptime, dataReportParam.getDeviceName());
responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
} catch (DataAccessException sqlex) {
responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
responseData.setMessage("请求数据异常");
responseData.setSuccess(true);
- log.error("主题:数据心跳出现错误,异常信息为{}", sqlex);
+ log.error("主题:设备数据上报出现错误,异常信息为{}", sqlex);
}
return responseData;
}
diff --git a/src/main/java/com/casic/service/impl/NormalDataProcessor.java b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
new file mode 100644
index 0000000..3f7630a
--- /dev/null
+++ b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
@@ -0,0 +1,164 @@
+package com.casic.service.impl;
+
+import com.alibaba.druid.util.StringUtils;
+import com.casic.dao.AlarmRecordsMapper;
+import com.casic.dao.DataGasMapper;
+import com.casic.dao.impl.AlarmJobDao;
+import com.casic.entity.AlarmJob;
+import com.casic.entity.AlarmRecords;
+import com.casic.entity.DataGasDector;
+import com.casic.model.DataContentParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+import xyz.downgoon.snowflake.Snowflake;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class NormalDataProcessor {
+
+ public static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd");
+
+ @Value("${casic.device.gas-dector.type}")
+ private Long deviceType;
+ @Value("${casic.device.gas-dector.minutes}")
+ private String minutes;
+ @Value("${casic.device.gas-dector.enable-local}")
+ private Boolean enableLocal;
+ @Resource
+ private DataGasMapper dataGasMapper;
+ @Autowired
+ private AlarmJobDao alarmJobDao;
+ @Resource
+ private AlarmRecordsMapper alarmRecordsMapper;
+ private static Snowflake snowflake = new Snowflake(0, 2);
+
+ public void normalDataProvider(DataContentParam dataReportParam, Long timeStamp, String devcode) {
+ Map gasMap = dataGasMapper.getWellCode(devcode);
+ if (ObjectUtils.isEmpty(gasMap)) {
+ log.info("没有该设备编号录入" + devcode);
+ if (enableLocal) {
+ return;
+ }
+ }
+ Boolean updateFlag = false;
+ if (ObjectUtils.isEmpty(dataGasMapper.getLastData(minutes, devcode))) {
+ updateFlag = this.saveNormalData(dataReportParam, timeStamp, devcode, gasMap);
+ }
+ this.dataTaskJudge(dataReportParam, devcode, timeStamp, gasMap, updateFlag);
+ return;
+ }
+
+ /**
+ * 自定义时间存库
+ *
+ * @param dataReportParam
+ * @param timeStamp
+ * @param devcode
+ * @param gasMap
+ */
+ private Boolean saveNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap) {
+ Boolean updateFlag = false;
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ List dataReportFilter = dataReportParam.getRtd_val().stream().filter(
+ data -> {
+ return data != -1;
+ }
+ ).collect(Collectors.toList());
+ if (dataReportFilter.size() > 0 && dataReportFilter.get(dataReportFilter.size() - 1) != 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 1);
+ updateFlag = true;
+ } else if (dataReportFilter.get(dataReportFilter.size() - 1) == 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 0);
+ }
+ dataReportFilter.forEach(
+ data -> {
+ if (data != 65535) {
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+ }
+ );
+ return updateFlag;
+ }
+
+ /**
+ * 报警就存库
+ *
+ * @param dataReportParam
+ * @param devcode
+ * @param timeStamp
+ * @param gasMap
+ */
+ private void dataTaskJudge(DataContentParam dataReportParam, String devcode, Long timeStamp, Map gasMap, Boolean updateFlag) {
+ List> alarmLevelList = dataGasMapper.getAlarmLevelList(deviceType);
+ String wellCode = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "";
+ Long deviceId = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? Long.valueOf(String.valueOf(gasMap.get("deviceId"))) : -1;
+ final String gasMsgContent=dataGasMapper.getGasMsgContent(deviceType);
+ dataReportParam.getRtd_val().stream().filter(
+ dataReport -> {
+ return dataReport != -1 && dataReport != 65535;
+ }
+ ).forEach(
+ dataReport -> {
+ for (Map alarmLevelMap : alarmLevelList) {
+ if (dataReport > Float.valueOf(String.valueOf(alarmLevelMap.get("high_value")))) {
+ AlarmRecords alarmRecord = new AlarmRecords();
+ alarmRecord.setId(snowflake.nextId());
+ alarmRecord.setDeviceId(deviceId);
+ alarmRecord.setDevcode(devcode);
+ alarmRecord.setWellCode(wellCode);
+ alarmRecord.setAlarmType("1"); // 业务报警
+ alarmRecord.setAlarmContent("燃气报警");
+ alarmRecord.setAlarmValue(String.valueOf(dataReport));
+ alarmRecord.setAlarmTime(new Date());
+ alarmRecord.setStatus("1");
+ alarmRecord.setAlarmLevel(Integer.valueOf(alarmLevelMap.get("level").toString()));
+ alarmRecord.setAlarmMessage("燃气报警");
+ String jobId = alarmRecordsMapper.isOldAlarmRecord(devcode, "燃气报警");
+ // 超出报警阈值 生成一条报警消息
+ if (!StringUtils.isEmpty(jobId)) {
+ alarmRecordsMapper.updateOldAlarmRecord(devcode, "燃气报警");
+ alarmRecord.setJobId(Long.valueOf(jobId));
+ } else {
+ AlarmJob alarmJob = alarmJobDao.saveData(devcode, wellCode, "RQZD", "1");
+ alarmRecord.setJobId(alarmJob.getId());
+ }
+ alarmRecordsMapper.insert(alarmRecord);
+ if (!updateFlag) {
+ alarmNormalData(dataReportParam, timeStamp, devcode, gasMap, dataReport);
+ }
+ break;
+ }
+ }
+ }
+ );
+ }
+
+ private void alarmNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap, Integer data) {
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+
+}
+
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index fac2afe..f8a06a6 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,40 +1,19 @@
server:
- port: 11556
+ port: 11320
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
- username: root
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell_zq_cs
+ username: postgres
password: Casic203
session:
store-type: redis
- redis:
- host: 111.198.10.15
- port: 11412
- password: ew5T4K3#203lwh
- redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
jms:
pub-sub-domain: true
- # session:
- # store-type: redis
- activemq:
- user:
- password:
- broker-url: tcp://192.168.0.203:61616
-#flowable数据源和多数据源配置
-casic:
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- #kaptcha-open: false #是否开启登录时验证码 (true/false)
- no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
- db:
- init:
- enable: false
- file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
- spring-session-open: false #开启spring session
logging:
level.root: error
- level.com.casic: error
+ level.com.casic: info
file:
path: logs/
name: missiles.log
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 86411e6..ffc01e9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -19,18 +19,11 @@
mapper-locations: classpath:mapper/*.xml
#mybatis-plus:
# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
-################### mybatis-plus配置 ###################
-################### casic配置 ###################
-flowable:
- checkProcessDefinitions: false #不校验process文件
casic:
- swagger-open: false #是否开启swagger (true/false)
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- muti-datasource-open: false #是否开启多数据源(true/false)
- spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
- session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
- session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
- extUrl: sys
- config:
- export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
- config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
+ device:
+ gas-dector:
+ type: 101
+ minutes: 60
+ enable-local: false
+# type 可燃气体的设备类型
+# minutes: 燃气外协设备上传数据的分钟数
\ No newline at end of file
diff --git a/target/classes/application-dev.yml b/target/classes/application-dev.yml
new file mode 100644
index 0000000..fac2afe
--- /dev/null
+++ b/target/classes/application-dev.yml
@@ -0,0 +1,40 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
+ username: root
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+logging:
+ level.root: error
+ level.com.casic: error
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/target/classes/application-postgre.yml b/target/classes/application-postgre.yml
new file mode 100644
index 0000000..2b7f69c
--- /dev/null
+++ b/target/classes/application-postgre.yml
@@ -0,0 +1,62 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell
+ username: postgres
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ redis-config:
+ host: 127.0.0.1
+ port: 6379
+ password:
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+smartcity:
+ config:
+ export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+ #export-path: D:\export\
+ image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\
+ config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\
+ download-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\download\
+ device:
+ redis:
+ invalid-time: 86400
+ host: 127.0.0.1
+ port: 6379
+ password: ew5T4K3#203lwh
+ config-prefix: 'Casic:'
+ getui:
+ appId: H9jSTE2bAt8QWq2K2GNOB3
+ appKey: bhPeCutJVdAyOasevQFtN9
+ masterSecret: lChudND74A89WRiHLkedb5
+logging:
+ level.root: info
+ level.com.casic: info
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/target/classes/application.yml b/target/classes/application.yml
new file mode 100644
index 0000000..86411e6
--- /dev/null
+++ b/target/classes/application.yml
@@ -0,0 +1,36 @@
+##########################################################
+################## 所有profile共有的配置 #################
+##########################################################
+spring:
+ profiles:
+ active: dev
+ servlet:
+ multipart:
+ max-file-size: 50MB
+ max-request-size: 80MB
+mybatis-plus:
+ global-config:
+ enable-sql-runner: true
+ configuration:
+ # 配置结果集属性为空时 是否映射返回结果
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
+ mapper-locations: classpath:mapper/*.xml
+mybatis:
+ mapper-locations: classpath:mapper/*.xml
+#mybatis-plus:
+# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
+################### mybatis-plus配置 ###################
+################### casic配置 ###################
+flowable:
+ checkProcessDefinitions: false #不校验process文件
+casic:
+ swagger-open: false #是否开启swagger (true/false)
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ muti-datasource-open: false #是否开启多数据源(true/false)
+ spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
+ session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
+ session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
+ extUrl: sys
+ config:
+ export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+ config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
diff --git a/target/classes/com/casic/CasicApplication.class b/target/classes/com/casic/CasicApplication.class
new file mode 100644
index 0000000..68c2f95
--- /dev/null
+++ b/target/classes/com/casic/CasicApplication.class
Binary files differ
diff --git a/target/classes/com/casic/controller/DeviceController.class b/target/classes/com/casic/controller/DeviceController.class
new file mode 100644
index 0000000..478d6ae
--- /dev/null
+++ b/target/classes/com/casic/controller/DeviceController.class
Binary files differ
diff --git a/target/classes/com/casic/controller/DeviceDataController.class b/target/classes/com/casic/controller/DeviceDataController.class
new file mode 100644
index 0000000..1f4400c
--- /dev/null
+++ b/target/classes/com/casic/controller/DeviceDataController.class
Binary files differ
diff --git a/target/classes/com/casic/dao/DataGasMapper.class b/target/classes/com/casic/dao/DataGasMapper.class
new file mode 100644
index 0000000..557d539
--- /dev/null
+++ b/target/classes/com/casic/dao/DataGasMapper.class
Binary files differ
diff --git a/target/classes/com/casic/dao/DeviceMapper.class b/target/classes/com/casic/dao/DeviceMapper.class
new file mode 100644
index 0000000..3ddcd2b
--- /dev/null
+++ b/target/classes/com/casic/dao/DeviceMapper.class
Binary files differ
diff --git a/target/classes/com/casic/dao/impl/DeviceDataMapper.class b/target/classes/com/casic/dao/impl/DeviceDataMapper.class
new file mode 100644
index 0000000..d73ed15
--- /dev/null
+++ b/target/classes/com/casic/dao/impl/DeviceDataMapper.class
Binary files differ
diff --git a/target/classes/com/casic/entity/DataGasReport.class b/target/classes/com/casic/entity/DataGasReport.class
new file mode 100644
index 0000000..a3dac78
--- /dev/null
+++ b/target/classes/com/casic/entity/DataGasReport.class
Binary files differ
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..814888c
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,321 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ * 报警工单表
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_job")
+public class AlarmJob extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 工单编号
+ */
+ @TableField("JOBCODE")
+ private String jobcode;
+ /**
+ * 工单类型
+ */
+ @TableField("JOG_TYPE")
+ private String jobType;
+ /**
+ * 井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 工单创建时间
+ */
+ @TableField("CREATE_TIME")
+ private Date createTime;
+ /**
+ * 工单状态（0待处理，1待确认，2处理中，3完成）
+ */
+ @TableField("JOB_STATUS")
+ private String jobStatus;
+ /**
+ * 接单人员
+ */
+ @TableField("GET_JOB_PERSON")
+ private Long getJobPerson;
+ /**
+ * 接单时间
+ */
+ @TableField("GET_JOB_TIME")
+ private Date getJobTime;
+ /**
+ * 应接单时间
+ */
+ @TableField("SHOULD_GET_TIME")
+ private Date shouldGetTime;
+ /**
+ * 第一现场情况
+ */
+ @TableField("FIRST_STATE")
+ private String firstState;
+ /**
+ * 第一现场照片
+ */
+ @TableField("FIRST_STATE_PHOTOS")
+ private String firstStatePhotos;
+ /**
+ * 确认人员
+ */
+ @TableField("CONFIRM_JOB_PERSON")
+ private Long confirmJobPerson;
+ /**
+ * 确认时间
+ */
+ @TableField("CONFRIM_JOB_TIME")
+ private Date confrimJobTime;
+ /**
+ * 处理人员
+ */
+ @TableField("HANDLE_JOB_Person")
+ private Long handleJobPerson;
+ /**
+ * 处理时间
+ */
+ @TableField("HANDLE_JOB_TIME")
+ private Date handleJobTime;
+ /**
+ * 维护情况记录
+ */
+ @TableField("HANDLE_MESSAGE")
+ private String handleMessage;
+ /**
+ * 维护图片
+ */
+ @TableField("HANDLE_PHOTOS")
+ private String handlePhotos;
+ /**
+ * 工单流转记录
+ */
+ @TableField("FLOW")
+ private String flow;
+
+ @TableField("JOB_BELONG_TO")
+ private Long jobBelongTo;
+
+ @TableField("JOB_FLAG_DELAY")
+ private String jobFlagDelay;
+
+ @TableField("JOB_FLAG_1")
+ private String jobFlag1;
+
+ @TableField(exist = false)
+ private String alarmValue;
+
+ @TableField(exist = false)
+ private String alarmContentName;
+
+ @TableField(exist = false)
+ private Integer recordId;
+
+ @Override
+ public String toString() {
+ return "AlarmJob{" +
+ "id=" + id +
+ ", jobcode=" + jobcode +
+ ", jogType=" + jobType +
+ ", wellCode=" + wellCode +
+ ", devcode=" + devcode +
+ ", createTime=" + createTime +
+ ", jobStatus=" + jobStatus +
+ ", getJobPerson=" + getJobPerson +
+ ", getJobTime=" + getJobTime +
+ ", firstState=" + firstState +
+ ", firstStatePhotos=" + firstStatePhotos +
+ ", confirmJobPerson=" + confirmJobPerson +
+ ", confrimJobTime=" + confrimJobTime +
+ ", handleJobPerson=" + handleJobPerson +
+ ", handleJobTime=" + handleJobTime +
+ ", handleMessage=" + handleMessage +
+ ", handlePhotos=" + handlePhotos +
+ ", flow=" + flow +
+ ", recordId=" + recordId +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/AlarmRecords.java b/src/main/java/com/casic/entity/AlarmRecords.java
new file mode 100644
index 0000000..88b0b26
--- /dev/null
+++ b/src/main/java/com/casic/entity/AlarmRecords.java
@@ -0,0 +1,108 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_records")
+public class AlarmRecords extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 设备ID
+ */
+ @TableField("DEVICE_ID")
+ private Long deviceId;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 闸井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 告警类型
+ */
+ @TableField("ALARM_TYPE")
+ private String alarmType;
+ /**
+ * 告警内容
+ */
+ @TableField("ALARM_CONTENT")
+ private String alarmContent;
+ /**
+ * 告警数值
+ */
+ @TableField("ALARM_VALUE")
+ private String alarmValue;
+ /**
+ * 告警等级
+ */
+ @TableField("ALARM_LEVEL")
+ private Integer alarmLevel;
+ /**
+ * 告警详情
+ */
+ @TableField("ALARM_MSG")
+ private String alarmMessage;
+ /**
+ * 告警时间
+ */
+ @TableField("ALARM_TIME")
+ private Date alarmTime;
+ /**
+ * 告警状态
+ */
+ @TableField("STATUS")
+ private String status;
+ /**
+ * 工单编号
+ */
+ @TableField("JOB_ID")
+ private Long jobId;
+
+ @TableField(exist = false)
+ private Integer jobStatus;
+
+ @Override
+ public String toString() {
+ return "AlarmRecords{" +
+ "id=" + id +
+ ", deviceId=" + deviceId +
+ ", devcode=" + devcode +
+ ", wellCode=" + wellCode +
+ ", alarmType=" + alarmType +
+ ", alarmContent=" + alarmContent +
+ ", alarmValue=" + alarmValue +
+ ", alarmLevel=" + alarmLevel +
+ ", alarmMessage=" + alarmMessage +
+ ", alarmTime=" + alarmTime +
+ ", status=" + status +
+ ", jobId=" + jobId +
+ ", jobStatus=" + jobStatus +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/DataGasDector.java b/src/main/java/com/casic/entity/DataGasDector.java
new file mode 100644
index 0000000..537789a
--- /dev/null
+++ b/src/main/java/com/casic/entity/DataGasDector.java
@@ -0,0 +1,42 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author cz
+ * @date 2022-7-1
+ */
+@Data
+@TableName("data_gas_dector")
+public class DataGasDector {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ private String devcode;
+ private String wellCode;
+ private String strength;
+
+ private String descn;
+ /**
+ * --信号与干扰加噪声比
+ */
+ private String sinr;
+ /**
+ * --参考信号接收功率
+ */
+ private String rsrp;
+ /**
+ * --物理小区标识
+ */
+ private String pci;
+ private Date uptime;
+ private Date logtime;
+}
diff --git a/src/main/java/com/casic/entity/DataGasReport.java b/src/main/java/com/casic/entity/DataGasReport.java
deleted file mode 100644
index c43ccdf..0000000
--- a/src/main/java/com/casic/entity/DataGasReport.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.casic.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author cz
- * @date 2022-7-1
- */
-@Data
-@TableName("data_gas_dector")
-public class DataGasReport {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @TableField("devcode")
- private String imei;
- private String wellcode;
-
- private String imsi;
- /**
- * --事件类型 0正常 1低报 2高报
- */
- private String gasSensorState;
- /**
- * --浓度值
- */
- private String gasSampleValue;
- /**
- * --信号与干扰加噪声比
- */
- private String sinr;
- /**
- * --参考信号接收功率
- */
- private String rsrp;
- /**
- * --物理小区标识
- */
- private String pci;
- /**
- * --心跳周期
- */
- private String heartbeatTime;
-
- /**
- * --小区位置信息
- */
- private String cellId;
- /**
- * --电池电压
- */
- private String batteryVoltage;
- /**
- * --电池电量
- */
- private String batteryValue;
- private String iccid;
- private Date uptime;
- private Date logtime;
-}
diff --git a/src/main/java/com/casic/entity/DeviceSatatus.java b/src/main/java/com/casic/entity/DeviceSatatus.java
new file mode 100644
index 0000000..bab7903
--- /dev/null
+++ b/src/main/java/com/casic/entity/DeviceSatatus.java
@@ -0,0 +1,19 @@
+package com.casic.entity;
+
+import lombok.Data;
+
+/**
+ * 不使用了
+ *
+ */
+@Data
+public class DeviceSatatus {
+ private String deviceId;
+ private String cell;
+ private String cellTs;
+ private String onlineState;
+ private String onlineTs;
+ private String lastDataId;
+ private String lastDataJson;
+ private String lastDataTs;
+}
diff --git a/src/main/java/com/casic/model/DataContentParam.java b/src/main/java/com/casic/model/DataContentParam.java
new file mode 100644
index 0000000..46d298a
--- /dev/null
+++ b/src/main/java/com/casic/model/DataContentParam.java
@@ -0,0 +1,19 @@
+package com.casic.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DataContentParam {
+ private String msg_type;
+ private String error_val;
+ private String ch_cnt;
+ private String erro_cnt;
+ private String alarm_low_cnt;
+ private String alarm_high_cnt;
+ private String offline_cnt;
+ private List rtd_val;
+ private List adc_val;
+ private List status_val;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/DataReportParam.java b/src/main/java/com/casic/model/DataReportParam.java
index 082814c..754f330 100644
--- a/src/main/java/com/casic/model/DataReportParam.java
+++ b/src/main/java/com/casic/model/DataReportParam.java
@@ -11,25 +11,12 @@
*/
@Data
public class DataReportParam {
- private String upPacketSN;
- private String upDataSN;
- private String topic;
- private String timestamp;
- private String tenantId;
- private String serviceId;
- private String protocol;
- private String productId;
- /**
- * gas_sensor_state = 1, --事件类型 0 正常 1 低报 2 高报
- * gas_sample_value = 11-- 浓度值
- */
- private Map payload;
- private String messageType;
private String deviceType;
- private String deviceId;
- private String assocAssetId;
- @JsonProperty(value = "IMSI", required = true)
- private String IMSI;
- @JsonProperty(value = "IMEI", required = true)
- private String IMEI;
+ private String iotId;
+ private String requestId;
+ private Object checkFailedData;
+ private String productKey;
+ private String gmtCreate;
+ private String deviceName;
+ private Object items;
}
diff --git a/src/main/java/com/casic/service/DeviceDataService.java b/src/main/java/com/casic/service/DeviceDataService.java
index d883fe4..457d710 100644
--- a/src/main/java/com/casic/service/DeviceDataService.java
+++ b/src/main/java/com/casic/service/DeviceDataService.java
@@ -3,25 +3,18 @@
import com.casic.model.DataReportParam;
import com.casic.model.HeartbeatParam;
import com.casic.model.ResponseData;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* @author cz
* @date 2022
*/
public interface DeviceDataService {
-
/**
*
* @param dataReportParam
* @return
*/
- ResponseData DeviceDataCommit(DataReportParam dataReportParam);
-
- /**
- *
- * @param heartbeatParam
- * @return
- */
- ResponseData heartBeatSave(HeartbeatParam heartbeatParam);
+ ResponseData gasReceiver(DataReportParam dataReportParam);
}
diff --git a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
index 93f0685..e473f0c 100644
--- a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
+++ b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
@@ -1,58 +1,49 @@
package com.casic.service.impl;
-import com.casic.dao.impl.DeviceDataMapper;
+import com.alibaba.druid.util.StringUtils;
+import com.alibaba.fastjson.JSON;
import com.casic.model.*;
import com.casic.service.DeviceDataService;
+import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.stereotype.Service;
+import java.util.Map;
+
/**
* @author cz
- * @date 2022-6-20
+ * @date 2022-9-26
*/
@Slf4j
@Service
public class DeviceDataServiceImpl implements DeviceDataService {
- @Autowired
- DeviceDataMapper deviceDataMapper;
+ private final NormalDataProcessor normalDataProcessor;
- /**
- * @param dataReportParam
- * @return
- */
- public ResponseData DeviceDataCommit(DataReportParam dataReportParam) {
- ResponseData responseData = new ResponseData();
- try {
- deviceDataMapper.addDeviceData(dataReportParam);
- responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
- responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
- } catch (DataAccessException sqlex) {
- responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
- responseData.setMessage("请求数据异常");
- responseData.setSuccess(true);
- log.error("主题:数据上报保存出现错误,异常信息为{}", sqlex);
- }
- return responseData;
+ public DeviceDataServiceImpl(NormalDataProcessor normalDataProcessor) {
+ this.normalDataProcessor = normalDataProcessor;
}
- /**
- * @param heartbeatParam
- * @return
- */
- public ResponseData heartBeatSave(HeartbeatParam heartbeatParam) {
+ public ResponseData gasReceiver(DataReportParam dataReportParam) {
ResponseData responseData = new ResponseData();
try {
- deviceDataMapper.editDeviceData(heartbeatParam);
+ Map> updDataMap = new ObjectMapper().convertValue(dataReportParam.getItems(), Map.class);
+ DataContentParam dataContentParam = JSON.parseObject(updDataMap.get("updData").get("value"), DataContentParam.class);
+ Long uptime = Long.valueOf(String.valueOf(updDataMap.get("updData").get("time")));
+ if (StringUtils.isEmpty(dataReportParam.getDeviceName())) {
+ responseData.setCode(200);
+ responseData.setMessage("没有设备编号");
+ return responseData;
+ }
+ normalDataProcessor.normalDataProvider(dataContentParam, uptime, dataReportParam.getDeviceName());
responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
} catch (DataAccessException sqlex) {
responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
responseData.setMessage("请求数据异常");
responseData.setSuccess(true);
- log.error("主题:数据心跳出现错误,异常信息为{}", sqlex);
+ log.error("主题:设备数据上报出现错误,异常信息为{}", sqlex);
}
return responseData;
}
diff --git a/src/main/java/com/casic/service/impl/NormalDataProcessor.java b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
new file mode 100644
index 0000000..3f7630a
--- /dev/null
+++ b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
@@ -0,0 +1,164 @@
+package com.casic.service.impl;
+
+import com.alibaba.druid.util.StringUtils;
+import com.casic.dao.AlarmRecordsMapper;
+import com.casic.dao.DataGasMapper;
+import com.casic.dao.impl.AlarmJobDao;
+import com.casic.entity.AlarmJob;
+import com.casic.entity.AlarmRecords;
+import com.casic.entity.DataGasDector;
+import com.casic.model.DataContentParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+import xyz.downgoon.snowflake.Snowflake;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class NormalDataProcessor {
+
+ public static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd");
+
+ @Value("${casic.device.gas-dector.type}")
+ private Long deviceType;
+ @Value("${casic.device.gas-dector.minutes}")
+ private String minutes;
+ @Value("${casic.device.gas-dector.enable-local}")
+ private Boolean enableLocal;
+ @Resource
+ private DataGasMapper dataGasMapper;
+ @Autowired
+ private AlarmJobDao alarmJobDao;
+ @Resource
+ private AlarmRecordsMapper alarmRecordsMapper;
+ private static Snowflake snowflake = new Snowflake(0, 2);
+
+ public void normalDataProvider(DataContentParam dataReportParam, Long timeStamp, String devcode) {
+ Map gasMap = dataGasMapper.getWellCode(devcode);
+ if (ObjectUtils.isEmpty(gasMap)) {
+ log.info("没有该设备编号录入" + devcode);
+ if (enableLocal) {
+ return;
+ }
+ }
+ Boolean updateFlag = false;
+ if (ObjectUtils.isEmpty(dataGasMapper.getLastData(minutes, devcode))) {
+ updateFlag = this.saveNormalData(dataReportParam, timeStamp, devcode, gasMap);
+ }
+ this.dataTaskJudge(dataReportParam, devcode, timeStamp, gasMap, updateFlag);
+ return;
+ }
+
+ /**
+ * 自定义时间存库
+ *
+ * @param dataReportParam
+ * @param timeStamp
+ * @param devcode
+ * @param gasMap
+ */
+ private Boolean saveNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap) {
+ Boolean updateFlag = false;
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ List dataReportFilter = dataReportParam.getRtd_val().stream().filter(
+ data -> {
+ return data != -1;
+ }
+ ).collect(Collectors.toList());
+ if (dataReportFilter.size() > 0 && dataReportFilter.get(dataReportFilter.size() - 1) != 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 1);
+ updateFlag = true;
+ } else if (dataReportFilter.get(dataReportFilter.size() - 1) == 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 0);
+ }
+ dataReportFilter.forEach(
+ data -> {
+ if (data != 65535) {
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+ }
+ );
+ return updateFlag;
+ }
+
+ /**
+ * 报警就存库
+ *
+ * @param dataReportParam
+ * @param devcode
+ * @param timeStamp
+ * @param gasMap
+ */
+ private void dataTaskJudge(DataContentParam dataReportParam, String devcode, Long timeStamp, Map gasMap, Boolean updateFlag) {
+ List> alarmLevelList = dataGasMapper.getAlarmLevelList(deviceType);
+ String wellCode = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "";
+ Long deviceId = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? Long.valueOf(String.valueOf(gasMap.get("deviceId"))) : -1;
+ final String gasMsgContent=dataGasMapper.getGasMsgContent(deviceType);
+ dataReportParam.getRtd_val().stream().filter(
+ dataReport -> {
+ return dataReport != -1 && dataReport != 65535;
+ }
+ ).forEach(
+ dataReport -> {
+ for (Map alarmLevelMap : alarmLevelList) {
+ if (dataReport > Float.valueOf(String.valueOf(alarmLevelMap.get("high_value")))) {
+ AlarmRecords alarmRecord = new AlarmRecords();
+ alarmRecord.setId(snowflake.nextId());
+ alarmRecord.setDeviceId(deviceId);
+ alarmRecord.setDevcode(devcode);
+ alarmRecord.setWellCode(wellCode);
+ alarmRecord.setAlarmType("1"); // 业务报警
+ alarmRecord.setAlarmContent("燃气报警");
+ alarmRecord.setAlarmValue(String.valueOf(dataReport));
+ alarmRecord.setAlarmTime(new Date());
+ alarmRecord.setStatus("1");
+ alarmRecord.setAlarmLevel(Integer.valueOf(alarmLevelMap.get("level").toString()));
+ alarmRecord.setAlarmMessage("燃气报警");
+ String jobId = alarmRecordsMapper.isOldAlarmRecord(devcode, "燃气报警");
+ // 超出报警阈值 生成一条报警消息
+ if (!StringUtils.isEmpty(jobId)) {
+ alarmRecordsMapper.updateOldAlarmRecord(devcode, "燃气报警");
+ alarmRecord.setJobId(Long.valueOf(jobId));
+ } else {
+ AlarmJob alarmJob = alarmJobDao.saveData(devcode, wellCode, "RQZD", "1");
+ alarmRecord.setJobId(alarmJob.getId());
+ }
+ alarmRecordsMapper.insert(alarmRecord);
+ if (!updateFlag) {
+ alarmNormalData(dataReportParam, timeStamp, devcode, gasMap, dataReport);
+ }
+ break;
+ }
+ }
+ }
+ );
+ }
+
+ private void alarmNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap, Integer data) {
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+
+}
+
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index fac2afe..f8a06a6 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,40 +1,19 @@
server:
- port: 11556
+ port: 11320
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
- username: root
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell_zq_cs
+ username: postgres
password: Casic203
session:
store-type: redis
- redis:
- host: 111.198.10.15
- port: 11412
- password: ew5T4K3#203lwh
- redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
jms:
pub-sub-domain: true
- # session:
- # store-type: redis
- activemq:
- user:
- password:
- broker-url: tcp://192.168.0.203:61616
-#flowable数据源和多数据源配置
-casic:
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- #kaptcha-open: false #是否开启登录时验证码 (true/false)
- no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
- db:
- init:
- enable: false
- file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
- spring-session-open: false #开启spring session
logging:
level.root: error
- level.com.casic: error
+ level.com.casic: info
file:
path: logs/
name: missiles.log
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 86411e6..ffc01e9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -19,18 +19,11 @@
mapper-locations: classpath:mapper/*.xml
#mybatis-plus:
# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
-################### mybatis-plus配置 ###################
-################### casic配置 ###################
-flowable:
- checkProcessDefinitions: false #不校验process文件
casic:
- swagger-open: false #是否开启swagger (true/false)
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- muti-datasource-open: false #是否开启多数据源(true/false)
- spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
- session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
- session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
- extUrl: sys
- config:
- export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
- config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
+ device:
+ gas-dector:
+ type: 101
+ minutes: 60
+ enable-local: false
+# type 可燃气体的设备类型
+# minutes: 燃气外协设备上传数据的分钟数
\ No newline at end of file
diff --git a/target/classes/application-dev.yml b/target/classes/application-dev.yml
new file mode 100644
index 0000000..fac2afe
--- /dev/null
+++ b/target/classes/application-dev.yml
@@ -0,0 +1,40 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
+ username: root
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+logging:
+ level.root: error
+ level.com.casic: error
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/target/classes/application-postgre.yml b/target/classes/application-postgre.yml
new file mode 100644
index 0000000..2b7f69c
--- /dev/null
+++ b/target/classes/application-postgre.yml
@@ -0,0 +1,62 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell
+ username: postgres
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ redis-config:
+ host: 127.0.0.1
+ port: 6379
+ password:
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+smartcity:
+ config:
+ export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+ #export-path: D:\export\
+ image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\
+ config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\
+ download-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\download\
+ device:
+ redis:
+ invalid-time: 86400
+ host: 127.0.0.1
+ port: 6379
+ password: ew5T4K3#203lwh
+ config-prefix: 'Casic:'
+ getui:
+ appId: H9jSTE2bAt8QWq2K2GNOB3
+ appKey: bhPeCutJVdAyOasevQFtN9
+ masterSecret: lChudND74A89WRiHLkedb5
+logging:
+ level.root: info
+ level.com.casic: info
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/target/classes/application.yml b/target/classes/application.yml
new file mode 100644
index 0000000..86411e6
--- /dev/null
+++ b/target/classes/application.yml
@@ -0,0 +1,36 @@
+##########################################################
+################## 所有profile共有的配置 #################
+##########################################################
+spring:
+ profiles:
+ active: dev
+ servlet:
+ multipart:
+ max-file-size: 50MB
+ max-request-size: 80MB
+mybatis-plus:
+ global-config:
+ enable-sql-runner: true
+ configuration:
+ # 配置结果集属性为空时 是否映射返回结果
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
+ mapper-locations: classpath:mapper/*.xml
+mybatis:
+ mapper-locations: classpath:mapper/*.xml
+#mybatis-plus:
+# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
+################### mybatis-plus配置 ###################
+################### casic配置 ###################
+flowable:
+ checkProcessDefinitions: false #不校验process文件
+casic:
+ swagger-open: false #是否开启swagger (true/false)
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ muti-datasource-open: false #是否开启多数据源(true/false)
+ spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
+ session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
+ session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
+ extUrl: sys
+ config:
+ export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+ config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
diff --git a/target/classes/com/casic/CasicApplication.class b/target/classes/com/casic/CasicApplication.class
new file mode 100644
index 0000000..68c2f95
--- /dev/null
+++ b/target/classes/com/casic/CasicApplication.class
Binary files differ
diff --git a/target/classes/com/casic/controller/DeviceController.class b/target/classes/com/casic/controller/DeviceController.class
new file mode 100644
index 0000000..478d6ae
--- /dev/null
+++ b/target/classes/com/casic/controller/DeviceController.class
Binary files differ
diff --git a/target/classes/com/casic/controller/DeviceDataController.class b/target/classes/com/casic/controller/DeviceDataController.class
new file mode 100644
index 0000000..1f4400c
--- /dev/null
+++ b/target/classes/com/casic/controller/DeviceDataController.class
Binary files differ
diff --git a/target/classes/com/casic/dao/DataGasMapper.class b/target/classes/com/casic/dao/DataGasMapper.class
new file mode 100644
index 0000000..557d539
--- /dev/null
+++ b/target/classes/com/casic/dao/DataGasMapper.class
Binary files differ
diff --git a/target/classes/com/casic/dao/DeviceMapper.class b/target/classes/com/casic/dao/DeviceMapper.class
new file mode 100644
index 0000000..3ddcd2b
--- /dev/null
+++ b/target/classes/com/casic/dao/DeviceMapper.class
Binary files differ
diff --git a/target/classes/com/casic/dao/impl/DeviceDataMapper.class b/target/classes/com/casic/dao/impl/DeviceDataMapper.class
new file mode 100644
index 0000000..d73ed15
--- /dev/null
+++ b/target/classes/com/casic/dao/impl/DeviceDataMapper.class
Binary files differ
diff --git a/target/classes/com/casic/entity/DataGasReport.class b/target/classes/com/casic/entity/DataGasReport.class
new file mode 100644
index 0000000..a3dac78
--- /dev/null
+++ b/target/classes/com/casic/entity/DataGasReport.class
Binary files differ
diff --git a/target/classes/com/casic/model/DataReportParam.class b/target/classes/com/casic/model/DataReportParam.class
new file mode 100644
index 0000000..284c4f6
--- /dev/null
+++ b/target/classes/com/casic/model/DataReportParam.class
Binary files differ
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..814888c
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,321 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ * 报警工单表
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_job")
+public class AlarmJob extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 工单编号
+ */
+ @TableField("JOBCODE")
+ private String jobcode;
+ /**
+ * 工单类型
+ */
+ @TableField("JOG_TYPE")
+ private String jobType;
+ /**
+ * 井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 工单创建时间
+ */
+ @TableField("CREATE_TIME")
+ private Date createTime;
+ /**
+ * 工单状态（0待处理，1待确认，2处理中，3完成）
+ */
+ @TableField("JOB_STATUS")
+ private String jobStatus;
+ /**
+ * 接单人员
+ */
+ @TableField("GET_JOB_PERSON")
+ private Long getJobPerson;
+ /**
+ * 接单时间
+ */
+ @TableField("GET_JOB_TIME")
+ private Date getJobTime;
+ /**
+ * 应接单时间
+ */
+ @TableField("SHOULD_GET_TIME")
+ private Date shouldGetTime;
+ /**
+ * 第一现场情况
+ */
+ @TableField("FIRST_STATE")
+ private String firstState;
+ /**
+ * 第一现场照片
+ */
+ @TableField("FIRST_STATE_PHOTOS")
+ private String firstStatePhotos;
+ /**
+ * 确认人员
+ */
+ @TableField("CONFIRM_JOB_PERSON")
+ private Long confirmJobPerson;
+ /**
+ * 确认时间
+ */
+ @TableField("CONFRIM_JOB_TIME")
+ private Date confrimJobTime;
+ /**
+ * 处理人员
+ */
+ @TableField("HANDLE_JOB_Person")
+ private Long handleJobPerson;
+ /**
+ * 处理时间
+ */
+ @TableField("HANDLE_JOB_TIME")
+ private Date handleJobTime;
+ /**
+ * 维护情况记录
+ */
+ @TableField("HANDLE_MESSAGE")
+ private String handleMessage;
+ /**
+ * 维护图片
+ */
+ @TableField("HANDLE_PHOTOS")
+ private String handlePhotos;
+ /**
+ * 工单流转记录
+ */
+ @TableField("FLOW")
+ private String flow;
+
+ @TableField("JOB_BELONG_TO")
+ private Long jobBelongTo;
+
+ @TableField("JOB_FLAG_DELAY")
+ private String jobFlagDelay;
+
+ @TableField("JOB_FLAG_1")
+ private String jobFlag1;
+
+ @TableField(exist = false)
+ private String alarmValue;
+
+ @TableField(exist = false)
+ private String alarmContentName;
+
+ @TableField(exist = false)
+ private Integer recordId;
+
+ @Override
+ public String toString() {
+ return "AlarmJob{" +
+ "id=" + id +
+ ", jobcode=" + jobcode +
+ ", jogType=" + jobType +
+ ", wellCode=" + wellCode +
+ ", devcode=" + devcode +
+ ", createTime=" + createTime +
+ ", jobStatus=" + jobStatus +
+ ", getJobPerson=" + getJobPerson +
+ ", getJobTime=" + getJobTime +
+ ", firstState=" + firstState +
+ ", firstStatePhotos=" + firstStatePhotos +
+ ", confirmJobPerson=" + confirmJobPerson +
+ ", confrimJobTime=" + confrimJobTime +
+ ", handleJobPerson=" + handleJobPerson +
+ ", handleJobTime=" + handleJobTime +
+ ", handleMessage=" + handleMessage +
+ ", handlePhotos=" + handlePhotos +
+ ", flow=" + flow +
+ ", recordId=" + recordId +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/AlarmRecords.java b/src/main/java/com/casic/entity/AlarmRecords.java
new file mode 100644
index 0000000..88b0b26
--- /dev/null
+++ b/src/main/java/com/casic/entity/AlarmRecords.java
@@ -0,0 +1,108 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_records")
+public class AlarmRecords extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 设备ID
+ */
+ @TableField("DEVICE_ID")
+ private Long deviceId;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 闸井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 告警类型
+ */
+ @TableField("ALARM_TYPE")
+ private String alarmType;
+ /**
+ * 告警内容
+ */
+ @TableField("ALARM_CONTENT")
+ private String alarmContent;
+ /**
+ * 告警数值
+ */
+ @TableField("ALARM_VALUE")
+ private String alarmValue;
+ /**
+ * 告警等级
+ */
+ @TableField("ALARM_LEVEL")
+ private Integer alarmLevel;
+ /**
+ * 告警详情
+ */
+ @TableField("ALARM_MSG")
+ private String alarmMessage;
+ /**
+ * 告警时间
+ */
+ @TableField("ALARM_TIME")
+ private Date alarmTime;
+ /**
+ * 告警状态
+ */
+ @TableField("STATUS")
+ private String status;
+ /**
+ * 工单编号
+ */
+ @TableField("JOB_ID")
+ private Long jobId;
+
+ @TableField(exist = false)
+ private Integer jobStatus;
+
+ @Override
+ public String toString() {
+ return "AlarmRecords{" +
+ "id=" + id +
+ ", deviceId=" + deviceId +
+ ", devcode=" + devcode +
+ ", wellCode=" + wellCode +
+ ", alarmType=" + alarmType +
+ ", alarmContent=" + alarmContent +
+ ", alarmValue=" + alarmValue +
+ ", alarmLevel=" + alarmLevel +
+ ", alarmMessage=" + alarmMessage +
+ ", alarmTime=" + alarmTime +
+ ", status=" + status +
+ ", jobId=" + jobId +
+ ", jobStatus=" + jobStatus +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/DataGasDector.java b/src/main/java/com/casic/entity/DataGasDector.java
new file mode 100644
index 0000000..537789a
--- /dev/null
+++ b/src/main/java/com/casic/entity/DataGasDector.java
@@ -0,0 +1,42 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author cz
+ * @date 2022-7-1
+ */
+@Data
+@TableName("data_gas_dector")
+public class DataGasDector {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ private String devcode;
+ private String wellCode;
+ private String strength;
+
+ private String descn;
+ /**
+ * --信号与干扰加噪声比
+ */
+ private String sinr;
+ /**
+ * --参考信号接收功率
+ */
+ private String rsrp;
+ /**
+ * --物理小区标识
+ */
+ private String pci;
+ private Date uptime;
+ private Date logtime;
+}
diff --git a/src/main/java/com/casic/entity/DataGasReport.java b/src/main/java/com/casic/entity/DataGasReport.java
deleted file mode 100644
index c43ccdf..0000000
--- a/src/main/java/com/casic/entity/DataGasReport.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.casic.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author cz
- * @date 2022-7-1
- */
-@Data
-@TableName("data_gas_dector")
-public class DataGasReport {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @TableField("devcode")
- private String imei;
- private String wellcode;
-
- private String imsi;
- /**
- * --事件类型 0正常 1低报 2高报
- */
- private String gasSensorState;
- /**
- * --浓度值
- */
- private String gasSampleValue;
- /**
- * --信号与干扰加噪声比
- */
- private String sinr;
- /**
- * --参考信号接收功率
- */
- private String rsrp;
- /**
- * --物理小区标识
- */
- private String pci;
- /**
- * --心跳周期
- */
- private String heartbeatTime;
-
- /**
- * --小区位置信息
- */
- private String cellId;
- /**
- * --电池电压
- */
- private String batteryVoltage;
- /**
- * --电池电量
- */
- private String batteryValue;
- private String iccid;
- private Date uptime;
- private Date logtime;
-}
diff --git a/src/main/java/com/casic/entity/DeviceSatatus.java b/src/main/java/com/casic/entity/DeviceSatatus.java
new file mode 100644
index 0000000..bab7903
--- /dev/null
+++ b/src/main/java/com/casic/entity/DeviceSatatus.java
@@ -0,0 +1,19 @@
+package com.casic.entity;
+
+import lombok.Data;
+
+/**
+ * 不使用了
+ *
+ */
+@Data
+public class DeviceSatatus {
+ private String deviceId;
+ private String cell;
+ private String cellTs;
+ private String onlineState;
+ private String onlineTs;
+ private String lastDataId;
+ private String lastDataJson;
+ private String lastDataTs;
+}
diff --git a/src/main/java/com/casic/model/DataContentParam.java b/src/main/java/com/casic/model/DataContentParam.java
new file mode 100644
index 0000000..46d298a
--- /dev/null
+++ b/src/main/java/com/casic/model/DataContentParam.java
@@ -0,0 +1,19 @@
+package com.casic.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DataContentParam {
+ private String msg_type;
+ private String error_val;
+ private String ch_cnt;
+ private String erro_cnt;
+ private String alarm_low_cnt;
+ private String alarm_high_cnt;
+ private String offline_cnt;
+ private List rtd_val;
+ private List adc_val;
+ private List status_val;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/DataReportParam.java b/src/main/java/com/casic/model/DataReportParam.java
index 082814c..754f330 100644
--- a/src/main/java/com/casic/model/DataReportParam.java
+++ b/src/main/java/com/casic/model/DataReportParam.java
@@ -11,25 +11,12 @@
*/
@Data
public class DataReportParam {
- private String upPacketSN;
- private String upDataSN;
- private String topic;
- private String timestamp;
- private String tenantId;
- private String serviceId;
- private String protocol;
- private String productId;
- /**
- * gas_sensor_state = 1, --事件类型 0 正常 1 低报 2 高报
- * gas_sample_value = 11-- 浓度值
- */
- private Map payload;
- private String messageType;
private String deviceType;
- private String deviceId;
- private String assocAssetId;
- @JsonProperty(value = "IMSI", required = true)
- private String IMSI;
- @JsonProperty(value = "IMEI", required = true)
- private String IMEI;
+ private String iotId;
+ private String requestId;
+ private Object checkFailedData;
+ private String productKey;
+ private String gmtCreate;
+ private String deviceName;
+ private Object items;
}
diff --git a/src/main/java/com/casic/service/DeviceDataService.java b/src/main/java/com/casic/service/DeviceDataService.java
index d883fe4..457d710 100644
--- a/src/main/java/com/casic/service/DeviceDataService.java
+++ b/src/main/java/com/casic/service/DeviceDataService.java
@@ -3,25 +3,18 @@
import com.casic.model.DataReportParam;
import com.casic.model.HeartbeatParam;
import com.casic.model.ResponseData;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* @author cz
* @date 2022
*/
public interface DeviceDataService {
-
/**
*
* @param dataReportParam
* @return
*/
- ResponseData DeviceDataCommit(DataReportParam dataReportParam);
-
- /**
- *
- * @param heartbeatParam
- * @return
- */
- ResponseData heartBeatSave(HeartbeatParam heartbeatParam);
+ ResponseData gasReceiver(DataReportParam dataReportParam);
}
diff --git a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
index 93f0685..e473f0c 100644
--- a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
+++ b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
@@ -1,58 +1,49 @@
package com.casic.service.impl;
-import com.casic.dao.impl.DeviceDataMapper;
+import com.alibaba.druid.util.StringUtils;
+import com.alibaba.fastjson.JSON;
import com.casic.model.*;
import com.casic.service.DeviceDataService;
+import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.stereotype.Service;
+import java.util.Map;
+
/**
* @author cz
- * @date 2022-6-20
+ * @date 2022-9-26
*/
@Slf4j
@Service
public class DeviceDataServiceImpl implements DeviceDataService {
- @Autowired
- DeviceDataMapper deviceDataMapper;
+ private final NormalDataProcessor normalDataProcessor;
- /**
- * @param dataReportParam
- * @return
- */
- public ResponseData DeviceDataCommit(DataReportParam dataReportParam) {
- ResponseData responseData = new ResponseData();
- try {
- deviceDataMapper.addDeviceData(dataReportParam);
- responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
- responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
- } catch (DataAccessException sqlex) {
- responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
- responseData.setMessage("请求数据异常");
- responseData.setSuccess(true);
- log.error("主题:数据上报保存出现错误,异常信息为{}", sqlex);
- }
- return responseData;
+ public DeviceDataServiceImpl(NormalDataProcessor normalDataProcessor) {
+ this.normalDataProcessor = normalDataProcessor;
}
- /**
- * @param heartbeatParam
- * @return
- */
- public ResponseData heartBeatSave(HeartbeatParam heartbeatParam) {
+ public ResponseData gasReceiver(DataReportParam dataReportParam) {
ResponseData responseData = new ResponseData();
try {
- deviceDataMapper.editDeviceData(heartbeatParam);
+ Map> updDataMap = new ObjectMapper().convertValue(dataReportParam.getItems(), Map.class);
+ DataContentParam dataContentParam = JSON.parseObject(updDataMap.get("updData").get("value"), DataContentParam.class);
+ Long uptime = Long.valueOf(String.valueOf(updDataMap.get("updData").get("time")));
+ if (StringUtils.isEmpty(dataReportParam.getDeviceName())) {
+ responseData.setCode(200);
+ responseData.setMessage("没有设备编号");
+ return responseData;
+ }
+ normalDataProcessor.normalDataProvider(dataContentParam, uptime, dataReportParam.getDeviceName());
responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
} catch (DataAccessException sqlex) {
responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
responseData.setMessage("请求数据异常");
responseData.setSuccess(true);
- log.error("主题:数据心跳出现错误,异常信息为{}", sqlex);
+ log.error("主题:设备数据上报出现错误,异常信息为{}", sqlex);
}
return responseData;
}
diff --git a/src/main/java/com/casic/service/impl/NormalDataProcessor.java b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
new file mode 100644
index 0000000..3f7630a
--- /dev/null
+++ b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
@@ -0,0 +1,164 @@
+package com.casic.service.impl;
+
+import com.alibaba.druid.util.StringUtils;
+import com.casic.dao.AlarmRecordsMapper;
+import com.casic.dao.DataGasMapper;
+import com.casic.dao.impl.AlarmJobDao;
+import com.casic.entity.AlarmJob;
+import com.casic.entity.AlarmRecords;
+import com.casic.entity.DataGasDector;
+import com.casic.model.DataContentParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+import xyz.downgoon.snowflake.Snowflake;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class NormalDataProcessor {
+
+ public static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd");
+
+ @Value("${casic.device.gas-dector.type}")
+ private Long deviceType;
+ @Value("${casic.device.gas-dector.minutes}")
+ private String minutes;
+ @Value("${casic.device.gas-dector.enable-local}")
+ private Boolean enableLocal;
+ @Resource
+ private DataGasMapper dataGasMapper;
+ @Autowired
+ private AlarmJobDao alarmJobDao;
+ @Resource
+ private AlarmRecordsMapper alarmRecordsMapper;
+ private static Snowflake snowflake = new Snowflake(0, 2);
+
+ public void normalDataProvider(DataContentParam dataReportParam, Long timeStamp, String devcode) {
+ Map gasMap = dataGasMapper.getWellCode(devcode);
+ if (ObjectUtils.isEmpty(gasMap)) {
+ log.info("没有该设备编号录入" + devcode);
+ if (enableLocal) {
+ return;
+ }
+ }
+ Boolean updateFlag = false;
+ if (ObjectUtils.isEmpty(dataGasMapper.getLastData(minutes, devcode))) {
+ updateFlag = this.saveNormalData(dataReportParam, timeStamp, devcode, gasMap);
+ }
+ this.dataTaskJudge(dataReportParam, devcode, timeStamp, gasMap, updateFlag);
+ return;
+ }
+
+ /**
+ * 自定义时间存库
+ *
+ * @param dataReportParam
+ * @param timeStamp
+ * @param devcode
+ * @param gasMap
+ */
+ private Boolean saveNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap) {
+ Boolean updateFlag = false;
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ List dataReportFilter = dataReportParam.getRtd_val().stream().filter(
+ data -> {
+ return data != -1;
+ }
+ ).collect(Collectors.toList());
+ if (dataReportFilter.size() > 0 && dataReportFilter.get(dataReportFilter.size() - 1) != 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 1);
+ updateFlag = true;
+ } else if (dataReportFilter.get(dataReportFilter.size() - 1) == 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 0);
+ }
+ dataReportFilter.forEach(
+ data -> {
+ if (data != 65535) {
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+ }
+ );
+ return updateFlag;
+ }
+
+ /**
+ * 报警就存库
+ *
+ * @param dataReportParam
+ * @param devcode
+ * @param timeStamp
+ * @param gasMap
+ */
+ private void dataTaskJudge(DataContentParam dataReportParam, String devcode, Long timeStamp, Map gasMap, Boolean updateFlag) {
+ List> alarmLevelList = dataGasMapper.getAlarmLevelList(deviceType);
+ String wellCode = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "";
+ Long deviceId = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? Long.valueOf(String.valueOf(gasMap.get("deviceId"))) : -1;
+ final String gasMsgContent=dataGasMapper.getGasMsgContent(deviceType);
+ dataReportParam.getRtd_val().stream().filter(
+ dataReport -> {
+ return dataReport != -1 && dataReport != 65535;
+ }
+ ).forEach(
+ dataReport -> {
+ for (Map alarmLevelMap : alarmLevelList) {
+ if (dataReport > Float.valueOf(String.valueOf(alarmLevelMap.get("high_value")))) {
+ AlarmRecords alarmRecord = new AlarmRecords();
+ alarmRecord.setId(snowflake.nextId());
+ alarmRecord.setDeviceId(deviceId);
+ alarmRecord.setDevcode(devcode);
+ alarmRecord.setWellCode(wellCode);
+ alarmRecord.setAlarmType("1"); // 业务报警
+ alarmRecord.setAlarmContent("燃气报警");
+ alarmRecord.setAlarmValue(String.valueOf(dataReport));
+ alarmRecord.setAlarmTime(new Date());
+ alarmRecord.setStatus("1");
+ alarmRecord.setAlarmLevel(Integer.valueOf(alarmLevelMap.get("level").toString()));
+ alarmRecord.setAlarmMessage("燃气报警");
+ String jobId = alarmRecordsMapper.isOldAlarmRecord(devcode, "燃气报警");
+ // 超出报警阈值 生成一条报警消息
+ if (!StringUtils.isEmpty(jobId)) {
+ alarmRecordsMapper.updateOldAlarmRecord(devcode, "燃气报警");
+ alarmRecord.setJobId(Long.valueOf(jobId));
+ } else {
+ AlarmJob alarmJob = alarmJobDao.saveData(devcode, wellCode, "RQZD", "1");
+ alarmRecord.setJobId(alarmJob.getId());
+ }
+ alarmRecordsMapper.insert(alarmRecord);
+ if (!updateFlag) {
+ alarmNormalData(dataReportParam, timeStamp, devcode, gasMap, dataReport);
+ }
+ break;
+ }
+ }
+ }
+ );
+ }
+
+ private void alarmNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap, Integer data) {
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+
+}
+
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index fac2afe..f8a06a6 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,40 +1,19 @@
server:
- port: 11556
+ port: 11320
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
- username: root
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell_zq_cs
+ username: postgres
password: Casic203
session:
store-type: redis
- redis:
- host: 111.198.10.15
- port: 11412
- password: ew5T4K3#203lwh
- redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
jms:
pub-sub-domain: true
- # session:
- # store-type: redis
- activemq:
- user:
- password:
- broker-url: tcp://192.168.0.203:61616
-#flowable数据源和多数据源配置
-casic:
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- #kaptcha-open: false #是否开启登录时验证码 (true/false)
- no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
- db:
- init:
- enable: false
- file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
- spring-session-open: false #开启spring session
logging:
level.root: error
- level.com.casic: error
+ level.com.casic: info
file:
path: logs/
name: missiles.log
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 86411e6..ffc01e9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -19,18 +19,11 @@
mapper-locations: classpath:mapper/*.xml
#mybatis-plus:
# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
-################### mybatis-plus配置 ###################
-################### casic配置 ###################
-flowable:
- checkProcessDefinitions: false #不校验process文件
casic:
- swagger-open: false #是否开启swagger (true/false)
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- muti-datasource-open: false #是否开启多数据源(true/false)
- spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
- session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
- session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
- extUrl: sys
- config:
- export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
- config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
+ device:
+ gas-dector:
+ type: 101
+ minutes: 60
+ enable-local: false
+# type 可燃气体的设备类型
+# minutes: 燃气外协设备上传数据的分钟数
\ No newline at end of file
diff --git a/target/classes/application-dev.yml b/target/classes/application-dev.yml
new file mode 100644
index 0000000..fac2afe
--- /dev/null
+++ b/target/classes/application-dev.yml
@@ -0,0 +1,40 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
+ username: root
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+logging:
+ level.root: error
+ level.com.casic: error
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/target/classes/application-postgre.yml b/target/classes/application-postgre.yml
new file mode 100644
index 0000000..2b7f69c
--- /dev/null
+++ b/target/classes/application-postgre.yml
@@ -0,0 +1,62 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell
+ username: postgres
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ redis-config:
+ host: 127.0.0.1
+ port: 6379
+ password:
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+smartcity:
+ config:
+ export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+ #export-path: D:\export\
+ image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\
+ config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\
+ download-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\download\
+ device:
+ redis:
+ invalid-time: 86400
+ host: 127.0.0.1
+ port: 6379
+ password: ew5T4K3#203lwh
+ config-prefix: 'Casic:'
+ getui:
+ appId: H9jSTE2bAt8QWq2K2GNOB3
+ appKey: bhPeCutJVdAyOasevQFtN9
+ masterSecret: lChudND74A89WRiHLkedb5
+logging:
+ level.root: info
+ level.com.casic: info
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/target/classes/application.yml b/target/classes/application.yml
new file mode 100644
index 0000000..86411e6
--- /dev/null
+++ b/target/classes/application.yml
@@ -0,0 +1,36 @@
+##########################################################
+################## 所有profile共有的配置 #################
+##########################################################
+spring:
+ profiles:
+ active: dev
+ servlet:
+ multipart:
+ max-file-size: 50MB
+ max-request-size: 80MB
+mybatis-plus:
+ global-config:
+ enable-sql-runner: true
+ configuration:
+ # 配置结果集属性为空时 是否映射返回结果
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
+ mapper-locations: classpath:mapper/*.xml
+mybatis:
+ mapper-locations: classpath:mapper/*.xml
+#mybatis-plus:
+# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
+################### mybatis-plus配置 ###################
+################### casic配置 ###################
+flowable:
+ checkProcessDefinitions: false #不校验process文件
+casic:
+ swagger-open: false #是否开启swagger (true/false)
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ muti-datasource-open: false #是否开启多数据源(true/false)
+ spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
+ session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
+ session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
+ extUrl: sys
+ config:
+ export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+ config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
diff --git a/target/classes/com/casic/CasicApplication.class b/target/classes/com/casic/CasicApplication.class
new file mode 100644
index 0000000..68c2f95
--- /dev/null
+++ b/target/classes/com/casic/CasicApplication.class
Binary files differ
diff --git a/target/classes/com/casic/controller/DeviceController.class b/target/classes/com/casic/controller/DeviceController.class
new file mode 100644
index 0000000..478d6ae
--- /dev/null
+++ b/target/classes/com/casic/controller/DeviceController.class
Binary files differ
diff --git a/target/classes/com/casic/controller/DeviceDataController.class b/target/classes/com/casic/controller/DeviceDataController.class
new file mode 100644
index 0000000..1f4400c
--- /dev/null
+++ b/target/classes/com/casic/controller/DeviceDataController.class
Binary files differ
diff --git a/target/classes/com/casic/dao/DataGasMapper.class b/target/classes/com/casic/dao/DataGasMapper.class
new file mode 100644
index 0000000..557d539
--- /dev/null
+++ b/target/classes/com/casic/dao/DataGasMapper.class
Binary files differ
diff --git a/target/classes/com/casic/dao/DeviceMapper.class b/target/classes/com/casic/dao/DeviceMapper.class
new file mode 100644
index 0000000..3ddcd2b
--- /dev/null
+++ b/target/classes/com/casic/dao/DeviceMapper.class
Binary files differ
diff --git a/target/classes/com/casic/dao/impl/DeviceDataMapper.class b/target/classes/com/casic/dao/impl/DeviceDataMapper.class
new file mode 100644
index 0000000..d73ed15
--- /dev/null
+++ b/target/classes/com/casic/dao/impl/DeviceDataMapper.class
Binary files differ
diff --git a/target/classes/com/casic/entity/DataGasReport.class b/target/classes/com/casic/entity/DataGasReport.class
new file mode 100644
index 0000000..a3dac78
--- /dev/null
+++ b/target/classes/com/casic/entity/DataGasReport.class
Binary files differ
diff --git a/target/classes/com/casic/model/DataReportParam.class b/target/classes/com/casic/model/DataReportParam.class
new file mode 100644
index 0000000..284c4f6
--- /dev/null
+++ b/target/classes/com/casic/model/DataReportParam.class
Binary files differ
diff --git a/target/classes/com/casic/model/DeviceOnlineParam.class b/target/classes/com/casic/model/DeviceOnlineParam.class
new file mode 100644
index 0000000..33c83e2
--- /dev/null
+++ b/target/classes/com/casic/model/DeviceOnlineParam.class
Binary files differ
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..814888c
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,321 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ * 报警工单表
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_job")
+public class AlarmJob extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 工单编号
+ */
+ @TableField("JOBCODE")
+ private String jobcode;
+ /**
+ * 工单类型
+ */
+ @TableField("JOG_TYPE")
+ private String jobType;
+ /**
+ * 井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 工单创建时间
+ */
+ @TableField("CREATE_TIME")
+ private Date createTime;
+ /**
+ * 工单状态（0待处理，1待确认，2处理中，3完成）
+ */
+ @TableField("JOB_STATUS")
+ private String jobStatus;
+ /**
+ * 接单人员
+ */
+ @TableField("GET_JOB_PERSON")
+ private Long getJobPerson;
+ /**
+ * 接单时间
+ */
+ @TableField("GET_JOB_TIME")
+ private Date getJobTime;
+ /**
+ * 应接单时间
+ */
+ @TableField("SHOULD_GET_TIME")
+ private Date shouldGetTime;
+ /**
+ * 第一现场情况
+ */
+ @TableField("FIRST_STATE")
+ private String firstState;
+ /**
+ * 第一现场照片
+ */
+ @TableField("FIRST_STATE_PHOTOS")
+ private String firstStatePhotos;
+ /**
+ * 确认人员
+ */
+ @TableField("CONFIRM_JOB_PERSON")
+ private Long confirmJobPerson;
+ /**
+ * 确认时间
+ */
+ @TableField("CONFRIM_JOB_TIME")
+ private Date confrimJobTime;
+ /**
+ * 处理人员
+ */
+ @TableField("HANDLE_JOB_Person")
+ private Long handleJobPerson;
+ /**
+ * 处理时间
+ */
+ @TableField("HANDLE_JOB_TIME")
+ private Date handleJobTime;
+ /**
+ * 维护情况记录
+ */
+ @TableField("HANDLE_MESSAGE")
+ private String handleMessage;
+ /**
+ * 维护图片
+ */
+ @TableField("HANDLE_PHOTOS")
+ private String handlePhotos;
+ /**
+ * 工单流转记录
+ */
+ @TableField("FLOW")
+ private String flow;
+
+ @TableField("JOB_BELONG_TO")
+ private Long jobBelongTo;
+
+ @TableField("JOB_FLAG_DELAY")
+ private String jobFlagDelay;
+
+ @TableField("JOB_FLAG_1")
+ private String jobFlag1;
+
+ @TableField(exist = false)
+ private String alarmValue;
+
+ @TableField(exist = false)
+ private String alarmContentName;
+
+ @TableField(exist = false)
+ private Integer recordId;
+
+ @Override
+ public String toString() {
+ return "AlarmJob{" +
+ "id=" + id +
+ ", jobcode=" + jobcode +
+ ", jogType=" + jobType +
+ ", wellCode=" + wellCode +
+ ", devcode=" + devcode +
+ ", createTime=" + createTime +
+ ", jobStatus=" + jobStatus +
+ ", getJobPerson=" + getJobPerson +
+ ", getJobTime=" + getJobTime +
+ ", firstState=" + firstState +
+ ", firstStatePhotos=" + firstStatePhotos +
+ ", confirmJobPerson=" + confirmJobPerson +
+ ", confrimJobTime=" + confrimJobTime +
+ ", handleJobPerson=" + handleJobPerson +
+ ", handleJobTime=" + handleJobTime +
+ ", handleMessage=" + handleMessage +
+ ", handlePhotos=" + handlePhotos +
+ ", flow=" + flow +
+ ", recordId=" + recordId +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/AlarmRecords.java b/src/main/java/com/casic/entity/AlarmRecords.java
new file mode 100644
index 0000000..88b0b26
--- /dev/null
+++ b/src/main/java/com/casic/entity/AlarmRecords.java
@@ -0,0 +1,108 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_records")
+public class AlarmRecords extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 设备ID
+ */
+ @TableField("DEVICE_ID")
+ private Long deviceId;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 闸井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 告警类型
+ */
+ @TableField("ALARM_TYPE")
+ private String alarmType;
+ /**
+ * 告警内容
+ */
+ @TableField("ALARM_CONTENT")
+ private String alarmContent;
+ /**
+ * 告警数值
+ */
+ @TableField("ALARM_VALUE")
+ private String alarmValue;
+ /**
+ * 告警等级
+ */
+ @TableField("ALARM_LEVEL")
+ private Integer alarmLevel;
+ /**
+ * 告警详情
+ */
+ @TableField("ALARM_MSG")
+ private String alarmMessage;
+ /**
+ * 告警时间
+ */
+ @TableField("ALARM_TIME")
+ private Date alarmTime;
+ /**
+ * 告警状态
+ */
+ @TableField("STATUS")
+ private String status;
+ /**
+ * 工单编号
+ */
+ @TableField("JOB_ID")
+ private Long jobId;
+
+ @TableField(exist = false)
+ private Integer jobStatus;
+
+ @Override
+ public String toString() {
+ return "AlarmRecords{" +
+ "id=" + id +
+ ", deviceId=" + deviceId +
+ ", devcode=" + devcode +
+ ", wellCode=" + wellCode +
+ ", alarmType=" + alarmType +
+ ", alarmContent=" + alarmContent +
+ ", alarmValue=" + alarmValue +
+ ", alarmLevel=" + alarmLevel +
+ ", alarmMessage=" + alarmMessage +
+ ", alarmTime=" + alarmTime +
+ ", status=" + status +
+ ", jobId=" + jobId +
+ ", jobStatus=" + jobStatus +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/DataGasDector.java b/src/main/java/com/casic/entity/DataGasDector.java
new file mode 100644
index 0000000..537789a
--- /dev/null
+++ b/src/main/java/com/casic/entity/DataGasDector.java
@@ -0,0 +1,42 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author cz
+ * @date 2022-7-1
+ */
+@Data
+@TableName("data_gas_dector")
+public class DataGasDector {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ private String devcode;
+ private String wellCode;
+ private String strength;
+
+ private String descn;
+ /**
+ * --信号与干扰加噪声比
+ */
+ private String sinr;
+ /**
+ * --参考信号接收功率
+ */
+ private String rsrp;
+ /**
+ * --物理小区标识
+ */
+ private String pci;
+ private Date uptime;
+ private Date logtime;
+}
diff --git a/src/main/java/com/casic/entity/DataGasReport.java b/src/main/java/com/casic/entity/DataGasReport.java
deleted file mode 100644
index c43ccdf..0000000
--- a/src/main/java/com/casic/entity/DataGasReport.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.casic.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author cz
- * @date 2022-7-1
- */
-@Data
-@TableName("data_gas_dector")
-public class DataGasReport {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @TableField("devcode")
- private String imei;
- private String wellcode;
-
- private String imsi;
- /**
- * --事件类型 0正常 1低报 2高报
- */
- private String gasSensorState;
- /**
- * --浓度值
- */
- private String gasSampleValue;
- /**
- * --信号与干扰加噪声比
- */
- private String sinr;
- /**
- * --参考信号接收功率
- */
- private String rsrp;
- /**
- * --物理小区标识
- */
- private String pci;
- /**
- * --心跳周期
- */
- private String heartbeatTime;
-
- /**
- * --小区位置信息
- */
- private String cellId;
- /**
- * --电池电压
- */
- private String batteryVoltage;
- /**
- * --电池电量
- */
- private String batteryValue;
- private String iccid;
- private Date uptime;
- private Date logtime;
-}
diff --git a/src/main/java/com/casic/entity/DeviceSatatus.java b/src/main/java/com/casic/entity/DeviceSatatus.java
new file mode 100644
index 0000000..bab7903
--- /dev/null
+++ b/src/main/java/com/casic/entity/DeviceSatatus.java
@@ -0,0 +1,19 @@
+package com.casic.entity;
+
+import lombok.Data;
+
+/**
+ * 不使用了
+ *
+ */
+@Data
+public class DeviceSatatus {
+ private String deviceId;
+ private String cell;
+ private String cellTs;
+ private String onlineState;
+ private String onlineTs;
+ private String lastDataId;
+ private String lastDataJson;
+ private String lastDataTs;
+}
diff --git a/src/main/java/com/casic/model/DataContentParam.java b/src/main/java/com/casic/model/DataContentParam.java
new file mode 100644
index 0000000..46d298a
--- /dev/null
+++ b/src/main/java/com/casic/model/DataContentParam.java
@@ -0,0 +1,19 @@
+package com.casic.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DataContentParam {
+ private String msg_type;
+ private String error_val;
+ private String ch_cnt;
+ private String erro_cnt;
+ private String alarm_low_cnt;
+ private String alarm_high_cnt;
+ private String offline_cnt;
+ private List rtd_val;
+ private List adc_val;
+ private List status_val;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/DataReportParam.java b/src/main/java/com/casic/model/DataReportParam.java
index 082814c..754f330 100644
--- a/src/main/java/com/casic/model/DataReportParam.java
+++ b/src/main/java/com/casic/model/DataReportParam.java
@@ -11,25 +11,12 @@
*/
@Data
public class DataReportParam {
- private String upPacketSN;
- private String upDataSN;
- private String topic;
- private String timestamp;
- private String tenantId;
- private String serviceId;
- private String protocol;
- private String productId;
- /**
- * gas_sensor_state = 1, --事件类型 0 正常 1 低报 2 高报
- * gas_sample_value = 11-- 浓度值
- */
- private Map payload;
- private String messageType;
private String deviceType;
- private String deviceId;
- private String assocAssetId;
- @JsonProperty(value = "IMSI", required = true)
- private String IMSI;
- @JsonProperty(value = "IMEI", required = true)
- private String IMEI;
+ private String iotId;
+ private String requestId;
+ private Object checkFailedData;
+ private String productKey;
+ private String gmtCreate;
+ private String deviceName;
+ private Object items;
}
diff --git a/src/main/java/com/casic/service/DeviceDataService.java b/src/main/java/com/casic/service/DeviceDataService.java
index d883fe4..457d710 100644
--- a/src/main/java/com/casic/service/DeviceDataService.java
+++ b/src/main/java/com/casic/service/DeviceDataService.java
@@ -3,25 +3,18 @@
import com.casic.model.DataReportParam;
import com.casic.model.HeartbeatParam;
import com.casic.model.ResponseData;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* @author cz
* @date 2022
*/
public interface DeviceDataService {
-
/**
*
* @param dataReportParam
* @return
*/
- ResponseData DeviceDataCommit(DataReportParam dataReportParam);
-
- /**
- *
- * @param heartbeatParam
- * @return
- */
- ResponseData heartBeatSave(HeartbeatParam heartbeatParam);
+ ResponseData gasReceiver(DataReportParam dataReportParam);
}
diff --git a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
index 93f0685..e473f0c 100644
--- a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
+++ b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
@@ -1,58 +1,49 @@
package com.casic.service.impl;
-import com.casic.dao.impl.DeviceDataMapper;
+import com.alibaba.druid.util.StringUtils;
+import com.alibaba.fastjson.JSON;
import com.casic.model.*;
import com.casic.service.DeviceDataService;
+import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.stereotype.Service;
+import java.util.Map;
+
/**
* @author cz
- * @date 2022-6-20
+ * @date 2022-9-26
*/
@Slf4j
@Service
public class DeviceDataServiceImpl implements DeviceDataService {
- @Autowired
- DeviceDataMapper deviceDataMapper;
+ private final NormalDataProcessor normalDataProcessor;
- /**
- * @param dataReportParam
- * @return
- */
- public ResponseData DeviceDataCommit(DataReportParam dataReportParam) {
- ResponseData responseData = new ResponseData();
- try {
- deviceDataMapper.addDeviceData(dataReportParam);
- responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
- responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
- } catch (DataAccessException sqlex) {
- responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
- responseData.setMessage("请求数据异常");
- responseData.setSuccess(true);
- log.error("主题:数据上报保存出现错误,异常信息为{}", sqlex);
- }
- return responseData;
+ public DeviceDataServiceImpl(NormalDataProcessor normalDataProcessor) {
+ this.normalDataProcessor = normalDataProcessor;
}
- /**
- * @param heartbeatParam
- * @return
- */
- public ResponseData heartBeatSave(HeartbeatParam heartbeatParam) {
+ public ResponseData gasReceiver(DataReportParam dataReportParam) {
ResponseData responseData = new ResponseData();
try {
- deviceDataMapper.editDeviceData(heartbeatParam);
+ Map> updDataMap = new ObjectMapper().convertValue(dataReportParam.getItems(), Map.class);
+ DataContentParam dataContentParam = JSON.parseObject(updDataMap.get("updData").get("value"), DataContentParam.class);
+ Long uptime = Long.valueOf(String.valueOf(updDataMap.get("updData").get("time")));
+ if (StringUtils.isEmpty(dataReportParam.getDeviceName())) {
+ responseData.setCode(200);
+ responseData.setMessage("没有设备编号");
+ return responseData;
+ }
+ normalDataProcessor.normalDataProvider(dataContentParam, uptime, dataReportParam.getDeviceName());
responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
} catch (DataAccessException sqlex) {
responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
responseData.setMessage("请求数据异常");
responseData.setSuccess(true);
- log.error("主题:数据心跳出现错误,异常信息为{}", sqlex);
+ log.error("主题:设备数据上报出现错误,异常信息为{}", sqlex);
}
return responseData;
}
diff --git a/src/main/java/com/casic/service/impl/NormalDataProcessor.java b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
new file mode 100644
index 0000000..3f7630a
--- /dev/null
+++ b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
@@ -0,0 +1,164 @@
+package com.casic.service.impl;
+
+import com.alibaba.druid.util.StringUtils;
+import com.casic.dao.AlarmRecordsMapper;
+import com.casic.dao.DataGasMapper;
+import com.casic.dao.impl.AlarmJobDao;
+import com.casic.entity.AlarmJob;
+import com.casic.entity.AlarmRecords;
+import com.casic.entity.DataGasDector;
+import com.casic.model.DataContentParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+import xyz.downgoon.snowflake.Snowflake;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class NormalDataProcessor {
+
+ public static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd");
+
+ @Value("${casic.device.gas-dector.type}")
+ private Long deviceType;
+ @Value("${casic.device.gas-dector.minutes}")
+ private String minutes;
+ @Value("${casic.device.gas-dector.enable-local}")
+ private Boolean enableLocal;
+ @Resource
+ private DataGasMapper dataGasMapper;
+ @Autowired
+ private AlarmJobDao alarmJobDao;
+ @Resource
+ private AlarmRecordsMapper alarmRecordsMapper;
+ private static Snowflake snowflake = new Snowflake(0, 2);
+
+ public void normalDataProvider(DataContentParam dataReportParam, Long timeStamp, String devcode) {
+ Map gasMap = dataGasMapper.getWellCode(devcode);
+ if (ObjectUtils.isEmpty(gasMap)) {
+ log.info("没有该设备编号录入" + devcode);
+ if (enableLocal) {
+ return;
+ }
+ }
+ Boolean updateFlag = false;
+ if (ObjectUtils.isEmpty(dataGasMapper.getLastData(minutes, devcode))) {
+ updateFlag = this.saveNormalData(dataReportParam, timeStamp, devcode, gasMap);
+ }
+ this.dataTaskJudge(dataReportParam, devcode, timeStamp, gasMap, updateFlag);
+ return;
+ }
+
+ /**
+ * 自定义时间存库
+ *
+ * @param dataReportParam
+ * @param timeStamp
+ * @param devcode
+ * @param gasMap
+ */
+ private Boolean saveNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap) {
+ Boolean updateFlag = false;
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ List dataReportFilter = dataReportParam.getRtd_val().stream().filter(
+ data -> {
+ return data != -1;
+ }
+ ).collect(Collectors.toList());
+ if (dataReportFilter.size() > 0 && dataReportFilter.get(dataReportFilter.size() - 1) != 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 1);
+ updateFlag = true;
+ } else if (dataReportFilter.get(dataReportFilter.size() - 1) == 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 0);
+ }
+ dataReportFilter.forEach(
+ data -> {
+ if (data != 65535) {
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+ }
+ );
+ return updateFlag;
+ }
+
+ /**
+ * 报警就存库
+ *
+ * @param dataReportParam
+ * @param devcode
+ * @param timeStamp
+ * @param gasMap
+ */
+ private void dataTaskJudge(DataContentParam dataReportParam, String devcode, Long timeStamp, Map gasMap, Boolean updateFlag) {
+ List> alarmLevelList = dataGasMapper.getAlarmLevelList(deviceType);
+ String wellCode = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "";
+ Long deviceId = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? Long.valueOf(String.valueOf(gasMap.get("deviceId"))) : -1;
+ final String gasMsgContent=dataGasMapper.getGasMsgContent(deviceType);
+ dataReportParam.getRtd_val().stream().filter(
+ dataReport -> {
+ return dataReport != -1 && dataReport != 65535;
+ }
+ ).forEach(
+ dataReport -> {
+ for (Map alarmLevelMap : alarmLevelList) {
+ if (dataReport > Float.valueOf(String.valueOf(alarmLevelMap.get("high_value")))) {
+ AlarmRecords alarmRecord = new AlarmRecords();
+ alarmRecord.setId(snowflake.nextId());
+ alarmRecord.setDeviceId(deviceId);
+ alarmRecord.setDevcode(devcode);
+ alarmRecord.setWellCode(wellCode);
+ alarmRecord.setAlarmType("1"); // 业务报警
+ alarmRecord.setAlarmContent("燃气报警");
+ alarmRecord.setAlarmValue(String.valueOf(dataReport));
+ alarmRecord.setAlarmTime(new Date());
+ alarmRecord.setStatus("1");
+ alarmRecord.setAlarmLevel(Integer.valueOf(alarmLevelMap.get("level").toString()));
+ alarmRecord.setAlarmMessage("燃气报警");
+ String jobId = alarmRecordsMapper.isOldAlarmRecord(devcode, "燃气报警");
+ // 超出报警阈值 生成一条报警消息
+ if (!StringUtils.isEmpty(jobId)) {
+ alarmRecordsMapper.updateOldAlarmRecord(devcode, "燃气报警");
+ alarmRecord.setJobId(Long.valueOf(jobId));
+ } else {
+ AlarmJob alarmJob = alarmJobDao.saveData(devcode, wellCode, "RQZD", "1");
+ alarmRecord.setJobId(alarmJob.getId());
+ }
+ alarmRecordsMapper.insert(alarmRecord);
+ if (!updateFlag) {
+ alarmNormalData(dataReportParam, timeStamp, devcode, gasMap, dataReport);
+ }
+ break;
+ }
+ }
+ }
+ );
+ }
+
+ private void alarmNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap, Integer data) {
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+
+}
+
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index fac2afe..f8a06a6 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,40 +1,19 @@
server:
- port: 11556
+ port: 11320
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
- username: root
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell_zq_cs
+ username: postgres
password: Casic203
session:
store-type: redis
- redis:
- host: 111.198.10.15
- port: 11412
- password: ew5T4K3#203lwh
- redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
jms:
pub-sub-domain: true
- # session:
- # store-type: redis
- activemq:
- user:
- password:
- broker-url: tcp://192.168.0.203:61616
-#flowable数据源和多数据源配置
-casic:
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- #kaptcha-open: false #是否开启登录时验证码 (true/false)
- no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
- db:
- init:
- enable: false
- file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
- spring-session-open: false #开启spring session
logging:
level.root: error
- level.com.casic: error
+ level.com.casic: info
file:
path: logs/
name: missiles.log
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 86411e6..ffc01e9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -19,18 +19,11 @@
mapper-locations: classpath:mapper/*.xml
#mybatis-plus:
# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
-################### mybatis-plus配置 ###################
-################### casic配置 ###################
-flowable:
- checkProcessDefinitions: false #不校验process文件
casic:
- swagger-open: false #是否开启swagger (true/false)
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- muti-datasource-open: false #是否开启多数据源(true/false)
- spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
- session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
- session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
- extUrl: sys
- config:
- export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
- config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
+ device:
+ gas-dector:
+ type: 101
+ minutes: 60
+ enable-local: false
+# type 可燃气体的设备类型
+# minutes: 燃气外协设备上传数据的分钟数
\ No newline at end of file
diff --git a/target/classes/application-dev.yml b/target/classes/application-dev.yml
new file mode 100644
index 0000000..fac2afe
--- /dev/null
+++ b/target/classes/application-dev.yml
@@ -0,0 +1,40 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
+ username: root
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+logging:
+ level.root: error
+ level.com.casic: error
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/target/classes/application-postgre.yml b/target/classes/application-postgre.yml
new file mode 100644
index 0000000..2b7f69c
--- /dev/null
+++ b/target/classes/application-postgre.yml
@@ -0,0 +1,62 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell
+ username: postgres
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ redis-config:
+ host: 127.0.0.1
+ port: 6379
+ password:
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+smartcity:
+ config:
+ export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+ #export-path: D:\export\
+ image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\
+ config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\
+ download-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\download\
+ device:
+ redis:
+ invalid-time: 86400
+ host: 127.0.0.1
+ port: 6379
+ password: ew5T4K3#203lwh
+ config-prefix: 'Casic:'
+ getui:
+ appId: H9jSTE2bAt8QWq2K2GNOB3
+ appKey: bhPeCutJVdAyOasevQFtN9
+ masterSecret: lChudND74A89WRiHLkedb5
+logging:
+ level.root: info
+ level.com.casic: info
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/target/classes/application.yml b/target/classes/application.yml
new file mode 100644
index 0000000..86411e6
--- /dev/null
+++ b/target/classes/application.yml
@@ -0,0 +1,36 @@
+##########################################################
+################## 所有profile共有的配置 #################
+##########################################################
+spring:
+ profiles:
+ active: dev
+ servlet:
+ multipart:
+ max-file-size: 50MB
+ max-request-size: 80MB
+mybatis-plus:
+ global-config:
+ enable-sql-runner: true
+ configuration:
+ # 配置结果集属性为空时 是否映射返回结果
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
+ mapper-locations: classpath:mapper/*.xml
+mybatis:
+ mapper-locations: classpath:mapper/*.xml
+#mybatis-plus:
+# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
+################### mybatis-plus配置 ###################
+################### casic配置 ###################
+flowable:
+ checkProcessDefinitions: false #不校验process文件
+casic:
+ swagger-open: false #是否开启swagger (true/false)
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ muti-datasource-open: false #是否开启多数据源(true/false)
+ spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
+ session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
+ session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
+ extUrl: sys
+ config:
+ export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+ config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
diff --git a/target/classes/com/casic/CasicApplication.class b/target/classes/com/casic/CasicApplication.class
new file mode 100644
index 0000000..68c2f95
--- /dev/null
+++ b/target/classes/com/casic/CasicApplication.class
Binary files differ
diff --git a/target/classes/com/casic/controller/DeviceController.class b/target/classes/com/casic/controller/DeviceController.class
new file mode 100644
index 0000000..478d6ae
--- /dev/null
+++ b/target/classes/com/casic/controller/DeviceController.class
Binary files differ
diff --git a/target/classes/com/casic/controller/DeviceDataController.class b/target/classes/com/casic/controller/DeviceDataController.class
new file mode 100644
index 0000000..1f4400c
--- /dev/null
+++ b/target/classes/com/casic/controller/DeviceDataController.class
Binary files differ
diff --git a/target/classes/com/casic/dao/DataGasMapper.class b/target/classes/com/casic/dao/DataGasMapper.class
new file mode 100644
index 0000000..557d539
--- /dev/null
+++ b/target/classes/com/casic/dao/DataGasMapper.class
Binary files differ
diff --git a/target/classes/com/casic/dao/DeviceMapper.class b/target/classes/com/casic/dao/DeviceMapper.class
new file mode 100644
index 0000000..3ddcd2b
--- /dev/null
+++ b/target/classes/com/casic/dao/DeviceMapper.class
Binary files differ
diff --git a/target/classes/com/casic/dao/impl/DeviceDataMapper.class b/target/classes/com/casic/dao/impl/DeviceDataMapper.class
new file mode 100644
index 0000000..d73ed15
--- /dev/null
+++ b/target/classes/com/casic/dao/impl/DeviceDataMapper.class
Binary files differ
diff --git a/target/classes/com/casic/entity/DataGasReport.class b/target/classes/com/casic/entity/DataGasReport.class
new file mode 100644
index 0000000..a3dac78
--- /dev/null
+++ b/target/classes/com/casic/entity/DataGasReport.class
Binary files differ
diff --git a/target/classes/com/casic/model/DataReportParam.class b/target/classes/com/casic/model/DataReportParam.class
new file mode 100644
index 0000000..284c4f6
--- /dev/null
+++ b/target/classes/com/casic/model/DataReportParam.class
Binary files differ
diff --git a/target/classes/com/casic/model/DeviceOnlineParam.class b/target/classes/com/casic/model/DeviceOnlineParam.class
new file mode 100644
index 0000000..33c83e2
--- /dev/null
+++ b/target/classes/com/casic/model/DeviceOnlineParam.class
Binary files differ
diff --git a/target/classes/com/casic/model/HeartbeatParam.class b/target/classes/com/casic/model/HeartbeatParam.class
new file mode 100644
index 0000000..d6d6651
--- /dev/null
+++ b/target/classes/com/casic/model/HeartbeatParam.class
Binary files differ
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..814888c
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,321 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ * 报警工单表
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_job")
+public class AlarmJob extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 工单编号
+ */
+ @TableField("JOBCODE")
+ private String jobcode;
+ /**
+ * 工单类型
+ */
+ @TableField("JOG_TYPE")
+ private String jobType;
+ /**
+ * 井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 工单创建时间
+ */
+ @TableField("CREATE_TIME")
+ private Date createTime;
+ /**
+ * 工单状态（0待处理，1待确认，2处理中，3完成）
+ */
+ @TableField("JOB_STATUS")
+ private String jobStatus;
+ /**
+ * 接单人员
+ */
+ @TableField("GET_JOB_PERSON")
+ private Long getJobPerson;
+ /**
+ * 接单时间
+ */
+ @TableField("GET_JOB_TIME")
+ private Date getJobTime;
+ /**
+ * 应接单时间
+ */
+ @TableField("SHOULD_GET_TIME")
+ private Date shouldGetTime;
+ /**
+ * 第一现场情况
+ */
+ @TableField("FIRST_STATE")
+ private String firstState;
+ /**
+ * 第一现场照片
+ */
+ @TableField("FIRST_STATE_PHOTOS")
+ private String firstStatePhotos;
+ /**
+ * 确认人员
+ */
+ @TableField("CONFIRM_JOB_PERSON")
+ private Long confirmJobPerson;
+ /**
+ * 确认时间
+ */
+ @TableField("CONFRIM_JOB_TIME")
+ private Date confrimJobTime;
+ /**
+ * 处理人员
+ */
+ @TableField("HANDLE_JOB_Person")
+ private Long handleJobPerson;
+ /**
+ * 处理时间
+ */
+ @TableField("HANDLE_JOB_TIME")
+ private Date handleJobTime;
+ /**
+ * 维护情况记录
+ */
+ @TableField("HANDLE_MESSAGE")
+ private String handleMessage;
+ /**
+ * 维护图片
+ */
+ @TableField("HANDLE_PHOTOS")
+ private String handlePhotos;
+ /**
+ * 工单流转记录
+ */
+ @TableField("FLOW")
+ private String flow;
+
+ @TableField("JOB_BELONG_TO")
+ private Long jobBelongTo;
+
+ @TableField("JOB_FLAG_DELAY")
+ private String jobFlagDelay;
+
+ @TableField("JOB_FLAG_1")
+ private String jobFlag1;
+
+ @TableField(exist = false)
+ private String alarmValue;
+
+ @TableField(exist = false)
+ private String alarmContentName;
+
+ @TableField(exist = false)
+ private Integer recordId;
+
+ @Override
+ public String toString() {
+ return "AlarmJob{" +
+ "id=" + id +
+ ", jobcode=" + jobcode +
+ ", jogType=" + jobType +
+ ", wellCode=" + wellCode +
+ ", devcode=" + devcode +
+ ", createTime=" + createTime +
+ ", jobStatus=" + jobStatus +
+ ", getJobPerson=" + getJobPerson +
+ ", getJobTime=" + getJobTime +
+ ", firstState=" + firstState +
+ ", firstStatePhotos=" + firstStatePhotos +
+ ", confirmJobPerson=" + confirmJobPerson +
+ ", confrimJobTime=" + confrimJobTime +
+ ", handleJobPerson=" + handleJobPerson +
+ ", handleJobTime=" + handleJobTime +
+ ", handleMessage=" + handleMessage +
+ ", handlePhotos=" + handlePhotos +
+ ", flow=" + flow +
+ ", recordId=" + recordId +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/AlarmRecords.java b/src/main/java/com/casic/entity/AlarmRecords.java
new file mode 100644
index 0000000..88b0b26
--- /dev/null
+++ b/src/main/java/com/casic/entity/AlarmRecords.java
@@ -0,0 +1,108 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_records")
+public class AlarmRecords extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 设备ID
+ */
+ @TableField("DEVICE_ID")
+ private Long deviceId;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 闸井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 告警类型
+ */
+ @TableField("ALARM_TYPE")
+ private String alarmType;
+ /**
+ * 告警内容
+ */
+ @TableField("ALARM_CONTENT")
+ private String alarmContent;
+ /**
+ * 告警数值
+ */
+ @TableField("ALARM_VALUE")
+ private String alarmValue;
+ /**
+ * 告警等级
+ */
+ @TableField("ALARM_LEVEL")
+ private Integer alarmLevel;
+ /**
+ * 告警详情
+ */
+ @TableField("ALARM_MSG")
+ private String alarmMessage;
+ /**
+ * 告警时间
+ */
+ @TableField("ALARM_TIME")
+ private Date alarmTime;
+ /**
+ * 告警状态
+ */
+ @TableField("STATUS")
+ private String status;
+ /**
+ * 工单编号
+ */
+ @TableField("JOB_ID")
+ private Long jobId;
+
+ @TableField(exist = false)
+ private Integer jobStatus;
+
+ @Override
+ public String toString() {
+ return "AlarmRecords{" +
+ "id=" + id +
+ ", deviceId=" + deviceId +
+ ", devcode=" + devcode +
+ ", wellCode=" + wellCode +
+ ", alarmType=" + alarmType +
+ ", alarmContent=" + alarmContent +
+ ", alarmValue=" + alarmValue +
+ ", alarmLevel=" + alarmLevel +
+ ", alarmMessage=" + alarmMessage +
+ ", alarmTime=" + alarmTime +
+ ", status=" + status +
+ ", jobId=" + jobId +
+ ", jobStatus=" + jobStatus +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/DataGasDector.java b/src/main/java/com/casic/entity/DataGasDector.java
new file mode 100644
index 0000000..537789a
--- /dev/null
+++ b/src/main/java/com/casic/entity/DataGasDector.java
@@ -0,0 +1,42 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author cz
+ * @date 2022-7-1
+ */
+@Data
+@TableName("data_gas_dector")
+public class DataGasDector {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ private String devcode;
+ private String wellCode;
+ private String strength;
+
+ private String descn;
+ /**
+ * --信号与干扰加噪声比
+ */
+ private String sinr;
+ /**
+ * --参考信号接收功率
+ */
+ private String rsrp;
+ /**
+ * --物理小区标识
+ */
+ private String pci;
+ private Date uptime;
+ private Date logtime;
+}
diff --git a/src/main/java/com/casic/entity/DataGasReport.java b/src/main/java/com/casic/entity/DataGasReport.java
deleted file mode 100644
index c43ccdf..0000000
--- a/src/main/java/com/casic/entity/DataGasReport.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.casic.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author cz
- * @date 2022-7-1
- */
-@Data
-@TableName("data_gas_dector")
-public class DataGasReport {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @TableField("devcode")
- private String imei;
- private String wellcode;
-
- private String imsi;
- /**
- * --事件类型 0正常 1低报 2高报
- */
- private String gasSensorState;
- /**
- * --浓度值
- */
- private String gasSampleValue;
- /**
- * --信号与干扰加噪声比
- */
- private String sinr;
- /**
- * --参考信号接收功率
- */
- private String rsrp;
- /**
- * --物理小区标识
- */
- private String pci;
- /**
- * --心跳周期
- */
- private String heartbeatTime;
-
- /**
- * --小区位置信息
- */
- private String cellId;
- /**
- * --电池电压
- */
- private String batteryVoltage;
- /**
- * --电池电量
- */
- private String batteryValue;
- private String iccid;
- private Date uptime;
- private Date logtime;
-}
diff --git a/src/main/java/com/casic/entity/DeviceSatatus.java b/src/main/java/com/casic/entity/DeviceSatatus.java
new file mode 100644
index 0000000..bab7903
--- /dev/null
+++ b/src/main/java/com/casic/entity/DeviceSatatus.java
@@ -0,0 +1,19 @@
+package com.casic.entity;
+
+import lombok.Data;
+
+/**
+ * 不使用了
+ *
+ */
+@Data
+public class DeviceSatatus {
+ private String deviceId;
+ private String cell;
+ private String cellTs;
+ private String onlineState;
+ private String onlineTs;
+ private String lastDataId;
+ private String lastDataJson;
+ private String lastDataTs;
+}
diff --git a/src/main/java/com/casic/model/DataContentParam.java b/src/main/java/com/casic/model/DataContentParam.java
new file mode 100644
index 0000000..46d298a
--- /dev/null
+++ b/src/main/java/com/casic/model/DataContentParam.java
@@ -0,0 +1,19 @@
+package com.casic.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DataContentParam {
+ private String msg_type;
+ private String error_val;
+ private String ch_cnt;
+ private String erro_cnt;
+ private String alarm_low_cnt;
+ private String alarm_high_cnt;
+ private String offline_cnt;
+ private List rtd_val;
+ private List adc_val;
+ private List status_val;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/DataReportParam.java b/src/main/java/com/casic/model/DataReportParam.java
index 082814c..754f330 100644
--- a/src/main/java/com/casic/model/DataReportParam.java
+++ b/src/main/java/com/casic/model/DataReportParam.java
@@ -11,25 +11,12 @@
*/
@Data
public class DataReportParam {
- private String upPacketSN;
- private String upDataSN;
- private String topic;
- private String timestamp;
- private String tenantId;
- private String serviceId;
- private String protocol;
- private String productId;
- /**
- * gas_sensor_state = 1, --事件类型 0 正常 1 低报 2 高报
- * gas_sample_value = 11-- 浓度值
- */
- private Map payload;
- private String messageType;
private String deviceType;
- private String deviceId;
- private String assocAssetId;
- @JsonProperty(value = "IMSI", required = true)
- private String IMSI;
- @JsonProperty(value = "IMEI", required = true)
- private String IMEI;
+ private String iotId;
+ private String requestId;
+ private Object checkFailedData;
+ private String productKey;
+ private String gmtCreate;
+ private String deviceName;
+ private Object items;
}
diff --git a/src/main/java/com/casic/service/DeviceDataService.java b/src/main/java/com/casic/service/DeviceDataService.java
index d883fe4..457d710 100644
--- a/src/main/java/com/casic/service/DeviceDataService.java
+++ b/src/main/java/com/casic/service/DeviceDataService.java
@@ -3,25 +3,18 @@
import com.casic.model.DataReportParam;
import com.casic.model.HeartbeatParam;
import com.casic.model.ResponseData;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* @author cz
* @date 2022
*/
public interface DeviceDataService {
-
/**
*
* @param dataReportParam
* @return
*/
- ResponseData DeviceDataCommit(DataReportParam dataReportParam);
-
- /**
- *
- * @param heartbeatParam
- * @return
- */
- ResponseData heartBeatSave(HeartbeatParam heartbeatParam);
+ ResponseData gasReceiver(DataReportParam dataReportParam);
}
diff --git a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
index 93f0685..e473f0c 100644
--- a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
+++ b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
@@ -1,58 +1,49 @@
package com.casic.service.impl;
-import com.casic.dao.impl.DeviceDataMapper;
+import com.alibaba.druid.util.StringUtils;
+import com.alibaba.fastjson.JSON;
import com.casic.model.*;
import com.casic.service.DeviceDataService;
+import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.stereotype.Service;
+import java.util.Map;
+
/**
* @author cz
- * @date 2022-6-20
+ * @date 2022-9-26
*/
@Slf4j
@Service
public class DeviceDataServiceImpl implements DeviceDataService {
- @Autowired
- DeviceDataMapper deviceDataMapper;
+ private final NormalDataProcessor normalDataProcessor;
- /**
- * @param dataReportParam
- * @return
- */
- public ResponseData DeviceDataCommit(DataReportParam dataReportParam) {
- ResponseData responseData = new ResponseData();
- try {
- deviceDataMapper.addDeviceData(dataReportParam);
- responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
- responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
- } catch (DataAccessException sqlex) {
- responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
- responseData.setMessage("请求数据异常");
- responseData.setSuccess(true);
- log.error("主题:数据上报保存出现错误,异常信息为{}", sqlex);
- }
- return responseData;
+ public DeviceDataServiceImpl(NormalDataProcessor normalDataProcessor) {
+ this.normalDataProcessor = normalDataProcessor;
}
- /**
- * @param heartbeatParam
- * @return
- */
- public ResponseData heartBeatSave(HeartbeatParam heartbeatParam) {
+ public ResponseData gasReceiver(DataReportParam dataReportParam) {
ResponseData responseData = new ResponseData();
try {
- deviceDataMapper.editDeviceData(heartbeatParam);
+ Map> updDataMap = new ObjectMapper().convertValue(dataReportParam.getItems(), Map.class);
+ DataContentParam dataContentParam = JSON.parseObject(updDataMap.get("updData").get("value"), DataContentParam.class);
+ Long uptime = Long.valueOf(String.valueOf(updDataMap.get("updData").get("time")));
+ if (StringUtils.isEmpty(dataReportParam.getDeviceName())) {
+ responseData.setCode(200);
+ responseData.setMessage("没有设备编号");
+ return responseData;
+ }
+ normalDataProcessor.normalDataProvider(dataContentParam, uptime, dataReportParam.getDeviceName());
responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
} catch (DataAccessException sqlex) {
responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
responseData.setMessage("请求数据异常");
responseData.setSuccess(true);
- log.error("主题:数据心跳出现错误,异常信息为{}", sqlex);
+ log.error("主题:设备数据上报出现错误,异常信息为{}", sqlex);
}
return responseData;
}
diff --git a/src/main/java/com/casic/service/impl/NormalDataProcessor.java b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
new file mode 100644
index 0000000..3f7630a
--- /dev/null
+++ b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
@@ -0,0 +1,164 @@
+package com.casic.service.impl;
+
+import com.alibaba.druid.util.StringUtils;
+import com.casic.dao.AlarmRecordsMapper;
+import com.casic.dao.DataGasMapper;
+import com.casic.dao.impl.AlarmJobDao;
+import com.casic.entity.AlarmJob;
+import com.casic.entity.AlarmRecords;
+import com.casic.entity.DataGasDector;
+import com.casic.model.DataContentParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+import xyz.downgoon.snowflake.Snowflake;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class NormalDataProcessor {
+
+ public static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd");
+
+ @Value("${casic.device.gas-dector.type}")
+ private Long deviceType;
+ @Value("${casic.device.gas-dector.minutes}")
+ private String minutes;
+ @Value("${casic.device.gas-dector.enable-local}")
+ private Boolean enableLocal;
+ @Resource
+ private DataGasMapper dataGasMapper;
+ @Autowired
+ private AlarmJobDao alarmJobDao;
+ @Resource
+ private AlarmRecordsMapper alarmRecordsMapper;
+ private static Snowflake snowflake = new Snowflake(0, 2);
+
+ public void normalDataProvider(DataContentParam dataReportParam, Long timeStamp, String devcode) {
+ Map gasMap = dataGasMapper.getWellCode(devcode);
+ if (ObjectUtils.isEmpty(gasMap)) {
+ log.info("没有该设备编号录入" + devcode);
+ if (enableLocal) {
+ return;
+ }
+ }
+ Boolean updateFlag = false;
+ if (ObjectUtils.isEmpty(dataGasMapper.getLastData(minutes, devcode))) {
+ updateFlag = this.saveNormalData(dataReportParam, timeStamp, devcode, gasMap);
+ }
+ this.dataTaskJudge(dataReportParam, devcode, timeStamp, gasMap, updateFlag);
+ return;
+ }
+
+ /**
+ * 自定义时间存库
+ *
+ * @param dataReportParam
+ * @param timeStamp
+ * @param devcode
+ * @param gasMap
+ */
+ private Boolean saveNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap) {
+ Boolean updateFlag = false;
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ List dataReportFilter = dataReportParam.getRtd_val().stream().filter(
+ data -> {
+ return data != -1;
+ }
+ ).collect(Collectors.toList());
+ if (dataReportFilter.size() > 0 && dataReportFilter.get(dataReportFilter.size() - 1) != 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 1);
+ updateFlag = true;
+ } else if (dataReportFilter.get(dataReportFilter.size() - 1) == 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 0);
+ }
+ dataReportFilter.forEach(
+ data -> {
+ if (data != 65535) {
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+ }
+ );
+ return updateFlag;
+ }
+
+ /**
+ * 报警就存库
+ *
+ * @param dataReportParam
+ * @param devcode
+ * @param timeStamp
+ * @param gasMap
+ */
+ private void dataTaskJudge(DataContentParam dataReportParam, String devcode, Long timeStamp, Map gasMap, Boolean updateFlag) {
+ List> alarmLevelList = dataGasMapper.getAlarmLevelList(deviceType);
+ String wellCode = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "";
+ Long deviceId = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? Long.valueOf(String.valueOf(gasMap.get("deviceId"))) : -1;
+ final String gasMsgContent=dataGasMapper.getGasMsgContent(deviceType);
+ dataReportParam.getRtd_val().stream().filter(
+ dataReport -> {
+ return dataReport != -1 && dataReport != 65535;
+ }
+ ).forEach(
+ dataReport -> {
+ for (Map alarmLevelMap : alarmLevelList) {
+ if (dataReport > Float.valueOf(String.valueOf(alarmLevelMap.get("high_value")))) {
+ AlarmRecords alarmRecord = new AlarmRecords();
+ alarmRecord.setId(snowflake.nextId());
+ alarmRecord.setDeviceId(deviceId);
+ alarmRecord.setDevcode(devcode);
+ alarmRecord.setWellCode(wellCode);
+ alarmRecord.setAlarmType("1"); // 业务报警
+ alarmRecord.setAlarmContent("燃气报警");
+ alarmRecord.setAlarmValue(String.valueOf(dataReport));
+ alarmRecord.setAlarmTime(new Date());
+ alarmRecord.setStatus("1");
+ alarmRecord.setAlarmLevel(Integer.valueOf(alarmLevelMap.get("level").toString()));
+ alarmRecord.setAlarmMessage("燃气报警");
+ String jobId = alarmRecordsMapper.isOldAlarmRecord(devcode, "燃气报警");
+ // 超出报警阈值 生成一条报警消息
+ if (!StringUtils.isEmpty(jobId)) {
+ alarmRecordsMapper.updateOldAlarmRecord(devcode, "燃气报警");
+ alarmRecord.setJobId(Long.valueOf(jobId));
+ } else {
+ AlarmJob alarmJob = alarmJobDao.saveData(devcode, wellCode, "RQZD", "1");
+ alarmRecord.setJobId(alarmJob.getId());
+ }
+ alarmRecordsMapper.insert(alarmRecord);
+ if (!updateFlag) {
+ alarmNormalData(dataReportParam, timeStamp, devcode, gasMap, dataReport);
+ }
+ break;
+ }
+ }
+ }
+ );
+ }
+
+ private void alarmNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap, Integer data) {
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+
+}
+
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index fac2afe..f8a06a6 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,40 +1,19 @@
server:
- port: 11556
+ port: 11320
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
- username: root
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell_zq_cs
+ username: postgres
password: Casic203
session:
store-type: redis
- redis:
- host: 111.198.10.15
- port: 11412
- password: ew5T4K3#203lwh
- redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
jms:
pub-sub-domain: true
- # session:
- # store-type: redis
- activemq:
- user:
- password:
- broker-url: tcp://192.168.0.203:61616
-#flowable数据源和多数据源配置
-casic:
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- #kaptcha-open: false #是否开启登录时验证码 (true/false)
- no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
- db:
- init:
- enable: false
- file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
- spring-session-open: false #开启spring session
logging:
level.root: error
- level.com.casic: error
+ level.com.casic: info
file:
path: logs/
name: missiles.log
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 86411e6..ffc01e9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -19,18 +19,11 @@
mapper-locations: classpath:mapper/*.xml
#mybatis-plus:
# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
-################### mybatis-plus配置 ###################
-################### casic配置 ###################
-flowable:
- checkProcessDefinitions: false #不校验process文件
casic:
- swagger-open: false #是否开启swagger (true/false)
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- muti-datasource-open: false #是否开启多数据源(true/false)
- spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
- session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
- session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
- extUrl: sys
- config:
- export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
- config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
+ device:
+ gas-dector:
+ type: 101
+ minutes: 60
+ enable-local: false
+# type 可燃气体的设备类型
+# minutes: 燃气外协设备上传数据的分钟数
\ No newline at end of file
diff --git a/target/classes/application-dev.yml b/target/classes/application-dev.yml
new file mode 100644
index 0000000..fac2afe
--- /dev/null
+++ b/target/classes/application-dev.yml
@@ -0,0 +1,40 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
+ username: root
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+logging:
+ level.root: error
+ level.com.casic: error
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/target/classes/application-postgre.yml b/target/classes/application-postgre.yml
new file mode 100644
index 0000000..2b7f69c
--- /dev/null
+++ b/target/classes/application-postgre.yml
@@ -0,0 +1,62 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell
+ username: postgres
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ redis-config:
+ host: 127.0.0.1
+ port: 6379
+ password:
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+smartcity:
+ config:
+ export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+ #export-path: D:\export\
+ image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\
+ config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\
+ download-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\download\
+ device:
+ redis:
+ invalid-time: 86400
+ host: 127.0.0.1
+ port: 6379
+ password: ew5T4K3#203lwh
+ config-prefix: 'Casic:'
+ getui:
+ appId: H9jSTE2bAt8QWq2K2GNOB3
+ appKey: bhPeCutJVdAyOasevQFtN9
+ masterSecret: lChudND74A89WRiHLkedb5
+logging:
+ level.root: info
+ level.com.casic: info
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/target/classes/application.yml b/target/classes/application.yml
new file mode 100644
index 0000000..86411e6
--- /dev/null
+++ b/target/classes/application.yml
@@ -0,0 +1,36 @@
+##########################################################
+################## 所有profile共有的配置 #################
+##########################################################
+spring:
+ profiles:
+ active: dev
+ servlet:
+ multipart:
+ max-file-size: 50MB
+ max-request-size: 80MB
+mybatis-plus:
+ global-config:
+ enable-sql-runner: true
+ configuration:
+ # 配置结果集属性为空时 是否映射返回结果
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
+ mapper-locations: classpath:mapper/*.xml
+mybatis:
+ mapper-locations: classpath:mapper/*.xml
+#mybatis-plus:
+# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
+################### mybatis-plus配置 ###################
+################### casic配置 ###################
+flowable:
+ checkProcessDefinitions: false #不校验process文件
+casic:
+ swagger-open: false #是否开启swagger (true/false)
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ muti-datasource-open: false #是否开启多数据源(true/false)
+ spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
+ session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
+ session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
+ extUrl: sys
+ config:
+ export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+ config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
diff --git a/target/classes/com/casic/CasicApplication.class b/target/classes/com/casic/CasicApplication.class
new file mode 100644
index 0000000..68c2f95
--- /dev/null
+++ b/target/classes/com/casic/CasicApplication.class
Binary files differ
diff --git a/target/classes/com/casic/controller/DeviceController.class b/target/classes/com/casic/controller/DeviceController.class
new file mode 100644
index 0000000..478d6ae
--- /dev/null
+++ b/target/classes/com/casic/controller/DeviceController.class
Binary files differ
diff --git a/target/classes/com/casic/controller/DeviceDataController.class b/target/classes/com/casic/controller/DeviceDataController.class
new file mode 100644
index 0000000..1f4400c
--- /dev/null
+++ b/target/classes/com/casic/controller/DeviceDataController.class
Binary files differ
diff --git a/target/classes/com/casic/dao/DataGasMapper.class b/target/classes/com/casic/dao/DataGasMapper.class
new file mode 100644
index 0000000..557d539
--- /dev/null
+++ b/target/classes/com/casic/dao/DataGasMapper.class
Binary files differ
diff --git a/target/classes/com/casic/dao/DeviceMapper.class b/target/classes/com/casic/dao/DeviceMapper.class
new file mode 100644
index 0000000..3ddcd2b
--- /dev/null
+++ b/target/classes/com/casic/dao/DeviceMapper.class
Binary files differ
diff --git a/target/classes/com/casic/dao/impl/DeviceDataMapper.class b/target/classes/com/casic/dao/impl/DeviceDataMapper.class
new file mode 100644
index 0000000..d73ed15
--- /dev/null
+++ b/target/classes/com/casic/dao/impl/DeviceDataMapper.class
Binary files differ
diff --git a/target/classes/com/casic/entity/DataGasReport.class b/target/classes/com/casic/entity/DataGasReport.class
new file mode 100644
index 0000000..a3dac78
--- /dev/null
+++ b/target/classes/com/casic/entity/DataGasReport.class
Binary files differ
diff --git a/target/classes/com/casic/model/DataReportParam.class b/target/classes/com/casic/model/DataReportParam.class
new file mode 100644
index 0000000..284c4f6
--- /dev/null
+++ b/target/classes/com/casic/model/DataReportParam.class
Binary files differ
diff --git a/target/classes/com/casic/model/DeviceOnlineParam.class b/target/classes/com/casic/model/DeviceOnlineParam.class
new file mode 100644
index 0000000..33c83e2
--- /dev/null
+++ b/target/classes/com/casic/model/DeviceOnlineParam.class
Binary files differ
diff --git a/target/classes/com/casic/model/HeartbeatParam.class b/target/classes/com/casic/model/HeartbeatParam.class
new file mode 100644
index 0000000..d6d6651
--- /dev/null
+++ b/target/classes/com/casic/model/HeartbeatParam.class
Binary files differ
diff --git a/target/classes/com/casic/model/ResponseData.class b/target/classes/com/casic/model/ResponseData.class
new file mode 100644
index 0000000..9d5cab1
--- /dev/null
+++ b/target/classes/com/casic/model/ResponseData.class
Binary files differ
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..814888c
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,321 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ * 报警工单表
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_job")
+public class AlarmJob extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 工单编号
+ */
+ @TableField("JOBCODE")
+ private String jobcode;
+ /**
+ * 工单类型
+ */
+ @TableField("JOG_TYPE")
+ private String jobType;
+ /**
+ * 井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 工单创建时间
+ */
+ @TableField("CREATE_TIME")
+ private Date createTime;
+ /**
+ * 工单状态（0待处理，1待确认，2处理中，3完成）
+ */
+ @TableField("JOB_STATUS")
+ private String jobStatus;
+ /**
+ * 接单人员
+ */
+ @TableField("GET_JOB_PERSON")
+ private Long getJobPerson;
+ /**
+ * 接单时间
+ */
+ @TableField("GET_JOB_TIME")
+ private Date getJobTime;
+ /**
+ * 应接单时间
+ */
+ @TableField("SHOULD_GET_TIME")
+ private Date shouldGetTime;
+ /**
+ * 第一现场情况
+ */
+ @TableField("FIRST_STATE")
+ private String firstState;
+ /**
+ * 第一现场照片
+ */
+ @TableField("FIRST_STATE_PHOTOS")
+ private String firstStatePhotos;
+ /**
+ * 确认人员
+ */
+ @TableField("CONFIRM_JOB_PERSON")
+ private Long confirmJobPerson;
+ /**
+ * 确认时间
+ */
+ @TableField("CONFRIM_JOB_TIME")
+ private Date confrimJobTime;
+ /**
+ * 处理人员
+ */
+ @TableField("HANDLE_JOB_Person")
+ private Long handleJobPerson;
+ /**
+ * 处理时间
+ */
+ @TableField("HANDLE_JOB_TIME")
+ private Date handleJobTime;
+ /**
+ * 维护情况记录
+ */
+ @TableField("HANDLE_MESSAGE")
+ private String handleMessage;
+ /**
+ * 维护图片
+ */
+ @TableField("HANDLE_PHOTOS")
+ private String handlePhotos;
+ /**
+ * 工单流转记录
+ */
+ @TableField("FLOW")
+ private String flow;
+
+ @TableField("JOB_BELONG_TO")
+ private Long jobBelongTo;
+
+ @TableField("JOB_FLAG_DELAY")
+ private String jobFlagDelay;
+
+ @TableField("JOB_FLAG_1")
+ private String jobFlag1;
+
+ @TableField(exist = false)
+ private String alarmValue;
+
+ @TableField(exist = false)
+ private String alarmContentName;
+
+ @TableField(exist = false)
+ private Integer recordId;
+
+ @Override
+ public String toString() {
+ return "AlarmJob{" +
+ "id=" + id +
+ ", jobcode=" + jobcode +
+ ", jogType=" + jobType +
+ ", wellCode=" + wellCode +
+ ", devcode=" + devcode +
+ ", createTime=" + createTime +
+ ", jobStatus=" + jobStatus +
+ ", getJobPerson=" + getJobPerson +
+ ", getJobTime=" + getJobTime +
+ ", firstState=" + firstState +
+ ", firstStatePhotos=" + firstStatePhotos +
+ ", confirmJobPerson=" + confirmJobPerson +
+ ", confrimJobTime=" + confrimJobTime +
+ ", handleJobPerson=" + handleJobPerson +
+ ", handleJobTime=" + handleJobTime +
+ ", handleMessage=" + handleMessage +
+ ", handlePhotos=" + handlePhotos +
+ ", flow=" + flow +
+ ", recordId=" + recordId +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/AlarmRecords.java b/src/main/java/com/casic/entity/AlarmRecords.java
new file mode 100644
index 0000000..88b0b26
--- /dev/null
+++ b/src/main/java/com/casic/entity/AlarmRecords.java
@@ -0,0 +1,108 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_records")
+public class AlarmRecords extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 设备ID
+ */
+ @TableField("DEVICE_ID")
+ private Long deviceId;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 闸井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 告警类型
+ */
+ @TableField("ALARM_TYPE")
+ private String alarmType;
+ /**
+ * 告警内容
+ */
+ @TableField("ALARM_CONTENT")
+ private String alarmContent;
+ /**
+ * 告警数值
+ */
+ @TableField("ALARM_VALUE")
+ private String alarmValue;
+ /**
+ * 告警等级
+ */
+ @TableField("ALARM_LEVEL")
+ private Integer alarmLevel;
+ /**
+ * 告警详情
+ */
+ @TableField("ALARM_MSG")
+ private String alarmMessage;
+ /**
+ * 告警时间
+ */
+ @TableField("ALARM_TIME")
+ private Date alarmTime;
+ /**
+ * 告警状态
+ */
+ @TableField("STATUS")
+ private String status;
+ /**
+ * 工单编号
+ */
+ @TableField("JOB_ID")
+ private Long jobId;
+
+ @TableField(exist = false)
+ private Integer jobStatus;
+
+ @Override
+ public String toString() {
+ return "AlarmRecords{" +
+ "id=" + id +
+ ", deviceId=" + deviceId +
+ ", devcode=" + devcode +
+ ", wellCode=" + wellCode +
+ ", alarmType=" + alarmType +
+ ", alarmContent=" + alarmContent +
+ ", alarmValue=" + alarmValue +
+ ", alarmLevel=" + alarmLevel +
+ ", alarmMessage=" + alarmMessage +
+ ", alarmTime=" + alarmTime +
+ ", status=" + status +
+ ", jobId=" + jobId +
+ ", jobStatus=" + jobStatus +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/DataGasDector.java b/src/main/java/com/casic/entity/DataGasDector.java
new file mode 100644
index 0000000..537789a
--- /dev/null
+++ b/src/main/java/com/casic/entity/DataGasDector.java
@@ -0,0 +1,42 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author cz
+ * @date 2022-7-1
+ */
+@Data
+@TableName("data_gas_dector")
+public class DataGasDector {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ private String devcode;
+ private String wellCode;
+ private String strength;
+
+ private String descn;
+ /**
+ * --信号与干扰加噪声比
+ */
+ private String sinr;
+ /**
+ * --参考信号接收功率
+ */
+ private String rsrp;
+ /**
+ * --物理小区标识
+ */
+ private String pci;
+ private Date uptime;
+ private Date logtime;
+}
diff --git a/src/main/java/com/casic/entity/DataGasReport.java b/src/main/java/com/casic/entity/DataGasReport.java
deleted file mode 100644
index c43ccdf..0000000
--- a/src/main/java/com/casic/entity/DataGasReport.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.casic.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author cz
- * @date 2022-7-1
- */
-@Data
-@TableName("data_gas_dector")
-public class DataGasReport {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @TableField("devcode")
- private String imei;
- private String wellcode;
-
- private String imsi;
- /**
- * --事件类型 0正常 1低报 2高报
- */
- private String gasSensorState;
- /**
- * --浓度值
- */
- private String gasSampleValue;
- /**
- * --信号与干扰加噪声比
- */
- private String sinr;
- /**
- * --参考信号接收功率
- */
- private String rsrp;
- /**
- * --物理小区标识
- */
- private String pci;
- /**
- * --心跳周期
- */
- private String heartbeatTime;
-
- /**
- * --小区位置信息
- */
- private String cellId;
- /**
- * --电池电压
- */
- private String batteryVoltage;
- /**
- * --电池电量
- */
- private String batteryValue;
- private String iccid;
- private Date uptime;
- private Date logtime;
-}
diff --git a/src/main/java/com/casic/entity/DeviceSatatus.java b/src/main/java/com/casic/entity/DeviceSatatus.java
new file mode 100644
index 0000000..bab7903
--- /dev/null
+++ b/src/main/java/com/casic/entity/DeviceSatatus.java
@@ -0,0 +1,19 @@
+package com.casic.entity;
+
+import lombok.Data;
+
+/**
+ * 不使用了
+ *
+ */
+@Data
+public class DeviceSatatus {
+ private String deviceId;
+ private String cell;
+ private String cellTs;
+ private String onlineState;
+ private String onlineTs;
+ private String lastDataId;
+ private String lastDataJson;
+ private String lastDataTs;
+}
diff --git a/src/main/java/com/casic/model/DataContentParam.java b/src/main/java/com/casic/model/DataContentParam.java
new file mode 100644
index 0000000..46d298a
--- /dev/null
+++ b/src/main/java/com/casic/model/DataContentParam.java
@@ -0,0 +1,19 @@
+package com.casic.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DataContentParam {
+ private String msg_type;
+ private String error_val;
+ private String ch_cnt;
+ private String erro_cnt;
+ private String alarm_low_cnt;
+ private String alarm_high_cnt;
+ private String offline_cnt;
+ private List rtd_val;
+ private List adc_val;
+ private List status_val;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/DataReportParam.java b/src/main/java/com/casic/model/DataReportParam.java
index 082814c..754f330 100644
--- a/src/main/java/com/casic/model/DataReportParam.java
+++ b/src/main/java/com/casic/model/DataReportParam.java
@@ -11,25 +11,12 @@
*/
@Data
public class DataReportParam {
- private String upPacketSN;
- private String upDataSN;
- private String topic;
- private String timestamp;
- private String tenantId;
- private String serviceId;
- private String protocol;
- private String productId;
- /**
- * gas_sensor_state = 1, --事件类型 0 正常 1 低报 2 高报
- * gas_sample_value = 11-- 浓度值
- */
- private Map payload;
- private String messageType;
private String deviceType;
- private String deviceId;
- private String assocAssetId;
- @JsonProperty(value = "IMSI", required = true)
- private String IMSI;
- @JsonProperty(value = "IMEI", required = true)
- private String IMEI;
+ private String iotId;
+ private String requestId;
+ private Object checkFailedData;
+ private String productKey;
+ private String gmtCreate;
+ private String deviceName;
+ private Object items;
}
diff --git a/src/main/java/com/casic/service/DeviceDataService.java b/src/main/java/com/casic/service/DeviceDataService.java
index d883fe4..457d710 100644
--- a/src/main/java/com/casic/service/DeviceDataService.java
+++ b/src/main/java/com/casic/service/DeviceDataService.java
@@ -3,25 +3,18 @@
import com.casic.model.DataReportParam;
import com.casic.model.HeartbeatParam;
import com.casic.model.ResponseData;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* @author cz
* @date 2022
*/
public interface DeviceDataService {
-
/**
*
* @param dataReportParam
* @return
*/
- ResponseData DeviceDataCommit(DataReportParam dataReportParam);
-
- /**
- *
- * @param heartbeatParam
- * @return
- */
- ResponseData heartBeatSave(HeartbeatParam heartbeatParam);
+ ResponseData gasReceiver(DataReportParam dataReportParam);
}
diff --git a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
index 93f0685..e473f0c 100644
--- a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
+++ b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
@@ -1,58 +1,49 @@
package com.casic.service.impl;
-import com.casic.dao.impl.DeviceDataMapper;
+import com.alibaba.druid.util.StringUtils;
+import com.alibaba.fastjson.JSON;
import com.casic.model.*;
import com.casic.service.DeviceDataService;
+import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.stereotype.Service;
+import java.util.Map;
+
/**
* @author cz
- * @date 2022-6-20
+ * @date 2022-9-26
*/
@Slf4j
@Service
public class DeviceDataServiceImpl implements DeviceDataService {
- @Autowired
- DeviceDataMapper deviceDataMapper;
+ private final NormalDataProcessor normalDataProcessor;
- /**
- * @param dataReportParam
- * @return
- */
- public ResponseData DeviceDataCommit(DataReportParam dataReportParam) {
- ResponseData responseData = new ResponseData();
- try {
- deviceDataMapper.addDeviceData(dataReportParam);
- responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
- responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
- } catch (DataAccessException sqlex) {
- responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
- responseData.setMessage("请求数据异常");
- responseData.setSuccess(true);
- log.error("主题:数据上报保存出现错误,异常信息为{}", sqlex);
- }
- return responseData;
+ public DeviceDataServiceImpl(NormalDataProcessor normalDataProcessor) {
+ this.normalDataProcessor = normalDataProcessor;
}
- /**
- * @param heartbeatParam
- * @return
- */
- public ResponseData heartBeatSave(HeartbeatParam heartbeatParam) {
+ public ResponseData gasReceiver(DataReportParam dataReportParam) {
ResponseData responseData = new ResponseData();
try {
- deviceDataMapper.editDeviceData(heartbeatParam);
+ Map> updDataMap = new ObjectMapper().convertValue(dataReportParam.getItems(), Map.class);
+ DataContentParam dataContentParam = JSON.parseObject(updDataMap.get("updData").get("value"), DataContentParam.class);
+ Long uptime = Long.valueOf(String.valueOf(updDataMap.get("updData").get("time")));
+ if (StringUtils.isEmpty(dataReportParam.getDeviceName())) {
+ responseData.setCode(200);
+ responseData.setMessage("没有设备编号");
+ return responseData;
+ }
+ normalDataProcessor.normalDataProvider(dataContentParam, uptime, dataReportParam.getDeviceName());
responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
} catch (DataAccessException sqlex) {
responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
responseData.setMessage("请求数据异常");
responseData.setSuccess(true);
- log.error("主题:数据心跳出现错误,异常信息为{}", sqlex);
+ log.error("主题:设备数据上报出现错误,异常信息为{}", sqlex);
}
return responseData;
}
diff --git a/src/main/java/com/casic/service/impl/NormalDataProcessor.java b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
new file mode 100644
index 0000000..3f7630a
--- /dev/null
+++ b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
@@ -0,0 +1,164 @@
+package com.casic.service.impl;
+
+import com.alibaba.druid.util.StringUtils;
+import com.casic.dao.AlarmRecordsMapper;
+import com.casic.dao.DataGasMapper;
+import com.casic.dao.impl.AlarmJobDao;
+import com.casic.entity.AlarmJob;
+import com.casic.entity.AlarmRecords;
+import com.casic.entity.DataGasDector;
+import com.casic.model.DataContentParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+import xyz.downgoon.snowflake.Snowflake;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class NormalDataProcessor {
+
+ public static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd");
+
+ @Value("${casic.device.gas-dector.type}")
+ private Long deviceType;
+ @Value("${casic.device.gas-dector.minutes}")
+ private String minutes;
+ @Value("${casic.device.gas-dector.enable-local}")
+ private Boolean enableLocal;
+ @Resource
+ private DataGasMapper dataGasMapper;
+ @Autowired
+ private AlarmJobDao alarmJobDao;
+ @Resource
+ private AlarmRecordsMapper alarmRecordsMapper;
+ private static Snowflake snowflake = new Snowflake(0, 2);
+
+ public void normalDataProvider(DataContentParam dataReportParam, Long timeStamp, String devcode) {
+ Map gasMap = dataGasMapper.getWellCode(devcode);
+ if (ObjectUtils.isEmpty(gasMap)) {
+ log.info("没有该设备编号录入" + devcode);
+ if (enableLocal) {
+ return;
+ }
+ }
+ Boolean updateFlag = false;
+ if (ObjectUtils.isEmpty(dataGasMapper.getLastData(minutes, devcode))) {
+ updateFlag = this.saveNormalData(dataReportParam, timeStamp, devcode, gasMap);
+ }
+ this.dataTaskJudge(dataReportParam, devcode, timeStamp, gasMap, updateFlag);
+ return;
+ }
+
+ /**
+ * 自定义时间存库
+ *
+ * @param dataReportParam
+ * @param timeStamp
+ * @param devcode
+ * @param gasMap
+ */
+ private Boolean saveNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap) {
+ Boolean updateFlag = false;
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ List dataReportFilter = dataReportParam.getRtd_val().stream().filter(
+ data -> {
+ return data != -1;
+ }
+ ).collect(Collectors.toList());
+ if (dataReportFilter.size() > 0 && dataReportFilter.get(dataReportFilter.size() - 1) != 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 1);
+ updateFlag = true;
+ } else if (dataReportFilter.get(dataReportFilter.size() - 1) == 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 0);
+ }
+ dataReportFilter.forEach(
+ data -> {
+ if (data != 65535) {
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+ }
+ );
+ return updateFlag;
+ }
+
+ /**
+ * 报警就存库
+ *
+ * @param dataReportParam
+ * @param devcode
+ * @param timeStamp
+ * @param gasMap
+ */
+ private void dataTaskJudge(DataContentParam dataReportParam, String devcode, Long timeStamp, Map gasMap, Boolean updateFlag) {
+ List> alarmLevelList = dataGasMapper.getAlarmLevelList(deviceType);
+ String wellCode = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "";
+ Long deviceId = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? Long.valueOf(String.valueOf(gasMap.get("deviceId"))) : -1;
+ final String gasMsgContent=dataGasMapper.getGasMsgContent(deviceType);
+ dataReportParam.getRtd_val().stream().filter(
+ dataReport -> {
+ return dataReport != -1 && dataReport != 65535;
+ }
+ ).forEach(
+ dataReport -> {
+ for (Map alarmLevelMap : alarmLevelList) {
+ if (dataReport > Float.valueOf(String.valueOf(alarmLevelMap.get("high_value")))) {
+ AlarmRecords alarmRecord = new AlarmRecords();
+ alarmRecord.setId(snowflake.nextId());
+ alarmRecord.setDeviceId(deviceId);
+ alarmRecord.setDevcode(devcode);
+ alarmRecord.setWellCode(wellCode);
+ alarmRecord.setAlarmType("1"); // 业务报警
+ alarmRecord.setAlarmContent("燃气报警");
+ alarmRecord.setAlarmValue(String.valueOf(dataReport));
+ alarmRecord.setAlarmTime(new Date());
+ alarmRecord.setStatus("1");
+ alarmRecord.setAlarmLevel(Integer.valueOf(alarmLevelMap.get("level").toString()));
+ alarmRecord.setAlarmMessage("燃气报警");
+ String jobId = alarmRecordsMapper.isOldAlarmRecord(devcode, "燃气报警");
+ // 超出报警阈值 生成一条报警消息
+ if (!StringUtils.isEmpty(jobId)) {
+ alarmRecordsMapper.updateOldAlarmRecord(devcode, "燃气报警");
+ alarmRecord.setJobId(Long.valueOf(jobId));
+ } else {
+ AlarmJob alarmJob = alarmJobDao.saveData(devcode, wellCode, "RQZD", "1");
+ alarmRecord.setJobId(alarmJob.getId());
+ }
+ alarmRecordsMapper.insert(alarmRecord);
+ if (!updateFlag) {
+ alarmNormalData(dataReportParam, timeStamp, devcode, gasMap, dataReport);
+ }
+ break;
+ }
+ }
+ }
+ );
+ }
+
+ private void alarmNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap, Integer data) {
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+
+}
+
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index fac2afe..f8a06a6 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,40 +1,19 @@
server:
- port: 11556
+ port: 11320
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
- username: root
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell_zq_cs
+ username: postgres
password: Casic203
session:
store-type: redis
- redis:
- host: 111.198.10.15
- port: 11412
- password: ew5T4K3#203lwh
- redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
jms:
pub-sub-domain: true
- # session:
- # store-type: redis
- activemq:
- user:
- password:
- broker-url: tcp://192.168.0.203:61616
-#flowable数据源和多数据源配置
-casic:
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- #kaptcha-open: false #是否开启登录时验证码 (true/false)
- no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
- db:
- init:
- enable: false
- file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
- spring-session-open: false #开启spring session
logging:
level.root: error
- level.com.casic: error
+ level.com.casic: info
file:
path: logs/
name: missiles.log
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 86411e6..ffc01e9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -19,18 +19,11 @@
mapper-locations: classpath:mapper/*.xml
#mybatis-plus:
# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
-################### mybatis-plus配置 ###################
-################### casic配置 ###################
-flowable:
- checkProcessDefinitions: false #不校验process文件
casic:
- swagger-open: false #是否开启swagger (true/false)
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- muti-datasource-open: false #是否开启多数据源(true/false)
- spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
- session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
- session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
- extUrl: sys
- config:
- export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
- config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
+ device:
+ gas-dector:
+ type: 101
+ minutes: 60
+ enable-local: false
+# type 可燃气体的设备类型
+# minutes: 燃气外协设备上传数据的分钟数
\ No newline at end of file
diff --git a/target/classes/application-dev.yml b/target/classes/application-dev.yml
new file mode 100644
index 0000000..fac2afe
--- /dev/null
+++ b/target/classes/application-dev.yml
@@ -0,0 +1,40 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
+ username: root
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+logging:
+ level.root: error
+ level.com.casic: error
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/target/classes/application-postgre.yml b/target/classes/application-postgre.yml
new file mode 100644
index 0000000..2b7f69c
--- /dev/null
+++ b/target/classes/application-postgre.yml
@@ -0,0 +1,62 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell
+ username: postgres
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ redis-config:
+ host: 127.0.0.1
+ port: 6379
+ password:
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+smartcity:
+ config:
+ export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+ #export-path: D:\export\
+ image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\
+ config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\
+ download-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\download\
+ device:
+ redis:
+ invalid-time: 86400
+ host: 127.0.0.1
+ port: 6379
+ password: ew5T4K3#203lwh
+ config-prefix: 'Casic:'
+ getui:
+ appId: H9jSTE2bAt8QWq2K2GNOB3
+ appKey: bhPeCutJVdAyOasevQFtN9
+ masterSecret: lChudND74A89WRiHLkedb5
+logging:
+ level.root: info
+ level.com.casic: info
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/target/classes/application.yml b/target/classes/application.yml
new file mode 100644
index 0000000..86411e6
--- /dev/null
+++ b/target/classes/application.yml
@@ -0,0 +1,36 @@
+##########################################################
+################## 所有profile共有的配置 #################
+##########################################################
+spring:
+ profiles:
+ active: dev
+ servlet:
+ multipart:
+ max-file-size: 50MB
+ max-request-size: 80MB
+mybatis-plus:
+ global-config:
+ enable-sql-runner: true
+ configuration:
+ # 配置结果集属性为空时 是否映射返回结果
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
+ mapper-locations: classpath:mapper/*.xml
+mybatis:
+ mapper-locations: classpath:mapper/*.xml
+#mybatis-plus:
+# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
+################### mybatis-plus配置 ###################
+################### casic配置 ###################
+flowable:
+ checkProcessDefinitions: false #不校验process文件
+casic:
+ swagger-open: false #是否开启swagger (true/false)
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ muti-datasource-open: false #是否开启多数据源(true/false)
+ spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
+ session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
+ session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
+ extUrl: sys
+ config:
+ export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+ config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
diff --git a/target/classes/com/casic/CasicApplication.class b/target/classes/com/casic/CasicApplication.class
new file mode 100644
index 0000000..68c2f95
--- /dev/null
+++ b/target/classes/com/casic/CasicApplication.class
Binary files differ
diff --git a/target/classes/com/casic/controller/DeviceController.class b/target/classes/com/casic/controller/DeviceController.class
new file mode 100644
index 0000000..478d6ae
--- /dev/null
+++ b/target/classes/com/casic/controller/DeviceController.class
Binary files differ
diff --git a/target/classes/com/casic/controller/DeviceDataController.class b/target/classes/com/casic/controller/DeviceDataController.class
new file mode 100644
index 0000000..1f4400c
--- /dev/null
+++ b/target/classes/com/casic/controller/DeviceDataController.class
Binary files differ
diff --git a/target/classes/com/casic/dao/DataGasMapper.class b/target/classes/com/casic/dao/DataGasMapper.class
new file mode 100644
index 0000000..557d539
--- /dev/null
+++ b/target/classes/com/casic/dao/DataGasMapper.class
Binary files differ
diff --git a/target/classes/com/casic/dao/DeviceMapper.class b/target/classes/com/casic/dao/DeviceMapper.class
new file mode 100644
index 0000000..3ddcd2b
--- /dev/null
+++ b/target/classes/com/casic/dao/DeviceMapper.class
Binary files differ
diff --git a/target/classes/com/casic/dao/impl/DeviceDataMapper.class b/target/classes/com/casic/dao/impl/DeviceDataMapper.class
new file mode 100644
index 0000000..d73ed15
--- /dev/null
+++ b/target/classes/com/casic/dao/impl/DeviceDataMapper.class
Binary files differ
diff --git a/target/classes/com/casic/entity/DataGasReport.class b/target/classes/com/casic/entity/DataGasReport.class
new file mode 100644
index 0000000..a3dac78
--- /dev/null
+++ b/target/classes/com/casic/entity/DataGasReport.class
Binary files differ
diff --git a/target/classes/com/casic/model/DataReportParam.class b/target/classes/com/casic/model/DataReportParam.class
new file mode 100644
index 0000000..284c4f6
--- /dev/null
+++ b/target/classes/com/casic/model/DataReportParam.class
Binary files differ
diff --git a/target/classes/com/casic/model/DeviceOnlineParam.class b/target/classes/com/casic/model/DeviceOnlineParam.class
new file mode 100644
index 0000000..33c83e2
--- /dev/null
+++ b/target/classes/com/casic/model/DeviceOnlineParam.class
Binary files differ
diff --git a/target/classes/com/casic/model/HeartbeatParam.class b/target/classes/com/casic/model/HeartbeatParam.class
new file mode 100644
index 0000000..d6d6651
--- /dev/null
+++ b/target/classes/com/casic/model/HeartbeatParam.class
Binary files differ
diff --git a/target/classes/com/casic/model/ResponseData.class b/target/classes/com/casic/model/ResponseData.class
new file mode 100644
index 0000000..9d5cab1
--- /dev/null
+++ b/target/classes/com/casic/model/ResponseData.class
Binary files differ
diff --git a/target/classes/com/casic/service/DeviceDataService.class b/target/classes/com/casic/service/DeviceDataService.class
new file mode 100644
index 0000000..0807bfb
--- /dev/null
+++ b/target/classes/com/casic/service/DeviceDataService.class
Binary files differ
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..814888c
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,321 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ * 报警工单表
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_job")
+public class AlarmJob extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 工单编号
+ */
+ @TableField("JOBCODE")
+ private String jobcode;
+ /**
+ * 工单类型
+ */
+ @TableField("JOG_TYPE")
+ private String jobType;
+ /**
+ * 井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 工单创建时间
+ */
+ @TableField("CREATE_TIME")
+ private Date createTime;
+ /**
+ * 工单状态（0待处理，1待确认，2处理中，3完成）
+ */
+ @TableField("JOB_STATUS")
+ private String jobStatus;
+ /**
+ * 接单人员
+ */
+ @TableField("GET_JOB_PERSON")
+ private Long getJobPerson;
+ /**
+ * 接单时间
+ */
+ @TableField("GET_JOB_TIME")
+ private Date getJobTime;
+ /**
+ * 应接单时间
+ */
+ @TableField("SHOULD_GET_TIME")
+ private Date shouldGetTime;
+ /**
+ * 第一现场情况
+ */
+ @TableField("FIRST_STATE")
+ private String firstState;
+ /**
+ * 第一现场照片
+ */
+ @TableField("FIRST_STATE_PHOTOS")
+ private String firstStatePhotos;
+ /**
+ * 确认人员
+ */
+ @TableField("CONFIRM_JOB_PERSON")
+ private Long confirmJobPerson;
+ /**
+ * 确认时间
+ */
+ @TableField("CONFRIM_JOB_TIME")
+ private Date confrimJobTime;
+ /**
+ * 处理人员
+ */
+ @TableField("HANDLE_JOB_Person")
+ private Long handleJobPerson;
+ /**
+ * 处理时间
+ */
+ @TableField("HANDLE_JOB_TIME")
+ private Date handleJobTime;
+ /**
+ * 维护情况记录
+ */
+ @TableField("HANDLE_MESSAGE")
+ private String handleMessage;
+ /**
+ * 维护图片
+ */
+ @TableField("HANDLE_PHOTOS")
+ private String handlePhotos;
+ /**
+ * 工单流转记录
+ */
+ @TableField("FLOW")
+ private String flow;
+
+ @TableField("JOB_BELONG_TO")
+ private Long jobBelongTo;
+
+ @TableField("JOB_FLAG_DELAY")
+ private String jobFlagDelay;
+
+ @TableField("JOB_FLAG_1")
+ private String jobFlag1;
+
+ @TableField(exist = false)
+ private String alarmValue;
+
+ @TableField(exist = false)
+ private String alarmContentName;
+
+ @TableField(exist = false)
+ private Integer recordId;
+
+ @Override
+ public String toString() {
+ return "AlarmJob{" +
+ "id=" + id +
+ ", jobcode=" + jobcode +
+ ", jogType=" + jobType +
+ ", wellCode=" + wellCode +
+ ", devcode=" + devcode +
+ ", createTime=" + createTime +
+ ", jobStatus=" + jobStatus +
+ ", getJobPerson=" + getJobPerson +
+ ", getJobTime=" + getJobTime +
+ ", firstState=" + firstState +
+ ", firstStatePhotos=" + firstStatePhotos +
+ ", confirmJobPerson=" + confirmJobPerson +
+ ", confrimJobTime=" + confrimJobTime +
+ ", handleJobPerson=" + handleJobPerson +
+ ", handleJobTime=" + handleJobTime +
+ ", handleMessage=" + handleMessage +
+ ", handlePhotos=" + handlePhotos +
+ ", flow=" + flow +
+ ", recordId=" + recordId +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/AlarmRecords.java b/src/main/java/com/casic/entity/AlarmRecords.java
new file mode 100644
index 0000000..88b0b26
--- /dev/null
+++ b/src/main/java/com/casic/entity/AlarmRecords.java
@@ -0,0 +1,108 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_records")
+public class AlarmRecords extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 设备ID
+ */
+ @TableField("DEVICE_ID")
+ private Long deviceId;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 闸井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 告警类型
+ */
+ @TableField("ALARM_TYPE")
+ private String alarmType;
+ /**
+ * 告警内容
+ */
+ @TableField("ALARM_CONTENT")
+ private String alarmContent;
+ /**
+ * 告警数值
+ */
+ @TableField("ALARM_VALUE")
+ private String alarmValue;
+ /**
+ * 告警等级
+ */
+ @TableField("ALARM_LEVEL")
+ private Integer alarmLevel;
+ /**
+ * 告警详情
+ */
+ @TableField("ALARM_MSG")
+ private String alarmMessage;
+ /**
+ * 告警时间
+ */
+ @TableField("ALARM_TIME")
+ private Date alarmTime;
+ /**
+ * 告警状态
+ */
+ @TableField("STATUS")
+ private String status;
+ /**
+ * 工单编号
+ */
+ @TableField("JOB_ID")
+ private Long jobId;
+
+ @TableField(exist = false)
+ private Integer jobStatus;
+
+ @Override
+ public String toString() {
+ return "AlarmRecords{" +
+ "id=" + id +
+ ", deviceId=" + deviceId +
+ ", devcode=" + devcode +
+ ", wellCode=" + wellCode +
+ ", alarmType=" + alarmType +
+ ", alarmContent=" + alarmContent +
+ ", alarmValue=" + alarmValue +
+ ", alarmLevel=" + alarmLevel +
+ ", alarmMessage=" + alarmMessage +
+ ", alarmTime=" + alarmTime +
+ ", status=" + status +
+ ", jobId=" + jobId +
+ ", jobStatus=" + jobStatus +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/DataGasDector.java b/src/main/java/com/casic/entity/DataGasDector.java
new file mode 100644
index 0000000..537789a
--- /dev/null
+++ b/src/main/java/com/casic/entity/DataGasDector.java
@@ -0,0 +1,42 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author cz
+ * @date 2022-7-1
+ */
+@Data
+@TableName("data_gas_dector")
+public class DataGasDector {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ private String devcode;
+ private String wellCode;
+ private String strength;
+
+ private String descn;
+ /**
+ * --信号与干扰加噪声比
+ */
+ private String sinr;
+ /**
+ * --参考信号接收功率
+ */
+ private String rsrp;
+ /**
+ * --物理小区标识
+ */
+ private String pci;
+ private Date uptime;
+ private Date logtime;
+}
diff --git a/src/main/java/com/casic/entity/DataGasReport.java b/src/main/java/com/casic/entity/DataGasReport.java
deleted file mode 100644
index c43ccdf..0000000
--- a/src/main/java/com/casic/entity/DataGasReport.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.casic.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author cz
- * @date 2022-7-1
- */
-@Data
-@TableName("data_gas_dector")
-public class DataGasReport {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @TableField("devcode")
- private String imei;
- private String wellcode;
-
- private String imsi;
- /**
- * --事件类型 0正常 1低报 2高报
- */
- private String gasSensorState;
- /**
- * --浓度值
- */
- private String gasSampleValue;
- /**
- * --信号与干扰加噪声比
- */
- private String sinr;
- /**
- * --参考信号接收功率
- */
- private String rsrp;
- /**
- * --物理小区标识
- */
- private String pci;
- /**
- * --心跳周期
- */
- private String heartbeatTime;
-
- /**
- * --小区位置信息
- */
- private String cellId;
- /**
- * --电池电压
- */
- private String batteryVoltage;
- /**
- * --电池电量
- */
- private String batteryValue;
- private String iccid;
- private Date uptime;
- private Date logtime;
-}
diff --git a/src/main/java/com/casic/entity/DeviceSatatus.java b/src/main/java/com/casic/entity/DeviceSatatus.java
new file mode 100644
index 0000000..bab7903
--- /dev/null
+++ b/src/main/java/com/casic/entity/DeviceSatatus.java
@@ -0,0 +1,19 @@
+package com.casic.entity;
+
+import lombok.Data;
+
+/**
+ * 不使用了
+ *
+ */
+@Data
+public class DeviceSatatus {
+ private String deviceId;
+ private String cell;
+ private String cellTs;
+ private String onlineState;
+ private String onlineTs;
+ private String lastDataId;
+ private String lastDataJson;
+ private String lastDataTs;
+}
diff --git a/src/main/java/com/casic/model/DataContentParam.java b/src/main/java/com/casic/model/DataContentParam.java
new file mode 100644
index 0000000..46d298a
--- /dev/null
+++ b/src/main/java/com/casic/model/DataContentParam.java
@@ -0,0 +1,19 @@
+package com.casic.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DataContentParam {
+ private String msg_type;
+ private String error_val;
+ private String ch_cnt;
+ private String erro_cnt;
+ private String alarm_low_cnt;
+ private String alarm_high_cnt;
+ private String offline_cnt;
+ private List rtd_val;
+ private List adc_val;
+ private List status_val;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/DataReportParam.java b/src/main/java/com/casic/model/DataReportParam.java
index 082814c..754f330 100644
--- a/src/main/java/com/casic/model/DataReportParam.java
+++ b/src/main/java/com/casic/model/DataReportParam.java
@@ -11,25 +11,12 @@
*/
@Data
public class DataReportParam {
- private String upPacketSN;
- private String upDataSN;
- private String topic;
- private String timestamp;
- private String tenantId;
- private String serviceId;
- private String protocol;
- private String productId;
- /**
- * gas_sensor_state = 1, --事件类型 0 正常 1 低报 2 高报
- * gas_sample_value = 11-- 浓度值
- */
- private Map payload;
- private String messageType;
private String deviceType;
- private String deviceId;
- private String assocAssetId;
- @JsonProperty(value = "IMSI", required = true)
- private String IMSI;
- @JsonProperty(value = "IMEI", required = true)
- private String IMEI;
+ private String iotId;
+ private String requestId;
+ private Object checkFailedData;
+ private String productKey;
+ private String gmtCreate;
+ private String deviceName;
+ private Object items;
}
diff --git a/src/main/java/com/casic/service/DeviceDataService.java b/src/main/java/com/casic/service/DeviceDataService.java
index d883fe4..457d710 100644
--- a/src/main/java/com/casic/service/DeviceDataService.java
+++ b/src/main/java/com/casic/service/DeviceDataService.java
@@ -3,25 +3,18 @@
import com.casic.model.DataReportParam;
import com.casic.model.HeartbeatParam;
import com.casic.model.ResponseData;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* @author cz
* @date 2022
*/
public interface DeviceDataService {
-
/**
*
* @param dataReportParam
* @return
*/
- ResponseData DeviceDataCommit(DataReportParam dataReportParam);
-
- /**
- *
- * @param heartbeatParam
- * @return
- */
- ResponseData heartBeatSave(HeartbeatParam heartbeatParam);
+ ResponseData gasReceiver(DataReportParam dataReportParam);
}
diff --git a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
index 93f0685..e473f0c 100644
--- a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
+++ b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
@@ -1,58 +1,49 @@
package com.casic.service.impl;
-import com.casic.dao.impl.DeviceDataMapper;
+import com.alibaba.druid.util.StringUtils;
+import com.alibaba.fastjson.JSON;
import com.casic.model.*;
import com.casic.service.DeviceDataService;
+import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.stereotype.Service;
+import java.util.Map;
+
/**
* @author cz
- * @date 2022-6-20
+ * @date 2022-9-26
*/
@Slf4j
@Service
public class DeviceDataServiceImpl implements DeviceDataService {
- @Autowired
- DeviceDataMapper deviceDataMapper;
+ private final NormalDataProcessor normalDataProcessor;
- /**
- * @param dataReportParam
- * @return
- */
- public ResponseData DeviceDataCommit(DataReportParam dataReportParam) {
- ResponseData responseData = new ResponseData();
- try {
- deviceDataMapper.addDeviceData(dataReportParam);
- responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
- responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
- } catch (DataAccessException sqlex) {
- responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
- responseData.setMessage("请求数据异常");
- responseData.setSuccess(true);
- log.error("主题:数据上报保存出现错误,异常信息为{}", sqlex);
- }
- return responseData;
+ public DeviceDataServiceImpl(NormalDataProcessor normalDataProcessor) {
+ this.normalDataProcessor = normalDataProcessor;
}
- /**
- * @param heartbeatParam
- * @return
- */
- public ResponseData heartBeatSave(HeartbeatParam heartbeatParam) {
+ public ResponseData gasReceiver(DataReportParam dataReportParam) {
ResponseData responseData = new ResponseData();
try {
- deviceDataMapper.editDeviceData(heartbeatParam);
+ Map> updDataMap = new ObjectMapper().convertValue(dataReportParam.getItems(), Map.class);
+ DataContentParam dataContentParam = JSON.parseObject(updDataMap.get("updData").get("value"), DataContentParam.class);
+ Long uptime = Long.valueOf(String.valueOf(updDataMap.get("updData").get("time")));
+ if (StringUtils.isEmpty(dataReportParam.getDeviceName())) {
+ responseData.setCode(200);
+ responseData.setMessage("没有设备编号");
+ return responseData;
+ }
+ normalDataProcessor.normalDataProvider(dataContentParam, uptime, dataReportParam.getDeviceName());
responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
} catch (DataAccessException sqlex) {
responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
responseData.setMessage("请求数据异常");
responseData.setSuccess(true);
- log.error("主题:数据心跳出现错误,异常信息为{}", sqlex);
+ log.error("主题:设备数据上报出现错误,异常信息为{}", sqlex);
}
return responseData;
}
diff --git a/src/main/java/com/casic/service/impl/NormalDataProcessor.java b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
new file mode 100644
index 0000000..3f7630a
--- /dev/null
+++ b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
@@ -0,0 +1,164 @@
+package com.casic.service.impl;
+
+import com.alibaba.druid.util.StringUtils;
+import com.casic.dao.AlarmRecordsMapper;
+import com.casic.dao.DataGasMapper;
+import com.casic.dao.impl.AlarmJobDao;
+import com.casic.entity.AlarmJob;
+import com.casic.entity.AlarmRecords;
+import com.casic.entity.DataGasDector;
+import com.casic.model.DataContentParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+import xyz.downgoon.snowflake.Snowflake;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class NormalDataProcessor {
+
+ public static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd");
+
+ @Value("${casic.device.gas-dector.type}")
+ private Long deviceType;
+ @Value("${casic.device.gas-dector.minutes}")
+ private String minutes;
+ @Value("${casic.device.gas-dector.enable-local}")
+ private Boolean enableLocal;
+ @Resource
+ private DataGasMapper dataGasMapper;
+ @Autowired
+ private AlarmJobDao alarmJobDao;
+ @Resource
+ private AlarmRecordsMapper alarmRecordsMapper;
+ private static Snowflake snowflake = new Snowflake(0, 2);
+
+ public void normalDataProvider(DataContentParam dataReportParam, Long timeStamp, String devcode) {
+ Map gasMap = dataGasMapper.getWellCode(devcode);
+ if (ObjectUtils.isEmpty(gasMap)) {
+ log.info("没有该设备编号录入" + devcode);
+ if (enableLocal) {
+ return;
+ }
+ }
+ Boolean updateFlag = false;
+ if (ObjectUtils.isEmpty(dataGasMapper.getLastData(minutes, devcode))) {
+ updateFlag = this.saveNormalData(dataReportParam, timeStamp, devcode, gasMap);
+ }
+ this.dataTaskJudge(dataReportParam, devcode, timeStamp, gasMap, updateFlag);
+ return;
+ }
+
+ /**
+ * 自定义时间存库
+ *
+ * @param dataReportParam
+ * @param timeStamp
+ * @param devcode
+ * @param gasMap
+ */
+ private Boolean saveNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap) {
+ Boolean updateFlag = false;
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ List dataReportFilter = dataReportParam.getRtd_val().stream().filter(
+ data -> {
+ return data != -1;
+ }
+ ).collect(Collectors.toList());
+ if (dataReportFilter.size() > 0 && dataReportFilter.get(dataReportFilter.size() - 1) != 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 1);
+ updateFlag = true;
+ } else if (dataReportFilter.get(dataReportFilter.size() - 1) == 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 0);
+ }
+ dataReportFilter.forEach(
+ data -> {
+ if (data != 65535) {
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+ }
+ );
+ return updateFlag;
+ }
+
+ /**
+ * 报警就存库
+ *
+ * @param dataReportParam
+ * @param devcode
+ * @param timeStamp
+ * @param gasMap
+ */
+ private void dataTaskJudge(DataContentParam dataReportParam, String devcode, Long timeStamp, Map gasMap, Boolean updateFlag) {
+ List> alarmLevelList = dataGasMapper.getAlarmLevelList(deviceType);
+ String wellCode = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "";
+ Long deviceId = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? Long.valueOf(String.valueOf(gasMap.get("deviceId"))) : -1;
+ final String gasMsgContent=dataGasMapper.getGasMsgContent(deviceType);
+ dataReportParam.getRtd_val().stream().filter(
+ dataReport -> {
+ return dataReport != -1 && dataReport != 65535;
+ }
+ ).forEach(
+ dataReport -> {
+ for (Map alarmLevelMap : alarmLevelList) {
+ if (dataReport > Float.valueOf(String.valueOf(alarmLevelMap.get("high_value")))) {
+ AlarmRecords alarmRecord = new AlarmRecords();
+ alarmRecord.setId(snowflake.nextId());
+ alarmRecord.setDeviceId(deviceId);
+ alarmRecord.setDevcode(devcode);
+ alarmRecord.setWellCode(wellCode);
+ alarmRecord.setAlarmType("1"); // 业务报警
+ alarmRecord.setAlarmContent("燃气报警");
+ alarmRecord.setAlarmValue(String.valueOf(dataReport));
+ alarmRecord.setAlarmTime(new Date());
+ alarmRecord.setStatus("1");
+ alarmRecord.setAlarmLevel(Integer.valueOf(alarmLevelMap.get("level").toString()));
+ alarmRecord.setAlarmMessage("燃气报警");
+ String jobId = alarmRecordsMapper.isOldAlarmRecord(devcode, "燃气报警");
+ // 超出报警阈值 生成一条报警消息
+ if (!StringUtils.isEmpty(jobId)) {
+ alarmRecordsMapper.updateOldAlarmRecord(devcode, "燃气报警");
+ alarmRecord.setJobId(Long.valueOf(jobId));
+ } else {
+ AlarmJob alarmJob = alarmJobDao.saveData(devcode, wellCode, "RQZD", "1");
+ alarmRecord.setJobId(alarmJob.getId());
+ }
+ alarmRecordsMapper.insert(alarmRecord);
+ if (!updateFlag) {
+ alarmNormalData(dataReportParam, timeStamp, devcode, gasMap, dataReport);
+ }
+ break;
+ }
+ }
+ }
+ );
+ }
+
+ private void alarmNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap, Integer data) {
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+
+}
+
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index fac2afe..f8a06a6 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,40 +1,19 @@
server:
- port: 11556
+ port: 11320
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
- username: root
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell_zq_cs
+ username: postgres
password: Casic203
session:
store-type: redis
- redis:
- host: 111.198.10.15
- port: 11412
- password: ew5T4K3#203lwh
- redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
jms:
pub-sub-domain: true
- # session:
- # store-type: redis
- activemq:
- user:
- password:
- broker-url: tcp://192.168.0.203:61616
-#flowable数据源和多数据源配置
-casic:
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- #kaptcha-open: false #是否开启登录时验证码 (true/false)
- no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
- db:
- init:
- enable: false
- file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
- spring-session-open: false #开启spring session
logging:
level.root: error
- level.com.casic: error
+ level.com.casic: info
file:
path: logs/
name: missiles.log
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 86411e6..ffc01e9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -19,18 +19,11 @@
mapper-locations: classpath:mapper/*.xml
#mybatis-plus:
# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
-################### mybatis-plus配置 ###################
-################### casic配置 ###################
-flowable:
- checkProcessDefinitions: false #不校验process文件
casic:
- swagger-open: false #是否开启swagger (true/false)
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- muti-datasource-open: false #是否开启多数据源(true/false)
- spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
- session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
- session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
- extUrl: sys
- config:
- export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
- config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
+ device:
+ gas-dector:
+ type: 101
+ minutes: 60
+ enable-local: false
+# type 可燃气体的设备类型
+# minutes: 燃气外协设备上传数据的分钟数
\ No newline at end of file
diff --git a/target/classes/application-dev.yml b/target/classes/application-dev.yml
new file mode 100644
index 0000000..fac2afe
--- /dev/null
+++ b/target/classes/application-dev.yml
@@ -0,0 +1,40 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
+ username: root
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+logging:
+ level.root: error
+ level.com.casic: error
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/target/classes/application-postgre.yml b/target/classes/application-postgre.yml
new file mode 100644
index 0000000..2b7f69c
--- /dev/null
+++ b/target/classes/application-postgre.yml
@@ -0,0 +1,62 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell
+ username: postgres
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ redis-config:
+ host: 127.0.0.1
+ port: 6379
+ password:
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+smartcity:
+ config:
+ export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+ #export-path: D:\export\
+ image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\
+ config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\
+ download-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\download\
+ device:
+ redis:
+ invalid-time: 86400
+ host: 127.0.0.1
+ port: 6379
+ password: ew5T4K3#203lwh
+ config-prefix: 'Casic:'
+ getui:
+ appId: H9jSTE2bAt8QWq2K2GNOB3
+ appKey: bhPeCutJVdAyOasevQFtN9
+ masterSecret: lChudND74A89WRiHLkedb5
+logging:
+ level.root: info
+ level.com.casic: info
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/target/classes/application.yml b/target/classes/application.yml
new file mode 100644
index 0000000..86411e6
--- /dev/null
+++ b/target/classes/application.yml
@@ -0,0 +1,36 @@
+##########################################################
+################## 所有profile共有的配置 #################
+##########################################################
+spring:
+ profiles:
+ active: dev
+ servlet:
+ multipart:
+ max-file-size: 50MB
+ max-request-size: 80MB
+mybatis-plus:
+ global-config:
+ enable-sql-runner: true
+ configuration:
+ # 配置结果集属性为空时 是否映射返回结果
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
+ mapper-locations: classpath:mapper/*.xml
+mybatis:
+ mapper-locations: classpath:mapper/*.xml
+#mybatis-plus:
+# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
+################### mybatis-plus配置 ###################
+################### casic配置 ###################
+flowable:
+ checkProcessDefinitions: false #不校验process文件
+casic:
+ swagger-open: false #是否开启swagger (true/false)
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ muti-datasource-open: false #是否开启多数据源(true/false)
+ spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
+ session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
+ session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
+ extUrl: sys
+ config:
+ export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+ config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
diff --git a/target/classes/com/casic/CasicApplication.class b/target/classes/com/casic/CasicApplication.class
new file mode 100644
index 0000000..68c2f95
--- /dev/null
+++ b/target/classes/com/casic/CasicApplication.class
Binary files differ
diff --git a/target/classes/com/casic/controller/DeviceController.class b/target/classes/com/casic/controller/DeviceController.class
new file mode 100644
index 0000000..478d6ae
--- /dev/null
+++ b/target/classes/com/casic/controller/DeviceController.class
Binary files differ
diff --git a/target/classes/com/casic/controller/DeviceDataController.class b/target/classes/com/casic/controller/DeviceDataController.class
new file mode 100644
index 0000000..1f4400c
--- /dev/null
+++ b/target/classes/com/casic/controller/DeviceDataController.class
Binary files differ
diff --git a/target/classes/com/casic/dao/DataGasMapper.class b/target/classes/com/casic/dao/DataGasMapper.class
new file mode 100644
index 0000000..557d539
--- /dev/null
+++ b/target/classes/com/casic/dao/DataGasMapper.class
Binary files differ
diff --git a/target/classes/com/casic/dao/DeviceMapper.class b/target/classes/com/casic/dao/DeviceMapper.class
new file mode 100644
index 0000000..3ddcd2b
--- /dev/null
+++ b/target/classes/com/casic/dao/DeviceMapper.class
Binary files differ
diff --git a/target/classes/com/casic/dao/impl/DeviceDataMapper.class b/target/classes/com/casic/dao/impl/DeviceDataMapper.class
new file mode 100644
index 0000000..d73ed15
--- /dev/null
+++ b/target/classes/com/casic/dao/impl/DeviceDataMapper.class
Binary files differ
diff --git a/target/classes/com/casic/entity/DataGasReport.class b/target/classes/com/casic/entity/DataGasReport.class
new file mode 100644
index 0000000..a3dac78
--- /dev/null
+++ b/target/classes/com/casic/entity/DataGasReport.class
Binary files differ
diff --git a/target/classes/com/casic/model/DataReportParam.class b/target/classes/com/casic/model/DataReportParam.class
new file mode 100644
index 0000000..284c4f6
--- /dev/null
+++ b/target/classes/com/casic/model/DataReportParam.class
Binary files differ
diff --git a/target/classes/com/casic/model/DeviceOnlineParam.class b/target/classes/com/casic/model/DeviceOnlineParam.class
new file mode 100644
index 0000000..33c83e2
--- /dev/null
+++ b/target/classes/com/casic/model/DeviceOnlineParam.class
Binary files differ
diff --git a/target/classes/com/casic/model/HeartbeatParam.class b/target/classes/com/casic/model/HeartbeatParam.class
new file mode 100644
index 0000000..d6d6651
--- /dev/null
+++ b/target/classes/com/casic/model/HeartbeatParam.class
Binary files differ
diff --git a/target/classes/com/casic/model/ResponseData.class b/target/classes/com/casic/model/ResponseData.class
new file mode 100644
index 0000000..9d5cab1
--- /dev/null
+++ b/target/classes/com/casic/model/ResponseData.class
Binary files differ
diff --git a/target/classes/com/casic/service/DeviceDataService.class b/target/classes/com/casic/service/DeviceDataService.class
new file mode 100644
index 0000000..0807bfb
--- /dev/null
+++ b/target/classes/com/casic/service/DeviceDataService.class
Binary files differ
diff --git a/target/classes/com/casic/service/DeviceService.class b/target/classes/com/casic/service/DeviceService.class
new file mode 100644
index 0000000..765368a
--- /dev/null
+++ b/target/classes/com/casic/service/DeviceService.class
Binary files differ
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..814888c
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,321 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ * 报警工单表
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_job")
+public class AlarmJob extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 工单编号
+ */
+ @TableField("JOBCODE")
+ private String jobcode;
+ /**
+ * 工单类型
+ */
+ @TableField("JOG_TYPE")
+ private String jobType;
+ /**
+ * 井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 工单创建时间
+ */
+ @TableField("CREATE_TIME")
+ private Date createTime;
+ /**
+ * 工单状态（0待处理，1待确认，2处理中，3完成）
+ */
+ @TableField("JOB_STATUS")
+ private String jobStatus;
+ /**
+ * 接单人员
+ */
+ @TableField("GET_JOB_PERSON")
+ private Long getJobPerson;
+ /**
+ * 接单时间
+ */
+ @TableField("GET_JOB_TIME")
+ private Date getJobTime;
+ /**
+ * 应接单时间
+ */
+ @TableField("SHOULD_GET_TIME")
+ private Date shouldGetTime;
+ /**
+ * 第一现场情况
+ */
+ @TableField("FIRST_STATE")
+ private String firstState;
+ /**
+ * 第一现场照片
+ */
+ @TableField("FIRST_STATE_PHOTOS")
+ private String firstStatePhotos;
+ /**
+ * 确认人员
+ */
+ @TableField("CONFIRM_JOB_PERSON")
+ private Long confirmJobPerson;
+ /**
+ * 确认时间
+ */
+ @TableField("CONFRIM_JOB_TIME")
+ private Date confrimJobTime;
+ /**
+ * 处理人员
+ */
+ @TableField("HANDLE_JOB_Person")
+ private Long handleJobPerson;
+ /**
+ * 处理时间
+ */
+ @TableField("HANDLE_JOB_TIME")
+ private Date handleJobTime;
+ /**
+ * 维护情况记录
+ */
+ @TableField("HANDLE_MESSAGE")
+ private String handleMessage;
+ /**
+ * 维护图片
+ */
+ @TableField("HANDLE_PHOTOS")
+ private String handlePhotos;
+ /**
+ * 工单流转记录
+ */
+ @TableField("FLOW")
+ private String flow;
+
+ @TableField("JOB_BELONG_TO")
+ private Long jobBelongTo;
+
+ @TableField("JOB_FLAG_DELAY")
+ private String jobFlagDelay;
+
+ @TableField("JOB_FLAG_1")
+ private String jobFlag1;
+
+ @TableField(exist = false)
+ private String alarmValue;
+
+ @TableField(exist = false)
+ private String alarmContentName;
+
+ @TableField(exist = false)
+ private Integer recordId;
+
+ @Override
+ public String toString() {
+ return "AlarmJob{" +
+ "id=" + id +
+ ", jobcode=" + jobcode +
+ ", jogType=" + jobType +
+ ", wellCode=" + wellCode +
+ ", devcode=" + devcode +
+ ", createTime=" + createTime +
+ ", jobStatus=" + jobStatus +
+ ", getJobPerson=" + getJobPerson +
+ ", getJobTime=" + getJobTime +
+ ", firstState=" + firstState +
+ ", firstStatePhotos=" + firstStatePhotos +
+ ", confirmJobPerson=" + confirmJobPerson +
+ ", confrimJobTime=" + confrimJobTime +
+ ", handleJobPerson=" + handleJobPerson +
+ ", handleJobTime=" + handleJobTime +
+ ", handleMessage=" + handleMessage +
+ ", handlePhotos=" + handlePhotos +
+ ", flow=" + flow +
+ ", recordId=" + recordId +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/AlarmRecords.java b/src/main/java/com/casic/entity/AlarmRecords.java
new file mode 100644
index 0000000..88b0b26
--- /dev/null
+++ b/src/main/java/com/casic/entity/AlarmRecords.java
@@ -0,0 +1,108 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_records")
+public class AlarmRecords extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 设备ID
+ */
+ @TableField("DEVICE_ID")
+ private Long deviceId;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 闸井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 告警类型
+ */
+ @TableField("ALARM_TYPE")
+ private String alarmType;
+ /**
+ * 告警内容
+ */
+ @TableField("ALARM_CONTENT")
+ private String alarmContent;
+ /**
+ * 告警数值
+ */
+ @TableField("ALARM_VALUE")
+ private String alarmValue;
+ /**
+ * 告警等级
+ */
+ @TableField("ALARM_LEVEL")
+ private Integer alarmLevel;
+ /**
+ * 告警详情
+ */
+ @TableField("ALARM_MSG")
+ private String alarmMessage;
+ /**
+ * 告警时间
+ */
+ @TableField("ALARM_TIME")
+ private Date alarmTime;
+ /**
+ * 告警状态
+ */
+ @TableField("STATUS")
+ private String status;
+ /**
+ * 工单编号
+ */
+ @TableField("JOB_ID")
+ private Long jobId;
+
+ @TableField(exist = false)
+ private Integer jobStatus;
+
+ @Override
+ public String toString() {
+ return "AlarmRecords{" +
+ "id=" + id +
+ ", deviceId=" + deviceId +
+ ", devcode=" + devcode +
+ ", wellCode=" + wellCode +
+ ", alarmType=" + alarmType +
+ ", alarmContent=" + alarmContent +
+ ", alarmValue=" + alarmValue +
+ ", alarmLevel=" + alarmLevel +
+ ", alarmMessage=" + alarmMessage +
+ ", alarmTime=" + alarmTime +
+ ", status=" + status +
+ ", jobId=" + jobId +
+ ", jobStatus=" + jobStatus +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/DataGasDector.java b/src/main/java/com/casic/entity/DataGasDector.java
new file mode 100644
index 0000000..537789a
--- /dev/null
+++ b/src/main/java/com/casic/entity/DataGasDector.java
@@ -0,0 +1,42 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author cz
+ * @date 2022-7-1
+ */
+@Data
+@TableName("data_gas_dector")
+public class DataGasDector {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ private String devcode;
+ private String wellCode;
+ private String strength;
+
+ private String descn;
+ /**
+ * --信号与干扰加噪声比
+ */
+ private String sinr;
+ /**
+ * --参考信号接收功率
+ */
+ private String rsrp;
+ /**
+ * --物理小区标识
+ */
+ private String pci;
+ private Date uptime;
+ private Date logtime;
+}
diff --git a/src/main/java/com/casic/entity/DataGasReport.java b/src/main/java/com/casic/entity/DataGasReport.java
deleted file mode 100644
index c43ccdf..0000000
--- a/src/main/java/com/casic/entity/DataGasReport.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.casic.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author cz
- * @date 2022-7-1
- */
-@Data
-@TableName("data_gas_dector")
-public class DataGasReport {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @TableField("devcode")
- private String imei;
- private String wellcode;
-
- private String imsi;
- /**
- * --事件类型 0正常 1低报 2高报
- */
- private String gasSensorState;
- /**
- * --浓度值
- */
- private String gasSampleValue;
- /**
- * --信号与干扰加噪声比
- */
- private String sinr;
- /**
- * --参考信号接收功率
- */
- private String rsrp;
- /**
- * --物理小区标识
- */
- private String pci;
- /**
- * --心跳周期
- */
- private String heartbeatTime;
-
- /**
- * --小区位置信息
- */
- private String cellId;
- /**
- * --电池电压
- */
- private String batteryVoltage;
- /**
- * --电池电量
- */
- private String batteryValue;
- private String iccid;
- private Date uptime;
- private Date logtime;
-}
diff --git a/src/main/java/com/casic/entity/DeviceSatatus.java b/src/main/java/com/casic/entity/DeviceSatatus.java
new file mode 100644
index 0000000..bab7903
--- /dev/null
+++ b/src/main/java/com/casic/entity/DeviceSatatus.java
@@ -0,0 +1,19 @@
+package com.casic.entity;
+
+import lombok.Data;
+
+/**
+ * 不使用了
+ *
+ */
+@Data
+public class DeviceSatatus {
+ private String deviceId;
+ private String cell;
+ private String cellTs;
+ private String onlineState;
+ private String onlineTs;
+ private String lastDataId;
+ private String lastDataJson;
+ private String lastDataTs;
+}
diff --git a/src/main/java/com/casic/model/DataContentParam.java b/src/main/java/com/casic/model/DataContentParam.java
new file mode 100644
index 0000000..46d298a
--- /dev/null
+++ b/src/main/java/com/casic/model/DataContentParam.java
@@ -0,0 +1,19 @@
+package com.casic.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DataContentParam {
+ private String msg_type;
+ private String error_val;
+ private String ch_cnt;
+ private String erro_cnt;
+ private String alarm_low_cnt;
+ private String alarm_high_cnt;
+ private String offline_cnt;
+ private List rtd_val;
+ private List adc_val;
+ private List status_val;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/DataReportParam.java b/src/main/java/com/casic/model/DataReportParam.java
index 082814c..754f330 100644
--- a/src/main/java/com/casic/model/DataReportParam.java
+++ b/src/main/java/com/casic/model/DataReportParam.java
@@ -11,25 +11,12 @@
*/
@Data
public class DataReportParam {
- private String upPacketSN;
- private String upDataSN;
- private String topic;
- private String timestamp;
- private String tenantId;
- private String serviceId;
- private String protocol;
- private String productId;
- /**
- * gas_sensor_state = 1, --事件类型 0 正常 1 低报 2 高报
- * gas_sample_value = 11-- 浓度值
- */
- private Map payload;
- private String messageType;
private String deviceType;
- private String deviceId;
- private String assocAssetId;
- @JsonProperty(value = "IMSI", required = true)
- private String IMSI;
- @JsonProperty(value = "IMEI", required = true)
- private String IMEI;
+ private String iotId;
+ private String requestId;
+ private Object checkFailedData;
+ private String productKey;
+ private String gmtCreate;
+ private String deviceName;
+ private Object items;
}
diff --git a/src/main/java/com/casic/service/DeviceDataService.java b/src/main/java/com/casic/service/DeviceDataService.java
index d883fe4..457d710 100644
--- a/src/main/java/com/casic/service/DeviceDataService.java
+++ b/src/main/java/com/casic/service/DeviceDataService.java
@@ -3,25 +3,18 @@
import com.casic.model.DataReportParam;
import com.casic.model.HeartbeatParam;
import com.casic.model.ResponseData;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* @author cz
* @date 2022
*/
public interface DeviceDataService {
-
/**
*
* @param dataReportParam
* @return
*/
- ResponseData DeviceDataCommit(DataReportParam dataReportParam);
-
- /**
- *
- * @param heartbeatParam
- * @return
- */
- ResponseData heartBeatSave(HeartbeatParam heartbeatParam);
+ ResponseData gasReceiver(DataReportParam dataReportParam);
}
diff --git a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
index 93f0685..e473f0c 100644
--- a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
+++ b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
@@ -1,58 +1,49 @@
package com.casic.service.impl;
-import com.casic.dao.impl.DeviceDataMapper;
+import com.alibaba.druid.util.StringUtils;
+import com.alibaba.fastjson.JSON;
import com.casic.model.*;
import com.casic.service.DeviceDataService;
+import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.stereotype.Service;
+import java.util.Map;
+
/**
* @author cz
- * @date 2022-6-20
+ * @date 2022-9-26
*/
@Slf4j
@Service
public class DeviceDataServiceImpl implements DeviceDataService {
- @Autowired
- DeviceDataMapper deviceDataMapper;
+ private final NormalDataProcessor normalDataProcessor;
- /**
- * @param dataReportParam
- * @return
- */
- public ResponseData DeviceDataCommit(DataReportParam dataReportParam) {
- ResponseData responseData = new ResponseData();
- try {
- deviceDataMapper.addDeviceData(dataReportParam);
- responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
- responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
- } catch (DataAccessException sqlex) {
- responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
- responseData.setMessage("请求数据异常");
- responseData.setSuccess(true);
- log.error("主题:数据上报保存出现错误,异常信息为{}", sqlex);
- }
- return responseData;
+ public DeviceDataServiceImpl(NormalDataProcessor normalDataProcessor) {
+ this.normalDataProcessor = normalDataProcessor;
}
- /**
- * @param heartbeatParam
- * @return
- */
- public ResponseData heartBeatSave(HeartbeatParam heartbeatParam) {
+ public ResponseData gasReceiver(DataReportParam dataReportParam) {
ResponseData responseData = new ResponseData();
try {
- deviceDataMapper.editDeviceData(heartbeatParam);
+ Map> updDataMap = new ObjectMapper().convertValue(dataReportParam.getItems(), Map.class);
+ DataContentParam dataContentParam = JSON.parseObject(updDataMap.get("updData").get("value"), DataContentParam.class);
+ Long uptime = Long.valueOf(String.valueOf(updDataMap.get("updData").get("time")));
+ if (StringUtils.isEmpty(dataReportParam.getDeviceName())) {
+ responseData.setCode(200);
+ responseData.setMessage("没有设备编号");
+ return responseData;
+ }
+ normalDataProcessor.normalDataProvider(dataContentParam, uptime, dataReportParam.getDeviceName());
responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
} catch (DataAccessException sqlex) {
responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
responseData.setMessage("请求数据异常");
responseData.setSuccess(true);
- log.error("主题:数据心跳出现错误,异常信息为{}", sqlex);
+ log.error("主题:设备数据上报出现错误,异常信息为{}", sqlex);
}
return responseData;
}
diff --git a/src/main/java/com/casic/service/impl/NormalDataProcessor.java b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
new file mode 100644
index 0000000..3f7630a
--- /dev/null
+++ b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
@@ -0,0 +1,164 @@
+package com.casic.service.impl;
+
+import com.alibaba.druid.util.StringUtils;
+import com.casic.dao.AlarmRecordsMapper;
+import com.casic.dao.DataGasMapper;
+import com.casic.dao.impl.AlarmJobDao;
+import com.casic.entity.AlarmJob;
+import com.casic.entity.AlarmRecords;
+import com.casic.entity.DataGasDector;
+import com.casic.model.DataContentParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+import xyz.downgoon.snowflake.Snowflake;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class NormalDataProcessor {
+
+ public static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd");
+
+ @Value("${casic.device.gas-dector.type}")
+ private Long deviceType;
+ @Value("${casic.device.gas-dector.minutes}")
+ private String minutes;
+ @Value("${casic.device.gas-dector.enable-local}")
+ private Boolean enableLocal;
+ @Resource
+ private DataGasMapper dataGasMapper;
+ @Autowired
+ private AlarmJobDao alarmJobDao;
+ @Resource
+ private AlarmRecordsMapper alarmRecordsMapper;
+ private static Snowflake snowflake = new Snowflake(0, 2);
+
+ public void normalDataProvider(DataContentParam dataReportParam, Long timeStamp, String devcode) {
+ Map gasMap = dataGasMapper.getWellCode(devcode);
+ if (ObjectUtils.isEmpty(gasMap)) {
+ log.info("没有该设备编号录入" + devcode);
+ if (enableLocal) {
+ return;
+ }
+ }
+ Boolean updateFlag = false;
+ if (ObjectUtils.isEmpty(dataGasMapper.getLastData(minutes, devcode))) {
+ updateFlag = this.saveNormalData(dataReportParam, timeStamp, devcode, gasMap);
+ }
+ this.dataTaskJudge(dataReportParam, devcode, timeStamp, gasMap, updateFlag);
+ return;
+ }
+
+ /**
+ * 自定义时间存库
+ *
+ * @param dataReportParam
+ * @param timeStamp
+ * @param devcode
+ * @param gasMap
+ */
+ private Boolean saveNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap) {
+ Boolean updateFlag = false;
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ List dataReportFilter = dataReportParam.getRtd_val().stream().filter(
+ data -> {
+ return data != -1;
+ }
+ ).collect(Collectors.toList());
+ if (dataReportFilter.size() > 0 && dataReportFilter.get(dataReportFilter.size() - 1) != 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 1);
+ updateFlag = true;
+ } else if (dataReportFilter.get(dataReportFilter.size() - 1) == 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 0);
+ }
+ dataReportFilter.forEach(
+ data -> {
+ if (data != 65535) {
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+ }
+ );
+ return updateFlag;
+ }
+
+ /**
+ * 报警就存库
+ *
+ * @param dataReportParam
+ * @param devcode
+ * @param timeStamp
+ * @param gasMap
+ */
+ private void dataTaskJudge(DataContentParam dataReportParam, String devcode, Long timeStamp, Map gasMap, Boolean updateFlag) {
+ List> alarmLevelList = dataGasMapper.getAlarmLevelList(deviceType);
+ String wellCode = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "";
+ Long deviceId = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? Long.valueOf(String.valueOf(gasMap.get("deviceId"))) : -1;
+ final String gasMsgContent=dataGasMapper.getGasMsgContent(deviceType);
+ dataReportParam.getRtd_val().stream().filter(
+ dataReport -> {
+ return dataReport != -1 && dataReport != 65535;
+ }
+ ).forEach(
+ dataReport -> {
+ for (Map alarmLevelMap : alarmLevelList) {
+ if (dataReport > Float.valueOf(String.valueOf(alarmLevelMap.get("high_value")))) {
+ AlarmRecords alarmRecord = new AlarmRecords();
+ alarmRecord.setId(snowflake.nextId());
+ alarmRecord.setDeviceId(deviceId);
+ alarmRecord.setDevcode(devcode);
+ alarmRecord.setWellCode(wellCode);
+ alarmRecord.setAlarmType("1"); // 业务报警
+ alarmRecord.setAlarmContent("燃气报警");
+ alarmRecord.setAlarmValue(String.valueOf(dataReport));
+ alarmRecord.setAlarmTime(new Date());
+ alarmRecord.setStatus("1");
+ alarmRecord.setAlarmLevel(Integer.valueOf(alarmLevelMap.get("level").toString()));
+ alarmRecord.setAlarmMessage("燃气报警");
+ String jobId = alarmRecordsMapper.isOldAlarmRecord(devcode, "燃气报警");
+ // 超出报警阈值 生成一条报警消息
+ if (!StringUtils.isEmpty(jobId)) {
+ alarmRecordsMapper.updateOldAlarmRecord(devcode, "燃气报警");
+ alarmRecord.setJobId(Long.valueOf(jobId));
+ } else {
+ AlarmJob alarmJob = alarmJobDao.saveData(devcode, wellCode, "RQZD", "1");
+ alarmRecord.setJobId(alarmJob.getId());
+ }
+ alarmRecordsMapper.insert(alarmRecord);
+ if (!updateFlag) {
+ alarmNormalData(dataReportParam, timeStamp, devcode, gasMap, dataReport);
+ }
+ break;
+ }
+ }
+ }
+ );
+ }
+
+ private void alarmNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap, Integer data) {
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+
+}
+
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index fac2afe..f8a06a6 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,40 +1,19 @@
server:
- port: 11556
+ port: 11320
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
- username: root
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell_zq_cs
+ username: postgres
password: Casic203
session:
store-type: redis
- redis:
- host: 111.198.10.15
- port: 11412
- password: ew5T4K3#203lwh
- redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
jms:
pub-sub-domain: true
- # session:
- # store-type: redis
- activemq:
- user:
- password:
- broker-url: tcp://192.168.0.203:61616
-#flowable数据源和多数据源配置
-casic:
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- #kaptcha-open: false #是否开启登录时验证码 (true/false)
- no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
- db:
- init:
- enable: false
- file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
- spring-session-open: false #开启spring session
logging:
level.root: error
- level.com.casic: error
+ level.com.casic: info
file:
path: logs/
name: missiles.log
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 86411e6..ffc01e9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -19,18 +19,11 @@
mapper-locations: classpath:mapper/*.xml
#mybatis-plus:
# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
-################### mybatis-plus配置 ###################
-################### casic配置 ###################
-flowable:
- checkProcessDefinitions: false #不校验process文件
casic:
- swagger-open: false #是否开启swagger (true/false)
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- muti-datasource-open: false #是否开启多数据源(true/false)
- spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
- session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
- session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
- extUrl: sys
- config:
- export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
- config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
+ device:
+ gas-dector:
+ type: 101
+ minutes: 60
+ enable-local: false
+# type 可燃气体的设备类型
+# minutes: 燃气外协设备上传数据的分钟数
\ No newline at end of file
diff --git a/target/classes/application-dev.yml b/target/classes/application-dev.yml
new file mode 100644
index 0000000..fac2afe
--- /dev/null
+++ b/target/classes/application-dev.yml
@@ -0,0 +1,40 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
+ username: root
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+logging:
+ level.root: error
+ level.com.casic: error
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/target/classes/application-postgre.yml b/target/classes/application-postgre.yml
new file mode 100644
index 0000000..2b7f69c
--- /dev/null
+++ b/target/classes/application-postgre.yml
@@ -0,0 +1,62 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell
+ username: postgres
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ redis-config:
+ host: 127.0.0.1
+ port: 6379
+ password:
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+smartcity:
+ config:
+ export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+ #export-path: D:\export\
+ image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\
+ config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\
+ download-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\download\
+ device:
+ redis:
+ invalid-time: 86400
+ host: 127.0.0.1
+ port: 6379
+ password: ew5T4K3#203lwh
+ config-prefix: 'Casic:'
+ getui:
+ appId: H9jSTE2bAt8QWq2K2GNOB3
+ appKey: bhPeCutJVdAyOasevQFtN9
+ masterSecret: lChudND74A89WRiHLkedb5
+logging:
+ level.root: info
+ level.com.casic: info
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/target/classes/application.yml b/target/classes/application.yml
new file mode 100644
index 0000000..86411e6
--- /dev/null
+++ b/target/classes/application.yml
@@ -0,0 +1,36 @@
+##########################################################
+################## 所有profile共有的配置 #################
+##########################################################
+spring:
+ profiles:
+ active: dev
+ servlet:
+ multipart:
+ max-file-size: 50MB
+ max-request-size: 80MB
+mybatis-plus:
+ global-config:
+ enable-sql-runner: true
+ configuration:
+ # 配置结果集属性为空时 是否映射返回结果
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
+ mapper-locations: classpath:mapper/*.xml
+mybatis:
+ mapper-locations: classpath:mapper/*.xml
+#mybatis-plus:
+# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
+################### mybatis-plus配置 ###################
+################### casic配置 ###################
+flowable:
+ checkProcessDefinitions: false #不校验process文件
+casic:
+ swagger-open: false #是否开启swagger (true/false)
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ muti-datasource-open: false #是否开启多数据源(true/false)
+ spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
+ session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
+ session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
+ extUrl: sys
+ config:
+ export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+ config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
diff --git a/target/classes/com/casic/CasicApplication.class b/target/classes/com/casic/CasicApplication.class
new file mode 100644
index 0000000..68c2f95
--- /dev/null
+++ b/target/classes/com/casic/CasicApplication.class
Binary files differ
diff --git a/target/classes/com/casic/controller/DeviceController.class b/target/classes/com/casic/controller/DeviceController.class
new file mode 100644
index 0000000..478d6ae
--- /dev/null
+++ b/target/classes/com/casic/controller/DeviceController.class
Binary files differ
diff --git a/target/classes/com/casic/controller/DeviceDataController.class b/target/classes/com/casic/controller/DeviceDataController.class
new file mode 100644
index 0000000..1f4400c
--- /dev/null
+++ b/target/classes/com/casic/controller/DeviceDataController.class
Binary files differ
diff --git a/target/classes/com/casic/dao/DataGasMapper.class b/target/classes/com/casic/dao/DataGasMapper.class
new file mode 100644
index 0000000..557d539
--- /dev/null
+++ b/target/classes/com/casic/dao/DataGasMapper.class
Binary files differ
diff --git a/target/classes/com/casic/dao/DeviceMapper.class b/target/classes/com/casic/dao/DeviceMapper.class
new file mode 100644
index 0000000..3ddcd2b
--- /dev/null
+++ b/target/classes/com/casic/dao/DeviceMapper.class
Binary files differ
diff --git a/target/classes/com/casic/dao/impl/DeviceDataMapper.class b/target/classes/com/casic/dao/impl/DeviceDataMapper.class
new file mode 100644
index 0000000..d73ed15
--- /dev/null
+++ b/target/classes/com/casic/dao/impl/DeviceDataMapper.class
Binary files differ
diff --git a/target/classes/com/casic/entity/DataGasReport.class b/target/classes/com/casic/entity/DataGasReport.class
new file mode 100644
index 0000000..a3dac78
--- /dev/null
+++ b/target/classes/com/casic/entity/DataGasReport.class
Binary files differ
diff --git a/target/classes/com/casic/model/DataReportParam.class b/target/classes/com/casic/model/DataReportParam.class
new file mode 100644
index 0000000..284c4f6
--- /dev/null
+++ b/target/classes/com/casic/model/DataReportParam.class
Binary files differ
diff --git a/target/classes/com/casic/model/DeviceOnlineParam.class b/target/classes/com/casic/model/DeviceOnlineParam.class
new file mode 100644
index 0000000..33c83e2
--- /dev/null
+++ b/target/classes/com/casic/model/DeviceOnlineParam.class
Binary files differ
diff --git a/target/classes/com/casic/model/HeartbeatParam.class b/target/classes/com/casic/model/HeartbeatParam.class
new file mode 100644
index 0000000..d6d6651
--- /dev/null
+++ b/target/classes/com/casic/model/HeartbeatParam.class
Binary files differ
diff --git a/target/classes/com/casic/model/ResponseData.class b/target/classes/com/casic/model/ResponseData.class
new file mode 100644
index 0000000..9d5cab1
--- /dev/null
+++ b/target/classes/com/casic/model/ResponseData.class
Binary files differ
diff --git a/target/classes/com/casic/service/DeviceDataService.class b/target/classes/com/casic/service/DeviceDataService.class
new file mode 100644
index 0000000..0807bfb
--- /dev/null
+++ b/target/classes/com/casic/service/DeviceDataService.class
Binary files differ
diff --git a/target/classes/com/casic/service/DeviceService.class b/target/classes/com/casic/service/DeviceService.class
new file mode 100644
index 0000000..765368a
--- /dev/null
+++ b/target/classes/com/casic/service/DeviceService.class
Binary files differ
diff --git a/target/classes/com/casic/service/impl/DeviceDataServiceImpl.class b/target/classes/com/casic/service/impl/DeviceDataServiceImpl.class
new file mode 100644
index 0000000..afcd9eb
--- /dev/null
+++ b/target/classes/com/casic/service/impl/DeviceDataServiceImpl.class
Binary files differ
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..814888c
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,321 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ * 报警工单表
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_job")
+public class AlarmJob extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 工单编号
+ */
+ @TableField("JOBCODE")
+ private String jobcode;
+ /**
+ * 工单类型
+ */
+ @TableField("JOG_TYPE")
+ private String jobType;
+ /**
+ * 井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 工单创建时间
+ */
+ @TableField("CREATE_TIME")
+ private Date createTime;
+ /**
+ * 工单状态（0待处理，1待确认，2处理中，3完成）
+ */
+ @TableField("JOB_STATUS")
+ private String jobStatus;
+ /**
+ * 接单人员
+ */
+ @TableField("GET_JOB_PERSON")
+ private Long getJobPerson;
+ /**
+ * 接单时间
+ */
+ @TableField("GET_JOB_TIME")
+ private Date getJobTime;
+ /**
+ * 应接单时间
+ */
+ @TableField("SHOULD_GET_TIME")
+ private Date shouldGetTime;
+ /**
+ * 第一现场情况
+ */
+ @TableField("FIRST_STATE")
+ private String firstState;
+ /**
+ * 第一现场照片
+ */
+ @TableField("FIRST_STATE_PHOTOS")
+ private String firstStatePhotos;
+ /**
+ * 确认人员
+ */
+ @TableField("CONFIRM_JOB_PERSON")
+ private Long confirmJobPerson;
+ /**
+ * 确认时间
+ */
+ @TableField("CONFRIM_JOB_TIME")
+ private Date confrimJobTime;
+ /**
+ * 处理人员
+ */
+ @TableField("HANDLE_JOB_Person")
+ private Long handleJobPerson;
+ /**
+ * 处理时间
+ */
+ @TableField("HANDLE_JOB_TIME")
+ private Date handleJobTime;
+ /**
+ * 维护情况记录
+ */
+ @TableField("HANDLE_MESSAGE")
+ private String handleMessage;
+ /**
+ * 维护图片
+ */
+ @TableField("HANDLE_PHOTOS")
+ private String handlePhotos;
+ /**
+ * 工单流转记录
+ */
+ @TableField("FLOW")
+ private String flow;
+
+ @TableField("JOB_BELONG_TO")
+ private Long jobBelongTo;
+
+ @TableField("JOB_FLAG_DELAY")
+ private String jobFlagDelay;
+
+ @TableField("JOB_FLAG_1")
+ private String jobFlag1;
+
+ @TableField(exist = false)
+ private String alarmValue;
+
+ @TableField(exist = false)
+ private String alarmContentName;
+
+ @TableField(exist = false)
+ private Integer recordId;
+
+ @Override
+ public String toString() {
+ return "AlarmJob{" +
+ "id=" + id +
+ ", jobcode=" + jobcode +
+ ", jogType=" + jobType +
+ ", wellCode=" + wellCode +
+ ", devcode=" + devcode +
+ ", createTime=" + createTime +
+ ", jobStatus=" + jobStatus +
+ ", getJobPerson=" + getJobPerson +
+ ", getJobTime=" + getJobTime +
+ ", firstState=" + firstState +
+ ", firstStatePhotos=" + firstStatePhotos +
+ ", confirmJobPerson=" + confirmJobPerson +
+ ", confrimJobTime=" + confrimJobTime +
+ ", handleJobPerson=" + handleJobPerson +
+ ", handleJobTime=" + handleJobTime +
+ ", handleMessage=" + handleMessage +
+ ", handlePhotos=" + handlePhotos +
+ ", flow=" + flow +
+ ", recordId=" + recordId +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/AlarmRecords.java b/src/main/java/com/casic/entity/AlarmRecords.java
new file mode 100644
index 0000000..88b0b26
--- /dev/null
+++ b/src/main/java/com/casic/entity/AlarmRecords.java
@@ -0,0 +1,108 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_records")
+public class AlarmRecords extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 设备ID
+ */
+ @TableField("DEVICE_ID")
+ private Long deviceId;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 闸井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 告警类型
+ */
+ @TableField("ALARM_TYPE")
+ private String alarmType;
+ /**
+ * 告警内容
+ */
+ @TableField("ALARM_CONTENT")
+ private String alarmContent;
+ /**
+ * 告警数值
+ */
+ @TableField("ALARM_VALUE")
+ private String alarmValue;
+ /**
+ * 告警等级
+ */
+ @TableField("ALARM_LEVEL")
+ private Integer alarmLevel;
+ /**
+ * 告警详情
+ */
+ @TableField("ALARM_MSG")
+ private String alarmMessage;
+ /**
+ * 告警时间
+ */
+ @TableField("ALARM_TIME")
+ private Date alarmTime;
+ /**
+ * 告警状态
+ */
+ @TableField("STATUS")
+ private String status;
+ /**
+ * 工单编号
+ */
+ @TableField("JOB_ID")
+ private Long jobId;
+
+ @TableField(exist = false)
+ private Integer jobStatus;
+
+ @Override
+ public String toString() {
+ return "AlarmRecords{" +
+ "id=" + id +
+ ", deviceId=" + deviceId +
+ ", devcode=" + devcode +
+ ", wellCode=" + wellCode +
+ ", alarmType=" + alarmType +
+ ", alarmContent=" + alarmContent +
+ ", alarmValue=" + alarmValue +
+ ", alarmLevel=" + alarmLevel +
+ ", alarmMessage=" + alarmMessage +
+ ", alarmTime=" + alarmTime +
+ ", status=" + status +
+ ", jobId=" + jobId +
+ ", jobStatus=" + jobStatus +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/DataGasDector.java b/src/main/java/com/casic/entity/DataGasDector.java
new file mode 100644
index 0000000..537789a
--- /dev/null
+++ b/src/main/java/com/casic/entity/DataGasDector.java
@@ -0,0 +1,42 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author cz
+ * @date 2022-7-1
+ */
+@Data
+@TableName("data_gas_dector")
+public class DataGasDector {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ private String devcode;
+ private String wellCode;
+ private String strength;
+
+ private String descn;
+ /**
+ * --信号与干扰加噪声比
+ */
+ private String sinr;
+ /**
+ * --参考信号接收功率
+ */
+ private String rsrp;
+ /**
+ * --物理小区标识
+ */
+ private String pci;
+ private Date uptime;
+ private Date logtime;
+}
diff --git a/src/main/java/com/casic/entity/DataGasReport.java b/src/main/java/com/casic/entity/DataGasReport.java
deleted file mode 100644
index c43ccdf..0000000
--- a/src/main/java/com/casic/entity/DataGasReport.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.casic.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author cz
- * @date 2022-7-1
- */
-@Data
-@TableName("data_gas_dector")
-public class DataGasReport {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @TableField("devcode")
- private String imei;
- private String wellcode;
-
- private String imsi;
- /**
- * --事件类型 0正常 1低报 2高报
- */
- private String gasSensorState;
- /**
- * --浓度值
- */
- private String gasSampleValue;
- /**
- * --信号与干扰加噪声比
- */
- private String sinr;
- /**
- * --参考信号接收功率
- */
- private String rsrp;
- /**
- * --物理小区标识
- */
- private String pci;
- /**
- * --心跳周期
- */
- private String heartbeatTime;
-
- /**
- * --小区位置信息
- */
- private String cellId;
- /**
- * --电池电压
- */
- private String batteryVoltage;
- /**
- * --电池电量
- */
- private String batteryValue;
- private String iccid;
- private Date uptime;
- private Date logtime;
-}
diff --git a/src/main/java/com/casic/entity/DeviceSatatus.java b/src/main/java/com/casic/entity/DeviceSatatus.java
new file mode 100644
index 0000000..bab7903
--- /dev/null
+++ b/src/main/java/com/casic/entity/DeviceSatatus.java
@@ -0,0 +1,19 @@
+package com.casic.entity;
+
+import lombok.Data;
+
+/**
+ * 不使用了
+ *
+ */
+@Data
+public class DeviceSatatus {
+ private String deviceId;
+ private String cell;
+ private String cellTs;
+ private String onlineState;
+ private String onlineTs;
+ private String lastDataId;
+ private String lastDataJson;
+ private String lastDataTs;
+}
diff --git a/src/main/java/com/casic/model/DataContentParam.java b/src/main/java/com/casic/model/DataContentParam.java
new file mode 100644
index 0000000..46d298a
--- /dev/null
+++ b/src/main/java/com/casic/model/DataContentParam.java
@@ -0,0 +1,19 @@
+package com.casic.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DataContentParam {
+ private String msg_type;
+ private String error_val;
+ private String ch_cnt;
+ private String erro_cnt;
+ private String alarm_low_cnt;
+ private String alarm_high_cnt;
+ private String offline_cnt;
+ private List rtd_val;
+ private List adc_val;
+ private List status_val;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/DataReportParam.java b/src/main/java/com/casic/model/DataReportParam.java
index 082814c..754f330 100644
--- a/src/main/java/com/casic/model/DataReportParam.java
+++ b/src/main/java/com/casic/model/DataReportParam.java
@@ -11,25 +11,12 @@
*/
@Data
public class DataReportParam {
- private String upPacketSN;
- private String upDataSN;
- private String topic;
- private String timestamp;
- private String tenantId;
- private String serviceId;
- private String protocol;
- private String productId;
- /**
- * gas_sensor_state = 1, --事件类型 0 正常 1 低报 2 高报
- * gas_sample_value = 11-- 浓度值
- */
- private Map payload;
- private String messageType;
private String deviceType;
- private String deviceId;
- private String assocAssetId;
- @JsonProperty(value = "IMSI", required = true)
- private String IMSI;
- @JsonProperty(value = "IMEI", required = true)
- private String IMEI;
+ private String iotId;
+ private String requestId;
+ private Object checkFailedData;
+ private String productKey;
+ private String gmtCreate;
+ private String deviceName;
+ private Object items;
}
diff --git a/src/main/java/com/casic/service/DeviceDataService.java b/src/main/java/com/casic/service/DeviceDataService.java
index d883fe4..457d710 100644
--- a/src/main/java/com/casic/service/DeviceDataService.java
+++ b/src/main/java/com/casic/service/DeviceDataService.java
@@ -3,25 +3,18 @@
import com.casic.model.DataReportParam;
import com.casic.model.HeartbeatParam;
import com.casic.model.ResponseData;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* @author cz
* @date 2022
*/
public interface DeviceDataService {
-
/**
*
* @param dataReportParam
* @return
*/
- ResponseData DeviceDataCommit(DataReportParam dataReportParam);
-
- /**
- *
- * @param heartbeatParam
- * @return
- */
- ResponseData heartBeatSave(HeartbeatParam heartbeatParam);
+ ResponseData gasReceiver(DataReportParam dataReportParam);
}
diff --git a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
index 93f0685..e473f0c 100644
--- a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
+++ b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
@@ -1,58 +1,49 @@
package com.casic.service.impl;
-import com.casic.dao.impl.DeviceDataMapper;
+import com.alibaba.druid.util.StringUtils;
+import com.alibaba.fastjson.JSON;
import com.casic.model.*;
import com.casic.service.DeviceDataService;
+import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.stereotype.Service;
+import java.util.Map;
+
/**
* @author cz
- * @date 2022-6-20
+ * @date 2022-9-26
*/
@Slf4j
@Service
public class DeviceDataServiceImpl implements DeviceDataService {
- @Autowired
- DeviceDataMapper deviceDataMapper;
+ private final NormalDataProcessor normalDataProcessor;
- /**
- * @param dataReportParam
- * @return
- */
- public ResponseData DeviceDataCommit(DataReportParam dataReportParam) {
- ResponseData responseData = new ResponseData();
- try {
- deviceDataMapper.addDeviceData(dataReportParam);
- responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
- responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
- } catch (DataAccessException sqlex) {
- responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
- responseData.setMessage("请求数据异常");
- responseData.setSuccess(true);
- log.error("主题:数据上报保存出现错误,异常信息为{}", sqlex);
- }
- return responseData;
+ public DeviceDataServiceImpl(NormalDataProcessor normalDataProcessor) {
+ this.normalDataProcessor = normalDataProcessor;
}
- /**
- * @param heartbeatParam
- * @return
- */
- public ResponseData heartBeatSave(HeartbeatParam heartbeatParam) {
+ public ResponseData gasReceiver(DataReportParam dataReportParam) {
ResponseData responseData = new ResponseData();
try {
- deviceDataMapper.editDeviceData(heartbeatParam);
+ Map> updDataMap = new ObjectMapper().convertValue(dataReportParam.getItems(), Map.class);
+ DataContentParam dataContentParam = JSON.parseObject(updDataMap.get("updData").get("value"), DataContentParam.class);
+ Long uptime = Long.valueOf(String.valueOf(updDataMap.get("updData").get("time")));
+ if (StringUtils.isEmpty(dataReportParam.getDeviceName())) {
+ responseData.setCode(200);
+ responseData.setMessage("没有设备编号");
+ return responseData;
+ }
+ normalDataProcessor.normalDataProvider(dataContentParam, uptime, dataReportParam.getDeviceName());
responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
} catch (DataAccessException sqlex) {
responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
responseData.setMessage("请求数据异常");
responseData.setSuccess(true);
- log.error("主题:数据心跳出现错误,异常信息为{}", sqlex);
+ log.error("主题:设备数据上报出现错误,异常信息为{}", sqlex);
}
return responseData;
}
diff --git a/src/main/java/com/casic/service/impl/NormalDataProcessor.java b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
new file mode 100644
index 0000000..3f7630a
--- /dev/null
+++ b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
@@ -0,0 +1,164 @@
+package com.casic.service.impl;
+
+import com.alibaba.druid.util.StringUtils;
+import com.casic.dao.AlarmRecordsMapper;
+import com.casic.dao.DataGasMapper;
+import com.casic.dao.impl.AlarmJobDao;
+import com.casic.entity.AlarmJob;
+import com.casic.entity.AlarmRecords;
+import com.casic.entity.DataGasDector;
+import com.casic.model.DataContentParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+import xyz.downgoon.snowflake.Snowflake;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class NormalDataProcessor {
+
+ public static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd");
+
+ @Value("${casic.device.gas-dector.type}")
+ private Long deviceType;
+ @Value("${casic.device.gas-dector.minutes}")
+ private String minutes;
+ @Value("${casic.device.gas-dector.enable-local}")
+ private Boolean enableLocal;
+ @Resource
+ private DataGasMapper dataGasMapper;
+ @Autowired
+ private AlarmJobDao alarmJobDao;
+ @Resource
+ private AlarmRecordsMapper alarmRecordsMapper;
+ private static Snowflake snowflake = new Snowflake(0, 2);
+
+ public void normalDataProvider(DataContentParam dataReportParam, Long timeStamp, String devcode) {
+ Map gasMap = dataGasMapper.getWellCode(devcode);
+ if (ObjectUtils.isEmpty(gasMap)) {
+ log.info("没有该设备编号录入" + devcode);
+ if (enableLocal) {
+ return;
+ }
+ }
+ Boolean updateFlag = false;
+ if (ObjectUtils.isEmpty(dataGasMapper.getLastData(minutes, devcode))) {
+ updateFlag = this.saveNormalData(dataReportParam, timeStamp, devcode, gasMap);
+ }
+ this.dataTaskJudge(dataReportParam, devcode, timeStamp, gasMap, updateFlag);
+ return;
+ }
+
+ /**
+ * 自定义时间存库
+ *
+ * @param dataReportParam
+ * @param timeStamp
+ * @param devcode
+ * @param gasMap
+ */
+ private Boolean saveNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap) {
+ Boolean updateFlag = false;
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ List dataReportFilter = dataReportParam.getRtd_val().stream().filter(
+ data -> {
+ return data != -1;
+ }
+ ).collect(Collectors.toList());
+ if (dataReportFilter.size() > 0 && dataReportFilter.get(dataReportFilter.size() - 1) != 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 1);
+ updateFlag = true;
+ } else if (dataReportFilter.get(dataReportFilter.size() - 1) == 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 0);
+ }
+ dataReportFilter.forEach(
+ data -> {
+ if (data != 65535) {
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+ }
+ );
+ return updateFlag;
+ }
+
+ /**
+ * 报警就存库
+ *
+ * @param dataReportParam
+ * @param devcode
+ * @param timeStamp
+ * @param gasMap
+ */
+ private void dataTaskJudge(DataContentParam dataReportParam, String devcode, Long timeStamp, Map gasMap, Boolean updateFlag) {
+ List> alarmLevelList = dataGasMapper.getAlarmLevelList(deviceType);
+ String wellCode = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "";
+ Long deviceId = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? Long.valueOf(String.valueOf(gasMap.get("deviceId"))) : -1;
+ final String gasMsgContent=dataGasMapper.getGasMsgContent(deviceType);
+ dataReportParam.getRtd_val().stream().filter(
+ dataReport -> {
+ return dataReport != -1 && dataReport != 65535;
+ }
+ ).forEach(
+ dataReport -> {
+ for (Map alarmLevelMap : alarmLevelList) {
+ if (dataReport > Float.valueOf(String.valueOf(alarmLevelMap.get("high_value")))) {
+ AlarmRecords alarmRecord = new AlarmRecords();
+ alarmRecord.setId(snowflake.nextId());
+ alarmRecord.setDeviceId(deviceId);
+ alarmRecord.setDevcode(devcode);
+ alarmRecord.setWellCode(wellCode);
+ alarmRecord.setAlarmType("1"); // 业务报警
+ alarmRecord.setAlarmContent("燃气报警");
+ alarmRecord.setAlarmValue(String.valueOf(dataReport));
+ alarmRecord.setAlarmTime(new Date());
+ alarmRecord.setStatus("1");
+ alarmRecord.setAlarmLevel(Integer.valueOf(alarmLevelMap.get("level").toString()));
+ alarmRecord.setAlarmMessage("燃气报警");
+ String jobId = alarmRecordsMapper.isOldAlarmRecord(devcode, "燃气报警");
+ // 超出报警阈值 生成一条报警消息
+ if (!StringUtils.isEmpty(jobId)) {
+ alarmRecordsMapper.updateOldAlarmRecord(devcode, "燃气报警");
+ alarmRecord.setJobId(Long.valueOf(jobId));
+ } else {
+ AlarmJob alarmJob = alarmJobDao.saveData(devcode, wellCode, "RQZD", "1");
+ alarmRecord.setJobId(alarmJob.getId());
+ }
+ alarmRecordsMapper.insert(alarmRecord);
+ if (!updateFlag) {
+ alarmNormalData(dataReportParam, timeStamp, devcode, gasMap, dataReport);
+ }
+ break;
+ }
+ }
+ }
+ );
+ }
+
+ private void alarmNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap, Integer data) {
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+
+}
+
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index fac2afe..f8a06a6 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,40 +1,19 @@
server:
- port: 11556
+ port: 11320
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
- username: root
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell_zq_cs
+ username: postgres
password: Casic203
session:
store-type: redis
- redis:
- host: 111.198.10.15
- port: 11412
- password: ew5T4K3#203lwh
- redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
jms:
pub-sub-domain: true
- # session:
- # store-type: redis
- activemq:
- user:
- password:
- broker-url: tcp://192.168.0.203:61616
-#flowable数据源和多数据源配置
-casic:
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- #kaptcha-open: false #是否开启登录时验证码 (true/false)
- no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
- db:
- init:
- enable: false
- file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
- spring-session-open: false #开启spring session
logging:
level.root: error
- level.com.casic: error
+ level.com.casic: info
file:
path: logs/
name: missiles.log
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 86411e6..ffc01e9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -19,18 +19,11 @@
mapper-locations: classpath:mapper/*.xml
#mybatis-plus:
# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
-################### mybatis-plus配置 ###################
-################### casic配置 ###################
-flowable:
- checkProcessDefinitions: false #不校验process文件
casic:
- swagger-open: false #是否开启swagger (true/false)
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- muti-datasource-open: false #是否开启多数据源(true/false)
- spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
- session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
- session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
- extUrl: sys
- config:
- export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
- config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
+ device:
+ gas-dector:
+ type: 101
+ minutes: 60
+ enable-local: false
+# type 可燃气体的设备类型
+# minutes: 燃气外协设备上传数据的分钟数
\ No newline at end of file
diff --git a/target/classes/application-dev.yml b/target/classes/application-dev.yml
new file mode 100644
index 0000000..fac2afe
--- /dev/null
+++ b/target/classes/application-dev.yml
@@ -0,0 +1,40 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
+ username: root
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+logging:
+ level.root: error
+ level.com.casic: error
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/target/classes/application-postgre.yml b/target/classes/application-postgre.yml
new file mode 100644
index 0000000..2b7f69c
--- /dev/null
+++ b/target/classes/application-postgre.yml
@@ -0,0 +1,62 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell
+ username: postgres
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ redis-config:
+ host: 127.0.0.1
+ port: 6379
+ password:
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+smartcity:
+ config:
+ export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+ #export-path: D:\export\
+ image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\
+ config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\
+ download-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\download\
+ device:
+ redis:
+ invalid-time: 86400
+ host: 127.0.0.1
+ port: 6379
+ password: ew5T4K3#203lwh
+ config-prefix: 'Casic:'
+ getui:
+ appId: H9jSTE2bAt8QWq2K2GNOB3
+ appKey: bhPeCutJVdAyOasevQFtN9
+ masterSecret: lChudND74A89WRiHLkedb5
+logging:
+ level.root: info
+ level.com.casic: info
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/target/classes/application.yml b/target/classes/application.yml
new file mode 100644
index 0000000..86411e6
--- /dev/null
+++ b/target/classes/application.yml
@@ -0,0 +1,36 @@
+##########################################################
+################## 所有profile共有的配置 #################
+##########################################################
+spring:
+ profiles:
+ active: dev
+ servlet:
+ multipart:
+ max-file-size: 50MB
+ max-request-size: 80MB
+mybatis-plus:
+ global-config:
+ enable-sql-runner: true
+ configuration:
+ # 配置结果集属性为空时 是否映射返回结果
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
+ mapper-locations: classpath:mapper/*.xml
+mybatis:
+ mapper-locations: classpath:mapper/*.xml
+#mybatis-plus:
+# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
+################### mybatis-plus配置 ###################
+################### casic配置 ###################
+flowable:
+ checkProcessDefinitions: false #不校验process文件
+casic:
+ swagger-open: false #是否开启swagger (true/false)
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ muti-datasource-open: false #是否开启多数据源(true/false)
+ spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
+ session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
+ session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
+ extUrl: sys
+ config:
+ export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+ config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
diff --git a/target/classes/com/casic/CasicApplication.class b/target/classes/com/casic/CasicApplication.class
new file mode 100644
index 0000000..68c2f95
--- /dev/null
+++ b/target/classes/com/casic/CasicApplication.class
Binary files differ
diff --git a/target/classes/com/casic/controller/DeviceController.class b/target/classes/com/casic/controller/DeviceController.class
new file mode 100644
index 0000000..478d6ae
--- /dev/null
+++ b/target/classes/com/casic/controller/DeviceController.class
Binary files differ
diff --git a/target/classes/com/casic/controller/DeviceDataController.class b/target/classes/com/casic/controller/DeviceDataController.class
new file mode 100644
index 0000000..1f4400c
--- /dev/null
+++ b/target/classes/com/casic/controller/DeviceDataController.class
Binary files differ
diff --git a/target/classes/com/casic/dao/DataGasMapper.class b/target/classes/com/casic/dao/DataGasMapper.class
new file mode 100644
index 0000000..557d539
--- /dev/null
+++ b/target/classes/com/casic/dao/DataGasMapper.class
Binary files differ
diff --git a/target/classes/com/casic/dao/DeviceMapper.class b/target/classes/com/casic/dao/DeviceMapper.class
new file mode 100644
index 0000000..3ddcd2b
--- /dev/null
+++ b/target/classes/com/casic/dao/DeviceMapper.class
Binary files differ
diff --git a/target/classes/com/casic/dao/impl/DeviceDataMapper.class b/target/classes/com/casic/dao/impl/DeviceDataMapper.class
new file mode 100644
index 0000000..d73ed15
--- /dev/null
+++ b/target/classes/com/casic/dao/impl/DeviceDataMapper.class
Binary files differ
diff --git a/target/classes/com/casic/entity/DataGasReport.class b/target/classes/com/casic/entity/DataGasReport.class
new file mode 100644
index 0000000..a3dac78
--- /dev/null
+++ b/target/classes/com/casic/entity/DataGasReport.class
Binary files differ
diff --git a/target/classes/com/casic/model/DataReportParam.class b/target/classes/com/casic/model/DataReportParam.class
new file mode 100644
index 0000000..284c4f6
--- /dev/null
+++ b/target/classes/com/casic/model/DataReportParam.class
Binary files differ
diff --git a/target/classes/com/casic/model/DeviceOnlineParam.class b/target/classes/com/casic/model/DeviceOnlineParam.class
new file mode 100644
index 0000000..33c83e2
--- /dev/null
+++ b/target/classes/com/casic/model/DeviceOnlineParam.class
Binary files differ
diff --git a/target/classes/com/casic/model/HeartbeatParam.class b/target/classes/com/casic/model/HeartbeatParam.class
new file mode 100644
index 0000000..d6d6651
--- /dev/null
+++ b/target/classes/com/casic/model/HeartbeatParam.class
Binary files differ
diff --git a/target/classes/com/casic/model/ResponseData.class b/target/classes/com/casic/model/ResponseData.class
new file mode 100644
index 0000000..9d5cab1
--- /dev/null
+++ b/target/classes/com/casic/model/ResponseData.class
Binary files differ
diff --git a/target/classes/com/casic/service/DeviceDataService.class b/target/classes/com/casic/service/DeviceDataService.class
new file mode 100644
index 0000000..0807bfb
--- /dev/null
+++ b/target/classes/com/casic/service/DeviceDataService.class
Binary files differ
diff --git a/target/classes/com/casic/service/DeviceService.class b/target/classes/com/casic/service/DeviceService.class
new file mode 100644
index 0000000..765368a
--- /dev/null
+++ b/target/classes/com/casic/service/DeviceService.class
Binary files differ
diff --git a/target/classes/com/casic/service/impl/DeviceDataServiceImpl.class b/target/classes/com/casic/service/impl/DeviceDataServiceImpl.class
new file mode 100644
index 0000000..afcd9eb
--- /dev/null
+++ b/target/classes/com/casic/service/impl/DeviceDataServiceImpl.class
Binary files differ
diff --git a/target/classes/com/casic/service/impl/DeviceServiceImpl.class b/target/classes/com/casic/service/impl/DeviceServiceImpl.class
new file mode 100644
index 0000000..4ef6b15
--- /dev/null
+++ b/target/classes/com/casic/service/impl/DeviceServiceImpl.class
Binary files differ
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..814888c
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,321 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ * 报警工单表
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_job")
+public class AlarmJob extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 工单编号
+ */
+ @TableField("JOBCODE")
+ private String jobcode;
+ /**
+ * 工单类型
+ */
+ @TableField("JOG_TYPE")
+ private String jobType;
+ /**
+ * 井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 工单创建时间
+ */
+ @TableField("CREATE_TIME")
+ private Date createTime;
+ /**
+ * 工单状态（0待处理，1待确认，2处理中，3完成）
+ */
+ @TableField("JOB_STATUS")
+ private String jobStatus;
+ /**
+ * 接单人员
+ */
+ @TableField("GET_JOB_PERSON")
+ private Long getJobPerson;
+ /**
+ * 接单时间
+ */
+ @TableField("GET_JOB_TIME")
+ private Date getJobTime;
+ /**
+ * 应接单时间
+ */
+ @TableField("SHOULD_GET_TIME")
+ private Date shouldGetTime;
+ /**
+ * 第一现场情况
+ */
+ @TableField("FIRST_STATE")
+ private String firstState;
+ /**
+ * 第一现场照片
+ */
+ @TableField("FIRST_STATE_PHOTOS")
+ private String firstStatePhotos;
+ /**
+ * 确认人员
+ */
+ @TableField("CONFIRM_JOB_PERSON")
+ private Long confirmJobPerson;
+ /**
+ * 确认时间
+ */
+ @TableField("CONFRIM_JOB_TIME")
+ private Date confrimJobTime;
+ /**
+ * 处理人员
+ */
+ @TableField("HANDLE_JOB_Person")
+ private Long handleJobPerson;
+ /**
+ * 处理时间
+ */
+ @TableField("HANDLE_JOB_TIME")
+ private Date handleJobTime;
+ /**
+ * 维护情况记录
+ */
+ @TableField("HANDLE_MESSAGE")
+ private String handleMessage;
+ /**
+ * 维护图片
+ */
+ @TableField("HANDLE_PHOTOS")
+ private String handlePhotos;
+ /**
+ * 工单流转记录
+ */
+ @TableField("FLOW")
+ private String flow;
+
+ @TableField("JOB_BELONG_TO")
+ private Long jobBelongTo;
+
+ @TableField("JOB_FLAG_DELAY")
+ private String jobFlagDelay;
+
+ @TableField("JOB_FLAG_1")
+ private String jobFlag1;
+
+ @TableField(exist = false)
+ private String alarmValue;
+
+ @TableField(exist = false)
+ private String alarmContentName;
+
+ @TableField(exist = false)
+ private Integer recordId;
+
+ @Override
+ public String toString() {
+ return "AlarmJob{" +
+ "id=" + id +
+ ", jobcode=" + jobcode +
+ ", jogType=" + jobType +
+ ", wellCode=" + wellCode +
+ ", devcode=" + devcode +
+ ", createTime=" + createTime +
+ ", jobStatus=" + jobStatus +
+ ", getJobPerson=" + getJobPerson +
+ ", getJobTime=" + getJobTime +
+ ", firstState=" + firstState +
+ ", firstStatePhotos=" + firstStatePhotos +
+ ", confirmJobPerson=" + confirmJobPerson +
+ ", confrimJobTime=" + confrimJobTime +
+ ", handleJobPerson=" + handleJobPerson +
+ ", handleJobTime=" + handleJobTime +
+ ", handleMessage=" + handleMessage +
+ ", handlePhotos=" + handlePhotos +
+ ", flow=" + flow +
+ ", recordId=" + recordId +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/AlarmRecords.java b/src/main/java/com/casic/entity/AlarmRecords.java
new file mode 100644
index 0000000..88b0b26
--- /dev/null
+++ b/src/main/java/com/casic/entity/AlarmRecords.java
@@ -0,0 +1,108 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author casic123
+ * @since 2019-05-17
+ */
+@Data
+@TableName("alarm_records")
+public class AlarmRecords extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id")
+ private Long id;
+ /**
+ * 设备ID
+ */
+ @TableField("DEVICE_ID")
+ private Long deviceId;
+ /**
+ * 设备编号
+ */
+ @TableField("DEVCODE")
+ private String devcode;
+ /**
+ * 闸井编号
+ */
+ @TableField("WELL_CODE")
+ private String wellCode;
+ /**
+ * 告警类型
+ */
+ @TableField("ALARM_TYPE")
+ private String alarmType;
+ /**
+ * 告警内容
+ */
+ @TableField("ALARM_CONTENT")
+ private String alarmContent;
+ /**
+ * 告警数值
+ */
+ @TableField("ALARM_VALUE")
+ private String alarmValue;
+ /**
+ * 告警等级
+ */
+ @TableField("ALARM_LEVEL")
+ private Integer alarmLevel;
+ /**
+ * 告警详情
+ */
+ @TableField("ALARM_MSG")
+ private String alarmMessage;
+ /**
+ * 告警时间
+ */
+ @TableField("ALARM_TIME")
+ private Date alarmTime;
+ /**
+ * 告警状态
+ */
+ @TableField("STATUS")
+ private String status;
+ /**
+ * 工单编号
+ */
+ @TableField("JOB_ID")
+ private Long jobId;
+
+ @TableField(exist = false)
+ private Integer jobStatus;
+
+ @Override
+ public String toString() {
+ return "AlarmRecords{" +
+ "id=" + id +
+ ", deviceId=" + deviceId +
+ ", devcode=" + devcode +
+ ", wellCode=" + wellCode +
+ ", alarmType=" + alarmType +
+ ", alarmContent=" + alarmContent +
+ ", alarmValue=" + alarmValue +
+ ", alarmLevel=" + alarmLevel +
+ ", alarmMessage=" + alarmMessage +
+ ", alarmTime=" + alarmTime +
+ ", status=" + status +
+ ", jobId=" + jobId +
+ ", jobStatus=" + jobStatus +
+ "}";
+ }
+}
diff --git a/src/main/java/com/casic/entity/DataGasDector.java b/src/main/java/com/casic/entity/DataGasDector.java
new file mode 100644
index 0000000..537789a
--- /dev/null
+++ b/src/main/java/com/casic/entity/DataGasDector.java
@@ -0,0 +1,42 @@
+package com.casic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author cz
+ * @date 2022-7-1
+ */
+@Data
+@TableName("data_gas_dector")
+public class DataGasDector {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ private String devcode;
+ private String wellCode;
+ private String strength;
+
+ private String descn;
+ /**
+ * --信号与干扰加噪声比
+ */
+ private String sinr;
+ /**
+ * --参考信号接收功率
+ */
+ private String rsrp;
+ /**
+ * --物理小区标识
+ */
+ private String pci;
+ private Date uptime;
+ private Date logtime;
+}
diff --git a/src/main/java/com/casic/entity/DataGasReport.java b/src/main/java/com/casic/entity/DataGasReport.java
deleted file mode 100644
index c43ccdf..0000000
--- a/src/main/java/com/casic/entity/DataGasReport.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.casic.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author cz
- * @date 2022-7-1
- */
-@Data
-@TableName("data_gas_dector")
-public class DataGasReport {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @TableField("devcode")
- private String imei;
- private String wellcode;
-
- private String imsi;
- /**
- * --事件类型 0正常 1低报 2高报
- */
- private String gasSensorState;
- /**
- * --浓度值
- */
- private String gasSampleValue;
- /**
- * --信号与干扰加噪声比
- */
- private String sinr;
- /**
- * --参考信号接收功率
- */
- private String rsrp;
- /**
- * --物理小区标识
- */
- private String pci;
- /**
- * --心跳周期
- */
- private String heartbeatTime;
-
- /**
- * --小区位置信息
- */
- private String cellId;
- /**
- * --电池电压
- */
- private String batteryVoltage;
- /**
- * --电池电量
- */
- private String batteryValue;
- private String iccid;
- private Date uptime;
- private Date logtime;
-}
diff --git a/src/main/java/com/casic/entity/DeviceSatatus.java b/src/main/java/com/casic/entity/DeviceSatatus.java
new file mode 100644
index 0000000..bab7903
--- /dev/null
+++ b/src/main/java/com/casic/entity/DeviceSatatus.java
@@ -0,0 +1,19 @@
+package com.casic.entity;
+
+import lombok.Data;
+
+/**
+ * 不使用了
+ *
+ */
+@Data
+public class DeviceSatatus {
+ private String deviceId;
+ private String cell;
+ private String cellTs;
+ private String onlineState;
+ private String onlineTs;
+ private String lastDataId;
+ private String lastDataJson;
+ private String lastDataTs;
+}
diff --git a/src/main/java/com/casic/model/DataContentParam.java b/src/main/java/com/casic/model/DataContentParam.java
new file mode 100644
index 0000000..46d298a
--- /dev/null
+++ b/src/main/java/com/casic/model/DataContentParam.java
@@ -0,0 +1,19 @@
+package com.casic.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DataContentParam {
+ private String msg_type;
+ private String error_val;
+ private String ch_cnt;
+ private String erro_cnt;
+ private String alarm_low_cnt;
+ private String alarm_high_cnt;
+ private String offline_cnt;
+ private List rtd_val;
+ private List adc_val;
+ private List status_val;
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/model/DataReportParam.java b/src/main/java/com/casic/model/DataReportParam.java
index 082814c..754f330 100644
--- a/src/main/java/com/casic/model/DataReportParam.java
+++ b/src/main/java/com/casic/model/DataReportParam.java
@@ -11,25 +11,12 @@
*/
@Data
public class DataReportParam {
- private String upPacketSN;
- private String upDataSN;
- private String topic;
- private String timestamp;
- private String tenantId;
- private String serviceId;
- private String protocol;
- private String productId;
- /**
- * gas_sensor_state = 1, --事件类型 0 正常 1 低报 2 高报
- * gas_sample_value = 11-- 浓度值
- */
- private Map payload;
- private String messageType;
private String deviceType;
- private String deviceId;
- private String assocAssetId;
- @JsonProperty(value = "IMSI", required = true)
- private String IMSI;
- @JsonProperty(value = "IMEI", required = true)
- private String IMEI;
+ private String iotId;
+ private String requestId;
+ private Object checkFailedData;
+ private String productKey;
+ private String gmtCreate;
+ private String deviceName;
+ private Object items;
}
diff --git a/src/main/java/com/casic/service/DeviceDataService.java b/src/main/java/com/casic/service/DeviceDataService.java
index d883fe4..457d710 100644
--- a/src/main/java/com/casic/service/DeviceDataService.java
+++ b/src/main/java/com/casic/service/DeviceDataService.java
@@ -3,25 +3,18 @@
import com.casic.model.DataReportParam;
import com.casic.model.HeartbeatParam;
import com.casic.model.ResponseData;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* @author cz
* @date 2022
*/
public interface DeviceDataService {
-
/**
*
* @param dataReportParam
* @return
*/
- ResponseData DeviceDataCommit(DataReportParam dataReportParam);
-
- /**
- *
- * @param heartbeatParam
- * @return
- */
- ResponseData heartBeatSave(HeartbeatParam heartbeatParam);
+ ResponseData gasReceiver(DataReportParam dataReportParam);
}
diff --git a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
index 93f0685..e473f0c 100644
--- a/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
+++ b/src/main/java/com/casic/service/impl/DeviceDataServiceImpl.java
@@ -1,58 +1,49 @@
package com.casic.service.impl;
-import com.casic.dao.impl.DeviceDataMapper;
+import com.alibaba.druid.util.StringUtils;
+import com.alibaba.fastjson.JSON;
import com.casic.model.*;
import com.casic.service.DeviceDataService;
+import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.stereotype.Service;
+import java.util.Map;
+
/**
* @author cz
- * @date 2022-6-20
+ * @date 2022-9-26
*/
@Slf4j
@Service
public class DeviceDataServiceImpl implements DeviceDataService {
- @Autowired
- DeviceDataMapper deviceDataMapper;
+ private final NormalDataProcessor normalDataProcessor;
- /**
- * @param dataReportParam
- * @return
- */
- public ResponseData DeviceDataCommit(DataReportParam dataReportParam) {
- ResponseData responseData = new ResponseData();
- try {
- deviceDataMapper.addDeviceData(dataReportParam);
- responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
- responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
- } catch (DataAccessException sqlex) {
- responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
- responseData.setMessage("请求数据异常");
- responseData.setSuccess(true);
- log.error("主题:数据上报保存出现错误,异常信息为{}", sqlex);
- }
- return responseData;
+ public DeviceDataServiceImpl(NormalDataProcessor normalDataProcessor) {
+ this.normalDataProcessor = normalDataProcessor;
}
- /**
- * @param heartbeatParam
- * @return
- */
- public ResponseData heartBeatSave(HeartbeatParam heartbeatParam) {
+ public ResponseData gasReceiver(DataReportParam dataReportParam) {
ResponseData responseData = new ResponseData();
try {
- deviceDataMapper.editDeviceData(heartbeatParam);
+ Map> updDataMap = new ObjectMapper().convertValue(dataReportParam.getItems(), Map.class);
+ DataContentParam dataContentParam = JSON.parseObject(updDataMap.get("updData").get("value"), DataContentParam.class);
+ Long uptime = Long.valueOf(String.valueOf(updDataMap.get("updData").get("time")));
+ if (StringUtils.isEmpty(dataReportParam.getDeviceName())) {
+ responseData.setCode(200);
+ responseData.setMessage("没有设备编号");
+ return responseData;
+ }
+ normalDataProcessor.normalDataProvider(dataContentParam, uptime, dataReportParam.getDeviceName());
responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
} catch (DataAccessException sqlex) {
responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
responseData.setMessage("请求数据异常");
responseData.setSuccess(true);
- log.error("主题:数据心跳出现错误,异常信息为{}", sqlex);
+ log.error("主题:设备数据上报出现错误,异常信息为{}", sqlex);
}
return responseData;
}
diff --git a/src/main/java/com/casic/service/impl/NormalDataProcessor.java b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
new file mode 100644
index 0000000..3f7630a
--- /dev/null
+++ b/src/main/java/com/casic/service/impl/NormalDataProcessor.java
@@ -0,0 +1,164 @@
+package com.casic.service.impl;
+
+import com.alibaba.druid.util.StringUtils;
+import com.casic.dao.AlarmRecordsMapper;
+import com.casic.dao.DataGasMapper;
+import com.casic.dao.impl.AlarmJobDao;
+import com.casic.entity.AlarmJob;
+import com.casic.entity.AlarmRecords;
+import com.casic.entity.DataGasDector;
+import com.casic.model.DataContentParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+import xyz.downgoon.snowflake.Snowflake;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class NormalDataProcessor {
+
+ public static final SimpleDateFormat sdf6 = new SimpleDateFormat("yyyyMMdd");
+
+ @Value("${casic.device.gas-dector.type}")
+ private Long deviceType;
+ @Value("${casic.device.gas-dector.minutes}")
+ private String minutes;
+ @Value("${casic.device.gas-dector.enable-local}")
+ private Boolean enableLocal;
+ @Resource
+ private DataGasMapper dataGasMapper;
+ @Autowired
+ private AlarmJobDao alarmJobDao;
+ @Resource
+ private AlarmRecordsMapper alarmRecordsMapper;
+ private static Snowflake snowflake = new Snowflake(0, 2);
+
+ public void normalDataProvider(DataContentParam dataReportParam, Long timeStamp, String devcode) {
+ Map gasMap = dataGasMapper.getWellCode(devcode);
+ if (ObjectUtils.isEmpty(gasMap)) {
+ log.info("没有该设备编号录入" + devcode);
+ if (enableLocal) {
+ return;
+ }
+ }
+ Boolean updateFlag = false;
+ if (ObjectUtils.isEmpty(dataGasMapper.getLastData(minutes, devcode))) {
+ updateFlag = this.saveNormalData(dataReportParam, timeStamp, devcode, gasMap);
+ }
+ this.dataTaskJudge(dataReportParam, devcode, timeStamp, gasMap, updateFlag);
+ return;
+ }
+
+ /**
+ * 自定义时间存库
+ *
+ * @param dataReportParam
+ * @param timeStamp
+ * @param devcode
+ * @param gasMap
+ */
+ private Boolean saveNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap) {
+ Boolean updateFlag = false;
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ List dataReportFilter = dataReportParam.getRtd_val().stream().filter(
+ data -> {
+ return data != -1;
+ }
+ ).collect(Collectors.toList());
+ if (dataReportFilter.size() > 0 && dataReportFilter.get(dataReportFilter.size() - 1) != 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 1);
+ updateFlag = true;
+ } else if (dataReportFilter.get(dataReportFilter.size() - 1) == 65535) {
+ dataGasMapper.setOfflineByDevcode(devcode, 0);
+ }
+ dataReportFilter.forEach(
+ data -> {
+ if (data != 65535) {
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+ }
+ );
+ return updateFlag;
+ }
+
+ /**
+ * 报警就存库
+ *
+ * @param dataReportParam
+ * @param devcode
+ * @param timeStamp
+ * @param gasMap
+ */
+ private void dataTaskJudge(DataContentParam dataReportParam, String devcode, Long timeStamp, Map gasMap, Boolean updateFlag) {
+ List> alarmLevelList = dataGasMapper.getAlarmLevelList(deviceType);
+ String wellCode = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "";
+ Long deviceId = !ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? Long.valueOf(String.valueOf(gasMap.get("deviceId"))) : -1;
+ final String gasMsgContent=dataGasMapper.getGasMsgContent(deviceType);
+ dataReportParam.getRtd_val().stream().filter(
+ dataReport -> {
+ return dataReport != -1 && dataReport != 65535;
+ }
+ ).forEach(
+ dataReport -> {
+ for (Map alarmLevelMap : alarmLevelList) {
+ if (dataReport > Float.valueOf(String.valueOf(alarmLevelMap.get("high_value")))) {
+ AlarmRecords alarmRecord = new AlarmRecords();
+ alarmRecord.setId(snowflake.nextId());
+ alarmRecord.setDeviceId(deviceId);
+ alarmRecord.setDevcode(devcode);
+ alarmRecord.setWellCode(wellCode);
+ alarmRecord.setAlarmType("1"); // 业务报警
+ alarmRecord.setAlarmContent("燃气报警");
+ alarmRecord.setAlarmValue(String.valueOf(dataReport));
+ alarmRecord.setAlarmTime(new Date());
+ alarmRecord.setStatus("1");
+ alarmRecord.setAlarmLevel(Integer.valueOf(alarmLevelMap.get("level").toString()));
+ alarmRecord.setAlarmMessage("燃气报警");
+ String jobId = alarmRecordsMapper.isOldAlarmRecord(devcode, "燃气报警");
+ // 超出报警阈值 生成一条报警消息
+ if (!StringUtils.isEmpty(jobId)) {
+ alarmRecordsMapper.updateOldAlarmRecord(devcode, "燃气报警");
+ alarmRecord.setJobId(Long.valueOf(jobId));
+ } else {
+ AlarmJob alarmJob = alarmJobDao.saveData(devcode, wellCode, "RQZD", "1");
+ alarmRecord.setJobId(alarmJob.getId());
+ }
+ alarmRecordsMapper.insert(alarmRecord);
+ if (!updateFlag) {
+ alarmNormalData(dataReportParam, timeStamp, devcode, gasMap, dataReport);
+ }
+ break;
+ }
+ }
+ }
+ );
+ }
+
+ private void alarmNormalData(DataContentParam dataReportParam, Long timeStamp, String devcode, Map gasMap, Integer data) {
+ DataGasDector dataGasDector = new DataGasDector();
+ dataGasDector.setDevcode(devcode);
+ dataGasDector.setWellCode(!ObjectUtils.isEmpty(gasMap) && gasMap.containsKey("wellCode") ? gasMap.get("wellCode") : "");
+ dataGasDector.setLogtime(new Date());
+ dataGasDector.setUptime(new Date(timeStamp));
+ dataGasDector.setDescn(dataReportParam.getMsg_type());
+ dataGasDector.setStrength(String.valueOf(data));
+ dataGasMapper.insert(dataGasDector);
+ }
+
+}
+
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index fac2afe..f8a06a6 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,40 +1,19 @@
server:
- port: 11556
+ port: 11320
################### spring配置 ###################
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
- username: root
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell_zq_cs
+ username: postgres
password: Casic203
session:
store-type: redis
- redis:
- host: 111.198.10.15
- port: 11412
- password: ew5T4K3#203lwh
- redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
jms:
pub-sub-domain: true
- # session:
- # store-type: redis
- activemq:
- user:
- password:
- broker-url: tcp://192.168.0.203:61616
-#flowable数据源和多数据源配置
-casic:
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- #kaptcha-open: false #是否开启登录时验证码 (true/false)
- no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
- db:
- init:
- enable: false
- file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
- spring-session-open: false #开启spring session
logging:
level.root: error
- level.com.casic: error
+ level.com.casic: info
file:
path: logs/
name: missiles.log
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 86411e6..ffc01e9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -19,18 +19,11 @@
mapper-locations: classpath:mapper/*.xml
#mybatis-plus:
# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
-################### mybatis-plus配置 ###################
-################### casic配置 ###################
-flowable:
- checkProcessDefinitions: false #不校验process文件
casic:
- swagger-open: false #是否开启swagger (true/false)
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- muti-datasource-open: false #是否开启多数据源(true/false)
- spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
- session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
- session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
- extUrl: sys
- config:
- export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
- config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
+ device:
+ gas-dector:
+ type: 101
+ minutes: 60
+ enable-local: false
+# type 可燃气体的设备类型
+# minutes: 燃气外协设备上传数据的分钟数
\ No newline at end of file
diff --git a/target/classes/application-dev.yml b/target/classes/application-dev.yml
new file mode 100644
index 0000000..fac2afe
--- /dev/null
+++ b/target/classes/application-dev.yml
@@ -0,0 +1,40 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&&useSSL=true
+ username: root
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+logging:
+ level.root: error
+ level.com.casic: error
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/target/classes/application-postgre.yml b/target/classes/application-postgre.yml
new file mode 100644
index 0000000..2b7f69c
--- /dev/null
+++ b/target/classes/application-postgre.yml
@@ -0,0 +1,62 @@
+server:
+ port: 11556
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://111.198.10.15:11209/smartwell
+ username: postgres
+ password: Casic203
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+ jms:
+ pub-sub-domain: true
+ # session:
+ # store-type: redis
+ redis-config:
+ host: 127.0.0.1
+ port: 6379
+ password:
+ activemq:
+ user:
+ password:
+ broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+ db:
+ init:
+ enable: false
+ file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+ spring-session-open: false #开启spring session
+smartcity:
+ config:
+ export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+ #export-path: D:\export\
+ image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\
+ config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\
+ download-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\download\
+ device:
+ redis:
+ invalid-time: 86400
+ host: 127.0.0.1
+ port: 6379
+ password: ew5T4K3#203lwh
+ config-prefix: 'Casic:'
+ getui:
+ appId: H9jSTE2bAt8QWq2K2GNOB3
+ appKey: bhPeCutJVdAyOasevQFtN9
+ masterSecret: lChudND74A89WRiHLkedb5
+logging:
+ level.root: info
+ level.com.casic: info
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/target/classes/application.yml b/target/classes/application.yml
new file mode 100644
index 0000000..86411e6
--- /dev/null
+++ b/target/classes/application.yml
@@ -0,0 +1,36 @@
+##########################################################
+################## 所有profile共有的配置 #################
+##########################################################
+spring:
+ profiles:
+ active: dev
+ servlet:
+ multipart:
+ max-file-size: 50MB
+ max-request-size: 80MB
+mybatis-plus:
+ global-config:
+ enable-sql-runner: true
+ configuration:
+ # 配置结果集属性为空时 是否映射返回结果
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
+ mapper-locations: classpath:mapper/*.xml
+mybatis:
+ mapper-locations: classpath:mapper/*.xml
+#mybatis-plus:
+# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
+################### mybatis-plus配置 ###################
+################### casic配置 ###################
+flowable:
+ checkProcessDefinitions: false #不校验process文件
+casic:
+ swagger-open: false #是否开启swagger (true/false)
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ muti-datasource-open: false #是否开启多数据源(true/false)
+ spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
+ session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
+ session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
+ extUrl: sys
+ config:
+ export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\
+ config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\
\ No newline at end of file
diff --git a/target/classes/com/casic/CasicApplication.class b/target/classes/com/casic/CasicApplication.class
new file mode 100644
index 0000000..68c2f95
--- /dev/null
+++ b/target/classes/com/casic/CasicApplication.class
Binary files differ
diff --git a/target/classes/com/casic/controller/DeviceController.class b/target/classes/com/casic/controller/DeviceController.class
new file mode 100644
index 0000000..478d6ae
--- /dev/null
+++ b/target/classes/com/casic/controller/DeviceController.class
Binary files differ
diff --git a/target/classes/com/casic/controller/DeviceDataController.class b/target/classes/com/casic/controller/DeviceDataController.class
new file mode 100644
index 0000000..1f4400c
--- /dev/null
+++ b/target/classes/com/casic/controller/DeviceDataController.class
Binary files differ
diff --git a/target/classes/com/casic/dao/DataGasMapper.class b/target/classes/com/casic/dao/DataGasMapper.class
new file mode 100644
index 0000000..557d539
--- /dev/null
+++ b/target/classes/com/casic/dao/DataGasMapper.class
Binary files differ
diff --git a/target/classes/com/casic/dao/DeviceMapper.class b/target/classes/com/casic/dao/DeviceMapper.class
new file mode 100644
index 0000000..3ddcd2b
--- /dev/null
+++ b/target/classes/com/casic/dao/DeviceMapper.class
Binary files differ
diff --git a/target/classes/com/casic/dao/impl/DeviceDataMapper.class b/target/classes/com/casic/dao/impl/DeviceDataMapper.class
new file mode 100644
index 0000000..d73ed15
--- /dev/null
+++ b/target/classes/com/casic/dao/impl/DeviceDataMapper.class
Binary files differ
diff --git a/target/classes/com/casic/entity/DataGasReport.class b/target/classes/com/casic/entity/DataGasReport.class
new file mode 100644
index 0000000..a3dac78
--- /dev/null
+++ b/target/classes/com/casic/entity/DataGasReport.class
Binary files differ
diff --git a/target/classes/com/casic/model/DataReportParam.class b/target/classes/com/casic/model/DataReportParam.class
new file mode 100644
index 0000000..284c4f6
--- /dev/null
+++ b/target/classes/com/casic/model/DataReportParam.class
Binary files differ
diff --git a/target/classes/com/casic/model/DeviceOnlineParam.class b/target/classes/com/casic/model/DeviceOnlineParam.class
new file mode 100644
index 0000000..33c83e2
--- /dev/null
+++ b/target/classes/com/casic/model/DeviceOnlineParam.class
Binary files differ
diff --git a/target/classes/com/casic/model/HeartbeatParam.class b/target/classes/com/casic/model/HeartbeatParam.class
new file mode 100644
index 0000000..d6d6651
--- /dev/null
+++ b/target/classes/com/casic/model/HeartbeatParam.class
Binary files differ
diff --git a/target/classes/com/casic/model/ResponseData.class b/target/classes/com/casic/model/ResponseData.class
new file mode 100644
index 0000000..9d5cab1
--- /dev/null
+++ b/target/classes/com/casic/model/ResponseData.class
Binary files differ
diff --git a/target/classes/com/casic/service/DeviceDataService.class b/target/classes/com/casic/service/DeviceDataService.class
new file mode 100644
index 0000000..0807bfb
--- /dev/null
+++ b/target/classes/com/casic/service/DeviceDataService.class
Binary files differ
diff --git a/target/classes/com/casic/service/DeviceService.class b/target/classes/com/casic/service/DeviceService.class
new file mode 100644
index 0000000..765368a
--- /dev/null
+++ b/target/classes/com/casic/service/DeviceService.class
Binary files differ
diff --git a/target/classes/com/casic/service/impl/DeviceDataServiceImpl.class b/target/classes/com/casic/service/impl/DeviceDataServiceImpl.class
new file mode 100644
index 0000000..afcd9eb
--- /dev/null
+++ b/target/classes/com/casic/service/impl/DeviceDataServiceImpl.class
Binary files differ
diff --git a/target/classes/com/casic/service/impl/DeviceServiceImpl.class b/target/classes/com/casic/service/impl/DeviceServiceImpl.class
new file mode 100644
index 0000000..4ef6b15
--- /dev/null
+++ b/target/classes/com/casic/service/impl/DeviceServiceImpl.class
Binary files differ
diff --git a/target/classes/com/casic/util/ConestUtil.class b/target/classes/com/casic/util/ConestUtil.class
new file mode 100644
index 0000000..cafcba6
--- /dev/null
+++ b/target/classes/com/casic/util/ConestUtil.class
Binary files differ