上报

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();
+    }
+}

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

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<String> photo;         // 照片
+    private String carInFront;
+    private String carInBody;
+    private String carOutFront;
+    private String carOutBody;
+    /**
+     * 联系人
+     */
+    private String contact;
 
-
+    /**
+     * 联系电话
+     */
+    private String contactPhone;
 }

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

@@ -179,6 +179,14 @@ public class DisposeRecordService extends ServiceImpl<DisposeRecordMapper, Dispo
                 .setInTime(DateUtil.parse(disposeRecordReportParam.getStartTime()).toLocalDateTime())
                 .setOutTime(DateUtil.parse(disposeRecordReportParam.getFinishTime()).toLocalDateTime())
                 .setDisposalSite(disposeRecordReportParam.getTreatmentCompanyName())
-                .setDataSn(disposeRecordReportParam.getTreatmentOrderNo());
+                .setDataSn(disposeRecordReportParam.getTreatmentOrderNo())
+                .setInFrontPhoto(disposeRecordReportParam.getCarInFront())
+                .setOutFrontPhoto(disposeRecordReportParam.getCarOutFront())
+                .setInBodyPhoto(disposeRecordReportParam.getCarInBody())
+                .setOutBodyPhoto(disposeRecordReportParam.getCarOutBody())
+                .setContact(disposeRecordReportParam.getContact())
+                .setContactPhone(disposeRecordReportParam.getContactPhone())
+                ;
+
     }
 }

njzscloud-svr/src/main/resources/application-prod.yml

@@ -6,7 +6,10 @@ spring:
     url: jdbc:mysql://127.0.0.1:3306/zsy_recycling_supervision?characterEncoding=UTF-8&allowMultiQueries=true&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
     username: root
     password: Ch3nTx2BBJ28AiCZ
-
+  security:
+    auth-ignores:
+      - /dispose_record/report
+      - /project_clearance_detail/report
   redis:
     enable: false
     pubsub: false

njzscloud-svr/src/main/resources/logback-spring.xml

@@ -17,7 +17,7 @@
     </appender>
 
     <appender name="file_appender" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log_path}/${service_name}/${service_name}.log</file>
+        <file>${log_path}/${service_name}.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <fileNamePattern>${log_path}/${service_name}/%d{yyyy-MM, aux}/${service_name}.%d{yyyy-MM-dd}.%i.log.zip</fileNamePattern>
             <maxFileSize>50MB</maxFileSize>

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"
+}