Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
tianjin-cement
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
竹天卫
tianjin-cement
Commits
1097cf30
Commit
1097cf30
authored
Oct 20, 2020
by
竹天卫
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://111.203.232.171:8888/zhutianwei/tianjin-cement
parents
24f1891d
062f06d3
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
54 additions
and
0 deletions
+54
-0
CabinetController.java
...wise/sc/cement/business/controller/CabinetController.java
+13
-0
SampleController.java
.../wise/sc/cement/business/controller/SampleController.java
+41
-0
No files found.
cement-business/src/main/java/cn/wise/sc/cement/business/controller/CabinetController.java
View file @
1097cf30
...
...
@@ -10,7 +10,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.DeleteMapping
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.PutMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
...
...
@@ -68,5 +70,16 @@ public class CabinetController {
return
BaseResponse
.
okData
(
iCabinetService
.
page
(
page
));
}
@DeleteMapping
(
"/{id}"
)
@ApiOperation
(
"删除柜子"
)
public
BaseResponse
<
Boolean
>
delete
(
@PathVariable
(
"id"
)
Integer
id
){
boolean
removeById
=
iCabinetService
.
removeById
(
id
);
if
(
removeById
){
return
BaseResponse
.
okData
(
true
);
}
else
{
return
BaseResponse
.
errorMsg
(
"删除失败!"
);
}
}
}
cement-business/src/main/java/cn/wise/sc/cement/business/controller/SampleController.java
View file @
1097cf30
...
...
@@ -4,11 +4,13 @@ import cn.hutool.core.codec.Base64;
import
cn.hutool.core.collection.CollectionUtil
;
import
cn.hutool.core.util.StrUtil
;
import
cn.hutool.extra.qrcode.QrCodeUtil
;
import
cn.wise.sc.cement.business.entity.Cabinet
;
import
cn.wise.sc.cement.business.model.BaseResponse
;
import
cn.wise.sc.cement.business.model.PageQuery
;
import
cn.wise.sc.cement.business.model.query.SampleManageQuery
;
import
cn.wise.sc.cement.business.service.ISampleService
;
import
cn.wise.sc.cement.business.service.ISysDictionaryService
;
import
cn.wise.sc.cement.business.util.RedisUtil
;
import
com.alibaba.fastjson.JSON
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiImplicitParam
;
...
...
@@ -17,6 +19,7 @@ import io.swagger.annotations.ApiOperation;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.scheduling.annotation.AsyncResult
;
import
org.springframework.web.bind.annotation.*
;
import
javax.imageio.ImageIO
;
...
...
@@ -47,6 +50,8 @@ public class SampleController {
private
ISampleService
sampleService
;
@Autowired
private
ISysDictionaryService
dictionaryService
;
@Autowired
RedisUtil
redisUtil
;
@ApiOperation
(
value
=
"样品分页列表"
)
@ApiImplicitParams
(
value
=
{
...
...
@@ -63,6 +68,7 @@ public class SampleController {
return
BaseResponse
.
errorMsg
(
"失败!"
);
}
@ApiOperation
(
"样品列表导出"
)
@PostMapping
(
"/export"
)
public
void
export
(
String
sampleName
,
String
cementCode
,
...
...
@@ -151,6 +157,41 @@ public class SampleController {
}
private
static
final
String
CABINET_KEY
=
"CABINET:CACHE:"
;
public
BaseResponse
<
String
>
newCabinet
(
String
cabinetName
)
{
if
(
StrUtil
.
isBlank
(
cabinetName
))
{
return
BaseResponse
.
errorMsg
(
"柜子名不能为空!"
);
}
//如果存在
if
(
redisUtil
.
existsKey
(
CABINET_KEY
))
{
String
cabinetStr
=
redisUtil
.
getString
(
CABINET_KEY
).
toString
();
List
<
String
>
list
=
JSON
.
parseObject
(
cabinetStr
,
ArrayList
.
class
);
list
.
add
(
cabinetName
);
String
newCabinetStr
=
JSON
.
toJSONString
(
list
);
redisUtil
.
setString
(
newCabinetStr
,
CABINET_KEY
);
return
BaseResponse
.
okData
(
newCabinetStr
);
}
else
{
List
<
String
>
list
=
new
ArrayList
<>();
list
.
add
(
cabinetName
);
String
newCabinetStr
=
JSON
.
toJSONString
(
list
);
redisUtil
.
setString
(
CABINET_KEY
,
newCabinetStr
);
return
BaseResponse
.
okData
(
newCabinetStr
);
}
}
public
BaseResponse
<
String
>
editCabinet
(
String
cabinetNames
)
{
if
(
StrUtil
.
isBlank
(
cabinetNames
))
{
redisUtil
.
setString
(
CABINET_KEY
,
cabinetNames
);
return
BaseResponse
.
okData
(
"更新成功!"
);
}
else
{
return
BaseResponse
.
errorMsg
(
"更新字符串不能为空!"
);
}
}
@ApiOperation
(
value
=
"样品销毁"
)
@PostMapping
(
"/destruction/{id}"
)
public
BaseResponse
destruction
(
@PathVariable
Integer
id
)
{
...
...
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