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

bug修复

Browse Source
This commit is contained in:
guo 2024-02-01 18:08:09 +08:00
parent 44dab7005b
commit c31bd5820d
10 changed files with 128 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemAreas.java
View File

@ -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;
}

5
src/main/java/com/zhgd/xmgl/modules/car/controller/CarPassRecordController.java
View File

@ -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<Map<String, Object>> getCarTitle(String action, String type, String plateNum, Integer redCode, Integer systemType) {

30
src/main/java/com/zhgd/xmgl/modules/hangbasket/controller/HangBasketDetectDataController.java
View File

@ -171,15 +171,25 @@ public class HangBasketDetectDataController {
e.printStackTrace();
}
//Step.2 AutoPoi 导出Excel
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
List<HangBasketDetectData> 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<HangBasketDetectData> 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<HangBasketDetectData> newestData(@ApiIgnore @RequestBody HashMap<String, Object> paramMap) {
return Result.success(hangBasketDetectDataService.newestData(paramMap));
}
}

35
src/main/java/com/zhgd/xmgl/modules/hangbasket/entity/HangBasketDetectData.java
View File

@ -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;
}

3
src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/HangBasketDetectDataMapper.java
View File

@ -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> {
HangBasketDetectData newestData(HashMap<String, Object> paramMap);
}

3
src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/HangBasketDisplacementDataMapper.java
View File

@ -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> {
HangBasketDisplacementData newestData(HashMap<String, Object> paramMap);
}

13
src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/xml/HangBasketDetectDataMapper.xml
View File

@ -1,4 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.hangbasket.mapper.HangBasketDetectDataMapper">
<select id="newestData" resultType="com.zhgd.xmgl.modules.hangbasket.entity.HangBasketDetectData">
select *
from hang_basket_detect_data
where 1=1
<if test="projectSn != null and projectSn != ''">
and project_sn = #{projectSn}
</if>
<if test="devSn != null and devSn != ''">
and dev_sn = #{devSn}
</if>
order by create_date desc
limit 1
</select>
</mapper>

13
src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/xml/HangBasketDisplacementDataMapper.xml
View File

@ -1,4 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.hangbasket.mapper.HangBasketDisplacementDataMapper">
<select id="newestData" resultType="com.zhgd.xmgl.modules.hangbasket.entity.HangBasketDisplacementData">
select *
from hang_basket_displacement_data
where 1=1
<if test="projectSn != null and projectSn != ''">
and project_sn = #{projectSn}
</if>
<if test="devSn != null and devSn != ''">
and dev_sn = #{devSn}
</if>
order by create_date desc
limit 1
</select>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketDetectDataService.java
View File

@ -20,4 +20,6 @@ public interface IHangBasketDetectDataService extends IService<HangBasketDetectD
List<HangBasketDetectData> queryList(HashMap<String, Object> paramMap);
void add(HangBasketDetectData hangBasketDetectData);
HangBasketDetectData newestData(HashMap<String, Object> paramMap);
}

43
src/main/java/com/zhgd/xmgl/modules/hangbasket/service/impl/HangBasketDetectDataServiceImpl.java
View File

@ -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<HangBasketDetectDataMapper, HangBasketDetectData> implements IHangBasketDetectDataService {
@Autowired
private HangBasketDevMapper hangBasketDevMapper;
@Autowired
private HangBasketDisplacementDataMapper hangBasketDisplacementDataMapper;
@Override
public IPage<HangBasketDetectData> queryPageList(HashMap<String, Object> paramMap) {
@ -60,6 +63,20 @@ public class HangBasketDetectDataServiceImpl extends ServiceImpl<HangBasketDetec
baseMapper.insert(hangBasketDetectData);
}
@Override
public HangBasketDetectData newestData(HashMap<String, Object> 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<HangBasketDetectData> getQueryWrapper(HashMap<String, Object> paramMap) {
QueryWrapper<HangBasketDetectData> queryWrapper = QueryGenerator.initPageQueryWrapper(HangBasketDetectData.class, paramMap);
queryWrapper.orderByDesc(RefUtil.fieldNameUlc(HangBasketDetectData::getId));