gx

@@ -8,6 +8,7 @@ use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\Setting\ProofreadingLogic;
 use App\Http\Logic\Bside\Setting\ProofreadingLogic;
 use App\Models\WebSetting\Proofreading;
 use App\Models\WebSetting\Proofreading;
 use App\Models\WebSetting\WebSettingCountry;
 use App\Models\WebSetting\WebSettingCountry;
+use Illuminate\Support\Facades\DB;
 
 
 class ProofreadingController extends BaseController
 class ProofreadingController extends BaseController
 {
 {
@@ -40,24 +41,22 @@ class ProofreadingController extends BaseController
             return $this->response('success',Code::SUCCESS,$data);
             return $this->response('success',Code::SUCCESS,$data);
         }
         }
         $new_list = $this->getUrlRead($this->param['url']);
         $new_list = $this->getUrlRead($this->param['url']);
-        $old_list = [];//老翻译的数据
-        $arr = [];
+        $data = [];//返回数据
+        $old_list = [];
         foreach ($list as $v){
         foreach ($list as $v){
             $old_list[] = $v['text'];
             $old_list[] = $v['text'];
-            $arr[$v['text']] = $v['translate'];
-        }
-        $data_list = array_merge(array_diff($old_list, $new_list),array_diff($new_list, $old_list));
-        $data = [];
-        foreach ($data_list as $v){
-            if(isset($arr[$v])){
             $data[] = [
             $data[] = [
-                    'text'=>$v,
-                    'translate'=>$arr[$v],
+                'text'=>$v['text'],
+                'translate'=>$v['translate'],
             ];
             ];
-            }else{
+        }
+        $arr2 = array_diff($new_list, $old_list);
+        if(!empty($arr2)){
+            $translate_list = Translate::tran($arr2, $countryInfo['alias']);
+            foreach ($arr2 as $k1=>$v1){
                 $data[] = [
                 $data[] = [
-                    'text'=>$v,
-                    'translate'=>Translate::tran($v, $countryInfo['alias']),
+                    'text'=>$v1,
+                    'translate'=>$translate_list[$k1]
                 ];
                 ];
             }
             }
         }
         }
@@ -71,13 +70,18 @@ class ProofreadingController extends BaseController
      * @time   :2023/6/12 10:52
      * @time   :2023/6/12 10:52
      */
      */
     public function save(){
     public function save(){
-        $proofreadingModel = new Proofreading();
+        //清除以前的翻译校队数据，重新添加
         $param = [
         $param = [
             'type'=>1,
             'type'=>1,
             'project_id'=>$this->user['project_id'],
             'project_id'=>$this->user['project_id'],
             'url'=>$this->param['url'],
             'url'=>$this->param['url'],
             'language_id'=>$this->param['language_id']
             'language_id'=>$this->param['language_id']
         ];
         ];
+        $proofreadingModel = new Proofreading();
+        DB::beginTransaction();
+        try {
+            $proofreadingModel->del($param);
+            //删除成功后，重新添加
             $save_data = [];
             $save_data = [];
             foreach ($this->param['data'] as $k => $v){
             foreach ($this->param['data'] as $k => $v){
                 $param['text'] = $v['text'];
                 $param['text'] = $v['text'];
@@ -85,6 +89,11 @@ class ProofreadingController extends BaseController
                 $save_data[] = $param;
                 $save_data[] = $param;
             }
             }
             $proofreadingModel->insert($save_data);
             $proofreadingModel->insert($save_data);
+            DB::commit();
+        }catch (\Exception $e){
+            DB::rollBack();
+            $this->fail('系统错误请联系管理员');
+        }
         $this->response('success');
         $this->response('success');
     }
     }