Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
zh-baseversion-project
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王浩
zh-baseversion-project
Commits
a9ce7ee1
Commit
a9ce7ee1
authored
Sep 19, 2024
by
wanghao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2 液化石油气-配送记录 外部接口开发。
parent
57f14343
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
317 additions
and
47 deletions
+317
-47
lpgGasController.java
...b/controller/externaldocking/lpggas/lpgGasController.java
+277
-2
DESEncoder.java
.../main/java/com/zehong/web/controller/tool/DESEncoder.java
+15
-45
TLpgDeliveryRecord.java
...ain/java/com/zehong/system/domain/TLpgDeliveryRecord.java
+12
-0
ITLpgDeliveryRecordService.java
...com/zehong/system/service/ITLpgDeliveryRecordService.java
+8
-0
TLpgDeliveryRecordServiceImpl.java
...ng/system/service/impl/TLpgDeliveryRecordServiceImpl.java
+5
-0
No files found.
zh-baseversion-admin/src/main/java/com/zehong/web/controller/externaldocking/lpggas/lpgGasController.java
View file @
a9ce7ee1
This diff is collapsed.
Click to expand it.
zh-baseversion-admin/src/main/java/com/zehong/web/controller/tool/DESEncoder.java
View file @
a9ce7ee1
...
@@ -160,54 +160,24 @@ public class DESEncoder {
...
@@ -160,54 +160,24 @@ public class DESEncoder {
String
lpggasdata
=
"[\n"
+
String
lpggasdata
=
"[\n"
+
" {\n"
+
" {\n"
+
" \"bottleCode\": \"32323\",\n"
+
" \"userOwnId\": \"1\",\n"
+
" \"userOwnId\": \"1\",\n"
+
" \"stationName\": \"储备站01-接口来的-01\",\n"
+
" \"stationName\": \"储备站-接口来的-01\",\n"
+
" \"gasUser\": \"用户名01-接口来的-01\",\n"
+
" \"deliveryPerson\": \"配送人-接口来的-01\",\n"
+
" \"telNum\": \"电话01-接口来的-01\",\n"
+
" \"vehicleCode\": \"车辆代码-接口来的-01\",\n"
+
" \"gasUserAddress\": \"用户地址01-接口来的-01\",\n"
+
" \"gasUserType\": \"1\",\n"
+
" \"gasUserType\": \"0\",\n"
+
" \"deliveryAddress\": \"配送地址-接口来的-01\",\n"
+
" \"safeCheckDate\": \"2024-12-16\",\n"
+
" \"deliveryDate\": \"2024-12-21 23:12:20\"\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"
+
" },\n"
+
" },\n"
+
" {\n"
+
" {\n"
+
" \"userOwnId\": \"2\",\n"
+
" \"bottleCode\": \"222222\",\n"
+
" \"stationName\": \"储备站01-接口来的-01\",\n"
+
" \"userOwnId\": \"89\",\n"
+
" \"gasUser\": \"用户名01-接口来的-01\",\n"
+
" \"stationName\": \"储备站-接口来的-01\",\n"
+
" \"telNum\": \"电话01-接口来的-01\",\n"
+
" \"deliveryPerson\": \"配送人-接口来的-01\",\n"
+
" \"gasUserAddress\": \"用户地址01-接口来的-01\",\n"
+
" \"vehicleCode\": \"车辆代码-接口来的-01\",\n"
+
" \"gasUserType\": \"用户类型-接口来的-01\",\n"
+
" \"gasUserType\": \"0\",\n"
+
" \"safeCheckDate\": \"2024-12-16\",\n"
+
" \"deliveryAddress\": \"配送地址-接口来的-01\",\n"
+
" \"safeCheckPerson\": \"安检人-接口来的-01\",\n"
+
" \"deliveryDate\": \"2024-12-21 23:12:21\"\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"
+
" }\n"
+
" }\n"
+
"]\n"
+
"]\n"
+
"\n"
;
"\n"
;
...
...
zh-baseversion-system/src/main/java/com/zehong/system/domain/TLpgDeliveryRecord.java
View file @
a9ce7ee1
...
@@ -57,6 +57,11 @@ public class TLpgDeliveryRecord extends BaseEntity
...
@@ -57,6 +57,11 @@ public class TLpgDeliveryRecord extends BaseEntity
private
Long
userId
;
private
Long
userId
;
/**
* 用户自有编号 第三方对接时接收下数据先
*/
private
String
userOwnId
;
public
void
setDeliveryRecordId
(
Long
deliveryRecordId
)
public
void
setDeliveryRecordId
(
Long
deliveryRecordId
)
{
{
this
.
deliveryRecordId
=
deliveryRecordId
;
this
.
deliveryRecordId
=
deliveryRecordId
;
...
@@ -156,6 +161,13 @@ public class TLpgDeliveryRecord extends BaseEntity
...
@@ -156,6 +161,13 @@ public class TLpgDeliveryRecord extends BaseEntity
this
.
userId
=
userId
;
this
.
userId
=
userId
;
}
}
public
String
getUserOwnId
()
{
return
userOwnId
;
}
public
void
setUserOwnId
(
String
userOwnId
)
{
this
.
userOwnId
=
userOwnId
;
}
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
...
...
zh-baseversion-system/src/main/java/com/zehong/system/service/ITLpgDeliveryRecordService.java
View file @
a9ce7ee1
...
@@ -51,6 +51,14 @@ public interface ITLpgDeliveryRecordService
...
@@ -51,6 +51,14 @@ public interface ITLpgDeliveryRecordService
*/
*/
public
int
insertTLpgDeliveryRecord
(
TLpgDeliveryRecord
tLpgDeliveryRecord
);
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
View file @
a9ce7ee1
...
@@ -157,6 +157,11 @@ public class TLpgDeliveryRecordServiceImpl implements ITLpgDeliveryRecordService
...
@@ -157,6 +157,11 @@ public class TLpgDeliveryRecordServiceImpl implements ITLpgDeliveryRecordService
return
tLpgDeliveryRecordMapper
.
insertTLpgDeliveryRecord
(
tLpgDeliveryRecord
);
return
tLpgDeliveryRecordMapper
.
insertTLpgDeliveryRecord
(
tLpgDeliveryRecord
);
}
}
@Override
public
int
insertBatch
(
List
<
TLpgDeliveryRecord
>
tLpgDeliveryRecords
)
{
return
tLpgDeliveryRecordMapper
.
insertBatch
(
tLpgDeliveryRecords
);
}
/**
/**
* 修改液化石油配送记录
* 修改液化石油配送记录
*
*
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment