emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/Test.java
@@ -1,9 +1,11 @@ package com.gkhy.safePlatform.emergency.controller; import com.gkhy.safePlatform.account.rpc.apimodel.UserAccountService; import com.gkhy.safePlatform.emergency.service.DemoService; import org.apache.dubbo.config.annotation.DubboReference; import org.apache.log4j.LogManager; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; @@ -15,12 +17,17 @@ @DubboReference(check = false) private UserAccountService userAccountService; // private Logger logger = LogManager.getLogger(Test.class); @Autowired private DemoService demoService; @RequestMapping(value = "/t/rpc",method = RequestMethod.GET) public Object testRpc(String id){ String resp = userAccountService.sayName(id); return resp; } @RequestMapping(value = "/t/get",method = RequestMethod.GET) public Object testEmergencyGetById(Long id){ return demoService.getById(id); } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/DemoInfo.java
@@ -1,13 +1,43 @@ package com.gkhy.safePlatform.emergency.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.util.Date; @TableName("demo") public class DemoInfo { @TableName("demo_table") public class DemoInfo implements Serializable { @TableId(type = IdType.AUTO) private Long id; private String name; private Date gmtCreate; public Long getId() { return id; } public void setId(Long id) { this.id = id; } public String getName() { return name; } public void setName(String name) { this.name = name; } public Date getGmtCreate() { return gmtCreate; } public void setGmtCreate(Date gmtCreate) { this.gmtCreate = gmtCreate; } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/DemoInfoRepository.java
@@ -1,4 +1,9 @@ package com.gkhy.safePlatform.emergency.repository; public interface DemoInfoRepository { import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.gkhy.safePlatform.emergency.entity.DemoInfo; import org.springframework.stereotype.Repository; @Repository public interface DemoInfoRepository extends BaseMapper<DemoInfo> { } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/DemoService.java
@@ -1,10 +1,11 @@ package com.gkhy.safePlatform.emergency.service; import com.gkhy.safePlatform.commons.vo.ResultVO; import com.gkhy.safePlatform.emergency.entity.DemoInfo; import org.springframework.beans.factory.annotation.Autowired; public interface DemoService { ResultVO<DemoInfo> getById(Long id); } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/DemoInfoService.java
@@ -1,6 +1,9 @@ package com.gkhy.safePlatform.emergency.service.baseService; public interface DemoInfoService { import com.baomidou.mybatisplus.extension.service.IService; import com.gkhy.safePlatform.emergency.entity.DemoInfo; import org.springframework.stereotype.Repository; // DO public interface DemoInfoService extends IService<DemoInfo> { } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/DemoInfoServiceImpl.java
@@ -1,8 +1,15 @@ package com.gkhy.safePlatform.emergency.service.baseService.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.gkhy.safePlatform.emergency.entity.DemoInfo; import com.gkhy.safePlatform.emergency.repository.DemoInfoRepository; import com.gkhy.safePlatform.emergency.service.baseService.DemoInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service("demoInfoService") public class DemoInfoServiceImpl implements DemoInfoService { public class DemoInfoServiceImpl extends ServiceImpl<DemoInfoRepository, DemoInfo> implements DemoInfoService { @Autowired private DemoInfoRepository demoInfoRepository; } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/DemoServiceImpl.java
@@ -1,5 +1,8 @@ package com.gkhy.safePlatform.emergency.service.impl; import com.gkhy.safePlatform.commons.enums.ResultCodes; import com.gkhy.safePlatform.commons.vo.ResultVO; import com.gkhy.safePlatform.emergency.entity.DemoInfo; import com.gkhy.safePlatform.emergency.service.DemoService; import com.gkhy.safePlatform.emergency.service.baseService.DemoInfoService; import org.springframework.beans.factory.annotation.Autowired; @@ -10,9 +13,17 @@ @Autowired private DemoInfoService demoInfoService; // 1 //2 //返回的都是dto 到controller @Override public ResultVO<DemoInfo> getById(Long id) { ResultVO<DemoInfo> resultVO = new ResultVO<>(); DemoInfo demoInfo = demoInfoService.getById(id); if(demoInfo != null && demoInfo.getId() > 0){ resultVO.setCode(ResultCodes.OK.getCode()); resultVO.setData(demoInfo); }else { resultVO.setCode(ResultCodes.OK.getCode()); } return resultVO; } } emergency/emergency-service/src/main/resource/mapper/emergency/DemoInfoRepository.xml
@@ -4,8 +4,10 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.gkhy.safePlatform.emergency.repository.DemoInfoRepository"> <resultMap type="DemoInfoDo" id="DemoInfoDoResult"> <result property="eventId" column="event_id" /> <resultMap type="com.gkhy.safePlatform.emergency.entity.DemoInfo" id="DemoInfoResult"> <id column="id" property="id" jdbcType="BIGINT"/> <result column="name" property="name" jdbcType="VARCHAR"/> <result column="gmt_create" property="gmtCreate" jdbcType="TIMESTAMP"/> </resultMap> goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/controller/DemoController.java
@@ -17,4 +17,16 @@ public Object testRpc(String name,String email){ return demoService.getUserDescInfo(name,email); } @RequestMapping(value = "/test/get",method = RequestMethod.GET) public Object testDataSourceGet(Long id){ return demoService.getById(id); } @RequestMapping(value = "/test/save",method = RequestMethod.GET) public Object testDataSourceSave(String title){ return demoService.saveOne(title); } } goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/entity/TestTable.java
对比新文件 @@ -0,0 +1,33 @@ package com.gkhy.safePlatform.goalManage.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.util.Date; @TableName("test_table") public class TestTable implements Serializable { @TableId(type = IdType.AUTO) private Long id; private String title; public Long getId() { return id; } public void setId(Long id) { this.id = id; } public String getTitle() { return title; } public void setTitle(String title) { this.title = title; } } goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/repository/TestTableRepository.java
对比新文件 @@ -0,0 +1,9 @@ package com.gkhy.safePlatform.goalManage.repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.gkhy.safePlatform.goalManage.entity.TestTable; import org.springframework.stereotype.Repository; @Repository public interface TestTableRepository extends BaseMapper<TestTable> { } goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/service/DemoService.java
@@ -1,6 +1,14 @@ package com.gkhy.safePlatform.goalManage.service; import com.gkhy.safePlatform.commons.vo.ResultVO; import com.gkhy.safePlatform.goalManage.entity.TestTable; public interface DemoService { String getUserDescInfo(String name,String email); ResultVO<TestTable> getById(Long id); ResultVO<TestTable> saveOne(String title); } goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/service/baseService/TestTableService.java
对比新文件 @@ -0,0 +1,8 @@ package com.gkhy.safePlatform.goalManage.service.baseService; import com.baomidou.mybatisplus.extension.service.IService; import com.gkhy.safePlatform.goalManage.entity.TestTable; public interface TestTableService extends IService<TestTable> { } goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/service/baseService/impl/TestTableServiceImpl.java
对比新文件 @@ -0,0 +1,15 @@ package com.gkhy.safePlatform.goalManage.service.baseService.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.gkhy.safePlatform.goalManage.entity.TestTable; import com.gkhy.safePlatform.goalManage.repository.TestTableRepository; import com.gkhy.safePlatform.goalManage.service.baseService.TestTableService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service("testTableService") public class TestTableServiceImpl extends ServiceImpl<TestTableRepository, TestTable> implements TestTableService { @Autowired private TestTableRepository testTableRepository; } goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/goalManage/service/impl/DemoServiceImpl.java
@@ -1,9 +1,14 @@ package com.gkhy.safePlatform.goalManage.service.impl; import com.gkhy.safePlatform.commons.enums.ResultCodes; import com.gkhy.safePlatform.commons.vo.ResultVO; import com.gkhy.safePlatform.emergency.rpc.api.EmergencyDemoRpcAPi; import com.gkhy.safePlatform.emergency.rpc.api.model.User; import com.gkhy.safePlatform.goalManage.entity.TestTable; import com.gkhy.safePlatform.goalManage.service.DemoService; import com.gkhy.safePlatform.goalManage.service.baseService.TestTableService; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service @@ -12,6 +17,9 @@ @DubboReference(check = false) private EmergencyDemoRpcAPi emergencyDemoRpcProvider; @Autowired private TestTableService testTableService; @Override public String getUserDescInfo(String name, String email) { User user = new User(); @@ -19,4 +27,34 @@ user.setEmail(email); return emergencyDemoRpcProvider.sayHello(user); } @Override public ResultVO<TestTable> getById(Long id) { ResultVO<TestTable> resultVO = new ResultVO<>(); TestTable testTableInfo = testTableService.getById(id); if(testTableInfo != null){ resultVO.setCode(ResultCodes.OK.getCode()); resultVO.setData(testTableInfo); }else { resultVO.setCode(ResultCodes.OK.getCode()); } return resultVO; } @Override public ResultVO<TestTable> saveOne(String title) { ResultVO<TestTable> resultVO = new ResultVO<>(); TestTable testTable = new TestTable(); if(title == null || title.isEmpty() || title.trim().isEmpty()){ resultVO.setCode(ResultCodes.SERVER_PARAM_NULL.getCode()); }else { testTable.setTitle(title); if(testTableService.save(testTable)){ resultVO.setCode(ResultCodes.OK.getCode()); }else { resultVO.setCode(ResultCodes.SERVER_UPDATE_ERROR.getCode()); } } return resultVO; } } goal-manage/goal-manage-service/src/main/resources/config/mapper/goalManage/TestTableRepository.xml
对比新文件 @@ -0,0 +1,13 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.gkhy.safePlatform.goalManage.entity.TestTable"> <resultMap id="TestTableMap" type="com.gkhy.safePlatform.goalManage.entity.TestTable"> <id column="id" property="id" jdbcType="BIGINT"/> <result property="title" column="title"/> </resultMap> </mapper> safePlatfrom-out-web/pom.xml
@@ -33,6 +33,11 @@ <artifactId>goal-manage-service</artifactId> <version>1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>com.gkhy.safePlatfrom</groupId> <artifactId>goal-manage-rpc-provider</artifactId> <version>1.0-SNAPSHOT</version> </dependency> safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DataSourceConfig.java
@@ -16,8 +16,14 @@ public class DataSourceConfig { @Bean @ConfigurationProperties("spring.datasource.one") DataSource dsOne(){ @ConfigurationProperties("spring.datasource.goalmanage") DataSource dsGoalManage(){ return DruidDataSourceBuilder.create().build(); } @Bean @ConfigurationProperties("spring.datasource.emergency") DataSource dsEmergency(){ return DruidDataSourceBuilder.create().build(); } safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigEmergency.java
文件名从 safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigOne.java 修改 @@ -23,26 +23,26 @@ import java.util.Arrays; @Configuration @MapperScan(basePackages = {"com.gkhy.safePlatform.emergency","com.gkhy.safePlatform.goalManage"}, sqlSessionTemplateRef = "sqlTemplate1",annotationClass = @MapperScan(basePackages = {"com.gkhy.safePlatform.emergency","com.gkhy.safePlatform.emergency"}, sqlSessionTemplateRef = "sqlTemplateEmergency",annotationClass = Repository.class) public class MyBatisConfigOne { public class MyBatisConfigEmergency { @Autowired @Qualifier("dsOne") DataSource dsOne; @Qualifier("dsEmergency") DataSource dsEmergency; @Autowired private MybatisPlusInterceptor mybatisPlusInterceptor; @Bean(name = "datasource1") @ConfigurationProperties(prefix = "spring.datasource.one") @Bean(name = "datasourceEmergency") @ConfigurationProperties(prefix = "spring.datasource.emergency") public DruidDataSource druidDataSourceA(){ return DruidDataSourceBuilder.create().build(); } @Bean(name = "sqlFactory1") public SqlSessionFactory sqlSessionFactory(@Qualifier("datasource1") DruidDataSource dataSource) @Bean(name = "sqlFactoryEmergency") public SqlSessionFactory sqlSessionFactory(@Qualifier("datasourceEmergency") DruidDataSource dataSource) throws Exception { MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean(); @@ -51,9 +51,9 @@ //------------------- Resource[] rs1 = resolver.getResources("classpath*:config/mapper/emergency/**Mapper.xml"); Resource[] rs2 = resolver.getResources("classpath*:config/mapper/goalManage/**Mapper.xml"); // Resource[] rs2 = resolver.getResources("classpath*:config/mapper/goalManage/**Mapper.xml"); ArrayList<Resource> resourceArrayList = new ArrayList<>(Arrays.asList(rs1)); resourceArrayList.addAll(new ArrayList<>(Arrays.asList(rs2))); // resourceArrayList.addAll(new ArrayList<>(Arrays.asList(rs2))); Resource[] resourceArray = new Resource[resourceArrayList.size()]; resourceArrayList.toArray(resourceArray); factoryBean.setMapperLocations(resourceArray); @@ -66,8 +66,8 @@ return factoryBean.getObject(); } @Bean(name = "sqlTemplate1") public SqlSessionTemplate sqlSessionTemplate(@Qualifier("sqlFactory1") SqlSessionFactory sqlSessionFactory) @Bean(name = "sqlTemplateEmergency") public SqlSessionTemplate sqlSessionTemplate(@Qualifier("sqlFactoryEmergency") SqlSessionFactory sqlSessionFactory) { return new SqlSessionTemplate(sqlSessionFactory); } safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigGoalManage.javacopy from safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigOne.java copy to safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigGoalManage.java
文件从 safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigOne.java 复制 @@ -23,26 +23,26 @@ import java.util.Arrays; @Configuration @MapperScan(basePackages = {"com.gkhy.safePlatform.emergency","com.gkhy.safePlatform.goalManage"}, sqlSessionTemplateRef = "sqlTemplate1",annotationClass = @MapperScan(basePackages = {"com.gkhy.safePlatform.goalManage"}, sqlSessionTemplateRef = "sqlTemplateGoalManage",annotationClass = Repository.class) public class MyBatisConfigOne { public class MyBatisConfigGoalManage { @Autowired @Qualifier("dsOne") DataSource dsOne; @Qualifier("dsGoalManage") DataSource dsGoalManage; @Autowired private MybatisPlusInterceptor mybatisPlusInterceptor; @Bean(name = "datasource1") @ConfigurationProperties(prefix = "spring.datasource.one") public DruidDataSource druidDataSourceA(){ @Bean(name = "dataSourceGoalManage") @ConfigurationProperties(prefix = "spring.datasource.goalmanage") public DruidDataSource dataSourceGoalManage(){ return DruidDataSourceBuilder.create().build(); } @Bean(name = "sqlFactory1") public SqlSessionFactory sqlSessionFactory(@Qualifier("datasource1") DruidDataSource dataSource) @Bean(name = "sqlFactoryGoalManage") public SqlSessionFactory sqlSessionFactory(@Qualifier("dataSourceGoalManage") DruidDataSource dataSource) throws Exception { MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean(); @@ -50,10 +50,10 @@ ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(); //------------------- Resource[] rs1 = resolver.getResources("classpath*:config/mapper/emergency/**Mapper.xml"); Resource[] rs2 = resolver.getResources("classpath*:config/mapper/goalManage/**Mapper.xml"); Resource[] rs1 = resolver.getResources("classpath*:config/mapper/goalManage/**Mapper.xml"); // Resource[] rs2 = resolver.getResources("classpath*:config/mapper/goalManage/**Mapper.xml"); ArrayList<Resource> resourceArrayList = new ArrayList<>(Arrays.asList(rs1)); resourceArrayList.addAll(new ArrayList<>(Arrays.asList(rs2))); // resourceArrayList.addAll(new ArrayList<>(Arrays.asList(rs2))); Resource[] resourceArray = new Resource[resourceArrayList.size()]; resourceArrayList.toArray(resourceArray); factoryBean.setMapperLocations(resourceArray); @@ -66,8 +66,8 @@ return factoryBean.getObject(); } @Bean(name = "sqlTemplate1") public SqlSessionTemplate sqlSessionTemplate(@Qualifier("sqlFactory1") SqlSessionFactory sqlSessionFactory) @Bean(name = "sqlTemplateGoalManage") public SqlSessionTemplate sqlSessionTemplate(@Qualifier("sqlFactoryGoalManage") SqlSessionFactory sqlSessionFactory) { return new SqlSessionTemplate(sqlSessionFactory); } safePlatfrom-out-web/src/main/resources/config/application-dev.yaml
@@ -9,11 +9,17 @@ # mysql spring: datasource: one: emergency: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://twt.sinanoaq.com:13306/zhongtai.demo?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: root password: Sinanoaq#415 url: jdbc:mysql://192.168.0.52:3306/safeplatform.emergency.dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: gkhy_dev_out_team password: Adsdf675T6AC7yga type: com.alibaba.druid.pool.DruidDataSource goalmanage: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://192.168.0.52:3306/safeplatform.goalmanage.dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: gkhy_dev_out_team password: Adsdf675T6AC7yga type: com.alibaba.druid.pool.DruidDataSource @@ -26,7 +32,7 @@ protocol: nacos address: nacos://192.168.0.52:8848?namespace=e07a2454-136b-4498-99eb-09dae3336ebe&username=gkhy_safeplatform_out&password=9485uyJHISes09t application: name: gkhy-safeplatform-account-provider name: gkhy-safeplatform-out scan: # 扫描rpc接口定义包 base-packages: com.gkhy.safePlatform