Explorar el Código

更新接口调整

fangq hace 4 años
padre
commit
ebc4b6f241
Se han modificado 1 ficheros con 23 adiciones y 12 borrados
  1. 23 12
      src/main/java/org/springblade/ship/open/OpenController.java

+ 23 - 12
src/main/java/org/springblade/ship/open/OpenController.java

@@ -62,13 +62,12 @@ public class OpenController extends BladeController {
 	private final ICableService cableService;
 
 	/**
-	 * 详情
+	 * 设备更新信息(用户、电缆、设备)
 	 */
-	@GetMapping("/updateInfo")
+	@GetMapping("/device/updateInfo")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入device")
 	public R updateInfo(@RequestParam String deviceCode) {
-
 		Device device = deviceService.getOne(new QueryWrapper<>(new Device()).lambda().eq(Device::getCode, deviceCode));
 		Assert.notNull(device, "系统找不到编码为【" + deviceCode + "】的设备!");
 		QueryWrapper<User> userQueryWrapper = new QueryWrapper<>(new User());
@@ -79,19 +78,31 @@ public class OpenController extends BladeController {
 		}
 		List<User> userList = userService.list(userQueryWrapper);
 		List<Cable> cableList = cableService.list(cableQueryWrapper);
-		device.setLastUpdateTime(DateUtil.now());
 
-		if (deviceService.updateById(device)){
-			Map<String, Object> map = new HashMap<>();
-			map.put("userList", userList);
-			map.put("cableList", cableList);
-			map.put("device", device);
-			return R.data(map);
-		}
-		return R.status(false);
+		Map<String, Object> map = new HashMap<>();
+		map.put("userList", userList);
+		map.put("cableList", cableList);
+		map.put("device", device);
+		map.put("updateTime", DateUtil.format(DateUtil.now(), "yyyy-MM-dd HH:mm:ss"));
+		return R.data(map);
+	}
+
+
+	/**
+	 * 设备最后更新时间
+	 */
+	@GetMapping("/device/updateTime")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入device")
+	public R updateTime(@RequestParam String deviceCode) {
+		Device device = deviceService.getOne(new QueryWrapper<>(new Device()).lambda().eq(Device::getCode, deviceCode));
+		Assert.notNull(device, "系统找不到编码为【" + deviceCode + "】的设备!");
+		device.setLastUpdateTime(DateUtil.now());
+		return R.status(deviceService.updateById(device));
 	}
 
 
 
 
+
 }