xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java
@@ -252,7 +252,7 @@ @RequestMapping(value = "/signFor", method = RequestMethod.POST) @ApiOperation(value = "签收") public Object signFor(String orderId,int status,String content,String customerReceiveId) { public Object signFor(String orderId,int status,String content,String customerReceiveId,int time) { if(status==1){ if(StrUtil.isEmpty(customerReceiveId)){ return ResultUtil.error("正常签收，接货人id必填"); @@ -261,6 +261,7 @@ OrderTask orderTask = iOrderTaskService.getById(orderId); orderTask.setStatus(status); orderTask.setUserId(securityUtil.getCurrUser().getId()); orderTask.setTime(time); if(StrUtil.isNotEmpty(customerReceiveId)){ orderTask.setCustomerReceiveId(customerReceiveId); } xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/StatisticController.java
@@ -5,12 +5,11 @@ import cn.exrick.xboot.core.common.utils.ResultUtil; import cn.exrick.xboot.core.common.vo.PageVo; import cn.exrick.xboot.core.common.vo.Result; import cn.exrick.xboot.your.entity.Area; import cn.exrick.xboot.your.entity.Car; import cn.exrick.xboot.your.entity.EventLog; import cn.exrick.xboot.your.entity.OrderTask; import cn.exrick.xboot.your.service.ICarService; import cn.exrick.xboot.your.service.IEventLogService; import cn.exrick.xboot.your.service.IOrderTaskService; import cn.exrick.xboot.your.service.*; import cn.exrick.xboot.your.util.HaiKangPost; import cn.hutool.core.date.DateUtil; import cn.hutool.json.JSONUtil; @@ -49,6 +48,12 @@ @Autowired private HaiKangPost haiKangPost; @Autowired private IAreaService iAreaService; @Autowired private IAreaSectionService iAreaSectionService; @RequestMapping(value = "/getIndex1", method = RequestMethod.GET) @ApiOperation(value = "获取首页数据") @@ -97,4 +102,11 @@ String latestGps = haiKangPost.findLatestGps(codes); return new ResultUtil<Object>().setData(JSONUtil.parseObj(latestGps)); } @RequestMapping(value = "/getAnalysis", method = RequestMethod.GET) @ApiOperation(value = "获取配送分析") public Result<Object> getAnalysis() { List<Area> list = iAreaService.list(); return new ResultUtil<Object>().setData(list); } } xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Area.java
@@ -39,6 +39,19 @@ @ApiModelProperty(value = "配送人id") private String userId; @ApiModelProperty(value = "商户总数") private int customerSum; @Transient @TableField(exist = false) @ApiModelProperty(value = "平均时长") private double time; @Transient @TableField(exist = false) @ApiModelProperty(value = "总体方差") private int variance; @Transient @TableField(exist = false) private String nickName; xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/AreaSection.java
@@ -37,4 +37,19 @@ @ApiModelProperty(value = "区域id") private String areaId; @ApiModelProperty(value = "分段商户数") private int customerNum; @ApiModelProperty(value = "平均时长") private double avgTime; @ApiModelProperty(value = "最短时长") private double minTime; @ApiModelProperty(value = "最长时长") private double maxTime; @ApiModelProperty(value = "稳定性分析") private int stability; } xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java
@@ -97,6 +97,9 @@ @ApiModelProperty(value = "是否点赞 0：否 1：是") private String likes; @ApiModelProperty(value = "耗时 毫秒") private int time; @Transient @TableField(exist = false) @ApiModelProperty(value = "商户名称") xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/CarScheduleImpl.java
@@ -1,14 +1,41 @@ package cn.exrick.xboot.your.schedulings; import cn.exrick.xboot.your.entity.Area; import cn.exrick.xboot.your.entity.Customer; import cn.exrick.xboot.your.service.IAreaSectionService; import cn.exrick.xboot.your.service.IAreaService; import cn.exrick.xboot.your.service.ICustomerService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import java.io.IOException; import java.util.List; //大屏配送分析 @Component public class CarScheduleImpl { @Autowired private IAreaService iAreaService; @Autowired private IAreaSectionService iAreaSectionService; @Autowired private ICustomerService iCustomerService; @Scheduled(cron="0 0 * * * ?")//每小时执行一次 public void execute() throws IOException { public void execute(){ List<Area> list = iAreaService.list(); for(Area area:list){ QueryWrapper<Customer> wrapper = new QueryWrapper<>(); wrapper.eq("area_id",area.getId()); int count = iCustomerService.count(wrapper); area.setCustomerSum(count); iAreaService.saveOrUpdate(area); } } } xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticPcScheduleImpl.java
@@ -14,7 +14,7 @@ import java.io.IOException; import java.util.Date; import java.util.List; //大屏首页统计 @Component public class StatisticPcScheduleImpl {
@@ -11,7 +11,7 @@ import java.io.IOException; import java.util.List; //客户端首页数据统计 @Component public class StatisticScheduleImpl {
