#

luxiaotao1123

2024-09-20 94c6d9bec3103526631e03d0e24afea0b23e26a5

#

 zy-acs-common/src/main/java/com/zy/acs/common/enums/AgvStatusType.java

@@ -16,11 +16,11 @@
    ERROR(0xFF, "故障状态"),
    ;

    public int val;
    public Integer val;

    public String desc;

    AgvStatusType(int val, String desc) {
    AgvStatusType(Integer val, String desc) {
        this.val = val;
        this.desc = desc;
    }

 zy-acs-flow/src/page/agv/AgvAvatar.jsx

@@ -8,8 +8,8 @@
    if (!record) return null;
    return (
        <Avatar
            src={record.logo?.src}
            alt={record.name}
            src={record.img?.src}
            alt={record.uuid}
            sx={{
                '& img': { objectFit: 'contain' },
                width,
@@ -17,7 +17,7 @@
                fontSize: height !== 40 ? '0.6rem' : undefined,
            }}
        >
            {record.name.charAt(0)}
            {record.uuid}
        </Avatar>
    );
};

 zy-acs-flow/src/page/agv/AgvCard.jsx

@@ -48,15 +48,11 @@
                    <AgvAvatar />
                    <Box textAlign="center" marginTop={1}>
                        <Typography variant="subtitle2">
                            {record.uuid}
                            {record.agvStatus}
                        </Typography>
                        <SelectField
                            color="textSecondary"
                            source="uuid"
                            choices={[
                                { id: '1', name: 'sad' }
                            ]}
                        />
                        <Typography variant="overline" sx={{ opacity: .7 }}>
                            {record.code}
                        </Typography>
                    </Box>
                </Box>
                <Box display="flex" justifyContent="space-around" width="100%">

 zy-acs-flow/src/page/agvDetail/AgvDetailList.jsx

@@ -148,6 +148,7 @@
                    <ReferenceField source="agvId" label="table.field.agvDetail.agvId" reference="agv" link={false} sortable={false}>
                        <TextField source="uuid" />
                    </ReferenceField>
                    <TextField source="statusDesc" label="common.field.status" sortable={false} />
                    <BooleanField source="posBool" label="table.field.agvDetail.pos" />
                    <ReferenceField source="code" label="table.field.agvDetail.code" reference="code" link={false} sortable={false}>
                        <TextField source="data" />
@@ -179,7 +180,6 @@
                        <TextField source="nickname" />
                    </ReferenceField>
                    <DateField source="createTime" label="common.field.createTime" showTime />
                    {/* <BooleanField source="statusBool" label="common.field.status" sortable={false} /> */}
                    <TextField source="memo" label="common.field.memo" sortable={false} />
                    <WrapperField cellClassName="opt" label="common.field.opt">
                        <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />

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

@@ -14,6 +14,7 @@
import com.zy.acs.manager.manager.entity.Agv;
import com.zy.acs.manager.manager.service.AgvDetailService;
import com.zy.acs.manager.manager.service.AgvService;
import com.zy.acs.manager.manager.service.CodeService;
import com.zy.acs.manager.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -30,6 +31,8 @@
    private AgvService agvService;
    @Autowired
    private AgvDetailService agvDetailService;
    @Autowired
    private CodeService codeService;

//    @PreAuthorize("hasAuthority('manager:agv:list')")
//    @PostMapping("/agv/page")
@@ -51,6 +54,7 @@
        PageParam<Agv, BaseParam> pageParam = new PageParam<>(baseParam, Agv.class);
        PageResult<AgvResult> page = agvService.pageRel(pageParam);
        for (AgvResult result : page.getRecords()) {
            result.sync(agvDetailService.selectByAgvId(result.getId()), codeService);
        }
        return R.ok().add(page);
    }

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java

@@ -1,6 +1,8 @@
package com.zy.acs.manager.manager.controller.result;

import com.zy.acs.manager.manager.entity.Agv;
import com.zy.acs.manager.manager.entity.AgvDetail;
import com.zy.acs.manager.manager.service.CodeService;
import lombok.Data;
import lombok.EqualsAndHashCode;

@@ -11,6 +13,30 @@
@EqualsAndHashCode(callSuper = true)
public class AgvResult extends Agv {

    private Double vol;
    private String agvStatus = "-";

    private String vol = "-";

    private String pos = "-";

    private String code = "-";


    public void sync(Object obj, CodeService codeService) {
        if (null == obj) return;
        if (obj instanceof AgvDetail) {
            AgvDetail agvDetail = (AgvDetail) obj;
            this.setAgvStatus(agvDetail.getStatusDesc());
            if (null != agvDetail.getPos()) {
                this.setPos(String.valueOf(agvDetail.getPos()));
            }
            if (null != agvDetail.getVol()) {
                this.setVol(String.valueOf(agvDetail.getVol()));
            }
            if (null != agvDetail.getRecentCode()) {
                this.setCode(codeService.getById(agvDetail.getRecentCode()).getData());
            }
        }
    }

}

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

@@ -4,9 +4,9 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zy.acs.common.enums.AgvStatusType;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.SpringUtils;
import com.zy.acs.common.enums.AgvStatusType;
import com.zy.acs.manager.manager.service.AgvService;
import com.zy.acs.manager.manager.service.CodeService;
import io.swagger.annotations.ApiModelProperty;
@@ -14,6 +14,7 @@

import java.io.Serializable;
import java.util.Date;
import java.util.Optional;

@Data
@TableName("man_agv_detail")
@@ -345,13 +346,9 @@
        this.agvStatus = AgvStatusType.get(status);
    }

    public String getStatus$(){
        if (null == this.status){ return null; }
        if (null == this.agvStatus){ return null; }
        return this.agvStatus.desc;
    public String getStatusDesc(){
        return Optional.ofNullable(this.agvStatus).map(status -> status.desc).orElse("");
    }



    public Long getRecentCode() {
//        if (this.code != null) {
@@ -368,19 +365,5 @@
        }
        return null;
    }

    public Boolean getStatusBool(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return true;
            case 0:
                return false;
            default:
                return null;
        }
    }



}