diff --git a/yunzhupaas-admin/pom.xml b/yunzhupaas-admin/pom.xml
index 8907f7d..3e87752 100644
--- a/yunzhupaas-admin/pom.xml
+++ b/yunzhupaas-admin/pom.xml
@@ -103,16 +103,16 @@
${project.version}
-
- com.yunzhupaas
- yunzhupaas-crm-controller
- ${project.version}
-
-
- com.yunzhupaas
- yunzhupaas-pcm-controller
- ${project.version}
-
+
+
+
+
+
+
+
+
+
+
com.yunzhupaas
diff --git a/yunzhupaas-admin/src/main/resources/application-dev.yml b/yunzhupaas-admin/src/main/resources/application-dev.yml
index 73ef8b6..c4dd5e2 100644
--- a/yunzhupaas-admin/src/main/resources/application-dev.yml
+++ b/yunzhupaas-admin/src/main/resources/application-dev.yml
@@ -2,7 +2,7 @@
server:
tomcat:
uri-encoding: UTF-8 #tomcat编码
- port: 30000 #tomcat端口
+ port: 40000 #tomcat端口
spring:
messages:
@@ -21,11 +21,12 @@ spring:
exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure #排除自动配置,手动配置druid
datasource:
db-type: MySQL #数据库类型(可选值 MySQL、SQLServer、Oracle、DM8、KingbaseES、PostgreSQL,请严格按可选值填写)
+ # host: aliyun.szlecheng.cn
host: mysql.szlecheng.cn
port: 13306
- username: yunzhupass
- password: '@yunzhupass'
- db-name: dev_yunzhupaas
+ username: jnpfsoft
+ password: ZtRmzjij4CiaXpSE
+ db-name: jnpfsoft_dev
db-schema: #金仓达梦选填
prepare-url: #自定义url
@@ -71,12 +72,12 @@ spring:
statementPrepareAfterLogEnabled: false
statementPrepareCallAfterLogEnabled: false
statementParameterSetLogEnabled: false
-# datasource:
-# master:
-# url: jdbc:mysql://${spring.datasource.host}:${spring.datasource.port}/${spring.datasource.dbname}?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=UTC
-# username: ${spring.datasource.username}
-# password: ${spring.datasource.password}
-# driver-class-name: com.mysql.cj.jdbc.Driver
+ # datasource:
+ # master:
+ # url: jdbc:mysql://${spring.datasource.host}:${spring.datasource.port}/${spring.datasource.dbname}?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=UTC
+ # username: ${spring.datasource.username}
+ # password: ${spring.datasource.password}
+ # driver-class-name: com.mysql.cj.jdbc.Driver
# ===================== Redis配置 =====================
# redis单机模式
@@ -85,7 +86,7 @@ spring:
database: 10
host: 127.0.0.1
port: 6379
-# password: redis_JtjYRD # 密码为空时,请将本行注释
+ # password: redis_JtjYRD # 密码为空时,请将本行注释
timeout: 3000 #超时时间(单位:秒)
lettuce: #Lettuce为Redis的Java驱动包
pool:
@@ -94,24 +95,24 @@ spring:
min-idle: 0 # 连接池中的最小空闲连接
max-idle: 8 # 连接池中的最大空闲连接
-# redis集群模式
-# redis:
-# cluster:
-# nodes:
-# - 192.168.0.225:6380
-# - 192.168.0.225:6381
-# - 192.168.0.225:6382
-# - 192.168.0.225:6383
-# - 192.168.0.225:6384
-# - 192.168.0.225:6385
-# password: 123456 # 密码为空时,请将本行注释
-# timeout: 3000 # 超时时间(单位:秒)
-# lettuce: #Lettuce为Redis的Java驱动包
-# pool:
-# max-active: 8 # 连接池最大连接数
-# max-wait: -1ms # 连接池最大阻塞等待时间(使用负值表示没有限制)
-# min-idle: 0 # 连接池中的最小空闲连接
-# max-idle: 8 # 连接池中的最大空闲连接
+ # redis集群模式
+ # redis:
+ # cluster:
+ # nodes:
+ # - 192.168.0.225:6380
+ # - 192.168.0.225:6381
+ # - 192.168.0.225:6382
+ # - 192.168.0.225:6383
+ # - 192.168.0.225:6384
+ # - 192.168.0.225:6385
+ # password: 123456 # 密码为空时,请将本行注释
+ # timeout: 3000 # 超时时间(单位:秒)
+ # lettuce: #Lettuce为Redis的Java驱动包
+ # pool:
+ # max-active: 8 # 连接池最大连接数
+ # max-wait: -1ms # 连接池最大阻塞等待时间(使用负值表示没有限制)
+ # min-idle: 0 # 连接池中的最小空闲连接
+ # max-idle: 8 # 连接池中的最大空闲连接
# ===================== Redis配置-End =====================
# ===================== 单点登录(用户信息同步)配置-Start =====================
cloud:
@@ -123,30 +124,30 @@ spring:
group: maxkey_identity
# 若使用RocketMQ-End
# 若使用RabbitMQ-Start
-# binders:
-# defaultRabbit: # 表示定义的名称,用于binding整合
-# type: rabbit # 消息组件类型
-# environment: # 设置rabbitmq的相关环境配置
-# spring:
-# rabbitmq:
-# host: 192.168.10.6
-# port: 5672
-# username: rabbitmq
-# password: rabbitmq
+ # binders:
+ # defaultRabbit: # 表示定义的名称,用于binding整合
+ # type: rabbit # 消息组件类型
+ # environment: # 设置rabbitmq的相关环境配置
+ # spring:
+ # rabbitmq:
+ # host: 192.168.10.6
+ # port: 5672
+ # username: rabbitmq
+ # password: rabbitmq
# 若使用RabbitMQ-End
# 若使用Kafka-Start
-# kafka:
-# # KafkaBinderConfigurationProperties
-# binder:
-# brokers: 192.168.10.6:9092
+ # kafka:
+ # # KafkaBinderConfigurationProperties
+ # binder:
+ # brokers: 192.168.10.6:9092
# 若使用Kafka-End
bindings:
ssoEventReceiver-in-0:
content-type: text/json
destination: MXK_IDENTITY_MAIN_TOPIC
group: maxkey_identity
- # ===================== 单点登录(用户信息同步)配置-End =====================
- # ===================== AI配置-Start =====================
+ # ===================== 单点登录(用户信息同步)配置-End =====================
+ # ===================== AI配置-Start =====================
ai:
openai:
enabled: true
@@ -160,16 +161,16 @@ spring:
mode: qwen-max
# GPT转发平台
-# api-host: https://api.chatanywhere.tech/
-# api-key:
-# chat:
-# mode: gpt-3.5-turbo
+ # api-host: https://api.chatanywhere.tech/
+ # api-key:
+ # chat:
+ # mode: gpt-3.5-turbo
# DeepSeek
-# api-host: https://api.deepseek.com/v1/
-# api-key:
-# chat:
-# mode: deepseek-chat
+ # api-host: https://api.deepseek.com/v1/
+ # api-key:
+ # chat:
+ # mode: deepseek-chat
# ===================== AI配置-End =====================
# SpringDoc接口文档 访问地址:http://127.0.0.1:30000/doc.html
@@ -204,7 +205,7 @@ config:
enable-storage: true #启用存储
enable-access: true #启用访问(线上请使用 Nginx 配置,效率更高)
domain: "" # 访问域名,例如:“http://127.0.0.1:8030/”,注意后面要和 path-patterns 保持一致,“/”结尾,本地存储建议使用相对路径,方便后期更换域名
-# base-path: /data/work-data/upload/jnpfsoft/yunzhupaas-resources/ # 基础路径
+ # base-path: /data/work-data/upload/jnpfsoft/yunzhupaas-resources/ # 基础路径
base-path: E:/XiangMu/yunzhu/zero-resources/ # 基础路径
path-patterns: /** # 访问路径
storage-path: # 存储路径
@@ -339,9 +340,9 @@ oauth:
defaultSSO: cas
#后端登录接口地址
loginPath: http://127.0.0.1:30000/api/oauth/Login
- #login:
- #JWT生成秘钥 不填写为默认值
- #jwtSecretKey: WviMjFNC72VKwGqm5LPoheQo5XN9iN4d
+ #login:
+ #JWT生成秘钥 不填写为默认值
+ #jwtSecretKey: WviMjFNC72VKwGqm5LPoheQo5XN9iN4d
sso:
#单点登录系统地址
baseUrl: http://127.0.0.1:8527
@@ -366,3 +367,4 @@ oauth:
serverLoginUrl: ${oauth.sso.cas.baseUrl}/sign/authz/cas/login
serverValidateUrl: ${oauth.sso.cas.baseUrl}/sign/authz/cas
# ===================== 单点登录(SSO)配置-End =====================
+userUrl: http://192.168.3.31:8000/api-web/sys/user/save
\ No newline at end of file
diff --git a/yunzhupaas-admin/src/main/resources/application-prod.yml b/yunzhupaas-admin/src/main/resources/application-prod.yml
index 67c211f..8bc68ed 100644
--- a/yunzhupaas-admin/src/main/resources/application-prod.yml
+++ b/yunzhupaas-admin/src/main/resources/application-prod.yml
@@ -2,7 +2,7 @@
server:
tomcat:
uri-encoding: UTF-8 #tomcat编码
- port: 30000 #tomcat端口
+ port: 40001 #tomcat端口
spring:
messages:
@@ -20,12 +20,13 @@ spring:
# ===================== 数据源配置 =====================
exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure #排除自动配置,手动配置druid
datasource:
- db-type: MySQL #数据库类型(可选值 MySQL、SQLServer、Oracle、DM、KingbaseES、PostgreSQL,请严格按可选值填写)
- host: 127.0.0.1
- port: 3306
- username: root
- password: 123456
- db-name: yunzhupaas_init
+ db-type: MySQL #数据库类型(可选值 MySQL、SQLServer、Oracle、DM8、KingbaseES、PostgreSQL,请严格按可选值填写)
+ # host: aliyun.szlecheng.cn
+ host: mysql.szlecheng.cn
+ port: 13306
+ username: yunzhupass
+ password: '@yunzhupass'
+ db-name: pord_yunzhupass
db-schema: #金仓达梦选填
prepare-url: #自定义url
@@ -78,20 +79,21 @@ spring:
# password: ${spring.datasource.password}
# driver-class-name: com.mysql.cj.jdbc.Driver
- # ===================== Redis配置-Start =====================
+ # ===================== Redis配置 =====================
# redis单机模式
- redis:
- database: 1 #缓存库编号
- host: 127.0.0.1
- port: 6379
- password: 123456 # 密码为空时,请将本行注释
- timeout: 3000 #超时时间(单位:秒)
- lettuce: #Lettuce为Redis的Java驱动包
- pool:
- max-active: 8 # 连接池最大连接数
- max-wait: -1ms # 连接池最大阻塞等待时间(使用负值表示没有限制)
- min-idle: 0 # 连接池中的最小空闲连接
- max-idle: 8 # 连接池中的最大空闲连接
+ data:
+ redis:
+ database: 10
+ host: 127.0.0.1
+ port: 6379
+ # password: redis_JtjYRD # 密码为空时,请将本行注释
+ timeout: 3000 #超时时间(单位:秒)
+ lettuce: #Lettuce为Redis的Java驱动包
+ pool:
+ max-active: 8 # 连接池最大连接数
+ max-wait: -1ms # 连接池最大阻塞等待时间(使用负值表示没有限制)
+ min-idle: 0 # 连接池中的最小空闲连接
+ max-idle: 8 # 连接池中的最大空闲连接
# redis集群模式
# redis:
@@ -144,7 +146,33 @@ spring:
content-type: text/json
destination: MXK_IDENTITY_MAIN_TOPIC
group: maxkey_identity
- # ===================== 单点登录(用户信息同步)配置-End =====================
+ # ===================== 单点登录(用户信息同步)配置-End =====================
+ # ===================== AI配置-Start =====================
+ ai:
+ openai:
+ enabled: true
+ # 超时时间, 秒, 根据AI平台性能调整超时时间
+ timeout: 300
+
+ # 阿里百联平台
+ api-host: https://dashscope.aliyuncs.com/compatible-mode/
+ api-key: sk-def0e6d9d0f8497cb5bcfff8c0c19935
+ chat:
+ mode: qwen-max
+
+ # GPT转发平台
+ # api-host: https://api.chatanywhere.tech/
+ # api-key:
+ # chat:
+ # mode: gpt-3.5-turbo
+
+ # DeepSeek
+ # api-host: https://api.deepseek.com/v1/
+ # api-key:
+ # chat:
+ # mode: deepseek-chat
+
+ # ===================== AI配置-End =====================
# SpringDoc接口文档 访问地址:http://127.0.0.1:30000/doc.html
springdoc:
default-flat-param-object: true
@@ -177,7 +205,8 @@ config:
enable-storage: true #启用存储
enable-access: true #启用访问(线上请使用 Nginx 配置,效率更高)
domain: "" # 访问域名,例如:“http://127.0.0.1:8030/”,注意后面要和 path-patterns 保持一致,“/”结尾,本地存储建议使用相对路径,方便后期更换域名
- base-path: D:/project/yunzhupaas-resources/ # 基础路径
+ # base-path: /data/work-data/upload/jnpfsoft/yunzhupaas-resources/ # 基础路径
+ base-path: E:/XiangMu/yunzhu/zero-resources/ # 基础路径
path-patterns: /** # 访问路径
storage-path: # 存储路径
aliyun-oss: # 阿里云 OSS ,不使用的情况下可以不写
@@ -311,26 +340,31 @@ oauth:
defaultSSO: cas
#后端登录接口地址
loginPath: http://127.0.0.1:30000/api/oauth/Login
- #轮询登录模式是否输出结果
- ticketOutMessage: false
- login:
+ #login:
#JWT生成秘钥 不填写为默认值
#jwtSecretKey: WviMjFNC72VKwGqm5LPoheQo5XN9iN4d
sso:
+ #单点登录系统地址
+ baseUrl: http://127.0.0.1:8527
#登录成功后跳转到前端的页面
- sucessFrontUrl: http://127.0.0.1:3000/sso
+ sucessFrontUrl: http://127.0.0.1:3100/sso
+ #错误信息是否输出到页面
+ ticketOutMessage: false
#logoutFrontUrl: http://sso.maxkey.top:8527/maxkey
+ #单点注销后端接口地址, 配置启用后YUNZHUPAAS退出会请求单点系统退出, 触发单点注销退出全部应用
+ #ssoLogoutApiUrl: ${oauth.sso.baseUrl}/sign/logout
auth2:
enabled: true
clientId: 747887288041603072
clientSecret: MYgMMjIwNzIwMjIxNTU4MTAxNzQlKQ
- baseUrl: http://127.0.0.1:8527
+ baseUrl: ${oauth.sso.baseUrl}
authorizeUrl: ${oauth.sso.auth2.baseUrl}/sign/authz/oauth/v20/authorize
accessTokenUrl: ${oauth.sso.auth2.baseUrl}/sign/authz/oauth/v20/token
userInfoUrl: ${oauth.sso.auth2.baseUrl}/sign/api/oauth/v20/me
cas:
enabled: true
- baseUrl: ${oauth.sso.auth2.baseUrl}
+ baseUrl: ${oauth.sso.baseUrl}
serverLoginUrl: ${oauth.sso.cas.baseUrl}/sign/authz/cas/login
serverValidateUrl: ${oauth.sso.cas.baseUrl}/sign/authz/cas
# ===================== 单点登录(SSO)配置-End =====================
+userUrl: http://192.168.3.31:8000/api-web/sys/user/save
\ No newline at end of file
diff --git a/yunzhupaas-admin/src/main/resources/application-test.yml b/yunzhupaas-admin/src/main/resources/application-test.yml
index 064bcf8..c068f11 100644
--- a/yunzhupaas-admin/src/main/resources/application-test.yml
+++ b/yunzhupaas-admin/src/main/resources/application-test.yml
@@ -2,7 +2,7 @@
server:
tomcat:
uri-encoding: UTF-8 #tomcat编码
- port: 30000 #tomcat端口
+ port: 40001 #tomcat端口
spring:
messages:
@@ -24,9 +24,9 @@ spring:
# host: aliyun.szlecheng.cn
host: mysql.szlecheng.cn
port: 13306
- username: yunzhupass
- password: '@yunzhupass'
- db-name: pord_yunzhupass
+ username: oa_yunzhupaas
+ password: OAYUNZHUPAAS
+ db-name: oa_yunzhupass
db-schema: #金仓达梦选填
prepare-url: #自定义url
diff --git a/yunzhupaas-admin/src/main/resources/application.yml b/yunzhupaas-admin/src/main/resources/application.yml
index 5149dc8..ede0f11 100644
--- a/yunzhupaas-admin/src/main/resources/application.yml
+++ b/yunzhupaas-admin/src/main/resources/application.yml
@@ -3,7 +3,7 @@ spring:
name: yunzhupaas-boot
profiles:
# 指定环境配置 dev(开发环境-默认)、test(测试环境)、preview(预生产)、prod(生产环境)
- active: dev
+ active: test
servlet:
multipart: #文件传输配置
max-file-size: 100MB #单个数据大小限制
diff --git a/yunzhupaas-admin/src/main/resources/mapper/crm/CrmOpportunityMapper.xml b/yunzhupaas-admin/src/main/resources/mapper/crm/CrmOpportunityMapper.xml
deleted file mode 100644
index d7c5555..0000000
--- a/yunzhupaas-admin/src/main/resources/mapper/crm/CrmOpportunityMapper.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
- update crm_customer set last_followup_date=#{lastFollowupDate} where company_id=#{customerId}
-
-
-
-
-
diff --git a/yunzhupaas-admin/src/main/resources/mapper/mdm/BcmProjectTypeMapper.xml b/yunzhupaas-admin/src/main/resources/mapper/mdm/BcmProjectTypeMapper.xml
deleted file mode 100644
index 8feac3a..0000000
--- a/yunzhupaas-admin/src/main/resources/mapper/mdm/BcmProjectTypeMapper.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/yunzhupaas-admin/src/main/resources/mapper/mdm/MdmCompanyMapper.xml b/yunzhupaas-admin/src/main/resources/mapper/mdm/CompanyBankMapper.xml
similarity index 71%
rename from yunzhupaas-admin/src/main/resources/mapper/mdm/MdmCompanyMapper.xml
rename to yunzhupaas-admin/src/main/resources/mapper/mdm/CompanyBankMapper.xml
index 5c6cbf8..dec6879 100644
--- a/yunzhupaas-admin/src/main/resources/mapper/mdm/MdmCompanyMapper.xml
+++ b/yunzhupaas-admin/src/main/resources/mapper/mdm/CompanyBankMapper.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/yunzhupaas-admin/src/main/resources/mapper/mdm/CompanyInvoiceMapper.xml b/yunzhupaas-admin/src/main/resources/mapper/mdm/CompanyInvoiceMapper.xml
new file mode 100644
index 0000000..4c4badd
--- /dev/null
+++ b/yunzhupaas-admin/src/main/resources/mapper/mdm/CompanyInvoiceMapper.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/yunzhupaas-admin/src/main/resources/mapper/crm/CrmLeadMapper.xml b/yunzhupaas-admin/src/main/resources/mapper/mdm/CompanyMapper.xml
similarity index 72%
rename from yunzhupaas-admin/src/main/resources/mapper/crm/CrmLeadMapper.xml
rename to yunzhupaas-admin/src/main/resources/mapper/mdm/CompanyMapper.xml
index 1d0677e..b5a1158 100644
--- a/yunzhupaas-admin/src/main/resources/mapper/crm/CrmLeadMapper.xml
+++ b/yunzhupaas-admin/src/main/resources/mapper/mdm/CompanyMapper.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/yunzhupaas-admin/src/main/resources/mapper/mdm/MdmProjectMapper.xml b/yunzhupaas-admin/src/main/resources/mapper/mdm/CorporationMapper.xml
similarity index 71%
rename from yunzhupaas-admin/src/main/resources/mapper/mdm/MdmProjectMapper.xml
rename to yunzhupaas-admin/src/main/resources/mapper/mdm/CorporationMapper.xml
index f3d7594..8e60f3a 100644
--- a/yunzhupaas-admin/src/main/resources/mapper/mdm/MdmProjectMapper.xml
+++ b/yunzhupaas-admin/src/main/resources/mapper/mdm/CorporationMapper.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/yunzhupaas-admin/src/main/resources/mapper/crm/CrmCustomerMapper.xml b/yunzhupaas-admin/src/main/resources/mapper/mdm/CustomersMapper.xml
similarity index 70%
rename from yunzhupaas-admin/src/main/resources/mapper/crm/CrmCustomerMapper.xml
rename to yunzhupaas-admin/src/main/resources/mapper/mdm/CustomersMapper.xml
index 7a5c65f..6b8a13e 100644
--- a/yunzhupaas-admin/src/main/resources/mapper/crm/CrmCustomerMapper.xml
+++ b/yunzhupaas-admin/src/main/resources/mapper/mdm/CustomersMapper.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/yunzhupaas-admin/src/main/resources/mapper/mdm/MaterialMapper.xml b/yunzhupaas-admin/src/main/resources/mapper/mdm/MaterialMapper.xml
new file mode 100644
index 0000000..6e5cd98
--- /dev/null
+++ b/yunzhupaas-admin/src/main/resources/mapper/mdm/MaterialMapper.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/yunzhupaas-admin/src/main/resources/mapper/mdm/MdmCompanyBankMapper.xml b/yunzhupaas-admin/src/main/resources/mapper/mdm/MdmCompanyBankMapper.xml
deleted file mode 100644
index 0e10b0c..0000000
--- a/yunzhupaas-admin/src/main/resources/mapper/mdm/MdmCompanyBankMapper.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/yunzhupaas-admin/src/main/resources/mapper/mdm/MdmCompanyContactMapper.xml b/yunzhupaas-admin/src/main/resources/mapper/mdm/MdmCompanyContactMapper.xml
deleted file mode 100644
index b48dc2b..0000000
--- a/yunzhupaas-admin/src/main/resources/mapper/mdm/MdmCompanyContactMapper.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/yunzhupaas-admin/src/main/resources/mapper/mdm/MdmContractTypeMapper.xml b/yunzhupaas-admin/src/main/resources/mapper/mdm/MdmContractTypeMapper.xml
deleted file mode 100644
index 7245025..0000000
--- a/yunzhupaas-admin/src/main/resources/mapper/mdm/MdmContractTypeMapper.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/yunzhupaas-admin/src/main/resources/mapper/mdm/PanyInvoiceMapper.xml b/yunzhupaas-admin/src/main/resources/mapper/mdm/PanyInvoiceMapper.xml
new file mode 100644
index 0000000..ec4488b
--- /dev/null
+++ b/yunzhupaas-admin/src/main/resources/mapper/mdm/PanyInvoiceMapper.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/yunzhupaas-admin/src/main/resources/mapper/mdm/ProductsMapper.xml b/yunzhupaas-admin/src/main/resources/mapper/mdm/ProductsMapper.xml
new file mode 100644
index 0000000..9842846
--- /dev/null
+++ b/yunzhupaas-admin/src/main/resources/mapper/mdm/ProductsMapper.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/yunzhupaas-admin/src/main/resources/mapper/mdm/SupplierMapper.xml b/yunzhupaas-admin/src/main/resources/mapper/mdm/SupplierMapper.xml
new file mode 100644
index 0000000..7e210bc
--- /dev/null
+++ b/yunzhupaas-admin/src/main/resources/mapper/mdm/SupplierMapper.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/yunzhupaas-admin/src/main/resources/mapper/pcm/PcmContractMapper.xml b/yunzhupaas-admin/src/main/resources/mapper/pcm/PcmContractMapper.xml
deleted file mode 100644
index a82ba23..0000000
--- a/yunzhupaas-admin/src/main/resources/mapper/pcm/PcmContractMapper.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
- insert into pcm_document (document_id,file_size,file_name,file_ext_name,local_path)
- values (#{fileId},#{fileSize},#{name},#{fileExtension},#{url})
-
-
- insert into pcm_business_document (table_name,business_object_id,document_id)
- values (#{tableName},#{businessObjectId},#{documentId})
-
-
-
-
- delete from pcm_business_document where business_object_id=#{businessObjectId} and table_name =#{tableName}
-
-
-
-
diff --git a/yunzhupaas-admin/src/main/resources/mapper/pcm/Pcm_contract_itemMapper.xml b/yunzhupaas-admin/src/main/resources/mapper/pcm/Pcm_contract_itemMapper.xml
deleted file mode 100644
index cb92fc1..0000000
--- a/yunzhupaas-admin/src/main/resources/mapper/pcm/Pcm_contract_itemMapper.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/yunzhupaas-admin/src/main/resources/mapper/pcm/Pcm_payment_planMapper.xml b/yunzhupaas-admin/src/main/resources/mapper/pcm/Pcm_payment_planMapper.xml
deleted file mode 100644
index fd4f651..0000000
--- a/yunzhupaas-admin/src/main/resources/mapper/pcm/Pcm_payment_planMapper.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/yunzhupaas-crm/yunzhupaas-crm-biz/src/main/java/com/yunzhupaas/base/mapper/CrmOpportunityMapper.java b/yunzhupaas-crm/yunzhupaas-crm-biz/src/main/java/com/yunzhupaas/base/mapper/CrmOpportunityMapper.java
deleted file mode 100644
index ca2c187..0000000
--- a/yunzhupaas-crm/yunzhupaas-crm-biz/src/main/java/com/yunzhupaas/base/mapper/CrmOpportunityMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.yunzhupaas.base.mapper;
-
-
-import com.yunzhupaas.base.entity.CrmOpportunityEntity;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yunzhupaas.base.mapper.SuperMapper;
-
-/**
- * crm_opportunity
- * 版本: V5.2.7
- * 版权: Copyright @ 2025 深圳市乐程软件有限公司版权所有
- * 作者: 深圳市乐程软件有限公司
- * 日期: 2026-03-27
- */
-public interface CrmOpportunityMapper extends SuperMapper {
-
- String selectCustomerBycustomerId(String customerId);
-
- int updateByCustomerByCustomerId(CrmOpportunityEntity entity);
-}
diff --git a/yunzhupaas-crm/yunzhupaas-crm-biz/src/main/java/com/yunzhupaas/base/service/CrmLeadService.java b/yunzhupaas-crm/yunzhupaas-crm-biz/src/main/java/com/yunzhupaas/base/service/CrmLeadService.java
deleted file mode 100644
index c25c4fa..0000000
--- a/yunzhupaas-crm/yunzhupaas-crm-biz/src/main/java/com/yunzhupaas/base/service/CrmLeadService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.yunzhupaas.base.service;
-
-import com.yunzhupaas.base.entity.*;
-import com.yunzhupaas.base.service.SuperService;
-import com.yunzhupaas.base.model.crmlead.*;
-import java.util.*;
-
-/**
- * crm_lead
- * 版本: V5.2.7
- * 版权: Copyright @ 2025 深圳市乐程软件有限公司版权所有
- * 作者: 深圳市乐程软件有限公司
- * 日期: 2026-03-27
- */
-public interface CrmLeadService extends SuperService {
- List getList(CrmLeadPagination crmLeadPagination);
-
- List getTypeList(CrmLeadPagination crmLeadPagination,String dataType);
-
- CrmLeadEntity getInfo(String leadid);
-
- void delete(CrmLeadEntity entity);
-
- void create(CrmLeadEntity entity);
-
- boolean update(String leadid, CrmLeadEntity entity);
-
- String checkForm(CrmLeadForm form,int i);
-
- void saveOrUpdate(CrmLeadForm crmLeadForm,String id, boolean isSave) throws Exception;
-}
diff --git a/yunzhupaas-crm/yunzhupaas-crm-biz/src/main/java/com/yunzhupaas/base/service/CrmOpportunityService.java b/yunzhupaas-crm/yunzhupaas-crm-biz/src/main/java/com/yunzhupaas/base/service/CrmOpportunityService.java
deleted file mode 100644
index 5956fd1..0000000
--- a/yunzhupaas-crm/yunzhupaas-crm-biz/src/main/java/com/yunzhupaas/base/service/CrmOpportunityService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.yunzhupaas.base.service;
-
-import com.yunzhupaas.base.entity.*;
-import com.yunzhupaas.base.service.SuperService;
-import com.yunzhupaas.base.model.crmopportunity.*;
-import java.util.*;
-
-/**
- * crm_opportunity
- * 版本: V5.2.7
- * 版权: Copyright @ 2025 深圳市乐程软件有限公司版权所有
- * 作者: 深圳市乐程软件有限公司
- * 日期: 2026-03-27
- */
-public interface CrmOpportunityService extends SuperService {
- List getList(CrmOpportunityPagination crmOpportunityPagination);
-
- List getTypeList(CrmOpportunityPagination crmOpportunityPagination,String dataType);
-
- CrmOpportunityEntity getInfo(String opportunityid);
-
- void delete(CrmOpportunityEntity entity);
-
- void create(CrmOpportunityEntity entity);
-
- boolean update(String opportunityid, CrmOpportunityEntity entity);
-
- String checkForm(CrmOpportunityForm form,int i);
-
- void saveOrUpdate(CrmOpportunityForm crmOpportunityForm,String id, boolean isSave) throws Exception;
-
- String selectCustomerBycustomerId(String customerId);
-}
diff --git a/yunzhupaas-crm/yunzhupaas-crm-biz/src/main/java/com/yunzhupaas/base/service/impl/CrmCustomerServiceImpl.java b/yunzhupaas-crm/yunzhupaas-crm-biz/src/main/java/com/yunzhupaas/base/service/impl/CrmCustomerServiceImpl.java
deleted file mode 100644
index 676e13a..0000000
--- a/yunzhupaas-crm/yunzhupaas-crm-biz/src/main/java/com/yunzhupaas/base/service/impl/CrmCustomerServiceImpl.java
+++ /dev/null
@@ -1,33 +0,0 @@
-
-package com.yunzhupaas.base.service.impl;
-
-import com.yunzhupaas.base.entity.*;
-import com.yunzhupaas.base.mapper.CrmCustomerMapper;
-import com.yunzhupaas.base.service.*;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import com.yunzhupaas.base.service.SuperServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.yunzhupaas.util.GeneraterSwapUtil;
-import java.sql.Connection;
-import java.sql.SQLException;
-import lombok.Cleanup;
-import com.yunzhupaas.database.plugins.DynamicSourceGeneratorInterface;
-import com.yunzhupaas.database.util.DynamicDataSourceUtil;
-import org.apache.commons.collections4.CollectionUtils;
-import com.yunzhupaas.i18n.util.I18nUtil;
-import com.yunzhupaas.exception.DataException;
-import com.yunzhupaas.constant.MsgCode;
-/**
- *
- * mdm_company
- * 版本: V5.2.7
- * 版权: Copyright @ 2025 深圳市乐程软件有限公司版权所有
- * 作者: 深圳市乐程软件有限公司
- * 日期: 2026-03-27
- */
-@Service
-public class CrmCustomerServiceImpl extends SuperServiceImpl implements CrmCustomerService{
- @Autowired
- private GeneraterSwapUtil generaterSwapUtil;
-}
diff --git a/yunzhupaas-crm/yunzhupaas-crm-biz/src/main/java/com/yunzhupaas/base/service/impl/CrmLeadServiceImpl.java b/yunzhupaas-crm/yunzhupaas-crm-biz/src/main/java/com/yunzhupaas/base/service/impl/CrmLeadServiceImpl.java
deleted file mode 100644
index 454ea1e..0000000
--- a/yunzhupaas-crm/yunzhupaas-crm-biz/src/main/java/com/yunzhupaas/base/service/impl/CrmLeadServiceImpl.java
+++ /dev/null
@@ -1,334 +0,0 @@
-
-package com.yunzhupaas.base.service.impl;
-
-import com.yunzhupaas.base.entity.*;
-import com.yunzhupaas.base.mapper.CrmLeadMapper;
-import com.yunzhupaas.base.service.*;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yunzhupaas.base.model.crmlead.*;
-import org.springframework.stereotype.Service;
-import com.yunzhupaas.base.service.SuperServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.yunzhupaas.util.GeneraterSwapUtil;
-import java.sql.Connection;
-import java.sql.SQLException;
-import lombok.Cleanup;
-import com.yunzhupaas.database.plugins.DynamicSourceGeneratorInterface;
-import com.yunzhupaas.database.util.DynamicDataSourceUtil;
-import org.apache.commons.collections4.CollectionUtils;
-import com.yunzhupaas.i18n.util.I18nUtil;
-import com.yunzhupaas.exception.DataException;
-import com.yunzhupaas.constant.MsgCode;
-import java.math.BigDecimal;
-import cn.hutool.core.util.ObjectUtil;
-import java.lang.reflect.Field;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-import com.yunzhupaas.base.model.ColumnDataModel;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springframework.transaction.annotation.Transactional;
-import com.baomidou.dynamic.datasource.annotation.DSTransactional;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.yulichang.toolkit.JoinWrappers;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.yunzhupaas.model.QueryAllModel;
-import java.text.SimpleDateFormat;
-import com.yunzhupaas.util.*;
-import java.util.*;
-import com.yunzhupaas.base.UserInfo;
-import com.yunzhupaas.permission.entity.UserEntity;
-import com.github.pagehelper.PageHelper;
-/**
- *
- * crm_lead
- * 版本: V5.2.7
- * 版权: Copyright @ 2025 深圳市乐程软件有限公司版权所有
- * 作者: 深圳市乐程软件有限公司
- * 日期: 2026-03-27
- */
-@Service
-public class CrmLeadServiceImpl extends SuperServiceImpl implements CrmLeadService{
- @Autowired
- private GeneraterSwapUtil generaterSwapUtil;
- @Autowired
- private UserProvider userProvider;
- @Override
- public List getList(CrmLeadPagination crmLeadPagination){
- return getTypeList(crmLeadPagination,crmLeadPagination.getDataType());
- }
- /** 列表查询 */
- @Override
- public List getTypeList(CrmLeadPagination crmLeadPagination,String dataType){
- String userId=userProvider.get().getUserId();
- Map tableClassMap=new HashMap<>();
- tableClassMap.put("crm_lead",CrmLeadEntity.class);
-
- MPJLambdaWrapper wrapper = JoinWrappers
- .lambda("crm_lead",CrmLeadEntity.class)
- .selectAll(CrmLeadEntity.class);
- MPJLambdaWrapper wrapper2 = JoinWrappers
- .lambda("crm_lead",CrmLeadEntity.class)
- .distinct().select(CrmLeadEntity::getLeadId);
-
- QueryAllModel queryAllModel = new QueryAllModel();
- queryAllModel.setWrapper(wrapper);
- queryAllModel.setClassMap(tableClassMap);
- queryAllModel.setDbLink(CrmLeadConstant.DBLINKID);
- //数据过滤
- boolean isPc = ServletUtil.getHeader("yunzhupaas-origin").equals("pc");
- String columnData = !isPc ? CrmLeadConstant.getAppColumnData() : CrmLeadConstant.getColumnData();
- ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
- String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
- queryAllModel.setRuleJson(ruleJson);
- //高级查询
- boolean hasSuperQuery = true;
- if (hasSuperQuery) {
- queryAllModel.setSuperJson(crmLeadPagination.getSuperQueryJson());
- }
- //数据权限
- boolean pcPermission = true;
- boolean appPermission = false;
- if (isPc && pcPermission) {
- queryAllModel.setModuleId(crmLeadPagination.getMenuId());
- }
- if (!isPc && appPermission) {
- queryAllModel.setModuleId(crmLeadPagination.getMenuId());
- }
- //拼接复杂条件
- wrapper = generaterSwapUtil.getConditionAllTable(queryAllModel);
- if(wrapper == null) return new ArrayList<>();
- queryAllModel.setWrapper(wrapper2);
- wrapper2 = generaterSwapUtil.getConditionAllTable(queryAllModel);
- //其他条件拼接
- otherConditions(crmLeadPagination, wrapper, isPc);
- otherConditions(crmLeadPagination, wrapper2, isPc);
-
- if("0".equals(dataType)){
- com.github.pagehelper.Page