From 5d0f7e5056781905cad2dd4c9b7803e30bd94f19 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 10 Apr 2018 09:08:19 +0800
Subject: [PATCH] 注册码管理
---
src/main/java/com/moral/controller/MachineActivateController.java | 18 ++++++++++++++++--
src/main/java/com/moral/service/impl/MachineActivateServiceImpl.java | 24 ++++++++++++++++++------
src/main/java/com/moral/service/MachineActivateService.java | 5 +++++
3 files changed, 39 insertions(+), 8 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;
+ }
+
}
diff --git a/src/main/java/com/moral/service/MachineActivateService.java b/src/main/java/com/moral/service/MachineActivateService.java
index 4312794..5cc70ac 100644
--- a/src/main/java/com/moral/service/MachineActivateService.java
+++ b/src/main/java/com/moral/service/MachineActivateService.java
@@ -2,6 +2,9 @@
import java.util.Map;
+import com.moral.common.bean.PageBean;
+import com.moral.entity.MachineActivate;
+
public interface MachineActivateService {
Integer checkActivate(String macCpuCode);
@@ -10,4 +13,6 @@
Integer createMachineActivate(Integer organizationId, String expireDate);
+ PageBean<MachineActivate> getMachineActivates(Map<String, Object> parameters);
+
}
diff --git a/src/main/java/com/moral/service/impl/MachineActivateServiceImpl.java b/src/main/java/com/moral/service/impl/MachineActivateServiceImpl.java
index 4a15fbb..e6abc85 100644
--- a/src/main/java/com/moral/service/impl/MachineActivateServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/MachineActivateServiceImpl.java
@@ -16,7 +16,9 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
+import com.github.pagehelper.PageHelper;
import com.moral.common.bean.Constants;
+import com.moral.common.bean.PageBean;
import com.moral.common.exception.BusinessException;
import com.moral.common.util.ValidateUtil;
import com.moral.entity.MachineActivate;
@@ -70,6 +72,12 @@
ValidateUtil.notNull(expireDate, "param.is.null");
MachineActivate machineActivate = new MachineActivate();
+ try {
+ machineActivate.setExpireDate(DateUtils.parseDate(expireDate, "yyyy-MM-dd"));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ throw new BusinessException("expireDate���������������������");
+ }
String activationCode = "";
Integer count = 0;
do {
@@ -80,13 +88,17 @@
machineActivate.setCreateTime(new Date());
machineActivate.setIsUsed(Constants.IS_USED_FALSE);
machineActivate.setOrganizationId(organizationId);
- try {
- machineActivate.setExpireDate(DateUtils.parseDate(expireDate, "yyyy-MM-dd"));
- } catch (ParseException e) {
- e.printStackTrace();
- throw new BusinessException("expireDate���������������������");
- }
return machineActivateMapper.insertSelective(machineActivate);
}
+
+ @Override
+ public PageBean<MachineActivate> getMachineActivates(Map<String, Object> parameters) {
+ Example example = new Example(MachineActivate.class);
+ Criteria criteria = example.createCriteria();
+ criteria.andEqualTo("organizationId", parameters.get("organizationId"));
+ PageHelper.startPage(Integer.valueOf((String) parameters.get("pageIndex")),Integer.valueOf((String) parameters.get("pageSize")));
+ List<MachineActivate> machineActivates = machineActivateMapper.selectByExample(example);
+ return new PageBean<MachineActivate>(machineActivates);
+ }
}
--
Gitblit v1.8.0