From a332264920c9cd9226d566c19e36e5d5b5549c1b Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 12 Aug 2019 15:11:31 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/controller/MachineActivateController.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/controller/MachineActivateController.java b/src/main/java/com/moral/controller/MachineActivateController.java
index 87f1f00..0c41538 100644
--- a/src/main/java/com/moral/controller/MachineActivateController.java
+++ b/src/main/java/com/moral/controller/MachineActivateController.java
@@ -1,13 +1,20 @@
package com.moral.controller;
+import static com.moral.common.util.WebUtils.getParametersStartingWith;
+
+import java.util.Map;
+
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import com.moral.common.bean.PageBean;
import com.moral.common.bean.ResultBean;
+import com.moral.entity.MachineActivate;
import com.moral.service.MachineActivateService;
@RestController
@@ -17,10 +24,17 @@
@Resource
private MachineActivateService machineActivateService;
- @PostMapping("machine")
+ @GetMapping("machine")
public ResultBean<Integer> activateMachine(Integer organizationId,String expireDate) {
Integer code = machineActivateService.createMachineActivate(organizationId,expireDate);
return new ResultBean<Integer>(code);
}
+ @GetMapping("list")
+ public PageBean<MachineActivate> getMachineActivates(HttpServletRequest request) {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ PageBean<MachineActivate> machineActivates = machineActivateService.getMachineActivates(parameters);
+ return machineActivates;
+ }
+
}
--
Gitblit v1.8.0