From 1b8098b7f79b66a80e5ca49d8765606cb5fa0408 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期四, 30 十一月 2023 19:11:00 +0800 Subject: [PATCH] 操作日志完善 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java | 57 ++++++++++++++++++++++++++++++++++++++------------------- 1 files changed, 38 insertions(+), 19 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 e24815c..dd8b910 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 @@ -6,10 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.vci.ubcs.code.applyjtcodeservice.vo.BaseModelVO; -import com.vci.ubcs.code.dto.CodeDeleteBatchDTO; -import com.vci.ubcs.code.dto.CodeExportAttrDTO; -import com.vci.ubcs.code.dto.CodeOrderDTO; -import com.vci.ubcs.code.dto.CodeOrderSecDTO; +import com.vci.ubcs.code.dto.*; import com.vci.ubcs.code.dto.datapush.BaseModelDTO; import com.vci.ubcs.code.service.MdmEngineService; import com.vci.ubcs.code.service.MdmIOService; @@ -19,6 +16,7 @@ import com.vci.ubcs.starter.revision.model.BaseModel; import com.vci.ubcs.starter.revision.model.TreeQueryObject; import com.vci.ubcs.starter.util.LocalFileUtil; +import com.vci.ubcs.starter.util.SaveLogUtil; import com.vci.ubcs.starter.web.pagemodel.*; import com.vci.ubcs.starter.web.util.ControllerUtil; import com.vci.ubcs.starter.web.util.LangBaseUtil; @@ -35,6 +33,7 @@ import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; +import java.rmi.ServerException; import java.util.*; @RestController @@ -57,7 +56,11 @@ */ @Autowired private MdmIOService mdmIOService; - + /** + * 鏃ュ織淇濆瓨宸ュ叿绫� + */ + @Autowired + private SaveLogUtil saveLogUtil; /** * 涓嬭浇鎵归噺鐢宠鐨勫鍏ユā鏉� @@ -80,6 +83,7 @@ ControllerUtil.writeDataToResponse(response,msg.getBytes(StandardCharsets.UTF_8),null); } } + /** * 涓嬭浇鎵归噺鐢宠鐨勫鍏ユā鏉� * @param codeClassifyOid 鍒嗙被鐨勪富閿� @@ -100,8 +104,6 @@ } ControllerUtil.writeDataToResponse(response,msg.getBytes(StandardCharsets.UTF_8),null); } - - } /** @@ -147,7 +149,7 @@ } /** - * 鎵归噺鐢宠缂栫爜鐨勪俊鎭� + * 鎵归噺鐢宠缂栫爜鐨勪俊鎭紙褰撳墠鍒嗙被涓婃壒閲忕敵璇凤級 * @param secDTOList 鐢宠缂栫爜鐨勪俊鎭紝蹇呴』鍖呭惈鐮佹鍜屽垎绫讳富閿殑淇℃伅 * @param file 鏂囦欢鐨勫唴瀹� */ @@ -238,8 +240,9 @@ file1.delete(); } } + /** - * 瀵煎叆鍘嗗彶鏁版嵁 + * 瀵煎叆鍘嗗彶鏁版嵁(浠庨《灞傚垎绫诲鐨�) * @param codeClassifyOid 鍒嗙被鐨勪富閿� * @param classifyAttr 鍒嗙被璺緞浣跨敤鐨勫睘鎬� * @param file 鏂囦欢鐨勫唴瀹� @@ -279,7 +282,6 @@ R r = R.fail("瀵煎叆澶辫触"); r.setData(codeImProtRusultVO); - return r; }finally { file1.delete(); @@ -297,7 +299,6 @@ return R.success("鎿嶄綔鎴愬姛锛�"); } - /** * 鐢宠缂栫爜淇濆瓨 * @param orderDTO 缂栫爜鐢宠鐩稿叧鐨勪俊鎭紝闇�瑕佹湁灞炴�у拰鐮佹鐩稿叧鐨勪俊鎭� @@ -306,9 +307,16 @@ @PostMapping("/addSaveCode") @VciBusinessLog(operateName = "鐢宠鍗曚釜缂栫爜") public R addSaveCode(@RequestBody CodeOrderDTO orderDTO) throws Exception { - return R.success(engineService.addSaveCode(orderDTO)); + String s = null; + try { + s = engineService.addSaveCode(orderDTO); + saveLogUtil.operateLog("缂栫爜鐢宠",false,orderDTO.toString()); + }catch (Exception e){ + saveLogUtil.operateLog("缂栫爜鐢宠",true,e.getMessage()); + throw e; + } + return R.success(s); } - /** * 浣跨敤妯℃澘鐨勪富閿幏鍙栬〃鍗曠殑瀹氫箟 @@ -391,7 +399,6 @@ return engineService.gridTableDataByClassifyOid(codeClassifyOid,templateOid,queryObject.getConditionMap(),queryObject.getPageHelper()); } - /*** * 鑾峰彇鍒嗙被瀵硅薄 * @param redisOid @@ -435,6 +442,7 @@ public DataGrid<Map<String,String>> gridResemble(String codeClassifyOid,String redisOid){ return mdmIOService.gridDatas(codeClassifyOid,redisOid); } + /*** * 瀵煎叆鏁版嵁 * @param codeImprotSaveDatVO//鏁版嵁瀵硅薄 @@ -442,11 +450,11 @@ */ @PostMapping("/batchImportData") public R batchImportData(@RequestBody CodeImprotParmaDatVO codeImprotSaveDatVO){ - return mdmIOService.batchImportData(codeImprotSaveDatVO.getCodeImprotSaveDatVOList(),codeImprotSaveDatVO.getClassifyAttr(),codeImprotSaveDatVO.getImprot()); + return mdmIOService.batchImportData(codeImprotSaveDatVO.getCodeImprotSaveDatVOList(),codeImprotSaveDatVO.getClassifyAttr(),codeImprotSaveDatVO.getImprot()); } /*** - *鏍规嵁鏁版嵁oid浠庣紦瀛樹腑绉婚櫎鏁版嵁 + * 鏍规嵁鏁版嵁oid浠庣紦瀛樹腑绉婚櫎鏁版嵁 * @param redisOid redisid * @param codeClassifyOid 瀛樺偍瑙勫垯鐨刼id * @param dataOids 鎵�闇�鍒犻櫎鐨勬暟鎹� @@ -456,6 +464,7 @@ public R deleteDatas(String redisOid,String codeClassifyOid,String dataOids){ return mdmIOService.deleteDatas(redisOid,codeClassifyOid,dataOids); } + /** * 鎵归噺淇濆瓨娴佺▼鎵ц椤甸潰淇敼鐨勫唴瀹� * @param orderDTOList 缂栫爜鐩稿叧鐨勪俊鎭紝涓嶉渶瑕佺爜娈电殑淇℃伅 @@ -520,7 +529,7 @@ @PostMapping("/upSaveCode") public R upSaveCode(@RequestBody CodeOrderDTO orderDTO){ engineService.upSaveCode(orderDTO); - return R.success("鎿嶄綔鎴愬姛锛�"); + return R.success("鎿嶄綔鎴愬姛锛�"); } /** @@ -658,7 +667,6 @@ return engineService.getFlowUIInfoByClassifyOid(codeClassifyOid,functionId,templateId,taskId,modelKey); } - @GetMapping("/thisistest") @ResponseBody public Integer thisistest(String codeClassifyOid, String functionId) throws Exception { @@ -726,7 +734,7 @@ * @param referConfigVO 鍙傜収鐨勯厤缃俊鎭� * @return 鎵ц鐨勭粨鏋� */ - @GetMapping("/defaultReferDataGrid") + @RequestMapping(value = "/defaultReferDataGrid",method = {RequestMethod.POST, RequestMethod.GET}) public IPage<BaseModelVO> defaultReferDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject){ return engineService.referDataGrid(referConfigVO,baseQueryObject); } @@ -750,4 +758,15 @@ public R processChangeStatus(@RequestBody FlowStatusDTO flowDTO){ return engineService.processChangeStatus(flowDTO); } + + /** + * 鏍囧噯鐢宠鍜屼慨璁㈢敤 + * @param codeBZApplyDTO 缂栫爜鐢宠鐩稿叧鐨勪俊鎭紝闇�瑕佹湁灞炴�у拰鐮佹鐩稿叧鐨勪俊鎭� + * @return 鎵ц缁撴灉 + */ + @PostMapping("/addSaveBZ") + @VciBusinessLog(operateName = "鐢宠鍗曚釜缂栫爜") + public R addSaveBZ (@RequestBody CodeBZApplyDTO codeBZApplyDTO) throws Exception { + return R.success(engineService.addSaveBZ(codeBZApplyDTO)); + } } -- Gitblit v1.9.3