Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
J
jyzb_platformV2
概览
Overview
Details
Activity
Cycle Analytics
版本库
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
问题
0
Issues
0
列表
Board
标记
里程碑
合并请求
0
Merge Requests
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
Snippets
成员
Members
Collapse sidebar
Close sidebar
活动
图像
聊天
创建新问题
作业
提交
Issue Boards
Open sidebar
赵剑炜
jyzb_platformV2
Commits
286b6e39
Commit
286b6e39
authored
Aug 24, 2023
by
李小惠
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改代码
parent
a1f765aa
显示空白字符变更
内嵌
并排
正在显示
11 个修改的文件
包含
48 行增加
和
23 行删除
+48
-23
.gitignore
.gitignore
+4
-0
DetailListReq.java
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/DetailListReq.java
+3
-1
pom.xml
jyzb-biz/pom.xml
+5
-0
OrderController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/OrderController.java
+1
-1
MessageWrapper.java
jyzb-biz/src/main/java/com/junmp/jyzb/entity/MessageWrapper.java
+26
-2
OrderService.java
jyzb-biz/src/main/java/com/junmp/jyzb/service/OrderService.java
+1
-1
OrderServiceImpl.java
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderServiceImpl.java
+2
-2
pom.xml
jyzb-boot/pom.xml
+0
-4
application-local.yml
jyzb-boot/src/main/resources/application-local.yml
+3
-3
application.yml
jyzb-boot/src/main/resources/application.yml
+3
-3
pom.xml
pom.xml
+0
-6
没有找到文件。
.gitignore
View file @
286b6e39
...
...
@@ -101,3 +101,7 @@ Thumbs.db
/jyzb-mq/jyzb-mq-producer/target/maven-archiver/pom.properties
/jyzb-biz/jyzb-biz.iml
/jyzb-biz/src/main/java/com/junmp/jyzb/config/rabbitMQ/RabbitmqConfig.java
/jyzb-boot/src/main/resources/application.yml
/jyzb-boot/src/main/resources/application-local.yml
/jyzb-boot/src/main/resources/application.yml
/jyzb-boot/src/main/resources/application-local.yml
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/DetailListReq.java
View file @
286b6e39
...
...
@@ -2,8 +2,10 @@ package com.junmp.jyzb.api.bean.req;
import
lombok.Data
;
import
java.io.Serializable
;
@Data
public
class
DetailListReq
{
public
class
DetailListReq
implements
Serializable
{
/**
* 类型
*/
...
...
jyzb-biz/pom.xml
View file @
286b6e39
...
...
@@ -98,5 +98,10 @@
<groupId>
com.junmp.v2
</groupId>
<artifactId>
message-boot-starter
</artifactId>
</dependency>
<dependency>
<groupId>
com.fasterxml.jackson.core
</groupId>
<artifactId>
jackson-databind
</artifactId>
</dependency>
</dependencies>
</project>
jyzb-biz/src/main/java/com/junmp/jyzb/controller/OrderController.java
View file @
286b6e39
...
...
@@ -63,7 +63,7 @@ public class OrderController {
//内部处理,任务单状态直接设置成finished 添加到数据并且直接推送到消息队列中去
@PostMapping
(
"/AddFinishOrder"
)
@ApiOperation
(
"新增已完成的任务单"
)
public
ApiRes
<
String
>
AddFinishOrder
(
@RequestBody
UpdateOrderReq
req
)
throws
JsonProcessingException
{
public
ApiRes
<
String
>
AddFinishOrder
(
@RequestBody
UpdateOrderReq
req
)
{
req
.
setExamineState
(
"finished"
);
return
ApiRes
.
success
(
orderService
.
AddFinishOrder
(
req
));
}
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/entity/MessageWrapper.java
View file @
286b6e39
...
...
@@ -5,9 +5,33 @@ import lombok.*;
import
java.io.Serializable
;
@Data
@AllArgsConstructor
@NoArgsConstructor
public
class
MessageWrapper
implements
Serializable
{
private
Object
object
;
private
String
type
;
public
MessageWrapper
()
{
}
public
MessageWrapper
(
Object
object
,
String
type
)
{
this
.
object
=
object
;
this
.
type
=
type
;
}
// getter和setter方法
public
Object
getObject
()
{
return
object
;
}
public
void
setObject
(
Object
object
)
{
this
.
object
=
object
;
}
public
String
getType
()
{
return
type
;
}
public
void
setType
(
String
type
)
{
this
.
type
=
type
;
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/OrderService.java
View file @
286b6e39
...
...
@@ -16,7 +16,7 @@ import java.util.Map;
public
interface
OrderService
extends
IService
<
OrderMain
>
{
String
AddOrder
(
UpdateOrderReq
req
);
String
AddFinishOrder
(
UpdateOrderReq
req
)
throws
JsonProcessingException
;
String
AddFinishOrder
(
UpdateOrderReq
req
);
Boolean
updateOrder
(
UpdateOrderReq
req
);
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderServiceImpl.java
View file @
286b6e39
...
...
@@ -73,7 +73,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain> i
@Transactional
(
rollbackFor
=
Exception
.
class
)
@Override
public
String
AddFinishOrder
(
UpdateOrderReq
req
)
throws
JsonProcessingException
{
public
String
AddFinishOrder
(
UpdateOrderReq
req
)
{
OrderMain
order
=
new
OrderMain
();
BeanPlusUtil
.
copyProperties
(
req
,
order
);
//保存
...
...
@@ -113,7 +113,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain> i
Exchange
exchange
=
new
DirectExchange
(
exchangeName
,
true
,
false
);
rabbitAdmin
.
declareQueue
(
queue
);
rabbitAdmin
.
declareExchange
(
exchange
);
rabbitAdmin
.
declareBinding
(
BindingBuilder
.
bind
(
queue
).
to
(
exchange
).
with
(
req
.
get
Start
OrgId
()).
noargs
());
rabbitAdmin
.
declareBinding
(
BindingBuilder
.
bind
(
queue
).
to
(
exchange
).
with
(
req
.
get
End
OrgId
()).
noargs
());
rabbitTemplate
.
convertAndSend
(
exchangeName
,
req
.
getEndOrgId
(),
req
);
}
...
...
jyzb-boot/pom.xml
View file @
286b6e39
...
...
@@ -110,10 +110,6 @@
<groupId>
org.springframework.integration
</groupId>
<artifactId>
spring-integration-mqtt
</artifactId>
</dependency>
<dependency>
<groupId>
com.fasterxml.jackson.core
</groupId>
<artifactId>
jackson-databind
</artifactId>
</dependency>
</dependencies>
<build>
...
...
jyzb-boot/src/main/resources/application-local.yml
View file @
286b6e39
...
...
@@ -26,9 +26,9 @@ knife4j:
spring
:
datasource
:
driver-class-name
:
com.mysql.cj.jdbc.Driver
url
:
jdbc:mysql://1
92.168.3.128:3306/db_jyzb
?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
username
:
junmp
password
:
123456
url
:
jdbc:mysql://1
27.0.0.1:3306/junmp
?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
username
:
root
password
:
vkeline
redis
:
#host: 192.168.3.188
...
...
jyzb-boot/src/main/resources/application.yml
View file @
286b6e39
...
...
@@ -12,10 +12,10 @@ spring:
application
:
name
:
jyzb-app
rabbitmq
:
host
:
1
92.168.3.188
host
:
1
27.0.0.1
port
:
5672
username
:
roo
t
password
:
123456
username
:
gues
t
password
:
guest
listener
:
simple
:
acknowledge-mode
:
MANUAL
...
...
pom.xml
View file @
286b6e39
...
...
@@ -295,12 +295,6 @@
<artifactId>
ws-api
</artifactId>
<version>
${junmp.v2.version}
</version>
</dependency>
<!--字符串转对象-->
<dependency>
<groupId>
com.fasterxml.jackson.core
</groupId>
<artifactId>
jackson-databind
</artifactId>
<version>
2.12.5
</version>
</dependency>
</dependencies>
</dependencyManagement>
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论