From 8316ac73f2b3299556bf6c6f46026908834ef63e Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Tue, 26 Sep 2023 19:35:33 +0800 Subject: [PATCH] =?UTF-8?q?1.excel=E5=8F=B0=E8=B4=A6=E5=AF=BC=E5=85=A5=202?= =?UTF-8?q?.pom=E6=96=87=E4=BB=B6=E6=B7=BB=E5=8A=A0=203.=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?knife4j=204.=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 15 +- .../controller/DisPhotovoltaicController.java | 52 +++++++ .../controller/IndexController.java | 21 +++ .../pojo/DisPhotovoltaic10Excel.java | 75 ++++++++++ .../pojo/DisPhotovoltaic380Excel.java | 77 ++++++++++ .../service/DisPhotovoltaicService.java | 12 ++ .../impl/DisPhotovoltaicServiceImpl.java | 11 ++ .../jbsyncdata/util/Knife4jConfiguration.java | 34 +++++ src/main/resources/application.yml | 63 ++++++++ src/main/resources/logback.xml | 140 ++++++++++++++++++ 10 files changed, 498 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/njcn/jbsyncdata/controller/DisPhotovoltaicController.java create mode 100644 src/main/java/com/njcn/jbsyncdata/controller/IndexController.java create mode 100644 src/main/java/com/njcn/jbsyncdata/pojo/DisPhotovoltaic10Excel.java create mode 100644 src/main/java/com/njcn/jbsyncdata/pojo/DisPhotovoltaic380Excel.java create mode 100644 src/main/java/com/njcn/jbsyncdata/service/DisPhotovoltaicService.java create mode 100644 src/main/java/com/njcn/jbsyncdata/service/impl/DisPhotovoltaicServiceImpl.java create mode 100644 src/main/java/com/njcn/jbsyncdata/util/Knife4jConfiguration.java create mode 100644 src/main/resources/logback.xml diff --git a/pom.xml b/pom.xml index 7efeea0..ed98b3e 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 2.2.2.RELEASE com.njcn @@ -14,7 +14,6 @@ jar 冀北数据同步项目 - jb_syncdata @@ -156,6 +155,18 @@ + + com.alibaba + easyexcel + 3.2.1 + + + + com.github.xiaoymin + knife4j-spring-boot-starter + 2.0.7 + + diff --git a/src/main/java/com/njcn/jbsyncdata/controller/DisPhotovoltaicController.java b/src/main/java/com/njcn/jbsyncdata/controller/DisPhotovoltaicController.java new file mode 100644 index 0000000..98c531f --- /dev/null +++ b/src/main/java/com/njcn/jbsyncdata/controller/DisPhotovoltaicController.java @@ -0,0 +1,52 @@ +package com.njcn.jbsyncdata.controller; + +import com.alibaba.excel.EasyExcel; +import com.njcn.jbsyncdata.pojo.DisPhotovoltaic10Excel; +import com.njcn.jbsyncdata.pojo.DisPhotovoltaic380Excel; +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 org.springframework.web.multipart.MultipartFile; + +import java.util.List; + +/** + * @author wr + * @description + * @date 2023/9/26 15:28 + */ +@RestController +@Slf4j +@Api(tags = "冀北数据管理") +@RequestMapping("/dataImport") +@RequiredArgsConstructor +public class DisPhotovoltaicController { + + @ApiOperation(value = "获取10kv分布式光伏接入情况") + @PostMapping("/import10") + public void importTakeOrder(MultipartFile file) throws Exception { + List list = EasyExcel.read(file.getInputStream()) + .head(DisPhotovoltaic10Excel.class) + .headRowNumber(2) + .sheet(2).doReadSync(); + + System.out.println(); + + } + + @ApiOperation(value = "获取380kv分布式光伏接入情况") + @PostMapping("/import380") + public void import380(MultipartFile file) throws Exception { + List list = EasyExcel.read(file.getInputStream()) + .head(DisPhotovoltaic380Excel.class) + .headRowNumber(2) + .sheet(3).doReadSync(); + + System.out.println(); + + } +} diff --git a/src/main/java/com/njcn/jbsyncdata/controller/IndexController.java b/src/main/java/com/njcn/jbsyncdata/controller/IndexController.java new file mode 100644 index 0000000..7947ad3 --- /dev/null +++ b/src/main/java/com/njcn/jbsyncdata/controller/IndexController.java @@ -0,0 +1,21 @@ +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 sayHi(@RequestParam(value = "name")String name){ + return ResponseEntity.ok("Hi:"+name); + } +} diff --git a/src/main/java/com/njcn/jbsyncdata/pojo/DisPhotovoltaic10Excel.java b/src/main/java/com/njcn/jbsyncdata/pojo/DisPhotovoltaic10Excel.java new file mode 100644 index 0000000..e3b48e6 --- /dev/null +++ b/src/main/java/com/njcn/jbsyncdata/pojo/DisPhotovoltaic10Excel.java @@ -0,0 +1,75 @@ +package com.njcn.jbsyncdata.pojo; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @author wr + * @description + * @date 2023/9/26 15:28 + */ +@Data +public class DisPhotovoltaic10Excel implements Serializable { + + @ExcelProperty(value = "市单位") + private String orgName; + + @ExcelProperty(value = "区县") + private String county; + + @ExcelProperty(value = "供电所") + private String powerSupply; + + @ExcelProperty(value = "发电客户编号") + private String generationUserID; + + @ExcelProperty(value = "发电客户名称") + private String generationUserName; + + @ExcelProperty(value = "并网时间") + private String connectionDate; + + @ExcelProperty(value = "电压等级") + private String Voltage_Level; + + @ExcelProperty(value = "发电客户地址") + private String address; + + @ExcelProperty(value = "发电客户类型") + private String generationUserType; + + @ExcelProperty(value = "消纳方式") + private String wayConsumption; + + @ExcelProperty(value = "合同容量") + private BigDecimal contractCapacity; + + @ExcelProperty(value = "行业类别") + private String industryType; + + @ExcelProperty(value = "台区编号") + private String stageID; + + @ExcelProperty(value = "台区名称") + private String stageName; + + @ExcelProperty(value = "PMS系统线路编号") + private String lineID; + + @ExcelProperty(value = "线路名称") + private String lineName; + + @ExcelProperty(value = "公线/专线") + private String lineType; + + @ExcelProperty(value = "运行状态") + private String comFlag; + + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/src/main/java/com/njcn/jbsyncdata/pojo/DisPhotovoltaic380Excel.java b/src/main/java/com/njcn/jbsyncdata/pojo/DisPhotovoltaic380Excel.java new file mode 100644 index 0000000..b5acd13 --- /dev/null +++ b/src/main/java/com/njcn/jbsyncdata/pojo/DisPhotovoltaic380Excel.java @@ -0,0 +1,77 @@ +package com.njcn.jbsyncdata.pojo; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @author wr + * @description + * @date 2023/9/26 15:28 + */ +@Data +public class DisPhotovoltaic380Excel implements Serializable { + + @ExcelProperty(value = "市单位") + private String orgName; + + @ExcelProperty(value = "区县") + private String county; + + @ExcelProperty(value = "供电所") + private String powerSupply; + + @ExcelProperty(value = "发电客户编号") + private String generationUserID; + + @ExcelProperty(value = "发电客户名称") + private String generationUserName; + + @ExcelProperty(value = "并网时间") + private String connectionDate; + + + + @ExcelProperty(value = "发电客户地址") + private String address; + + @ExcelProperty(value = "发电客户类型") + private String generationUserType; + + @ExcelProperty(value = "消纳方式") + private String wayConsumption; + + @ExcelProperty(value = "合同容量") + private BigDecimal contractCapacity; + + @ExcelProperty(value = "电压等级") + private String Voltage_Level; + + @ExcelProperty(value = "行业类别") + private String industryType; + + @ExcelProperty(value = "台区编号") + private String stageID; + + @ExcelProperty(value = "台区名称") + private String stageName; + + @ExcelProperty(value = "变压器PMSID") + private String transformerPMSID; + + @ExcelProperty(value = "是否已配置配变融合终端") + private String isFusionTerminal; + + @ExcelProperty(value = "是否安装反孤岛保护") + private String isAntiarc; + + @ExcelProperty(value = "所属线路PMS编号") + private String lineID; + + @ExcelProperty(value = "所属线路PMS名称") + private String lineName; + + +} diff --git a/src/main/java/com/njcn/jbsyncdata/service/DisPhotovoltaicService.java b/src/main/java/com/njcn/jbsyncdata/service/DisPhotovoltaicService.java new file mode 100644 index 0000000..db27840 --- /dev/null +++ b/src/main/java/com/njcn/jbsyncdata/service/DisPhotovoltaicService.java @@ -0,0 +1,12 @@ +package com.njcn.jbsyncdata.service; + +/** + * @author wr + * @description + * @date 2023/9/26 16:09 + */ +public class DisPhotovoltaicService { + + + +} diff --git a/src/main/java/com/njcn/jbsyncdata/service/impl/DisPhotovoltaicServiceImpl.java b/src/main/java/com/njcn/jbsyncdata/service/impl/DisPhotovoltaicServiceImpl.java new file mode 100644 index 0000000..3b5fbab --- /dev/null +++ b/src/main/java/com/njcn/jbsyncdata/service/impl/DisPhotovoltaicServiceImpl.java @@ -0,0 +1,11 @@ +package com.njcn.jbsyncdata.service.impl; + +import com.njcn.jbsyncdata.service.DisPhotovoltaicService; + +/** + * @author wr + * @description + * @date 2023/9/26 16:10 + */ +public class DisPhotovoltaicServiceImpl extends DisPhotovoltaicService { +} diff --git a/src/main/java/com/njcn/jbsyncdata/util/Knife4jConfiguration.java b/src/main/java/com/njcn/jbsyncdata/util/Knife4jConfiguration.java new file mode 100644 index 0000000..8fb14be --- /dev/null +++ b/src/main/java/com/njcn/jbsyncdata/util/Knife4jConfiguration.java @@ -0,0 +1,34 @@ +package com.njcn.jbsyncdata.util; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import springfox.documentation.builders.ApiInfoBuilder; +import springfox.documentation.builders.PathSelectors; +import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.plugins.Docket; +import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc; + +@Configuration +@EnableSwagger2WebMvc +public class Knife4jConfiguration { + + @Bean(value = "defaultApi2") + public Docket defaultApi2() { + Docket docket=new Docket(DocumentationType.SWAGGER_2) + .apiInfo(new ApiInfoBuilder() + .title("冀北数据同步API接口文档") + .description("冀北数据同步API") + .termsOfServiceUrl("http://www.xx.com/") + .version("1.0") + .build()) + //分组名称 + .groupName("2.X版本") + .select() + //这里指定Controller扫描包路径 + .apis(RequestHandlerSelectors.basePackage("com.njcn.jbsyncdata.controller")) + .paths(PathSelectors.any()) + .build(); + return docket; + } +} \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 8b13789..2391aad 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1 +1,64 @@ +server: + port: 10288 +spring: + application: + name: jbsyncdata + #??????? + datasource: + druid: + driver-class-name: com.mysql.cj.jdbc.Driver + # url: jdbc:mysql://101.132.25.239:13306/pqsinfo?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=CTT&rewriteBatchedStatements=true + url: jdbc:mysql://192.168.1.18:13306/pqsinfo_pmscs?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT + username: root + password: njcnpqs +# url: jdbc:mysql://localhost:3306/info?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT +# username: root +# password: root + + #????????????????????? + initial-size: 5 + min-idle: 5 + max-active: 50 + #??????????????? + max-wait: 60000 + #????????????????????? + min-evictable-idle-time-millis: 300000 + validation-query: select 1 + test-while-idle: true + test-on-borrow: false + test-on-return: false + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 20 + jackson: + time-zone: GMT+8 + date-format: yyyy-MM-dd HH:mm:ss + locale: zh_CN + serialization: + # ????? + indent_output: false + servlet: + multipart: + max-file-size: 100MB + max-request-size: 500MB + + +#mybatis???? +mybatis-plus: + mapper-locations: classpath*:com/njcn/**/mapping/*.xml + configuration: + #???? + map-underscore-to-camel-case: true + #??sql???? + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + #?????? + #log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl + global-config: + db-config: + #???????? + id-type: assign_uuid +log: + commonLevel: info + + + diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml new file mode 100644 index 0000000..7a71704 --- /dev/null +++ b/src/main/resources/logback.xml @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + ${log.pattern} + + UTF-8 + + + + + + + + ${log.homeDir}/${log.projectName}/debug/debug.log + + + + + DEBUG + + ACCEPT + + DENY + + + + + + ${log.homeDir}/${log.projectName}/debug/debug.log.%d{yyyy-MM-dd}.%i.log + + 10MB + + ${log.maxHistory:-30} + + + + + + + + + + ${log.pattern} + + UTF-8 + + + + + + + INFO + ACCEPT + DENY + + + ${log.homeDir}/${log.projectName}/info/info.log + + + + ${log.homeDir}/${log.projectName}/info/info.log.%d{yyyy-MM-dd}.%i.log + + 10MB + ${log.maxHistory:-30} + + + + ${log.pattern} + + UTF-8 + + + + + + + + ${log.homeDir}/${log.projectName}/error/error.log + + + ERROR + ACCEPT + DENY + + + + ${log.homeDir}/${log.projectName}/error/error.log.%d{yyyy-MM-dd}.%i.log + + 10MB + ${log.maxHistory:-30} + + + + ${log.pattern} + + UTF-8 + + + + + + + + + + + + + + + + + + + + + + +