龚焕茏
2024-08-24 11456e1af96ae10fe08dcecf091797b6f08d391b
feat:工单同步点位状态、增加故障类型枚举
3个文件已修改
18 ■■■■■ 已修改文件
ycl-common/src/main/java/enumeration/general/ErrorTypeEnum.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-common/src/main/java/enumeration/general/ErrorTypeEnum.java
@@ -28,7 +28,8 @@
    OSD("OSD异常"),
    MONITORUNQUALIFY("一机一档不合格"),
    VIDEOORPICUNNORMAL("视频拉流、图片获取异常"),
    PICUNUSEFUL("大图不可用");
    PICUNUSEFUL("大图不可用"),
    PICURLABNORMAL("图片访问异常");
    private final String value;
ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
@@ -114,9 +114,9 @@
            reports.add(entity);
        });
        if (saveBatch(reports)) {
            return Result.ok("导入成功");
            return Result.ok("成功导入" + list.size() + "条数据");
        }
        return Result.error("添加失败");
        return Result.error("导入失败");
    }
    /**
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -28,10 +28,8 @@
import com.ycl.platform.wvp.WVPResult;
import com.ycl.system.Result;
import com.ycl.system.domain.SysConfig;
import com.ycl.system.entity.SysDictData;
import com.ycl.system.mapper.SysConfigMapper;
import com.ycl.system.mapper.SysDictDataMapper;
import com.ycl.system.mapper.SysDictTypeMapper;
import com.ycl.system.model.LoginUser;
import com.ycl.system.page.PageUtil;
import com.ycl.utils.DateUtils;
@@ -39,7 +37,10 @@
import com.ycl.utils.http.HttpUtils;
import com.ycl.utils.redis.RedisCache;
import com.ycl.utils.uuid.IdUtils;
import enumeration.general.*;
import enumeration.general.NotifyTypeEnum;
import enumeration.general.UrgentLevelEnum;
import enumeration.general.WorkOrderDistributeWayEnum;
import enumeration.general.WorkOrderStatusEnum;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
@@ -213,7 +214,9 @@
        }
        // 如果是直接下发,添加下发记录
        if (WorkOrderStatusEnum.DISTRIBUTED.equals(waitAddList.get(0).getStatus())) {
            ArrayList<String> list = new ArrayList<>();
            List<WorkOrderDistributeRecord> distributedRecordList = waitAddList.stream().map(item -> {
                list.add(item.getSerialNumber());
                WorkOrderDistributeRecord workOrderDistributeRecord = new WorkOrderDistributeRecord();
                workOrderDistributeRecord.setWorkOrderNo(item.getWorkOrderNo());
                workOrderDistributeRecord.setDistributeWay(WorkOrderDistributeWayEnum.DIRECT_DISTRIBUTE);
@@ -223,6 +226,8 @@
                return workOrderDistributeRecord;
            }).collect(Collectors.toList());
            workOrderDistributeRecordMapper.insertBatch(distributedRecordList);
            // 同步点位状态
            ywPointService.updateRecovery(list, 1);
        }
        log.info("传入工单总数: {},实际添加工单数:{}, 实际修改工单数:{}", total, waitAddList.size(), updateNum);
        return Boolean.TRUE;