Merge branch 'dev_2307' of http://182.92.169.222:3000/zhc077/projectManagement into dev_2307

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

@@ -77,10 +77,49 @@
         <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-button type="primary" icon="import">导入规则</a-button>
+
+                <a-button type="primary" icon="import"  @click="showProcess">导入规则</a-button>
+        <a-modal
+          title="正在上传..."
+          :visible="ModalData.isVisible==='true'"
+          :confirm-loading="false"
+          :mask="true"
+          :maskClosable="false"
+          :keyboard="false"
+          :closable="false"
+          :footer="false"
+        >
+          <p>当前状态：{{ ModalData.status }}</p>
+          <p>总记录数：{{ ModalData.records }}</p>
+          <p>已上传：{{ ModalData.uploaded }}</p>
+          <a-progress
+            :percent="parseInt(String(ModalData.uploaded/ModalData.records*100))"
+            title="上传进度："
+            status="active" :steps="ModalData.records"/>
+        </a-modal>
               </a-upload>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="tablexImportExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入实体</a-button>
+
+      <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-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>
@@ -212,6 +251,13 @@ export default {
   },
   data () {
     return {
+      ModalData:{
+        uploaded: '0',
+        isVisible: 'false',
+        records: '0',
+        status: '判断文件结构'
+      },
+      visible:false,
       description: '模块管理管理页面',
       // 表头
       columns: [
@@ -427,6 +473,7 @@ export default {
     this.loginRole(usercode)
     //console.log('userole1',this.userRole1)
     this.getSuperFieldList()
+    this.showProcess()
   },
   computed: {
     importExcelUrl: function () {
@@ -450,6 +497,20 @@ export default {
     },
   },
   methods: {
+    // 显示进度
+    showProcess(){
+      let userId = store.getters.userInfo.id
+      let base_url = window._CONFIG['domianURL']
+      base_url = base_url.replace('http', 'ws')
+      let ws = new WebSocket(`${base_url}/uploadProcess/${userId}`)
+      ws.onmessage = (e) =>{
+        this.ModalData=JSON.parse(e.data)
+        if (this.visible===false) {
+          // this.getList()
+          console.log("重新获取列表")
+        }
+      }
+    },
     // 多选框的事件回调
     checkChange (checked) {
       // 初始是默认全选的，假设此刻点击了name的选择框

ant-design-vue-jeecg/src/views/requiremententity/RequirementEntityList.vue

@@ -95,15 +95,14 @@
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
-
           <a-divider type="vertical" />
           <a @click="handleDetail(record)">详情</a>
           <a-divider type="vertical" />
           <a @click="fq(record.id)">废弃</a>
           <a-divider type="vertical" />
-          <a @click="zh(record)">转化</a>
+          <a :disabled="record.entityStatus!=9" @click="updateEntityStatus(record.id)">撤销</a>
           <a-divider type="vertical" />
-          <a :disabled="record.entityStatus!=9" @click="updateEntityStatus(record,'9')">撤销</a>
+          <a @click="zh(record)">转化</a>
           <a-divider type="vertical" />
           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
@@ -194,6 +193,7 @@
           importExcelUrl: "requiremententity/requirementEntity/importExcel",
           fq:"/requiremententity/requirementEntity/fq",
           hb:"/requiremententity/requirementEntity/hb",
+          cx:"/requiremententity/requirementEntity/cx",
 
         },
         dictOptions:{},
@@ -209,6 +209,16 @@
       },
     },
     methods: {
+      updateEntityStatus(id){
+        getAction(this.url.cx,{id:id}).then((res)=>{
+          if (res.success) {
+            this.$message.success(res.message);
+            this.loadData();
+          }else{
+            this.$message.warning(res.message);
+          }
+        });
+      },
       hb(hbsj){
         console.log(hbsj)
         if(hbsj.length<2){

jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -72,6 +72,7 @@ public class ShiroConfig {
         }
         // 配置不会被拦截的链接 顺序判断
         filterChainDefinitionMap.put("/createtp/createtp/maketupu","anon"); // 知识图谱排除
+        filterChainDefinitionMap.put("/uploadProcess/**", "anon"); //上传进度条
         filterChainDefinitionMap.put("/sys/cas/client/validateLogin", "anon"); //cas验证登录
         filterChainDefinitionMap.put("/sys/randomImage/**", "anon"); //登录验证码接口排除
         filterChainDefinitionMap.put("/sys/checkCaptcha", "anon"); //登录验证码接口排除

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requiremententity/controller/RequirementEntityController.java

@@ -200,6 +200,26 @@ public class RequirementEntityController extends JeecgController<RequirementEnti
 		 return Result.OK("已废弃");
 	 }
 
+	 /**
+	  * 撤销废除
+	  *
+	  * @param id
+	  * @return
+	  */
+	 @AutoLog(value = "撤销废除")
+	 @ApiOperation(value="撤销废除", notes="撤销废除")
+	 @GetMapping(value = "/cx")
+	 public Result<?> cx(@RequestParam(name="id",required=true) String id) {
+		 RequirementEntity requirementEntity = requirementEntityService.getById(id);
+		 if(requirementEntity==null) {
+			 return Result.error("未找到对应数据");
+		 }else{
+			 requirementEntity.setEntityStatus(0);
+			 requirementEntityService.updateById(requirementEntity);
+		 }
+		 return Result.OK("已撤销废除");
+	 }
+
 	 /**
 	  *  合并
 	  *
@@ -210,6 +230,10 @@ public class RequirementEntityController extends JeecgController<RequirementEnti
 	 @ApiOperation(value="合并", notes="合并")
 	 @DeleteMapping(value = "/hb")
 	 public Result<?> hb(@RequestParam(name="ids",required=true) String ids,@RequestParam(name="id",required=true) String id) {
+		 RequirementEntity requirementEntity1 = requirementEntityService.getById(id);
+		 if(requirementEntity1.getEntityStatus()==9){
+			 return Result.error("该实体已废弃，需撤回废弃后再保留");
+		 }else{
 			 List<String> listids =  Arrays.asList(ids.split(","));
 			 for (int i = 0 ; i < listids.size(); i++){
 				 if(!id.equals(listids.get(i))){
@@ -218,12 +242,13 @@ public class RequirementEntityController extends JeecgController<RequirementEnti
 					 requirementEntityService.updateById(requirementEntity);
 				 }
 			 }
-		 RequirementEntity requirementEntity1 = requirementEntityService.getById(id);
 			 requirementEntity1.setEntityStatus(2);
 			 requirementEntityService.updateById(requirementEntity1);
 			 return Result.OK("成功");
 		 }
 
+	 }
+
     /**
     * 导出excel
     *

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/rulex/controller/RulexController.java

@@ -1,17 +1,18 @@
 package org.jeecg.modules.demo.rulex.controller;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.demo.functionx.entity.Functionx;
 import org.jeecg.modules.demo.functionx.mapper.FunctionxMapper;
 import org.jeecg.modules.demo.functionx.service.IFunctionxService;
@@ -20,37 +21,31 @@ import org.jeecg.modules.demo.rulex.entity.Rulex;
 import org.jeecg.modules.demo.rulex.mapper.RulexMapper;
 import org.jeecg.modules.demo.rulex.service.IRuleVoService;
 import org.jeecg.modules.demo.rulex.service.IRulexService;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
 import org.jeecg.modules.demo.rulex.util.DateValidator;
 import org.jeecg.modules.demo.rulex.util.DateValidatorUsingDateFormat;
 import org.jeecg.modules.fieldx.entity.Fieldx;
 import org.jeecg.modules.fieldx.service.IFieldxService;
 import org.jeecg.modules.modulex.entity.Modulex;
 import org.jeecg.modules.modulex.service.IModulexService;
-import org.jeecg.modules.system.entity.SysDict;
 import org.jeecg.modules.system.entity.SysDictItem;
 import org.jeecg.modules.system.mapper.SysDictItemMapper;
 import org.jeecg.modules.tablex.entity.Tablex;
 import org.jeecg.modules.tablex.service.ITablexService;
+import org.jeecg.modules.tablex.ws.WebSocketUtils;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * @Description: 规则管理
@@ -63,10 +58,6 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 @RequestMapping("/rulex/rulex")
 @Slf4j
 public class RulexController extends JeecgController<Rulex, IRulexService> {
-	@Autowired
-	private IRulexService rulexService;
-	 @Autowired
-	 private IRuleVoService iRuleVoService;
     @Autowired
     FunctionxMapper functionxMapper;
     @Autowired
@@ -79,13 +70,18 @@ public class RulexController extends JeecgController<Rulex, IRulexService> {
     ITablexService iTablexService;
     @Autowired
     IModulexService iModulexService;
-
     @Autowired
     RulexController rulexController;
-
+    @Autowired
+    private IRulexService rulexService;
+    @Autowired
+    private IRuleVoService iRuleVoService;
     @Autowired
     private SysDictItemMapper sysDictItemMapper;
 
+    @Autowired
+    private WebSocketUtils webSocketUtils;
+
 
     /**
      * 分页列表查询
@@ -223,26 +219,38 @@ public class RulexController extends JeecgController<Rulex, IRulexService> {
     /**
      * 通过excel导入数据
      *
-    * @param request
-    * @param response
+     *
      * @return
      */
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+    public Result<?> importExcel(MultipartFile file) {
 
-		return rulexController.preImportAndExcel(request);
+        return rulexController.preImportAndExcel(file);
     }
+
     @Transactional
-	 public Result<?> preImportAndExcel(HttpServletRequest request)  {
-		 //return super.importExcel(request, response, ScTeams.class);
-		 MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-		 Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+    public Result<?> preImportAndExcel(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);
+
+
+        // 判断文件是否是表格
+        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("文件格式不正确");
+        }
         //校验时间
         final DateValidator validator = new DateValidatorUsingDateFormat("yyyy-MM-dd hh:mm:ss");
-		 for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-			 System.err.println("----------------------------------------------");
-			 // 获取上传文件对象
-			 MultipartFile file = entity.getValue();
+
         if (file == null) {
             return Result.error("文件上传失败，请重新上传");
         }
@@ -251,13 +259,14 @@ public class RulexController extends JeecgController<Rulex, IRulexService> {
         params.setHeadRows(1);//表头行数,默认1
         params.setNeedSave(true);//是否需要保存上传的Excel,默认为false
         try {
-//                List<ScTeamsDr> list = ExcelImportUtil.importExcel(file.getInputStream(), ScTeamsDr.class, params);
+            message.put("status", "数据预读入");
+            webSocketUtils.sendMessage(loginUser.getId(), message);
             List<RuleVo> list = ExcelImportUtil.importExcel(file.getInputStream(), RuleVo.class, params);
             if (list == null || list.size() <= 0) {
+                message.put("isVisible", "false");
+                webSocketUtils.sendMessage(loginUser.getId(), message);
                 return Result.error("文件导入失败:模板中暂无数据");
             }
-				 System.err.println("----------------------------------------------");
-				 System.out.println("List<ScTeams> list = ExcelImportUtil.importExcel: " + list);
             int num = 0;
             for (int i = 0; i < list.size(); i++) {
                 if (
@@ -285,6 +294,8 @@ public class RulexController extends JeecgController<Rulex, IRulexService> {
                 }
                 num++;
                 if (num == 0) {
+                    message.put("isVisible", "false");
+                    webSocketUtils.sendMessage(loginUser.getId(), message);
                     return Result.error("文件导入失败:导入模板不匹配");
 //					 } else if (num!=list.size()) {
 //						 return Result.error("文件导入失败:请检查填写文字");
@@ -297,8 +308,12 @@ public class RulexController extends JeecgController<Rulex, IRulexService> {
             log.error(msg, e);
             //if(msg!=null && msg.contains("Duplicate entry"))
             if (msg != null && msg.indexOf("Duplicate entry") >= 0) {
+                message.put("isVisible", "false");
+                webSocketUtils.sendMessage(loginUser.getId(), message);
                 return Result.error("文件导入失败:有重复数据！");
             } else {
+                message.put("isVisible", "false");
+                webSocketUtils.sendMessage(loginUser.getId(), message);
                 return Result.error("文件导入失败:" + e.getMessage());
             }
             //update-end-author:taoyan date:20211124 for: 导入数据重复增加提示
@@ -309,11 +324,17 @@ public class RulexController extends JeecgController<Rulex, IRulexService> {
                 e.printStackTrace();
             }
         }
-		 }
+
         List<RuleVo> ruleVoList = iRuleVoService.list();
         if (ruleVoList.size() <= 0 || ruleVoList == null) {
+            message.put("isVisible", "false");
+            webSocketUtils.sendMessage(loginUser.getId(), message);
             return Result.error("文件导入失败,模板不匹配");
         }
+        // 将总的记录数传递给前端
+        message.put("records", String.valueOf(ruleVoList.size()));
+        webSocketUtils.sendMessage(loginUser.getId(), message);
+
         for (int i = 0; i < ruleVoList.size(); i++) {
             Rulex rulex = new Rulex();
             RuleVo ruleVo = ruleVoList.get(i);
@@ -324,6 +345,8 @@ public class RulexController extends JeecgController<Rulex, IRulexService> {
             Fieldx byId = iFieldxService.getOne(rulexLambdaQueryWrapper);
             if (byId == null) {
                 iRuleVoService.remove(null);
+                message.put("isVisible", "false");
+                webSocketUtils.sendMessage(loginUser.getId(), message);
                 return Result.error("字段输入错误,请核对");
             }
             rulex.setFieldId(byId.getId());
@@ -334,6 +357,8 @@ public class RulexController extends JeecgController<Rulex, IRulexService> {
             Functionx byId1 = functionxService.getOne(functionxLambdaQueryWrapper);
             if (byId1 == null) {
                 iRuleVoService.remove(null);
+                message.put("isVisible", "false");
+                webSocketUtils.sendMessage(loginUser.getId(), message);
                 return Result.error("功能输入错误,请核对");
             }
             rulex.setFunctionId(byId1.getId());
@@ -343,6 +368,8 @@ public class RulexController extends JeecgController<Rulex, IRulexService> {
             modulexLambdaQueryWrapper.eq(Modulex::getModuleName, moduleName);
             Modulex byId2 = iModulexService.getOne(modulexLambdaQueryWrapper);
             if (byId2 == null) {
+                message.put("isVisible", "false");
+                webSocketUtils.sendMessage(loginUser.getId(), message);
                 iRuleVoService.remove(null);
 
                 return Result.error("模块输入错误,请核对");
@@ -354,6 +381,8 @@ public class RulexController extends JeecgController<Rulex, IRulexService> {
             tableLambdaQueryWrapper.eq(Tablex::getTableName, tableId);
             Tablex byId3 = iTablexService.getOne(tableLambdaQueryWrapper);
             if (byId3 == null) {
+                message.put("isVisible", "false");
+                webSocketUtils.sendMessage(loginUser.getId(), message);
                 iRuleVoService.remove(null);
 
                 return Result.error("实体输入错误,请核对");
@@ -366,7 +395,8 @@ public class RulexController extends JeecgController<Rulex, IRulexService> {
                 rulex.setDuration(aDouble);
             } catch (Exception e) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); //手动回滚，这样上层就无需去处理异常了
-
+                message.put("isVisible", "false");
+                webSocketUtils.sendMessage(loginUser.getId(), message);
                 return Result.error("任务时长输入错误,请核对");
             }
 
@@ -375,7 +405,8 @@ public class RulexController extends JeecgController<Rulex, IRulexService> {
                 d = Double.valueOf(ruleVo.getRealDuration());
             } catch (Exception e) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); //手动回滚，这样上层就无需去处理异常了
-
+                message.put("isVisible", "false");
+                webSocketUtils.sendMessage(loginUser.getId(), message);
                 return Result.error("实际时长输入错误,请核对");
             }
             rulex.setRealDuration(d);
@@ -384,7 +415,8 @@ public class RulexController extends JeecgController<Rulex, IRulexService> {
                 integer = Integer.valueOf(ruleVo.getWorkLevel());
             } catch (Exception e) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); //手动回滚，这样上层就无需去处理异常了
-
+                message.put("isVisible", "false");
+                webSocketUtils.sendMessage(loginUser.getId(), message);
                 return Result.error("任务等级输入错误,请核对");
             }
             rulex.setWorkLevel(integer);
@@ -394,6 +426,8 @@ public class RulexController extends JeecgController<Rulex, IRulexService> {
             SysDictItem sysDictItem = sysDictItemMapper.selectOne(sysDictItemLambdaQueryWrapper);
             if (sysDictItem == null) {
                 iRuleVoService.remove(null);
+                message.put("isVisible", "false");
+                webSocketUtils.sendMessage(loginUser.getId(), message);
                 return Result.error("任务状态输入错误,请核对");
             }
 
@@ -405,6 +439,8 @@ public class RulexController extends JeecgController<Rulex, IRulexService> {
             SysDictItem sysDictItem2 = sysDictItemMapper.selectOne(sysDictItemLambdaQueryWrapper2);
             if (sysDictItem2 == null) {
                 iRuleVoService.remove(null);
+                message.put("isVisible", "false");
+                webSocketUtils.sendMessage(loginUser.getId(), message);
                 return Result.error("规则状态输入错误,请核对");
             }
 
@@ -416,6 +452,8 @@ public class RulexController extends JeecgController<Rulex, IRulexService> {
             SysDictItem sysDictItem3 = sysDictItemMapper.selectOne(sysDictItemLambdaQueryWrapper3);
             if (sysDictItem3 == null) {
                 iRuleVoService.remove(null);
+                message.put("isVisible", "false");
+                webSocketUtils.sendMessage(loginUser.getId(), message);
                 return Result.error("版本状态输入错误,请核对");
             }
 
@@ -429,10 +467,10 @@ public class RulexController extends JeecgController<Rulex, IRulexService> {
                 if (startTime != null)
                     if (!validator.isValid(startTime)) {
                         TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); //手动回滚，这样上层就无需去处理异常了
+                        message.put("isVisible", "false");
+                        webSocketUtils.sendMessage(loginUser.getId(), message);
                         return Result.error("开始时间输入错误");
-					 }
-
-					 else {
+                    } else {
                         Date date = simpleDateFormat.parse(startTime);
                         rulex.setStartTime(date);
                     }
@@ -440,10 +478,10 @@ public class RulexController extends JeecgController<Rulex, IRulexService> {
                 if (submitTime != null)
                     if (!validator.isValid(submitTime)) {
                         TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); //手动回滚，这样上层就无需去处理异常了
+                        message.put("isVisible", "false");
+                        webSocketUtils.sendMessage(loginUser.getId(), message);
                         return Result.error("提交时间输入错误");
-					 }
-
-					 else {
+                    } else {
                         Date date1 = simpleDateFormat.parse(submitTime);
                         rulex.setSubmitTime(date1);
                     }
@@ -456,6 +494,8 @@ public class RulexController extends JeecgController<Rulex, IRulexService> {
             List<String> list = rulexMapper.checkRuleNo(byId1.getId());
             if (list.contains(ruleNo)) {
                 iRuleVoService.remove(null);
+                message.put("isVisible", "false");
+                webSocketUtils.sendMessage(loginUser.getId(), message);
                 return Result.error("规则序号已存在");
             }
             rulex.setRuleNo(ruleNo);
@@ -480,7 +520,8 @@ public class RulexController extends JeecgController<Rulex, IRulexService> {
                 integer1 = Integer.valueOf(ruleVo.getVerison());
             } catch (Exception e) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); //手动回滚，这样上层就无需去处理异常了
-
+                message.put("isVisible", "false");
+                webSocketUtils.sendMessage(loginUser.getId(), message);
                 return Result.error("版本号输入错误,请核对");
             }
             rulex.setVerison(String.valueOf(integer1));
@@ -488,13 +529,17 @@ public class RulexController extends JeecgController<Rulex, IRulexService> {
             String managerUsers = ruleVo.getManagerUsers();
             if (managerUsers != null)
                 rulex.setManagerUsers(managerUsers);
+            message.put("status", "正在读取数据");
+            webSocketUtils.sendMessage(loginUser.getId(), message);
             //存入真实表
-			 rulexService.save(rulex);
+            rulexService.saveRule(rulex,loginUser,message,i+1);
             iRuleVoService.remove(null);
         }
+        message.put("isVisible", "false");
+        webSocketUtils.sendMessage(loginUser.getId(), message);
         return Result.ok("文件导入成功！");
-
     }
+
     @GetMapping(value = "/sort")
     public Result<?> sort(@RequestParam(name = "id", required = true) String id) {
         return rulexService.sort(id);

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/rulex/service/IRulexService.java

@@ -1,11 +1,13 @@
 package org.jeecg.modules.demo.rulex.service;
 
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.demo.functionx.entity.Functionx;
 import org.jeecg.modules.demo.rulex.entity.Rulex;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 规则管理
@@ -20,6 +22,7 @@ public interface IRulexService extends IService<Rulex> {
   List<Rulex> queryRuleListByFunctionId(Functionx functionx);
 
 
+  void saveRule(Rulex rulex, LoginUser loginUser, Map<String, String> message,int i);
 
     void saveRulex(Functionx functionx);
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/rulex/service/impl/RulexServiceImpl.java

@@ -5,20 +5,24 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.demo.functionx.entity.Functionx;
 import org.jeecg.modules.demo.rulex.entity.Rulex;
 import org.jeecg.modules.demo.rulex.mapper.RulexMapper;
 import org.jeecg.modules.demo.rulex.service.IRulexService;
 import org.jeecg.modules.fieldx.entity.Fieldx;
 import org.jeecg.modules.fieldx.service.IFieldxService;
+import org.jeecg.modules.message.controller.SysMessageTemplateController;
 import org.jeecg.modules.tablex.entity.Tablex;
 import org.jeecg.modules.tablex.service.ITablexService;
+import org.jeecg.modules.tablex.ws.WebSocketUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 规则管理
@@ -34,6 +38,9 @@ public class RulexServiceImpl extends ServiceImpl<RulexMapper, Rulex> implements
     @Autowired
     RulexMapper rulexMapper;
 
+    @Autowired
+    private WebSocketUtils webSocketUtils;
+
     @Autowired
     private ITablexService iTablexService;
 
@@ -70,6 +77,26 @@ public class RulexServiceImpl extends ServiceImpl<RulexMapper, Rulex> implements
         return this.list(ruleWrapper);
     }
 
+    @Override
+    public void saveRule(Rulex rulex, LoginUser loginUser, Map<String, String> message,int i) {
+
+        try {
+
+            Thread.sleep(1000L);
+            this.save(rulex);
+            message.put("uploaded", String.valueOf(i ));
+
+            webSocketUtils.sendMessage(loginUser.getId(), message);
+        } catch (InterruptedException e) {
+            message.put("isVisible", "false");
+            webSocketUtils.sendMessage(loginUser.getId(), message);
+            log.error(e.getMessage(), e);
+        }
+
+
+    }
+
+
     /**
      * 功能管理新增规则操作时，如果功能类型是‘新增’和‘修改’，自动根据实体对应的字段，自动生成若干条记录（根据实体的字段生成多条规则）
      *

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/controller/TablexController.java

@@ -37,12 +37,14 @@ import lombok.extern.slf4j.Slf4j;
 
 import org.jeecg.modules.tablex.service.ITablexVoService;
 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.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -81,6 +83,9 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
 	 @Autowired
 	 private IRequirementEntityService requirementEntityService;
 
+	 @Autowired
+	 private WebSocketUtils webSocketUtils;
+
 	 /**
 	  * 分页列表查询
 	  *
@@ -269,14 +274,23 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
 	  */
 	 @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
 	 public Result<?> importExcel(MultipartFile file) {
-		 try {
 
 		 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("文件格式不正确");
 			 }
 
@@ -286,17 +300,25 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
 			 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 &&
@@ -307,13 +329,17 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
 						 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) {
-					 return Result.error("导入失败，版本号格式错误");
+					 message.put("isVisible", "false");
+					 webSocketUtils.sendMessage(loginUser.getId(), message);
+					 return Result.error("预读入失败，版本号格式错误");
 				 }
-
 				 //存入临时表中
 				 tablexVoService.save(tablexVo);
 			 }
@@ -324,20 +350,30 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
 			 tablexVoService.removeAll(voList);
 
 			 if (voList.size() == 0) {
+				 message.put("isVisible", "false");
+				 webSocketUtils.sendMessage(loginUser.getId(), message);
 				 return Result.error("导入失败，数据为空");
 			 }
 
-			 Tablex tablex = new Tablex();
+			 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();
@@ -346,9 +382,9 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
 				 String verisonStatus = voList.get(i).getVerisonStatus();
 
 				 //判断实体状态
-				 int statusInt = status.equals("正常") ? 1 : status.equals("停用") ? 0 : status.equals("废弃") ? 9 : 3;
+				 //int statusInt = status.equals("正常") ? 1 : status.equals("停用") ? 0 : status.equals("废弃") ? 9 : 3;
 				 //判断版本状态
-				 int verisonStatusInt = verisonStatus.equals("当前") ? 1 : verisonStatus.equals("历史") ? 0 : 3;
+				 //int verisonStatusInt = verisonStatus.equals("当前") ? 1 : verisonStatus.equals("历史") ? 0 : 3;
 
 				 //判断对应模块
 				 if (modulexId != null && voList.get(i).getModuleId() != null && !voList.get(i).getModuleId().equals("")) {
@@ -357,9 +393,9 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
 						 //判断英文名称
 						 if (voList.get(i).getTableEnName() != null && !voList.get(i).getTableEnName().equals("") && !voList.get(i).getTableEnName().equals(modulex.getModuleEnName())) {
 							 //判断实体状态
-							 if (statusInt == 1 || statusInt == 0 || statusInt == 9) {
+							 if (status.equals("1") || status.equals("0") || status.equals("9")) {
 								 //判断版本状态
-								 if (verisonStatusInt == 1 || verisonStatusInt == 0) {
+								 if (verisonStatus.equals("1") || verisonStatus.equals("0")) {
 									 //判断版本号
 									 if (voList.get(i).getVerison() != null && !voList.get(i).getVerison().equals("")) {
 									 	tablex.setModuleId(voList.get(i).getModuleId());
@@ -368,36 +404,53 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
 									 	tablex.setTableStructure(voList.get(i).getTableStructure());
 									 	tablex.setStructuralDiagram(voList.get(i).getStructuralDiagram());
 									 	tablex.setCreateBy(loginUser.getRealname());
-										 tablex.setStatus(statusInt);
-										 tablex.setVerisonStatus(verisonStatusInt);
+									 	tablex.setStatus(Integer.valueOf(voList.get(i).getStatus()));
+									 	tablex.setVerisonStatus(Integer.valueOf(voList.get(i).getVerisonStatus()));
 									 	tablex.setVerison(Integer.valueOf(voList.get(i).getVerison()));
 
-										 //保存到真实表中
-										 tablexService.save(tablex);
+									 	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("文件导入失败");
 		 }
-		 return Result.OK("文件导入成功！");
+		 message.put("isVisible", "false");
+		 webSocketUtils.sendMessage(loginUser.getId(), message);
+		 return Result.ok("文件导入成功！");
 	 }
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/service/ITablexService.java

@@ -1,7 +1,12 @@
 package org.jeecg.modules.tablex.service;
 
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.tablex.entity.Tablex;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.tablex.vo.TablexVo;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 实体表
@@ -15,4 +20,5 @@ public interface ITablexService extends IService<Tablex> {
 
     void updateVersion(String tableId, int i);
 
+    void saveSingleBatch(List<Tablex> tablexList, LoginUser loginUser, Map<String, String> message);
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/service/impl/TablexServiceImpl.java

@@ -1,13 +1,19 @@
 package org.jeecg.modules.tablex.service.impl;
 
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.tablex.entity.Tablex;
 import org.jeecg.modules.tablex.mapper.TablexMapper;
 import org.jeecg.modules.tablex.service.ITablexService;
+import org.jeecg.modules.tablex.vo.TablexVo;
+import org.jeecg.modules.tablex.ws.WebSocketUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Description: 实体表
  * @Author: jeecg-boot
@@ -20,6 +26,9 @@ public class TablexServiceImpl extends ServiceImpl<TablexMapper, Tablex> impleme
     @Autowired
     private TablexMapper tablexMapper;
 
+    @Autowired
+    private WebSocketUtils webSocketUtils;
+
     @Override
     public void updateSql(String tableId, String sql) {
         tablexMapper.updateSql(tableId,sql);
@@ -29,4 +38,22 @@ public class TablexServiceImpl extends ServiceImpl<TablexMapper, Tablex> impleme
     public void updateVersion(String tableId, int i) {
         tablexMapper.updateVersion(tableId,i);
     }
+
+    @Override
+    public void saveSingleBatch(List<Tablex> tablexList, LoginUser loginUser, Map<String, String> message) {
+        for (int i = 0; i < tablexList.size(); i++){
+            try {
+                Thread.sleep(1000L);
+                message.put("uploaded", String.valueOf(i + 1));
+                this.save(tablexList.get(i));
+                webSocketUtils.sendMessage(loginUser.getId(), message);
+            } catch (InterruptedException e) {
+                message.put("isVisible", "false");
+                webSocketUtils.sendMessage(loginUser.getId(), message);
+                log.error(e.getMessage(), e);
+            }
+        }
+    }
+
+
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/ws/MyWebSocket.java

@@ -0,0 +1,63 @@
+package org.jeecg.modules.tablex.ws;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.websocket.*;
+import javax.websocket.server.PathParam;
+import javax.websocket.server.ServerEndpoint;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+@Slf4j
+@Component
+@ServerEndpoint(value = "/uploadProcess/{val}")
+public class MyWebSocket {
+
+
+    /**
+     * 已经建立连接的对话，ConcurrentHashMap是一个线程安全的Map
+     */
+    private static final Map<String, Session> sessionPool =
+            new ConcurrentHashMap<>();
+
+
+    /**
+     * 连接建立成功触发
+     *
+     * @param session 会话
+     */
+    @OnOpen
+    public void onOpen(Session session, EndpointConfig endpointConfig,
+                       @PathParam("val") String key) {
+        //     将session进行保存
+        sessionPool.put(key, session);
+        log.info("创建一个连接，当前连接的连接数量是:{}", sessionPool.size());
+
+    }
+
+    /**
+     * 发送消息
+     *
+     * @param info 信息
+     */
+    @OnMessage
+    public void onMessage(String info) {
+        log.info("接受到的消息是：{}", info);
+    }
+
+    public Map<String, Session> getSessionPool() {
+        return sessionPool;
+    }
+
+    /**
+     * 关闭连接时触发
+     *
+     * @param session 会话
+     */
+    @OnClose
+    public void onClose(Session session, @PathParam("val") String key) {
+        sessionPool.remove(key);
+        log.info("关闭一个连接，当前剩余连接数为:{}", sessionPool.size());
+    }
+}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/ws/WebSocketUtils.java

@@ -0,0 +1,53 @@
+package org.jeecg.modules.tablex.ws;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import javax.websocket.Session;
+import java.util.Map;
+
+@Slf4j
+@Component
+public class WebSocketUtils {
+    @Autowired
+    MyWebSocket webSocket;
+
+
+    private static Map<String, Session> sessionPool;
+
+
+    @PostConstruct
+    private void init() {
+        sessionPool = webSocket.getSessionPool();
+    }
+
+
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+
+
+    public void sendMessage(String key, Map<String, String> message) {
+        Session session = sessionPool.get(key);
+        try {
+            session.getBasicRemote()
+                    .sendText(OBJECT_MAPPER
+                            .writeValueAsString(message));
+        } catch (Exception e) {
+            log.error(e.getMessage());
+        }
+    }
+
+    public void sendAllMessage(Map<String, String> message) {
+        sessionPool.values().forEach(session -> {
+            try {
+                session.getBasicRemote()
+                        .sendText(OBJECT_MAPPER
+                                .writeValueAsString(message));
+            } catch (Exception e) {
+                log.error(e.getMessage());
+            }
+        });
+    }
+}