瀏覽代碼

app相机列表,返回公司下全部相机

lyhzzz 2 年之前
父節點
當前提交
216485e9e2

+ 2 - 0
src/main/java/com/fdkankan/ucenter/entity/User.java

@@ -148,5 +148,7 @@ public class User implements Serializable {
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("company_id")
+    private Long companyId;
 
 }

+ 1 - 1
src/main/java/com/fdkankan/ucenter/mapper/ICameraDetailMapper.java

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

+ 1 - 1
src/main/java/com/fdkankan/ucenter/service/impl/AppCameraService.java

@@ -48,7 +48,7 @@ public class AppCameraService {
         if(user == null){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3015, LoginConstant.FAILURE_MSG_3015);
         }
-        List<CameraAppVo> cameraAppVoList = cameraDetailService.getListByUserAndType(user.getId(), cameraType);
+        List<CameraAppVo> cameraAppVoList = cameraDetailService.getListByUserAndType(user.getCompanyId(), cameraType);
         for (CameraAppVo cameraApp : cameraAppVoList) {
             UserIncrement userIncrementEntity = userIncrementService.getByCameraId(cameraApp.getId());
             if(userIncrementEntity != null){

+ 2 - 2
src/main/java/com/fdkankan/ucenter/service/impl/CameraDetailServiceImpl.java

@@ -160,8 +160,8 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
     }
 
     @Override
-    public List<CameraAppVo> getListByUserAndType(Long userId, Integer cameraType) {
-        return this.getBaseMapper().getListByUserAndType(userId,cameraType);
+    public List<CameraAppVo> getListByUserAndType(Long companyId, Integer cameraType) {
+        return this.getBaseMapper().getListByUserAndType(companyId,cameraType);
     }
     @Override
     public List<CameraAppVo> getListByUserIdsAndType(List<Long> userId, Integer cameraType) {

+ 1 - 1
src/main/resources/mapper/ucenter/CameraDetailMapper.xml

@@ -7,7 +7,7 @@
         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 = #{userId}
+        and d.company_id = #{companyId}
         and d.goods_id = #{cameraType}
     </select>