数据源切换加注解

module_kzks/src/main/java/org/jeecg/modules/kyBgInfo/controller/KyBgInfoController.java

@@ -13,7 +13,6 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.kyBgInfo.entity.KyBgInfo;
 import org.jeecg.modules.kyBgInfo.service.IKyBgInfoService;
 import org.jeecg.modules.kyBgInfo.vo.KyBgInfoDetailListVO;
-import org.jeecg.modules.mesInfo.vo.MesInfoDetailListVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;

module_kzks/src/main/java/org/jeecg/modules/kyBgInfo/mapper/KyBgInfoMapper.java

@@ -3,6 +3,8 @@ package org.jeecg.modules.kyBgInfo.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.jeecg.modules.dataSourceSwitch.annotation.TargetDataSource;
+import org.jeecg.modules.dataSourceSwitch.enums.DataSourceType;
 import org.jeecg.modules.kyBgInfo.entity.KyBgInfo;
 import org.jeecg.modules.kyBgInfo.vo.KyBgInfoDetailListVO;
 
@@ -14,6 +16,7 @@ import java.util.List;
  * @Date:   2023-08-18
  * @Version: V1.0
  */
+@TargetDataSource(value = DataSourceType.SLAVE)
 public interface KyBgInfoMapper extends BaseMapper<KyBgInfo> {
 
     /**项目成本——工时详情*/

module_kzks/src/main/java/org/jeecg/modules/kyBgInfo/service/impl/KyBgInfoServiceImpl.java

@@ -3,6 +3,8 @@ package org.jeecg.modules.kyBgInfo.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.dataSourceSwitch.annotation.TargetDataSource;
+import org.jeecg.modules.dataSourceSwitch.enums.DataSourceType;
 import org.jeecg.modules.kyBgInfo.entity.KyBgInfo;
 import org.jeecg.modules.kyBgInfo.mapper.KyBgInfoMapper;
 import org.jeecg.modules.kyBgInfo.service.IKyBgInfoService;
@@ -25,6 +27,7 @@ import java.util.List;
  * @Version: V1.0
  */
 @Service
+@TargetDataSource(value = DataSourceType.SLAVE)
 public class KyBgInfoServiceImpl extends ServiceImpl<KyBgInfoMapper, KyBgInfo> implements IKyBgInfoService {
 
     @Autowired

module_kzks/src/main/java/org/jeecg/modules/kyTaskInfo/controller/KyTaskInfoController.java

@@ -1,42 +1,26 @@
 package org.jeecg.modules.kyTaskInfo.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.kyTaskInfo.entity.KyTaskInfo;
-import org.jeecg.modules.kyTaskInfo.service.IKyTaskInfoService;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.kyTaskInfo.entity.KyTaskInfo;
+import org.jeecg.modules.kyTaskInfo.service.IKyTaskInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
 
- /**
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+/**
  * @Description: ky_task_info
  * @Author: jeecg-boot
  * @Date:   2023-08-30
@@ -49,7 +33,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class KyTaskInfoController extends JeecgController<KyTaskInfo, IKyTaskInfoService> {
 	@Autowired
 	private IKyTaskInfoService kyTaskInfoService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -71,7 +55,7 @@ public class KyTaskInfoController extends JeecgController<KyTaskInfo, IKyTaskInf
 		IPage<KyTaskInfo> pageList = kyTaskInfoService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -86,7 +70,7 @@ public class KyTaskInfoController extends JeecgController<KyTaskInfo, IKyTaskInf
 		kyTaskInfoService.save(kyTaskInfo);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -101,7 +85,7 @@ public class KyTaskInfoController extends JeecgController<KyTaskInfo, IKyTaskInf
 		kyTaskInfoService.updateById(kyTaskInfo);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -116,7 +100,7 @@ public class KyTaskInfoController extends JeecgController<KyTaskInfo, IKyTaskInf
 		kyTaskInfoService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -131,7 +115,7 @@ public class KyTaskInfoController extends JeecgController<KyTaskInfo, IKyTaskInf
 		this.kyTaskInfoService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

module_kzks/src/main/java/org/jeecg/modules/kyTaskInfo/mapper/KyTaskInfoMapper.java

@@ -3,6 +3,9 @@ package org.jeecg.modules.kyTaskInfo.mapper;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.jeecg.modules.dataSourceSwitch.annotation.TargetDataSource;
+import org.jeecg.modules.dataSourceSwitch.enums.DataSourceType;
 import org.jeecg.modules.kyTaskInfo.entity.KyTaskInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -12,6 +15,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @Date:   2023-08-30
  * @Version: V1.0
  */
+@TargetDataSource(value = DataSourceType.SLAVE)
 public interface KyTaskInfoMapper extends BaseMapper<KyTaskInfo> {
 
+    /**根据任务号查科研任务的业务员和下达部门*/
+    @Select("select * from ky_task_info where taskno = #{taskno}")
+    public KyTaskInfo getKyTaskInfoByTaskno(String taskno);
+
 }

module_kzks/src/main/java/org/jeecg/modules/kyTaskInfo/service/IKyTaskInfoService.java

@@ -11,4 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IKyTaskInfoService extends IService<KyTaskInfo> {
 
+    /**根据任务号查科研任务的业务员和下达部门*/
+    public KyTaskInfo getKyTaskInfoByTaskno(String taskno);
+
 }

module_kzks/src/main/java/org/jeecg/modules/kyTaskInfo/service/impl/KyTaskInfoServiceImpl.java

@@ -1,8 +1,11 @@
 package org.jeecg.modules.kyTaskInfo.service.impl;
 
+import org.jeecg.modules.dataSourceSwitch.annotation.TargetDataSource;
+import org.jeecg.modules.dataSourceSwitch.enums.DataSourceType;
 import org.jeecg.modules.kyTaskInfo.entity.KyTaskInfo;
 import org.jeecg.modules.kyTaskInfo.mapper.KyTaskInfoMapper;
 import org.jeecg.modules.kyTaskInfo.service.IKyTaskInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -14,6 +17,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  * @Version: V1.0
  */
 @Service
+@TargetDataSource(value = DataSourceType.SLAVE)
 public class KyTaskInfoServiceImpl extends ServiceImpl<KyTaskInfoMapper, KyTaskInfo> implements IKyTaskInfoService {
 
+    @Autowired
+    @SuppressWarnings("all")
+    private KyTaskInfoMapper kyTaskInfoMapper;
+
+    /**根据任务号查科研任务的业务员和下达部门*/
+    public KyTaskInfo getKyTaskInfoByTaskno(String taskno){
+        return kyTaskInfoMapper.getKyTaskInfoByTaskno(taskno);
+    }
+
 }

module_kzks/src/main/java/org/jeecg/modules/mesInfo/mapper/MesInfoMapper.java

@@ -4,6 +4,8 @@ import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.jeecg.modules.dataSourceSwitch.annotation.TargetDataSource;
+import org.jeecg.modules.dataSourceSwitch.enums.DataSourceType;
 import org.jeecg.modules.mesInfo.entity.MesInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.jeecg.modules.mesInfo.vo.MesInfoDetailListVO;
@@ -14,6 +16,7 @@ import org.jeecg.modules.mesInfo.vo.MesInfoDetailListVO;
  * @Date:   2023-08-18
  * @Version: V1.0
  */
+@TargetDataSource(value = DataSourceType.SLAVE)
 public interface MesInfoMapper extends BaseMapper<MesInfo> {
 
     /**项目成本——装机明细*/

module_kzks/src/main/java/org/jeecg/modules/mesInfo/service/impl/MesInfoServiceImpl.java

@@ -2,6 +2,8 @@ package org.jeecg.modules.mesInfo.service.impl;
 
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.dataSourceSwitch.annotation.TargetDataSource;
+import org.jeecg.modules.dataSourceSwitch.enums.DataSourceType;
 import org.jeecg.modules.mesInfo.entity.MesInfo;
 import org.jeecg.modules.mesInfo.mapper.MesInfoMapper;
 import org.jeecg.modules.mesInfo.service.IMesInfoService;
@@ -25,6 +27,7 @@ import java.util.List;
  * @Version: V1.0
  */
 @Service
+@TargetDataSource(value = DataSourceType.SLAVE)
 public class MesInfoServiceImpl extends ServiceImpl<MesInfoMapper, MesInfo> implements IMesInfoService {
 
     @Autowired

module_kzks/src/main/java/org/jeecg/modules/mesInfoInstallationcost/mapper/MesInfoInstallationcostMapper.java

@@ -3,6 +3,8 @@ package org.jeecg.modules.mesInfoInstallationcost.mapper;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.dataSourceSwitch.annotation.TargetDataSource;
+import org.jeecg.modules.dataSourceSwitch.enums.DataSourceType;
 import org.jeecg.modules.mesInfoInstallationcost.entity.MesInfoInstallationcost;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -12,6 +14,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @Date:   2023-08-22
  * @Version: V1.0
  */
+@TargetDataSource(value = DataSourceType.SLAVE)
 public interface MesInfoInstallationcostMapper extends BaseMapper<MesInfoInstallationcost> {
 
 }

module_kzks/src/main/java/org/jeecg/modules/mesInfoInstallationcost/service/IMesInfoInstallationcostService.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.mesInfoInstallationcost.service;
 
+import org.jeecg.modules.dataSourceSwitch.annotation.TargetDataSource;
+import org.jeecg.modules.dataSourceSwitch.enums.DataSourceType;
 import org.jeecg.modules.mesInfoInstallationcost.entity.MesInfoInstallationcost;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -9,6 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @Date:   2023-08-22
  * @Version: V1.0
  */
+@TargetDataSource(value = DataSourceType.SLAVE)
 public interface IMesInfoInstallationcostService extends IService<MesInfoInstallationcost> {
 
 }

module_kzks/src/main/java/org/jeecg/modules/projectCost/mapper/ProjectCostMapper.java

@@ -5,6 +5,8 @@ import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.jeecg.modules.dataSourceSwitch.annotation.TargetDataSource;
+import org.jeecg.modules.dataSourceSwitch.enums.DataSourceType;
 import org.jeecg.modules.projectCost.entity.ProjectCost;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.jeecg.modules.projectCost.vo.ProjectCostVO;
@@ -15,6 +17,7 @@ import org.jeecg.modules.projectCost.vo.ProjectCostVO;
  * @Date:   2023-08-15
  * @Version: V1.0
  */
+@TargetDataSource(value = DataSourceType.SLAVE)
 public interface ProjectCostMapper extends BaseMapper<ProjectCost> {
 
     /**根据任务号查询项目成本的主任务及组批后的主任务*/

module_kzks/src/main/java/org/jeecg/modules/projectCost/service/impl/ProjectCostServiceImpl.java

@@ -22,6 +22,7 @@ import java.util.List;
  * @Version: V1.0
  */
 @Service
+@TargetDataSource(value = DataSourceType.SLAVE)
 public class ProjectCostServiceImpl extends ServiceImpl<ProjectCostMapper, ProjectCost> implements IProjectCostService {
 
     @Autowired
@@ -45,15 +46,11 @@ public class ProjectCostServiceImpl extends ServiceImpl<ProjectCostMapper, Proje
 
     /**根据任务号查询项目成本的主任务及组批后的主任务
      * */
-    // 将注解标注在方法上，表示此方法使用数据源2
-    @TargetDataSource(value = DataSourceType.SLAVE)
     public List<ProjectCostVO> costListByTaskNoMain(String taskno){
         return projectCostMapper.costListByTaskNoMain(taskno);
     }
 
     /**根据任务号查询项目成本的子任务及组批后的子任务*/
-    // 将注解标注在方法上，表示此方法使用数据源2
-    @TargetDataSource(value = DataSourceType.SLAVE)
     public List<ProjectCostVO> costListByTaskNoSub(String taskno){
         return projectCostMapper.costListByTaskNoSub(taskno);
     }

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/mapper/ProjectCostHuijiMapper.java

@@ -2,6 +2,8 @@ package org.jeecg.modules.projectCostHuiji.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.dataSourceSwitch.annotation.TargetDataSource;
+import org.jeecg.modules.dataSourceSwitch.enums.DataSourceType;
 import org.jeecg.modules.projectCostHuiji.entity.ProjectCostHuiji;
 
 import java.util.List;
@@ -12,6 +14,7 @@ import java.util.List;
  * @Date:   2023-08-15
  * @Version: V1.0
  */
+@TargetDataSource(value = DataSourceType.SLAVE)
 public interface ProjectCostHuijiMapper extends BaseMapper<ProjectCostHuiji> {
 
     /**

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/service/impl/ProjectCostHuijiServiceImpl.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.projectCostHuiji.service.impl;
 
+import org.jeecg.modules.dataSourceSwitch.annotation.TargetDataSource;
+import org.jeecg.modules.dataSourceSwitch.enums.DataSourceType;
 import org.jeecg.modules.projectCostHuiji.entity.ProjectCostHuiji;
 import org.jeecg.modules.projectCostHuiji.mapper.ProjectCostHuijiMapper;
 import org.jeecg.modules.projectCostHuiji.service.IProjectCostHuijiService;
@@ -17,6 +19,7 @@ import java.util.List;
  * @Version: V1.0
  */
 @Service
+@TargetDataSource(value = DataSourceType.SLAVE)
 public class ProjectCostHuijiServiceImpl extends ServiceImpl<ProjectCostHuijiMapper, ProjectCostHuiji> implements IProjectCostHuijiService {
 
     @Autowired

module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrder/mapper/WzOutboundOrderBMapper.java

@@ -4,6 +4,8 @@ import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.jeecg.modules.dataSourceSwitch.annotation.TargetDataSource;
+import org.jeecg.modules.dataSourceSwitch.enums.DataSourceType;
 import org.jeecg.modules.wzOutboundOrder.entity.WzOutboundOrderB;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.jeecg.modules.wzOutboundOrder.vo.WzOutboundOrderBDetailListVO;
@@ -15,6 +17,7 @@ import org.jeecg.modules.wzOutboundOrder.vo.WzOutboundOrderBWLBMListVO;
  * @Date:   2023-08-17
  * @Version: V1.0
  */
+@TargetDataSource(value = DataSourceType.SLAVE)
 public interface WzOutboundOrderBMapper extends BaseMapper<WzOutboundOrderB> {
 
 

module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrder/mapper/WzOutboundOrderHMapper.java

@@ -4,6 +4,8 @@ import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.jeecg.modules.dataSourceSwitch.annotation.TargetDataSource;
+import org.jeecg.modules.dataSourceSwitch.enums.DataSourceType;
 import org.jeecg.modules.wzOutboundOrder.entity.WzOutboundOrderH;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -13,6 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @Date:   2023-08-17
  * @Version: V1.0
  */
+@TargetDataSource(value = DataSourceType.SLAVE)
 public interface WzOutboundOrderHMapper extends BaseMapper<WzOutboundOrderH> {
 
     /**根据任务号列表查询所有出库单号*/

module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrder/service/impl/WzOutboundOrderBServiceImpl.java

@@ -1,6 +1,8 @@
 package org.jeecg.modules.wzOutboundOrder.service.impl;
 
 import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.dataSourceSwitch.annotation.TargetDataSource;
+import org.jeecg.modules.dataSourceSwitch.enums.DataSourceType;
 import org.jeecg.modules.wzOutboundOrder.entity.WzOutboundOrderB;
 import org.jeecg.modules.wzOutboundOrder.mapper.WzOutboundOrderBMapper;
 import org.jeecg.modules.wzOutboundOrder.service.IWzOutboundOrderBService;
@@ -20,6 +22,7 @@ import java.util.List;
  * @Version: V1.0
  */
 @Service
+@TargetDataSource(value = DataSourceType.SLAVE)
 public class WzOutboundOrderBServiceImpl extends ServiceImpl<WzOutboundOrderBMapper, WzOutboundOrderB> implements IWzOutboundOrderBService {
 
     @Autowired

module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrder/service/impl/WzOutboundOrderHServiceImpl.java

@@ -2,6 +2,8 @@ package org.jeecg.modules.wzOutboundOrder.service.impl;
 
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.dataSourceSwitch.annotation.TargetDataSource;
+import org.jeecg.modules.dataSourceSwitch.enums.DataSourceType;
 import org.jeecg.modules.wzOutboundOrder.entity.WzOutboundOrderH;
 import org.jeecg.modules.wzOutboundOrder.mapper.WzOutboundOrderHMapper;
 import org.jeecg.modules.wzOutboundOrder.service.IWzOutboundOrderHService;
@@ -25,6 +27,7 @@ import java.util.List;
  * @Version: V1.0
  */
 @Service
+@TargetDataSource(value = DataSourceType.SLAVE)
 public class WzOutboundOrderHServiceImpl extends ServiceImpl<WzOutboundOrderHMapper, WzOutboundOrderH> implements IWzOutboundOrderHService {
 
     @Autowired