imei相关接口修改

express-main/src/main/java/cn/haliaeetus/controller/deviceapi/AppLoginController.java

@@ -6,8 +6,11 @@ import cn.haliaeetus.framework.base.controller.BaseController;
 import cn.haliaeetus.framework.base.digt.Md5Util;
 import cn.haliaeetus.framework.toolkit.CacheTool;
 import cn.haliaeetus.framework.util.ServletUtils;
-import cn.haliaeetus.service.*;
 import cn.haliaeetus.service.AppNotice.AppNoticeService;
+import cn.haliaeetus.service.BasicInfoService;
+import cn.haliaeetus.service.DeliveryMsgTemplateConfigService;
+import cn.haliaeetus.service.ExStoreService;
+import cn.haliaeetus.service.UserService;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import com.xinai.core.WgMjController;
@@ -44,7 +47,7 @@ public class AppLoginController extends BaseController {
 	@RequestMapping(value = {"/apps/api/v2/notLogin"})
 	@ResponseBody
 	public Object getContactNumber(HttpServletRequest request, HttpServletResponse response){
-		return buildJson(99,"请重新报备！");
+		return buildJson(99,"禁止登录，请联系管理员！");
 	}
 
 	@RequestMapping(value = {"/apps/api/v2/getPhoneImei"})

express-main/src/main/java/cn/haliaeetus/framework/base/filter/ApiLoginFilter.java

@@ -1,8 +1,8 @@
 package cn.haliaeetus.framework.base.filter;
 
 import cn.haliaeetus.entity.PhoneImei;
-import cn.haliaeetus.framework.util.StringUtil;
 import cn.haliaeetus.service.BasicInfoService;
+import cn.haliaeetus.service.ExStoreService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.context.WebApplicationContext;
 
@@ -10,6 +10,8 @@ import javax.servlet.*;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 
+import static cn.haliaeetus.framework.base.controller.BaseController.buildJson;
+
 /**
  * @author sunjj
  * @version 1.0.0
@@ -20,12 +22,14 @@ import java.io.IOException;
 public class ApiLoginFilter implements Filter {
 
     private BasicInfoService basicInfoService;
+    private ExStoreService exStoreService;
     private WebApplicationContext wac;
 
     @Override
     public void init(FilterConfig filterConfig) throws ServletException {
         wac = (WebApplicationContext) filterConfig.getServletContext().getAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE);
         basicInfoService = wac.getBean(BasicInfoService.class);
+        exStoreService = wac.getBean(ExStoreService.class);
     }
 
     @Override
@@ -49,7 +53,7 @@ public class ApiLoginFilter implements Filter {
             }
             PhoneImei phoneImei = basicInfoService.getPhoneImeiByImie(imei);
             if(phoneImei==null){
-                httpRequest.getRequestDispatcher(path).forward(request, response);
+                phoneImei(phoneImei, imei, appVersion);
                 return;
             }
             if(phoneImei.getIsOpen()==0){
@@ -57,7 +61,7 @@ public class ApiLoginFilter implements Filter {
                 return;
             }
             if(!appVersion.equals(phoneImei.getAppVersion())){
-                httpRequest.getRequestDispatcher(path).forward(request, response);
+                phoneImei(phoneImei, imei, appVersion);
                 return;
             }
             if(phoneImei.getIsLogin()!=1){
@@ -73,4 +77,30 @@ public class ApiLoginFilter implements Filter {
     public void destroy() {
 
     }
+
+    public Object phoneImei(PhoneImei phoneImeiOld, String imei, String appVersion){
+        try {
+            PhoneImei phoneImei = new PhoneImei();
+            if (null == phoneImeiOld){
+                phoneImei.setImei(imei);
+                phoneImei.setIsLogin(1);
+                phoneImei.setIsOpen(1);
+                phoneImei.setAppVersion(appVersion);
+                exStoreService.insertPhoneImei(phoneImei);
+                basicInfoService.savePhoneImei(phoneImei);
+            }else {
+                if(phoneImeiOld.getIsOpen()==0){
+                    return buildJson(-1,"报备失败,该设备被禁用！");
+                }
+                if(!appVersion.equals(phoneImeiOld.getAppVersion())){
+                    phoneImeiOld.setAppVersion(appVersion);
+                    exStoreService.updatePhoneImei(phoneImeiOld);
+                    basicInfoService.savePhoneImei(phoneImeiOld);
+                }
+            }
+        }catch (Exception e){
+            return buildJson(-1,"报备失败！");
+        }
+        return buildJson(0,"报备成功,请重新登录！");
+    }
 }