Merge remote-tracking branch 'upstream/6170'

# Conflicts:
#	fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/utils/EncryptUtilsTest.java

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/bo/AppPersonnelInfoBo.java

@@ -25,6 +25,11 @@ public class AppPersonnelInfoBo extends BaseEntity {
      */
     private Long id;
 
+    /**
+     * 设备IMEI
+     */
+    private String deviceImei;
+
     /**
      * 设备id
      */

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppDeviceDetailVo.java

@@ -104,4 +104,7 @@ public class AppDeviceDetailVo {
      * 告警状态(0解除告警，1告警)
      */
     private String alarmStatus;
+
+    // 灯光亮度
+    private String lightBrightness;
 }

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppDeviceShareDetailVo.java

@@ -104,4 +104,41 @@ public class AppDeviceShareDetailVo implements Serializable {
      * 发送信息
      */
     private String sendMsg;
+
+    //设备主灯档位
+    private String mainLightMode;
+
+    //激光灯档位
+    private String laserLightMode;
+
+    //电量百分比
+    private String batteryPercentage;
+
+    //充电状态（0没有充电，1正在充电，2为已充满）
+    private String chargeState;
+
+    //电池剩余续航时间200分钟
+    private String batteryRemainingTime;
+
+    /**
+     * 在线状态(0离线，1在线)
+     */
+    private Integer onlineStatus;
+
+    // 经度
+    private String longitude;
+
+    // 纬度
+    private String latitude;
+
+    // 逆解析地址
+    private String address;
+
+    /**
+     * 告警状态(0解除告警，1告警)
+     */
+    private String alarmStatus;
+
+    // 灯光亮度
+    private String lightBrightness;
 }

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppDeviceShareVo.java

@@ -57,6 +57,12 @@ public class AppDeviceShareVo implements Serializable {
     @ExcelProperty(value = "手机号")
     private String phonenumber;
 
+    /**
+     * 他人分享手机号
+     */
+    @ExcelProperty(value = "手机号")
+    private String otherPhonenumber;
+
     /**
      * 功能权限（1：灯光模式；2：激光模式；3：开机画面；4：人员信息登记；5：发送信息；6：产品信息）
 以逗号分隔
@@ -65,6 +71,11 @@ public class AppDeviceShareVo implements Serializable {
     @ExcelDictFormat(readConverterExp = "1=：灯光模式；2：激光模式；3：开机画面；4：人员信息登记；5：发送信息；6：产品信息")
     private String permission;
 
+    /**
+     * 设备类型
+     */
+    private String typeName;
+
     /**
      * 备注
      */
@@ -73,4 +84,29 @@ public class AppDeviceShareVo implements Serializable {
 
     // 设备图片
     private String devicePic;
+
+    /**
+     * 在线状态(0离线，1在线)
+     */
+    private Integer onlineStatus;
+
+    /**
+     * 电量 百分比
+     */
+    private String battery;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 告警状态(0解除告警，1告警)
+     */
+    private String alarmStatus;
 }

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppDeviceShareMapper.java

@@ -1,5 +1,6 @@
 package com.fuyuanshen.app.mapper;
 
+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.fuyuanshen.app.domain.AppDeviceShare;
@@ -16,4 +17,6 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface AppDeviceShareMapper extends BaseMapperPlus<AppDeviceShare, AppDeviceShareVo> {
     IPage<AppDeviceShareVo> otherDeviceShareList(@Param("bo") AppDeviceShareBo bo, Page<AppDeviceShareVo> page);
+
+    Page<AppDeviceShareVo> selectAppDeviceShareList(@Param("bo") AppDeviceShareBo bo,Page<AppDeviceShareVo> page);
 }

fys-modules/fys-app/src/main/resources/mapper/app/AppDeviceShareMapper.xml

@@ -5,6 +5,46 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.fuyuanshen.app.mapper.AppDeviceShareMapper">
 
     <select id="otherDeviceShareList" resultType="com.fuyuanshen.app.domain.vo.AppDeviceShareVo">
-        SELECT * FROM app_device_share a where a.phonenumber = #{bo.phonenumber}
+        select d.device_name,
+        d.device_mac,
+        d.device_sn,
+        d.device_imei,
+        d.device_pic,
+        dt.type_name,
+        dt.communication_mode,
+        dt.model_dictionary detailPageUrl,
+        d.bluetooth_name,
+        c.binding_time,
+        ad.*,u.user_name otherPhonenumber
+        from
+        app_device_share ad
+        left join device d on ad.device_id = d.id
+        left join app_user u on ad.create_by = u.user_id
+        inner join device_type dt on d.device_type = dt.id
+        inner join app_device_bind_record c on d.id = c.device_id
+        where ad.phonenumber = #{bo.phonenumber}
+    </select>
+    <select id="selectAppDeviceShareList" resultType="com.fuyuanshen.app.domain.vo.AppDeviceShareVo">
+        select d.device_name,
+        d.device_mac,
+        d.device_sn,
+        d.device_imei,
+        d.device_pic,
+        dt.type_name,
+        dt.communication_mode,
+        d.bluetooth_name,
+        dt.model_dictionary detailPageUrl,
+        c.binding_time,
+        ad.*,u.user_name otherPhonenumber
+        from
+        app_device_share ad
+        left join device d on ad.device_id = d.id
+        left join app_user u on ad.create_by = u.user_id
+        inner join device_type dt on d.device_type = dt.id
+        inner join app_device_bind_record c on d.id = c.device_id
+        where ad.create_by = #{bo.createBy}
+        <if test="bo.deviceId != null">
+            and ad.device_id = #{bo.deviceId}
+        </if>
     </select>
 </mapper>