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
8390b127
Commit
8390b127
authored
Jun 10, 2021
by
罗贤顺
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复问题
parent
b0108612
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
TProcessesBlastdesignHoleServiceImpl.java
...ss/service/impl/TProcessesBlastdesignHoleServiceImpl.java
+1
-2
application-dev.yml
acquisition-business/src/main/resources/application-dev.yml
+3
-2
No files found.
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastdesignHoleServiceImpl.java
View file @
8390b127
...
...
@@ -239,7 +239,6 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
Rcode
.
NOT_PARAM
.
assertNotNull
(
query
.
getX
());
Rcode
.
NOT_PARAM
.
assertNotNull
(
query
.
getY
());
Rcode
.
NOT_PARAM
.
assertNotNull
(
query
.
getZ
());
Rcode
.
NOT_PARAM
.
assertNotNull
(
query
.
getDrillingDate
());
//uid自动生成 不能手动设置
if
(
query
.
getUid
()
!=
null
)
{
return
R
.
failed
(
"炮孔设计中->uid自动生成 不能手动设置"
);
...
...
@@ -301,7 +300,7 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
tProcessesDrillingQuery
.
setUid
(
hole
.
getUid
());
//设置当前登录人(穿孔的制表人)
cn
.
wise
.
im
.
common
.
http
.
R
str
=
itSysUserService
.
getLoginUser
();
if
(
str
.
getCode
()
!
=
0
)
{
if
(
str
.
getCode
()
=
=
0
)
{
log
.
error
(
"炮孔设计中->获取当前登录人错误:{}"
,
JSON
.
toJSONString
(
str
));
return
R
.
failed
(
str
.
getMessage
());
}
...
...
acquisition-business/src/main/resources/application-dev.yml
View file @
8390b127
...
...
@@ -19,8 +19,9 @@ spring:
connection-test-query
:
SELECT 1
redis
:
port
:
6379
host
:
localhost
# password: Wise_@123456
# host: localhost
host
:
192.168.110.85
# password: Wise_@123456
servlet
:
multipart
:
max-file-size
:
100MB
...
...
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