From b54814fc40e4fd25a864835384d899523cb9d1c7 Mon Sep 17 00:00:00 2001 From: "bo.yang" Date: Sat, 24 Jul 2021 22:15:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BF=AB=E9=80=92=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E3=80=81Excel=E6=89=B9=E9=87=8F=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ExpImportQueryController.java | 42 +++---------- .../bps/service/IExpImportQueryService.java | 11 ++++ .../impl/ExpImportQueryServiceImpl.java | 59 +++++++++++++++++-- .../mapper/bps/ExpressInfoMapper.xml | 8 ++- .../templates/bps/expImportQuery/add.html | 2 +- .../templates/bps/expImportQuery/detail.html | 4 +- .../bps/expImportQuery/expImportQuery.html | 11 +++- .../bps/expressInfo/expressInfo.html | 2 +- 8 files changed, 92 insertions(+), 47 deletions(-) diff --git a/box-bps/src/main/java/com/ruoyi/bps/controller/ExpImportQueryController.java b/box-bps/src/main/java/com/ruoyi/bps/controller/ExpImportQueryController.java index 1233fc567..07ad24b84 100644 --- a/box-bps/src/main/java/com/ruoyi/bps/controller/ExpImportQueryController.java +++ b/box-bps/src/main/java/com/ruoyi/bps/controller/ExpImportQueryController.java @@ -10,8 +10,6 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; @@ -20,7 +18,6 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import java.time.LocalDateTime; import java.util.List; /** @@ -164,8 +161,9 @@ public class ExpImportQueryController extends BaseController return prefix + "/detail"; } - - + /** + * Excel导入查模板下载 + */ @GetMapping ( "/importTemplate" ) @ResponseBody public AjaxResult importTemplate ( ) { @@ -173,40 +171,16 @@ public class ExpImportQueryController extends BaseController return util.importTemplateExcel ( "快递查询导入模板" ); } + /** + * Excel导入查询 + */ @PostMapping("/importData") + @Log(title = "Excel批量导入快递查询", businessType = BusinessType.IMPORT) @ResponseBody public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception { - String queryTime= DateUtils.dateTimeNow("yyyy-MM-dd HH:mm:ss"); - String queryId= LocalDateTime.now().toString(); ExcelUtil util= new ExcelUtil(ExpressInfo.class); List expressInfoList=util.importExcel(file.getInputStream()); - ExpImportQuery expImportQuery=new ExpImportQuery(); - try{ - for( ExpressInfo expressInfo:expressInfoList){ - ExpressInfo ei= expressInfoService.SelectExpressInfo(expressInfo); - ei.setQueryId(queryId); - ei.setQueryUserName(ShiroUtils.getSysUser().getUserName()); - ei.setQueryType("excel"); - ei.setQueryTime(queryTime); - expressInfoService.insertExpressInfo(ei); - } - - expImportQuery.setQueryTime(queryTime); - expImportQuery.setQueryLoginName(ShiroUtils.getLoginName()); - expImportQuery.setQueryUserName(ShiroUtils.getSysUser().getUserName()); - expImportQuery.setFinishTime(DateUtils.dateTimeNow("yyyy-MM-dd HH:mm:ss")); - expImportQuery.setQueryIp(ShiroUtils.getIp()); - expImportQuery.setStatus("success"); - expImportQuery.setQueryQty(String.valueOf(expressInfoList.size())); - expImportQuery.setQueryId(queryId); - expImportQueryService.insertExpImportQuery(expImportQuery); - - return AjaxResult.success("导入查询成功!"); - }catch (Exception e){ - expImportQuery.setStatus("fail"); - return AjaxResult.error(e.getMessage()); - } - + return expImportQueryService.importData(expressInfoList); } } diff --git a/box-bps/src/main/java/com/ruoyi/bps/service/IExpImportQueryService.java b/box-bps/src/main/java/com/ruoyi/bps/service/IExpImportQueryService.java index 761cc11fa..e8f81ecb4 100644 --- a/box-bps/src/main/java/com/ruoyi/bps/service/IExpImportQueryService.java +++ b/box-bps/src/main/java/com/ruoyi/bps/service/IExpImportQueryService.java @@ -2,6 +2,8 @@ package com.ruoyi.bps.service; import java.util.List; import com.ruoyi.bps.domain.ExpImportQuery; +import com.ruoyi.bps.domain.ExpressInfo; +import com.ruoyi.common.core.domain.AjaxResult; /** * Excel批量快递查询Service接口 @@ -58,4 +60,13 @@ public interface IExpImportQueryService * @return 结果 */ public int deleteExpImportQueryById(Long sid); + + /** + * 删除Excel批量快递查询信息 + * + * @param expressInfoList Excel导入的快递列表 + * @return 结果 + */ + public AjaxResult importData(List expressInfoList); + } diff --git a/box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpImportQueryServiceImpl.java b/box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpImportQueryServiceImpl.java index 5467c390f..032407c36 100644 --- a/box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpImportQueryServiceImpl.java +++ b/box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpImportQueryServiceImpl.java @@ -1,12 +1,19 @@ package com.ruoyi.bps.service.impl; -import java.util.List; +import com.ruoyi.bps.domain.ExpImportQuery; +import com.ruoyi.bps.domain.ExpressInfo; +import com.ruoyi.bps.mapper.ExpImportQueryMapper; +import com.ruoyi.bps.service.IExpImportQueryService; +import com.ruoyi.bps.service.IExpressInfoService; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.ShiroUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.bps.mapper.ExpImportQueryMapper; -import com.ruoyi.bps.domain.ExpImportQuery; -import com.ruoyi.bps.service.IExpImportQueryService; -import com.ruoyi.common.core.text.Convert; + +import java.time.LocalDateTime; +import java.util.List; /** * Excel批量快递查询Service业务层处理 @@ -20,6 +27,9 @@ public class ExpImportQueryServiceImpl implements IExpImportQueryService @Autowired private ExpImportQueryMapper expImportQueryMapper; + @Autowired + private IExpressInfoService expressInfoService; + /** * 查询Excel批量快递查询 * @@ -91,4 +101,43 @@ public class ExpImportQueryServiceImpl implements IExpImportQueryService { return expImportQueryMapper.deleteExpImportQueryById(sid); } + + + /** + * 删除Excel批量快递查询信息 + * + * @param expressInfoList Excel导入的快递列表 + * @return 结果 + */ + @Override + public AjaxResult importData(List expressInfoList) { + String queryTime= DateUtils.dateTimeNow("yyyy-MM-dd HH:mm:ss"); + String queryId= LocalDateTime.now().toString(); + ExpImportQuery expImportQuery=new ExpImportQuery(); + try{ + for( ExpressInfo expressInfo:expressInfoList){ + ExpressInfo ei= expressInfoService.SelectExpressInfo(expressInfo); + ei.setQueryId(queryId); + ei.setQueryUserName(ShiroUtils.getSysUser().getUserName()); + ei.setQueryType("excel"); + ei.setQueryTime(queryTime); + expressInfoService.insertExpressInfo(ei); + } + + expImportQuery.setQueryTime(queryTime); + expImportQuery.setQueryLoginName(ShiroUtils.getLoginName()); + expImportQuery.setQueryUserName(ShiroUtils.getSysUser().getUserName()); + expImportQuery.setFinishTime(DateUtils.dateTimeNow("yyyy-MM-dd HH:mm:ss")); + expImportQuery.setQueryIp(ShiroUtils.getIp()); + expImportQuery.setStatus("success"); + expImportQuery.setQueryQty(String.valueOf(expressInfoList.size())); + expImportQuery.setQueryId(queryId); + expImportQueryMapper.insertExpImportQuery(expImportQuery); + + return AjaxResult.success("导入查询成功!"); + }catch (Exception e){ + expImportQuery.setStatus("fail"); + return AjaxResult.error(e.getMessage()); + } + } } diff --git a/box-bps/src/main/resources/mapper/bps/ExpressInfoMapper.xml b/box-bps/src/main/resources/mapper/bps/ExpressInfoMapper.xml index cb1805b0f..7d190b26b 100644 --- a/box-bps/src/main/resources/mapper/bps/ExpressInfoMapper.xml +++ b/box-bps/src/main/resources/mapper/bps/ExpressInfoMapper.xml @@ -24,10 +24,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select message, nu, ischeck, com, status, `data`, `state`, `condition`, routeInfo, returnCode, `result`, phone, + select message, nu, deliveryNum, ischeck, com, status, `data`, `state`, `condition`, routeInfo, returnCode, `result`, phone, collectTime, singedTime, lastUpdateTime, queryTime, queryUserName, queryId, queryType from expressInfo @@ -39,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and com = #{com} and phone = #{phone} and queryId = #{queryId} + and deliveryNum = #{deliveryNum} @@ -69,6 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" queryUserName, queryId, queryType, + deliveryNum, #{message}, @@ -90,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{queryUserName}, #{queryId}, #{queryType}, + #{deliveryNum}, @@ -114,6 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" queryUserName = #{queryUserName}, queryId = #{queryId}, queryType = #{queryType}, + deliveryNum = #{deliveryNum}, where message = #{message} diff --git a/box-bps/src/main/resources/templates/bps/expImportQuery/add.html b/box-bps/src/main/resources/templates/bps/expImportQuery/add.html index fb3398328..0f1e8b2be 100644 --- a/box-bps/src/main/resources/templates/bps/expImportQuery/add.html +++ b/box-bps/src/main/resources/templates/bps/expImportQuery/add.html @@ -7,7 +7,7 @@
- +
diff --git a/box-bps/src/main/resources/templates/bps/expImportQuery/detail.html b/box-bps/src/main/resources/templates/bps/expImportQuery/detail.html index d0b2a4496..b88440c8d 100644 --- a/box-bps/src/main/resources/templates/bps/expImportQuery/detail.html +++ b/box-bps/src/main/resources/templates/bps/expImportQuery/detail.html @@ -11,8 +11,8 @@
  • - - + +
diff --git a/box-bps/src/main/resources/templates/bps/expImportQuery/expImportQuery.html b/box-bps/src/main/resources/templates/bps/expImportQuery/expImportQuery.html index c8f1778cc..0bfb6fd02 100644 --- a/box-bps/src/main/resources/templates/bps/expImportQuery/expImportQuery.html +++ b/box-bps/src/main/resources/templates/bps/expImportQuery/expImportQuery.html @@ -42,6 +42,9 @@ 导入 + + 下载导入模板 + 提示：仅允许导入“xls”或“xlsx”格式文件！ diff --git a/box-bps/src/main/resources/templates/bps/expressInfo/expressInfo.html b/box-bps/src/main/resources/templates/bps/expressInfo/expressInfo.html index 04a3a4e21..3b190cb30 100644 --- a/box-bps/src/main/resources/templates/bps/expressInfo/expressInfo.html +++ b/box-bps/src/main/resources/templates/bps/expressInfo/expressInfo.html @@ -27,7 +27,7 @@
  • -  搜索 + 实时查询  重置