Merge branch 'rcs_master_1.0' into rcs_master_all

zhang

2 天以前 14f2c4fce50c871d84f89d2dca2298e0892b4672

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java

@@ -117,26 +117,32 @@
        // 优先级排序
        taskDtoList.sort((o1, o2) -> o2.getPriority() - o1.getPriority());

        // 校验
        List<Task> taskList = validService.validTaskDtoList(taskDtoList);

        // 保存总线
        //查询bus是否存在，用于检测是否已经存在
        //在RCS系统中，busNo和taskNo组合起来确定是否存在
        Date now = new Date();
        Bus bus = new Bus();
        bus.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
        bus.setBusNo(batchNo);
        bus.setStartTime(now);
        bus.setBusSts(BusStsType.RECEIVE.val());
        bus.setMemo(memo);

        if (!busService.save(bus)) {
            throw new BusinessException("Internal Server Error!");
        Bus bus = busService.selectByBusNo(batchNo);
        if (bus == null){
            // 保存总线
            bus = new Bus();
            bus.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
            bus.setBusNo(batchNo);
            bus.setStartTime(now);
            bus.setBusSts(BusStsType.RECEIVE.val());
            bus.setMemo(memo);
            if (!busService.save(bus)) {
                throw new BusinessException("Internal Server Error!");
            }
        }

        // 校验
        List<Task> taskList = validService.validTaskDtoList(bus.getId(),taskDtoList);


        // 保存任务
        for (Task task : taskList) {
            task.setBusId(bus.getId());
            task.setTaskSts(TaskStsType.INIT.val());
            task.setMemo(memo);
            if (!taskService.save(task)) {
                throw new BusinessException("seqNum:" + task.getSeqNum() + " failed to save!");
            }