fengchunyu
/
dataCompareSy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source 
# Conflicts:
#	config/application.properties
develop
hanrenchun 10 months ago
parent 7a9f6d19a5 9f7df97445
commit 597f18b651
7 changed files with 91 additions and 9 deletions
Show Stats Download Patch File Download Diff File

70
src/main/java/com/ssf/mysqloracletest/domain/TJksbglMysql.java
Unescape View File

@ -3,6 +3,8 @@ package com.ssf.mysqloracletest.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
/**
@ -11,317 +13,381 @@ import lombok.Data;
*/
@Data
@TableName(value = "t_jksbgl")
public class TJksbglMysql {
/**
*
*/
@TableField(value = "id")
private String id;
/**
* 设备名称
*/
@TableField(value = "sbmc")
private String sbmc;
/**
* 设备编号
*/
@TableField(value = "sbbh")
private String sbbh;
/**
* ip地址
*/
@TableField(value = "ipdz")
private String ipdz;
/**
*
*/
@TableField(value = "macdz")
private String macdz;
/**
*
*/
@TableField(value = "sbdk")
private String sbdk;
/**
*
*/
@TableField(value = "jkdwlx")
private String jkdwlx;
/**
*
*/
@TableField(value = "sblx")
private String sblx;
/**
*
*/
@TableField(value = "sbxs")
private String sbxs;
/**
*
*/
@TableField(value = "gnlx")
private String gnlx;
/**
*
*/
@TableField(value = "ywbq")
private String ywbq;
/**
*
*/
@TableField(value = "jcc")
private String jcc;
/**
*
*/
@TableField(value = "sbjd")
private String sbjd;
/**
*
*/
@TableField(value = "sbwd")
private String sbwd;
/**
*
*/
@TableField(value = "azdz")
private String azdz;
/**
*
*/
@TableField(value = "cjfx")
private String cjfx;
/**
*
*/
@TableField(value = "sbzt")
private String sbzt;
/**
*
*/
@TableField(value = "ssgajg")
private String ssgajg;
/**
*
*/
@TableField(value = "jrfs")
private String jrfs;
/**
*
*/
@TableField(value = "wlbs")
private String wlbs;
/**
*
*/
@TableField(value = "sbcs")
private String sbcs;
/**
*
*/
@TableField(value = "azsj")
private String azsj;
/**
*
*/
@TableField(value = "ssbmhy")
private String ssbmhy;
/**
*
*/
@TableField(value = "dwlx")
private String dwlx;
/**
*
*/
@TableField(value = "djrxm")
private String djrxm;
/**
*
*/
@TableField(value = "djrsfzh")
private String djrsfzh;
/**
*
*/
@TableField(value = "djrdwdm")
private String djrdwdm;
/**
*
*/
@TableField(value = "djrdwmc")
private String djrdwmc;
/**
*
*/
@TableField(value = "djsj")
private String djsj;
/**
*
*/
@TableField(value = "jrsjl")
private String jrsjl;
/**
*
*/
@TableField(value = "zrsjl")
private String zrsjl;
/**
*
*/
@TableField(value = "j30tsjl")
private String j30tsjl;
/**
*
*/
@TableField(value = "j30tjl")
private String j30tjl;
/**
*
*/
@TableField(value = "zxzpsj")
private String zxzpsj;
/**
*
*/
@TableField(value = "zxrksj")
private String zxrksj;
/**
*
*/
@TableField(value = "j7tsjl")
private String j7tsjl;
/**
*
*/
@TableField(value = "sfzdryj")
private String sfzdryj;
/**
*
*/
@TableField(value = "glytbh")
private String glytbh;
/**
*
*/
@TableField(value = "glksbh")
private String glksbh;
/**
*
*/
@TableField(value = "sfsdryj")
private String sfsdryj;
/**
*
*/
@TableField(value = "sbid")
private String sbid;
/**
*
*/
@TableField(value = "sbjc")
private String sbjc;
/**
*
*/
@TableField(value = "gldl")
private String gldl;
/**
*
*/
@TableField(value = "dllx")
private String dllx;
/**
*
*/
@TableField(value = "cjqy")
private String cjqy;
/**
*
*/
@TableField(value = "cjfxlx")
private String cjfxlx;
/**
*
*/
@TableField(value = "sbsybh")
private String sbsybh;
/**
*
*/
@TableField(value = "sbbabh")
private String sbbabh;
/**
*
*/
@TableField(value = "sbbazt")
private String sbbazt;
/**
*
*/
@TableField(value = "sbbzmc")
private String sbbzmc;
/**
*
*/
@TableField(value = "lkldmc")
private String lkldmc;
/**
*
*/
@TableField(value = "lklddm")
private String lklddm;
/**
*
*/
@TableField(value = "glxmmc")
private String glxmmc;
/**
*
*/
@TableField(value = "glxmid")
private String glxmid;
/**
*
*/
@TableField(value = "jczq")
private String jczq;
/**
*
*/
@TableField(value = "jckk")
private String jckk;
/**
*
*/
@TableField(value = "zpfx")
private String zpfx;
/**
*
*/
@TableField(value = "gldw")
private String gldw;
/**
*
*/
@TableField(value = "lxr")
private String lxr;
/**
*
*/
@TableField(value = "lxdh")
private String lxdh;
/**
*
*/
@TableField(value = "sfjsbryj")
private String sfjsbryj;
/**
*
*/
@TableField(value = "sfzzrkyj")
private String sfzzrkyj;
// @TableField(exist = false)
// private static final long serialVersionUID = 1L;
}

5
src/main/java/com/ssf/mysqloracletest/mapper/JcjJjxxViewOracleMapper.java
Unescape View File

@ -1,12 +1,15 @@
package com.ssf.mysqloracletest.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ssf.mysqloracletest.domain.JcjJjxxViewOracle;
import com.ssf.mysqloracletest.domain.VSySydzOracle;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
import java.util.Map;
public interface JcjJjxxViewOracleMapper {
@Mapper
public interface JcjJjxxViewOracleMapper extends BaseMapper<JcjJjxxViewOracle> {
public int countJjxx();
public List<JcjJjxxViewOracle> getJjxxList(Map map);

3
src/main/java/com/ssf/mysqloracletest/mapper/JcjJxxViewMysqlMapper.java
Unescape View File

@ -2,6 +2,9 @@ package com.ssf.mysqloracletest.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ssf.mysqloracletest.domain.JcjJjxxViewMysql;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface JcjJxxViewMysqlMapper extends BaseMapper<JcjJjxxViewMysql> {
public JcjJjxxViewMysql selectJcjJxxByJJBH(String JJBH);

3
src/main/java/com/ssf/mysqloracletest/service/JcjJjxxViewOracleService.java
Unescape View File

@ -1,5 +1,6 @@
package com.ssf.mysqloracletest.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ssf.mysqloracletest.domain.JcjJjxxViewOracle;
import java.util.List;
@ -10,7 +11,7 @@ import java.util.Map;
* @description 针对表【jcj_jjxx_view】的数据库操作Service
* @createDate 2023-11-29 16:13:53
*/
public interface JcjJjxxViewOracleService{
public interface JcjJjxxViewOracleService extends IService<JcjJjxxViewOracle> {
public int countJjxx();

13
src/main/java/com/ssf/mysqloracletest/service/impl/JcjJjxxViewOracleServiceImpl.java
Unescape View File

@ -1,12 +1,16 @@
package com.ssf.mysqloracletest.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ssf.mysqloracletest.domain.JcjJjxxViewMysql;
import com.ssf.mysqloracletest.domain.JcjJjxxViewOracle;
import com.ssf.mysqloracletest.mapper.JcjJjxxViewOracleMapper;
import com.ssf.mysqloracletest.mapper.JcjJxxViewMysqlMapper;
import com.ssf.mysqloracletest.service.JcjJjxxViewMysqlService;
import com.ssf.mysqloracletest.service.JcjJjxxViewOracleService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
@ -17,9 +21,10 @@ import java.util.Map;
*/
@Service
@DS("oracleSydz")
public class JcjJjxxViewOracleServiceImpl implements JcjJjxxViewOracleService {
@Resource
private JcjJjxxViewOracleMapper oracleMapper;
@RequiredArgsConstructor
public class JcjJjxxViewOracleServiceImpl extends ServiceImpl<JcjJjxxViewOracleMapper, JcjJjxxViewOracle> implements JcjJjxxViewOracleService {
private final JcjJjxxViewOracleMapper oracleMapper;
@Override

4
src/main/java/com/ssf/mysqloracletest/task/JcjJjxxTask.java
Unescape View File

@ -119,6 +119,10 @@ public class JcjJjxxTask {
return;
}
if (!"true".equals(ConfigParam.JjxxSwitch)) {
return;
}
//1 去mysql查出当前最大时间
JcjJjxxViewMysql jcjJjxxViewMysql = jcjJjxxViewMysqlService.selectRecordOrderByRksj();
//2 用得到的最大时间去oracle 查询大于这个时间的记录

2
src/main/resources/application.yml
Unescape View File

@ -1 +1 @@
server: port: 5679 spring: datasource: dynamic: primary: mysql #设置默认的数据源或者数据源组,默认值即为master strict: false #设置严格模式,默认false不启动. 启动后再为匹配到指定数据源时候回抛出异常,不启动会使用默认数据源. datasource: oracleSydz: 9 driver-class-name: oracle.jdbc.driver.OracleDriver username: za_sjdj 9 spring: mysql: 9 dynamic: # url: jdbc:mysql://121.41.91.94:12036/yhzafk?useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&serverTimezone=GMT driver-class-name: com.mysql.cj.jdbc.Driver username: root password: '!QAZ1qaz' mybatis-plus: mapper-locations: - classpath:mapper/*.xml
server: port: 5679 strict: false #设置严格模式,默认false不启动. 启动后再为匹配到指定数据源时候回抛出异常,不启动会使用默认数据源. spring: dynamic: primary: mysql #设置默认的数据源或者数据源组,默认值即为master spring: datasource: dynamic: primary: mysql #设置默认的数据源或者数据源组,默认值即为master strict: false #设置严格模式,默认false不启动. 启动后再为匹配到指定数据源时候回抛出异常,不启动会使用默认数据源. datasource: oracleSydz: spring: spring: 9 jdbc:mysql://121.41.91.94:12036/yhzafk?useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&serverTimezone=GMT driver-class-name: com.mysql.cj.jdbc.Driver username: root password: '!QAZ1qaz' mybatis-plus: mapper-locations: - classpath:mapper/*.xml
Write Preview
Loading…
Cancel
Save