From a36a5865814b86d999b6f865e5c36a47c92acaeb Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 30 八月 2023 17:20:00 +0800
Subject: [PATCH] 文件服务修改
---
Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/SmsMapper.xml | 24 ++++++------
Source/UBCS/ubcs-service/ubcs-user/src/main/resources/mapper/UserMapper.xml | 5 --
Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application.yml | 1
Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/UserPwdstrategy.java | 2
Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/OssMapper.xml | 22 +++++-----
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 2
Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application-prod.yml | 23 -----------
Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/AttachMapper.xml | 18 ++++----
Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/Strategy.java | 6 +++
Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/controller/OssController.java | 2 +
Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/Combination.java | 6 +++
11 files changed, 50 insertions(+), 61 deletions(-)
diff --git a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/controller/OssController.java b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/controller/OssController.java
index fd01d58..1409fc4 100644
--- a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/controller/OssController.java
+++ b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/controller/OssController.java
@@ -38,6 +38,8 @@
import javax.validation.Valid;
+import java.rmi.ServerException;
+
import static org.springblade.core.cache.constant.CacheConstant.RESOURCE_CACHE;
/**
diff --git a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application-prod.yml b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application-prod.yml
index 4164439..c238494 100644
--- a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application-prod.yml
+++ b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application-prod.yml
@@ -4,26 +4,3 @@
url: ${blade.datasource.prod.url}
username: ${blade.datasource.prod.username}
password: ${blade.datasource.prod.password}
- servlet:
- multipart:
- max-file-size: 500MB
- max-request-size: 500MB
-
-#鏈嶅姟鍣ㄧ鍙�
-server:
- port: 36007
-
-#榛樿瀵硅薄瀛樺偍閰嶇疆
-oss:
- enabled: true
- name: minio
- tenant-mode: true
- endpoint: http://dev.vci-tech.com:39000
- access-key: TyEeBAJiAKDvHICUVAoH
- secret-key: Reo4wW8EWF4gSizUmVsNjWfbDZzR3rBYFn5Jehd9
- bucket-name: vci-ubcs
-
-#鍏抽棴椹煎嘲鍛藉悕鏄犲皠
-mybatis-plus:
- configuration:
- map-underscore-to-camel-case: false
diff --git a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application.yml b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application.yml
index 9fe53c6..eb64df4 100644
--- a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application.yml
+++ b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application.yml
@@ -24,3 +24,4 @@
mybatis-plus:
configuration:
map-underscore-to-camel-case: false
+ call-setters-on-nulls: true
diff --git a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/AttachMapper.xml b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/AttachMapper.xml
index c1eec08..81ffb52 100644
--- a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/AttachMapper.xml
+++ b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/AttachMapper.xml
@@ -5,19 +5,19 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="attachResultMap" type="com.vci.ubcs.resource.entity.Attach">
<result column="id" property="id"/>
- <result column="create_user" property="createUser"/>
- <result column="create_dept" property="createDept"/>
- <result column="create_time" property="createTime"/>
- <result column="update_user" property="updateUser"/>
- <result column="update_time" property="updateTime"/>
+ <result column="createuser" property="createUser"/>
+ <result column="createdept" property="createDept"/>
+ <result column="createtime" property="createTime"/>
+ <result column="updateuser" property="updateUser"/>
+ <result column="updatetime" property="updateTime"/>
<result column="status" property="status"/>
- <result column="is_deleted" property="isDeleted"/>
+ <result column="isdeleted" property="isDeleted"/>
<result column="link" property="link"/>
- <result column="domain_url" property="domainUrl"/>
+ <result column="domainurl" property="domainUrl"/>
<result column="name" property="name"/>
- <result column="original_name" property="originalName"/>
+ <result column="originalname" property="originalName"/>
<result column="extension" property="extension"/>
- <result column="attach_size" property="attachSize"/>
+ <result column="attachsize" property="attachSize"/>
</resultMap>
diff --git a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/OssMapper.xml b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/OssMapper.xml
index 790d23b..644a479 100644
--- a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/OssMapper.xml
+++ b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/OssMapper.xml
@@ -5,26 +5,26 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="ossResultMap" type="com.vci.ubcs.resource.entity.Oss">
<result column="id" property="id"/>
- <result column="create_user" property="createUser"/>
- <result column="create_time" property="createTime"/>
- <result column="update_user" property="updateUser"/>
- <result column="update_time" property="updateTime"/>
+ <result column="createuser" property="createUser"/>
+ <result column="createtime" property="createTime"/>
+ <result column="updateuser" property="updateUser"/>
+ <result column="updatetime" property="updateTime"/>
<result column="status" property="status"/>
- <result column="is_deleted" property="isDeleted"/>
- <result column="oss_code" property="ossCode"/>
+ <result column="isdeleted" property="isDeleted"/>
+ <result column="osscode" property="ossCode"/>
<result column="category" property="category"/>
<result column="endpoint" property="endpoint"/>
- <result column="access_key" property="accessKey"/>
- <result column="secret_key" property="secretKey"/>
- <result column="bucket_name" property="bucketName"/>
- <result column="app_id" property="appId"/>
+ <result column="accesskey" property="accessKey"/>
+ <result column="secretkey" property="secretKey"/>
+ <result column="bucketname" property="bucketName"/>
+ <result column="appid" property="appId"/>
<result column="region" property="region"/>
<result column="remark" property="remark"/>
</resultMap>
<select id="selectOssPage" resultMap="ossResultMap">
- select * from pl_sys_oss where is_deleted = 0
+ select * from pl_sys_oss where isdeleted = 0
</select>
</mapper>
diff --git a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/SmsMapper.xml b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/SmsMapper.xml
index ea9ebc2..002cc0f 100644
--- a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/SmsMapper.xml
+++ b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/SmsMapper.xml
@@ -5,20 +5,20 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="smsResultMap" type="com.vci.ubcs.resource.entity.Sms">
<result column="id" property="id"/>
- <result column="create_user" property="createUser"/>
- <result column="create_dept" property="createDept"/>
- <result column="create_time" property="createTime"/>
- <result column="update_user" property="updateUser"/>
- <result column="update_time" property="updateTime"/>
+ <result column="createuser" property="createUser"/>
+ <result column="createdept" property="createDept"/>
+ <result column="createtime" property="createTime"/>
+ <result column="updateuser" property="updateUser"/>
+ <result column="updatetime" property="updateTime"/>
<result column="status" property="status"/>
- <result column="is_deleted" property="isDeleted"/>
- <result column="sms_code" property="smsCode"/>
- <result column="template_id" property="templateId"/>
+ <result column="isdeleted" property="isDeleted"/>
+ <result column="smscode" property="smsCode"/>
+ <result column="templateid" property="templateId"/>
<result column="category" property="category"/>
- <result column="access_key" property="accessKey"/>
- <result column="secret_key" property="secretKey"/>
- <result column="region_id" property="regionId"/>
- <result column="sign_name" property="signName"/>
+ <result column="accesskey" property="accessKey"/>
+ <result column="secretkey" property="secretKey"/>
+ <result column="regionid" property="regionId"/>
+ <result column="signname" property="signName"/>
<result column="remark" property="remark"/>
</resultMap>
diff --git a/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/Combination.java b/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/Combination.java
index a46d65c..4b3c4c6 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/Combination.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/Combination.java
@@ -86,6 +86,12 @@
private String updateUser;
/**
+ * 绉熸埛ID
+ */
+ @ApiModelProperty(value = "绉熸埛ID")
+ private String tenantId;
+
+ /**
* 鎺堟潈浜�
*/
@ApiModelProperty(value = "鎺堟潈浜�")
diff --git a/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/Strategy.java b/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/Strategy.java
index 3526db2..5468209 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/Strategy.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/Strategy.java
@@ -152,6 +152,12 @@
@TableField(exist = false)
private String combinationNames;
+ /**
+ * 绉熸埛ID
+ */
+ @ApiModelProperty(value = "绉熸埛ID")
+ private String tenantId;
+
@Override
public boolean equals(Object o) {
if (this == o) {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/UserPwdstrategy.java b/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/UserPwdstrategy.java
index fbe8bf9..0eaac57 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/UserPwdstrategy.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/UserPwdstrategy.java
@@ -17,7 +17,7 @@
/**
* (UserPwdStrtategy)瀹炰綋绫�
*
- * @author makejava
+ * @author Ludc
* @since 2023-03-20 14:59:29
*/
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index 35949f6..19fb609 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -2470,7 +2470,7 @@
// conditionMap.put(CODE_CLASSIFY_OID_FIELD, QueryOptionConstant.IN + "(select oid from " + VciBaseUtil.getTableName(MdmBtmTypeConstant.CODE_CLASSIFY)
List<BtmTypeVO> classifyData = btmTypeClient.selectByIdCollection(Collections.singletonList(MdmBtmTypeConstant.CODE_CLASSIFY)).getData();
if(Func.isEmpty(classifyData)){
- throw new ServiceException("涓氬姟绫诲瀷閰嶇疆涓嶄竴鑷达紝璇蜂慨鏀硅嫳鏂囧悕绉颁负"+MdmBtmTypeConstant.CODE_CLASSIFY);
+ throw new ServiceException("涓氬姟绫诲瀷涓嫳鏂囧悕绉板拰鏌ヨ鏉′欢閰嶇疆涓嶄竴鑷达紝璇蜂慨鏀逛笟鍔＄被鍨嬩腑鍒嗙被琛ㄨ嫳鏂囧悕绉颁负"+MdmBtmTypeConstant.CODE_CLASSIFY);
}
conditionMap.put("t." + CODE_CLASSIFY_OID_FIELD, QueryOptionConstant.IN + "(select oid from " +
classifyData.get(0).getTableName() + " where lcstatus='" + FrameWorkDefaultValueConstant
diff --git a/Source/UBCS/ubcs-service/ubcs-user/src/main/resources/mapper/UserMapper.xml b/Source/UBCS/ubcs-service/ubcs-user/src/main/resources/mapper/UserMapper.xml
index 559bcbd..020ff7e 100644
--- a/Source/UBCS/ubcs-service/ubcs-user/src/main/resources/mapper/UserMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-user/src/main/resources/mapper/UserMapper.xml
@@ -39,11 +39,8 @@
LEFT JOIN PL_SYS_USER_PWDSTRATEGY plup on plup.USER_ID=pou.ID
LEFT JOIN PL_SYS_PWDSTRATEGY pss on pss.ID=plup.PWDSTRATEGY_ID
WHERE is_deleted = 0
- <if test="tenantId!=null and tenantId != ''">
- and tenant_id = #{tenantId}
- </if>
<if test="user.tenantId!=null and user.tenantId != ''">
- and tenant_id = #{user.tenantId}
+ and pou.tenant_id = #{user.tenantId}
</if>
<if test="user.account!=null and user.account != ''">
and account = #{user.account}
--
Gitblit v1.9.3