Commit 763e71db authored by zhangsen's avatar zhangsen

预警信息修改为已处置流程补充

parent 10549733
...@@ -104,19 +104,23 @@ public class WarningRecordStatusMessage extends EmqxListener { ...@@ -104,19 +104,23 @@ public class WarningRecordStatusMessage extends EmqxListener {
log.info("修改预警状态信息:{}", analysisResult); log.info("修改预警状态信息:{}", analysisResult);
List<JSONObject> taskList = JSONObject.parseArray(analysisResult.toJSONString(), JSONObject.class); List<JSONObject> taskList = JSONObject.parseArray(analysisResult.toJSONString(), JSONObject.class);
List<String> traceIds = taskList.stream().map(t -> t.get("extAttr1").toString()).collect(Collectors.toList()); List<String> traceIds = taskList.stream().map(t -> t.get("extAttr1").toString()).collect(Collectors.toList());
LambdaUpdateWrapper<IdxBizFanWarningRecord> lambda = new LambdaUpdateWrapper<>(); // LambdaUpdateWrapper<IdxBizFanWarningRecord> lambda = new LambdaUpdateWrapper<>();
lambda.set(IdxBizFanWarningRecord::getDisposotionState, "已处置"); // lambda.set(IdxBizFanWarningRecord::getDisposotionState, "已处置");
lambda.set(IdxBizFanWarningRecord::getStatus, "1"); // lambda.set(IdxBizFanWarningRecord::getStatus, "1");
lambda.set(IdxBizFanWarningRecord::getDisposotionDate, new Date()); // lambda.set(IdxBizFanWarningRecord::getDisposotionDate, new Date());
lambda.in(IdxBizFanWarningRecord::getSequenceNbr, traceIds); // lambda.in(IdxBizFanWarningRecord::getSequenceNbr, traceIds);
idxBizFanWarningRecordService.update(lambda); // idxBizFanWarningRecordService.update(lambda);
LambdaUpdateWrapper<FanWarningRecord> lambdaTd = new LambdaUpdateWrapper<>(); List<FanWarningRecord> list = new ArrayList<>();
lambdaTd.set(FanWarningRecord::getDisposotionState, "已处置"); for (String traceId : traceIds) {
lambdaTd.set(FanWarningRecord::getStatus, "1"); FanWarningRecord fanWarningRecord = new FanWarningRecord();
lambdaTd.set(FanWarningRecord::getDisposotionDate, DateUtil.now()); fanWarningRecord.setTs(Long.valueOf(traceId));
lambdaTd.in(FanWarningRecord::getTs, traceIds); fanWarningRecord.setDisposotionDate(DateUtil.now());
fanWarningRecordService.update(lambdaTd); fanWarningRecord.setStatus("1");
fanWarningRecord.setDisposotionState("已处置");
list.add(fanWarningRecord);
}
fanWaringRecordMapper.updateStatusByTs(list);
} }
...@@ -124,20 +128,22 @@ public class WarningRecordStatusMessage extends EmqxListener { ...@@ -124,20 +128,22 @@ public class WarningRecordStatusMessage extends EmqxListener {
log.info("修改预警状态信息:{}", analysisResult); log.info("修改预警状态信息:{}", analysisResult);
List<JSONObject> taskList = JSONObject.parseArray(analysisResult.toJSONString(), JSONObject.class); List<JSONObject> taskList = JSONObject.parseArray(analysisResult.toJSONString(), JSONObject.class);
List<String> traceIds = taskList.stream().map(t -> t.get("extAttr1").toString()).collect(Collectors.toList()); List<String> traceIds = taskList.stream().map(t -> t.get("extAttr1").toString()).collect(Collectors.toList());
LambdaUpdateWrapper<IdxBizPvWarningRecord> lambda = new LambdaUpdateWrapper<>(); // LambdaUpdateWrapper<IdxBizPvWarningRecord> lambda = new LambdaUpdateWrapper<>();
lambda.set(IdxBizPvWarningRecord::getDisposotionState, "已处置"); // lambda.set(IdxBizPvWarningRecord::getDisposotionState, "已处置");
lambda.set(IdxBizPvWarningRecord::getStatus, "1"); // lambda.set(IdxBizPvWarningRecord::getStatus, "1");
lambda.set(IdxBizPvWarningRecord::getDisposotionDate, new Date()); // lambda.set(IdxBizPvWarningRecord::getDisposotionDate, new Date());
lambda.in(IdxBizPvWarningRecord::getSequenceNbr, traceIds); // lambda.in(IdxBizPvWarningRecord::getSequenceNbr, traceIds);
idxBizPvWarningRecordService.update(lambda); // idxBizPvWarningRecordService.update(lambda);
// td // td
List<PvWarningRecord> list = new ArrayList<>();
LambdaUpdateWrapper<PvWarningRecord> lambdaTd = new LambdaUpdateWrapper<>(); for (String traceId : traceIds) {
lambdaTd.set(PvWarningRecord::getDisposotionState, "已处置"); PvWarningRecord pvWarningRecord = new PvWarningRecord();
lambdaTd.set(PvWarningRecord::getStatus, "1"); pvWarningRecord.setTs(Long.valueOf(traceId));
lambdaTd.set(PvWarningRecord::getDisposotionDate, DateUtil.now()); pvWarningRecord.setDisposotionDate(DateUtil.now());
lambdaTd.in(PvWarningRecord::getTs, traceIds); pvWarningRecord.setStatus("1");
pvWarningRecordService.update(lambdaTd); pvWarningRecord.setDisposotionState("已处置");
list.add(pvWarningRecord);
}
pvWaringRecordMapper.updateStatusByTs(list);
} }
} }
...@@ -32,4 +32,6 @@ public interface FanWaringRecordMapper extends BaseMapper<FanWarningRecord> { ...@@ -32,4 +32,6 @@ public interface FanWaringRecordMapper extends BaseMapper<FanWarningRecord> {
FanWarningRecord getInfoByTs(@Param("ts") Long ts); FanWarningRecord getInfoByTs(@Param("ts") Long ts);
int updateStatusByTs(@Param("list") List<FanWarningRecord> list);
} }
...@@ -27,4 +27,6 @@ public interface PvWaringRecordMapper extends BaseMapper<PvWarningRecord> { ...@@ -27,4 +27,6 @@ public interface PvWaringRecordMapper extends BaseMapper<PvWarningRecord> {
Integer getInfoByPageTotal(@Param("dto") FanHealthIndexDto dto); Integer getInfoByPageTotal(@Param("dto") FanHealthIndexDto dto);
PvWarningRecord getInfoByTs(@Param("ts") Long ts); PvWarningRecord getInfoByTs(@Param("ts") Long ts);
int updateStatusByTs(@Param("list") List<PvWarningRecord> list);
} }
...@@ -215,4 +215,22 @@ ...@@ -215,4 +215,22 @@
<select id="getInfoByTs" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanWarningRecord"> <select id="getInfoByTs" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanWarningRecord">
select * from analysis_data.fan_warning_record where ts = #{ts,jdbcType=TIMESTAMP} limit 1 select * from analysis_data.fan_warning_record where ts = #{ts,jdbcType=TIMESTAMP} limit 1
</select> </select>
<insert id="updateStatusByTs">
insert
into
fan_warning_record
(ts,
disposotion_state,
disposotion_date,
status)
values
<foreach collection="list" separator="," item="item" index="index">
(#{item.ts, jdbcType=TIMESTAMP},
#{item.disposotionState, jdbcType=VARCHAR},
#{item.disposotionDate, jdbcType=VARCHAR},
#{item.status, jdbcType=VARCHAR})
</foreach>
</insert>
</mapper> </mapper>
...@@ -231,4 +231,21 @@ ...@@ -231,4 +231,21 @@
<select id="getInfoByTs" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.PvWarningRecord"> <select id="getInfoByTs" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.PvWarningRecord">
select * from analysis_data.pv_warning_record where ts = #{ts,jdbcType=TIMESTAMP} limit 1 select * from analysis_data.pv_warning_record where ts = #{ts,jdbcType=TIMESTAMP} limit 1
</select> </select>
<insert id="updateStatusByTs">
insert
into
pv_warning_record
(ts,
disposotion_state,
disposotion_date,
status)
values
<foreach collection="list" separator="," item="item" index="index">
(#{item.ts, jdbcType=TIMESTAMP},
#{item.disposotionState, jdbcType=VARCHAR},
#{item.disposotionDate, jdbcType=VARCHAR},
#{item.status, jdbcType=VARCHAR})
</foreach>
</insert>
</mapper> </mapper>
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