Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
D
data-acquisition
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
竹天卫
data-acquisition
Commits
0212e23f
Commit
0212e23f
authored
May 20, 2021
by
renchao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
生产工序业务修改
parent
9f4b90a5
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
41 additions
and
6 deletions
+41
-6
TProcessesDrillingController.java
...ion/business/controller/TProcessesDrillingController.java
+13
-0
ProjectEnum.java
...n/wise/sc/acquisition/business/enumation/ProjectEnum.java
+2
-1
ITProcessesDrillingService.java
...uisition/business/service/ITProcessesDrillingService.java
+1
-0
TProcessesDrillingServiceImpl.java
.../business/service/impl/TProcessesDrillingServiceImpl.java
+25
-5
No files found.
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesDrillingController.java
View file @
0212e23f
...
@@ -64,6 +64,19 @@ public class TProcessesDrillingController {
...
@@ -64,6 +64,19 @@ public class TProcessesDrillingController {
}
}
/**
* 修改所有爆破日期
*
* @param tProcessesDrillingQuery
* @return
*/
@ApiOperation
(
value
=
"修改所有爆破日期"
)
@RequestMapping
(
value
=
"/updateAllBlastDate"
,
method
=
RequestMethod
.
POST
)
public
R
updateAllBlastDate
(
@RequestBody
TProcessesDrillingQuery
tProcessesDrillingQuery
)
{
return
itProcessesDrillingService
.
updateAllBlastDate
(
tProcessesDrillingQuery
);
}
/**
/**
* 根据uid获取详细信息
* 根据uid获取详细信息
*
*
...
...
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/enumation/ProjectEnum.java
View file @
0212e23f
...
@@ -759,7 +759,8 @@ public class ProjectEnum {
...
@@ -759,7 +759,8 @@ public class ProjectEnum {
DESIGN_HOLE_SPACE
(
8
,
"DesignHoleSpace"
,
"设计孔距(m)"
),
DESIGN_HOLE_SPACE
(
8
,
"DesignHoleSpace"
,
"设计孔距(m)"
),
STEP_HEIGHT
(
9
,
"StepHeight"
,
"台阶高度"
),
STEP_HEIGHT
(
9
,
"StepHeight"
,
"台阶高度"
),
HOLE_BLAST_VOLUME
(
10
,
"HoleBlastVolume"
,
"单孔爆破量"
),
HOLE_BLAST_VOLUME
(
10
,
"HoleBlastVolume"
,
"单孔爆破量"
),
HOLE_ID
(
10
,
"HoleID"
,
"炮孔编号"
);
BLAST_DATE
(
11
,
"BlastDate"
,
"爆破日期"
),
HOLE_ID
(
12
,
"HoleID"
,
"炮孔编号"
);
// 成员变量
// 成员变量
private
int
value
;
private
int
value
;
...
...
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesDrillingService.java
View file @
0212e23f
...
@@ -24,6 +24,7 @@ public interface ITProcessesDrillingService extends IService<TProcessesDrilling>
...
@@ -24,6 +24,7 @@ public interface ITProcessesDrillingService extends IService<TProcessesDrilling>
R
updateHoleBlastVolume
(
TProcessesDrillingQuery
query
);
R
updateHoleBlastVolume
(
TProcessesDrillingQuery
query
);
R
updateAllBlastDate
(
TProcessesDrillingQuery
query
);
R
getByUid
(
TProcessesDrillingQuery
query
);
R
getByUid
(
TProcessesDrillingQuery
query
);
...
...
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesDrillingServiceImpl.java
View file @
0212e23f
...
@@ -109,7 +109,7 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
...
@@ -109,7 +109,7 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
//参数校验
//参数校验
Rcode
.
NOT_PARAM
.
assertNotNull
(
query
);
Rcode
.
NOT_PARAM
.
assertNotNull
(
query
);
//tag不能添加
//tag不能添加
if
(
StringUtils
.
isNotBlank
(
query
.
getTag
())){
if
(
StringUtils
.
isNotBlank
(
query
.
getTag
()))
{
return
R
.
failed
(
"穿孔工序中->tag标注日期自动生成,不能添加"
);
return
R
.
failed
(
"穿孔工序中->tag标注日期自动生成,不能添加"
);
}
}
//条件封装
//条件封装
...
@@ -126,7 +126,7 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
...
@@ -126,7 +126,7 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
if
(
insert
>
0
)
{
if
(
insert
>
0
)
{
return
R
.
ok
(
"穿孔工序中->增加成功"
);
return
R
.
ok
(
"穿孔工序中->增加成功"
);
}
else
{
}
else
{
log
.
error
(
"穿孔工序中->增加失败,{}"
,
JSON
.
toJSONString
(
tProcessesDrilling
));
log
.
error
(
"穿孔工序中->增加失败,{}"
,
JSON
.
toJSONString
(
tProcessesDrilling
));
return
R
.
failed
(
"穿孔工序中->增加失败"
);
return
R
.
failed
(
"穿孔工序中->增加失败"
);
}
}
}
}
...
@@ -148,7 +148,7 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
...
@@ -148,7 +148,7 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
return
R
.
failed
(
"穿孔工序中->不能修改炮孔编号"
);
return
R
.
failed
(
"穿孔工序中->不能修改炮孔编号"
);
}
}
//不能修改tag
//不能修改tag
if
(
StringUtils
.
isNotBlank
(
query
.
getTag
())){
if
(
StringUtils
.
isNotBlank
(
query
.
getTag
()))
{
return
R
.
failed
(
"穿孔工序中->tag标注日期自动生成,不能修改"
);
return
R
.
failed
(
"穿孔工序中->tag标注日期自动生成,不能修改"
);
}
}
//条件封装
//条件封装
...
@@ -232,7 +232,7 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
...
@@ -232,7 +232,7 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
if
(
update
>
0
)
{
if
(
update
>
0
)
{
return
R
.
ok
(
"穿孔工序中->修改成功"
);
return
R
.
ok
(
"穿孔工序中->修改成功"
);
}
else
{
}
else
{
log
.
error
(
"穿孔工序中->修改失败:{}"
,
JSON
.
toJSONString
(
temp
));
log
.
error
(
"穿孔工序中->修改失败:{}"
,
JSON
.
toJSONString
(
temp
));
return
R
.
failed
(
"穿孔工序中->修改失败"
);
return
R
.
failed
(
"穿孔工序中->修改失败"
);
}
}
}
}
...
@@ -259,7 +259,7 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
...
@@ -259,7 +259,7 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
if
(
update
>
0
)
{
if
(
update
>
0
)
{
return
R
.
ok
(
"穿孔工序中->修改成功"
);
return
R
.
ok
(
"穿孔工序中->修改成功"
);
}
else
{
}
else
{
log
.
error
(
"穿孔工序中->修改失败:{}"
,
JSON
.
toJSONString
(
temp
));
log
.
error
(
"穿孔工序中->修改失败:{}"
,
JSON
.
toJSONString
(
temp
));
return
R
.
failed
(
"穿孔工序中->修改失败"
);
return
R
.
failed
(
"穿孔工序中->修改失败"
);
}
}
}
}
...
@@ -280,6 +280,26 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
...
@@ -280,6 +280,26 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
}
}
@Override
public
R
updateAllBlastDate
(
TProcessesDrillingQuery
query
)
{
log
.
info
(
JSON
.
toJSONString
(
query
));
//参数校验
Rcode
.
NOT_PARAM
.
assertNotNull
(
query
);
Rcode
.
NOT_PARAM
.
assertNotNull
(
query
.
getBlastDate
());
//封装条件
QueryWrapper
<
TProcessesDrilling
>
queryWrapper
=
new
QueryWrapper
<>();
//封装实体
TProcessesDrilling
tProcessesDrilling
=
new
TProcessesDrilling
();
tProcessesDrilling
.
setBlastDate
(
query
.
getBlastDate
());
int
update
=
baseMapper
.
update
(
tProcessesDrilling
,
queryWrapper
);
if
(
update
>
0
)
{
return
R
.
ok
(
"穿孔工序中->修改爆破日期成功"
);
}
else
{
log
.
error
(
"穿孔工序中->修改爆破日期失败:{}"
,
JSON
.
toJSONString
(
tProcessesDrilling
));
return
R
.
failed
(
"穿孔工序中->修改爆破日期失败"
);
}
}
/**
/**
* 计算并设值 单孔爆破量(m3)=孔距*排距*台阶高度
* 计算并设值 单孔爆破量(m3)=孔距*排距*台阶高度
*/
*/
...
...
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