From 0837147172f82ca1abec71cfdb81ff63ee56cdfb Mon Sep 17 00:00:00 2001 From: wang-hao-jie <1550036656@qq.com> Date: 星期五, 10 十二月 2021 11:07:12 +0800 Subject: [PATCH] 违章记录 --- xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/StatisticController.java | 18 +++++++- xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticScheduleImpl.java | 2 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/CarScheduleImpl.java | 29 ++++++++++++++ xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java | 3 + xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java | 3 + xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/AreaSection.java | 15 +++++++ xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticPcScheduleImpl.java | 2 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Area.java | 13 ++++++ 8 files changed, 78 insertions(+), 7 deletions(-) diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java index c63db75..09fc5c3 100644 --- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java +++ b/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("姝e父绛炬敹锛屾帴璐т汉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); } diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/StatisticController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/StatisticController.java index 0efae0b..56ecf50 100644 --- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/StatisticController.java +++ b/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); + } } diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Area.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Area.java index 3fe41c5..70c04ea 100644 --- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Area.java +++ b/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; diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/AreaSection.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/AreaSection.java index a8b4860..2dd46c0 100644 --- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/AreaSection.java +++ b/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; + } \ No newline at end of file diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java index a71fa37..83f9d13 100644 --- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java +++ b/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 = "鍟嗘埛鍚嶇О") diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/CarScheduleImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/CarScheduleImpl.java index 5d8a8b6..9c75e08 100644 --- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/CarScheduleImpl.java +++ b/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); + } + + } } diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticPcScheduleImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticPcScheduleImpl.java index 5026b0b..2545605 100644 --- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticPcScheduleImpl.java +++ b/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 { diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticScheduleImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticScheduleImpl.java index d314e9b..155494d 100644 --- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticScheduleImpl.java +++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticScheduleImpl.java @@ -11,7 +11,7 @@ import java.io.IOException; import java.util.List; - +//瀹㈡埛绔椤垫暟鎹粺璁� @Component public class StatisticScheduleImpl { -- Gitblit v1.9.1