From c9749c730878c6dcca7f0f9081ebca9e57a3b0be Mon Sep 17 00:00:00 2001 From: sige Date: Fri, 12 Apr 2024 10:48:21 +0800 Subject: [PATCH] ~ --- app.db | Bin 299008 -> 299008 bytes .../com/iflytop/digester/DigestionTaskThread.java | 4 ++-- .../digester/controller/DigestionController.java | 17 +++++++++++++++++ .../deviceinstance/HeatingTurntableSlot.java | 5 +++++ .../deviceinstance/TransferRobotArmInstance.java | 9 +++++++-- .../digester/model/MdbDigestionSolution.java | 4 ++-- .../underframework/controller/TsApiSnippet.java | 21 ++++++++++++++++++--- .../UfApiControllerExceptionHandler.java | 18 +++++++++--------- web | 2 +- 9 files changed, 61 insertions(+), 19 deletions(-) diff --git a/app.db b/app.db index 028094f04bfbbda4c7a44c77bf42ade82d5fe732..e69323887f8a91b3a48e3120e2752fe76343e479 100644 GIT binary patch delta 1694 zcmcIkTWAzl7@o<6kYp}KXhB*i42Xg3k-3~Rmw+L`r#?u{WdvCkJTvEvS(3f))Emio z!HtO0jh7%Hgov@wQk6{}LM$yspM3Mt*A`|$@ZCpya%q}vifjbu#+mv5^ZnoV|Ns1# zmkwTDI#~URADaF8I6qW7vz$}p&L^C3RD2 zFw;3YEVsKz>p_s(s)sZHEvN#BbO^An8USM5VW;o=o;Qj!`AIs4C+K%!`S>KoSvOx_ zTB|So68|t4&peNx-m2fICQ~aHU$=E|$o;18igowZR3aLdHe>jXMX(p>K!Y|z_IwT4 zPJlO}1s)~DQ%%wk<7AQMagjE}n5o3eGs)CxvE6l!^#mxeH5@n~fR4=|2?e(9Sim!o zsrwp5UI0g5Uy3$?!XYkYHQdwuWs`1<2y>V(kl0<~%~ogyD?(PhvLRJTCmZK~XA%isrjrP_8tk;QpVej^P?RkVc=-U1jrm)Or!)03BhS?ji5pjQj5hJ#P*c64-t_?e)_N93@!|4AtGhmv@(;_a1MV3D; zp^%Whq;uJSlDXT=(zV;nWMuI9kzAN1C8gh(;yC`Q+gG?!@(l|?!Uha7P4>$NmIfk> zkq;n&nA(J3`=cfP4Ec$+dgc>K_#cVfLnblYcMnI6O}uY~AKTEtu#015kl(P;!yf-0 ptHR&|d3bY%>@Cio+O!;Lbvv8U_=q1oP*M4c+EP(le^lGf{0++~G$8;0 delta 747 zcmZozAk?rxXo57O_(U0JM)8daOY$YTxfmFD^mq^PW$>|cP30};730~-y^^PhYh&SK z&P`PpSlAhjLglp^%_pC%wUw(@%1*6RvNAL`G%_(TF)=hUGBVUrO3qF3Oi{8@n!cHz zMMYXkN2wsOC^5GfC}OB%s8k!vz`!sgR93subn>0`Dw88?B+$$;HZ?LZFh?@SL6Jp8 z5ZN4EkTHuH9RxN_U=fhw=Cfnqzrkn6H-W#6FP(2EKR3S#|9bvdzDFAi75FyWt(zsN zk!F%)l$>moq-$(!o}z1#W|^j&n39;NYiwX_YGIm|m}q2VmL~D()TRTB4xB&-GV%p5 z@C9rvbmOaU)@5Yp*KRRy;x~M@t>eY=#m}~OzgR!jz`!t?mrDT%sv(quf>KUqVQFTH zl7f{&bhT1RWkD*?&(CL1c-guG==!q!oYGvNh-s}3Zb?If+E^X9c^RpRCH0wk=`a&h za|=?75=%;pfW`pBNJl{_r4-1|%+CWxf@y6mL}RUv0+|j&vl?u3J;XD}RvV*Pjj$PH zZ!9!Chz$*xrAi>*VtUpX>{~2WLW4;uH?blpzceqU7!*pzAQ#jwQ(#hPGhl2pU}`g9 JUS`0O007$++vWfO diff --git a/src/main/java/com/iflytop/digester/DigestionTaskThread.java b/src/main/java/com/iflytop/digester/DigestionTaskThread.java index 8ee7d05..05eea2a 100644 --- a/src/main/java/com/iflytop/digester/DigestionTaskThread.java +++ b/src/main/java/com/iflytop/digester/DigestionTaskThread.java @@ -94,7 +94,7 @@ public class DigestionTaskThread extends Thread { public void run() { try { this.prepare(); - var rounds = this.solution.getRounds(); + var rounds = this.solution.getDigestionRounds(); var firstRound = rounds.remove(0); var lastRound = rounds.remove(rounds.size() - 1); @@ -159,7 +159,7 @@ public class DigestionTaskThread extends Thread { try { // 异常处理执行 - var errorRound = this.solution.getErrorRounds(); + var errorRound = this.solution.getDigestionErrorRounds(); for ( int i=0; i getRounds() { + public List getDigestionRounds() { ObjectMapper jsonMapper = new ObjectMapper(); JsonNode roundsJsonTree = null; try { @@ -53,7 +53,7 @@ public class MdbDigestionSolution extends UfActiveRecord { } // get error round - public DigestionSolutionErrorRound getErrorRounds() { + public DigestionSolutionErrorRound getDigestionErrorRounds() { ObjectMapper jsonMapper = new ObjectMapper(); JsonNode errorRoundsJsonTree = null; try { diff --git a/src/main/java/com/iflytop/digester/underframework/controller/TsApiSnippet.java b/src/main/java/com/iflytop/digester/underframework/controller/TsApiSnippet.java index 9ec3e8b..9638f58 100644 --- a/src/main/java/com/iflytop/digester/underframework/controller/TsApiSnippet.java +++ b/src/main/java/com/iflytop/digester/underframework/controller/TsApiSnippet.java @@ -37,10 +37,25 @@ public class TsApiSnippet extends UfApiControllerBase { @PostMapping("/api/snippet/execute") @ResponseBody - public UfApiResponse execute(@RequestBody UfMdbSnippet snippet ) { + public UfApiResponse execute(@RequestBody Map params ) { try { - snippet = UfActiveRecord.findOne(UfMdbSnippet.class, snippet.id); - UfCmdSnippetExecutor.execute(snippet.key); + String id = (String)params.get("id"); + Map snippetParams = (Map)params.get("params"); + var snippet = UfActiveRecord.findOne(UfMdbSnippet.class, id); + UfCmdSnippetExecutor.execute(snippet.key, snippetParams); + } catch ( Exception e ) { + return error(e.getMessage()); + } + return success(); + } + + @PostMapping("/api/snippet/execute-by-key") + @ResponseBody + public UfApiResponse executeByKey(@RequestBody Map params ) { + try { + String key = (String)params.get("key"); + Map snippetParams = (Map)params.get("params"); + UfCmdSnippetExecutor.execute(key, snippetParams); } catch ( Exception e ) { return error(e.getMessage()); } diff --git a/src/main/java/com/iflytop/digester/underframework/controller/UfApiControllerExceptionHandler.java b/src/main/java/com/iflytop/digester/underframework/controller/UfApiControllerExceptionHandler.java index be5c68d..b7f865c 100644 --- a/src/main/java/com/iflytop/digester/underframework/controller/UfApiControllerExceptionHandler.java +++ b/src/main/java/com/iflytop/digester/underframework/controller/UfApiControllerExceptionHandler.java @@ -5,13 +5,13 @@ import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; @ControllerAdvice public class UfApiControllerExceptionHandler { - @ExceptionHandler(RuntimeException.class) - public ResponseEntity handleException(RuntimeException ex) { - var response = new UfApiResponse(); - response.success = false; - response.code = "500"; - response.message = ex.getMessage(); - response.data = null; - return new ResponseEntity<>(response, HttpStatus.OK); - } +// @ExceptionHandler(RuntimeException.class) +// public ResponseEntity handleException(RuntimeException ex) { +// var response = new UfApiResponse(); +// response.success = false; +// response.code = "500"; +// response.message = ex.getMessage(); +// response.data = null; +// return new ResponseEntity<>(response, HttpStatus.OK); +// } } diff --git a/web b/web index c02d1dc..53712a5 160000 --- a/web +++ b/web @@ -1 +1 @@ -Subproject commit c02d1dcba08ea7ff724791e191264cb70ea90435 +Subproject commit 53712a58ceb4f19c7dba9204587134b88d86e3e5