From fbec1c270bfbeac936035cbc9db61d8a1162ccf9 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 05 Mar 2018 10:35:27 +0800
Subject: [PATCH] 报表优化
---
src/main/java/com/moral/service/impl/MachineActivateServiceImpl.java | 51 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 34 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/MachineActivateServiceImpl.java b/src/main/java/com/moral/service/impl/MachineActivateServiceImpl.java
index e49e743..4a15fbb 100644
--- a/src/main/java/com/moral/service/impl/MachineActivateServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/MachineActivateServiceImpl.java
@@ -2,14 +2,16 @@
import static org.apache.commons.lang3.time.DateUtils.truncate;
+import java.text.ParseException;
import java.util.Calendar;
import java.util.Date;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.UUID;
import javax.annotation.Resource;
+import org.apache.commons.lang3.time.DateUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
@@ -31,29 +33,19 @@
private MachineActivateMapper machineActivateMapper;
@Override
- public Map<String, Object> checkActivate(String macCpuCode) {
+ public Integer checkActivate(String macCpuCode) {
ValidateUtil.notEmpty(macCpuCode, "param.is.null");
- Map<String, Object> map = new HashMap<String, Object>();
- String result = "1";
MachineActivate machineActivate = new MachineActivate();
machineActivate.setMacCpuCode(macCpuCode);
- machineActivate = machineActivateMapper.selectOne(machineActivate);
- if (ObjectUtils.isEmpty(machineActivate)) {
- result = "0";
- }
- map.put("result", result);
-
- return map;
+ return machineActivateMapper.selectCount(machineActivate);
}
@Override
@Transactional
- public Map<String, Object> activateMachine(Map<String, Object> parameters) {
+ public Integer activateMachine(Map<String, Object> parameters) {
ValidateUtil.notNull(parameters.get("macCpuCode"), "param.is.null");
ValidateUtil.notNull(parameters.get("activationCode"), "param.is.null");
-
- Map<String, Object> map = new HashMap<String, Object>();
Example example = new Example(MachineActivate.class);
Criteria criteria = example.createCriteria();
@@ -67,9 +59,34 @@
MachineActivate machineActivate = machineActivates.get(0);
machineActivate.setIsUsed(Constants.IS_DELETE_TRUE);
machineActivate.setMacCpuCode((String) parameters.get("macCpuCode"));
- int updateCount = machineActivateMapper.updateByPrimaryKeySelective(machineActivate);
- map.put("result", updateCount);
- return map;
+
+ return machineActivateMapper.updateByPrimaryKeySelective(machineActivate);
}
+ @Override
+ @Transactional
+ public Integer createMachineActivate(Integer organizationId,String expireDate) {
+ ValidateUtil.notNull(organizationId, "param.is.null");
+ ValidateUtil.notNull(expireDate, "param.is.null");
+
+ MachineActivate machineActivate = new MachineActivate();
+ String activationCode = "";
+ Integer count = 0;
+ do {
+ activationCode = UUID.randomUUID().toString().replaceAll("-", "").substring(0, 16).toUpperCase();
+ machineActivate.setActivationCode(activationCode);
+ count = machineActivateMapper.selectCount(machineActivate);
+ } while (count > 1);
+ 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);
+ }
}
--
Gitblit v1.8.0