From 69815d7e44d3ef8945223371940c2c89497df462 Mon Sep 17 00:00:00 2001 From: "bo.yang" Date: Fri, 23 Jul 2021 09:41:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0Excel=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=88=E8=AF=A6=E7=BB=86=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=BE=85=E5=AE=8C=E6=88=90=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ExpImportQueryController.java | 96 +++++++++++--- .../com/ruoyi/bps/domain/ExpImportQuery.java | 118 ++++++++++-------- .../com/ruoyi/bps/domain/ExpressInfo.java | 36 +++++- .../bps/service/IExpressInfoService.java | 8 ++ .../service/impl/ExpressInfoServiceImpl.java | 10 +- .../mapper/bps/ExpImportQueryMapper.xml | 16 ++- .../mapper/bps/ExpressInfoMapper.xml | 52 ++++++-- .../templates/bps/expImportQuery/add.html | 8 +- .../templates/bps/expImportQuery/detail.html | 1 + .../templates/bps/expImportQuery/edit.html | 2 +- .../bps/expImportQuery/expImportQuery.html | 31 ++++- .../bps/expressInfo/expressInfo.html | 2 +- 12 files changed, 279 insertions(+), 101 deletions(-) create mode 100644 box-bps/src/main/resources/templates/bps/expImportQuery/detail.html 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 ab3e1b576..7c727ffd5 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 @@ -1,23 +1,29 @@ package com.ruoyi.bps.controller; -import java.util.List; +import com.ruoyi.bps.domain.ExpImportQuery; +import com.ruoyi.bps.domain.ExpSubsPushResp; +import com.ruoyi.bps.domain.ExpressInfo; +import com.ruoyi.bps.service.IExpImportQueryService; +import com.ruoyi.bps.service.IExpressInfoService; +import com.ruoyi.common.annotation.Log; +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.ExceptionUtil; +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; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.bps.domain.ExpImportQuery; -import com.ruoyi.bps.service.IExpImportQueryService; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; /** * Excel批量快递查询Controller @@ -34,6 +40,9 @@ public class ExpImportQueryController extends BaseController @Autowired private IExpImportQueryService expImportQueryService; + @Autowired + private IExpressInfoService expressInfoService; + @RequiresPermissions("bps:expImportQuery:view") @GetMapping() public String expImportQuery() @@ -123,4 +132,63 @@ public class ExpImportQueryController extends BaseController { return toAjax(expImportQueryService.deleteExpImportQueryByIds(ids)); } + + + /** + * 快递查询明细信息 + */ + @RequiresPermissions("bps:expImportQuery:detail") + @GetMapping("/detail/{queryId}") + public String detail(@PathVariable("queryId") String queryId, ModelMap mmap) + { + /*ExpSubsPushResp expSubsPushResp = expSubsPushRespService.selectExpSubsPushRespById(sid); + mmap.put("expSubsPushResp", expSubsPushResp);*/ + return prefix + "/detail"; + } + + + + @GetMapping ( "/importTemplate" ) + @ResponseBody + public AjaxResult importTemplate ( ) { + ExcelUtil util = new ExcelUtil<>(ExpressInfo.class); + return util.importTemplateExcel ( "快递查询导入模板" ); + } + + @PostMapping("/importData") + @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()); + } + + } } diff --git a/box-bps/src/main/java/com/ruoyi/bps/domain/ExpImportQuery.java b/box-bps/src/main/java/com/ruoyi/bps/domain/ExpImportQuery.java index 3ac9fad28..b18dde143 100644 --- a/box-bps/src/main/java/com/ruoyi/bps/domain/ExpImportQuery.java +++ b/box-bps/src/main/java/com/ruoyi/bps/domain/ExpImportQuery.java @@ -18,13 +18,17 @@ public class ExpImportQuery extends BaseEntity /** sid */ private Long sid; + /** 查询ID */ + @Excel(name = "查询ID") + private String queryId; + /** 查询时间 */ @Excel(name = "查询时间") private String queryTime; /** 用户ID */ @Excel(name = "用户ID") - private String queryUserId; + private String queryLoginName; /** 用户名 */ @Excel(name = "用户名") @@ -46,90 +50,94 @@ public class ExpImportQuery extends BaseEntity @Excel(name = "运单总量") private String queryQty; - public void setSid(Long sid) - { + public static long getSerialVersionUID() { + return serialVersionUID; + } + + public Long getSid() { + return sid; + } + + public void setSid(Long sid) { this.sid = sid; } - public Long getSid() - { - return sid; + public String getQueryId() { + return queryId; } - public void setQueryTime(String queryTime) - { + + public void setQueryId(String queryId) { + this.queryId = queryId; + } + + public String getQueryTime() { + return queryTime; + } + + public void setQueryTime(String queryTime) { this.queryTime = queryTime; } - public String getQueryTime() - { - return queryTime; - } - public void setQueryUserId(String queryUserId) - { - this.queryUserId = queryUserId; + public String getQueryLoginName() { + return queryLoginName; } - public String getQueryUserId() - { - return queryUserId; + public void setQueryLoginName(String queryLoginName) { + this.queryLoginName = queryLoginName; } - public void setQueryUserName(String queryUserName) - { + + public String getQueryUserName() { + return queryUserName; + } + + public void setQueryUserName(String queryUserName) { this.queryUserName = queryUserName; } - public String getQueryUserName() - { - return queryUserName; + public String getQueryIp() { + return queryIp; } - public void setQueryIp(String queryIp) - { + + public void setQueryIp(String queryIp) { this.queryIp = queryIp; } - public String getQueryIp() - { - return queryIp; + public String getFinishTime() { + return finishTime; } - public void setFinishTime(String finishTime) - { + + public void setFinishTime(String finishTime) { this.finishTime = finishTime; } - public String getFinishTime() - { - return finishTime; + public String getStatus() { + return status; } - public void setStatus(String status) - { + + public void setStatus(String status) { this.status = status; } - public String getStatus() - { - return status; - } - public void setQueryQty(String queryQty) - { - this.queryQty = queryQty; + public String getQueryQty() { + return queryQty; } - public String getQueryQty() - { - return queryQty; + public void setQueryQty(String queryQty) { + this.queryQty = queryQty; } @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("sid", getSid()) - .append("queryTime", getQueryTime()) - .append("queryUserId", getQueryUserId()) - .append("queryUserName", getQueryUserName()) - .append("queryIp", getQueryIp()) - .append("finishTime", getFinishTime()) - .append("status", getStatus()) - .append("queryQty", getQueryQty()) - .toString(); + return "ExpImportQuery{" + + "sid=" + sid + + ", queryId='" + queryId + '\'' + + ", queryTime='" + queryTime + '\'' + + ", queryLoginName='" + queryLoginName + '\'' + + ", queryUserName='" + queryUserName + '\'' + + ", queryIp='" + queryIp + '\'' + + ", finishTime='" + finishTime + '\'' + + ", status='" + status + '\'' + + ", queryQty='" + queryQty + '\'' + + '}'; } } diff --git a/box-bps/src/main/java/com/ruoyi/bps/domain/ExpressInfo.java b/box-bps/src/main/java/com/ruoyi/bps/domain/ExpressInfo.java index e34dd86b6..90abce865 100644 --- a/box-bps/src/main/java/com/ruoyi/bps/domain/ExpressInfo.java +++ b/box-bps/src/main/java/com/ruoyi/bps/domain/ExpressInfo.java @@ -86,7 +86,13 @@ public class ExpressInfo extends BaseEntity /** 查询人*/ @Excel(name = "查询人",type= Excel.Type.EXPORT) - private String queryUser; + private String queryUserName; + + /** 查询ID*/ + private String queryID; + + /** 查询类型*/ + private String queryType; public void setMessage(String message) @@ -234,12 +240,12 @@ public class ExpressInfo extends BaseEntity this.queryTime = queryTime; } - public String getQueryUser() { - return queryUser; + public String getQueryUserName() { + return queryUserName; } - public void setQueryUser(String queryUser) { - this.queryUser = queryUser; + public void setQueryUserName(String queryUserName) { + this.queryUserName = queryUserName; } public String getDeliveryNum() { @@ -250,6 +256,22 @@ public class ExpressInfo extends BaseEntity this.deliveryNum = deliveryNum; } + public String getQueryID() { + return queryID; + } + + public void setQueryID(String queryID) { + this.queryID = queryID; + } + + public String getQueryType() { + return queryType; + } + + public void setQueryType(String queryType) { + this.queryType = queryType; + } + @Override public String toString() { return "ExpressInfo{" + @@ -270,7 +292,9 @@ public class ExpressInfo extends BaseEntity ", singedTime='" + singedTime + '\'' + ", lastUpdateTime='" + lastUpdateTime + '\'' + ", queryTime='" + queryTime + '\'' + - ", queryUser='" + queryUser + '\'' + + ", queryUserName='" + queryUserName + '\'' + + ", queryID='" + queryID + '\'' + + ", queryType='" + queryType + '\'' + '}'; } } diff --git a/box-bps/src/main/java/com/ruoyi/bps/service/IExpressInfoService.java b/box-bps/src/main/java/com/ruoyi/bps/service/IExpressInfoService.java index 90c079f32..d0a13cb8c 100644 --- a/box-bps/src/main/java/com/ruoyi/bps/service/IExpressInfoService.java +++ b/box-bps/src/main/java/com/ruoyi/bps/service/IExpressInfoService.java @@ -59,4 +59,12 @@ public interface IExpressInfoService * @return 结果 */ public int deleteExpressInfoById(String message); + + /** + * 查询快递信息 + * + * @param expressInfo 快递信息 + * @return 快递信息 + */ + public ExpressInfo SelectExpressInfo(ExpressInfo expressInfo); } diff --git a/box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpressInfoServiceImpl.java b/box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpressInfoServiceImpl.java index fcec56e11..37c5f105c 100644 --- a/box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpressInfoServiceImpl.java +++ b/box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpressInfoServiceImpl.java @@ -107,7 +107,8 @@ public class ExpressInfoServiceImpl implements IExpressInfoService //return expressInfoMapper.selectExpressInfoList(expressInfo); } - private ExpressInfo SelectExpressInfo(ExpressInfo expressInfo){ + @Override + public ExpressInfo SelectExpressInfo(ExpressInfo expressInfo){ String nu=expressInfo.getNu(); //快递单号 String com=expressInfo.getCom(); //快递公司 String phone=expressInfo.getPhone(); //收、寄件人电话号码 @@ -176,10 +177,10 @@ public class ExpressInfoServiceImpl implements IExpressInfoService String collectTime= queryTrackResp.getData().get(queryTrackResp.getData().size()-1).getTime(); //获取查询时间 - String queryTime= DateUtils.dateTimeNow("yyyy-MM-dd HH:mm:ss"); + String queryTime= StringUtils.isNotEmpty(expressInfo.getQueryTime())?expressInfo.getQueryTime():DateUtils.dateTimeNow("yyyy-MM-dd HH:mm:ss"); //获取查询人（登录用户） - String queryUser= ShiroUtils.getLoginName(); + String queryUserName= ShiroUtils.getLoginName(); //将快递信息中的Context转化为字符 String dataStr=""; @@ -190,6 +191,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService dataStr+="\r\n"; } } + String a= queryTrackResp.getCondition(); ExpressInfo callbackExpressInfo=new ExpressInfo(); callbackExpressInfo.setMessage(queryTrackResp.getMessage()); callbackExpressInfo.setNu(queryTrackResp.getNu()); @@ -207,7 +209,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService callbackExpressInfo.setCollectTime(collectTime); callbackExpressInfo.setLastUpdateTime(lastUpdateTime); callbackExpressInfo.setQueryTime(queryTime); - callbackExpressInfo.setQueryUser(queryUser); + callbackExpressInfo.setQueryUserName(queryUserName); callbackExpressInfo.setDeliveryNum(expressInfo.getDeliveryNum()); return callbackExpressInfo; diff --git a/box-bps/src/main/resources/mapper/bps/ExpImportQueryMapper.xml b/box-bps/src/main/resources/mapper/bps/ExpImportQueryMapper.xml index 9cd140c00..1a405a2c7 100644 --- a/box-bps/src/main/resources/mapper/bps/ExpImportQueryMapper.xml +++ b/box-bps/src/main/resources/mapper/bps/ExpImportQueryMapper.xml @@ -6,8 +6,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - + @@ -16,14 +17,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select sid, queryTime, queryUserId, queryUserName, queryIp, finishTime, status, queryQty from exp_import_query + select sid, queryId, queryTime, queryLoginName, queryUserName, queryIp, finishTime, status, queryQty from exp_import_query @@ -36,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where message = #{message} - + insert into expressInfo @@ -45,14 +54,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ischeck, com, status, - data, - state, - condition, + `data`, + `state`, + `condition`, routeInfo, returnCode, - result, + `result`, phone, - + collectTime, + singedTime, + lastUpdateTime, + queryTime, + queryUserName, + queryID, + queryType, + #{message}, #{nu}, @@ -66,6 +82,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{returnCode}, #{result}, #{phone}, + #{collectTime}, + #{singedTime}, + #{lastUpdateTime}, + #{queryTime}, + #{queryUserName}, + #{queryID}, + #{queryType}, @@ -76,13 +99,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ischeck = #{ischeck}, com = #{com}, status = #{status}, - data = #{data}, - state = #{state}, - condition = #{condition}, + `data` = #{data}, + `state` = #{state}, + `condition` = #{condition}, routeInfo = #{routeInfo}, returnCode = #{returnCode}, - result = #{result}, + `result` = #{result}, phone = #{phone}, + collectTime = #{collectTime}, + singedTime = #{singedTime}, + lastUpdateTime = #{lastUpdateTime}, + queryTime = #{queryTime}, + queryUserName = #{queryUserName}, + queryID = #{queryID}, + queryType = #{queryType}, 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 cea2ae111..fcd4d1c68 100644 --- a/box-bps/src/main/resources/templates/bps/expImportQuery/add.html +++ b/box-bps/src/main/resources/templates/bps/expImportQuery/add.html @@ -6,6 +6,12 @@
+
+ +
+ +
+
@@ -15,7 +21,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 new file mode 100644 index 000000000..6dd90d24d --- /dev/null +++ b/box-bps/src/main/resources/templates/bps/expImportQuery/detail.html @@ -0,0 +1 @@ +222 \ No newline at end of file diff --git a/box-bps/src/main/resources/templates/bps/expImportQuery/edit.html b/box-bps/src/main/resources/templates/bps/expImportQuery/edit.html index a4db55aa5..47f9f625b 100644 --- a/box-bps/src/main/resources/templates/bps/expImportQuery/edit.html +++ b/box-bps/src/main/resources/templates/bps/expImportQuery/edit.html @@ -16,7 +16,7 @@
- +
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 d4e9221e4..37a7a4eaa 100644 --- a/box-bps/src/main/resources/templates/bps/expImportQuery/expImportQuery.html +++ b/box-bps/src/main/resources/templates/bps/expImportQuery/expImportQuery.html @@ -16,7 +16,7 @@
  • - +
  • @@ -39,6 +39,9 @@
    • + + 导入 + 添加 @@ -61,6 +64,7 @@ + + + \ No newline at end of file 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 5cb02ff5c..5b465cb04 100644 --- a/box-bps/src/main/resources/templates/bps/expressInfo/expressInfo.html +++ b/box-bps/src/main/resources/templates/bps/expressInfo/expressInfo.html @@ -161,7 +161,7 @@ title: '查询时间' }, { - field: 'queryUser', + field: 'queryUserName', title: '查询人' } /*