Merge branch 'dev-meta-dz' of xiongzhu/raex_back into master

src/main/java/com/izouma/nineth/domain/netease/NeteaseMessage.java

@@ -1,5 +1,6 @@
 package com.izouma.nineth.domain.netease;
 
+import com.izouma.nineth.annotations.Searchable;
 import com.izouma.nineth.domain.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -26,6 +27,7 @@ public class NeteaseMessage extends BaseEntity {
     private Integer ope;
     //type: 0 文本消息, 1 图片消息,3 视频消息
     private Integer type;
+    @Searchable
     private String  body;
     private String  msgInfo;
     private Long    timetag;

src/main/java/com/izouma/nineth/enums/MetaResourcesType.java

@@ -1,8 +1,9 @@
 package com.izouma.nineth.enums;
 
 public enum MetaResourcesType {
-    PARTY("党建"),
-    ;
+    PARTY_ONE("党建一楼"),
+    PARTY_TWO("党建二楼"),
+    PARTY_THREE("党建三楼");
 
     private final String description;
 

src/main/java/com/izouma/nineth/web/MetaResourcesController.java

@@ -4,6 +4,7 @@ import com.izouma.nineth.domain.MetaResources;
 import com.izouma.nineth.dto.MetaRestResult;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.AssetRepo;
 import com.izouma.nineth.repo.MetaResourcesRepo;
 import com.izouma.nineth.service.MetaResourcesService;
 import com.izouma.nineth.utils.ObjUtils;
@@ -24,6 +25,7 @@ import java.util.Objects;
 public class MetaResourcesController extends BaseController {
     private MetaResourcesService metaResourcesService;
     private MetaResourcesRepo metaResourcesRepo;
+    private AssetRepo assetRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
@@ -75,5 +77,10 @@ public class MetaResourcesController extends BaseController {
         }
         return MetaRestResult.returnSuccess("查询成功", metaResources.getValue());
     }
+
+//    @GetMapping
+//    public MetaRestResult<Long> getUserId(String name) {
+//        assetRepo.findByNameLike
+//    }
 }
 

src/main/vue/src/views/MetaResourcesEdit.vue

@@ -58,7 +58,10 @@ export default {
 		return {
 			saving: false,
             type: '',
-			typeOptions: [{ label: '党建', value: 'PARTY' }],
+			typeOptions: [{ label: '党建一楼', value: 'PARTY_ONE' },
+			{ label: '党建二楼', value: 'PARTY_TWO' },
+			{ label: '党建三楼', value: 'PARTY_THREE' }
+		],
 			formData: {},
 			rules: {
 				name: [

src/main/vue/src/views/MetaResourcesList.vue

@@ -54,10 +54,13 @@ export default {
     mixins: [pageableTable],
     data() {
         return {
+            type: '',
             multipleMode: false,
             search: '',
             typeOptions: [
-                { label: '党建', value: 'PARTY' }
+                { label: '党建一楼', value: 'PARTY_ONE' },
+                { label: '党建二楼', value: 'PARTY_TWO' },
+                { label: '党建三楼', value: 'PARTY_THREE' }
             ],
             url: '/metaResources/all',
             downloading: false

src/main/vue/src/views/NeteaseMessageList.vue

@@ -1,56 +1,47 @@
 <template>
-    <div  class="list-view">
+    <div class="list-view">
         <page-title>
-            <el-button @click="addRow" type="primary" icon="el-icon-plus" :disabled="fetchingData || downloading" class="filter-item">
-                新增
-            </el-button>
-            <el-button @click="download" icon="el-icon-upload2" :loading="downloading" :disabled="fetchingData" class="filter-item">
+            <el-button
+                @click="download"
+                icon="el-icon-upload2"
+                :loading="downloading"
+                :disabled="fetchingData"
+                class="filter-item"
+            >
                 导出
             </el-button>
         </page-title>
         <div class="filters-container">
             <el-input
-                    placeholder="搜索..."
-                    v-model="search"
-                    clearable
-                    class="filter-item search"
-                    @keyup.enter.native="getData"
+                placeholder="搜索..."
+                v-model="search"
+                clearable
+                class="filter-item search"
+                @keyup.enter.native="getData"
             >
                 <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
             </el-input>
         </div>
-        <el-table :data="tableData" row-key="id" ref="table"
-                  header-row-class-name="table-header-row"
-                  header-cell-class-name="table-header-cell"
-                  row-class-name="table-row" cell-class-name="table-cell"
-                  :height="tableHeight" v-loading="fetchingData">
-            <el-table-column v-if="multipleMode" align="center" type="selection"
-                             width="50">
-            </el-table-column>
-            <el-table-column prop="id" label="ID" width="100">
-            </el-table-column>
-                                <el-table-column prop="from" label="发送用户"
->
-                    </el-table-column>
-                    <el-table-column prop="to" label="收信用户"
->
-                    </el-table-column>
-                    <el-table-column prop="ope" label="发信类型"
->
-                    </el-table-column>
-                    <el-table-column prop="type" label="信息类型"
->
-                    </el-table-column>
-                    <el-table-column prop="body" label="信息主题"
->
-                    </el-table-column>
-            <el-table-column
-                    label="操作"
-                    align="center"
-                    fixed="right"
-                    width="150">
-                <template slot-scope="{row}">
-                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+        <el-table
+            :data="tableData"
+            row-key="id"
+            ref="table"
+            header-row-class-name="table-header-row"
+            header-cell-class-name="table-header-cell"
+            row-class-name="table-row"
+            cell-class-name="table-cell"
+            :height="tableHeight"
+            v-loading="fetchingData"
+        >
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+            <el-table-column prop="id" label="ID" width="100"> </el-table-column>
+            <el-table-column prop="from" label="发送用户"> </el-table-column>
+            <el-table-column prop="to" label="收信用户"> </el-table-column>
+            <el-table-column prop="ope" label="发信类型"> </el-table-column>
+            <el-table-column prop="type" label="信息类型"> </el-table-column>
+            <el-table-column prop="body" label="信息主题"> </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" width="150">
+                <template slot-scope="{ row }">
                     <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
                 </template>
             </el-table-column>
@@ -64,112 +55,101 @@
                     <el-button @click="toggleMultipleMode(false)">取消</el-button>
                 </el-button-group>
             </div> -->
-            <el-pagination background @size-change="onSizeChange"
-                           @current-change="onCurrentChange" :current-page="page"
-                           :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize"
-                           layout="total, sizes, prev, pager, next, jumper"
-                           :total="totalElements">
+            <el-pagination
+                background
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
+                :current-page="page"
+                :page-sizes="[10, 20, 30, 40, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="totalElements"
+            >
             </el-pagination>
         </div>
-
     </div>
 </template>
 <script>
-    import { mapState } from "vuex";
-    import pageableTable from "@/mixins/pageableTable";
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
 
-    export default {
-        name: 'NeteaseMessageList',
-        mixins: [pageableTable],
-        data() {
-            return {
-                multipleMode: false,
-                search: "",
-                url: "/neteaseMessage/all",
-                downloading: false,
-            }
+export default {
+    name: 'NeteaseMessageList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            body: '',
+            search: '',
+            url: '/neteaseMessage/all',
+            downloading: false
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        beforeGetData() {
+            return { search: this.search, query: { del: false, toId: this.$route.query.toId } };
         },
-        computed: {
-            selection() {
-                return this.$refs.table.selection.map(i => i.id);
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
             }
         },
-        methods: {
-            beforeGetData() {
-                return { search: this.search, query: { del: false } };
-            },
-            toggleMultipleMode(multipleMode) {
-                this.multipleMode = multipleMode;
-                if (!multipleMode) {
-                    this.$refs.table.clearSelection();
-                }
-            },
-            addRow() {
-                this.$router.push({
-                    path: "/neteaseMessageEdit",
-                    query: {
-                        ...this.$route.query
-                    }
-                });
-            },
-            editRow(row) {
-                this.$router.push({
-                    path: "/neteaseMessageEdit",
-                    query: {
-                    id: row.id
-                    }
-                });
-            },
-            download() {
-                this.downloading = true;
-                this.$axios
-                    .get("/neteaseMessage/excel", { 
-                        responseType: "blob",
-                        params: { size: 10000 }
-                    })
-                    .then(res => {
-                        console.log(res);
-                        this.downloading = false;
-                        const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
-                        const link = document.createElement("a");
-                        link.href = downloadUrl;
-                        link.setAttribute(
-                            "download",
-                            res.headers["content-disposition"].split("filename=")[1]
-                        );
-                        document.body.appendChild(link);
-                        link.click();
-                        link.remove();
-                    })
-                    .catch(e => {
-                        console.log(e);
-                        this.downloading = false;
-                        this.$message.error(e.error);
-                    });
-            },
-            operation1() {
-                this.$notify({
-                    title: '提示',
-                    message: this.selection
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/neteaseMessage/excel', {
+                    responseType: 'blob',
+                    params: { size: 10000 }
+                })
+                .then(res => {
+                    console.log(res);
+                    this.downloading = false;
+                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                    const link = document.createElement('a');
+                    link.href = downloadUrl;
+                    link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
+                    document.body.appendChild(link);
+                    link.click();
+                    link.remove();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.downloading = false;
+                    this.$message.error(e.error);
                 });
-            },
-            operation2() {
-                this.$message('操作2');
-            },
-            deleteRow(row) {
-                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
-                    return this.$http.post(`/neteaseMessage/del/${row.id}`)
-                }).then(() => {
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/neteaseMessage/del/${row.id}`);
+                })
+                .then(() => {
                     this.$message.success('删除成功');
                     this.getData();
-                }).catch(e => {
+                })
+                .catch(e => {
                     if (e !== 'cancel') {
                         this.$message.error(e.error);
                     }
-                })
-            },
+                });
         }
     }
+};
 </script>
 <style lang="less" scoped>
 </style>

src/main/vue/src/views/TeamList.vue

@@ -70,6 +70,7 @@
                 fixed="right"
                 width="300">
                 <template slot-scope="{row}">
+                    <el-button @click="NeteaseMessageList(row)" type="primary" size="mini" plain>聊天记录</el-button>
                     <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
                     <el-button @click="mute(row)" v-if="row.mute === false" type="danger" size="mini" plain>群禁言
                     </el-button>
@@ -328,6 +329,14 @@ export default {
                 }
             });
         },
+        NeteaseMessageList(row) {
+            this.$router.push({
+                path: "/NeteaseMessageList",
+                query: {
+                    toId: row.tid
+                }
+            });
+        },
         download() {
             this.downloading = true;
             this.$axios