update 添加鉴权卡

jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java

@@ -106,9 +106,6 @@ public class MemberBasicInfoController extends BaseController {
     @GetMapping("/getMerchantListByAuth")
     public RestApiResponse<?> getMerchantListByAuth() {
         RestApiResponse<?> response = null;
-        // List<MerchantInfoVO> list = memberBasicInfoService.getMerchantListByAuth(deptIds);
-        // List<MerchantInfoVO> list = memberBasicInfoService.getMerchantListByAuth();
-        // List<MerchantInfoVO> list = UserUtils.getMerchantListByAuth();
         LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail();
         logger.info("获取登录用户信息:{}", JSON.toJSONString(loginUserDetail));
         List<MerchantInfoVO> list = loginUserDetail.getMerchantInfoVOList();

jsowell-admin/src/main/resources/application-dev.yml

@@ -36,10 +36,10 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://192.168.2.2:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        username: jsowell_dev
-#        url: jdbc:mysql://192.168.2.2:3306/jsowell_prd_copy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#        username: jsowell_prd_copy
+        #url: jdbc:mysql://192.168.2.2:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        #username: jsowell_dev
+        url: jdbc:mysql://192.168.2.2:3306/jsowell_prd_copy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: jsowell_prd_copy
         password: 123456
       # 从库数据源
       slave:

jsowell-ui/src/views/pile/card/index.vue

@@ -1,6 +1,7 @@
 <template>
     <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+                 label-width="68px">
             <el-form-item label="逻辑卡号" prop="logicCard">
                 <el-input
                     v-model="queryParams.logicCard"
@@ -9,14 +10,14 @@
                     @keyup.enter.native="handleQuery"
                 />
             </el-form-item>
-<!--      <el-form-item label="物理卡号" prop="physicsCard">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.physicsCard"-->
-<!--          placeholder="请输入物理卡号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
+            <!--      <el-form-item label="物理卡号" prop="physicsCard">-->
+            <!--        <el-input-->
+            <!--          v-model="queryParams.physicsCard"-->
+            <!--          placeholder="请输入物理卡号"-->
+            <!--          clearable-->
+            <!--          @keyup.enter.native="handleQuery"-->
+            <!--        />-->
+            <!--      </el-form-item>-->
             <el-form-item label="手机号码" prop="phoneNumber">
                 <el-input
                     v-model="queryParams.phoneNumber"
@@ -40,7 +41,8 @@
                     size="mini"
                     @click="handleAdd"
                     v-hasPermi="['pile:card:add']"
-        >新增</el-button>
+                >新增
+                </el-button>
             </el-col>
             <el-col :span="1.5">
                 <el-button
@@ -51,7 +53,8 @@
                     :disabled="single"
                     @click="handleUpdate"
                     v-hasPermi="['pile:card:edit']"
-        >修改</el-button>
+                >修改
+                </el-button>
             </el-col>
             <el-col :span="1.5">
                 <el-button
@@ -62,34 +65,35 @@
                     :disabled="multiple"
                     @click="handleDelete"
                     v-hasPermi="['pile:card:remove']"
-        >删除</el-button>
+                >删除
+                </el-button>
             </el-col>
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="warning"-->
-<!--          plain-->
-<!--          icon="el-icon-download"-->
-<!--          size="mini"-->
-<!--          @click="handleExport"-->
-<!--          v-hasPermi="['pile:card:export']"-->
-<!--        >导出</el-button>-->
-<!--      </el-col>-->
+            <!--      <el-col :span="1.5">-->
+            <!--        <el-button-->
+            <!--          type="warning"-->
+            <!--          plain-->
+            <!--          icon="el-icon-download"-->
+            <!--          size="mini"-->
+            <!--          @click="handleExport"-->
+            <!--          v-hasPermi="['pile:card:export']"-->
+            <!--        >导出</el-button>-->
+            <!--      </el-col>-->
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
         <el-table v-loading="loading" :data="cardList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-<!--      <el-table-column label="主键" align="center" prop="id" />-->
-      <el-table-column label="逻辑卡号" align="center" prop="logicCard" />
-      <el-table-column label="卡状态" align="center" prop="status" >
+            <el-table-column type="selection" width="55" align="center"/>
+            <!--      <el-table-column label="主键" align="center" prop="id" />-->
+            <el-table-column label="逻辑卡号" align="center" prop="logicCard"/>
+            <el-table-column label="卡状态" align="center" prop="status">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.card_status"
                               :value="scope.row.status"/>
                 </template>
             </el-table-column>
-      <el-table-column label="密钥" align="center" prop="secretKey" />
-<!--      <el-table-column label="物理卡号" align="center" prop="physicsCard" />-->
-      <el-table-column label="所属用户" align="center" prop="nickName" >
+            <el-table-column label="密钥" align="center" prop="secretKey"/>
+            <!--      <el-table-column label="物理卡号" align="center" prop="physicsCard" />-->
+            <el-table-column label="所属用户" align="center" prop="nickName">
                 <template slot-scope="scope">
                     <router-link
                         :to="'/member/detail/index/'+scope.row.memberId"
@@ -99,8 +103,8 @@
                     </router-link>
                 </template>
             </el-table-column>
-      <el-table-column label="手机号码" align="center" prop="phoneNumber" />
-      <el-table-column label="创建时间" align="center" prop="createTime" />
+            <el-table-column label="手机号码" align="center" prop="phoneNumber"/>
+            <el-table-column label="创建时间" align="center" prop="createTime"/>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
                     <el-button
@@ -109,14 +113,16 @@
                         icon="el-icon-edit"
                         @click="handleUpdate(scope.row)"
                         v-hasPermi="['pile:card:edit']"
-          >修改</el-button>
+                    >修改
+                    </el-button>
                     <el-button
                         size="mini"
                         type="text"
                         icon="el-icon-circle-close"
                         @click="handleDeactivateCard(scope.row)"
                         v-hasPermi="['pile:card:remove']"
-          >停用</el-button>
+                    >停用
+                    </el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -132,48 +138,25 @@
         <!-- 添加或修改充电站鉴权卡对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
             <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="一级运营商" prop="merchantId">
+                <el-form-item label="选择运营商" prop="merchantId">
                     <el-select
                         v-model="form.merchantId"
-            clearable placeholder="请选择一级运营商"
+                        clearable placeholder="请选择运营商"
                     >
                         <el-option
-              v-for="item in firstLevelMerchantList"
-              :key="item.merchantName"
+                            v-for="item in merchantList"
+                            :key="item.merchantId"
                             :label="item.merchantName"
-              :value="item.id">
+                            :value="item.merchantId">
                         </el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="逻辑卡号" prop="logicCard">
-          <el-input v-model="form.logicCard" :disabled = "isDisabled" placeholder="请输入逻辑卡号" />
+                    <el-input v-model="form.logicCard" :disabled="isDisabled" placeholder="请输入逻辑卡号"/>
                 </el-form-item>
                 <el-form-item label="手机号码" prop="phoneNumber">
-          <el-input v-model="form.phoneNumber" placeholder="请输入会员的手机号码" />
+                    <el-input v-model="form.phoneNumber" placeholder="请输入会员的手机号码"/>
                 </el-form-item>
-<!--        <el-form-item label="选择状态" prop="status">-->
-<!--          <el-select-->
-<!--            placeholder="请选择状态"-->
-<!--            v-model="form.status"-->
-<!--          >-->
-<!--            <el-option-->
-<!--              v-for="item in dict.type.card_status"-->
-<!--              :key="item.value"-->
-<!--              :label="item.label"-->
-<!--              :value="item.value"-->
-<!--            >-->
-<!--            </el-option>-->
-<!--          </el-select>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="物理卡号" prop="physicsCard">-->
-<!--          <el-input v-model="form.physicsCard" placeholder="请输入物理卡号" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="会员id" prop="memberId">-->
-<!--          <el-input v-model="form.memberId" placeholder="请输入所属用户" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="删除标识" prop="delFlag">-->
-<!--          <el-input v-model="form.delFlag" placeholder="请输入删除标识" />-->
-<!--        </el-form-item>-->
             </el-form>
             <div slot="footer" class="dialog-footer">
                 <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -186,6 +169,7 @@
 <script>
 import {listCard, getCard, delCard, addCard, updateCard, deactivateCard} from "@/api/pile/card";
 import {queryFirstLevelMerchant} from "@/api/pile/merchant";
+import {getMerchantList} from "@/api/member/info";
 
 export default {
     name: "card",
@@ -213,6 +197,7 @@ export default {
             // 卡号是否可填写
             isDisabled: false,
             firstLevelMerchantList: [],
+            merchantList: [],
             // 查询参数
             queryParams: {
                 pageNum: 1,
@@ -227,7 +212,7 @@ export default {
             form: {},
             // 表单校验
             rules: {
-        merchantId:[
+                merchantId: [
                     {
                         required: true,
                         message: "请选择一级运营商",
@@ -241,7 +226,7 @@ export default {
                         trigger: "blur"
                     }
                 ],
-        logicCard:[
+                logicCard: [
                     {
                         required: true,
                         max: 16,
@@ -254,7 +239,8 @@ export default {
     },
     created() {
         this.getList();
-    this.getFirstLevelMerchantList();
+        // this.getFirstLevelMerchantList();
+        this.getMerchantList();
     },
     methods: {
         /** 查询充电站鉴权卡列表 */
@@ -268,11 +254,20 @@ export default {
         },
         // 获取一级运营商列表
         getFirstLevelMerchantList() {
-      queryFirstLevelMerchant().then(response =>{
+            queryFirstLevelMerchant().then(response => {
                 console.log("getFirstLevelMerchantList", response)
                 this.firstLevelMerchantList = response.rows;
+
             });
         },
+        // 获取运营商列表
+        getMerchantList() {
+            getMerchantList().then((response) => {
+                console.log("getMerchantList response", response)
+                this.merchantList = response.obj;
+                this.form.merchantId = this.merchantList[0].merchantId
+            })
+        },
         // 取消按钮
         cancel() {
             this.open = false;
@@ -281,19 +276,15 @@ export default {
         // 表单重置
         reset() {
             this.form = {
-        id: null,
                 logicCard: null,
                 physicsCard: null,
                 memberId: null,
-        merchantId: null,
                 phoneNumber: null,
-        createTime: null,
-        createBy: null,
-        updateTime: null,
-        updateBy: null,
-        delFlag: null
             };
             this.resetForm("form");
+            if (this.merchantList.length > 0) {
+                this.form.merchantId = this.merchantList[0].merchantId
+            }
         },
         /** 搜索按钮操作 */
         handleQuery() {
@@ -308,14 +299,14 @@ export default {
         // 多选框选中数据
         handleSelectionChange(selection) {
             this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+            this.single = selection.length !== 1
             this.multiple = !selection.length
         },
         /** 新增按钮操作 */
         handleAdd() {
-      this.reset();
+            // this.reset();
             this.open = true;
-      this.title = "添加充电站鉴权卡";
+            this.title = "添加充电站鉴权卡11";
             this.isDisabled = false;
         },
         /** 修改按钮操作 */
@@ -338,38 +329,43 @@ export default {
                         updateCard(this.form).then(response => {
                             this.$modal.msgSuccess("修改成功");
                             this.open = false;
+                            this.reset();
                             this.getList();
                         });
                     } else {
                         addCard(this.form).then(response => {
                             this.$modal.msgSuccess("新增成功");
                             this.open = false;
+                            this.reset();
                             this.getList();
                         });
                     }
+
                 }
             });
         },
         /** 删除按钮操作 */
         handleDelete(row) {
             const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除充电站鉴权卡编号为"' + ids + '"的数据项？').then(function() {
+            this.$modal.confirm('是否确认删除充电站鉴权卡编号为"' + ids + '"的数据项？').then(function () {
                 return delCard(ids);
             }).then(() => {
                 this.getList();
                 this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+            }).catch(() => {
+            });
         },
 
         // 停用按钮
         handleDeactivateCard(row) {
             const id = row.id;
-      this.$modal.confirm('是否确认停用卡号为"' + row.logicCard + '"的鉴权卡？').then(function() {
+            this.$modal.confirm('是否确认停用卡号为"' + row.logicCard + '"的鉴权卡？').then(function () {
                 return deactivateCard(id);
             }).then(() => {
                 this.getList();
                 this.$modal.msgSuccess("停用成功");
-      }).catch(() => {});
+            }).catch(() => {
+            });
         },
         /** 导出按钮操作 */
         handleExport() {