From 57a1355a8ece1d0b1229799d43e8773d094c1517 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Sat, 23 Nov 2024 17:51:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BE=B9=E4=BB=A3=E6=95=B0=E6=8D=AE=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E5=90=8C=E6=AD=A5WARN=E6=8A=A5=E8=AD=A6=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/service/DataCenterServiceImpl.java | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/bonus-modules/data/src/main/java/com/bonus/data/service/DataCenterServiceImpl.java b/bonus-modules/data/src/main/java/com/bonus/data/service/DataCenterServiceImpl.java index c944bd1..460a293 100644 --- a/bonus-modules/data/src/main/java/com/bonus/data/service/DataCenterServiceImpl.java +++ b/bonus-modules/data/src/main/java/com/bonus/data/service/DataCenterServiceImpl.java @@ -120,6 +120,15 @@ public class DataCenterServiceImpl implements DataCenterService{ attributeVos.clear(); DevAttributeVo devAttributeVo=new DevAttributeVo(devId,json,deviceVo.getDevName(),deviceVo.getDevType(),"电池电量",vo.getCapacity(),"%","capacity","0",vo.getDataTime(),mergerId); attributeVos.add(devAttributeVo); + if ("1".equals(isWarn(config,vo.getAngleX(),1,deviceVo,"角度X"))) { + mapper.updateDeviceIsWarn(devId); + } + if ("1".equals(isWarn(config,vo.getAngleY(),1,deviceVo,"角度Y"))) { + mapper.updateDeviceIsWarn(devId); + } + if ("1".equals(isWarn(config,vo.getAngleZ(),1,deviceVo,"角度Z"))) { + mapper.updateDeviceIsWarn(devId); + } DevAttributeVo devAttributeVo2=new DevAttributeVo(devId,json,deviceVo.getDevName(),deviceVo.getDevType(),"角度X",vo.getAngleX(),"°","angle_x",isWarn(config,vo.getAngleX(),1,deviceVo,"角度X"),vo.getDataTime(),mergerId); attributeVos.add(devAttributeVo2); DevAttributeVo devAttributeVo3=new DevAttributeVo(devId,json,deviceVo.getDevName(),deviceVo.getDevType(),"角度Y",vo.getAngleY(),"°","angle_y",isWarn(config,vo.getAngleY(),1,deviceVo,"角度Y"),vo.getDataTime(),mergerId); @@ -299,18 +308,33 @@ public class DataCenterServiceImpl implements DataCenterService{ DevAttributeVo devAttributeVo3=new DevAttributeVo(devId,json,deviceVo.getDevName(),deviceVo.getDevType(),"5.0µm粒子数",vo.getGrain50(),"m³","grain_50","0",vo.getDataTime(),mergerId); attributeVos.add(devAttributeVo3); DevAttributeVo devAttributeVo4=new DevAttributeVo(devId,json,deviceVo.getDevName(),deviceVo.getDevType(),"pm25",vo.getPm25(),"μg/m3","pm25",isWarn(config,vo.getPm25(),2,deviceVo,"pm25"),vo.getDataTime(),mergerId); + if ("1".equals(isWarn(config,vo.getPm25(),2,deviceVo,"pm25"))) { + mapper.updateDeviceIsWarn(devId); + } attributeVos.add(devAttributeVo4); DevAttributeVo devAttributeVo5=new DevAttributeVo(devId,json,deviceVo.getDevName(),deviceVo.getDevType(),"pm10",vo.getPm10(),"μg/m3","pm10",isWarn(config,vo.getPm10(),3,deviceVo,"pm10"),vo.getDataTime(),mergerId); + if ("1".equals(isWarn(config,vo.getPm10(),3,deviceVo,"pm10"))) { + mapper.updateDeviceIsWarn(devId); + } attributeVos.add(devAttributeVo5); DevAttributeVo devAttributeVo6=new DevAttributeVo(devId,json,deviceVo.getDevName(),deviceVo.getDevType(),"噪声",vo.getNoise(),"db","noise",isWarn(config,vo.getNoise(),4,deviceVo,"噪声"),vo.getDataTime(),mergerId); + if ("1".equals(isWarn(config,vo.getNoise(),4,deviceVo,"噪声"))) { + mapper.updateDeviceIsWarn(devId); + } attributeVos.add(devAttributeVo6); DevAttributeVo devAttributeVo7=new DevAttributeVo(devId,json,deviceVo.getDevName(),deviceVo.getDevType(),"风向",vo.getWindDirection(),"","wind_direction","0",vo.getDataTime(),mergerId); attributeVos.add(devAttributeVo7); DevAttributeVo devAttributeVo8=new DevAttributeVo(devId,json,deviceVo.getDevName(),deviceVo.getDevType(),"风速",vo.getWindForce(),"m/s","wind_force","0",vo.getDataTime(),mergerId); attributeVos.add(devAttributeVo8); DevAttributeVo devAttributeVo9=new DevAttributeVo(devId,json,deviceVo.getDevName(),deviceVo.getDevType(),"温度",vo.getAirTemperature(),"°C","air_Temperature",isWarn(config,vo.getAirTemperature(),5,deviceVo,"温度"),vo.getDataTime(),mergerId); + if ("1".equals(isWarn(config,vo.getAirTemperature(),5,deviceVo,"温度"))) { + mapper.updateDeviceIsWarn(devId); + } attributeVos.add(devAttributeVo9); DevAttributeVo devAttributeVo10=new DevAttributeVo(devId,json,deviceVo.getDevName(),deviceVo.getDevType(),"湿度",vo.getHumidity(),"%rh","humidity",isWarn(config,vo.getHumidity(),6,deviceVo,"湿度"),vo.getDataTime(),mergerId); + if ("1".equals(isWarn(config,vo.getHumidity(),6,deviceVo,"湿度"))) { + mapper.updateDeviceIsWarn(devId); + } attributeVos.add(devAttributeVo10); DevAttributeVo devAttributeVo11=new DevAttributeVo(devId,json,deviceVo.getDevName(),deviceVo.getDevType(),"微正压",vo.getPositivePressure(),"Pa","positive_pressure","0",vo.getDataTime(),mergerId); attributeVos.add(devAttributeVo11); @@ -366,12 +390,24 @@ public class DataCenterServiceImpl implements DataCenterService{ String mergerId= UuidUtils.generateUuid().toUpperCase().replaceAll("-",""); attributeVos.clear(); DevAttributeVo devAttributeVo=new DevAttributeVo(devId,json,deviceVo.getDevName(),deviceVo.getDevType(),"含氧量",vo.getOxygen(),"%VOL","oxygen",isWarn(config,vo.getOxygen(),7,deviceVo,"含氧量"),vo.getDataTime(),mergerId); + if ("1".equals(isWarn(config,vo.getOxygen(),7,deviceVo,"含氧量"))) { + mapper.updateDeviceIsWarn(devId); + } attributeVos.add(devAttributeVo); DevAttributeVo devAttributeVo2=new DevAttributeVo(devId,json,deviceVo.getDevName(),deviceVo.getDevType(),"一氧化碳",vo.getCarbonMonoxide(),"ppm","carbon_monoxide",isWarn(config,vo.getCarbonMonoxide(),8,deviceVo,"一氧化碳"),vo.getDataTime(),mergerId); + if ("1".equals(isWarn(config,vo.getCarbonMonoxide(),8,deviceVo,"一氧化碳"))) { + mapper.updateDeviceIsWarn(devId); + } attributeVos.add(devAttributeVo2); DevAttributeVo devAttributeVo3=new DevAttributeVo(devId,json,deviceVo.getDevName(),deviceVo.getDevType(),"可燃气体",vo.getCombustible(),"%LEL","combustible",isWarn(config,vo.getCombustible(),9,deviceVo,"可燃气体"),vo.getDataTime(),mergerId); + if ("1".equals(isWarn(config,vo.getCombustible(),9,deviceVo,"可燃气体"))) { + mapper.updateDeviceIsWarn(devId); + } attributeVos.add(devAttributeVo3); DevAttributeVo devAttributeVo4=new DevAttributeVo(devId,json,deviceVo.getDevName(),deviceVo.getDevType(),"硫化氢",vo.getHydrothion(),"ppm","hydrothion",isWarn(config,vo.getHydrothion(),10,deviceVo,"硫化氢"),vo.getDataTime(),mergerId); + if ("1".equals(isWarn(config,vo.getHydrothion(),10,deviceVo,"硫化氢"))) { + mapper.updateDeviceIsWarn(devId); + } attributeVos.add(devAttributeVo4); //更新/新增设备检测信息及记录 insertOrAddDevAttribute(attributeVos);