app-ht

1. F 版本发布和上传信息做唯一处理

app-ht
1. F 版本发布和上传信息做唯一处理
xu
1 parent 0c178f9d
Showing 3 changed files with 28 additions and 18 deletions Show diff stats
app-ht/modules/production/controllers/ProductionController.php
app-ht/modules/upgrade/controllers/UpgradeController.php
app-ht/modules/upgrade/views/upgrade/create.php
@@ -62,7 +62,6 @@ class ProductionController extends BaseController
             $productionEndTime = strtotime($productionEndTime) + 86400;
             $where[] = ['<=', 'p.name', $productionEndTime];
         }
-
         if ($type == 0) {
             $pageList = ProductionRepository::getPageList($where, 0 , 0);
             $pages = null;
@@ -653,7 +653,6 @@ class UpgradeController extends BaseController
             return $this->redirect($upgradeURL);
         }
-
         if (empty($upgradeModel->manufacture_id)) {
             Yii::$app->session->setFlash('error', '请先配置好厂商');
             return $this->redirect($upgradeURL);
@@ -668,10 +667,13 @@ class UpgradeController extends BaseController
         }
         $exitUpgradeModel = UpgradeRepository::findOne([
             'manufacture_id' => $upgradeModel->manufacture_id,
-            'project_id' => $upgradeModel->project_id,
-            'model_id' => $upgradeModel->model_id,
-            'is_delete' => 0,
-            'status' => UpgradeStatus::STATUS_ON
+            'project_id'    => $upgradeModel->project_id,
+            'model_id'      => $upgradeModel->model_id,
+            'is_delete'     => 0,
+            'type'          => $upgradeModel->type,
+            'version'       => $upgradeModel->version,
+            'package_name'  => $upgradeModel->package_name,
+            'status'        => UpgradeStatus::STATUS_ON
         ]);
         if ($exitUpgradeModel && $upgradeModel->id != $exitUpgradeModel->id) {
@@ -719,6 +721,12 @@ class UpgradeController extends BaseController
         $modelId = $request->post("model");
         $type = $request->post("type");
         $id = $request->post('id');
+        $version = $request->post('version');
+        $package_name = $request->post('package_name');
+        if (empty($package_name)) {
+            $e->message = '请先录入一个包名';
+            return $this->renderJson($e);
+        }
         if (empty($manufactureId)) {
             $e->message = '请先选择厂商';
             return $this->renderJson($e);
@@ -734,19 +742,20 @@ class UpgradeController extends BaseController
             return $this->renderJson($e);
         }
-        $upgradeModel = UpgradeRepository::findOne(['manufacture_id' => $manufactureId, 'project_id' => $projectId, 'model_id' => $modelId, 'is_delete' => 0, 'status' => UpgradeStatus::STATUS_ON, 'type' => $type]);
-        if ($upgradeModel && empty($id)) {
-            $e->message = '该厂商该批次已经存在一个版本号为：'.$upgradeModel->version.'的发布版本，请先取消发布的版本再上传'.$upgradeModel->id;
-            return $this->renderJson($e);
+        $upgradeModel = UpgradeRepository::findOne(['manufacture_id' => $manufactureId, 'project_id' => $projectId, 'model_id' => $modelId, 'is_delete' => 0, 'package_name' => $package_name, 'type' => $type]);
+        if ($upgradeModel && empty($id) ) {
+                $e->message = '该厂商该批次已经存在一个版本号为：'.$upgradeModel->version.' 包名为'.$package_name.'的版本，请先确认再上传';
+                return $this->renderJson($e);
+
         }
-        if ($upgradeModel && !empty($id) && $id != $upgradeModel->id) {
-            $e->message = '该厂商该批次已经存在一个版本号为：'.$upgradeModel->version.'的发布版本，请先取消发布的版本再上传！';
+        if ($upgradeModel && !empty($id) && $id != $upgradeModel->id ) {
+            $e->message = '该厂商该批次已经存在一个版本号为：'.$upgradeModel->version.' 包名为'.$package_name.'的版本，请先确认再上传！';
             return $this->renderJson($e);
         }
-
         $e->success = true;
         $e->message = 'ok';
+
         return $this->renderJson($e);
     }
 }
 \ No newline at end of file
@@ -45,13 +45,13 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] =  $this-&gt;title;
                     <?php } ?>
                 </label>
                 <div class="col-sm-4 text-left">
-                    <input type="text" value="<?= (isset($gets["version"]) ? $gets["version"] : "") ?>" name="version" placeholder="请填写APP版本号" style="margin-top: -6px;" class="form-control"">
+                    <input type="text" value="<?= (isset($gets["version"]) ? $gets["version"] : "") ?>" id="version" name="version" placeholder="请填写APP版本号" style="margin-top: -6px;" class="form-control"">
                 </div>
             </div>
             <div class="form-group col-sm-12">
                 <label for="skillName" class="col-sm-4 control-label text-right"><span style="color: #ff0000;">*</span>安装包名称：</label>
                 <div class="col-sm-4 text-left">
-                    <input type="text" value="<?= (isset($gets["package_name"]) ? $gets["package_name"] : "") ?>" name="package_name" placeholder="请填写安装包名称" style="margin-top: -6px;" class="form-control"">
+                    <input type="text" value="<?= (isset($gets["package_name"]) ? $gets["package_name"] : "") ?>" id="package_name" name="package_name" placeholder="请填写安装包名称" style="margin-top: -6px;" class="form-control"">
                 </div>
             </div>
             <div class="form-group col-sm-12">
@@ -142,11 +142,11 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] =  $this-&gt;title;
         var project_id = $("#project").val();
         var model_id = $("#model").val();
         var path = $("input[name='path']").val();
-        if (a == ""){
+        if ($.trim(a) == ""){
             alert("APP版本号不能为空");
             return false;
         }
-        if (package_name == ""){
+        if ($.trim(package_name) == ""){
             alert("安装包名不能为空");
             return false;
         }
@@ -268,7 +268,9 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] =  $this-&gt;title;
                 var project = $('#project').val();
                 var model = $('#model').val();
                 var type = $('#type').val();
-                $.post(checkUpgradeUrl, {manufacture:manufacture, project:project,model:model,type:type}, function(res){
+                var package_name = $('#package_name').val();
+                var version = $('#version').val();
+                $.post(checkUpgradeUrl, {manufacture:manufacture, project:project,model:model,type:type, package_name:package_name, version:version}, function(res){
                     if (res.success) {
                         if (that.hasClass('disabled')) {
                             return false;