feats

pom.xml

@@ -135,6 +135,7 @@
 			<artifactId>sa-token-jwt</artifactId>
 			<version>1.29.0</version>
 		</dependency>
+
 	</dependencies>
 
 	<profiles>
@@ -153,6 +154,7 @@
 						<groupId>org.springframework.boot</groupId>
 						<artifactId>spring-boot-maven-plugin</artifactId>
 						<configuration>
+							<includeSystemScope>true</includeSystemScope>
 							<excludes>
 								<exclude>
 									<groupId>org.springframework.boot</groupId>
@@ -204,6 +206,9 @@
 					<plugin>
 						<groupId>org.springframework.boot</groupId>
 						<artifactId>spring-boot-maven-plugin</artifactId>
+						<configuration>
+							<includeSystemScope>true</includeSystemScope>
+						</configuration>
 					</plugin>
 
 					<!-- 跳过测试 -->

src/main/java/com/yunzhi/nanyang/common/ResponseBean.java

@@ -60,14 +60,23 @@ public class ResponseBean<T> implements Serializable {
     public int getCode() {
         return code;
     }
+    public void setCode(int code) {
+        this.code = code;
+    }
 
     public String getMessage() {
         return message;
     }
+    public void setMessage(String message) {
+        this.message = message;
+    }
 
     public T getData() {
         return data;
     }
+    public void setData(T data) {
+        this.data = data;
+    }
     
     @Override
     public String toString() {

src/main/java/com/yunzhi/nanyang/common/StringUtils.java

@@ -42,6 +42,12 @@ public class StringUtils {
         return isEmpty(src) ? defaultVal : src;
     }
 
+    public static String like(String src) {
+        if (null == src) return null;
+        if ("".equals(src)) return src;
+        return "%" + src + "%";
+    }
+
     public static String random(int length) {
         String str="abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
         Random random = new Random();

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

@@ -1,17 +1,13 @@
 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.Constants;
-import com.yunzhi.nanyang.common.ResponseBean;
-import com.yunzhi.nanyang.common.StringUtils;
-import com.yunzhi.nanyang.entity.SysUser;
-import com.yunzhi.nanyang.entity.TaOrder;
-import com.yunzhi.nanyang.entity.TaPerson;
-import com.yunzhi.nanyang.service.ISysUserService;
-import com.yunzhi.nanyang.service.ITaOrderService;
+import com.yunzhi.nanyang.common.*;
+import com.yunzhi.nanyang.entity.*;
+import com.yunzhi.nanyang.service.*;
+import com.yunzhi.nanyang.vo.DeviceSummary;
 import com.yunzhi.nanyang.vo.MachineSummary;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -20,16 +16,17 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
-import com.yunzhi.nanyang.service.ITaMachineryService;
-import com.yunzhi.nanyang.entity.TaMachinery;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -56,6 +53,17 @@ public class TaMachineryController extends BaseController {
     @Autowired
     public ITaOrderService iTaOrderService;
 
+    @Autowired
+    public ITdDeviceService iTdDeviceService;
+
+    @Autowired
+    public ITdHatcDeviceService iTdHatcDeviceService;
+
+    @Autowired
+    public HttpUtils httpUtils;
+
+    @Value("${hatc.apiServer}")
+    private String hatcApiServer;
 
     /**
      * 分页查询列表
@@ -230,4 +238,47 @@ public class TaMachineryController extends BaseController {
 
         return ResponseBean.success(taOrderList);
     }
+
+    /**
+     * 车辆实时预览
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/machinery/{id}/preview",method= RequestMethod.GET)
+    @ApiOperation(value="车辆实时预览", notes = "车辆实时预览", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean machineryPreview(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+
+        TdDevice tdDevice = iTdDeviceService.getExistBy("machinery_id", id, false, true);
+        if (tdDevice == null) {
+            return ResponseBean.error("当前车辆未绑定设备");
+        }
+
+        DeviceSummary deviceSummary = JSONObject.parseObject(tdDevice.getApiConfig(), DeviceSummary.class);
+        TdHatcDevice hatcDevice = iTdHatcDeviceService.getById(deviceSummary.getDeviceId());
+
+        if (hatcDevice == null || null == hatcDevice.getDeviceStatus() || hatcDevice.getDeviceStatus() != 1) {
+            return ResponseBean.error("车辆设备离线");
+        }
+
+        String url = String.format("%s/preview?terminalID=%s&productKey=%s&channelNo=%d&netType=%d",
+                hatcApiServer,
+                StringUtils.urlEncode(hatcDevice.getTerminalId()),
+                StringUtils.urlEncode(hatcDevice.getProductKey()),
+                deviceSummary.getChannel(),
+                deviceSummary.getNetType()
+                );
+
+        String respStr = httpUtils.get(url);
+        ResponseBean responseBean = JSONObject.parseObject(respStr, ResponseBean.class);
+
+        Map<String, Object> data = new HashMap<>();
+        data.put("url", responseBean.getData());
+        data.put("devSerialNum", hatcDevice.getTerminalId());
+        data.put("productKey", hatcDevice.getProductKey());
+        data.put("channel", deviceSummary.getChannel());
+        data.put("streamType", 1);  // 0 主码流, 1 子码流
+        data.put("code", 0);
+        data.put("protocol", 0);
+
+        return ResponseBean.success(data);
+    }
 }

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

@@ -1,10 +1,17 @@
 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.ResponseBean;
+import com.yunzhi.nanyang.common.StringUtils;
+import com.yunzhi.nanyang.entity.TaMachinery;
+import com.yunzhi.nanyang.entity.TdHatcDevice;
+import com.yunzhi.nanyang.service.ITaMachineryService;
+import com.yunzhi.nanyang.service.ITdHatcDeviceService;
+import com.yunzhi.nanyang.vo.DeviceSummary;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -39,81 +46,154 @@ public class TdDeviceController extends BaseController {
     @Autowired
     public ITdDeviceService iTdDeviceService;
 
+    @Autowired
+    public ITdHatcDeviceService iTdHatcDeviceService;
 
-    /**
-     * 分页查询列表
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @RequestMapping(value="/tdDevice",method= RequestMethod.GET)
-    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean tdDeviceList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
-
-		    IPage<TdDevice> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TdDevice> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+    @Autowired
+    public ITaMachineryService iTaMachineryService;
 
-            IPage<TdDevice> result = iTdDeviceService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
-    }
+//
+//    /**
+//     * 分页查询列表
+//     * @param pageNum
+//     * @param pageSize
+//     * @return
+//     */
+//    @RequestMapping(value="/tdDevice",method= RequestMethod.GET)
+//    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+//    public ResponseBean tdDeviceList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+//									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+//
+//		    IPage<TdDevice> pg = new Page<>(pageNum, pageSize);
+//            QueryWrapper<TdDevice> queryWrapper = new QueryWrapper<>();
+//            queryWrapper.orderByDesc("create_date");
+//
+//            IPage<TdDevice> result = iTdDeviceService.page(pg, queryWrapper);
+//            return ResponseBean.success(result);
+//    }
 
     /**
      * 保存对象
      * @param tdDevice 实体对象
      * @return
      */
-    @RequestMapping(value="/tdDevice",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/device",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean tdDeviceAdd(@ApiParam("保存内容") @RequestBody TdDevice tdDevice) throws Exception{
 
-        if (iTdDeviceService.save(tdDevice)){
-            return ResponseBean.success(tdDevice);
-        }else {
-            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        boolean isNew = StringUtils.isEmpty(tdDevice.getDeviceId());
+
+        if (StringUtils.isEmpty(tdDevice.getMachineryId())) {
+            return ResponseBean.error("未绑定农机");
         }
-    }
 
-    /**
-     * 根据id删除对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/tdDevice/{id}", method= RequestMethod.DELETE)
-    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean tdDeviceDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTdDeviceService.removeById(id)){
-            return ResponseBean.success("success");
-        }else {
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        TdDevice origin = iTdDeviceService.getExistBy("machinery_id", tdDevice.getMachineryId(), false, true);
+        if (isNew) {
+            // 如果是新增操作
+            if (null != origin) {
+                return ResponseBean.error("该农机已绑定设备");
+            }
+        } else {
+            if (null != origin) {
+                // 如果非新增操作, 并且当前的 id 与 数据库 id 不一致
+                if (!tdDevice.getDeviceId().equals(origin.getDeviceId())) {
+                    return ResponseBean.error("该农机已绑定设备");
+                }
+            } else {
+                isNew = true;
+            }
         }
-    }
 
-    /**
-     * 修改对象
-     * @param id  实体ID
-     * @param tdDevice 实体对象
-     * @return
-     */
-    @RequestMapping(value="/tdDevice/{id}",method= RequestMethod.PUT)
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean tdDeviceUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody TdDevice tdDevice) throws Exception{
+        if (StringUtils.isEmpty(tdDevice.getApiConfig())) {
+            return ResponseBean.error("未绑定海康设备");
+        }
+
+        TaMachinery taMachinery = iTaMachineryService.getExistBy("machinery_id", tdDevice.getMachineryId(), false, true);
+        if (taMachinery == null) {
+            return ResponseBean.error("绑定农机不存在");
+        }
+
+        try {
+            DeviceSummary deviceSummary = JSONObject.parseObject(tdDevice.getApiConfig(), DeviceSummary.class);
+            if (null == deviceSummary) {
+                return ResponseBean.error("未绑定海康设备");
+            }
+
+            if (StringUtils.isEmpty(deviceSummary.getDeviceId())) {
+                return ResponseBean.error("未绑定海康设备");
+            }
 
-        if (iTdDeviceService.updateById(tdDevice)){
-            return ResponseBean.success(iTdDeviceService.getById(id));
+            TdHatcDevice hatcDevice = iTdHatcDeviceService.getById(deviceSummary.getDeviceId());
+            if (null == hatcDevice) {
+                return ResponseBean.error("绑定的海康设备不存在");
+            }
+
+            if (null == deviceSummary.getChannel() || deviceSummary.getChannel() < 1) {
+                return ResponseBean.error("未设置通道号, 或者通道号不正确");
+            }
+
+            if (null == deviceSummary.getNetType() || deviceSummary.getNetType() < 0 || deviceSummary.getNetType() > 3) {
+                return ResponseBean.error("未设置网络类型, 或者网络类型不正确");
+            }
+
+            tdDevice.setDeviceNo(hatcDevice.getTerminalId());
+            tdDevice.setDeviceType(hatcDevice.getProductKey());
+            taMachinery.setOnlineStatus(hatcDevice.getDeviceStatus());
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseBean.error("海康设备参数无效");
+        }
+
+        boolean isOk = isNew ? iTdDeviceService.save(tdDevice) : iTdDeviceService.updateById(tdDevice);
+        iTaMachineryService.updateById(taMachinery);
+
+        if (isOk){
+            return ResponseBean.success(tdDevice);
         }else {
-            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
     }
+//
+//    /**
+//     * 根据id删除对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/tdDevice/{id}", method= RequestMethod.DELETE)
+//    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+//    public ResponseBean tdDeviceDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        if(iTdDeviceService.removeById(id)){
+//            return ResponseBean.success("success");
+//        }else {
+//            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 修改对象
+//     * @param id  实体ID
+//     * @param tdDevice 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/tdDevice/{id}",method= RequestMethod.PUT)
+//    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+//    public ResponseBean tdDeviceUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+//                                        @ApiParam("更新内容") @RequestBody TdDevice tdDevice) throws Exception{
+//
+//        if (iTdDeviceService.updateById(tdDevice)){
+//            return ResponseBean.success(iTdDeviceService.getById(id));
+//        }else {
+//            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
 
     /**
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/tdDevice/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/machinery/{id}/device",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean tdDeviceGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTdDeviceService.getById(id));
+    public ResponseBean tdDeviceGet(@ApiParam("农机ID") @PathVariable String id) throws Exception{
+        TdDevice tdDevice = iTdDeviceService.getExistBy("machinery_id", id, false, true);
+        return ResponseBean.success(tdDevice);
     }
 }

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

@@ -0,0 +1,74 @@
+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 com.yunzhi.nanyang.common.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.yunzhi.nanyang.service.ITdHatcDeviceService;
+import com.yunzhi.nanyang.entity.TdHatcDevice;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    * 海康设备表 前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2022-05-11
+ */
+
+@Api(tags = "海康设备表")
+@RestController
+@RequestMapping("/")
+public class TdHatcDeviceController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TdHatcDeviceController.class);
+
+    @Autowired
+    public ITdHatcDeviceService iTdHatcDeviceService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/hatc-device",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                @ApiParam("终端ID") @RequestParam(value ="terminalId", required = false) String terminalId) throws Exception{
+
+        IPage<TdHatcDevice> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TdHatcDevice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(!StringUtils.isEmpty(terminalId), "terminal_id", StringUtils.like(terminalId));
+        queryWrapper.orderByDesc("terminal_id");
+
+        IPage<TdHatcDevice> result = iTdHatcDeviceService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/hatc-device/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean tdHatcDeviceGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        return ResponseBean.success(iTdHatcDeviceService.getById(id));
+    }
+}

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

@@ -83,6 +83,9 @@ public class TaMachinery implements Serializable {
     @ApiModelProperty(value = "状态")
     private Integer status;
 
+    @ApiModelProperty(value = "设备状态, 1在线")
+    private Integer onlineStatus;
+
     @ApiModelProperty(value = "创建用户")
     private String createUser;
 

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

@@ -30,6 +30,9 @@ public class TaMachineryGps implements Serializable {
     @TableId(value = "serial_no", type = IdType.AUTO)
     private Integer serialNo;
 
+    @ApiModelProperty(value = "设备ID,海康设备表")
+    private String deviceId;
+
     @ApiModelProperty(value = "农机ID")
     private String machineryId;
 
@@ -39,6 +42,9 @@ public class TaMachineryGps implements Serializable {
     @ApiModelProperty(value = "维度")
     private String lat;
 
+    @ApiModelProperty(value = "全部GPS数据")
+    private String gpsData;
+
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;
 

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

@@ -27,7 +27,7 @@ public class TdDevice implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "设备ID")
-    @TableId(value = "device_id", type = IdType.INPUT)
+    @TableId(value = "device_id", type = IdType.UUID)
     private String deviceId;
 
     @ApiModelProperty(value = "设备号")

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

@@ -0,0 +1,91 @@
+package com.yunzhi.nanyang.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 海康设备表
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TdHatcDevice对象", description="海康设备表")
+public class TdHatcDevice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "device_id", type = IdType.UUID)
+    private String deviceId;
+
+    private String modelCode;
+    private String modelName;
+    private String protocol;
+
+    @ApiModelProperty(value = "终端ID;必填")
+    private String terminalId;
+
+    @ApiModelProperty(value = "产品密钥;设备所属型号的产品密钥，必填")
+    private String productKey;
+
+    @ApiModelProperty(value = "设备型号名称;选填")
+    private String deviceModel;
+
+    @ApiModelProperty(value = "设备名称;(最长不超过32个字)，选填")
+    private String deviceName;
+
+    @ApiModelProperty(value = "软件版本;选填")
+    private String version;
+
+    @ApiModelProperty(value = "软件版本时间;(格式：yyyy-MM-dd)，选填")
+    private String softwareVerTime;
+
+    @ApiModelProperty(value = "出厂时间;(格式：yyyy-MM-dd)，选填")
+    private String createTime;
+
+    @ApiModelProperty(value = "在线状态;0：离线；1：在线，选填")
+    private Integer deviceStatus;
+
+    @ApiModelProperty(value = "SIM卡号;选填")
+    private String simcardNum;
+
+    @ApiModelProperty(value = "固件语言;必填")
+    private String language;
+
+    @ApiModelProperty(value = "厂商名;选填")
+    private String manufacturerName;
+
+    @ApiModelProperty(value = "验证码;选填")
+    private String cerificationCode;
+
+    @ApiModelProperty(value = "冻结状态;0:正常；1:冻结，选填")
+    private Integer useStatus;
+
+    @ApiModelProperty(value = "自动解冻时间;useStatus为 1 时该字段有效，选填")
+    private String useTime;
+
+    @ApiModelProperty(value = "设备在AMS系统中的项目编号;如果是ARM系统，该字段必填，其他系统该字段不填")
+    private String amsProjectCode;
+
+    @ApiModelProperty(value = "设备通道列表;选填")
+    private String deviceChannelList;
+
+    @ApiModelProperty(value = "车牌号;选填")
+    private String plateNum;
+
+    @ApiModelProperty(value = "机构ID")
+    private String orgId;
+
+
+}

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

@@ -50,7 +50,7 @@ public interface TaOrderMapper extends BaseMapper<TaOrder> {
 
     List<TaOrder> checkMachineryDuty(@Param("machineryId") String machineryId,@Param("appointmentDate") String appointmentDate);
 
-    @Update("UPDATE ta_order SET pay_status = #{payStatus} WHERE order_id = #{orderId}")
+//    @Update("UPDATE ta_order SET pay_status = #{payStatus} WHERE order_id = #{orderId}")
     int updatePayStatus(@Param("orderId") String orderId, @Param("payStatus") int payStatus);
 
     @Update("UPDATE ta_order SET dispatch_status = #{dispatchStatus} WHERE order_id = #{orderId}")

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

@@ -0,0 +1,18 @@
+package com.yunzhi.nanyang.mapper;
+
+import com.yunzhi.nanyang.entity.TdHatcDevice;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 海康设备表 Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-05-11
+ */
+@Mapper
+public interface TdHatcDeviceMapper extends BaseMapper<TdHatcDevice> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.yunzhi.nanyang.service;
+
+import com.yunzhi.nanyang.entity.TdHatcDevice;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 海康设备表 服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-05-11
+ */
+public interface ITdHatcDeviceService extends IService<TdHatcDevice> {
+
+}

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

@@ -0,0 +1,22 @@
+package com.yunzhi.nanyang.service.impl;
+
+import com.yunzhi.nanyang.entity.TdHatcDevice;
+import com.yunzhi.nanyang.mapper.TdHatcDeviceMapper;
+import com.yunzhi.nanyang.service.ITdHatcDeviceService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 海康设备表 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-05-11
+ */
+@Slf4j
+@Service
+public class TdHatcDeviceServiceImpl extends ServiceImpl<TdHatcDeviceMapper, TdHatcDevice> implements ITdHatcDeviceService {
+
+}

src/main/java/com/yunzhi/nanyang/vo/DeviceSummary.java

@@ -0,0 +1,19 @@
+package com.yunzhi.nanyang.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("设备信息")
+@Data
+public class DeviceSummary {
+
+    @ApiModelProperty(value = "设备ID")
+    private String deviceId;
+
+    @ApiModelProperty(value = "通道号")
+    private Integer channel;
+
+    @ApiModelProperty(value = "网络类型, 0 内网, 1 电信, 2 移动, 3 联通")
+    private Integer netType;
+}

src/main/resources/application-dev.yml

@@ -14,3 +14,4 @@ logging:
   level:
     root: info
     springfox: info
+

src/main/resources/application.yml

@@ -36,6 +36,11 @@ sms:
     code: SMS_207555188
     sign: 云致科技
 
+###
+hatc:
+  ### 海康接口服务, 自己写的
+  apiServer: http://localhost:7081
+
 ###
 yz:
   default:

src/main/resources/mapper/TdHatcDeviceMapper.xml

@@ -0,0 +1,5 @@
+<?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.TdHatcDeviceMapper">
+
+</mapper>