Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/task/AirportTask.java

@@ -19,6 +19,7 @@ import com.tuoheng.common.core.utils.HttpUtils;
 import com.tuoheng.common.core.utils.JacksonUtil;
 import com.tuoheng.common.core.utils.JsonResult;
 import com.tuoheng.common.core.utils.StringUtils;
+import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -43,8 +44,7 @@ public class AirportTask {
     @Autowired
     private TenantMapper tenantMapper;
 
-    //    @Scheduled(fixedRate = 60000)
-//    @XxlJob("airportTaskHandler")
+    @XxlJob("freewayAirportTaskHandler")
     public void airportTaskHandler() {
         //查询当前时间正负1分钟的时间跨度，xxljob执行频率为1分钟1次
         long start = new Date().getTime() - 1 * 60000L;

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/workorder/WorkOrderPageListVo.java

@@ -31,11 +31,6 @@ public class WorkOrderPageListVo {
      */
     private Integer status;
 
-    /**
-     * 工单生成时间
-     */
-    private Date createTime;
-
     /**
      * 问题总数
      */
@@ -98,6 +93,18 @@ public class WorkOrderPageListVo {
      */
     private String deptName;
 
+    /**
+     * 创建人
+     */
+    private String createUser;
+
+    /**
+     * 工单生成时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
     /**
      * 更新人
      */
@@ -106,5 +113,7 @@ public class WorkOrderPageListVo {
     /**
      * 更新时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
 }

tuoheng-service/tuoheng-admin/src/main/resources/application-dev.yml

@@ -166,10 +166,10 @@ xxl:
       addresses: http://192.168.11.11:8110/xxl-job-admin
     accessToken: tuoheng
     executor:
-      appname: xxl-job-executor-feishou
+      appname: xxl-job-executor-freeway
       address:
       ip:
       # 多个后台，端口号不能相同
-      port: 9888
+      port: 9997
       logpath: /data/java/logs/xxl-job/jobhandler
       logretentiondays: 15

tuoheng-service/tuoheng-admin/src/main/resources/application-prod.yml

@@ -164,13 +164,13 @@ xxl:
   enable: true
   job:
     admin:
-      addresses: http://172.16.1.31:8110/xxl-job-admin
+      addresses: https://xxl-job.t-aaron.com/xxl-job-admin/
     accessToken: tuoheng
     executor:
-      appname: xxl-job-executor-feishou
+      appname: xxl-job-executor-freeway
       address:
       ip:
       # 多个后台，端口号不能相同
-      port: 9888
+      port: 9997
       logpath: /data/java/logs/xxl-job/jobhandler
       logretentiondays: 15

tuoheng-service/tuoheng-admin/src/main/resources/application-test.yml

@@ -167,10 +167,10 @@ xxl:
       addresses: http://172.15.1.11:8110/xxl-job-admin
     accessToken: tuoheng
     executor:
-      appname: xxl-job-executor-feishou
+      appname: xxl-job-executor-freeway
       address:
       ip:
       # 多个后台，端口号不能相同
-      port: 9888
+      port: 9997
       logpath: /data/java/logs/xxl-job/jobhandler
       logretentiondays: 15

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/InspectionFileServiceImpl.java

@@ -425,7 +425,7 @@ public class InspectionFileServiceImpl implements IInspectionFileService {
         BeanUtils.copyProperties(inspection, vo);
         //对视频地址进行处理
         if (StringUtils.isNotEmpty(inspection.getAiVideoUrl())) {
-            vo.setAiVideoUrl(CommonConfig.videoURL + inspection.getVideoUrl());
+            vo.setAiVideoUrl(CommonConfig.videoURL + inspection.getAiVideoUrl());
         }
 
         return JsonResult.success(vo);

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/InspectionServiceImpl.java

@@ -202,7 +202,7 @@ public class InspectionServiceImpl implements IInspectionService {
         BeanUtils.copyProperties(inspection,vo);
         //对视频地址进行处理
         if(StringUtils.isNotEmpty(inspection.getAiVideoUrl())){
-            vo.setAiVideoUrl(CommonConfig.videoURL+inspection.getVideoUrl());
+            vo.setAiVideoUrl(CommonConfig.videoURL+inspection.getAiVideoUrl());
         }
 
         return JsonResult.success(vo);

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/WorkOrderServiceImpl.java

@@ -337,7 +337,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             QuestionType questionType = questionTypeMapper.selectById(t.getQuestionId());
             if (ObjectUtil.isNotNull(questionType)) {
                 vo.setType(questionType.getName());
-                vo.setContent(questionType.getContent());
+                vo.setContent(t.getQuestionName());
             }
             return vo;