Browse Source

1、工单导入

master
Aug 6 months ago
parent
commit
66d9f6c0df
12 changed files with 3011 additions and 0 deletions
  1. +224
    -0
      admin-hanhai-vue/src/views/workorderTemplate/WorkorderTemplateList.vue
  2. +134
    -0
      admin-hanhai-vue/src/views/workorderTemplate/modules/WorkorderTemplateForm.vue
  3. +84
    -0
      admin-hanhai-vue/src/views/workorderTemplate/modules/WorkorderTemplateModal.Style#Drawer.vue
  4. +60
    -0
      admin-hanhai-vue/src/views/workorderTemplate/modules/WorkorderTemplateModal.vue
  5. +37
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/controller/WorkorderTemplateController.java
  6. +21
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/entity/ImportBean.java
  7. +31
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/service/WorkorderExcelService.java
  8. +1278
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/service/impl/WorkorderExcelServiceImpl.java
  9. +77
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/util/ExcelClassField.java
  10. +28
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/util/ExcelExport.java
  11. +31
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/util/ExcelImport.java
  12. +1006
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/util/ExcelUtils.java

+ 224
- 0
admin-hanhai-vue/src/views/workorderTemplate/WorkorderTemplateList.vue View File

@ -0,0 +1,224 @@
<template>
<a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="12">
<a-form-item label="文件路径">
<a-input placeholder="文件路径" v-model="queryParam.fPath"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="12">
<a-form-item label="工单id">
<a-input placeholder="工单id" v-model="queryParam.templateId"></a-input>
</a-form-item>
</a-col>
</a-row>
</a-form>
</div>
<!-- 查询区域-END -->
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('工单信息表')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
<!-- 高级查询区域 -->
<j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
</a-menu>
<a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
</a-dropdown>
</div>
<!-- table区域-begin -->
<div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>
<a style="margin-left: 24px" @click="onClearSelected">清空</a>
</div>
<a-table
ref="table"
size="middle"
:scroll="{x:true}"
bordered
rowKey="id"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
class="j-table-force-nowrap"
@change="handleTableChange">
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
<template slot="imgSlot" slot-scope="text,record">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
<img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
</template>
<template slot="fileSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button
v-else
:ghost="true"
type="primary"
icon="download"
size="small"
@click="downloadFile(text)">
下载
</a-button>
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
<a-dropdown>
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
<a-menu slot="overlay">
<a-menu-item>
<a @click="handleDetail(record)">详情</a>
</a-menu-item>
<a-menu-item>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
</a-dropdown>
</span>
</a-table>
</div>
<workorder-template-modal ref="modalForm" @ok="modalFormOk"></workorder-template-modal>
</a-card>
</template>
<script>
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import WorkorderTemplateModal from './modules/WorkorderTemplateModal'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
export default {
name: 'WorkorderTemplateList',
mixins:[JeecgListMixin, mixinDevice],
components: {
WorkorderTemplateModal
},
data () {
return {
description: '工单信息表管理页面',
//
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:60,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{
title:'工单id',
align:"center",
dataIndex: 'id'
},
{
title:'任务号',
align:"center",
dataIndex: 'taskNo'
},
{
title:'担当信息',
align:"center",
dataIndex: 'responsibler'
},
{
title:'机型信息',
align:"center",
dataIndex: 'model'
},
{
title:'数量',
align:"center",
dataIndex: 'number'
},
{
title:'是否紧急',
align:"center",
dataIndex: 'isEmergency_dictText'
},
{
title:'备注',
align:"center",
dataIndex: 'remark'
},
{
title:'关联状态id',
align:"center",
dataIndex: 'statusId_dictText'
},
{
title: '操作',
dataIndex: 'action',
align:"center",
fixed:"right",
width:147,
scopedSlots: { customRender: 'action' }
}
],
url: {
list: "/workorderTemplate/workorderTemplate/list",
delete: "/workorderTemplate/workorderTemplate/delete",
deleteBatch: "/workorderTemplate/workorderTemplate/deleteBatch",
exportXlsUrl: "/workorderTemplate/workorderTemplate/templateExport",
importExcelUrl: "workorderTemplate/workorderTemplate/import",
mytemplateImport: "workorderTemplate/workorderTemplate/templateImport",
},
dictOptions:{},
superFieldList:[],
}
},
created() {
this.getSuperFieldList();
},
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
},
},
methods: {
initDictConfig(){
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'taskNo',text:'任务号',dictCode:''})
fieldList.push({type:'string',value:'responsibler',text:'担当信息',dictCode:''})
fieldList.push({type:'string',value:'model',text:'机型信息',dictCode:''})
fieldList.push({type:'int',value:'number',text:'数量',dictCode:''})
fieldList.push({type:'string',value:'isEmergency',text:'是否紧急',dictCode:'emergency_flag'})
fieldList.push({type:'Text',value:'remark',text:'备注',dictCode:''})
fieldList.push({type:'string',value:'statusId',text:'关联状态id',dictCode:"workorder_status,name,id"})
this.superFieldList = fieldList
}
}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
</style>

+ 134
- 0
admin-hanhai-vue/src/views/workorderTemplate/modules/WorkorderTemplateForm.vue View File

@ -0,0 +1,134 @@
<template>
<a-spin :spinning="confirmLoading">
<j-form-container :disabled="formDisabled">
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-row>
<a-col :span="24">
<a-form-model-item label="任务号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="taskNo">
<a-input v-model="model.taskNo" placeholder="请输入任务号" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="担当信息" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="responsibler">
<a-input v-model="model.responsibler" placeholder="请输入担当信息" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="机型信息" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="model">
<a-textarea v-model="model.model" rows="4" placeholder="请输入机型信息" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="number">
<a-input-number v-model="model.number" placeholder="请输入数量" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="是否紧急" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isEmergency">
<j-dict-select-tag type="list" v-model="model.isEmergency" dictCode="emergency_flag" placeholder="请选择是否紧急" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
<a-textarea v-model="model.remark" rows="4" placeholder="请输入备注" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="关联状态id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="statusId">
<j-dict-select-tag type="list" v-model="model.statusId" dictCode="workorder_status,name,id" placeholder="请选择关联状态id" />
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</j-form-container>
</a-spin>
</template>
<script>
import { httpAction, getAction } from '@/api/manage'
import { validateDuplicateValue } from '@/utils/util'
export default {
name: 'WorkorderTemplateForm',
components: {
},
props: {
//
disabled: {
type: Boolean,
default: false,
required: false
}
},
data () {
return {
model:{
},
labelCol: {
xs: { span: 24 },
sm: { span: 5 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
},
confirmLoading: false,
validatorRules: {
},
url: {
add: "/workorderTemplate/workorderTemplate/add",
edit: "/workorderTemplate/workorderTemplate/edit",
queryById: "/workorderTemplate/workorderTemplate/queryById"
}
}
},
computed: {
formDisabled(){
return this.disabled
},
},
created () {
//model
this.modelDefault = JSON.parse(JSON.stringify(this.model));
},
methods: {
add () {
this.edit(this.modelDefault);
},
edit (record) {
this.model = Object.assign({}, record);
this.visible = true;
},
submitForm () {
const that = this;
//
this.$refs.form.validate(valid => {
if (valid) {
that.confirmLoading = true;
let httpurl = '';
let method = '';
if(!this.model.id){
httpurl+=this.url.add;
method = 'post';
}else{
httpurl+=this.url.edit;
method = 'put';
}
httpAction(httpurl,this.model,method).then((res)=>{
if(res.success){
that.$message.success(res.message);
that.$emit('ok');
}else{
that.$message.warning(res.message);
}
}).finally(() => {
that.confirmLoading = false;
})
}
})
},
}
}
</script>

+ 84
- 0
admin-hanhai-vue/src/views/workorderTemplate/modules/WorkorderTemplateModal.Style#Drawer.vue View File

@ -0,0 +1,84 @@
<template>
<a-drawer
:title="title"
:width="width"
placement="right"
:closable="false"
@close="close"
destroyOnClose
:visible="visible">
<workorder-template-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></workorder-template-form>
<div class="drawer-footer">
<a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
<a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
</div>
</a-drawer>
</template>
<script>
import WorkorderTemplateForm from './WorkorderTemplateForm'
export default {
name: 'WorkorderTemplateModal',
components: {
WorkorderTemplateForm
},
data () {
return {
title:"操作",
width:800,
visible: false,
disableSubmit: false
}
},
methods: {
add () {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
})
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
});
},
close () {
this.$emit('close');
this.visible = false;
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleOk () {
this.$refs.realForm.submitForm();
},
handleCancel () {
this.close()
}
}
}
</script>
<style lang="less" scoped>
/** Button按钮间距 */
.ant-btn {
margin-left: 30px;
margin-bottom: 30px;
float: right;
}
.drawer-footer{
position: absolute;
bottom: -8px;
width: 100%;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
left: 0;
background: #fff;
border-radius: 0 0 2px 2px;
}
</style>

+ 60
- 0
admin-hanhai-vue/src/views/workorderTemplate/modules/WorkorderTemplateModal.vue View File

@ -0,0 +1,60 @@
<template>
<j-modal
:title="title"
:width="width"
:visible="visible"
switchFullscreen
@ok="handleOk"
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
@cancel="handleCancel"
cancelText="关闭">
<workorder-template-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></workorder-template-form>
</j-modal>
</template>
<script>
import WorkorderTemplateForm from './WorkorderTemplateForm'
export default {
name: 'WorkorderTemplateModal',
components: {
WorkorderTemplateForm
},
data () {
return {
title:'',
width:800,
visible: false,
disableSubmit: false
}
},
methods: {
add () {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
})
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
})
},
close () {
this.$emit('close');
this.visible = false;
},
handleOk () {
this.$refs.realForm.submitForm();
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleCancel () {
this.close()
}
}
}
</script>

+ 37
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/controller/WorkorderTemplateController.java View File

@ -1,5 +1,7 @@
package org.jeecg.modules.workorderTemplate.controller;
import java.io.File;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@ -7,11 +9,16 @@ import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.annotation.Resource;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.Part;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.workorderTemplate.entity.ImportBean;
import org.jeecg.modules.workorderTemplate.entity.WorkorderTemplate;
import org.jeecg.modules.workorderTemplate.service.IWorkorderTemplateService;
@ -20,6 +27,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.modules.workorderTemplate.service.WorkorderExcelService;
import org.jeecg.modules.workorderTemplate.util.ExcelUtils;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@ -165,7 +174,35 @@ public class WorkorderTemplateController extends JeecgController<WorkorderTempla
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
System.out.println("test");
return super.importExcel(request, response, WorkorderTemplate.class);
}
@PostMapping("/import")
public Result<?> importUser(@RequestPart("file")MultipartFile file) throws Exception {
List<ImportBean> importBeanList = ExcelUtils.readMultipartFile(file, ImportBean.class);
return workorderExcelService.templateImport1(importBeanList);
}
/******************************************************************************************************************/
//excel信息
@Resource
private WorkorderExcelService workorderExcelService;
/****************************************************************************************************/
@ApiOperation(value="导入导出-工单信息导入", notes="导入导出-工单信息导入")
@RequestMapping(value = "/templateImport")
public Result<?> templateImport(HttpServletRequest request){
String path = "";
return workorderExcelService.templateImport(path);
}
@ApiOperation(value="导入导出-工单信息导出", notes="导入导出-工单信息导出")
@RequestMapping(value = "/templateExport")
public Result<?> templateExport(HttpServletRequest request, HttpServletResponse response){
String path = request.getParameter("fPath").replace("\\", "\\\\") + "\\\\";
String templateId = request.getParameter("templateId");
return workorderExcelService.templateExport(path, templateId);
}
}

+ 21
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/entity/ImportBean.java View File

@ -0,0 +1,21 @@
package org.jeecg.modules.workorderTemplate.entity;
import lombok.Data;
import org.jeecg.modules.workorderTemplate.util.ExcelImport;
@Data
public class ImportBean {
@ExcelImport("任务号")
private String taskNo;
@ExcelImport("担当信息")
private String responsibler;
@ExcelImport("机型信息")
private String model;
@ExcelImport("数量")
private int number;
}

+ 31
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/service/WorkorderExcelService.java View File

@ -0,0 +1,31 @@
package org.jeecg.modules.workorderTemplate.service;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.workorderTemplate.entity.ImportBean;
import java.util.List;
public interface WorkorderExcelService {
/**
* 工单导入
* @param importBeanList 导入数据
* @return
*/
public Result<?> templateImport1(List<ImportBean> importBeanList);
/**
* 工单导入
* @param path 导入文件路径
* @return
*/
public Result<?> templateImport(String path);
/**
* 工单导出
* @param templateId 工单编号
* @return
*/
public Result<?> templateExport(String path, String templateId);
}

+ 1278
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/service/impl/WorkorderExcelServiceImpl.java
File diff suppressed because it is too large
View File


+ 77
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/util/ExcelClassField.java View File

@ -0,0 +1,77 @@
package org.jeecg.modules.workorderTemplate.util;
import java.util.LinkedHashMap;
/**
* @author sunnyzyq
* @date 2021/12/17
*/
public class ExcelClassField {
/** 字段名称 */
private String fieldName;
/** 表头名称 */
private String name;
/** 映射关系 */
private LinkedHashMap<String, String> kvMap;
/** 示例值 */
private Object example;
/** 排序 */
private int sort;
/** 是否为注解字段:0-否,1-是 */
private int hasAnnotation;
public String getFieldName() {
return fieldName;
}
public void setFieldName(String fieldName) {
this.fieldName = fieldName;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public LinkedHashMap<String, String> getKvMap() {
return kvMap;
}
public void setKvMap(LinkedHashMap<String, String> kvMap) {
this.kvMap = kvMap;
}
public Object getExample() {
return example;
}
public void setExample(Object example) {
this.example = example;
}
public int getSort() {
return sort;
}
public void setSort(int sort) {
this.sort = sort;
}
public int getHasAnnotation() {
return hasAnnotation;
}
public void setHasAnnotation(int hasAnnotation) {
this.hasAnnotation = hasAnnotation;
}
}

+ 28
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/util/ExcelExport.java View File

@ -0,0 +1,28 @@
package org.jeecg.modules.workorderTemplate.util;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* @author sunnyzyq
* @date 2021/12/17
*/
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)
public @interface ExcelExport {
/** 字段名称 */
String value();
/** 导出排序先后: 数字越小越靠前(默认按Java类字段顺序导出) */
int sort() default 0;
/** 导出映射,格式如:0-未知;1-男;2-女 */
String kv() default "";
/** 导出模板示例值(有值的话,直接取该值,不做映射) */
String example() default "";
}

+ 31
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/util/ExcelImport.java View File

@ -0,0 +1,31 @@
package org.jeecg.modules.workorderTemplate.util;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* @author sunnyzyq
* @date 2021/12/17
*/
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)
public @interface ExcelImport {
/** 字段名称 */
String value();
/** 导出映射,格式如:0-未知;1-男;2-女 */
String kv() default "";
/** 是否为必填字段(默认为非必填) */
boolean required() default false;
/** 最大长度(默认255) */
int maxLength() default 255;
/** 导入唯一性验证(多个字段则取联合验证) */
boolean unique() default false;
}

+ 1006
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/util/ExcelUtils.java
File diff suppressed because it is too large
View File


Loading…
Cancel
Save