diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/CrawlerCraneAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/CrawlerCraneAlarmController.java index 596fd0714..5209afd41 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/CrawlerCraneAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/CrawlerCraneAlarmController.java @@ -104,7 +104,7 @@ public class CrawlerCraneAlarmController { @ApiOperation(value = " 添加履带吊报警信息信息", notes = "添加履带吊报警信息信息", httpMethod = "POST") @PostMapping(value = "/add") public Result add(@RequestBody CrawlerCraneAlarm crawlerCraneAlarm) { - crawlerCraneAlarmService.save(crawlerCraneAlarm); + crawlerCraneAlarmService.saveInfo(crawlerCraneAlarm); return Result.success("添加成功!"); } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/CrawlerCraneCurrentDataController.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/CrawlerCraneCurrentDataController.java index a885db9da..83de39760 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/CrawlerCraneCurrentDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/CrawlerCraneCurrentDataController.java @@ -118,8 +118,7 @@ public class CrawlerCraneCurrentDataController { @ApiOperation(value = " 添加履带吊实时数据信息信息", notes = "添加履带吊实时数据信息信息", httpMethod = "POST") @PostMapping(value = "/add") public Result add(@RequestBody CrawlerCraneCurrentData crawlerCraneCurrentData) { - Result result = new Result(); - crawlerCraneCurrentDataService.save(crawlerCraneCurrentData); + crawlerCraneCurrentDataService.saveInfo(crawlerCraneCurrentData); return Result.success("添加成功!"); } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/CrawlerCraneWorkerCycleController.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/CrawlerCraneWorkerCycleController.java index 45a514ed4..cb238adfb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/CrawlerCraneWorkerCycleController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/CrawlerCraneWorkerCycleController.java @@ -104,8 +104,7 @@ public class CrawlerCraneWorkerCycleController { @ApiOperation(value = " 添加履带吊工作循环信息信息", notes = "添加履带吊工作循环信息信息", httpMethod = "POST") @PostMapping(value = "/add") public Result add(@RequestBody CrawlerCraneWorkerCycle crawlerCraneWorkerCycle) { - Result result = new Result(); - crawlerCraneWorkerCycleService.save(crawlerCraneWorkerCycle); + crawlerCraneWorkerCycleService.saveInfo(crawlerCraneWorkerCycle); return Result.success("添加成功!"); } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/TruckCraneAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/TruckCraneAlarmController.java index 3bdf72e7d..945de3f32 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/TruckCraneAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/TruckCraneAlarmController.java @@ -104,8 +104,7 @@ public class TruckCraneAlarmController { @ApiOperation(value = " 添加汽车吊报警信息信息", notes = "添加汽车吊报警信息信息", httpMethod = "POST") @PostMapping(value = "/add") public Result add(@RequestBody TruckCraneAlarm truckCraneAlarm) { - Result result = new Result(); - truckCraneAlarmService.save(truckCraneAlarm); + truckCraneAlarmService.saveInfo(truckCraneAlarm); return Result.success("添加成功!"); } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/TruckCraneCurrentDataController.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/TruckCraneCurrentDataController.java index d5336823b..77019f2e2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/TruckCraneCurrentDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/TruckCraneCurrentDataController.java @@ -117,7 +117,7 @@ public class TruckCraneCurrentDataController { @ApiOperation(value = " 添加汽车吊实时数据信息信息", notes = "添加汽车吊实时数据信息信息", httpMethod = "POST") @PostMapping(value = "/add") public Result add(@RequestBody TruckCraneCurrentData truckCraneCurrentData) { - truckCraneCurrentDataService.save(truckCraneCurrentData); + truckCraneCurrentDataService.saveInfo(truckCraneCurrentData); return Result.success("添加成功!"); } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/CrawlerCraneCurrentData.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/CrawlerCraneCurrentData.java index 3e7c5ae40..4febe4875 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/CrawlerCraneCurrentData.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/CrawlerCraneCurrentData.java @@ -69,7 +69,7 @@ public class CrawlerCraneCurrentData implements Serializable { * 风速 */ @Excel(name = "风速", width = 15) - @ApiModelProperty(value = "风速") + @ApiModelProperty(value = "风速") private String windSpeed; /** * 主钩吊重 diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ICrawlerCraneAlarmService.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ICrawlerCraneAlarmService.java index 09e171812..1e2adf2c5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ICrawlerCraneAlarmService.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ICrawlerCraneAlarmService.java @@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.bigdevice.service; import com.zhgd.xmgl.modules.bigdevice.entity.CrawlerCraneAlarm; import com.baomidou.mybatisplus.extension.service.IService; +import com.zhgd.xmgl.modules.bigdevice.entity.CrawlerCraneCurrentData; import java.util.Map; @@ -14,4 +15,6 @@ import java.util.Map; public interface ICrawlerCraneAlarmService extends IService { Map alarmStat(Map map); + + boolean saveInfo(CrawlerCraneAlarm crawlerCraneAlarm); } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ICrawlerCraneCurrentDataService.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ICrawlerCraneCurrentDataService.java index fe62dcc8a..989273419 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ICrawlerCraneCurrentDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ICrawlerCraneCurrentDataService.java @@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.bigdevice.service; import com.zhgd.xmgl.modules.bigdevice.entity.CrawlerCraneCurrentData; import com.baomidou.mybatisplus.extension.service.IService; +import com.zhgd.xmgl.modules.bigdevice.entity.CrawlerCraneWorkerCycle; import com.zhgd.xmgl.modules.bigdevice.entity.TruckCraneCurrentData; import java.util.List; @@ -19,4 +20,6 @@ public interface ICrawlerCraneCurrentDataService extends IService map); + + boolean saveInfo(CrawlerCraneCurrentData crawlerCraneCurrentData); } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ICrawlerCraneWorkerCycleService.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ICrawlerCraneWorkerCycleService.java index 318f5e129..60ef49ab0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ICrawlerCraneWorkerCycleService.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ICrawlerCraneWorkerCycleService.java @@ -1,7 +1,12 @@ package com.zhgd.xmgl.modules.bigdevice.service; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.xmgl.modules.bigdevice.entity.CrawlerCraneWorkerCycle; import com.baomidou.mybatisplus.extension.service.IService; +import com.zhgd.xmgl.modules.bigdevice.entity.TruckCrane; +import com.zhgd.xmgl.modules.bigdevice.entity.TruckCraneAlarm; +import org.springframework.beans.factory.annotation.Autowired; /** * @Description: 履带吊工作循环信息 @@ -11,4 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface ICrawlerCraneWorkerCycleService extends IService { + boolean saveInfo(CrawlerCraneWorkerCycle crawlerCraneWorkerCycle); } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ITruckCraneAlarmService.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ITruckCraneAlarmService.java index 4c9e55afd..a1c69314c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ITruckCraneAlarmService.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ITruckCraneAlarmService.java @@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.bigdevice.service; import com.zhgd.xmgl.modules.bigdevice.entity.TruckCraneAlarm; import com.baomidou.mybatisplus.extension.service.IService; +import com.zhgd.xmgl.modules.bigdevice.entity.TruckCraneCurrentData; import java.util.Map; @@ -14,4 +15,6 @@ import java.util.Map; public interface ITruckCraneAlarmService extends IService { Map alarmStat(Map map); + + boolean saveInfo(TruckCraneAlarm truckCraneAlarm); } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ITruckCraneCurrentDataService.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ITruckCraneCurrentDataService.java index 2ff2d47e5..2e20bfd15 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ITruckCraneCurrentDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ITruckCraneCurrentDataService.java @@ -19,4 +19,6 @@ public interface ITruckCraneCurrentDataService extends IService map); + boolean saveInfo(TruckCraneCurrentData truckCraneCurrentData); + } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/CrawlerCraneAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/CrawlerCraneAlarmServiceImpl.java index 60e1ebf09..983c64298 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/CrawlerCraneAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/CrawlerCraneAlarmServiceImpl.java @@ -3,12 +3,16 @@ package com.zhgd.xmgl.modules.bigdevice.service.impl; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.modules.bigdevice.entity.CrawlerCrane; import com.zhgd.xmgl.modules.bigdevice.entity.CrawlerCraneAlarm; import com.zhgd.xmgl.modules.bigdevice.entity.CrawlerCraneCurrentData; import com.zhgd.xmgl.modules.bigdevice.entity.TruckCraneAlarm; import com.zhgd.xmgl.modules.bigdevice.mapper.CrawlerCraneAlarmMapper; import com.zhgd.xmgl.modules.bigdevice.service.ICrawlerCraneAlarmService; +import com.zhgd.xmgl.modules.bigdevice.service.ICrawlerCraneService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -24,6 +28,9 @@ import java.util.*; @Service public class CrawlerCraneAlarmServiceImpl extends ServiceImpl implements ICrawlerCraneAlarmService { + @Autowired + private ICrawlerCraneService crawlerCraneService; + @Override public Map alarmStat(Map map) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(CrawlerCraneAlarm.class, map); @@ -84,4 +91,15 @@ public class CrawlerCraneAlarmServiceImpl extends ServiceImpllambdaQuery().ge(CrawlerCraneAlarm::getReportTime, DateUtil.beginOfDay(new Date())))); return resultMap; } + + @Override + public boolean saveInfo(CrawlerCraneAlarm crawlerCraneAlarm) { + CrawlerCrane crawlerCrane = crawlerCraneService.getOne(Wrappers.lambdaQuery().eq(CrawlerCrane::getDevSn, crawlerCraneAlarm.getDevSn())); + if (crawlerCrane == null) { + throw new OpenAlertException("该设备不存在"); + } + crawlerCraneAlarm.setDevName(crawlerCrane.getDevName()); + crawlerCraneAlarm.setProjectSn(crawlerCrane.getProjectSn()); + return this.save(crawlerCraneAlarm); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/CrawlerCraneCurrentDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/CrawlerCraneCurrentDataServiceImpl.java index 1ae917da5..08c49bad0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/CrawlerCraneCurrentDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/CrawlerCraneCurrentDataServiceImpl.java @@ -5,9 +5,11 @@ import cn.hutool.core.map.MapUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.xmgl.modules.bigdevice.entity.CrawlerCrane; import com.zhgd.xmgl.modules.bigdevice.entity.CrawlerCraneCurrentData; +import com.zhgd.xmgl.modules.bigdevice.entity.CrawlerCraneWorkerCycle; import com.zhgd.xmgl.modules.bigdevice.entity.TruckCraneCurrentData; import com.zhgd.xmgl.modules.bigdevice.mapper.CrawlerCraneCurrentDataMapper; import com.zhgd.xmgl.modules.bigdevice.service.ICrawlerCraneCurrentDataService; @@ -72,4 +74,15 @@ public class CrawlerCraneCurrentDataServiceImpl extends ServiceImpllambdaQuery().eq(CrawlerCrane::getDevSn, crawlerCraneCurrentData.getDevSn())); + if (crawlerCrane == null) { + throw new OpenAlertException("该设备不存在"); + } + crawlerCraneCurrentData.setDevName(crawlerCrane.getDevName()); + crawlerCraneCurrentData.setProjectSn(crawlerCrane.getProjectSn()); + return this.save(crawlerCraneCurrentData); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/CrawlerCraneWorkerCycleServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/CrawlerCraneWorkerCycleServiceImpl.java index df8724d31..05016980d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/CrawlerCraneWorkerCycleServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/CrawlerCraneWorkerCycleServiceImpl.java @@ -1,8 +1,14 @@ package com.zhgd.xmgl.modules.bigdevice.service.impl; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.zhgd.jeecg.common.execption.OpenAlertException; +import com.zhgd.xmgl.modules.bigdevice.entity.CrawlerCrane; import com.zhgd.xmgl.modules.bigdevice.entity.CrawlerCraneWorkerCycle; +import com.zhgd.xmgl.modules.bigdevice.entity.TruckCrane; import com.zhgd.xmgl.modules.bigdevice.mapper.CrawlerCraneWorkerCycleMapper; +import com.zhgd.xmgl.modules.bigdevice.service.ICrawlerCraneService; import com.zhgd.xmgl.modules.bigdevice.service.ICrawlerCraneWorkerCycleService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -16,4 +22,17 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class CrawlerCraneWorkerCycleServiceImpl extends ServiceImpl implements ICrawlerCraneWorkerCycleService { + @Autowired + private ICrawlerCraneService crawlerCraneService; + + @Override + public boolean saveInfo(CrawlerCraneWorkerCycle crawlerCraneWorkerCycle) { + CrawlerCrane crawlerCrane = crawlerCraneService.getOne(Wrappers.lambdaQuery().eq(CrawlerCrane::getDevSn, crawlerCraneWorkerCycle.getDevSn())); + if (crawlerCrane == null) { + throw new OpenAlertException("该设备不存在"); + } + crawlerCraneWorkerCycle.setDevName(crawlerCrane.getDevName()); + crawlerCraneWorkerCycle.setProjectSn(crawlerCrane.getProjectSn()); + return this.save(crawlerCraneWorkerCycle); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TruckCraneAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TruckCraneAlarmServiceImpl.java index 093d0626f..82eefbefe 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TruckCraneAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TruckCraneAlarmServiceImpl.java @@ -1,10 +1,16 @@ package com.zhgd.xmgl.modules.bigdevice.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.modules.bigdevice.entity.TruckCrane; import com.zhgd.xmgl.modules.bigdevice.entity.TruckCraneAlarm; +import com.zhgd.xmgl.modules.bigdevice.entity.TruckCraneCurrentData; import com.zhgd.xmgl.modules.bigdevice.mapper.TruckCraneAlarmMapper; import com.zhgd.xmgl.modules.bigdevice.service.ITruckCraneAlarmService; +import com.zhgd.xmgl.modules.bigdevice.service.ITruckCraneService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -23,6 +29,9 @@ import java.util.Map; @Service public class TruckCraneAlarmServiceImpl extends ServiceImpl implements ITruckCraneAlarmService { + @Autowired + private ITruckCraneService truckCraneService; + @Override public Map alarmStat(Map map) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(TruckCraneAlarm.class, map); @@ -61,4 +70,15 @@ public class TruckCraneAlarmServiceImpl extends ServiceImpllambdaQuery().eq(TruckCrane::getDevSn, truckCraneAlarm.getDevSn())); + if (truckCrane == null) { + throw new OpenAlertException("该设备不存在"); + } + truckCraneAlarm.setDevName(truckCrane.getDevName()); + truckCraneAlarm.setProjectSn(truckCrane.getProjectSn()); + return this.save(truckCraneAlarm); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TruckCraneCurrentDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TruckCraneCurrentDataServiceImpl.java index 415fe17cf..eb22c3535 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TruckCraneCurrentDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TruckCraneCurrentDataServiceImpl.java @@ -5,6 +5,8 @@ import cn.hutool.core.map.MapUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.zhgd.exception.CustomException; +import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.xmgl.modules.bigdevice.entity.CrawlerCrane; import com.zhgd.xmgl.modules.bigdevice.entity.TruckCrane; @@ -76,4 +78,15 @@ public class TruckCraneCurrentDataServiceImpl extends ServiceImpllambdaQuery().eq(TruckCrane::getDevSn, truckCraneCurrentData.getDevSn())); + if (truckCrane == null) { + throw new OpenAlertException("该设备不存在"); + } + truckCraneCurrentData.setDevName(truckCrane.getDevName()); + truckCraneCurrentData.setProjectSn(truckCrane.getProjectSn()); + return this.save(truckCraneCurrentData); + } }