Commit e19e0514 authored by wzp's avatar wzp

修改bug

parent 5e93b9e2
...@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.*; ...@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -117,6 +118,13 @@ public class TBoxOperationController extends BaseController { ...@@ -117,6 +118,13 @@ public class TBoxOperationController extends BaseController {
tBoxOperation.setMac(tBoxOperation.getMac().toUpperCase()); tBoxOperation.setMac(tBoxOperation.getMac().toUpperCase());
} }
if (2==tBoxOperation.getStatus()) { if (2==tBoxOperation.getStatus()) {
TBoxOperation byId = tBoxOperationService.getById(tBoxOperation.getId());
if (byId.getMac()!=null&&!byId.getMac().equals(tBoxOperation.getMac())){
Map<String, Object> resultMap = new LinkedHashMap<String, Object>();
resultMap.put("resultCode", "500");
resultMap.put("message", "此账号已绑定机顶盒!");
return resultMap;
}
final ArrayList<String> rsaKeys = RSAUtils.createRSAKeys(); final ArrayList<String> rsaKeys = RSAUtils.createRSAKeys();
tBoxOperation.setPublicKey(rsaKeys.get(0)); tBoxOperation.setPublicKey(rsaKeys.get(0));
tBoxOperation.setPrivateKey(rsaKeys.get(1)); tBoxOperation.setPrivateKey(rsaKeys.get(1));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment