root
/
ifish
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
yiyan 2025-06-09 20:28:43 +08:00
parent c18cce86a1 1ba8aea6c9
commit 6f879f19cf
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/ifish/action/UpdateUserAction.java
View File

@ -8,6 +8,7 @@ import com.ifish.service.BaseService;
import com.ifish.service.PageListService; import com.ifish.service.PageListService;
import com.ifish.service.UserService; import com.ifish.service.UserService;
import com.ifish.util.IfishUtil; import com.ifish.util.IfishUtil;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -87,6 +88,10 @@ public class UpdateUserAction {
@RequestMapping(value = "/bindDevice.do") @RequestMapping(value = "/bindDevice.do")
@ResponseBody @ResponseBody
public Object bindDevice(@RequestParam String deviceId,@RequestParam Integer userId,@RequestParam String phoneType, @RequestParam(required = false) Integer type){ public Object bindDevice(@RequestParam String deviceId,@RequestParam Integer userId,@RequestParam String phoneType, @RequestParam(required = false) Integer type){
System.out.println("bindDevice ----- " + deviceId + "\t" + userId + "\t" + phoneType + "\t" + type);
if (StringUtils.isBlank(deviceId)) {
return IfishUtil.returnJson(ResultEnum.success.getKey(), "");
}
AliyunDeviceInfo aliyunDeviceInfo = baseService.getAliyunDeviceInfoByUserId(userId); AliyunDeviceInfo aliyunDeviceInfo = baseService.getAliyunDeviceInfoByUserId(userId);
if (aliyunDeviceInfo == null) { if (aliyunDeviceInfo == null) {
aliyunDeviceInfo = new AliyunDeviceInfo(); aliyunDeviceInfo = new AliyunDeviceInfo();
@ -102,6 +107,11 @@ public class UpdateUserAction {
} }
return baseService.saveAliyunDeviceInfo(aliyunDeviceInfo); return baseService.saveAliyunDeviceInfo(aliyunDeviceInfo);
} else { } else {
if (type != null) {
aliyunDeviceInfo.setType(type);
} else {
aliyunDeviceInfo.setType(0);
}
aliyunDeviceInfo.setUserId(userId); aliyunDeviceInfo.setUserId(userId);
aliyunDeviceInfo.setPhoneType(phoneType); aliyunDeviceInfo.setPhoneType(phoneType);
aliyunDeviceInfo.setLastUpdateTime(new Date()); aliyunDeviceInfo.setLastUpdateTime(new Date());