1

.gitignore

@@ -115,4 +115,121 @@ Thumbs.db
 /jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateOrderReq.java
 /jyzb-boot/src/main/resources/application-local.yml
 /jyzb-boot/src/main/resources/application-local.yml
+/jyzb-process/target
+/jyzb-api/target/
+/jyzb-biz/target/
+##ignore this file##
+/target/
+
+.classpath
+.project
+/.settings/
+ ##filter databfile、sln file##
+*.mdb
+*.ldb
+*.sln
+##class file##
+*.com
+*.class
+*.dll
+*.exe
+*.o
+*.so
+# compression file
+*.7z
+*.dmg
+*.gz
+*.iso
+*.jar
+*.rar
+*.tar
+*.zip
+*.via
+*.tmp
+*.err
+# OS generated files #
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+Icon?
+ehthumbs.db
+Thumbs.db
+/*/target/*
+/.idea/misc.xml
+/.idea/jyzb_platformV2.iml
+/.idea/artifacts/jyzb3.xml
+/jyzb-mq/jyzb-mq-consumer/target/classes/application.yml
+/jyzb-mq/jyzb-mq-producer/target/classes/application.yml
+/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
+/jyzb-mq/jyzb-mq-producer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+/jyzb-mq/jyzb-mq-producer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+/jyzb-mq/jyzb-mq-producer/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
+/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+/jyzb-boot/src/main/resources/application.yml
+/jyzb-boot/pom.xml
+/.idea/encodings.xml
+/jyzb-api/jyzb-api.iml
+/jyzb-boot/pom.xml
+/jyzb-boot/src/main/resources/application-local.yml
+/.idea/modules.xml
+/.idea/modules.xml
+/jyzb-biz/jyzb-biz.iml
+/.idea/modules.xml
+/jyzb-boot/jyzb-boot.iml
+/jyzb-mq/jyzb-mq-producer/jyzb-mq-producer.iml
+/jyzb-mq/jyzb-mq-consumer/jyzb-mq-consumer.iml
+/.idea/modules.xml
+/.idea/compiler.xml
+/.idea/modules.xml
+/.idea/dataSources.xml
+/.idea/mybatisx/templates.xml
+/.idea/dataSources.xml
+/pom.xml
+/.idea/compiler.xml
+/.idea/modules.xml
+/pom.xml
+/jyzb-biz/jyzb-biz.iml
+/jyzb-biz/jyzb-biz.iml
+/jyzb-mq/jyzb-mq-producer/pom.xml
+/jyzb-biz/jyzb-biz.iml
+/jyzb-mq/pom.xml
+/jyzb-mq/jyzb-mq.iml
+/jyzb-mq/jyzb-mq-consumer/pom.xml
+/jyzb-mq/jyzb-mq-consumer/src/main/java/com/junmp/jyzb/config/DirectRabbitConfig.java
+/jyzb-mq/jyzb-mq-consumer/src/main/java/com/junmp/jyzb/config/DirectReceiver.java
+/jyzb-mq/jyzb-mq-consumer/src/main/java/com/junmp/jyzb/config/DirectReceiver.java.orig
+/jyzb-mq/jyzb-mq-consumer/src/main/java/com/junmp/jyzb/controller/SendMsgController.java
+/jyzb-mq/jyzb-mq-consumer/src/main/java/com/junmp/jyzb/MqConsumerApplication.java
+/jyzb-mq/jyzb-mq-consumer/src/main/resources/application.yml
+/jyzb-mq/jyzb-mq-consumer/target/maven-archiver/pom.properties
+/jyzb-mq/jyzb-mq-producer/src/main/java/com/junmp/jyzb/config/DirectRabbitConfig.java
+/jyzb-mq/jyzb-mq-producer/src/main/java/com/junmp/jyzb/controller/SendMsgController.java
+/jyzb-mq/jyzb-mq-producer/src/main/java/com/junmp/jyzb/MqProducerApplication.java
+/jyzb-mq/jyzb-mq-producer/src/main/resources/application.yml
+/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-boot/src/main/resources/application.yml
+/jyzb-boot/src/main/resources/application-local.yml
+/pom.xml
+/pom.xml
+/jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderMainServiceImpl.java.orig
+/jyzb-biz/pom.xml
+/.idea/compiler.xml
+/jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateOrderReq.java
+/jyzb-boot/src/main/resources/application-local.yml
+/jyzb-boot/src/main/resources/application-local.yml
 /jyzb-biz/jyzb-biz.iml

.gitignore.orig

-/jyzb-process/target
-/jyzb-api/target/
-/jyzb-biz/target/
-##ignore this file##
-/target/
-
-.classpath
-.project
-/.settings/
- ##filter databfile、sln file##
-*.mdb
-*.ldb
-*.sln
-##class file##
-*.com
-*.class
-*.dll
-*.exe
-*.o
-*.so
-# compression file
-*.7z
-*.dmg
-*.gz
-*.iso
-*.jar
-*.rar
-*.tar
-*.zip
-*.via
-*.tmp
-*.err
-# OS generated files #
-.DS_Store
-.DS_Store?
-._*
-.Spotlight-V100
-.Trashes
-Icon?
-ehthumbs.db
-Thumbs.db
-/*/target/*
-/.idea/misc.xml
-/.idea/jyzb_platformV2.iml
-/.idea/artifacts/jyzb3.xml
-/jyzb-mq/jyzb-mq-consumer/target/classes/application.yml
-/jyzb-mq/jyzb-mq-producer/target/classes/application.yml
-/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
-/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
-/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
-/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
-/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
-/jyzb-mq/jyzb-mq-producer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
-/jyzb-mq/jyzb-mq-producer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
-/jyzb-mq/jyzb-mq-producer/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
-/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
-/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
-/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
-/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
-/jyzb-boot/src/main/resources/application.yml
-/jyzb-boot/pom.xml
-/.idea/encodings.xml
-<<<<<<< HEAD
-/jyzb-boot/src/main/resources/application.yml
-=======
-/jyzb-api/jyzb-api.iml
-/jyzb-api/jyzb-api.iml
->>>>>>> develop

jyzb-boot/src/main/resources/application-local.yml

@@ -26,9 +26,9 @@ knife4j:
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    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: root
-    password: vkeline
+    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
+    username: junmp
+    password: 123456
 
   redis:
     #host: 192.168.3.188

jyzb-process/src/main/java/com/junmp/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl.java

@@ -284,8 +284,7 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
 
     @Override
     public Boolean suspendOrActivateProcessDefinitionById(SuspendOrActivateDefinitionReq req) {
-//        ProcessTemplates processTemplates = processTemplateService.getById(req.getTemplateId());
-        ProcessTemplates processTemplates = processTemplateService.getById(req.getProcessDefinitionId());
+        ProcessTemplates processTemplates = processTemplateService.getById(req.getFormId());
         if (req.getIsStop() == true){
             repositoryService.suspendProcessDefinitionById(req.getProcessDefinitionId(), true, null);
             processTemplates.setIsStop(true);
@@ -849,7 +848,7 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
             BpmnModel bpmnModel = repositoryService.getBpmnModel(historicProcessInstance.getProcessDefinitionId());
 
             String Name= bpmnModel.getMainProcess().getName();
-            historyProcessInstanceVO.setOrderID(MapUtil.getStr(processVariables, ORDER_ID));
+            historyProcessInstanceVO.setOrderId(MapUtil.getStr(processVariables, ORDER_ID));
             historyProcessInstanceVO.setOrderType(MapUtil.getStr(processVariables, ORDER_TYPE));
             historyProcessInstanceVO.setProcessDefinitionName(historicProcessInstance.getProcessDefinitionName());
             historyProcessInstanceVO.setStartUser(JSONObject.parseObject(MapUtil.getStr(processVariables, START_USER_INFO), new TypeReference<UserInfo>() {

jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/FlowTaskServiceImpl.java

@@ -43,6 +43,7 @@ import org.flowable.task.api.history.HistoricTaskInstance;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -362,7 +363,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             BpmnModel bpmnModel = repositoryService.getBpmnModel(historicProcessInstance.getProcessDefinitionId());
 
             String Name= bpmnModel.getMainProcess().getName();
-            historyProcessInstanceVO.setOrderID(MapUtil.getStr(processVariables, ORDER_ID));
+            historyProcessInstanceVO.setOrderId(MapUtil.getStr(processVariables, ORDER_ID));
             historyProcessInstanceVO.setOrderType(MapUtil.getStr(processVariables, ORDER_TYPE));
             historyProcessInstanceVO.setProcessDefinitionName(historicProcessInstance.getProcessDefinitionName());
             historyProcessInstanceVO.setStartUser(JSONObject.parseObject(MapUtil.getStr(processVariables, START_USER_INFO), new TypeReference<UserInfo>() {
@@ -398,7 +399,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
     public ApiRes<List<TaskDetailVO>> record(String processInstanceId) {
         List<Comment> processInstanceComments = taskService.getProcessInstanceComments(processInstanceId);
         Map<String, List<Comment>> commentsMap = processInstanceComments.stream()
-                .collect(Collectors.groupingBy(Comment::getTaskId));
+                .collect(Collectors.groupingBy(Comment::getTaskId, Collectors.toList()));
         List<Attachment> processInstanceAttachments = taskService.getProcessInstanceAttachments(processInstanceId);
         Map<String, List<Attachment>> attachmentMap = processInstanceAttachments.stream()
                 .collect(Collectors.groupingBy(Attachment::getTaskId));
@@ -478,7 +479,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                                     taskDetailVO.setSignImage(comment1.getFullMessage());
                                 }
                             }
-                            taskDetailVO.setComment(comments.get(0).getFullMessage());
+                            taskDetailVO.setComment(new String(comments.get(0).getFullMessage().getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8));
                             taskDetailVO.setAttachmentVOList(attachmentVOList);
                             taskDetailVOS.add(taskDetailVO);
                         }

jyzb-process/src/main/java/com/junmp/junmpProcess/vo/HistoryProcessInstanceVO.java

@@ -21,7 +21,7 @@ public class HistoryProcessInstanceVO {
     @ApiModelProperty("发起人")
     private UserInfo startUser;
     @ApiModelProperty("单据ID")
-    private String orderID;
+    private String orderId;
     @ApiModelProperty("单据类型")
     private String orderType;
     @ApiModelProperty("提交时间")