From 9b15da3af97c9c627a039b2cfe2784df8e85c1bf Mon Sep 17 00:00:00 2001 From: du <1725534722@qq.com> Date: Fri, 16 Aug 2024 09:03:19 +0800 Subject: [PATCH] yunkunmap --- pom.xml | 1 - ruoyi-admin/pom.xml | 34 ++- .../main/java/com/ruoyi/RuoYiApplication.java | 33 ++- .../ruoyi/web/core/config/SwaggerConfig.java | 250 +++++++++--------- .../ykmap/controller/LineController.java | 82 ++++++ .../ykmap/controller/YxlglController.java | 98 +++++++ .../ykmap/controller/YywtzController.java | 100 +++++++ .../ykmap/controller/YywzlController.java | 96 +++++++ .../java/com/ruoyi/ykmap/entity/Yxlgl.java | 92 +++++++ .../java/com/ruoyi/ykmap/entity/Yywtz.java | 72 +++++ .../java/com/ruoyi/ykmap/entity/Yywzl.java | 82 ++++++ .../ykmap/entity/request/YxlglRequest.java | 21 ++ .../ykmap/entity/response/EquipResponse.java | 27 ++ .../entity/response/GetCarIdInfoResponse.java | 40 +++ .../ykmap/entity/response/ItemsResponse.java | 18 ++ .../entity/response/LineTemplateResponse.java | 57 ++++ .../response/SearchCityCountResponse.java | 21 ++ .../entity/response/SearchCityResponse.java | 33 +++ .../response/SelectLineInfoResponse.java | 28 ++ .../entity/response/UserInfoResponse.java | 33 +++ .../com/ruoyi/ykmap/mapper/LineMapper.java | 56 ++++ .../com/ruoyi/ykmap/mapper/YxlglMapper.java | 25 ++ .../com/ruoyi/ykmap/mapper/YywtzMapper.java | 22 ++ .../com/ruoyi/ykmap/mapper/YywzlMapper.java | 25 ++ .../com/ruoyi/ykmap/service/LineService.java | 55 ++++ .../com/ruoyi/ykmap/service/YxlglService.java | 25 ++ .../com/ruoyi/ykmap/service/YywtzService.java | 24 ++ .../com/ruoyi/ykmap/service/YywzlService.java | 25 ++ .../ykmap/service/impl/LineServiceImpl.java | 125 +++++++++ .../ykmap/service/impl/YxlglServiceImpl.java | 31 +++ .../ykmap/service/impl/YywtzServiceImpl.java | 32 +++ .../ykmap/service/impl/YywzlServiceImpl.java | 33 +++ .../src/main/resources/application-druid.yml | 19 +- .../src/main/resources/application.yml | 17 +- .../src/main/resources/mapper/LineMapper.xml | 77 ++++++ .../src/main/resources/mapper/YxlglMapper.xml | 15 ++ .../src/main/resources/mapper/YywtzMapper.xml | 10 + .../src/main/resources/mapper/YywzlMapper.xml | 10 + ruoyi-common/pom.xml | 6 +- .../ruoyi/framework/config/MyBatisConfig.java | 32 +-- .../framework/config/SecurityConfig.java | 2 + 41 files changed, 1703 insertions(+), 181 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/ykmap/controller/LineController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/ykmap/controller/YxlglController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/ykmap/controller/YywtzController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/ykmap/controller/YywzlController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/Yxlgl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/Yywtz.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/Yywzl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/request/YxlglRequest.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/response/EquipResponse.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/response/GetCarIdInfoResponse.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/response/ItemsResponse.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/response/LineTemplateResponse.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/response/SearchCityCountResponse.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/response/SearchCityResponse.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/response/SelectLineInfoResponse.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/response/UserInfoResponse.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/ykmap/mapper/LineMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/ykmap/mapper/YxlglMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/ykmap/mapper/YywtzMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/ykmap/mapper/YywzlMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/ykmap/service/LineService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/ykmap/service/YxlglService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/ykmap/service/YywtzService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/ykmap/service/YywzlService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/ykmap/service/impl/LineServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/ykmap/service/impl/YxlglServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/ykmap/service/impl/YywtzServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/ykmap/service/impl/YywzlServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/LineMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/YxlglMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/YywtzMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/YywzlMapper.xml diff --git a/pom.xml b/pom.xml index 75712eb..f2f76be 100644 --- a/pom.xml +++ b/pom.xml @@ -132,7 +132,6 @@ fastjson2 ${fastjson.version} - io.jsonwebtoken diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 88dc045..f81fbe9 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -16,7 +16,17 @@ + + cn.hutool + hutool-all + 5.8.23 + + + com.github.xiaoymin + knife4j-openapi2-spring-boot-starter + 4.4.0 + org.springframework.boot @@ -25,18 +35,26 @@ - - io.springfox - springfox-boot-starter - + + + + + + + + + - io.swagger - swagger-models - 1.6.2 + org.postgresql + postgresql + 42.6.0 + + + org.projectlombok + lombok - mysql diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java index 32eb6f1..8814a68 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java @@ -3,6 +3,11 @@ package com.ruoyi; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.core.env.Environment; + +import java.net.InetAddress; +import java.net.UnknownHostException; /** * 启动程序 @@ -14,17 +19,21 @@ public class RuoYiApplication { public static void main(String[] args) { - // System.setProperty("spring.devtools.restart.enabled", "false"); - SpringApplication.run(RuoYiApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 若依启动成功 ლ(´ڡ`ლ)ﾞ \n" + - " .-------. ____ __ \n" + - " | _ _ \\ \\ \\ / / \n" + - " | ( ' ) | \\ _. / ' \n" + - " |(_ o _) / _( )_ .' \n" + - " | (_,_).' __ ___(_ o _)' \n" + - " | |\\ \\ | || |(_,_)' \n" + - " | | \\ `' /| `-' / \n" + - " | | \\ / \\ / \n" + - " ''-' `'-' `-..-' "); + ConfigurableApplicationContext application = SpringApplication.run(RuoYiApplication.class, args); + Environment env = application.getEnvironment(); + String ip; + try { + ip = InetAddress.getLocalHost().getHostAddress(); + } catch (UnknownHostException e) { + throw new RuntimeException(e); + } + String port = env.getProperty("server.port"); + String path = env.getProperty("server.servlet.context-path"); + path = path.isEmpty() ? "" : path; + System.out.println("\n----------------------------------------------------------\n\t" + + "Application is running! Access URLs:\n\t" + + "swagger-ui: http://localhost:" + port + path + "doc.html\n\t" + + "swagger-ui: http://" + ip + ":" + port + path + "doc.html\n\t" + + "----------------------------------------------------------"); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java index ae1c3ec..5db7e77 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java @@ -1,125 +1,125 @@ -package com.ruoyi.web.core.config; - -import java.util.ArrayList; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import com.ruoyi.common.config.RuoYiConfig; -import io.swagger.annotations.ApiOperation; -import io.swagger.models.auth.In; -import springfox.documentation.builders.ApiInfoBuilder; -import springfox.documentation.builders.PathSelectors; -import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.service.ApiInfo; -import springfox.documentation.service.ApiKey; -import springfox.documentation.service.AuthorizationScope; -import springfox.documentation.service.Contact; -import springfox.documentation.service.SecurityReference; -import springfox.documentation.service.SecurityScheme; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spi.service.contexts.SecurityContext; -import springfox.documentation.spring.web.plugins.Docket; - -/** - * Swagger2的接口配置 - * - * @author ruoyi - */ -@Configuration -public class SwaggerConfig -{ - /** 系统基础配置 */ - @Autowired - private RuoYiConfig ruoyiConfig; - - /** 是否开启swagger */ - @Value("${swagger.enabled}") - private boolean enabled; - - /** 设置请求的统一前缀 */ - @Value("${swagger.pathMapping}") - private String pathMapping; - - /** - * 创建API - */ - @Bean - public Docket createRestApi() - { - return new Docket(DocumentationType.OAS_30) - // 是否启用Swagger - .enable(enabled) - // 用来创建该API的基本信息，展示在文档的页面中（自定义展示的信息） - .apiInfo(apiInfo()) - // 设置哪些接口暴露给Swagger展示 - .select() - // 扫描所有有注解的api，用这种方式更灵活 - .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)) - // 扫描指定包中的swagger注解 - // .apis(RequestHandlerSelectors.basePackage("com.ruoyi.project.tool.swagger")) - // 扫描所有 .apis(RequestHandlerSelectors.any()) - .paths(PathSelectors.any()) - .build() - /* 设置安全模式，swagger可以设置访问token */ - .securitySchemes(securitySchemes()) - .securityContexts(securityContexts()) - .pathMapping(pathMapping); - } - - /** - * 安全模式，这里指定token通过Authorization头请求头传递 - */ - private List securitySchemes() - { - List apiKeyList = new ArrayList(); - apiKeyList.add(new ApiKey("Authorization", "Authorization", In.HEADER.toValue())); - return apiKeyList; - } - - /** - * 安全上下文 - */ - private List securityContexts() - { - List securityContexts = new ArrayList<>(); - securityContexts.add( - SecurityContext.builder() - .securityReferences(defaultAuth()) - .operationSelector(o -> o.requestMappingPattern().matches("/.*")) - .build()); - return securityContexts; - } - - /** - * 默认的安全上引用 - */ - private List defaultAuth() - { - AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything"); - AuthorizationScope[] authorizationScopes = new AuthorizationScope[1]; - authorizationScopes[0] = authorizationScope; - List securityReferences = new ArrayList<>(); - securityReferences.add(new SecurityReference("Authorization", authorizationScopes)); - return securityReferences; - } - - /** - * 添加摘要信息 - */ - private ApiInfo apiInfo() - { - // 用ApiInfoBuilder进行定制 - return new ApiInfoBuilder() - // 设置标题 - .title("标题：若依管理系统_接口文档") - // 描述 - .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...") - // 作者信息 - .contact(new Contact(ruoyiConfig.getName(), null, null)) - // 版本 - .version("版本号:" + ruoyiConfig.getVersion()) - .build(); - } -} +//package com.ruoyi.web.core.config; +// +//import java.util.ArrayList; +//import java.util.List; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.beans.factory.annotation.Value; +//import org.springframework.context.annotation.Bean; +//import org.springframework.context.annotation.Configuration; +//import com.ruoyi.common.config.RuoYiConfig; +//import io.swagger.annotations.ApiOperation; +//import io.swagger.models.auth.In; +//import springfox.documentation.builders.ApiInfoBuilder; +//import springfox.documentation.builders.PathSelectors; +//import springfox.documentation.builders.RequestHandlerSelectors; +//import springfox.documentation.service.ApiInfo; +//import springfox.documentation.service.ApiKey; +//import springfox.documentation.service.AuthorizationScope; +//import springfox.documentation.service.Contact; +//import springfox.documentation.service.SecurityReference; +//import springfox.documentation.service.SecurityScheme; +//import springfox.documentation.spi.DocumentationType; +//import springfox.documentation.spi.service.contexts.SecurityContext; +//import springfox.documentation.spring.web.plugins.Docket; +// +///** +// * Swagger2的接口配置 +// * +// * @author ruoyi +// */ +//@Configuration +//public class SwaggerConfig +//{ +// /** 系统基础配置 */ +// @Autowired +// private RuoYiConfig ruoyiConfig; +// +// /** 是否开启swagger */ +// @Value("${swagger.enabled}") +// private boolean enabled; +// +// /** 设置请求的统一前缀 */ +// @Value("${swagger.pathMapping}") +// private String pathMapping; +// +// /** +// * 创建API +// */ +// @Bean +// public Docket createRestApi() +// { +// return new Docket(DocumentationType.OAS_30) +// // 是否启用Swagger +// .enable(enabled) +// // 用来创建该API的基本信息，展示在文档的页面中（自定义展示的信息） +// .apiInfo(apiInfo()) +// // 设置哪些接口暴露给Swagger展示 +// .select() +// // 扫描所有有注解的api，用这种方式更灵活 +// .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)) +// // 扫描指定包中的swagger注解 +// // .apis(RequestHandlerSelectors.basePackage("com.ruoyi.project.tool.swagger")) +// // 扫描所有 .apis(RequestHandlerSelectors.any()) +// .paths(PathSelectors.any()) +// .build() +// /* 设置安全模式，swagger可以设置访问token */ +// .securitySchemes(securitySchemes()) +// .securityContexts(securityContexts()) +// .pathMapping(pathMapping); +// } +// +// /** +// * 安全模式，这里指定token通过Authorization头请求头传递 +// */ +// private List securitySchemes() +// { +// List apiKeyList = new ArrayList(); +// apiKeyList.add(new ApiKey("Authorization", "Authorization", In.HEADER.toValue())); +// return apiKeyList; +// } +// +// /** +// * 安全上下文 +// */ +// private List securityContexts() +// { +// List securityContexts = new ArrayList<>(); +// securityContexts.add( +// SecurityContext.builder() +// .securityReferences(defaultAuth()) +// .operationSelector(o -> o.requestMappingPattern().matches("/.*")) +// .build()); +// return securityContexts; +// } +// +// /** +// * 默认的安全上引用 +// */ +// private List defaultAuth() +// { +// AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything"); +// AuthorizationScope[] authorizationScopes = new AuthorizationScope[1]; +// authorizationScopes[0] = authorizationScope; +// List securityReferences = new ArrayList<>(); +// securityReferences.add(new SecurityReference("Authorization", authorizationScopes)); +// return securityReferences; +// } +// +// /** +// * 添加摘要信息 +// */ +// private ApiInfo apiInfo() +// { +// // 用ApiInfoBuilder进行定制 +// return new ApiInfoBuilder() +// // 设置标题 +// .title("标题：若依管理系统_接口文档") +// // 描述 +// .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...") +// // 作者信息 +// .contact(new Contact(ruoyiConfig.getName(), null, null)) +// // 版本 +// .version("版本号:" + ruoyiConfig.getVersion()) +// .build(); +// } +//} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/ykmap/controller/LineController.java b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/controller/LineController.java new file mode 100644 index 0000000..73caa0e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/controller/LineController.java @@ -0,0 +1,82 @@ +package com.ruoyi.ykmap.controller; + +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.ykmap.entity.response.*; +import com.ruoyi.ykmap.service.LineService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * 大屏线路接口 + * @author du + * @since 2024/8/14 10:40 + */ +@RestController +@RequestMapping("/ykmap/line") +@Api(tags = "大屏线路接口") +public class LineController extends BaseController { + + @Resource + private LineService lineService; + + @ApiOperation(value = "根据车辆id查询线路,装备,人员,标的物", response = GetCarIdInfoResponse.class) + @GetMapping("/getCarIdInfo/{id}") + public AjaxResult getCarIdInfo(@PathVariable String id) { + return success(lineService.getCarIdInfo(id)); + } + + + @ApiOperation(value = "任务明细弹窗线路信息", response = SelectLineInfoResponse.class) + @GetMapping("/selectLineInfo/{id}") + public AjaxResult selectLineInfo(@PathVariable String id) { + return success(lineService.selectLineInfo(id)); + } + + @ApiOperation(value = "任务明细弹窗装备信息", response = EquipResponse.class) + @GetMapping("/equip/{id}") + public AjaxResult equip(@PathVariable String id) { + return success(lineService.equip(id)); + } + + @ApiOperation(value = "任务明细弹窗人员信息", response = UserInfoResponse.class) + @GetMapping("/userInfo/{id}") + public AjaxResult userInfo(@PathVariable String id) { + return success(lineService.userInfo(id)); + } + + @ApiOperation(value = "任务明细弹窗标的物信息", response = ItemsResponse.class) + @GetMapping("/items/{id}") + public AjaxResult items(@PathVariable String id) { + return success(lineService.items(id)); + } + + @ApiOperation(value = "线路模板具体信息", response = LineTemplateResponse.class) + @GetMapping("/lineTemplate") + @DataSource(value = DataSourceType.SLAVE) + public AjaxResult lineTemplate(String area) { + return success(lineService.lineTemplate(area)); + } + + @ApiOperation(value = "业务已覆盖省份清单", response = SearchCityResponse.class) + @GetMapping("/searchCity") + @DataSource(value = DataSourceType.SLAVE) + public AjaxResult searchCity() { + return success(lineService.searchCity()); + } + + @ApiOperation(value = "业务已覆盖省份个数", response = SearchCityCountResponse.class) + @GetMapping("/searchCityCount") + @DataSource(value = DataSourceType.SLAVE) + public AjaxResult searchCityCount() { + return success(lineService.searchCityCount()); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/ykmap/controller/YxlglController.java b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/controller/YxlglController.java new file mode 100644 index 0000000..2101ec9 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/controller/YxlglController.java @@ -0,0 +1,98 @@ +package com.ruoyi.ykmap.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.ykmap.entity.Yxlgl; +import com.ruoyi.ykmap.entity.request.YxlglRequest; +import com.ruoyi.ykmap.service.YxlglService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.io.Serializable; + +/** + * 【营运管理部门】：线路管理数据（exl_operation_line_data）表控制层 + * + * @author du + * @since 2024/8/13 9:56 + */ +@RestController +@RequestMapping("/ykmap/xlgl") +@Api(tags = "【营运管理部门】：线路管理数据") +@DataSource(value = DataSourceType.SLAVE) +public class YxlglController extends BaseController { + + /** + * 服务对象 + */ + @Resource + private YxlglService yxlglService; + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param yxlglRequest 查询实体 + * @return 所有数据 + */ + @ApiOperation(value = "分页查询所有数据", response = Yxlgl.class) + @GetMapping + public AjaxResult selectAll(Page page, YxlglRequest yxlglRequest) { + return success(yxlglService.page(page, yxlglRequest)); + } + + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @ApiOperation(value = "通过主键查询单条数据", response = Yxlgl.class) + @GetMapping("{id}") + public AjaxResult selectOne(@PathVariable Serializable id) { + return success(yxlglService.getById(id)); + } + + /** + * 新增数据 + * + * @param xlgl 实体对象 + * @return 新增结果 + */ + @ApiOperation(value = "新增数据") + @PostMapping + public AjaxResult insert(@RequestBody Yxlgl xlgl) { + return success(yxlglService.save(xlgl)); + } + + /** + * 修改数据 + * + * @param xlgl 实体对象 + * @return 修改结果 + */ + @ApiOperation(value = "修改数据") + @PostMapping("/edit") + public AjaxResult update(@RequestBody Yxlgl xlgl) { + return success(yxlglService.updateById(xlgl)); + } + + /** + * 删除数据 + * + * @param id 主键结合 + * @return 删除结果 + */ + @ApiOperation(value = "删除数据") + @GetMapping("/delete/{id}") + public AjaxResult delete(@PathVariable Long id) { + return success(yxlglService.removeById(id)); + } + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/ykmap/controller/YywtzController.java b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/controller/YywtzController.java new file mode 100644 index 0000000..ca5eb65 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/controller/YywtzController.java @@ -0,0 +1,100 @@ +package com.ruoyi.ykmap.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.ykmap.entity.Yxlgl; +import com.ruoyi.ykmap.entity.Yywtz; +import com.ruoyi.ykmap.entity.Yywzl; +import com.ruoyi.ykmap.entity.request.YxlglRequest; +import com.ruoyi.ykmap.service.YxlglService; +import com.ruoyi.ykmap.service.YywtzService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.io.Serializable; + +/** + * 【营运管理部门】：业务拓展数据（exl_operation_expansion_data）表控制层 + * + * @author du + * @since 2024/8/13 9:56 + */ +@RestController +@RequestMapping("/ykmap/ywtz") +@Api(tags = "【营运管理部门】：业务拓展数据") +@DataSource(value = DataSourceType.SLAVE) +public class YywtzController extends BaseController { + + /** + * 服务对象 + */ + @Resource + private YywtzService yywtzService; + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @return 所有数据 + */ + @ApiOperation(value = "分页查询所有数据", response = Yywtz.class) + @GetMapping + public AjaxResult selectAll(Page page) { + return success(yywtzService.page(page)); + } + + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @ApiOperation(value = "通过主键查询单条数据", response = Yywtz.class) + @GetMapping("{id}") + public AjaxResult selectOne(@PathVariable Serializable id) { + return success(yywtzService.getById(id)); + } + + /** + * 新增数据 + * + * @param xlgl 实体对象 + * @return 新增结果 + */ + @ApiOperation(value = "新增数据") + @PostMapping + public AjaxResult insert(@RequestBody Yywtz xlgl) { + return success(yywtzService.save(xlgl)); + } + + /** + * 修改数据 + * + * @param xlgl 实体对象 + * @return 修改结果 + */ + @ApiOperation(value = "修改数据") + @PostMapping("/edit") + public AjaxResult update(@RequestBody Yywtz xlgl) { + return success(yywtzService.updateById(xlgl)); + } + + /** + * 删除数据 + * + * @param id 主键结合 + * @return 删除结果 + */ + @ApiOperation(value = "删除数据") + @GetMapping("/delete/{id}") + public AjaxResult delete(@PathVariable Long id) { + return success(yywtzService.removeById(id)); + } + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/ykmap/controller/YywzlController.java b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/controller/YywzlController.java new file mode 100644 index 0000000..3e547c8 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/controller/YywzlController.java @@ -0,0 +1,96 @@ +package com.ruoyi.ykmap.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.ykmap.entity.Yywzl; +import com.ruoyi.ykmap.service.YywzlService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.io.Serializable; + +/** + * 【营运管理部门】：业务总览数据（exl_operation_overview_data_route）表控制层 + * + * @author du + * @since 2024/8/13 9:56 + */ +@RestController +@RequestMapping("/ykmap/ywzl") +@Api(tags = "【营运管理部门】：业务总览数据") +@DataSource(value = DataSourceType.SLAVE) +public class YywzlController extends BaseController { + + /** + * 服务对象 + */ + @Resource + private YywzlService yywzlService; + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @return 所有数据 + */ + @ApiOperation(value = "分页查询所有数据", response = Yywzl.class) + @GetMapping + public AjaxResult selectAll(Page page) { + return success(yywzlService.page(page)); + } + + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @ApiOperation(value = "通过主键查询单条数据", response = Yywzl.class) + @GetMapping("{id}") + public AjaxResult selectOne(@PathVariable Serializable id) { + return success(yywzlService.getById(id)); + } + + /** + * 新增数据 + * + * @param xlgl 实体对象 + * @return 新增结果 + */ + @ApiOperation(value = "新增数据") + @PostMapping + public AjaxResult insert(@RequestBody Yywzl xlgl) { + return success(yywzlService.save(xlgl)); + } + + /** + * 修改数据 + * + * @param xlgl 实体对象 + * @return 修改结果 + */ + @ApiOperation(value = "修改数据") + @PostMapping("/edit") + public AjaxResult update(@RequestBody Yywzl xlgl) { + return success(yywzlService.updateById(xlgl)); + } + + /** + * 删除数据 + * + * @param id 主键结合 + * @return 删除结果 + */ + @ApiOperation(value = "删除数据") + @GetMapping("/delete/{id}") + public AjaxResult delete(@PathVariable Long id) { + return success(yywzlService.removeById(id)); + } + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/Yxlgl.java b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/Yxlgl.java new file mode 100644 index 0000000..e0ba4a2 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/Yxlgl.java @@ -0,0 +1,92 @@ +package com.ruoyi.ykmap.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** + * 【营运管理部门】：线路管理数据（exl_operation_line_data）表实体类 + * + * @author du + * @since 2024/8/13 9:49 + */ +@Data +@ApiModel("线路管理数据") +@TableName(value = "exl_operation_line_data") +public class Yxlgl { + + /** + * id + */ + @TableId + @ApiModelProperty("id") + private String id; + + /** + * 创建id + */ + @ApiModelProperty("创建id") + private Integer creatorId; + + /** + * 更新id + */ + @ApiModelProperty("更新id") + private Integer updaterId; + + /** + * 更新时间 + */ + @ApiModelProperty("更新时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; + + /** + * 线路类型:工作日、周六、周日 + */ + @ApiModelProperty("线路类型:工作日、周六、周日") + private String lineType; + + /** + * 营运网点线路条数（条） + */ + @ApiModelProperty("营运网点线路条数（条）") + private Integer networkLineNum; + + /** + * 营运无网点线路条数（条） + */ + @ApiModelProperty("营运无网点线路条数（条）") + private Integer noNetworkLineNum; + + /** + * 维护线路条数（条） + */ + @ApiModelProperty("维护线路条数（条）") + private Integer maintenanceLineNum; + + /** + * 数据时间（月份），时间戳 + */ + @ApiModelProperty("数据时间（月份），时间戳") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate dataTime; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/Yywtz.java b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/Yywtz.java new file mode 100644 index 0000000..67bbd6d --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/Yywtz.java @@ -0,0 +1,72 @@ +package com.ruoyi.ykmap.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** + * 【营运管理部门】：业务拓展数据（exl_operation_expansion_data）表实体类 + * @author du + * @since 2024/8/14 10:33 + */ +@Data +@ApiModel("业务总览数据") +@TableName(value = "exl_operation_expansion_data") +public class Yywtz { + /** + * id + */ + @TableId + @ApiModelProperty("id") + private String id; + + /** + * 创建id + */ + @ApiModelProperty("创建id") + private Integer creatorId; + + /** + * 更新id + */ + @ApiModelProperty("更新id") + private Integer updaterId; + + /** + * 更新时间 + */ + @ApiModelProperty("更新时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; + + /** + * 业务已覆盖省份名称 + */ + @ApiModelProperty("业务已覆盖省份名称") + private String provinceName; + + + /** + * 数据时间（月份），时间戳 + */ + @ApiModelProperty("数据时间（月份），时间戳") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate dataTime; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/Yywzl.java b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/Yywzl.java new file mode 100644 index 0000000..b84b539 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/Yywzl.java @@ -0,0 +1,82 @@ +package com.ruoyi.ykmap.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** + * 【营运管理部门】：业务总览数据（exl_operation_overview_data_route）表实体类 + * @author du + * @since 2024/8/14 10:17 + */ +@Data +@ApiModel("业务总览数据") +@TableName(value = "exl_operation_overview_data_route") +public class Yywzl { + + /** + * id + */ + @TableId + @ApiModelProperty("id") + private String id; + + /** + * 创建id + */ + @ApiModelProperty("创建id") + private Integer creatorId; + + /** + * 更新id + */ + @ApiModelProperty("更新id") + private Integer updaterId; + + /** + * 更新时间 + */ + @ApiModelProperty("更新时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; + + + /** + * 区镇:吴中区、吴江区、虎丘区、姑苏区、工业园区、相城区 + */ + @ApiModelProperty("区镇:吴中区、吴江区、虎丘区、姑苏区、工业园区、相城区") + private String area; + + + /** + * 线路总条数（条） + */ + @ApiModelProperty("线路总条数（条）") + private Integer lineTotalNum; + + + /** + * 数据时间（月份），时间戳 + */ + @ApiModelProperty("数据时间（月份），时间戳") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate dataTime; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/request/YxlglRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/request/YxlglRequest.java new file mode 100644 index 0000000..ee4dd0b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/request/YxlglRequest.java @@ -0,0 +1,21 @@ +package com.ruoyi.ykmap.entity.request; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 【营运管理部门】：线路管理数据（exl_operation_line_data）请求体 + * @author du + * @since 2024/8/14 9:01 + */ +@Data +@ApiModel("线路管理数据") +public class YxlglRequest { + + /** + * 线路类型:工作日、周六、周日 + */ + @ApiModelProperty("线路类型:工作日、周六、周日") + private String lineType; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/response/EquipResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/response/EquipResponse.java new file mode 100644 index 0000000..600896a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/response/EquipResponse.java @@ -0,0 +1,27 @@ +package com.ruoyi.ykmap.entity.response; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 任务装备返回体 + * @author du + * @since 2024/8/14 11:06 + */ +@Data +@ApiModel("任务装备返回体") +public class EquipResponse { + + /** + * 装备名称 + */ + @ApiModelProperty("装备名称") + private String thingType; + + /** + * 装备类型 + */ + @ApiModelProperty("装备类型") + private String type; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/response/GetCarIdInfoResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/response/GetCarIdInfoResponse.java new file mode 100644 index 0000000..78ba5cf --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/response/GetCarIdInfoResponse.java @@ -0,0 +1,40 @@ +package com.ruoyi.ykmap.entity.response; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 根据车辆id查询线路,装备,人员,标的物 + * @author du + * @since 2024/8/15 9:29 + */ +@Data +public class GetCarIdInfoResponse { + + /** + * 线路类型 + */ + @ApiModelProperty("线路类型") + private String lineType; + + + /** + * 装备信息 + */ + @ApiModelProperty("装备信息") + private List zbList; + + /** + * 人员信息 + */ + @ApiModelProperty("人员信息") + private List userList; + + /** + * 标的物 + */ + @ApiModelProperty("标的物") + private ItemsResponse bdwInfo; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/response/ItemsResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/response/ItemsResponse.java new file mode 100644 index 0000000..474b49a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/response/ItemsResponse.java @@ -0,0 +1,18 @@ +package com.ruoyi.ykmap.entity.response; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 标的物信息返回体 + * @author du + * @since 2024/8/14 11:18 + */ +@Data +@ApiModel("标的物信息返回体") +public class ItemsResponse { + + @ApiModelProperty("数量") + private Integer count; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/response/LineTemplateResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/response/LineTemplateResponse.java new file mode 100644 index 0000000..dda3776 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/response/LineTemplateResponse.java @@ -0,0 +1,57 @@ +package com.ruoyi.ykmap.entity.response; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +/** + * 线路模板具体信息返回体 + * @author du + * @since 2024/8/14 15:09 + */ +@Data +@ApiModel("线路模板具体信息返回体") +public class LineTemplateResponse { + + /** + * 区域 + */ + @ApiModelProperty("区域") + private String area; + + /** + * 线路总数 + */ + @ApiModelProperty("线路总数") + private Integer lineNum; + + /** + * 营业网点总数 + */ + @ApiModelProperty("营业网点总数") + private Integer yywdzs; + + /** + * 上门收款点总数 + */ + @ApiModelProperty("上门收款点总数") + private Integer skdNum; + + /** + * ATM机总数 + */ + @ApiModelProperty("ATM机总数") + private Integer atmNum; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/response/SearchCityCountResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/response/SearchCityCountResponse.java new file mode 100644 index 0000000..7bbe31d --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/response/SearchCityCountResponse.java @@ -0,0 +1,21 @@ +package com.ruoyi.ykmap.entity.response; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 业务已覆盖省份清单数量 + * @author du + * @since 2024/8/14 17:08 + */ +@Data +@ApiModel("业务已覆盖省份清单数量") +public class SearchCityCountResponse { + + /** + * 个数 + */ + @ApiModelProperty("个数") + private Integer count; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/response/SearchCityResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/response/SearchCityResponse.java new file mode 100644 index 0000000..4373653 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/response/SearchCityResponse.java @@ -0,0 +1,33 @@ +package com.ruoyi.ykmap.entity.response; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +/** + * 业务已覆盖省份清单 + * @author du + * @since 2024/8/14 16:04 + */ +@Data +@ApiModel("业务已覆盖省份清单") +public class SearchCityResponse { + + /** + * 省份 + */ + @ApiModelProperty("省份") + private String city; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/response/SelectLineInfoResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/response/SelectLineInfoResponse.java new file mode 100644 index 0000000..77bcf32 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/response/SelectLineInfoResponse.java @@ -0,0 +1,28 @@ +package com.ruoyi.ykmap.entity.response; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 线路信息返回体 + * @author du + * @since 2024/8/14 10:51 + */ +@Data +@ApiModel("线路信息返回体") +public class SelectLineInfoResponse { + /** + * 任务名称 + */ + @ApiModelProperty("任务名称") + private String name; + + /** + * 任务类型 + */ + @ApiModelProperty("任务类型") + private String type; + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/response/UserInfoResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/response/UserInfoResponse.java new file mode 100644 index 0000000..a813fb0 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/entity/response/UserInfoResponse.java @@ -0,0 +1,33 @@ +package com.ruoyi.ykmap.entity.response; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 人员信息返回体 + * @author du + * @since 2024/8/14 11:10 + */ +@Data +@ApiModel("人员信息返回体") +public class UserInfoResponse { + + /** + * 人员信息 + */ + @ApiModelProperty("人员信息") + private String ename; + + /** + * 职位名称 + */ + @ApiModelProperty("职位名称") + private String name; + + /** + * 排序 + */ + @ApiModelProperty("排序") + private Integer orderNum; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/ykmap/mapper/LineMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/mapper/LineMapper.java new file mode 100644 index 0000000..abfc5f9 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/mapper/LineMapper.java @@ -0,0 +1,56 @@ +package com.ruoyi.ykmap.mapper; + +import com.ruoyi.ykmap.entity.response.*; +import org.apache.ibatis.annotations.Param; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; + +/** + * 大屏线路数据层 + * + * @author du + * @since 2024/8/13 9:49 + */ +public interface LineMapper{ + + + /** + * 任务明细弹窗线路信息 + */ + SelectLineInfoResponse selectLineInfo(String id); + + /** + * 任务明细弹窗装备信息 + */ + List equip(String id); + + /** + * 任务明细弹窗人员信息 + */ + List userInfo(String id); + + /** + * 任务明细弹窗标的物信息 + */ + ItemsResponse items(String id); + + /** + * 线路模板具体信息 + */ + List lineTemplate(@Param("area") String area,@Param("a1") LocalDate a1, @Param("a2")LocalDate a2); + + + /** + * 业务已覆盖省份清单 + */ + List searchCity(@Param("a1") LocalDate a1, @Param("a2")LocalDate a2); + + /** + * 业务已覆盖省份个数 + */ + SearchCityCountResponse searchCityCount(@Param("a1") LocalDate a1, @Param("a2")LocalDate a2); + + String getByCarId(String id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/ykmap/mapper/YxlglMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/mapper/YxlglMapper.java new file mode 100644 index 0000000..f7a8a66 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/mapper/YxlglMapper.java @@ -0,0 +1,25 @@ +package com.ruoyi.ykmap.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.ykmap.entity.Yxlgl; +import com.ruoyi.ykmap.entity.request.YxlglRequest; +import org.apache.ibatis.annotations.Param; + +/** + * 【营运管理部门】：线路管理数据（exl_operation_line_data）表数据层 + * + * @author du + * @since 2024/8/13 9:49 + */ +public interface YxlglMapper extends BaseMapper { + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param yxlglRequest 查询实体 + * @return 所有数据 + */ + Page page(Page page,@Param("req") YxlglRequest yxlglRequest); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/ykmap/mapper/YywtzMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/mapper/YywtzMapper.java new file mode 100644 index 0000000..1a1bcb9 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/mapper/YywtzMapper.java @@ -0,0 +1,22 @@ +package com.ruoyi.ykmap.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.ykmap.entity.Yywtz; + +/** + * 【营运管理部门】：业务拓展数据（exl_operation_expansion_data）表数据层 + * + * @author du + * @since 2024/8/13 9:49 + */ +public interface YywtzMapper extends BaseMapper { + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @return 所有数据 + */ + Page page(Page page); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/ykmap/mapper/YywzlMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/mapper/YywzlMapper.java new file mode 100644 index 0000000..0bf1667 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/mapper/YywzlMapper.java @@ -0,0 +1,25 @@ +package com.ruoyi.ykmap.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.ykmap.entity.Yxlgl; +import com.ruoyi.ykmap.entity.Yywzl; +import com.ruoyi.ykmap.entity.request.YxlglRequest; +import org.apache.ibatis.annotations.Param; + +/** + * 【营运管理部门】：业务总览数据（exl_operation_overview_data_route）表数据层 + * + * @author du + * @since 2024/8/13 9:49 + */ +public interface YywzlMapper extends BaseMapper { + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @return 所有数据 + */ + Page page(Page page); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/ykmap/service/LineService.java b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/service/LineService.java new file mode 100644 index 0000000..1816b5e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/service/LineService.java @@ -0,0 +1,55 @@ +package com.ruoyi.ykmap.service; + +import com.ruoyi.ykmap.entity.response.*; + +import java.util.List; + +/** + * 大屏线路业务层 + * @author du + * @since 2024/8/14 10:43 + */ +public interface LineService { + + /** + * 任务明细弹窗线路信息 + */ + SelectLineInfoResponse selectLineInfo(String id); + + + /** + * 任务明细弹窗装备信息 + */ + List equip(String id); + + /** + * 任务明细弹窗人员信息 + */ + List userInfo(String id); + + /** + * 任务明细弹窗标的物信息 + */ + ItemsResponse items(String id); + + /** + * 线路模板具体信息 + */ + List lineTemplate(String area); + + /** + * 业务已覆盖省份清单 + */ + List searchCity(); + + /** + * 业务已覆盖省份个数 + */ + SearchCityCountResponse searchCityCount(); + + + /** + * 根据车辆id查询线路,装备,人员,标的 + */ + GetCarIdInfoResponse getCarIdInfo(String id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/ykmap/service/YxlglService.java b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/service/YxlglService.java new file mode 100644 index 0000000..089f772 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/service/YxlglService.java @@ -0,0 +1,25 @@ +package com.ruoyi.ykmap.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.ykmap.entity.Yxlgl; +import com.ruoyi.ykmap.entity.request.YxlglRequest; + +/** + * 【营运管理部门】：线路管理数据（exl_operation_line_data）表业务层 + * + * @author du + * @since 2024/8/13 9:49 + */ +public interface YxlglService extends IService { + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param yxlglRequest 查询实体 + * @return 所有数据 + */ + Page page(Page page, YxlglRequest yxlglRequest); + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/ykmap/service/YywtzService.java b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/service/YywtzService.java new file mode 100644 index 0000000..45de29f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/service/YywtzService.java @@ -0,0 +1,24 @@ +package com.ruoyi.ykmap.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.ykmap.entity.Yywtz; +import com.ruoyi.ykmap.entity.Yywzl; + +/** + * 【营运管理部门】：业务拓展数据（exl_operation_expansion_data）表业务层 + * + * @author du + * @since 2024/8/13 9:49 + */ +public interface YywtzService extends IService { + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @return 所有数据 + */ + Page page(Page page); + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/ykmap/service/YywzlService.java b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/service/YywzlService.java new file mode 100644 index 0000000..22756fe --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/service/YywzlService.java @@ -0,0 +1,25 @@ +package com.ruoyi.ykmap.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.ykmap.entity.Yxlgl; +import com.ruoyi.ykmap.entity.Yywzl; +import com.ruoyi.ykmap.entity.request.YxlglRequest; + +/** + * 【营运管理部门】：业务总览数据（exl_operation_overview_data_route）表业务层 + * + * @author du + * @since 2024/8/13 9:49 + */ +public interface YywzlService extends IService { + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @return 所有数据 + */ + Page page(Page page); + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/ykmap/service/impl/LineServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/service/impl/LineServiceImpl.java new file mode 100644 index 0000000..7da2ee7 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/service/impl/LineServiceImpl.java @@ -0,0 +1,125 @@ +package com.ruoyi.ykmap.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.ruoyi.ykmap.entity.response.*; +import com.ruoyi.ykmap.mapper.LineMapper; +import com.ruoyi.ykmap.service.LineService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.time.LocalDate; +import java.util.List; + +/** + * 大屏线路业务处理层 + * + * @author du + * @since 2024/8/14 10:44 + */ +@Service +public class LineServiceImpl implements LineService { + + @Resource + private LineMapper lineMapper; + + /** + * 任务明细弹窗线路信息 + */ + @Override + public SelectLineInfoResponse selectLineInfo(String id) { + return lineMapper.selectLineInfo(id); + } + + /** + * 任务明细弹窗装备信息 + */ + @Override + public List equip(String id) { + return lineMapper.equip(id); + } + + /** + * 任务明细弹窗人员信息 + */ + @Override + public List userInfo(String id) { + return lineMapper.userInfo(id); + } + + /** + * 任务明细弹窗标的物信息 + */ + @Override + public ItemsResponse items(String id) { + return lineMapper.items(id); + } + + /** + * 线路模板具体信息 + */ + @Override + public List lineTemplate(String area) { + LocalDate now = LocalDate.now(); + if (now.getDayOfMonth() < 26) { + LocalDate a1 = now.minusMonths(2).withDayOfMonth(26); + LocalDate a2 = now.minusMonths(1).withDayOfMonth(25); + return lineMapper.lineTemplate(area, a1, a2); + } else { + LocalDate a1 = now.minusMonths(1).withDayOfMonth(26); + LocalDate a2 = now.withDayOfMonth(25); + return lineMapper.lineTemplate(area, a1, a2); + } + } + + /** + * 业务已覆盖省份清单 + */ + @Override + public List searchCity() { + LocalDate now = LocalDate.now(); + if (now.getDayOfMonth() < 26) { + LocalDate a1 = now.minusMonths(2).withDayOfMonth(26); + LocalDate a2 = now.minusMonths(1).withDayOfMonth(25); + return lineMapper.searchCity(a1, a2); + } else { + LocalDate a1 = now.minusMonths(1).withDayOfMonth(26); + LocalDate a2 = now.withDayOfMonth(25); + return lineMapper.searchCity(a1, a2); + } + } + + /** + * 业务已覆盖省份个数 + */ + @Override + public SearchCityCountResponse searchCityCount() { + LocalDate now = LocalDate.now(); + if (now.getDayOfMonth() < 26) { + LocalDate a1 = now.minusMonths(2).withDayOfMonth(26); + LocalDate a2 = now.minusMonths(1).withDayOfMonth(25); + return lineMapper.searchCityCount(a1, a2); + } else { + LocalDate a1 = now.minusMonths(1).withDayOfMonth(26); + LocalDate a2 = now.withDayOfMonth(25); + return lineMapper.searchCityCount(a1, a2); + } + } + + /** + * 根据车辆id查询线路,装备,人员,标的 + */ + @Override + public GetCarIdInfoResponse getCarIdInfo(String id) { + //获取该车辆的任务id + String bcs = lineMapper.getByCarId(id); + GetCarIdInfoResponse res = new GetCarIdInfoResponse(); + res.setZbList(lineMapper.equip(bcs)); + res.setUserList(lineMapper.userInfo(bcs)); + res.setBdwInfo(lineMapper.items(bcs)); + SelectLineInfoResponse se = lineMapper.selectLineInfo(bcs); + if (BeanUtil.isNotEmpty(se)) { + res.setLineType(se.getType()); + } + return res; + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/ykmap/service/impl/YxlglServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/service/impl/YxlglServiceImpl.java new file mode 100644 index 0000000..c964a98 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/service/impl/YxlglServiceImpl.java @@ -0,0 +1,31 @@ +package com.ruoyi.ykmap.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.ykmap.entity.Yxlgl; +import com.ruoyi.ykmap.entity.request.YxlglRequest; +import com.ruoyi.ykmap.mapper.YxlglMapper; +import com.ruoyi.ykmap.service.YxlglService; +import org.springframework.stereotype.Service; + +/** + * 【营运管理部门】：线路管理数据（exl_operation_line_data）表业务处理层 + * + * @author du + * @since 2024/5/13 9:58 + */ +@Service +public class YxlglServiceImpl extends ServiceImpl implements YxlglService { + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param yxlglRequest 查询实体 + * @return 所有数据 + */ + @Override + public Page page(Page page, YxlglRequest yxlglRequest) { + return baseMapper.page(page,yxlglRequest); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/ykmap/service/impl/YywtzServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/service/impl/YywtzServiceImpl.java new file mode 100644 index 0000000..7b942a6 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/service/impl/YywtzServiceImpl.java @@ -0,0 +1,32 @@ +package com.ruoyi.ykmap.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.ykmap.entity.Yywtz; +import com.ruoyi.ykmap.entity.Yywzl; +import com.ruoyi.ykmap.mapper.YywtzMapper; +import com.ruoyi.ykmap.mapper.YywzlMapper; +import com.ruoyi.ykmap.service.YywtzService; +import com.ruoyi.ykmap.service.YywzlService; +import org.springframework.stereotype.Service; + +/** + * 【营运管理部门】：业务拓展数据（exl_operation_expansion_data）表业务处理层 + * + * @author du + * @since 2024/5/13 9:58 + */ +@Service +public class YywtzServiceImpl extends ServiceImpl implements YywtzService { + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @return 所有数据 + */ + @Override + public Page page(Page page) { + return baseMapper.page(page); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/ykmap/service/impl/YywzlServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/service/impl/YywzlServiceImpl.java new file mode 100644 index 0000000..ca3abad --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/ykmap/service/impl/YywzlServiceImpl.java @@ -0,0 +1,33 @@ +package com.ruoyi.ykmap.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.ykmap.entity.Yxlgl; +import com.ruoyi.ykmap.entity.Yywzl; +import com.ruoyi.ykmap.entity.request.YxlglRequest; +import com.ruoyi.ykmap.mapper.YxlglMapper; +import com.ruoyi.ykmap.mapper.YywzlMapper; +import com.ruoyi.ykmap.service.YxlglService; +import com.ruoyi.ykmap.service.YywzlService; +import org.springframework.stereotype.Service; + +/** + * 【营运管理部门】：业务总览数据（exl_operation_overview_data_route）表业务处理层 + * + * @author du + * @since 2024/5/13 9:58 + */ +@Service +public class YywzlServiceImpl extends ServiceImpl implements YywzlService { + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @return 所有数据 + */ + @Override + public Page page(Page page) { + return baseMapper.page(page); + } +} diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 426a48a..42df63d 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -2,20 +2,23 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.cj.jdbc.Driver druid: # 主库数据源 master: - url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + driverClassName: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://39.101.188.84:3307/yk_map?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: password + password: Admin123@ # 从库数据源 slave: # 从数据源开关/默认关闭 - enabled: false - url: - username: - password: + enabled: true + url: jdbc:postgresql://39.101.188.84:5432/yk_map + username: postgres + password: adminadmin + driverClassName: org.postgresql.Driver + # 配置检测连接是否有效 + validationQuery: SELECT 1 # 初始连接数 initialSize: 5 # 最小连接池数量 @@ -39,7 +42,7 @@ spring: testWhileIdle: true testOnBorrow: false testOnReturn: false - webStatFilter: + webStatFilter: enabled: true statViewServlet: enabled: true diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 2b10e16..baae7af 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -64,7 +64,7 @@ spring: devtools: restart: # 热部署开关 - enabled: true + enabled: false # redis 配置 redis: # 地址 @@ -97,10 +97,10 @@ token: # 令牌有效期（默认30分钟） expireTime: 30 -# MyBatis配置 -mybatis: +# mybatis-plus配置 +mybatis-plus: # 搜索指定包别名 - typeAliasesPackage: com.ruoyi.**.domain + typeAliasesPackage: com.ruoyi.**.domain,com.ruoyi.**.entity, # 配置mapper的扫描，找到所有的mapper.xml映射文件 mapperLocations: classpath*:mapper/**/*Mapper.xml # 加载全局的配置文件 @@ -112,12 +112,9 @@ pagehelper: supportMethodsArguments: true params: count=countSql -# Swagger配置 -swagger: - # 是否开启swagger - enabled: true - # 请求前缀 - pathMapping: /dev-api +knife4j: + # production: true + enable: true # 防止XSS攻击 xss: diff --git a/ruoyi-admin/src/main/resources/mapper/LineMapper.xml b/ruoyi-admin/src/main/resources/mapper/LineMapper.xml new file mode 100644 index 0000000..1dbe03e --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/LineMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/YxlglMapper.xml b/ruoyi-admin/src/main/resources/mapper/YxlglMapper.xml new file mode 100644 index 0000000..0760f46 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/YxlglMapper.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/YywtzMapper.xml b/ruoyi-admin/src/main/resources/mapper/YywtzMapper.xml new file mode 100644 index 0000000..4937de4 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/YywtzMapper.xml @@ -0,0 +1,10 @@ + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/YywzlMapper.xml b/ruoyi-admin/src/main/resources/mapper/YywzlMapper.xml new file mode 100644 index 0000000..4c5945c --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/YywzlMapper.xml @@ -0,0 +1,10 @@ + + + + + diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index d625896..b53913f 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -16,7 +16,11 @@ - + + com.baomidou + mybatis-plus-boot-starter + 3.5.3.1 + org.springframework diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java index 057c941..b4135ae 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java @@ -113,20 +113,20 @@ public class MyBatisConfig return resources.toArray(new Resource[resources.size()]); } - @Bean - public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception - { - String typeAliasesPackage = env.getProperty("mybatis.typeAliasesPackage"); - String mapperLocations = env.getProperty("mybatis.mapperLocations"); - String configLocation = env.getProperty("mybatis.configLocation"); - typeAliasesPackage = setTypeAliasesPackage(typeAliasesPackage); - VFS.addImplClass(SpringBootVFS.class); - - final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean(); - sessionFactory.setDataSource(dataSource); - sessionFactory.setTypeAliasesPackage(typeAliasesPackage); - sessionFactory.setMapperLocations(resolveMapperLocations(StringUtils.split(mapperLocations, ","))); - sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation)); - return sessionFactory.getObject(); - } +// @Bean +// public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception +// { +// String typeAliasesPackage = env.getProperty("mybatis.typeAliasesPackage"); +// String mapperLocations = env.getProperty("mybatis.mapperLocations"); +// String configLocation = env.getProperty("mybatis.configLocation"); +// typeAliasesPackage = setTypeAliasesPackage(typeAliasesPackage); +// VFS.addImplClass(SpringBootVFS.class); +// +// final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean(); +// sessionFactory.setDataSource(dataSource); +// sessionFactory.setTypeAliasesPackage(typeAliasesPackage); +// sessionFactory.setMapperLocations(resolveMapperLocations(StringUtils.split(mapperLocations, ","))); +// sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation)); +// return sessionFactory.getObject(); +// } } \ No newline at end of file diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index 511842b..6efc3a7 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -115,6 +115,8 @@ public class SecurityConfig // 静态资源，可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() + .antMatchers("/ykmap/**").permitAll() + // 除上面外的所有请求全部需要鉴权认证 .anyRequest().authenticated(); })