#

luxiaotao1123

2024-09-20 35a42b06584523a9c5cdf767b1d789121f421911

#

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java

@@ -10,6 +10,8 @@
import com.zy.acs.manager.common.domain.KeyValVo;
import com.zy.acs.manager.common.domain.PageParam;
import com.zy.acs.manager.manager.entity.Agv;
import com.zy.acs.manager.manager.entity.AgvDetail;
import com.zy.acs.manager.manager.service.AgvDetailService;
import com.zy.acs.manager.manager.service.AgvService;
import com.zy.acs.manager.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,13 +27,20 @@

    @Autowired
    private AgvService agvService;
    @Autowired
    private AgvDetailService agvDetailService;

    @PreAuthorize("hasAuthority('manager:agv:list')")
    @PostMapping("/agv/page")
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<Agv, BaseParam> pageParam = new PageParam<>(baseParam, Agv.class);
        return R.ok().add(agvService.page(pageParam, pageParam.buildWrapper(true)));
        PageParam<Agv, BaseParam> page = agvService.page(pageParam, pageParam.buildWrapper(true));
        for (Agv agv : page.getRecords()) {
            AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
            agv.setAgvDetail(agvDetail);
        }
        return R.ok().add(page);
//        return R.ok().add(agvService.pageRel(pageParam));
    }


 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Agv.java

@@ -1,9 +1,6 @@
package com.zy.acs.manager.manager.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import com.zy.acs.manager.manager.service.AgvModelService;
import com.zy.acs.manager.manager.service.AgvStsService;
import com.zy.acs.framework.common.Cools;
@@ -79,6 +76,9 @@
    @ApiModelProperty(value = "备注")
    private String memo;

    @TableField(exist = false)
    private AgvDetail agvDetail;

    public String getAgvSts$(){
        AgvStsService service = SpringUtils.getBean(AgvStsService.class);
        AgvSts agvSts = service.getById(this.agvSts);