feat(sys | login): 多租户模式支持

+ 两个业务通过用户ID分配数据源

zhyc-admin/src/main/java/com/zhyc/Event/FarmLoginEvent.java

@@ -0,0 +1,24 @@
+package com.zhyc.Event;
+
+import lombok.Data;
+
+@Data
+public class FarmLoginEvent {
+
+    private final String farmCode;
+    private final Long userId;
+
+    public FarmLoginEvent(String farmCode, Long userId) {
+        this.farmCode = farmCode;
+        this.userId = userId;
+    }
+
+    public String getFarmCode() {
+        return farmCode;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+}
+

zhyc-admin/src/main/java/com/zhyc/Routing/Filter/DataSourceRoutingFilter.java

@@ -0,0 +1,49 @@
+package com.zhyc.Routing.Filter;
+
+import com.zhyc.framework.config.routing.DataSourceKeys;
+import com.zhyc.framework.datasource.DynamicDataSourceContextHolder;
+import lombok.extern.slf4j.Slf4j;
+import org.bytedeco.opencv.presets.opencv_core;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@Component
+@Slf4j
+@Order(value = -100)
+public class DataSourceRoutingFilter extends OncePerRequestFilter {
+
+    @Override
+    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
+
+        String uri = request.getRequestURI();
+        String username = request.getRemoteUser();
+        log.debug("username:{}",username);
+        try {
+            if (uri.startsWith("/app") || uri.startsWith("/base") || uri.startsWith("/biosafety") || uri.startsWith("/common")
+                    || uri.startsWith("/dairyProducts") || uri.startsWith("/enums") || uri.startsWith("/feed") || uri.startsWith("/frozen") || uri.startsWith("/produce")
+                    || uri.startsWith("sale") || uri.startsWith("/stock") || uri.startsWith("/work") || uri.startsWith("/sheepfold_management")) {
+                log.debug("业务请求 : BUSINESS : {}", uri);
+                if (username.equals("admin")) {
+                    DynamicDataSourceContextHolder.setDataSourceType(DataSourceKeys.FARM_1);
+                }else if (username.equals("ry")) {
+                    DynamicDataSourceContextHolder.setDataSourceType(DataSourceKeys.FARM_2);
+                }
+            } else {
+                log.debug("系统请求 ： SYSTEM : {}", uri);
+                DynamicDataSourceContextHolder.setDataSourceType(DataSourceKeys.SYSTEM);
+            }
+
+            filterChain.doFilter(request, response);
+        } finally {
+            // 业务结束后清楚数据源-防止线程复用导致错误
+            DynamicDataSourceContextHolder.clearDataSourceType();
+        }
+    }
+}

zhyc-admin/src/main/java/com/zhyc/web/mvc/MvcConfig.java

@@ -0,0 +1,17 @@
+package com.zhyc.web.mvc;
+
+import com.zhyc.Routing.Filter.DataSourceRoutingFilter;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class MvcConfig {
+    @Bean
+    public FilterRegistrationBean<DataSourceRoutingFilter> myFilter() {
+        FilterRegistrationBean<DataSourceRoutingFilter> registrationBean = new FilterRegistrationBean<>();
+        registrationBean.setFilter(new DataSourceRoutingFilter());
+        registrationBean.addUrlPatterns("/*");
+        return registrationBean;
+    }
+}

zhyc-admin/src/main/resources/application-druid.yml

@@ -9,16 +9,19 @@ spring:
 #                url: jdbc:mysql://localhost:3306/zhyc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 #                username: root
 #                password: 123456
-                url: jdbc:mysql://118.182.97.76:3306/zhyc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://118.182.97.76:3306/zhyc_sys?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: zhyc
                 password: yszh123
             # 从库数据源
-            slave:
+            farm01:
                 # 从数据源开关/默认关闭
-                enabled: false
-                url: 
-                username: 
-                password: 
+                url: jdbc:mysql://118.182.97.76:3306/zhyc_sheep01?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: zhyc
+                password: yszh123
+            farm02:
+                url: jdbc:mysql://118.182.97.76:3306/zhyc_sheep02?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: zhyc
+                password: yszh123
             # 初始连接数
             initialSize: 5
             # 最小连接池数量

zhyc-framework/src/main/java/com/zhyc/framework/config/DruidConfig.java

@@ -9,6 +9,8 @@ import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.sql.DataSource;
+
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
@@ -19,23 +21,34 @@ import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
 import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties;
 import com.alibaba.druid.util.Utils;
-import com.zhyc.common.enums.DataSourceType;
 import com.zhyc.common.utils.spring.SpringUtils;
 import com.zhyc.framework.config.properties.DruidProperties;
 import com.zhyc.framework.datasource.DynamicDataSource;
 
 /**
  * druid 配置多数据源
- * 
+ *
  * @author ruoyi
  */
 @Configuration
-public class DruidConfig
-{
+public class DruidConfig {
     @Bean
     @ConfigurationProperties("spring.datasource.druid.master")
-    public DataSource masterDataSource(DruidProperties druidProperties)
-    {
+    public DataSource masterDataSource(DruidProperties druidProperties) {
+        DruidDataSource dataSource = DruidDataSourceBuilder.create().build();
+        return druidProperties.dataSource(dataSource);
+    }
+
+    @Bean
+    @ConfigurationProperties("spring.datasource.druid.farm01")
+    public DataSource farm1DataSource(DruidProperties druidProperties) {
+        DruidDataSource dataSource = DruidDataSourceBuilder.create().build();
+        return druidProperties.dataSource(dataSource);
+    }
+
+    @Bean
+    @ConfigurationProperties("spring.datasource.druid.farm02")
+    public DataSource farm2DataSource(DruidProperties druidProperties) {
         DruidDataSource dataSource = DruidDataSourceBuilder.create().build();
         return druidProperties.dataSource(dataSource);
     }
@@ -43,49 +56,49 @@ public class DruidConfig
     @Bean
     @ConfigurationProperties("spring.datasource.druid.slave")
     @ConditionalOnProperty(prefix = "spring.datasource.druid.slave", name = "enabled", havingValue = "true")
-    public DataSource slaveDataSource(DruidProperties druidProperties)
-    {
+    public DataSource slaveDataSource(DruidProperties druidProperties) {
         DruidDataSource dataSource = DruidDataSourceBuilder.create().build();
         return druidProperties.dataSource(dataSource);
     }
 
     @Bean(name = "dynamicDataSource")
     @Primary
-    public DynamicDataSource dataSource(DataSource masterDataSource)
-    {
+    public DataSource dynamicDataSource(
+            @Qualifier("masterDataSource") DataSource systemDataSource,
+            @Qualifier("farm1DataSource") DataSource farm1DataSource,
+            @Qualifier("farm2DataSource") DataSource farm2DataSource) {
+
+        // 存储数据源路由
         Map<Object, Object> targetDataSources = new HashMap<>();
-        targetDataSources.put(DataSourceType.MASTER.name(), masterDataSource);
-        setDataSource(targetDataSources, DataSourceType.SLAVE.name(), "slaveDataSource");
-        return new DynamicDataSource(masterDataSource, targetDataSources);
+        targetDataSources.put("system", systemDataSource);
+        targetDataSources.put("farm01", farm1DataSource);
+        targetDataSources.put("farm02", farm2DataSource);
+
+        return new DynamicDataSource(systemDataSource, targetDataSources);
     }
-    
+
     /**
      * 设置数据源
-     * 
+     *
      * @param targetDataSources 备选数据源集合
-     * @param sourceName 数据源名称
-     * @param beanName bean名称
+     * @param sourceName        数据源名称
+     * @param beanName          bean名称
      */
-    public void setDataSource(Map<Object, Object> targetDataSources, String sourceName, String beanName)
-    {
-        try
-        {
+    public void setDataSource(Map<Object, Object> targetDataSources, String sourceName, String beanName) {
+        try {
             DataSource dataSource = SpringUtils.getBean(beanName);
             targetDataSources.put(sourceName, dataSource);
-        }
-        catch (Exception e)
-        {
+        } catch (Exception e) {
         }
     }
 
     /**
      * 去除监控页面底部的广告
      */
-    @SuppressWarnings({ "rawtypes", "unchecked" })
+    @SuppressWarnings({"rawtypes", "unchecked"})
     @Bean
     @ConditionalOnProperty(name = "spring.datasource.druid.statViewServlet.enabled", havingValue = "true")
-    public FilterRegistrationBean removeDruidFilterRegistrationBean(DruidStatProperties properties)
-    {
+    public FilterRegistrationBean removeDruidFilterRegistrationBean(DruidStatProperties properties) {
         // 获取web监控页面的参数
         DruidStatProperties.StatViewServlet config = properties.getStatViewServlet();
         // 提取common.js的配置路径
@@ -93,16 +106,14 @@ public class DruidConfig
         String commonJsPattern = pattern.replaceAll("\\*", "js/common.js");
         final String filePath = "support/http/resources/js/common.js";
         // 创建filter进行过滤
-        Filter filter = new Filter()
-        {
+        Filter filter = new Filter() {
             @Override
-            public void init(javax.servlet.FilterConfig filterConfig) throws ServletException
-            {
+            public void init(javax.servlet.FilterConfig filterConfig) throws ServletException {
             }
+
             @Override
             public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
-                    throws IOException, ServletException
-            {
+                    throws IOException, ServletException {
                 chain.doFilter(request, response);
                 // 重置缓冲区，响应头不会被重置
                 response.resetBuffer();
@@ -113,9 +124,9 @@ public class DruidConfig
                 text = text.replaceAll("powered.*?shrek.wang</a>", "");
                 response.getWriter().write(text);
             }
+
             @Override
-            public void destroy()
-            {
+            public void destroy() {
             }
         };
         FilterRegistrationBean registrationBean = new FilterRegistrationBean();

zhyc-framework/src/main/java/com/zhyc/framework/config/routing/DataSourceKeys.java

@@ -0,0 +1,8 @@
+package com.zhyc.framework.config.routing;
+
+public interface DataSourceKeys {
+    String SYSTEM = "system";
+    String FARM_1 = "farm01";
+    String FARM_2 = "farm02";
+}
+

zhyc-framework/src/main/java/com/zhyc/framework/web/service/SysLoginService.java

@@ -1,6 +1,8 @@
 package com.zhyc.framework.web.service;
 
 import javax.annotation.Resource;
+
+import com.zhyc.framework.datasource.DynamicDataSourceContextHolder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.BadCredentialsException;

zhyc-module/src/main/java/com/zhyc/module/feed/controller/SgFeedListController.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
 import javax.servlet.http.HttpServletResponse;
 
 import com.zhyc.module.feed.service.impl.SgFeedListServiceImpl;
@@ -39,7 +40,7 @@ public class SgFeedListController extends BaseController {
     private final ISgFeedListService sgFeedListService;
 
 
-    public static boolean refresh = true;
+    public static final AtomicBoolean refresh = new AtomicBoolean(true);
 
     @Autowired
     public SgFeedListController(ISgFeedListService sgFeedListService) {
@@ -57,9 +58,8 @@ public class SgFeedListController extends BaseController {
         刷新缓存
         当配方管理表出现更新 或 饲喂计划表出现增删改时会将refresh置为true 通知此处进行刷新
          */
-        if (refresh) {
-            sgFeedListService.SyncFeedList();
-            refresh = false;
+        if (refresh.compareAndSet(true, false)) {
+            sgFeedListService.syncFeedListSafely();
         }
         startPage();
         List<SgFeedList> list = sgFeedListService.selectSgFeedListList(sgFeedList);

zhyc-module/src/main/java/com/zhyc/module/feed/controller/SgFeedPlanController.java

@@ -83,7 +83,7 @@ public class SgFeedPlanController extends BaseController {
         // 计算其他字段值
         setPlan(sgFeedPlan);
         // 通知配料清单刷新数据
-        SgFeedListController.refresh = true;
+        SgFeedListController.refresh.set(true);
         return toAjax(sgFeedPlanService.insertSgFeedPlan(sgFeedPlan));
     }
 
@@ -97,7 +97,7 @@ public class SgFeedPlanController extends BaseController {
         // 根据修改后的值重新计算
         setPlan(sgFeedPlan);
         // 通知配料清单刷新数据
-        SgFeedListController.refresh = true;
+        SgFeedListController.refresh.set(true);
         return toAjax(sgFeedPlanService.updateSgFeedPlan(sgFeedPlan));
     }
 
@@ -109,7 +109,7 @@ public class SgFeedPlanController extends BaseController {
     @DeleteMapping("/{createDates}")
     public AjaxResult remove(@PathVariable Date[] createDates) {
         // 通知配料清单刷新数据
-        SgFeedListController.refresh = true;
+        SgFeedListController.refresh.set(true);
         return toAjax(sgFeedPlanService.deleteSgFeedPlanByCreateDates(createDates));
     }
 

zhyc-module/src/main/java/com/zhyc/module/feed/controller/SgFormulaManagementController.java

@@ -93,8 +93,7 @@ public class SgFormulaManagementController extends BaseController {
     @PostMapping
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult add(@RequestBody SgFormulaManagement sgFormulaManagement) {
-        if (null == sgFormulaManagement)
-            throw new RuntimeException("ERROR: 数据为空");
+        if (null == sgFormulaManagement) throw new RuntimeException("ERROR: 数据为空");
         if (Objects.equals(sgFormulaManagement.getBatchId(), "0")) {
             SgFormulaManagement exist = sgFormulaManagementService.selectSgFormulaManagementByFormulaId(sgFormulaManagement.getFormulaId());
             if (exist != null) {
@@ -145,7 +144,7 @@ public class SgFormulaManagementController extends BaseController {
         }
 
         // 通知配料清单刷新数据
-        SgFeedListController.refresh = true;
+        SgFeedListController.refresh.set(true);
         return toAjax(sgFormulaManagementService.updateSgFormulaManagement(sgFormulaManagement));
     }
 
@@ -172,7 +171,7 @@ public class SgFormulaManagementController extends BaseController {
         sgFormulaManagement.setBatchId(batchId);
 
         // 通知配料清单刷新数据
-        SgFeedListController.refresh = true;
+        SgFeedListController.refresh.set(true);
         return toAjax(sgFormulaManagementService.deleteSgFormulaManagement(sgFormulaManagement));
     }
 }

zhyc-module/src/main/java/com/zhyc/module/feed/service/ISgFeedListService.java

@@ -59,5 +59,7 @@ public interface ISgFeedListService {
      */
     int deleteSgFeedListById(Long id);
 
+    void syncFeedListSafely();
+
     void SyncFeedList();
 }

zhyc-module/src/main/java/com/zhyc/module/feed/service/impl/SgFeedListServiceImpl.java

@@ -11,6 +11,10 @@ import org.springframework.stereotype.Service;
 import com.zhyc.module.feed.mapper.SgFeedListMapper;
 import com.zhyc.module.feed.domain.SgFeedList;
 import com.zhyc.module.feed.service.ISgFeedListService;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import static com.zhyc.module.feed.controller.SgFeedListController.refresh;
 
 /**
  * 配料清单Service业务层处理
@@ -30,7 +34,15 @@ public class SgFeedListServiceImpl implements ISgFeedListService {
         this.sgFeedListMapper = sgFeedListMapper;
         this.sgFormulaManagementService = sgFormulaManagementService;
         this.sgFeedPlanService = sgFeedPlanService;
-        // 构造时将数据库初始数据写入缓存
+        // 第一次请求时更新缓存
+        refresh.set(true);
+    }
+
+    /**
+     * 在数据源已切换后调用
+     */
+    public synchronized void initCacheIfNecessary() {
+        // 初次访问时将数据库初始数据写入缓存
         List<SgFeedList> feedListsFromDataBase = this.selectSgFeedListList(new SgFeedList());
         for (SgFeedList sgFeedListItem : feedListsFromDataBase) {
             String key = sgFeedListItem.getFormulaId() + "_" + sgFeedListItem.getFormulaBatchId() + "_" + sgFeedListItem.getDeployDate();
@@ -157,6 +169,16 @@ public class SgFeedListServiceImpl implements ISgFeedListService {
         }
     }
 
+    public void syncFeedListSafely() {
+        try {
+            SyncFeedList();
+        } catch (Exception e) {
+            refresh.set(true); // 初始化失败，下次还能重试
+            throw e;
+        }
+    }
+
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
     public void SyncFeedList() {
         HashMap<String, SgFeedList> cacheTemp = new HashMap<>(sgFeedListMap);
         // 清空旧缓存

zhyc-module/src/main/resources/mapper/feed/SgMaterialMapper.xml

@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isGranular != null "> and is_granular = #{isGranular}</if>
         </where>
     </select>
-    
+
     <select id="selectSgMaterialByMaterialId" parameterType="String" resultMap="SgMaterialResult">
         <include refid="selectSgMaterialVo"/>
         where material_id = #{materialId}