Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-admin/src/test/java/SpringBootTestController.java

@@ -2510,6 +2510,7 @@ public class SpringBootTestController {
 
         GetStationInfoDTO dto = new GetStationInfoDTO();
         dto.setType("page");
+        dto.setIdList(Lists.newArrayList("395"));
         aMapService.getStationInfosV2(dto);
     }
 

jsowell-ui/src/api/pile/basic.js

@@ -122,3 +122,10 @@ export function getPersonalPileList(data) {
         data: data
     })
 }
+
+export function generatePileSecret() {
+    return request({
+        url: '/pile/basic/getPileSecretStr',
+        method: 'get'
+    })
+}

jsowell-ui/src/views/system/user/profile/index.vue

@@ -55,6 +55,33 @@
         </el-card>
       </el-col>
     </el-row>
+
+    <el-row :gutter="20" v-hasRole="['admin', 'common']" style="margin-top: 20px;">
+      <el-col :span="6" :xs="24">
+        <el-card class="box-card">
+          <div slot="header" class="password">
+            <p>桩动态密码</p>
+            <el-button type="primary" @click="generatePileSecret" plain>点击生成动态密码</el-button>
+          </div>
+          <div>
+            <div>
+              <ul class="list-group list-group-striped">
+                <li class="list-group-item">
+                  <el-icon name="date" /> 当前日期
+                  <div class="pull-right">{{ nowDate }}</div>
+                </li>
+              </ul>
+              <ul class="list-group list-group-striped">
+                <li class="list-group-item">
+                  <el-icon name="key" /> 动态密码
+                  <div class="pull-right">{{ pileSecret }}</div>
+                </li>
+              </ul>
+            </div>
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
   </div>
 </template>
 
@@ -63,6 +90,7 @@ import userAvatar from "./userAvatar";
 import userInfo from "./userInfo";
 import resetPwd from "./resetPwd";
 import { getUserProfile } from "@/api/system/user";
+import { generatePileSecret } from "@/api/pile/basic";
 
 export default {
   name: "Profile",
@@ -70,6 +98,8 @@ export default {
   data() {
     return {
       user: {},
+      nowDate: '',
+      pileSecret: '',
       roleGroup: {},
       postGroup: {},
       activeTab: "userinfo"
@@ -77,6 +107,7 @@ export default {
   },
   created() {
     this.getUser();
+    this.nowDate = new Date().toLocaleDateString();
   },
   methods: {
     getUser() {
@@ -85,7 +116,21 @@ export default {
         this.roleGroup = response.roleGroup;
         this.postGroup = response.postGroup;
       });
+    },
+    generatePileSecret() {
+      generatePileSecret().then(response => {
+        console.log("response", response);
+        this.pileSecret = response.obj;
+      });
     }
   }
 };
 </script>
+
+<style>
+.password {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+</style>