feats

src/main/java/com/yunzhi/nanyang/controller/TaMachineryController.java

@@ -81,12 +81,13 @@ public class TaMachineryController extends BaseController {
                                         @ApiParam("名称") @RequestParam(value ="name", required = false) String name,
                                         @ApiParam("类型") @RequestParam(value ="typeId", required = false) String typeId,
                                         @ApiParam("机构ID") @RequestParam(value ="orgId", required = false) String orgId,
-                                        @ApiParam("状态") @RequestParam(value ="status", required = false) Integer status) throws Exception{
+                                        @ApiParam("状态") @RequestParam(value ="status", required = false) Integer status,
+                                        @ApiParam("绑定设备") @RequestParam(value ="isBound", defaultValue = "false") Boolean isBound) throws Exception{
         checkOrgAccess(orgId);
 
         IPage<TaMachinery> pg = new Page<>(pageNum, pageSize);
 
-        IPage<TaMachinery> result = iTaMachineryService.getPageBy(pg, name, typeId, orgId, status);
+        IPage<TaMachinery> result = iTaMachineryService.getPageBy(pg, name, typeId, orgId, status, isBound);
         return ResponseBean.success(result);
     }
 

src/main/java/com/yunzhi/nanyang/controller/TaMachineryGpsController.java

@@ -1,10 +1,19 @@
 package com.yunzhi.nanyang.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.nanyang.common.BaseController;
+import com.yunzhi.nanyang.common.Constants;
 import com.yunzhi.nanyang.common.ResponseBean;
+import com.yunzhi.nanyang.entity.TaWorkJob;
+import com.yunzhi.nanyang.entity.TdDevice;
+import com.yunzhi.nanyang.entity.TdHatcDevice;
+import com.yunzhi.nanyang.service.ITaMachineryService;
+import com.yunzhi.nanyang.service.ITaWorkJobService;
+import com.yunzhi.nanyang.service.ITdDeviceService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -20,6 +29,8 @@ import com.yunzhi.nanyang.service.ITaMachineryGpsService;
 import com.yunzhi.nanyang.entity.TaMachineryGps;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
     * 农机定位信息 前端控制器
@@ -39,81 +50,110 @@ public class TaMachineryGpsController extends BaseController {
     @Autowired
     public ITaMachineryGpsService iTaMachineryGpsService;
 
+    @Autowired
+    public ITaWorkJobService iTaWorkJobService;
+
+    @Autowired
+    public ITdDeviceService iTdDeviceService;
+
 
     /**
      * 分页查询列表
-     * @param pageNum
-     * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taMachineryGps",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/machinery-gps",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taMachineryGpsList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
-
-		    IPage<TaMachineryGps> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaMachineryGps> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+    public ResponseBean taMachineryGpsList(@ApiParam("作业ID") @RequestParam(value ="jobId") String jobId) throws Exception {
 
-            IPage<TaMachineryGps> result = iTaMachineryGpsService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
-    }
+        TaWorkJob taWorkJob = iTaWorkJobService.getById(jobId);
+        if (null == taWorkJob || taWorkJob.getStatus() == Constants.STATUS_DELETE) {
+            return ResponseBean.error("未找到农机作业信息");
+        }
 
-    /**
-     * 保存对象
-     * @param taMachineryGps 实体对象
-     * @return
-     */
-    @RequestMapping(value="/taMachineryGps",method= RequestMethod.POST)
-    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taMachineryGpsAdd(@ApiParam("保存内容") @RequestBody TaMachineryGps taMachineryGps) throws Exception{
-
-        if (iTaMachineryGpsService.save(taMachineryGps)){
-            return ResponseBean.success(taMachineryGps);
-        }else {
-            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        if (taWorkJob.getStatus() < Constants.WORK_DOING) {
+            return ResponseBean.error("农机尚未作业");
         }
-    }
 
-    /**
-     * 根据id删除对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/taMachineryGps/{id}", method= RequestMethod.DELETE)
-    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taMachineryGpsDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaMachineryGpsService.removeById(id)){
-            return ResponseBean.success("success");
-        }else {
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        if (null == taWorkJob.getStartDate() || null == taWorkJob.getEndDate()) {
+            return ResponseBean.error("未找到农机作业时间");
         }
-    }
 
-    /**
-     * 修改对象
-     * @param id  实体ID
-     * @param taMachineryGps 实体对象
-     * @return
-     */
-    @RequestMapping(value="/taMachineryGps/{id}",method= RequestMethod.PUT)
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taMachineryGpsUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody TaMachineryGps taMachineryGps) throws Exception{
-
-        if (iTaMachineryGpsService.updateById(taMachineryGps)){
-            return ResponseBean.success(iTaMachineryGpsService.getById(id));
-        }else {
-            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        // 获取设备信息
+        TdDevice tdDevice = iTdDeviceService.getExistBy("machinery_id", taWorkJob.getMachineryId(), false, true);
+        if (null == tdDevice) {
+            return ResponseBean.error("未找到作业农机的GPS设备信息");
         }
-    }
 
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/taMachineryGps/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taMachineryGpsGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaMachineryGpsService.getById(id));
+        // apiconfig 字符串格式一般为
+        // {"channel":1,"netType":1,"deviceId":"52bb072175e914ffae1db96cff652817"}
+        JSONObject jsonObject = JSON.parseObject(tdDevice.getApiConfig());
+        String deviceId = jsonObject.getString("deviceId");
+
+        QueryWrapper<TaMachineryGps> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("device_id", deviceId);
+        queryWrapper.ge("create_date", taWorkJob.getStartDate());
+        queryWrapper.le("create_date", taWorkJob.getEndDate());
+        queryWrapper.orderByAsc("create_date");
+
+        List<TaMachineryGps> result = iTaMachineryGpsService.list(queryWrapper);
+        return ResponseBean.success(result);
     }
+
+//    /**
+//     * 保存对象
+//     * @param taMachineryGps 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/taMachineryGps",method= RequestMethod.POST)
+//    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+//    public ResponseBean taMachineryGpsAdd(@ApiParam("保存内容") @RequestBody TaMachineryGps taMachineryGps) throws Exception{
+//
+//        if (iTaMachineryGpsService.save(taMachineryGps)){
+//            return ResponseBean.success(taMachineryGps);
+//        }else {
+//            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 根据id删除对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/taMachineryGps/{id}", method= RequestMethod.DELETE)
+//    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+//    public ResponseBean taMachineryGpsDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        if(iTaMachineryGpsService.removeById(id)){
+//            return ResponseBean.success("success");
+//        }else {
+//            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 修改对象
+//     * @param id  实体ID
+//     * @param taMachineryGps 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/taMachineryGps/{id}",method= RequestMethod.PUT)
+//    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+//    public ResponseBean taMachineryGpsUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+//                                        @ApiParam("更新内容") @RequestBody TaMachineryGps taMachineryGps) throws Exception{
+//
+//        if (iTaMachineryGpsService.updateById(taMachineryGps)){
+//            return ResponseBean.success(iTaMachineryGpsService.getById(id));
+//        }else {
+//            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 根据id查询对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/taMachineryGps/{id}",method= RequestMethod.GET)
+//    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+//    public ResponseBean taMachineryGpsGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        return ResponseBean.success(iTaMachineryGpsService.getById(id));
+//    }
 }

src/main/java/com/yunzhi/nanyang/controller/TaWorkJobController.java

@@ -228,7 +228,18 @@ public class TaWorkJobController extends BaseController {
         }
 
         TaWorkJob taWorkJob = iTaWorkJobService.getDetailBy(id);
+        return ResponseBean.success(taWorkJob);
+    }
 
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/work-job/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="获取详情", notes = "获取详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getDetail(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+        TaWorkJob taWorkJob = iTaWorkJobService.getDetailBy(id);
         return ResponseBean.success(taWorkJob);
     }
 }

src/main/java/com/yunzhi/nanyang/controller/TaWorkMessageController.java

@@ -51,8 +51,8 @@ public class TaWorkMessageController extends BaseController {
 
         IPage<TaWorkMessage> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaWorkMessage> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(StringUtils.isEmpty(messageType), "message_type", messageType);
-        queryWrapper.like(StringUtils.isEmpty(orderNo), "order_no", "%" + orderNo + "%");
+        queryWrapper.eq(!StringUtils.isEmpty(messageType), "message_type", messageType);
+        queryWrapper.like(!StringUtils.isEmpty(orderNo), "order_no", "%" + orderNo + "%");
         queryWrapper.orderByDesc("create_date");
 
         IPage<TaWorkMessage> result = iTaWorkMessageService.page(pg, queryWrapper);

src/main/java/com/yunzhi/nanyang/controller/TdRawDeviceController.java

@@ -1,11 +1,14 @@
 package com.yunzhi.nanyang.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.nanyang.common.BaseController;
+import com.yunzhi.nanyang.common.HttpUtils;
 import com.yunzhi.nanyang.common.ResponseBean;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 import com.yunzhi.nanyang.common.StringUtils;
@@ -13,6 +16,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import com.yunzhi.nanyang.entity.TdRawDevice;
 import com.yunzhi.nanyang.service.TdRawDeviceService;
@@ -28,6 +32,12 @@ import com.yunzhi.nanyang.service.TdRawDeviceService;
 @RequestMapping("/")
 public class TdRawDeviceController extends BaseController {
 
+    @Value("${device.server}")
+    String deviceServer;
+
+    @Autowired
+    HttpUtils httpUtils;
+
     @Autowired
     private TdRawDeviceService tdRawDeviceService;
 
@@ -67,32 +77,34 @@ public class TdRawDeviceController extends BaseController {
 //        return ResponseBean.success(result);
 //    }
 
-//    /** 
-//     * 新增数据
-//     *
-//     * @param tdRawDevice 实例对象
-//     * @return 实例对象
-//     */
-//    @ApiOperation("新增数据")
-//    @PostMapping("/raw-device")
-//    public ResponseBean add(@ApiParam("对象实体") @RequestBody TdRawDevice tdRawDevice) throws Exception {
-//        tdRawDeviceService.save(tdRawDevice);
-//        return ResponseBean.success(tdRawDevice);
-//    }
-//    
-//    /** 
-//     * 更新数据
-//     *
-//     * @param tdRawDevice 实例对象
-//     * @return 实例对象
-//     */
-//    @ApiOperation("更新数据")
-//    @PutMapping("/raw-device/{id}")
-//    public ResponseBean edit(@ApiParam("对象实体") @RequestBody TdRawDevice tdRawDevice,
-//                            @ApiParam("对象ID") @PathVariable String id ) throws Exception {
-//        tdRawDeviceService.updateById(tdRawDevice);
-//        return ResponseBean.success(tdRawDevice);
-//    }
+    /**
+     * 新增数据
+     *
+     * @param tdRawDevice 实例对象
+     * @return 实例对象
+     */
+    @ApiOperation("新增设备")
+    @PostMapping("/admin/raw-device")
+    public ResponseBean add(@ApiParam("对象实体") @RequestBody TdRawDevice tdRawDevice) throws Exception {
+        tdRawDevice.setDeviceStatus(0); // 默认离线
+        tdRawDevice.setCreateDate(LocalDateTime.now());
+        tdRawDeviceService.save(tdRawDevice);
+        return ResponseBean.success(tdRawDevice);
+    }
+
+    /**
+     * 同步设备
+     *
+     * @param
+     * @return 实例对象
+     */
+    @ApiOperation("同步设备")
+    @PutMapping("/raw-device/sync")
+    public ResponseBean sync() throws Exception {
+        String url = deviceServer + "/shensong/syncDevice";
+        String s = httpUtils.get(url);
+        return JSONObject.parseObject(s, ResponseBean.class);
+    }
 //    
 //    /** 
 //     * 通过主键删除数据

src/main/java/com/yunzhi/nanyang/entity/TdRawDevice.java

@@ -25,7 +25,7 @@ import lombok.experimental.Accessors;
 public class TdRawDevice implements Serializable,Cloneable{
     /** 设备ID */
     @ApiModelProperty(name = "设备ID",notes = "")
-    @TableId(value = "device_id", type = IdType.INPUT)
+    @TableId(value = "device_id", type = IdType.UUID)
     private String deviceId ;
     /** 设备大类 */
     @ApiModelProperty(name = "设备大类",notes = "")

src/main/java/com/yunzhi/nanyang/mapper/TaMachineryMapper.java

@@ -45,7 +45,8 @@ public interface TaMachineryMapper extends BaseMapper<TaMachinery> {
                                  @Param("name") String name,
                                  @Param("typeId") String typeId,
                                  @Param("orgId") String orgId,
-                                 @Param("status") Integer status);
+                                 @Param("status") Integer status,
+                                 @Param("isBound") Boolean isBound);
 
     @Select("SELECT 'machinery' as `name`, count(*) as `value` FROM ta_machinery WHERE `status` > -1")
     ChartParam statisTotal();

src/main/java/com/yunzhi/nanyang/service/ITaMachineryService.java

@@ -33,7 +33,7 @@ public interface ITaMachineryService extends IBaseService<TaMachinery> {
 
     boolean updateStatus(String machineryId, String statusColumn, int statusValue);
 
-    IPage<TaMachinery> getPageBy(IPage<TaMachinery> pg, String name, String typeId, String orgId, Integer status);
+    IPage<TaMachinery> getPageBy(IPage<TaMachinery> pg, String name, String typeId, String orgId, Integer status, Boolean isBound);
 
     ChartParam statisTotal();
 

src/main/java/com/yunzhi/nanyang/service/impl/TaMachineryServiceImpl.java

@@ -1,6 +1,5 @@
 package com.yunzhi.nanyang.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.common.Constants;
@@ -136,8 +135,8 @@ public class TaMachineryServiceImpl extends BaseServiceImpl<TaMachineryMapper, T
     }
 
     @Override
-    public IPage<TaMachinery> getPageBy(IPage<TaMachinery> pg, String name, String typeId, String orgId, Integer status) {
-        return baseMapper.getPageBy(pg, name, typeId, orgId, status);
+    public IPage<TaMachinery> getPageBy(IPage<TaMachinery> pg, String name, String typeId, String orgId, Integer status, Boolean isBound) {
+        return baseMapper.getPageBy(pg, name, typeId, orgId, status, isBound);
     }
 
     @Override

src/main/resources/application.yml

@@ -41,6 +41,9 @@ hatc:
   ### 海康接口服务
   apiServer: http://localhost:7081
 
+device:
+  server: http://localhost:7081
+
 ###
 yz:
   default:

src/main/resources/mapper/TaMachineryMapper.xml

@@ -73,6 +73,10 @@
         FROM
             ta_machinery t
             INNER JOIN ta_org m ON m.org_id = t.org_id
+
+        <if test="isBound != null and isBound">
+            INNER JOIN td_device d on t.machinery_id = d.machinery_id
+        </if>
         WHERE
             t.`status` &gt; -1
         <if test="name != null and name != ''">