efats

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.yunzhi</groupId>
 	<artifactId>nanyang</artifactId>
-	<version>0.0.2</version>
+	<version>0.0.3</version>
 	<name>main-service</name>
 	<description>Demo project for Spring Boot</description>
 

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

@@ -0,0 +1,101 @@
+package com.yunzhi.nanyang.controller;
+
+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.ResponseBean;
+import java.util.List;
+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.web.bind.annotation.*;
+import com.yunzhi.nanyang.entity.TcBind;
+import com.yunzhi.nanyang.service.TcBindService;
+
+ /**
+ * 绑定表;(tc_bind)表控制层
+ * @author : http://njyunzhi.com
+ * @date : 2022-11-22
+ */
+@Api(tags = "绑定表对象功能接口")
+@RestController
+@RequestMapping("/")
+public class TcBindController extends BaseController {
+    
+    @Autowired
+    private TcBindService tcBindService;
+    
+    /** 
+     * 通过ID查询单条数据 
+     *
+     * @param serialNo 主键
+     * @return 实例对象
+     */
+    @ApiOperation("通过ID查询单条数据")
+    @GetMapping("/tcBind/{id}")
+    public ResponseBean queryById(@ApiParam("对象ID") @PathVariable Integer id) throws Exception {
+        return ResponseBean.success(tcBindService.getById(id));
+    }
+    
+    /** 
+     * 分页查询
+     *
+     * @param pageNum 当前页码
+     * @param pageSize 每页条数
+     * @return 查询结果
+     */
+    @ApiOperation("分页查询")
+    @GetMapping("/tcBind")
+    public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
+        
+        IPage<TcBind> pg = new Page<>(pageNum, pageSize);
+        // QueryWrapper<TcBind> queryWrapper = new QueryWrapper<>();
+        // queryWrapper.orderByDesc("create_date");
+        IPage<TcBind> result = tcBindService.page(pg);
+        
+        return ResponseBean.success(result);
+    }
+    
+    /** 
+     * 新增数据
+     *
+     * @param tcBind 实例对象
+     * @return 实例对象
+     */
+    @ApiOperation("新增数据")
+    @PostMapping("/tcBind")
+    public ResponseBean add(@ApiParam("对象实体") @RequestBody TcBind tcBind) throws Exception {
+        tcBindService.save(tcBind);
+        return ResponseBean.success(tcBind);
+    }
+    
+    /** 
+     * 更新数据
+     *
+     * @param tcBind 实例对象
+     * @return 实例对象
+     */
+    @ApiOperation("更新数据")
+    @PutMapping("/tcBind/{id}")
+    public ResponseBean edit(@ApiParam("对象实体") @RequestBody TcBind tcBind,
+                            @ApiParam("对象ID") @PathVariable Integer id ) throws Exception {
+        tcBindService.updateById(tcBind);
+        return ResponseBean.success(tcBind);
+    }
+    
+    /** 
+     * 通过主键删除数据
+     *
+     * @param serialNo 主键
+     * @return 是否成功
+     */
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("/tcBind/{id}")
+    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable Integer id){
+        tcBindService.removeLogicById(id);
+        return ResponseBean.success("success");
+    }
+}

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

@@ -9,8 +9,10 @@ import com.yunzhi.nanyang.common.*;
 import java.time.LocalDateTime;
 import java.util.List;
 
+import com.yunzhi.nanyang.entity.TcBind;
 import com.yunzhi.nanyang.entity.TdDevice;
 import com.yunzhi.nanyang.service.ITdDeviceService;
+import com.yunzhi.nanyang.service.TcBindService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -44,6 +46,9 @@ public class TdRawDeviceController extends BaseController {
     @Autowired
     private ITdDeviceService iTdDeviceService;
 
+    @Autowired
+    private TcBindService tcBindService;
+
 //    /** 
 //     * 通过ID查询单条数据 
 //     *
@@ -107,7 +112,7 @@ public class TdRawDeviceController extends BaseController {
             return ResponseBean.error("当前设备号已存在");
         }
 
-
+        TcBind tcBind = null;
         String url = String.format("%s/%s/tdRawDevice/%s", deviceServer, tdRawDevice.getDeviceKind(), tdRawDevice.getDeviceNo());
         String s = httpUtils.get(url);
         if (StringUtils.isEmpty(s)) {
@@ -122,13 +127,36 @@ public class TdRawDeviceController extends BaseController {
                     return ResponseBean.error("验证平台服务出错, 未找到当前设备");
                 }
             }
-        }
 
+            // 飞防设备在新增的时候，把中间数据采集表也写入
+            if ("feifang".equals(tdRawDevice.getDeviceKind())) {
+                JSONObject data = resp.getJSONObject("data");
+                if (data != null) {
+                    tcBind = tcBindService.getByDevice(tdRawDevice.getDeviceKind(), tdRawDevice.getDeviceNo());
+                    if (null == tcBind) {
+                        tcBind = new TcBind();
+                        tcBind.setDeviceType(tdRawDevice.getDeviceKind());
+                        tcBind.setDeviceNo(tdRawDevice.getDeviceNo());
+                        tcBind.setMachineryType(data.getString("p1"));
+                        tcBind.setMachineryName(data.getString("p25"));
+                        tcBind.setUserName(data.getString("p8"));
+                        tcBind.setPhone(data.getString("p7"));
+                        tcBind.setStatus(0);
+                        tcBind.setCreateDate(LocalDateTime.now());
+                    }
+                }
+
+            }
+        }
 
         tdRawDevice.setDeviceStatus(0); // 默认离线
         tdRawDevice.setCreateDate(LocalDateTime.now());
         tdRawDeviceService.save(tdRawDevice);
 
+        if (tcBind != null && null == tcBind.getSerialNo()) {
+            tcBindService.save(tcBind);
+        }
+
         return ResponseBean.success(tdRawDevice);
     }
 

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

@@ -0,0 +1,61 @@
+package com.yunzhi.nanyang.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+ /**
+ * 绑定表;
+ * @author : http://www.chiner.pro
+ * @date : 2022-11-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "绑定表",description = "")
+@TableName("tc_bind")
+public class TcBind implements Serializable,Cloneable{
+    /** 序号 */
+    @ApiModelProperty(name = "序号",notes = "")
+    @TableId(value = "serial_no", type = IdType.AUTO)
+    private Integer serialNo ;
+    /** 设备类型 */
+    @ApiModelProperty(name = "设备类型",notes = "")
+    private String deviceType ;
+    /** 设备号 */
+    @ApiModelProperty(name = "设备号",notes = "")
+    private String deviceNo ;
+    /** 农机类型 */
+    @ApiModelProperty(name = "农机类型",notes = "")
+    private String machineryType ;
+    /** 农机名称 */
+    @ApiModelProperty(name = "农机名称",notes = "")
+    private String machineryName ;
+    /** 农机图片 */
+    @ApiModelProperty(name = "农机图片",notes = "")
+    private String machineryThumb ;
+    /** 归属人 */
+    @ApiModelProperty(name = "归属人",notes = "")
+    private String userName ;
+    /** 手机号 */
+    @ApiModelProperty(name = "手机号",notes = "")
+    private String phone ;
+    /** 身份证号 */
+    @ApiModelProperty(name = "身份证号",notes = "")
+    private String idCard ;
+    /** 状态;0未入库1已入库 */
+    @ApiModelProperty(name = "状态",notes = "0未入库1已入库")
+    private Integer status ;
+    /** 创建时间 */
+    @ApiModelProperty(name = "创建时间",notes = "")
+    private LocalDateTime createDate ;
+
+}

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

@@ -0,0 +1,17 @@
+package com.yunzhi.nanyang.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import com.yunzhi.nanyang.entity.TcBind;
+
+ /**
+ * 绑定表;(tc_bind)表数据库访问层
+ * @author : http://njyunzhi.com
+ * @date : 2022-11-22
+ */
+@Mapper
+public interface TcBindMapper  extends BaseMapper<TcBind>{
+
+     TcBind getByDevice(@Param("deviceType") String deviceType,@Param("deviceNo") String deviceNo);
+ }

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

@@ -0,0 +1,14 @@
+package com.yunzhi.nanyang.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.nanyang.entity.TcBind;
+
+ /**
+ * 绑定表;(tc_bind)表服务接口
+ * @author : http://njyunzhi.com
+ * @date : 2022-11-22
+ */
+public interface TcBindService extends IBaseService<TcBind> {
+
+     TcBind getByDevice(String deviceKind, String deviceNo);
+ }

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

@@ -0,0 +1,22 @@
+package com.yunzhi.nanyang.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.yunzhi.nanyang.entity.TcBind;
+import com.yunzhi.nanyang.mapper.TcBindMapper;
+import com.yunzhi.nanyang.service.TcBindService;
+
+/**
+ * 绑定表;(tc_bind)表服务实现类
+ *
+ * @author : http://www.chiner.pro
+ * @date : 2022-11-22
+ */
+@Service
+public class TcBindServiceImpl extends BaseServiceImpl<TcBindMapper, TcBind> implements TcBindService {
+
+    @Override
+    public TcBind getByDevice(String deviceKind, String deviceNo) {
+        return baseMapper.getByDevice(deviceKind, deviceNo);
+    }
+}

src/main/resources/mapper/TcBindMapper.xml

@@ -0,0 +1,15 @@
+<?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.yunzhi.nanyang.mapper.TcBindMapper">
+
+    <select id="getByDevice" resultType="com.yunzhi.nanyang.entity.TcBind">
+        SELECT
+            *
+        FROM
+            tc_bind t
+        WHERE
+            t.device_type = #{deviceType}
+          AND t.device_no = #{deviceNo}
+    </select>
+</mapper>