From 8beab91730f3e3cd6b53e4d498f763ff9dc65ef5 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 18 Nov 2020 14:16:55 +0800
Subject: [PATCH] 修改污染溯源接口,从history表中获取改为从history天表获取

---
 src/main/java/com/moral/service/impl/MachineActivateServiceImpl.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/service/impl/MachineActivateServiceImpl.java b/src/main/java/com/moral/service/impl/MachineActivateServiceImpl.java
index e6abc85..64c26f6 100644
--- a/src/main/java/com/moral/service/impl/MachineActivateServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/MachineActivateServiceImpl.java
@@ -49,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"));
@@ -58,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"));
 

--
Gitblit v1.8.0