添加双数据源，经营分析

huimv-ql-farm/huimv-ql-environment/pom.xml

@@ -29,6 +29,11 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+            <version>2.4.2</version>
+        </dependency>
+        <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>

huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/HuimvEnvironmentApplication.java

@@ -9,8 +9,8 @@ import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 //自动格式化返回时间
 @EnableJpaAuditing
 // 多数据源
-//@SpringBootApplication(exclude = DruidDataSourceAutoConfigure.class)
-@SpringBootApplication
+@SpringBootApplication(exclude = DruidDataSourceAutoConfigure.class)
+//@SpringBootApplication
 public class HuimvEnvironmentApplication {
 
     public static void main(String[] args) {

huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/service/impl/EnvironmentControlServiceImpl.java

@@ -125,6 +125,7 @@ public class EnvironmentControlServiceImpl implements IEnvironmentControlService
     private  DeviceUpDataEntityRepo deviceUpDataEntityRepo;
 
     @Override
+    @DS("slave")
     public Result getAllFarm(){
         List endList  = new ArrayList();
         List<FarmSm> all = farmSmRepository.findAll();
@@ -147,6 +148,7 @@ public class EnvironmentControlServiceImpl implements IEnvironmentControlService
     }
 
     @Override
+    @DS("slave")
     public Result getAllBylqid(String lqid) {
          List endList = new ArrayList();
 
@@ -169,6 +171,7 @@ public class EnvironmentControlServiceImpl implements IEnvironmentControlService
 
 
     @Override
+    @DS("master")
     public Result warningInfor() {
         List endList  = new ArrayList();
         List<DeviceUpDataEntity> allByTimestampBetween = deviceUpDataEntityRepo.findAllByTimestampBetween(minTemp, maxTemp, cn.hutool.core.date.DateUtil.today());
@@ -192,6 +195,7 @@ public class EnvironmentControlServiceImpl implements IEnvironmentControlService
 
 
     @Override
+    @DS("master")
     public Result findByZSID() {
         return null;
     }

huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/service/impl/IndexEnvServiceImpl.java

@@ -26,6 +26,7 @@ public class IndexEnvServiceImpl implements IndexEnvService {
     private IndexEnvEntityRepo entityRepo;
 
     @Override
+    @DS("master")
     public Result add(IndexEnvEntity envEntity) {
         if (envEntity == null){
             return new Result(10002,"请输入参数",false);
@@ -41,6 +42,7 @@ public class IndexEnvServiceImpl implements IndexEnvService {
     }
 
     @Override
+    @DS("master")
     public Result remove(Integer[] ids) {
         if (ids == null || ids.length==0){
             return new Result(10002,"请选择要删除的数据",false);
@@ -56,6 +58,7 @@ public class IndexEnvServiceImpl implements IndexEnvService {
         }
     }
     @Override
+    @DS("master")
     public Result update(IndexEnvEntity envEntity) {
         if (envEntity == null){
             return new Result(10002,"请选择要修改的值",false);
@@ -70,6 +73,7 @@ public class IndexEnvServiceImpl implements IndexEnvService {
         }
     }
     @Override
+    @DS("master")
     public Result findAll() {
         try {
             List<IndexEnvEntity> all = entityRepo.findAll();

huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/service/impl/LoginServiceImpl.java

@@ -16,6 +16,7 @@ public class LoginServiceImpl implements ILoginService {
     private SysAccountEntityRepository sysAccountEntityRepo;
 
     @Override
+    @DS("master")
     public Result login(String accountName, String password) {
         //Step1:判断账户状态
         //Step2:读取菜单组
@@ -41,6 +42,7 @@ public class LoginServiceImpl implements ILoginService {
     }
 
     @Override
+    @DS("master")
     public Result logout() {
         return null;
     }

huimv-ql-farm/huimv-ql-environment/src/main/resources/application-haiyan.yml

@@ -6,11 +6,26 @@ spring:
 
   #------DataSource-----
   datasource:
-#    url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-    url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-    username: root
-    password: hm123456
-    driver-class-name: com.mysql.cj.jdbc.Driver
+    dynamic:
+      datasource:
+        master:
+          url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+          username: root
+          password: hm123456
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          max-active: 5
+          max-idle: 5
+          min-idle: 3
+          initial-size: 3
+        slave:
+          url: jdbc:mysql://36.22.189.214:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+          username: root
+          password: hm123456
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          max-active: 5
+          max-idle: 5
+          min-idle: 3
+          initial-size: 3
 
   jpa:
     hibernate:

huimv-ql-farm/huimv-ql-environment/src/main/resources/application-ycg.yml

@@ -6,11 +6,26 @@ spring:
 
   #------DataSource-----
   datasource:
-#    url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-    url: jdbc:mysql://127.0.0.1:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-    username: root
-    password: hm123456
-    driver-class-name: com.mysql.cj.jdbc.Driver
+    dynamic:
+      datasource:
+        master:
+          url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+          username: root
+          password: hm123456
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          max-active: 5
+          max-idle: 5
+          min-idle: 3
+          initial-size: 3
+        slave:
+          url: jdbc:mysql://36.22.189.214:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+          username: root
+          password: hm123456
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          max-active: 5
+          max-idle: 5
+          min-idle: 3
+          initial-size: 3
 
   jpa:
     hibernate:

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MOperationAnalysisController.java

@@ -0,0 +1,36 @@
+package com.huimv.production.controller;
+
+import com.huimv.production.domain.MOperationAnalysis;
+import com.huimv.production.result.Result;
+import com.huimv.production.service.MOperationAnalysisService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/operationAnalysis")
+public class MOperationAnalysisController {
+
+	@Autowired
+	private MOperationAnalysisService service;
+
+	@RequestMapping("/add")
+	public Result add(MOperationAnalysis entity){ return service.add(entity); }
+
+	@RequestMapping("/remove")
+	public Result remove(Integer[] ids){ return service.remove(ids); }
+
+	@RequestMapping("/update")
+	public Result update(MOperationAnalysis entity){ return service.update(entity); }
+
+	@RequestMapping("/findAllById")
+	public Result findAllById(Integer id){ return service.findAllById(id); }
+
+
+	@RequestMapping("/findAll")
+	public Result findAll(){
+		return service.findAll();
+	}
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/MOperationAnalysis.java

@@ -0,0 +1,27 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Data
+@Entity
+@Table(name = "m_operation_analysis")
+public class MOperationAnalysis implements Serializable {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Integer id;
+
+	@Column(name = "fodder")
+	private Integer fodder;
+
+	@Column(name = "hog_such")
+	private Integer hogSuch;
+
+	@Column(name = "date")
+	private String date;
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MOperationAnalysisRepository.java

@@ -0,0 +1,14 @@
+package com.huimv.production.repo;
+
+import com.huimv.production.domain.MOperationAnalysis;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
+
+public interface MOperationAnalysisRepository extends JpaRepository<MOperationAnalysis, Integer>,JpaSpecificationExecutor<MOperationAnalysis>{
+	
+	@Query(nativeQuery = true ,value = "select * from m_operation_analysis where fodder like %?1% limit ?2 , ?3")
+    List<MOperationAnalysis> findAll(String name, Integer startPage, Integer pageSize);
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MOperationAnalysisService.java

@@ -0,0 +1,23 @@
+package com.huimv.production.service;
+
+
+import com.huimv.production.domain.MOperationAnalysis;
+import com.huimv.production.result.Result;
+
+public interface MOperationAnalysisService {
+
+   //添加
+   Result add(MOperationAnalysis entity);
+
+   //添加
+   Result remove(Integer[] ids);
+
+   //添加
+   Result update(MOperationAnalysis entity);
+
+   //查询
+  Result findAll();
+
+   //根据id查找
+   Result findAllById(Integer id);
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MOperationAnalysisServiceImpl.java

@@ -0,0 +1,78 @@
+package com.huimv.production.service.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.huimv.production.domain.MOperationAnalysis;
+import com.huimv.production.repo.MOperationAnalysisRepository;
+import com.huimv.production.result.Result;
+import com.huimv.production.result.ResultStatus;
+import com.huimv.production.service.MOperationAnalysisService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@DS("thired")
+public class MOperationAnalysisServiceImpl implements MOperationAnalysisService {
+
+	@Autowired
+	private MOperationAnalysisRepository rep;
+
+	@Override
+	public Result add(MOperationAnalysis entity){
+		if (entity == null){
+			return new Result(10002, ResultStatus.addNull);
+		}
+		try {
+			rep.save(entity);
+			return new Result(10000,ResultStatus.addSuccess);
+		}catch (Exception e){
+			return new Result(10001,ResultStatus.addFailed);
+		}
+	}
+
+	@Override
+	public Result remove(Integer[] ids) {
+		if (ids == null || ids.length==0){
+			return new Result(10002,ResultStatus.deleteNull);
+		}
+		try {
+			for (Integer id : ids) {
+				rep.deleteById(id);
+			}
+			return new Result(10000,ResultStatus.deleteSuccess);
+		}catch (Exception e){
+			return new Result(10001,ResultStatus.deleteFailed);
+		}
+	}
+
+	@Override
+	public Result update(MOperationAnalysis entity) {
+		if (entity == null){
+			return new Result(10002,ResultStatus.updateNull);
+		}
+		try {
+			rep.save(entity);
+			return new Result(10000,ResultStatus.updateSuccess);
+		}catch (Exception e){
+			return new Result(10001,ResultStatus.updateFailed);
+		}
+	}
+
+	@Override
+	public Result findAll() {
+		return new Result(10000,ResultStatus.findSuccess,rep.findAll());
+	}
+
+	@Override
+	public Result findAllById(Integer id) {
+		try {
+			MOperationAnalysis entity = rep.findById(id).get();
+			return new Result(10000,ResultStatus.findSuccess,entity);
+		}catch (Exception e){
+			return new Result(10001,ResultStatus.findFailed,null);
+		}
+	}
+}

huimv-ql-farm/huimv-ql-production/src/main/resources/application-ycg.yml

@@ -5,8 +5,8 @@ spring:
     name: production
 
   datasource:
-#    url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai&failOverReadOnly=false&validationQuery=select 1&testOnBorrow=true
-    url: jdbc:mysql://127.0.0.1:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai&failOverReadOnly=false&validationQuery=select 1&testOnBorrow=true
+#    url: jdbc:mysql://127.0.0.1:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver