任务完成问题修复

skyouc

2025-04-28 c772d3422a7e74878ffe9360d4bc4f83c5034dac

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java

@@ -64,8 +64,8 @@
    /**
     * wcs站点编号
     */
    @ApiModelProperty(value= "wcs站点编号")
    private String wcsCode;
    @ApiModelProperty(value= "目标位置")
    private String target;

    /**
     * 站点标签
@@ -154,7 +154,7 @@
        this.type = type;
        this.site = site;
        this.name = name;
        this.wcsCode = wcsCode;
        this.target = wcsCode;
        this.label = label;
        this.device = device;
        this.deviceCode = deviceCode;
@@ -198,7 +198,26 @@
        DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
        List<DictData> dictDatas = dictDataService.list(new LambdaQueryWrapper<DictData>()
                .eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_TASK_TYPE)
                .in(DictData::getId, asList));
                .in(DictData::getValue, asList));
        if (dictDatas.isEmpty()) {
            return null;
        }
        List<String> strings = dictDatas.stream().map(DictData::getLabel).collect(Collectors.toList());

        return StringUtils.join(strings, ",");
    }

    public String getDevice$(){
        if (null == this.device){ return null; }
        String[] split = this.device.split(",");
        List<String> asList = Arrays.asList(split);
        if (asList.isEmpty()) {
            return null;
        }
        DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
        List<DictData> dictDatas = dictDataService.list(new LambdaQueryWrapper<DictData>()
                .eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_DEVICE_TYPE)
                .in(DictData::getValue, asList));
        if (dictDatas.isEmpty()) {
            return null;
        }