ソースを参照

结构调整;添加api文档;

wangchangsheng 2 年 前
コミット
2359846712
57 ファイル変更956 行追加86 行削除
  1. 33 0
      web/backmanagerconfig-xktj/pom.xml
  2. 21 2
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/BackConfigMain.java
  3. 76 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/config/SwagerrConfiguration.java
  4. 8 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/PointGenerateController.java
  5. 17 2
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicCompanyController.java
  6. 6 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicEnergyGroupController.java
  7. 8 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicEquipmentController.java
  8. 8 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicEquipmentPointController.java
  9. 7 1
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicLineController.java
  10. 7 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicMeterPointController.java
  11. 8 1
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicPowerstationController.java
  12. 23 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicPowerstationPointController.java
  13. 6 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicProjectController.java
  14. 6 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicProjectPlanController.java
  15. 6 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicRealtimeDbconfigController.java
  16. 6 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicRegionController.java
  17. 19 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicSquareController.java
  18. 15 10
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicWindsubStationController.java
  19. 6 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicWindturbineController.java
  20. 6 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProEconEquipmentmodelController.java
  21. 6 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProEconManufacturerController.java
  22. 41 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProEconTestingPointController.java
  23. 9 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/StandardpointController.java
  24. 5 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/SttreeControllel.java
  25. 20 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/mapper/auto/ProBasicPowerstationPointMapper.java
  26. 16 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/mapper/auto/ProBasicSquareMapper.java
  27. 2 2
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/mapper/auto/ProBasicWindsubStationMapper.java
  28. 16 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/mapper/auto/ProEconTestingPointMapper.java
  29. 2 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicCompany.java
  30. 2 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicEnergyGroup.java
  31. 3 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicEquipment.java
  32. 2 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicEquipmentPoint.java
  33. 2 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicLine.java
  34. 2 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicMeterPoint.java
  35. 2 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicPowerstation.java
  36. 133 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicPowerstationPoint.java
  37. 2 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicProject.java
  38. 2 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicProjectPlan.java
  39. 2 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicRealtimeDbconfig.java
  40. 2 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicRegion.java
  41. 87 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicSquare.java
  42. 4 2
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicWindsubStation.java
  43. 2 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicWppoint.java
  44. 2 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProEconEquipmentmodel.java
  45. 2 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProEconManufacturer.java
  46. 114 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProEconTestingPoint.java
  47. 2 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/Standardpoint.java
  48. 20 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/IProBasicPowerstationPointService.java
  49. 16 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/IProBasicSquareService.java
  50. 19 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/IProBasicSubStationService.java
  51. 0 20
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/IProBasicWindsubStationService.java
  52. 16 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/IProEconTestingPointService.java
  53. 24 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProBasicPowerstationPointServiceImpl.java
  54. 20 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProBasicSquareServiceImpl.java
  55. 45 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProBasicSubStationServiceImpl.java
  56. 0 46
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProBasicWindsubStationServiceImpl.java
  57. 20 0
      web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProEconTestingPointServiceImpl.java

+ 33 - 0
web/backmanagerconfig-xktj/pom.xml

@@ -68,6 +68,39 @@
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-redis</artifactId>
         </dependency>
+
+        <!-- 添加swagger2 -->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.9.2</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.swagger</groupId>
+                    <artifactId>swagger-annotations</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.swagger</groupId>
+                    <artifactId>swagger-models</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.5.21</version>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>1.5.21</version>
+        </dependency>
+
     </dependencies>
     <build>
         <plugins>

+ 21 - 2
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/BackConfigMain.java

@@ -1,16 +1,35 @@
 package com.gyee.backconfig;
 
 
+import lombok.extern.log4j.Log4j2;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.core.env.Environment;
 
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+@Log4j2
 @SpringBootApplication
 //@EnableDiscoveryClient
 @MapperScan("com.gyee.backconfig.mapper")
 public class BackConfigMain {
 
-    public static void main(String[] args) {
-        SpringApplication.run(BackConfigMain.class,args);
+    public static void main(String[] args) throws UnknownHostException {
+        ConfigurableApplicationContext application = SpringApplication.run(BackConfigMain.class, args);
+
+        Environment env = application.getEnvironment();
+        String ip = InetAddress.getLocalHost().getHostAddress();
+        String port = env.getProperty("server.port");
+        String path = env.getProperty("server.servlet.context-path");
+
+        log.info("\n-------------------------------------------------------------------\n\t" +
+                "后台管理系统启动成功,访问路径如下:\n\t" +
+                "本地路径: \t\thttp://localhost:" + port + path + "\n\t" +
+                "网络地址: \t\thttp://" + ip + ":" + port + path + "\n\t" +
+                "API文档: \t\thttp://" + ip + ":" + port + path + "/swagger-ui.html\n" +
+                "-----------------------------------------------------------------------");
     }
 }

+ 76 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/config/SwagerrConfiguration.java

@@ -0,0 +1,76 @@
+package com.gyee.backconfig.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+/**
+ * Swagger 配置文件
+ * @ClassName: Swagger
+ * @Description: 配置文件
+ * @author gyee
+ * @date 2022年11月10日
+ *
+ */
+@Configuration(value="true")
+@EnableSwagger2 //启动swagger注解 启动服务,浏览器输入"http://localhost:8080/swagger-ui.html"
+public class SwagerrConfiguration implements WebMvcConfigurer {
+
+
+    @Bean
+    public Docket createRestApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                //.host("")
+                // 用来创建该API的基本信息,展示在文档的页面中(自定义展示的信息)
+                .apiInfo(apiInfo())
+                // 设置哪些接口暴露给Swagger展示
+                .select()
+                // 扫描所有有注解的api,用这种方式更灵活
+                .apis(RequestHandlerSelectors.basePackage("com.gyee.backconfig"))
+                // 扫描指定包中的swagger注解
+                //.apis(RequestHandlerSelectors.basePackage("com.gyee.frame.controller"))
+                // 扫描所有 .apis(RequestHandlerSelectors.any())
+                .paths(PathSelectors.any())
+                .build();
+    }
+
+    private ApiInfo apiInfo() {
+        return new ApiInfoBuilder()
+                //设置标题
+                .title("后台管理API文档")
+                //描述
+                .description("后台管理项目")
+                //作者信息
+                //.contact(new Contact(v2Config.getName(), null, V2Config.getEmail_account()))
+                //服务条款URL
+                .termsOfServiceUrl("")
+                //版本
+                .version("版本号:1.0")
+                .build();
+    }
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+
+        // 解决静态资源无法访问
+
+        registry.addResourceHandler("/**").addResourceLocations("classpath:/static/");
+
+        // 解决swagger无法访问
+
+        registry.addResourceHandler("/swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
+
+        // 解决swagger的js文件无法访问
+
+        registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
+
+    }
+}

+ 8 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/PointGenerateController.java

@@ -2,12 +2,18 @@ package com.gyee.backconfig.controller;
 
 import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.service.auto.PointGenerateService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+
+@Api(value = "测点配置" ,tags =  "测点配置")
 @RestController
 @RequestMapping("//generate")
 public class PointGenerateController {
@@ -17,6 +23,8 @@ public class PointGenerateController {
 
 
     @PostMapping(value = "/add")
+    @ApiOperation(value = "生成测点", notes = "生成测点")
+    @ApiImplicitParams({ @ApiImplicitParam(name = "points", value = "统一编码", required = true, dataType = "string[]", paramType = "query")})
     public R addGeneratePoint(@RequestParam(value = "points", required = false) String[] points) {
 
         int code = pointGenerateService.addGeneratePoint(points);

+ 17 - 2
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicCompanyController.java

@@ -7,6 +7,7 @@ import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.ProBasicCompany;
 import com.gyee.backconfig.service.auto.IProBasicCompanyService;
 import com.gyee.common.model.StringUtils;
+import io.swagger.annotations.*;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -22,6 +23,8 @@ import java.util.List;
  * @since 2022-10-15
  */
 @RestController
+@RequestMapping("//pro-basic-company")
+@Api(value = "省公司表配置" ,tags =  "省公司表配置")
 public class ProBasicCompanyController {
     @Resource
     private IProBasicCompanyService proBasicCompanyService;
@@ -37,6 +40,12 @@ public class ProBasicCompanyController {
      * @return
      */
     @GetMapping(value = "/listByPage")
+    @ApiOperation(value = "省公司-列表", notes = "省公司-列表")
+    @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "公司id", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "name", value = "名称", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "aname", value = "别名", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "pageNum", value = "当前页码", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "pageSize", value = "每页大小", required = true, dataType = "string", paramType = "query")})
     public R findList(@RequestParam(value = "id", required = false) String id,
                       @RequestParam(value = "name", required = false) String name,
                       @RequestParam(value = "aname", required = false) String aname,
@@ -57,6 +66,8 @@ public class ProBasicCompanyController {
      * @return
      */
     @GetMapping(value = "/companys/{id}")
+    @ApiOperation(value = "省公司-根据主键查询", notes = "省公司-根据主键查询")
+    @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "公司id", required = false, dataType = "string", paramType = "query")})
     public R findOne(@PathVariable("id") String id) {
         QueryWrapper<ProBasicCompany> qw = new QueryWrapper<>();
         qw.eq("id", id);
@@ -76,7 +87,8 @@ public class ProBasicCompanyController {
      * @return
      */
     @PostMapping(value = "/add-companys")
-    public R addAll(@RequestBody ProBasicCompany company) {
+    @ApiOperation(value = "省公司-新增", notes = "省公司-新增")
+    public R addAll(@ApiParam(name = "company", value = "公司对象", required = true)@RequestBody ProBasicCompany company) {
 
         boolean b = proBasicCompanyService.saveOrUpdate(company);
         if (b) {
@@ -94,6 +106,8 @@ public class ProBasicCompanyController {
      * @return
      */
     @DeleteMapping(value = "/remove-companys/{ids}")
+    @ApiOperation(value = "省公司-删除", notes = "省公司-删除")
+    @ApiImplicitParams({ @ApiImplicitParam(name = "ids", value = "公司id(多条逗号隔开)", required = false, dataType = "string", paramType = "query")})
     public R deleteAll(@PathVariable("ids") String ids) {
         String[] strings = ids.split(",");
 
@@ -114,7 +128,8 @@ public class ProBasicCompanyController {
      * @return
      */
     @PutMapping(value = "/companys")
-    public R update(@RequestBody List<ProBasicCompany> list) {
+    @ApiOperation(value = "省公司-批量修改", notes = "省公司-批量修改")
+    public R update(@ApiParam(name = "list", value = "公司集合", required = true)@RequestBody List<ProBasicCompany> list) {
         boolean b = proBasicCompanyService.updateBatchById(list);
         if (b) {
             return R.ok().data(b);

+ 6 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicEnergyGroupController.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.ProBasicEnergyGroup;
 import com.gyee.backconfig.service.auto.IProBasicEnergyGroupService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -20,6 +22,7 @@ import java.util.Arrays;
  */
 @RestController
 @RequestMapping("//pro-basic-energy-group")
+@Api(value = "集团配置" ,tags =  "集团配置")
 public class ProBasicEnergyGroupController {
     @Resource
     private IProBasicEnergyGroupService proBasicEnergyGroupService;
@@ -34,6 +37,7 @@ public class ProBasicEnergyGroupController {
      * @return
      */
     @GetMapping(value = "/List")
+    @ApiOperation(value = "集团-列表", notes = "集团-列表")
     public R findList(@RequestParam(value = "id", required = false) String id,
                       @RequestParam(value = "name", required = false) String name,
                       @RequestParam(value = "aname", required = false) String aname,
@@ -53,6 +57,7 @@ public class ProBasicEnergyGroupController {
      * @return
      */
     @PostMapping(value = "/add-EnergyGroup")
+    @ApiOperation(value = "集团-新增(修改)", notes = "集团-新增(修改)")
     public R addAll(@RequestBody ProBasicEnergyGroup proBasicEnergyGroup) {
 
         boolean b = proBasicEnergyGroupService.saveOrUpdate(proBasicEnergyGroup);
@@ -69,6 +74,7 @@ public class ProBasicEnergyGroupController {
      * @return
      */
     @DeleteMapping(value = "/remove-EnergyGroup/{ids}")
+    @ApiOperation(value = "集团-删除", notes = "集团-删除")
     public R deleteAll(@PathVariable("ids") String ids) {
         String[] strings = ids.split(",");
         boolean b = proBasicEnergyGroupService.removeByIds(Arrays.asList(strings));

+ 8 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicEquipmentController.java

@@ -6,6 +6,8 @@ import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.ProBasicWppoint;
 import com.gyee.backconfig.service.auto.IProBasicWppointService;
 import com.gyee.common.model.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -21,6 +23,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("//pro-basic-wppoint")
+@Api(value = "场站测点配置" ,tags =  "场站测点配置")
 public class ProBasicEquipmentController {
     @Resource
     private IProBasicWppointService proBasicWppointService;
@@ -38,6 +41,7 @@ public class ProBasicEquipmentController {
      * @return
      */
     @GetMapping(value = "/list")
+    @ApiOperation(value = "场站测点-列表", notes = "场站测点-列表")
     public R findList(@RequestParam(value = "id", required = false) String id,
                       @RequestParam(value = "code", required = false) String code,
                       @RequestParam(value = "name", required = false) String name,
@@ -60,6 +64,7 @@ public class ProBasicEquipmentController {
      * @return
      */
     @GetMapping(value = "/{id}")
+    @ApiOperation(value = "场站测点-更具主键查询", notes = "场站测点-更具主键查询")
     public R findOne(@PathVariable("id") String id) {
 
         ProBasicWppoint pointnew = proBasicWppointService.getOne(id);
@@ -79,6 +84,7 @@ public class ProBasicEquipmentController {
      * @return
      */
     @PostMapping(value = "/add")
+    @ApiOperation(value = "场站测点-新增(修改)", notes = "场站测点-新增(修改)")
     public R addAll(@RequestBody ProBasicWppoint pointnew) {
 
         boolean b = proBasicWppointService.addOrUpdate(pointnew);
@@ -98,6 +104,7 @@ public class ProBasicEquipmentController {
      * @return
      */
     @DeleteMapping(value = "/{ids}")
+    @ApiOperation(value = "场站测点-批量删除", notes = "场站测点-批量删除")
     public R deleteAll(@PathVariable("ids") String ids) {
         boolean b = proBasicWppointService.removeByIds(ids);
         if (b) {
@@ -114,6 +121,7 @@ public class ProBasicEquipmentController {
      * @return
      */
     @PutMapping(value = "/editPointnew")
+    @ApiOperation(value = "场站测点-批量修改", notes = "场站测点-批量修改")
     public R update(@RequestBody List<ProBasicWppoint> list) {
         boolean b = proBasicWppointService.updateBatchById(list);
         if (b) {

+ 8 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicEquipmentPointController.java

@@ -6,6 +6,8 @@ import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.ProBasicEquipmentPoint;
 import com.gyee.backconfig.service.auto.IProBasicEquipmentPointService;
 import com.gyee.common.model.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -21,6 +23,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("//pro-basic-equipment-point")
+@Api(value = "设备测点配置" ,tags =  "设备测点配置")
 public class ProBasicEquipmentPointController {
     @Resource
     private IProBasicEquipmentPointService proBasicEquipmentPointService;
@@ -38,6 +41,7 @@ public class ProBasicEquipmentPointController {
      * @return
      */
     @GetMapping(value = "/list")
+    @ApiOperation(value = "设备测点-列表", notes = "设备测点-列表")
     public R findList(@RequestParam(value = "id", required = false) String id,
                       @RequestParam(value = "code", required = false) String code,
                       @RequestParam(value = "name", required = false) String name,
@@ -61,6 +65,7 @@ public class ProBasicEquipmentPointController {
      * @return
      */
     @GetMapping(value = "/{id}")
+    @ApiOperation(value = "设备测点-列表", notes = "设备测点-列表")
     public R findOne(@PathVariable("id") String id) {
 
         ProBasicEquipmentPoint pointnew = proBasicEquipmentPointService.getOne(id);
@@ -80,6 +85,7 @@ public class ProBasicEquipmentPointController {
      * @return
      */
     @PostMapping(value = "/add")
+    @ApiOperation(value = "设备测点-新增(修改)", notes = "设备测点-新增(修改)")
     public R addAll(@RequestBody ProBasicEquipmentPoint pointnew) {
 
         boolean b = proBasicEquipmentPointService.addOrUpdate(pointnew);
@@ -99,6 +105,7 @@ public class ProBasicEquipmentPointController {
      * @return
      */
     @DeleteMapping(value = "/{ids}")
+    @ApiOperation(value = "设备测点-批量删除", notes = "设备测点-批量删除")
     public R deleteAll(@PathVariable("ids") String ids) {
         boolean b = proBasicEquipmentPointService.removeByIds(ids);
         if (b) {
@@ -115,6 +122,7 @@ public class ProBasicEquipmentPointController {
      * @return
      */
     @PutMapping(value = "/editPointnew")
+    @ApiOperation(value = "设备测点-批量修改", notes = "设备测点-批量修改")
     public R update(@RequestBody List<ProBasicEquipmentPoint> list) {
         boolean b = proBasicEquipmentPointService.updateBatchById(list);
         if (b) {

+ 7 - 1
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicLineController.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.ProBasicLine;
 import com.gyee.backconfig.service.auto.IProBasicLineService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -20,6 +22,7 @@ import java.util.Arrays;
  */
 @RestController
 @RequestMapping("//pro-basic-line")
+@Api(value = "集电线路配置" ,tags =  "集电线路配置")
 public class ProBasicLineController {
     @Resource
     private IProBasicLineService proBasicLineService;
@@ -35,6 +38,7 @@ public class ProBasicLineController {
      * @return
      */
     @GetMapping(value = "/listByPage")
+    @ApiOperation(value = "集电线路-列表", notes = "集电线路-列表")
     public R findList(@RequestParam(value = "id", required = false) String id,
                       @RequestParam(value = "code", required = false) String code,
                       @RequestParam(value = "name", required = false) String name,
@@ -54,8 +58,9 @@ public class ProBasicLineController {
      * @param proBasicLine
      * @return
      */
-    @PostMapping("/add-Line")
+    @PostMapping("/add-line")
     @CrossOrigin(origins = "*", maxAge = 3600)
+    @ApiOperation(value = "集电线路-新增(修改)", notes = "集电线路-新增(修改)")
     public R addModifyProjectPlan(@RequestBody ProBasicLine proBasicLine){
         boolean saveOrUpdate = proBasicLineService.saveOrUpdate(proBasicLine);
         if (saveOrUpdate) {
@@ -71,6 +76,7 @@ public class ProBasicLineController {
      * @return
      */
     @DeleteMapping(value = "/remove-lines/{ids}")
+    @ApiOperation(value = "集电线路-删除", notes = "集电线路-删除")
     public  R deleteAll(@PathVariable("ids") String ids) {
         String[] strings = ids.split(",");
 

+ 7 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicMeterPointController.java

@@ -7,6 +7,8 @@ import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.ProBasicMeterPoint;
 import com.gyee.backconfig.service.auto.IProBasicMeterPointService;
 import com.gyee.common.model.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -22,6 +24,7 @@ import java.util.Arrays;
  */
 @RestController
 @RequestMapping("//pro-basic-meter-point")
+@Api(value = "电计量点表配置" ,tags =  "电计量点表配置")
 public class ProBasicMeterPointController {
     @Resource
     private IProBasicMeterPointService proBasicMeterPointService;
@@ -38,6 +41,7 @@ public class ProBasicMeterPointController {
      * @return
      */
     @GetMapping(value = "/listByPage")
+    @ApiOperation(value = "电计量-列表", notes = "电计量-列表")
     public R findList(@RequestParam(value = "id", required = false) String id,
                       @RequestParam(value = "code", required = false) String code,
                       @RequestParam(value = "windpowerstationId", required = false) String windpowerstationId,
@@ -59,6 +63,7 @@ public class ProBasicMeterPointController {
      * @return
      */
     @GetMapping(value = "/meterpoint/{id}")
+    @ApiOperation(value = "电计量-根据主键查询", notes = "电计量-根据主键查询")
     public R findOne(@PathVariable("id") String id) {
         QueryWrapper<ProBasicMeterPoint> qw = new QueryWrapper<>();
         qw.eq("id", id);
@@ -77,6 +82,7 @@ public class ProBasicMeterPointController {
      * @return
      */
     @PostMapping(value = "/save")
+    @ApiOperation(value = "电计量-新增", notes = "电计量-新增")
     public R addAll(@RequestBody ProBasicMeterPoint meterpoint) {
         boolean b = proBasicMeterPointService.saveOrUpdate(meterpoint);
         if (b) {
@@ -93,6 +99,7 @@ public class ProBasicMeterPointController {
      * @return
      */
     @DeleteMapping(value = "/remove-meterpoint/{ids}")
+    @ApiOperation(value = "电计量-删除", notes = "电计量-删除")
     public R deleteAll(@PathVariable("ids") String ids) {
         String[] strings = ids.split(",");
         boolean b = proBasicMeterPointService.removeByIds(Arrays.asList(strings));

+ 8 - 1
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicPowerstationController.java

@@ -6,6 +6,8 @@ import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.ProBasicPowerstation;
 import com.gyee.backconfig.service.auto.IProBasicPowerstationService;
 import com.gyee.backconfig.vo.WindpowerstationAdmVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -21,7 +23,8 @@ import java.util.List;
  * @since 2022-10-15
  */
 @RestController
-@RequestMapping("//pro-basic-windpowerstation")
+@RequestMapping("//pro-basic-powerstation")
+@Api(value = "场站配置" ,tags =  "场站配置")
 public class ProBasicPowerstationController {
     @Resource
     private IProBasicPowerstationService proBasicWindpowerstationService;
@@ -38,6 +41,7 @@ public class ProBasicPowerstationController {
      * @return
      */
     @GetMapping(value = "/List")
+    @ApiOperation(value = "场站-列表", notes = "场站-列表")
     public R findList(@RequestParam(value = "id", required = false) String id,
                       @RequestParam(value = "name", required = false) String name,
                       @RequestParam(value = "code", required = false) String code,
@@ -60,6 +64,7 @@ public class ProBasicPowerstationController {
      * @return
      */
     @PostMapping(value = "/add")
+    @ApiOperation(value = "场站-新增or修改", notes = "场站-新增or修改")
     public R addAll(@RequestBody ProBasicPowerstation proBasicWindpowerstation) {
 
         boolean b = proBasicWindpowerstationService.saveOrUpdate(proBasicWindpowerstation);
@@ -78,6 +83,7 @@ public class ProBasicPowerstationController {
      * @return
      */
     @DeleteMapping(value = "/{ids}")
+    @ApiOperation(value = "场站-删除", notes = "场站-删除")
     public R deleteAll(@PathVariable("ids") String ids) {
         String[] strings = ids.split(",");
         boolean b = proBasicWindpowerstationService.removeByIds(Arrays.asList(strings));
@@ -97,6 +103,7 @@ public class ProBasicPowerstationController {
      */
     @CrossOrigin(origins = "*", maxAge = 3600)
     @GetMapping(value = "/getAdmList")
+    @ApiOperation(value = "场站-行政管理区域风电场列表", notes = "场站-行政管理区域风电场列表")
     public R getAdmList(
             @RequestParam(value = "id",required = false) String id,
             @RequestParam(value = "regionId",required = false) String regionId,

+ 23 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicPowerstationPointController.java

@@ -0,0 +1,23 @@
+package com.gyee.backconfig.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 场站测点,期次测点,线路测点,三级公司测点,区域测点
+
+
+
++方阵测点 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-10
+ */
+@RestController
+@RequestMapping("//pro-basic-powerstation-point")
+public class ProBasicPowerstationPointController {
+
+}

+ 6 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicProjectController.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.ProBasicProject;
 import com.gyee.backconfig.service.auto.IProBasicProjectService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -20,6 +22,7 @@ import java.util.Arrays;
  */
 @RestController
 @RequestMapping("//pro-basic-project")
+@Api(value = "工程期次表配置" ,tags =  "工程期次表配置")
 public class ProBasicProjectController {
     @Resource
     private IProBasicProjectService proBasicProjectService;
@@ -35,6 +38,7 @@ public class ProBasicProjectController {
      * @return
      */
     @GetMapping(value = "/List")
+    @ApiOperation(value = "工程期次-列表", notes = "工程期次-列表")
     public R findList(@RequestParam(value = "id",required = false) String id,
                       @RequestParam(value = "name",required = false) String name,
                       @RequestParam(value = "code",required = false) String code,
@@ -56,6 +60,7 @@ public class ProBasicProjectController {
      * @return
      */
     @PostMapping(value = "/add")
+    @ApiOperation(value = "工程期次-新增or修改", notes = "工程期次-新增or修改")
     public R addAll(@RequestBody ProBasicProject proBasicProject){
 
         boolean b = proBasicProjectService.saveOrUpdate(proBasicProject);
@@ -73,6 +78,7 @@ public class ProBasicProjectController {
      * @return
      */
     @DeleteMapping(value = "/remove-Project/{ids}")
+    @ApiOperation(value = "工程期次-删除", notes = "工程期次-删除")
     public  R deleteAll(@PathVariable("ids") String ids) {
         String[] strings = ids.split(",");
 

+ 6 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicProjectPlanController.java

@@ -6,6 +6,8 @@ import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.ProBasicProject;
 import com.gyee.backconfig.model.auto.ProBasicProjectPlan;
 import com.gyee.backconfig.service.auto.IProBasicProjectPlanService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -21,6 +23,7 @@ import java.util.Arrays;
  */
 @RestController
 @RequestMapping("//pro-basic-project-plan")
+@Api(value = "工程期次计划电量配置" ,tags =  "工程期次计划电量配置")
 public class ProBasicProjectPlanController {
     @Resource
     private IProBasicProjectPlanService proBasicProjectPlanService;
@@ -35,6 +38,7 @@ public class ProBasicProjectPlanController {
      * @return
      */
     @GetMapping(value = "/List")
+    @ApiOperation(value = "工程计划电量-列表", notes = "工程计划电量-列表")
     public R findList(@RequestParam(value = "id", required = false) String id,
                       @RequestParam(value = "projectId", required = false) String projectId,
                       @RequestParam(value = "windpowerstationId", required = false) String windpowerstationId,
@@ -54,6 +58,7 @@ public class ProBasicProjectPlanController {
      * @return
      */
     @PostMapping(value = "/add")
+    @ApiOperation(value = "工程计划电量-新增or修改", notes = "工程计划电量-新增or修改")
     public R addAll(@RequestBody ProBasicProjectPlan proBasicProjectPlan){
 
         boolean b = proBasicProjectPlanService.saveOrUpdate(proBasicProjectPlan);
@@ -70,6 +75,7 @@ public class ProBasicProjectPlanController {
      * @return
      */
     @DeleteMapping(value = "/remove-ProjectPlan/{ids}")
+    @ApiOperation(value = "工程计划电量-删除", notes = "工程计划电量-删除")
     public  R deleteAll(@PathVariable("ids") String ids) {
         String[] strings = ids.split(",");
 

+ 6 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicRealtimeDbconfigController.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.ProBasicRealtimeDbconfig;
 import com.gyee.backconfig.service.auto.IProBasicRealtimeDbconfigService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -20,6 +22,7 @@ import java.util.Arrays;
  */
 @RestController
 @RequestMapping("//pro-basic-realtime-dbconfig")
+@Api(value = "实时数据库配置" ,tags =  "实时数据库配置")
 public class ProBasicRealtimeDbconfigController {
 
     @Resource
@@ -36,6 +39,7 @@ public class ProBasicRealtimeDbconfigController {
      * @return
      */
     @GetMapping(value = "/listByPage")
+    @ApiOperation(value = "实时数据库配置-列表", notes = "实时数据库配置-列表")
     public R findList(@RequestParam(value = "id", required = false) String id,
                       @RequestParam(value = "surName", required = false) String surName,
                       @RequestParam(value = "windpowerstationId", required = false) String windpowerstationId,
@@ -50,6 +54,7 @@ public class ProBasicRealtimeDbconfigController {
     }
 
     @PostMapping(value = "/save")
+    @ApiOperation(value = "实时数据库配置-新增or修改", notes = "实时数据库配置-邢增or修改")
     public R addAll(@RequestBody ProBasicRealtimeDbconfig proBasicRealtimeDbconfig) {
         boolean b = proBasicRealtimeDbconfigService.saveOrUpdate(proBasicRealtimeDbconfig);
         if (b) {
@@ -60,6 +65,7 @@ public class ProBasicRealtimeDbconfigController {
     }
 
     @DeleteMapping(value = "/remove-Realtime/{ids}")
+    @ApiOperation(value = "实时数据库配置-删除", notes = "实时数据库配置-删除")
     public R deleteAll(@PathVariable("ids") String ids) {
         String[] strings = ids.split(",");
         boolean b = proBasicRealtimeDbconfigService.removeByIds(Arrays.asList(strings));

+ 6 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicRegionController.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.ProBasicRegion;
 import com.gyee.backconfig.service.auto.IProBasicRegionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -20,6 +22,7 @@ import java.util.Arrays;
  */
 @RestController
 @RequestMapping("//pro-basic-region")
+@Api(value = "区域配置" ,tags =  "区域配置")
 public class ProBasicRegionController {
     @Resource
     private IProBasicRegionService proBasicRegionService;
@@ -36,6 +39,7 @@ public class ProBasicRegionController {
      * @return
      */
     @GetMapping(value = "/List")
+    @ApiOperation(value = "区域-列表", notes = "区域-列表")
     public R findList(@RequestParam(value = "id", required = false) String id,
                       @RequestParam(value = "name", required = false) String name,
                       @RequestParam(value = "aname", required = false) String aname,
@@ -57,6 +61,7 @@ public class ProBasicRegionController {
      * @return
      */
     @PostMapping(value = "/save")
+    @ApiOperation(value = "区域-新增or修改", notes = "区域-新增or修改")
     @CrossOrigin(origins = "*", maxAge = 3600)
     public R addAll(@RequestBody ProBasicRegion proBasicRegion) {
 
@@ -69,6 +74,7 @@ public class ProBasicRegionController {
     }
 
     @DeleteMapping(value = "/{ids}")
+    @ApiOperation(value = "区域-删除", notes = "区域-删除")
     public R deleteAll(@PathVariable("ids") String ids) {
         String[] strings = ids.split(",");
         boolean b = proBasicRegionService.removeByIds(Arrays.asList(strings));

+ 19 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicSquareController.java

@@ -0,0 +1,19 @@
+package com.gyee.backconfig.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 方阵 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-10
+ */
+@RestController
+@RequestMapping("//pro-basic-square")
+public class ProBasicSquareController {
+
+}

+ 15 - 10
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicWindsubStationController.java

@@ -4,11 +4,11 @@ package com.gyee.backconfig.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.config.R;
-import com.gyee.backconfig.model.auto.ProBasicMeterPoint;
-import com.gyee.backconfig.model.auto.ProBasicRegion;
-import com.gyee.backconfig.model.auto.ProBasicWindsubStation;
-import com.gyee.backconfig.service.auto.IProBasicWindsubStationService;
+import com.gyee.backconfig.model.auto.ProBasicSubStation;
+import com.gyee.backconfig.service.auto.IProBasicSubStationService;
 import com.gyee.common.model.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -24,17 +24,19 @@ import java.util.Arrays;
  */
 @RestController
 @RequestMapping("//pro-basic-windsub-station")
-public class ProBasicWindsubStationController {
+@Api(value = "变电所配置" ,tags =  "变电所配置")
+public class ProBasicSubStationController {
     @Resource
-    private IProBasicWindsubStationService proBasicWindsubStationService;
+    private IProBasicSubStationService proBasicWindsubStationService;
 
     @GetMapping(value = "/List")
+    @ApiOperation(value = "变电所-列表", notes = "变电所-列表")
     public R findList(@RequestParam(value = "id", required = false) String id,
                       @RequestParam(value = "code", required = false) String code,
                       @RequestParam(value = "name", required = false) String name,
                       @RequestParam(value = "pageNum", required = true) String pageNum,
                       @RequestParam(value = "pageSize", required = true) String pageSize) {
-        IPage<ProBasicWindsubStation> list = proBasicWindsubStationService.list(id, name, code, pageNum, pageSize);
+        IPage<ProBasicSubStation> list = proBasicWindsubStationService.list(id, name, code, pageNum, pageSize);
         if (null != list) {
             return R.ok().data(list);
         } else {
@@ -49,10 +51,11 @@ public class ProBasicWindsubStationController {
      * @return
      */
     @GetMapping(value = "/meterpoint/{id}")
+    @ApiOperation(value = "变电所-根据主键查询", notes = "变电所-根据主键查询")
     public R findOne(@PathVariable("id") String id) {
-        QueryWrapper<ProBasicWindsubStation> qw = new QueryWrapper<>();
+        QueryWrapper<ProBasicSubStation> qw = new QueryWrapper<>();
         qw.eq("id", id);
-        ProBasicWindsubStation Square = proBasicWindsubStationService.getOne(qw);
+        ProBasicSubStation Square = proBasicWindsubStationService.getOne(qw);
         if (StringUtils.isNotNull(Square)) {
             return R.ok().data(Square);
         } else {
@@ -67,7 +70,8 @@ public class ProBasicWindsubStationController {
      * @return
      */
     @PostMapping(value = "/save")
-    public R addAll(@RequestBody ProBasicWindsubStation meterpoint) {
+    @ApiOperation(value = "变电所-新增or修改", notes = "变电所-新增or修改")
+    public R addAll(@RequestBody ProBasicSubStation meterpoint) {
         boolean b = proBasicWindsubStationService.saveOrUpdate(meterpoint);
         if (b) {
             return R.ok().data(b);
@@ -83,6 +87,7 @@ public class ProBasicWindsubStationController {
      * @return
      */
     @DeleteMapping(value = "/remove-WindsubStation/{ids}")
+    @ApiOperation(value = "变电所-删除", notes = "变电所-删除")
     public R deleteAll(@PathVariable("ids") String ids) {
         String[] strings = ids.split(",");
         boolean b = proBasicWindsubStationService.removeByIds(Arrays.asList(strings));

+ 6 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicWindturbineController.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.ProBasicEquipment;
 import com.gyee.backconfig.service.auto.IProBasicEquipmentService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -20,6 +22,7 @@ import java.util.Arrays;
  */
 @RestController
 @RequestMapping("//pro-basic-windturbine")
+@Api(value = "风机配置" ,tags =  "风机配置")
 public class ProBasicWindturbineController {
     @Resource
     private IProBasicEquipmentService proBasicWindturbineService;
@@ -37,6 +40,7 @@ public class ProBasicWindturbineController {
      * @return
      */
     @GetMapping(value = "/list")
+    @ApiOperation(value = "风机-列表", notes = "风机-列表")
     public R findList(@RequestParam(value = "id", required = false) String id,
                       @RequestParam(value = "code", required = false) String code,
                       @RequestParam(value = "windpowerstationId", required = false) String windpowerstationId,
@@ -59,6 +63,7 @@ public class ProBasicWindturbineController {
      * @return
      */
     @PostMapping(value = "/add")
+    @ApiOperation(value = "风机-新增or修改", notes = "风机-新增or修改")
     public R addAll(@RequestBody ProBasicEquipment proBasicWindpowerstation) {
 
         boolean b = proBasicWindturbineService.saveOrUpdate(proBasicWindpowerstation);
@@ -76,6 +81,7 @@ public class ProBasicWindturbineController {
      * @return
      */
     @DeleteMapping(value = "/{ids}")
+    @ApiOperation(value = "风机-删除", notes = "风机-删除")
     public R deleteAll(@PathVariable("ids") String ids) {
         String[] strings = ids.split(",");
         boolean b = proBasicWindturbineService.removeByIds(Arrays.asList(strings));

+ 6 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProEconEquipmentmodelController.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.ProEconEquipmentmodel;
 import com.gyee.backconfig.service.auto.IProEconEquipmentmodelService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -20,6 +22,7 @@ import java.util.Arrays;
  */
 @RestController
 @RequestMapping("//pro-econ-equipmentmodel")
+@Api(value = "设备型号配置" ,tags =  "设备型号配置")
 public class ProEconEquipmentmodelController {
     @Resource
     private IProEconEquipmentmodelService proEconEquipmentmodelService;
@@ -34,6 +37,7 @@ public class ProEconEquipmentmodelController {
      * @return
      */
     @GetMapping(value = "/list")
+    @ApiOperation(value = "设备型号-列表", notes = "设备型号-列表")
     public R findList(@RequestParam(value = "id", required = false) String id,
                       @RequestParam(value = "code", required = false) String code,
                       @RequestParam(value = "name", required = false) String name,
@@ -53,6 +57,7 @@ public class ProEconEquipmentmodelController {
      * @return
      */
     @PostMapping(value = "/add")
+    @ApiOperation(value = "设备型号-新增or修改", notes = "设备型号-新增or修改")
     public R addAll(@RequestBody ProEconEquipmentmodel proEconEquipmentmodel) {
 
         boolean b = proEconEquipmentmodelService.saveOrUpdate(proEconEquipmentmodel);
@@ -69,6 +74,7 @@ public class ProEconEquipmentmodelController {
      * @return
      */
     @DeleteMapping(value = "/{ids}")
+    @ApiOperation(value = "设备型号-新增or修改", notes = "设备型号-新增or修改")
     public R deleteAll(@PathVariable("ids") String ids) {
         String[] strings = ids.split(",");
         boolean b = proEconEquipmentmodelService.removeByIds(Arrays.asList(strings));

+ 6 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProEconManufacturerController.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.ProEconManufacturer;
 import com.gyee.backconfig.service.auto.IProEconManufacturerService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -20,11 +22,13 @@ import java.util.Arrays;
  */
 @RestController
 @RequestMapping("//pro-econ-manufacturer")
+@Api(value = "设备厂商配置" ,tags =  "设备厂商配置")
 public class ProEconManufacturerController {
     @Resource
     private IProEconManufacturerService proEconManufacturerService;
 
     @GetMapping(value = "/list")
+    @ApiOperation(value = "设备厂商-列表", notes = "设备厂商-列表")
     public R findList(@RequestParam(value = "id", required = false) String id,
                       @RequestParam(value = "name", required = false) String name,
                       @RequestParam(value = "pageNum", required = true) String pageNum,
@@ -42,6 +46,7 @@ public class ProEconManufacturerController {
      * @return
      */
     @PostMapping(value = "/add")
+    @ApiOperation(value = "设备厂商-新增or修改", notes = "设备厂商-新增or修改")
     public R addAll(@RequestBody ProEconManufacturer proEconManufacturer) {
 
         boolean b = proEconManufacturerService.saveOrUpdate(proEconManufacturer);
@@ -58,6 +63,7 @@ public class ProEconManufacturerController {
      * @return
      */
     @DeleteMapping(value = "/{ids}")
+    @ApiOperation(value = "设备厂商-删除", notes = "设备厂商-删除")
     public R deleteAll(@PathVariable("ids") String ids) {
         String[] strings = ids.split(",");
         boolean b = proEconManufacturerService.removeByIds(Arrays.asList(strings));

+ 41 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProEconTestingPointController.java

@@ -0,0 +1,41 @@
+package com.gyee.backconfig.controller;
+
+
+import com.gyee.backconfig.config.R;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 逻辑测点 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-10
+ */
+@Api(value = "逻辑测点配置" ,tags =  "逻辑测点配置")
+@RestController
+@RequestMapping("//pro-econ-testing-point")
+public class ProEconTestingPointController {
+
+    @PostMapping(value = "/add")
+    @ApiOperation(value = "生成测点", notes = "生成测点")
+    @ApiImplicitParams({ @ApiImplicitParam(name = "points", value = "统一编码", required = true, dataType = "string[]", paramType = "query")})
+    public R addGeneratePoint(@RequestParam(value = "points", required = false) String[] points) {
+
+        int code =0;// pointGenerateService.addGeneratePoint(points);
+
+        if (code > 0) {
+            return R.ok();
+        } else {
+            return R.ok().data("插入失败" + code + "条测点");
+        }
+    }
+
+}

+ 9 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/StandardpointController.java

@@ -6,6 +6,8 @@ import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.Standardpoint;
 import com.gyee.backconfig.service.auto.IStandardpointService;
 import com.gyee.common.model.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -21,6 +23,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("//standardpoint")
+@Api(value = "标准点配置" ,tags =  "标准点配置")
 public class StandardpointController {
     @Resource
     private IStandardpointService standardpointService;
@@ -36,6 +39,7 @@ public class StandardpointController {
      * @return
      */
     @GetMapping(value = "/list")
+    @ApiOperation(value = "标准点配置-列表", notes = "标准点配置-列表")
     public R findList(@RequestParam(value = "id", required = false) String id,
                       @RequestParam(value = "uniformcode", required = false) String uniformcode,
                       @RequestParam(value = "name", required = false) String name,
@@ -58,6 +62,7 @@ public class StandardpointController {
      * @return
      */
     @GetMapping(value = "/{id}")
+    @ApiOperation(value = "标准点配置-根据主键查询", notes = "标准点配置-根据主键查询")
     public R findOne(@PathVariable("id") String id) {
 
         Standardpoint standardpoint = standardpointService.getOne(id);
@@ -77,6 +82,7 @@ public class StandardpointController {
      * @return
      */
     @PostMapping(value = "/add")
+    @ApiOperation(value = "标准点配置-新增or修改", notes = "标准点配置-新增or修改")
     public R addAll(@RequestBody Standardpoint standardpoint) {
 
         boolean b = standardpointService.addOrUpdate(standardpoint);
@@ -96,6 +102,7 @@ public class StandardpointController {
      * @return
      */
     @DeleteMapping(value = "/{ids}")
+    @ApiOperation(value = "标准点配置-删除", notes = "标准点配置-删除")
     public R deleteAll(@PathVariable("ids") String ids) {
         boolean b = standardpointService.removeByIds(ids);
         if (b) {
@@ -112,6 +119,7 @@ public class StandardpointController {
      * @return
      */
     @PutMapping(value = "/editStandardpoint")
+    @ApiOperation(value = "标准点配置-修改", notes = "标准点配置-修改")
     public R update(@RequestBody List<Standardpoint> list) {
         boolean b = standardpointService.updateBatchById(list);
         if (b) {
@@ -130,6 +138,7 @@ public class StandardpointController {
      * @return
      */
     @GetMapping(value = "/pointcode")
+    @ApiOperation(value = "设备厂商-列表", notes = "设备厂商-列表")
     public R findList(
             @RequestParam(value = "type", required = false) String type) {
         String code = standardpointService.getPointCode(type);

+ 5 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/SttreeControllel.java

@@ -5,6 +5,8 @@ import com.gyee.backconfig.model.auto.ProBasicEnergyGroup;
 import com.gyee.backconfig.model.auto.ProBasicRegion;
 import com.gyee.backconfig.service.auto.SttreeService;
 import com.gyee.common.model.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -15,6 +17,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("//sttree")
+@Api(value = "组织结构树" ,tags =  "组织结构树")
 public class SttreeControllel {
     @Resource
     private SttreeService sttreeService;
@@ -28,6 +31,7 @@ public class SttreeControllel {
     @GetMapping(value = "/energytreels")
     @ResponseBody
     @CrossOrigin(origins = "*", maxAge = 3600)
+    @ApiOperation(value = "集团组织结构树-集团层级树", notes = "集团组织结构树-集团层级树")
     public R wtls(String tag) {
         List<ProBasicEnergyGroup> resultList = sttreeService.energytree(tag);
         if (StringUtils.isNotNull(resultList)) {
@@ -45,6 +49,7 @@ public class SttreeControllel {
     @GetMapping(value = "/regiontreels")
     @ResponseBody
     @CrossOrigin(origins = "*", maxAge = 3600)
+    @ApiOperation(value = "区域组织结构树-集团层级树", notes = "区域组织结构树-集团层级树")
     public R rels(String tag) {
         List<ProBasicRegion> resultList = sttreeService.Regiontree(tag);
         if (StringUtils.isNotNull(resultList)) {

+ 20 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/mapper/auto/ProBasicPowerstationPointMapper.java

@@ -0,0 +1,20 @@
+package com.gyee.backconfig.mapper.auto;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.backconfig.model.auto.ProBasicPowerstationPoint;
+
+/**
+ * <p>
+ * 场站测点,期次测点,线路测点,三级公司测点,区域测点
+
+
+
++方阵测点 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-10
+ */
+public interface ProBasicPowerstationPointMapper extends BaseMapper<ProBasicPowerstationPoint> {
+
+}

+ 16 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/mapper/auto/ProBasicSquareMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.backconfig.mapper.auto;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.backconfig.model.auto.ProBasicSquare;
+
+/**
+ * <p>
+ * 方阵 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-10
+ */
+public interface ProBasicSquareMapper extends BaseMapper<ProBasicSquare> {
+
+}

+ 2 - 2
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/mapper/auto/ProBasicWindsubStationMapper.java

@@ -1,6 +1,6 @@
 package com.gyee.backconfig.mapper.auto;
 
-import com.gyee.backconfig.model.auto.ProBasicWindsubStation;
+import com.gyee.backconfig.model.auto.ProBasicSubStation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author wang
  * @since 2022-10-15
  */
-public interface ProBasicWindsubStationMapper extends BaseMapper<ProBasicWindsubStation> {
+public interface ProBasicSubStationMapper extends BaseMapper<ProBasicSubStation> {
 
 }

+ 16 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/mapper/auto/ProEconTestingPointMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.backconfig.mapper.auto;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.backconfig.model.auto.ProEconTestingPoint;
+
+/**
+ * <p>
+ * 逻辑测点 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-10
+ */
+public interface ProEconTestingPointMapper extends BaseMapper<ProEconTestingPoint> {
+
+}

+ 2 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicCompany.java

@@ -6,6 +6,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -19,6 +20,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "省公司表-ProBasicCompany", description = "省公司表")
 public class ProBasicCompany extends Model {
 
     private static final long serialVersionUID = 1L;

+ 2 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicEnergyGroup.java

@@ -6,6 +6,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -19,6 +20,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "集团对象-ProBasicEnergyGroup", description = "集团对象")
 public class ProBasicEnergyGroup extends Model {
 
     private static final long serialVersionUID = 1L;

+ 3 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicEquipment.java

@@ -3,6 +3,8 @@ package com.gyee.backconfig.model.auto;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.time.LocalDate;
+
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -16,6 +18,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "风机&光伏-ProBasicEquipment", description = "风机&光伏")
 public class ProBasicEquipment extends Model {
 
     private static final long serialVersionUID = 1L;

+ 2 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicEquipmentPoint.java

@@ -2,6 +2,7 @@ package com.gyee.backconfig.model.auto;
 
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -15,6 +16,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "设备测点-ProBasicEquipmentPoint", description = "设备测点")
 public class ProBasicEquipmentPoint extends Model {
 
     private static final long serialVersionUID = 1L;

+ 2 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicLine.java

@@ -6,6 +6,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -19,6 +20,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "集电线路-ProBasicLine", description = "集电线路")
 public class ProBasicLine extends Model {
 
     private static final long serialVersionUID = 1L;

+ 2 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicMeterPoint.java

@@ -2,6 +2,7 @@ package com.gyee.backconfig.model.auto;
 
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -15,6 +16,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "电计量点表-ProBasicMeterPoint", description = "电计量点表")
 public class ProBasicMeterPoint extends Model {
 
     private static final long serialVersionUID = 1L;

+ 2 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicPowerstation.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -21,6 +22,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "场站表-ProBasicPowerstation", description = "场站表")
 public class ProBasicPowerstation extends Model {
 
     private static final long serialVersionUID = 1L;

+ 133 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicPowerstationPoint.java

@@ -0,0 +1,133 @@
+package com.gyee.backconfig.model.auto;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 场站测点,期次测点,线路测点,三级公司测点,区域测点
+
+
+
++方阵测点
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProBasicPowerstationPoint extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String nemCode;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 实时库名称
+     */
+    private String aname;
+
+    /**
+     * 型号
+     */
+    private String model;
+
+    /**
+     * 单位
+     */
+    private String valueUnit;
+
+    /**
+     * 英文名称
+     */
+    private String englishName;
+
+    /**
+     * 类型编号
+     */
+    private String typeId;
+
+    /**
+     * 所属型号
+     */
+    private String modelId;
+
+    /**
+     * 最大值
+     */
+    private BigDecimal maxval;
+
+    /**
+     * 最小值
+     */
+    private BigDecimal minval;
+
+    /**
+     * 合理最大值
+     */
+    private BigDecimal reasonableMaxval;
+
+    /**
+     * 合理最小值
+     */
+    private BigDecimal reasonableMinval;
+
+    /**
+     * 统一编码
+     */
+    private String uniformCode;
+
+    /**
+     * 短ID
+     */
+    private String shortId;
+
+    /**
+     * 长ID
+     */
+    private String longId;
+
+    /**
+     * 场站编号
+     */
+    private String windpowerstationId;
+
+    /**
+     * 实时配置编号
+     */
+    private String realtimeId;
+
+    /**
+     * 集团测点编号
+     */
+    private String groupPointId;
+
+    /**
+     * 具体名称
+     */
+    private String specificName;
+
+    /**
+     * 系数
+     */
+    private BigDecimal coefficient;
+
+
+}

+ 2 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicProject.java

@@ -10,6 +10,7 @@ import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -23,6 +24,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "工程表-ProBasicProject", description = "工程表")
 public class ProBasicProject extends Model {
     private static final long serialVersionUID = 1L;
 

+ 2 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicProjectPlan.java

@@ -2,6 +2,7 @@ package com.gyee.backconfig.model.auto;
 
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -15,6 +16,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "工程计划电量表-ProBasicProjectPlan", description = "工程计划电量表")
 public class ProBasicProjectPlan extends Model {
 
     private static final long serialVersionUID = 1L;

+ 2 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicRealtimeDbconfig.java

@@ -1,6 +1,7 @@
 package com.gyee.backconfig.model.auto;
 
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -14,6 +15,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "实时数据库配置表-ProBasicRealtimeDbconfig", description = "实时数据库配置表")
 public class ProBasicRealtimeDbconfig extends Model {
 
     private static final long serialVersionUID = 1L;

+ 2 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicRegion.java

@@ -6,6 +6,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -19,6 +20,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "区域-ProBasicRegion", description = "区域")
 public class ProBasicRegion extends Model {
 
     private static final long serialVersionUID = 1L;

+ 87 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicSquare.java

@@ -0,0 +1,87 @@
+package com.gyee.backconfig.model.auto;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 方阵
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProBasicSquare extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String nemCode;
+
+    /**
+     * 风场编号(冗余)
+     */
+    private String windpowerstationId;
+
+    /**
+     * 工程编号(冗余)
+     */
+    private String projectId;
+
+    /**
+     * 风电线编号
+     */
+    private String lineId;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 别名
+     */
+    private String aname;
+
+    /**
+     * 接入类型
+     */
+    private String types;
+
+    /**
+     * 是否可用
+     */
+    private Integer isAble;
+
+    /**
+     * 备用1
+     */
+    private String spare1;
+
+    /**
+     * 备用2
+     */
+    private String spare2;
+
+    /**
+     * 备用3
+     */
+    private String spare3;
+
+    /**
+     * 备用4
+     */
+    private String spare4;
+
+
+}

+ 4 - 2
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicWindsubStation.java

@@ -3,6 +3,7 @@ package com.gyee.backconfig.model.auto;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -16,7 +17,8 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ProBasicWindsubStation extends Model {
+@ApiModel(value = "变电所-ProBasicWindsubStation", description = "变电所")
+public class ProBasicSubStation extends Model {
 
     private static final long serialVersionUID = 1L;
 
@@ -29,7 +31,7 @@ public class ProBasicWindsubStation extends Model {
     /**
      * 编码
      */
-    private String code;
+    private String nemCode;
 
     /**
      * 名称

+ 2 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicWppoint.java

@@ -2,6 +2,7 @@ package com.gyee.backconfig.model.auto;
 
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -19,6 +20,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "方阵测点-ProBasicWppoint", description = "方阵测点")
 public class ProBasicWppoint extends Model {
 
     private static final long serialVersionUID = 1L;

+ 2 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProEconEquipmentmodel.java

@@ -5,6 +5,7 @@ import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -18,6 +19,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "设备型号-ProEconEquipmentmodel", description = "设备型号")
 public class ProEconEquipmentmodel extends Model {
 
     private static final long serialVersionUID = 1L;

+ 2 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProEconManufacturer.java

@@ -3,6 +3,7 @@ package com.gyee.backconfig.model.auto;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -16,6 +17,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "设备厂商-ProEconManufacturer", description = "设备厂商")
 public class ProEconManufacturer extends Model {
 
     private static final long serialVersionUID = 1L;

+ 114 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProEconTestingPoint.java

@@ -0,0 +1,114 @@
+package com.gyee.backconfig.model.auto;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 逻辑测点
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconTestingPoint extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String nemCode;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 型号
+     */
+    private String model;
+
+    /**
+     * 单位
+     */
+    private String valueUnit;
+
+    /**
+     * 英文名称
+     */
+    private String englishName;
+
+    /**
+     * 类型编号
+     */
+    private String typeId;
+
+    /**
+     * 最大值
+     */
+    private BigDecimal maxval;
+
+    /**
+     * 最小值
+     */
+    private BigDecimal minval;
+
+    /**
+     * 合理最大值
+     */
+    private BigDecimal reasonableMaxval;
+
+    /**
+     * 合理最小值
+     */
+    private BigDecimal reasonableMinval;
+
+    /**
+     * 统一编码
+     */
+    private String uniformCode;
+
+    /**
+     * 部件编号
+     */
+    private String logicalUnitId;
+
+    /**
+     * 是否显示
+     */
+    private Integer isDisplay;
+
+    /**
+     * 备用1
+     */
+    private String spare1;
+
+    /**
+     * 备用2
+     */
+    private String spare2;
+
+    /**
+     * 备用3
+     */
+    private String spare3;
+
+    /**
+     * 备用4
+     */
+    private String spare4;
+
+
+}

+ 2 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/Standardpoint.java

@@ -1,6 +1,7 @@
 package com.gyee.backconfig.model.auto;
 
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -14,6 +15,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "标准点-Standardpoint", description = "标准点")
 public class Standardpoint extends Model {
 
     private static final long serialVersionUID = 1L;

+ 20 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/IProBasicPowerstationPointService.java

@@ -0,0 +1,20 @@
+package com.gyee.backconfig.service.auto;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.backconfig.model.auto.ProBasicPowerstationPoint;
+
+/**
+ * <p>
+ * 场站测点,期次测点,线路测点,三级公司测点,区域测点
+
+
+
++方阵测点 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-10
+ */
+public interface IProBasicPowerstationPointService extends IService<ProBasicPowerstationPoint> {
+
+}

+ 16 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/IProBasicSquareService.java

@@ -0,0 +1,16 @@
+package com.gyee.backconfig.service.auto;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.backconfig.model.auto.ProBasicSquare;
+
+/**
+ * <p>
+ * 方阵 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-10
+ */
+public interface IProBasicSquareService extends IService<ProBasicSquare> {
+
+}

+ 19 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/IProBasicSubStationService.java

@@ -0,0 +1,19 @@
+package com.gyee.backconfig.service.auto;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.model.auto.ProBasicSubStation;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 变电所 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-10-15
+ */
+public interface IProBasicSubStationService extends IService<ProBasicSubStation> {
+    IPage<ProBasicSubStation> list(String id, String name, String code, String pageNum, String pageSize);
+
+
+}

+ 0 - 20
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/IProBasicWindsubStationService.java

@@ -1,20 +0,0 @@
-package com.gyee.backconfig.service.auto;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gyee.backconfig.model.auto.ProBasicRegion;
-import com.gyee.backconfig.model.auto.ProBasicWindsubStation;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 变电所 服务类
- * </p>
- *
- * @author wang
- * @since 2022-10-15
- */
-public interface IProBasicWindsubStationService extends IService<ProBasicWindsubStation> {
-    IPage<ProBasicWindsubStation> list(String id, String name, String code,String pageNum, String pageSize);
-
-
-}

+ 16 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/IProEconTestingPointService.java

@@ -0,0 +1,16 @@
+package com.gyee.backconfig.service.auto;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.backconfig.model.auto.ProEconTestingPoint;
+
+/**
+ * <p>
+ * 逻辑测点 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-10
+ */
+public interface IProEconTestingPointService extends IService<ProEconTestingPoint> {
+
+}

+ 24 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProBasicPowerstationPointServiceImpl.java

@@ -0,0 +1,24 @@
+package com.gyee.backconfig.service.auto.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.backconfig.mapper.auto.ProBasicPowerstationPointMapper;
+import com.gyee.backconfig.model.auto.ProBasicPowerstationPoint;
+import com.gyee.backconfig.service.auto.IProBasicPowerstationPointService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 场站测点,期次测点,线路测点,三级公司测点,区域测点
+
+
+
++方阵测点 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-10
+ */
+@Service
+public class ProBasicPowerstationPointServiceImpl extends ServiceImpl<ProBasicPowerstationPointMapper, ProBasicPowerstationPoint> implements IProBasicPowerstationPointService {
+
+}

+ 20 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProBasicSquareServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.backconfig.service.auto.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.backconfig.mapper.auto.ProBasicSquareMapper;
+import com.gyee.backconfig.model.auto.ProBasicSquare;
+import com.gyee.backconfig.service.auto.IProBasicSquareService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 方阵 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-10
+ */
+@Service
+public class ProBasicSquareServiceImpl extends ServiceImpl<ProBasicSquareMapper, ProBasicSquare> implements IProBasicSquareService {
+
+}

+ 45 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProBasicSubStationServiceImpl.java

@@ -0,0 +1,45 @@
+package com.gyee.backconfig.service.auto.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gyee.backconfig.model.auto.ProBasicSubStation;
+import com.gyee.backconfig.mapper.auto.ProBasicSubStationMapper;
+import com.gyee.backconfig.service.auto.IProBasicSubStationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.common.model.StringUtils;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 变电所 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-10-15
+ */
+@Service
+public class ProBasicSubStationServiceImpl extends ServiceImpl<ProBasicSubStationMapper, ProBasicSubStation> implements IProBasicSubStationService {
+
+    @Override
+    public IPage<ProBasicSubStation> list(String id, String name, String code, String pageNum, String pageSize) {
+        QueryWrapper<ProBasicSubStation> qw = new QueryWrapper<>();
+
+        if (StringUtils.isNotEmpty(id)){
+            qw.eq("id",id);
+        }
+
+        if (StringUtils.isNotEmpty(name)){
+            qw.eq("name",name);
+        }
+
+        if (StringUtils.isNotEmpty(code)){
+            qw.like("code",code);
+        }
+
+
+        Page<ProBasicSubStation> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        IPage<ProBasicSubStation> pageData = baseMapper.selectPage(page, qw);
+        return pageData;
+    }
+}

+ 0 - 46
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProBasicWindsubStationServiceImpl.java

@@ -1,46 +0,0 @@
-package com.gyee.backconfig.service.auto.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gyee.backconfig.model.auto.ProBasicRegion;
-import com.gyee.backconfig.model.auto.ProBasicWindsubStation;
-import com.gyee.backconfig.mapper.auto.ProBasicWindsubStationMapper;
-import com.gyee.backconfig.service.auto.IProBasicWindsubStationService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gyee.common.model.StringUtils;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 变电所 服务实现类
- * </p>
- *
- * @author wang
- * @since 2022-10-15
- */
-@Service
-public class ProBasicWindsubStationServiceImpl extends ServiceImpl<ProBasicWindsubStationMapper, ProBasicWindsubStation> implements IProBasicWindsubStationService {
-
-    @Override
-    public IPage<ProBasicWindsubStation> list(String id, String name, String code, String pageNum, String pageSize) {
-        QueryWrapper<ProBasicWindsubStation> qw = new QueryWrapper<>();
-
-        if (StringUtils.isNotEmpty(id)){
-            qw.eq("id",id);
-        }
-
-        if (StringUtils.isNotEmpty(name)){
-            qw.eq("name",name);
-        }
-
-        if (StringUtils.isNotEmpty(code)){
-            qw.like("code",code);
-        }
-
-
-        Page<ProBasicWindsubStation> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
-        IPage<ProBasicWindsubStation> pageData = baseMapper.selectPage(page, qw);
-        return pageData;
-    }
-}

+ 20 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProEconTestingPointServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.backconfig.service.auto.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.backconfig.mapper.auto.ProEconTestingPointMapper;
+import com.gyee.backconfig.model.auto.ProEconTestingPoint;
+import com.gyee.backconfig.service.auto.IProEconTestingPointService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 逻辑测点 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-10
+ */
+@Service
+public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPointMapper, ProEconTestingPoint> implements IProEconTestingPointService {
+
+}