init
This commit is contained in:
@@ -0,0 +1,15 @@
|
||||
package com.sl;
|
||||
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
import org.springframework.cloud.openfeign.EnableFeignClients;
|
||||
|
||||
@EnableFeignClients
|
||||
@SpringBootApplication
|
||||
public class CarriageApplication {
|
||||
|
||||
public static void main(String[] args) {
|
||||
SpringApplication.run(CarriageApplication.class, args);
|
||||
}
|
||||
|
||||
}
|
@@ -0,0 +1,55 @@
|
||||
package com.sl.ms.carriage.controller;
|
||||
|
||||
import com.sl.ms.carriage.domain.dto.CarriageDTO;
|
||||
import com.sl.ms.carriage.domain.dto.WaybillDTO;
|
||||
import com.sl.ms.carriage.service.CarriageService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiImplicitParam;
|
||||
import io.swagger.annotations.ApiImplicitParams;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.util.List;
|
||||
|
||||
@Slf4j
|
||||
@Validated
|
||||
@RestController
|
||||
@Api(tags = "运费管理")
|
||||
@RequestMapping("/carriages")
|
||||
public class CarriageController {
|
||||
|
||||
@Resource
|
||||
private CarriageService carriageService;
|
||||
|
||||
@PostMapping
|
||||
@ApiOperation(value = "新增/修改运费模板")
|
||||
public CarriageDTO saveOrUpdate(@RequestBody CarriageDTO carriageDto) {
|
||||
return carriageService.saveOrUpdate(carriageDto);
|
||||
}
|
||||
|
||||
@GetMapping
|
||||
@ApiOperation(value = "运费模板列表")
|
||||
public List<CarriageDTO> findAll() {
|
||||
return carriageService.findAll();
|
||||
}
|
||||
|
||||
|
||||
@DeleteMapping("{id}")
|
||||
@ApiOperation(value = "删除运费模板")
|
||||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = "id", value = "运费模板id", required = true, dataTypeClass = String.class)
|
||||
})
|
||||
public void delete(@NotNull(message = "id不能为空") @PathVariable("id") Long id) {
|
||||
carriageService.removeById(id);
|
||||
}
|
||||
|
||||
@PostMapping("compute")
|
||||
@ApiOperation(value = "运费计算")
|
||||
public CarriageDTO compute(@RequestBody WaybillDTO waybillDTO) {
|
||||
return carriageService.compute(waybillDTO);
|
||||
}
|
||||
}
|
@@ -0,0 +1,52 @@
|
||||
package com.sl.ms.carriage.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.sl.transport.common.entity.BaseEntity;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* 运费模板表
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@TableName("sl_carriage")
|
||||
public class CarriageEntity extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID = -5358753714676282742L;
|
||||
|
||||
/**
|
||||
* 模板类型:1-同城寄,2-省内寄,3-经济区互寄,4-跨省
|
||||
*/
|
||||
private Integer templateType;
|
||||
|
||||
/**
|
||||
* 运送类型:1-普快,2-特快
|
||||
*/
|
||||
private Integer transportType;
|
||||
|
||||
/**
|
||||
* 关联城市:1-全国,2-京津冀,3-江浙沪,4-川渝,5-黑吉辽
|
||||
*/
|
||||
private String associatedCity;
|
||||
|
||||
/**
|
||||
* 首重价格
|
||||
*/
|
||||
private Double firstWeight;
|
||||
|
||||
/**
|
||||
* 续重价格
|
||||
*/
|
||||
private Double continuousWeight;
|
||||
|
||||
/**
|
||||
* 轻抛系数
|
||||
*/
|
||||
private Integer lightThrowingCoefficient;
|
||||
|
||||
}
|
@@ -0,0 +1,49 @@
|
||||
package com.sl.ms.carriage.enums;
|
||||
|
||||
import cn.hutool.core.util.EnumUtil;
|
||||
import com.sl.transport.common.enums.BaseExceptionEnum;
|
||||
|
||||
/**
|
||||
* 异常枚举
|
||||
*/
|
||||
public enum CarriageExceptionEnum implements BaseExceptionEnum {
|
||||
|
||||
NOT_ECONOMIC_ZONE_REPEAT(1001, "非经济区的模板重复,只能有一个模板"),
|
||||
ECONOMIC_ZONE_CITY_REPEAT(1002, "经济区互寄关联城市重复"),
|
||||
NOT_FOUND(1003, "没有找到运费模板,无法计算运费");
|
||||
|
||||
private Integer code;
|
||||
private Integer status;
|
||||
private String value;
|
||||
|
||||
CarriageExceptionEnum(Integer code, String value) {
|
||||
this.code = code;
|
||||
this.value = value;
|
||||
this.status = 500;
|
||||
}
|
||||
|
||||
CarriageExceptionEnum(Integer code, Integer status, String value) {
|
||||
this.code = code;
|
||||
this.value = value;
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Integer getCode() {
|
||||
return this.code;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getValue() {
|
||||
return this.value;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Integer getStatus() {
|
||||
return this.status;
|
||||
}
|
||||
|
||||
public static CarriageExceptionEnum codeOf(Integer code) {
|
||||
return EnumUtil.getBy(CarriageExceptionEnum::getCode, code);
|
||||
}
|
||||
}
|
@@ -0,0 +1,11 @@
|
||||
package com.sl.ms.carriage.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.sl.ms.carriage.entity.CarriageEntity;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* 运费管理表 mapper接口
|
||||
*/
|
||||
@Mapper
|
||||
public interface CarriageMapper extends BaseMapper<CarriageEntity> {}
|
@@ -0,0 +1,48 @@
|
||||
package com.sl.ms.carriage.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.sl.ms.carriage.domain.dto.CarriageDTO;
|
||||
import com.sl.ms.carriage.domain.dto.WaybillDTO;
|
||||
import com.sl.ms.carriage.entity.CarriageEntity;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 运费管理表 服务类
|
||||
*/
|
||||
public interface CarriageService extends IService<CarriageEntity> {
|
||||
|
||||
/**
|
||||
* 新增/修改运费模板
|
||||
*
|
||||
* @param carriageDto 新增/修改运费对象
|
||||
* 必填字段:templateType、transportType
|
||||
* 更新时传入id字段
|
||||
*/
|
||||
CarriageDTO saveOrUpdate(CarriageDTO carriageDto);
|
||||
|
||||
/**
|
||||
* 获取全部运费模板
|
||||
*
|
||||
* @return 运费模板对象列表
|
||||
*/
|
||||
List<CarriageDTO> findAll();
|
||||
|
||||
/**
|
||||
* 运费计算
|
||||
*
|
||||
* @param waybillDTO 运费计算对象
|
||||
* @return 运费模板对象,不仅包含模板数据还包含:computeWeight、expense 字段
|
||||
*/
|
||||
CarriageDTO compute(WaybillDTO waybillDTO);
|
||||
|
||||
|
||||
/**
|
||||
* 根据模板类型查询模板,经济区互寄不通过该方法查询模板
|
||||
*
|
||||
* @param templateType 模板类型:1-同城寄,2-省内寄,4-跨省
|
||||
* @return 运费模板
|
||||
*/
|
||||
CarriageEntity findByTemplateType(Integer templateType);
|
||||
|
||||
}
|
@@ -0,0 +1,35 @@
|
||||
package com.sl.ms.carriage.utils;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.sl.ms.carriage.domain.dto.CarriageDTO;
|
||||
import com.sl.ms.carriage.entity.CarriageEntity;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 运费模板工具类
|
||||
*/
|
||||
public class CarriageUtils {
|
||||
|
||||
private CarriageUtils() {
|
||||
|
||||
}
|
||||
|
||||
public static CarriageEntity toEntity(CarriageDTO carriageDTO) {
|
||||
CarriageEntity carriage = BeanUtil.toBean(carriageDTO, CarriageEntity.class);
|
||||
//关联城市以逗号分割存储到数据库
|
||||
String associatedCity = CollUtil.join(carriageDTO.getAssociatedCityList(), ",");
|
||||
carriage.setAssociatedCity(associatedCity);
|
||||
return carriage;
|
||||
}
|
||||
|
||||
public static CarriageDTO toDTO(CarriageEntity carriage) {
|
||||
CarriageDTO carriageDTO = BeanUtil.toBean(carriage, CarriageDTO.class);
|
||||
//按照逗号分割成集合放入DTO对象中
|
||||
List<String> associatedCityList = StrUtil.split(carriage.getAssociatedCity(), ',');
|
||||
carriageDTO.setAssociatedCityList(associatedCityList);
|
||||
return carriageDTO;
|
||||
}
|
||||
}
|
@@ -0,0 +1,7 @@
|
||||
|
||||
_ ${spring.application.name} ${application.version}
|
||||
___ | | ___ __ __ _ __ _ __ ___ ___ ___ Port: ${server.port}
|
||||
/ __|| | _____ / _ \\ \/ /| '_ \ | '__|/ _ \/ __|/ __| Pid: ${pid} Profile(s): ${AnsiColor.GREEN}${spring.profiles.active}${AnsiColor.DEFAULT}
|
||||
\__ \| ||_____|| __/ > < | |_) || | | __/\__ \\__ \
|
||||
|___/|_| \___|/_/\_\| .__/ |_| \___||___/|___/ https://sl-express.itheima.net/
|
||||
|_|
|
@@ -0,0 +1,28 @@
|
||||
server:
|
||||
port: 18094
|
||||
tomcat:
|
||||
uri-encoding: UTF-8
|
||||
threads:
|
||||
max: 1000
|
||||
min-spare: 30
|
||||
spring:
|
||||
cloud:
|
||||
nacos:
|
||||
username: nacos
|
||||
password: nacos
|
||||
server-addr: 192.168.150.101:8848
|
||||
discovery:
|
||||
namespace: ecae68ba-7b43-4473-a980-4ddeb6157bdc
|
||||
ip: 192.168.150.1
|
||||
config:
|
||||
namespace: ecae68ba-7b43-4473-a980-4ddeb6157bdc
|
||||
shared-configs: #共享配置
|
||||
- data-id: shared-spring-seata.yml
|
||||
group: SHARED_GROUP
|
||||
refresh: false
|
||||
- data-id: shared-spring-mysql.yml
|
||||
group: SHARED_GROUP
|
||||
refresh: false
|
||||
- data-id: shared-spring-mybatis-plus.yml
|
||||
group: SHARED_GROUP
|
||||
refresh: false
|
@@ -0,0 +1,27 @@
|
||||
server:
|
||||
port: 18094
|
||||
tomcat:
|
||||
uri-encoding: UTF-8
|
||||
threads:
|
||||
max: 1000
|
||||
min-spare: 30
|
||||
spring:
|
||||
cloud:
|
||||
nacos:
|
||||
username: nacos
|
||||
password: vO5/dZ9,iL
|
||||
server-addr: nacos-service.yjy-public-slwl-java-prod.svc.cluster.local:8848
|
||||
discovery:
|
||||
namespace: 92312ba8-1119-440f-81af-c29618df303b
|
||||
config:
|
||||
namespace: 92312ba8-1119-440f-81af-c29618df303b
|
||||
shared-configs: #共享配置
|
||||
- data-id: shared-spring-seata.yml
|
||||
group: SHARED_GROUP
|
||||
refresh: false
|
||||
- data-id: shared-spring-mysql.yml
|
||||
group: SHARED_GROUP
|
||||
refresh: false
|
||||
- data-id: shared-spring-mybatis-plus.yml
|
||||
group: SHARED_GROUP
|
||||
refresh: false
|
@@ -0,0 +1,27 @@
|
||||
server:
|
||||
port: 18094
|
||||
tomcat:
|
||||
uri-encoding: UTF-8
|
||||
threads:
|
||||
max: 1000
|
||||
min-spare: 30
|
||||
spring:
|
||||
cloud:
|
||||
nacos:
|
||||
username: nacos
|
||||
password: nacos
|
||||
server-addr: 192.168.150.101:8848
|
||||
discovery:
|
||||
namespace: ecae68ba-7b43-4473-a980-4ddeb6157bdc
|
||||
config:
|
||||
namespace: ecae68ba-7b43-4473-a980-4ddeb6157bdc
|
||||
shared-configs: #共享配置
|
||||
- data-id: shared-spring-seata.yml
|
||||
group: SHARED_GROUP
|
||||
refresh: false
|
||||
- data-id: shared-spring-mysql.yml
|
||||
group: SHARED_GROUP
|
||||
refresh: false
|
||||
- data-id: shared-spring-mybatis-plus.yml
|
||||
group: SHARED_GROUP
|
||||
refresh: false
|
@@ -0,0 +1,27 @@
|
||||
server:
|
||||
port: 18094
|
||||
tomcat:
|
||||
uri-encoding: UTF-8
|
||||
threads:
|
||||
max: 1000
|
||||
min-spare: 30
|
||||
spring:
|
||||
cloud:
|
||||
nacos:
|
||||
username: nacos
|
||||
password: nacos
|
||||
server-addr: nacos-service.yjy-public-slwl-java.svc.cluster.local:8848
|
||||
discovery:
|
||||
namespace: 92312ba8-1119-440f-81af-c29618df303b
|
||||
config:
|
||||
namespace: 92312ba8-1119-440f-81af-c29618df303b
|
||||
shared-configs: #共享配置
|
||||
- data-id: shared-spring-seata.yml
|
||||
group: SHARED_GROUP
|
||||
refresh: false
|
||||
- data-id: shared-spring-mysql.yml
|
||||
group: SHARED_GROUP
|
||||
refresh: false
|
||||
- data-id: shared-spring-mybatis-plus.yml
|
||||
group: SHARED_GROUP
|
||||
refresh: false
|
@@ -0,0 +1,25 @@
|
||||
application:
|
||||
version: v1.0
|
||||
logging:
|
||||
config: classpath:logback-spring.xml
|
||||
spring:
|
||||
application:
|
||||
name: sl-express-ms-carriage
|
||||
profiles:
|
||||
active: local
|
||||
mvc:
|
||||
pathmatch:
|
||||
#解决异常:swagger Failed to start bean 'documentationPluginsBootstrapper'; nested exception is java.lang.NullPointerException
|
||||
#因为Springfox使用的路径匹配是基于AntPathMatcher的,而Spring Boot 2.6.X使用的是PathPatternMatcher
|
||||
matching-strategy: ant_path_matcher
|
||||
main:
|
||||
allow-circular-references: true
|
||||
sl:
|
||||
swagger:
|
||||
package-path: com.sl.ms.carriage.controller
|
||||
title: 神领物流 - 运费微服务接口文档
|
||||
description: 该微服务完成运费管理、计算服务。
|
||||
contact-name: 传智教育·研究院
|
||||
contact-url: http://www.itcast.cn/
|
||||
contact-email: yjy@itcast.cn
|
||||
version: ${application.version}
|
@@ -0,0 +1,41 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!--scan: 当此属性设置为true时,配置文件如果发生改变,将会被重新加载,默认值为true。-->
|
||||
<!--scanPeriod: 设置监测配置文件是否有修改的时间间隔,如果没有给出时间单位,默认单位是毫秒。当scan为true时,此属性生效。默认的时间间隔为1分钟。-->
|
||||
<!--debug: 当此属性设置为true时,将打印出logback内部日志信息,实时查看logback运行状态。默认值为false。-->
|
||||
<configuration debug="false" scan="false" scanPeriod="60 seconds">
|
||||
<springProperty scope="context" name="appName" source="spring.application.name"/>
|
||||
<!--文件名-->
|
||||
<property name="logback.appname" value="${appName}"/>
|
||||
<!--文件位置-->
|
||||
<property name="logback.logdir" value="/data/logs"/>
|
||||
|
||||
<!-- 定义控制台输出 -->
|
||||
<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
|
||||
<layout class="ch.qos.logback.classic.PatternLayout">
|
||||
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} - [%thread] - %-5level - %logger{50} - %msg%n</pattern>
|
||||
</layout>
|
||||
</appender>
|
||||
|
||||
|
||||
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
|
||||
<level>DEBUG</level>
|
||||
</filter>
|
||||
<File>${logback.logdir}/${logback.appname}/${logback.appname}.log</File>
|
||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||
<FileNamePattern>${logback.logdir}/${logback.appname}/${logback.appname}.%d{yyyy-MM-dd}.log.zip</FileNamePattern>
|
||||
<maxHistory>90</maxHistory>
|
||||
</rollingPolicy>
|
||||
<encoder>
|
||||
<charset>UTF-8</charset>
|
||||
<pattern>%d [%thread] %-5level %logger{36} %line - %msg%n</pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
|
||||
<!--evel:用来设置打印级别,大小写无关:TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF,-->
|
||||
<!--不能设置为INHERITED或者同义词NULL。默认是DEBUG。-->
|
||||
<root level="INFO">
|
||||
<appender-ref ref="stdout"/>
|
||||
</root>
|
||||
</configuration>
|
Reference in New Issue
Block a user