修改用户设备信息

rankin-api-web/src/main/java/cn/rankin/apiweb/controller/LoginController.java

@@ -36,7 +36,6 @@ public class LoginController {
 
         log.info("login request header:user-agent={}",request.getHeader("User-Agent"));
 
-        HttpUtil.getSystemInfo(request);
 
         log.info("login request header : ip={},terminal={},merchant={}",ip , request.getHeader("terminal"), request.getHeader("merchant"));
         return userService.login(loginInfoDTO);

rankin-api-web/src/main/java/cn/rankin/apiweb/service/user/UserClient.java

@@ -9,7 +9,6 @@ import cn.rankin.data.api.user.entity.UserTag;
 import cn.rankin.data.api.user.entity.UserTagProductRelation;
 import cn.rankin.data.api.user.vo.TerminalDeviceVo;
 import cn.rankin.data.api.user.vo.TerminalUserVo;
-import cn.rankin.data.api.user.vo.UserDeviceVo;
 import cn.rankin.data.api.user.vo.WhiteUserVo;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.stereotype.Component;
@@ -59,10 +58,12 @@ public interface UserClient {
     UserTag findUserTagById(@PathVariable("tagId")  String tagId);
 
 
-    @RequestMapping(value = "/userDevice/bindingDevice/{uid}", method = RequestMethod.GET)
-    UserDeviceVo findUserDevice(@PathVariable("uid")  String uid,
+    @RequestMapping(value = "/userDevice/setUserDevice/{uid}", method = RequestMethod.GET)
+    boolean setUserDevice(@PathVariable("uid")  String uid,
                                  @RequestParam("deviceCode") String deviceCode,
-                                 @RequestParam("deviceType") String deviceType);
+                                 @RequestParam("deviceMode") String deviceMode,
+                                @RequestParam("deviceMfrs") String deviceMfrs,
+                                @RequestParam("deviceBrand") String deviceBrand);
 
 
     @RequestMapping(value = "/userTagProductRelation/page/pids", method = RequestMethod.POST)
@@ -135,9 +136,9 @@ public interface UserClient {
         }
 
         @Override
-        public UserDeviceVo findUserDevice(String uid, String deviceCode, String deviceType)
+        public boolean setUserDevice(String uid, String deviceCode, String deviceMode,String deviceMfrs,String deviceBrand)
         {
-            return null;
+            return true;
         }
 
         @Override

rankin-api-web/src/main/java/cn/rankin/apiweb/service/user/UserService.java

@@ -58,7 +58,10 @@ public class UserService {
 
     public APIResult<UserInfoVo> login(LoginInfoDTO loginInfoDTO) {
         String deviceCode = loginInfoDTO.getDeviceCode();
-        String deviceType = loginInfoDTO.getDeviceType();
+        String deviceModel = loginInfoDTO.getDeviceModel();
+        String deviceMfrs = loginInfoDTO.getDeviceMfrs();
+        String deviceBrand = loginInfoDTO.getDeviceBrand();
+
         String merchant = loginInfoDTO.getMerchant();
         String eid = loginInfoDTO.getEid();
         String loginPassword = loginInfoDTO.getPassword();
@@ -71,9 +74,12 @@ public class UserService {
             return APIResult.error(ApiWebCode.LOGIN_ERROR);
         }
 
-        //查询登陆用户是否记录用户登录手机产品商
-        String uid = userVo.getId();
-        userClient.findUserDevice(uid,deviceCode,deviceType);
+        //设置用户登录设备信息
+        if(deviceModel != null && !"".equals(deviceModel.trim()))
+        {
+            String uid = userVo.getId();
+            userClient.setUserDevice(uid,deviceCode,deviceModel,deviceMfrs,deviceBrand);
+        }
 
         String storePassword = userVo.getPassword();
         if (!SecurityManager.validate(loginPassword, storePassword)) {

rankin-data-api/src/main/java/cn/rankin/data/api/app/dto/LoginInfoDTO.java

@@ -25,5 +25,12 @@ public class LoginInfoDTO implements Serializable {
 
     private String terminal;
 
-    private String deviceType;
+    //设备型号
+    private String deviceModel;
+
+    //设备厂商
+    private String deviceMfrs;
+
+    //设备商标
+    private String deviceBrand;
 }

rankin-data-api/src/main/java/cn/rankin/data/api/user/entity/UserDevice.java

@@ -1,8 +1,5 @@
 package cn.rankin.data.api.user.entity;
 
-import cn.rankin.common.utils.enums.BaseStatusEnum;
-import cn.rankin.common.utils.enums.EventTypeEnum;
-import cn.rankin.common.utils.enums.PlatformTypeEnum;
 import lombok.Data;
 import lombok.ToString;
 import org.hibernate.annotations.DynamicInsert;
@@ -30,11 +27,20 @@ public class UserDevice implements Serializable {
     @Column(name="device_code")
     private String deviceCode;
 
-    @Column(name="device_type")
-    private String deviceType;
+    //设备型号
+    @Column(name="device_model")
+    private String deviceModel;
 
-    @Column(name="binding_num")
-    private int bindingNum;
+    //设备厂商
+    @Column(name="device_mfrs")
+    private String deviceMfrs;
+
+    //设备厂商
+    @Column(name="device_brand")
+    private String deviceBrand;
+
+    @Column(name="num")
+    private int num;
 
     @Column(name = "gmt_created", updatable = false, insertable = false, columnDefinition = "timestamp NULL DEFAULT CURRENT_TIMESTAMP")
     @Temporal(TemporalType.TIMESTAMP)

rankin-data-api/src/main/java/cn/rankin/data/api/user/vo/UserDeviceVo.java

@@ -1,31 +0,0 @@
-package cn.rankin.data.api.user.vo;
-
-import cn.rankin.common.utils.enums.BaseStatusEnum;
-import lombok.Data;
-import lombok.ToString;
-
-import javax.persistence.Column;
-import javax.persistence.Id;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@ToString
-public class UserDeviceVo implements Serializable {
-
-    private String id;
-
-    private String userId;
-
-    private String deviceCode;
-
-    private String deviceType;
-
-    private Integer bindingNum = 0;
-
-    private Date createTime;
-
-    private Date updateTime;
-}

rankin-user-service/src/main/java/cn/rankin/userservice/controller/UserDeviceController.java

@@ -22,10 +22,12 @@ public class UserDeviceController
     private UserDeviceService userDeviceService;
 
 
-    @RequestMapping(value = "/bindingDevice/{uid}", method = RequestMethod.GET)
+    @RequestMapping(value = "/setUserDevice/{uid}", method = RequestMethod.GET)
     public UserDevice bindingDevice(@PathVariable("uid") String uid,
                                          @RequestParam("deviceCode") String deviceCode,
-                                         @RequestParam("deviceType") String deviceType){
+                                         @RequestParam("deviceMode") String deviceMode,
+                                         @RequestParam("deviceMfrs") String deviceMfrs,
+                                         @RequestParam("deviceBrand") String deviceBrand){
 
         if(RaStringHelper.isNull(uid))
         {
@@ -35,16 +37,24 @@ public class UserDeviceController
         {
             return null;
         }
-        if(RaStringHelper.isNull(deviceType))
+        if(RaStringHelper.isNull(deviceMode))
+        {
+            return null;
+        }
+        if(RaStringHelper.isNull(deviceMfrs))
+        {
+            return null;
+        }
+        if(RaStringHelper.isNull(deviceBrand))
         {
             return null;
         }
 
-        UserDevice userDevice = userDeviceService.findDevice(uid,deviceCode,deviceType);
+        UserDevice userDevice = userDeviceService.findDevice(uid,deviceCode,deviceMode,deviceMfrs,deviceBrand);
         if(userDevice!=null)
         {
-            int bindingNum = userDevice.getBindingNum()+1;
-            userDeviceService.updateDevice(uid,deviceCode,deviceType,bindingNum);
+            int num = userDevice.getNum()+1;
+            userDeviceService.updateDevice(uid,deviceCode,deviceMode,deviceMfrs,deviceBrand,num);
         }
 
         return userDevice;

rankin-user-service/src/main/java/cn/rankin/userservice/repository/UserDeviceRepository.java

@@ -13,11 +13,11 @@ import java.util.List;
 
 public interface UserDeviceRepository extends BasicJpaRepository<UserDevice, String> {
 
-    @Query(value = "select device from UserDevice device where device.userId = ?1 AND device.deviceCode= ?2 AND device.deviceType = ?3")
-    UserDevice findUserDevice(String uid, String deviceCode,String deviceType);
+    @Query(value = "select device from UserDevice device where device.userId = ?1 AND device.deviceCode= ?2 AND device.deviceModel = ?3  AND device.deviceMfrs = ?4  AND device.deviceBrand = ?5")
+    UserDevice findUserDevice(String uid, String deviceCode,String deviceModel,String deviceMfrs,String deviceBrand);
 
     @Transactional
     @Modifying
-    @Query(value = "update UserDevice device set device.bindingNum = ?4 where device.userId = ?1 AND device.deviceCode= ?2 AND device.deviceType = ?3")
-    int updateDevice(String uid, String deviceCode,String deviceType,int bindingNum);
+    @Query(value = "update UserDevice device set device.num = ?6 where device.userId = ?1 AND device.deviceCode= ?2 AND device.deviceModel = ?3  AND device.deviceMfrs = ?4  AND device.deviceBrand = ?5")
+    int updateDevice(String uid, String deviceCode,String deviceModel,String deviceMfrs,String deviceBrand,int bindingNum);
 }

rankin-user-service/src/main/java/cn/rankin/userservice/service/UserDeviceService.java

@@ -15,13 +15,15 @@ public class UserDeviceService
     private UserDeviceRepository userDeviceRepository;
 
     /**
-     * Find user deceive
-     * @param uid the user id
-     * @param deviceCode the device code
-     * @param deviceType the device type
-     * @return the entity of user device
+     * Find device
+     * @param uid
+     * @param deviceCode
+     * @param deviceModel
+     * @param deviceMfrs
+     * @param deviceBrand
+     * @return
      */
-    public UserDevice findDevice(String uid,String deviceCode,String deviceType)
+    public UserDevice findDevice(String uid,String deviceCode,String deviceModel,String deviceMfrs,String deviceBrand)
     {
         if(RaStringHelper.isNull(uid))
         {
@@ -31,12 +33,12 @@ public class UserDeviceService
         {
             return null;
         }
-        if(RaStringHelper.isNull(deviceType))
+        if(RaStringHelper.isNull(deviceModel))
         {
             return null;
         }
 
-        UserDevice userDevice = userDeviceRepository.findUserDevice(uid,deviceCode,deviceType);
+        UserDevice userDevice = userDeviceRepository.findUserDevice(uid,deviceCode,deviceModel,deviceMfrs,deviceBrand);
         if(userDevice != null)
         {
             return userDevice;
@@ -47,8 +49,10 @@ public class UserDeviceService
             userDevice.setUserId(uid);
             userDevice.setGmtCreated(new Date());
             userDevice.setDeviceCode(deviceCode);
-            userDevice.setDeviceType(deviceType);
-            userDevice.setBindingNum(1);
+            userDevice.setDeviceModel(deviceModel);
+            userDevice.setDeviceMfrs(deviceMfrs);
+            userDevice.setDeviceBrand(deviceBrand);
+            userDevice.setNum(1);
             userDeviceRepository.save(userDevice);
 
             return null;
@@ -56,13 +60,16 @@ public class UserDeviceService
     }
 
     /**
-     * Find user deceive
-     * @param uid the user id
-     * @param deviceCode the device code
-     * @param deviceType the device type
-     * @return the entity of user device
+     * Updates device
+     * @param uid
+     * @param deviceCode
+     * @param deviceModel
+     * @param deviceMfrs
+     * @param deviceBrand
+     * @param bingdingNum
+     * @return
      */
-    public int updateDevice(String uid,String deviceCode,String deviceType,int bingdingNum)
+    public int updateDevice(String uid,String deviceCode,String deviceModel,String deviceMfrs,String deviceBrand,int bingdingNum)
     {
         if(RaStringHelper.isNull(uid))
         {
@@ -72,12 +79,12 @@ public class UserDeviceService
         {
             return 0;
         }
-        if(RaStringHelper.isNull(deviceType))
+        if(RaStringHelper.isNull(deviceModel))
         {
             return 0;
         }
 
-        int updateRet = userDeviceRepository.updateDevice(uid,deviceCode,deviceType,bingdingNum);
+        int updateRet = userDeviceRepository.updateDevice(uid,deviceCode,deviceModel,deviceMfrs,deviceBrand,bingdingNum);
 
         return   updateRet;
     }