From 6ddaebea3b9afa4a34500068a21203ea05ba5ad7 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 28 七月 2023 20:05:29 +0800
Subject: [PATCH] 提交代码
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyController.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyController.java
index 9cdf420..c06511b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyController.java
@@ -22,11 +22,11 @@
import com.vci.ubcs.code.entity.CodeClassify;
import com.vci.ubcs.code.mapper.CodeClassifyMapper;
import com.vci.ubcs.code.service.ICodeClassifyService;
-import com.vci.ubcs.code.vo.CodeOsattributeVO;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
+import com.vci.ubcs.code.vo.pagemodel.CodeImProtRusultVO;
import com.vci.ubcs.code.wrapper.CodeClassifyWrapper;
+import com.vci.ubcs.omd.vo.BtmTypeAttributeVO;
import com.vci.ubcs.starter.revision.model.TreeQueryObject;
-import com.vci.ubcs.starter.util.BladeTreeQueryObject;
import com.vci.ubcs.starter.util.LocalFileUtil;
import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
import com.vci.ubcs.starter.web.pagemodel.DataGrid;
@@ -38,6 +38,8 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
+import lombok.extern.log4j.Log4j;
+import lombok.extern.log4j.Log4j2;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@@ -47,7 +49,6 @@
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.File;
@@ -70,6 +71,7 @@
@AllArgsConstructor
@RequestMapping("/codeClassify")
@Api(value = "涓婚搴撳畾涔夎〃", tags = "涓婚搴撳畾涔夎〃鎺ュ彛")
+@Log4j2
public class CodeClassifyController extends BladeController {
private final ICodeClassifyService codeClassifyService;
@@ -225,7 +227,7 @@
* @return 涓婚搴撳垎绫绘樉绀烘爲
*/
@GetMapping("/referTree")
- public List<Tree> referTree(@RequestBody TreeQueryObject treeQueryObject) {
+ public List<Tree> referTree(TreeQueryObject treeQueryObject) {
return codeClassifyService.referTree(treeQueryObject);
}
@@ -281,12 +283,16 @@
codeClassifyService.importClassify(file1);
return R.success("瀵煎叆鎴愬姛锛�");
}catch (Throwable e) {
+ log.error("瀵煎叆閿欒",e);
String errorFile = LocalFileUtil.getDefaultTempFolder() + File.separator + "閿欒淇℃伅.txt";
LocalFileUtil.writeContentToFile(LangBaseUtil.getErrorMsg(e),errorFile);
- //鏀惧埌map閲�
-// R result = R.fail("瀵煎叆澶辫触");
-// result.(ControllerUtil.putErrorFile(errorFile));
- return R.data(400,errorFile,"瀵煎叆澶辫触");
+ CodeImProtRusultVO codeImProtRusultVO =new CodeImProtRusultVO();
+ codeImProtRusultVO.setRedisUuid("");
+ codeImProtRusultVO.setFileOid(ControllerUtil.putErrorFile(errorFile));
+ codeImProtRusultVO.setFilePath(errorFile);
+ R r = R.fail("瀵煎叆澶辫触");
+ r.setData(codeImProtRusultVO);
+ return r;
}finally {
file1.delete();
}
@@ -309,7 +315,7 @@
* @return 灞炴�х殑淇℃伅锛屽寘鍚粯璁ょ殑灞炴��
*/
@GetMapping("/listClassifyLinkAttr")
- public DataGrid<CodeOsattributeVO> listClassifyLinkAttr(BaseQueryObject baseQueryObject){
+ public DataGrid<BtmTypeAttributeVO> listClassifyLinkAttr(BaseQueryObject baseQueryObject){
return codeClassifyService.listClassifyLinkAttr(baseQueryObject);
}
--
Gitblit v1.9.3