Merge remote-tracking branch 'origin/master'

fuliqi

2024-09-04 3df04e32e4190bfe8a74998f19fedbbfa9747f29

Merge remote-tracking branch 'origin/master'

 ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java

@@ -68,10 +68,11 @@
        if (Objects.isNull(form.getPointId())) {
            throw new RuntimeException("点位不能为空");
        }
        Long userId = SecurityUtils.getUserId();
        YwPeople people = new LambdaQueryChainWrapper<>(peopleMapper).eq(YwPeople::getUserId, userId).one();
        form.setPeopleId(people.getId());
        form.setUnitId(people.getBelongUnit());
        Integer unitId = SecurityUtils.getUnitId();
        if (Objects.isNull(unitId)) {
            throw new RuntimeException("非运维单位暂时无法报备");
        }
        form.setUnitId(unitId);
        if ("事前报备".equals(form.getReportType())) {
            // 如果是事前报备需要检验是否已经生成下发工单
            YwPointVO point = ywpointMapper.countNotFinishedWorkOrderByGb(form.getPointId());
@@ -116,10 +117,11 @@
    @SneakyThrows
    @Transactional
    public Result importData(ReportForm form) {
        Long userId = SecurityUtils.getUserId();
        YwPeople people = new LambdaQueryChainWrapper<>(peopleMapper).eq(YwPeople::getUserId, userId).one();
        form.setPeopleId(people.getId());
        form.setUnitId(people.getBelongUnit());
        Integer unitId = SecurityUtils.getUnitId();
        if (Objects.isNull(unitId)) {
            throw new RuntimeException("非运维单位暂时无法报备");
        }
        form.setUnitId(unitId);
        form.setBeginCreateTime(DateUtils.parseDate(form.getBeginCreateTimeStr()));
        form.setEndCreateTime(DateUtils.parseDate(form.getEndCreateTimeStr()));
        // 读取excel数据

 ycl-server/src/main/java/com/ycl/task/UYTask.java

@@ -96,8 +96,8 @@
            log.error("图像监测数据为空");
        }
        // 本地测试
        Query query = new Query(Criteria.where("mongoCreateTime").lt(DateUtils.getDayEnd(new Date())));
        uyErrorTypeCheckService.imageDetectionCheck(mongoTemplate.find(query, ImageDetectionResult.class));
//        Query query = new Query(Criteria.where("mongoCreateTime").lt(DateUtils.getDayEnd(new Date())));
//        uyErrorTypeCheckService.imageDetectionCheck(mongoTemplate.find(query, ImageDetectionResult.class));
        log.info("结束执行图像监测数据同步");
    }

@@ -217,8 +217,8 @@
            }
        }
        // 本地测试
        Query query = new Query(Criteria.where("mongoCreateTime").lt(DateUtils.getDayEnd(new Date())));
        uyErrorTypeCheckService.recordMetaDSumCheck(mongoTemplate.find(query, RecordMetaDSumResult.class));
//        Query query = new Query(Criteria.where("mongoCreateTime").lt(DateUtils.getDayEnd(new Date())));
//        uyErrorTypeCheckService.recordMetaDSumCheck(mongoTemplate.find(query, RecordMetaDSumResult.class));
        log.info("结束执行录像可用数据同步");
    }


 ycl-server/src/main/java/com/ycl/utils/SecurityUtils.java

@@ -46,7 +46,7 @@
        try {
            if (isAdmin(getUserId())) {
                return null;
            } else if (hasRole("yw_admin")) {
            } else if (hasRole("zg_city")) {
                return null;
            }
            return getLoginUser().getUser().getUnitId();

 ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml

@@ -32,7 +32,7 @@

    <select id="page" resultMap="BaseResultMap">
        SELECT
        wo.id,wo.status, wo.work_order_no,wo.create_time, wo.unit_id, wo.yw_people_id, wo.yw_handle_time, wo.yw_result, wo.yw_check_result, wo.overtime, wo.deduct,
        wo.id,wo.status, wo.work_order_no, wo.serial_number,wo.create_time, wo.unit_id, wo.yw_people_id, wo.yw_handle_time, wo.yw_result, wo.yw_check_result, wo.overtime, wo.deduct,
        u.unit_name,
        p.yw_person_name,
        tm.name as source,
@@ -65,7 +65,7 @@
            AND wo.yw_handle_time BETWEEN #{query.start} AND #{query.end}
        </if>
        GROUP BY
        wo.id, wo.status, wo.work_order_no,wo.create_time, wo.unit_id, wo.yw_people_id,tm.name, wo.yw_handle_time, wo.yw_result, wo.yw_check_result, wo.overtime, wo.deduct,
        wo.id, wo.status, wo.work_order_no, wo.serial_number,wo.create_time, wo.unit_id, wo.yw_people_id,tm.name, wo.yw_handle_time, wo.yw_result, wo.yw_check_result, wo.overtime, wo.deduct,
        u.unit_name,
        p.yw_person_name
        ORDER BY wo.create_time DESC