更新导入实体新页面

dev^2
mqh 1 year ago
parent 7f3093b53c
commit c4fb53431f
  1. 55
      ant-design-vue-jeecg/src/views/modulex/ModulexList.vue
  2. 85
      ant-design-vue-jeecg/src/views/modulex/modules/ModulexImport.vue
  3. 35
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/controller/TablexController.java

@ -124,9 +124,11 @@
<!-- <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( 1)">导入实体
</a-button>
<!-- <a-button type="primary" icon="import" @click="showModalImport()">导入实体</a-button>-->
<a-modal
<!-- <a-modal
title="正在上传..."
:visible="ModalData.isVisible==='true'"
:confirm-loading="false"
@ -143,7 +145,7 @@
:percent="parseInt(String(ModalData.uploaded/ModalData.records*100))"
title="上传进度:"
status="active" :steps="ModalData.records"/>
</a-modal>
</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("")
// }
}
},
//

@ -24,20 +24,15 @@
</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'">
</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>
@ -46,28 +41,9 @@
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-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>

@ -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;
@ -91,6 +92,9 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
@Autowired
private WebSocketUtils webSocketUtils;
@Value("${jeecg.wordPath}")
private String wordPath;
/**
* 分页列表查询
*
@ -328,18 +332,17 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
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);
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) {
@ -350,9 +353,11 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
//存入临时表中
tablexVoService.save(tablexVo);
}
//从临时表中取出数据
List<TablexVo> voList = tablexVoService.list();
// 将总的记录数传递给前端
message.put("records", String.valueOf(voList.size()));
webSocketUtils.sendMessage(loginUser.getId(), message);
//删除临时表中的数据
tablexVoService.removeAll(voList);
@ -461,7 +466,7 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
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;
}*/
}
}

Loading…
Cancel
Save