|
@@ -81,13 +81,15 @@ public class RestApiController {
|
|
|
public String moveToAction(@RequestBody HlRequestDTO dto) {
|
|
|
|
|
|
String result = "";
|
|
|
+ String message = "";
|
|
|
String token = dto.getToken();
|
|
|
LinkedHashMap<String, Object> object = new LinkedHashMap<>();
|
|
|
if (!token.equals("")) {
|
|
|
String apiKey = service.selectApiKey(dto);
|
|
|
if (apiKey.equals("")) {
|
|
|
object.put("error", "invalidToken");
|
|
|
- return object.toString();
|
|
|
+ message = "invalidToken";
|
|
|
+ result = object.toString();
|
|
|
} else {
|
|
|
try {
|
|
|
token = LifeCenterFunction.aesDecrypt(apiKey, LifeCenterConfigVO.IV, token);
|
|
@@ -112,7 +114,8 @@ public class RestApiController {
|
|
|
String resourceType = dto.getResourceType();
|
|
|
if (resourceType.equals("")) {
|
|
|
object.put("error", "emptyResourceType");
|
|
|
- return object.toString();
|
|
|
+ message = "emptyResourceType";
|
|
|
+ result = object.toString();
|
|
|
} else {
|
|
|
if (resourceType.equals("bloodPressure") || resourceType.equals("bloodSugar") ||
|
|
|
resourceType.equals("oxygenSaturation") || resourceType.equals("pulseRate") || resourceType.equals("temperature")) {
|
|
@@ -132,29 +135,38 @@ public class RestApiController {
|
|
|
// result = selectVitalSign(dto);
|
|
|
} else {
|
|
|
object.put("error", "invalidResourceType");
|
|
|
- return object.toString();
|
|
|
+ message = "invalidResourceType";
|
|
|
+ result = object.toString();
|
|
|
}
|
|
|
}
|
|
|
|
|
|
|
|
|
} else {
|
|
|
object.put("error", "expireToken");
|
|
|
- return object.toString();
|
|
|
+ message = "expireToken";
|
|
|
+ result = object.toString();
|
|
|
}
|
|
|
} else {
|
|
|
object.put("error", "invalidParameters");
|
|
|
- return object.toString();
|
|
|
+ message = "invalidParameters";
|
|
|
+ result = object.toString();
|
|
|
}
|
|
|
|
|
|
} catch (Exception e) {
|
|
|
object.put("error", "invalidParameters");
|
|
|
- return object.toString();
|
|
|
+ message = "invalidParameters";
|
|
|
+ result = object.toString();
|
|
|
}
|
|
|
}
|
|
|
|
|
|
} else {
|
|
|
object.put("error", "emptyToken");
|
|
|
- return object.toString();
|
|
|
+ message = "emptyToken";
|
|
|
+ result = object.toString();
|
|
|
+ }
|
|
|
+
|
|
|
+ if (message.equals("")) {
|
|
|
+ message = "success";
|
|
|
}
|
|
|
|
|
|
return result;
|