diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dispose/controller/ProjectClearanceDetailController.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dispose/controller/ProjectClearanceDetailController.java new file mode 100644 index 0000000..6f40edb --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dispose/controller/ProjectClearanceDetailController.java @@ -0,0 +1,23 @@ +package com.njzscloud.supervisory.dispose.controller; + +import com.njzscloud.common.core.utils.R; +import com.njzscloud.supervisory.dispose.pojo.DisposeRecordReportParam; +import com.njzscloud.supervisory.dispose.service.DisposeRecordService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +@Slf4j +@RestController +@RequestMapping("/project_clearance_detail") +@RequiredArgsConstructor +public class ProjectClearanceDetailController { + + private final DisposeRecordService disposeRecordService; + + @PostMapping("/report") + public R report(@RequestParam(required = false, defaultValue = "1") Integer action, @RequestBody DisposeRecordReportParam disposeRecordReportParam) { + disposeRecordService.report(action, disposeRecordReportParam); + return R.success(); + } +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dispose/pojo/DisposeRecordEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dispose/pojo/DisposeRecordEntity.java index 7e4273b..c41e20e 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dispose/pojo/DisposeRecordEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dispose/pojo/DisposeRecordEntity.java @@ -81,7 +81,12 @@ public class DisposeRecordEntity { * 处置地点 */ private String disposalSite; + private String dataSn; + private String inFrontPhoto; + private String inBodyPhoto; + private String outFrontPhoto; + private String outBodyPhoto; /** * 创建人 Id; sys_user.id diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dispose/pojo/DisposeRecordReportParam.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dispose/pojo/DisposeRecordReportParam.java index 2134b00..a946d6f 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dispose/pojo/DisposeRecordReportParam.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dispose/pojo/DisposeRecordReportParam.java @@ -5,6 +5,8 @@ import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; +import java.util.List; + /** * 处置记录 */ @@ -49,6 +51,18 @@ public class DisposeRecordReportParam { private Double endLng; // 结束经度 private Double endLat; // 结束纬度 private String remark; // 备注 + private List photo; // 照片 + private String carInFront; + private String carInBody; + private String carOutFront; + private String carOutBody; + /** + * 联系人 + */ + private String contact; - + /** + * 联系电话 + */ + private String contactPhone; } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dispose/service/DisposeRecordService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dispose/service/DisposeRecordService.java index ac0deda..1ed512b 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dispose/service/DisposeRecordService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dispose/service/DisposeRecordService.java @@ -179,6 +179,14 @@ public class DisposeRecordService extends ServiceImpl - ${log_path}/${service_name}/${service_name}.log + ${log_path}/${service_name}.log ${log_path}/${service_name}/%d{yyyy-MM, aux}/${service_name}.%d{yyyy-MM-dd}.%i.log.zip 50MB diff --git a/z-doc/http/其他.http b/z-doc/http/其他.http index 20d9d41..dc6936f 100644 --- a/z-doc/http/其他.http +++ b/z-doc/http/其他.http @@ -140,3 +140,45 @@ Authorization: MTkzODEzOTAyNTgyMTQ1ODQzMywxOTM4MTM5MDI2MjM2Njk0NTMwLDAxNDExODhlY "tableName": "biz_test", "basePackage": "com.njzscloud" } + +### +POST http://supervisory.xinsunjie.com/api/project_clearance_detail/report +Content-Type: application/json + +{ + "treatmentCompanySn": "12000001", + "treatmentCompanyName": "南京再昇云", + "treatmentOrderNo": "1955187197116157952", + "carNo": "苏A2S691", + "startTime": 1754988005000, + "finishTime": 1754988023000, + "goodsCateSn": "ZSZY02", + "goodsCateName": "建筑垃圾", + "goodsName": "", + "grossWeight": 3, + "tareWeight": 1, + "netWeight": 2, + "propertyCompanySn": "", + "propertyCompanyName": "梅冬生", + "communitySn": "", + "communityName": "测试项目", + "clearCompanySn": "", + "clearCompanyName": "梅冬生", + "remark": "", + "startRegionName": "颍泉区", + "status": 1, + "sn": "", + "contact": "梅冬生", + "contactPhone": "18662862923", + "photo": [ + "https://cdn-zsy.oss-cn-shanghai.aliyuncs.com/car-demo.png", + "https://cdn-zsy.oss-cn-shanghai.aliyuncs.com/car-demo2.png", + "https://cdn-zsy.oss-cn-shanghai.aliyuncs.com/car-demo3.png", + "https://cdn-zsy.oss-cn-shanghai.aliyuncs.com/car-demo3.png" + ], + "action": 1, + "carInFront": "https://cdn-zsy.oss-cn-shanghai.aliyuncs.com/car-demo.png", + "carInBody": "https://cdn-zsy.oss-cn-shanghai.aliyuncs.com/car-demo2.png", + "carOutFront": "https://cdn-zsy.oss-cn-shanghai.aliyuncs.com/car-demo3.png", + "carOutBody": "https://cdn-zsy.oss-cn-shanghai.aliyuncs.com/car-demo3.png" +}