From a216d2503641b1d2ae6d4a2defa870470f2737bb Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期一, 18 九月 2023 14:14:52 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java | 87 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 86 insertions(+), 1 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java index ea037a8..61bc9e2 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java @@ -10,6 +10,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.ServletRequest; +import javax.servlet.http.HttpServletRequest; +import javax.ws.rs.core.Context; + /** * 涓婚搴撳垎绫绘帶鍒跺櫒 * @@ -19,15 +23,18 @@ @RestController @RequestMapping("/codeSyncUniversalController") public class CodeSyncUniversalController { + /** * 鏃ュ織 */ private Logger logger = LoggerFactory.getLogger(getClass()); + /** * 鎺ュ彛闆嗘垚鏈嶅姟 */ @Autowired private UniversalInterfaceI universalInterfaceI; + /**** * 鐢宠鎺ュ彛 * @param dataString 灞炴�т俊鎭� @@ -36,8 +43,9 @@ * @throws Throwable */ @PostMapping("/applyCode") - public String applyCode(@RequestParam("dataString")String dataString, @RequestParam("dataType")String dataType) { + public String applyCode(@RequestParam("dataString")String dataString, @RequestParam("dataType")String dataType, ServletRequest request) { String result=""; + HttpServletRequest httpServletRequest = (HttpServletRequest) request; try { result = universalInterfaceI.applyCode(dataString, dataType); }catch (Throwable e){ @@ -46,4 +54,81 @@ } return result; } + + /**** + * 鏇存柊/鍒犻櫎/鐘舵�佹帴鍙� + * @param dataString 灞炴�т俊鎭� + * @param dataType 鏁版嵁鏍煎紡绫诲瀷 + * @return + * @throws Throwable + */ + @PostMapping("/syncData") + public String syncData(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType) { + String result=""; + try { + result= universalInterfaceI.syncEditData(dataString,dataType); + }catch (Throwable e){ + e.printStackTrace();; + logger.error("syncData->"+e.getMessage()); + } + return result; + } + + /**** + * 鏌ヨ鍒嗙被鍙� + * @param dataString 灞炴�т俊鎭� + * @param dataType 鏁版嵁鏍煎紡绫诲瀷 + * @return + * @throws Throwable + */ + @PostMapping("/queryClassify") + public String queryClassify(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType) throws Throwable { + String result=""; + try { + result = universalInterfaceI.queryClassify(dataString, dataType); + }catch (Throwable e){ + e.printStackTrace(); + logger.error("queryClassify->"+e.getMessage()); + } + return result; + } + + /**** + * 鏌ヨ鍒嗙被鍙� + * @param dataString 灞炴�т俊鎭� + * @param dataType 鏁版嵁鏍煎紡绫诲瀷 + * @return + * @throws Throwable + */ + @PostMapping("/queryData") + public String queryData(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType) throws Throwable { + String result=""; + try { + result= universalInterfaceI.queryData(dataString,dataType); + }catch (Throwable e){ + e.printStackTrace(); + logger.error("queryData->"+e.getMessage()); + } + return result; + } + + /**** + * 鏌ヨ瑙勫垯 + * @param dataString 灞炴�т俊鎭� + * @param dataType 鏁版嵁鏍煎紡绫诲瀷 + * @return + * @throws Throwable + */ + @PostMapping("/queryClassifyRule") + public String queryClassifyRule(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType) throws Throwable { + String result=""; + try { + result= universalInterfaceI.queryClassifyRule(dataString,dataType); + }catch (Throwable e){ + e.printStackTrace(); + logger.error("queryData->"+e.getMessage()); + } + return result; + } + } -- Gitblit v1.9.3