联调

eride-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java

@@ -625,8 +625,11 @@ public class AppVerifyController extends BaseController
         if(StrUtil.isBlank(sn)){
             throw new ServiceException("【根据sn查询正在进行中的订单】sn不能为空");
         }
-        EOrderVO order = orderService.getInProgressOrder(sn);
+        List<EOrderVO> order = orderService.getInProgressOrder(getUserId(),sn);
-        return success(order);
+        if(ObjectUtil.isNull(order) || order.isEmpty()){
+            return error("无正在进行中的订单");
+        }
+        return success(order.get(0));
     }
 
     /**
@@ -829,10 +832,16 @@ public class AppVerifyController extends BaseController
     public AjaxResult getDeviceListByToken()
     {
         logger.info("【根据token查询车辆列表】");
-        EDeviceQuery deviceQuery = new EDeviceQuery();
+        // todo 如果是用户有订单，则返回所有订单中的车辆  获取到用户类型，如果是普通用户，则查询订单来判断
-        deviceQuery.setUserId(getUserId());
+        if(ServiceConstants.USER_TYPE_NORMAL.equals(getUserType())){
-        List<EDevice> list = deviceService.selectEDeviceListWithIsolate(deviceQuery);
+            List<EDevice> devices = deviceService.getInProgressOrder(getUserId());
-        return success(list);
+            return success(devices);
+        }else{
+            EDeviceQuery deviceQuery = new EDeviceQuery();
+            deviceQuery.setUserId(getUserId());
+            List<EDevice> list = deviceService.selectEDeviceListWithIsolate(deviceQuery);
+            return success(list);
+        }
     }
 
     /**

eride-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java

@@ -23,7 +23,7 @@ import com.ruoyi.common.utils.sql.SqlUtil;
 
 /**
  * web层通用数据处理
- * 
+ *
  * @author ruoyi
  */
 public class BaseController
@@ -113,7 +113,7 @@ public class BaseController
     {
         return AjaxResult.success(message);
     }
-    
+
     /**
      * 返回成功消息
      */
@@ -140,7 +140,7 @@ public class BaseController
 
     /**
      * 响应返回结果
-     * 
+     *
      * @param rows 影响行数
      * @return 操作结果
      */
@@ -151,7 +151,7 @@ public class BaseController
 
     /**
      * 响应返回结果
-     * 
+     *
      * @param result 结果
      * @return 操作结果
      */
@@ -184,6 +184,14 @@ public class BaseController
         return getLoginUser().getUserId();
     }
 
+    /**
+     * 获取登录用户id
+     */
+    public String getUserType()
+    {
+        return getLoginUser().getUserType();
+    }
+
     /**
      * 获取登录部门id
      */

eride-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java

@@ -26,6 +26,11 @@ public class LoginUser implements UserDetails
      */
     private Long deptId;
 
+    /**
+     * 用户类型
+     */
+    private String userType;
+
     /**
      * 用户唯一标识
      */
@@ -71,6 +76,10 @@ public class LoginUser implements UserDetails
      */
     private EUserVO user;
 
+    public void setUserType(String userType) {
+        this.userType = userType;
+    }
+
     public LoginUser()
     {
     }
@@ -81,10 +90,11 @@ public class LoginUser implements UserDetails
         this.permissions = permissions;
     }
 
-    public LoginUser(Long userId, Long deptId, EUserVO user, Set<String> permissions)
+    public LoginUser(Long userId, Long deptId, String userType, EUserVO user, Set<String> permissions)
     {
         this.userId = userId;
         this.deptId = deptId;
+        this.userType = userType;
         this.user = user;
         this.permissions = permissions;
     }
@@ -94,6 +104,11 @@ public class LoginUser implements UserDetails
         return userId;
     }
 
+    public String getUserType()
+    {
+        return userType;
+    }
+
     public void setUserId(Long userId)
     {
         this.userId = userId;

eride-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java

@@ -67,7 +67,7 @@ public class UserDetailsServiceImpl implements UserDetailsService
                         passwordService.validate(user);
                     }
                 }
-                UserDetails loginUser = createLoginUser(user);
+                 UserDetails loginUser = createLoginUser(user);
                 return loginUser;
             }
             verifyUser(username, user);
@@ -98,6 +98,6 @@ public class UserDetailsServiceImpl implements UserDetailsService
 
     public UserDetails createLoginUser(EUserVO user)
     {
-        return new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user));
+        return new LoginUser(user.getUserId(), user.getDeptId(), user.getUserType(),user, permissionService.getMenuPermission(user));
     }
 }

eride-system/src/main/java/com/ruoyi/system/mapper/EDeviceMapper.java

@@ -167,4 +167,12 @@ public interface EDeviceMapper extends BaseMapper<EDevice>
      * @return 结果
      */
     int cancelDefault(@Param("userId") Long userId, @Param("sn") String sn);
+
+    /**
+     * 根据用户id查询正在进行的车辆列表
+     *
+     * @param userId 用户id
+     * @return 结果
+     */
+    List<EDevice> getInProgressOrder(Long userId);
 }

eride-system/src/main/java/com/ruoyi/system/mapper/EOrderMapper.java

@@ -100,7 +100,7 @@ public interface EOrderMapper
     /**
      * 根据sn查询正在进行中的订单
      */
-    List<EOrderVO> getInProgressOrder(String sn);
+    List<EOrderVO> getInProgressOrder(@Param("userId") Long userId,@Param("sn") String sn);
 
     /**
      * 订单金额

eride-system/src/main/java/com/ruoyi/system/service/IEDeviceService.java

@@ -397,4 +397,6 @@ public interface IEDeviceService extends IService<EDevice>
     /** 获取到该代理商下所有的车辆数 */
     Integer getTatalDeviceCount(Long merchantId, String status,String[] statusList);
 
+    /** 根据用户id查询正在进行的车辆列表 */
+    List<EDevice> getInProgressOrder(Long userId);
 }

eride-system/src/main/java/com/ruoyi/system/service/IEOrderService.java

@@ -193,7 +193,7 @@ public interface IEOrderService
     /**
      * 根据sn查询正在进行中的订单
      */
-    EOrderVO getInProgressOrder(String sn);
+    List<EOrderVO> getInProgressOrder(Long userId, String sn);
 
 
     void validate(EOrderQuery orderQuery);

eride-system/src/main/java/com/ruoyi/system/service/impl/EDeviceServiceImpl.java

@@ -42,6 +42,7 @@ import org.springframework.transaction.support.TransactionTemplate;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.concurrent.ScheduledExecutorService;
@@ -1354,6 +1355,11 @@ public class EDeviceServiceImpl extends ServiceImpl<EDeviceMapper, EDevice> impl
     public Integer getTatalDeviceCount(Long merchantId,String status,String[] statusList) {
         return deviceMapper.getTatalDeviceCount(merchantId,status,statusList);
     }
+
+    @Override
+    public List<EDevice> getInProgressOrder(Long userId) {
+        return deviceMapper.getInProgressOrder(userId);
+    }
 //
 //    /** 押金抵扣 */
 //    private void depositDeduction(EtOrder order) {

eride-system/src/main/java/com/ruoyi/system/service/impl/EOrderServiceImpl.java

@@ -493,8 +493,8 @@ public class EOrderServiceImpl implements IEOrderService
         if(StrUtil.isNotBlank(order.getSn())){
             throw new RuntimeException("该订单已绑定车辆："+order.getSn());
         }
-        EOrderVO order1 = getInProgressOrder(sn);
+        List<EOrderVO> order1 = getInProgressOrder(null,sn);
-        if(ObjectUtil.isNotNull(order1)){
+        if(!order1.isEmpty()){
             throw new RuntimeException("该车辆【"+sn+"】有进行中的订单：");
         }
         Boolean execute = transactionTemplate.execute(e -> {
@@ -953,12 +953,8 @@ public class EOrderServiceImpl implements IEOrderService
      * 根据sn查询正在进行中的订单
      */
     @Override
-    public EOrderVO getInProgressOrder(String sn) {
+    public List<EOrderVO> getInProgressOrder(Long userId, String sn) {
-        List<EOrderVO> orders = orderMapper.getInProgressOrder(sn);
+        return orderMapper.getInProgressOrder(userId,sn);
-        if(ObjectUtil.isNotNull(orders.size()) && orders.size() > 0){
-            return orders.get(0);
-        }
-        return null;
     }
 
     @Override

eride-system/src/main/resources/mapper/system/EDeviceMapper.xml

@@ -356,4 +356,56 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="cancelDefault" >
         update e_device set is_default = '0' where user_id = #{userId} and sn != #{sn}
     </update>
+
+<!--    <select id="getInProgressOrder" resultType="EDeviceVO">-->
+<!--        select d.sn,d.latitude,d.longitude,d.last_location_time,d.last_time,d.status,d.user_id,u.user_-->
+<!--    </select>-->
+
+    <select id="getInProgressOrder" resultType="com.ruoyi.system.domain.order.EOrderVO">
+        select
+            d.device_id,
+            d.picture,
+            d.device_name,
+            d.mac,
+            d.sn,
+            d.model_id,
+            d.hardware_version_id,
+            d.vehicle_num,
+            d.activation_time,
+            d.online_status,
+            d.create_by,
+            d.create_time,
+            d.update_by,
+            d.update_time,
+            d.last_time,
+            d.last_location_time,
+            d.gps,
+            d.remark,
+            d.status,
+            d.lock_status,
+            d.location,
+            d.remaining_power,
+            d.voltage,
+            d.qrcode,
+            d.longitude,
+            d.latitude,
+            d.lock_status,
+            d.location,
+            d.remaining_power,
+            d.voltage,
+            d.is_default,
+            d.version,
+            d.user_id,
+            d.is_senseless_unlock,
+            d.is_auto_shutdown,
+            d.is_auto_defense,
+            d.is_vibration_alarm,
+            d.is_admin_unlocking from e_device d
+        left join e_order o on d.sn = o.sn
+        where  o.status = 4
+        <if test="userId != null  and userId != ''">
+            and o.user_id = #{userId}
+        </if>
+        order by create_time desc
+    </select>
 </mapper>

eride-system/src/main/resources/mapper/system/EOrderMapper.xml

@@ -207,7 +207,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getInProgressOrder" resultType="com.ruoyi.system.domain.order.EOrderVO">
         <include refid="selectRlOrderDetail"/>
-        where o.sn = #{sn} and o.status = 4
+        where  o.status = 4
+        <if test="sn != null  and sn != ''">
+            and o.sn = #{sn}
+        </if>
+        <if test="userId != null  and userId != ''">
+            and o.user_id = #{userId}
+        </if>
         order by create_time desc
     </select>