兼容深光

README.md

@@ -5,3 +5,14 @@
 JASYPTPASSWORD=4dage168...
 --jasypt.encryptor.password=${JASYPTPASSWORD}
 ~~~~
+
+
+###**v1.1.0**
+~~~~
+1.场景管理.场景列表
+    /service/manage_jp/scene/list 参数type添加枚举，5四维深光点云，6四维深光obj
+2.归档管理.归档列表
+    /service/manage_jp/storage/list 参数type添加枚举，5四维深光点云，6四维深光obj
+3.设备管理.添加相机
+    /service/manage_jp/camera/add  参数cameraType添加枚举，11四维深光相机
+~~~~

src/main/java/com/fdkankan/manage_jp/entity/CameraDetail.java

@@ -92,7 +92,7 @@ public class CameraDetail implements Serializable {
      * 商品表t_goods的id
      */
     @TableField("goods_id")
-    private Long goodsId;
+    private Integer goodsId;
 
     /**
      * 企业表t_company的id

src/main/java/com/fdkankan/manage_jp/service/impl/CameraServiceImpl.java

@@ -104,13 +104,7 @@ public class CameraServiceImpl extends MPJBaseServiceImpl<ICameraMapper, Camera>
         detail.setUsedSpace(0L);
         detail.setCameraId(camera.getId());
         detail.setType(param.getCameraType());
-        if(param.getCameraType() == 9){
-            detail.setGoodsId(9L);
-        }else if(param.getCameraType() == 10){
-            detail.setGoodsId(10L);
-        }else{
-            detail.setGoodsId(param.getCameraType() == 0 ? 1L : 4L);
-        }
+        detail.setGoodsId(param.getCameraType() == 0 ? 1 : 4);
         detail.setOutTime(new Date());
         detail.setAgency(Constant.DEFAULT_AGENT);
         detail.setAddress(param.getAddress());

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

@@ -152,13 +152,13 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             cooNumList =  tmContractorNumService.getNumList(sceneNumList);
         }
         HashMap<String,JSONObject> ssSceneMap = new HashMap<>();
-        if(param.getType() == 2){
+        if(param.getType() == 2 || param.getType() == 5){
             ssSceneMap = laserService.list(sceneNumList);
         }
         HashMap<String,Boolean> coldMap = tmColdStorageService.getByNumList(sceneNumList);
 
         for (SceneVo record : page.getRecords()) {
-            if(param.getType() == 2){
+            if(param.getType() == 2 || param.getType() == 5){
                 JSONObject ssObj = ssSceneMap.get(record.getNum());
                 if(ssObj!=null){
                     record.setSceneName(ssObj.getString("title"));

src/main/java/com/fdkankan/manage_jp/service/impl/TmColdStorageServiceImpl.java

@@ -72,14 +72,14 @@ public class TmColdStorageServiceImpl extends ServiceImpl<ITmColdStorageMapper,
         if(param.getType() != null){
             List<Integer> sceneSourceByType = SceneSourceUtils.getSceneSourceByType(param.getType());
             wrapper.in(TmColdStorage::getSceneSource,sceneSourceByType);
-            if(param.getType() == 4){
+            if(param.getType() == 4 || param.getType() == 6){
                 wrapper.eq(TmColdStorage::getIsObj,1);
             }
 
         }
         wrapper.orderByDesc(TmColdStorage::getShootingTime);
         Page<TmColdStorage> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
-        if(param.getType() != null && param.getType() == 2){  //深时归档信息
+        if(param.getType() != null && (param.getType() == 2 || param.getType() == 5)){  //深时归档信息
             List<String> numList = page.getRecords().stream().map(TmColdStorage::getSceneNum).collect(Collectors.toList());
             HashMap<String, JSONObject> ssObj = laserService.list(numList,3);
             for (TmColdStorage record : page.getRecords()) {

src/main/resources/mapper/manage_jp/SceneProMapper.xml

@@ -53,6 +53,12 @@
         <if test="param.type !=null and param.type == 4">
             and s.scene_source = 4 and is_obj = 1
         </if>
+        <if test="param.type !=null and param.type == 5">
+            and s.scene_source = 5
+        </if>
+        <if test="param.type !=null and param.type == 6">
+            and s.scene_source = 5 and is_obj = 1
+        </if>
         <if test="param.companyName !=null and param.companyName !='' ">
             and co.company_name like concat ('%',#{param.companyName},'%')
         </if>