Merge remote-tracking branch 'origin/master'

message/src/main/resources/application-prd.properties

@@ -47,9 +47,10 @@ spring.servlet.multipart.max-file-size=100MB
 spring.servlet.multipart.max-request-size=100MB
 spring.servlet.multipart.location=${logging.path}/data
 ######################################################RabbitMq\u914D\u7F6E#####################################################
-spring.rabbitmq.addresses=114.135.61.188:55672
-spring.rabbitmq.username=zoniot
-spring.rabbitmq.password=zcxk100
+spring.rabbitmq.host=47.112.217.10
+spring.rabbitmq.port=5672
+spring.rabbitmq.username=huaxu
+spring.rabbitmq.password=huaxu123
 spring.rabbitmq.virtual-host=/
 spring.rabbitmq.connection-timeout=15000
 spring.rabbitmq.publisher-confirm-type=correlated

operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderManageController.java

@@ -492,7 +492,7 @@ public class WorkOrderManageController {
         //巡检发送系统消息所需参数
         vars.put("工单类型",orderType);
         vars.put("工单编号",workOrderManage.getTaskNo());
-        vars.put("url",workOrderManage.getId());
+        vars.put("url",String.format("?id=%s",workOrderManage.getId().toString()));
         vars.put("templateId",7);
         vars.put("msgType",7);
         String startProcess = workFlowService.startProcess(processDefinition,vars);
@@ -508,7 +508,7 @@ public class WorkOrderManageController {
         workOrderManage.setUrgency(urgency);//紧急程度
         workOrderManage.setOrderUserId(orderUserId);//接单人ID
         workOrderManage.setDateLimit(dateLimit);
-        if(workOrderManage.getOrderPid() != null) {
+        if(orderPid != null) {
             workOrderManage.setOrderPid(Integer.parseInt(orderPid));
         }
         if(loginUser.getId() != null) {
@@ -587,7 +587,7 @@ public class WorkOrderManageController {
         LoginUser currentUser = UserUtil.getCurrentUser();
         WorkFlowLog workFlowLog=new WorkFlowLog();
         workFlowLog.setFlowId(id);
-        workFlowLog.setFlowType(1);
+        workFlowLog.setFlowType(2);
         workFlowLog.setFlowResult(remark);
         workFlowLog.setCreateBy(currentUser.getId()!=null?currentUser.getId().toString():null);
         workFlowLog.setDateCreate(new Date());

operation_manager/src/main/java/com/huaxu/task/controller/PlanManageController.java

@@ -206,7 +206,7 @@ public class PlanManageController {
         //巡检发送系统消息所需参数
         vars.put("任务类型",taskType);
         vars.put("任务编号",planManage.getPlanId());
-        vars.put("url",planManage.getId());
+        vars.put("url",String.format("?id=%s",planManage.getId().toString()));
         vars.put("templateId",4);
         vars.put("msgType",4);
         String startProcess = workFlowService.startProcess(processDefinition,vars);

user_center/src/main/resources/application-prd.properties

@@ -68,9 +68,10 @@ spring.cloud.nacos.discovery.server-addr=10.0.0.136:8848
 UMIS.sys_config_path=/UMIS_USER_IMAGES/
 UMIS.sys_excel_path=/UMIS_USER_EXCEL/
 #rabbit
-spring.rabbitmq.addresses=114.135.61.188:55672
-spring.rabbitmq.username=zoniot
-spring.rabbitmq.password=zcxk100
+spring.rabbitmq.host=47.112.217.10
+spring.rabbitmq.port=5672
+spring.rabbitmq.username=huaxu
+spring.rabbitmq.password=huaxu123
 spring.rabbitmq.virtual-host=/
 spring.rabbitmq.connection-timeout=15000
 spring.rabbitmq.publisher-confirm-type=correlated