From d1e3a87aad6f737394b33852d9496d673472ddbe Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期二, 16 五月 2023 18:19:17 +0800
Subject: [PATCH] 主要完成修改Class统一命名，与老平台命名一致，删除多余VOClass等。
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java | 254 +++++++++++++++++++++++++++++---------------------
1 files changed, 146 insertions(+), 108 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 f185863..9ceecf8 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
@@ -9,8 +9,10 @@
import com.vci.ubcs.code.service.MdmEngineService;
import com.vci.ubcs.code.service.MdmIOService;
import com.vci.ubcs.code.vo.pagemodel.CodeImProtRusultVO;
+import com.vci.ubcs.code.vo.pagemodel.MdmUIInfoVO;
import com.vci.ubcs.starter.annotation.VciBusinessLog;
import com.vci.ubcs.starter.util.LocalFileUtil;
+import com.vci.ubcs.starter.web.pagemodel.DataGrid;
import com.vci.ubcs.starter.web.util.ControllerUtil;
import com.vci.ubcs.starter.web.util.LangBaseUtil;
import io.swagger.annotations.Api;
@@ -27,121 +29,157 @@
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.List;
+import java.util.Map;
@RestController
//@AllArgsConstructor
@RequestMapping("/mdmEngineController")
@Api(value = "缂栫爜鏁版嵁绠＄悊", tags = "缂栫爜鏁版嵁绠＄悊")
public class MdmEngineController {
-
+//
+//// /**
+//// * 鏃ュ織
+//// */
+// private Logger logger = LoggerFactory.getLogger(getClass());
// /**
-// * 鏃ュ織
+// * 涓绘暟鎹紩鎿庢湇鍔�
// */
- private Logger logger = LoggerFactory.getLogger(getClass());
- /**
- * 涓绘暟鎹紩鎿庢湇鍔�
- */
- @Autowired
- private MdmEngineService engineService;
- /**
- * 涓绘暟鎹鍏ュ鍑烘湇鍔�
- */
- @Autowired
- private MdmIOService mdmIOService;
+// @Autowired
+// private MdmEngineService engineService;
+// /**
+// * 涓绘暟鎹鍏ュ鍑烘湇鍔�
+// */
+// @Autowired
+// private MdmIOService mdmIOService;
+//
+// /**
+// * 涓嬭浇鎵归噺鐢宠鐨勫鍏ユā鏉�
+// * @param codeClassifyOid 鍒嗙被鐨勪富閿�
+// * @param response 鍝嶅簲瀵硅薄
+// * @throws IOException 鎶涘嚭寮傚父
+// */
+// @GetMapping("/downloadImportExcel")
+// @VciBusinessLog(operateName = "涓嬭浇鎵归噺鐢宠缂栫爜鐨勫鍏ユā鏉�")
+// public void downloadImportExcel(String codeClassifyOid, HttpServletResponse response) throws IOException{
+// String excelName = mdmIOService.createImportExcel(codeClassifyOid,false);
+// try {
+// ControllerUtil.writeFileToResponse(response,excelName);
+// } catch (Throwable e) {
+// //濡傛灉鍑洪敊,鎶婇敊璇俊鎭啓鍒皌ext
+// String msg = LangBaseUtil.getErrorMsg(e);
+// if(StringUtils.isBlank(msg)){
+// msg = "鏈煡閿欒";
+// }
+// ControllerUtil.writeDataToResponse(response,msg.getBytes(StandardCharsets.UTF_8),null);
+// }
+// }
+//
+//
+// /**
+// * 鎵归噺鐢宠缂栫爜鐨勪俊鎭�
+// * @param secDTOList 鐢宠缂栫爜鐨勪俊鎭紝蹇呴』鍖呭惈鐮佹鍜屽垎绫讳富閿殑淇℃伅
+// * @param file 鏂囦欢鐨勫唴瀹�
+// */
+// @VciBusinessLog(operateName = "鎵归噺鐢宠缂栫爜鐨勪俊鎭�")
+// @PostMapping("/batchImportCode")
+// public R batchImportCode(String secDTOList, String codeClassifyOid, MultipartFile file, HttpServletResponse response) throws Throwable {
+// CodeOrderDTO orderDTO = new CodeOrderDTO();
+// orderDTO.setCodeClassifyOid(codeClassifyOid);
+// if(StringUtils.isNotBlank(secDTOList)){
+// List<CodeOrderSecDTO> secDTOS = JSONObject.parseArray(secDTOList, CodeOrderSecDTO.class);
+// orderDTO.setSecDTOList(secDTOS);
+// }
+// String excelFileName = LocalFileUtil.getDefaultTempFolder() + File.separator + LocalFileUtil.getFileNameForIE(file.getOriginalFilename());
+// File file1 = new File(excelFileName);
+// try {
+// file.transferTo(new File(excelFileName));
+// CodeImProtRusultVO codeImProtRusultVO = mdmIOService.batchImportCode(orderDTO,file1);
+// if(StringUtils.isNotBlank(codeImProtRusultVO.getFilePath())||StringUtils.isNotBlank(codeImProtRusultVO.getRedisUuid())){
+// //鏀惧埌map閲�
+// R result = R.fail("瀵煎叆澶辫触");
+// if(StringUtils.isNotBlank(codeImProtRusultVO.getFilePath())) {
+// String filedUUid = ControllerUtil.putErrorFile(codeImProtRusultVO.getFilePath());
+// codeImProtRusultVO.setFileOid(filedUUid);
+// }
+// result.setData(codeImProtRusultVO);
+// return result;
+// }else {
+// return R.success("鎿嶄綔鎴愬姛锛�");
+// }
+// }catch (Throwable e) {
+// logger.error("瀵煎叆閿欒",e);
+// String errorFile = LocalFileUtil.getDefaultTempFolder() + File.separator + "閿欒.txt";
+// LocalFileUtil.writeContentToFile( LangBaseUtil.getErrorMsg(e),errorFile);
+// String uuid=ControllerUtil.putErrorFile(errorFile);
+// CodeImProtRusultVO codeImProtRusultVO =new CodeImProtRusultVO();
+// codeImProtRusultVO.setRedisUuid("");
+// codeImProtRusultVO.setFileOid(uuid);
+// codeImProtRusultVO.setFilePath(errorFile);
+// R result = R.fail("瀵煎叆澶辫触");
+// result.setData(codeImProtRusultVO);
+//// result.setObj(codeImProtRusultVO);
+// return result;
+// }finally {
+// file1.delete();
+// }
+// }
+//
+//
+// /**
+// * 淇敼鐘舵��
+// * @param baseModelDTO 鏁版嵁浼犺緭瀵硅薄
+// * @return 鎵ц缁撴灉
+// */
+// @PostMapping("changeStatus")
+// public R changeStatus(BaseModelDTO baseModelDTO) {
+// engineService.changeStatus(baseModelDTO);
+// return R.success("鎿嶄綔鎴愬姛锛�");
+// }
+//
+//
+// /**
+// * 鐢宠缂栫爜淇濆瓨
+// * @param orderDTO 缂栫爜鐢宠鐩稿叧鐨勪俊鎭紝闇�瑕佹湁灞炴�у拰鐮佹鐩稿叧鐨勪俊鎭�
+// * @return 鎵ц缁撴灉
+// */
+// @PostMapping("/addSaveCode")
+// @VciBusinessLog(operateName = "鐢宠鍗曚釜缂栫爜")
+// public R addSaveCode(@RequestBody CodeOrderDTO orderDTO){
+// return R.success(engineService.addSaveCode(orderDTO));
+// }
+//
+//
+// /**
+// * 浣跨敤妯℃澘鐨勪富閿幏鍙栬〃鍗曠殑瀹氫箟
+// * @param templateOid 妯℃澘鐨勪富閿�
+// * @param codeClassifyOid 浣跨敤妯℃澘鐨勫垎绫讳富閿�
+// * @return UI鐩稿叧鐨勪俊鎭紙浠呭寘鍚〃鍗曪級
+// */
+// @GetMapping("/getFormDefineByTemplateOid")
+// public MdmUIInfoVO getFormDefineByTemplateOid(String templateOid, String codeClassifyOid){
+// return engineService.getFormDefineByTemplateOid(templateOid,codeClassifyOid);
+// }
+//
+// /**
+// * 鐩镐技椤规煡璇�
+// * @param orderDTO 缂栫爜鐨勭浉鍏充俊鎭�
+// * @return 鏁版嵁鍒楄〃
+// */
+// @PostMapping("/resembleQuery")
+// public DataGrid<Map<String,String>> resembleQuery(@RequestBody CodeOrderDTO orderDTO){
+// return engineService.resembleQuery(orderDTO);
+// }
+//
+// /**
+// * 淇敼鍗曟潯涓婚搴撶殑鏁版嵁
+// * @param orderDTO 缂栫爜鐢宠鐩稿叧鐨勪俊鎭紝涓嶉渶瑕佺爜娈电殑淇℃伅
+// * @return 鎵ц缁撴灉
+// */
+// @PutMapping("/editSaveCode")
+// @VciBusinessLog(operateName = "淇敼缂栫爜鏁版嵁")
+// public R editSaveCode(@RequestBody CodeOrderDTO orderDTO){
+// engineService.editSaveCode(orderDTO);
+// return R.success("淇敼鎴愬姛锛�");
+// }
- /**
- * 涓嬭浇鎵归噺鐢宠鐨勫鍏ユā鏉�
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @param response 鍝嶅簲瀵硅薄
- * @throws IOException 鎶涘嚭寮傚父
- */
- @GetMapping("/downloadImportExcel")
- @VciBusinessLog(operateName = "涓嬭浇鎵归噺鐢宠缂栫爜鐨勫鍏ユā鏉�")
- public void downloadImportExcel(String codeClassifyOid, HttpServletResponse response) throws IOException{
- String excelName = mdmIOService.createImportExcel(codeClassifyOid,false);
- try {
- ControllerUtil.writeFileToResponse(response,excelName);
- } catch (Throwable e) {
- //濡傛灉鍑洪敊,鎶婇敊璇俊鎭啓鍒皌ext
- String msg = LangBaseUtil.getErrorMsg(e);
- if(StringUtils.isBlank(msg)){
- msg = "鏈煡閿欒";
- }
- ControllerUtil.writeDataToResponse(response,msg.getBytes(StandardCharsets.UTF_8),null);
- }
- }
-
-
- /**
- * 鎵归噺鐢宠缂栫爜鐨勪俊鎭�
- * @param secDTOList 鐢宠缂栫爜鐨勪俊鎭紝蹇呴』鍖呭惈鐮佹鍜屽垎绫讳富閿殑淇℃伅
- * @param file 鏂囦欢鐨勫唴瀹�
- */
- @VciBusinessLog(operateName = "鎵归噺鐢宠缂栫爜鐨勪俊鎭�")
- @PostMapping("/batchImportCode")
- public R batchImportCode(String secDTOList, String codeClassifyOid, MultipartFile file, HttpServletResponse response) throws Throwable {
- CodeOrderDTO orderDTO = new CodeOrderDTO();
- orderDTO.setCodeClassifyOid(codeClassifyOid);
- if(StringUtils.isNotBlank(secDTOList)){
- List<CodeOrderSecDTO> secDTOS = JSONObject.parseArray(secDTOList, CodeOrderSecDTO.class);
- orderDTO.setSecDTOList(secDTOS);
- }
- String excelFileName = LocalFileUtil.getDefaultTempFolder() + File.separator + LocalFileUtil.getFileNameForIE(file.getOriginalFilename());
- File file1 = new File(excelFileName);
- try {
- file.transferTo(new File(excelFileName));
- CodeImProtRusultVO codeImProtRusultVO = mdmIOService.batchImportCode(orderDTO,file1);
- if(StringUtils.isNotBlank(codeImProtRusultVO.getFilePath())||StringUtils.isNotBlank(codeImProtRusultVO.getRedisUuid())){
- //鏀惧埌map閲�
- R result = R.fail("瀵煎叆澶辫触");
- if(StringUtils.isNotBlank(codeImProtRusultVO.getFilePath())) {
- String filedUUid = ControllerUtil.putErrorFile(codeImProtRusultVO.getFilePath());
- codeImProtRusultVO.setFileOid(filedUUid);
- }
- result.setData(codeImProtRusultVO);
- return result;
- }else {
- return R.success("鎿嶄綔鎴愬姛锛�");
- }
- }catch (Throwable e) {
- logger.error("瀵煎叆閿欒",e);
- String errorFile = LocalFileUtil.getDefaultTempFolder() + File.separator + "閿欒.txt";
- LocalFileUtil.writeContentToFile( LangBaseUtil.getErrorMsg(e),errorFile);
- String uuid=ControllerUtil.putErrorFile(errorFile);
- CodeImProtRusultVO codeImProtRusultVO =new CodeImProtRusultVO();
- codeImProtRusultVO.setRedisUuid("");
- codeImProtRusultVO.setFileOid(uuid);
- codeImProtRusultVO.setFilePath(errorFile);
- R result = R.fail("瀵煎叆澶辫触");
- result.setData(codeImProtRusultVO);
-// result.setObj(codeImProtRusultVO);
- return result;
- }finally {
- file1.delete();
- }
- }
-
-
- /**
- * 淇敼鐘舵��
- * @param baseModelDTO 鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- */
- @PostMapping("changeStatus")
- public R changeStatus(BaseModelDTO baseModelDTO) {
- engineService.changeStatus(baseModelDTO);
- return R.success("鎿嶄綔鎴愬姛锛�");
- }
-
-
- /**
- * 鐢宠缂栫爜淇濆瓨
- * @param orderDTO 缂栫爜鐢宠鐩稿叧鐨勪俊鎭紝闇�瑕佹湁灞炴�у拰鐮佹鐩稿叧鐨勪俊鎭�
- * @return 鎵ц缁撴灉
- */
- @PostMapping("/addSaveCode")
- @VciBusinessLog(operateName = "鐢宠鍗曚釜缂栫爜")
- public R addSaveCode(@RequestBody CodeOrderDTO orderDTO){
- return R.success(engineService.addSaveCode(orderDTO));
- }
}
--
Gitblit v1.9.3