diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemAreas.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemAreas.java index 3717193d9..df868faaa 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemAreas.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemAreas.java @@ -1,10 +1,10 @@ /* * Welcome to use the TableGo Tools. - * + * * http://vipbooks.iteye.com * http://blog.csdn.net/vipbooks * http://www.cnblogs.com/vipbooks - * + * * Author:bianj * Email:edinsker@163.com * Version:5.0.0 @@ -22,7 +22,7 @@ import lombok.Data; /** * 行政区域县区信息表(system_areas) - * + * * @author bianj * @version 1.0.0 2018-03-07 */ @@ -37,14 +37,22 @@ public class SystemAreas implements java.io.Serializable { @TableId(type = IdType.ASSIGN_ID) private Long id; - /** */ + /** + * + */ private String areaid; - /** */ + /** + * + */ private String area; - /** */ + /** + * + */ private String cityid; + private String weathercityid; -} \ No newline at end of file + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarPassRecordController.java b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarPassRecordController.java index bf46e5329..c6bf43ea9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarPassRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarPassRecordController.java @@ -10,7 +10,6 @@ import com.zhgd.xmgl.modules.car.entity.CarPassRecord; import com.zhgd.xmgl.modules.car.entity.vo.TodayOutInNumber; import com.zhgd.xmgl.modules.car.service.ICarCameraService; import com.zhgd.xmgl.modules.car.service.ICarPassRecordService; -import com.zhgd.xmgl.modules.taskprogress.entity.TaskProgressMaterialRel; import com.zhgd.xmgl.util.yunboCarUtils; import io.swagger.annotations.*; import lombok.extern.slf4j.Slf4j; @@ -224,7 +223,9 @@ public class CarPassRecordController { } } - return JSONUtil.toJsonStr(data); + String rs = JSONUtil.toJsonStr(data); + log.info("saveCarPassRecord-rs:{}", rs); + return rs; } private List> getCarTitle(String action, String type, String plateNum, Integer redCode, Integer systemType) { 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 0c0c46733..ec13ab1de 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 @@ -171,15 +171,25 @@ public class HangBasketDetectDataController { e.printStackTrace(); } - //Step.2 AutoPoi 导出Excel - ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - List pageList = hangBasketDetectDataService.list(queryWrapper); - //导出文件名称 - mv.addObject(NormalExcelConstants.FILE_NAME, "挂篮检测数据列表"); - mv.addObject(NormalExcelConstants.CLASS, HangBasketDetectData.class); - mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("挂篮检测数据列表数据", "导出人:Jeecg", "导出信息")); - mv.addObject(NormalExcelConstants.DATA_LIST, pageList); - return mv; - } + //Step.2 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + List pageList = hangBasketDetectDataService.list(queryWrapper); + //导出文件名称 + mv.addObject(NormalExcelConstants.FILE_NAME, "挂篮检测数据列表"); + mv.addObject(NormalExcelConstants.CLASS, HangBasketDetectData.class); + mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("挂篮检测数据列表数据", "导出人:Jeecg", "导出信息")); + mv.addObject(NormalExcelConstants.DATA_LIST, pageList); + return mv; + } + + @ApiOperation(value = "查询最新的数据（监测数据）", notes = "查询最新的数据（监测数据）", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "devSn", value = "设备编码", paramType = "body", required = false, dataType = "String"), + }) + @PostMapping(value = "/newestData") + public Result newestData(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(hangBasketDetectDataService.newestData(paramMap)); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/hangbasket/entity/HangBasketDetectData.java b/src/main/java/com/zhgd/xmgl/modules/hangbasket/entity/HangBasketDetectData.java index ea5aa0594..13e1ccf03 100644 --- a/src/main/java/com/zhgd/xmgl/modules/hangbasket/entity/HangBasketDetectData.java +++ b/src/main/java/com/zhgd/xmgl/modules/hangbasket/entity/HangBasketDetectData.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.Date; 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 lombok.Data; @@ -148,14 +149,30 @@ public class HangBasketDetectData implements Serializable { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新时间 yyyy-MM-dd HH:mm:ss") - private java.util.Date updateDate; - /** - * 项目sn - */ - @Excel(name = "项目sn", width = 15) - @ApiModelProperty(value = "项目sn") - private java.lang.String projectSn; + private java.util.Date updateDate; + /** + * 项目sn + */ + @Excel(name = "项目sn", width = 15) + @ApiModelProperty(value = "项目sn") + private java.lang.String projectSn; - @ApiModelProperty(value = "倾角") - private Double inclination; + @ApiModelProperty(value = "倾角") + private Double inclination; + + + /** + * 菱形架速度(m/s) + */ + @TableField(exist = false) + @Excel(name = "菱形架速度(m/s)", width = 15) + @ApiModelProperty(value = "菱形架速度(m/s)") + private java.lang.Double diamondFrameSpeed; + /** + * 菱形架位移(m) + */ + @TableField(exist = false) + @Excel(name = "菱形架位移(m)", width = 15) + @ApiModelProperty(value = "菱形架位移(m)") + private java.lang.Double diamondFrameDisplacement; } diff --git a/src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/HangBasketDetectDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/HangBasketDetectDataMapper.java index 780662846..82cf65f40 100644 --- a/src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/HangBasketDetectDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/HangBasketDetectDataMapper.java @@ -4,6 +4,8 @@ import org.apache.ibatis.annotations.Mapper; import com.zhgd.xmgl.modules.hangbasket.entity.HangBasketDetectData; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.HashMap; + /** * @Description: 挂篮检测数据 * @author： pds @@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper public interface HangBasketDetectDataMapper extends BaseMapper { + HangBasketDetectData newestData(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/HangBasketDisplacementDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/HangBasketDisplacementDataMapper.java index 26fc9ef5b..a08803f32 100644 --- a/src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/HangBasketDisplacementDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/HangBasketDisplacementDataMapper.java @@ -4,6 +4,8 @@ import com.zhgd.xmgl.modules.hangbasket.entity.HangBasketDisplacementData; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.HashMap; + /** * @Description: 挂篮位移数据 * @author： pds @@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper public interface HangBasketDisplacementDataMapper extends BaseMapper { + HangBasketDisplacementData newestData(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/xml/HangBasketDetectDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/xml/HangBasketDetectDataMapper.xml index 62a014b0f..aa61f81f0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/xml/HangBasketDetectDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/xml/HangBasketDetectDataMapper.xml @@ -1,4 +1,17 @@ + diff --git a/src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/xml/HangBasketDisplacementDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/xml/HangBasketDisplacementDataMapper.xml index ef74c2075..0f5c60046 100644 --- a/src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/xml/HangBasketDisplacementDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/xml/HangBasketDisplacementDataMapper.xml @@ -1,4 +1,17 @@ + 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 5ac249721..18f39b75f 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 @@ -20,4 +20,6 @@ public interface IHangBasketDetectDataService extends IService queryList(HashMap paramMap); void add(HangBasketDetectData hangBasketDetectData); + + HangBasketDetectData newestData(HashMap paramMap); } 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 cf64aa9db..95f88ca06 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,27 +1,28 @@ package com.zhgd.xmgl.modules.hangbasket.service.impl; +import cn.hutool.core.date.DateUtil; 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; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.xmgl.util.PageUtil; 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.hangbasket.entity.HangBasketDetectData; +import com.zhgd.xmgl.modules.hangbasket.entity.HangBasketDev; +import com.zhgd.xmgl.modules.hangbasket.entity.HangBasketDisplacementData; +import com.zhgd.xmgl.modules.hangbasket.mapper.HangBasketDetectDataMapper; +import com.zhgd.xmgl.modules.hangbasket.mapper.HangBasketDevMapper; +import com.zhgd.xmgl.modules.hangbasket.mapper.HangBasketDisplacementDataMapper; +import com.zhgd.xmgl.modules.hangbasket.service.IHangBasketDetectDataService; +import com.zhgd.xmgl.util.PageUtil; +import com.zhgd.xmgl.util.RefUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import java.util.HashMap; import java.util.List; -import com.zhgd.xmgl.util.RefUtil; - /** * @Description: 挂篮检测数据 * @author： pds @@ -32,6 +33,8 @@ import com.zhgd.xmgl.util.RefUtil; public class HangBasketDetectDataServiceImpl extends ServiceImpl implements IHangBasketDetectDataService { @Autowired private HangBasketDevMapper hangBasketDevMapper; + @Autowired + private HangBasketDisplacementDataMapper hangBasketDisplacementDataMapper; @Override public IPage queryPageList(HashMap paramMap) { @@ -60,6 +63,20 @@ public class HangBasketDetectDataServiceImpl extends ServiceImpl paramMap) { + HangBasketDetectData data = baseMapper.newestData(paramMap); + HangBasketDisplacementData data1 = hangBasketDisplacementDataMapper.newestData(paramMap); + if (data1 != null) { + data.setDiamondFrameSpeed(data1.getDiamondFrameSpeed()); + data.setDiamondFrameDisplacement(data1.getDiamondFrameDisplacement()); + if (DateUtil.compare(data.getCreateDate(), data1.getCreateDate()) < 0) { + data.setCreateDate(data1.getCreateDate()); + } + } + return data; + } + private QueryWrapper getQueryWrapper(HashMap paramMap) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(HangBasketDetectData.class, paramMap); queryWrapper.orderByDesc(RefUtil.fieldNameUlc(HangBasketDetectData::getId));