lzq
/
zsy-recycling-supervision
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

master
lzq 2025-08-08 09:43:14 +08:00
parent b575de3230
commit c35456688d
4 changed files with 103 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
njzscloud-svr/src/main/java/com/njzscloud/supervisory/dispose/controller/DisposeRecordController.java
View File

@ -7,6 +7,7 @@ import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.common.mvc.util.FileResponseUtil;
import com.njzscloud.supervisory.dispose.pojo.DisposeRecordEntity;
import com.njzscloud.supervisory.dispose.pojo.DisposeRecordPagingParam;
import com.njzscloud.supervisory.dispose.pojo.DisposeRecordReportParam;
import com.njzscloud.supervisory.dispose.service.DisposeRecordService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@ -95,4 +96,9 @@ public class DisposeRecordController {
return R.success(disposeRecordService.paging(pageParam, disposeRecordPagingParam));
}
@PostMapping("/report")
public R<?> report(@RequestParam(required = false, defaultValue = "1") Integer action, @RequestBody DisposeRecordReportParam disposeRecordReportParam) {
disposeRecordService.report(action, disposeRecordReportParam);
return R.success();
}
}

1
njzscloud-svr/src/main/java/com/njzscloud/supervisory/dispose/pojo/DisposeRecordEntity.java
View File

@ -81,6 +81,7 @@ public class DisposeRecordEntity {
* 处置地点
*/
private String disposalSite;
private String dataSn;
/**
* 创建人 Id; sys_user.id

54
njzscloud-svr/src/main/java/com/njzscloud/supervisory/dispose/pojo/DisposeRecordReportParam.java 100644
View File

@ -0,0 +1,54 @@
package com.njzscloud.supervisory.dispose.pojo;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import lombok.experimental.Accessors;
/**
* 处置记录
*/
@Getter
@Setter
@ToString
@Accessors(chain = true)
public class DisposeRecordReportParam {
private String clearOrderNo; // 清运订单号
private String treatmentOrderNo; // 消纳订单号
private Integer orderType; // 订单类型:1:拉料,2:送料,3:消纳,4:销售
private String orderTypeName; // 订单类型名称
private String goodsSn; // 暂时没用
private String goodsName; // 货物名称
private String goodsCateSn; // 分类编码，建筑垃圾:ZSZY02,装修垃圾:ZSZY02
private String goodsCateName; // 分类名
private Integer carType; // 车辆类型:1:清运公司，2:消纳场
private String carNo; // 车牌号
private Double tareWeight; // 皮重
private Double grossWeight; // 毛重
private Double netWeight; // 净重
private String startTime; // 开始时间
private String finishTime; // 完成时间
private String communitySn; // 小区编号
private String communityName; // 小区名称
private String clearCompanySn; // 清运公司编码
private String clearCompanyName; // 清运公司名称
private String propertyCompanySn; // 物业公司编码
private String propertyCompanyName; // 物业公司名称
private String treatmentCompanySn; // 消纳厂编码
private String treatmentCompanyName;// 消纳厂名称
private String provinceId; // 省份编码
private String provinceName; // 省份名
private String cityId; // 城市编码
private String cityName; // 城市名
private String startRegionId; // 开始区域编码
private String startRegionName; // 开始区域名
private String endRegionId; // 结束区域编码
private String endRegionName; // 结束区域名
private Double startLng; // 开始经度
private Double startLat; // 开始纬度
private Double endLng; // 结束经度
private Double endLat; // 结束纬度
private String remark; // 备注
}

48
njzscloud-svr/src/main/java/com/njzscloud/supervisory/dispose/service/DisposeRecordService.java
View File

@ -8,16 +8,14 @@ import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njzscloud.common.core.ex.Exceptions;
import com.njzscloud.common.core.tuple.Tuple2;
import com.njzscloud.common.core.utils.GroupUtil;
import com.njzscloud.common.mp.support.PageParam;
import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.supervisory.dispose.contant.GarbageCategory;
import com.njzscloud.supervisory.dispose.mapper.DisposeRecordMapper;
import com.njzscloud.supervisory.dispose.pojo.DisposeRecordEntity;
import com.njzscloud.supervisory.dispose.pojo.DisposeRecordExportResult;
import com.njzscloud.supervisory.dispose.pojo.DisposeRecordPagingParam;
import com.njzscloud.supervisory.dispose.pojo.DisposeRecordStatisticsResult;
import com.njzscloud.supervisory.dispose.pojo.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -114,11 +112,9 @@ public class DisposeRecordService extends ServiceImpl<DisposeRecordMapper, Dispo
DateTime time = DateUtil.parse(date + "-01 00:00:00");
int dayOfMonth = DateUtil.endOfMonth(time).dayOfMonth();
ArrayList<String> dayList = new ArrayList<>(dayOfMonth);
ArrayList<Double> defaultSeries = new ArrayList<>(dayOfMonth);
for (int i = 0; i < dayOfMonth; i++) {
dayList.add(i + 1 + "号");
defaultSeries.add(0.0);
}
@ -139,4 +135,44 @@ public class DisposeRecordService extends ServiceImpl<DisposeRecordMapper, Dispo
.put("series", series)
.build();
}
public void report(Integer action, DisposeRecordReportParam disposeRecordReportParam) {
if (action == 1) {
this.save(resolveData(disposeRecordReportParam));
} else if (action == 2) {
DisposeRecordEntity disposeRecordEntity = this.getOne(Wrappers.lambdaQuery(DisposeRecordEntity.class)
.eq(DisposeRecordEntity::getDataSn, disposeRecordReportParam.getTreatmentOrderNo())
);
if (disposeRecordEntity != null) {
this.updateById(resolveData(disposeRecordReportParam).setId(disposeRecordEntity.getId()));
} else {
throw Exceptions.clierr("更新失败，数据不存在");
}
} else if (action == 3) {
DisposeRecordEntity disposeRecordEntity = this.getOne(Wrappers.lambdaQuery(DisposeRecordEntity.class)
.eq(DisposeRecordEntity::getDataSn, disposeRecordReportParam.getTreatmentOrderNo())
);
if (disposeRecordEntity != null) {
this.removeById(disposeRecordEntity.getId());
} else {
throw Exceptions.clierr("删除失败，数据不存在");
}
}
}
private DisposeRecordEntity resolveData(DisposeRecordReportParam disposeRecordReportParam) {
return new DisposeRecordEntity()
.setOrigin(disposeRecordReportParam.getCommunityName())
.setClearingCompany(disposeRecordReportParam.getClearCompanyName())
.setGarbageCategory("ZSZY02".equals(disposeRecordReportParam.getGoodsCateSn()) ? GarbageCategory.ChaiQianLaJi : GarbageCategory.ZhuangXiuLaJi)
.setLicensePlate(disposeRecordReportParam.getCarNo())
.setInWeight(String.valueOf(disposeRecordReportParam.getGrossWeight() == null ? 0 : disposeRecordReportParam.getGrossWeight()))
.setOutWeight(String.valueOf(disposeRecordReportParam.getTareWeight() == null ? 0 : disposeRecordReportParam.getTareWeight()))
.setSuttleWeight(String.valueOf(disposeRecordReportParam.getNetWeight() == null ? 0 : disposeRecordReportParam.getNetWeight()))
.setInTime(DateUtil.parse(disposeRecordReportParam.getStartTime()).toLocalDateTime())
.setOutTime(DateUtil.parse(disposeRecordReportParam.getFinishTime()).toLocalDateTime())
.setDisposalSite(disposeRecordReportParam.getTreatmentCompanyName())
.setDataSn(disposeRecordReportParam.getTreatmentOrderNo());
}
}