root
/
school
1
0
Fork 0
Code Issues 8 Pull Requests Projects Releases Wiki Activity
Browse Source

物流优化

dev
wangfukang 2 years ago
parent
45ae5798c0
commit
4b8eb8aaa1
6 changed files with 19 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      hiver-admin/test-output/test-report.html
  2. 2
      hiver-core/src/main/java/cc/hiver/core/common/utils/SecurityUtil.java
  3. 5
      hiver-core/src/main/java/cc/hiver/core/common/vo/TokenCompany.java
  4. 4
      hiver-core/src/main/java/cc/hiver/core/logisticsentruckinglog/service/impl/LogisticsEntruckingLogServiceImpl.java
  5. 4
      hiver-core/src/main/java/cc/hiver/core/logisticsorder/controller/LogisticsOrderController.java
  6. 4
      hiver-core/src/main/java/cc/hiver/core/logisticsorder/entity/LogisticsOrder.java

18
hiver-admin/test-output/test-report.html
View File

@ -5,7 +5,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>Hiver测试报告</title> <title>Hiver测试报告</title>
<link rel="apple-touch-icon" href="spark/logo.png"> <link rel="apple-touch-icon" href="spark/logo.png">
<link rel="shortcut icon" href="spark/logo.png"> <link rel="shortcut icon" href="spark/logo.png">
<link rel="stylesheet" href="spark/spark-style.css"> <link rel="stylesheet" href="spark/spark-style.css">
@ -35,7 +35,7 @@
<a href="#"><span class="badge badge-primary">Hiver</span></a> <a href="#"><span class="badge badge-primary">Hiver</span></a>
</li> </li>
<li class="m-r-10"> <li class="m-r-10">
<a href="#"><span class="badge badge-primary">十月 15, 2024 22:32:27</span></a> <a href="#"><span class="badge badge-primary">十月 16, 2024 00:19:02</span></a>
</li> </li>
</ul> </ul>
</div> </div>
@ -84,7 +84,7 @@
<div class="test-detail"> <div class="test-detail">
<span class="meta text-white badge badge-sm"></span> <span class="meta text-white badge badge-sm"></span>
<p class="name">passTest</p> <p class="name">passTest</p>
<p class="text-sm"><span>22:32:27 下午</span> / <span>0.012 secs</span></p> <p class="text-sm"><span>00:19:02 上午</span> / <span>0.017 secs</span></p>
</div> </div>
<div class="test-contents d-none"> <div class="test-contents d-none">
<div class="detail-head"> <div class="detail-head">
@ -92,9 +92,9 @@
<div class="info"> <div class="info">
<div class='float-right'><span class='badge badge-default'>#test-id=1</span></div> <div class='float-right'><span class='badge badge-default'>#test-id=1</span></div>
<h5 class="test-status text-pass">passTest</h5> <h5 class="test-status text-pass">passTest</h5>
<span class='badge badge-success'>10.15.2024 22:32:27</span> <span class='badge badge-success'>10.16.2024 00:19:02</span>
<span class='badge badge-danger'>10.15.2024 22:32:27</span> <span class='badge badge-danger'>10.16.2024 00:19:02</span>
<span class='badge badge-default'>0.012 secs</span> <span class='badge badge-default'>0.017 secs</span>
</div> </div>
<div class="m-t-10 m-l-5"></div> <div class="m-t-10 m-l-5"></div>
</div> </div>
@ -104,7 +104,7 @@
<tbody> <tbody>
<tr class="event-row"> <tr class="event-row">
<td><span class="badge log pass-bg">Pass</span></td> <td><span class="badge log pass-bg">Pass</span></td>
<td>22:32:27</td> <td>0:19:02</td>
<td> <td>
Test passed Test passed
</td> </td>
@ -128,13 +128,13 @@
<div class="col-md-3"> <div class="col-md-3">
<div class="card"><div class="card-body"> <div class="card"><div class="card-body">
<p class="m-b-0">Started</p> <p class="m-b-0">Started</p>
<h3>十月 15, 2024 22:32:27</h3> <h3>十月 16, 2024 00:19:02</h3>
</div></div> </div></div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<div class="card"><div class="card-body"> <div class="card"><div class="card-body">
<p class="m-b-0">Ended</p> <p class="m-b-0">Ended</p>
<h3>十月 15, 2024 22:32:27</h3> <h3>十月 16, 2024 00:19:02</h3>
</div></div> </div></div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">

2
hiver-core/src/main/java/cc/hiver/core/common/utils/SecurityUtil.java
View File

@ -378,6 +378,8 @@ public class SecurityUtil {
public LogiticsCompany getCurrCompany() { public LogiticsCompany getCurrCompany() {
final Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); final Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
boolean authenticated = authentication.isAuthenticated();
String name = authentication.getName();
if (authentication == null || !authentication.isAuthenticated() || authentication.getName() == null if (authentication == null || !authentication.isAuthenticated() || authentication.getName() == null
|| authentication instanceof AnonymousAuthenticationToken) { || authentication instanceof AnonymousAuthenticationToken) {
throw new HiverException("未检测到登录用户"); throw new HiverException("未检测到登录用户");

5
hiver-core/src/main/java/cc/hiver/core/common/vo/TokenCompany.java
View File

@ -47,11 +47,6 @@ public class TokenCompany implements UserDetails, Serializable {
return null; return null;
} }
@Override
public String getUsername() {
return null;
}
@Override @Override
public boolean isAccountNonExpired() { public boolean isAccountNonExpired() {
return true; return true;

4
hiver-core/src/main/java/cc/hiver/core/logisticsentruckinglog/service/impl/LogisticsEntruckingLogServiceImpl.java
View File

@ -11,6 +11,7 @@ import cc.hiver.core.utils.DateUtil;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -54,6 +55,9 @@ public class LogisticsEntruckingLogServiceImpl extends ServiceImpl<LogisticsEntr
@Override @Override
public IPage<LogisticsEntruckingLogDatePageVo> getDateLogisticsEntruckingLogPageList(LogisticsEntruckingLogQueryVo logisticsEntruckingLogQueryVo) { public IPage<LogisticsEntruckingLogDatePageVo> getDateLogisticsEntruckingLogPageList(LogisticsEntruckingLogQueryVo logisticsEntruckingLogQueryVo) {
if(StringUtils.isNotEmpty(logisticsEntruckingLogQueryVo.getEndDate())){
logisticsEntruckingLogQueryVo.setEndDate(DateUtil.addDay(logisticsEntruckingLogQueryVo.getEndDate(), 1));
}
final Page<LogisticsEntruckingLogDatePageVo> page = new Page<>(logisticsEntruckingLogQueryVo.getPageNum(), logisticsEntruckingLogQueryVo.getPageSize()); final Page<LogisticsEntruckingLogDatePageVo> page = new Page<>(logisticsEntruckingLogQueryVo.getPageNum(), logisticsEntruckingLogQueryVo.getPageSize());
// 获取日期 // 获取日期
final IPage<LogisticsEntruckingLogDatePageVo> dateLogisticsEntruckingLogPageList = logisticsEntruckingLogMapper.getDateLogisticsEntruckingLogPageList(page, logisticsEntruckingLogQueryVo); final IPage<LogisticsEntruckingLogDatePageVo> dateLogisticsEntruckingLogPageList = logisticsEntruckingLogMapper.getDateLogisticsEntruckingLogPageList(page, logisticsEntruckingLogQueryVo);

4
hiver-core/src/main/java/cc/hiver/core/logisticsorder/controller/LogisticsOrderController.java
View File

@ -111,11 +111,11 @@ public class LogisticsOrderController {
//如果更新成功，把修改记录保存一下 //如果更新成功，把修改记录保存一下
Gson gson = new Gson(); Gson gson = new Gson();
LogisticsOrderChangeLog logisticsOrderChangeLog = new LogisticsOrderChangeLog(); LogisticsOrderChangeLog logisticsOrderChangeLog = new LogisticsOrderChangeLog();
logisticsOrderChangeLog.setCreateBy(logiticsCompany.getId());
logisticsOrderChangeLog.setCreateByName(logiticsCompany.getContacts());
logisticsOrderChangeLog.setOldData(gson.toJson(oldLogisticsOrder)); logisticsOrderChangeLog.setOldData(gson.toJson(oldLogisticsOrder));
logisticsOrderChangeLog.setNewData(gson.toJson(logisticsOrder)); logisticsOrderChangeLog.setNewData(gson.toJson(logisticsOrder));
logisticsOrderChangeLog.setOrderId(logisticsOrder.getId()); logisticsOrderChangeLog.setOrderId(logisticsOrder.getId());
logisticsOrderChangeLog.setCreateBy(logisticsOrder.getCreateBy());
logisticsOrderChangeLog.setCreateByName(logisticsOrder.getCreateByName());
logisticsOrderChangeLog.setCreateTime(new Date()); logisticsOrderChangeLog.setCreateTime(new Date());
int status = logisticsOrderService.saveLogisticsOrderChangeLog(logisticsOrderChangeLog); int status = logisticsOrderService.saveLogisticsOrderChangeLog(logisticsOrderChangeLog);
if(status == 0){ if(status == 0){

4
hiver-core/src/main/java/cc/hiver/core/logisticsorder/entity/LogisticsOrder.java
View File

@ -130,7 +130,7 @@ public class LogisticsOrder{
@ApiModelProperty(value = "到达站名称") @ApiModelProperty(value = "到达站名称")
private String arrivalStationName; private String arrivalStationName;
@CompareField(name = "货物类型") @CompareField(name = "重量")
@ApiModelProperty(value = "重量") @ApiModelProperty(value = "重量")
private BigDecimal weight; private BigDecimal weight;
@ -138,7 +138,7 @@ public class LogisticsOrder{
@ApiModelProperty(value = "件数") @ApiModelProperty(value = "件数")
private Integer count; private Integer count;
@CompareField(name = "体积") @CompareField(name = "落地费")
@ApiModelProperty(value = "运费") @ApiModelProperty(value = "运费")
private BigDecimal freight; private BigDecimal freight;

Write Preview
Loading…
Cancel
Save