From 367c66e0ab339e15d6ad881ace683cec7e11f2f7 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期二, 30 五月 2023 17:34:36 +0800
Subject: [PATCH] 1、主要完成传入业务类型与basemodel进行插入。 2、完成传入业务类型、oid进行查询返回list<basemodel>
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java | 368 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 351 insertions(+), 17 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..87aa4dd 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
@@ -3,18 +3,23 @@
import com.alibaba.fastjson.JSONObject;
import com.alibaba.nacos.common.utils.StringUtils;
+import com.vci.ubcs.code.dto.CodeDeleteBatchDTO;
import com.vci.ubcs.code.dto.CodeOrderDTO;
import com.vci.ubcs.code.dto.CodeOrderSecDTO;
import com.vci.ubcs.code.dto.datapush.BaseModelDTO;
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.*;
import com.vci.ubcs.starter.annotation.VciBusinessLog;
+import com.vci.ubcs.starter.revision.model.BaseModel;
import com.vci.ubcs.starter.util.LocalFileUtil;
+import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
+import com.vci.ubcs.starter.web.pagemodel.DataGrid;
+import com.vci.ubcs.starter.web.pagemodel.Tree;
import com.vci.ubcs.starter.web.util.ControllerUtil;
import com.vci.ubcs.starter.web.util.LangBaseUtil;
+import com.vci.ubcs.starter.web.util.VciBaseUtil;
import io.swagger.annotations.Api;
-import lombok.AllArgsConstructor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springblade.core.tool.api.R;
@@ -26,7 +31,9 @@
import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
+import java.util.Collections;
import java.util.List;
+import java.util.Map;
@RestController
//@AllArgsConstructor
@@ -89,20 +96,20 @@
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("鎿嶄綔鎴愬姛锛�");
- }
+// 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";
@@ -119,6 +126,7 @@
}finally {
file1.delete();
}
+ return null;
}
@@ -141,7 +149,333 @@
*/
@PostMapping("/addSaveCode")
@VciBusinessLog(operateName = "鐢宠鍗曚釜缂栫爜")
- public R addSaveCode(@RequestBody CodeOrderDTO orderDTO){
+ public R addSaveCode(@RequestBody CodeOrderDTO orderDTO) throws Exception {
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 deleteBatchDTO 鍒犻櫎鐨勪俊鎭紝蹇呴』瑕佹湁涓婚敭鍜屽垎绫荤殑涓婚敭
+ * @return 鎵ц缁撴灉
+ */
+ @VciBusinessLog(operateName = "鎵归噺鍒犻櫎涓婚搴撶殑鏁版嵁")
+ @DeleteMapping("/deleteCode")
+ public R deleteCode(@RequestBody CodeDeleteBatchDTO deleteBatchDTO){
+ engineService.deleteCode(deleteBatchDTO);
+ return R.success("鍒犻櫎鎴愬姛锛�");
+ }
+
+ /**
+ * 浣跨敤鍒嗙被鍜岄樁娈电殑缂栧彿锛岃幏鍙栧寘鍚殑灞炴��
+ * @param codeClassifyOid 鍒嗙被鐨勪富閿�
+ * @param phase 闃舵鐨勫悕绉�
+ * @return 鍖呭惈鐨勫睘鎬э紝璇疯幏鍙杘bj灞炴��
+ */
+ @VciBusinessLog(operateName = "鑾峰彇闃舵鐨勫睘鎬т俊鎭�")
+ @GetMapping("/listPhaseAttrByClassifyOid")
+ public R listPhaseAttrByClassifyOid(String codeClassifyOid,String phase){
+ return R.data(engineService.listPhaseAttrByClassifyOid(codeClassifyOid,phase));
+ }
+
+ /**
+ * 鑾峰彇褰撳墠鍒嗙被鎵�鍦ㄨ矾寰勪笂鐨勫垎绫诲睘鎬�
+ * @param codeClassifyOid 鍒嗙被鐨勪富閿�
+ * @return 鍖呭惈浜嗗綋鍓嶅垎绫荤殑涓婄骇鍜屾墍鏈夊眰绾х殑涓嬬骇
+ */
+ @GetMapping("/hasSelfClassifyTree")
+ public List<Tree> hasSelfClassifyTree(String codeClassifyOid){
+ return engineService.hasSelfClassifyTree(codeClassifyOid);
+ }
+
+ /**
+ * 浣跨敤鍒嗙被鑾峰彇瀵瑰簲鐨勬暟鎹�
+ * @param codeClassifyOid 鍒嗙被鐨勪富閿�
+ * @param templateOid 妯℃澘鐨勪富閿�
+ * @param queryObject 鍩虹鏌ヨ瀵硅薄
+ * @return 鏁版嵁鐨勪俊鎭紙鍖呭惈涓嬬骇鍒嗙被锛�
+ */
+ @GetMapping("/gridTableDataByClassifyOid")
+ @VciBusinessLog(operateName = "鏌ヨ涓婚搴撳垎绫荤殑鏁版嵁")
+ public DataGrid<Map<String,String>> gridTableDataByClassifyOid(String codeClassifyOid, String templateOid, BaseQueryObject queryObject){
+ //TODO鍚庣画鍙互瀹氫箟鏌ヨ妯℃澘鏉ユ煡璇�
+ return engineService.gridTableDataByClassifyOid(codeClassifyOid,templateOid,queryObject.getConditionMap(),queryObject.getPageHelper());
+ }
+
+
+ /***
+ * 鑾峰彇鍒嗙被瀵硅薄
+ * @param redisOid
+ * @return
+ */
+ @GetMapping("/gridclassifys")
+ public R gridclassifys(String redisOid){
+ List<CodeImportTemplateVO> codeImportTemplateVOs=mdmIOService.gridclassifys(redisOid);
+ return R.data(codeImportTemplateVOs);
+ }
+
+ /***
+ * 浠巖edis缂撳瓨閲岃幏鍙栧埌瀵煎叆姝ｇ‘鐨勬暟鎹�
+ * @param codeClassifyOid
+ * @param redisOid
+ * @return
+ */
+ @GetMapping("/gridValidata")
+ public DataGrid<Map<String,String>> gridValidata(String codeClassifyOid,String redisOid){
+ return mdmIOService.gridDatas(codeClassifyOid,redisOid);
+ }
+
+ /***
+ * 浠巖edis缂撳瓨閲岃幏鍙栧埌瀵煎叆姝ｇ‘鐨勬暟鎹�
+ * @param dataOid
+ * @param redisOid
+ * @return
+ */
+ @GetMapping("/gridRowResemble")
+ public DataGrid<Map<String,String>> gridRowResemble(String dataOid,String redisOid){
+ return mdmIOService.gridRowResemble(dataOid,redisOid);
+ }
+
+ /***
+ * 浠巖edis缂撳瓨閲岃幏鍙栧埌瀵煎叆鍏锋湁鐩镐技椤圭殑鏁版嵁
+ * @param codeClassifyOid
+ * @param redisOid
+ * @return
+ */
+ @GetMapping("/gridResemble")
+ public DataGrid<Map<String,String>> gridResemble(String codeClassifyOid,String redisOid){
+ return mdmIOService.gridDatas(codeClassifyOid,redisOid);
+ }
+
+ /**
+ * 鎵归噺淇濆瓨娴佺▼鎵ц椤甸潰淇敼鐨勫唴瀹�
+ * @param orderDTOList 缂栫爜鐩稿叧鐨勪俊鎭紝涓嶉渶瑕佺爜娈电殑淇℃伅
+ * @return 鎵ц缁撴灉
+ */
+ @PostMapping("/batchUpdateCode")
+ public R batchUpdateCode(@RequestBody List<CodeOrderDTO> orderDTOList){
+ return engineService.batchUpdateCode(orderDTOList);
+ }
+
+ /**
+ * 鏍囪娴佺▼涓笟鍔℃暟鎹槸鍚﹂�氳繃
+ * @param oid 涓氬姟鏁版嵁涓婚敭
+ * @param btmName 涓氬姟绫诲瀷
+ * @param pass 鏄惁閫氳繃 true-閫氳繃;false-涓嶉�氳繃
+ * @return 鎵ц缁撴灉
+ */
+ @PostMapping("/markPass")
+ public R markDataPassing(String oid,String btmName,Boolean pass){
+ return engineService.markDataPassing(oid,btmName,pass);
+ }
+
+ /**
+ * 缁勫悎瑙勫垯鐨勯瑙堢殑鍐呭
+ * @param orderDTO 鐢宠缂栫爜淇℃伅
+ * @return 鍏紡杞崲鍚庣殑鍊�
+ */
+ @PostMapping("/previewCompRule")
+ public R previewCompRule(@RequestBody CodeOrderDTO orderDTO){
+ return R.data(engineService.previewCompRule(orderDTO));
+ }
+
+ /**
+ * 鍒嗙被娉ㄥ叆鐨勫唴瀹�
+ * @param orderDTO 鐢宠缂栫爜鐨勪俊鎭紝鍖呭惈鍒嗙被鐨勪富閿拰妯℃澘鐨勪富閿�
+ * @return 鎵ц缁撴灉
+ */
+ @PostMapping("/previewClassify")
+ public R previewClassify(@RequestBody CodeOrderDTO orderDTO){
+ VciBaseUtil.alertNotNull(orderDTO,"鐢宠鐨勪俊鎭�",orderDTO.getCodeClassifyOid(),"鍒嗙被涓婚敭",orderDTO.getTemplateOid(),"妯℃澘鐨勪富閿�");
+ Map<String,String> classifyMap = engineService.previewClassify(orderDTO.getCodeClassifyOid(),orderDTO.getTemplateOid());
+ return R.data(classifyMap);
+ }
+
+ /**
+ * 涓嬭浇閿欒鐨勬枃浠朵俊鎭�
+ * @param uuid 鍞竴鏍囪瘑
+ * @param response 鍝嶅簲瀵硅薄
+ * @throws IOException 鎶涘嚭寮傚父
+ */
+ @GetMapping("/downloadErrorFile")
+ public void downloadErrorFile(String uuid,HttpServletResponse response) throws IOException {
+ ControllerUtil.downloadErrorFile(response,uuid);
+ }
+
+ /**
+ * 鍗囩増缂栫爜鏁版嵁
+ * @param orderDTO 缂栫爜鐩稿叧鐨勪俊鎭紝涓嶉渶瑕佺爜娈电殑淇℃伅
+ * @return 鎵ц缁撴灉
+ */
+ @VciBusinessLog(operateName = "鍗囩増缂栫爜鏁版嵁")
+ @PostMapping("/upSaveCode")
+ public R upSaveCode(@RequestBody CodeOrderDTO orderDTO){
+ engineService.upSaveCode(orderDTO);
+ return R.success("鎿嶄綔鎴愬姛锛�");
+ }
+
+ /**
+ * 浣跨敤鐮佹鐨勪富閿幏鍙栧垎绫荤殑鐮佸�煎唴瀹�
+ * @param classifySecOid 鐮佹鐨勪富閿�
+ * @param parentClassifyValueOid 涓婄骇鍒嗙被鐨勪富閿�
+ * @return 鍒嗙被鐮佸�肩殑鍐呭
+ */
+ @GetMapping("/listCodeClassifyValueBySecOid")
+ public DataGrid<CodeClassifyValueVO> listCodeClassifyValueBySecOid(String classifySecOid, String parentClassifyValueOid){
+ List<CodeClassifyValueVO> valueVOS = engineService.listCodeClassifyValueBySecOid(classifySecOid, parentClassifyValueOid);
+ DataGrid<CodeClassifyValueVO> dataGrid = new DataGrid<>();
+ dataGrid.setData(valueVOS);
+ dataGrid.setTotal(valueVOS==null?0:valueVOS.size());
+ return dataGrid;
+ }
+
+ /**
+ * 浣跨敤鍒嗙被鐨勪富閿潵鑾峰彇缂栫爜瑙勫垯
+ * @param codeClassifyOid 鍒嗙被鐨勪富閿�
+ * @return 缂栫爜瑙勫垯鐨勫唴瀹�
+ */
+ @GetMapping("/getCodeRuleByClassifyOid")
+// @VciUnCheckRight
+ public R<CodeRuleVO> getCodeRuleByClassifyOid(String codeClassifyOid){
+ return R.data(engineService.getCodeRuleByClassifyOid(codeClassifyOid));
+ }
+
+ /**
+ * 浣跨敤涓婚敭鑾峰彇鏁版嵁
+ * @param oid 鏁版嵁涓婚敭
+ * @param templateOid 妯℃澘鐨勪富閿�
+ * @return 鏁版嵁鍐呭
+ */
+ @GetMapping("/getDataByOid")
+ public R<List<Map<String,String>>> getDataByOid(String oid,String templateOid){
+ return engineService.getDataByOid(oid,templateOid);
+ }
+
+ /**
+ * 浣跨敤鍒嗙被妯℃澘涓婚敭+妯℃澘娴佺▼鍚嶇О鑾峰彇鍦ㄥ鎵归〉闈笂宸︿晶鏄剧ず鐨勫睘鎬�
+ * @param templateOid 鍒嗙被妯℃澘鐨勪富閿�
+ * @param executionId 娴佺▼鎵цid
+ * @param processUse 娴佺▼鐨勭敤閫�
+ * @return 鏍戣妭鐐规樉绀虹殑鍚嶇О
+ */
+ @GetMapping("/getFieldByProcessTemplate")
+ public List<String> getFieldByProcessTemplate(String templateOid,String executionId,String processUse){
+ return engineService.getFieldByProcessTemplate(templateOid,executionId,processUse);
+ }
+
+ /**
+ * 浣跨敤鍒嗙被鐨勪富閿幏鍙栦笟鍔℃暟鎹�
+ * @param btmType 涓氬姟绫诲瀷
+ * @param queryObject 鏌ヨ瀵硅薄
+ * @return 琛ㄦ牸鐨勬樉绀哄璞″��
+ */
+ @GetMapping("/getTableDataByOids")
+ public DataGrid<Map<String,String>> getTableDataByOids(String btmType,BaseQueryObject queryObject){
+ return engineService.getTableDataByExecutionId(btmType,queryObject);
+ }
+
+ /**
+ * 浣跨敤鍒嗙被鐨勪富閿幏鍙栬〃鏍肩殑瀹氫箟
+ * @param codeClassifyOid 鍒嗙被涓婚敭
+ * @param phase 闃舵鐨勫悕绉�
+ * @return UI鐩稿叧鐨勪俊鎭紙浠呭寘鍚〃鍗�)
+ */
+ @GetMapping("/getTableDefineByClassifyOid")
+ public MdmUIInfoVO getTableDefineByClassifyOid(String codeClassifyOid,String phase){
+ return engineService.getTableDefineByClassifyOid_v2(codeClassifyOid,phase);
+ }
+
+ /**
+ * 浣跨敤鍒嗙被鐨勭殑缂栧彿璺緞锛岃幏鍙栬〃鍗曠殑瀹氫箟
+ * @param idPath 缂栧彿鐨勮矾寰�
+ * @return UI鐩稿叧鐨勪俊鎭紙浠呭寘鍚〃鍗�)
+ */
+// @VciUnCheckRight
+ @GetMapping("/getFormDefineByClassifyIdPath")
+ public MdmUIInfoVO getFormDefineByClassifyIdPath(String idPath){
+ return engineService.getFormDefineByClassifyIdPath(idPath);
+ }
+
+ /**
+ * 浣跨敤鍒嗙被鐨勪富閿幏鍙栬〃鍗曠殑瀹氫箟
+ * @param codeClassifyOid 鍒嗙被涓婚敭
+ * @return UI鐩稿叧鐨勪俊鎭紙浠呭寘鍚〃鍗�)
+ */
+ @GetMapping("/getFormDefineByClassifyOid")
+ public MdmUIInfoVO getFormDefineByClassifyOid(String codeClassifyOid){
+ return engineService.getFormDefineByClassifyOid(codeClassifyOid);
+ }
+
+ /**
+ * 鏍规嵁妯℃澘鐨勪富閿幏鍙栬〃鏍肩殑瀹氫箟
+ * @param templateOid 妯℃澘鐨勪富閿�
+ * @return ui鐩稿叧鐨勪俊鎭紙浠呭寘鍚〃鏍硷級
+ */
+ @GetMapping("/getTableDefineByTemplateOid")
+ public MdmUIInfoVO getTableDefineByTemplateOid(String templateOid){
+ return engineService.getTableDefineByTemplateOid(templateOid);
+ }
+
+ /**
+ * 浣跨敤鍒嗙被鐨勭紪鍙疯矾寰勶紝鑾峰彇琛ㄦ牸鐨勭浉鍏冲畾涔�
+ * @param codeClassifyIdPath 鍒嗙被鐨勭紪鍙疯矾寰勶紝蹇呴』鏄粠椤跺眰鑺傜偣寮�濮嬶紝xxx/yy/zz杩欐牱鐨勬牸寮�
+ * @param functionId 鍔熻兘鐨勭紪鍙�
+ * @return UI鐩稿叧鐨勪俊鎭紙浠呭寘鍚〃鏍�)
+ */
+ @GetMapping("/getUIInfoByClassifyIdPath")
+ public MdmUIInfoVO getUIInfoByClassifyIdPath(String codeClassifyIdPath,String functionId){
+ return engineService.getUIInfoByClassifyIdPath(codeClassifyIdPath,functionId);
+ }
+
+ /**
+ * 浣跨敤鍒嗙被鑾峰彇琛ㄦ牸鐨勫畾涔�
+ * @param codeClassifyOid 鍒嗙被涓婚敭
+ * @param functionId 鍔熻兘鐨勭紪鍙�
+ * @return UI鐩稿叧鐨勪俊鎭紙浠呭寘鍚〃鏍硷級
+ */
+ @GetMapping("/getUIInfoByClassifyOid")
+ public MdmUIInfoVO getUIInfoByClassifyOid(String codeClassifyOid,String functionId){
+ return engineService.getUIInfoByClassifyOid(codeClassifyOid,functionId);
+ }
+
+
+ @GetMapping("/thisistest")
+ @ResponseBody
+ public List<BaseModel> thisistest(String codeClassifyOid, String functionId) throws Exception {
+ return engineService.selectByTypeAndOid("wupin", "b1511bb3-a773-43e2-ac85-a7fde7314a0f,3e08970024835e69f6c2b2ecd90c48c3,582ff205-0dfb-43e0-8223-e772ff1851ab,db0400fe-cc90-4d9d-8da7-1edf06b1481b");
+// return engineService.getUIInfoByClassifyOid(codeClassifyOid,functionId);
+ }
}
--
Gitblit v1.9.3