diff --git a/zycx/src/main/java/com/czlis/zycx/controller/ZycxController.java b/zycx/src/main/java/com/czlis/zycx/controller/ZycxController.java index 37cade0..c9a157b 100644 --- a/zycx/src/main/java/com/czlis/zycx/controller/ZycxController.java +++ b/zycx/src/main/java/com/czlis/zycx/controller/ZycxController.java @@ -118,5 +118,17 @@ public class ZycxController extends BaseController { return zycxService.printSendSample(sqhArray); } + @Anonymous + @ApiOperation("打印机插件设置") + @GetMapping("/printsetup") + public Result printsetup() { + return zycxService.printsetup(); + } + @Anonymous + @ApiOperation("打印机插件检查") + @GetMapping("/printcheck") + public Result printcheck() { + return zycxService.printcheck(); + } } diff --git a/zycx/src/main/java/com/czlis/zycx/service/ZycxService.java b/zycx/src/main/java/com/czlis/zycx/service/ZycxService.java index dfd6d26..afe6e4d 100644 --- a/zycx/src/main/java/com/czlis/zycx/service/ZycxService.java +++ b/zycx/src/main/java/com/czlis/zycx/service/ZycxService.java @@ -19,6 +19,7 @@ public interface ZycxService { Result getSQDMain(LabReqmain labReqmain); Result test1(String sqh); - + Result printsetup(); + Result printcheck(); Result printSendSample(String[] sqhList); } diff --git a/zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java b/zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java index 89c2fc5..f745ce6 100644 --- a/zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java +++ b/zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java @@ -338,6 +338,21 @@ public class ZycxServiceImpl implements ZycxService { System.out.println("已给客户端[" + webSocketUser.getUsername() + "]推送打印通知,IP:" + webSocketUser.getLoginIp()); return new Result("0","打印成功"); } - - + @Override + public Result printsetup(){ + WebSocketMessage wsMessage=new WebSocketMessage(); + wsMessage.setMsgType("lisbarprint"); + wsMessage.setData("lisbarprint://setup"); + wsMessage.setSenderId(SecurityUtils.getUsername()); + return sendprintmsg(JSONUtil.toJsonStr(wsMessage)); + } + @Override + public Result printcheck(){ + String ip= IpUtils.getIpAddr(); + String UserId = ChatWebSocketServer.getUserIdByIp(ip); + if(UserId==null||"".equals(UserId)){ + return new Result("-1","当前客户端打印插件不在线或未安装"); + } + return new Result("0","客户端插件正常"); + } }