From 3534b13391b2a6152d0f91b72fda343b13a947cb Mon Sep 17 00:00:00 2001 From: ludc <ludc@vci-tech.com> Date: 星期三, 22 一月 2025 15:55:27 +0800 Subject: [PATCH] 分类码段码值管理查询去除null的情况,分类码段生成编码时去除码值为null的情况 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyController.java | 30 ++++++++++++++++++++++++------ 1 files changed, 24 insertions(+), 6 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 1ac0859..df82de1 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 @@ -23,6 +23,7 @@ import com.vci.ubcs.code.mapper.CodeClassifyMapper; import com.vci.ubcs.code.service.ICodeClassifyService; 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; @@ -37,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; @@ -68,11 +71,13 @@ @AllArgsConstructor @RequestMapping("/codeClassify") @Api(value = "涓婚搴撳畾涔夎〃", tags = "涓婚搴撳畾涔夎〃鎺ュ彛") +@Log4j2 public class CodeClassifyController extends BladeController { private final ICodeClassifyService codeClassifyService; CodeClassifyMapper codeClassifyMapper; + /** * 涓婚搴撳畾涔夎〃 璇︽儏 */ @@ -91,7 +96,7 @@ */ @GetMapping("/treeCodeClassify") public List<Tree> treeCodeClassify(TreeQueryObject treeQueryObject) { - return codeClassifyService. treeCodeClassify(treeQueryObject); + return codeClassifyService.treeCodeClassify(treeQueryObject); } /** @@ -223,7 +228,7 @@ * @return 涓婚搴撳垎绫绘樉绀烘爲 */ @GetMapping("/referTree") - public List<Tree> referTree(@RequestBody TreeQueryObject treeQueryObject) { + public List<Tree> referTree(TreeQueryObject treeQueryObject) { return codeClassifyService.referTree(treeQueryObject); } @@ -279,12 +284,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(); } @@ -350,4 +359,13 @@ CodeClassifyVO codeClassifyVO = codeClassifyService.getObjectByClsfNamePath(clsfNamePath); return R.data(codeClassifyVO); } + + /** + * 娴佹按渚濊禆鐢熸垚 + */ + @GetMapping("/flowingDependencyGen") + public R flowingDependencyGen(String classifyOid) { + return codeClassifyService.flowingDependencyGen(classifyOid); + } + } -- Gitblit v1.9.3