Commit b672f5d5 authored by chenzhao's avatar chenzhao

修改代码

parent 15550b9a
package com.yeejoin.amos.boot.module.jxiop.biz.entity; package com.yeejoin.amos.boot.module.jxiop.biz.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
...@@ -24,7 +26,7 @@ public class IdxBizFanHealthIndex { ...@@ -24,7 +26,7 @@ public class IdxBizFanHealthIndex {
/** /**
* *
*/ */
@TableField("SEQUENCE_NBR") @TableId(value = "SEQUENCE_NBR", type = IdType.ID_WORKER_STR)
private String sequenceNbr; private String sequenceNbr;
/** /**
......
...@@ -142,7 +142,7 @@ public class IdxBizFanPointProcessVariableClassification{ ...@@ -142,7 +142,7 @@ public class IdxBizFanPointProcessVariableClassification{
* *
*/ */
@TableField("GATEWAY_ID") @TableField("GATEWAY_ID")
private Long gatewayId; private String gatewayId;
/** /**
* 点表地址 * 点表地址
......
package com.yeejoin.amos.boot.module.jxiop.biz.entity; package com.yeejoin.amos.boot.module.jxiop.biz.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data; import lombok.Data;
...@@ -27,7 +29,7 @@ public class IdxBizPvHealthIndex{ ...@@ -27,7 +29,7 @@ public class IdxBizPvHealthIndex{
/** /**
* *
*/ */
@TableField("SEQUENCE_NBR") @TableId(value = "SEQUENCE_NBR", type = IdType.ID_WORKER_STR)
private String sequenceNbr; private String sequenceNbr;
/** /**
...@@ -100,13 +102,13 @@ public class IdxBizPvHealthIndex{ ...@@ -100,13 +102,13 @@ public class IdxBizPvHealthIndex{
* *
*/ */
@TableField("ANALYSIS_START_TIME") @TableField("ANALYSIS_START_TIME")
private LocalDateTime analysisStartTime; private Date analysisStartTime;
/** /**
* *
*/ */
@TableField("ANALYSIS_END_TIME") @TableField("ANALYSIS_END_TIME")
private LocalDateTime analysisEndTime; private Date analysisEndTime;
/** /**
* 片区 * 片区
......
...@@ -150,7 +150,7 @@ public class IdxBizPvPointProcessVariableClassification{ ...@@ -150,7 +150,7 @@ public class IdxBizPvPointProcessVariableClassification{
* *
*/ */
@TableField("GATEWAY_ID") @TableField("GATEWAY_ID")
private Long gatewayId; private String gatewayId;
/** /**
* 点表地址 * 点表地址
......
...@@ -1013,6 +1013,7 @@ public class CommonServiceImpl { ...@@ -1013,6 +1013,7 @@ public class CommonServiceImpl {
idxBizFanHealthIndex.setHealthIndex(object.getDouble("indexValue")); idxBizFanHealthIndex.setHealthIndex(object.getDouble("indexValue"));
idxBizFanHealthIndex.setAnalysisObjSeq(obj.getSequenceNbr()); idxBizFanHealthIndex.setAnalysisObjSeq(obj.getSequenceNbr());
idxBizFanHealthIndex.setRecDate(new Date()); idxBizFanHealthIndex.setRecDate(new Date());
idxBizFanHealthIndex.setSequenceNbr(null);
//获取健康指数对应等级 //获取健康指数对应等级
LambdaQueryWrapper<IdxBizFanHealthLevel> query = new LambdaQueryWrapper<>(); LambdaQueryWrapper<IdxBizFanHealthLevel> query = new LambdaQueryWrapper<>();
query.eq(IdxBizFanHealthLevel::getAnalysisObjType,"设备"); query.eq(IdxBizFanHealthLevel::getAnalysisObjType,"设备");
...@@ -1020,7 +1021,6 @@ public class CommonServiceImpl { ...@@ -1020,7 +1021,6 @@ public class CommonServiceImpl {
query.le(IdxBizFanHealthLevel::getGroupLowerLimit,object.getDouble("indexValue")); query.le(IdxBizFanHealthLevel::getGroupLowerLimit,object.getDouble("indexValue"));
query.ge(IdxBizFanHealthLevel::getGroupUpperLimit,object.getDouble("indexValue")); query.ge(IdxBizFanHealthLevel::getGroupUpperLimit,object.getDouble("indexValue"));
IdxBizFanHealthLevel idxBizFanHealthLevel = idxBizFanHealthLevelMapper.selectOne(query); IdxBizFanHealthLevel idxBizFanHealthLevel = idxBizFanHealthLevelMapper.selectOne(query);
idxBizFanHealthIndex.setSequenceNbr(null);
idxBizFanHealthIndex.setHealthLevel(idxBizFanHealthLevel.getHealthLevel()); idxBizFanHealthIndex.setHealthLevel(idxBizFanHealthLevel.getHealthLevel());
idxBizFanHealthIndex.setAnalysisType("按时刻"); idxBizFanHealthIndex.setAnalysisType("按时刻");
idxBizFanHealthIndex.setANOMALY(object.getDouble("scoreValue")); idxBizFanHealthIndex.setANOMALY(object.getDouble("scoreValue"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment