diff --git a/src/main/java/com/zhgd/xmgl/call/IccWorkerCall.java b/src/main/java/com/zhgd/xmgl/call/IccWorkerCall.java index 73afa3e9f..0d59e0ef5 100644 --- a/src/main/java/com/zhgd/xmgl/call/IccWorkerCall.java +++ b/src/main/java/com/zhgd/xmgl/call/IccWorkerCall.java @@ -355,6 +355,7 @@ public class IccWorkerCall implements WorkerManufacturer { } catch (Exception e) { log.error("err", e); noticeFailed(subject, newProject.getProjectName(), e.getMessage(), false); + throw e; } } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/enums/ProjectUfaceConfigSupplierTypeEnum.java b/src/main/java/com/zhgd/xmgl/modules/project/enums/ProjectUfaceConfigSupplierTypeEnum.java index 1dcc439b2..7b1a89800 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/enums/ProjectUfaceConfigSupplierTypeEnum.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/enums/ProjectUfaceConfigSupplierTypeEnum.java @@ -44,8 +44,7 @@ public enum ProjectUfaceConfigSupplierTypeEnum { /** * ICC */ - ICC(10, "ICC"); - HIKVISION_ACCESS_CONTROL_ISC(9, "海康门禁isc"), + ICC(10, "ICC"), /** *正赢 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendancePresenceServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendancePresenceServiceImpl.java index a26572d7b..63c6d32f6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendancePresenceServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendancePresenceServiceImpl.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.worker.service.impl; +import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionSyncServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionSyncServiceImpl.java index f1f9e3978..1aeb81df9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionSyncServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionSyncServiceImpl.java @@ -35,7 +35,6 @@ import com.zhgd.xmgl.modules.xz.enums.XzHikvisionSyncOperateEnum; import com.zhgd.xmgl.modules.xz.enums.XzHikvisionSyncTypeEnum; import com.zhgd.xmgl.modules.xz.mapper.XzHikvisionSyncMapper; import com.zhgd.xmgl.modules.xz.service.IXzHikvisionSyncService; -import com.zhgd.xmgl.modules.xz.special.entity.XzGasAnalyze; import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RefUtil; import com.zhgd.xmgl.util.ThreadLocalUtil; @@ -52,7 +51,6 @@ import org.springframework.transaction.annotation.Transactional; import java.util.*; import java.util.concurrent.CompletableFuture; -import java.util.stream.Collectors; /** * @Description: 星纵-海康同步数据 @@ -340,8 +338,6 @@ public class XzHikvisionSyncServiceImpl extends ServiceImpl syncList = new ArrayList<>(); @@ -382,6 +378,8 @@ public class XzHikvisionSyncServiceImpl extends ServiceImpl