Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/report/query/QueryInspectionHandleReportService.java

@@ -128,9 +128,11 @@ public class QueryInspectionHandleReportService {
                         handlerImageList.add(CommonConfig.imageURL + str);
                     }
                     inspectionFileHandleReportVo = new InspectionFileHandleReportVo();
-                    User user = userMap.get(inspectionFileHandle.getHandlerUser());
-                    if (null != user) {
-                        inspectionFileHandleReportVo.setHandlerUser(user.getRealname());
+                    if (CollectionUtil.isNotEmpty(userMap)) {
+                        User user = userMap.get(inspectionFileHandle.getHandlerUser());
+                        if (null != user) {
+                            inspectionFileHandleReportVo.setHandlerUser(user.getRealname());
+                        }
                     }
                     inspectionFileHandleReportVo.setHandlerResult(inspectionFileHandle.getHandlerResult());
                     inspectionFileHandleReportVo.setHandlerTime(inspectionFileHandle.getHandlerTime());
@@ -179,6 +181,9 @@ public class QueryInspectionHandleReportService {
      */
     private Map<String, User> getUserMap(List<InspectionFileHandle> inspectionFileHandleList) {
         List<String> userIdList = inspectionFileHandleList.stream().map(o -> o.getHandlerUser()).collect(Collectors.toList());
+        if (CollectionUtil.isEmpty(userIdList)) {
+            return null;
+        }
         List<User> userList = userMapper.selectList(new LambdaQueryWrapper<User>()
                 .in(User::getId, userIdList)
                 .eq(User::getMark, 1));

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/dsp/DspCallbackServiceImpl.java

@@ -82,7 +82,6 @@ public class DspCallbackServiceImpl implements IDspCallbackService {
         Inspection inspection = inspectionMapper.selectOne(new LambdaQueryWrapper<Inspection>()
                 .eq(Inspection::getId, inspectionId)
                 .eq(Inspection::getTenantId, business.getTenantId()));
-        log.info("任务, inspection:{}", inspection);
         if (ObjectUtil.isNull(inspection)) {
             log.info("任务不存在");
             throw new ServiceException(0, "巡检任务不存在");

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/inspection/InspectionReportVo.java

@@ -2,6 +2,7 @@ package com.tuoheng.admin.vo.inspection;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -161,13 +162,15 @@ public class InspectionReportVo {
     /**
      * 执行开始时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date executionStartTime;
 
     /**
      * 执行结束时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date executionEndTime;
 
     /**