加回工作流

pom.xml

@@ -807,6 +807,66 @@
             <artifactId>mpxj</artifactId>
             <version>10.11.0</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.example</groupId>
+            <artifactId>wflow-server</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/src/main/resources/lib/wflow-server-1.0-SNAPSHOT.jar</systemPath>
+        </dependency>
+
+        <dependency>
+            <groupId>org.flowable</groupId>
+            <artifactId>flowable-spring-boot-starter-actuator</artifactId>
+            <version>6.7.2</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-actuator</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.dev33</groupId>
+            <artifactId>sa-token-spring-boot-starter</artifactId>
+            <version>1.30.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.belerweb</groupId>
+            <artifactId>pinyin4j</artifactId>
+            <version>2.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.googlecode.aviator</groupId>
+            <artifactId>aviator</artifactId>
+            <version>5.3.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.javadelight</groupId>
+            <artifactId>delight-nashorn-sandbox</artifactId>
+            <version>0.3.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <version>2.12.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.fastjson2</groupId>
+            <artifactId>fastjson2</artifactId>
+            <version>2.0.40</version>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/com/zhgd/config/DataSourceOneConfig.java

@@ -0,0 +1,57 @@
+package com.zhgd.config;
+
+import com.baomidou.mybatisplus.core.MybatisConfiguration;
+import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
+import org.apache.ibatis.logging.stdout.StdOutImpl;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionTemplate;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.context.annotation.Primary;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+
+import javax.sql.DataSource;
+
+@Configuration
+@MapperScan(basePackages = {"com.zhgd.*.*.*.*.mapper", "com.zhgd.*.*.*.mapper"}, sqlSessionTemplateRef = "db1SqlSessionTemplate")
+public class DataSourceOneConfig {
+
+    @Bean
+    @ConfigurationProperties(prefix = "spring.datasource.db1")
+    public DataSource db1DataSource() {
+        return DataSourceBuilder.create().build();
+    }
+
+    @Bean
+    @Lazy  //这个是懒加载的注解，根据自己项目需要看是否添加
+    public SqlSessionFactory db1SqlSessionFactory(@Qualifier("db1DataSource") DataSource dataSource) throws Exception {
+        MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean();
+        bean.setDataSource(dataSource);
+        //开启驼峰
+        MybatisConfiguration configuration = new MybatisConfiguration();
+        configuration.setMapUnderscoreToCamelCase(true);
+        configuration.setLogImpl(StdOutImpl.class);
+        bean.setConfiguration(configuration);
+        bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath*:com/zhgd/xmgl/**/*.xml"));
+        return bean.getObject();
+    }
+
+    @Bean
+    @Primary
+    public DataSourceTransactionManager db1TransactionManager(@Qualifier("db1DataSource") DataSource dataSource) {
+        return new DataSourceTransactionManager(dataSource);
+    }
+
+    @Bean
+    @Primary
+    @Lazy
+    public SqlSessionTemplate db1SqlSessionTemplate(@Qualifier("db1SqlSessionFactory") SqlSessionFactory sqlSessionFactory) throws Exception {
+        return new SqlSessionTemplate(sqlSessionFactory);
+    }
+}

src/main/java/com/zhgd/config/DataSourceTwoConfig.java

@@ -0,0 +1,54 @@
+package com.zhgd.config;
+
+import com.baomidou.mybatisplus.core.MybatisConfiguration;
+import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
+import org.apache.ibatis.logging.stdout.StdOutImpl;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionTemplate;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+
+import javax.sql.DataSource;
+
+@Configuration
+@MapperScan(basePackages = "com.wflow.mapper", sqlSessionTemplateRef = "sqlSessionTemplate2")
+public class DataSourceTwoConfig {
+
+    @Primary
+    @Bean(name = "dataSource2")
+    @ConfigurationProperties(prefix = "spring.datasource.db2")
+    public DataSource dataSource() {
+        return DataSourceBuilder.create().build();
+    }
+
+    @Primary
+    @Bean(name = "sqlSessionFactory2")
+    public SqlSessionFactory db1SqlSessionFactory(@Qualifier("dataSource2") DataSource dataSource) throws Exception {
+        MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean();
+        bean.setDataSource(dataSource);
+        //开启驼峰
+        MybatisConfiguration configuration = new MybatisConfiguration();
+        configuration.setMapUnderscoreToCamelCase(true);
+        configuration.setLogImpl(StdOutImpl.class);
+        bean.setConfiguration(configuration);
+        bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath*:mapper/*.xml"));
+        return bean.getObject();
+    }
+
+    @Bean(name = "transactionManager2")
+    public DataSourceTransactionManager transactionManager(@Qualifier("dataSource2") DataSource dataSource) {
+        return new DataSourceTransactionManager(dataSource);
+    }
+
+    @Bean(name = "sqlSessionTemplate2")
+    public SqlSessionTemplate sqlSessionTemplate(@Qualifier("sqlSessionFactory2") SqlSessionFactory sqlSessionFactory) throws Exception {
+        return new SqlSessionTemplate(sqlSessionFactory);
+    }
+}

src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/CompanyMapper.java

@@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.basicdata.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.wflow.bean.vo.OrgTreeVo;
 import com.zhgd.jeecg.common.mybatis.EntityMap;
 import com.zhgd.xmgl.modules.basicdata.entity.Company;
 import com.zhgd.xmgl.modules.basicdata.entity.SystemUser;
@@ -51,4 +52,12 @@ public interface CompanyMapper extends BaseMapper<Company> {
      */
     Company getHeadquarterCompany(Map<String, Object> map);
 
+    /**
+     * 查询某部门下的子部门列表
+     *
+     * @param deptId 父部门
+     * @return 子部门列表，type字段固定返回固定值 dept
+     */
+    @Select("SELECT company_sn id, company_name `name`, 'dept' AS 'type' FROM company WHERE parent_id=#{deptId}")
+    List<OrgTreeVo> selectByDept(@Param("deptId") String deptId);
 }

src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemUserMapper.java

@@ -3,6 +3,9 @@ package com.zhgd.xmgl.modules.basicdata.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.wflow.bean.do_.DeptDo;
+import com.wflow.bean.do_.UserDeptDo;
+import com.wflow.bean.vo.OrgTreeVo;
 import com.zhgd.jeecg.common.mybatis.EntityMap;
 import com.zhgd.xmgl.modules.basicdata.entity.SystemUser;
 import org.apache.ibatis.annotations.Mapper;
@@ -57,4 +60,37 @@ public interface SystemUserMapper extends BaseMapper<SystemUser> {
 
     List<SystemUser> getTenantListBySn(Map<String, Object> map);
 
+    /**
+     * 查询该部门下的所有用户
+     *
+     * @param deptId 部门ID
+     * @return 用户列表 type为固定值user
+     */
+    @Select("SELECT user_id id, real_name `name`, 'user' AS 'type', avatar " +
+            "FROM system_user" +
+            " WHERE sn = #{deptId}")
+    List<OrgTreeVo> selectUsersByDept(@Param("deptId") String deptId);
+
+    /**
+     * 查询指定用户所在的部门，一个用户可能同时在多个部门下
+     *
+     * @param userId 用户ID
+     * @return 用户所在的部门列表
+     */
+    @Select("SELECT d.company_sn id, d.company_name FROM system_user u, company d WHERE u.sn = d.company_sn AND u.user_id = #{userId}")
+    List<DeptDo> getUserDepts(@Param("userId") String userId);
+
+    /**
+     * 批量查询指定用户及部门信息
+     *
+     * @param udIds 用户ID_部门id 字符串拼接的集合
+     * @return 用户部门信息列表
+     */
+    @Select({"<script>",
+            "SELECT tb.* FROM (SELECT CONCAT(wu.user_id, '_', wd.company_sn) tid, wu.user_id, wu.real_name, wd.company_sn, wu.avatar, wd.company_name",
+            "FROM system_user wu, company wd ",
+            "WHERE wu.sn = wd.company_sn) tb WHERE tb.tid IN",
+            "<foreach item='item' index='index' collection='list' open='(' separator=',' close=')'>#{item}</foreach>",
+            "</script>"})
+    List<UserDeptDo> getUserDepInfosBatch(@Param("list") Collection<String> udIds);
 }

src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/FlowOrgRepositoryServiceImpl.java

@@ -0,0 +1,202 @@
+package com.zhgd.xmgl.modules.basicdata.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.wflow.bean.do_.DeptDo;
+import com.wflow.bean.do_.RoleDo;
+import com.wflow.bean.do_.UserDeptDo;
+import com.wflow.bean.do_.UserDo;
+import com.wflow.bean.vo.ModelGroupVo;
+import com.wflow.bean.vo.OrgTreeVo;
+import com.wflow.bean.vo.UserVo;
+import com.wflow.service.OrgRepositoryService;
+import com.zhgd.xmgl.modules.basicdata.entity.BaseRoleUser;
+import com.zhgd.xmgl.modules.basicdata.entity.Company;
+import com.zhgd.xmgl.modules.basicdata.entity.SystemUser;
+import com.zhgd.xmgl.modules.basicdata.mapper.BaseRoleMapper;
+import com.zhgd.xmgl.modules.basicdata.mapper.BaseRoleUserMapper;
+import com.zhgd.xmgl.modules.basicdata.mapper.CompanyMapper;
+import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Primary
+@Service
+public class FlowOrgRepositoryServiceImpl implements OrgRepositoryService {
+
+    @Autowired
+    private SystemUserMapper systemUserMapper;
+
+    @Autowired
+    private BaseRoleUserMapper baseRoleUserMapper;
+
+    @Autowired
+    private BaseRoleMapper systemRoleMapper;
+
+    @Autowired
+    private CompanyMapper companyMapper;
+
+    @Override
+    public List<ModelGroupVo.Form> getModelsByPerm(String userId) {
+        return null;
+    }
+
+    @Override
+    public UserDo getUserById(String userId) {
+        SystemUser systemUser = systemUserMapper.selectById(userId);
+        if (Objects.nonNull(systemUser)) {
+            UserDo userDo = new UserDo();
+            userDo.setUserId(systemUser.getUserId().toString());
+            userDo.setUserName(systemUser.getRealName());
+            userDo.setAvatar(systemUser.getAvatar());
+            return userDo;
+        }
+        return null;
+    }
+
+    @Override
+    public List<OrgTreeVo> selectUsersByPy(String py) {
+        return null;
+    }
+
+    @Override
+    public List<OrgTreeVo> selectUsersByDept(String deptId) {
+        return systemUserMapper.selectUsersByDept(deptId);
+    }
+
+    @Override
+    public List<UserDo> getUsersBatch(Collection<String> userIds) {
+        try {
+            return systemUserMapper.selectBatchIds(userIds).stream()
+                    .map(u -> new UserDo(u.getUserId().toString(), u.getRealName(), u.getAvatar()))
+                    .collect(Collectors.toList());
+        } catch (Exception e) {
+            return Collections.emptyList();
+        }
+    }
+
+    @Override
+    public Set<String> getUsersByDepts(Collection<String> deptIds) {
+        try {
+            return systemUserMapper.selectList(
+                            new LambdaQueryWrapper<SystemUser>()
+                                    .select(SystemUser::getUserId)
+                                    .in(SystemUser::getDepartment, deptIds))
+                    .stream().map(Object::toString)
+                    .collect(Collectors.toSet());
+        } catch (Exception e) {
+            return Collections.emptySet();
+        }
+    }
+
+    @Override
+    public DeptDo getDeptById(String deptId) {
+        Company departments = companyMapper.selectOne(Wrappers.<Company>lambdaQuery().eq(Company::getCompanySn, deptId));
+        if (Objects.nonNull(departments)) {
+            DeptDo deptDo = new DeptDo();
+            deptDo.setId(departments.getCompanySn().toString());
+            deptDo.setDeptName(departments.getCompanyName());
+            deptDo.setLeader("");
+            deptDo.setParentId(departments.getParentId().toString());
+            return deptDo;
+        }
+        return null;
+    }
+
+    @Override
+    public List<DeptDo> getDeptsByUser(String userId) {
+        return systemUserMapper.getUserDepts(userId);
+    }
+
+    @Override
+    public List<DeptDo> getSysAllDepts() {
+        try {
+            return companyMapper.selectList(null).stream()
+                    .map(d -> new DeptDo(d.getCompanySn().toString(), d.getCompanyName(), "", d.getParentId().toString()))
+                    .collect(Collectors.toList());
+        } catch (Exception e) {
+            return Collections.emptyList();
+        }
+    }
+
+    @Override
+    public List<UserDeptDo> getSysAllUserDepts() {
+        try {
+            return systemUserMapper.selectList(null).stream()
+                    .map(d -> new UserDeptDo(d.getUserId().toString(), d.getDepartment()))
+                    .collect(Collectors.toList());
+        } catch (Exception e) {
+            return Collections.emptyList();
+        }
+    }
+
+    @Override
+    public List<OrgTreeVo> getSubDeptById(String parentId) {
+        return companyMapper.selectByDept(parentId);
+    }
+
+    @Override
+    public List<String> getRecursiveSubDept(String parentId) {
+        List<String> list = new ArrayList<>();
+        loadSubDept(parentId, list);
+        return list;
+    }
+
+    /**
+     * 递归加载所有子部门
+     *
+     * @param parentId 父部门ID
+     * @param subDepts 所有子部门缓存
+     */
+    private void loadSubDept(String parentId, List<String> subDepts) {
+        List<Company> departments = companyMapper.selectList(
+                new LambdaQueryWrapper<Company>()
+                        .eq(Company::getParentId, parentId));
+        subDepts.addAll(departments.stream().map(Company::getCompanySn).collect(Collectors.toList()).stream().map(Object::toString).collect(Collectors.toList()));
+        departments.forEach(d -> loadSubDept(d.getCompanySn().toString(), subDepts));
+    }
+
+    @Override
+    public List<RoleDo> getSysAllRoles() {
+        try {
+            return systemRoleMapper.selectList(null).stream()
+                    .map(r -> new RoleDo(r.getRoleId().toString(), r.getRoleName()))
+                    .collect(Collectors.toList());
+        } catch (Exception e) {
+            return Collections.emptyList();
+        }
+    }
+
+    @Override
+    public Set<String> getUsersByRoles(List<String> roles) {
+        return baseRoleUserMapper.selectList(new LambdaQueryWrapper<BaseRoleUser>()
+                        .select(BaseRoleUser::getUserId)
+                        .in(BaseRoleUser::getRoleId, roles)).stream()
+                .map(Object::toString).collect(Collectors.toSet());
+    }
+
+    @Override
+    public String getUserSign(String userId) {
+        return systemUserMapper.selectById(userId).getUserId().toString();
+    }
+
+    @Override
+    public void updateUserSign(String userId, String signature) {
+
+    }
+
+    @Override
+    public UserVo getUserDetail(String userId) {
+        return null;
+    }
+
+    @Override
+    public Map<String, UserDeptDo> getUserDeptInfos(Collection<String> userDeptIds) {
+        return systemUserMapper.getUserDepInfosBatch(userDeptIds)
+                .stream().collect(Collectors.toMap(UserDeptDo::getUserId, v -> v));
+    }
+}

src/main/resources/application-gsx-other-env-show.properties

@@ -6,10 +6,15 @@ http.port=23912
 #spring.datasource.url=jdbc:mysql://139.9.66.234:3386/wisdomsite_ty?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true
 #spring.datasource.url=jdbc:mysql://182.90.224.237:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false
 #spring.datasource.url=jdbc:mysql://139.9.66.234:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true
-spring.datasource.url=jdbc:mysql://192.168.34.221:3306/wisdomsite_other_env_show?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false
+spring.datasource.db1.jdbc-url=jdbc:mysql://192.168.34.221:3306/wisdomsite_other_env_show?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false
-spring.datasource.username=ENC(XR4C/hvTYCUqudS49Wh/jA==)
+spring.datasource.db1.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.db1.username=ENC(XR4C/hvTYCUqudS49Wh/jA==)
 #spring.datasource.password=ENC(hHkiHEc6vSWjqfOtg2/2Uiihs0vX3l7V)
-spring.datasource.password=ENC(LsKaVL2ycDu+uUNoPndYLA==)
+spring.datasource.db1.password=ENC(LsKaVL2ycDu+uUNoPndYLA==)
+spring.datasource.db2.jdbc-url=jdbc:mysql://192.168.34.155:3306/wflow_pro?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8
+spring.datasource.db2.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.db2.username=root
+spring.datasource.db2.password=root
 server.port=19111
 #server.port=30246
 basePath=C:/jxj/prod/backEnd/itbgpImage/