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/MdmEngineController.java |   39 +++++++++++++++------------------------
 1 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java
index 4d5c848..7e3cf21 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java
@@ -1,6 +1,5 @@
 package com.vci.ubcs.code.controller;
 
-
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.nacos.common.utils.StringUtils;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -33,11 +32,9 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.rmi.ServerException;
 import java.util.*;
 
 @RestController
-//@AllArgsConstructor
 @RequestMapping("/mdmEngineController")
 @Api(value = "缂栫爜鏁版嵁绠＄悊", tags = "缂栫爜鏁版嵁绠＄悊")
 public class MdmEngineController {
@@ -358,7 +355,7 @@
 	 * @param baseModelDTO 鏁版嵁浼犺緭瀵硅薄
 	 * @return 鎵ц缁撴灉
 	 */
-	@PostMapping("changeStatus")
+	@PostMapping("/changeStatus")
 	public R changeStatus(@RequestBody BaseModelDTO baseModelDTO) {
 		engineService.changeStatus(baseModelDTO);
 		return R.success("鎿嶄綔鎴愬姛锛�");
@@ -464,7 +461,7 @@
 		return engineService.gridTableDataByClassifyOid(codeClassifyOid,templateOid,queryObject.getConditionMap(),queryObject.getPageHelper());
 	}
 
-	/***
+	/**
 	 * 鑾峰彇鍒嗙被瀵硅薄
 	 * @param redisOid
 	 * @return
@@ -475,7 +472,7 @@
 		return R.data(codeImportTemplateVOs);
 	}
 
-	/***
+	/**
 	 * 浠巖edis缂撳瓨閲岃幏鍙栧埌瀵煎叆姝ｇ‘鐨勬暟鎹�
 	 * @param codeClassifyOid
 	 * @param redisOid
@@ -486,7 +483,7 @@
 		return mdmIOService.gridDatas(codeClassifyOid,redisOid);
 	}
 
-	/***
+	/**
 	 * 浠巖edis缂撳瓨閲岃幏鍙栧埌瀵煎叆琛岀浉浼奸」鐨勬暟鎹�
 	 * @param dataOid
 	 * @param redisOid
@@ -497,7 +494,7 @@
 		return mdmIOService.gridRowResemble(dataOid,redisOid);
 	}
 
-	/***
+	/**
 	 * 浠巖edis缂撳瓨閲岃幏鍙栧埌瀵煎叆鍏锋湁鐩镐技椤圭殑鏁版嵁
 	 * @param codeClassifyOid
 	 * @param redisOid
@@ -508,7 +505,7 @@
 		return mdmIOService.gridDatas(codeClassifyOid,redisOid);
 	}
 
-	/***
+	/**
 	 * 瀵煎叆鏁版嵁
 	 * @param codeImprotSaveDatVO//鏁版嵁瀵硅薄
 	 * @return
@@ -518,7 +515,7 @@
 		return mdmIOService.batchImportData(codeImprotSaveDatVO.getCodeImprotSaveDatVOList(),codeImprotSaveDatVO.getClassifyAttr(),codeImprotSaveDatVO.getImprot());
 	}
 
-	/***
+	/**
 	 * 鏍规嵁鏁版嵁oid浠庣紦瀛樹腑绉婚櫎鏁版嵁
 	 * @param redisOid redisid
 	 * @param codeClassifyOid 瀛樺偍瑙勫垯鐨刼id
@@ -673,7 +670,7 @@
 	 * @param idPath 缂栧彿鐨勮矾寰�
 	 * @return UI鐩稿叧鐨勪俊鎭紙浠呭寘鍚〃鍗�)
 	 */
-//	@VciUnCheckRight
+	//	@VciUnCheckRight
 	@GetMapping("/getFormDefineByClassifyIdPath")
 	public MdmUIInfoVO getFormDefineByClassifyIdPath(String idPath){
 		return engineService.getFormDefineByClassifyIdPath(idPath);
@@ -728,7 +725,7 @@
 	 * @return UI鐩稿叧鐨勪俊鎭紙浠呭寘鍚〃鏍硷級
 	 */
 	@GetMapping("/getFlowdUIInfoByClassifyOid")
-	public MdmUIInfoVO getUIInfoByClassifyOid(String codeClassifyOid,String functionId,String templateId,String taskId,String modelKey){
+	public MdmUIInfoVO getFlowUIInfoByClassifyOid(String codeClassifyOid,String functionId,String templateId,String taskId,String modelKey){
 		return engineService.getFlowUIInfoByClassifyOid(codeClassifyOid,functionId,templateId,taskId,modelKey);
 	}
 
@@ -843,7 +840,7 @@
 	 */
 	@GetMapping("/exportGroupCodeExcel")
 	@VciBusinessLog(operateName = "瀵煎嚭闆嗗洟鐮�")
-	public R exportGroupCodeExcel(String codeClassifyOid, HttpServletResponse response){
+	public void exportGroupCodeExcel(String codeClassifyOid, HttpServletResponse response) throws IOException {
 		try {
 			String excelName = mdmIOService.exportGroupCodeExcel(codeClassifyOid);
 			ControllerUtil.writeFileToResponse(response,excelName);
@@ -854,20 +851,14 @@
 				msg = "鏈煡閿欒";
 			}
 			String errorFile = LocalFileUtil.getDefaultTempFolder() + File.separator + "閿欒.txt";
-			LocalFileUtil.writeContentToFile(LangBaseUtil.getErrorMsg(e),errorFile);
-			try {
-				ControllerUtil.writeFileToResponse(response,errorFile);
-			} catch (IOException ex) {
-				ex.printStackTrace();
-			}
-			String uuid=ControllerUtil.putErrorFile(errorFile);
-			return R.fail(msg);
-		//	ControllerUtil.writeDataToResponse(response,msg.getBytes(StandardCharsets.UTF_8),null);
+			LocalFileUtil.writeContentToFile(msg,errorFile);
+			ControllerUtil.writeFileToResponse(response,errorFile);
+		//	return R.fail(msg);
 		}
-		return R.status(true);
+	//	return R.status(true);
 	}
 
-	/***
+	/**
 	 * 闆嗗洟鐮佸鍏�
 	 * @param codeClassifyOid
 	 * @param file

--
Gitblit v1.9.3