打包上线

src/main/java/com/zy/bms/controller/ubi/UbiWxController.java

@@ -5,7 +5,6 @@ import com.zy.bms.common.ServerResponse;
 import com.zy.bms.controller.BaseController;
 import com.zy.bms.entity.Group;
 import com.zy.bms.entity.PrivilegeApplyRecord;
-import com.zy.bms.pojo.io.PageIO;
 import com.zy.bms.service.IGroupService;
 import com.zy.bms.service.IPrivilegeApplyRecordService;
 import com.zy.bms.service.IUserPrivilegeService;
@@ -62,10 +61,10 @@ public class UbiWxController extends BaseController {
      * 通过用户ID分页查询该用户拥有权限的设备列表
      */
     @GetMapping("getDeviceList.do")
-    public ServerResponse getDeviceList(PageIO io, String group) {
+    public ServerResponse getDeviceList(String group) {
         Set<String> groupIds = new HashSet<>(userPrivilegeService.ownGroupIds(userId()));
         if (!groupIds.contains(group)) return ServerResponse.warning("无权限");
-        return ServerResponse.success(ubiInfoStateService.listPageWx(io, group));
+        return ServerResponse.success(ubiInfoStateService.listWx(group));
     }
 
     /**
@@ -75,4 +74,12 @@ public class UbiWxController extends BaseController {
     public ServerResponse getDeviceDetail(String openNum) {
         return ServerResponse.success(ubiInfoStateService.getDetailWx(openNum));
     }
+
+    /**
+     * 获取设备详情信息
+     */
+    @GetMapping("checkOpenNum.do")
+    public ServerResponse checkOpenNum(String openNum) {
+        return ServerResponse.success(ubiInfoStateService.checkOpenNum(openNum));
+    }
 }

src/main/java/com/zy/bms/mapper/ubi/UbiInfoStateMapper.java

@@ -50,8 +50,14 @@ public interface UbiInfoStateMapper extends BaseMapper<UbiInfoState> {
      * 微信端
      * 通过设备组分页查询设备列表
      *
-     * @param page  分页信息
      * @param group 设备组
      */
-    IPage<UbiDeviceListVo> listPageWx(Page<UbiDeviceListVo> page, @Param("group") String group);
+    List<UbiDeviceListVo> listWx(@Param("group") String group);
+
+    /**
+     * 检查设备码是否存在
+     *
+     * @param openNum 设备码
+     */
+    int checkOpenNum(@Param("openNum") String openNum);
 }

src/main/java/com/zy/bms/pojo/vo/UbiDeviceDetailVo.java

@@ -4,6 +4,7 @@ import com.zy.bms.entity.ubi.UbiNtrip;
 import com.zy.bms.entity.ubi.UbiTcp;
 import lombok.Data;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -46,6 +47,31 @@ public class UbiDeviceDetailVo {
      */
     private String version;
 
+    /**
+     * 经度
+     */
+    private Double lat;
+
+    /**
+     * 纬度
+     */
+    private Double lon;
+
+    /**
+     * 经度
+     */
+    private Double latGcj;
+
+    /**
+     * 纬度
+     */
+    private Double lonGcj;
+
+    /**
+     * 数据更新时间
+     */
+    private LocalDateTime updateTime;
+
     /**
      * ntrip 链路设置
      */

src/main/java/com/zy/bms/service/ubi/IUbiInfoStateService.java

@@ -8,6 +8,8 @@ import com.zy.bms.pojo.io.PageIO;
 import com.zy.bms.pojo.vo.UbiDeviceDetailVo;
 import com.zy.bms.pojo.vo.UbiDeviceListVo;
 
+import java.util.List;
+
 /**
  * <p>
  * 设备动态信息表 服务类
@@ -41,10 +43,9 @@ public interface IUbiInfoStateService extends IService<UbiInfoState> {
      * 微信端
      * 通过用户ID分页查询该用户拥有权限的设备列表
      *
-     * @param io     查询参数
-     * @param group  设备组
+     * @param group 设备组
      */
-    IPage<UbiDeviceListVo> listPageWx(PageIO io, String group);
+    List<UbiDeviceListVo> listWx(String group);
 
     /**
      * 微信端
@@ -53,4 +54,11 @@ public interface IUbiInfoStateService extends IService<UbiInfoState> {
      * @param openNum 设备公开码
      */
     UbiDeviceDetailVo getDetailWx(String openNum);
+
+    /**
+     * 校验设备码是否存在
+     *
+     * @param openNum 设备码
+     */
+    boolean checkOpenNum(String openNum);
 }

src/main/java/com/zy/bms/service/ubi/impl/UbiInfoStateServiceImpl.java

@@ -60,13 +60,17 @@ public class UbiInfoStateServiceImpl extends ServiceImpl<UbiInfoStateMapper, Ubi
     }
 
     @Override
-    public IPage<UbiDeviceListVo> listPageWx(PageIO io, String group) {
-        Page<UbiDeviceListVo> page = new Page<>(io.getCurrent(), io.getSize());
-        return baseMapper.listPageWx(page, group);
+    public List<UbiDeviceListVo> listWx(String group) {
+        return baseMapper.listWx(group);
     }
 
     @Override
     public UbiDeviceDetailVo getDetailWx(String openNum) {
         return baseMapper.getDetail(openNum);
     }
+
+    @Override
+    public boolean checkOpenNum(String openNum) {
+        return baseMapper.checkOpenNum(openNum) > 0;
+    }
 }

src/main/resources/mapper/UbiInfoStateMapper.xml

@@ -5,11 +5,9 @@
 
     <update id="updateStatus">
         UPDATE
-        ubi_info_state
-        SET
-        status = 0
-        WHERE
-        TIMESTAMPDIFF(SECOND,update_time,NOW()) > (freq+120)
+            ubi_info_state
+        SET status = 0
+        WHERE TIMESTAMPDIFF(SECOND, update_time, NOW()) > (freq + 120)
     </update>
 
     <select id="listPage" resultType="com.zy.bms.pojo.vo.UbiDeviceListVo">
@@ -49,29 +47,32 @@
     </select>
 
     <select id="getDetail" resultType="com.zy.bms.pojo.vo.UbiDeviceDetailVo">
-        SELECT
-            t1.open_num,
-            t2.power_volt,
-            t2.sat_num,
-            t2.signal_4g,
-            t2.`version`,
-            t2.status
-        FROM
-            device_base t1
-        LEFT JOIN ubi_info_state t2 ON t1.open_num = t2.open_num
-        WHERE
-            t1.open_num = #{openNum}
+        SELECT t1.open_num,
+               t2.power_volt,
+               t2.sat_num,
+               t2.signal4g,
+               t2.`version`,
+               t2.status,
+               t2.lon,
+               t2.lon_gcj,
+               t2.lat,
+               t2.lat_gcj,
+               t2.update_time
+        FROM device_base t1
+                 LEFT JOIN ubi_info_state t2 ON t1.open_num = t2.open_num
+        WHERE t1.open_num = #{openNum}
     </select>
 
-    <select id="listPageWx" resultType="com.zy.bms.pojo.vo.UbiDeviceListVo">
-        SELECT
-            t1.open_num,
-            t1.create_time,
-            t2.status
-        FROM
-            device_base t1
-        LEFT JOIN ubi_info_state t2 ON t1.open_num = t2.open_num
-        WHERE
-            t1.group_id = #{group}
+    <select id="listWx" resultType="com.zy.bms.pojo.vo.UbiDeviceListVo">
+        SELECT t1.open_num,
+               t1.create_time,
+               t2.status
+        FROM device_base t1
+                 LEFT JOIN ubi_info_state t2 ON t1.open_num = t2.open_num
+        WHERE t1.group_id = #{group}
+    </select>
+
+    <select id="checkOpenNum" resultType="java.lang.Integer">
+        SELECT IFNULL((SELECT 1 FROM device_base WHERE open_num = #{openNum} LIMIT 1), 0)
     </select>
 </mapper>