DESKTOP-9JTA2JJ\HP %!s(int64=5) %!d(string=hai) anos
pai
achega
bf19b8d19a
Modificáronse 1 ficheiros con 12 adicións e 12 borrados
  1. 12 12
      api/application/controllers/Alarm.php

+ 12 - 12
api/application/controllers/Alarm.php

@@ -209,18 +209,18 @@ class Alarm extends Base_Controller {
 		$ids = explode(",", $ids);
 		$filter = array('id' => $ids);
 		$data = array('status' => intval($status));
-		$res = $this->Alarm_model->update($filter, $data);
-		if ($status == 1) {
-			foreach ($ids as $v) {
-				$alarmData = $this->Alarm_model->getOne($v,'A.lampid,A.alarmtype');
-				if ($status == 0) {
-					$this->Lamp_model->update(array('id'=>$alarData['lampid']),array('isfaulted'=>1));
-				}else{
-					$this->Lamp_model->update(array('id'=>$alarData['lampid']),array('isfaulted'=>0));
-				}
-				$this->Alarm_model->update(array('lampid'=>$alarmData['lampid'],'status'=>0),array('status'=>1));
-			}
-		}
+		$res = $this->Alarm_model->update($data,$filter);
+		// if ($status == 1) {
+		// 	foreach ($ids as $v) {
+		// 		$alarmData = $this->Alarm_model->get_one(['id'=>$v],'lampid');
+		// 		if ($status == 0) {
+		// 			$this->Lamp_model->update(array('id'=>$alarData['lampid']),array('isfaulted'=>1));
+		// 		}else{
+		// 			$this->Lamp_model->update(array('id'=>$alarData['lampid']),array('isfaulted'=>0));
+		// 		}
+		// 		$this->Alarm_model->update(array('lampid'=>$alarmData['lampid'],'status'=>0),array('status'=>1));
+		// 	}
+		// }
 		if ($res) {
 			exit(json_result('0000', $this->response['0000'], array()));
 		} else {