21

src/main/java/com/fdkankan/ucenter/controller/api/LaserController.java

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -43,17 +44,23 @@ public class LaserController extends BaseController {
      */
     @RequestMapping(value = "/getSnCodeByPhone",method = RequestMethod.GET)
     public Result getSnCodeByUserName(@RequestParam(required = false)String phone) throws Exception {
-        User userEntity = userService.getByUserName(phone);
-        List<CameraAppVo> cameraAppVos = cameraDetailService.getListByUserAndType(userEntity.getId(), 10);//深时相机
-        Set<String> collect = cameraAppVos.stream().map(CameraAppVo::getSnCode).collect(Collectors.toSet());
+        List<Long> userIds = userService.getLikeUserName(phone);
         HashMap<String,Object> map = new HashMap<>();
+        Set<String> snCodeSet = new HashSet<>();
         map.put("phone",phone);
-        map.put("snCodes",collect);
+        map.put("snCodes",snCodeSet);
+        if(userIds.size() <=0){
+            return Result.success(map);
+        }
+
+        List<CameraAppVo> camera = cameraDetailService.getListByUserIdsAndType(userIds, 10);
+        snCodeSet = camera.stream().map(CameraAppVo::getSnCode).collect(Collectors.toSet());
+        map.put("snCodes",snCodeSet);
         return Result.success(map);
     }
 
     /**
-     * 获取场景数据 废弃
+     * 获取场景数据
      */
     @RequestMapping(value = "/getSceneByNum",method = RequestMethod.GET)
     public Result getSceneByNum(@RequestParam(required = false)String num) throws Exception {

src/main/java/com/fdkankan/ucenter/mapper/ICameraDetailMapper.java

@@ -20,4 +20,5 @@ import java.util.List;
 public interface ICameraDetailMapper extends BaseMapper<CameraDetail> {
 
     List<CameraAppVo> getListByUserAndType(@Param("userId") Long userId, @Param("cameraType") Integer cameraType);
+    List<CameraAppVo> getListByUserIdsAndType(@Param("userIds") List<Long> userId, @Param("cameraType") Integer cameraType);
 }

src/main/java/com/fdkankan/ucenter/service/ICameraDetailService.java

@@ -34,6 +34,7 @@ public interface ICameraDetailService extends IService<CameraDetail> {
     void addUsedSpace(HashMap<Long, Long> cameraMap);
 
     List<CameraAppVo> getListByUserAndType(Long userId, Integer cameraType);
+    List<CameraAppVo> getListByUserIdsAndType(List<Long> userId, Integer cameraType);
 
     boolean updateCameraBalance(Long cameraId, int body, Integer points);
 

src/main/java/com/fdkankan/ucenter/service/ISceneProService.java

@@ -31,7 +31,7 @@ public interface ISceneProService extends IService<ScenePro> {
 
     HashMap<Long, GroupByCount> findSceneNumByCameraIds(List<Long> cameraIdList);
 
-    void lockOrUnLockBySpace(CameraDetail cameraDetail, Long cameraId, int payStatus);
+    void lockOrUnLockBySpace(CameraDetail cameraDetail, Long cameraId, Integer payStatus);
 
     List<ScenePro> getListByCameraId(Long cameraId);
 

src/main/java/com/fdkankan/ucenter/service/impl/CameraDetailServiceImpl.java

@@ -160,6 +160,10 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
     public List<CameraAppVo> getListByUserAndType(Long userId, Integer cameraType) {
         return this.getBaseMapper().getListByUserAndType(userId,cameraType);
     }
+    @Override
+    public List<CameraAppVo> getListByUserIdsAndType(List<Long> userId, Integer cameraType) {
+        return this.getBaseMapper().getListByUserIdsAndType(userId,cameraType);
+    }
 
     @Override
     public boolean updateCameraBalance(Long cameraId, int body, Integer points) {

src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -176,7 +176,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
      * @param payStatus -2 封存，为 1 解封
      */
     @Override
-    public void lockOrUnLockBySpace(CameraDetail cameraDetail, Long cameraId, int payStatus) {
+    public void lockOrUnLockBySpace(CameraDetail cameraDetail, Long cameraId, Integer payStatus) {
         LambdaQueryWrapper<ScenePro> wrapper = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<ScenePlus> plusWr = new LambdaQueryWrapper<>();
         Long count = 0L;

src/main/resources/mapper/ucenter/CameraDetailMapper.xml

@@ -10,4 +10,16 @@
         and d.user_id = #{userId}
         and d.goods_id = #{cameraType}
     </select>
+
+    <select id="getListByUserIdsAndType" resultType="com.fdkankan.ucenter.vo.response.CameraAppVo">
+        SELECT * FROM t_camera_detail d
+                          LEFT JOIN t_camera c on d.camera_id = c.id
+                          LEFT JOIN t_goods g on d.goods_id = g.id
+        WHERE d.rec_status = 'A'
+          and d.user_id in
+        <foreach item="userId" collection="userIds" open="(" separator="," close=")">
+            #{userId}
+        </foreach>
+          and d.goods_id = #{cameraType}
+    </select>
 </mapper>