From 8072f94e9cd1a6f6c05b4d81ce35bac1ddc69418 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Fri, 28 Nov 2025 11:11:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=94=B5=E7=AE=B1?= =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=95=B0=E6=8D=AE=E4=BF=A1=E6=81=AF=EF=BC=88?= =?UTF-8?q?=E4=BD=B3=E4=BD=B3=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ElectricalDataController.java | 43 ++++++++++++++++++- .../zhgd/xmgl/security/WebSecurityConfig.java | 1 + 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/electrical/controller/ElectricalDataController.java b/src/main/java/com/zhgd/xmgl/modules/electrical/controller/ElectricalDataController.java index 6f055f72e..6bb57c236 100644 --- a/src/main/java/com/zhgd/xmgl/modules/electrical/controller/ElectricalDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/electrical/controller/ElectricalDataController.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gexin.fastjson.JSON; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.mybatis.EntityMap; @@ -207,5 +208,45 @@ public class ElectricalDataController { return result; } - + @ApiOperation(value = "添加配电箱实时数据信息（佳佳）", notes = "添加配电箱实时数据信息（佳佳）", httpMethod = "POST") + @PostMapping(value = "/addByJj") + public Result addByJj(@ApiIgnore @RequestBody HashMap param) { + String uid = MapUtils.getString(param, "uid"); + log.info("添加配电箱实时数据信息（佳佳）设备编号:{}", uid); + log.debug("添加配电箱实时数据信息（佳佳）：{}", JSON.toJSONString(param)); + //{ + // "uid": "xxx", + // "time": "2022.11.16 11:05:46", + // "c1": "0.0", + // "c2": "0.0", + // "c3": "0.0", + // "leak": "0.0", + // "power": "0.0", + // "t1": "9", + // "t2": "9", + // "t3": "9", + // "t4": "10", + // "v1": "0.0", + // "v2": "0.1", + // "v3": "0.0" + //} + //假设 现场的环境温度传感线是接T1端口，A相线温度传感线接T2，B相线温度传感线接T3，C相线温度传感线接T4， + //那么上报数据，T1=环境温度，T2=A相线温度，T3=B相线温度，T4=C相线温度 + ElectricalData electricalData = new ElectricalData(); + electricalData.setDevSn(uid); + electricalData.setUploadTime(DateUtil.formatDateTime(DateUtil.parseDateTime(MapUtils.getString(param,"time")))); + electricalData.setVoltageA(MapUtils.getString(param,"v1")); + electricalData.setVoltageB(MapUtils.getString(param,"v2")); + electricalData.setVoltageC(MapUtils.getString(param,"v3")); + electricalData.setPhaseCurrentA(MapUtils.getString(param,"c1")); + electricalData.setPhaseCurrentB(MapUtils.getString(param,"c2")); + electricalData.setPhaseCurrentC(MapUtils.getString(param,"c3")); + electricalData.setElectricLeakage(MapUtils.getString(param,"leak")); + electricalData.setCableTemperatureA(MapUtils.getString(param,"t2")); + electricalData.setCableTemperatureB(MapUtils.getString(param,"t3")); + electricalData.setCableTemperatureC(MapUtils.getString(param,"t4")); + electricalData.setAmbientTemperature(MapUtils.getString(param,"t1")); + electricalDataService.saveElectricalData(electricalData); + return Result.ok(); + } } diff --git a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java index 111fd6778..3d32ccab9 100644 --- a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java +++ b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java @@ -78,6 +78,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { http.authorizeRequests() //请求路径允许访问 + .antMatchers("/xmgl/electricalData/addByJj").permitAll() .antMatchers("/xmgl/cache/clearAll").permitAll() .antMatchers("/xmgl/videoScreenshot/captureScreenshotSync").permitAll() .antMatchers("/xmgl/policeCameraItemFile/*").permitAll()