From e8ef361dc975aeaedeee6f28dfe679489a22f9d5 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 02 Sep 2019 17:42:06 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/service/impl/MachineActivateServiceImpl.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/MachineActivateServiceImpl.java b/src/main/java/com/moral/service/impl/MachineActivateServiceImpl.java
index 4a15fbb..64c26f6 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;
@@ -47,6 +49,13 @@
ValidateUtil.notNull(parameters.get("macCpuCode"), "param.is.null");
ValidateUtil.notNull(parameters.get("activationCode"), "param.is.null");
+ MachineActivate machineActivate = new MachineActivate();
+ machineActivate.setMacCpuCode(parameters.get("macCpuCode").toString());
+ int selectCount = machineActivateMapper.selectCount(machineActivate);
+ if (selectCount > 0) {
+ throw new BusinessException("���������������������������������������������");
+ }
+
Example example = new Example(MachineActivate.class);
Criteria criteria = example.createCriteria();
criteria.andEqualTo("activationCode", parameters.get("activationCode"));
@@ -56,7 +65,7 @@
if (ObjectUtils.isEmpty(machineActivates)) {
throw new BusinessException("������������������������������������������");
}
- MachineActivate machineActivate = machineActivates.get(0);
+ machineActivate = machineActivates.get(0);
machineActivate.setIsUsed(Constants.IS_DELETE_TRUE);
machineActivate.setMacCpuCode((String) parameters.get("macCpuCode"));
@@ -70,6 +79,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 +95,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