PSSR导入功能修改

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrCleaningController.java

@@ -116,6 +116,8 @@ public class TPssrCleaningController extends BaseController {
                         entity.setDevNo(cellValue);
                     } else if (j == 2) {
                         entity.setSerialNumber(Long.parseLong(cellValue));
+                    } else if (j == 3) {
+                        entity.setDevType(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId.toString());
@@ -123,6 +125,7 @@ public class TPssrCleaningController extends BaseController {
                 list.add(entity);
             } catch (Exception e) {
                 failNumber++;
+                logger.info("e:" + e);
                 failRow.add(i + 1);
             }
         }

ui/src/views/pssr/lighting/index.vue

@@ -61,15 +61,15 @@
           v-if="isApprove==0"
         >删除</el-button>
       </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['pssr:lighting:edit']"
-                    v-if="isApprove==0"
-            >导入</el-button>
+        <!--<el-col :span="1.5">-->
+            <!--<el-button-->
+                    <!--type="info"-->
+                    <!--icon="el-icon-upload2"-->
+                    <!--size="mini"-->
+                    <!--@click="handleImport"-->
+                    <!--v-hasPermi="['pssr:lighting:edit']"-->
+                    <!--v-if="isApprove==0"-->
+            <!--&gt;导入</el-button>-->
         </el-col>
       <el-col :span="1.5">
         <el-button

ui/src/views/pssr/moc/index.vue

@@ -82,17 +82,17 @@
         >删除
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="info"
-          icon="el-icon-upload2"
-          size="mini"
-          @click="handleImport"
-          v-hasPermi="['pssr:moc:edit']"
-          v-if="isApprove==0"
-        >导入
-        </el-button>
-      </el-col>
+      <!--<el-col :span="1.5">-->
+        <!--<el-button-->
+          <!--type="info"-->
+          <!--icon="el-icon-upload2"-->
+          <!--size="mini"-->
+          <!--@click="handleImport"-->
+          <!--v-hasPermi="['pssr:moc:edit']"-->
+          <!--v-if="isApprove==0"-->
+        <!--&gt;导入-->
+        <!--</el-button>-->
+      <!--</el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"

ui/src/views/pssr/motor/index.vue

@@ -70,16 +70,16 @@
           v-if="isApprove==0"
         >删除</el-button>
       </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['pssr:motor:edit']"
-                    v-if="isApprove==0"
-            >导入</el-button>
-        </el-col>
+        <!--<el-col :span="1.5">-->
+            <!--<el-button-->
+                    <!--type="info"-->
+                    <!--icon="el-icon-upload2"-->
+                    <!--size="mini"-->
+                    <!--@click="handleImport"-->
+                    <!--v-hasPermi="['pssr:motor:edit']"-->
+                    <!--v-if="isApprove==0"-->
+            <!--&gt;导入</el-button>-->
+        <!--</el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"

ui/src/views/pssr/overhaulValve/index.vue

@@ -73,17 +73,17 @@
         >删除
         </el-button>
       </el-col>
-      <!--<el-col :span="1.5">-->
-        <!--<el-button-->
-          <!--type="info"-->
-          <!--icon="el-icon-upload2"-->
-          <!--size="mini"-->
-          <!--@click="handleImport"-->
-          <!--v-if="isApprove==0"-->
-          <!--v-hasPermi="['pssr:overhaulValve:edit']"-->
-        <!--&gt;导入-->
-        <!--</el-button>-->
-      <!--</el-col>-->
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          icon="el-icon-upload2"
+          size="mini"
+          @click="handleImport"
+          v-if="isApprove==0"
+          v-hasPermi="['pssr:overhaulValve:edit']"
+        >导入
+        </el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"

ui/src/views/pssr/pipe/index.vue

@@ -82,17 +82,17 @@
         >删除
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="info"
-          icon="el-icon-upload2"
-          size="mini"
-          @click="handleImport"
-          v-hasPermi="['pssr:pipe:edit']"
-          v-if="isApprove==0"
-        >导入
-        </el-button>
-      </el-col>
+      <!--<el-col :span="1.5">-->
+        <!--<el-button-->
+          <!--type="info"-->
+          <!--icon="el-icon-upload2"-->
+          <!--size="mini"-->
+          <!--@click="handleImport"-->
+          <!--v-hasPermi="['pssr:pipe:edit']"-->
+          <!--v-if="isApprove==0"-->
+        <!--&gt;导入-->
+        <!--</el-button>-->
+      <!--</el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"

ui/src/views/pssr/power/index.vue

@@ -61,16 +61,16 @@
           v-if="isApprove==0"
         >删除</el-button>
       </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['pssr:power:edit']"
-                    v-if="isApprove==0"
-            >导入</el-button>
-        </el-col>
+        <!--<el-col :span="1.5">-->
+            <!--<el-button-->
+                    <!--type="info"-->
+                    <!--icon="el-icon-upload2"-->
+                    <!--size="mini"-->
+                    <!--@click="handleImport"-->
+                    <!--v-hasPermi="['pssr:power:edit']"-->
+                    <!--v-if="isApprove==0"-->
+            <!--&gt;导入</el-button>-->
+        <!--</el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"

ui/src/views/pssr/public/index.vue

@@ -167,16 +167,16 @@
           v-if="isApprove==0"
         >删除</el-button>
       </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['pssr:public:edit']"
-                    v-if="isApprove==0"
-            >导入</el-button>
-        </el-col>
+        <!--<el-col :span="1.5">-->
+            <!--<el-button-->
+                    <!--type="info"-->
+                    <!--icon="el-icon-upload2"-->
+                    <!--size="mini"-->
+                    <!--@click="handleImport"-->
+                    <!--v-hasPermi="['pssr:public:edit']"-->
+                    <!--v-if="isApprove==0"-->
+            <!--&gt;导入</el-button>-->
+        <!--</el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"

ui/src/views/pssr/torchvoc/index.vue

@@ -78,16 +78,16 @@
           v-if="isApprove==0"
         >删除</el-button>
       </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['pssr:torchvoc:edit']"
-                    v-if="isApprove==0"
-            >导入</el-button>
-        </el-col>
+        <!--<el-col :span="1.5">-->
+            <!--<el-button-->
+                    <!--type="info"-->
+                    <!--icon="el-icon-upload2"-->
+                    <!--size="mini"-->
+                    <!--@click="handleImport"-->
+                    <!--v-hasPermi="['pssr:torchvoc:edit']"-->
+                    <!--v-if="isApprove==0"-->
+            <!--&gt;导入</el-button>-->
+        <!--</el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"

ui/src/views/pssr/vessel/index.vue

@@ -82,17 +82,17 @@
         >删除
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="info"
-          icon="el-icon-upload2"
-          size="mini"
-          @click="handleImport"
-          v-hasPermi="['pssr:vessel:edit']"
-          v-if="isApprove==0"
-        >导入
-        </el-button>
-      </el-col>
+      <!--<el-col :span="1.5">-->
+        <!--<el-button-->
+          <!--type="info"-->
+          <!--icon="el-icon-upload2"-->
+          <!--size="mini"-->
+          <!--@click="handleImport"-->
+          <!--v-hasPermi="['pssr:vessel:edit']"-->
+          <!--v-if="isApprove==0"-->
+        <!--&gt;导入-->
+        <!--</el-button>-->
+      <!--</el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"