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

bug修改

Browse Source
This commit is contained in:
guo 2024-03-16 18:59:42 +08:00
parent 3d1065cd06
commit 1a88dfeb71
4 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/entity/MechanicalEquipmentPositionData.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;
@ -57,12 +58,7 @@ public class MechanicalEquipmentPositionData implements Serializable {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "上传时间")
private java.util.Date uploadTime;
/**
* 机械设备名称
*/
@Excel(name = "机械设备名称", width = 15)
@ApiModelProperty(value = "机械设备名称")
private java.lang.String equipmentName;
/**
* 速度
*/
@ -109,4 +105,13 @@ public class MechanicalEquipmentPositionData implements Serializable {
@Excel(name = "项目sn", width = 15)
@ApiModelProperty(value = "项目sn")
private java.lang.String projectSn;
/**
* 机械设备名称
*/
@Excel(name = "机械设备名称", width = 15)
@ApiModelProperty(value = "机械设备名称")
@TableField(exist = false)
private java.lang.String equipmentName;
}

10
src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/mapper/MechanicalEquipmentPositionDataMapper.java
View File

@ -1,8 +1,15 @@
package com.zhgd.xmgl.modules.mechanicalequipmentposition.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Mapper;
import com.zhgd.xmgl.modules.mechanicalequipmentposition.entity.MechanicalEquipmentPositionData;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @Description: 机械设备定位-实时数据
@ -13,4 +20,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@Mapper
public interface MechanicalEquipmentPositionDataMapper extends BaseMapper<MechanicalEquipmentPositionData> {
IPage<MechanicalEquipmentPositionData> queryList(Page<MechanicalEquipmentPositionData> page, @Param(Constants.WRAPPER) QueryWrapper<MechanicalEquipmentPositionData> queryWrapper);
List<MechanicalEquipmentPositionData> queryList(@Param(Constants.WRAPPER) QueryWrapper<MechanicalEquipmentPositionData> queryWrapper);
}

7
src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/mapper/xml/MechanicalEquipmentPositionDataMapper.xml
View File

@ -1,4 +1,11 @@
<?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.mechanicalequipmentposition.mapper.MechanicalEquipmentPositionDataMapper">
<select id="queryList"
resultType="com.zhgd.xmgl.modules.mechanicalequipmentposition.entity.MechanicalEquipmentPositionData">
select mepd.*, mepd2.equipment_name
from mechanical_equipment_position_data mepd
left join mechanical_equipment_position_dev mepd2 on mepd.dev_sn = mepd2.dev_sn
${ew.customSqlSegment}
</select>
</mapper>

6
src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/impl/MechanicalEquipmentPositionDataServiceImpl.java
View File

@ -35,7 +35,7 @@ public class MechanicalEquipmentPositionDataServiceImpl extends ServiceImpl<Mech
public IPage<MechanicalEquipmentPositionData> queryPageList(HashMap<String, Object> paramMap) {
QueryWrapper<MechanicalEquipmentPositionData> queryWrapper = getQueryWrapper(paramMap);
Page<MechanicalEquipmentPositionData> page = PageUtil.getPage(paramMap);
IPage<MechanicalEquipmentPositionData> pageList = this.page(page, queryWrapper);
IPage<MechanicalEquipmentPositionData> pageList = baseMapper.queryList(page, queryWrapper);
pageList.setRecords(dealList(pageList.getRecords()));
return pageList;
}
@ -43,11 +43,11 @@ public class MechanicalEquipmentPositionDataServiceImpl extends ServiceImpl<Mech
@Override
public List<MechanicalEquipmentPositionData> queryList(HashMap<String, Object> paramMap) {
QueryWrapper<MechanicalEquipmentPositionData> queryWrapper = getQueryWrapper(paramMap);
return dealList(this.list(queryWrapper));
return dealList(baseMapper.queryList(queryWrapper));
}
private QueryWrapper<MechanicalEquipmentPositionData> getQueryWrapper(HashMap<String, Object> paramMap) {
String alias = "";
String alias = "mepd.";
QueryWrapper<MechanicalEquipmentPositionData> queryWrapper = QueryGenerator.initPageQueryWrapper(MechanicalEquipmentPositionData.class, paramMap, alias);
queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(MechanicalEquipmentPositionData::getId));
return queryWrapper;