diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportQuery.java index 1706a029f2..c7d22a52d9 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportQuery.java @@ -58,8 +58,9 @@ public class BaseVehicleExportQuery implements Query { private String solidStartDate; @ApiModelProperty(value = "买断结束日期") private String solidEndDate; - + @ApiModelProperty("厂家开票日期开始") private String manDateStart; + @ApiModelProperty("厂家开票日期结束") private String manDateEnd; @ApiModelProperty(value = "分公司名称") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderBillInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderBillInfoVo.java index f33ada737a..07119b5672 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderBillInfoVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderBillInfoVo.java @@ -64,4 +64,9 @@ public class AppBusSalesOrderBillInfoVo implements Vo { @ApiModelProperty("是否包牌") private String licensePlateValue; + @ApiModelProperty("客户类型key") + private String customerClassKey; + @ApiModelProperty("客户类型value") + private String customerClass; + } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index 711ba7d2d3..fa40060989 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -221,7 +221,8 @@ financePlan, financePlanValue, licensePlateKey, - licensePlateValue + licensePlateValue, + customerClass,customerClassKey FROM bus_sales_order bo WHERE bo.sid = #{saleOrderSid} diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmOrderVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmOrderVo.java index d61e9f9331..6f3d73fde4 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmOrderVo.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmOrderVo.java @@ -35,6 +35,11 @@ public class CrmOrderVo implements Vo { @ApiModelProperty("客户sid") private String customerSid; + @ApiModelProperty("客户类型key") + private String customerClassKey; + @ApiModelProperty("客户类型value") + private String customerClass; + diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml index 7a06176c6f..cc1796259b 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml @@ -191,7 +191,7 @@ diff --git a/anrui-gateway/src/main/resources/application.yml b/anrui-gateway/src/main/resources/application.yml index 4bee12722f..b9670cefca 100644 --- a/anrui-gateway/src/main/resources/application.yml +++ b/anrui-gateway/src/main/resources/application.yml @@ -85,6 +85,12 @@ spring: uri: lb://anrui-reportcenter filters: - StripPrefix=1 + - id: yxt-as + predicates: + - Path= /as/** + uri: lb://yxt-as + filters: + - StripPrefix=1 ignore: whites: diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusSalesOrderBillInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusSalesOrderBillInfoVo.java index e55610ba4b..916f0fe4d9 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusSalesOrderBillInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusSalesOrderBillInfoVo.java @@ -68,4 +68,8 @@ public class BusSalesOrderBillInfoVo implements Vo { private String licensePlateKey; @ApiModelProperty("是否包牌") private String licensePlateValue; + @ApiModelProperty("客户类型key") + private String customerClassKey; + @ApiModelProperty("客户类型value") + private String customerClass; } diff --git a/yxt-as/pom.xml b/yxt-as/pom.xml new file mode 100644 index 0000000000..cd6246652f --- /dev/null +++ b/yxt-as/pom.xml @@ -0,0 +1,91 @@ + + + + + com.yxt.anrui + anrui + 0.0.1 + + + 4.0.0 + + com.yxt + yxt-as + 0.0.1 + + yxt-as + + + + + com.yxt + yxt-common-base + 0.0.1 + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + org.springframework.cloud + spring-cloud-starter-openfeign + + + + mysql + mysql-connector-java + runtime + + + com.baomidou + mybatis-plus-boot-starter + + + com.baomidou + mybatis-plus-annotation + + + org.projectlombok + lombok + 1.18.24 + true + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + 2.5.6 + + + + repackage + + + + + + + + src/main/java + + **/*Mapper.xml + + + + src/main/resources + + **/*.* + + false + + + + + + diff --git a/yxt-as/src/main/java/com/yxt/as/AsApplication.java b/yxt-as/src/main/java/com/yxt/as/AsApplication.java new file mode 100644 index 0000000000..fbb4f7f6cb --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/as/AsApplication.java @@ -0,0 +1,21 @@ +package com.yxt.as; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.openfeign.EnableFeignClients; + +/** + * 售后服务 + */ +@EnableDiscoveryClient +@SpringBootApplication(scanBasePackages = { + "com.yxt.common.base.config", + "com.yxt.as" +}) +@EnableFeignClients(basePackages = {}) +public class AsApplication { + public static void main(String[] args) { + SpringApplication.run(AsApplication.class, args); + } +} diff --git a/yxt-as/src/main/java/com/yxt/as/feign/base/basevehicle/BaseVehicleFeign.java b/yxt-as/src/main/java/com/yxt/as/feign/base/basevehicle/BaseVehicleFeign.java new file mode 100644 index 0000000000..6c9a2f35f4 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/as/feign/base/basevehicle/BaseVehicleFeign.java @@ -0,0 +1,15 @@ +package com.yxt.as.feign.base.basevehicle; + +import org.springframework.cloud.openfeign.FeignClient; + +/** + * @description: 车辆信息 + * @author: dimengzhe + * @date: 2024/3/6 + **/ +@FeignClient( + contextId = "anrui-base-BaseVehicle", + name = "anrui-base", + path = "v1/basevehicle") +public interface BaseVehicleFeign { +} diff --git a/yxt-as/src/main/java/com/yxt/as/feign/portal/sysstafforg/SysStaffOrgFeign.java b/yxt-as/src/main/java/com/yxt/as/feign/portal/sysstafforg/SysStaffOrgFeign.java new file mode 100644 index 0000000000..47d9938e9d --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/as/feign/portal/sysstafforg/SysStaffOrgFeign.java @@ -0,0 +1,25 @@ +package com.yxt.as.feign.portal.sysstafforg; + +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * @description: 人员与机构 + * @author: dimengzhe + * @date: 2024/3/6 + **/ +@FeignClient( + contextId = "anrui-portal-SysStaffOrg", + name = "anrui-portal", + path = "v1/sysstafforg") +public interface SysStaffOrgFeign { + + @GetMapping("/getOrgSidByPath") + @ResponseBody + @ApiOperation("根据用户组织全路径获取用户的分公司sid") + ResultBean getOrgSidByPath(@RequestParam("orgPath") String orgPath); +} diff --git a/yxt-as/src/main/resources/application-devv.yml b/yxt-as/src/main/resources/application-devv.yml new file mode 100644 index 0000000000..385f85890b --- /dev/null +++ b/yxt-as/src/main/resources/application-devv.yml @@ -0,0 +1,28 @@ +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://127.0.0.1:3306/yxt_as?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true + username: root + password: root + cloud: + nacos: + discovery: + server-addr: 127.0.0.1:8848 + redis: + database: 3 # Redis数据库索引（默认为0） + host: 127.0.0.1 + jedis: + pool: + max-active: -1 #连接池最大连接数（使用负值表示没有限制） + max-idle: 8 #连接池中的最大空闲连接 + max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制） + min-idle: 0 # 连接池中的最小空闲连接 + password: 123456 + port: 6379 + timeout: 0 # 连接超时时间（毫秒） + +image: + upload: + path: D:\\anrui\\upload\\ + url: + prefix: http://192.168.0.107:8111/upload/ \ No newline at end of file diff --git a/yxt-as/src/main/resources/application-pro.yml b/yxt-as/src/main/resources/application-pro.yml new file mode 100644 index 0000000000..965e72a704 --- /dev/null +++ b/yxt-as/src/main/resources/application-pro.yml @@ -0,0 +1,28 @@ +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://120.46.172.184:3306/yxt_as?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8 + username: root + password: '@anrui18033887500' + cloud: + nacos: + discovery: + server-addr: 127.0.0.1:8848 + redis: + database: 3 # Redis数据库索引（默认为0） + host: 127.0.0.1 + jedis: + pool: + max-active: -1 #连接池最大连接数（使用负值表示没有限制） + max-idle: 8 #连接池中的最大空闲连接 + max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制） + min-idle: 0 # 连接池中的最小空闲连接 + password: 123456 + port: 6379 + timeout: 0 # 连接超时时间（毫秒） + +image: + upload: + path: D:\anrui\upload\ + url: + prefix: http://120.46.172.184/api/upload/ diff --git a/yxt-as/src/main/resources/application-test.yml b/yxt-as/src/main/resources/application-test.yml new file mode 100644 index 0000000000..a1132b9ee2 --- /dev/null +++ b/yxt-as/src/main/resources/application-test.yml @@ -0,0 +1,29 @@ +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://172.18.0.4:3306/yxt_as?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true + username: root + password: yxt_mysql_138 + cloud: + nacos: + discovery: + server-addr: 172.18.0.5:8848 + redis: + database: 3 # Redis数据库索引（默认为0） + host: 172.18.0.7 + jedis: + pool: + max-active: -1 #连接池最大连接数（使用负值表示没有限制） + max-idle: 8 #连接池中的最大空闲连接 + max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制） + min-idle: 0 # 连接池中的最小空闲连接 + password: + port: 6379 + timeout: 0 # 连接超时时间（毫秒） + +image: + upload: + path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload/ + url: + prefix: http://anrui.yyundong.com/upload/ + diff --git a/yxt-as/src/main/resources/application.yml b/yxt-as/src/main/resources/application.yml new file mode 100644 index 0000000000..d9b2408398 --- /dev/null +++ b/yxt-as/src/main/resources/application.yml @@ -0,0 +1,62 @@ +spring: + application: + name: yxt-as + profiles: + active: devv + messages: + # 国际化资源文件路径 + basename: i18n/messages + servlet: + #上传文件 + multipart: + max-file-size: 50MB + max-request-size: 100MB + devtools: + restart: + # 热部署开关 + enabled: true + mvc: + async: + request-timeout: 20000 + + + +server: + port: 7011 + max-http-header-size: 102400 + tomcat: + max-http-form-post-size: -1 +#mybatis +mybatis-plus: + # 配置mapper的扫描，找到所有的mapper.xml映射文件 + mapper-locations: classpath*:**Mapper.xml + global-config: + refresh: true + db-config: + #定义生成ID的类型 + id-type: Auto + db-type: mysql + configuration: + map-underscore-to-camel-case: false + cache-enabled: true + call-setters-on-nulls: true + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + +#hystrix的超时时间 +hystrix: + command: + default: + execution: + timeout: + enabled: true + isolation: + thread: + timeoutInMilliseconds: 60000 +#ribbon的超时时间 +ribbon: + ReadTimeout: 60000 + ConnectTimeout: 60000 + + + + diff --git a/yxt-as/src/main/resources/banner.txt b/yxt-as/src/main/resources/banner.txt new file mode 100644 index 0000000000..98e44c5880 --- /dev/null +++ b/yxt-as/src/main/resources/banner.txt @@ -0,0 +1,13 @@ + ,----.. ____ + / / \ ,' , `. +| : : ,---. ,-+-,.' _ | ,---. ,---, +. | ;. / ' ,'\ ,-+-. ; , || ' ,'\ ,-+-. / | +. ; /--` / / | ,--.'|' | || ,---. / / | ,--.'|' | +; | ; . ; ,. :| | ,', | |,/ \ . ; ,. :| | ,"' | +| : | ' | |: :| | / | |--'/ / | ' | |: :| | / | | +. | '___' | .; :| : | | , . ' / | ' | .; :| | | | | +' ; : .'| : || : | |/ ' ; /| | : || | | |/ +' | '/ :\ \ / | | |`-' ' | / | \ \ / | | |--' +| : / `----' | ;/ | : | `----' | |/ + \ \ .' '---' \ \ / '---' + `---` `----' diff --git a/yxt-as/src/main/resources/logback-spring.xml b/yxt-as/src/main/resources/logback-spring.xml new file mode 100644 index 0000000000..d74a0b15a3 --- /dev/null +++ b/yxt-as/src/main/resources/logback-spring.xml @@ -0,0 +1,50 @@ + + + + + + + + + + %yellow(%date{yyyy-MM-dd HH:mm:ss}) |%highlight(%-5level) |%green(%logger:%line) |%blue(%msg%n) + + + + + + + + + + + + + + + ${log.base}.log + + ${log.base}.%d{yyyyMMdd}.%i.log.zip + + + + 1MB + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} + -%msg%n + + + + + + + + + + \ No newline at end of file