From c85ebfc2763252bba26a2d103fa5b3f843b3f0e1 Mon Sep 17 00:00:00 2001 From: guo Date: Sat, 27 Jan 2024 10:25:07 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BridgeErectMachineDataController.java | 3 +- .../IBridgeErectMachineDataService.java | 3 ++ .../BridgeErectMachineDataServiceImpl.java | 20 +++++++++++++ .../HangBasketAlarmDataController.java | 7 +++-- .../HangBasketDetectDataController.java | 3 +- .../HangBasketDisplacementDataController.java | 3 +- .../service/IHangBasketAlarmDataService.java | 2 ++ .../service/IHangBasketDetectDataService.java | 2 ++ .../IHangBasketDisplacementDataService.java | 2 ++ .../impl/HangBasketAlarmDataServiceImpl.java | 20 +++++++++++++ .../impl/HangBasketDetectDataServiceImpl.java | 21 ++++++++++++++ ...HangBasketDisplacementDataServiceImpl.java | 20 +++++++++++++ .../HighSlopeCurrentDataController.java | 29 +++++++++++++++++++ .../zhgd/xmgl/security/WebSecurityConfig.java | 1 + 14 files changed, 130 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/controller/BridgeErectMachineDataController.java b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/controller/BridgeErectMachineDataController.java index 6afed7ef7..1a7761fd4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/controller/BridgeErectMachineDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/controller/BridgeErectMachineDataController.java @@ -86,7 +86,8 @@ public class BridgeErectMachineDataController { @ApiOperation(value = "添加架桥机生产数据信息", notes = "添加架桥机生产数据信息", httpMethod = "POST") @PostMapping(value = "/add") public Result add(@RequestBody BridgeErectMachineData bridgeErectMachineData) { - bridgeErectMachineDataService.save(bridgeErectMachineData); + log.info("添加架桥机生产数据信息：{}", JSON.toJSONString(bridgeErectMachineData)); + bridgeErectMachineDataService.add(bridgeErectMachineData); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/IBridgeErectMachineDataService.java b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/IBridgeErectMachineDataService.java index f3b5d425f..118a9a4bf 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/IBridgeErectMachineDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/IBridgeErectMachineDataService.java @@ -18,4 +18,7 @@ public interface IBridgeErectMachineDataService extends IService queryPageList(HashMap paramMap); List queryList(HashMap paramMap); + + void add(BridgeErectMachineData bridgeErectMachineData); + } diff --git a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/impl/BridgeErectMachineDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/impl/BridgeErectMachineDataServiceImpl.java index 1c8b39980..2f38cbdb7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/impl/BridgeErectMachineDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/impl/BridgeErectMachineDataServiceImpl.java @@ -1,8 +1,13 @@ package com.zhgd.xmgl.modules.bridgeerectmachine.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineData; +import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineDev; import com.zhgd.xmgl.modules.bridgeerectmachine.mapper.BridgeErectMachineDataMapper; +import com.zhgd.xmgl.modules.bridgeerectmachine.mapper.BridgeErectMachineDevMapper; import com.zhgd.xmgl.modules.bridgeerectmachine.service.IBridgeErectMachineDataService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -24,6 +29,9 @@ import com.zhgd.xmgl.util.RefUtil; */ @Service public class BridgeErectMachineDataServiceImpl extends ServiceImpl implements IBridgeErectMachineDataService { + @Autowired + private BridgeErectMachineDevMapper bridgeErectMachineDevMapper; + @Override public IPage queryPageList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); @@ -39,6 +47,18 @@ public class BridgeErectMachineDataServiceImpl extends ServiceImpl() + .eq(BridgeErectMachineDev::getDevSn, bridgeErectMachineData.getDevSn())); + if (dev == null) { + throw new OpenAlertException("设备编号不正确"); + } + bridgeErectMachineData.setDevName(dev.getDevName()); + bridgeErectMachineData.setProjectSn(dev.getProjectSn()); + baseMapper.insert(bridgeErectMachineData); + } + private QueryWrapper getQueryWrapper(HashMap paramMap) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(BridgeErectMachineData.class, paramMap); queryWrapper.orderByDesc(RefUtil.fieldNameUlc(BridgeErectMachineData::getId)); diff --git a/src/main/java/com/zhgd/xmgl/modules/hangbasket/controller/HangBasketAlarmDataController.java b/src/main/java/com/zhgd/xmgl/modules/hangbasket/controller/HangBasketAlarmDataController.java index 594f0acfa..5fef549cf 100644 --- a/src/main/java/com/zhgd/xmgl/modules/hangbasket/controller/HangBasketAlarmDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/hangbasket/controller/HangBasketAlarmDataController.java @@ -90,9 +90,10 @@ public class HangBasketAlarmDataController { @ApiOperation(value = "添加挂篮告警数据信息", notes = "添加挂篮告警数据信息", httpMethod = "POST") @PostMapping(value = "/add") public Result add(@RequestBody HangBasketAlarmData hangBasketAlarmData) { - hangBasketAlarmDataService.save(hangBasketAlarmData); - return Result.ok(); - } + log.info("添加挂篮告警数据信息:{}", JSON.toJSONString(hangBasketAlarmData)); + hangBasketAlarmDataService.add(hangBasketAlarmData); + return Result.ok(); + } /** * 编辑 diff --git a/src/main/java/com/zhgd/xmgl/modules/hangbasket/controller/HangBasketDetectDataController.java b/src/main/java/com/zhgd/xmgl/modules/hangbasket/controller/HangBasketDetectDataController.java index 05e209035..0c0c46733 100644 --- a/src/main/java/com/zhgd/xmgl/modules/hangbasket/controller/HangBasketDetectDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/hangbasket/controller/HangBasketDetectDataController.java @@ -86,7 +86,8 @@ public class HangBasketDetectDataController { @ApiOperation(value = "添加挂篮检测数据信息", notes = "添加挂篮检测数据信息", httpMethod = "POST") @PostMapping(value = "/add") public Result add(@RequestBody HangBasketDetectData hangBasketDetectData) { - hangBasketDetectDataService.save(hangBasketDetectData); + log.info("添加挂篮检测数据信息:{}", JSON.toJSONString(hangBasketDetectData)); + hangBasketDetectDataService.add(hangBasketDetectData); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/hangbasket/controller/HangBasketDisplacementDataController.java b/src/main/java/com/zhgd/xmgl/modules/hangbasket/controller/HangBasketDisplacementDataController.java index 1383939b5..a77c893a2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/hangbasket/controller/HangBasketDisplacementDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/hangbasket/controller/HangBasketDisplacementDataController.java @@ -86,7 +86,8 @@ public class HangBasketDisplacementDataController { @ApiOperation(value = "添加挂篮位移数据信息", notes = "添加挂篮位移数据信息", httpMethod = "POST") @PostMapping(value = "/add") public Result add(@RequestBody HangBasketDisplacementData hangBasketDisplacementData) { - hangBasketDisplacementDataService.save(hangBasketDisplacementData); + log.info("添加挂篮位移数据信息:{}", JSON.toJSONString(hangBasketDisplacementData)); + hangBasketDisplacementDataService.add(hangBasketDisplacementData); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketAlarmDataService.java b/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketAlarmDataService.java index 160987180..2b402a578 100644 --- a/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketAlarmDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketAlarmDataService.java @@ -18,4 +18,6 @@ public interface IHangBasketAlarmDataService extends IService queryPageList(HashMap paramMap); List queryList(HashMap paramMap); + + void add(HangBasketAlarmData hangBasketAlarmData); } diff --git a/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketDetectDataService.java b/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketDetectDataService.java index 266f6dc64..5ac249721 100644 --- a/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketDetectDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketDetectDataService.java @@ -18,4 +18,6 @@ public interface IHangBasketDetectDataService extends IService queryPageList(HashMap paramMap); List queryList(HashMap paramMap); + + void add(HangBasketDetectData hangBasketDetectData); } diff --git a/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketDisplacementDataService.java b/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketDisplacementDataService.java index 11d659a98..02574e16b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketDisplacementDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketDisplacementDataService.java @@ -18,4 +18,6 @@ public interface IHangBasketDisplacementDataService extends IService queryPageList(HashMap paramMap); List queryList(HashMap paramMap); + + void add(HangBasketDisplacementData hangBasketDisplacementData); } diff --git a/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/impl/HangBasketAlarmDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/impl/HangBasketAlarmDataServiceImpl.java index 8aa8ec1f5..fefb3259f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/impl/HangBasketAlarmDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/impl/HangBasketAlarmDataServiceImpl.java @@ -1,8 +1,13 @@ package com.zhgd.xmgl.modules.hangbasket.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.xmgl.modules.hangbasket.entity.HangBasketAlarmData; +import com.zhgd.xmgl.modules.hangbasket.entity.HangBasketDev; import com.zhgd.xmgl.modules.hangbasket.mapper.HangBasketAlarmDataMapper; +import com.zhgd.xmgl.modules.hangbasket.mapper.HangBasketDevMapper; import com.zhgd.xmgl.modules.hangbasket.service.IHangBasketAlarmDataService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -24,6 +29,9 @@ import com.zhgd.xmgl.util.RefUtil; */ @Service public class HangBasketAlarmDataServiceImpl extends ServiceImpl implements IHangBasketAlarmDataService { + @Autowired + private HangBasketDevMapper hangBasketDevMapper; + @Override public IPage queryPageList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); @@ -39,6 +47,18 @@ public class HangBasketAlarmDataServiceImpl extends ServiceImpl() + .eq(HangBasketDev::getDevSn, hangBasketAlarmData.getDevSn())); + if (dev == null) { + throw new OpenAlertException("设备编号不正确"); + } + hangBasketAlarmData.setProjectSn(dev.getProjectSn()); + hangBasketAlarmData.setDevName(dev.getDevName()); + baseMapper.insert(hangBasketAlarmData); + } + private QueryWrapper getQueryWrapper(HashMap paramMap) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(HangBasketAlarmData.class, paramMap); queryWrapper.orderByDesc(RefUtil.fieldNameUlc(HangBasketAlarmData::getId)); diff --git a/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/impl/HangBasketDetectDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/impl/HangBasketDetectDataServiceImpl.java index dd405708a..cf64aa9db 100644 --- a/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/impl/HangBasketDetectDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/impl/HangBasketDetectDataServiceImpl.java @@ -1,8 +1,14 @@ package com.zhgd.xmgl.modules.hangbasket.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.zhgd.jeecg.common.execption.OpenAlertException; +import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineDev; import com.zhgd.xmgl.modules.hangbasket.entity.HangBasketDetectData; +import com.zhgd.xmgl.modules.hangbasket.entity.HangBasketDev; import com.zhgd.xmgl.modules.hangbasket.mapper.HangBasketDetectDataMapper; +import com.zhgd.xmgl.modules.hangbasket.mapper.HangBasketDevMapper; import com.zhgd.xmgl.modules.hangbasket.service.IHangBasketDetectDataService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -24,6 +30,9 @@ import com.zhgd.xmgl.util.RefUtil; */ @Service public class HangBasketDetectDataServiceImpl extends ServiceImpl implements IHangBasketDetectDataService { + @Autowired + private HangBasketDevMapper hangBasketDevMapper; + @Override public IPage queryPageList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); @@ -39,6 +48,18 @@ public class HangBasketDetectDataServiceImpl extends ServiceImpl() + .eq(HangBasketDev::getDevSn, hangBasketDetectData.getDevSn())); + if (dev == null) { + throw new OpenAlertException("设备编号不正确"); + } + hangBasketDetectData.setProjectSn(dev.getProjectSn()); + hangBasketDetectData.setDevName(dev.getDevName()); + baseMapper.insert(hangBasketDetectData); + } + private QueryWrapper getQueryWrapper(HashMap paramMap) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(HangBasketDetectData.class, paramMap); queryWrapper.orderByDesc(RefUtil.fieldNameUlc(HangBasketDetectData::getId)); diff --git a/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/impl/HangBasketDisplacementDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/impl/HangBasketDisplacementDataServiceImpl.java index 22179bca4..412f867f5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/impl/HangBasketDisplacementDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/impl/HangBasketDisplacementDataServiceImpl.java @@ -1,8 +1,13 @@ package com.zhgd.xmgl.modules.hangbasket.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.zhgd.jeecg.common.execption.OpenAlertException; +import com.zhgd.xmgl.modules.hangbasket.entity.HangBasketDev; import com.zhgd.xmgl.modules.hangbasket.entity.HangBasketDisplacementData; +import com.zhgd.xmgl.modules.hangbasket.mapper.HangBasketDevMapper; import com.zhgd.xmgl.modules.hangbasket.mapper.HangBasketDisplacementDataMapper; import com.zhgd.xmgl.modules.hangbasket.service.IHangBasketDisplacementDataService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -24,6 +29,9 @@ import com.zhgd.xmgl.util.RefUtil; */ @Service public class HangBasketDisplacementDataServiceImpl extends ServiceImpl implements IHangBasketDisplacementDataService { + @Autowired + private HangBasketDevMapper hangBasketDevMapper; + @Override public IPage queryPageList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); @@ -39,6 +47,18 @@ public class HangBasketDisplacementDataServiceImpl extends ServiceImpl() + .eq(HangBasketDev::getDevSn, hangBasketDisplacementData.getDevSn())); + if (dev == null) { + throw new OpenAlertException("设备编号不正确"); + } + hangBasketDisplacementData.setProjectSn(dev.getProjectSn()); + hangBasketDisplacementData.setDevName(dev.getDevName()); + baseMapper.insert(hangBasketDisplacementData); + } + private QueryWrapper getQueryWrapper(HashMap paramMap) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(HangBasketDisplacementData.class, paramMap); queryWrapper.orderByDesc(RefUtil.fieldNameUlc(HangBasketDisplacementData::getId)); diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/controller/HighSlopeCurrentDataController.java b/src/main/java/com/zhgd/xmgl/modules/highslope/controller/HighSlopeCurrentDataController.java index 0159cbaf5..3b9283e64 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highslope/controller/HighSlopeCurrentDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/highslope/controller/HighSlopeCurrentDataController.java @@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.highslope.controller; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.NumberUtil; +import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; @@ -208,4 +209,32 @@ public class HighSlopeCurrentDataController { public Result> getNumberDifferentTypesAlarmsRadarChartOneMonth(@RequestParam Map map) { return Result.success(highSlopeCurrentDataService.getNumberDifferentTypesAlarmsRadarChartOneMonth(map)); } + + @PostMapping("/lrk/add") + @ApiOperation(value = "接收高边坡数据", notes = "接收高边坡数据") + @ApiImplicitParams({ + @ApiImplicitParam(required = true, allowMultiple = true, dataType = "array"), + @ApiImplicitParam(name = "current", value = "实时数据", dataType = "object"), + @ApiImplicitParam(name = "current.calcValue", value = "单位根据监测类型", allowMultiple = true, dataType = "object"), + @ApiImplicitParam(name = "current.calcValue.rateChange", value = "变化速率", dataType = "float"), + @ApiImplicitParam(name = "current.calcValue.value", value = "计算值", dataType = "float"), + @ApiImplicitParam(name = "current.calcValue.variation", value = "变化值", dataType = "float"), + @ApiImplicitParam(name = "current.pointAlarmStatus", value = "报警状态", dataType = "object"), + @ApiImplicitParam(name = "current.pointAlarmStatus.alarmState", value = "警状态 报警状态 1.正常 2.超报警 3.超控制 4.变化速率报警", dataType = "int"), + @ApiImplicitParam(name = "metadata.deviceCode", value = "设备编号", dataType = "string"), + @ApiImplicitParam(name = "metadata.monitorTypeName", value = "监测名称", dataType = "string"), + @ApiImplicitParam(name = "metadata.nickname", value = "测点昵称", dataType = "string"), + @ApiImplicitParam(name = "metadata.projectCode", value = "项目编号", dataType = "string") + }) + public Result addLrkData(@RequestBody JSONArray jsonArray) { + log.info("addLrkData推送数据：{}", jsonArray); + try { + highSlopeCurrentDataService.saveBatchHighSlopeCurrentData(jsonArray); + } catch (Exception e) { + e.printStackTrace(); + log.error("推送数据接收错误！错误原因为：{}", e.getMessage()); + throw new RuntimeException("推送数据接收错误！错误原因为：" + e.getMessage()); + } + return new Result().code(1); + } } diff --git a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java index d6feb619d..4f22844c7 100644 --- a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java +++ b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java @@ -311,6 +311,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { .antMatchers("/xmgl/sprayRtDev/list").permitAll() .antMatchers("/xmgl/sprayRtDev/editByDevSn").permitAll() .antMatchers("/xmgl/sprayRtData/add").permitAll() + .antMatchers("/xmgl/highSlopeCurrentData/lrk/add").permitAll() .antMatchers(HttpMethod.OPTIONS, "/**").anonymous() .anyRequest().authenticated() // 剩下所有的验证都需要验证. .and()