Merge branch 'master' of http://gogs.renlianiot.com:4000/zmcoding/smart-tool-api

catch/alarm/controller/AlarmReport.php

@@ -99,7 +99,7 @@ class AlarmReport extends CatchController
             $end_date = $request->param('end_date');
         }
         // 查出告警类型
-        $alarm_types = $this->sysDictDataModel->getTypesByCode('AlarmType');
+        $alarm_types = $this->sysDictDataModel->getTypesByCode('AlarmReason');
 
         $datas = [];
         while ($start_date <= $end_date) {

catch/alarm/database/migrations/20210527112040_alarm_records.php

@@ -32,6 +32,7 @@ class AlarmRecords extends Migrator
         $table = $this->table('alarm_records', ['engine' => 'InnoDB',  'comment' => '' ,'id' => 'id','signed' => true ,'primary_key' => ['id']]);
         $table->addColumn('device_number', 'string', ['limit' => 50,'null' => true,'signed' => true,'comment' => '设备编号',])
             ->addColumn('alarm_reason', 'string', ['limit' => 50,'null' => true,'signed' => true,'comment' => '告警原因',])
+            ->addColumn('alarm_type', 'string', ['limit' => 50,'null' => true,'signed' => true,'comment' => '告警类型',])
 			->addColumn('handler_id', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => false,'default' => 0,'signed' => false,'comment' => '处理人ID',])
 			->addColumn('start_time', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => true,'signed' => true,'comment' => '开始时间',])
 			->addColumn('end_time', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => true,'signed' => true,'comment' => '结束时间',])

catch/alarm/model/AlarmRecords.php

@@ -26,6 +26,7 @@ class AlarmRecords extends Model
         'end_time',
         // 告警状态
         'state',
+        'alarm_type',
         // 备注
         'comment',
         // 处理结果

catch/alarm/model/get/AlarmRecordsGet.php

@@ -58,7 +58,7 @@ trait AlarmRecordsGet
      */
     public function getReasonTextAttr($value)
     {
-        return $this->getDictValue('AlarmType',$this->alarm_reason);
+        return $this->getDictValue('AlarmReason',$this->alarm_reason);
     }
     /**
      * 获取告警状态
@@ -76,4 +76,11 @@ trait AlarmRecordsGet
     
        return (new SysDictData())->getValueByCode($typeCode,$value);
    }
+    /**
+     * 获取告警类型名称
+     */
+    public function getAlarmTypeAttr($value)
+    {
+        return $this->getDictValue('AlarmType', $value);
+    }
 }

catch/alarm/model/get/AlarmReportGet.php

@@ -17,7 +17,7 @@ trait AlarmReportGet
         if (is_null($type)) {
             return '';
         }
-        return $this->getDictValue('AlarmType', $type);
+        return $this->getDictValue('AlarmReason', $type);
     }
     
    

catch/hydraulic/controller/Hydraulic.php

@@ -37,9 +37,7 @@ class Hydraulic extends CatchController
         if(isset($data['out_date']) && is_int($data['out_date'])){
             $data['out_date'] = date('Y-m-d',$data['out_date']);
         }
-        if(isset($data['out_date']) && !$data['out_date']){
-            $data['out_date'] = null;
-        }
+  
         return CatchResponse::success($this->hydraulicModel->storeBy($data));
     }
     
@@ -65,9 +63,6 @@ class Hydraulic extends CatchController
         if(isset($data['out_date']) && is_int($data['out_date'])){
             $data['out_date'] = date('Y-m-d',$data['out_date']);
         }
-        if(isset($data['out_date']) && !$data['out_date']){
-            $data['out_date'] = null;
-        }
         return CatchResponse::success($this->hydraulicModel->updateBy($id, $data));
     }
     

catch/hydraulic/model/Hydraulic.php

@@ -143,6 +143,29 @@ class Hydraulic extends Model
            return '-';
        }
     }
+
+    /**
+     * 校验日期
+     */
+    public function getEffectiveTimeAttr($value)
+    {
+       if($value){
+            return date('Y-m-d H:i:s',$value);
+       }else{
+           return '-';
+       }
+    }
+        /**
+     * 校验日期
+     */
+    public function getCheckTimeAttr($value)
+    {
+       if($value){
+            return date('Y-m-d H:i:s',$value);
+       }else{
+           return '-';
+       }
+    }
     /**
      * 获取告警状态文本
      */

catch/logs/model/WxPushResultLog.php

@@ -75,7 +75,7 @@ class WxPushResultLog extends Model
         if (is_null($type)) {
             return '';
         }
-        return $this->getDictValue('AlarmType', $type);
+        return $this->getDictValue('AlarmReason', $type);
     }
 
     /*

catch/screen/controller/Preview.php

@@ -143,7 +143,7 @@ class Preview extends CatchController
                             ->where('alarm_time','>',$time)
                             ->whereIn('alarm_type','fence_in,fence_out')
                             ->select()->toArray();
-        $type_id = Db::table("sys_dict_type")->where('code','AlarmType')->value('id');
+        $type_id = Db::table("sys_dict_type")->where('code','AlarmReason')->value('id');
         
         $scrollData=[];
         foreach($alarm_list as $val){

catch/wind/controller/Fan.php

@@ -54,10 +54,16 @@ class Fan extends CatchController
         $save_data=array(
             'wind_id'=>$data['wind_id'],
             'fan_model'=>$data['fan_model'],
+            'supplier'=>$data['supplier'],
+            'out_date'=>date('Y-m-d',$data['out_date']),
+            'address'=>$data['address'],
             'info'=>$data['info'],
             'creator_id' => $data['creator_id'],
             'created_at' => time(),
         );
+        if(isset($data['out_date']) && is_int($data['out_date'])){
+            $save_data['out_date'] = date('Y-m-d',$data['out_date']);
+        }
         $add_fans=array();
         if($data['mul_number']){
             $numArr=explode(',',$data['mul_number']);
@@ -104,7 +110,9 @@ class Fan extends CatchController
     public function update(Request $request, $id) : \think\Response
     {   $data = $request->post();
       
-       
+        if(isset($data['out_date']) && is_int($data['out_date'])){
+            $data['out_date'] = date('Y-m-d',$data['out_date']);
+        }
         return CatchResponse::success($this->fanModel->updateBy($id, $data));
     }
     

catch/wind/database/migrations/20220428195332_fan.php

@@ -32,7 +32,11 @@ class Fan extends Migrator
         $table = $this->table('fan', ['engine' => 'InnoDB', 'collation' => 'utf8mb4_general_ci', 'comment' => '风机表' ,'id' => 'id','signed' => true ,'primary_key' => ['id']]);
         $table->addColumn('wind_id', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => false,'default' => 0,'signed' => true,'comment' => '风厂的id',])
 			->addColumn('number', 'string', ['limit' => 32,'null' => false,'default' => 0,'signed' => true,'comment' => '机位号',])
-			->addColumn('fan_model', 'string', ['limit' => 32,'null' => false,'default' => 0,'signed' => true,'comment' => '风机型号',])
+            ->addColumn('fan_model', 'string', ['limit' => 32,'null' => false,'default' => 0,'signed' => true,'comment' => '风机型号',])
+            ->addColumn('supplier', 'string', ['limit' => 50,'null' => true,'signed' => true,'comment' => '供应商',])
+            ->addColumn('out_date', 'date', ['null' => true,'signed' => true,'comment' => '出厂日期',])
+			->addColumn('address', 'string', ['limit' => 100,'null' => true,'signed' => true,'comment' => '地址',])
+            
             ->addColumn('longitude', 'decimal', ['precision' => 10,'scale' => 6,'null' => true,'signed' => true,'comment' => '经度',])
             ->addColumn('latitude', 'decimal', ['precision' => 10,'scale' => 6,'null' => true,'signed' => true,'comment' => '纬度',])
 			->addColumn('info', 'string', ['limit' => 100,'null' => true,'signed' => true,'comment' => '备注',])

catch/wind/model/Fan.php

@@ -23,9 +23,12 @@ class Fan extends Model
         // 编号
         'number',
         'fan_model',
+        'out_date',
+        'supplier',
         'longitude',
         'latitude',
         'info',
+        'address',
         // 创建人ID
         'creator_id',
         // 创建时间