Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
soss
Overview
Overview
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
hooloo
ms
soss
Commits
6987837e
Commit
6987837e
authored
Apr 15, 2023
by
weijiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加错误日志
parent
ce1ffe8c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletions
+6
-1
soss-admin/src/main/java/com/soss/web/controller/coffee/ApplicationController.java
+6
-1
No files found.
soss-admin/src/main/java/com/soss/web/controller/coffee/ApplicationController.java
View file @
6987837e
...
@@ -14,6 +14,7 @@ import com.soss.system.service.impl.OrderTakingServiceImpl;
...
@@ -14,6 +14,7 @@ import com.soss.system.service.impl.OrderTakingServiceImpl;
import
com.soss.system.service.impl.ShopServiceImpl
;
import
com.soss.system.service.impl.ShopServiceImpl
;
import
com.soss.system.utils.DistanceUtil
;
import
com.soss.system.utils.DistanceUtil
;
import
io.jsonwebtoken.lang.Assert
;
import
io.jsonwebtoken.lang.Assert
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.redis.core.StringRedisTemplate
;
import
org.springframework.data.redis.core.StringRedisTemplate
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
...
@@ -22,6 +23,7 @@ import java.util.concurrent.TimeUnit;
...
@@ -22,6 +23,7 @@ import java.util.concurrent.TimeUnit;
@RestController
@RestController
@RequestMapping
(
"/application"
)
@RequestMapping
(
"/application"
)
@Slf4j
public
class
ApplicationController
{
public
class
ApplicationController
{
@Autowired
@Autowired
StringRedisTemplate
stringRedisTemplate
;
StringRedisTemplate
stringRedisTemplate
;
...
@@ -99,6 +101,8 @@ public class ApplicationController {
...
@@ -99,6 +101,8 @@ public class ApplicationController {
throw
new
ServiceException
(
"该机器未绑定店铺,请先绑定店铺"
);
throw
new
ServiceException
(
"该机器未绑定店铺,请先绑定店铺"
);
}
}
log
.
info
(
"jgRegister, machineCode:{}, screenNo:{}, registerId:{}"
,
machineCode
,
screenNo
,
screenNo
);
if
(
screenNo
==
null
)
{
if
(
screenNo
==
null
)
{
screenNo
=
1
;
screenNo
=
1
;
}
}
...
@@ -111,8 +115,9 @@ public class ApplicationController {
...
@@ -111,8 +115,9 @@ public class ApplicationController {
machineService
.
saveMachineScreenRef
(
Integer
.
parseInt
(
machine
.
getId
()),
screenNo
,
registerId
);
machineService
.
saveMachineScreenRef
(
Integer
.
parseInt
(
machine
.
getId
()),
screenNo
,
registerId
);
return
AjaxResult
.
success
();
return
AjaxResult
.
success
();
}
}
@RequestMapping
(
"/getOrderTaking"
)
@RequestMapping
(
"/getOrderTaking"
)
public
AjaxResult
getOrderTaking
(
String
machineCode
){
public
AjaxResult
getOrderTaking
(
String
machineCode
)
{
return
AjaxResult
.
success
(
orderTakingService
.
getMachineInfo
(
machineCode
));
return
AjaxResult
.
success
(
orderTakingService
.
getMachineInfo
(
machineCode
));
}
}
...
...
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