ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/MonitorController.java

@@ -208,6 +208,7 @@
        monitorInfoVO.setCityName(one.getCity());
        monitorInfoVO.setName(one.getRealName());
        monitorInfoVO.setPhone(one.getPhone());
        monitorInfoVO.setProfilePicture(one.getProfilePicture());
        for (JSONObject string : strings) {
            if (string.getString("terid").equals(terid)){
                monitorInfoVO.setLicensePlateNumber(string.getString("carlicence"));

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisOrderDataController.java

@@ -41,6 +41,7 @@
import java.io.InputStream;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;

@@ -218,6 +219,7 @@
            while (iterator.hasNext()){
                AnalysisOrderData analysisOrderData = iterator.next();
                try {
                    analysisOrderData.setDataType(1);
                    analysisOrderData.setOrderDate(new SimpleDateFormat("yyyy-MM-dd").parse(analysisOrderData.getOrderDateStr()));
                }catch (Exception e){
                    errors.add("回收订单编号:["+analysisOrderData.getOrderNum()+"],时间格式化错误,忽略导入");
@@ -249,17 +251,20 @@
                AnalysisOrderData analysisOrderData = new AnalysisOrderData();
                analysisOrderData.setOrderNum(order.getOrderNumber());
                analysisOrderData.setOrderDate(order.getCreateTime());
//                analysisOrderData.setOrderChannel(order.getOrderChannel());
                analysisOrderData.setOrderChannel(order.getSiteName());
                analysisOrderData.setCity(order.getCity());
                analysisOrderData.setOrderCategory(order.getServeName());
                analysisOrderData.setUserName(order.getReservationName());
                analysisOrderData.setUserPhone(order.getReservationPhone());
                analysisOrderData.setRecyclePerson(order.getServerName());
                analysisOrderData.setState(order.getState());
                analysisOrderData.setImportTime(LocalDateTime.now());
                analysisOrderData.setDataType(2);
                analysisOrderDataList.add(analysisOrderData);
            });
            // 删除今日订单
            analysisOrderDataService.remove(new QueryWrapper<AnalysisOrderData>().lambda()
                            .eq(AnalysisOrderData::getDataType,2)
                    .like(AnalysisOrderData::getOrderDate, new SimpleDateFormat("yyyy-MM-dd").format(new Date()))
            );
            analysisOrderDataService.saveBatch(analysisOrderDataList);

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisRecycleDataController.java

@@ -60,8 +60,8 @@
     */
    @ApiOperation( value = "查询回收数据分析-大屏")
    @GetMapping(value = "/recycleLarge")
    public R<Map<String,Long>> recycleLarge(@RequestParam(value = "analysisType",required = false) Integer analysisType) {
        Map<String,Long> map = analysisRecycleDataService.recycleLarge(analysisType);
    public R<Map<String,Integer>> recycleLarge(@RequestParam(value = "analysisType",required = false) Integer analysisType) {
        Map<String,Integer> map = analysisRecycleDataService.recycleLarge(analysisType);
        return R.ok(map);
    }


 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/model/AnalysisOrderData.java

@@ -89,4 +89,8 @@
    @TableField(exist = false)
    private String orderDateStr;

    @ApiModelProperty(value = "数据类型 1=添加、导入数据 2=同步订单数据")
    @TableField("data_type")
    private Integer dataType;

}

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/service/AnalysisRecycleDataService.java

@@ -22,6 +22,6 @@
     * @param analysisType
     * @return
     */
    Map<String,Long> recycleLarge(Integer analysisType);
    Map<String,Integer> recycleLarge(Integer analysisType);

}

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/service/impl/AnalysisRecycleDataServiceImpl.java

@@ -13,10 +13,7 @@
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

/**
 * <p>
@@ -31,49 +28,61 @@


    @Override
    public Map<String,Long> recycleLarge(Integer analysisType) {
        Map<String,Long> map = new HashMap<>();
    public Map<String,Integer> recycleLarge(Integer analysisType) {
        Map<String,Integer> map = new HashMap<>();
        if (analysisType == 1) {
            // 年份
            String year = LocalDateTime.now().getYear()+"年";
            long count = this.count(Wrappers.lambdaQuery(AnalysisRecycleData.class).eq(AnalysisRecycleData::getAnalysisValue, year));
            map.put(year,count);
            AnalysisRecycleData analysisRecycleData = this.getOne(Wrappers.lambdaQuery(AnalysisRecycleData.class)
                    .eq(AnalysisRecycleData::getAnalysisValue, year).last("LIMIT 1"));
            map.put(year,Objects.nonNull(analysisRecycleData)?analysisRecycleData.getOrderCount():0);
            year = LocalDateTime.now().minusYears(1).getYear()+"年";
            count = this.count(Wrappers.lambdaQuery(AnalysisRecycleData.class).eq(AnalysisRecycleData::getAnalysisValue, year));
            map.put(year,count);
            analysisRecycleData = this.getOne(Wrappers.lambdaQuery(AnalysisRecycleData.class)
                    .eq(AnalysisRecycleData::getAnalysisValue, year).last("LIMIT 1"));
            map.put(year,Objects.nonNull(analysisRecycleData)?analysisRecycleData.getOrderCount():0);
            year = LocalDateTime.now().minusYears(2).getYear()+"年";
            count = this.count(Wrappers.lambdaQuery(AnalysisRecycleData.class).eq(AnalysisRecycleData::getAnalysisValue, year));
            map.put(year,count);
            analysisRecycleData = this.getOne(Wrappers.lambdaQuery(AnalysisRecycleData.class)
                    .eq(AnalysisRecycleData::getAnalysisValue, year).last("LIMIT 1"));
            map.put(year,Objects.nonNull(analysisRecycleData)?analysisRecycleData.getOrderCount():0);
            year = LocalDateTime.now().minusYears(3).getYear()+"年";
            count = this.count(Wrappers.lambdaQuery(AnalysisRecycleData.class).eq(AnalysisRecycleData::getAnalysisValue, year));
            map.put(year,count);
            analysisRecycleData = this.getOne(Wrappers.lambdaQuery(AnalysisRecycleData.class)
                    .eq(AnalysisRecycleData::getAnalysisValue, year).last("LIMIT 1"));
            map.put(year,Objects.nonNull(analysisRecycleData)?analysisRecycleData.getOrderCount():0);
            year = LocalDateTime.now().minusYears(4).getYear()+"年";
            count = this.count(Wrappers.lambdaQuery(AnalysisRecycleData.class).eq(AnalysisRecycleData::getAnalysisValue, year));
            map.put(year,count);
            analysisRecycleData = this.getOne(Wrappers.lambdaQuery(AnalysisRecycleData.class)
                    .eq(AnalysisRecycleData::getAnalysisValue, year).last("LIMIT 1"));
            map.put(year,Objects.nonNull(analysisRecycleData)?analysisRecycleData.getOrderCount():0);
            year = LocalDateTime.now().minusYears(5).getYear()+"年";
            count = this.count(Wrappers.lambdaQuery(AnalysisRecycleData.class).eq(AnalysisRecycleData::getAnalysisValue, year));
            map.put(year,count);
            analysisRecycleData = this.getOne(Wrappers.lambdaQuery(AnalysisRecycleData.class)
                    .eq(AnalysisRecycleData::getAnalysisValue, year).last("LIMIT 1"));
            map.put(year,Objects.nonNull(analysisRecycleData)?analysisRecycleData.getOrderCount():0);
            return map;
        } else{
            // 月份
            String month = new SimpleDateFormat("yyyy年MM月").format(new Date());
            long count = this.count(Wrappers.lambdaQuery(AnalysisRecycleData.class).eq(AnalysisRecycleData::getAnalysisValue, month));
            map.put(month,count);
            AnalysisRecycleData analysisRecycleData = this.getOne(Wrappers.lambdaQuery(AnalysisRecycleData.class)
                    .eq(AnalysisRecycleData::getAnalysisValue, month).last("LIMIT 1"));
            map.put(month, Objects.nonNull(analysisRecycleData)?analysisRecycleData.getOrderCount():0);
            month = new SimpleDateFormat("yyyy年MM月").format(DateUtils.localDateTimeToDate(LocalDateTime.now().minusMonths(1)));
            count = this.count(Wrappers.lambdaQuery(AnalysisRecycleData.class).eq(AnalysisRecycleData::getAnalysisValue, month));
            map.put(month,count);
            analysisRecycleData = this.getOne(Wrappers.lambdaQuery(AnalysisRecycleData.class)
                    .eq(AnalysisRecycleData::getAnalysisValue, month).last("LIMIT 1"));
            map.put(month,Objects.nonNull(analysisRecycleData)?analysisRecycleData.getOrderCount():0);
            month = new SimpleDateFormat("yyyy年MM月").format(DateUtils.localDateTimeToDate(LocalDateTime.now().minusMonths(2)));
            count = this.count(Wrappers.lambdaQuery(AnalysisRecycleData.class).eq(AnalysisRecycleData::getAnalysisValue, month));
            map.put(month,count);
            analysisRecycleData = this.getOne(Wrappers.lambdaQuery(AnalysisRecycleData.class)
                    .eq(AnalysisRecycleData::getAnalysisValue, month).last("LIMIT 1"));
            map.put(month,Objects.nonNull(analysisRecycleData)?analysisRecycleData.getOrderCount():0);
            month = new SimpleDateFormat("yyyy年MM月").format(DateUtils.localDateTimeToDate(LocalDateTime.now().minusMonths(3)));
            count = this.count(Wrappers.lambdaQuery(AnalysisRecycleData.class).eq(AnalysisRecycleData::getAnalysisValue, month));
            map.put(month,count);
            analysisRecycleData = this.getOne(Wrappers.lambdaQuery(AnalysisRecycleData.class)
                    .eq(AnalysisRecycleData::getAnalysisValue, month).last("LIMIT 1"));
            map.put(month,Objects.nonNull(analysisRecycleData)?analysisRecycleData.getOrderCount():0);
            month = new SimpleDateFormat("yyyy年MM月").format(DateUtils.localDateTimeToDate(LocalDateTime.now().minusMonths(4)));
            count = this.count(Wrappers.lambdaQuery(AnalysisRecycleData.class).eq(AnalysisRecycleData::getAnalysisValue, month));
            map.put(month,count);
            analysisRecycleData = this.getOne(Wrappers.lambdaQuery(AnalysisRecycleData.class)
                    .eq(AnalysisRecycleData::getAnalysisValue, month).last("LIMIT 1"));
            map.put(month,Objects.nonNull(analysisRecycleData)?analysisRecycleData.getOrderCount():0);
            month = new SimpleDateFormat("yyyy年MM月").format(DateUtils.localDateTimeToDate(LocalDateTime.now().minusMonths(5)));
            count = this.count(Wrappers.lambdaQuery(AnalysisRecycleData.class).eq(AnalysisRecycleData::getAnalysisValue, month));
            map.put(month,count);
            analysisRecycleData = this.getOne(Wrappers.lambdaQuery(AnalysisRecycleData.class)
                    .eq(AnalysisRecycleData::getAnalysisValue, month).last("LIMIT 1"));
            map.put(month,Objects.nonNull(analysisRecycleData)?analysisRecycleData.getOrderCount():0);
            return map;
        }
    }

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/MonitorInfoVO.java

@@ -22,4 +22,6 @@
    private String cityName;
    @ApiModelProperty(value = "手机号")
    private String phone;
    @ApiModelProperty(value = "师傅头像")
    private String profilePicture;
}