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

bug修复

Browse Source
This commit is contained in:
guo 2024-01-26 15:22:07 +08:00
parent 663dd6ef91
commit f59bf0a8b6
6 changed files with 78 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/zhgd/xmgl/modules/discharging/controller/DischargingPlatformAlarmController.java
View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.base.entity.vo.SectorVo;
import com.zhgd.xmgl.modules.discharging.entity.DischargingPlatformCurrentData;
import com.zhgd.xmgl.modules.discharging.entity.vo.CountAlarmLevelVo;
import com.zhgd.xmgl.modules.discharging.entity.vo.CountDischargingPlatformCurrentDataVo;
import com.zhgd.xmgl.modules.discharging.service.IDischargingPlatformAlarmService;
@ -52,9 +53,9 @@ public class DischargingPlatformAlarmController {
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "body", required = true, dataType = "Integer"),
})
@PostMapping(value = "/list")
public Result<IPage<EntityMap>> queryPageList(@RequestBody Map<String, Object> map) {
Result<IPage<EntityMap>> result = new Result<IPage<EntityMap>>();
IPage<EntityMap> pageList = dischargingPlatformAlarmService.queryDischargingPlatformAlarmPageList(map);
public Result<IPage<DischargingPlatformCurrentData>> queryPageList(@RequestBody Map<String, Object> map) {
Result<IPage<DischargingPlatformCurrentData>> result = new Result<IPage<DischargingPlatformCurrentData>>();
IPage<DischargingPlatformCurrentData> pageList = dischargingPlatformAlarmService.queryDischargingPlatformAlarmPageList(map);
result.setSuccess(true);
result.setResult(pageList);
return result;

99
src/main/java/com/zhgd/xmgl/modules/discharging/entity/DischargingPlatformCurrentData.java
View File

@ -1,61 +1,76 @@
package com.zhgd.xmgl.modules.discharging.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;
/**
* @Description: 卸料平台-实时数据
* @author： pds
* @date： 2021-04-21
* @date： 2021-04-21
* @version： V1.0
*/
@Data
@TableName("discharging_platform_current_data")
@ApiModel(value="DischargingPlatformCurrentData实体类",description="DischargingPlatformCurrentData")
@ApiModel(value = "DischargingPlatformCurrentData实体类", description = "DischargingPlatformCurrentData")
public class DischargingPlatformCurrentData 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*/
@Excel(name = "项目sn", width = 15)
@ApiModelProperty(value="项目sn")
private java.lang.String projectSn ;
/**接收创建时间*/
@Excel(name = "接收创建时间", width = 15)
@ApiModelProperty(value="接收创建时间")
private java.lang.String reciveTime ;
/**载重，单位吨*/
@Excel(name = "载重，单位吨", width = 15)
@ApiModelProperty(value="载重，单位吨")
private java.lang.String loading ;
/**位移，单位米*/
@Excel(name = "位移，单位米", width = 15)
@ApiModelProperty(value="位移，单位米")
private java.lang.String displacement ;
/**X倾角*/
@Excel(name = "X倾角", width = 15)
@ApiModelProperty(value="X倾角")
private java.lang.String xDipAngle ;
/**Y倾角*/
@Excel(name = "Y倾角", width = 15)
@ApiModelProperty(value="Y倾角")
private java.lang.String yDipAngle ;
@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 reciveTime;
/**
* 载重，单位吨
*/
@Excel(name = "载重，单位吨", width = 15)
@ApiModelProperty(value = "载重，单位吨")
private java.lang.String loading;
/**
* 位移，单位米
*/
@Excel(name = "位移，单位米", width = 15)
@ApiModelProperty(value = "位移，单位米")
private java.lang.String displacement;
/**
* X倾角
*/
@Excel(name = "X倾角", width = 15)
@ApiModelProperty(value = "X倾角")
private java.lang.String xDipAngle;
/**
* Y倾角
*/
@Excel(name = "Y倾角", width = 15)
@ApiModelProperty(value = "Y倾角")
private java.lang.String yDipAngle;
@TableField(exist = false)
@ -74,5 +89,11 @@ public class DischargingPlatformCurrentData implements Serializable {
@ApiModelProperty(value = "载重比%")
private java.lang.Double loadRatio;
@TableField(exist = false)
@ApiModelProperty(value = "alarmTime")
private String alarmTime;
@TableField(exist = false)
@ApiModelProperty(value = "devName")
private String devName;
}

3
src/main/java/com/zhgd/xmgl/modules/discharging/mapper/DischargingPlatformAlarmMapper.java
View File

@ -7,6 +7,7 @@ import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.base.entity.vo.SectorOneVo;
import com.zhgd.xmgl.base.entity.vo.SectorVo;
import com.zhgd.xmgl.modules.discharging.entity.DischargingPlatformAlarm;
import com.zhgd.xmgl.modules.discharging.entity.DischargingPlatformCurrentData;
import com.zhgd.xmgl.modules.discharging.entity.vo.CountAlarmLevelVo;
import com.zhgd.xmgl.modules.discharging.entity.vo.CountDischargingPlatformCurrentDataVo;
import org.apache.ibatis.annotations.Mapper;
@ -25,7 +26,7 @@ import java.util.Map;
@Mapper
public interface DischargingPlatformAlarmMapper extends BaseMapper<DischargingPlatformAlarm> {
List<EntityMap> queryDischargingPlatformAlarmPageList(Page<EntityMap> page, @Param("param") Map<String, Object> map);
List<DischargingPlatformCurrentData> queryDischargingPlatformAlarmPageList(Page<DischargingPlatformCurrentData> page, @Param("param") Map<String, Object> map);
Integer selectDischargingPlatformAlarmCurrentDayCount(Map<String, Object> map);

12
src/main/java/com/zhgd/xmgl/modules/discharging/mapper/xml/DischargingPlatformAlarmMapper.xml
View File

@ -1,19 +1,19 @@
<?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.discharging.mapper.DischargingPlatformAlarmMapper">
<select id="queryDischargingPlatformAlarmPageList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap" >
SELECT a.alarm_type,a.add_time alarm_time,b.*,c.dev_name
<select id="queryDischargingPlatformAlarmPageList"
resultType="com.zhgd.xmgl.modules.discharging.entity.DischargingPlatformCurrentData">
SELECT b.*,a.alarm_type,a.add_time alarm_time,c.dev_name
from discharging_platform_alarm a INNER JOIN discharging_platform_current_data b ON a.currentdata_id=b.id
LEFT JOIN discharging_platform_dev c ON c.dev_sn=b.dev_sn
where a.project_sn=#{param.projectSn}
<if test="param.devSn!=null and param.devSn!=''">
<if test="param.devSn != null and param.devSn != ''">
and a.dev_sn=#{param.devSn}
</if>
<if test="param.startTime!=null and param.startTime!=''">
<if test="param.startTime != null and param.startTime != ''">
AND a.add_time &gt;=CONCAT(DATE_FORMAT(#{param.startTime},'%Y-%m-%d'),' 00:00:00')
</if>
<if test="param.endTime!=null and param.endTime!=''">
<if test="param.endTime != null and param.endTime != ''">
AND a.add_time &lt;=CONCAT(DATE_FORMAT(#{param.endTime},'%Y-%m-%d'),' 23:59:59')
</if>
order by a.add_time desc

3
src/main/java/com/zhgd/xmgl/modules/discharging/service/IDischargingPlatformAlarmService.java
View File

@ -5,6 +5,7 @@ import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.base.entity.vo.SectorVo;
import com.zhgd.xmgl.modules.discharging.entity.DischargingPlatformAlarm;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zhgd.xmgl.modules.discharging.entity.DischargingPlatformCurrentData;
import com.zhgd.xmgl.modules.discharging.entity.DischargingPlatformDev;
import com.zhgd.xmgl.modules.discharging.entity.vo.CountAlarmLevelVo;
@ -22,7 +23,7 @@ public interface IDischargingPlatformAlarmService extends IService<DischargingPl
void addDischargingPlatformAlarm(DischargingPlatformAlarm dischargingPlatformAlarm, DischargingPlatformDev dev);
IPage<EntityMap> queryDischargingPlatformAlarmPageList(Map<String, Object> map);
IPage<DischargingPlatformCurrentData> queryDischargingPlatformAlarmPageList(Map<String, Object> map);
List<EntityMap> getAlarmCycleTrendGraph(Map<String, Object> map);

7
src/main/java/com/zhgd/xmgl/modules/discharging/service/impl/DischargingPlatformAlarmServiceImpl.java
View File

@ -10,6 +10,7 @@ import com.zhgd.xmgl.base.entity.vo.SectorVo;
import com.zhgd.xmgl.modules.basicdata.entity.Notice;
import com.zhgd.xmgl.modules.basicdata.service.INoticeService;
import com.zhgd.xmgl.modules.discharging.entity.DischargingPlatformAlarm;
import com.zhgd.xmgl.modules.discharging.entity.DischargingPlatformCurrentData;
import com.zhgd.xmgl.modules.discharging.entity.DischargingPlatformDev;
import com.zhgd.xmgl.modules.discharging.entity.vo.CountAlarmLevelVo;
import com.zhgd.xmgl.modules.discharging.mapper.DischargingPlatformAlarmMapper;
@ -104,11 +105,11 @@ public class DischargingPlatformAlarmServiceImpl extends ServiceImpl<Discharging
}
@Override
public IPage<EntityMap> queryDischargingPlatformAlarmPageList(Map<String, Object> map) {
public IPage<DischargingPlatformCurrentData> queryDischargingPlatformAlarmPageList(Map<String, Object> map) {
int pageNo = Integer.parseInt(map.getOrDefault("pageNo", 1).toString());
int pageSize = Integer.parseInt(map.getOrDefault("pageSize", 10).toString());
Page<EntityMap> page = new Page<>(pageNo, pageSize);
List<EntityMap> list = dischargingPlatformAlarmMapper.queryDischargingPlatformAlarmPageList(page, map);
Page<DischargingPlatformCurrentData> page = new Page<>(pageNo, pageSize);
List<DischargingPlatformCurrentData> list = dischargingPlatformAlarmMapper.queryDischargingPlatformAlarmPageList(page, map);
return page.setRecords(list);
}