|
|
|
@ -11,6 +11,7 @@ import java.net.URLDecoder;
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
|
|
import org.checkerframework.checker.units.qual.A;
|
|
|
|
|
import org.jeecg.common.api.vo.Result;
|
|
|
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
|
|
@ -75,21 +76,24 @@ public class TtFeedingEquipController extends JeecgController<TtFeedingEquip, IT
|
|
|
|
|
@ApiOperation(value = "tt_feeding_equip-分页列表查询", notes = "tt_feeding_equip-分页列表查询")
|
|
|
|
|
@GetMapping(value = "/list")
|
|
|
|
|
public Result<IPage<TtFeedingEquip>> queryPageList(TtFeedingEquip ttFeedingEquip,
|
|
|
|
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
|
|
|
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
|
|
|
|
HttpServletRequest req) {
|
|
|
|
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
|
|
|
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
|
|
|
|
HttpServletRequest req) {
|
|
|
|
|
QueryWrapper<TtFeedingEquip> queryWrapper = QueryGenerator.initQueryWrapper(ttFeedingEquip, req.getParameterMap());
|
|
|
|
|
Page<TtFeedingEquip> page = new Page<TtFeedingEquip>(pageNo, pageSize);
|
|
|
|
|
IPage<TtFeedingEquip> pageList = ttFeedingEquipService.page(page, queryWrapper);
|
|
|
|
|
List<TtFeedingEquip> list = pageList.getRecords();
|
|
|
|
|
if (list.size() > 0) {
|
|
|
|
|
// 查询所有集中供料,按ip标注
|
|
|
|
|
LambdaQueryWrapper<TtEqtBase> lwq = new LambdaQueryWrapper<>();
|
|
|
|
|
lwq.eq(TtEqtBase::getEqtStatus, 1);
|
|
|
|
|
lwq.eq(TtEqtBase::getEqtType, 5);
|
|
|
|
|
List<TtEqtBase> deviceList = ttEqtBaseService.list(lwq);
|
|
|
|
|
Map<String, TtEqtBase> deviceMap = deviceList.stream().collect(Collectors.toMap(TtEqtBase::getEqtIp, v -> v));
|
|
|
|
|
for (TtFeedingEquip feeding : list) {
|
|
|
|
|
QueryWrapper<TtEqtBase> eqtBase = new QueryWrapper<>();
|
|
|
|
|
eqtBase.eq("eqt_no", feeding.getEqtNo());
|
|
|
|
|
eqtBase.eq("eqt_type", 5);
|
|
|
|
|
TtEqtBase ttEqtBase = ttEqtBaseService.getOne(eqtBase);
|
|
|
|
|
if (ttEqtBase != null) {
|
|
|
|
|
feeding.setDescr(ttEqtBase.getDescr());
|
|
|
|
|
TtEqtBase eqtBase = deviceMap.get(feeding.getEqtIp());
|
|
|
|
|
if(eqtBase != null) {
|
|
|
|
|
feeding.setDescr(eqtBase.getDescr());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -180,33 +184,9 @@ public class TtFeedingEquipController extends JeecgController<TtFeedingEquip, IT
|
|
|
|
|
* @param ttFeedingEquip
|
|
|
|
|
*/
|
|
|
|
|
//@RequiresPermissions("ttfeedingequip:tt_feeding_equip:exportXls")
|
|
|
|
|
// @RequestMapping(value = "/exportXls")
|
|
|
|
|
// public ModelAndView exportXls(HttpServletRequest request, TtFeedingEquip ttFeedingEquip) {
|
|
|
|
|
// return super.exportXls(request, ttFeedingEquip, TtFeedingEquip.class, "tt_feeding_equip");
|
|
|
|
|
// }
|
|
|
|
|
@RequestMapping(value = "/exportXls")
|
|
|
|
|
public ModelAndView exportXls(HttpServletRequest request, TtFeedingEquip ttFeedingEquip) {
|
|
|
|
|
ModelAndView modelAndView = super.exportXls(request, ttFeedingEquip, TtFeedingEquip.class, "tt_feeding_equip");
|
|
|
|
|
Object model = modelAndView.getModel().get("data");
|
|
|
|
|
List<TtFeedingEquip> list = new ArrayList<>();
|
|
|
|
|
if (model instanceof ArrayList<?>) {
|
|
|
|
|
for (Object o : (List<?>) model) {
|
|
|
|
|
list.add((TtFeedingEquip) o);
|
|
|
|
|
}
|
|
|
|
|
if (list.size() > 0) {
|
|
|
|
|
for (TtFeedingEquip ttFeeding : list) {
|
|
|
|
|
QueryWrapper<TtEqtBase> eqtBase = new QueryWrapper<>();
|
|
|
|
|
eqtBase.eq("eqt_no", ttFeeding.getEqtNo());
|
|
|
|
|
eqtBase.eq("eqt_type", 5);
|
|
|
|
|
eqtBase.eq("location", "集中供料系统车间");
|
|
|
|
|
TtEqtBase ttEqtBase = ttEqtBaseService.getOne(eqtBase);
|
|
|
|
|
if (ttEqtBase != null) {
|
|
|
|
|
ttFeeding.setDescr(ttEqtBase.getDescr());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return modelAndView;
|
|
|
|
|
return super.exportXls(request, ttFeedingEquip, TtFeedingEquip.class, "tt_feeding_equip");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|