重整配置文件至可用

.gitignore

@@ -40,3 +40,4 @@ Icon?
 ehthumbs.db
 Thumbs.db
 /*/target/*
+/.idea/misc.xml

.idea/misc.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="19" project-jdk-type="JavaSDK" />
-</project>
\ No newline at end of file

jyzb-process/pom.xml

@@ -33,19 +33,24 @@
             <artifactId>amqp-client</artifactId>
             <version>5.9.0</version>
         </dependency>
-
+        <!--引入rabbitmq的相关依赖-->
+<!--        <dependency>-->
+<!--            <groupId>com.rabbitmq</groupId>-->
+<!--            <artifactId>amqp-client</artifactId>-->
+<!--            <version>5.7.2</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
             <version>3.3.2</version>
         </dependency>
 
-        <!-- 整合到spring项目需要导入此依赖 -->
-        <dependency>
-            <groupId>org.springframework.amqp</groupId>
-            <artifactId>spring-rabbit</artifactId>
-            <version>2.3.10</version>
-        </dependency>
+<!--        &lt;!&ndash; 整合到spring项目需要导入此依赖 &ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.amqp</groupId>-->
+<!--            <artifactId>spring-rabbit</artifactId>-->
+<!--            <version>2.3.10</version>-->
+<!--        </dependency>-->
 
 
         <dependency>

jyzb-process/src/main/java/com/junmp/junmpProcess/controller/BpmnController.java

@@ -51,7 +51,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static com.junmp.junmpProcess.common.CommonConstants.*;
 
 @Slf4j
 @RestController

jyzb-process/src/main/java/com/junmp/junmpProcess/listener/CounterSignListener.java

@@ -27,7 +27,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static com.junmp.junmpProcess.common.CommonConstants.START_USER_INFO;
 import static com.junmp.junmpProcess.utils.BpmnModelUtils.getChildNode;
 
 /**

jyzb-process/src/main/java/com/junmp/junmpProcess/listener/GlobalEndListener.java

 package com.junmp.junmpProcess.listener;
 
 import com.junmp.junmpProcess.utils.RabbitMQUtils2;
+//import com.rabbitmq.client.Channel;
+//import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
+import com.rabbitmq.client.MessageProperties;
 import lombok.SneakyThrows;
 import org.flowable.common.engine.api.delegate.event.FlowableEngineEntityEvent;
 import org.flowable.common.engine.api.delegate.event.FlowableEngineEventType;
@@ -41,8 +44,8 @@ public class GlobalEndListener extends AbstractFlowableEngineEventListener {
 
         Connection connection = RabbitMQUtils2.getConnection();
         Channel channel = connection.createChannel();
-
-        channel.basicPublish("", "info",null,null);
+        channel.queueDeclare("info",false,false,false,null);
+        channel.basicPublish("", "info", MessageProperties.PERSISTENT_TEXT_PLAIN,("publish").getBytes());
 
         RabbitMQUtils2.closeChannelAndConnection(connection,channel);
     }

jyzb-process/src/main/java/com/junmp/junmpProcess/utils/RabbitMQUtils.java

@@ -12,11 +12,11 @@ public class RabbitMQUtils {
     static{
         //重量级资源  类加载执行之执行一次
         connectionFactory = new ConnectionFactory();
-        connectionFactory.setHost("124.222.235.52");
+        connectionFactory.setHost("192.168.3.188");
         connectionFactory.setPort(5672);
         connectionFactory.setVirtualHost("/");
-        connectionFactory.setUsername("guest");
-        connectionFactory.setPassword("guest");
+        connectionFactory.setUsername("root");
+        connectionFactory.setPassword("123456");
 
     }
 

jyzb-process/target/classes/com/junmp/junmpProcess/mapper/xml/OrgUserMapper.xml

@@ -6,12 +6,18 @@
         <!--@Table base_cabinet-->
         <result column="user_id" jdbcType="VARCHAR" property="userID" />
         <result column="real_name" jdbcType="VARCHAR" property="realName" />
-        <result column="role_name" jdbcType="VARCHAR" property="roleName" />
-        <result column="role_id" jdbcType="VARCHAR" property="roleID" />
     </resultMap>
 
     <select id="QueryUserByRoleId"   resultMap="UserListDTO">
-        SELECT su.user_id,su.real_name,sr.role_name,sr.role_id FROM `sys_role` sr left join sys_user_role sur on  sr.role_id=sur.role_id LEFT JOIN sys_user su on sur.user_id=su.user_id
-        where sr.role_id=#{roleId}
+        SELECT su.user_id,su.real_name FROM `sys_role` sr  join sys_user_role sur on  sr.role_id=sur.role_id  JOIN sys_user su on sur.user_id=su.user_id
+        where sr.role_id in ${roleId}
+        GROUP BY su.user_id,su.real_name
+    </select>
+
+    <select id="QueryUserByRoleIdAndOrg"   resultMap="UserListDTO">
+        SELECT su.user_id,su.real_name FROM `sys_role` sr  join sys_user_role sur on  sr.role_id=sur.role_id  JOIN sys_user su on sur.user_id=su.user_id
+        join sys_user_org suo on suo.user_id=su.user_id join pub_org po on po.org_id=suo.org_id
+        where sr.role_id in ${roleId} and po.org_id in ${orgId}
+        GROUP BY su.user_id,su.real_name
     </select>
 </mapper>
\ No newline at end of file

jyzb-process/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

 com\junmp\junmpProcess\dto\PageDTO.class
+com\junmp\junmpProcess\utils\RabbitMQUtils.class
 com\junmp\junmpProcess\entity\Process.class
 com\junmp\junmpProcess\dto\json\flowJson\FlowConditionNodes.class
 com\junmp\junmpProcess\dto\json\FormItemProps.class
@@ -24,6 +25,7 @@ com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$2.class
 com\junmp\junmpProcess\service\Repository\impl\TemplateGroupServiceImpl.class
 com\junmp\junmpProcess\dto\json\FormOperates.class
 com\junmp\junmpProcess\mapper\TemplateGroupMapper.class
+com\junmp\junmpProcess\common\RabbitMqProducer.class
 com\junmp\junmpProcess\mapper\FormGroupsMapper.class
 com\junmp\junmpProcess\service\Repository\WorkspaceProcessService.class
 com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$13.class
@@ -56,21 +58,29 @@ com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl.class
 com\junmp\junmpProcess\utils\ExUtils$2.class
 com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$1.class
 com\junmp\junmpProcess\vo\MultiVO.class
+com\junmp\junmpProcess\dto\json\ApproverGroups.class
 com\junmp\junmpProcess\service\Repository\impl\UserServiceImpl.class
 com\junmp\junmpProcess\dto\json\flowJson\FlowNode.class
 com\junmp\junmpProcess\utils\DateUtils$5.class
+com\junmp\junmpProcess\utils\JsonToELConverter.class
+com\junmp\junmpProcess\dto\json\JunmpUserInfo.class
 com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$7.class
 com\junmp\junmpProcess\entity\FormGroups.class
 com\junmp\junmpProcess\listener\ProcessListener.class
 com\junmp\junmpProcess\dto\json\FormItem.class
 com\junmp\junmpProcess\dto\FlowDTO.class
+com\junmp\junmpProcess\dto\UserListDTO.class
+com\junmp\junmpProcess\config\FlowableGlobListenerConfig.class
 com\junmp\junmpProcess\dto\json\flowJson\FlowApproverGroups.class
 com\junmp\junmpProcess\dto\json\GroupsInfo.class
+com\junmp\junmpProcess\listener\GlobalEndListener.class
 com\junmp\junmpProcess\utils\IdWorker.class
 com\junmp\junmpProcess\entity\TemplateGroup$TemplateGroupBuilder.class
 com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$11.class
+com\junmp\junmpProcess\service\Bussiness\impl\OrgUserServicelmpl.class
 com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$12.class
 com\junmp\junmpProcess\utils\DateUtils$4.class
+com\junmp\junmpProcess\utils\BpmnConvert.class
 com\junmp\junmpProcess\doc\BpmnDoc.class
 com\junmp\junmpProcess\utils\SpringContextHolder.class
 com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$3.class
@@ -79,11 +89,13 @@ com\junmp\junmpProcess\service\Bussiness\OrgUserAndDeptService.class
 com\junmp\junmpProcess\utils\DateUtils$1.class
 com\junmp\junmpProcess\entity\Departments.class
 com\junmp\junmpProcess\utils\DateUtils$7.class
+com\junmp\junmpProcess\mapper\OrgUserMapper.class
 com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$6.class
 com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$9.class
 com\junmp\junmpProcess\service\Repository\FormGroupService.class
 com\junmp\junmpProcess\entity\ProcessTemplates$ProcessTemplatesBuilder.class
 com\junmp\junmpProcess\service\Repository\impl\DepartmentsServiceImpl.class
+com\junmp\junmpProcess\utils\RabbitMQUtils2.class
 com\junmp\junmpProcess\listener\TimerListener.class
 com\junmp\junmpProcess\service\Repository\impl\WorkspaceProcessServiceImpl.class
 com\junmp\junmpProcess\job\CustomJobCmd.class
@@ -99,6 +111,7 @@ com\junmp\junmpProcess\vo\OrgTreeVo$OrgTreeVoBuilder.class
 com\junmp\junmpProcess\dto\TaskDTO.class
 com\junmp\junmpProcess\utils\BpmnModelUtils$Type.class
 com\junmp\junmpProcess\dto\json\flowJson\FlowChildNode.class
+com\junmp\junmpProcess\vo\UpdateProcessVO.class
 com\junmp\junmpProcess\entity\ProcessTemplates.class
 com\junmp\junmpProcess\dto\json\SettingsInfo.class
 com\junmp\junmpProcess\utils\DateUtils$2.class

pom.xml

@@ -131,17 +131,13 @@
                 <artifactId>v2-log-boot-starter</artifactId>
                 <version>${junmp.v2.version}</version>
             </dependency>
-            <!--引入rabbitmq的相关依赖-->
-            <dependency>
-                <groupId>com.rabbitmq</groupId>
-                <artifactId>amqp-client</artifactId>
-                <version>5.7.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-amqp</artifactId>
-                <version>1.5.10.RELEASE</version>
-            </dependency>
+<!--            &lt;!&ndash;引入rabbitmq的相关依赖&ndash;&gt;-->
+<!--            <dependency>-->
+<!--                <groupId>com.rabbitmq</groupId>-->
+<!--                <artifactId>amqp-client</artifactId>-->
+<!--                <version>5.7.2</version>-->
+<!--            </dependency>-->
+
 
             <dependency>
                 <groupId>com.junmp.v2</groupId>