From c4fb53431f2ea25fc3336cde5c64e238171e30bb Mon Sep 17 00:00:00 2001
From: mqh <1571896045@qq.com>
Date: Thu, 20 Jul 2023 14:47:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AF=BC=E5=85=A5=E5=AE=9E?=
 =?UTF-8?q?=E4=BD=93=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/modulex/ModulexList.vue         |  89 +-
 .../views/modulex/modules/ModulexImport.vue   |  99 +--
 .../tablex/controller/TablexController.java   | 795 +++++++++---------
 3 files changed, 498 insertions(+), 485 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/modulex/ModulexList.vue b/ant-design-vue-jeecg/src/views/modulex/ModulexList.vue
index 74f3755..2692368 100644
--- a/ant-design-vue-jeecg/src/views/modulex/ModulexList.vue
+++ b/ant-design-vue-jeecg/src/views/modulex/ModulexList.vue
@@ -124,26 +124,28 @@
 
       <!--      <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-button type="primary" icon="import"
+                @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"
+              :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>
@@ -484,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"
       },
@@ -502,7 +505,7 @@ export default {
     this.loginRole(usercode)
     //console.log('userole1',this.userRole1)
     this.getSuperFieldList()
-    this.showProcess()
+    /*    this.showProcess()*/
   },
   computed: {
     importExcelUrl: function () {
@@ -521,32 +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.ModalData);
-      // 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(this.tablexImportExcelUrl,'');
+      this.$refs.moduleximport.show(data);
       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("重新获取列表")
-        // }
       }
     },
     // 多选框的事件回调
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 85c8496..cb26dfe 100644
--- a/ant-design-vue-jeecg/src/views/modulex/modules/ModulexImport.vue
+++ b/ant-design-vue-jeecg/src/views/modulex/modules/ModulexImport.vue
@@ -24,50 +24,26 @@
         </div>
       </a-form-item>
       <a-form-item label="上传标准表格">
-        <!-- @click="showProcess" -->
-        <!--        <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>
-            <a-progress
-              :percent="parseInt(String(ModalData.uploaded/ModalData.records*100))"
-              title="上传进度："
-              status="active"
-              :steps="ModalData.records"/>
-          </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-form-item v-if="ModalData.isVisible==='true'" class="box">
+          <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-form-item>
+      <!--      <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
@@ -80,7 +56,7 @@
 </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'
@@ -91,7 +67,7 @@ export default {
   comments: {},
   data() {
     return {
-      title: '',
+      title: '导入xxxxx',
       visible: false,
       model: {},
       // 注意事项默认值
@@ -107,7 +83,8 @@ export default {
       url:
         {
           downfile: '',
-          uploadUrl: ''
+          uploadUrl: '',
+          list: "/modulex/modulex/list"
         },
       datas: [
         'Racing car sprays burning fuel into crowd.',
@@ -116,6 +93,7 @@ export default {
         'Man charged over missing wedding girl.',
         'Los Angeles battles huge wildfires.'
       ]
+
     }
   },
   created() {
@@ -151,31 +129,36 @@ 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.list, params).then((res) =>
+      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() {
 
     },
-    show(uploadUrl, downUrl) {
-      this.url.uploadUrl = uploadUrl
-      this.url.downfile = downUrl
+    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.visible = true
       this.ModalData = record
     },
+    edit1(record) {
+      this.visible = true
+    },
 
     close() {
       this.$emit('close')
@@ -206,4 +189,10 @@ export default {
   width: 85%;
   float: right;
 }
+.box{
+  display: flex;
+  flex-direction:column;
+  justify-content:center;
+  align-items: center;
+}
 </style>
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 fafd6ae..cfe2e22 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
@@ -51,6 +51,7 @@ 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;
@@ -60,408 +61,412 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 
- /**
+/**
  * @Description: 实体表
  * @Author: jeecg-boot
- * @Date:   2023-04-10
+ * @Date: 2023-04-10
  * @Version: V1.0
  */
-@Api(tags="实体表")
+@Api(tags = "实体表")
 @RestController
 @RequestMapping("/tablex/tablex")
 @Slf4j
 public class TablexController extends JeecgController<Tablex, ITablexService> {
-	 @Autowired
-	 private ITablexService tablexService;
-
-	 @Autowired
-	 private IModulexService modulexService;
-	 @Autowired
-	 private IFieldxService fieldxService;
-
-	 @Autowired
-	 private FieldxController fieldxController;
-
-	 @Autowired
-	 private ITablexVoService tablexVoService;
-
-	 @Autowired
-	 private IRequirementEntityService requirementEntityService;
-
-	 @Autowired
-	 private WebSocketUtils webSocketUtils;
-
-	 /**
-	  * 分页列表查询
-	  *
-	  * @param tablex
-	  * @param pageNo
-	  * @param pageSize
-	  * @param req
-	  * @return
-	  */
-	 @AutoLog(value = "实体表-分页列表查询")
-	 @ApiOperation(value = "实体表-分页列表查询", notes = "实体表-分页列表查询")
-	 @GetMapping(value = "/list")
-	 public Result<?> queryPageList(Tablex tablex,
-									@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-									@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-									HttpServletRequest req) {
-		 QueryWrapper<Tablex> queryWrapper = QueryGenerator.initQueryWrapper(tablex, req.getParameterMap());
-		 Page<Tablex> page = new Page<Tablex>(pageNo, pageSize);
-		 IPage<Tablex> pageList = tablexService.page(page, queryWrapper);
-		 return Result.OK(pageList);
-	 }
-
-	 /**
-	  * 添加
-	  *
-	  * @param tablex
-	  * @return
-	  */
-	 @AutoLog(value = "实体表-添加")
-	 @ApiOperation(value = "实体表-添加", notes = "实体表-添加")
-	 @PostMapping(value = "/add")
-	 public Result<?> add(@RequestBody Tablex tablex) {
-		 List<Tablex> tablexList = tablexService.list();
-		 for (Tablex tablex1 : tablexList) {
-			 if (tablex1.getModuleId().equals(tablex.getModuleId())) {
-				 return Result.error("该模块已有实体，添加失败");
-			 }
-		 }
-		 if (tablex.getModuleId() != null) {
-			 Modulex modulex = modulexService.getById(tablex.getModuleId());
-			 tablex.setTableName(modulex.getModuleName());
-			 tablex.setTableEnName(modulex.getModuleEnName());
-		 }
-		 tablex.setVerison(1);
-		 tablex.setTableStructure("CREATE TABLE '" + tablex.getTableEnName() + "' ();");
-		 tablexService.save(tablex);
-		 System.err.println(tablex.toString());
-		 modulexService.setmodule(tablex.getId(), tablex.getModuleId());
-		 return Result.OK("添加成功！");
-	 }
-
-	 /**
-	  * 转化
-	  *
-	  * @param tablex
-	  * @return
-	  */
-	 @AutoLog(value = "转化")
-	 @ApiOperation(value = "转化", notes = "转化")
-	 @PostMapping(value = "/zh")
-	 public Result<?> zh(@RequestBody Tablex tablex,HttpServletRequest req) {
-	 	 String reid = tablex.getId();
-		 tablex.setId(null);
-		 List<Tablex> tablexList = tablexService.list();
-		 for (Tablex tablex1 : tablexList) {
-			 if (tablex1.getModuleId().equals(tablex.getModuleId())) {
-				 return Result.error("该模块已有实体，转化失败");
-			 }
-		 }
-		 RequirementEntity requirementEntity = requirementEntityService.getById(reid);
-		 tablex.setTableName(requirementEntity.getEntityName());
-		 tablex.setTableEnName(requirementEntity.getEntityEnName());
-		 tablex.setVerison(1);
-		 tablex.setTableStructure("CREATE TABLE '" + tablex.getTableEnName() + "' ();");
-		 QueryWrapper<Tablex> queryWrapper = QueryGenerator.initQueryWrapper(tablex, req.getParameterMap());
-		 queryWrapper.eq("table_name",tablex.getTableName()).or().eq("table_en_name",tablex.getTableEnName());
-		 List<Tablex> tlist = tablexService.list(queryWrapper);
-		 if(tlist.size()>0){
-			 return Result.error("中文或者英文名称重复,不可转化");
-		 }else {
-			 tablexService.save(tablex);
-			 modulexService.setmodule(tablex.getId(), tablex.getModuleId());
-			 requirementEntity.setEntityStatus(3);
-			 requirementEntity.setTableId(tablex.getId());
-			 requirementEntity.setModuleId(tablex.getModuleId());
-			 requirementEntityService.updateById(requirementEntity);
-			 return Result.OK("转化成功！");
-		 }
-	 }
-
-	 /**
-	  * 编辑
-	  *
-	  * @param tablex
-	  * @return
-	  */
-	 @AutoLog(value = "实体表-编辑")
-	 @ApiOperation(value = "实体表-编辑", notes = "实体表-编辑")
-	 @PutMapping(value = "/edit")
-	 public Result<?> edit(@RequestBody Tablex tablex) {
-		 tablex.setVerison(tablex.getVerison() + 1);
-		 List<Tablex> tablexList = tablexService.list();
-		 for (Tablex tablex1 : tablexList) {
-			 if (tablex1.getModuleId().equals(tablex.getModuleId())) {
-				 return Result.error("该模块已有实体，编辑失败");
-			 }
-		 }
-		 if (tablex.getModuleId() != null) {
-			 Modulex modulex = modulexService.getById(tablex.getModuleId());
-			 tablex.setTableName(modulex.getModuleName());
-			 tablex.setTableEnName(modulex.getModuleEnName());
-		 }
-		 tablexService.updateById(tablex);
-		 tablexService.updateSql(tablex.getId(), fieldxController.createSql(tablex.getId()));
-		 return Result.OK("编辑成功!");
-	 }
-
-	 /**
-	  * 通过id删除
-	  *
-	  * @param id
-	  * @return
-	  */
-	 @AutoLog(value = "实体表-通过id删除")
-	 @ApiOperation(value = "实体表-通过id删除", notes = "实体表-通过id删除")
-	 @DeleteMapping(value = "/delete")
-	 public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
-		 List<Fieldx> fieldxList = fieldxService.list(new QueryWrapper<Fieldx>().eq("table_id", id));
-		 if (!fieldxList.isEmpty()) {
-			 return Result.error("该表内已有字段，不能删除");
-		 }
-		 List<Fieldx> fieldxList1 = fieldxService.list(new QueryWrapper<Fieldx>().eq("associate_table", id));
-		 if (!fieldxList1.isEmpty()) {
-			 return Result.error("该表已被关联，不能删除");
-		 }
-		 tablexService.removeById(id);
-		 return Result.OK("删除成功!");
-	 }
-
-
-	 /**
-	  * 批量删除
-	  *
-	  * @param ids
-	  * @return
-	  */
-	 @AutoLog(value = "实体表-批量删除")
-	 @ApiOperation(value = "实体表-批量删除", notes = "实体表-批量删除")
-	 @DeleteMapping(value = "/deleteBatch")
-	 public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-		 this.tablexService.removeByIds(Arrays.asList(ids.split(",")));
-		 return Result.OK("批量删除成功!");
-	 }
-
-	 /**
-	  * 通过id查询
-	  *
-	  * @param id
-	  * @return
-	  */
-	 @AutoLog(value = "实体表-通过id查询")
-	 @ApiOperation(value = "实体表-通过id查询", notes = "实体表-通过id查询")
-	 @GetMapping(value = "/queryById")
-	 public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
-		 Tablex tablex = tablexService.getById(id);
-		 if (tablex == null) {
-			 return Result.error("未找到对应数据");
-		 }
-		 return Result.OK(tablex);
-	 }
-
-	 /**
-	  * 导出excel
-	  *
-	  * @param request
-	  * @param tablex
-	  */
-	 @RequestMapping(value = "/exportXls")
-	 public ModelAndView exportXls(HttpServletRequest request, Tablex tablex) {
-		 return super.exportXls(request, tablex, Tablex.class, "实体表");
-	 }
-
-	 /**
-	  * 通过excel导入数据
-	  *
-	  * @param file
-	  * @return
-	  */
-	 @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-	 public Result<?> importExcel(MultipartFile file) {
-
-		 LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-
-		 Map<String, String> message = new HashMap<>();
-		 message.put("isVisible", "true");
-		 message.put("uploaded", "0");
-		 message.put("status", "判断文件结构");
-		 webSocketUtils.sendMessage(loginUser.getId(), message);
-
-		 try {
-			 // 判断文件是否是表格
-			 String originalFilename = file.getOriginalFilename();
-			 if (StringUtils.isBlank(originalFilename) ||
-					 (!originalFilename.endsWith("xls") &&
-							 !originalFilename.endsWith("xlsx"))) {
-/*				 message.put("isVisible", "false");*/
-				 webSocketUtils.sendMessage(loginUser.getId(), message);
-				 return Result.error("文件格式不正确");
-			 }
-
-			 //获取上传文件对象
-			 ImportParams params = new ImportParams();
-			 params.setTitleRows(1);//表格标题行数,默认0
-			 params.setHeadRows(1);//表头行数,默认1
-			 params.setNeedSave(true);//是否需要保存上传的Excel,默认为false
-			 List<TablexVo> list = null;
-			 message.put("status", "读取数据中");
-			 webSocketUtils.sendMessage(loginUser.getId(), message);
-			 try {
-				 //读取excel数据
-				 list = ExcelImportUtil.importExcel(file.getInputStream(), TablexVo.class, params);
-			 } catch (Exception e) {
-/*				 message.put("isVisible", "false");*/
-				 webSocketUtils.sendMessage(loginUser.getId(), message);
-				 return Result.error("文件读取失败");
-			 }
-			 //判断文件中是否存在数据
-			 if (list == null || list.size() == 0) {
-/*				 message.put("isVisible", "false");*/
-				 webSocketUtils.sendMessage(loginUser.getId(), message);
-				 return Result.error("Excel数据为空");
-			 }
-
-			 message.put("status", "数据预读入");
-			 webSocketUtils.sendMessage(loginUser.getId(), message);
-			 for (TablexVo tablexVo : list) {
-				 //判断当前存入行是否为空值
-				 if (tablexVo.getModuleId() == null &&
-						 tablexVo.getTableName() == null &&
-						 tablexVo.getTableEnName() == null &&
-						 tablexVo.getTableStructure() == null &&
-						 tablexVo.getStructuralDiagram() == null &&
-						 tablexVo.getStatus() == null &&
-						 tablexVo.getVerisonStatus() == null &&
-						 tablexVo.getVerison() == null) continue;
-				 // 将总的记录数传递给前端
-				 message.put("records", String.valueOf(list.size()));
-				 webSocketUtils.sendMessage(loginUser.getId(), message);
-
-				 //判断版本号长度
-				 String verison = tablexVo.getVerison();
-				 if (verison.length() > 5) {
-/*					 message.put("isVisible", "false");*/
-					 webSocketUtils.sendMessage(loginUser.getId(), message);
-					 return Result.error("预读入失败，版本号格式错误");
-				 }
-				 //存入临时表中
-				 tablexVoService.save(tablexVo);
-			 }
-
-			 //从临时表中取出数据
-			 List<TablexVo> voList = tablexVoService.list();
-			 //删除临时表中的数据
-			 tablexVoService.removeAll(voList);
-
-			 if (voList.size() == 0) {
-/*				 message.put("isVisible", "false");*/
-				 webSocketUtils.sendMessage(loginUser.getId(), message);
-				 return Result.error("导入失败，数据为空");
-			 }
-
-			 message.put("status", "开始数据校验");
-			 webSocketUtils.sendMessage(loginUser.getId(), message);
-			 for (int i = 0; i < voList.size(); i++) {
-
-				 List<Tablex> tablexList = new ArrayList<>();
-				 Tablex tablex = new Tablex();
-
-				 String moduleId = voList.get(i).getModuleId();
-				 if (moduleId == null || moduleId.equals("")){
-/*					 message.put("isVisible", "false");*/
-					 webSocketUtils.sendMessage(loginUser.getId(), message);
-				 	return Result.error("对应模块填写不能为空");
-				 }
-				 LambdaQueryWrapper<Modulex> queryWrapper = new LambdaQueryWrapper<>();
-				 queryWrapper.eq(Modulex::getId,moduleId);
-				 Modulex modulex = modulexService.getOne(queryWrapper);
-				 if(modulex == null){
-/*					 message.put("isVisible", "false");*/
-					 webSocketUtils.sendMessage(loginUser.getId(), message);
-				 	return Result.error("对应模块填写错误");
-				 }
-				 String modulexId = modulex.getId();
-
-				 String status = voList.get(i).getStatus();
-				 String verisonStatus = voList.get(i).getVerisonStatus();
-
-				 //判断实体状态
-				 //int statusInt = status.equals("正常") ? 1 : status.equals("停用") ? 0 : status.equals("废弃") ? 9 : 3;
-				 //判断版本状态
-				 //int verisonStatusInt = verisonStatus.equals("当前") ? 1 : verisonStatus.equals("历史") ? 0 : 3;
-
-				 //判断对应模块
-				 if (modulexId != null && voList.get(i).getModuleId() != null && !voList.get(i).getModuleId().equals("")) {
-					 //判断中文名称
-					 if (voList.get(i).getTableName() != null && !voList.get(i).getTableName().equals("") && !voList.get(i).getTableName().equals(modulex.getModuleName())) {
-						 //判断英文名称
-						 if (voList.get(i).getTableEnName() != null && !voList.get(i).getTableEnName().equals("") && !voList.get(i).getTableEnName().equals(modulex.getModuleEnName())) {
-							 //判断实体状态
-							 if (status.equals("1") || status.equals("0") || status.equals("9")) {
-								 //判断版本状态
-								 if (verisonStatus.equals("1") || verisonStatus.equals("0")) {
-									 //判断版本号
-									 if (voList.get(i).getVerison() != null && !voList.get(i).getVerison().equals("")) {
-									 	tablex.setModuleId(voList.get(i).getModuleId());
-									 	tablex.setTableName(voList.get(i).getTableName());
-									 	tablex.setTableEnName(voList.get(i).getTableEnName());
-									 	tablex.setTableStructure(voList.get(i).getTableStructure());
-									 	tablex.setStructuralDiagram(voList.get(i).getStructuralDiagram());
-									 	tablex.setCreateBy(loginUser.getRealname());
-									 	tablex.setStatus(Integer.valueOf(voList.get(i).getStatus()));
-									 	tablex.setVerisonStatus(Integer.valueOf(voList.get(i).getVerisonStatus()));
-									 	tablex.setVerison(Integer.valueOf(voList.get(i).getVerison()));
-
-									 	tablexList.add(tablex);
-
-									 	//单条保存到真实表中
-										tablexService.saveSingleBatch(tablexList,loginUser,message);
-
-									 } else {
-/*										 message.put("isVisible", "false");*/
-										 webSocketUtils.sendMessage(loginUser.getId(), message);
-										 return Result.error("导入失败，第" + i + 1 + "行的版本号填写错误！");
-									 }
-								 } else {
-/*									 message.put("isVisible", "false");*/
-									 webSocketUtils.sendMessage(loginUser.getId(), message);
-									 return Result.error("导入失败，第" + i + 1 + "行的版本状态填写错误！");
-								 }
-							 } else {
-		/*						 message.put("isVisible", "false");*/
-								 webSocketUtils.sendMessage(loginUser.getId(), message);
-								 return Result.error("导入失败，第" + i + 1 + "行的实体状态填写错误！");
-							 }
-						 } else {
-					/*		 message.put("isVisible", "false");*/
-							 webSocketUtils.sendMessage(loginUser.getId(), message);
-							 return Result.error("导入失败，第" + i + 1 + "行的英文名称填写错误！");
-						 }
-					 } else {
-						/* message.put("isVisible", "false");*/
-						 webSocketUtils.sendMessage(loginUser.getId(), message);
-						 return Result.error("导入失败，第" + i + 1 + "行的中文名称填写错误！");
-					 }
-				 } else {
-					 /*message.put("isVisible", "false");*/
-					 webSocketUtils.sendMessage(loginUser.getId(), message);
-					 return Result.error("导入失败，第" + i + 1 + "行的对应模块填写错误！");
-				 }
-			 }
-		 } catch (Exception e) {
-			/* message.put("isVisible", "false");*/
-			 webSocketUtils.sendMessage(loginUser.getId(), message);
-			 return Result.error("文件导入失败");
-		 }
-		 /*message.put("isVisible", "false");*/
-		 webSocketUtils.sendMessage(loginUser.getId(), message);
-		 return Result.ok("文件导入成功！");
-	 }
-
-/*	 //导出实体标准模板
+    @Autowired
+    private ITablexService tablexService;
+
+    @Autowired
+    private IModulexService modulexService;
+    @Autowired
+    private IFieldxService fieldxService;
+
+    @Autowired
+    private FieldxController fieldxController;
+
+    @Autowired
+    private ITablexVoService tablexVoService;
+
+    @Autowired
+    private IRequirementEntityService requirementEntityService;
+
+    @Autowired
+    private WebSocketUtils webSocketUtils;
+
+    @Value("${jeecg.wordPath}")
+    private String wordPath;
+
+    /**
+     * 分页列表查询
+     *
+     * @param tablex
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "实体表-分页列表查询")
+    @ApiOperation(value = "实体表-分页列表查询", notes = "实体表-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<?> queryPageList(Tablex tablex,
+                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                   HttpServletRequest req) {
+        QueryWrapper<Tablex> queryWrapper = QueryGenerator.initQueryWrapper(tablex, req.getParameterMap());
+        Page<Tablex> page = new Page<Tablex>(pageNo, pageSize);
+        IPage<Tablex> pageList = tablexService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 添加
+     *
+     * @param tablex
+     * @return
+     */
+    @AutoLog(value = "实体表-添加")
+    @ApiOperation(value = "实体表-添加", notes = "实体表-添加")
+    @PostMapping(value = "/add")
+    public Result<?> add(@RequestBody Tablex tablex) {
+        List<Tablex> tablexList = tablexService.list();
+        for (Tablex tablex1 : tablexList) {
+            if (tablex1.getModuleId().equals(tablex.getModuleId())) {
+                return Result.error("该模块已有实体，添加失败");
+            }
+        }
+        if (tablex.getModuleId() != null) {
+            Modulex modulex = modulexService.getById(tablex.getModuleId());
+            tablex.setTableName(modulex.getModuleName());
+            tablex.setTableEnName(modulex.getModuleEnName());
+        }
+        tablex.setVerison(1);
+        tablex.setTableStructure("CREATE TABLE '" + tablex.getTableEnName() + "' ();");
+        tablexService.save(tablex);
+        System.err.println(tablex.toString());
+        modulexService.setmodule(tablex.getId(), tablex.getModuleId());
+        return Result.OK("添加成功！");
+    }
+
+    /**
+     * 转化
+     *
+     * @param tablex
+     * @return
+     */
+    @AutoLog(value = "转化")
+    @ApiOperation(value = "转化", notes = "转化")
+    @PostMapping(value = "/zh")
+    public Result<?> zh(@RequestBody Tablex tablex, HttpServletRequest req) {
+        String reid = tablex.getId();
+        tablex.setId(null);
+        List<Tablex> tablexList = tablexService.list();
+        for (Tablex tablex1 : tablexList) {
+            if (tablex1.getModuleId().equals(tablex.getModuleId())) {
+                return Result.error("该模块已有实体，转化失败");
+            }
+        }
+        RequirementEntity requirementEntity = requirementEntityService.getById(reid);
+        tablex.setTableName(requirementEntity.getEntityName());
+        tablex.setTableEnName(requirementEntity.getEntityEnName());
+        tablex.setVerison(1);
+        tablex.setTableStructure("CREATE TABLE '" + tablex.getTableEnName() + "' ();");
+        QueryWrapper<Tablex> queryWrapper = QueryGenerator.initQueryWrapper(tablex, req.getParameterMap());
+        queryWrapper.eq("table_name", tablex.getTableName()).or().eq("table_en_name", tablex.getTableEnName());
+        List<Tablex> tlist = tablexService.list(queryWrapper);
+        if (tlist.size() > 0) {
+            return Result.error("中文或者英文名称重复,不可转化");
+        } else {
+            tablexService.save(tablex);
+            modulexService.setmodule(tablex.getId(), tablex.getModuleId());
+            requirementEntity.setEntityStatus(3);
+            requirementEntity.setTableId(tablex.getId());
+            requirementEntity.setModuleId(tablex.getModuleId());
+            requirementEntityService.updateById(requirementEntity);
+            return Result.OK("转化成功！");
+        }
+    }
+
+    /**
+     * 编辑
+     *
+     * @param tablex
+     * @return
+     */
+    @AutoLog(value = "实体表-编辑")
+    @ApiOperation(value = "实体表-编辑", notes = "实体表-编辑")
+    @PutMapping(value = "/edit")
+    public Result<?> edit(@RequestBody Tablex tablex) {
+        tablex.setVerison(tablex.getVerison() + 1);
+        List<Tablex> tablexList = tablexService.list();
+        for (Tablex tablex1 : tablexList) {
+            if (tablex1.getModuleId().equals(tablex.getModuleId())) {
+                return Result.error("该模块已有实体，编辑失败");
+            }
+        }
+        if (tablex.getModuleId() != null) {
+            Modulex modulex = modulexService.getById(tablex.getModuleId());
+            tablex.setTableName(modulex.getModuleName());
+            tablex.setTableEnName(modulex.getModuleEnName());
+        }
+        tablexService.updateById(tablex);
+        tablexService.updateSql(tablex.getId(), fieldxController.createSql(tablex.getId()));
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "实体表-通过id删除")
+    @ApiOperation(value = "实体表-通过id删除", notes = "实体表-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        List<Fieldx> fieldxList = fieldxService.list(new QueryWrapper<Fieldx>().eq("table_id", id));
+        if (!fieldxList.isEmpty()) {
+            return Result.error("该表内已有字段，不能删除");
+        }
+        List<Fieldx> fieldxList1 = fieldxService.list(new QueryWrapper<Fieldx>().eq("associate_table", id));
+        if (!fieldxList1.isEmpty()) {
+            return Result.error("该表已被关联，不能删除");
+        }
+        tablexService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "实体表-批量删除")
+    @ApiOperation(value = "实体表-批量删除", notes = "实体表-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        this.tablexService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "实体表-通过id查询")
+    @ApiOperation(value = "实体表-通过id查询", notes = "实体表-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+        Tablex tablex = tablexService.getById(id);
+        if (tablex == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(tablex);
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param tablex
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, Tablex tablex) {
+        return super.exportXls(request, tablex, Tablex.class, "实体表");
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param file
+     * @return
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(MultipartFile file) {
+
+        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+        Map<String, String> message = new HashMap<>();
+        message.put("isVisible", "true");
+        message.put("uploaded", "0");
+        message.put("status", "判断文件结构");
+        webSocketUtils.sendMessage(loginUser.getId(), message);
+
+        try {
+            // 判断文件是否是表格
+            String originalFilename = file.getOriginalFilename();
+            if (StringUtils.isBlank(originalFilename) ||
+                    (!originalFilename.endsWith("xls") &&
+                            !originalFilename.endsWith("xlsx"))) {
+                /*				 message.put("isVisible", "false");*/
+                webSocketUtils.sendMessage(loginUser.getId(), message);
+                return Result.error("文件格式不正确");
+            }
+
+            //获取上传文件对象
+            ImportParams params = new ImportParams();
+            params.setTitleRows(1);//表格标题行数,默认0
+            params.setHeadRows(1);//表头行数,默认1
+            params.setNeedSave(true);//是否需要保存上传的Excel,默认为false
+            List<TablexVo> list = null;
+            message.put("status", "读取数据中");
+            webSocketUtils.sendMessage(loginUser.getId(), message);
+            try {
+                //读取excel数据
+                list = ExcelImportUtil.importExcel(file.getInputStream(), TablexVo.class, params);
+            } catch (Exception e) {
+                /*				 message.put("isVisible", "false");*/
+                webSocketUtils.sendMessage(loginUser.getId(), message);
+                return Result.error("文件读取失败");
+            }
+            //判断文件中是否存在数据
+            if (list == null || list.size() == 0) {
+                /*				 message.put("isVisible", "false");*/
+                webSocketUtils.sendMessage(loginUser.getId(), message);
+                return Result.error("Excel数据为空");
+            }
+
+            message.put("status", "数据预读入");
+            webSocketUtils.sendMessage(loginUser.getId(), message);
+            for (TablexVo tablexVo : list) {
+                //判断当前存入行是否为空值
+                if (StringUtils.isBlank(tablexVo.getModuleId()) &&
+                        StringUtils.isBlank(tablexVo.getTableName()) &&
+                        StringUtils.isBlank(tablexVo.getTableEnName()) &&
+                        StringUtils.isBlank(tablexVo.getTableStructure()) &&
+                        StringUtils.isBlank(tablexVo.getStructuralDiagram()) &&
+                        StringUtils.isBlank(tablexVo.getStatus()) &&
+                        StringUtils.isBlank(tablexVo.getVerisonStatus()) &&
+                        StringUtils.isBlank(tablexVo.getVerison())) {
+                    list.remove(tablexVo);
+                    continue;
+                }
+                //判断版本号长度
+                String verison = tablexVo.getVerison();
+                if (verison.length() > 5) {
+                    /*					 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");*/
+                webSocketUtils.sendMessage(loginUser.getId(), message);
+                return Result.error("导入失败，数据为空");
+            }
+
+            message.put("status", "开始数据校验");
+            webSocketUtils.sendMessage(loginUser.getId(), message);
+            for (int i = 0; i < voList.size(); i++) {
+
+                List<Tablex> tablexList = new ArrayList<>();
+                Tablex tablex = new Tablex();
+
+                String moduleId = voList.get(i).getModuleId();
+                if (moduleId == null || moduleId.equals("")) {
+                    /*					 message.put("isVisible", "false");*/
+                    webSocketUtils.sendMessage(loginUser.getId(), message);
+                    return Result.error("对应模块填写不能为空");
+                }
+                LambdaQueryWrapper<Modulex> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(Modulex::getId, moduleId);
+                Modulex modulex = modulexService.getOne(queryWrapper);
+                if (modulex == null) {
+                    /*					 message.put("isVisible", "false");*/
+                    webSocketUtils.sendMessage(loginUser.getId(), message);
+                    return Result.error("对应模块填写错误");
+                }
+                String modulexId = modulex.getId();
+
+                String status = voList.get(i).getStatus();
+                String verisonStatus = voList.get(i).getVerisonStatus();
+
+                //判断实体状态
+                //int statusInt = status.equals("正常") ? 1 : status.equals("停用") ? 0 : status.equals("废弃") ? 9 : 3;
+                //判断版本状态
+                //int verisonStatusInt = verisonStatus.equals("当前") ? 1 : verisonStatus.equals("历史") ? 0 : 3;
+
+                //判断对应模块
+                if (modulexId != null && voList.get(i).getModuleId() != null && !voList.get(i).getModuleId().equals("")) {
+                    //判断中文名称
+                    if (voList.get(i).getTableName() != null && !voList.get(i).getTableName().equals("") && !voList.get(i).getTableName().equals(modulex.getModuleName())) {
+                        //判断英文名称
+                        if (voList.get(i).getTableEnName() != null && !voList.get(i).getTableEnName().equals("") && !voList.get(i).getTableEnName().equals(modulex.getModuleEnName())) {
+                            //判断实体状态
+                            if (status.equals("1") || status.equals("0") || status.equals("9")) {
+                                //判断版本状态
+                                if (verisonStatus.equals("1") || verisonStatus.equals("0")) {
+                                    //判断版本号
+                                    if (voList.get(i).getVerison() != null && !voList.get(i).getVerison().equals("")) {
+                                        tablex.setModuleId(voList.get(i).getModuleId());
+                                        tablex.setTableName(voList.get(i).getTableName());
+                                        tablex.setTableEnName(voList.get(i).getTableEnName());
+                                        tablex.setTableStructure(voList.get(i).getTableStructure());
+                                        tablex.setStructuralDiagram(voList.get(i).getStructuralDiagram());
+                                        tablex.setCreateBy(loginUser.getRealname());
+                                        tablex.setStatus(Integer.valueOf(voList.get(i).getStatus()));
+                                        tablex.setVerisonStatus(Integer.valueOf(voList.get(i).getVerisonStatus()));
+                                        tablex.setVerison(Integer.valueOf(voList.get(i).getVerison()));
+
+                                        tablexList.add(tablex);
+
+                                        //单条保存到真实表中
+                                        tablexService.saveSingleBatch(tablexList, loginUser, message);
+
+                                    } else {
+                                        /*										 message.put("isVisible", "false");*/
+                                        webSocketUtils.sendMessage(loginUser.getId(), message);
+                                        return Result.error("导入失败，第" + i + 1 + "行的版本号填写错误！");
+                                    }
+                                } else {
+                                    /*									 message.put("isVisible", "false");*/
+                                    webSocketUtils.sendMessage(loginUser.getId(), message);
+                                    return Result.error("导入失败，第" + i + 1 + "行的版本状态填写错误！");
+                                }
+                            } else {
+                                /*						 message.put("isVisible", "false");*/
+                                webSocketUtils.sendMessage(loginUser.getId(), message);
+                                return Result.error("导入失败，第" + i + 1 + "行的实体状态填写错误！");
+                            }
+                        } else {
+                            /*		 message.put("isVisible", "false");*/
+                            webSocketUtils.sendMessage(loginUser.getId(), message);
+                            return Result.error("导入失败，第" + i + 1 + "行的英文名称填写错误！");
+                        }
+                    } else {
+                        /* message.put("isVisible", "false");*/
+                        webSocketUtils.sendMessage(loginUser.getId(), message);
+                        return Result.error("导入失败，第" + i + 1 + "行的中文名称填写错误！");
+                    }
+                } else {
+                    /*message.put("isVisible", "false");*/
+                    webSocketUtils.sendMessage(loginUser.getId(), message);
+                    return Result.error("导入失败，第" + i + 1 + "行的对应模块填写错误！");
+                }
+            }
+        } catch (Exception e) {
+            /* message.put("isVisible", "false");*/
+            webSocketUtils.sendMessage(loginUser.getId(), message);
+            return Result.error("文件导入失败");
+        }
+        /*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>();
@@ -486,5 +491,5 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
 			 log.error("下载模板异常--》{}", e);
 		 }
 		 return null;
-	 }*/
+	 }
 }