add Sample Detail

app/api/business/LoginBus.php

@@ -25,7 +25,6 @@ class LoginBus
         if (!$ry_info && !$jcdw_info) {
             throw new ApiException(config('status.err_user_not_exist'));
         }
-
         //在ry表中查询到数据，则验证用户名和密码
         if (isset($ry_info['rybh']) && $ry_info['kl']==$password) {
             $data=[
@@ -64,7 +63,7 @@ class LoginBus
             ->encode()
             ->getToken();
 
-        //将ip存到redis中，通过middleware验证
+        //将ip存到redis中，通过middleware验证 todo
         $real_ip = request()->ip();
         Cache::store('redis')->set($real_ip,$token,1 * 24 * 3600);
 

app/api/business/SuperviserTaskBus.php

@@ -99,15 +99,4 @@ class SuperviserTaskBus
         $result = (new Ccjc())->updateTaskByArrCondition($arr);
         return $result;
     }
-
-
-
-
-
-
-
-
-
-
-
 }

app/api/controller/v1/Index.php

@@ -445,11 +445,21 @@ class Index extends BaseController
                 ->where($sumMap)
                 ->select();
 //            $res['rows'] = Db::name("ccjc")->where($sumMap)->page($pageNum,$pageSize)->select();
-            $res['total'] = Db::name("undertake")->Join('t_ccjc','t_undertake.task_id=t_ccjc.id')->where($sumMap)->count();
+            $res['total'] = Db::name("undertake")
+                ->Join('t_ccjc','t_undertake.task_id=t_ccjc.id')
+                ->where($sumMap)
+                ->count();
 //            $res['total'] = Db::name("ccjc")->where($sumMap)->count();
         }else{
-            $res['rows'] = Db::name("undertake")->Join('t_ccjc','t_undertake.task_id=t_ccjc.id')->where($sumMap)->page($pageNum,$pageSize)->select();
-            $res['total'] = Db::name("undertake")->Join('t_ccjc','t_undertake.task_id=t_ccjc.id')->where($sumMap)->count();
+            $res['rows'] = Db::name("undertake")
+                ->Join('t_ccjc','t_undertake.task_id=t_ccjc.id')
+                ->where($sumMap)
+                ->page($pageNum,$pageSize)
+                ->select();
+            $res['total'] = Db::name("undertake")
+                ->Join('t_ccjc','t_undertake.task_id=t_ccjc.id')
+                ->where($sumMap)
+                ->count();
 
         }
 

app/api/controller/v1/Login.php

@@ -17,23 +17,16 @@ class Login extends BaseController
     //登录
     public function login()
     {
-
         if (!$this->request->isPost()) return showError(config('status.illegal_request'));
-        //todo validate
-
-        $data = [
+         $data = [
             'username'=>$this->request->param('login_name', '', 'trim'),
             'password'=>$this->request->param('pwd', '', 'trim'),
         ];
-
-        //todo validate
-//        try {
-//            $this->validate(User::class)->scene('login')->check($data);
-//        } catch (ValidateException $exception) {
-//            return show('11', $exception->getError());
-//        }
-
-
+        try {
+            validate(User::class)->scene('login')->check($data);
+        } catch (ValidateException $exception) {
+            return show(config('status.err_validate'),$exception->getError());
+        }
         $res=(new LoginBus())->login($data['username'],$data['password']);
         return showSuccess($res);
     }

app/api/controller/v1/Sample.php

@@ -41,39 +41,39 @@ class Sample
 
         //受检单位信息
         $unit_test = [
-            'unit_name' => request()->param('units.units_name','','trim'),
-            'address' => request()->param('units.address'),
-            'represent_name' => request()->param('units.corporation','','trim'),
-            'user_name' => request()->param('units.user_name','','trim'),
-            'phone' => request()->param('units.phone','','trim'),
-            'fax' => request()->param('units.fax','','trim'),
+            'unit_name' => request()->param('units.units_name','','trim'),//单位名称
+            'address' => request()->param('units.address'),//通讯地址
+            'represent_name' => request()->param('units.corporation','','trim'),//法定代表人
+            'user_name' => request()->param('units.user_name','','trim'),//*受检人
+            'phone' => request()->param('units.phone','','trim'),//电话
+            'fax' => request()->param('units.fax','','trim'),//传真
         ];
 
         //生产单位信息
         $unit_production = [
-            'production_name' =>request()->param('production.production_name','','trim'),
-            'address' =>request()->param('production.p_address','','trim'),
-            'postcode' =>request()->param('production.p_postcode','','trim'),
-            'user_name' =>request()->param('production.p_user_name','','trim'),
-            'phone' =>request()->param('production.p_phone','','trim'),
-            'fax' =>request()->param('production.p_fax','','trim'),
+            'production_name' =>request()->param('production.production_name','','trim'),//单位名称
+            'address' =>request()->param('production.p_address','','trim'),//通讯地址
+            'postcode' =>request()->param('production.p_postcode','','trim'),//邮编
+            'user_name' =>request()->param('production.p_user_name','','trim'),//联系人
+            'phone' =>request()->param('production.p_phone','','trim'),//电话
+            'fax' =>request()->param('production.p_fax','','trim'),//传真
             'production_class' =>request()->param('production.production_class','','trim'),//生产方式
         ];
 
         //抽样单位信息
         $unit_sample = [
-            'unit_name' => request()->param('sampleUnit.sample_unit_name','','trim'),
-            'unit_user' => request()->param('sampleUnit.sample_unit_user','','trim'),
-            'address' => request()->param('sampleUnit.sample_unit_address','','trim'),
-            'postcode' => request()->param('sampleUnit.sample_unit_postcode','','trim'),
-            'phone' => request()->param('sampleUnit.sample_unit_phone','','trim'),
-            'fax' => request()->param('sampleUnit.sample_unit_fax','','trim'),
-            'email' => request()->param('sampleUnit.sample_unit_email','','trim'),
+            'unit_name' => request()->param('sampleUnit.sample_unit_name','','trim'),//单位名称
+            'unit_user' => request()->param('sampleUnit.sample_unit_user','','trim'),//联系人
+            'address' => request()->param('sampleUnit.sample_unit_address','','trim'),//通讯地址
+            'postcode' => request()->param('sampleUnit.sample_unit_postcode','','trim'),//邮编
+            'phone' => request()->param('sampleUnit.sample_unit_phone','','trim'),//联系电话
+            'fax' => request()->param('sampleUnit.sample_unit_fax','','trim'),//传真
+            'email' => request()->param('sampleUnit.sample_unit_email','','trim'),//Email
         ];
 
 //抽样单cyd信息
         $cyd_data = [
-            'sample_id' => request()->param('sample_id','','trim'),
+            'sample_id' => request()->param('sample_id','','trim'),//抽样单的id
             'task_id' => request()->param('task_id','','trim'),//关联任务id
             'test_id' => request()->param('test_id','','trim'),//检测单位id-------todo 这个怎么填！！！！！！！！！！！！
 
@@ -82,19 +82,21 @@ class Sample
             'sample_unit' => request()->param('sample_unit','','trim'),//抽样单位id
 
             'sample_name' => request()->param('sample_name','','trim'),//样品名称
-            'brand' => request()->param('brand','','trim'),
-            'ispack' => request()->param('ispack','','trim'),
-            'type' => request()->param('type','','trim'),
-            'standard' => request()->param('standard','','trim'),
-            'production_date' => request()->param('production_date','','trim'),
-            'place' => request()->param('place','','trim'),
-            'certicfie' => request()->param('certicfie','','trim'),
-            'certifie_num' => request()->param('certifie_num','','trim'),
-            'sample_num' => request()->param('sample_num','','trim'),
-            'sample_num_unit' => request()->param('sample_num_unit','','trim'),
-            'sample_base' => request()->param('sample_base','','trim'),
-            'sample_base_unit' => request()->param('sample_base_unit','','trim'),
-            'sample_ground' => request()->param('sample_ground','','trim'),
+            'brand' => request()->param('brand','','trim'),//商标
+            'ispack' => request()->param('ispack','','trim'),//包装
+            'type' => request()->param('type','','trim'),//型号规格
+            'standard' => request()->param('standard','','trim'),//执行标准
+            'production_date' => request()->param('production_date','','trim'),//生产日期或批号
+            'place' => request()->param('place','','trim'),//	产地
+            'certicfie' => request()->param('certicfie','','trim'),//*产品认证情况
+            'certifie_num' => request()->param('certifie_num','','trim'),//证书编号
+            'sample_num' => request()->param('sample_num','','trim'),//*抽样数量
+            'sample_num_unit' => request()->param('sample_num_unit','','trim'),//*抽样数量单位
+            'sample_base' => request()->param('sample_base','','trim'),//抽样基数
+            'sample_base_unit' => request()->param('sample_base_unit','','trim'),//抽样基数单位
+            'sample_ground' => request()->param('sample_ground','','trim'),//*抽样场所
+            'base' => request()->param('base', '', 'trim'),//检测任务依据
+            'sample_date'=>request()->param('sample_date','','trim'),//抽样时间
             'file_name' => request()->param('file_name','','trim'),//文件名
             'file_url' => request()->param('file_url','','trim'),//文件链接
         ];

app/api/exception/ApiException.php

@@ -8,11 +8,9 @@
 namespace app\api\exception;
 
 use Throwable;
-
 //具体的handle方法在app\ExceptionHandle.php 中
 class ApiException extends \RuntimeException
 {
-
     public function __construct(array $apiErrCode,Throwable $previous = null)
         //ApiException(config('status.err_user_not_exist')
         //这里array $apiErrCode改成数组是为了方便调用配置文件。config('status.success')

app/api/validate/User.php

@@ -19,8 +19,8 @@ class User extends Validate
     ];
 
     protected $message = [
-        'username.require' => 'require',
-        'password.require' => 'require',
+        'username.require' => '用户名不能为空',
+        'password.require' => '密码不能为空',
     ];
 
     protected $scene =[

app/common/lib/auth/JwtAuth.php

@@ -22,7 +22,6 @@ class JwtAuth
     private $rybh;//人员编号
     private $rymc;//人员名称
     private $groupname;//组名
-    private $name;//名称//这个我不知到是什么，后面再改//Todo
     private $uid;//t_ry表的id
 
     private $token;
@@ -45,7 +44,6 @@ class JwtAuth
         }
         return self::$instance;
     }
-
     /**
      * 私有化构造函数 防止new
      */

config/status.php

@@ -12,25 +12,23 @@ return [
 
     //用户登录相关的错误
     'err_username_or_password'=>['-1', '用户名或密码错误'],
-    'err_user_not_exist'=>['100','用户不存在'],
+    'err_user_not_exist'=>['100','用户名或密码    不存在'],
 
 
     //JwtMiddleware相关错误
     'err_unKnow'=>['200','未知错误'],
     'err_params'=>['300','参数错误'],
 
-
     //数据操作有关错误
     'none_authority' => ['400', '无权操作'],
     'none_data' => ['401', '未选取有效数据'],
     'err_public_status'=>['402','当前任务不可废止'],
-
+    'err_data_upload' => ['4004', '数据上传失败，请重试'],
 
     //lib/update上传相关的错误
     'undefined_error'=>['1000','上传文件发生未知错误'],
     'no_file_to_uploaded' => ['1000', '未上传任何文件'],
 
-
     //模型操作相关的错误
     'none_model_info'=>['2004','未选取有效模型'],
     'none_model_product'=>['2005','检测对象未选取有效数据'],
@@ -39,9 +37,8 @@ return [
     //任务操作相关的错误
     'err_task_auth'=>['3004','权限不足，无法操作该任务'],
 
-
-    //数据库操作相关错误
-    'err_data_upload' => ['4004', '数据上传失败，请重试'],
+    //api-validate异常抛出
+    'err_validate'=>'999',
 
 
 ];