uat合并prod

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;
         }
     }
 

src/main/java/com/zhgd/xmgl/modules/project/enums/ProjectUfaceConfigSupplierTypeEnum.java

@@ -44,8 +44,7 @@ public enum ProjectUfaceConfigSupplierTypeEnum {
 	/**
 	 * ICC
 	 */
-	ICC(10, "ICC");
+	ICC(10, "ICC"),
-	HIKVISION_ACCESS_CONTROL_ISC(9, "海康门禁isc"),
 	/**
 	 *正赢
 	 */

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;

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<XzHikvisionSyncMappe
         }
     }
 
-    }
-
     @Override
     public void mqttAck(String deviceSn, JSONArray ackInfo, Integer isSuccess) {
         List<XzHikvisionSync> syncList = new ArrayList<>();
@@ -382,6 +378,8 @@ public class XzHikvisionSyncServiceImpl extends ServiceImpl<XzHikvisionSyncMappe
         sync.setUpdateDate(new Date());
         sync.setBigType(1);
         syncList.add(sync);
+    }
+
     @Override
     public void updateStatusByWhoId(int bigType, Long whoId, int type, String devSn, int isSuccess) {
         baseMapper.updateStatusByWhoId(bigType, whoId, type, devSn, isSuccess);