From 837b544f2d6e32847cf47d7a0ea04e779bd07cb3 Mon Sep 17 00:00:00 2001
From: mqh <1571896045@qq.com>
Date: Wed, 19 Jul 2023 20:23:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AE=9E=E4=BD=93=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/modulex/ModulexList.vue         | 229 +++++++++---------
 .../views/modulex/modules/ModulexImport.vue   | 139 +++++++----
 .../tablex/controller/TablexController.java   |  62 +++--
 .../service/impl/TablexServiceImpl.java       |   2 +-
 4 files changed, 257 insertions(+), 175 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/modulex/ModulexList.vue b/ant-design-vue-jeecg/src/views/modulex/ModulexList.vue
index 7f9412c..74f3755 100644
--- a/ant-design-vue-jeecg/src/views/modulex/ModulexList.vue
+++ b/ant-design-vue-jeecg/src/views/modulex/ModulexList.vue
@@ -52,7 +52,7 @@
 
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="责任人">
-              <j-select-user-by-dep placeholder="请选择责任人" v-model="queryParam.managerUsers" />
+              <j-select-user-by-dep placeholder="请选择责任人" v-model="queryParam.managerUsers"/>
             </a-form-item>
           </a-col>
 
@@ -72,7 +72,8 @@
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <!-- <a-button type="primary" @click="showModal1()"></a-button> -->
       <a-button type="primary" icon="import" @click="showModalImport()">导入模块</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
+                @change="handleImportExcel">
         <a-modal
           title="正在上传..."
           :visible="ModalData.isVisible==='true'"
@@ -93,35 +94,14 @@
         </a-modal>
         <a-button type="primary" icon="import" @click="showProcess">导入模块</a-button>
       </a-upload>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="functionImportExcelUrl" @change="handleImportExcel">
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
+                :action="functionImportExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入功能</a-button>
       </a-upload>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="ruleImportExcelUrl" @change="handleImportExcel">
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
+                :action="ruleImportExcelUrl" @change="handleImportExcel">
 
-                <a-button type="primary" icon="import"  @click="showProcess">导入规则</a-button>
-        <a-modal
-          title="正在上传..."
-          :visible="ModalData.isVisible==='true'"
-          :confirm-loading="false"
-          :mask="true"
-          :maskClosable="false"
-          :keyboard="false"
-          :closable="false"
-          :footer="false"
-        >
-          <p>当前状态：{{ ModalData.status }}</p>
-          <p>总记录数：{{ ModalData.records }}</p>
-          <p>已上传：{{ ModalData.uploaded }}</p>
-          <a-progress
-            :percent="parseInt(String(ModalData.uploaded/ModalData.records*100))"
-            title="上传进度："
-            status="active" :steps="ModalData.records"/>
-        </a-modal>
-              </a-upload>
-
-      <a-upload name="file" :showUploadList="false" :multiple="false"
-                :headers="tokenHeader" :action="tablexImportExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import"  @click="showProcess">导入实体</a-button>
+        <a-button type="primary" icon="import" @click="showProcess">导入规则</a-button>
         <a-modal
           title="正在上传..."
           :visible="ModalData.isVisible==='true'"
@@ -142,10 +122,35 @@
         </a-modal>
       </a-upload>
 
+      <!--      <a-upload name="file" :showUploadList="false" :multiple="false"
+                      :headers="tokenHeader" :action="tablexImportExcelUrl" @change="handleImportExcel">-->
+      <a-button type="primary" icon="import" @click="showProcess()">导入实体</a-button>
+<!--      <a-button type="primary" icon="import" @click="showModalImport()">导入实体</a-button>-->
+      <a-modal
+        title="正在上传..."
+        :visible="ModalData.isVisible==='true'"
+        :confirm-loading="false"
+        :mask="true"
+        :maskClosable="false"
+        :keyboard="false"
+        :closable="false"
+        :footer="false"
+      >
+        <p>当前状态：{{ ModalData.status }}</p>
+        <p>总记录数：{{ ModalData.records }}</p>
+        <p>已上传：{{ ModalData.uploaded }}</p>
+        <a-progress
+          :percent="parseInt(String(ModalData.uploaded/ModalData.records*100))"
+          title="上传进度："
+          status="active" :steps="ModalData.records"/>
+      </a-modal>
+      <!--      </a-upload>-->
+
       <a-button @click="fanhui" type="primary" icon="rollback">返回</a-button>
       <a-button type="primary" icon="download" @click="exportxsxl('模块，功能，规则表')">导出综合表</a-button>
 
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrlf" @change="handleImportExcel">
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrlf"
+                @change="handleImportExcel">
         <a-button type="primary" icon="import">导入字段</a-button>
       </a-upload>
     </div>
@@ -176,27 +181,27 @@
         <!-- 管理  公用部分-->
         <span slot="htmlSlot" slot-scope="text, record">
           <a @click="functionManage(record)">功能</a>
-          <a-divider type="vertical" />
+          <a-divider type="vertical"/>
 
           <a @click="tablexManage(record)">实体</a>
           <!-- <a-divider type="vertical" /> -->
-          <br />
+          <br/>
           <a @click="viewVid(record)">字段</a>
         </span>
 
         <!--功能  管理员-->
         <span slot="actionManage" slot-scope="text, record" v-if="userRole1 === '1'">
           <a @click="fabu(record)">发布</a>
-          <a-divider type="vertical" />
+          <a-divider type="vertical"/>
           <a @click="tijiao(record)">提交</a>
-          <a-divider type="vertical" />
+          <a-divider type="vertical"/>
           <a @click="kaishi(record)">开始</a>
-          <br />
+          <br/>
           <a @click="chehui(record)">撤回</a>
-          <a-divider type="vertical" />
+          <a-divider type="vertical"/>
 
           <a @click="bugfankui(record)">BUG反馈</a>
-          <br />
+          <br/>
           <!--          <a @click="shenhe(record)">审核</a>-->
           <!--          <a-divider type="vertical"/>-->
         </span>
@@ -218,13 +223,13 @@
         <!--操作 -->
         <span slot="action1" slot-scope="text, record">
           <a @click="fuzhiProject(record)">复制</a>
-          <a-divider type="vertical" />
+          <a-divider type="vertical"/>
 
           <a @click="handleEdit(record)">编辑</a>
           <!-- <a-divider type="vertical" /> -->
-          <br />
+          <br/>
           <a @click="handleDetail(record)">详情</a>
-          <a-divider type="vertical" />
+          <a-divider type="vertical"/>
 
           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
@@ -233,7 +238,7 @@
         <span slot="filterDropdown">
           <a-card>
             <!-- /* 多选框 options:指定可选项 defaultValue:默认选中的选项 change:变化时回调 */ -->
-            <a-checkbox-group :options="checkColumn" :defaultValue="checkColumn" @change="checkChange" />
+            <a-checkbox-group :options="checkColumn" :defaultValue="checkColumn" @change="checkChange"/>
           </a-card>
         </span>
       </a-table>
@@ -251,17 +256,18 @@
 <script>
 
 import '@assets/less/TableExpand.less'
-import { mixinDevice } from '@/utils/mixin'
-import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import {mixinDevice} from '@/utils/mixin'
+import {JeecgListMixin} from '@/mixins/JeecgListMixin'
 import ModulexModal from './modules/ModulexModal'
 import ModulexImport from './modules/ModulexImport.vue'
-import { getAction } from "@api/manage"
+import {getAction} from "@api/manage"
 import BugxModal from "@views/modulex/modules/BugxModal"
 import store from "@/store"
-import { filterObj } from "@/utils/util"
+import {filterObj} from "@/utils/util"
 import FieldxList from "@views/fieldx/FieldxList.vue"
 import TablexList from "@views/tablex/TablexList.vue"
 import axios from 'axios';
+
 export default {
   name: 'ModulexList',
   mixins: [JeecgListMixin, mixinDevice],
@@ -272,15 +278,15 @@ export default {
     ModulexModal,
     ModulexImport
   },
-  data () {
+  data() {
     return {
-      ModalData:{
+      ModalData: {
         uploaded: '0',
         isVisible: 'false',
         records: '0',
         status: '判断文件结构'
       },
-      visible:false,
+      visible: false,
       moduleximport: false,
       description: '模块管理管理页面',
       // 表头
@@ -435,7 +441,7 @@ export default {
           align: "center",
           fixed: "right",
           width: 98,
-          scopedSlots: { customRender: 'htmlSlot' },
+          scopedSlots: {customRender: 'htmlSlot'},
           // customCell: () => {
           //   return {
           //     style: {
@@ -450,7 +456,7 @@ export default {
           align: "center",
           fixed: "right",
           width: 140,
-          scopedSlots: { customRender: 'actionManage' },
+          scopedSlots: {customRender: 'actionManage'},
           customCell: () => {
             return {
               style: {
@@ -466,7 +472,7 @@ export default {
           align: "center",
           fixed: "right",
           width: 100,
-          scopedSlots: { customRender: 'action1', filterDropdown: 'filterDropdown' }
+          scopedSlots: {customRender: 'action1', filterDropdown: 'filterDropdown'}
         }
       ],
       url: {
@@ -488,7 +494,7 @@ export default {
       loadRouteType: false,
     }
   },
-  created () {
+  created() {
     // 实例创建完成将columns备份给filterColumns
     this.filterColumn = this.columns
     let usercode = store.getters.userInfo.id
@@ -509,39 +515,42 @@ export default {
     checkColumn: function () {
       return this.columns.map(item => item.title)
     },
-    functionImportExcelUrl: function(){
+    functionImportExcelUrl: function () {
       return `${window._CONFIG['domianURL']}/${this.url.functionImportExcelUrl}`;
     },
-  tablexImportExcelUrl: function(){
-    return `${window._CONFIG['domianURL']}/${this.url.tablexImportExcelUrl}`;
-  },
+    tablexImportExcelUrl: function () {
+      return `${window._CONFIG['domianURL']}/${this.url.tablexImportExcelUrl}`;
+    },
     ruleImportExcelUrl: function () {
       return `${window._CONFIG['domianURL']}/${this.url.ruleImportExcelUrl}`
     },
   },
   methods: {
 
-    showModalImport(){
-      this.$refs.moduleximport.edit();
+    showModalImport() {
+      this.$refs.moduleximport.edit(this.ModalData);
       // this.$refs.moduleximport.title = "测试页面111111";
       this.$refs.moduleximport.disableSubmit = false;
     },
     // 显示进度
-    showProcess(){
+    showProcess() {
       let userId = store.getters.userInfo.id
       let base_url = window._CONFIG['domianURL']
       base_url = base_url.replace('http', 'ws')
       let ws = new WebSocket(`${base_url}/uploadProcess/${userId}`)
-      ws.onmessage = (e) =>{
-        this.ModalData=JSON.parse(e.data)
-        if (this.visible===false) {
-          // this.getList()
-          console.log("重新获取列表")
-        }
+      this.$refs.moduleximport.show(this.tablexImportExcelUrl,'');
+      ws.onmessage = (e) => {
+        // this.ModalData = JSON.parse(e.data)
+        this.$refs.moduleximport.edit(JSON.parse(e.data));
+        // if (JSON.parse(e.data).isVisible === 'false') {
+        //   this.$refs.moduleximport.close();
+        //   // this.getList()
+        //   console.log("重新获取列表")
+        // }
       }
     },
     // 多选框的事件回调
-    checkChange (checked) {
+    checkChange(checked) {
       // 初始是默认全选的，假设此刻点击了name的选择框
       console.log(checked) // ['age','address','action']
       const columns = this.columns
@@ -558,14 +567,14 @@ export default {
       this.filterColumn = filterValue
     },
 
-    fanhui () {
+    fanhui() {
       this.$router.push({
         /*返回产品*/
         path: '/src/views/projectx/ProjectxList',/*在引号中填写返回vue*/
       })
     },
-    loginRole (id) {
-      getAction('functionx/functionx/loginrole', { id: id }).then((res) => {
+    loginRole(id) {
+      getAction('functionx/functionx/loginrole', {id: id}).then((res) => {
         if (res.success) {
           //重新计算分页问题
           this.userRole1 = res.result
@@ -573,8 +582,8 @@ export default {
         }
       })
     },
-    shenhe (record) {
-      getAction('/modulex/modulex/shenhe', { id: record.id }).then((res) => {
+    shenhe(record) {
+      getAction('/modulex/modulex/shenhe', {id: record.id}).then((res) => {
         if (res.success) {
           //重新计算分页问题
           this.$message.success(res.result)
@@ -584,10 +593,10 @@ export default {
         }
       })
     },
-    viewVid (record) {
+    viewVid(record) {
       // console.log(record)
       let s = null
-      getAction('/tablex/tablex/list', { moduleId: record.id }).then((res) => {
+      getAction('/tablex/tablex/list', {moduleId: record.id}).then((res) => {
         s = res.result.records
         console.log(s)
         if (s[0] == null) {
@@ -605,8 +614,8 @@ export default {
       this.$refs.BugxModal.title = "BUG反馈"
       this.$refs.BugxModal.disableSubmit = false
     },
-    chehui (record) {
-      getAction('/modulex/modulex/cehui', { id: record.id }).then((res) => {
+    chehui(record) {
+      getAction('/modulex/modulex/cehui', {id: record.id}).then((res) => {
         if (res.success) {
           //重新计算分页问题
           this.$message.success(res.result)
@@ -616,8 +625,8 @@ export default {
         }
       })
     },
-    tijiao (record) {
-      getAction('/modulex/modulex/tijiao', { id: record.id }).then((res) => {
+    tijiao(record) {
+      getAction('/modulex/modulex/tijiao', {id: record.id}).then((res) => {
         if (res.success) {
           //重新计算分页问题
           this.$message.success(res.result)
@@ -627,8 +636,8 @@ export default {
         }
       })
     },
-    kaishi (record) {
-      getAction('/modulex/modulex/kaishi', { id: record.id }).then((res) => {
+    kaishi(record) {
+      getAction('/modulex/modulex/kaishi', {id: record.id}).then((res) => {
         if (res.success) {
           //重新计算分页问题
           this.$message.success(res.result)
@@ -638,8 +647,8 @@ export default {
         }
       })
     },
-    fabu (record) {
-      getAction('/modulex/modulex/fabu', { id: record.id }).then((res) => {
+    fabu(record) {
+      getAction('/modulex/modulex/fabu', {id: record.id}).then((res) => {
         if (res.success) {
           //重新计算分页问题
           this.$message.success(res.result)
@@ -647,7 +656,7 @@ export default {
         }
       })
     },
-    functionManage (record) {
+    functionManage(record) {
       this.$router.push({
         path: '/src/views/functionx/FunctionxList',
         query: {
@@ -657,7 +666,7 @@ export default {
         // query: {id: '123456'}
       })
     },
-    tablexManage (record) {
+    tablexManage(record) {
       this.$refs.TablexList.showModal()
       this.$refs.TablexList.edit(record)
       this.$refs.TablexList.disableSubmit = false
@@ -666,34 +675,34 @@ export default {
       //   query: {moduleid: record.id,project:this.$route.query.project}
       // })
     },
-    initDictConfig () {
+    initDictConfig() {
     },
-    getSuperFieldList () {
+    getSuperFieldList() {
       let fieldList = []
-      fieldList.push({ type: 'string', value: 'pid', text: '上级模块id', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'projectId', text: '项目id', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'moduleName', text: '中文名称', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'moduleEnName', text: '英文名称', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'moduleCode', text: '模块编码', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'pmDescribe', text: '内容描述', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'managerUsers', text: '责任人', dictCode: '' })
-      fieldList.push({ type: 'int', value: 'workLevel', text: '任务等级', dictCode: '' })
-      fieldList.push({ type: 'int', value: 'workStatus', text: '任务状态', dictCode: '' })
-      fieldList.push({ type: 'date', value: 'publishTime', text: '发布时间' })
-      fieldList.push({ type: 'double', value: 'duration', text: '任务时长', dictCode: '' })
-      fieldList.push({ type: 'date', value: 'startTime', text: '开始时间' })
-      fieldList.push({ type: 'date', value: 'submitTime', text: '提交时间' })
-      fieldList.push({ type: 'double', value: 'realDuration', text: '实际时长', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'userRole', text: '用户角色', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'relatedBean', text: '关联实体', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'prototypes', text: '原型图', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'diagrams', text: '分析图', dictCode: '' })
-      fieldList.push({ type: 'int', value: 'status', text: '模块状态', dictCode: '' })
-      fieldList.push({ type: 'int', value: 'verisonStatus', text: '版本状态', dictCode: '' })
-      fieldList.push({ type: 'int', value: 'verison', text: '版本号', dictCode: '' })
+      fieldList.push({type: 'string', value: 'pid', text: '上级模块id', dictCode: ''})
+      fieldList.push({type: 'string', value: 'projectId', text: '项目id', dictCode: ''})
+      fieldList.push({type: 'string', value: 'moduleName', text: '中文名称', dictCode: ''})
+      fieldList.push({type: 'string', value: 'moduleEnName', text: '英文名称', dictCode: ''})
+      fieldList.push({type: 'string', value: 'moduleCode', text: '模块编码', dictCode: ''})
+      fieldList.push({type: 'string', value: 'pmDescribe', text: '内容描述', dictCode: ''})
+      fieldList.push({type: 'string', value: 'managerUsers', text: '责任人', dictCode: ''})
+      fieldList.push({type: 'int', value: 'workLevel', text: '任务等级', dictCode: ''})
+      fieldList.push({type: 'int', value: 'workStatus', text: '任务状态', dictCode: ''})
+      fieldList.push({type: 'date', value: 'publishTime', text: '发布时间'})
+      fieldList.push({type: 'double', value: 'duration', text: '任务时长', dictCode: ''})
+      fieldList.push({type: 'date', value: 'startTime', text: '开始时间'})
+      fieldList.push({type: 'date', value: 'submitTime', text: '提交时间'})
+      fieldList.push({type: 'double', value: 'realDuration', text: '实际时长', dictCode: ''})
+      fieldList.push({type: 'string', value: 'userRole', text: '用户角色', dictCode: ''})
+      fieldList.push({type: 'string', value: 'relatedBean', text: '关联实体', dictCode: ''})
+      fieldList.push({type: 'string', value: 'prototypes', text: '原型图', dictCode: ''})
+      fieldList.push({type: 'string', value: 'diagrams', text: '分析图', dictCode: ''})
+      fieldList.push({type: 'int', value: 'status', text: '模块状态', dictCode: ''})
+      fieldList.push({type: 'int', value: 'verisonStatus', text: '版本状态', dictCode: ''})
+      fieldList.push({type: 'int', value: 'verison', text: '版本号', dictCode: ''})
       this.superFieldList = fieldList
     },
-    loadParameter () {
+    loadParameter() {
       if (this.loadRouteType === false) {
         this.projectIdx = this.$route.query.project
         // console.log('aaaaaaaaa',this.projectIdx)
@@ -701,7 +710,7 @@ export default {
         this.loadRouteType = true
       }
     },
-    loadData (arg) {
+    loadData(arg) {
       if (!this.url.list) {
         this.$message.error("请设置url.list属性!")
         return
@@ -730,7 +739,7 @@ export default {
         this.loading = false
       })
     },
-    getQueryParams () {
+    getQueryParams() {
       //获取查询条件
       let sqp = {}
       if (this.superQueryParams) {
@@ -742,7 +751,7 @@ export default {
       param.pageNo = this.ipagination.current
       param.pageSize = this.ipagination.pageSize
       //模块管理 条件查询如果没有条件，则使用路由跳转值 ；直接点击模块管理则查询全部
-      if(param.projectId==null)
+      if (param.projectId == null)
         param.projectId = this.$route.query.project;
       //param.id=this.id;
       //!!!!!!!
@@ -750,7 +759,7 @@ export default {
       // console.log('paaaaaaaaaaaaaaaaaaaaa')
       return filterObj(param)
     },
-    searchReset () {
+    searchReset() {
       this.queryParam = ''
       this.loadData()
     },
diff --git a/ant-design-vue-jeecg/src/views/modulex/modules/ModulexImport.vue b/ant-design-vue-jeecg/src/views/modulex/modules/ModulexImport.vue
index 6fc48d0..85c8496 100644
--- a/ant-design-vue-jeecg/src/views/modulex/modules/ModulexImport.vue
+++ b/ant-design-vue-jeecg/src/views/modulex/modules/ModulexImport.vue
@@ -7,26 +7,37 @@
     @ok="handleOk"
     @cancel="handleCancel"
     cancelText="关闭">
-    <a-alert message="请下载" type="info" show-icon  style="margin-bottom: 20px;"/>
-    <a-form :form="form" :label-col="{ span: 5 }" :wrapper-col="{ span: 16 }" >
+    <a-alert message="请下载" type="info" show-icon style="margin-bottom: 20px;"/>
+    <a-form :form="form" :label-col="{ span: 5 }" :wrapper-col="{ span: 16 }">
       <!-- <a-alert message="请下载" type="info" show-icon /> -->
       <a-form-item label="下载标准表格">
-        <div class="standB"><a-button type="primary" icon="download" @click="handleDownload"/></div>
-        <div class="standBu"> <a-alert
-          message="必须下载标准表格,否则审核不通过"
-          type="error"
-          closable
-          @close="onClose"
-        /></div>
+        <div class="standB">
+          <a-button type="primary" icon="download" @click="handleDownload"/>
+        </div>
+        <div class="standBu">
+          <a-alert
+            message="必须下载标准表格,否则审核不通过"
+            type="error"
+            closable
+            @close="onClose"
+          />
+        </div>
       </a-form-item>
       <a-form-item label="上传标准表格">
         <!-- @click="showProcess" -->
-        <a-upload
-          :multiple="false"
-          action="https://www.mocky.io/v2/5cc8019d300000980a055e76"
-          @change="handleChange">
-          <a-button type="primary" icon="upload" ></a-button>
-          <!-- <div>
+        <!--        <a-upload
+                  :multiple="false"
+                  :action="url.uploadUrl"
+                  @change="handleChange"
+                >-->
+        <a-upload name="file"
+                  :multiple="false"
+                  :action="url.uploadUrl"
+                  @change="handleChange"
+                  :showUploadList="false"
+                  :headers="tokenHeader">
+          <a-button type="primary" icon="upload"></a-button>
+          <div v-if="ModalData.isVisible==='true'">
             <p>当前状态：{{ ModalData.status }}</p>
             <p>总记录数：{{ ModalData.records }}</p>
             <p>已上传：{{ ModalData.uploaded }}</p>
@@ -35,12 +46,33 @@
               title="上传进度："
               status="active"
               :steps="ModalData.records"/>
-          </div> -->
+          </div>
         </a-upload>
       </a-form-item>
+      <!--      <a-modal-->
+      <!--        title="正在上传..."-->
+      <!--        :visible="ModalData.isVisible==='true'"-->
+      <!--        :confirm-loading="false"-->
+      <!--        :mask="true"-->
+      <!--        :maskClosable="false"-->
+      <!--        :keyboard="false"-->
+      <!--        :closable="false"-->
+      <!--        :footer="false"-->
+      <!--      >-->
+      <!--        <p>当前状态：{{ ModalData.status }}</p>-->
+      <!--        <p>总记录数：{{ ModalData.records }}</p>-->
+      <!--        <p>已上传：{{ ModalData.uploaded }}</p>-->
+      <!--        <a-progress-->
+      <!--          :percent="parseInt(String(ModalData.uploaded/ModalData.records*100))"-->
+      <!--          title="上传进度："-->
+      <!--          status="active" :steps="ModalData.records"/>-->
+      <!--      </a-modal>-->
       <a-form-model-item label="注意事项" v-if="uploadFinished">
         <a-list size="small" :data-source="datas">
-          <a-list-item slot="renderItem" slot-scope="item,index" style="border-bottom:0px ;"> {{ index+1 }} . {{ item }}</a-list-item>
+          <a-list-item slot="renderItem" slot-scope="item,index" style="border-bottom:0px ;"> {{ index + 1 }} . {{
+              item
+            }}
+          </a-list-item>
         </a-list>
       </a-form-model-item>
     </a-form>
@@ -50,14 +82,16 @@
 <script>
 import getAction from '@api/manage'
 import store from '@/store'
+import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+import {mixinDevice} from '@/utils/mixin'
+
 export default {
   name: 'ModelTest',
-  comments: {
-
-  },
+  mixins: [JeecgListMixin, mixinDevice],
+  comments: {},
   data() {
     return {
-      title: '导入xxxxxx',
+      title: '',
       visible: false,
       model: {},
       // 注意事项默认值
@@ -71,9 +105,10 @@ export default {
       confirmLoading: false,
       form: this.$form.createForm(this),
       url:
-      {
-        downfile: ''
-      },
+        {
+          downfile: '',
+          uploadUrl: ''
+        },
       datas: [
         'Racing car sprays burning fuel into crowd.',
         'Japanese princess to wed commoner.',
@@ -85,20 +120,19 @@ export default {
   },
   created() {
   },
-  computed: {
-  },
+  computed: {},
   methods: {
     // 上传
     // 显示进度
-    showProcess() {
-      let userId = store.getters.userInfo.id
-      let baseUrl = window._CONFIG['domianURL']
-      baseUrl = baseUrl.replace('http', 'ws')
-      let ws = new WebSocket(`${baseUrl}/uploadProcess/${userId}`)
-      ws.onmessage = (e) => {
-        this.ModalData = JSON.parse(e.data)
-      }
-    },
+    /*    showProcess() {
+          let userId = store.getters.userInfo.id
+          let baseUrl = window._CONFIG['domianURL']
+          baseUrl = baseUrl.replace('http', 'ws')
+          let ws = new WebSocket(`${baseUrl}/uploadProcess/${userId}`)
+          ws.onmessage = (e) => {
+            this.ModalData = JSON.parse(e.data)
+          }
+        },*/
     // 上传文件
     handleChange(info) {
       if (info.file.status !== 'uploading') {
@@ -118,24 +152,30 @@ export default {
     // 下载标准文档
     handleDownload() {
       console.log(1111)
-    //   getAction(this.url.downfile).then(response => {
-    //     const url = window.URL.createObjectURL(new Blob([response.data]))
-    //     const link = document.createElement('a')
-    //     link.href = url
-    //     link.setAttribute('download', 'your-document.pdf')
-    //     document.body.appendChild(link)
-    //     link.click()
-    // })
-    // .catch(error => {
-    //     console.error(error)
-    // })
+      //   getAction(this.url.downfile).then(response => {
+      //     const url = window.URL.createObjectURL(new Blob([response.data]))
+      //     const link = document.createElement('a')
+      //     link.href = url
+      //     link.setAttribute('download', 'your-document.pdf')
+      //     document.body.appendChild(link)
+      //     link.click()
+      // })
+      // .catch(error => {
+      //     console.error(error)
+      // })
     },
     add() {
 
     },
-    edit(record) {
+    show(uploadUrl, downUrl) {
+      this.url.uploadUrl = uploadUrl
+      this.url.downfile = downUrl
       this.visible = true
     },
+    edit(record) {
+      // this.visible = true
+      this.ModalData = record
+    },
 
     close() {
       this.$emit('close')
@@ -157,11 +197,12 @@ export default {
 </script>
 
 <style scoped>
-.standB{
+.standB {
   width: 15%;
   float: left;
 }
-.standBu{
+
+.standBu {
   width: 85%;
   float: right;
 }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/controller/TablexController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/controller/TablexController.java
index 50d0f3a..fafd6ae 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/controller/TablexController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/controller/TablexController.java
@@ -1,5 +1,7 @@
 package org.jeecg.modules.tablex.controller;
 
+import java.io.File;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.io.IOException;
@@ -40,10 +42,13 @@ import org.jeecg.modules.tablex.vo.TablexVo;
 import org.jeecg.modules.tablex.ws.WebSocketUtils;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.def.TemplateExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.entity.TemplateExportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecgframework.poi.excel.view.JeecgTemplateExcelView;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -291,7 +296,7 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
 			 if (StringUtils.isBlank(originalFilename) ||
 					 (!originalFilename.endsWith("xls") &&
 							 !originalFilename.endsWith("xlsx"))) {
-				 message.put("isVisible", "false");
+/*				 message.put("isVisible", "false");*/
 				 webSocketUtils.sendMessage(loginUser.getId(), message);
 				 return Result.error("文件格式不正确");
 			 }
@@ -308,13 +313,13 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
 				 //读取excel数据
 				 list = ExcelImportUtil.importExcel(file.getInputStream(), TablexVo.class, params);
 			 } catch (Exception e) {
-				 message.put("isVisible", "false");
+/*				 message.put("isVisible", "false");*/
 				 webSocketUtils.sendMessage(loginUser.getId(), message);
 				 return Result.error("文件读取失败");
 			 }
 			 //判断文件中是否存在数据
 			 if (list == null || list.size() == 0) {
-				 message.put("isVisible", "false");
+/*				 message.put("isVisible", "false");*/
 				 webSocketUtils.sendMessage(loginUser.getId(), message);
 				 return Result.error("Excel数据为空");
 			 }
@@ -338,7 +343,7 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
 				 //判断版本号长度
 				 String verison = tablexVo.getVerison();
 				 if (verison.length() > 5) {
-					 message.put("isVisible", "false");
+/*					 message.put("isVisible", "false");*/
 					 webSocketUtils.sendMessage(loginUser.getId(), message);
 					 return Result.error("预读入失败，版本号格式错误");
 				 }
@@ -352,7 +357,7 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
 			 tablexVoService.removeAll(voList);
 
 			 if (voList.size() == 0) {
-				 message.put("isVisible", "false");
+/*				 message.put("isVisible", "false");*/
 				 webSocketUtils.sendMessage(loginUser.getId(), message);
 				 return Result.error("导入失败，数据为空");
 			 }
@@ -366,7 +371,7 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
 
 				 String moduleId = voList.get(i).getModuleId();
 				 if (moduleId == null || moduleId.equals("")){
-					 message.put("isVisible", "false");
+/*					 message.put("isVisible", "false");*/
 					 webSocketUtils.sendMessage(loginUser.getId(), message);
 				 	return Result.error("对应模块填写不能为空");
 				 }
@@ -374,7 +379,7 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
 				 queryWrapper.eq(Modulex::getId,moduleId);
 				 Modulex modulex = modulexService.getOne(queryWrapper);
 				 if(modulex == null){
-					 message.put("isVisible", "false");
+/*					 message.put("isVisible", "false");*/
 					 webSocketUtils.sendMessage(loginUser.getId(), message);
 				 	return Result.error("对应模块填写错误");
 				 }
@@ -416,43 +421,70 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
 										tablexService.saveSingleBatch(tablexList,loginUser,message);
 
 									 } else {
-										 message.put("isVisible", "false");
+/*										 message.put("isVisible", "false");*/
 										 webSocketUtils.sendMessage(loginUser.getId(), message);
 										 return Result.error("导入失败，第" + i + 1 + "行的版本号填写错误！");
 									 }
 								 } else {
-									 message.put("isVisible", "false");
+/*									 message.put("isVisible", "false");*/
 									 webSocketUtils.sendMessage(loginUser.getId(), message);
 									 return Result.error("导入失败，第" + i + 1 + "行的版本状态填写错误！");
 								 }
 							 } else {
-								 message.put("isVisible", "false");
+		/*						 message.put("isVisible", "false");*/
 								 webSocketUtils.sendMessage(loginUser.getId(), message);
 								 return Result.error("导入失败，第" + i + 1 + "行的实体状态填写错误！");
 							 }
 						 } else {
-							 message.put("isVisible", "false");
+					/*		 message.put("isVisible", "false");*/
 							 webSocketUtils.sendMessage(loginUser.getId(), message);
 							 return Result.error("导入失败，第" + i + 1 + "行的英文名称填写错误！");
 						 }
 					 } else {
-						 message.put("isVisible", "false");
+						/* message.put("isVisible", "false");*/
 						 webSocketUtils.sendMessage(loginUser.getId(), message);
 						 return Result.error("导入失败，第" + i + 1 + "行的中文名称填写错误！");
 					 }
 				 } else {
-					 message.put("isVisible", "false");
+					 /*message.put("isVisible", "false");*/
 					 webSocketUtils.sendMessage(loginUser.getId(), message);
 					 return Result.error("导入失败，第" + i + 1 + "行的对应模块填写错误！");
 				 }
 			 }
 		 } catch (Exception e) {
-			 message.put("isVisible", "false");
+			/* message.put("isVisible", "false");*/
 			 webSocketUtils.sendMessage(loginUser.getId(), message);
 			 return Result.error("文件导入失败");
 		 }
-		 message.put("isVisible", "false");
+		 /*message.put("isVisible", "false");*/
 		 webSocketUtils.sendMessage(loginUser.getId(), message);
 		 return Result.ok("文件导入成功！");
 	 }
+
+/*	 //导出实体标准模板
+	 @RequestMapping(value = "/templateExcel")
+	 public ModelAndView wbsExcelTemplate(HttpServletRequest request, HttpServletResponse response) {
+		 Map<String, Object> map = new HashMap<String, Object>();
+		 //设置导出文件名称
+		 SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+		 Date date = new Date(System.currentTimeMillis());
+		 String currTime = formatter.format(date);
+		 String fileName = currTime + "-" + "模板.xlsx";
+		 try {
+			 String url = getClass().getClassLoader().getResource("static").getPath();
+			 // 模板存放地址 这里写的地址根本拿不到 在其他人的电脑上
+			 String templateUrl = wordPath + File.separator + "实体表模板.xls";
+			 TemplateExportParams params = new TemplateExportParams(
+					 templateUrl);
+			 ModelAndView mv = new ModelAndView(new JeecgTemplateExcelView());
+			 mv.addObject(TemplateExcelConstants.FILE_NAME, fileName);
+			 mv.addObject(TemplateExcelConstants.PARAMS, params);
+			 // 添加模板参数
+			 mv.addObject(TemplateExcelConstants.MAP_DATA, map); //data
+			 return mv;
+		 } catch (Exception e) {
+			 log.error("下载模板异常--》{}", e);
+		 }
+		 return null;
+	 }*/
 }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/service/impl/TablexServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/service/impl/TablexServiceImpl.java
index 7b5b0ff..c5779fa 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/service/impl/TablexServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/service/impl/TablexServiceImpl.java
@@ -48,7 +48,7 @@ public class TablexServiceImpl extends ServiceImpl<TablexMapper, Tablex> impleme
                 this.save(tablexList.get(i));
                 webSocketUtils.sendMessage(loginUser.getId(), message);
             } catch (InterruptedException e) {
-                message.put("isVisible", "false");
+                /*message.put("isVisible", "false");*/
                 webSocketUtils.sendMessage(loginUser.getId(), message);
                 log.error(e.getMessage(), e);
             }