lyhzzz 2 роки тому
батько
коміт
c40c275512

+ 2 - 0
src/main/java/com/fdkankan/manage_jp/service/ICameraDetailService.java

@@ -32,4 +32,6 @@ public interface ICameraDetailService extends MPJBaseService<CameraDetail> {
     List<CameraDetail> getListByCompanyId(Long companyId);
 
     List<CameraDetail> getByUserName(String userName);
+
+    CameraDetail getByCameraId(Integer cameraId);
 }

+ 2 - 0
src/main/java/com/fdkankan/manage_jp/service/ICompanyService.java

@@ -32,4 +32,6 @@ public interface ICompanyService extends IService<Company> {
     void saveSubUsers(RequestCompany bo);
 
     Company getByUserName(String userName);
+
+    Company getByCameraId(Integer cameraId);
 }

+ 8 - 0
src/main/java/com/fdkankan/manage_jp/service/impl/CameraDetailServiceImpl.java

@@ -10,6 +10,7 @@ import com.fdkankan.manage_jp.mapper.ICameraMapper;
 import com.fdkankan.manage_jp.service.ICameraDetailService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.manage_jp.service.ICameraService;
+import com.fdkankan.manage_jp.service.ICompanyService;
 import com.fdkankan.manage_jp.service.IUserService;
 import com.fdkankan.manage_jp.vo.response.ResponseCamera;
 import com.github.yulichang.base.MPJBaseServiceImpl;
@@ -109,4 +110,11 @@ public class CameraDetailServiceImpl extends MPJBaseServiceImpl<ICameraDetailMap
         }
         return null;
     }
+
+    @Override
+    public CameraDetail getByCameraId(Integer cameraId) {
+        LambdaQueryWrapper<CameraDetail> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(CameraDetail::getCameraId,cameraId);
+        return this.getOne(wrapper);
+    }
 }

+ 6 - 0
src/main/java/com/fdkankan/manage_jp/service/impl/CompanyServiceImpl.java

@@ -322,4 +322,10 @@ public class CompanyServiceImpl extends ServiceImpl<ICompanyMapper, Company> imp
         }
         return null;
     }
+
+    @Override
+    public Company getByCameraId(Integer cameraId) {
+        CameraDetail cameraDetail = cameraDetailService.getByCameraId(cameraId);
+        return this.getById(cameraDetail.getCompanyId());
+    }
 }

+ 1 - 2
src/main/java/com/fdkankan/manage_jp/service/impl/SceneProServiceImpl.java

@@ -91,8 +91,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
         Page<SceneVo> page = this.getBaseMapper().pageList(new Page<>(param.getPage(),param.getLimit()),param);
         for (SceneVo record : page.getRecords()) {
-            String userName = record.getUserName();
-            Company company = companyService.getByUserName(userName);
+            Company company = companyService.getByCameraId(record.getCameraId());
             if(company != null){
                 record.setCompanyName(company.getCompanyName());
             }

+ 2 - 0
src/main/java/com/fdkankan/manage_jp/vo/response/SceneVo.java

@@ -29,4 +29,6 @@ public class SceneVo {
     private String childName;
 
     private Integer isUpgrade = 1;
+    private Integer cameraId ;
+
 }

+ 2 - 2
src/main/resources/mapper/manage_jp/SceneProMapper.xml

@@ -7,7 +7,7 @@
         SELECT * FROM(
         select s.scene_name ,s.num,s.create_time,c.sn_code,s.space as sceneSize
         ,u.user_name,s.view_count,s.status,s.pay_status,'v3' as scene_version ,s.web_site as webSite,thumb
-        ,null as algorithmTime,c.child_name
+        ,null as algorithmTime,c.child_name,s.camera_id
         from t_scene_pro s
         <include refid="commonWhere"></include>
         <if test="param.sceneName != null and param.sceneName!='' ">
@@ -17,7 +17,7 @@
         UNION
         select s.title as sceneName ,s.num,s.create_time,c.sn_code,e.space as sceneSize
         ,u.user_name,e.view_count,s.scene_status as status,s.pay_status,'v4' as scene_version,e.web_site as webSite,thumb
-        ,algorithm_time,c.child_name
+        ,algorithm_time,c.child_name,s.camera_id
         from t_scene_plus s
         left join t_scene_plus_ext e on s.id = e.plus_id
         <include refid="commonWhere"></include>