Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
YeeAmosFireAutoSysRoot
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
station
YeeAmosFireAutoSysRoot
Commits
02cac15c
Commit
02cac15c
authored
Aug 18, 2020
by
zhengjiawei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
消防整改 注解
parent
bae66871
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
63 additions
and
4 deletions
+63
-4
FireParamBo.java
...in/java/com/yeejoin/amos/fas/business/bo/FireParamBo.java
+1
-1
FireRectificationController.java
.../fas/business/controller/FireRectificationController.java
+0
-2
FireRectificationMapper.java
...amos/fas/business/dao/mapper/FireRectificationMapper.java
+15
-1
FireRectificationServiceImpl.java
...s/business/service/impl/FireRectificationServiceImpl.java
+31
-0
FireRectificationService.java
.../fas/business/service/intfc/FireRectificationService.java
+16
-0
No files found.
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/bo/FireParamBo.java
View file @
02cac15c
...
@@ -6,7 +6,7 @@ import lombok.Data;
...
@@ -6,7 +6,7 @@ import lombok.Data;
import
java.util.List
;
import
java.util.List
;
@Data
@Data
@ApiModel
(
description
=
"消防整改
消防要求
实体类"
)
@ApiModel
(
description
=
"消防整改
单据修改
实体类"
)
public
class
FireParamBo
{
public
class
FireParamBo
{
private
List
<
FireMoreDataBo
>
warnningData
;
private
List
<
FireMoreDataBo
>
warnningData
;
private
List
<
FireMoreDataBo
>
hiddenData
;
private
List
<
FireMoreDataBo
>
hiddenData
;
...
...
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/FireRectificationController.java
View file @
02cac15c
...
@@ -14,11 +14,9 @@ import org.springframework.web.bind.annotation.RequestBody;
...
@@ -14,11 +14,9 @@ import org.springframework.web.bind.annotation.RequestBody;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.typroject.tyboot.core.foundation.enumeration.UserType
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
/**
/**
...
...
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/FireRectificationMapper.java
View file @
02cac15c
...
@@ -8,16 +8,30 @@ import java.util.List;
...
@@ -8,16 +8,30 @@ import java.util.List;
import
java.util.Map
;
import
java.util.Map
;
public
interface
FireRectificationMapper
extends
BaseMapper
{
public
interface
FireRectificationMapper
extends
BaseMapper
{
/**
* 查询当前页数据和数量
* @param param
* @return
*/
List
<
FireRectificationBo
>
queryFiresAndCount
(
Map
<
String
,
Object
>
param
);
List
<
FireRectificationBo
>
queryFiresAndCount
(
Map
<
String
,
Object
>
param
);
long
countQueryFireList
(
Map
<
String
,
Object
>
param
);
long
countQueryFireList
(
Map
<
String
,
Object
>
param
);
/**
* 查询详细信息
* @param billNo
* @return
*/
FireRectificationBo
selectOneForBase
(
String
billNo
);
FireRectificationBo
selectOneForBase
(
String
billNo
);
List
<
FireMoreDataBo
>
selectOneForEmergency
(
String
billNo
);
List
<
FireMoreDataBo
>
selectOneForEmergency
(
String
billNo
);
List
<
FireMoreDataBo
>
selectOneForDanger
(
String
billNo
);
List
<
FireMoreDataBo
>
selectOneForDanger
(
String
billNo
);
List
<
FireMoreDataBo
>
selectOneForHidden
(
String
billNo
);
List
<
FireMoreDataBo
>
selectOneForHidden
(
String
billNo
);
FireInfoBo
selectOneForfire
(
String
billNo
,
int
id
);
FireInfoBo
selectOneForfire
(
String
billNo
,
int
id
);
/**
* 修改单据及其相关信息
* @param param
* @return
*/
int
updateBill
(
Map
<
String
,
String
>
param
);
int
updateBill
(
Map
<
String
,
String
>
param
);
int
updateWarnning
(
FireMoreDataBo
param
);
int
updateWarnning
(
FireMoreDataBo
param
);
int
updateHidden
(
FireMoreDataBo
param
);
int
updateHidden
(
FireMoreDataBo
param
);
...
...
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/FireRectificationServiceImpl.java
View file @
02cac15c
...
@@ -30,6 +30,16 @@ public class FireRectificationServiceImpl implements FireRectificationService {
...
@@ -30,6 +30,16 @@ public class FireRectificationServiceImpl implements FireRectificationService {
@Value
(
"${file.downLoad.url}"
)
@Value
(
"${file.downLoad.url}"
)
private
String
ipUrl
;
private
String
ipUrl
;
/**
* 根据条件查询对应单据
* @param nameLike 单据模糊查询
* @param sDate 起始日
* @param eDate 终止日
* @param states 状态
* @param pageNum 页码
* @param pageSize
* @return
*/
@Override
@Override
public
Map
<
String
,
Object
>
queryFiresAndCount
(
String
nameLike
,
String
sDate
,
String
eDate
,
int
states
,
int
pageNum
,
int
pageSize
)
{
public
Map
<
String
,
Object
>
queryFiresAndCount
(
String
nameLike
,
String
sDate
,
String
eDate
,
int
states
,
int
pageNum
,
int
pageSize
)
{
if
(
nameLike
.
trim
().
equals
(
""
)){
if
(
nameLike
.
trim
().
equals
(
""
)){
...
@@ -51,6 +61,11 @@ public class FireRectificationServiceImpl implements FireRectificationService {
...
@@ -51,6 +61,11 @@ public class FireRectificationServiceImpl implements FireRectificationService {
return
map
;
return
map
;
}
}
/**
* 查询详细单据信息
* @param billNo
* @return
*/
@Override
@Override
public
Map
<
String
,
Object
>
selectOneById
(
String
billNo
)
{
public
Map
<
String
,
Object
>
selectOneById
(
String
billNo
)
{
Map
<
String
,
Object
>
result
=
new
HashMap
();
Map
<
String
,
Object
>
result
=
new
HashMap
();
...
@@ -72,6 +87,11 @@ public class FireRectificationServiceImpl implements FireRectificationService {
...
@@ -72,6 +87,11 @@ public class FireRectificationServiceImpl implements FireRectificationService {
return
result
;
return
result
;
}
}
/**
* 下载文件
* @param path
* @param response
*/
@Override
@Override
public
void
downLoadFilesByUrll
(
String
path
,
HttpServletResponse
response
)
{
public
void
downLoadFilesByUrll
(
String
path
,
HttpServletResponse
response
)
{
List
<
String
>
list
=
Arrays
.
asList
(
path
.
split
(
","
));
List
<
String
>
list
=
Arrays
.
asList
(
path
.
split
(
","
));
...
@@ -82,6 +102,11 @@ public class FireRectificationServiceImpl implements FireRectificationService {
...
@@ -82,6 +102,11 @@ public class FireRectificationServiceImpl implements FireRectificationService {
}
}
}
}
/**
* 修改单据相关信息
* @param paramBo
* @return
*/
@Override
@Override
public
Map
<
String
,
String
>
updateByid
(
FireParamBo
paramBo
)
{
public
Map
<
String
,
String
>
updateByid
(
FireParamBo
paramBo
)
{
Map
<
String
,
String
>
map
=
new
HashMap
<>();
Map
<
String
,
String
>
map
=
new
HashMap
<>();
...
@@ -121,6 +146,12 @@ public class FireRectificationServiceImpl implements FireRectificationService {
...
@@ -121,6 +146,12 @@ public class FireRectificationServiceImpl implements FireRectificationService {
return
map
;
return
map
;
}
}
/**
* 判空
* @param data
* @param list
* @return
*/
public
boolean
isDataEmpty
(
String
data
,
List
<
FireMoreDataBo
>
list
)
{
public
boolean
isDataEmpty
(
String
data
,
List
<
FireMoreDataBo
>
list
)
{
if
(
data
!=
null
){
if
(
data
!=
null
){
return
!(
""
).
equals
(
data
);
return
!(
""
).
equals
(
data
);
...
...
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/FireRectificationService.java
View file @
02cac15c
...
@@ -22,9 +22,25 @@ public interface FireRectificationService {
...
@@ -22,9 +22,25 @@ public interface FireRectificationService {
* @return
* @return
*/
*/
Map
<
String
,
Object
>
queryFiresAndCount
(
String
nameLike
,
String
sDate
,
String
eDate
,
int
states
,
int
pageNum
,
int
pageSize
);
Map
<
String
,
Object
>
queryFiresAndCount
(
String
nameLike
,
String
sDate
,
String
eDate
,
int
states
,
int
pageNum
,
int
pageSize
);
/**
* 查询详细单据信息
* @param billNo
* @return
*/
Map
<
String
,
Object
>
selectOneById
(
String
billNo
);
Map
<
String
,
Object
>
selectOneById
(
String
billNo
);
/**
* 下载文件
* @param path
* @param response
*/
void
downLoadFilesByUrll
(
String
path
,
HttpServletResponse
response
);
void
downLoadFilesByUrll
(
String
path
,
HttpServletResponse
response
);
/**
* 修改单据相关信息
* @param paramBo
* @return
*/
Map
<
String
,
String
>
updateByid
(
FireParamBo
paramBo
);
Map
<
String
,
String
>
updateByid
(
FireParamBo
paramBo
);
}
}
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