Merge remote-tracking branch 'origin/master'

# Conflicts:
#	zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/sync/remote/DefaultLjZfjgSyncDataService.java
#	zfjg-modules/zfjg-manage/src/main/resources/mapper/enforce/obj/EnforceObjMapper.xml

pom.xml

@@ -461,17 +461,17 @@
             </releases>
         </repository>
         <!--mxkj 私有仓库-->
-        <repository>
-            <id>my-public</id>
-            <url>http://gis.htmusic.cn:18081/repository/maven-public/</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-            </snapshots>
-        </repository>
+        <!--<repository>-->
+            <!--<id>my-public</id>-->
+            <!--<url>http://gis.htmusic.cn:18081/repository/maven-public/</url>-->
+            <!--<releases>-->
+                <!--<enabled>true</enabled>-->
+            <!--</releases>-->
+            <!--<snapshots>-->
+                <!--<enabled>true</enabled>-->
+                <!--<updatePolicy>always</updatePolicy>-->
+            <!--</snapshots>-->
+        <!--</repository>-->
     </repositories>
 
     <pluginRepositories>

zfjg-gateway/src/main/java/com/zfjg/gateway/handler/SwaggerHandler.java

@@ -2,6 +2,7 @@ package com.zfjg.gateway.handler;
 
 import java.util.Optional;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Profile;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -16,6 +17,7 @@ import springfox.documentation.swagger.web.UiConfigurationBuilder;
 
 @RestController
 @RequestMapping("/swagger-resources")
+@Profile("dev")
 public class SwaggerHandler
 {
     @Autowired(required = false)

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/mapper/enforce/job/EnforceJobNodeItemRecordMapper.java

@@ -21,4 +21,8 @@ public interface EnforceJobNodeItemRecordMapper extends BaseMapper<EnforceJobNod
      *  所有node的item信息的检车信息
      */
     List<EnforceJobNodeItemRecordDTO> findRecordByItemIds(@Param("ids") List<Long> ids);
+
+    List<EnforceJobNodeItemRecordDTO> findByIds(@Param("ids") List<Long> ids);
+
+    EnforceJobNodeItemRecordDTO getByIdEnforce(Long  id);
 }

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/impl/enforce/job/EnforceJobServiceImpl.java

@@ -53,6 +53,7 @@ import com.zfjg.manage.config.Constant;
 import com.zfjg.manage.mapper.CommMapper;
 import com.zfjg.manage.mapper.enforce.job.EnforceJobMapper;
 import com.zfjg.manage.mapper.enforce.job.EnforceJobNodeItemMapper;
+import com.zfjg.manage.mapper.enforce.job.EnforceJobNodeItemRecordMapper;
 import com.zfjg.manage.mapper.enforce.job.EnforceJobNodeMapper;
 import com.zfjg.manage.mapper.enforce.template.EnforceTemplateMapper;
 import com.zfjg.manage.mapper.enforce.template.EnforceTemplateNodeItemMapper;
@@ -189,7 +190,8 @@ public class EnforceJobServiceImpl extends ServiceImpl<EnforceJobMapper, Enforce
     private RedisTemplate redisTemplate;
 
     @Autowired
-    private SequenceGenerator sequenceGenerator;
+    EnforceJobNodeItemRecordMapper enforceJobNodeItemRecordMapper;
+
 
     @Value("${enforce.root_org_id}")
     private String rootOrgId;
@@ -1313,6 +1315,7 @@ public class EnforceJobServiceImpl extends ServiceImpl<EnforceJobMapper, Enforce
         List<Long> deleteIds = new ArrayList<>();
         //EnforceJobNodeItemRecord 添加
         List<EnforceJobNodeItemRecord> recordsList = new ArrayList<>();
+        List<EnforceJobNodeItemRecord> updateList = new ArrayList<>();
         for (EnforceJobNodeItemDTO enforceJobNodeItemDTO :
                 enforceJobNodeItemDTOList) {
 
@@ -1372,29 +1375,29 @@ public class EnforceJobServiceImpl extends ServiceImpl<EnforceJobMapper, Enforce
 //            enforceJobNodeItemRecordService.deleteRecords(enforceJobNodeItemDTO.getId());
             deleteIds.add(enforceJobNodeItemDTO.getId());
 
+
+
             enforceJobNodeItemDTO.getRecords().forEach(e -> {
                 EnforceJobNodeItemRecord record = new EnforceJobNodeItemRecord();
                 BeanUtils.copyProperties(e, record);
+                record.setId(SequenceGenerator.getInstance().nextId());
                 record.setItemId(enforceJobNodeItemDTO.getId());
-                record.setId(sequenceGenerator.nextId());
                 recordsList.add(record);
-//                enforceJobNodeItemRecordService.saveRecord(e);
+
             });
         }
+
+
+//        enforceJobNodeItemRecordService.listByIds()
+
+
         if (StringUtils.isNotEmpty(deleteIds)) {
             enforceJobNodeItemRecordService.remove(new LambdaQueryWrapper<EnforceJobNodeItemRecord>()
                     .in(EnforceJobNodeItemRecord::getItemId, deleteIds));
         }
+
         if (StringUtils.isNotEmpty(recordsList)) {
-            try {
-                enforceJobNodeItemRecordService.saveOrUpdateBatch(recordsList);
-            }catch (Exception e){
-                e.printStackTrace();
-                for (EnforceJobNodeItemRecord bean:recordsList){
-                    bean.setId(sequenceGenerator.nextId());
-                }
-                enforceJobNodeItemRecordService.saveOrUpdateBatch(recordsList);
-            }
+            enforceJobNodeItemRecordService.saveBatch(initData(recordsList));
         }
         if (StringUtils.isNotEmpty(updateEnforceJobNodeItemList)) {
             enforceJobNodeItemService.updateBatchById(updateEnforceJobNodeItemList);
@@ -1404,6 +1407,31 @@ public class EnforceJobServiceImpl extends ServiceImpl<EnforceJobMapper, Enforce
         }
     }
 
+    private List<EnforceJobNodeItemRecord> initData(List<EnforceJobNodeItemRecord> list){
+        if(list==null){
+            return null;
+        }
+        List<Long> collect = list.stream().map(EnforceJobNodeItemRecord::getId).collect(Collectors.toList());
+        List<EnforceJobNodeItemRecordDTO> enforceJobNodeItemRecords = enforceJobNodeItemRecordMapper.findByIds(collect);
+        if(enforceJobNodeItemRecords!=null&&enforceJobNodeItemRecords.size()>0){
+            log.error("生成id有重复______________________");
+            enforceJobNodeItemRecords.forEach(e->{
+                list.forEach(e1->{
+                   if(e.getId().equals(e1.getId())){
+                       long l = SequenceGenerator.getInstance().nextId();
+                       EnforceJobNodeItemRecordDTO byId = enforceJobNodeItemRecordMapper.getByIdEnforce(l);
+                       if(byId!=null){
+                           l=SequenceGenerator.getInstance().nextId();
+                           log.error("再次重复______________________");
+                       }
+                       e1.setId(l);
+                   }
+                });
+            });
+        }
+        return list;
+    }
+
     @Override
     public Optional<EnforceJobDTO> find(long id) {
         EnforceJob enforceJob = baseMapper.selectById(id);
@@ -2691,7 +2719,7 @@ public class EnforceJobServiceImpl extends ServiceImpl<EnforceJobMapper, Enforce
         BeanUtils.copyProperties(enforceHandbook, templateHandbook);
         //新增  EnforceJobTemplateHandbook
 
-        templateHandbook.setId(sequenceGenerator.nextId());
+        templateHandbook.setId(SequenceGenerator.getInstance().nextId());
         templateHandbook.setJobId(enforceJobNode.getJobId());
         templateHandbook.setJobNodeId(enforceJobNode.getId());
         templateHandbook.setItemType("0");
@@ -2710,7 +2738,7 @@ public class EnforceJobServiceImpl extends ServiceImpl<EnforceJobMapper, Enforce
         enforceJobNodeItem.setItemName(enforceHandbook.getEnforceItem());
         enforceJobNodeItem.setItemContent(enforceHandbook.getEnforceContent());
         enforceJobNodeItem.setEnforceObjClass(enforceHandbook.getEnforceClass());
-        enforceJobNodeItem.setId(sequenceGenerator.nextId());
+        enforceJobNodeItem.setId(SequenceGenerator.getInstance().nextId());
         enforceJobNodeItem.setCheckOptions(null);
         enforceJobNodeItem.setCreateTime(new Date());
         enforceJobNodeItem.setUpdateTime(new Date());

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/impl/enforce/obj/EnforceObjServiceImpl.java

@@ -93,8 +93,6 @@ public class EnforceObjServiceImpl extends ServiceImpl<EnforceObjMapper, Enforce
     @Autowired
     private ElasticsearchRestTemplate elasticsearchRestTemplate;
 
-    @Autowired
-    private SequenceGenerator sequenceGenerator;
 
     private static Map<String, String> enforceObjTypeMap = new HashMap<String, String>() {
         {
@@ -644,7 +642,7 @@ public class EnforceObjServiceImpl extends ServiceImpl<EnforceObjMapper, Enforce
      */
     private void saveEnforceObjChangeHis(EnforceObj enforceObjOld, EnforceObjDTO enforceObjDTO) {
         EnforceObjChangeHis enforceObjChangeHis = new EnforceObjChangeHis();
-        enforceObjChangeHis.setId(sequenceGenerator.nextId());
+        enforceObjChangeHis.setId(SequenceGenerator.getInstance().nextId());
         if (Objects.nonNull(enforceObjOld)) {
             LOGGER.info("变更执法对象信息前,enforceOriginalObj=[{}]", enforceObjOld);
             LOGGER.info("变更记录执法对象信息后,enforceObj=[{}]", enforceObjDTO);

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/sync/remote/DefaultLjZfjgSyncDataService.java

@@ -7,6 +7,7 @@ import cn.hutool.core.util.ReflectUtil;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.zfjg.common.core.constant.CacheConstants;
 import com.zfjg.common.core.enums.JobTypeEnum;
@@ -17,6 +18,7 @@ import com.zfjg.manage.api.domain.device.Device;
 import com.zfjg.manage.api.domain.enforce.job.EnforceJob;
 import com.zfjg.manage.api.domain.enforce.job.EnforceJobReport;
 import com.zfjg.manage.api.domain.enforce.obj.EnforceObj;
+import com.zfjg.manage.api.domain.enforce.obj.EnforceObjArchitecture;
 import com.zfjg.manage.api.domain.enforce.obj.EnforceObjTag;
 import com.zfjg.manage.api.domain.enforce.obj.Tag;
 import com.zfjg.manage.api.domain.enforce.video.EnforceVideo;
@@ -40,6 +42,7 @@ import com.zfjg.system.api.domain.SysDictData;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -98,7 +101,9 @@ public class DefaultLjZfjgSyncDataService implements ILjZfjgSyncDataService {
             log.info("未开启两江数据推送接口");
             return;
         }
-        if (checkParams(obj, "id", "deviceName", "cameraIndexCode", "serialNo", "deviceIndexCode", "enforceOrgName", "registerTime", "deviceStatus", "bindStatus", "enforceOrgId", "isDeleted", "createTime", "updateTime")) {
+        if (checkParams(obj, "id", "deviceName", "cameraIndexCode", "serialNo", "deviceIndexCode", "enforceOrgName", "registerTime",
+                "deviceStatus", "bindStatus", "enforceOrgId", "isDeleted", "createTime", "updateTime"
+        )) {
             request("/device", obj, checkIsLjData(MapUtil.getStr(obj, "enforceOrgId")));
         } else if (checkParams(obj, "id")) {
             Device device = Optional.ofNullable(deviceService.getById((Serializable) obj.get("id"))).orElse(new Device());
@@ -144,7 +149,8 @@ public class DefaultLjZfjgSyncDataService implements ILjZfjgSyncDataService {
             return;
         }
         if (checkParams(obj, "id")) {
-            EnforceJob enforceJob = Optional.ofNullable(enforceJobService.getRealJobById((Serializable) obj.get("id"))).orElse(new EnforceJob());
+            EnforceJob enforceJob = Optional.ofNullable(enforceJobService.getRealJobById((Serializable) obj.get("id")))
+                    .orElse(new EnforceJob());
             if (!JobTypeEnum.REPORT.getValue().equals(enforceJob.getJobType()) || !checkIsLjData(enforceJob.getEnforceOrgId())) {
                 throw new ServiceException("不是两江举报投诉任务不进行同步： " + enforceJob);
             }
@@ -204,7 +210,10 @@ public class DefaultLjZfjgSyncDataService implements ILjZfjgSyncDataService {
             log.info("未开启两江数据推送接口");
             return;
         }
-        if (checkParams(obj, "id", "enforceOrgName", "enforceObjName", "manageStatus", "enforceOrgId", "enforceObjType", "architectureType", "holeResponsibility", "createUserId", "updateUserId", "isDeleted", "selectTimes", "dataSources", "isLabel", "extractNum", "createTime", "updateTime")) {
+        if (checkParams(obj, "id", "enforceOrgName", "enforceObjName", "manageStatus", "enforceOrgId", "enforceObjType", "architectureType",
+                "holeResponsibility", "createUserId", "updateUserId",
+                "isDeleted", "selectTimes", "dataSources", "isLabel", "extractNum", "createTime", "updateTime"
+        )) {
             request("/enforce_obj", obj, checkIsLjData(MapUtil.getStr(obj, "enforceOrgId")));
         } else if (checkParams(obj, "id")) {
             EnforceObj enforceObj = Optional.ofNullable(enforceObjService.getById((Serializable) obj.get("id"))).orElse(new EnforceObj());
@@ -248,7 +257,8 @@ public class DefaultLjZfjgSyncDataService implements ILjZfjgSyncDataService {
             log.info("未开启两江数据推送接口");
             return;
         }
-        if (checkParams(obj, "id", "mediaId", "deviceId", "deviceName", "enforceOrgId", "enforceOrgName", "videoType", "videoBeginTime", "videoEndTime", "isDeleted", "fileId", "duration", "timeOut", "createTime")) {
+        if (checkParams(obj, "id", "mediaId", "deviceId", "deviceName", "enforceOrgId", "enforceOrgName", "videoType", "videoBeginTime", "videoEndTime",
+                "isDeleted", "fileId", "duration", "timeOut", "createTime")) {
             obj.put("timeOut", 0);
             request("/device_video", obj, checkIsLjData(MapUtil.getStr(obj, "enforceOrgId")));
         } else if (checkParams(obj, "id")) {
@@ -312,27 +322,38 @@ public class DefaultLjZfjgSyncDataService implements ILjZfjgSyncDataService {
 
     @Override
     public void updateFireRoom() {
-        System.out.println("消控室接口");
-        System.out.println(enabled);
+        log.info("=============消控室接口");
+
         if (!enabled) {
-            System.out.println("未开启消控室接口");
+            log.error("===========未开启消控室接口");
             return;
         }
         if (!fireRoomEnable) {
-            System.out.println("未开启消控室执行计划");
+            log.info("============未开启消控室执行计划");
             return;
         }
         List<EnforceJobFireRoomDTO> enforceJobFireRoomDTOS = enforceObjServiceExtend.enforceJobFireRoomList();
         if (enforceJobFireRoomDTOS.isEmpty()) {
-            log.error("未找到不合格的消控室");
+            log.info("============未找到不合格的消控室");
             return;
         }
-        log.info("不合格的消控室{}", enforceJobFireRoomDTOS);
+        log.info("不合格的消控室" + enforceJobFireRoomDTOS);
         Map<String, String> stringStringMap = enforceJobFireRoomDTOS.stream().collect(Collectors.toMap(EnforceJobFireRoomDTO::getEnforceObjId, EnforceJobFireRoomDTO::getJobId));
         List<String> ids = enforceJobFireRoomDTOS.stream().map(EnforceJobFireRoomDTO::getEnforceObjId).collect(Collectors.toList());
         List<EnforceObj> enforceObjs = enforceObjService.listByIds(ids);
-        log.info("不合格的消控室执法对象{}", enforceObjs);
+        log.info("不合格的消控室执法对象" + enforceObjs);
         for (EnforceObj enforceObj : enforceObjs) {
+
+            //发送数据到IRS交互应用
+            String address = Optional.of(enforceObj).map(EnforceObj::getEnforceOrgName).orElse("");
+            if (!address.contains("两江新区")) {
+                log.info(enforceObj.getEnforceObjName() + " 发送至发送数据到IRS交互应用不是两江新区");
+                continue;
+            }
+            if (!stringStringMap.containsKey(enforceObj.getId())) {
+                log.info(enforceObj.getEnforceObjName() + " 发送至发送数据到IRS交互应用找不到ID");
+                continue;
+            }
             String eventCondition = "A11";
             if (ObjectUtil.isNotEmpty(enforceObj.getPlaceType())) {
                 SysDictData dictDataCache = commMapper.selectDeptByQuery(CacheConstants.PLACE_TYPE, enforceObj.getPlaceType());
@@ -365,26 +386,23 @@ public class DefaultLjZfjgSyncDataService implements ILjZfjgSyncDataService {
                     eventCondition = "A10";
                 }
             }
-            System.out.println(enforceObj.getEnforceObjName() + " 发送至发送数据到IRS交互应用不是两江新区走的情形为: " + eventCondition);
-            //发送数据到IRS交互应用
-            String address = Optional.of(enforceObj).map(EnforceObj::getEnforceObjAddress).orElse("");
-            if (!address.contains("两江新区")) {
-                System.out.println(enforceObj.getEnforceObjName() + " 发送至发送数据到IRS交互应用不是两江新区");
-                continue;
-            }
-            if (!stringStringMap.containsKey(enforceObj.getId())) {
-                System.out.println(enforceObj.getEnforceObjName() + " 发送至发送数据到IRS交互应用找不到ID");
-                continue;
-            }
+            log.info(enforceObj.getEnforceObjName() + "==---------------------发送至发送数据到IRS交互应用不是两江新区走的情形为: " + eventCondition);
+
             String jobId = stringStringMap.get(enforceObj.getId());
             EnforceJob enforceJob = enforceJobService.getById(jobId);
 
             JSONObject response = GaoDeMapUtil.geoEncode(enforceJob.getStartLongitude(), enforceJob.getStartLatitude());
-            String streetName = Optional.of(response).filter(it -> it.containsKey("regeocode")).map(it -> it.getJSONObject("regeocode")).filter(it -> it.containsKey("addressComponent")).map(it -> it.getJSONObject("addressComponent")).filter(it -> it.containsKey("township")).map(it -> it.getString("township")).orElse("");
+            String streetName = Optional.of(response).filter(it -> it.containsKey("regeocode"))
+                    .map(it -> it.getJSONObject("regeocode"))
+                    .filter(it -> it.containsKey("addressComponent"))
+                    .map(it -> it.getJSONObject("addressComponent"))
+                    .filter(it -> it.containsKey("township"))
+                    .map(it -> it.getString("township")).orElse("");
             if (StringUtils.isEmpty(streetName)) {
-                System.out.println(enforceObj.getEnforceObjName() + "发送至发送数据到IRS交互应用找不到街道");
+                log.info(enforceObj.getEnforceObjName() + "---------------发送至发送数据到IRS交互应用找不到街道");
                 continue;
             }
+            log.info("-------------数据发送");
 
             StartEventDto startEventDto = new StartEventDto();
             startEventDto.setAreaName("两江新区");
@@ -403,8 +421,11 @@ public class DefaultLjZfjgSyncDataService implements ILjZfjgSyncDataService {
 
             Map<String, Object> param = BeanUtil.beanToMap(startEventDto, false, true);
             log.error("单位发送至发送数据到IRS交互应用参数: {}", JSON.toJSONString(param));
-            String startEventString = HttpUtil.createPost("http://183.66.101.165:9408/api/event/start/v1").body(JSON.toJSONString(param)).execute().sync().body();
-            System.out.println("单位发送至发送数据到IRS交互应用: " + startEventString);
+            String startEventString = HttpUtil.createPost("http://183.66.101.165:9408/api/event/start/v1")
+                    .body(JSON.toJSONString(param))
+                    .execute()
+                    .sync()
+                    .body();
             log.error("单位发送至发送数据到IRS交互应用: {}", startEventString);
 
         }

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/task/job/UnfreezeEnforceObjJobClient.java

@@ -39,8 +39,6 @@ public class UnfreezeEnforceObjJobClient {
     @Value("${fire.corn.unfreeze-enforce-obj-rsync.isopen}")
     private Boolean isopen;
 
-    @Autowired
-    SequenceGenerator sequenceGenerator;
     /**
      * 冻结执法对象自动解封任务(用新的)
      */
@@ -75,7 +73,7 @@ public class UnfreezeEnforceObjJobClient {
         enforceObjChangeHis.setUpdateUserName("系统操作");
         enforceObjChangeHis.setCreateTime(new Date());
         enforceObjChangeHis.setUpdateUserType(1L);
-        enforceObjChangeHis.setId(sequenceGenerator.nextId());
+        enforceObjChangeHis.setId(SequenceGenerator.getInstance().nextId());
         enforceObjChangeHisMapper.insert(enforceObjChangeHis);
         t.setManageStatus(0L);
         EnforceObjDTO enforceObjDTO = new EnforceObjDTO();

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/task/obj/ObjCountTask.java

@@ -41,8 +41,6 @@ public class ObjCountTask {
     @Autowired
     private EnforceObjChangeHisMapper enforceObjChangeHisMapper;
 
-    @Autowired
-    SequenceGenerator sequenceGenerator;
     /**
      * 定时更新执法对象抽泣次数
      */
@@ -102,7 +100,7 @@ public class ObjCountTask {
             enforceObjChangeHis.setUpdateUserName("系统操作");
             enforceObjChangeHis.setCreateTime(new Date());
             enforceObjChangeHis.setUpdateUserType(1L);
-            enforceObjChangeHis.setId(sequenceGenerator.nextId());
+            enforceObjChangeHis.setId(SequenceGenerator.getInstance().nextId());
             enforceObjChangeHisMapper.insert(enforceObjChangeHis);
             log.info("定时更新执法对象经营状态ID:{},时间{}", enforceObj.getId(), enforceObj.getBlockedEndTime());
         });

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/task/obj/ObjSyncTask.java

@@ -71,9 +71,6 @@ public class ObjSyncTask {
     @Autowired
     private RestTemplate restTemplate;
 
-    @Autowired
-    private SequenceGenerator sequenceGenerator;
-
     @Value("${fire.corn.obj-sync-task.isopen}")
     private Boolean isopen;
 
@@ -542,7 +539,7 @@ public class ObjSyncTask {
      */
     public <T> T execute(ObjSyncSearch search, String path, Class<T> object, String type) {
         SysPullLog sysPullLog = new SysPullLog();
-        sysPullLog.setId(sequenceGenerator.nextId());
+        sysPullLog.setId(SequenceGenerator.getInstance().nextId());
         sysPullLog.setRunTime(DateUtils.getNowDate());
         sysPullLog.setReq_json(search.toString());
         sysPullLog.setState(0l);

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

@@ -184,8 +184,6 @@ public class DataShareVeidoListClient {
         private IDeviceService deviceRepository;
         private IEnforceVideoService enforceVideoRepository;
         private VideoBindJobTask videoBindJobService;
-
-        private SequenceGenerator sequenceGenerator;
         /**
          * STEP4：设置参数提交方式
          */
@@ -206,7 +204,6 @@ public class DataShareVeidoListClient {
             this.deviceRepository = SpringUtils.getBean(IDeviceService.class);
             this.enforceVideoRepository = SpringUtils.getBean(IEnforceVideoService.class);
             this.videoBindJobService = SpringUtils.getBean(VideoBindJobTask.class);
-            this.sequenceGenerator=SpringUtils.getBean(SequenceGenerator.class);
         }
 
         @Override
@@ -226,7 +223,7 @@ public class DataShareVeidoListClient {
                 sysPullLogMapper.insert(sysPullLog);
                 return;
             }
-            sysPullLog.setId(sequenceGenerator.nextId());
+            sysPullLog.setId(SequenceGenerator.getInstance().nextId());
             sysPullLogMapper.insert(sysPullLog);
             log.info("线程：" + Thread.currentThread().getName() + " , 读取数据耗时 ：" + (System.currentTimeMillis() - start) + "ms");
             List<EnforceVideoHkRes> enforceVideoHkRes = result.getJSONObject("data").getJSONArray("list").toJavaList(EnforceVideoHkRes.class);

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/utils/SequenceGenerator.java

@@ -1,7 +1,5 @@
 package com.zfjg.manage.utils;
 
-import org.springframework.stereotype.Service;
-
 import java.net.NetworkInterface;
 import java.security.SecureRandom;
 import java.time.Instant;
@@ -14,9 +12,9 @@ import java.util.Enumeration;
  * <p>This class should be used as a Singleton. Make sure that you create and reuse a Single
  * instance of SequenceGenerator per node in your distributed system cluster.
  */
-@Service
 public class SequenceGenerator {
-  private static final int TOTAL_BITS = 60;
+
+  private static final int TOTAL_BITS = 64;
   private static final int EPOCH_BITS = 42;
   private static final int NODE_ID_BITS = 10;
   private static final int SEQUENCE_BITS = 12;
@@ -27,13 +25,15 @@ public class SequenceGenerator {
   // Custom Epoch (January 1, 2015 Midnight UTC = 2015-01-01T00:00:00Z)
   private static final long CUSTOM_EPOCH = 1420070400000L;
 
+  private static final SequenceGenerator INSTANCE = new SequenceGenerator();
+
   private final int nodeId;
 
   private volatile long lastTimestamp = -1L;
   private volatile long sequence = 0L;
 
   // Create SequenceGenerator with a nodeId
-  public SequenceGenerator(int nodeId) {
+  private SequenceGenerator(int nodeId) {
     if (nodeId < 0 || nodeId > maxNodeId) {
       throw new IllegalArgumentException(
           String.format("NodeId must be between %d and %d", 0, maxNodeId));
@@ -42,11 +42,20 @@ public class SequenceGenerator {
   }
 
   // Let SequenceGenerator generate a nodeId
-  public SequenceGenerator() {
+  private  SequenceGenerator() {
     this.nodeId = createNodeId();
   }
+  // 公开的静态方法,用于获取单例实例
+  public static SequenceGenerator getInstance() {
+    return INSTANCE;
+  }
 
   public synchronized long nextId() {
+    try {
+      Thread.sleep(3);
+    }catch (Exception e){
+
+    }
     long currentTimestamp = timestamp();
 
     if (currentTimestamp < lastTimestamp) {
@@ -69,7 +78,9 @@ public class SequenceGenerator {
     long id = currentTimestamp << (TOTAL_BITS - EPOCH_BITS);
     id |= (nodeId << (TOTAL_BITS - EPOCH_BITS - NODE_ID_BITS));
     id |= sequence;
-    return id;
+    long result = id % 100000000000000000L;
+    long l = result / 10;
+    return l;
   }
 
   // Get current timestamp in milliseconds, adjust for the custom epoch.
@@ -108,5 +119,4 @@ public class SequenceGenerator {
     return nodeId;
   }
 
-
 }

zfjg-modules/zfjg-manage/src/main/resources/mapper/enforce/job/EnforceJobNodeItemRecordMapper.xml

@@ -28,4 +28,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 )
             </if>
     </select>
+
+    <select id="findByIds"
+            resultType="com.zfjg.manage.api.dto.enforce.job.EnforceJobNodeItemRecordDTO">
+        select
+        id,
+        item_id,
+        is_deleted
+        from enforce_job_node_item_record
+        where
+
+        <if test="ids != null and ids.size>0">
+            id in
+            <foreach collection="ids" index="index" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+    </select>
+
+    <select id="getByIdEnforce"
+            resultType="com.zfjg.manage.api.dto.enforce.job.EnforceJobNodeItemRecordDTO">
+        select
+        id,
+        item_id,
+        is_deleted
+        from enforce_job_node_item_record
+        where
+
+        <if test="id != null">
+            id =  #{id}
+        </if>
+    </select>
+
 </mapper>

zfjg-modules/zfjg-manage/src/main/resources/mapper/enforce/obj/EnforceObjMapper.xml

@@ -280,13 +280,15 @@
     AND a.extract_num = 0
     </select>
     <select id="getEnforceJobFireRoom" resultType="com.zfjg.manage.api.dto.enforce.job.EnforceJobFireRoomDTO">
-        SELECT DISTINCT enforce_obj_id,job_id
+        SELECT DISTINCT enforce_obj_id, job_id
         FROM enforce_job_node_item
-        WHERE TO_DAYS(NOW()) - TO_DAYS(update_time) <![CDATA[ <= ]]> 1
-          AND enforce_obj_class = '消防控制室'
-          AND check_result = 2
+        WHERE DATEDIFF(NOW(), update_time) &lt;= 1
+        AND enforce_obj_class = '消防控制室'
+        AND check_result = 2;
     </select>
 
+
+
     <select id="getEnforceJobUseWaterList" resultType="com.zfjg.manage.api.dto.enforce.job.EnforceJobFireRoomDTO">
         SELECT DISTINCT enforce_obj_id,
                         job_id,