Browse Source

基本稳定版本,删除无用代码

wuweihao 4 years ago
parent
commit
1b4721eec7

+ 11 - 4
laser/src/main/java/com/fdkankan/indoor/base/convert/ModifyCloud.java

@@ -19,11 +19,18 @@ public class ModifyCloud {
 		String str = FileUtil.readStringFile(path);
 		JSONObject json = JSONObject.fromObject(str);
 		
+//		String[] pointAttributes = {
+//		                            "POSITION_CARTESIAN",
+//		                            "COLOR_PACKED",
+//		                            "NORMAL_OCT16"
+//									};
 		String[] pointAttributes = {
-		                            "POSITION_CARTESIAN",
-		                            "COLOR_PACKED",
-		                            "NORMAL_OCT16"
-									};
+				"POSITION_CARTESIAN",
+				"COLOR_PACKED",
+				"NORMAL_OCT16",
+				"INTENSITY",
+				"CLASSIFICATION"
+		};
 		json.put("pointAttributes", pointAttributes);
 		return json;
 	}

+ 1 - 0
laser/src/main/java/com/fdkankan/indoor/core/controller/TestController.java

@@ -56,6 +56,7 @@ public class TestController {
     }
 
 
+//    @Transactional
     @ApiOperation("事务:transaction")
     @GetMapping("transaction")
     public Result transaction(OwenEntity param){

+ 2 - 0
laser/src/main/java/com/fdkankan/indoor/core/service/impl/OwenServiceImpl.java

@@ -7,6 +7,7 @@ import com.fdkankan.indoor.core.service.OwenService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Created by owen on 2021/7/28 0028 20:05
@@ -43,6 +44,7 @@ public class OwenServiceImpl implements OwenService {
     }
 
 
+    @Transactional
     @Override
     public Result transaction(OwenEntity param) {
 

+ 16 - 11
laser/src/main/java/com/fdkankan/indoor/core/service/impl/PoiServiceImpl.java

@@ -1,7 +1,5 @@
 package com.fdkankan.indoor.core.service.impl;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.indoor.base.util.Result;
 import com.fdkankan.indoor.core.entity.dto.PoiHotDto;
@@ -9,7 +7,6 @@ import com.fdkankan.indoor.core.entity.dto.PoiSearchDto;
 import com.fdkankan.indoor.core.entity.dto.PoiTypeDto;
 import com.fdkankan.indoor.core.entity.PoiEntity;
 import com.fdkankan.indoor.core.entity.dto.SecurityDto;
-import com.fdkankan.indoor.core.entity.poi.PoiBaseEntity;
 import com.fdkankan.indoor.core.mapper.PoiMapper;
 import com.fdkankan.indoor.core.service.PoiService;
 import com.fdkankan.indoor.core.service.PoiTypeService;
@@ -196,7 +193,7 @@ public class PoiServiceImpl extends IBaseServiceImpl implements PoiService {
 
     /**
      * 未登录, can_write: false
-     * @param dto
+     * @param
      * @return
      */
     private SecurityDto changeSecurityUnLogin(){
@@ -208,8 +205,14 @@ public class PoiServiceImpl extends IBaseServiceImpl implements PoiService {
     }
 
     private List<PoiHotDto> changeSecurityUnLoginList(List<PoiHotDto> param){
-        List<PoiHotDto> collect = param.stream().peek(p -> p.setSecurity(changeSecurityUnLogin())).collect(Collectors.toList());
-            return collect;
+//        List<PoiHotDto> collect = param.stream().peek(p -> p.setSecurity(changeSecurityUnLogin())).collect(Collectors.toList());
+
+        List<PoiHotDto> result = new ArrayList<>();
+        for (PoiHotDto dto : param) {
+            dto.setSecurity(changeSecurityUnLogin());
+            result.add(dto);
+        }
+            return result;
     }
 
 
@@ -224,11 +227,13 @@ public class PoiServiceImpl extends IBaseServiceImpl implements PoiService {
 
         List<Integer> numbers = Arrays.asList(3, 2, 2, 3, 7, 3, 5);
 
-        IntSummaryStatistics stats = numbers.stream().mapToInt((x) -> x).summaryStatistics();
+//        IntSummaryStatistics stats = numbers.stream().mapToInt((x) -> x).summaryStatistics();
+////
+////        System.out.println("列表中最大的数 : " + stats.getMax());
+////        System.out.println("列表中最小的数 : " + stats.getMin());
+////        System.out.println("所有数之和 : " + stats.getSum());
+////        System.out.println("平均数 : " + stats.getAverage());
 
-        System.out.println("列表中最大的数 : " + stats.getMax());
-        System.out.println("列表中最小的数 : " + stats.getMin());
-        System.out.println("所有数之和 : " + stats.getSum());
-        System.out.println("平均数 : " + stats.getAverage());
+        numbers.stream().peek(System.out::println).count();
     }
 }

+ 0 - 1
laser/src/main/resources/application-dev.properties

@@ -1,4 +1,3 @@
-#spring.data.mongodb.uri=mongodb://192.168.0.47:27017/json_data
 spring.data.mongodb.uri=mongodb://120.25.146.52:27017/json_data
 spring.data.mongodb.username=4dage
 spring.data.mongodb.password=1234