2 液化石油气-配送记录 外部接口开发。

zh-baseversion-admin/src/main/java/com/zehong/web/controller/tool/DESEncoder.java

@@ -160,54 +160,24 @@ public class DESEncoder {
 
 		String lpggasdata = "[\n" +
 				"    {\n" +
+				"        \"bottleCode\": \"32323\",\n" +
 				"        \"userOwnId\": \"1\",\n" +
-				"        \"stationName\": \"储备站01-接口来的-01\",\n" +
-				"        \"gasUser\": \"用户名01-接口来的-01\",\n" +
-				"        \"telNum\": \"电话01-接口来的-01\",\n" +
-				"        \"gasUserAddress\": \"用户地址01-接口来的-01\",\n" +
-				"        \"gasUserType\": \"0\",\n" +
-				"        \"safeCheckDate\": \"2024-12-16\",\n" +
-				"        \"safeCheckPerson\": \"安检人-接口来的-01\",\n" +
-				"        \"bottleNum\": \"15\",\n" +
-				"        \"checkInStatus\": \"0\",\n" +
-				"        \"stoveCheckStatus\": \"0\",\n" +
-				"        \"hoseCheckStatus\": \"0\",\n" +
-				"        \"valveCheckStatus\": \"0\",\n" +
-				"        \"bottleCheckStatus\": \"0\",\n" +
-				"        \"alarmCheckStatus\": \"0\",\n" +
-				"        \"placeCheckStatus\": \"0\",\n" +
-				"\n" +
-				"        \"stoveCheckPic\": \"0\",\n" +
-				"        \"hoseCheckPic\": \"0\",\n" +
-				"        \"valveCheckPic\": \"0\",\n" +
-				"        \"bottleCheckPic\": \"0\",\n" +
-				"        \"alarmCheckPic\": \"0\",\n" +
-				"        \"placeCheckPic\": \"0\",\n" +
+				"        \"stationName\": \"储备站-接口来的-01\",\n" +
+				"        \"deliveryPerson\": \"配送人-接口来的-01\",\n" +
+				"        \"vehicleCode\": \"车辆代码-接口来的-01\",\n" +
+				"        \"gasUserType\": \"1\",\n" +
+				"        \"deliveryAddress\": \"配送地址-接口来的-01\",\n" +
+				"        \"deliveryDate\": \"2024-12-21 23:12:20\"\n" +
 				"    },\n" +
 				"    {\n" +
-				"        \"userOwnId\": \"2\",\n" +
-				"        \"stationName\": \"储备站01-接口来的-01\",\n" +
-				"        \"gasUser\": \"用户名01-接口来的-01\",\n" +
-				"        \"telNum\": \"电话01-接口来的-01\",\n" +
-				"        \"gasUserAddress\": \"用户地址01-接口来的-01\",\n" +
-				"        \"gasUserType\": \"用户类型-接口来的-01\",\n" +
-				"        \"safeCheckDate\": \"2024-12-16\",\n" +
-				"        \"safeCheckPerson\": \"安检人-接口来的-01\",\n" +
-				"        \"bottleNum\": \"设定净重-接口来的-01\",\n" +
-				"        \"checkInStatus\": \"入户状态01-接口来的-01\",\n" +
-				"        \"stoveCheckStatus\": \"0\",\n" +
-				"        \"hoseCheckStatus\": \"0\",\n" +
-				"        \"valveCheckStatus\": \"0\",\n" +
-				"        \"bottleCheckStatus\": \"0\",\n" +
-				"        \"alarmCheckStatus\": \"0\",\n" +
-				"        \"placeCheckStatus\": \"0\",\n" +
-				"\n" +
-				"        \"stoveCheckPic\": \"0\",\n" +
-				"        \"hoseCheckPic\": \"0\",\n" +
-				"        \"valveCheckPic\": \"0\",\n" +
-				"        \"bottleCheckPic\": \"0\",\n" +
-				"        \"alarmCheckPic\": \"0\",\n" +
-				"        \"placeCheckPic\": \"0\",\n" +
+				"        \"bottleCode\": \"222222\",\n" +
+				"        \"userOwnId\": \"89\",\n" +
+				"        \"stationName\": \"储备站-接口来的-01\",\n" +
+				"        \"deliveryPerson\": \"配送人-接口来的-01\",\n" +
+				"        \"vehicleCode\": \"车辆代码-接口来的-01\",\n" +
+				"        \"gasUserType\": \"0\",\n" +
+				"        \"deliveryAddress\": \"配送地址-接口来的-01\",\n" +
+				"        \"deliveryDate\": \"2024-12-21 23:12:21\"\n" +
 				"    }\n" +
 				"]\n" +
 				"\n";

zh-baseversion-system/src/main/java/com/zehong/system/domain/TLpgDeliveryRecord.java

@@ -57,6 +57,11 @@ public class TLpgDeliveryRecord extends BaseEntity
 
     private Long userId;
 
+    /**
+     * 用户自有编号 第三方对接时接收下数据先
+     */
+    private String userOwnId;
+
     public void setDeliveryRecordId(Long deliveryRecordId) 
     {
         this.deliveryRecordId = deliveryRecordId;
@@ -156,6 +161,13 @@ public class TLpgDeliveryRecord extends BaseEntity
         this.userId = userId;
     }
 
+    public String getUserOwnId() {
+        return userOwnId;
+    }
+
+    public void setUserOwnId(String userOwnId) {
+        this.userOwnId = userOwnId;
+    }
 
     @Override
     public String toString() {

zh-baseversion-system/src/main/java/com/zehong/system/service/ITLpgDeliveryRecordService.java

@@ -51,6 +51,14 @@ public interface ITLpgDeliveryRecordService
      */
     public int insertTLpgDeliveryRecord(TLpgDeliveryRecord tLpgDeliveryRecord);
 
+
+    /**
+     * 批量插入
+     * @param tLpgDeliveryRecords t
+     * @return r
+     */
+    public int insertBatch(List<TLpgDeliveryRecord> tLpgDeliveryRecords);
+
     /**
      * 修改液化石油配送记录
      * 

zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TLpgDeliveryRecordServiceImpl.java

@@ -157,6 +157,11 @@ public class TLpgDeliveryRecordServiceImpl implements ITLpgDeliveryRecordService
         return tLpgDeliveryRecordMapper.insertTLpgDeliveryRecord(tLpgDeliveryRecord);
     }
 
+    @Override
+    public int insertBatch(List<TLpgDeliveryRecord> tLpgDeliveryRecords) {
+        return tLpgDeliveryRecordMapper.insertBatch(tLpgDeliveryRecords);
+    }
+
     /**
      * 修改液化石油配送记录
      *