车辆状态查询修改

Dockerfile

@@ -7,4 +7,7 @@ WORKDIR /app
 # 复制 jar 包
 COPY target/*.jar app.jar
 # 设置 JVM 参数和启动命令
-ENTRYPOINT ["java", "-jar", "-Xms128m", "-Xmx256m", "app.jar"]
+# 设置默认的 JAVA_OPTS
+# ENV JAVA_OPTS="-Xms128m -Xmx256m"
+# 设置 JVM 参数和启动命令
+ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} -jar app.jar"]

Jenkinsfile

@@ -7,6 +7,7 @@ pipeline {
         APP_NAME = "sczx_car"
         DOCKER_IMAGE = "${APP_NAME}:latest"
         CONTAINER_NAME = "${APP_NAME}-container"
+        NACOS_ADDR = "115.190.8.52:8848"
     }
 
     stages {
@@ -59,7 +60,9 @@ pipeline {
                       --name \${CONTAINER_NAME} \
                       --network sczx-net \
                       -p 8083:8083 \
-                      -e JAVA_OPTS="-Xms256m -Xmx512m -Duser.timezone=Asia/Shanghai" \
+                      -e SPRING_PROFILES_ACTIVE=test \
+                      -e NACOS_SERVER_ADDR=\${NACOS_ADDR} \
+                      -e JAVA_OPTS="-Xms128m -Xmx256m -Duser.timezone=Asia/Shanghai" \
                       -e TZ=Asia/Shanghai \
                       -v /etc/localtime:/etc/localtime:ro \
                       --restart always \

pom.xml

@@ -75,6 +75,11 @@
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-commons</artifactId>

src/main/java/com/sczx/car/config/SwaggerConfig.java

@@ -3,6 +3,7 @@ package com.sczx.car.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.ParameterBuilder;
 import springfox.documentation.builders.PathSelectors;
@@ -15,6 +16,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 import java.util.Arrays;
 
+@Profile("!prod")
 @Configuration
 @EnableSwagger2
 public class SwaggerConfig {

src/main/java/com/sczx/car/dto/CarModelSimpleDTO.java

@@ -32,9 +32,6 @@ public class CarModelSimpleDTO {
     @ApiModelProperty("是否支持免押(0不支持 1支持)")
     private String depositFree;
 
-    @ApiModelProperty("是否支持代扣(0不支持 1支持)")
-    private String autoDeduct;
-
     @ApiModelProperty("电池类型")
     private String batteryType;
 

src/main/java/com/sczx/car/dto/StoreCarDTO.java

@@ -26,6 +26,9 @@ public class StoreCarDTO {
     @ApiModelProperty("IoT识别码")
     private String iotCode;
 
+    @ApiModelProperty("IoT识别号")
+    private String lotNumber;
+
     @ApiModelProperty("车辆品牌ID")
     private Long brandId;
 

src/main/java/com/sczx/car/mapper/RentBatteyRuleMapper.java

@@ -24,4 +24,11 @@ public interface RentBatteyRuleMapper extends BaseMapper<RentBatteyRulePO> {
      */
     List<RentBatteyRuleDTO> queryRentBatteyRuleByCarRuleId(@Param("carRuleId") Integer carRuleId);
 
+    /**
+     * 根据 id 查询 租电套餐计费规则
+     * @param id
+     * @return
+     */
+    RentBatteyRuleDTO getRentBatteyRuleById(@Param("id") Integer id);
+
 }

src/main/java/com/sczx/car/repository/RentBatteyRuleRepo.java

@@ -16,4 +16,5 @@ import java.util.List;
  */
 public interface RentBatteyRuleRepo extends IService<RentBatteyRulePO> {
     List<RentBatteyRuleDTO> queryRentBatteyRuleByCarRuleId(Integer carRuleId);
+    RentBatteyRuleDTO getRentBatteyRuleById(Integer id);
 }

src/main/java/com/sczx/car/repository/impl/RentBatteyRuleRepoImpl.java

@@ -24,4 +24,9 @@ public class RentBatteyRuleRepoImpl extends ServiceImpl<RentBatteyRuleMapper, Re
     public List<RentBatteyRuleDTO> queryRentBatteyRuleByCarRuleId(Integer carRuleId) {
         return this.getBaseMapper().queryRentBatteyRuleByCarRuleId(carRuleId);
     }
+
+    @Override
+    public RentBatteyRuleDTO getRentBatteyRuleById(Integer id) {
+        return this.getBaseMapper().getRentBatteyRuleById(id);
+    }
 }

src/main/java/com/sczx/car/service/impl/CarRentalServiceImpl.java

@@ -4,7 +4,6 @@ import com.sczx.car.convert.CarModelConvert;
 import com.sczx.car.dto.CarRentalDetailDTO;
 import com.sczx.car.dto.RentBatteyRuleDTO;
 import com.sczx.car.dto.RentBatteyRuleRsp;
-import com.sczx.car.exception.BizException;
 import com.sczx.car.po.CarModelPO;
 import com.sczx.car.repository.CarModelRepo;
 import com.sczx.car.repository.RentBatteyRuleRepo;
@@ -55,7 +54,7 @@ public class CarRentalServiceImpl implements CarRentalService {
 
         List<RentBatteyRuleDTO> rentBatteyRuleList =  rentBatteyRuleRepo.queryRentBatteyRuleByCarRuleId(carRuleId);
         if(CollectionUtils.isEmpty(rentBatteyRuleList)){
-            throw new BizException("无对应租电套餐，请重新选择租车套餐");
+            return null;
         }else {
             RentBatteyRuleRsp rentBatteyRuleRsp = new RentBatteyRuleRsp();
             rentBatteyRuleRsp.setRentBatteyRuleList(rentBatteyRuleList);

src/main/java/com/sczx/car/service/impl/RentBatteyRuleServiceImpl.java

@@ -1,8 +1,6 @@
 package com.sczx.car.service.impl;
 
-import com.sczx.car.convert.RentBatteyRuleConvert;
 import com.sczx.car.dto.RentBatteyRuleDTO;
-import com.sczx.car.po.RentBatteyRulePO;
 import com.sczx.car.repository.RentBatteyRuleRepo;
 import com.sczx.car.service.RentBatteyRuleService;
 import lombok.extern.slf4j.Slf4j;
@@ -17,8 +15,7 @@ public class RentBatteyRuleServiceImpl implements RentBatteyRuleService {
     private RentBatteyRuleRepo rentBatteyRuleRepo;
 
     @Override
-    public RentBatteyRuleDTO getRentBatteyRuleByBatteyRuleId(Long carRuleId) {
-        RentBatteyRulePO rentBatteyRulePO = rentBatteyRuleRepo.getById(carRuleId);
-        return RentBatteyRuleConvert.INSTANCE.poToDto(rentBatteyRulePO);
+    public RentBatteyRuleDTO getRentBatteyRuleByBatteyRuleId(Long batteyRuleId) {
+        return rentBatteyRuleRepo.getRentBatteyRuleById(batteyRuleId.intValue());
     }
 }

src/main/java/com/sczx/car/thirdpart/facade/StoreFacade.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
-@FeignClient(name = "sczx-store")
+@FeignClient(name = "sczx-store", url = "${sczx-store.ribbon.listOfServers:}")
 public interface StoreFacade {
 
     @GetMapping("/pub/getStoreById")

src/main/resources/application-local.yml

@@ -0,0 +1,3 @@
+sczx-store:
+  ribbon:
+    listOfServers: http://115.190.8.52:8082

src/main/resources/application.yml

@@ -1,87 +1,3 @@
-
-server:
-  port: 8083
-
 spring:
   application:
     name: sczx-car # 微服务名称
-  http:
-    encoding:
-      charset: UTF-8
-      enabled: true
-      force: true
-  mvc:
-    async:
-      request-timeout: -1
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 115.190.8.52:8848 # Nacos 地址
-        group: DEFAULT_GROUP
-        metadata:
-          version: 1.0.0
-          env: dev
-  lifecycle:
-    timeout-per-shutdown-phase: 30s # 设置优雅停机时间
-  datasource:
-    url: jdbc:mysql://115.190.8.52:3306/sczx?useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
-    username: sczx_user
-    password: Sczx123@
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    hikari:
-      maximum-pool-size: 20          # 最大连接数
-      minimum-idle: 5                # 最小空闲连接数
-      connection-timeout: 30000      # 连接超时时间(毫秒)
-      idle-timeout: 600000           # 空闲连接超时时间(毫秒)
-      max-lifetime: 1800000          # 连接最大存活时间(毫秒)
-      leak-detection-threshold: 60000 # 连接泄漏检测阈值(毫秒)
-      auto-commit: true
-      connection_init_sql: SELECT 1
-  redis:
-    host: 115.190.8.52
-    port: 6379
-    lettuce:
-      pool:
-        max-active: 8
-        max-wait: 2000ms
-        max-idle: 4
-        min-idle: 1
-        max-life-time: 300000ms
-
-management:
-  endpoints:
-    web:
-      exposure:
-        include: "*" # 暴露所有监控端点
-  endpoint:
-    health:
-      show-details: always
-
-feign:
-  client:
-    config:
-      default:
-        connectTimeout: 5000
-        readTimeout: 5000
-  hystrix:
-    enabled: true # 启用 Feign 的 Hystrix 支持
-
-hystrix:
-  command:
-    default:
-      execution:
-        isolation:
-          thread:
-            timeoutInMilliseconds: 10000 # 默认熔断超时时间
-
-
-mybatis-plus:
-  mapper-locations: classpath*:mapper/**/*.xml
-  type-aliases-package: com.sczx.car.po  # 实体类包路径
-  configuration:
-    mapUnderscoreToCamelCase: true
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl  # 控制台打印 SQL（调试用）
-
-auth:
-  secret-key: his-is-a-very-long-and-secure-secret-key-for-jwt-signing-please-dont-use-short-keys
-  token-expiration: 86400000  # 24小时

src/main/resources/bootstrap.yml

@@ -0,0 +1,15 @@
+spring:
+  application:
+    name: sczx-car # 应用名称，对应 Nacos 配置的 dataId
+  cloud:
+    nacos:
+      server-addr: ${NACOS_SERVER_ADDR} # Nacos 服务器地址
+      config:
+        group: DEFAULT_GROUP # 配置分组
+        file-extension: yaml # 配置文件格式
+        timeout: 5000 # 配置读取超时时间
+          # 添加共享配置
+        shared-configs:
+            - data-id: shared-config.yaml
+              group: DEFAULT_GROUP
+              refresh: true # 是否支持动态刷新

src/main/resources/mapper/CarMapper.xml

@@ -13,18 +13,19 @@
         zc.license_plate,
         zc.brand_name,
         zc.model_name,
-        zc.battery_type ,
+        zcm.battery_type ,
         ifnull(zom.overdue_days, 0) overdue_days,
         (case
-        when ifnull(zc.package_id, 0)>0 then 'NON_PACKAGE'
-        when zc.brs_status = '9'
-        and ifnull(zom.overdue_days, 0) > 0
-        and zom.order_status = 'RENT_OVERDUE' then 'OVERDUE'
-        when zc.brs_status = '9'
-        and ifnull(zom.overdue_days, 0) = 0
-        and zom.order_status = 'RENT_ING' then 'RENTING'
-        when zc.brs_status = '0' then 'FREE'
-        when zc.brs_status = '1' then 'REMOVED'
+        WHEN ifnull(zcmp.car_rule_num, 0)= 0 THEN 'NON_PACKAGE'
+        WHEN zc.brs_status = '9'
+        AND ifnull(zom.overdue_days, 0) > 0
+        AND zom.order_status = 'RENT_OVERDUE' THEN 'OVERDUE'
+        WHEN zc.brs_status = '9'
+        AND ifnull(zom.overdue_days, 0) = 0
+        AND zom.order_status = 'RENT_ING' THEN 'RENTING'
+        WHEN zc.brs_status = '9' THEN 'RENTING'
+        WHEN zc.brs_status = '0' THEN 'FREE'
+        WHEN zc.brs_status = '1' THEN 'REMOVED'
         END ) store_car_status,
         zc.brs_status,
         zcm.image,
@@ -33,12 +34,19 @@
         zom.pick_car_time,
         zc.update_time,
         zc.store_id,
-        zc.iot_code,
+        zc.lot_number,
         zc.iot_status,
         zcm.max_speed,
         zcm.weight
         from
         zc_car zc
+        LEFT JOIN (
+        SELECT
+        car_model_id,
+        count(car_rule_id) AS car_rule_num FROM  zc_car_model_package
+        GROUP BY
+        car_model_id) zcmp ON
+        zc.model_id = zcmp.car_model_id
         left join (
         select
         *

src/main/resources/mapper/CarModelMapper.xml

@@ -14,8 +14,7 @@
         cm.brand_name AS brand_name,
         cm.image AS image,
         GROUP_CONCAT(DISTINCT r.rental_type SEPARATOR ',') AS rental_types,
-        MAX(r.deposit_free) AS deposit_free,
-        MAX(r.auto_deduct) AS auto_deduct
+        MAX(r.deposit_free) AS deposit_free
         FROM
         zc_car_model cm
         JOIN
@@ -26,13 +25,12 @@
         zc_car_model_package mp ON cm.id = mp.car_model_id
         JOIN
         zc_rent_car_rule r ON mp.car_rule_id = r.id AND r.del_flag = '0' AND r.status = '0'
+        JOIN
+        zc_company zc ON r.operating_company_id = zc.id and zc.id = s.operating_company_id and zc.status = '0'
         <where>
             s.id = #{storeCarModelReq.storeId}
             <if test="storeCarModelReq.depositFree != null and storeCarModelReq.depositFree != ''">
-                AND r.deposit_free = #{storeCarModelReq.depositFree}
-            </if>
-            <if test="storeCarModelReq.autoDeduct != null and storeCarModelReq.autoDeduct != ''">
-                AND r.auto_deduct = #{storeCarModelReq.autoDeduct}
+                and r.deposit_free = #{storeCarModelReq.depositFree}
             </if>
             AND cm.del_flag = '0' AND cm.status = '0'
         </where>

src/main/resources/mapper/RentBatteyRuleMapper.xml

@@ -15,4 +15,16 @@
         rcb.car_rule_id = #{carRuleId}
         AND b.is_delete = 0
     </select>
+
+    <select id="getRentBatteyRuleById" resultType="com.sczx.car.dto.RentBatteyRuleDTO">
+        SELECT
+        b.*,c.category_name
+        FROM
+        zc_rent_battey_rule b
+        JOIN
+        zc_battery_category c ON b.category_id = c.id
+        WHERE
+        b.id = #{id}
+        AND b.is_delete = 0
+    </select>
 </mapper>

src/main/resources/mapper/RentCarRuleMapper.xml

@@ -26,7 +26,7 @@
         r.extend4 AS extend4,
         r.extend5 AS extend5
         FROM (
-        SELECT DISTINCT mp.car_rule_id
+        SELECT DISTINCT mp.car_rule_id,s.operating_company_id
         FROM zc_car_model cm
         JOIN zc_car c ON cm.id = c.model_id
         JOIN zc_company_store s ON c.store_id = s.id
@@ -37,7 +37,7 @@
         AND cm.del_flag = '0'
         AND cm.status = '0'
         ) tmp
-        JOIN zc_rent_car_rule r ON tmp.car_rule_id = r.id
+        JOIN zc_rent_car_rule r ON tmp.car_rule_id = r.id and r.operating_company_id = tmp.operating_company_id
         WHERE r.del_flag = '0' AND r.status = '0'
     </select>
 </mapper>