更新导入实体新页面

ant-design-vue-jeecg/src/views/modulex/ModulexList.vue

@@ -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,10 +94,12 @@
         </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
@@ -119,10 +122,13 @@
         </a-modal>
       </a-upload>
 
-      <a-upload name="file" :showUploadList="false" :multiple="false"
+      <!--      <a-upload name="file" :showUploadList="false" :multiple="false"
-                :headers="tokenHeader" :action="tablexImportExcelUrl" @change="handleImportExcel">
+                      :headers="tokenHeader" :action="tablexImportExcelUrl" @change="handleImportExcel">-->
-        <a-button type="primary" icon="import"  @click="showProcess">导入实体</a-button>
+      <a-button type="primary" icon="import"
-        <a-modal
+                @click="showProcess( 1)">导入实体
+      </a-button>
+      <!--      <a-button type="primary" icon="import" @click="showModalImport()">导入实体</a-button>-->
+      <!--      <a-modal
               title="正在上传..."
               :visible="ModalData.isVisible==='true'"
               :confirm-loading="false"
@@ -139,13 +145,14 @@
                 :percent="parseInt(String(ModalData.uploaded/ModalData.records*100))"
                 title="上传进度："
                 status="active" :steps="ModalData.records"/>
-        </a-modal>
+            </a-modal>-->
-      </a-upload>
+      <!--      </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>
@@ -262,6 +269,7 @@ 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],
@@ -478,6 +486,7 @@ export default {
         importExcelUrl: "modulex/modulex/importExcel",
         functionImportExcelUrl: "/functionx/functionx/importExcel",
         tablexImportExcelUrl: "tablex/tablex/importExcel",
+        tablexDownExcelUrl: "tablex/tablex/templateExcel",
         ruleImportExcelUrl: "rulex/rulex/importExcel",
         exportxsxl: "modulex/modulex/exportxsxl"
       },
@@ -496,7 +505,7 @@ export default {
     this.loginRole(usercode)
     //console.log('userole1',this.userRole1)
     this.getSuperFieldList()
-    this.showProcess()
+    /*    this.showProcess()*/
   },
   computed: {
     importExcelUrl: function () {
@@ -515,29 +524,48 @@ export default {
     tablexImportExcelUrl: function () {
       return `${window._CONFIG['domianURL']}/${this.url.tablexImportExcelUrl}`;
     },
+    tablexDownExcelUrl: function () {
+      return `${window._CONFIG['domianURL']}/${this.url.tablexDownExcelUrl}`;
+    },
     ruleImportExcelUrl: function () {
       return `${window._CONFIG['domianURL']}/${this.url.ruleImportExcelUrl}`
     },
   },
   methods: {
-
-    showModalImport(){
-      this.$refs.moduleximport.edit();
-      // this.$refs.moduleximport.title = "测试页面111111";
-      this.$refs.moduleximport.disableSubmit = false;
-    },
     // 显示进度
-    showProcess(){
+    showProcess(type) {
+      let data = {
+        uploadUrl: '',
+        downUrl: '',
+        title: '',
+        note: []
+      }
+      switch (type) {
+        case 1: {
+          data.note = ['对应模块id(必填)：填写正确的模块名称',
+            '中文名称(必填)：与模块名称相同。',
+            '英文名称(必填)：与模块名称相同，写模块名称的英文名称。',
+            '结构图(选填)：类图或E-R图，可以为空，不填写。',
+            '实体状态：可填入值为[正常、停用、废弃]，若不填写，默认为“正常”状态。',
+            '版本状态: 可填入值为[当前、历史]，若不填写，默认为“当前”状态',
+            '版本号：请填写小与五位数的正整数'
+          ]
+          data.title = '导入实体'
+          data.uploadUrl = this.tablexImportExcelUrl
+          data.downUrl = this.tablexDownExcelUrl
+          break;
+        }
+        default: {
+          return
+        }
+      }
       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}`)
+      this.$refs.moduleximport.show(data);
       ws.onmessage = (e) => {
-        this.ModalData=JSON.parse(e.data)
+        this.$refs.moduleximport.edit(JSON.parse(e.data));
-        if (this.visible===false) {
-          // this.getList()
-          console.log("重新获取列表")
-        }
       }
     },
     // 多选框的事件回调

ant-design-vue-jeecg/src/views/modulex/modules/ModulexImport.vue

@@ -11,22 +11,28 @@
     <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="standB">
-        <div class="standBu"> <a-alert
+          <a-button type="primary" icon="download" @click="handleDownload"/>
+        </div>
+        <div class="standBu">
+          <a-alert
             message="必须下载标准表格,否则审核不通过"
             type="error"
             closable
             @close="onClose"
-        /></div>
+          />
+        </div>
       </a-form-item>
       <a-form-item label="上传标准表格">
-        <!-- @click="showProcess" -->
+        <a-upload name="file"
-        <a-upload
                   :multiple="false"
-          action="https://www.mocky.io/v2/5cc8019d300000980a055e76"
+                  :action="url.uploadUrl"
-          @change="handleChange">
+                  :showUploadList="false"
+                  :headers="tokenHeader">
           <a-button type="primary" icon="upload"></a-button>
-          <!-- <div>
+        </a-upload>
+      </a-form-item>
+      <a-form-item v-if="ModalData.isVisible==='true'" class="box">
           <p>当前状态：{{ ModalData.status }}</p>
           <p>总记录数：{{ ModalData.records }}</p>
           <p>已上传：{{ ModalData.uploaded }}</p>
@@ -35,12 +41,14 @@
             title="上传进度："
             status="active"
             :steps="ModalData.records"/>
-          </div> -->
-        </a-upload>
       </a-form-item>
-      <a-form-model-item label="注意事项" v-if="uploadFinished">
+      <!--      <a-form-model-item label="注意事项" v-if="uploadFinished">-->
+      <a-form-model-item label="注意事项">
         <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>
@@ -48,16 +56,18 @@
 </template>
 
 <script>
-import getAction from '@api/manage'
+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: '导入xxxxx',
       visible: false,
       model: {},
       // 注意事项默认值
@@ -72,7 +82,9 @@ export default {
       form: this.$form.createForm(this),
       url:
         {
-        downfile: ''
+          downfile: '',
+          uploadUrl: '',
+          list: "/modulex/modulex/list"
         },
       datas: [
         'Racing car sprays burning fuel into crowd.',
@@ -81,16 +93,16 @@ export default {
         'Man charged over missing wedding girl.',
         'Los Angeles battles huge wildfires.'
       ]
+
     }
   },
   created() {
   },
-  computed: {
+  computed: {},
-  },
   methods: {
     // 上传
     // 显示进度
-    showProcess() {
+    /*    showProcess() {
           let userId = store.getters.userInfo.id
           let baseUrl = window._CONFIG['domianURL']
           baseUrl = baseUrl.replace('http', 'ws')
@@ -98,7 +110,7 @@ export default {
           ws.onmessage = (e) => {
             this.ModalData = JSON.parse(e.data)
           }
-    },
+        },*/
     // 上传文件
     handleChange(info) {
       if (info.file.status !== 'uploading') {
@@ -117,23 +129,34 @@ export default {
     },
     // 下载标准文档
     handleDownload() {
-      console.log(1111)
+      // getAction(this.url.list, params).then((res) =>
-    //   getAction(this.url.downfile).then(response => {
+      getAction(this.url.downfile).then((response) => {
-    //     const url = window.URL.createObjectURL(new Blob([response.data]))
+          const url = window.URL.createObjectURL(new Blob([response.data]))
-    //     const link = document.createElement('a')
+          const link = document.createElement('a')
-    //     link.href = url
+          link.href = url
-    //     link.setAttribute('download', 'your-document.pdf')
+          link.setAttribute('download', 'your-document.pdf')
-    //     document.body.appendChild(link)
+          document.body.appendChild(link)
-    //     link.click()
+          link.click()
-    // })
+      })
-    // .catch(error => {
+      .catch(error => {
-    //     console.error(error)
+          console.error(error)
-    // })
+      })
     },
     add() {
 
+    },
+    show(data) {
+      this.url.uploadUrl = data.uploadUrl
+      this.url.downfile = data.downUrl
+      this.datas=data.note
+      this.title=data.title
+      this.ModalData = {}
+      this.visible = true
     },
     edit(record) {
+      this.ModalData = record
+    },
+    edit1(record) {
       this.visible = true
     },
 
@@ -161,8 +184,15 @@ export default {
   width: 15%;
   float: left;
 }
+
 .standBu {
   width: 85%;
   float: right;
 }
+.box{
+  display: flex;
+  flex-direction:column;
+  justify-content:center;
+  align-items: center;
+}
 </style>

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,12 +42,16 @@ 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.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -86,6 +92,9 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
     @Autowired
     private WebSocketUtils webSocketUtils;
 
+    @Value("${jeecg.wordPath}")
+    private String wordPath;
+
     /**
      * 分页列表查询
      *
@@ -291,7 +300,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 +317,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数据为空");
             }
@@ -323,36 +332,37 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
             webSocketUtils.sendMessage(loginUser.getId(), message);
             for (TablexVo tablexVo : list) {
                 //判断当前存入行是否为空值
-				 if (tablexVo.getModuleId() == null &&
+                if (StringUtils.isBlank(tablexVo.getModuleId()) &&
-						 tablexVo.getTableName() == null &&
+                        StringUtils.isBlank(tablexVo.getTableName()) &&
-						 tablexVo.getTableEnName() == null &&
+                        StringUtils.isBlank(tablexVo.getTableEnName()) &&
-						 tablexVo.getTableStructure() == null &&
+                        StringUtils.isBlank(tablexVo.getTableStructure()) &&
-						 tablexVo.getStructuralDiagram() == null &&
+                        StringUtils.isBlank(tablexVo.getStructuralDiagram()) &&
-						 tablexVo.getStatus() == null &&
+                        StringUtils.isBlank(tablexVo.getStatus()) &&
-						 tablexVo.getVerisonStatus() == null &&
+                        StringUtils.isBlank(tablexVo.getVerisonStatus()) &&
-						 tablexVo.getVerison() == null) continue;
+                        StringUtils.isBlank(tablexVo.getVerison())) {
-				 // 将总的记录数传递给前端
+                    list.remove(tablexVo);
-				 message.put("records", String.valueOf(list.size()));
+                    continue;
-				 webSocketUtils.sendMessage(loginUser.getId(), message);
+                }
-
                 //判断版本号长度
                 String verison = tablexVo.getVerison();
                 if (verison.length() > 5) {
-					 message.put("isVisible", "false");
+                    /*					 message.put("isVisible", "false");*/
                     webSocketUtils.sendMessage(loginUser.getId(), message);
                     return Result.error("预读入失败，版本号格式错误");
                 }
                 //存入临时表中
                 tablexVoService.save(tablexVo);
             }
-
             //从临时表中取出数据
             List<TablexVo> voList = tablexVoService.list();
+            // 将总的记录数传递给前端
+            message.put("records", String.valueOf(voList.size()));
+            webSocketUtils.sendMessage(loginUser.getId(), message);
             //删除临时表中的数据
             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 +376,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 +384,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 +426,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;
+	 }
 }

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);
             }