fix: 执法设备绑定报错

zfjg-api/zfjg-api-manage/src/main/java/com/zfjg/manage/api/domain/enforce/job/EnforceJobCertificate.java

@@ -71,7 +71,7 @@ public class EnforceJobCertificate
     private Date sendTime;
 
     /** 签字时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     @ApiModelProperty(value = "签字时间")
     private Date signTime;
 

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/impl/device/DeviceServiceImpl.java

@@ -154,6 +154,7 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
         //记录绑定记录
         DeviceBoundHis his = new DeviceBoundHis();
         BeanUtils.copyProperties(device,his);
+        his.setId(null);
         his.setBoundBeginTime(new Date());
         his.setUsePersonId(userId);
         his.setUsePersonName(sysUser.getNickName());

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/task/RandomTaskRun.java

@@ -1244,7 +1244,6 @@ public class RandomTaskRun {
 //                createJobTemplateHandbook(enforceTemplateHandbookDTO, jobNodeItem).ifPresent(jobNodeItem::setItemId);
                 EnforceJobTemplateHandbook enforceJobTemplateHandbook = new EnforceJobTemplateHandbook();
                 BeanUtils.copyProperties(enforceTemplateHandbookDTO, enforceJobTemplateHandbook);
-
                 enforceJobTemplateHandbook.setJobId(jobNodeItem.getJobId());
                 enforceJobTemplateHandbook.setJobNodeId(jobNodeItem.getNodeId());
                 enforceJobTemplateHandbook.setHandbookCopyId(jobNodeItem.getItemId());

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/task/video/DataShareCameraIndexCodeClient.java

@@ -1,5 +1,6 @@
 package com.zfjg.manage.task.video;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hikvision.artemis.sdk.ArtemisHttpUtil;
@@ -138,6 +139,7 @@ public class DataShareCameraIndexCodeClient {
                     .eq(HikRegions::getIndexCode, t.getUnitIndexCode())
                     .last("LIMIT 1"));
             if (Objects.nonNull(hikRegionsOptional)) {
+                if (StrUtil.isBlank(hikRegionsOptional.getName())) return; // fixme 如果海康没有绑定机构则跳过
                 SysDept cquserOrganize = deptMapper.findLikeOrgName(hikRegionsOptional.getName());
                 if (Objects.nonNull(cquserOrganize)) {
 //                    final String TIMESTAMP_PATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX";