使用新开发框架改造jobs项目

src/main/java/com/tanpu/feo/feojob/FeoJobApplication.java

 package com.tanpu.feo.feojob;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/tanpu/feo/feojob/config/ApiExceptionConfig.java

 package com.tanpu.feo.feojob.config;
 
-import com.fengwenyi.api.result.ResultTemplate;
+import com.tanpu.common.api.CommonResp;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.BindException;
 import org.springframework.validation.BindingResult;
@@ -23,9 +23,9 @@ public class ApiExceptionConfig {
      */
     @ExceptionHandler(value = Exception.class)
     @ResponseBody
-    public ResultTemplate<String> errorHandler(Exception e) {
+    public CommonResp<String> errorHandler(Exception e) {
         log.error("==========全局异常： {}", e.getMessage());
-        return ResultTemplate.fail(e.getMessage());
+        return CommonResp.failed(e.getMessage());
     }
 
     /**
@@ -35,15 +35,12 @@ public class ApiExceptionConfig {
      */
     @ExceptionHandler({MethodArgumentNotValidException.class, BindException.class})
     @ResponseBody
-    public ResultTemplate<String> errorHandler(MethodArgumentNotValidException exception) {
+    public CommonResp<String> errorHandler(MethodArgumentNotValidException exception) {
         StringBuilder errorInfo = new StringBuilder();
         BindingResult bindingResult=null;
         if(exception instanceof MethodArgumentNotValidException){
             bindingResult= ((MethodArgumentNotValidException)exception).getBindingResult();
         }
-        if(exception instanceof BindException){
-            bindingResult= ((BindException)exception).getBindingResult();
-        }
         for(int i = 0; i < bindingResult.getFieldErrors().size(); i++){
             if(i > 0){
                 errorInfo.append(",");
@@ -52,6 +49,6 @@ public class ApiExceptionConfig {
             errorInfo.append(fieldError.getField()).append(" :").append(fieldError.getDefaultMessage());
         }
         log.error("==========数据校验异常： {}", errorInfo.toString());
-        return ResultTemplate.fail(errorInfo.toString());
+        return CommonResp.failed(errorInfo.toString());
     }
 }

src/main/java/com/tanpu/feo/feojob/controller/OrgSyncController.java

 package com.tanpu.feo.feojob.controller;
 
 import cn.hutool.json.JSONUtil;
-import com.fengwenyi.api.result.ResultTemplate;
+import com.tanpu.common.api.CommonResp;
 import com.tanpu.feo.feojob.dto.OrgSyncDto;
 import com.tanpu.feo.feojob.jobs.OrgSyncByWxcpJob;
 import com.tanpu.feo.feojob.service.OrgSyncByJyzyService;
@@ -26,14 +26,14 @@ public class OrgSyncController {
 
     @RequestMapping(value = "/executeSyneFromWxCp", method = RequestMethod.GET)
     @ApiOperation(value = "从企业微信同步")
-    public ResultTemplate<String> executeSyneFromWxCp() {
+    public CommonResp<String> executeSyneFromWxCp() {
         orgSyncByWxcpJob.orgSyncByWxcp("N");
-        return ResultTemplate.success("执行完成");
+        return CommonResp.success("执行完成");
     }
 
     @RequestMapping(value = "/executeSyneFromJyzy", method = RequestMethod.POST)
     @ApiOperation(value = "从精业展业同步")
-    public ResultTemplate<String> executeSyneFromJyzy(@RequestBody @Validated OrgSyncDto OrgSyncDto) {
+    public CommonResp<String> executeSyneFromJyzy(@RequestBody @Validated OrgSyncDto OrgSyncDto) {
         log.info("======executeSyneFromJyzy:入参数据->{}======", JSONUtil.toJsonStr(OrgSyncDto));
         return orgSyncByJyzyService.orgSyncByJyzy(OrgSyncDto);
     }

src/main/java/com/tanpu/feo/feojob/entity/base/BaseEntity.java → src/main/java/com/tanpu/feo/feojob/dao/BaseEntity.java

-package com.tanpu.feo.feojob.entity.base;
+package com.tanpu.feo.feojob.dao;
 
 import lombok.Data;
 

src/main/java/com/tanpu/feo/feojob/dao/DiagnoseDataSourceConfig.java

+package com.tanpu.feo.feojob.dao;
+
+import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
+import org.apache.commons.lang3.ArrayUtils;
+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.Resource;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.support.TransactionTemplate;
+
+import javax.sql.DataSource;
+
+
+@Configuration
+@MapperScan(value = {"com.tanpu.feo.feojob.dao.diagnose.mapper"}, sqlSessionTemplateRef = "diagnoseSqlSessionTemplate")
+public class DiagnoseDataSourceConfig {
+
+    @Bean(name = "diagnoseDataSource")
+    @ConfigurationProperties(prefix = "spring.datasource.diagnose")
+    @Primary
+    public DataSource setDataSource() {
+        return DataSourceBuilder.create().build();
+    }
+
+    @Bean(name = "diagnoseTransactionManager")
+    @Primary
+    public DataSourceTransactionManager setTransactionManager(@Qualifier("diagnoseDataSource") DataSource dataSource) {
+        return new DataSourceTransactionManager(dataSource);
+    }
+
+    @Bean(name = "diagnoseSqlSessionFactory")
+    @Primary
+    public SqlSessionFactory setSqlSessionFactory(@Qualifier("diagnoseDataSource") DataSource dataSource) throws Exception {
+        MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean();
+        bean.setDataSource(dataSource);
+        PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
+        Resource[] resources1 = resolver.getResources("classpath:mapper/diagnose/*.xml");
+        Resource[] resources = ArrayUtils.addAll(resources1);
+        bean.setMapperLocations(resources);
+        return bean.getObject();
+    }
+
+    @Bean(name = "diagnoseSqlSessionTemplate")
+    @Primary
+    public SqlSessionTemplate setSqlSessionTemplate(@Qualifier("diagnoseSqlSessionFactory") SqlSessionFactory sqlSessionFactory) throws Exception {
+        return new SqlSessionTemplate(sqlSessionFactory);
+    }
+
+    @Bean(name = "diagnoseTransactionTemplate")
+    @Primary
+    public TransactionTemplate transactionTemplate(@Qualifier("diagnoseTransactionManager") PlatformTransactionManager transactionManager) {
+        return new TransactionTemplate(transactionManager);
+    }
+
+    @Bean(name = "diagnoseJdbcTemplate")
+    @Primary
+    public JdbcTemplate diagnoseJdbcTemplate(@Qualifier("diagnoseDataSource") DataSource dataSource) {
+        return new JdbcTemplate(dataSource);
+    }
+
+    @Bean(name = "diagnoseNamedParameterJdbcTemplate")
+    @Primary
+    public NamedParameterJdbcTemplate namedParameterJdbcTemplate(@Qualifier("diagnoseJdbcTemplate") JdbcTemplate jdbcTemplate) {
+        return new NamedParameterJdbcTemplate(jdbcTemplate);
+    }
+}
+

src/main/java/com/tanpu/feo/feojob/dao/JyzyUserDataSourceConfig.java

+package com.tanpu.feo.feojob.dao;
+
+import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
+import org.apache.commons.lang3.ArrayUtils;
+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.core.io.Resource;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.support.TransactionTemplate;
+
+import javax.sql.DataSource;
+
+
+@Configuration
+@MapperScan(value = {"com.tanpu.feo.feojob.dao.jyzyuser.mapper"}, sqlSessionTemplateRef = "jyzyUserSqlSessionTemplate")
+public class JyzyUserDataSourceConfig {
+
+    @Bean(name = "jyzyUserDataSource")
+    @ConfigurationProperties(prefix = "spring.datasource.jyzyuser")
+    public DataSource setDataSource() {
+        return DataSourceBuilder.create().build();
+    }
+
+    @Bean(name = "jyzyUserTransactionManager")
+    public DataSourceTransactionManager setTransactionManager(@Qualifier("jyzyUserDataSource") DataSource dataSource) {
+        return new DataSourceTransactionManager(dataSource);
+    }
+
+    @Bean(name = "jyzyUserSqlSessionFactory")
+    public SqlSessionFactory setSqlSessionFactory(@Qualifier("jyzyUserDataSource") DataSource dataSource) throws Exception {
+        MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean();
+        bean.setDataSource(dataSource);
+        PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
+        Resource[] resources1 = resolver.getResources("classpath:mapper/jyzyuser/*.xml");
+        Resource[] resources = ArrayUtils.addAll(resources1);
+        bean.setMapperLocations(resources);
+        return bean.getObject();
+    }
+
+    @Bean(name = "jyzyUserSqlSessionTemplate")
+    public SqlSessionTemplate setSqlSessionTemplate(@Qualifier("jyzyUserSqlSessionFactory") SqlSessionFactory sqlSessionFactory) throws Exception {
+        return new SqlSessionTemplate(sqlSessionFactory);
+    }
+
+    @Bean(name = "jyzyUserTransactionTemplate")
+    public TransactionTemplate transactionTemplate(@Qualifier("jyzyUserTransactionManager") PlatformTransactionManager transactionManager) {
+        return new TransactionTemplate(transactionManager);
+    }
+
+    @Bean(name = "jyzyUserJdbcTemplate")
+    public JdbcTemplate jyzyUserJdbcTemplate(@Qualifier("jyzyUserDataSource") DataSource dataSource) {
+        return new JdbcTemplate(dataSource);
+    }
+
+    @Bean(name = "jyzyUserNamedParameterJdbcTemplate")
+    public NamedParameterJdbcTemplate namedParameterJdbcTemplate(@Qualifier("jyzyUserJdbcTemplate") JdbcTemplate jdbcTemplate) {
+        return new NamedParameterJdbcTemplate(jdbcTemplate);
+    }
+}
+

src/main/java/com/tanpu/feo/feojob/dao/UserDataSourceConfig.java

+package com.tanpu.feo.feojob.dao;
+
+import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
+import org.apache.commons.lang3.ArrayUtils;
+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.core.io.Resource;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.support.TransactionTemplate;
+
+import javax.sql.DataSource;
+
+
+@Configuration
+@MapperScan(value = {"com.tanpu.feo.feojob.dao.user.mapper"}, sqlSessionTemplateRef = "userSqlSessionTemplate")
+public class UserDataSourceConfig {
+
+    @Bean(name = "userDataSource")
+    @ConfigurationProperties(prefix = "spring.datasource.user")
+    public DataSource setDataSource() {
+        return DataSourceBuilder.create().build();
+    }
+
+    @Bean(name = "userTransactionManager")
+    public DataSourceTransactionManager setTransactionManager(@Qualifier("userDataSource") DataSource dataSource) {
+        return new DataSourceTransactionManager(dataSource);
+    }
+
+    @Bean(name = "userSqlSessionFactory")
+    public SqlSessionFactory setSqlSessionFactory(@Qualifier("userDataSource") DataSource dataSource) throws Exception {
+        MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean();
+        bean.setDataSource(dataSource);
+        PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
+        Resource[] resources1 = resolver.getResources("classpath:mapper/user/*.xml");
+        Resource[] resources = ArrayUtils.addAll(resources1);
+        bean.setMapperLocations(resources);
+        return bean.getObject();
+    }
+
+    @Bean(name = "userSqlSessionTemplate")
+    public SqlSessionTemplate setSqlSessionTemplate(@Qualifier("userSqlSessionFactory") SqlSessionFactory sqlSessionFactory) throws Exception {
+        return new SqlSessionTemplate(sqlSessionFactory);
+    }
+
+    @Bean(name = "userTransactionTemplate")
+    public TransactionTemplate transactionTemplate(@Qualifier("userTransactionManager") PlatformTransactionManager transactionManager) {
+        return new TransactionTemplate(transactionManager);
+    }
+
+    @Bean(name = "userJdbcTemplate")
+    public JdbcTemplate userJdbcTemplate(@Qualifier("userDataSource") DataSource dataSource) {
+        return new JdbcTemplate(dataSource);
+    }
+
+    @Bean(name = "userNamedParameterJdbcTemplate")
+    public NamedParameterJdbcTemplate namedParameterJdbcTemplate(@Qualifier("userJdbcTemplate") JdbcTemplate jdbcTemplate) {
+        return new NamedParameterJdbcTemplate(jdbcTemplate);
+    }
+}
+

src/main/java/com/tanpu/feo/feojob/entity/IfaAssetsEntity.java → src/main/java/com/tanpu/feo/feojob/dao/diagnose/entity/IfaAssetsEntity.java

- package com.tanpu.feo.feojob.entity;
+ package com.tanpu.feo.feojob.dao.diagnose.entity;
 
 import java.math.BigDecimal;
 
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.tanpu.feo.feojob.entity.base.BaseEntity;
+import com.tanpu.feo.feojob.dao.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/tanpu/feo/feojob/mapper/IfaAssetsMapper.java → src/main/java/com/tanpu/feo/feojob/dao/diagnose/mapper/IfaAssetsMapper.java

-package com.tanpu.feo.feojob.mapper;
+package com.tanpu.feo.feojob.dao.diagnose.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.tanpu.feo.feojob.entity.IfaAssetsEntity;
+import com.tanpu.feo.feojob.dao.diagnose.entity.IfaAssetsEntity;
 import org.springframework.stereotype.Repository;
 
 

src/main/java/com/tanpu/feo/feojob/entity/jyzy/JyzyOrgEntity.java → src/main/java/com/tanpu/feo/feojob/dao/jyzyuser/entity/JyzyOrgEntity.java

- package com.tanpu.feo.feojob.entity.jyzy;
+ package com.tanpu.feo.feojob.dao.jyzyuser.entity;
 
 import java.io.Serializable;
 import java.util.Date;

src/main/java/com/tanpu/feo/feojob/entity/jyzy/JyzyTeamEntity.java → src/main/java/com/tanpu/feo/feojob/dao/jyzyuser/entity/JyzyTeamEntity.java

- package com.tanpu.feo.feojob.entity.jyzy;
+ package com.tanpu.feo.feojob.dao.jyzyuser.entity;
 
 import java.io.Serializable;
 import java.util.Date;

src/main/java/com/tanpu/feo/feojob/entity/jyzy/JyzyUserInfoEntity.java → src/main/java/com/tanpu/feo/feojob/dao/jyzyuser/entity/JyzyUserInfoEntity.java

-package com.tanpu.feo.feojob.entity.jyzy;
+package com.tanpu.feo.feojob.dao.jyzyuser.entity;
 
 import cn.hutool.crypto.digest.MD5;
 import com.baomidou.mybatisplus.annotation.TableField;

src/main/java/com/tanpu/feo/feojob/mapper/jyzy/JyzyOrgMapper.java → src/main/java/com/tanpu/feo/feojob/dao/jyzyuser/mapper/JyzyOrgMapper.java

-package com.tanpu.feo.feojob.mapper.jyzy;
+package com.tanpu.feo.feojob.dao.jyzyuser.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
-import com.tanpu.feo.feojob.entity.jyzy.JyzyOrgEntity;
+import com.tanpu.feo.feojob.dao.jyzyuser.entity.JyzyOrgEntity;
 import org.springframework.stereotype.Repository;
 
 

src/main/java/com/tanpu/feo/feojob/mapper/jyzy/JyzyTeamMapper.java → src/main/java/com/tanpu/feo/feojob/dao/jyzyuser/mapper/JyzyTeamMapper.java

-package com.tanpu.feo.feojob.mapper.jyzy;
+package com.tanpu.feo.feojob.dao.jyzyuser.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.tanpu.feo.feojob.entity.jyzy.JyzyTeamEntity;
+import com.tanpu.feo.feojob.dao.jyzyuser.entity.JyzyTeamEntity;
 import org.springframework.stereotype.Repository;
 
 

src/main/java/com/tanpu/feo/feojob/mapper/jyzy/JyzyUserInfoMapper.java → src/main/java/com/tanpu/feo/feojob/dao/jyzyuser/mapper/JyzyUserInfoMapper.java

-package com.tanpu.feo.feojob.mapper.jyzy;
+package com.tanpu.feo.feojob.dao.jyzyuser.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
-import com.tanpu.feo.feojob.entity.jyzy.JyzyUserInfoEntity;
+import com.tanpu.feo.feojob.dao.jyzyuser.entity.JyzyUserInfoEntity;
 import org.springframework.stereotype.Repository;
 
 

src/main/java/com/tanpu/feo/feojob/entity/DepartmentEmployeeEntity.java → src/main/java/com/tanpu/feo/feojob/dao/user/entity/DepartmentEmployeeEntity.java

- package com.tanpu.feo.feojob.entity;
+ package com.tanpu.feo.feojob.dao.user.entity;
 
 
  import com.baomidou.mybatisplus.annotation.TableName;
-import com.tanpu.feo.feojob.entity.base.BaseEntity;
+import com.tanpu.feo.feojob.dao.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/tanpu/feo/feojob/entity/DepartmentEntity.java → src/main/java/com/tanpu/feo/feojob/dao/user/entity/DepartmentEntity.java

- package com.tanpu.feo.feojob.entity;
+ package com.tanpu.feo.feojob.dao.user.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.tanpu.feo.feojob.entity.base.BaseEntity;
+import com.tanpu.feo.feojob.dao.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/tanpu/feo/feojob/entity/EmployeeEntity.java → src/main/java/com/tanpu/feo/feojob/dao/user/entity/EmployeeEntity.java

- package com.tanpu.feo.feojob.entity;
+ package com.tanpu.feo.feojob.dao.user.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.tanpu.feo.feojob.entity.base.BaseEntity;
+import com.tanpu.feo.feojob.dao.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/tanpu/feo/feojob/entity/EmployeeRoleEntity.java → src/main/java/com/tanpu/feo/feojob/dao/user/entity/EmployeeRoleEntity.java

- package com.tanpu.feo.feojob.entity;
+ package com.tanpu.feo.feojob.dao.user.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.tanpu.feo.feojob.entity.base.BaseEntity;
+import com.tanpu.feo.feojob.dao.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/tanpu/feo/feojob/entity/OrgEntity.java → src/main/java/com/tanpu/feo/feojob/dao/user/entity/OrgEntity.java

- package com.tanpu.feo.feojob.entity;
+ package com.tanpu.feo.feojob.dao.user.entity;
 
 import java.util.Date;
 
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.tanpu.feo.feojob.entity.base.BaseEntity;
+import com.tanpu.feo.feojob.dao.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/tanpu/feo/feojob/entity/OrgExtEntity.java → src/main/java/com/tanpu/feo/feojob/dao/user/entity/OrgExtEntity.java

- package com.tanpu.feo.feojob.entity;
+ package com.tanpu.feo.feojob.dao.user.entity;
 
 
  import com.baomidou.mybatisplus.annotation.TableName;
-import com.tanpu.feo.feojob.entity.base.BaseEntity;
+import com.tanpu.feo.feojob.dao.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/tanpu/feo/feojob/entity/RoleEntity.java → src/main/java/com/tanpu/feo/feojob/dao/user/entity/RoleEntity.java

- package com.tanpu.feo.feojob.entity;
+ package com.tanpu.feo.feojob.dao.user.entity;
 
 
  import com.baomidou.mybatisplus.annotation.TableName;
-import com.tanpu.feo.feojob.entity.base.BaseEntity;
+import com.tanpu.feo.feojob.dao.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/tanpu/feo/feojob/entity/UserInfoEntity.java → src/main/java/com/tanpu/feo/feojob/dao/user/entity/UserInfoEntity.java

- package com.tanpu.feo.feojob.entity;
+ package com.tanpu.feo.feojob.dao.user.entity;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -6,11 +6,10 @@ import java.util.Date;
 
 import cn.hutool.crypto.digest.MD5;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.tanpu.feo.feojob.entity.jyzy.JyzyUserInfoEntity;
+import com.tanpu.feo.feojob.dao.jyzyuser.entity.JyzyUserInfoEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 
  /**
  * Entity

src/main/java/com/tanpu/feo/feojob/mapper/DepartmentEmployeeMapper.java → src/main/java/com/tanpu/feo/feojob/dao/user/mapper/DepartmentEmployeeMapper.java

-package com.tanpu.feo.feojob.mapper;
+package com.tanpu.feo.feojob.dao.user.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.tanpu.feo.feojob.entity.DepartmentEmployeeEntity;
+import com.tanpu.feo.feojob.dao.user.entity.DepartmentEmployeeEntity;
 import org.springframework.stereotype.Repository;
 
 

src/main/java/com/tanpu/feo/feojob/mapper/DepartmentMapper.java → src/main/java/com/tanpu/feo/feojob/dao/user/mapper/DepartmentMapper.java

-package com.tanpu.feo.feojob.mapper;
+package com.tanpu.feo.feojob.dao.user.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.tanpu.feo.feojob.entity.DepartmentEntity;
+import com.tanpu.feo.feojob.dao.user.entity.DepartmentEntity;
 import org.springframework.stereotype.Repository;
 
 

src/main/java/com/tanpu/feo/feojob/mapper/EmployeeMapper.java → src/main/java/com/tanpu/feo/feojob/dao/user/mapper/EmployeeMapper.java

-package com.tanpu.feo.feojob.mapper;
+package com.tanpu.feo.feojob.dao.user.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.tanpu.feo.feojob.entity.EmployeeEntity;
+import com.tanpu.feo.feojob.dao.user.entity.EmployeeEntity;
 import org.springframework.stereotype.Repository;
 
 

src/main/java/com/tanpu/feo/feojob/mapper/EmployeeRoleMapper.java → src/main/java/com/tanpu/feo/feojob/dao/user/mapper/EmployeeRoleMapper.java

-package com.tanpu.feo.feojob.mapper;
+package com.tanpu.feo.feojob.dao.user.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.tanpu.feo.feojob.entity.EmployeeRoleEntity;
+import com.tanpu.feo.feojob.dao.user.entity.EmployeeRoleEntity;
 import org.springframework.stereotype.Repository;
 
 

src/main/java/com/tanpu/feo/feojob/mapper/OrgExtMapper.java → src/main/java/com/tanpu/feo/feojob/dao/user/mapper/OrgExtMapper.java

-package com.tanpu.feo.feojob.mapper;
+package com.tanpu.feo.feojob.dao.user.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.tanpu.feo.feojob.entity.OrgExtEntity;
+import com.tanpu.feo.feojob.dao.user.entity.OrgExtEntity;
 import org.springframework.stereotype.Repository;
 
 

src/main/java/com/tanpu/feo/feojob/mapper/OrgMapper.java → src/main/java/com/tanpu/feo/feojob/dao/user/mapper/OrgMapper.java

-package com.tanpu.feo.feojob.mapper;
+package com.tanpu.feo.feojob.dao.user.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
-import com.tanpu.feo.feojob.entity.OrgEntity;
+import com.tanpu.feo.feojob.dao.user.entity.OrgEntity;
 import org.springframework.stereotype.Repository;
 
 

src/main/java/com/tanpu/feo/feojob/mapper/RoleMapper.java → src/main/java/com/tanpu/feo/feojob/dao/user/mapper/RoleMapper.java

-package com.tanpu.feo.feojob.mapper;
+package com.tanpu.feo.feojob.dao.user.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.tanpu.feo.feojob.entity.RoleEntity;
+import com.tanpu.feo.feojob.dao.user.entity.RoleEntity;
 import org.springframework.stereotype.Repository;
 
 

src/main/java/com/tanpu/feo/feojob/mapper/UserInfoMapper.java → src/main/java/com/tanpu/feo/feojob/dao/user/mapper/UserInfoMapper.java

-package com.tanpu.feo.feojob.mapper;
+package com.tanpu.feo.feojob.dao.user.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
-import com.tanpu.feo.feojob.entity.UserInfoEntity;
+import com.tanpu.feo.feojob.dao.user.entity.UserInfoEntity;
 import org.springframework.stereotype.Repository;
 
 

src/main/java/com/tanpu/feo/feojob/dto/JyzyTeamDto.java

 package com.tanpu.feo.feojob.dto;
 
-import com.tanpu.feo.feojob.entity.jyzy.JyzyTeamEntity;
-import com.tanpu.feo.feojob.entity.jyzy.JyzyUserInfoEntity;
+import com.tanpu.feo.feojob.dao.jyzyuser.entity.JyzyTeamEntity;
+import com.tanpu.feo.feojob.dao.jyzyuser.entity.JyzyUserInfoEntity;
 import lombok.Builder;
 import lombok.Data;
 

src/main/java/com/tanpu/feo/feojob/dto/OrgInfoDto.java

 package com.tanpu.feo.feojob.dto;
 
 
-import com.tanpu.feo.feojob.entity.*;
+import com.tanpu.feo.feojob.dao.user.entity.*;
 import lombok.Builder;
 import lombok.Data;
 

src/main/java/com/tanpu/feo/feojob/jobs/OrgSyncByWxcpJob.java

@@ -7,9 +7,9 @@ import cn.hutool.crypto.digest.MD5;
 import cn.hutool.json.JSONUtil;
 import com.tanpu.feo.feojob.constant.BaseConstant;
 import com.tanpu.feo.feojob.constant.OrgExtConstant;
+import com.tanpu.feo.feojob.dao.user.entity.*;
 import com.tanpu.feo.feojob.dto.WorkDataDto;
 import com.tanpu.feo.feojob.dto.WxCpDepartDto;
-import com.tanpu.feo.feojob.entity.*;
 import com.tanpu.feo.feojob.enums.EmployeeDutyEnum;
 import com.tanpu.feo.feojob.enums.RoleTypeEnum;
 import com.tanpu.feo.feojob.service.*;

src/main/java/com/tanpu/feo/feojob/service/DepartmentEmployeeService.java

@@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.tanpu.feo.feojob.constant.BaseConstant;
 import com.tanpu.feo.feojob.dto.DepartmentEmployeeDTO;
-import com.tanpu.feo.feojob.entity.DepartmentEmployeeEntity;
-import com.tanpu.feo.feojob.mapper.DepartmentEmployeeMapper;
+import com.tanpu.feo.feojob.dao.user.entity.DepartmentEmployeeEntity;
+import com.tanpu.feo.feojob.dao.user.mapper.DepartmentEmployeeMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/com/tanpu/feo/feojob/service/DepartmentService.java

@@ -3,8 +3,8 @@ package com.tanpu.feo.feojob.service;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.tanpu.feo.feojob.constant.BaseConstant;
-import com.tanpu.feo.feojob.entity.DepartmentEntity;
-import com.tanpu.feo.feojob.mapper.DepartmentMapper;
+import com.tanpu.feo.feojob.dao.user.entity.DepartmentEntity;
+import com.tanpu.feo.feojob.dao.user.mapper.DepartmentMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/java/com/tanpu/feo/feojob/service/EmployeeRoleService.java

@@ -9,8 +9,8 @@ import com.tanpu.feo.feojob.constant.BaseConstant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.tanpu.feo.feojob.entity.EmployeeRoleEntity;
-import com.tanpu.feo.feojob.mapper.EmployeeRoleMapper;
+import com.tanpu.feo.feojob.dao.user.entity.EmployeeRoleEntity;
+import com.tanpu.feo.feojob.dao.user.mapper.EmployeeRoleMapper;
 import lombok.extern.slf4j.Slf4j;
 
 /**

src/main/java/com/tanpu/feo/feojob/service/EmployeeService.java

@@ -3,8 +3,8 @@ package com.tanpu.feo.feojob.service;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.tanpu.feo.feojob.constant.BaseConstant;
-import com.tanpu.feo.feojob.entity.EmployeeEntity;
-import com.tanpu.feo.feojob.mapper.EmployeeMapper;
+import com.tanpu.feo.feojob.dao.user.entity.EmployeeEntity;
+import com.tanpu.feo.feojob.dao.user.mapper.EmployeeMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/java/com/tanpu/feo/feojob/service/IfaAssetsService.java

 package com.tanpu.feo.feojob.service;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.tanpu.feo.feojob.entity.IfaAssetsEntity;
-import com.tanpu.feo.feojob.mapper.IfaAssetsMapper;
+
+import com.tanpu.feo.feojob.dao.diagnose.entity.IfaAssetsEntity;
+import com.tanpu.feo.feojob.dao.diagnose.mapper.IfaAssetsMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -15,7 +15,7 @@ import org.springframework.stereotype.Service;
  */
 @Service("ifaAssetsService")
 @Slf4j
-@DS("feo_diagnose")
+
 public class IfaAssetsService {
 
 	@Autowired
@@ -27,7 +27,7 @@ public class IfaAssetsService {
 		return ifaAssetsMapper.selectById(s);
 	}
 
-	@DS("feo_diagnose")
+
 	public void insertIfaAssets(IfaAssetsEntity ifaAssets) {
 		ifaAssetsMapper.insert(ifaAssets);
 	}

src/main/java/com/tanpu/feo/feojob/service/OrgExtService.java

@@ -3,8 +3,8 @@ package com.tanpu.feo.feojob.service;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.tanpu.feo.feojob.constant.BaseConstant;
-import com.tanpu.feo.feojob.entity.OrgExtEntity;
-import com.tanpu.feo.feojob.mapper.OrgExtMapper;
+import com.tanpu.feo.feojob.dao.user.entity.OrgExtEntity;
+import com.tanpu.feo.feojob.dao.user.mapper.OrgExtMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/java/com/tanpu/feo/feojob/service/OrgService.java

@@ -3,8 +3,8 @@ package com.tanpu.feo.feojob.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.tanpu.feo.feojob.constant.BaseConstant;
-import com.tanpu.feo.feojob.entity.OrgEntity;
-import com.tanpu.feo.feojob.mapper.OrgMapper;
+import com.tanpu.feo.feojob.dao.user.entity.OrgEntity;
+import com.tanpu.feo.feojob.dao.user.mapper.OrgMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/java/com/tanpu/feo/feojob/service/OrgSyncByJyzyService.java

@@ -4,15 +4,15 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
-import com.fengwenyi.api.result.ResultTemplate;
+import com.tanpu.common.api.CommonResp;
+import com.tanpu.feo.feojob.dao.user.entity.*;
 import com.tanpu.feo.feojob.dto.JyzyTeamDto;
 import com.tanpu.feo.feojob.dto.OrgInfoDto;
 import com.tanpu.feo.feojob.dto.OrgSyncDto;
 import com.tanpu.feo.feojob.dto.WorkDataDto;
-import com.tanpu.feo.feojob.entity.*;
-import com.tanpu.feo.feojob.entity.jyzy.JyzyOrgEntity;
-import com.tanpu.feo.feojob.entity.jyzy.JyzyTeamEntity;
-import com.tanpu.feo.feojob.entity.jyzy.JyzyUserInfoEntity;
+import com.tanpu.feo.feojob.dao.jyzyuser.entity.JyzyOrgEntity;
+import com.tanpu.feo.feojob.dao.jyzyuser.entity.JyzyTeamEntity;
+import com.tanpu.feo.feojob.dao.jyzyuser.entity.JyzyUserInfoEntity;
 import com.tanpu.feo.feojob.enums.EmployeeDutyEnum;
 import com.tanpu.feo.feojob.enums.RoleTypeEnum;
 import com.tanpu.feo.feojob.service.jyzy.JyzyOrgService;
@@ -51,7 +51,7 @@ public class OrgSyncByJyzyService {
     @Resource
     private OrgSyncService orgSyncService;
 
-    public ResultTemplate<String> orgSyncByJyzy(OrgSyncDto orgSyncDto) {
+    public CommonResp<String> orgSyncByJyzy(OrgSyncDto orgSyncDto) {
         try {
             //1 从精业展业 数据库中 获取组织及用户 信息
             List<JyzyTeamDto> jyzyTeamDtoList = getJyzyTeamByOrgCode(orgSyncDto.getJyzyOrgCode());
@@ -71,9 +71,9 @@ public class OrgSyncByJyzyService {
 
         } catch (Exception e) {
             log.error("=========从 精业展业 同步 机构信息失败，原因--->{}", e.getMessage());
-            return ResultTemplate.fail(e.getMessage());
+            return CommonResp.failed(e.getMessage());
         }
-        return ResultTemplate.success("同步成功");
+        return CommonResp.success("同步成功");
     }
 
     private void dataCompare(WorkDataDto<UserInfoEntity> workUserInfo, WorkDataDto<EmployeeEntity> workEmployee, WorkDataDto<DepartmentEntity> workDepartment,

src/main/java/com/tanpu/feo/feojob/service/OrgSyncByWxcpService.java

 package com.tanpu.feo.feojob.service;
 
 import com.tanpu.feo.feojob.constant.BaseConstant;
+import com.tanpu.feo.feojob.dao.diagnose.entity.IfaAssetsEntity;
+import com.tanpu.feo.feojob.dao.user.entity.*;
 import com.tanpu.feo.feojob.dto.WorkDataDto;
-import com.tanpu.feo.feojob.entity.*;
-import com.tanpu.feo.feojob.mapper.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/com/tanpu/feo/feojob/service/OrgSyncService.java

@@ -4,9 +4,9 @@ package com.tanpu.feo.feojob.service;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
+import com.tanpu.feo.feojob.dao.diagnose.entity.IfaAssetsEntity;
+import com.tanpu.feo.feojob.dao.user.entity.*;
 import com.tanpu.feo.feojob.dto.WorkDataDto;
-import com.tanpu.feo.feojob.entity.*;
-import com.tanpu.feo.feojob.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;

src/main/java/com/tanpu/feo/feojob/service/RoleService.java

@@ -3,8 +3,8 @@ package com.tanpu.feo.feojob.service;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.tanpu.feo.feojob.constant.BaseConstant;
-import com.tanpu.feo.feojob.entity.RoleEntity;
-import com.tanpu.feo.feojob.mapper.RoleMapper;
+import com.tanpu.feo.feojob.dao.user.entity.RoleEntity;
+import com.tanpu.feo.feojob.dao.user.mapper.RoleMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/java/com/tanpu/feo/feojob/service/UserInfoService.java

@@ -3,8 +3,8 @@ package com.tanpu.feo.feojob.service;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.tanpu.feo.feojob.constant.BaseConstant;
-import com.tanpu.feo.feojob.entity.UserInfoEntity;
-import com.tanpu.feo.feojob.mapper.UserInfoMapper;
+import com.tanpu.feo.feojob.dao.user.entity.UserInfoEntity;
+import com.tanpu.feo.feojob.dao.user.mapper.UserInfoMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/java/com/tanpu/feo/feojob/service/jyzy/JyzyOrgService.java

 package com.tanpu.feo.feojob.service.jyzy;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.tanpu.feo.feojob.constant.BaseConstant;
-import com.tanpu.feo.feojob.entity.jyzy.JyzyOrgEntity;
+import com.tanpu.feo.feojob.dao.jyzyuser.entity.JyzyOrgEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 
-import com.tanpu.feo.feojob.mapper.jyzy.JyzyOrgMapper;
+import com.tanpu.feo.feojob.dao.jyzyuser.mapper.JyzyOrgMapper;
 import lombok.extern.slf4j.Slf4j;
 
 
@@ -21,7 +21,6 @@ import lombok.extern.slf4j.Slf4j;
  */
 @Service("JyzyOrgService")
 @Slf4j
-@DS("jyzy_fatools")
 public class JyzyOrgService {
 
 	@Autowired

src/main/java/com/tanpu/feo/feojob/service/jyzy/JyzyTeamService.java

 package com.tanpu.feo.feojob.service.jyzy;
 
 
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.tanpu.feo.feojob.constant.BaseConstant;
-import com.tanpu.feo.feojob.entity.jyzy.JyzyTeamEntity;
-import com.tanpu.feo.feojob.mapper.jyzy.JyzyTeamMapper;
+import com.tanpu.feo.feojob.dao.jyzyuser.entity.JyzyTeamEntity;
+import com.tanpu.feo.feojob.dao.jyzyuser.mapper.JyzyTeamMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -22,7 +22,7 @@ import java.util.List;
  */
 @Service("JyzyTeamService")
 @Slf4j
-@DS("jyzy_fatools")
+
 public class JyzyTeamService {
 
 	@Autowired

src/main/java/com/tanpu/feo/feojob/service/jyzy/JyzyUserInfoService.java

 package com.tanpu.feo.feojob.service.jyzy;
 
 
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.tanpu.feo.feojob.constant.BaseConstant;
-import com.tanpu.feo.feojob.entity.jyzy.JyzyUserInfoEntity;
-import com.tanpu.feo.feojob.mapper.jyzy.JyzyUserInfoMapper;
+import com.tanpu.feo.feojob.dao.jyzyuser.entity.JyzyUserInfoEntity;
+import com.tanpu.feo.feojob.dao.jyzyuser.mapper.JyzyUserInfoMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -22,7 +21,6 @@ import java.util.List;
  */
 @Service
 @Slf4j
-@DS("jyzy_fatools")
 public class JyzyUserInfoService {
 
 	@Autowired

src/main/resources/application.yml

@@ -2,7 +2,7 @@
 apollo:
   bootstrap:
     enabled: true # 启用apollo配置中心
-    namespaces: application.yml  # 监听namespaces
+    namespaces: application.yml,feo-common  # 监听namespaces
   cacheDir: ./apollocache/  # 配置中心缓存路径
   meta: http://apollo.caixiaoquan.com:8080
 

src/main/resources/feojob/IfaAssetsMapper.xml → src/main/resources/mapper/diagnose/IfaAssetsMapper.xml

@@ -2,10 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <!--注册操作对应Entity的Mapper类-->
-<mapper namespace="com.tanpu.feo.feojob.mapper.IfaAssetsMapper">
+<mapper namespace="com.tanpu.feo.feojob.dao.diagnose.mapper.IfaAssetsMapper">
 
 	<!-- Entity类的ResultMap -->
-	<resultMap type="com.tanpu.feo.feojob.entity.IfaAssetsEntity" id="ifaAssetsResultMap">
+	<resultMap type="com.tanpu.feo.feojob.dao.diagnose.entity.IfaAssetsEntity" id="ifaAssetsResultMap">
 		<result property="id" column="id"/>
 		<result property="ifaId" column="ifa_id"/>
 		<result property="totalMarket" column="total_market"/>

src/main/resources/feojob/JyzyOrgMapper.xml → src/main/resources/mapper/jyzyuser/JyzyOrgMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.tanpu.feo.feojob.mapper.JyzyOrgMapper">
 
 	<!-- Entity类的ResultMap -->
-	<resultMap type="com.tanpu.feo.feojob.entity.jyzy.JyzyOrgEntity" id="orgResultMap">
+	<resultMap type="com.tanpu.feo.feojob.dao.jyzyuser.entity.JyzyOrgEntity" id="orgResultMap">
 		<result property="id" column="id"/>
 		<result property="orgCode" column="org_code"/>
 		<result property="orgName" column="org_name"/>

src/main/resources/feojob/JyzyTeamMapper.xml → src/main/resources/mapper/jyzyuser/JyzyTeamMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.tanpu.feo.feojob.mapper.JyzyTeamMapper">
 
 	<!-- Entity类的ResultMap -->
-	<resultMap type="com.tanpu.feo.feojob.entity.jyzy.JyzyTeamEntity" id="teamResultMap">
+	<resultMap type="com.tanpu.feo.feojob.dao.jyzyuser.entity.JyzyTeamEntity" id="teamResultMap">
 		<result property="id" column="id"/>
 		<result property="teamName" column="team_name"/>
 		<result property="pId" column="p_id"/>

src/main/resources/feojob/JyzyUserInfoMapper.xml → src/main/resources/mapper/jyzyuser/JyzyUserInfoMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.tanpu.feo.feojob.mapper.JyzyUserInfoMapper">
 
 	<!-- Entity类的ResultMap -->
-	<resultMap type="com.tanpu.feo.feojob.entity.jyzy.JyzyUserInfoEntity" id="userInfoResultMap">
+	<resultMap type="com.tanpu.feo.feojob.dao.jyzyuser.entity.JyzyUserInfoEntity" id="userInfoResultMap">
 		<result property="id" column="id"/>
 		<result property="uiOpenid" column="ui_openid"/>
 		<result property="uiUnionid" column="ui_unionId"/>

src/main/resources/feojob/DepartmentEmployeeMapper.xml → src/main/resources/mapper/user/DepartmentEmployeeMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.caixiaoquan.faTools.feojob.mapper.DepartmentEmployeeMapper">
 
 	<!-- Entity类的ResultMap -->
-	<resultMap type="com.tanpu.feo.feojob.entity.DepartmentEmployeeEntity" id="departmentEmployeeResultMap">
+	<resultMap type="com.tanpu.feo.feojob.dao.user.entity.DepartmentEmployeeEntity" id="departmentEmployeeResultMap">
 		<result property="id" column="id"/>
 		<result property="employeeId" column="employee_id"/>
 		<result property="departmentId" column="department_id"/>

src/main/resources/feojob/DepartmentMapper.xml → src/main/resources/mapper/user/DepartmentMapper.xml

@@ -2,10 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <!--注册操作对应Entity的Mapper类-->
-<mapper namespace="com.tanpu.feo.feojob.mapper.DepartmentMapper">
+<mapper namespace="com.tanpu.feo.feojob.dao.user.mapper.DepartmentMapper">
 
 	<!-- Entity类的ResultMap -->
-	<resultMap type="com.tanpu.feo.feojob.entity.DepartmentEntity" id="departmentResultMap">
+	<resultMap type="com.tanpu.feo.feojob.dao.user.entity.DepartmentEntity" id="departmentResultMap">
 		<result property="id" column="id"/>
 		<result property="departmentId" column="department_id"/>
 		<result property="departmentName" column="department_name"/>

src/main/resources/feojob/EmployeeMapper.xml → src/main/resources/mapper/user/EmployeeMapper.xml

@@ -2,10 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <!--注册操作对应Entity的Mapper类-->
-<mapper namespace="com.tanpu.feo.feojob.mapper.EmployeeMapper">
+<mapper namespace="com.tanpu.feo.feojob.dao.user.mapper.EmployeeMapper">
 
 	<!-- Entity类的ResultMap -->
-	<resultMap type="com.tanpu.feo.feojob.entity.EmployeeEntity" id="employeeResultMap">
+	<resultMap type="com.tanpu.feo.feojob.dao.user.entity.EmployeeEntity" id="employeeResultMap">
 		<result property="id" column="id"/>
 		<result property="employeeId" column="employee_id"/>
 		<result property="name" column="name"/>

src/main/resources/feojob/EmployeeRoleMapper.xml → src/main/resources/mapper/user/EmployeeRoleMapper.xml

@@ -2,10 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <!--注册操作对应Entity的Mapper类-->
-<mapper namespace="com.tanpu.feo.feojob.mapper.EmployeeRoleMapper">
+<mapper namespace="com.tanpu.feo.feojob.dao.user.mapper.EmployeeRoleMapper">
 
 	<!-- Entity类的ResultMap -->
-	<resultMap type="com.tanpu.feo.feojob.entity.EmployeeRoleEntity" id="employeeRoleResultMap">
+	<resultMap type="com.tanpu.feo.feojob.dao.user.entity.EmployeeRoleEntity" id="employeeRoleResultMap">
 		<result property="id" column="id"/>
 		<result property="employeeId" column="employee_id"/>
 		<result property="roleId" column="role_id"/>

src/main/resources/feojob/OrgExtMapper.xml → src/main/resources/mapper/user/OrgExtMapper.xml

@@ -2,10 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <!--注册操作对应Entity的Mapper类-->
-<mapper namespace="com.tanpu.feo.feojob.mapper.OrgExtMapper">
+<mapper namespace="com.tanpu.feo.feojob.dao.user.mapper.OrgExtMapper">
 
 	<!-- Entity类的ResultMap -->
-	<resultMap type="com.tanpu.feo.feojob.entity.OrgExtEntity" id="orgExtResultMap">
+	<resultMap type="com.tanpu.feo.feojob.dao.user.entity.OrgExtEntity" id="orgExtResultMap">
 		<result property="id" column="id"/>
 		<result property="orgId" column="org_id"/>
 		<result property="deleteTag" column="delete_tag"/>

src/main/resources/feojob/OrgMapper.xml → src/main/resources/mapper/user/OrgMapper.xml

@@ -2,10 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <!--注册操作对应Entity的Mapper类-->
-<mapper namespace="com.tanpu.feo.feojob.mapper.OrgMapper">
+<mapper namespace="com.tanpu.feo.feojob.dao.user.mapper.OrgMapper">
 
 	<!-- Entity类的ResultMap -->
-	<resultMap type="com.tanpu.feo.feojob.entity.OrgEntity" id="orgResultMap">
+	<resultMap type="com.tanpu.feo.feojob.dao.user.entity.OrgEntity" id="orgResultMap">
 		<result property="id" column="id"/>
 		<result property="orgCode" column="org_code"/>
 		<result property="orgName" column="org_name"/>

src/main/resources/feojob/RoleMapper.xml → src/main/resources/mapper/user/RoleMapper.xml

@@ -2,10 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <!--注册操作对应Entity的Mapper类-->
-<mapper namespace="com.tanpu.feo.feojob.mapper.RoleMapper">
+<mapper namespace="com.tanpu.feo.feojob.dao.user.mapper.RoleMapper">
 
 	<!-- Entity类的ResultMap -->
-	<resultMap type="com.tanpu.feo.feojob.entity.RoleEntity" id="roleResultMap">
+	<resultMap type="com.tanpu.feo.feojob.dao.user.entity.RoleEntity" id="roleResultMap">
 		<result property="id" column="id"/>
 		<result property="roleId" column="role_id"/>
 		<result property="description" column="description"/>

src/main/resources/feojob/UserInfoMapper.xml → src/main/resources/mapper/user/UserInfoMapper.xml

@@ -2,10 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <!--注册操作对应Entity的Mapper类-->
-<mapper namespace="com.tanpu.feo.feojob.mapper.UserInfoMapper">
+<mapper namespace="com.tanpu.feo.feojob.dao.user.mapper.UserInfoMapper">
 
 	<!-- Entity类的ResultMap -->
-	<resultMap type="com.tanpu.feo.feojob.entity.UserInfoEntity" id="userInfoResultMap">
+	<resultMap type="com.tanpu.feo.feojob.dao.user.entity.UserInfoEntity" id="userInfoResultMap">
 		<result property="id" column="id"/>
 		<result property="uiOpenid" column="ui_openid"/>
 		<result property="uiUnionid" column="ui_unionId"/>