From 9f9f7637f0cfd99497d2a5457089c7e92951a426 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 24 十一月 2023 14:46:34 +0800
Subject: [PATCH] 本地日志文件下载工具类中的方法修改，sql拼接错误修改
---
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/DockingPreAttrMappingServiceImpl.java | 2
Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/LocalLog.java | 63 ++++++
Source/UBCS/ubcs-ops-api/ubcs-resource-api/src/main/java/com/vci/ubcs/resource/entity/Attach.java | 11
Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/SmsMapper.xml | 2
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/HttpUtil.java | 2
Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/LogOperate.java | 69 ++++++
Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application-prod.yml | 4
Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/AttachMapper.xml | 2
Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/dto/LocalLogVO.java | 31 +++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 8
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeApplyWebManagementServiceImpl.java | 2
Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/controller/FileController.java | 230 +++++++++++-----------
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 2
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java | 4
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeButtonWrapper.java | 2
Source/UBCS/ubcs-ops-api/ubcs-resource-api/src/main/java/com/vci/ubcs/resource/utils/FileDownloadUtil.java | 114 ++++++++---
17 files changed, 385 insertions(+), 165 deletions(-)
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/HttpUtil.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/HttpUtil.java
index 3ff0ef7..3806f25 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/HttpUtil.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/HttpUtil.java
@@ -346,7 +346,7 @@
return result;
}
}catch (Throwable e){
- e.printStackTrace();;
+ e.printStackTrace();
}
return result;
}
diff --git a/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/dto/LocalLogVO.java b/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/dto/LocalLogVO.java
new file mode 100644
index 0000000..add2fea
--- /dev/null
+++ b/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/dto/LocalLogVO.java
@@ -0,0 +1,31 @@
+package com.vci.ubcs.log.dto;
+
+import com.vci.ubcs.log.entity.LocalLog;
+import javafx.scene.Parent;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author ludc
+ * @date 2023/11/23 11:17
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LocalLogVO extends LocalLog implements Serializable {
+
+ /**
+ * 搴忓垪鍖�
+ */
+ private static final long serialVersionUID = 2217599544701726981L;
+
+ /**
+ * 鏃ュ織鍏ㄨ矾寰勯泦鍚�
+ */
+ private String logFullPaths;
+
+}
diff --git a/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/LocalLog.java b/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/LocalLog.java
new file mode 100644
index 0000000..6fe8cfa
--- /dev/null
+++ b/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/LocalLog.java
@@ -0,0 +1,63 @@
+package com.vci.ubcs.log.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author ludc
+ * @date 2023/10/31 15:43
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LocalLog implements Serializable {
+
+ /**
+ * 搴忓垪鍖�
+ */
+ private static final long serialVersionUID = 2217599544701726181L;
+
+ /**
+ * 鏃ュ織鎵�灞炴湇鍔″悕绉�
+ */
+ private String serviceName;
+
+ /**
+ * 鏈嶅姟id
+ */
+ private String serviceId;
+
+ /**
+ * 鏃ュ織鏂囦欢鎵�鍦ㄧ殑璺緞
+ */
+ private String logPath;
+
+ /**
+ * 鏃ュ織鍚嶇О
+ */
+ private String logName;
+
+ /**
+ * 鏃ュ織绫诲瀷
+ */
+ private String logType;
+
+ /**
+ * 鏃ュ織鍒涘缓鏃堕棿
+ */
+ private String createTime;
+
+ /**
+ * 鏃ュ織鐨勬渶鍚庝慨鏀规椂闂�
+ */
+ private String lastModifier;
+
+ /**
+ * 鏄惁鍖呭惈瀛樺湪瀛愭枃浠�
+ */
+ private Boolean hasChildren;
+
+}
diff --git a/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/LogOperate.java b/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/LogOperate.java
new file mode 100644
index 0000000..2d9cac1
--- /dev/null
+++ b/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/LogOperate.java
@@ -0,0 +1,69 @@
+package com.vci.ubcs.log.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 鎿嶄綔鏃ュ織绠＄悊:(鍖呮嫭鐧诲綍鏃ュ織銆佹搷浣滄棩蹇椼�佹巿鏉冩棩蹇楋紝浠ュ強绠＄悊鍛樼殑浠ヤ笂涓夌鏃ュ織)
+ * @author ludc
+ * @date 2023/11/24 10:58
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LogOperate implements Serializable {
+
+ /**
+ * 搴忓垪鍖�
+ */
+ private static final long serialVersionUID = 2217599544701724211L;
+
+ /**
+ * 涓婚敭
+ */
+ private String oid;
+
+ /**
+ * 鐢ㄦ埛鍚�
+ */
+ private String userName;
+
+ /**
+ * 濮撳悕
+ */
+ private String realName;
+
+ /**
+ * ip鍦板潃
+ */
+ private String ip;
+
+ /**
+ * 妯″潡
+ */
+ private String model;
+
+ /**
+ * 鎿嶄綔
+ */
+ private String operate;
+
+ /**
+ * 鏃堕棿
+ */
+ private String time;
+
+ /**
+ * 鎿嶄綔缁撴灉
+ */
+ private String operateResult;
+
+ /**
+ * 鎻忚堪
+ */
+ private String description;
+
+}
diff --git a/Source/UBCS/ubcs-ops-api/ubcs-resource-api/src/main/java/com/vci/ubcs/resource/entity/Attach.java b/Source/UBCS/ubcs-ops-api/ubcs-resource-api/src/main/java/com/vci/ubcs/resource/entity/Attach.java
index 24ae52e..544e274 100644
--- a/Source/UBCS/ubcs-ops-api/ubcs-resource-api/src/main/java/com/vci/ubcs/resource/entity/Attach.java
+++ b/Source/UBCS/ubcs-ops-api/ubcs-resource-api/src/main/java/com/vci/ubcs/resource/entity/Attach.java
@@ -16,11 +16,13 @@
*/
package com.vci.ubcs.resource.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
import org.springblade.core.tenant.mp.TenantEntity;
/**
@@ -32,7 +34,7 @@
@TableName("pl_attach")
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "Attach瀵硅薄", description = "闄勪欢琛�")
-public class Attach extends TenantEntity {
+public class Attach extends BaseEntity {
private static final long serialVersionUID = 1L;
@@ -66,6 +68,11 @@
*/
@ApiModelProperty(value = "闄勪欢澶у皬")
private Long attachSize;
-
+ /**
+ * 绉熸埛ID
+ */
+ @ApiModelProperty(value = "绉熸埛ID")
+ @TableField("TENANT_ID")
+ private String tenantId;
}
diff --git a/Source/UBCS/ubcs-ops-api/ubcs-resource-api/src/main/java/com/vci/ubcs/resource/utils/FileDownloadUtil.java b/Source/UBCS/ubcs-ops-api/ubcs-resource-api/src/main/java/com/vci/ubcs/resource/utils/FileDownloadUtil.java
index 89450ec..8df5b21 100644
--- a/Source/UBCS/ubcs-ops-api/ubcs-resource-api/src/main/java/com/vci/ubcs/resource/utils/FileDownloadUtil.java
+++ b/Source/UBCS/ubcs-ops-api/ubcs-resource-api/src/main/java/com/vci/ubcs/resource/utils/FileDownloadUtil.java
@@ -21,39 +21,39 @@
@Slf4j
public class FileDownloadUtil {
- /**
- * 涓嬭浇鏂囦欢
- * @param response 鍝嶅簲瀵硅薄
- * @param fileObjectBO 鏂囦欢鐨勪俊鎭紝鍖呭惈鏂囦欢鐨勮緭鍏ユ祦
- * @throws IOException 涓嬭浇寮傚父浼氭姏鍑�
- */
- public static void downloadFile(HttpServletResponse response, FileObjectBO fileObjectBO) throws IOException {
- downloadFile(response,fileObjectBO,true);
- }
+ /**
+ * 涓嬭浇鏂囦欢
+ * @param response 鍝嶅簲瀵硅薄
+ * @param fileObjectBO 鏂囦欢鐨勪俊鎭紝鍖呭惈鏂囦欢鐨勮緭鍏ユ祦
+ * @throws IOException 涓嬭浇寮傚父浼氭姏鍑�
+ */
+ public static void downloadFile(HttpServletResponse response, FileObjectBO fileObjectBO) throws IOException {
+ downloadFile(response,fileObjectBO,true);
+ }
- /**
- * 涓嬭浇鏂囦欢
- * @param response 鍝嶅簲瀵硅薄
- * @param fileObjectBO 鏂囦欢鐨勪俊鎭紝鍖呭惈鏂囦欢鐨勮緭鍏ユ祦
- * @param closeInputStream 鏄惁鍏抽棴娴�
- * @throws IOException 涓嬭浇鍑洪敊鐨勬椂鍊欐姏鍑哄紓甯�
- */
- public static void downloadFile(HttpServletResponse response, FileObjectBO fileObjectBO,boolean closeInputStream) throws IOException {
- MediaType mediaType = MediaTypeFactory.getMediaType(fileObjectBO.getBucketName() + "." + fileObjectBO.getFileExtension()).orElse(MediaType.APPLICATION_OCTET_STREAM);
- // 璁剧疆寮哄埗涓嬭浇涓嶆墦寮�
- response.setContentType(mediaType.toString()+";application/force-download;charset=UTF-8");
- try{
- String fileName = URLEncoder.encode(fileObjectBO.getName() + "." + fileObjectBO.getFileExtension(), "UTF8");
- response.addHeader("Content-Disposition", "attachment;filename="+ fileName+ ";filename*=utf-8''");
- }catch(Exception e){
- if(log.isErrorEnabled()){
- log.error("璁剧疆鏂囦欢鐨勫悕绉板埌鍝嶅簲娴佺殑鏃跺�欏嚭閿�",e);
- }
- }
- response.setCharacterEncoding("UTF-8");
- Cookie cookie = new Cookie("fileDownload", "true");
- cookie.setPath("/");
- response.addCookie(cookie);
+ /**
+ * 涓嬭浇鏂囦欢
+ * @param response 鍝嶅簲瀵硅薄
+ * @param fileObjectBO 鏂囦欢鐨勪俊鎭紝鍖呭惈鏂囦欢鐨勮緭鍏ユ祦
+ * @param closeInputStream 鏄惁鍏抽棴娴�
+ * @throws IOException 涓嬭浇鍑洪敊鐨勬椂鍊欐姏鍑哄紓甯�
+ */
+ public static void downloadFile(HttpServletResponse response, FileObjectBO fileObjectBO,boolean closeInputStream) throws IOException {
+ MediaType mediaType = MediaTypeFactory.getMediaType(fileObjectBO.getBucketName() + "." + fileObjectBO.getFileExtension()).orElse(MediaType.APPLICATION_OCTET_STREAM);
+ // 璁剧疆寮哄埗涓嬭浇涓嶆墦寮�
+ response.setContentType(mediaType.toString()+";application/force-download;charset=UTF-8");
+ try{
+ String fileName = URLEncoder.encode(fileObjectBO.getName() + "." + fileObjectBO.getFileExtension(), "UTF8");
+ response.addHeader("Content-Disposition", "attachment;filename="+ fileName+ ";filename*=utf-8''");
+ }catch(Exception e){
+ if(log.isErrorEnabled()){
+ log.error("璁剧疆鏂囦欢鐨勫悕绉板埌鍝嶅簲娴佺殑鏃跺�欏嚭閿�",e);
+ }
+ }
+ response.setCharacterEncoding("UTF-8");
+ Cookie cookie = new Cookie("fileDownload", "true");
+ cookie.setPath("/");
+ response.addCookie(cookie);
if(closeInputStream) {
try (InputStream ins = (fileObjectBO.getInputStream() != null ? fileObjectBO.getInputStream() : new FileInputStream(fileObjectBO.getFileLocalPath()))) {
IOUtils.copy(ins, response.getOutputStream());
@@ -76,5 +76,53 @@
throw e;
}
}
- }
+ }
+
+ /**
+ * 涓嬭浇鏂囦欢
+ * @param response 鍝嶅簲瀵硅薄
+ * @param fileObjectBO 鏂囦欢鐨勪俊鎭紝鍖呭惈鏂囦欢鐨勮緭鍏ユ祦
+ * @param closeInputStream 鏄惁鍏抽棴娴�
+ * @throws IOException 涓嬭浇鍑洪敊鐨勬椂鍊欐姏鍑哄紓甯�
+ */
+ public static void downloadFileLocal(HttpServletResponse response, FileObjectBO fileObjectBO,boolean closeInputStream) throws IOException {
+ MediaType mediaType = MediaTypeFactory.getMediaType(fileObjectBO.getFileExtension()).orElse(MediaType.APPLICATION_OCTET_STREAM);
+ // 璁剧疆寮哄埗涓嬭浇涓嶆墦寮�
+ response.setContentType(mediaType.toString()+";application/force-download;charset=UTF-8");
+ try{
+ String fileName = URLEncoder.encode(fileObjectBO.getName(), "UTF8");
+ response.addHeader("Content-Disposition", "attachment;filename="+ fileName+ ";filename*=utf-8''");
+ }catch(Exception e){
+ if(log.isErrorEnabled()){
+ log.error("璁剧疆鏂囦欢鐨勫悕绉板埌鍝嶅簲娴佺殑鏃跺�欏嚭閿�",e);
+ }
+ }
+ response.setCharacterEncoding("UTF-8");
+ Cookie cookie = new Cookie("fileDownload", "true");
+ cookie.setPath("/");
+ response.addCookie(cookie);
+ if(closeInputStream) {
+ try (InputStream ins = (fileObjectBO.getInputStream() != null ? fileObjectBO.getInputStream() : new FileInputStream(fileObjectBO.getFileLocalPath()))) {
+ IOUtils.copy(ins, response.getOutputStream());
+ } catch (IOException e) {
+ //鏈夊彲鑳藉鎴风鐨勯摼鎺�
+ if (log.isErrorEnabled()) {
+ log.error("鍐欏叆鏂囦欢鍒板搷搴旀祦鍑洪敊", e);
+ }
+ throw e;
+ }
+ }else{
+ try {
+ InputStream ins = (fileObjectBO.getInputStream() != null ? fileObjectBO.getInputStream() : new FileInputStream(fileObjectBO.getFileLocalPath()));
+ IOUtils.copy(ins, response.getOutputStream());
+ } catch (IOException e) {
+ //鏈夊彲鑳藉鎴风鐨勯摼鎺�
+ if (log.isErrorEnabled()) {
+ log.error("鍐欏叆鏂囦欢鍒板搷搴旀祦鍑洪敊", e);
+ }
+ throw e;
+ }
+ }
+ }
+
}
diff --git a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/controller/FileController.java b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/controller/FileController.java
index b81f862..626effe 100644
--- a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/controller/FileController.java
+++ b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/controller/FileController.java
@@ -1,6 +1,7 @@
package com.vci.ubcs.resource.controller;
import com.alibaba.fastjson.JSON;
+import com.alibaba.nacos.common.utils.StringUtils;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vci.ubcs.resource.dto.FileObjectDTO;
import com.vci.ubcs.resource.dto.FileReleaseDTO;
@@ -24,6 +25,7 @@
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.Collection;
import java.util.List;
@@ -38,36 +40,40 @@
@Slf4j
public class FileController {
- /**
- * 鏂囦欢鏈嶅姟
- */
- @Autowired
- private IFileService fileService;
+ /**
+ * 鏂囦欢鏈嶅姟
+ */
+ @Autowired
+ private IFileService fileService;
- /**
- * 鏍规嵁鏂囦欢涓婚敭涓嬭浇鏂囦欢
- * @param fileOids 鏂囦欢鐨勪富閿�
- * @param response 鍝嶅簲鐨勫璞�
- * @return 鎵ц缁撴灉锛屽彧鏈変笅杞藉け璐ョ殑鏃跺�欐墠浼氳繖鏍�
- */
+ /**
+ * 鏍规嵁鏂囦欢涓婚敭涓嬭浇鏂囦欢
+ * @param fileOids 鏂囦欢鐨勪富閿�
+ * @param response 鍝嶅簲鐨勫璞�
+ * @return 鎵ц缁撴灉锛屽彧鏈変笅杞藉け璐ョ殑鏃跺�欐墠浼氳繖鏍�
+ */
@RequestMapping(value = "/downloadFilesByOids",method = {RequestMethod.GET,RequestMethod.POST})
- public String downloadFilesByOids(@RequestParam String fileOids, HttpServletResponse response){
- try{
+ public void downloadFilesByOids(@RequestParam String fileOids, HttpServletResponse response) throws IOException {
+ try {
+ //ControllerUtil.writeFileToResponse(response,excelName);
FileDownloadUtil.downloadFile(response, fileService.downloadFileByOids(VciBaseUtil.str2List(fileOids)));
- }catch (Throwable e){
- return JSON.toJSONString(R.fail(LangBaseUtil.getErrorMsg(e)));
+ } catch (Throwable e) {
+ //濡傛灉鍑洪敊,鎶婇敊璇俊鎭啓鍒皌ext
+ String msg = LangBaseUtil.getErrorMsg(e);
+ if(StringUtils.isBlank(msg)){
+ msg = "鏈煡閿欒";
+ }
+ ControllerUtil.writeDataToResponse(response,msg.getBytes(StandardCharsets.UTF_8),null);
}
- //鍥犱负璁剧疆浜嗗搷搴攃ontentType,鎵�浠ヨ繖鍎夸笉鑳藉啀鐩存帴杩斿洖R浜嗭紝鍙兘浼氬鑷存姤閿�
- return JSON.toJSONString(R.success("涓嬭浇瀹屾垚")) ;
}
- /**
- * 鏂囦欢鍒犻櫎
- * @param oids 鏂囦欢鐨勪富閿�
- * @return 鏂囦欢鍐呭
- */
- @DeleteMapping("/deleteFile")
- public R deleteFile(@RequestBody Collection<String> oids){
+ /**
+ * 鏂囦欢鍒犻櫎
+ * @param oids 鏂囦欢鐨勪富閿�
+ * @return 鏂囦欢鍐呭
+ */
+ @DeleteMapping("/deleteFile")
+ public R deleteFile(@RequestBody Collection<String> oids){
try {
fileService.deleteFiles(oids);
}catch (Throwable e){
@@ -79,104 +85,104 @@
log.debug(msg);
return R.fail(msg);
}
- return R.success("鍒犻櫎鎴愬姛");
- }
+ return R.success("鍒犻櫎鎴愬姛");
+ }
- /**
- * 鍓嶇椤甸潰鍗曟枃浠朵笂浼犮��(鍏堟暟鎹紝鍚庢枃浠舵ā寮忎笂浼�)
- * @param file 涓婁紶鐨勬枃浠�
- * @param fileObjectDTO 鏂囦欢淇℃伅浼犺緭瀵硅薄
- * @return 鏂囦欢淇℃伅鏄剧ず瀵硅薄
- */
- @PostMapping("/uploadFile")
- public R<FileObjectVO> uploadFile(MultipartFile file, FileObjectDTO fileObjectDTO){
- if (file != null ) {
- return fileService.uploadFile(file, fileObjectDTO);
- } else {
- return R.fail("鏃犱笂浼犵殑鏂囦欢");
- }
- }
+ /**
+ * 鍓嶇椤甸潰鍗曟枃浠朵笂浼犮��(鍏堟暟鎹紝鍚庢枃浠舵ā寮忎笂浼�)
+ * @param file 涓婁紶鐨勬枃浠�
+ * @param fileObjectDTO 鏂囦欢淇℃伅浼犺緭瀵硅薄
+ * @return 鏂囦欢淇℃伅鏄剧ず瀵硅薄
+ */
+ @PostMapping("/uploadFile")
+ public R<FileObjectVO> uploadFile(MultipartFile file, FileObjectDTO fileObjectDTO){
+ if (file != null ) {
+ return fileService.uploadFile(file, fileObjectDTO);
+ } else {
+ return R.fail("鏃犱笂浼犵殑鏂囦欢");
+ }
+ }
- /**
- * 鍦ㄤ笂浼犳枃浠跺悗锛屼繚瀛樻枃浠剁殑淇℃伅
- * @param fileObjectDTO 鏂囦欢淇℃伅浼犺緭瀵硅薄
- * @return 鏂囦欢淇℃伅鏄剧ず瀵硅薄
- */
- @PostMapping("/saveFileAfterUpload")
- public R<FileObjectVO> saveFileAfterUpload( @RequestBody FileObjectDTO fileObjectDTO){
- return fileService.saveFileAfterUpload(fileObjectDTO);
- }
+ /**
+ * 鍦ㄤ笂浼犳枃浠跺悗锛屼繚瀛樻枃浠剁殑淇℃伅
+ * @param fileObjectDTO 鏂囦欢淇℃伅浼犺緭瀵硅薄
+ * @return 鏂囦欢淇℃伅鏄剧ず瀵硅薄
+ */
+ @PostMapping("/saveFileAfterUpload")
+ public R<FileObjectVO> saveFileAfterUpload( @RequestBody FileObjectDTO fileObjectDTO){
+ return fileService.saveFileAfterUpload(fileObjectDTO);
+ }
- /**
- * 灏嗗師鏁版嵁涓嬬殑鎵�鏈夋枃浠跺叡浜埌鍏朵粬鐨勪笟鍔℃暟鎹笅
- * @param shareDTO 鏂囦欢鍒嗕韩
- * @return 鏂囦欢淇℃伅鏄剧ず瀵硅薄,鏄涓�
- */
- @PostMapping("/shareFiles")
- public R<List<FileObjectVO>> shareFiles(@RequestBody FileShareDTO shareDTO){
- return fileService.shareFiles(shareDTO);
- }
+ /**
+ * 灏嗗師鏁版嵁涓嬬殑鎵�鏈夋枃浠跺叡浜埌鍏朵粬鐨勪笟鍔℃暟鎹笅
+ * @param shareDTO 鏂囦欢鍒嗕韩
+ * @return 鏂囦欢淇℃伅鏄剧ず瀵硅薄,鏄涓�
+ */
+ @PostMapping("/shareFiles")
+ public R<List<FileObjectVO>> shareFiles(@RequestBody FileShareDTO shareDTO){
+ return fileService.shareFiles(shareDTO);
+ }
- /**
- * 淇敼鏂囦欢淇℃伅(涓嶅惈鏂囦欢),娉ㄦ剰objectName鍜宖ilePath涓嶄細鍙樺寲
- * @param fileDTOs 鏂囦欢鐨勬暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- @PostMapping("/updateFileInfos")
- public R updateFileInfos(@RequestBody Collection<FileObjectDTO> fileDTOs){
- return fileService.updateFileInfos(fileDTOs);
- }
+ /**
+ * 淇敼鏂囦欢淇℃伅(涓嶅惈鏂囦欢),娉ㄦ剰objectName鍜宖ilePath涓嶄細鍙樺寲
+ * @param fileDTOs 鏂囦欢鐨勬暟鎹璞�
+ * @return 鎵ц缁撴灉
+ */
+ @PostMapping("/updateFileInfos")
+ public R updateFileInfos(@RequestBody Collection<FileObjectDTO> fileDTOs){
+ return fileService.updateFileInfos(fileDTOs);
+ }
- /**
- * 鏂囦欢鐢熸晥
- * @param ids 鏂囦欢鐨勪富閿�
- * @return 鎵ц缁撴灉
- */
- @PutMapping("/releasedFiles")
- public R releasedFiles(@RequestBody Collection<String> ids){
- return fileService.releasedFiles(ids);
- }
+ /**
+ * 鏂囦欢鐢熸晥
+ * @param ids 鏂囦欢鐨勪富閿�
+ * @return 鎵ц缁撴灉
+ */
+ @PutMapping("/releasedFiles")
+ public R releasedFiles(@RequestBody Collection<String> ids){
+ return fileService.releasedFiles(ids);
+ }
- /**
- * 鎵归噺鎸囧畾鏂囦欢涓氬姟鏁版嵁鍚庣敓鏁�
- * @param releaseDTOS 鐢熸晥鐨勭浉鍏充俊鎭�
- * @return 鎵ц缁撴灉
- */
- @PutMapping("/releasedFilesForOwn")
- public R releasedFilesForOwn(@RequestBody Collection<FileReleaseDTO> releaseDTOS){
- return fileService.releasedFilesForOwn(releaseDTOS);
- }
+ /**
+ * 鎵归噺鎸囧畾鏂囦欢涓氬姟鏁版嵁鍚庣敓鏁�
+ * @param releaseDTOS 鐢熸晥鐨勭浉鍏充俊鎭�
+ * @return 鎵ц缁撴灉
+ */
+ @PutMapping("/releasedFilesForOwn")
+ public R releasedFilesForOwn(@RequestBody Collection<FileReleaseDTO> releaseDTOS){
+ return fileService.releasedFilesForOwn(releaseDTOS);
+ }
- /**
- * 浣跨敤涓氬姟绫诲瀷鏌ヨ鏂囦欢鐨勪俊鎭紝鎻愪緵缁欓〉闈㈣皟鐢�
- * @param fileQuery 鏌ヨ瀵硅薄
- * @return 鏂囦欢鐨勬樉绀哄璞�
- */
- @RequestMapping(value = "/listFiles",method = {RequestMethod.GET,RequestMethod.POST})
- public R<IPage<FileObjectVO>> listFiles(FileQuery fileQuery, Query query){
- return R.data(fileService.listFiles(fileQuery,query));
- }
+ /**
+ * 浣跨敤涓氬姟绫诲瀷鏌ヨ鏂囦欢鐨勪俊鎭紝鎻愪緵缁欓〉闈㈣皟鐢�
+ * @param fileQuery 鏌ヨ瀵硅薄
+ * @return 鏂囦欢鐨勬樉绀哄璞�
+ */
+ @RequestMapping(value = "/listFiles",method = {RequestMethod.GET,RequestMethod.POST})
+ public R<IPage<FileObjectVO>> listFiles(FileQuery fileQuery, Query query){
+ return R.data(fileService.listFiles(fileQuery,query));
+ }
- /**
- * 浣跨敤鏂囦欢涓婚敭鑾峰彇瀵硅薄
- * @param oid 涓婚敭
- * @return 鏂囦欢鏄剧ず瀵硅薄
- */
- @GetMapping("/get")
- public FileObjectVO get(String oid){
- return fileService.get(oid);
- }
+ /**
+ * 浣跨敤鏂囦欢涓婚敭鑾峰彇瀵硅薄
+ * @param oid 涓婚敭
+ * @return 鏂囦欢鏄剧ず瀵硅薄
+ */
+ @GetMapping("/get")
+ public FileObjectVO get(String oid){
+ return fileService.get(oid);
+ }
- /**
- * 浣跨敤鏂囦欢鐨勪富閿壒閲忚幏鍙栧璞�
- * @param oids 鏂囦欢鐨勪富閿泦鍚�
- * @return 鏂囦欢鐨勬樉绀轰俊鎭�
- */
- @GetMapping("/listFilesByOids")
- public List<FileObjectVO> listFilesByOids( Collection<String> oids){
- return fileService.listFilesByOids(oids);
- }
+ /**
+ * 浣跨敤鏂囦欢鐨勪富閿壒閲忚幏鍙栧璞�
+ * @param oids 鏂囦欢鐨勪富閿泦鍚�
+ * @return 鏂囦欢鐨勬樉绀轰俊鎭�
+ */
+ @GetMapping("/listFilesByOids")
+ public List<FileObjectVO> listFilesByOids( Collection<String> oids){
+ return fileService.listFilesByOids(oids);
+ }
}
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 d80f6c2..080f06c 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
@@ -23,7 +23,3 @@
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/mapper/AttachMapper.xml b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/AttachMapper.xml
index 81ffb52..c29205b 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
@@ -22,7 +22,7 @@
<select id="selectAttachPage" resultMap="attachResultMap">
- select * from blade_attach where is_deleted = 0
+ select * from blade_attach 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 002cc0f..ac43f88 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
@@ -24,7 +24,7 @@
<select id="selectSmsPage" resultMap="smsResultMap">
- select * from pl_sys_sms where is_deleted = 0
+ select * from pl_sys_sms where isdeleted = 0
</select>
</mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/DockingPreAttrMappingServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/DockingPreAttrMappingServiceImpl.java
index 9c6eef1..86a2b9b 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/DockingPreAttrMappingServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/DockingPreAttrMappingServiceImpl.java
@@ -225,7 +225,7 @@
try {
count = dockingPreAttrMappingMapper.selectCount(Wrappers.<DockingPreAttrMapping>query().lambda().eq(DockingPreAttrMapping::getTargetClassifyId, targetClassifyId).eq(DockingPreAttrMapping::getSourceClassifyId,sourceClassifyId));
}catch (Throwable e){
- e.printStackTrace();;
+ e.printStackTrace();
} finally {
return count>0?true:false;
}
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java
index b0535f1..3db3194 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java
@@ -471,7 +471,7 @@
}
return R.success(message);
}catch (Throwable e){
- e.printStackTrace();;
+ e.printStackTrace();
log.error("鑾峰彇鏁版嵁妯″瀷澶辫触"+e);
R.fail(message);
}
@@ -537,7 +537,7 @@
}
}catch (Throwable e){
- e.printStackTrace();;
+ e.printStackTrace();
log.error("鑾峰彇鐢宠鍗曠姸鎬佸け璐�"+e);
throw new VciBaseException(message);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java
index 44ea636..0f2f922 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java
@@ -71,7 +71,7 @@
this.setHttpToThreadLocal(request);
result= universalInterfaceI.syncEditData(dataString,dataType);
}catch (Throwable e){
- e.printStackTrace();;
+ e.printStackTrace();
logger.error("syncData->"+e.getMessage());
}
return result;
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeApplyWebManagementServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeApplyWebManagementServiceImpl.java
index f43d83a..a0be413 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeApplyWebManagementServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeApplyWebManagementServiceImpl.java
@@ -48,7 +48,7 @@
QueryWrapper<SystemClassifyRole> wrapper = new QueryWrapper<>();
wrapper.eq("systemOid",systemOid);
wrapper.eq("systemId",systemId);
- List<SystemClassifyRole> systemClassifyRoles = this.listByIds(roleList.stream().map(SystemClassifyRole ::getOid).collect(Collectors.toList()));;
+ List<SystemClassifyRole> systemClassifyRoles = this.listByIds(roleList.stream().map(SystemClassifyRole ::getOid).collect(Collectors.toList()));
this.remove(wrapper);
List<SystemClassifyRole> newSCRoles = new ArrayList<>();
//鏁版嵁澶勭悊
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 91912c7..dd02c8d 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
@@ -1961,7 +1961,7 @@
String sqlHasPage = pageHelper.getLimit() > 0 ? ("select * from (select A.*,rownum RN from (" + sql + whereSubfixForPage) : sql;
String sqlCount = "select count(1) from " + tableName + SPACE + "t" + SPACE + joinTableList.values().stream().collect(Collectors.joining(SPACE))
+ (StringUtils.isBlank(whereSql) ? "" : " where ") + whereSql;
- String sqlId = "select ID from " + tableName + SPACE + "t" + SPACE + joinTableList.values().stream().collect(Collectors.joining(SPACE))
+ String sqlId = "select t.ID from " + tableName + SPACE + "t" + SPACE + joinTableList.values().stream().collect(Collectors.joining(SPACE))
+ (StringUtils.isBlank(whereSql) ? "" : " where ") + whereSql;
CodeTemplateAttrSqlBO sqlBO = new CodeTemplateAttrSqlBO();
sqlBO.setTableName(tableName);
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
index e468dc1..56d77fd 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
@@ -1070,7 +1070,7 @@
}
});
}catch (Throwable e){
- e.printStackTrace();;
+ e.printStackTrace();
msg="缂栫爜鏇存敼/鐘舵�佹洿鏀�/鍒犻櫎:"+e.getMessage();
/* XMLResultSystemVO XMLResultSystemVO=new XMLResultSystemVO();
XMLResultSystemVO.setErrorid(errorid);
@@ -1254,7 +1254,7 @@
issucess=true;
resultData.setLibrary(libraryVo);
}catch (Throwable e){
- e.printStackTrace();;
+ e.printStackTrace();
msg="鏌ヨ鍒嗙被澶辫触:"+e.getMessage();
}finally {
resultData.setErrorid(errorid);
@@ -1473,7 +1473,7 @@
msg = "鎺ュ彛鍙傛暟锛歭ibrary 鏈煡璇㈠埌瀵瑰簲鐨勫簱鑺傜偣淇℃伅";
}
}catch (Throwable e){
- e.printStackTrace();;
+ e.printStackTrace();
msg="鏌ヨ鏁版嵁澶辫触:"+e.getMessage();
}finally {
resultDataVO.setErrorid(errorid);
@@ -1925,7 +1925,7 @@
issucess=true;
resultClassifyRuleData.setLibrary(resultLibraryVO);
}catch (Throwable e){
- e.printStackTrace();;
+ e.printStackTrace();
msg="鏌ヨ鍒嗙被澶辫触:"+e.getMessage();
}finally {
resultClassifyRuleData.setErrorid(errorid);
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeButtonWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeButtonWrapper.java
index c178bcd..fd8b3a2 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeButtonWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeButtonWrapper.java
@@ -38,7 +38,7 @@
@Override
public CodeButtonVO entityVO(CodeButton codebutton) {
- CodeButtonVO codebuttonVO = new CodeButtonVO();;
+ CodeButtonVO codebuttonVO = new CodeButtonVO();
BeanUtilForVCI.copyPropertiesIgnoreCase(codebutton,codebuttonVO);
Objects.requireNonNull(codebuttonVO);
codebuttonVO.setUsedpositiontypeText(DictCache.getValue("codeButtonPosition", codebutton.getUsedPositionType()));
--
Gitblit v1.9.3