Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -32,53 +32,97 @@ class CNoticeController extends BaseController
      * @param WebSettingLogic $webSettingLogic
      * @param WebSettingLogic $webSettingLogic
      */
      */
     public function sendNotify(){
     public function sendNotify(){
-        $type = $this->request->input('type', UpdateNotify::TYPE_MASTER);
-        if (FALSE == in_array($type, [UpdateNotify::TYPE_MASTER, UpdateNotify::TYPE_MINOR])){
-            $this->response('非法参数！', Code::USER_ERROR);
+        $updateProgressModel = new UpdateProgress();
+        $progressInfo = $updateProgressModel->formatQuery(['project_id'=>$this->user['project_id'],'type'=>$this->param['type']])->orderBy('id','desc')->first();
+        if((!empty($progressInfo))){
+            $progressInfo = $progressInfo->toArray();
+            if(($progressInfo['total_num'] > $progressInfo['current_num'])){
+                $this->response('当前页面正在生成了，请完成后再点击',Code::USER_ERROR,$progressInfo);
             }
             }
-        $page = $this->request->input('page', UpdateNotify::PAGE_ALL);
-        if (FALSE == in_array($type, [UpdateNotify::PAGE_ALL, UpdateNotify::PAGE_SINGLE])){
-            $this->response('非法参数！', Code::USER_ERROR);
         }
         }
-        $data = $this->sendNotifyMessage($type,$page);
-        @file_put_contents(storage_path('logs/lyh_error.log'), var_export($data, true) . PHP_EOL, FILE_APPEND);
-        if(!empty($data)){
-            $this->response('当前页面正在生成了，请完成后再点击',Code::USER_ERROR,$data);
+        //通知更新
+        if($this->param['type'] == UpdateNotify::TYPE_MASTER){
+            $this->updateMaster();
+        }else{
+            $this->updateMinorLanguages();
         }
         }
+        $urlStr = $this->getString($this->param['type'],$this->param['page']);
+        $this->curlGet($urlStr);
         $this->response('success');
         $this->response('success');
     }
     }
 
 
     /**
     /**
-     * 通知c端
-     * @param string $type
-     * @return array
+     * @remark :主键通知
+     * @name   :updateMaster
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/12 14:46
      */
      */
-    public function sendNotifyMessage($type,$page){
-        $updateProgressModel = new UpdateProgress();
-        $progressInfo = $updateProgressModel->formatQuery(['project_id'=>$this->user['project_id'],'type'=>$type])->orderBy('id','desc')->first();
-        if((!empty($progressInfo))){
-            $progressInfo = $progressInfo->toArray();
-            if(($progressInfo['total_num'] > $progressInfo['current_num'])){
-                return $progressInfo;
+    public function updateMaster(){
+        try {
+            $updateNotifyModel = new UpdateNotify();
+            if($this->param['page'] == UpdateNotify::PAGE_ALL){
+                //如果是更新所有
+                $routeMapModel = new RouteMap();
+                $count = $routeMapModel->formatQuery(['project_id'=>$this->user['project_id']])->count();
+                $updateNotifyModel->edit(['status' => 1], ['project_id' => $this->user['project_id'], 'status' => 0]);
+                $this->addProgress($count,$this->param['type']);
+            }elseif($this->param['page'] == UpdateNotify::PAGE_SINGLE){
+                //更新所有已修改的更新
+                $count = $updateNotifyModel->formatQuery(['project_id' => $this->user['project_id'], 'status' => 0])->count();
+                $updateNotifyModel->edit(['status' => 1], ['project_id' => $this->user['project_id'], 'status' => 0]);
+                $this->addProgress($count,$this->param['type']);
+            }else{
+                //根据传递的参数更新
+                $count = count($this->param['url']);
+                $extent = json_encode(['url'=>$this->param['url']]);
+                $this->addProgress($count,$this->param['type'],$extent);
+            }
+        }catch (\Exception $e){
+            $this->response('error',Code::USER_ERROR);
         }
         }
+        return true;
     }
     }
+
+    /**
+     * @remark :更新小语种
+     * @name   :updateMinorLanguages
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/12 14:48
+     */
+    public function updateMinorLanguages(){
         $updateNotifyModel = new UpdateNotify();
         $updateNotifyModel = new UpdateNotify();
-        $field = ($type == UpdateNotify::TYPE_MINOR) ? 'minor_languages_status' : 'status';
-        if($page == UpdateNotify::PAGE_ALL){
+        try {
+            if($this->param['page'] == UpdateNotify::PAGE_ALL){
+                $this->request->validate([
+                    'language' => 'required',
+                ], [
+                    'language.required' => '请选择语种',
+                ]);
                 //如果是更新所有
                 //如果是更新所有
                 $routeMapModel = new RouteMap();
                 $routeMapModel = new RouteMap();
                 $count = $routeMapModel->formatQuery(['project_id'=>$this->user['project_id']])->count();
                 $count = $routeMapModel->formatQuery(['project_id'=>$this->user['project_id']])->count();
+                $updateNotifyModel->edit(['minor_languages_status' => 1], ['project_id' => $this->user['project_id'], 'minor_languages_status' => 0]);
+                $extent = json_encode(['language'=>$this->param['language']]);
+                $this->addProgress($count,$this->param['type'],$extent);
             }else{
             }else{
-            $count = $updateNotifyModel->formatQuery(['project_id' => $this->user['project_id'], $field => 0])->count();
+                $this->request->validate([
+                    'url'=>'required',
+                    'language' => 'required',
+                ], [
+                    'url.required' => '请输入更新链接',
+                    'language.required' => '请选择语种',
+                ]);
+                //根据传递的参数更新
+                $count = count($this->param['url']);
+                $extent = json_encode(['url'=>$this->param['url'],'language'=>$this->param['language']]);
+                $this->addProgress($count,$this->param['type'],$extent);
             }
             }
-        if($count == 0){
-            return [];
+        }catch (\Exception $e){
+            $this->response('error',Code::USER_ERROR);
         }
         }
-        $this->addProgress($count,$type);
-        $updateNotifyModel->edit([$field => 1], ['project_id' => $this->user['project_id'], $field => 0]);
-        $urlStr = $this->getString($type,$page);
-        $this->curlGet($urlStr);
-        return [];
+        return true;
     }
     }
 
 
     /**
     /**
@@ -111,11 +155,12 @@ class CNoticeController extends BaseController
      * @method :post
      * @method :post
      * @time   :2023/9/6 17:01
      * @time   :2023/9/6 17:01
      */
      */
-    public function addProgress($count,$type){
+    public function addProgress($count,$type,$extend = ''){
         $data = [
         $data = [
             'total_num'=>$count,
             'total_num'=>$count,
             'current_num'=>0,
             'current_num'=>0,
             'type'=>$type,
             'type'=>$type,
+            'extend'=>$extend,
             'project_id'=>$this->user['project_id'],
             'project_id'=>$this->user['project_id'],
             'created_at'=>date('Y-m-d H;i:s')
             'created_at'=>date('Y-m-d H;i:s')
         ];
         ];