Change the buiding tool to angular-cli

[holmes/rule-management.git] / rulemgt-frontend / src / app / correlation-ruleList / alarmRule.service.ts

diff --git a/rulemgt/src/main/frontend/src/alarm/app/correlation-ruleList/alarmRule.service.ts b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.service.ts
similarity index 87%
rename from rulemgt/src/main/frontend/src/alarm/app/correlation-ruleList/alarmRule.service.ts
rename to rulemgt-frontend/src/app/correlation-ruleList/alarmRule.service.ts
index c0ca2ad..33ea713 100644 (file)
--- a/rulemgt/src/main/frontend/src/alarm/app/correlation-ruleList/alarmRule.service.ts
+++ b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.service.ts
@@ -15,10 +15,10 @@
 */
 import { Injectable } from '@angular/core';
 import { Http, Response, Headers } from '@angular/http';
-import 'rxjs/add/operator/toPromise';
-import 'rxjs/add/operator/map';
+
+
 import { RuleModel } from './alarmRule';
-import { RuleRequest } from './ruleRequest'
+import { RuleRequest } from './ruleRequest';
 import { Router } from '@angular/router';
 import { ModalService } from '../correlation-modal/modal.service';
 
@@ -40,11 +40,11 @@ export class AlarmRuleService {
         return Promise.reject(error._body || error);
     }
 
-    search(ruleid: string): Promise<RuleModel> {
-        if (typeof (ruleid) == "string") {
+    search(ruleId: string): Promise<RuleModel> {
+        if (typeof (ruleId) == "string") {
             let rule = [{
-                ruleid: null,
-                rulename: null,
+                ruleId: null,
+                ruleName: null,
                 description: null,
                 content: null,
                 createtime: null,
@@ -54,7 +54,7 @@ export class AlarmRuleService {
                 enabled: 0,
             }]
         }
-        let data = { 'ruleid': ruleid };
+        let data = { 'ruleId': ruleId };
         var queryrequest = JSON.stringify(data);
         const url = `${this.ruleUrl}?queryrequest=${queryrequest}`;
         return this.http.get(url, {headers:this.headers})
@@ -64,7 +64,7 @@ export class AlarmRuleService {
     }
 
     searchrules(rule: RuleRequest): Promise<RuleModel[]> {
-        let data = { rulename: rule.rulename, enabled: rule.enabled }
+        let data = { ruleName: rule.ruleName, enabled: rule.enabled }
         console.log(JSON.stringify(data));
         const url = `${this.ruleUrl}?queryrequest=${JSON.stringify(data)}`
         return this.http.get(url, { body: data, headers: this.headers })
@@ -85,7 +85,7 @@ export class AlarmRuleService {
 
     updateRule(rule: RuleModel): Promise<any> {
         let rules = {
-            "ruleid": rule.ruleid,
+            "ruleId": rule.ruleId,
             "description": rule.description,
             "content": rule.content,
             "enabled": rule.enabled
@@ -103,7 +103,7 @@ export class AlarmRuleService {
             "description": rule.description,
             "content": rule.content,
             "enabled": rule.enabled,
-            "rulename": rule.rulename
+            "ruleName": rule.ruleName
         }
         return this.http.put(this.ruleUrl, JSON.stringify(ruledata), { headers: this.headers })
             .toPromise()
@@ -111,8 +111,8 @@ export class AlarmRuleService {
             .catch(error => error);
     }
 
-    public delete(ruleid: string): Promise<void> {
-        const url = `${this.ruleUrl}` + '/' + ruleid;
+    public delete(ruleId: string): Promise<void> {
+        const url = `${this.ruleUrl}` + '/' + ruleId;
         return this.http.delete(url, { headers: this.headers })
             .toPromise()
             .then(res => {