任务接口封装

common/common_utils/src/main/java/com/founder/commonutils/ZdryApiEntity/FenceTask.java

@@ -62,4 +62,8 @@ public class FenceTask implements Serializable {
     @ApiModelProperty(value = "信息删除判断标志")
     @TableField(value = "xxsc_pdbz")
     private int xxscPdbz;
+
+    @ApiModelProperty(value = "任务类型")
+    @TableField(value = "task_type")
+    private String taskType;
 }

common/common_utils/src/main/java/com/founder/commonutils/ZdryApiEntity/OnlineAndWear.java

@@ -28,6 +28,11 @@ import java.io.Serializable;
 public class OnlineAndWear implements Serializable {
 
     private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "信息主键编号")
+    @TableId(type = IdType.AUTO)
+    private String id;
+
     @ApiModelProperty(value = "设备Imei")
     @TableField(value = "sb_imei")
     private String sbImei;

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

+package com.founder.zdry.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.founder.commonutils.ZdryApiEntity.FenceTask;
+import com.founder.commonutils.publicEntity.MapRestResult;
+import com.founder.commonutils.publicEntity.ResultCode;
+import com.founder.zdry.service.FenceTaskService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author yangyang
+ * @since 2021-06-05
+ */
+@RestController
+@Api(tags = "任务管理")
+@RequestMapping("/fence")
+public class FenceTaskController {
+
+    @Autowired
+    private FenceTaskService fenceTaskService;
+
+    @ApiOperation(value = "分页围栏任务列表")
+    @GetMapping("fenceTaskList/{page}/{limit}")
+    public MapRestResult fenceTaskList(
+            @ApiParam(name = "page", value = "当前页码", required = true)
+            @PathVariable Long page,
+
+            @ApiParam(name = "limit", value = "每页记录数", required = true)
+            @PathVariable Long limit,
+
+            @ApiParam(name = "taskType", value = "任务类型")
+            @RequestParam(required = false)  String taskType,
+
+            @ApiParam(name = "sbimei", value = "设备IMEI")
+            @RequestParam(required = false)  String sbimei
+          ){
+
+        Page<FenceTask> pageParam = new Page<>(page, limit);
+        QueryWrapper<FenceTask> wrapper = new QueryWrapper<>();
+        if(StringUtils.isNotBlank(taskType)){
+            wrapper.like("task_type", taskType);
+        }
+        if(StringUtils.isNotBlank(sbimei)){
+            wrapper.like("sb_imei", sbimei);
+        }
+        wrapper.eq("xxsc_pdbz", "0");
+        wrapper.orderByAsc("djsj");
+        fenceTaskService.page(pageParam, wrapper);
+        List<FenceTask> records = pageParam.getRecords();
+        long total = pageParam.getTotal();
+        return  MapRestResult.build(ResultCode.SUCCESS,"成功获取任务列表信息",total,records);
+    }
+}
+

service/zdry/src/main/java/com/founder/zdry/mapper/FenceTaskMapper.java

+package com.founder.zdry.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.founder.commonutils.ZdryAndZdryApiVo.UsersAndOnlineVo;
+import com.founder.commonutils.ZdryApiEntity.FenceTask;
+import com.founder.commonutils.zdryEntity.Users;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author yangyang
+ * @since 2021-06-05
+ */
+@Mapper
+@Component
+public interface FenceTaskMapper extends BaseMapper<FenceTask> {
+
+
+}

service/zdry/src/main/java/com/founder/zdry/mapper/xml/FenceTaskMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.founder.zdry.mapper.FenceTaskMapper">
+
+</mapper>

service/zdry/src/main/java/com/founder/zdry/service/FenceTaskService.java

+package com.founder.zdry.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.founder.commonutils.ZdryApiEntity.FenceTask;
+
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author yangyang
+ * @since 2021-06-05
+ */
+public interface FenceTaskService extends IService<FenceTask> {
+
+}

service/zdry/src/main/java/com/founder/zdry/service/impl/FenceTaskServiceImpl.java

+package com.founder.zdry.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.founder.commonutils.ZdryApiEntity.FenceTask;
+import com.founder.zdry.mapper.FenceTaskMapper;
+import com.founder.zdry.service.FenceTaskService;
+
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author yangyang
+ * @since 2021-06-05
+ */
+@Service
+public class FenceTaskServiceImpl extends ServiceImpl<FenceTaskMapper, FenceTask> implements FenceTaskService {
+
+}

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

@@ -215,7 +215,7 @@ public class ZdryApiServiceImpl implements ZdryApiService {
                 JSONObject result = JSONObject.parseObject(resultString);
 
                 // 查看是否登录
-                if (result.getString("error_code").equals("101")) {
+                if (result.getString("success").equals("false")) {
                     if(getToken().equals("success")){
                          resultString = restTemplate.getForEntity(url,String.class).getBody();
                     }else{
@@ -333,8 +333,16 @@ public class ZdryApiServiceImpl implements ZdryApiService {
                                        // 查询
                                        OnlineAndWear onlineAndWear = zdryApiMapper.selectOne(wrapper);
                                        if(null != onlineAndWear){
+                                           onlineAndWear.setSbImei(p.getSbImei());
+                                           onlineAndWear.setXm(p.getXm());
+                                           onlineAndWear.setLastLocationX(p.getLastLocationX());
+                                           onlineAndWear.setLastLocationY(p.getLastLocationY());
+                                           onlineAndWear.setWearFlag(p.getWearFlag());
+                                           onlineAndWear.setOnline(p.getOnline());
+                                           onlineAndWear.setLocationUpdatedAt(p.getLocationUpdatedAt());
+                                           onlineAndWear.setLastAddress(p.getLastAddress());
                                            // 执行更新
-                                           zdryApiMapper.updateById(p);
+                                           zdryApiMapper.updateById(onlineAndWear);
                                         }else{
                                            // 插入数据
                                            zdryApiMapper.insert(p);
@@ -394,6 +402,7 @@ public class ZdryApiServiceImpl implements ZdryApiService {
                 fenceTask.setTimeEnd(time_end);
                 fenceTask.setSafeArea(safe_area);
                 fenceTask.setSbImei(sbImei);
+                fenceTask.setTaskType("dzwl");
 
                 // 执行更新
                 zdryFenceTaskMapper.updateById(fenceTask);
@@ -404,6 +413,7 @@ public class ZdryApiServiceImpl implements ZdryApiService {
                 fenceTasks.setTimeEnd(time_end);
                 fenceTasks.setSafeArea(safe_area);
                 fenceTasks.setSbImei(sbImei);
+                fenceTask.setTaskType("dzwl");
 
                 // 插入数据
                 int flag = zdryFenceTaskMapper.insert(fenceTasks);
@@ -430,6 +440,7 @@ public class ZdryApiServiceImpl implements ZdryApiService {
                     fenceTask.setTimeEnd(time_end);
                     fenceTask.setSafeArea(safe_area);
                     fenceTask.setSbImei(sbImei);
+                    fenceTask.setTaskType("dzwl");
 
                     // 执行更新
                     zdryFenceTaskMapper.updateById(fenceTask);
@@ -440,6 +451,7 @@ public class ZdryApiServiceImpl implements ZdryApiService {
                     fenceTasks.setTimeEnd(time_end);
                     fenceTasks.setSafeArea(safe_area);
                     fenceTasks.setSbImei(sbImei);
+                    fenceTask.setTaskType("dzwl");
 
                     // 插入数据
                     int flag = zdryFenceTaskMapper.insert(fenceTasks);