增加场馆名称和区域名称显示，增加设备ID唯一处理

dayun-admin/src/main/java/com/jjt/biz/controller/ApiController.java

@@ -61,7 +61,17 @@ public class ApiController extends BaseController {
     @PostMapping("/device")
     public AjaxResult device(@RequestBody DeviceInfo deviceInfo) {
         deviceInfo.setRegisterTime(new Date());
-        return toAjax(deviceInfoService.insertDeviceInfo(deviceInfo));
+        int i = 0;
+        try {
+            i = deviceInfoService.insertDeviceInfo(deviceInfo);
+        } catch (Exception e) {
+            if (e.getMessage().contains("Duplicate entry")) {
+                return AjaxResult.error("DEVICE_ID重复");
+            } else {
+                return AjaxResult.error(e.getMessage());
+            }
+        }
+        return toAjax(1);
     }
 
     /**

dayun-admin/src/main/resources/mapper/biz/BluetoothInfoMapper.xml

@@ -9,6 +9,8 @@
         <result property="deviceId" column="DEVICE_ID"/>
         <result property="venueId" column="VENUE_ID"/>
         <result property="areaId" column="AREA_ID"/>
+        <result property="venueName" column="VENUE_NAME"/>
+        <result property="areaName" column="AREA_NAME"/>
         <result property="mac" column="MAC"/>
         <result property="name" column="NAME"/>
         <result property="fileName" column="FILE_NAME"/>

dayun-admin/src/main/resources/mapper/biz/WifiInfoMapper.xml

@@ -9,6 +9,8 @@
         <result property="deviceId" column="DEVICE_ID"/>
         <result property="venueId" column="VENUE_ID"/>
         <result property="areaId" column="AREA_ID"/>
+        <result property="venueName" column="VENUE_NAME"/>
+        <result property="areaName" column="AREA_NAME"/>
         <result property="bssid" column="BSSID"/>
         <result property="ssid" column="SSID"/>
         <result property="authPage" column="AUTH_PAGE"/>