修改用户设备信息

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

@@ -1,12 +1,13 @@
 package cn.rankin.userservice.controller;
 
+import cn.rankin.data.api.user.dto.UserDeviceDTO;
 import cn.rankin.data.api.user.entity.UserDevice;
-import cn.rankin.data.api.user.vo.UserDeviceVo;
 import cn.rankin.userservice.helper.RaStringHelper;
 import cn.rankin.userservice.service.UserDeviceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.List;
 
 
@@ -18,33 +19,24 @@ public class UserDeviceController
     @Autowired
     private UserDeviceService userDeviceService;
 
-    @RequestMapping(value = "/op/{uid}", method = RequestMethod.GET)
+    @RequestMapping(value = "/op/{uid}", method = RequestMethod.POST)
     public int bindingDevice(@PathVariable("uid") String uid,
-                             @RequestParam("deviceCode") String deviceCode,
-                             @RequestParam("deviceMode") String deviceMode,
-                             @RequestParam("deviceMfrs") String deviceMfrs,
-                             @RequestParam("deviceName") String deviceName,
-                             @RequestParam("deviceType") String deviceType)
+                             @Valid @RequestBody UserDeviceDTO userDeviceDTO)
     {
 
         if (RaStringHelper.isNull(uid))
         {
             return 0;
         }
-        if (RaStringHelper.isNull(deviceCode))
+        if (RaStringHelper.isNull(userDeviceDTO.getDeviceCode()))
         {
             return 0;
         }
 
-        UserDeviceVo userDeviceVo = new UserDeviceVo();
-        userDeviceVo.setUserId(uid);
-        userDeviceVo.setDeviceCode(deviceCode);
-        userDeviceVo.setDeviceModel(deviceMode);
-        userDeviceVo.setDeviceMfrs(deviceMfrs);
-        userDeviceVo.setDeviceName(deviceName);
-        userDeviceVo.setDeviceType(deviceType);
 
-        return userDeviceService.opUserDevice(userDeviceVo);
+        userDeviceDTO.setUserId(uid);
+
+        return userDeviceService.opUserDevice(userDeviceDTO);
 
     }
 

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

@@ -14,13 +14,13 @@ 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.deviceModel = ?3")
-    UserDevice findUserDevice(String uid, String deviceCode,String deviceModel);
+    @Query(value = "select device from UserDevice device where device.userId = ?1 AND device.deviceName= ?2 AND device.deviceModel = ?3")
+    UserDevice findUserDevice(String uid, String deviceName,String deviceModel);
 
     @Transactional
     @Modifying
-    @Query(value = "update UserDevice device set device.num = ?4 where device.userId = ?1 AND device.deviceCode= ?2 AND device.deviceModel = ?3")
-    int updateDevice(String uid, String deviceCode,String deviceModel,int num);
+    @Query(value = "update UserDevice device set device.num = ?4 where device.userId = ?1 AND device.deviceName= ?2 AND device.deviceModel = ?3")
+    int updateDevice(String uid, String deviceName,String deviceModel,int num);
 
     /**
      * 根据用户编号查询设备信息

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

@@ -1,5 +1,6 @@
 package cn.rankin.userservice.service;
 
+import cn.rankin.data.api.user.dto.UserDeviceDTO;
 import cn.rankin.data.api.user.entity.UserDevice;
 import cn.rankin.data.api.user.vo.UserDeviceVo;
 import cn.rankin.userservice.helper.RaStringHelper;
@@ -22,27 +23,27 @@ public class UserDeviceService
      * @param userDeviceVo
      * @return
      */
-    public int opUserDevice(UserDeviceVo userDeviceVo)
+    public int opUserDevice(UserDeviceDTO uerDeviceDTO)
     {
-        if (userDeviceVo == null)
+        if (uerDeviceDTO == null)
         {
             return 0;
         }
 
-        String uid = userDeviceVo.getUserId();
-        String deviceCode = userDeviceVo.getDeviceCode();
-        String deviceModel = userDeviceVo.getDeviceModel();
-        String deviceName = userDeviceVo.getDeviceName();
-        String deviceType = userDeviceVo.getDeviceType();
-        String deviceMfrs = userDeviceVo.getDeviceMfrs();
+        String uid = uerDeviceDTO.getUserId();
+        String deviceCode = uerDeviceDTO.getDeviceCode();
+        String deviceModel = uerDeviceDTO.getDeviceModel();
+        String deviceName = uerDeviceDTO.getDeviceName();
+        String deviceType = uerDeviceDTO.getDeviceType();
+        String deviceMfrs = uerDeviceDTO.getDeviceMfrs();
 
         //查询用户设备信息
-        UserDevice userDevice = userDeviceRepository.findUserDevice(uid, deviceCode, deviceModel);
+        UserDevice userDevice = userDeviceRepository.findUserDevice(uid, deviceName, deviceModel);
         if (userDevice != null)
         {
             //更新访问量
             int num = userDevice.getNum() + 1;
-            int updateRet = userDeviceRepository.updateDevice(uid, deviceCode, deviceModel, num);
+            int updateRet = userDeviceRepository.updateDevice(uid, deviceName, deviceModel, num);
 
             return updateRet;
         }