|
|
@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException;
|
|
|
|
import java.net.URLDecoder;
|
|
|
|
import java.net.URLDecoder;
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import org.checkerframework.checker.units.qual.A;
|
|
|
|
import org.jeecg.common.api.vo.Result;
|
|
|
|
import org.jeecg.common.api.vo.Result;
|
|
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
|
|
import org.jeecg.common.util.oConvertUtils;
|
|
|
|
import org.jeecg.common.util.oConvertUtils;
|
|
|
@ -20,6 +22,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import org.jeecg.modules.demo.tteqtbase.entity.TtEqtBase;
|
|
|
|
|
|
|
|
import org.jeecg.modules.demo.tteqtbase.service.ITtEqtBaseService;
|
|
|
|
|
|
|
|
import org.jeecg.modules.demo.ttfeedingequip.entity.TtFeedingEquip;
|
|
|
|
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
|
|
|
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
|
|
|
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
|
|
|
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
|
|
|
import org.jeecgframework.poi.excel.entity.ExportParams;
|
|
|
|
import org.jeecgframework.poi.excel.entity.ExportParams;
|
|
|
@ -50,7 +55,8 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
|
|
public class TtElectricMeterController extends JeecgController<TtElectricMeter, ITtElectricMeterService> {
|
|
|
|
public class TtElectricMeterController extends JeecgController<TtElectricMeter, ITtElectricMeterService> {
|
|
|
|
@Autowired
|
|
|
|
@Autowired
|
|
|
|
private ITtElectricMeterService ttElectricMeterService;
|
|
|
|
private ITtElectricMeterService ttElectricMeterService;
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
|
|
|
private ITtEqtBaseService ttEqtBaseService;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -86,6 +92,14 @@ public class TtElectricMeterController extends JeecgController<TtElectricMeter,
|
|
|
|
QueryWrapper<TtElectricMeter> queryWrapper = QueryGenerator.initQueryWrapper(ttElectricMeter, req.getParameterMap());
|
|
|
|
QueryWrapper<TtElectricMeter> queryWrapper = QueryGenerator.initQueryWrapper(ttElectricMeter, req.getParameterMap());
|
|
|
|
Page<TtElectricMeter> page = new Page<TtElectricMeter>(pageNo, pageSize);
|
|
|
|
Page<TtElectricMeter> page = new Page<TtElectricMeter>(pageNo, pageSize);
|
|
|
|
IPage<TtElectricMeter> pageList = ttElectricMeterService.page(page, queryWrapper);
|
|
|
|
IPage<TtElectricMeter> pageList = ttElectricMeterService.page(page, queryWrapper);
|
|
|
|
|
|
|
|
List<TtElectricMeter> list=pageList.getRecords();
|
|
|
|
|
|
|
|
for (TtElectricMeter meter : list){
|
|
|
|
|
|
|
|
QueryWrapper<TtEqtBase> eqtBase = new QueryWrapper<>();
|
|
|
|
|
|
|
|
eqtBase.eq("eqt_no",meter.getEqtNo());
|
|
|
|
|
|
|
|
eqtBase.eq("eqt_type", 6 );
|
|
|
|
|
|
|
|
TtEqtBase ttEqtBase = ttEqtBaseService.getOne(eqtBase);
|
|
|
|
|
|
|
|
meter.setLocation(ttEqtBase.getLocation());
|
|
|
|
|
|
|
|
}
|
|
|
|
return Result.OK(pageList);
|
|
|
|
return Result.OK(pageList);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|