diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorCurrentDataController.java b/src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorCurrentDataController.java index 19409e043..b79ecdf56 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorCurrentDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorCurrentDataController.java @@ -2,9 +2,9 @@ package com.zhgd.xmgl.modules.concrete.controller; import com.gexin.fastjson.JSON; import com.zhgd.jeecg.common.api.vo.Result; -import com.zhgd.jeecg.common.mybatis.EntityMap; -import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorCurrentData; import com.zhgd.xmgl.entity.vo.ConcreteMonitorCurrentDataVo; +import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorCurrentData; +import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorDevPointPosition; import com.zhgd.xmgl.modules.concrete.service.IConcreteMonitorCurrentDataService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -25,7 +25,7 @@ import java.util.Map; * @Title: Controller * @Description: 混凝土监测-实时数据 * @author： pds - * @date： 2021-04-22 + * @date： 2021-04-22 * @version： V1.0 */ @RestController @@ -33,31 +33,32 @@ import java.util.Map; @Slf4j @Api(tags = "混凝土监测-实时数据") public class ConcreteMonitorCurrentDataController { - @Autowired - private IConcreteMonitorCurrentDataService concreteMonitorCurrentDataService; + @Autowired + private IConcreteMonitorCurrentDataService concreteMonitorCurrentDataService; /** - * 添加 + * 添加 + * * @param * @return */ - @ApiOperation(value = " 添加混凝土监测-实时数据信息", notes = "添加混凝土监测-实时数据信息" , httpMethod="POST") - @PostMapping(value = "/add") - public Result add(@RequestBody ConcreteMonitorCurrentDataVo concreteMonitorCurrentDataVo) { + @ApiOperation(value = " 添加混凝土监测-实时数据信息", notes = "添加混凝土监测-实时数据信息", httpMethod = "POST") + @PostMapping(value = "/add") + public Result add(@RequestBody ConcreteMonitorCurrentDataVo concreteMonitorCurrentDataVo) { log.info("添加混凝土监测-实时数据信息：{}", JSON.toJSONString(concreteMonitorCurrentDataVo)); concreteMonitorCurrentDataService.saveConcreteMonitorCurrentData(concreteMonitorCurrentDataVo); return Result.ok(); - } + } - @ApiOperation(value = "查询混凝土监测设备各点位最新一条实时数据", notes = "查询凝土监测设备各点位最新一条实时数据" , httpMethod="POST") + @ApiOperation(value = "查询混凝土监测设备各点位最新一条实时数据", notes = "查询凝土监测设备各点位最新一条实时数据", httpMethod = "POST") @ApiImplicitParam(name = "devSn", value = "塔机设备编号", paramType = "query", required = true, dataType = "Integer") @PostMapping(value = "/getNewestConcreteMonitorCurrentData") - public Result> getNewestConcreteMonitorCurrentData(@RequestBody Map map) { + public Result> getNewestConcreteMonitorCurrentData(@RequestBody Map map) { return Result.success(concreteMonitorCurrentDataService.getNewestConcreteMonitorCurrentData(map)); } - @ApiOperation(value = "查询混凝土监测当日实时数据", notes = "查询凝土监测当日实时数据" , httpMethod="POST") + @ApiOperation(value = "查询混凝土监测当日实时数据", notes = "查询凝土监测当日实时数据", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "devSn", value = "塔机设备编号", paramType = "query", required = true, dataType = "String"), @@ -65,7 +66,7 @@ public class ConcreteMonitorCurrentDataController { @ApiImplicitParam(name = "pointNo", value = "监测点点位号", paramType = "query", required = true, dataType = "String") }) @PostMapping(value = "/getTodayConcreteMonitorCurrentDataList") - public Result> getTodayConcreteMonitorCurrentDataList(@RequestBody Map map) { + public Result> getTodayConcreteMonitorCurrentDataList(@RequestBody Map map) { return Result.success(concreteMonitorCurrentDataService.getTodayConcreteMonitorCurrentDataList(map)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/entity/ConcreteMonitorDevPointPosition.java b/src/main/java/com/zhgd/xmgl/modules/concrete/entity/ConcreteMonitorDevPointPosition.java index 06866bf6e..e0ba9fae5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/entity/ConcreteMonitorDevPointPosition.java +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/entity/ConcreteMonitorDevPointPosition.java @@ -1,50 +1,66 @@ package com.zhgd.xmgl.modules.concrete.entity; -import java.io.Serializable; - import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import lombok.Data; -import org.jeecgframework.poi.excel.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; + +import java.io.Serializable; +import java.util.List; + /** * @Description: 混凝土监测设备-监测点位置 * @author： pds - * @date： 2021-04-22 + * @date： 2021-04-22 * @version： V1.0 */ @Data @TableName("concrete_monitor_dev_point_position") -@ApiModel(value="ConcreteMonitorDevPointPosition实体类",description="ConcreteMonitorDevPointPosition") +@ApiModel(value = "ConcreteMonitorDevPointPosition实体类", description = "ConcreteMonitorDevPointPosition") public class ConcreteMonitorDevPointPosition implements Serializable { private static final long serialVersionUID = 1L; - - /**id*/ + + /** + * id + */ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value="id") - private java.lang.Long id ; - /**设备编号*/ - @Excel(name = "设备编号", width = 15) - @ApiModelProperty(value="设备编号") - private java.lang.String devSn ; - /**项目sn*/ + @ApiModelProperty(value = "id") + private java.lang.Long id; + /** + * 设备编号 + */ + @Excel(name = "设备编号", width = 15) + @ApiModelProperty(value = "设备编号") + private java.lang.String devSn; + /** + * 项目sn + */ @Excel(name = "项目sn", width = 15) - @ApiModelProperty(value="项目sn") - private java.lang.String projectSn ; - /**监测点点位名称*/ - @Excel(name = "监测点点位名称", width = 15) - @ApiModelProperty(value="监测点点位名称") - private java.lang.String pointName ; - /**监测点点位号*/ - @Excel(name = "监测点点位号", width = 15) - @ApiModelProperty(value="监测点点位号") - private java.lang.Integer pointNo ; - /**温度报警阀值*/ - @Excel(name = "温度报警阀值", width = 15) - @ApiModelProperty(value="温度报警阀值") - private java.lang.Double temperatureThreshold ; + @ApiModelProperty(value = "项目sn") + private java.lang.String projectSn; + /** + * 监测点点位名称 + */ + @Excel(name = "监测点点位名称", width = 15) + @ApiModelProperty(value = "监测点点位名称") + private java.lang.String pointName; + /** + * 监测点点位号 + */ + @Excel(name = "监测点点位号", width = 15) + @ApiModelProperty(value = "监测点点位号") + private java.lang.Integer pointNo; + /** + * 温度报警阀值 + */ + @Excel(name = "温度报警阀值", width = 15) + @ApiModelProperty(value = "温度报警阀值") + private java.lang.Double temperatureThreshold; + @TableField(exist = false) + @ApiModelProperty(value = "混凝土监测-实时数据") + private List list; } diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorCurrentDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorCurrentDataMapper.java index 9da17a6eb..07a1f37c9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorCurrentDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorCurrentDataMapper.java @@ -20,5 +20,5 @@ public interface ConcreteMonitorCurrentDataMapper extends BaseMapper getTodayConcreteMonitorCurrentDataList(Map map); - List getNewestConcreteMonitorCurrentData(@Param("devSn") String devSn, @Param("pointNo")String pointNo); + List getNewestConcreteMonitorCurrentData(@Param("devSn") String devSn, @Param("pointNo") String pointNo); } diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorDevPointPositionMapper.java b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorDevPointPositionMapper.java index 7c97e094e..decfe37d4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorDevPointPositionMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorDevPointPositionMapper.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Map; import com.zhgd.jeecg.common.mybatis.EntityMap; +import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorCurrentData; import org.apache.ibatis.annotations.Mapper; import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorDevPointPosition; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -17,5 +18,4 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper public interface ConcreteMonitorDevPointPositionMapper extends BaseMapper { - List selectConcreteMonitorDevPointPositionList(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorCurrentDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorCurrentDataMapper.xml index 936fe05d0..82fdc216e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorCurrentDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorCurrentDataMapper.xml @@ -17,12 +17,12 @@ - SELECT a.* from concrete_monitor_current_data a WHERE dev_sn=#{devSn} and point_no=#{pointNo} ORDER BY receive_time DESC LIMIT 1 - - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorDevPointPositionMapper.xml b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorDevPointPositionMapper.xml index 1aa6d74ed..0b0b8e8f8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorDevPointPositionMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorDevPointPositionMapper.xml @@ -2,11 +2,4 @@ - - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/service/IConcreteMonitorCurrentDataService.java b/src/main/java/com/zhgd/xmgl/modules/concrete/service/IConcreteMonitorCurrentDataService.java index 9b40e68d4..82e477f80 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/service/IConcreteMonitorCurrentDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/service/IConcreteMonitorCurrentDataService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorCurrentData; import com.zhgd.xmgl.entity.vo.ConcreteMonitorCurrentDataVo; +import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorDevPointPosition; import java.util.List; import java.util.Map; @@ -20,5 +21,5 @@ public interface IConcreteMonitorCurrentDataService extends IService getTodayConcreteMonitorCurrentDataList(Map map); - List getNewestConcreteMonitorCurrentData(Map map); + List getNewestConcreteMonitorCurrentData(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorCurrentDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorCurrentDataServiceImpl.java index acd0a81f6..95a2027db 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorCurrentDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorCurrentDataServiceImpl.java @@ -1,9 +1,9 @@ package com.zhgd.xmgl.modules.concrete.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; -import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.entity.vo.ConcreteMonitorCurrentDataVo; import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorAlarm; import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorCurrentData; @@ -91,12 +91,13 @@ public class ConcreteMonitorCurrentDataServiceImpl extends ServiceImpl getNewestConcreteMonitorCurrentData(Map map) { - List pointList = concreteMonitorDevPointPositionMapper.selectConcreteMonitorDevPointPositionList(map); + public List getNewestConcreteMonitorCurrentData(Map map) { + String devSn = MapUtils.getString(map, "devSn"); + List pointList = concreteMonitorDevPointPositionMapper.selectList(new LambdaQueryWrapper().eq(ConcreteMonitorDevPointPosition::getDevSn, devSn)); if (pointList != null && pointList.size() > 0) { - for (EntityMap data : pointList) { - List list = concreteMonitorCurrentDataMapper.getNewestConcreteMonitorCurrentData(MapUtils.getString(data, "devSn"), MapUtils.getString(data, "pointNo")); - data.put("list", list); + for (ConcreteMonitorDevPointPosition data : pointList) { + List list = concreteMonitorCurrentDataMapper.getNewestConcreteMonitorCurrentData(devSn, String.valueOf(data.getPointNo())); + data.setList(list); } } return pointList; diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorDevServiceImpl.java index 64cc5018d..daa873ec1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorDevServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorDevServiceImpl.java @@ -27,7 +27,7 @@ import java.util.UUID; /** * @Description: 混凝土监测设备 * @author： pds - * @date： 2021-04-22 + * @date： 2021-04-22 * @version： V1.0 */ @Service @@ -43,21 +43,21 @@ public class ConcreteMonitorDevServiceImpl extends ServiceImpl page = new Page<>(pageNo, pageSize); - List list=concreteMonitorDevMapper.selectConcreteMonitorDevPageList(page, map); + List list = concreteMonitorDevMapper.selectConcreteMonitorDevPageList(page, map); return page.setRecords(list); } @Override public List selectConcreteMonitorDevList(Map map) { - QueryWrapper queryWrapper=new QueryWrapper<>(); - queryWrapper.lambda().eq(ConcreteMonitorDev::getProjectSn, MapUtils.getString(map,"projectSn")); - List list=concreteMonitorDevMapper.selectList(queryWrapper); - if(list!=null&&list.size()>0){ - for (ConcreteMonitorDev dev:list){ - QueryWrapper qu=new QueryWrapper<>(); - qu.lambda().eq(ConcreteMonitorDevPointPosition::getDevSn,dev.getDevSn()) - .eq(ConcreteMonitorDevPointPosition::getProjectSn,dev.getProjectSn()); - List pointList=concreteMonitorDevPointPositionMapper.selectList(qu); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(ConcreteMonitorDev::getProjectSn, MapUtils.getString(map, "projectSn")); + List list = concreteMonitorDevMapper.selectList(queryWrapper); + if (list != null && list.size() > 0) { + for (ConcreteMonitorDev dev : list) { + QueryWrapper qu = new QueryWrapper<>(); + qu.lambda().eq(ConcreteMonitorDevPointPosition::getDevSn, dev.getDevSn()) + .eq(ConcreteMonitorDevPointPosition::getProjectSn, dev.getProjectSn()); + List pointList = concreteMonitorDevPointPositionMapper.selectList(qu); dev.setPointList(pointList); } } @@ -68,20 +68,20 @@ public class ConcreteMonitorDevServiceImpl extends ServiceImpl queryWrapper=new QueryWrapper<>(); - queryWrapper.lambda().eq(ConcreteMonitorDev::getDevSn,concreteMonitorDev.getDevSn()); - int count=concreteMonitorDevMapper.selectCount(queryWrapper); - if(count>0){ + } else { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(ConcreteMonitorDev::getDevSn, concreteMonitorDev.getDevSn()); + int count = concreteMonitorDevMapper.selectCount(queryWrapper); + if (count > 0) { throw new OpenAlertException(MessageUtil.get("EquipmentNumExistErr")); } } concreteMonitorDev.setRealTime(new Date()); concreteMonitorDevMapper.insert(concreteMonitorDev); - if(concreteMonitorDev.getPointList()!=null&&concreteMonitorDev.getPointList().size()>0){ - for (ConcreteMonitorDevPointPosition pointPosition:concreteMonitorDev.getPointList()){ + if (concreteMonitorDev.getPointList() != null && concreteMonitorDev.getPointList().size() > 0) { + for (ConcreteMonitorDevPointPosition pointPosition : concreteMonitorDev.getPointList()) { pointPosition.setDevSn(concreteMonitorDev.getDevSn()); pointPosition.setProjectSn(concreteMonitorDev.getProjectSn()); concreteMonitorDevPointPositionMapper.insert(pointPosition); @@ -93,12 +93,12 @@ public class ConcreteMonitorDevServiceImpl extends ServiceImpl0){ - QueryWrapper queryWrapper=new QueryWrapper<>(); - queryWrapper.lambda().eq(ConcreteMonitorDevPointPosition::getProjectSn,concreteMonitorDev.getProjectSn()) - .eq(ConcreteMonitorDevPointPosition::getDevSn,concreteMonitorDev.getDevSn()); + if (concreteMonitorDev.getPointList() != null && concreteMonitorDev.getPointList().size() > 0) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(ConcreteMonitorDevPointPosition::getProjectSn, concreteMonitorDev.getProjectSn()) + .eq(ConcreteMonitorDevPointPosition::getDevSn, concreteMonitorDev.getDevSn()); concreteMonitorDevPointPositionMapper.delete(queryWrapper); - for (ConcreteMonitorDevPointPosition pointPosition:concreteMonitorDev.getPointList()){ + for (ConcreteMonitorDevPointPosition pointPosition : concreteMonitorDev.getPointList()) { pointPosition.setDevSn(concreteMonitorDev.getDevSn()); pointPosition.setProjectSn(concreteMonitorDev.getProjectSn()); concreteMonitorDevPointPositionMapper.insert(pointPosition); @@ -108,24 +108,24 @@ public class ConcreteMonitorDevServiceImpl extends ServiceImpl queryWrapper=new QueryWrapper<>(); - queryWrapper.lambda().eq(ConcreteMonitorDevPointPosition::getProjectSn,concreteMonitorDev.getProjectSn()) - .eq(ConcreteMonitorDevPointPosition::getDevSn,concreteMonitorDev.getDevSn()); + if (concreteMonitorDev != null) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(ConcreteMonitorDevPointPosition::getProjectSn, concreteMonitorDev.getProjectSn()) + .eq(ConcreteMonitorDevPointPosition::getDevSn, concreteMonitorDev.getDevSn()); concreteMonitorDevPointPositionMapper.delete(queryWrapper); } } @Override public ConcreteMonitorDev selectConcreteMonitorDevById(String id) { - ConcreteMonitorDev concreteMonitorDev=concreteMonitorDevMapper.selectById(id); - if(concreteMonitorDev!=null){ - QueryWrapper qu=new QueryWrapper<>(); - qu.lambda().eq(ConcreteMonitorDevPointPosition::getDevSn,concreteMonitorDev.getDevSn()) - .eq(ConcreteMonitorDevPointPosition::getProjectSn,concreteMonitorDev.getProjectSn()); - List pointList=concreteMonitorDevPointPositionMapper.selectList(qu); + ConcreteMonitorDev concreteMonitorDev = concreteMonitorDevMapper.selectById(id); + if (concreteMonitorDev != null) { + QueryWrapper qu = new QueryWrapper<>(); + qu.lambda().eq(ConcreteMonitorDevPointPosition::getDevSn, concreteMonitorDev.getDevSn()) + .eq(ConcreteMonitorDevPointPosition::getProjectSn, concreteMonitorDev.getProjectSn()); + List pointList = concreteMonitorDevPointPositionMapper.selectList(qu); concreteMonitorDev.setPointList(pointList); } return concreteMonitorDev;