From b2d0ea43b97152489efaff9ea4d8b6d04fb334b7 Mon Sep 17 00:00:00 2001 From: fuck_zhn <2218834824@qq.com> Date: Sun, 19 Nov 2023 20:42:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=BD=A6=E8=BE=86=E7=AE=A1?= =?UTF-8?q?=E7=90=86sel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/httpRequests/2023-11-19T204017.200.json | 5 + .idea/httpRequests/http-client.cookies | 1 + .idea/httpRequests/http-requests-log.http | 18 +++ .idea/misc.xml | 7 - .idea/uiDesigner.xml | 124 +++++++++++++++++ .idea/workspace.xml | 128 +++++++++++++++++- dragon-car-common/pom.xml | 3 +- .../java/com/dragon/car/domain/CarInit.java | 29 ++++ dragon-car-remote/pom.xml | 13 +- .../dragon/car/remote/RemoteFirmService.java | 13 ++ .../factory/RemoteFirmFallbackFactory.java | 11 ++ ...ot.autoconfigure.AutoConfiguration.imports | 2 + dragon-car-service/pom.xml | 109 ++++++++++++++- .../com/dragon/car/server/DragonCarMain.java | 23 ++++ .../car/server/controller/CarController.java | 35 +++++ .../dragon/car/server/mapper/CarMapper.java | 13 ++ .../dragon/car/server/service/CarService.java | 19 +++ .../server/service/impl/CarServiceImpl.java | 38 ++++++ .../src/main/resources/banner.txt | 2 + .../src/main/resources/bootstrap.yml | 28 ++++ pom.xml | 7 +- 21 files changed, 604 insertions(+), 24 deletions(-) create mode 100644 .idea/httpRequests/2023-11-19T204017.200.json create mode 100644 .idea/httpRequests/http-client.cookies create mode 100644 .idea/httpRequests/http-requests-log.http create mode 100644 .idea/uiDesigner.xml create mode 100644 dragon-car-common/src/main/java/com/dragon/car/domain/CarInit.java create mode 100644 dragon-car-remote/src/main/java/com/dragon/car/remote/RemoteFirmService.java create mode 100644 dragon-car-remote/src/main/java/com/dragon/car/remote/factory/RemoteFirmFallbackFactory.java create mode 100644 dragon-car-remote/src/main/resources/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 dragon-car-service/src/main/java/com/dragon/car/server/DragonCarMain.java create mode 100644 dragon-car-service/src/main/java/com/dragon/car/server/controller/CarController.java create mode 100644 dragon-car-service/src/main/java/com/dragon/car/server/mapper/CarMapper.java create mode 100644 dragon-car-service/src/main/java/com/dragon/car/server/service/CarService.java create mode 100644 dragon-car-service/src/main/java/com/dragon/car/server/service/impl/CarServiceImpl.java create mode 100644 dragon-car-service/src/main/resources/banner.txt create mode 100644 dragon-car-service/src/main/resources/bootstrap.yml diff --git a/.idea/httpRequests/2023-11-19T204017.200.json b/.idea/httpRequests/2023-11-19T204017.200.json new file mode 100644 index 0000000..479d3f6 --- /dev/null +++ b/.idea/httpRequests/2023-11-19T204017.200.json @@ -0,0 +1,5 @@ +{ + "code": 500, + "msg": "\r\n### Error querying database. Cause: java.sql.SQLSyntaxErrorException: Unknown column 'car_frim_id' in 'field list'\r\n### The error may exist in com/dragon/car/server/mapper/CarMapper.java (best guess)\r\n### The error may involve defaultParameterMap\r\n### The error occurred while setting parameters\r\n### SQL: SELECT car_id,car_name,car_frim_id,car_frim_name FROM car_init\r\n### Cause: java.sql.SQLSyntaxErrorException: Unknown column 'car_frim_id' in 'field list'\n; bad SQL grammar []; nested exception is java.sql.SQLSyntaxErrorException: Unknown column 'car_frim_id' in 'field list'", + "data": null +} \ No newline at end of file diff --git a/.idea/httpRequests/http-client.cookies b/.idea/httpRequests/http-client.cookies new file mode 100644 index 0000000..edfe326 --- /dev/null +++ b/.idea/httpRequests/http-client.cookies @@ -0,0 +1 @@ +# domain path name value date diff --git a/.idea/httpRequests/http-requests-log.http b/.idea/httpRequests/http-requests-log.http new file mode 100644 index 0000000..4bd23ec --- /dev/null +++ b/.idea/httpRequests/http-requests-log.http @@ -0,0 +1,18 @@ +POST http://localhost:9201/car/carInit +Content-Length: 0 +Connection: Keep-Alive +User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.9) +Accept-Encoding: br,deflate,gzip,x-gzip + +### + +POST http://localhost:9201/car/carInit +Content-Length: 0 +Connection: Keep-Alive +User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.9) +Accept-Encoding: br,deflate,gzip,x-gzip + +<> 2023-11-19T204017.200.json + +### + diff --git a/.idea/misc.xml b/.idea/misc.xml index 2d7ccb5..0da1b4d 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,9 +1,5 @@ - - - @@ -14,8 +10,5 @@ - - \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..2b63946 --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index ed1dda3..cc4864d 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,9 +3,36 @@ + + + + + + + + + + + + + + + + + + + + + + { + "associatedIndex": 0 +} + + + + - { - "keyToString": { - "last_opened_file_path": "C:/Users/Administrator/Desktop/ZHN-DEV/FUCK", - "node.js.selected.package.eslint": "(autodetect)", - "rearrange.code.on.save": "true", - "settings.editor.selected.configurable": "MavenSettings" + +}]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1698030187471 + + + + + + + + \ No newline at end of file diff --git a/dragon-car-common/pom.xml b/dragon-car-common/pom.xml index 03846c9..6ee5fdc 100644 --- a/dragon-car-common/pom.xml +++ b/dragon-car-common/pom.xml @@ -6,7 +6,7 @@ com.zhn dragon-car - 1.0-SNAPSHOT + 1.0.0 dragon-car-common @@ -21,6 +21,5 @@ com.dragon dragon-common-core - diff --git a/dragon-car-common/src/main/java/com/dragon/car/domain/CarInit.java b/dragon-car-common/src/main/java/com/dragon/car/domain/CarInit.java new file mode 100644 index 0000000..ce195c7 --- /dev/null +++ b/dragon-car-common/src/main/java/com/dragon/car/domain/CarInit.java @@ -0,0 +1,29 @@ +package com.dragon.car.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.dragon.common.core.annotation.Excel; +import com.dragon.common.core.annotation.Excel.ColumnType; +import lombok.*; + +/** + * @author : Administrator + * @description : 车辆初始化-实体类 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@ToString +@TableName ("car_init") +public class CarInit { + + @Excel (name = "参数主键", cellType = ColumnType.NUMERIC) + //设置为主键自增 + @TableId (type = IdType.AUTO) + private String carId; + private String carName; + private String carFrimId; + private String carFrimName; +} diff --git a/dragon-car-remote/pom.xml b/dragon-car-remote/pom.xml index a2d0c57..e1eb53d 100644 --- a/dragon-car-remote/pom.xml +++ b/dragon-car-remote/pom.xml @@ -1,12 +1,12 @@ - 4.0.0 com.zhn dragon-car - 1.0-SNAPSHOT + 1.0.0 dragon-car-remote @@ -16,5 +16,12 @@ 17 UTF-8 + + + com.zhn + dragon-car-common + 1.0.0 + + diff --git a/dragon-car-remote/src/main/java/com/dragon/car/remote/RemoteFirmService.java b/dragon-car-remote/src/main/java/com/dragon/car/remote/RemoteFirmService.java new file mode 100644 index 0000000..290dc2b --- /dev/null +++ b/dragon-car-remote/src/main/java/com/dragon/car/remote/RemoteFirmService.java @@ -0,0 +1,13 @@ +package com.dragon.car.remote; + +/** + * 日志服务 + * + * @author dragon + */ +/* +@FeignClient(contextId = "remoteLogService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteLogFallbackFactory.class) +*/ +public interface RemoteFirmService { + +} diff --git a/dragon-car-remote/src/main/java/com/dragon/car/remote/factory/RemoteFirmFallbackFactory.java b/dragon-car-remote/src/main/java/com/dragon/car/remote/factory/RemoteFirmFallbackFactory.java new file mode 100644 index 0000000..c607de9 --- /dev/null +++ b/dragon-car-remote/src/main/java/com/dragon/car/remote/factory/RemoteFirmFallbackFactory.java @@ -0,0 +1,11 @@ +package com.dragon.car.remote.factory; + +import org.springframework.stereotype.Component; + +/** + * @author : Administrator + * @description : 企业远程调用 + */ +@Component +public class RemoteFirmFallbackFactory { +} diff --git a/dragon-car-remote/src/main/resources/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/dragon-car-remote/src/main/resources/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..04cd392 --- /dev/null +++ b/dragon-car-remote/src/main/resources/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +com.dragon.system.remote.factory.RemoteFirmFallbackFactory + diff --git a/dragon-car-service/pom.xml b/dragon-car-service/pom.xml index 80ceedf..43da70a 100644 --- a/dragon-car-service/pom.xml +++ b/dragon-car-service/pom.xml @@ -1,12 +1,12 @@ - 4.0.0 com.zhn dragon-car - 1.0-SNAPSHOT + 1.0.0 dragon-car-service @@ -16,5 +16,108 @@ 17 UTF-8 + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + + com.mysql + mysql-connector-j + + + + + com.dragon + dragon-common-datasource + + + + + com.dragon + dragon-common-datascope + + + + + com.dragon + dragon-common-log + + + + + com.dragon + dragon-common-swagger + + + + com.dragon + dragon-file-remote + + + + com.zhn + dragon-car-common + 1.0.0 + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.apache.maven.plugins + maven-compiler-plugin + + 16 + 16 + + + + diff --git a/dragon-car-service/src/main/java/com/dragon/car/server/DragonCarMain.java b/dragon-car-service/src/main/java/com/dragon/car/server/DragonCarMain.java new file mode 100644 index 0000000..3cd4b98 --- /dev/null +++ b/dragon-car-service/src/main/java/com/dragon/car/server/DragonCarMain.java @@ -0,0 +1,23 @@ +package com.dragon.car.server; + + +import com.dragon.common.security.annotation.EnableCustomConfig; +import com.dragon.common.security.annotation.EnableDragonFeignClients; +import com.dragon.common.swagger.annotation.EnableCustomSwagger2; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * 系统模块 + * + * @author dragon + */ +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableDragonFeignClients +@SpringBootApplication +public class DragonCarMain { + public static void main (String[] args) { + SpringApplication.run (DragonCarMain.class, args); + } +} diff --git a/dragon-car-service/src/main/java/com/dragon/car/server/controller/CarController.java b/dragon-car-service/src/main/java/com/dragon/car/server/controller/CarController.java new file mode 100644 index 0000000..f0d4404 --- /dev/null +++ b/dragon-car-service/src/main/java/com/dragon/car/server/controller/CarController.java @@ -0,0 +1,35 @@ +package com.dragon.car.server.controller; + +import com.dragon.car.domain.CarInit; +import com.dragon.car.server.service.CarService; +import com.dragon.common.core.domain.Result; +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.RestController; + +import java.util.List; + +/** + * @author : Administrator + * @description : 汽车管理控制层 + */ +@RestController +@RequestMapping ("/car") +public class CarController { + @Autowired + CarService carService; + + /** + * 车辆初始化 + * + * @return List 初始化企业车辆列表 + */ + @PostMapping ("/carInit") + public Result> carInit () { + + return carService.carInit (); + } + + +} diff --git a/dragon-car-service/src/main/java/com/dragon/car/server/mapper/CarMapper.java b/dragon-car-service/src/main/java/com/dragon/car/server/mapper/CarMapper.java new file mode 100644 index 0000000..9bc9621 --- /dev/null +++ b/dragon-car-service/src/main/java/com/dragon/car/server/mapper/CarMapper.java @@ -0,0 +1,13 @@ +package com.dragon.car.server.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.dragon.car.domain.CarInit; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author : Administrator + * @description : + */ +@Mapper +public interface CarMapper extends BaseMapper { +} diff --git a/dragon-car-service/src/main/java/com/dragon/car/server/service/CarService.java b/dragon-car-service/src/main/java/com/dragon/car/server/service/CarService.java new file mode 100644 index 0000000..bbfaccd --- /dev/null +++ b/dragon-car-service/src/main/java/com/dragon/car/server/service/CarService.java @@ -0,0 +1,19 @@ +package com.dragon.car.server.service; + +import com.dragon.car.domain.CarInit; +import com.dragon.common.core.domain.Result; + +import java.util.List; + +/** + * @author : Administrator + * @description : + */ +public interface CarService { + /** + * 初始化车辆 + * + * @return List 企业管理的车-列表 + */ + Result> carInit (); +} diff --git a/dragon-car-service/src/main/java/com/dragon/car/server/service/impl/CarServiceImpl.java b/dragon-car-service/src/main/java/com/dragon/car/server/service/impl/CarServiceImpl.java new file mode 100644 index 0000000..178849d --- /dev/null +++ b/dragon-car-service/src/main/java/com/dragon/car/server/service/impl/CarServiceImpl.java @@ -0,0 +1,38 @@ +package com.dragon.car.server.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.dragon.car.domain.CarInit; +import com.dragon.car.server.mapper.CarMapper; +import com.dragon.car.server.service.CarService; +import com.dragon.common.core.domain.Result; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @author : Administrator + * @description : 车辆业务逻辑层 + */ +@Service +public class CarServiceImpl implements CarService { + + @Resource + CarMapper carMapper; + + + /** + * 初始化车辆 + * + * @return List 企业管理的车-列表 + */ + @Override + public Result> carInit () { + LambdaQueryWrapper aclqw = new LambdaQueryWrapper<> (); + + carMapper.selectList (aclqw); + return null; + } + + +} diff --git a/dragon-car-service/src/main/resources/banner.txt b/dragon-car-service/src/main/resources/banner.txt new file mode 100644 index 0000000..0dd5eee --- /dev/null +++ b/dragon-car-service/src/main/resources/banner.txt @@ -0,0 +1,2 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} diff --git a/dragon-car-service/src/main/resources/bootstrap.yml b/dragon-car-service/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..f269d26 --- /dev/null +++ b/dragon-car-service/src/main/resources/bootstrap.yml @@ -0,0 +1,28 @@ +# Tomcat +server: + port: 9201 + +# Spring +spring: + application: + # 应用名称 + name: dragon-car + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 10.100.1.5:8848 + config: + # 配置中心地址 + server-addr: 10.100.1.5:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +mybatis-plus: + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl diff --git a/pom.xml b/pom.xml index 4aa724b..d0b48c1 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.zhn dragon-car - 1.0-SNAPSHOT + 1.0.0 pom dragon-car-common @@ -23,7 +23,10 @@ 17 UTF-8 - + + dragon-car车辆管理模块 + + dragon-release dragon-releases