Merge branch 'dev'

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

@@ -485,6 +485,7 @@ public class EnforceJobServiceImpl extends ServiceImpl<EnforceJobMapper, Enforce
         List<EnforceJob> jobs = new ArrayList<>();
         // 校验是否已生成复检任务，若已生成则删除重新生成
         QueryWrapper<EnforceJob> wrapper = new QueryWrapper<>();
+        wrapper.select("id");
         wrapper.eq("first_check_id", enforceJob.getId());
         wrapper.eq("is_deleted", DeleteStatusEnum.NOT_DELETED.getStatus());
         List<EnforceJob> list = baseMapper.selectList(wrapper);
@@ -1379,7 +1380,6 @@ public class EnforceJobServiceImpl extends ServiceImpl<EnforceJobMapper, Enforce
             deleteIds.add(enforceJobNodeItemDTO.getId());
 
 
-
             enforceJobNodeItemDTO.getRecords().forEach(e -> {
                 EnforceJobNodeItemRecord record = new EnforceJobNodeItemRecord();
                 BeanUtils.copyProperties(e, record);
@@ -1410,25 +1410,25 @@ public class EnforceJobServiceImpl extends ServiceImpl<EnforceJobMapper, Enforce
         }
     }
 
-    private List<EnforceJobNodeItemRecord> initData(List<EnforceJobNodeItemRecord> list){
-        if(list==null){
+    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){
+        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);
-                   }
+            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);
+                    }
                 });
             });
         }
@@ -1645,6 +1645,7 @@ public class EnforceJobServiceImpl extends ServiceImpl<EnforceJobMapper, Enforce
         IEnforceQrCodeSignService enforceQrCodeSignService = SpringUtils.getBean(IEnforceQrCodeSignService.class);
         // 校验复检任务是否全部恢复为待执行状态
         QueryWrapper<EnforceJob> wrapper = new QueryWrapper<>();
+        wrapper.select("id,job_status");
         wrapper.eq("first_check_id", jobDTO.getId());
         wrapper.eq("is_deleted", DeleteStatusEnum.NOT_DELETED);
         List<EnforceJob> list = baseMapper.selectList(wrapper);

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

@@ -122,6 +122,7 @@ public class DataShareVeidoListClient {
             log.info("同步视频数据已关闭");
             return;
         }
+        log.info("总队同步视频定时任务开始");
         /**
          * STEP1：设置平台参数，根据实际情况,设置host appkey appsecret 三个参数.
          */
@@ -155,11 +156,14 @@ public class DataShareVeidoListClient {
         JSONObject json = new JSONObject();
         json.put("mediaType", 1);
         json.put("saveStatus", 1);
-
-
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("uuuu-MM-dd'T'HH:mm:ss.SSS");
+        LocalDateTime nowTime = LocalDateTime.now();
+        String endTime = dateTimeFormatter.format(nowTime);
+        String beginTime = dateTimeFormatter.format(nowTime.minusDays(period));
+        json.put("uploadPeriodBeginTime", beginTime + "+08:00");
+        json.put("uploadPeriodEndTime",endTime + "+08:00");
         String body = json.toJSONString();
         log.info("requset={}", body);
-
         /**
          * STEP6：调用接口
          */

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

@@ -1,10 +1,8 @@
 package com.zfjg.manage.utils;
 
-import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import cn.hutool.http.HttpUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.google.gson.reflect.TypeToken;
 import com.zfjg.common.core.domain.R;
 import com.zfjg.common.core.exception.ServiceException;
@@ -21,8 +19,6 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.lang.reflect.Type;
-import java.time.OffsetDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -75,6 +71,7 @@ public class ZzglClient {
 //        get.header(Header.AUTHORIZATION, "Bearer " + "");
             get.timeout(3000);
             HttpResponseDataVO execute = execute(get);
+            log.info("消控室信息查询：返回参数：{}", execute);
             Type type = new TypeToken<R<List<EnforceRoomVO>>>() {
             }.getType();
             R<List<EnforceRoomVO>> data = toData(execute, type);
@@ -100,6 +97,7 @@ public class ZzglClient {
             get.timeout(3000);
             get.body(GsonUtils.toJson(req));
             HttpResponseDataVO execute = execute(get);
+            log.info("值班记录：返回参数：{}", execute);
             Type type = new TypeToken<TableInfo<EnforceDutyRecordVO>>() {
             }.getType();
             return toDataPage(execute, type);
@@ -127,6 +125,7 @@ public class ZzglClient {
 //        get.header(Header.AUTHORIZATION, "Bearer " + "");
             get.timeout(3000);
             HttpResponseDataVO execute = execute(get);
+            log.info("查询值班人员：返回参数：{}", execute);
             Type type = new TypeToken<R<List<HandoverInfoApiVO>>>() {
             }.getType();
             R<List<HandoverInfoApiVO>> data = toData(execute, type);
@@ -153,21 +152,12 @@ public class ZzglClient {
 //        get.header(Header.AUTHORIZATION, "Bearer " + "");
             get.timeout(3000);
             HttpResponseDataVO execute = execute(get);
+            log.info("查看档案：返回参数：{}", execute);
             Type type = new TypeToken<R<DutyRecordDetailVO>>() {
             }.getType();
             R<DutyRecordDetailVO> data = toData(execute, type);
             DutyRecordDetailVO data1 = data.getData();
-/*            if (CollectionUtil.isNotEmpty(data1.getJsonObjects())) {
-                for (JSONObject jsonObject : data1.getJsonObjects()) {
-                    if (jsonObject.containsKey("jjbsj")) {
-                        String jjbsj = jsonObject.getString("jjbsj");
-                        OffsetDateTime offsetDateTime = OffsetDateTime.parse(jjbsj);
-                        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-                        String formattedDateTime = offsetDateTime.format(formatter);
-                        jsonObject.put("jjbsj", formattedDateTime);
-                    }
-                }
-            }*/
+
             return data1;
         } catch (Exception e) {
             log.error("调用自主管理，查看档案接口失败。参数{}。异常{}", id, e);
@@ -191,6 +181,7 @@ public class ZzglClient {
 //        get.header(Header.AUTHORIZATION, "Bearer " + "");
             get.timeout(3000);
             HttpResponseDataVO execute = execute(get);
+            log.info("检查项：返回参数：{}", execute);
             Type type = new TypeToken<R<SingleDutyApplyDetailsAppVO>>() {
             }.getType();
             R<SingleDutyApplyDetailsAppVO> data = toData(execute, type);
@@ -216,6 +207,7 @@ public class ZzglClient {
             get.timeout(3000);
             get.body(GsonUtils.toJson(req));
             HttpResponseDataVO execute = execute(get);
+            log.info("取消单人值班：返回参数：{}", execute);
         } catch (Exception e) {
             log.error("调用自主管理，取消单人值班接口失败。参数{}。异常{}", req, e);
         }
@@ -236,6 +228,7 @@ public class ZzglClient {
             get.timeout(3000);
             get.body(GsonUtils.toJson(req));
             HttpResponseDataVO execute = execute(get);
+            log.info("批量根据精确的单位名获取消防室：返回参数：{}", execute);
             Type type = new TypeToken<R<RoomByPreciseCompanyNameVO>>() {
             }.getType();
             R<RoomByPreciseCompanyNameVO> data = toData(execute, type);
@@ -261,6 +254,7 @@ public class ZzglClient {
             get.timeout(3000);
             get.body(GsonUtils.toJson(req));
             HttpResponseDataVO execute = execute(get);
+            log.info("双随机校验-全面检查：返回参数：{}", execute);
         } catch (Exception e) {
             log.error("调用自主管理，双随机校验-全面检查接口失败。参数{}。异常{}", req, e);
         }