Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
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
项目统一框架
amos-boot-biz
Commits
d5dec841
Commit
d5dec841
authored
Dec 27, 2021
by
kongfm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
气瓶相关接口调整
parent
df5e85dc
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
19 additions
and
10 deletions
+19
-10
CylinderInfoDto.java
...oin/amos/boot/module/tzs/flc/api/dto/CylinderInfoDto.java
+1
-1
CylinderUnitDto.java
...oin/amos/boot/module/tzs/flc/api/dto/CylinderUnitDto.java
+2
-2
CylinderInfo.java
...oin/amos/boot/module/tzs/flc/api/entity/CylinderInfo.java
+3
-3
CylinderUnit.java
...oin/amos/boot/module/tzs/flc/api/entity/CylinderUnit.java
+2
-2
IEquipmentInformService.java
...t/module/tzs/flc/api/service/IEquipmentInformService.java
+9
-0
CylinderInfoMapper.xml
...-tzs-api/src/main/resources/mapper/CylinderInfoMapper.xml
+2
-2
tzs-1.0.0.0.xml
...ystem-tzs/src/main/resources/db/changelog/tzs-1.0.0.0.xml
+0
-0
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderInfoDto.java
View file @
d5dec841
...
...
@@ -82,6 +82,6 @@ public class CylinderInfoDto extends BaseDto {
private
Boolean
syncState
;
@ApiModelProperty
(
value
=
"对接公司编码"
)
private
String
ap
iCompanyCode
;
private
String
ap
pId
;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderUnitDto.java
View file @
d5dec841
...
...
@@ -90,8 +90,8 @@ public class CylinderUnitDto extends BaseDto {
@ApiModelProperty
(
value
=
"1初次同步数据 2上层系统已同步数据 0已删除数据"
)
private
Boolean
syncState
;
@ApiModelProperty
(
value
=
"对接公司编码"
)
private
String
apiCompanyCode
;
@ApiModelProperty
(
value
=
"对接公司编码"
)
private
String
appId
;
@ApiModelProperty
(
value
=
"气瓶数量"
)
private
Long
cylinderNumber
;
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderInfo.java
View file @
d5dec841
...
...
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.yeejoin.amos.boot.biz.common.entity.BaseEntity
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.experimental.Accessors
;
...
...
@@ -150,7 +151,6 @@ public class CylinderInfo {
/**
* 对接公司编码
*/
@TableField
(
"api_company_code"
)
private
String
apiCompanyCode
;
@TableField
(
"app_id"
)
private
String
appId
;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderUnit.java
View file @
d5dec841
...
...
@@ -168,8 +168,8 @@ public class CylinderUnit {
/**
* 对接公司编码
*/
@TableField
(
"api_company_code
"
)
private
String
ap
iCompanyCode
;
@TableField
(
"app_id
"
)
private
String
ap
pId
;
/**
* 经度
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/service/IEquipmentInformService.java
View file @
d5dec841
...
...
@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tzs.flc.api.service;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yeejoin.amos.boot.biz.common.bo.ReginParams
;
import
com.yeejoin.amos.boot.module.tzs.flc.api.dto.EquipmentInformDto
;
import
java.util.List
;
...
...
@@ -19,4 +20,12 @@ public interface IEquipmentInformService {
Page
<
EquipmentInformDto
>
queryDtoList
(
Page
<
EquipmentInformDto
>
page
,
EquipmentInformDto
equipmentInformDto
,
String
sortParam
,
String
sortRule
);
Boolean
batchDelete
(
List
<
Long
>
sequenceNbrList
);
Boolean
acceptInform
(
Long
sequenceNbr
);
EquipmentInformDto
updateEquipmentInform
(
EquipmentInformDto
model
);
EquipmentInformDto
queryDtoBySeq
(
Long
sequenceNbr
);
Boolean
startWorkflow
(
Long
sequenceNbr
,
ReginParams
userInfo
)
throws
Exception
;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/CylinderInfoMapper.xml
View file @
d5dec841
...
...
@@ -11,9 +11,9 @@
tz_cylinder_info t
WHERE
t.sequence_nbr IN ( SELECT max( tt.sequence_nbr ) FROM tz_cylinder_info tt GROUP BY tt.sequence_code )
AND t.ap
i_company_code
= (
AND t.ap
p_id
= (
SELECT
u.ap
i_company_code
u.ap
p_id
FROM
tz_cylinder_unit u
WHERE
...
...
amos-boot-system-tzs/src/main/resources/db/changelog/tzs-1.0.0.0.xml
View file @
d5dec841
This diff is collapsed.
Click to expand it.
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