admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
guo 2023-08-08 16:22:13 +08:00
parent eab1e05e2d
commit 8c6e852c4c
9 changed files with 112 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorCurrentDataController.java
View File

@ -2,9 +2,9 @@ package com.zhgd.xmgl.modules.concrete.controller;
import com.gexin.fastjson.JSON; import com.gexin.fastjson.JSON;
import com.zhgd.jeecg.common.api.vo.Result; 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.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 com.zhgd.xmgl.modules.concrete.service.IConcreteMonitorCurrentDataService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
@ -25,7 +25,7 @@ import java.util.Map;
* @Title: Controller * @Title: Controller
* @Description: 混凝土监测-实时数据 * @Description: 混凝土监测-实时数据
* @author： pds * @author： pds
* @date： 2021-04-22 * @date： 2021-04-22
* @version： V1.0 * @version： V1.0
*/ */
@RestController @RestController
@ -33,31 +33,32 @@ import java.util.Map;
@Slf4j @Slf4j
@Api(tags = "混凝土监测-实时数据") @Api(tags = "混凝土监测-实时数据")
public class ConcreteMonitorCurrentDataController { public class ConcreteMonitorCurrentDataController {
@Autowired @Autowired
private IConcreteMonitorCurrentDataService concreteMonitorCurrentDataService; private IConcreteMonitorCurrentDataService concreteMonitorCurrentDataService;
/** /**
* 添加 * 添加
*
* @param * @param
* @return * @return
*/ */
@ApiOperation(value = " 添加混凝土监测-实时数据信息", notes = "添加混凝土监测-实时数据信息" , httpMethod="POST") @ApiOperation(value = " 添加混凝土监测-实时数据信息", notes = "添加混凝土监测-实时数据信息", httpMethod = "POST")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<ConcreteMonitorCurrentData> add(@RequestBody ConcreteMonitorCurrentDataVo concreteMonitorCurrentDataVo) { public Result<ConcreteMonitorCurrentData> add(@RequestBody ConcreteMonitorCurrentDataVo concreteMonitorCurrentDataVo) {
log.info("添加混凝土监测-实时数据信息：{}", JSON.toJSONString(concreteMonitorCurrentDataVo)); log.info("添加混凝土监测-实时数据信息：{}", JSON.toJSONString(concreteMonitorCurrentDataVo));
concreteMonitorCurrentDataService.saveConcreteMonitorCurrentData(concreteMonitorCurrentDataVo); concreteMonitorCurrentDataService.saveConcreteMonitorCurrentData(concreteMonitorCurrentDataVo);
return Result.ok(); return Result.ok();
} }
@ApiOperation(value = "查询混凝土监测设备各点位最新一条实时数据", notes = "查询凝土监测设备各点位最新一条实时数据" , httpMethod="POST") @ApiOperation(value = "查询混凝土监测设备各点位最新一条实时数据", notes = "查询凝土监测设备各点位最新一条实时数据", httpMethod = "POST")
@ApiImplicitParam(name = "devSn", value = "塔机设备编号", paramType = "query", required = true, dataType = "Integer") @ApiImplicitParam(name = "devSn", value = "塔机设备编号", paramType = "query", required = true, dataType = "Integer")
@PostMapping(value = "/getNewestConcreteMonitorCurrentData") @PostMapping(value = "/getNewestConcreteMonitorCurrentData")
public Result<List<EntityMap>> getNewestConcreteMonitorCurrentData(@RequestBody Map<String,Object> map) { public Result<List<ConcreteMonitorDevPointPosition>> getNewestConcreteMonitorCurrentData(@RequestBody Map<String, Object> map) {
return Result.success(concreteMonitorCurrentDataService.getNewestConcreteMonitorCurrentData(map)); return Result.success(concreteMonitorCurrentDataService.getNewestConcreteMonitorCurrentData(map));
} }
@ApiOperation(value = "查询混凝土监测当日实时数据", notes = "查询凝土监测当日实时数据" , httpMethod="POST") @ApiOperation(value = "查询混凝土监测当日实时数据", notes = "查询凝土监测当日实时数据", httpMethod = "POST")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "devSn", value = "塔机设备编号", paramType = "query", required = true, dataType = "String"), @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") @ApiImplicitParam(name = "pointNo", value = "监测点点位号", paramType = "query", required = true, dataType = "String")
}) })
@PostMapping(value = "/getTodayConcreteMonitorCurrentDataList") @PostMapping(value = "/getTodayConcreteMonitorCurrentDataList")
public Result<List<ConcreteMonitorCurrentData>> getTodayConcreteMonitorCurrentDataList(@RequestBody Map<String,Object> map) { public Result<List<ConcreteMonitorCurrentData>> getTodayConcreteMonitorCurrentDataList(@RequestBody Map<String, Object> map) {
return Result.success(concreteMonitorCurrentDataService.getTodayConcreteMonitorCurrentDataList(map)); return Result.success(concreteMonitorCurrentDataService.getTodayConcreteMonitorCurrentDataList(map));
} }

78
src/main/java/com/zhgd/xmgl/modules/concrete/entity/ConcreteMonitorDevPointPosition.java
View File

@ -1,50 +1,66 @@
package com.zhgd.xmgl.modules.concrete.entity; package com.zhgd.xmgl.modules.concrete.entity;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; 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.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
import java.io.Serializable;
import java.util.List;
/** /**
* @Description: 混凝土监测设备-监测点位置 * @Description: 混凝土监测设备-监测点位置
* @author： pds * @author： pds
* @date： 2021-04-22 * @date： 2021-04-22
* @version： V1.0 * @version： V1.0
*/ */
@Data @Data
@TableName("concrete_monitor_dev_point_position") @TableName("concrete_monitor_dev_point_position")
@ApiModel(value="ConcreteMonitorDevPointPosition实体类",description="ConcreteMonitorDevPointPosition") @ApiModel(value = "ConcreteMonitorDevPointPosition实体类", description = "ConcreteMonitorDevPointPosition")
public class ConcreteMonitorDevPointPosition implements Serializable { public class ConcreteMonitorDevPointPosition implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**id*/ /**
* id
*/
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value="id") @ApiModelProperty(value = "id")
private java.lang.Long id ; private java.lang.Long id;
/**设备编号*/ /**
@Excel(name = "设备编号", width = 15) * 设备编号
@ApiModelProperty(value="设备编号") */
private java.lang.String devSn ; @Excel(name = "设备编号", width = 15)
/**项目sn*/ @ApiModelProperty(value = "设备编号")
private java.lang.String devSn;
/**
* 项目sn
*/
@Excel(name = "项目sn", width = 15) @Excel(name = "项目sn", width = 15)
@ApiModelProperty(value="项目sn") @ApiModelProperty(value = "项目sn")
private java.lang.String projectSn ; private java.lang.String projectSn;
/**监测点点位名称*/ /**
@Excel(name = "监测点点位名称", width = 15) * 监测点点位名称
@ApiModelProperty(value="监测点点位名称") */
private java.lang.String pointName ; @Excel(name = "监测点点位名称", width = 15)
/**监测点点位号*/ @ApiModelProperty(value = "监测点点位名称")
@Excel(name = "监测点点位号", width = 15) private java.lang.String pointName;
@ApiModelProperty(value="监测点点位号") /**
private java.lang.Integer pointNo ; * 监测点点位号
/**温度报警阀值*/ */
@Excel(name = "温度报警阀值", width = 15) @Excel(name = "监测点点位号", width = 15)
@ApiModelProperty(value="温度报警阀值") @ApiModelProperty(value = "监测点点位号")
private java.lang.Double temperatureThreshold ; private java.lang.Integer pointNo;
/**
* 温度报警阀值
*/
@Excel(name = "温度报警阀值", width = 15)
@ApiModelProperty(value = "温度报警阀值")
private java.lang.Double temperatureThreshold;
@TableField(exist = false)
@ApiModelProperty(value = "混凝土监测-实时数据")
private List<ConcreteMonitorCurrentData> list;
} }

2
src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorCurrentDataMapper.java
View File

@ -20,5 +20,5 @@ public interface ConcreteMonitorCurrentDataMapper extends BaseMapper<ConcreteMon
List<ConcreteMonitorCurrentData> getTodayConcreteMonitorCurrentDataList(Map<String, Object> map); List<ConcreteMonitorCurrentData> getTodayConcreteMonitorCurrentDataList(Map<String, Object> map);
List<EntityMap> getNewestConcreteMonitorCurrentData(@Param("devSn") String devSn, @Param("pointNo")String pointNo); List<ConcreteMonitorCurrentData> getNewestConcreteMonitorCurrentData(@Param("devSn") String devSn, @Param("pointNo") String pointNo);
} }

2
src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorDevPointPositionMapper.java
View File

@ -4,6 +4,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorCurrentData;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorDevPointPosition; import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorDevPointPosition;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@ -17,5 +18,4 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@Mapper @Mapper
public interface ConcreteMonitorDevPointPositionMapper extends BaseMapper<ConcreteMonitorDevPointPosition> { public interface ConcreteMonitorDevPointPositionMapper extends BaseMapper<ConcreteMonitorDevPointPosition> {
List<EntityMap> selectConcreteMonitorDevPointPositionList(Map<String, Object> map);
} }

6
src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorCurrentDataMapper.xml
View File

@ -17,12 +17,12 @@
</select> </select>
<select id="getNewestConcreteMonitorCurrentData" resultType="com.zhgd.jeecg.common.mybatis.EntityMap"> <select id="getNewestConcreteMonitorCurrentData"
resultType="com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorCurrentData">
SELECT a.* SELECT a.*
from concrete_monitor_current_data a from concrete_monitor_current_data a
WHERE dev_sn=#{devSn} and point_no=#{pointNo} WHERE dev_sn=#{devSn} and point_no=#{pointNo}
ORDER BY receive_time DESC ORDER BY receive_time DESC
LIMIT 1 LIMIT 1
</select> </select>
</mapper> </mapper>

9
src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorDevPointPositionMapper.xml
View File

@ -2,11 +2,4 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.concrete.mapper.ConcreteMonitorDevPointPositionMapper"> <mapper namespace="com.zhgd.xmgl.modules.concrete.mapper.ConcreteMonitorDevPointPositionMapper">
<select id="selectConcreteMonitorDevPointPositionList" </mapper>
resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
select *
from concrete_monitor_dev_point_position
where dev_sn=#{devSn}
</select>
</mapper>

3
src/main/java/com/zhgd/xmgl/modules/concrete/service/IConcreteMonitorCurrentDataService.java
View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorCurrentData; import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorCurrentData;
import com.zhgd.xmgl.entity.vo.ConcreteMonitorCurrentDataVo; import com.zhgd.xmgl.entity.vo.ConcreteMonitorCurrentDataVo;
import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorDevPointPosition;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -20,5 +21,5 @@ public interface IConcreteMonitorCurrentDataService extends IService<ConcreteMon
List<ConcreteMonitorCurrentData> getTodayConcreteMonitorCurrentDataList(Map<String, Object> map); List<ConcreteMonitorCurrentData> getTodayConcreteMonitorCurrentDataList(Map<String, Object> map);
List<EntityMap> getNewestConcreteMonitorCurrentData(Map<String, Object> map); List<ConcreteMonitorDevPointPosition> getNewestConcreteMonitorCurrentData(Map<String, Object> map);
} }

13
src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorCurrentDataServiceImpl.java
View File

@ -1,9 +1,9 @@
package com.zhgd.xmgl.modules.concrete.service.impl; 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.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.jeecg.common.execption.OpenAlertException; 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.entity.vo.ConcreteMonitorCurrentDataVo;
import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorAlarm; import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorAlarm;
import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorCurrentData; import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorCurrentData;
@ -91,12 +91,13 @@ public class ConcreteMonitorCurrentDataServiceImpl extends ServiceImpl<ConcreteM
} }
@Override @Override
public List<EntityMap> getNewestConcreteMonitorCurrentData(Map<String, Object> map) { public List<ConcreteMonitorDevPointPosition> getNewestConcreteMonitorCurrentData(Map<String, Object> map) {
List<EntityMap> pointList = concreteMonitorDevPointPositionMapper.selectConcreteMonitorDevPointPositionList(map); String devSn = MapUtils.getString(map, "devSn");
List<ConcreteMonitorDevPointPosition> pointList = concreteMonitorDevPointPositionMapper.selectList(new LambdaQueryWrapper<ConcreteMonitorDevPointPosition>().eq(ConcreteMonitorDevPointPosition::getDevSn, devSn));
if (pointList != null && pointList.size() > 0) { if (pointList != null && pointList.size() > 0) {
for (EntityMap data : pointList) { for (ConcreteMonitorDevPointPosition data : pointList) {
List<EntityMap> list = concreteMonitorCurrentDataMapper.getNewestConcreteMonitorCurrentData(MapUtils.getString(data, "devSn"), MapUtils.getString(data, "pointNo")); List<ConcreteMonitorCurrentData> list = concreteMonitorCurrentDataMapper.getNewestConcreteMonitorCurrentData(devSn, String.valueOf(data.getPointNo()));
data.put("list", list); data.setList(list);
} }
} }
return pointList; return pointList;

70
src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorDevServiceImpl.java
View File

@ -27,7 +27,7 @@ import java.util.UUID;
/** /**
* @Description: 混凝土监测设备 * @Description: 混凝土监测设备
* @author： pds * @author： pds
* @date： 2021-04-22 * @date： 2021-04-22
* @version： V1.0 * @version： V1.0
*/ */
@Service @Service
@ -43,21 +43,21 @@ public class ConcreteMonitorDevServiceImpl extends ServiceImpl<ConcreteMonitorDe
int pageNo = Integer.parseInt(map.getOrDefault("pageNo", 1).toString()); int pageNo = Integer.parseInt(map.getOrDefault("pageNo", 1).toString());
int pageSize = Integer.parseInt(map.getOrDefault("pageSize", 10).toString()); int pageSize = Integer.parseInt(map.getOrDefault("pageSize", 10).toString());
Page<EntityMap> page = new Page<>(pageNo, pageSize); Page<EntityMap> page = new Page<>(pageNo, pageSize);
List<EntityMap> list=concreteMonitorDevMapper.selectConcreteMonitorDevPageList(page, map); List<EntityMap> list = concreteMonitorDevMapper.selectConcreteMonitorDevPageList(page, map);
return page.setRecords(list); return page.setRecords(list);
} }
@Override @Override
public List<ConcreteMonitorDev> selectConcreteMonitorDevList(Map<String, Object> map) { public List<ConcreteMonitorDev> selectConcreteMonitorDevList(Map<String, Object> map) {
QueryWrapper<ConcreteMonitorDev> queryWrapper=new QueryWrapper<>(); QueryWrapper<ConcreteMonitorDev> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(ConcreteMonitorDev::getProjectSn, MapUtils.getString(map,"projectSn")); queryWrapper.lambda().eq(ConcreteMonitorDev::getProjectSn, MapUtils.getString(map, "projectSn"));
List<ConcreteMonitorDev> list=concreteMonitorDevMapper.selectList(queryWrapper); List<ConcreteMonitorDev> list = concreteMonitorDevMapper.selectList(queryWrapper);
if(list!=null&&list.size()>0){ if (list != null && list.size() > 0) {
for (ConcreteMonitorDev dev:list){ for (ConcreteMonitorDev dev : list) {
QueryWrapper<ConcreteMonitorDevPointPosition> qu=new QueryWrapper<>(); QueryWrapper<ConcreteMonitorDevPointPosition> qu = new QueryWrapper<>();
qu.lambda().eq(ConcreteMonitorDevPointPosition::getDevSn,dev.getDevSn()) qu.lambda().eq(ConcreteMonitorDevPointPosition::getDevSn, dev.getDevSn())
.eq(ConcreteMonitorDevPointPosition::getProjectSn,dev.getProjectSn()); .eq(ConcreteMonitorDevPointPosition::getProjectSn, dev.getProjectSn());
List<ConcreteMonitorDevPointPosition> pointList=concreteMonitorDevPointPositionMapper.selectList(qu); List<ConcreteMonitorDevPointPosition> pointList = concreteMonitorDevPointPositionMapper.selectList(qu);
dev.setPointList(pointList); dev.setPointList(pointList);
} }
} }
@ -68,20 +68,20 @@ public class ConcreteMonitorDevServiceImpl extends ServiceImpl<ConcreteMonitorDe
public void saveConcreteMonitorDev(ConcreteMonitorDev concreteMonitorDev) { public void saveConcreteMonitorDev(ConcreteMonitorDev concreteMonitorDev) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
concreteMonitorDev.setAddTime(sdf.format(new Date())); concreteMonitorDev.setAddTime(sdf.format(new Date()));
if(StringUtils.isEmpty(concreteMonitorDev.getDevSn())){ if (StringUtils.isEmpty(concreteMonitorDev.getDevSn())) {
concreteMonitorDev.setDevSn(UUID.randomUUID().toString().replace("-", "").toUpperCase()); concreteMonitorDev.setDevSn(UUID.randomUUID().toString().replace("-", "").toUpperCase());
}else{ } else {
QueryWrapper<ConcreteMonitorDev> queryWrapper=new QueryWrapper<>(); QueryWrapper<ConcreteMonitorDev> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(ConcreteMonitorDev::getDevSn,concreteMonitorDev.getDevSn()); queryWrapper.lambda().eq(ConcreteMonitorDev::getDevSn, concreteMonitorDev.getDevSn());
int count=concreteMonitorDevMapper.selectCount(queryWrapper); int count = concreteMonitorDevMapper.selectCount(queryWrapper);
if(count>0){ if (count > 0) {
throw new OpenAlertException(MessageUtil.get("EquipmentNumExistErr")); throw new OpenAlertException(MessageUtil.get("EquipmentNumExistErr"));
} }
} }
concreteMonitorDev.setRealTime(new Date()); concreteMonitorDev.setRealTime(new Date());
concreteMonitorDevMapper.insert(concreteMonitorDev); concreteMonitorDevMapper.insert(concreteMonitorDev);
if(concreteMonitorDev.getPointList()!=null&&concreteMonitorDev.getPointList().size()>0){ if (concreteMonitorDev.getPointList() != null && concreteMonitorDev.getPointList().size() > 0) {
for (ConcreteMonitorDevPointPosition pointPosition:concreteMonitorDev.getPointList()){ for (ConcreteMonitorDevPointPosition pointPosition : concreteMonitorDev.getPointList()) {
pointPosition.setDevSn(concreteMonitorDev.getDevSn()); pointPosition.setDevSn(concreteMonitorDev.getDevSn());
pointPosition.setProjectSn(concreteMonitorDev.getProjectSn()); pointPosition.setProjectSn(concreteMonitorDev.getProjectSn());
concreteMonitorDevPointPositionMapper.insert(pointPosition); concreteMonitorDevPointPositionMapper.insert(pointPosition);
@ -93,12 +93,12 @@ public class ConcreteMonitorDevServiceImpl extends ServiceImpl<ConcreteMonitorDe
public void editConcreteMonitorDev(ConcreteMonitorDev concreteMonitorDev) { public void editConcreteMonitorDev(ConcreteMonitorDev concreteMonitorDev) {
concreteMonitorDev.setRealTime(null); concreteMonitorDev.setRealTime(null);
concreteMonitorDevMapper.updateById(concreteMonitorDev); concreteMonitorDevMapper.updateById(concreteMonitorDev);
if(concreteMonitorDev.getPointList()!=null&&concreteMonitorDev.getPointList().size()>0){ if (concreteMonitorDev.getPointList() != null && concreteMonitorDev.getPointList().size() > 0) {
QueryWrapper<ConcreteMonitorDevPointPosition> queryWrapper=new QueryWrapper<>(); QueryWrapper<ConcreteMonitorDevPointPosition> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(ConcreteMonitorDevPointPosition::getProjectSn,concreteMonitorDev.getProjectSn()) queryWrapper.lambda().eq(ConcreteMonitorDevPointPosition::getProjectSn, concreteMonitorDev.getProjectSn())
.eq(ConcreteMonitorDevPointPosition::getDevSn,concreteMonitorDev.getDevSn()); .eq(ConcreteMonitorDevPointPosition::getDevSn, concreteMonitorDev.getDevSn());
concreteMonitorDevPointPositionMapper.delete(queryWrapper); concreteMonitorDevPointPositionMapper.delete(queryWrapper);
for (ConcreteMonitorDevPointPosition pointPosition:concreteMonitorDev.getPointList()){ for (ConcreteMonitorDevPointPosition pointPosition : concreteMonitorDev.getPointList()) {
pointPosition.setDevSn(concreteMonitorDev.getDevSn()); pointPosition.setDevSn(concreteMonitorDev.getDevSn());
pointPosition.setProjectSn(concreteMonitorDev.getProjectSn()); pointPosition.setProjectSn(concreteMonitorDev.getProjectSn());
concreteMonitorDevPointPositionMapper.insert(pointPosition); concreteMonitorDevPointPositionMapper.insert(pointPosition);
@ -108,24 +108,24 @@ public class ConcreteMonitorDevServiceImpl extends ServiceImpl<ConcreteMonitorDe
@Override @Override
public void deleteConcreteMonitorDev(String id) { public void deleteConcreteMonitorDev(String id) {
ConcreteMonitorDev concreteMonitorDev=concreteMonitorDevMapper.selectById(id); ConcreteMonitorDev concreteMonitorDev = concreteMonitorDevMapper.selectById(id);
concreteMonitorDevMapper.deleteById(id); concreteMonitorDevMapper.deleteById(id);
if(concreteMonitorDev!=null){ if (concreteMonitorDev != null) {
QueryWrapper<ConcreteMonitorDevPointPosition> queryWrapper=new QueryWrapper<>(); QueryWrapper<ConcreteMonitorDevPointPosition> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(ConcreteMonitorDevPointPosition::getProjectSn,concreteMonitorDev.getProjectSn()) queryWrapper.lambda().eq(ConcreteMonitorDevPointPosition::getProjectSn, concreteMonitorDev.getProjectSn())
.eq(ConcreteMonitorDevPointPosition::getDevSn,concreteMonitorDev.getDevSn()); .eq(ConcreteMonitorDevPointPosition::getDevSn, concreteMonitorDev.getDevSn());
concreteMonitorDevPointPositionMapper.delete(queryWrapper); concreteMonitorDevPointPositionMapper.delete(queryWrapper);
} }
} }
@Override @Override
public ConcreteMonitorDev selectConcreteMonitorDevById(String id) { public ConcreteMonitorDev selectConcreteMonitorDevById(String id) {
ConcreteMonitorDev concreteMonitorDev=concreteMonitorDevMapper.selectById(id); ConcreteMonitorDev concreteMonitorDev = concreteMonitorDevMapper.selectById(id);
if(concreteMonitorDev!=null){ if (concreteMonitorDev != null) {
QueryWrapper<ConcreteMonitorDevPointPosition> qu=new QueryWrapper<>(); QueryWrapper<ConcreteMonitorDevPointPosition> qu = new QueryWrapper<>();
qu.lambda().eq(ConcreteMonitorDevPointPosition::getDevSn,concreteMonitorDev.getDevSn()) qu.lambda().eq(ConcreteMonitorDevPointPosition::getDevSn, concreteMonitorDev.getDevSn())
.eq(ConcreteMonitorDevPointPosition::getProjectSn,concreteMonitorDev.getProjectSn()); .eq(ConcreteMonitorDevPointPosition::getProjectSn, concreteMonitorDev.getProjectSn());
List<ConcreteMonitorDevPointPosition> pointList=concreteMonitorDevPointPositionMapper.selectList(qu); List<ConcreteMonitorDevPointPosition> pointList = concreteMonitorDevPointPositionMapper.selectList(qu);
concreteMonitorDev.setPointList(pointList); concreteMonitorDev.setPointList(pointList);
} }
return concreteMonitorDev; return concreteMonitorDev;