~whyclxw/LithiumBms.git

			@@ -1,9 +1,11 @@
			package com.whyc.pojo.db_alarm;

			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.annotation.JsonFormat;
			import com.whyc.pojo.db_lithium_ram_db.DevInf;
			import io.swagger.annotations.ApiModel;
			import io.swagger.annotations.ApiModelProperty;
			import lombok.Data;
			@@ -67,5 +69,6 @@
			@ApiModelProperty(value = "告警记录状态[0-实时告警 1-历史告警 2-取消告警]")
			private Integer almClearedType;


			@TableField(exist = false)
			private DevInf devInf;
			}

			@@ -72,10 +72,13 @@
			if(dto.getEndTime()!=null){
			sql+=" and alm_endtime <='"+ThreadLocalUtil.format(dto.getEndTime(),1)+"' ";
			}
			if(dto.getDevType()!=0){
			if(dto.getDevType()!=null){
			sql+=" and FLOOR(dev_id/100000000)="+dto.getDevType();
			}
			if(dto.getAlmId()!=0){
			if(dto.getDevId()!=null){
			sql+=" and dev_id="+dto.getDevId();
			}
			if(dto.getAlmId()!=null){
			sql+=" and alm_id="+dto.getAlmId();
			}
			sql+=" and dev_id in (" +
			@@ -113,10 +116,13 @@
			if(dto.getEndTime()!=null){
			sql+=" and alm_endtime <='"+ThreadLocalUtil.format(dto.getEndTime(),1)+"' ";
			}
			if(dto.getDevType()!=0){
			if(dto.getDevType()!=null){
			sql+=" and FLOOR(dev_id/100000000)="+dto.getDevType();
			}
			if(dto.getAlmId()!=0){
			if(dto.getDevId()!=null){
			sql+=" and dev_id="+dto.getDevId();
			}
			if(dto.getAlmId()!=null){
			sql+=" and alm_id="+dto.getAlmId();
			}
			sql+=" and dev_id in (" +

			@@ -1,9 +1,13 @@
			package com.whyc.util;

			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.github.pagehelper.PageInfo;
			import com.whyc.dto.DalmDto;
			import com.whyc.factory.ThreadPoolExecutorFactory;
			import com.whyc.mapper.CommonMapper;
			import com.whyc.mapper.DevInfMapper;
			import com.whyc.pojo.db_alarm.DevalarmDataYear;
			import com.whyc.pojo.db_lithium_ram_db.DevInf;
			import com.whyc.service.SubTablePageInfoService;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Component;
			@@ -25,6 +29,9 @@

			@Autowired
			private SubTablePageInfoService service;

			@Autowired(required = false)
			private DevInfMapper dinfMapper;

			/*按年份表分页查询/
			public PageInfo<Object> getPageInfo(int pageNum,int pageSize,
			@@ -98,7 +105,15 @@
			dto.setLimitStart(limitList.get(0));
			dto.setLimitEnd(limitList.get(1));
			dto.setTableName(tableName);
			List list = service.getListDevAlm(dto);
			List<DevalarmDataYear> list = service.getListDevAlm(dto);
			for (DevalarmDataYear year:list) {
			int devId=year.getDevId();
			QueryWrapper wrapper=new QueryWrapper();
			wrapper.eq("dev_id",devId);
			wrapper.last("limit 1");
			DevInf dinf=dinfMapper.selectOne(wrapper);
			year.setDevInf(dinf);
			}
			dataList.addAll(list);
			}
			}

	src/main/java/com/whyc/pojo/db_alarm/DevalarmDataYear.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/whyc/service/SubTablePageInfoService.java	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/whyc/util/SubTablePageInfoUtil.java	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史