微调

src/main/java/com/njcn/jbsyncdata/controller/DisPhotovoltaicController.java

@@ -1,8 +1,12 @@
 package com.njcn.jbsyncdata.controller;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.EasyExcel;
 import com.njcn.jbsyncdata.pojo.DisPhotovoltaic10Excel;
 import com.njcn.jbsyncdata.pojo.DisPhotovoltaic380Excel;
+import com.njcn.jbsyncdata.pojo.ExcelData;
+import com.njcn.jbsyncdata.service.IBusinessService;
+import com.njcn.jbsyncdata.util.StreamUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -13,6 +17,11 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 /**
  * @author wr
@@ -26,14 +35,21 @@ import java.util.List;
 @RequiredArgsConstructor
 public class DisPhotovoltaicController {
 
+    private final IBusinessService businessService;
+
     @ApiOperation(value = "获取10kv分布式光伏接入情况")
     @PostMapping("/import10")
     public void importTakeOrder(MultipartFile file) throws Exception {
-        List<DisPhotovoltaic10Excel> list = EasyExcel.read(file.getInputStream())
-                .head(DisPhotovoltaic10Excel.class)
+        List<ExcelData> list = EasyExcel.read(file.getInputStream())
+                .head(ExcelData.class)
                 .headRowNumber(2)
                 .sheet(2).doReadSync();
-
+        //排重
+        list = list.stream()
+                .filter(t -> StrUtil.isNotBlank(t.getGenerationUserID()))
+                .filter(StreamUtil.distinctByKey(ExcelData::getGenerationUserID))
+                .collect(Collectors.toList());
+        businessService.testInterfaceByUserId(list);
         System.out.println();
 
     }
@@ -41,12 +57,21 @@ public class DisPhotovoltaicController {
     @ApiOperation(value = "获取380kv分布式光伏接入情况")
     @PostMapping("/import380")
     public void import380(MultipartFile file) throws Exception {
-        List<DisPhotovoltaic380Excel> list = EasyExcel.read(file.getInputStream())
-                .head(DisPhotovoltaic380Excel.class)
+        List<ExcelData> list = EasyExcel.read(file.getInputStream())
+                .head(ExcelData.class)
                 .headRowNumber(2)
                 .sheet(3).doReadSync();
-
+        //排重
+        list = list.stream()
+                .filter(t -> StrUtil.isNotBlank(t.getGenerationUserID()))
+                .filter(StreamUtil.distinctByKey(ExcelData::getGenerationUserID))
+                .collect(Collectors.toList());
+        businessService.testInterfaceByUserId(list);
         System.out.println();
 
     }
+
+
+
+
 }

src/main/java/com/njcn/jbsyncdata/controller/IndexController.java

@@ -1,21 +0,0 @@
-package com.njcn.jbsyncdata.controller;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-@Api(tags = "首页模块")
-@RestController
-public class IndexController {
-
-    @ApiImplicitParam(name = "name",value = "姓名",required = true)
-    @ApiOperation(value = "向客人问好")
-    @GetMapping("/sayHi")
-    public ResponseEntity<String> sayHi(@RequestParam(value = "name")String name){
-        return ResponseEntity.ok("Hi:"+name);
-    }
-}

src/main/java/com/njcn/jbsyncdata/controller/TokenController.java

@@ -0,0 +1,33 @@
+package com.njcn.jbsyncdata.controller;
+
+import com.njcn.jbsyncdata.component.TokenComponent;
+import com.njcn.jbsyncdata.pojo.result.TokenResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+@Slf4j
+@Api(tags = "冀北获取token")
+@RequestMapping("/oauth")
+@RequiredArgsConstructor
+public class TokenController {
+
+    @Resource
+    private TokenComponent tokenComponent;
+
+
+    @ApiOperation(value = "测试获取token")
+    @PostMapping("/testToken")
+    public TokenResult testToken() {
+        return tokenComponent.getTokenWithRestTemplate();
+    }
+
+
+}