Commit 286b6e39 by 李小惠

修改代码

parent a1f765aa
...@@ -101,3 +101,7 @@ Thumbs.db ...@@ -101,3 +101,7 @@ Thumbs.db
/jyzb-mq/jyzb-mq-producer/target/maven-archiver/pom.properties /jyzb-mq/jyzb-mq-producer/target/maven-archiver/pom.properties
/jyzb-biz/jyzb-biz.iml /jyzb-biz/jyzb-biz.iml
/jyzb-biz/src/main/java/com/junmp/jyzb/config/rabbitMQ/RabbitmqConfig.java /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
...@@ -2,8 +2,10 @@ package com.junmp.jyzb.api.bean.req; ...@@ -2,8 +2,10 @@ package com.junmp.jyzb.api.bean.req;
import lombok.Data; import lombok.Data;
import java.io.Serializable;
@Data @Data
public class DetailListReq { public class DetailListReq implements Serializable {
/** /**
* 类型 * 类型
*/ */
......
...@@ -98,5 +98,10 @@ ...@@ -98,5 +98,10 @@
<groupId>com.junmp.v2</groupId> <groupId>com.junmp.v2</groupId>
<artifactId>message-boot-starter</artifactId> <artifactId>message-boot-starter</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>
...@@ -63,7 +63,7 @@ public class OrderController { ...@@ -63,7 +63,7 @@ public class OrderController {
//内部处理,任务单状态直接设置成finished 添加到数据并且直接推送到消息队列中去 //内部处理,任务单状态直接设置成finished 添加到数据并且直接推送到消息队列中去
@PostMapping("/AddFinishOrder") @PostMapping("/AddFinishOrder")
@ApiOperation("新增已完成的任务单") @ApiOperation("新增已完成的任务单")
public ApiRes<String> AddFinishOrder(@RequestBody UpdateOrderReq req) throws JsonProcessingException { public ApiRes<String> AddFinishOrder(@RequestBody UpdateOrderReq req) {
req.setExamineState("finished"); req.setExamineState("finished");
return ApiRes.success(orderService.AddFinishOrder(req)); return ApiRes.success(orderService.AddFinishOrder(req));
} }
......
...@@ -5,9 +5,33 @@ import lombok.*; ...@@ -5,9 +5,33 @@ import lombok.*;
import java.io.Serializable; import java.io.Serializable;
@Data @Data
@AllArgsConstructor
@NoArgsConstructor
public class MessageWrapper implements Serializable { public class MessageWrapper implements Serializable {
private Object object; private Object object;
private String type; 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;
}
} }
...@@ -16,7 +16,7 @@ import java.util.Map; ...@@ -16,7 +16,7 @@ import java.util.Map;
public interface OrderService extends IService<OrderMain> { public interface OrderService extends IService<OrderMain> {
String AddOrder(UpdateOrderReq req); String AddOrder(UpdateOrderReq req);
String AddFinishOrder(UpdateOrderReq req) throws JsonProcessingException; String AddFinishOrder(UpdateOrderReq req);
Boolean updateOrder(UpdateOrderReq req); Boolean updateOrder(UpdateOrderReq req);
......
...@@ -73,7 +73,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain> i ...@@ -73,7 +73,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain> i
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
public String AddFinishOrder(UpdateOrderReq req) throws JsonProcessingException { public String AddFinishOrder(UpdateOrderReq req) {
OrderMain order = new OrderMain(); OrderMain order = new OrderMain();
BeanPlusUtil.copyProperties(req, order); BeanPlusUtil.copyProperties(req, order);
//保存 //保存
...@@ -113,7 +113,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain> i ...@@ -113,7 +113,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain> i
Exchange exchange = new DirectExchange(exchangeName, true, false); Exchange exchange = new DirectExchange(exchangeName, true, false);
rabbitAdmin.declareQueue(queue); rabbitAdmin.declareQueue(queue);
rabbitAdmin.declareExchange(exchange); rabbitAdmin.declareExchange(exchange);
rabbitAdmin.declareBinding(BindingBuilder.bind(queue).to(exchange).with(req.getStartOrgId()).noargs()); rabbitAdmin.declareBinding(BindingBuilder.bind(queue).to(exchange).with(req.getEndOrgId()).noargs());
rabbitTemplate.convertAndSend(exchangeName, req.getEndOrgId(), req); rabbitTemplate.convertAndSend(exchangeName, req.getEndOrgId(), req);
} }
......
...@@ -110,10 +110,6 @@ ...@@ -110,10 +110,6 @@
<groupId>org.springframework.integration</groupId> <groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-mqtt</artifactId> <artifactId>spring-integration-mqtt</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
...@@ -26,9 +26,9 @@ knife4j: ...@@ -26,9 +26,9 @@ knife4j:
spring: spring:
datasource: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.3.128:3306/db_jyzb?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true url: jdbc:mysql://127.0.0.1:3306/junmp?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
username: junmp username: root
password: 123456 password: vkeline
redis: redis:
#host: 192.168.3.188 #host: 192.168.3.188
......
...@@ -12,10 +12,10 @@ spring: ...@@ -12,10 +12,10 @@ spring:
application: application:
name: jyzb-app name: jyzb-app
rabbitmq: rabbitmq:
host: 192.168.3.188 host: 127.0.0.1
port: 5672 port: 5672
username: root username: guest
password: 123456 password: guest
listener: listener:
simple: simple:
acknowledge-mode: MANUAL acknowledge-mode: MANUAL
......
...@@ -295,12 +295,6 @@ ...@@ -295,12 +295,6 @@
<artifactId>ws-api</artifactId> <artifactId>ws-api</artifactId>
<version>${junmp.v2.version}</version> <version>${junmp.v2.version}</version>
</dependency> </dependency>
<!--字符串转对象-->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.12.5</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论