任务关联人接口新加查询条件和实时轨迹东八区修改

service/zdry/src/main/java/com/founder/zdry/controller/FenceTaskController.java

@@ -44,21 +44,27 @@ public class FenceTaskController {
             @ApiParam(name = "limit", value = "每页记录数", required = true)
             @PathVariable Long limit,
 
-            @ApiParam(name = "taskType", value = "任务类型")
-            @RequestParam(required = false)  String taskType,
+            @ApiParam(name = "gklx", value = "任务类型")
+            @RequestParam(required = false)  String gklx,
 
             @ApiParam(name = "sbimei", value = "设备IMEI")
-            @RequestParam(required = false)  String sbimei
+            @RequestParam(required = false)  String sbimei,
+
+            @ApiParam(name = "name", value = "任务名称")
+            @RequestParam(required = false)  String name
           ){
 
         Page<FenceTask> pageParam = new Page<>(page, limit);
         QueryWrapper<FenceTask> wrapper = new QueryWrapper<>();
-        if(StringUtils.isNotBlank(taskType)){
-            wrapper.like("task_type", taskType);
+        if(StringUtils.isNotBlank(gklx)){
+            wrapper.eq("gklx", gklx);
         }
         if(StringUtils.isNotBlank(sbimei)){
             wrapper.like("sb_imei", sbimei);
         }
+        if(StringUtils.isNotBlank(name)){
+            wrapper.like("name", name);
+        }
         wrapper.eq("xxsc_pdbz", "0");
         wrapper.orderByAsc("djsj");
         fenceTaskService.page(pageParam, wrapper);

serviceapi/zdryapi/src/main/java/com/founder/zdryapi/service/impl/ZdryApiServiceImpl.java

@@ -240,8 +240,8 @@ public class ZdryApiServiceImpl implements ZdryApiService {
                         String y = jsonArrayPoint.get(1).toString();
 
                         locationData.setDevice(device);
-                        locationData.setCreated_at(sf.format(new Date(Long.parseLong(created_at))));
-                        locationData.setTime_begin(sf.format(new Date(Long.parseLong(time_begins))));
+                        locationData.setCreated_at(sf.format(new Date(Long.parseLong(created_at) - TimeZone.getDefault().getRawOffset())));
+                        locationData.setTime_begin(sf.format(new Date(Long.parseLong(time_begins)- TimeZone.getDefault().getRawOffset())));
                         if(type.equals("1")){
                             locationData.setType("基站定位");