diff --git a/config/application.properties b/config/application.properties index 9964450..6355fc1 100644 --- a/config/application.properties +++ b/config/application.properties @@ -1,6 +1,6 @@ -#ʵ�е�ַ���봦���� + sydzSwitch=false -#���β�ѯ������ + oncesCounts=10000 syfwSwitch=false @@ -13,9 +13,8 @@ cjxxSwitch=false zdrySwitch=false cyrySwitch=false JjxxSwitch=false -#------------------------?????---------------------------- NewNsydwSwitch=false -metaImpUserSwitch=false +metaImpUserSwitch=true NewNalarminfoSwitch=false metaHandleAlarmSwitch=true metaActualUnitUserInfoSwitch=false @@ -24,6 +23,7 @@ actualTimecjxxSwitch=false actualTimejjxxSwitch=false RentalHouseSwitch=false metaRealEstateInfoSwitch=false - +sydzToEstateInfoSwitch=true +syryToActualInfoSwitch=true diff --git a/src/main/java/com/ssf/mysqloracletest/domain/MetaRealEstateInfo.java b/src/main/java/com/ssf/mysqloracletest/domain/MetaRealEstateInfo.java index f6f1a93..3daf406 100644 --- a/src/main/java/com/ssf/mysqloracletest/domain/MetaRealEstateInfo.java +++ b/src/main/java/com/ssf/mysqloracletest/domain/MetaRealEstateInfo.java @@ -10,12 +10,12 @@ import lombok.EqualsAndHashCode; * 实有房屋信息表(MetaRealEstateInfo)Domain * * @author makejava - * @since 2023-12-05 09:24:09 + * @since 2023-12-06 15:01:30 */ @Data @EqualsAndHashCode(callSuper = false) @TableName(value = "meta_real_estate_info") -public class MetaRealEstateInfo { +public class MetaRealEstateInfo { /** * 主键 @@ -38,11 +38,31 @@ public class MetaRealEstateInfo { */ private String policeDistrictCode; + /** + * 实有房屋地址简称 + */ + private String realEstateBriefAddress; + /** * 实有房屋地址 */ private String realEstateAddress; + /** + * 单元名称 + */ + private String unitName; + + /** + * 楼栋名称 + */ + private String buildingName; + + /** + * 房屋名称 + */ + private String homeName; + /** * 经度 */ diff --git a/src/main/java/com/ssf/mysqloracletest/domain/VSySydzMysql.java b/src/main/java/com/ssf/mysqloracletest/domain/VSySydzMysql.java index c6fb9d3..583f6b8 100644 --- a/src/main/java/com/ssf/mysqloracletest/domain/VSySydzMysql.java +++ b/src/main/java/com/ssf/mysqloracletest/domain/VSySydzMysql.java @@ -18,6 +18,7 @@ public class VSySydzMysql { private String DZDXTYMC; private String SJDZYSID; private String DZYSID; + private String status; } diff --git a/src/main/java/com/ssf/mysqloracletest/domain/VillageSendStaticRecord.java b/src/main/java/com/ssf/mysqloracletest/domain/VillageSendStaticRecord.java new file mode 100644 index 0000000..a366543 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/domain/VillageSendStaticRecord.java @@ -0,0 +1,30 @@ +package com.ssf.mysqloracletest.domain; + +import lombok.Data; + +/** + * village_send_vehicle_record + * 形体抓拍转发记录表 + */ +@Data +public class VillageSendStaticRecord { + private String id; + private String villageCode; + private String villageName; + private String deviceCode; + private String tableName; + private String tableId; + private String sendTime; + private String receiveTime; + private String manufactorNo; + private String receiptId; + private String resultStatus; + private String resultRemark; + private String isactive; + private String c1; + private String c2; + private String c3; + private String c4; + private String c5; + +} diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/VSwryGjxxOracleMapper.java b/src/main/java/com/ssf/mysqloracletest/mapper/VSwryGjxxOracleMapper.java index f2d74bc..55d194f 100644 --- a/src/main/java/com/ssf/mysqloracletest/mapper/VSwryGjxxOracleMapper.java +++ b/src/main/java/com/ssf/mysqloracletest/mapper/VSwryGjxxOracleMapper.java @@ -21,6 +21,8 @@ public interface VSwryGjxxOracleMapper extends BaseMapper { public List getSwryList(Map map); + public List getSwryListByTime(Map map); + public List getRealTimeRecording(String maxTime); } diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/VSySydzMysqlMapper.java b/src/main/java/com/ssf/mysqloracletest/mapper/VSySydzMysqlMapper.java index 77e56a4..17b8231 100644 --- a/src/main/java/com/ssf/mysqloracletest/mapper/VSySydzMysqlMapper.java +++ b/src/main/java/com/ssf/mysqloracletest/mapper/VSySydzMysqlMapper.java @@ -2,16 +2,23 @@ package com.ssf.mysqloracletest.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ssf.mysqloracletest.domain.VSySydwmOracle; import com.ssf.mysqloracletest.domain.VSySydzMysql; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface VSySydzMysqlMapper extends BaseMapper { public VSySydzMysql selectVSySydzById(String id); + public List selectVSySydz(VSySydzMysql bean); + public int insertVSySydz(VSySydzMysql bean); public int updateVSySydzById(VSySydzMysql bean); + + public int updateVSySydzBySJDZYSID(VSySydzMysql bean); + + } \ No newline at end of file diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/VSySyrkMysqlMapper.java b/src/main/java/com/ssf/mysqloracletest/mapper/VSySyrkMysqlMapper.java index 864a037..f7f1857 100644 --- a/src/main/java/com/ssf/mysqloracletest/mapper/VSySyrkMysqlMapper.java +++ b/src/main/java/com/ssf/mysqloracletest/mapper/VSySyrkMysqlMapper.java @@ -4,18 +4,22 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ssf.mysqloracletest.domain.VSySyrkMysql; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** -* @author 28758 -* @description 针对表【v_sy_syrk】的数据库操作Mapper -* @createDate 2023-11-28 18:50:36 -* @Entity generator.domain.VSySyrk -*/ + * @author 28758 + * @description 针对表【v_sy_syrk】的数据库操作Mapper + * @createDate 2023-11-28 18:50:36 + * @Entity generator.domain.VSySyrk + */ @Mapper public interface VSySyrkMysqlMapper extends BaseMapper { public VSySyrkMysql selectVSySyrkById(String id); + public List selectVSySyrkList(); + public int insertVSySyrk(VSySyrkMysql bean); public int updateVSySyrkById(VSySyrkMysql bean); diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/VillageSendStaticRecordDao.java b/src/main/java/com/ssf/mysqloracletest/mapper/VillageSendStaticRecordDao.java new file mode 100644 index 0000000..3418197 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/mapper/VillageSendStaticRecordDao.java @@ -0,0 +1,48 @@ +package com.ssf.mysqloracletest.mapper; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.ssf.mysqloracletest.domain.VillageSendStaticRecord; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +@DS("mysql") +public interface VillageSendStaticRecordDao { + /** + * 插入一条记录 + * + * @return + */ + int insertRecord(VillageSendStaticRecord villageSendStaticRecord); + + /** + * 批量插入 + * + * @return + */ + int insertRecords(List villageSendStaticRecord); + + /** + * 单条更新 + * + * @return + */ + int updateRecord(VillageSendStaticRecord villageSendStaticRecord); + + int updateRecordByTableId(VillageSendStaticRecord villageSendStaticRecord); + + /** + * 查询车辆转发记录表中指定厂家，小区，表，设备，最大的一条已转发记录 + * + * @param map + * @return + */ + Long getMaxTableIdFromVillageSendStaticRecord(Map map); + + /** + * + */ + public List getList(Map map); +} diff --git a/src/main/java/com/ssf/mysqloracletest/service/TransitImpVehicleRecordService.java b/src/main/java/com/ssf/mysqloracletest/service/TransitImpVehicleRecordService.java index 736d6ee..bc6be31 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/TransitImpVehicleRecordService.java +++ b/src/main/java/com/ssf/mysqloracletest/service/TransitImpVehicleRecordService.java @@ -10,4 +10,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface TransitImpVehicleRecordService extends IService { + } diff --git a/src/main/java/com/ssf/mysqloracletest/service/VSySwryGjxxOracleService.java b/src/main/java/com/ssf/mysqloracletest/service/VSySwryGjxxOracleService.java index a3f4bd8..683a10a 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/VSySwryGjxxOracleService.java +++ b/src/main/java/com/ssf/mysqloracletest/service/VSySwryGjxxOracleService.java @@ -17,5 +17,7 @@ public interface VSySwryGjxxOracleService extends IService { public List getSwryList(Map map); + public List getSwryListByTime(Map map); + public List getRealTimeRecording(String maxTime); } diff --git a/src/main/java/com/ssf/mysqloracletest/service/VSySydzMysqlService.java b/src/main/java/com/ssf/mysqloracletest/service/VSySydzMysqlService.java index 7ddbd95..6a0bdf9 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/VSySydzMysqlService.java +++ b/src/main/java/com/ssf/mysqloracletest/service/VSySydzMysqlService.java @@ -3,13 +3,19 @@ package com.ssf.mysqloracletest.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ssf.mysqloracletest.domain.VSySydzMysql; +import java.util.List; + public interface VSySydzMysqlService extends IService { public VSySydzMysql selectVSySydzById(String id); + public List selectVSySydz(VSySydzMysql bean); + public int insertVSySydz(VSySydzMysql sydz); public int updateVSySydzById(VSySydzMysql sydz); + public int updateVSySydzBySJDZYSID(VSySydzMysql sydz); + } diff --git a/src/main/java/com/ssf/mysqloracletest/service/VSySyrkMysqlService.java b/src/main/java/com/ssf/mysqloracletest/service/VSySyrkMysqlService.java index dce5d59..029be04 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/VSySyrkMysqlService.java +++ b/src/main/java/com/ssf/mysqloracletest/service/VSySyrkMysqlService.java @@ -3,6 +3,8 @@ package com.ssf.mysqloracletest.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ssf.mysqloracletest.domain.VSySyrkMysql; +import java.util.List; + /** * @author 28758 * @description 针对表【v_sy_syrk】的数据库操作Service @@ -11,6 +13,8 @@ import com.ssf.mysqloracletest.domain.VSySyrkMysql; public interface VSySyrkMysqlService extends IService { public VSySyrkMysql selectVSySyrkById(String id); + public List selectVSySyrkList(); + public int insertVSySyrk(VSySyrkMysql syrk); public int updateVSySyrkById(VSySyrkMysql syrk); diff --git a/src/main/java/com/ssf/mysqloracletest/service/impl/VSwryGjxxOracleServiceImpl.java b/src/main/java/com/ssf/mysqloracletest/service/impl/VSwryGjxxOracleServiceImpl.java index b6d836b..6afdfd8 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/impl/VSwryGjxxOracleServiceImpl.java +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/VSwryGjxxOracleServiceImpl.java @@ -35,6 +35,11 @@ public class VSwryGjxxOracleServiceImpl extends ServiceImpl getSwryListByTime(Map map) { + return oracleMapper.getSwryListByTime(map); + } + @Override public List getRealTimeRecording(String time) { return oracleMapper.getRealTimeRecording(time); diff --git a/src/main/java/com/ssf/mysqloracletest/service/impl/VSySydzMysqlServiceImpl.java b/src/main/java/com/ssf/mysqloracletest/service/impl/VSySydzMysqlServiceImpl.java index 357f59e..4bb5489 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/impl/VSySydzMysqlServiceImpl.java +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/VSySydzMysqlServiceImpl.java @@ -10,6 +10,8 @@ import com.ssf.mysqloracletest.service.VSySydzMysqlService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; + @Service @DS("mysql") @RequiredArgsConstructor @@ -22,6 +24,11 @@ public class VSySydzMysqlServiceImpl extends ServiceImpl selectVSySydz(VSySydzMysql bean) { + return sySydzMysqlMapper.selectVSySydz(bean); + } + @Override public int insertVSySydz(VSySydzMysql bean) { return sySydzMysqlMapper.insertVSySydz(bean); @@ -31,4 +38,8 @@ public class VSySydzMysqlServiceImpl extends ServiceImpl implements VSySydzOracleService { +public class VSySydzOracleServiceImpl extends ServiceImpl implements VSySydzOracleService { @Resource private VSySydzOracleMapper oracleMapper; diff --git a/src/main/java/com/ssf/mysqloracletest/service/impl/VSySyrkMysqlServiceImpl.java b/src/main/java/com/ssf/mysqloracletest/service/impl/VSySyrkMysqlServiceImpl.java index 262b7b5..ae98e43 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/impl/VSySyrkMysqlServiceImpl.java +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/VSySyrkMysqlServiceImpl.java @@ -8,11 +8,13 @@ import com.ssf.mysqloracletest.service.VSySyrkMysqlService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; + /** -* @author 28758 -* @description 针对表【v_sy_syrk】的数据库操作Service实现 -* @createDate 2023-11-28 18:50:36 -*/ + * @author 28758 + * @description 针对表【v_sy_syrk】的数据库操作Service实现 + * @createDate 2023-11-28 18:50:36 + */ @Service @DS("mysql") @RequiredArgsConstructor @@ -25,6 +27,11 @@ public class VSySyrkMysqlServiceImpl extends ServiceImpl selectVSySyrkList() { + return sySyrkMysqlMapper.selectVSySyrkList(); + } + @Override public int insertVSySyrk(VSySyrkMysql syrk) { return sySyrkMysqlMapper.insertVSySyrk(syrk); diff --git a/src/main/java/com/ssf/mysqloracletest/task/JcjJjxxTask.java b/src/main/java/com/ssf/mysqloracletest/task/JcjJjxxTask.java index 5f240f5..a268934 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/JcjJjxxTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/JcjJjxxTask.java @@ -59,7 +59,6 @@ public class JcjJjxxTask { int countJjxx = jcjJjxxViewOracleService.countJjxx(); logger.info("countJjxx:" + countJjxx); - logger.info("countJjxx:" + countJjxx); if (countJjxx > 0) { JjxxTag = true; diff --git a/src/main/java/com/ssf/mysqloracletest/task/MetaActualUserInfoTask.java b/src/main/java/com/ssf/mysqloracletest/task/MetaActualUserInfoTask.java index bf17e4a..a5a3607 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/MetaActualUserInfoTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/MetaActualUserInfoTask.java @@ -43,7 +43,13 @@ public class MetaActualUserInfoTask { /** - * 清洗实有人口 + * + * 功能描述: 已弃用 + * + * @param:清洗实有人口 + * @return: + * @auther: cyfeng + * @date: 2023/12/6 17:01 */ @Scheduled(initialDelay = 100, fixedDelay = 3000) public void transMetaActualUserInfo() { diff --git a/src/main/java/com/ssf/mysqloracletest/task/MetaImpUserInfoTask.java b/src/main/java/com/ssf/mysqloracletest/task/MetaImpUserInfoTask.java index 068d951..c53c940 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/MetaImpUserInfoTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/MetaImpUserInfoTask.java @@ -1,9 +1,10 @@ package com.ssf.mysqloracletest.task; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ssf.mysqloracletest.domain.*; +import com.ssf.mysqloracletest.domain.MetaImpUserInfo; +import com.ssf.mysqloracletest.domain.VillageActualUserInfo; +import com.ssf.mysqloracletest.domain.ZhxfZdrygkRyjbxxViewMysql; import com.ssf.mysqloracletest.service.MetaImpUserInfoService; import com.ssf.mysqloracletest.service.VillageActualUserInfoService; import com.ssf.mysqloracletest.service.ZhxfZdrygkRyjbxxViewMysqlService; @@ -17,14 +18,10 @@ import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import javax.annotation.Resource; import java.util.List; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; /** - * 用户数据接入 + * 重点人 */ @Component @RequiredArgsConstructor @@ -37,12 +34,8 @@ public class MetaImpUserInfoTask { private final VillageActualUserInfoService actualUserInfoService; - - - /** - * 连云港 对接海康平台获取人员基础数据 - * // + * 重点人 */ @Scheduled(initialDelay = 100, fixedDelay = 3000) public void transzdry() { @@ -56,23 +49,11 @@ public class MetaImpUserInfoTask { Page page = new Page<>(1, 1000); List resultList = zdryMysqlService.page(page, queryWrapper).getRecords(); - CountDownLatch latch = new CountDownLatch(resultList.size()); - ExecutorService impUserPool = Executors.newFixedThreadPool(5); - for (ZhxfZdrygkRyjbxxViewMysql bean : resultList) { - impUserPool.submit(() -> { - cleanImpUser(bean); - latch.countDown(); - }); + cleanImpUser(bean); } - try { - // Wait for all threads to complete - latch.await(); - } catch (InterruptedException e) { - e.printStackTrace(); - } - // 关闭线程池 - impUserPool.shutdown(); + + } catch (Exception e) { logger.info(StringKit.getTrace(e)); } @@ -95,12 +76,12 @@ public class MetaImpUserInfoTask { userInfo.setUserPic(userPic); userInfo.setUserName(StringKit.toString(beanCp.getXM())); userInfo.setIdCard(StringKit.toString(beanCp.getZJHM())); - userInfo.setSex( "".equals(StringKit.toString(beanCp.getXB()))? 0: NumKit.checkInt(beanCp.getXB())); + userInfo.setSex("".equals(StringKit.toString(beanCp.getXB())) ? 0 : NumKit.checkInt(beanCp.getXB())); userInfo.setPhone(StringKit.toString(beanCp.getSJHM())); String zdrlx = StringKit.toString(beanCp.getZDRYXL()); - if("".equals(zdrlx)){ - userInfo.setImpUserType(zdrlx.substring(0,4) + "000000"); + if ("".equals(zdrlx)) { + userInfo.setImpUserType(zdrlx.substring(0, 4) + "000000"); userInfo.setImpUserSubType(beanCp.getZDRYXL()); } userInfo.setHouseHoldRegister(beanCp.getHJDQH()); diff --git a/src/main/java/com/ssf/mysqloracletest/task/MetaRealEstateInfoTask.java b/src/main/java/com/ssf/mysqloracletest/task/MetaRealEstateInfoTask.java index ab770e4..4d69011 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/MetaRealEstateInfoTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/MetaRealEstateInfoTask.java @@ -35,6 +35,9 @@ public class MetaRealEstateInfoTask { /** + * 已弃用 + * 实有房屋往实有地址清洗 + * * 清洗实有房屋 */ @Scheduled(initialDelay = 100, fixedDelay = 3000) @@ -72,6 +75,7 @@ public class MetaRealEstateInfoTask { } } + //实有房屋往实有地址清洗 private void cleanJwtSyfw(VJwtSyfw bean) { VJwtSyfw jwtSyfwCp = new VJwtSyfw(); try { diff --git a/src/main/java/com/ssf/mysqloracletest/task/SydzToEstateInfoTask.java b/src/main/java/com/ssf/mysqloracletest/task/SydzToEstateInfoTask.java new file mode 100644 index 0000000..b713f58 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/task/SydzToEstateInfoTask.java @@ -0,0 +1,155 @@ +package com.ssf.mysqloracletest.task; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ssf.mysqloracletest.domain.MetaRealEstateInfo; +import com.ssf.mysqloracletest.domain.VJwtSyfw; +import com.ssf.mysqloracletest.domain.VSySydzMysql; +import com.ssf.mysqloracletest.service.JwtSyfwService; +import com.ssf.mysqloracletest.service.MetaRealEstateInfoService; +import com.ssf.mysqloracletest.service.VSySydzMysqlService; +import com.ssf.mysqloracletest.utils.ConfigParam; +import com.ssf.mysqloracletest.utils.NumKit; +import com.ssf.mysqloracletest.utils.StringKit; +import lombok.RequiredArgsConstructor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + +/** + * 用户数据接入 + */ +@Component +@RequiredArgsConstructor +public class SydzToEstateInfoTask { + + private static final Logger logger = LoggerFactory.getLogger(SydzToEstateInfoTask.class); + + private final MetaRealEstateInfoService estateInfoService; + private final VSySydzMysqlService sydzMysqlService; + + + /** + * + * 实有房屋往实有地址清洗 + * + * 清洗实有房屋 + */ + @Scheduled(initialDelay = 100, fixedDelay = 3000) + public void transMetaRealEstateInfo() { + + if (!"true".equals(ConfigParam.sydzToEstateInfoSwitch)) { + return; + } + + + logger.info("sydzToEstateInfoSwitch start"); + try { + List sydzs = sydzMysqlService.selectVSySydz(new VSySydzMysql()); + + CountDownLatch latch = new CountDownLatch(sydzs.size()); + ExecutorService jwtSyfwPool = Executors.newFixedThreadPool(50); + + for (VSySydzMysql bean : sydzs) { + jwtSyfwPool.submit(() -> { + cleanJwtSyfw(bean); + latch.countDown(); + }); + } + try { + // Wait for all threads to complete + latch.await(); + } catch (InterruptedException e) { + e.printStackTrace(); + } + // 关闭线程池 + jwtSyfwPool.shutdown(); + } catch (Exception e) { + logger.info(StringKit.getTrace(e)); + } + } + + //实有房屋往实有地址清洗 + private void cleanJwtSyfw(VSySydzMysql bean) { + VSySydzMysql beanCp = new VSySydzMysql(); + try { + + BeanUtils.copyProperties(bean, beanCp); + + String dzdxtymc = StringKit.toString(beanCp.getDZDXTYMC()); + dzdxtymc = StringKit.convertChineseUnitToDigit(dzdxtymc); +// dzdxtymc = dzdxtymc.replaceAll("号","幢"); + String home = ""; + try { + home = StringKit.extractDigits(dzdxtymc.substring(0, dzdxtymc.indexOf("室"))); + } catch (Exception e) { + home = ""; + } + String unit = "1"; + try { + unit = StringKit.extractDigits(dzdxtymc.substring(0, dzdxtymc.indexOf("单元"))); + } catch (Exception e) { + unit = "1"; + } + String build = ""; + try { + build = StringKit.extractDigits(dzdxtymc.substring(0, dzdxtymc.indexOf("幢"))); + } catch (Exception e) { + build = ""; + } + + + String address = ""; + try { + int index = dzdxtymc.indexOf("号"); + if (index != -1) { + address = dzdxtymc.substring(0, index); + } + } catch (Exception e) { + logger.info("小区地址未匹配到请求中户籍地址:" + build); + } + + + if ("".equals(home) || "".equals(unit) || "".equals(address)){ + beanCp.setStatus("2"); + sydzMysqlService.updateVSySydzById(beanCp); + return; + } + + + MetaRealEstateInfo realEstateInfo = new MetaRealEstateInfo(); +// realEstateInfo.setHomeId(); + realEstateInfo.setPoliceStationCode(StringKit.toString(bean.getZRQDM())); + realEstateInfo.setPoliceDistrictCode(StringKit.toString(bean.getZRQDM())); + realEstateInfo.setRealEstateBriefAddress(address + "号"); + realEstateInfo.setRealEstateAddress(StringKit.toString(StringKit.convertChineseUnitToDigit(beanCp.getDZDXTYMC()))); + realEstateInfo.setUnitName(unit); + realEstateInfo.setBuildingName(build); + realEstateInfo.setHomeName(home); + realEstateInfo.setLongitude(NumKit.checkDouble(bean.getJDZB())); + realEstateInfo.setLatitude(NumKit.checkDouble(bean.getCJSJ())); + boolean b = estateInfoService.save(realEstateInfo); + + if (b) { + beanCp.setStatus("1"); + sydzMysqlService.updateVSySydzById(beanCp); + } + } catch (Exception e) { + logger.info(StringKit.getTrace(e)); + beanCp.setStatus("2"); + sydzMysqlService.updateVSySydzById(beanCp); + } + } + + + + + +} diff --git a/src/main/java/com/ssf/mysqloracletest/task/SyrkToActualInfoTask.java b/src/main/java/com/ssf/mysqloracletest/task/SyrkToActualInfoTask.java new file mode 100644 index 0000000..5104980 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/task/SyrkToActualInfoTask.java @@ -0,0 +1,145 @@ +package com.ssf.mysqloracletest.task; + +import com.ssf.mysqloracletest.domain.*; +import com.ssf.mysqloracletest.service.MetaActualUserInfoService; +import com.ssf.mysqloracletest.service.MetaRealEstateInfoService; +import com.ssf.mysqloracletest.service.VSySyrkMysqlService; +import com.ssf.mysqloracletest.service.VillageActualUserInfoService; +import com.ssf.mysqloracletest.utils.ConfigParam; +import com.ssf.mysqloracletest.utils.NumKit; +import com.ssf.mysqloracletest.utils.StringKit; +import lombok.RequiredArgsConstructor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + +/** + * 用户数据接入 + */ +@Component +@RequiredArgsConstructor +public class SyrkToActualInfoTask { + + private static final Logger logger = LoggerFactory.getLogger(SyrkToActualInfoTask.class); + + private final MetaActualUserInfoService metaActualUserInfoService; + private final VSySyrkMysqlService syrkMysqlService; + private final VillageActualUserInfoService villageActualUserInfoService; + private final MetaRealEstateInfoService estateInfoService; + + /** + * 实有房屋往实有地址清洗 + *

+ * 清洗实有房屋 + */ + @Scheduled(initialDelay = 100, fixedDelay = 3000) + public void transMetaRealEstateInfo() { + + if (!"true".equals(ConfigParam.syryToActualInfoSwitch)) { + return; + } + + + logger.info("syryToActualInfoSwitch start"); + try { + List sydzs = syrkMysqlService.selectVSySyrkList(); + + CountDownLatch latch = new CountDownLatch(sydzs.size()); + ExecutorService jwtSyfwPool = Executors.newFixedThreadPool(50); + + for (VSySyrkMysql bean : sydzs) { + jwtSyfwPool.submit(() -> { + cleanJwtSyfw(bean); + latch.countDown(); + }); + } + try { + // Wait for all threads to complete + latch.await(); + } catch (InterruptedException e) { + e.printStackTrace(); + } + // 关闭线程池 + jwtSyfwPool.shutdown(); + } catch (Exception e) { + logger.info(StringKit.getTrace(e)); + } + } + + //实有房屋往实有地址清洗 + private void cleanJwtSyfw(VSySyrkMysql bean) { + VSySyrkMysql beanCp = new VSySyrkMysql(); + try { + + BeanUtils.copyProperties(bean, beanCp); + //先取现居住地 如果没有 取户籍地 +// String sxzdxz = StringKit.toString(beanCp.getXJZDXZ() ); +// if("".equals(StringKit.toString(sxzdxz))){ +// sxzdxz = StringKit.toString(beanCp.getHJDXZ()); +// } +// if("".equals(sxzdxz)){ +// logger.info("sxzdxz:"+sxzdxz); +// beanCp.setStatus("2"); +// syrkMysqlService.updateVSySyrkById(beanCp); +// return; +// } + + + VillageActualUserInfo userInfoPara = new VillageActualUserInfo(); + userInfoPara.setIdcard(StringKit.toString(beanCp.getSFZH())); + List actualUserInfos = villageActualUserInfoService.selectVillageActualUserInfoListLimit1(userInfoPara); + String userPic = ""; + if (actualUserInfos != null && actualUserInfos.size() > 0) { + userPic = StringKit.toString(actualUserInfos.get(0).getUserPic()); + } + + MetaActualUserInfo realEstateInfo = new MetaActualUserInfo(); + realEstateInfo.setUserPic(userPic); + realEstateInfo.setUserName(beanCp.getXM()); + realEstateInfo.setIdCard(beanCp.getSFZH()); + realEstateInfo.setSex(NumKit.checkInt(beanCp.getXB())); + realEstateInfo.setPhone(beanCp.getLXDH()); + realEstateInfo.setLandline(beanCp.getSJHM()); + realEstateInfo.setActualUserType(NumKit.checkInt(beanCp.getRYLX())); +// realEstateInfo.setHouseHoldRegister(); + //户籍地 + realEstateInfo.setHouseHoldAddress(beanCp.getHJDXZ()); + //现居住地 + realEstateInfo.setHabitationAddress(beanCp.getXJZDXZ()); + realEstateInfo.setPoliceStationCode(beanCp.getPCSDM()); + realEstateInfo.setPoliceStationName(beanCp.getPCSMC()); + realEstateInfo.setPoliceDistrictCode(beanCp.getJWQDM()); + realEstateInfo.setPoliceDistrictName(beanCp.getJWQMC()); + realEstateInfo.setManagementStatus(beanCp.getSTS()); + + //房屋放出来单独清洗 + /* MetaRealEstateInfo metaRealEstateInfoPara = new MetaRealEstateInfo(); + metaRealEstateInfoPara.setRealEstateAddress(StringKit.toString(beanCp.getXJZDXZ())); + MetaRealEstateInfo estateInfo = estateInfoService.getListByAddress(metaRealEstateInfoPara); + if (estateInfo != null) { + realEstateInfo.setHomeId(StringKit.toString(estateInfo.getId())); + }*/ + realEstateInfo.setMetaCreateTime(beanCp.getYSBZK_RKSJ()); + realEstateInfo.setMetaUpdateTime(beanCp.getYSBZK_GXSJ()); + + boolean b = metaActualUserInfoService.save(realEstateInfo); + if (b) { + beanCp.setStatus("1"); + syrkMysqlService.updateVSySyrkById(beanCp); + } + } catch (Exception e) { + logger.info(StringKit.getTrace(e)); + beanCp.setStatus("2"); + syrkMysqlService.updateVSySyrkById(beanCp); + } + } + + +} diff --git a/src/main/java/com/ssf/mysqloracletest/task/VSwryGjxxTask.java b/src/main/java/com/ssf/mysqloracletest/task/VSwryGjxxTask.java index 3a9fb97..583c7f3 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/VSwryGjxxTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/VSwryGjxxTask.java @@ -1,5 +1,8 @@ package com.ssf.mysqloracletest.task; +import cn.hutool.core.date.DateField; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.ssf.mysqloracletest.domain.TransitImpUserRecord; import com.ssf.mysqloracletest.domain.TransitImpVehicleRecord; @@ -10,17 +13,12 @@ import com.ssf.mysqloracletest.service.VSySwryGjxxOracleService; import com.ssf.mysqloracletest.utils.ConfigParam; import com.ssf.mysqloracletest.utils.NumKit; import com.ssf.mysqloracletest.utils.StringKit; - import lombok.RequiredArgsConstructor; -import oracle.sql.TRANSDUMP; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; - -import javax.annotation.Resource; import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.List; @@ -30,7 +28,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; /** - * 用户数据接入 + * 用户数据接入 */ @Component @RequiredArgsConstructor @@ -44,7 +42,6 @@ public class VSwryGjxxTask { SimpleDateFormat dateFormat = new SimpleDateFormat(pattern); - private final VSySwryGjxxOracleService vSySwryGjxxOracleService; private final TransitImpUserRecordService transitImpUserRecordService; @@ -92,7 +89,7 @@ public class VSwryGjxxTask { try { List Swrys = vSySwryGjxxOracleService.getSwryList(SwryMap); for (VSwryGjxxOracle swry : Swrys) { - if ("02".equals(swry.getGJLX())){ + if ("02".equals(swry.getGJLX())) { TransitImpVehicleRecord transitImpVehicleRecord = new TransitImpVehicleRecord(); transitImpVehicleRecord.setDeviceCode(swry.getVALUE3()); transitImpVehicleRecord.setLongitude(NumKit.checkBigDecimal(swry.getJDZB())); @@ -106,21 +103,21 @@ public class VSwryGjxxTask { transitImpVehicleRecord.setPassTime(NumKit.checkLong(swry.getRYWKSJ())); transitImpVehicleRecord.setPartitionField(dateFormat.parse(swry.getRYWKSJ())); TransitImpVehicleRecord one = transitImpVehicleRecordService.lambdaQuery().eq(TransitImpVehicleRecord::getGlobalPic, swry.getVALUE5()).one(); - if (one==null){ + if (one == null) { boolean save = transitImpVehicleRecordService.save(transitImpVehicleRecord); if (save) { logger.info("Swry-" + swry.getGJXXID() + ":插入成功"); } - }else { + } else { UpdateWrapper transitImpVehicleRecordUpdateWrapper = new UpdateWrapper<>(); - transitImpVehicleRecordUpdateWrapper.eq("global_pic",swry.getVALUE5()); + transitImpVehicleRecordUpdateWrapper.eq("global_pic", swry.getVALUE5()); boolean update = transitImpVehicleRecordService.update(transitImpVehicleRecord, transitImpVehicleRecordUpdateWrapper); if (update) { logger.info("Swry-" + swry.getGJXXID() + ":更新成功"); } } } - if ("03".equals(swry.getGJSJ())){ + if ("03".equals(swry.getGJSJ())) { TransitImpUserRecord transitImpUserRecord = new TransitImpUserRecord(); transitImpUserRecord.setDeviceCode(swry.getVALUE6()); transitImpUserRecord.setLongitude(NumKit.checkBigDecimal(swry.getJDZB())); @@ -133,15 +130,15 @@ public class VSwryGjxxTask { transitImpUserRecord.setIdCard(swry.getZDRYSFZH()); transitImpUserRecord.setPassTime(NumKit.checkLong(swry.getRYWKSJ())); transitImpUserRecord.setPartitionField(dateFormat.parse(swry.getRYWKSJ())); - TransitImpUserRecord one = transitImpUserRecordService.lambdaQuery().eq(TransitImpUserRecord::getGlobalPic,swry.getVALUE4()).one(); - if (one==null) { + TransitImpUserRecord one = transitImpUserRecordService.lambdaQuery().eq(TransitImpUserRecord::getGlobalPic, swry.getVALUE4()).one(); + if (one == null) { boolean save = transitImpUserRecordService.save(transitImpUserRecord); if (save) { logger.info("Swry-" + swry.getGJXXID() + ":插入成功"); } - }else { + } else { UpdateWrapper transitImpUserRecordUpdateWrapper = new UpdateWrapper<>(); - transitImpUserRecordUpdateWrapper.eq("global_pic",swry.getVALUE4()); + transitImpUserRecordUpdateWrapper.eq("global_pic", swry.getVALUE4()); boolean update = transitImpUserRecordService.update(transitImpUserRecord, transitImpUserRecordUpdateWrapper); if (update) { logger.info("Swry-" + swry.getGJXXID() + ":更新成功"); @@ -176,5 +173,25 @@ public class VSwryGjxxTask { + public static void main(String[] args) { + + //首先从数据库取记录里面的最大时间 + //取到了之后 查询的时候 >最大时间 <当前时间一年之后的时间 + + long currentTimeMillis = System.currentTimeMillis(); + // Convert long to DateTime + DateTime currentDateTime = DateUtil.date(currentTimeMillis); + + // 获取当前时间的格式化字符串 + String currentFormattedDate = currentDateTime.toString("yyyyMMddHHmmss"); + System.out.println("Current Formatted Date: " + currentFormattedDate); + + // 获取1年后的时间 + DateTime oneYearLaterDateTime = currentDateTime.offset(DateField.YEAR, 1); + String oneYearLaterFormattedDate = oneYearLaterDateTime.toString("yyyyMMddHHmmss"); + System.out.println("1 Year Later Formatted Date: " + oneYearLaterFormattedDate); + + + } } diff --git a/src/main/java/com/ssf/mysqloracletest/task/VSySydzTask.java b/src/main/java/com/ssf/mysqloracletest/task/VSySydzTask.java index 496cb5f..be0e508 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/VSySydzTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/VSySydzTask.java @@ -2,6 +2,8 @@ package com.ssf.mysqloracletest.task; import com.ssf.mysqloracletest.domain.VSySydzMysql; import com.ssf.mysqloracletest.domain.VSySydzOracle; +import com.ssf.mysqloracletest.domain.VillageSendStaticRecord; +import com.ssf.mysqloracletest.mapper.VillageSendStaticRecordDao; import com.ssf.mysqloracletest.service.VSySydzMysqlService; import com.ssf.mysqloracletest.service.VSySydzOracleService; import com.ssf.mysqloracletest.utils.ConfigParam; @@ -22,7 +24,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; /** - * 用户数据接入 + * 用户数据接入 */ @Component public class VSySydzTask { @@ -31,9 +33,10 @@ public class VSySydzTask { @Resource private VSySydzMysqlService sydzMysqlService; - @Resource private VSySydzOracleService sydzOracleService; + @Resource + private VillageSendStaticRecordDao sendStaticRecordDao; final int oncesCounts = NumKit.checkInt(ConfigParam.oncesCounts) == 0 ? 1000 : NumKit.checkInt(ConfigParam.oncesCounts); @@ -44,7 +47,7 @@ public class VSySydzTask { * // */ @Scheduled(initialDelay = 100, fixedDelay = 3000) - public void transSydz() { + public void transSydzInit() { if (sydzTag) { return; @@ -54,16 +57,11 @@ public class VSySydzTask { return; } - try { int countSydz = sydzOracleService.countSydz(); - logger.info("countSydz:" + countSydz); - logger.info("countSydz:" + countSydz); if (countSydz > 0) { - sydzTag = true; - int count = countSydz / oncesCounts; CountDownLatch latch = new CountDownLatch(count); ExecutorService sydzPool = Executors.newFixedThreadPool(50); @@ -72,27 +70,13 @@ public class VSySydzTask { Map sydzMap = new HashMap(); sydzMap.put("rowStart", i * oncesCounts); sydzMap.put("rowEnd", (i + 1) * oncesCounts); - sydzPool.submit(() -> { - try { - List sydzs = sydzOracleService.getSydzList(sydzMap); - for (VSySydzOracle sydz : sydzs) { - VSySydzMysql sBean = new VSySydzMysql(); - BeanUtils.copyProperties(sydz, sBean); - //确定一个数据是否唯一 - VSySydzMysql checkSydz = sydzMysqlService.selectVSySydzById(sydz.getDZDXMC()); - if (checkSydz == null) { - sydzMysqlService.insertVSySydz(sBean); - logger.info("sydz-" + sydz.getDZDXMC() + ":插入成功"); - } else { - sydzMysqlService.updateVSySydzById(sBean); - logger.info("sydz-" + sydz.getSJDZYSID() + ":更新成功"); - } - } - } catch (Exception e) { - logger.info("sydzs:" + StringKit.getTrace(e)); - } - latch.countDown(); - }); + + + VillageSendStaticRecord sendStaticRecord = new VillageSendStaticRecord(); + sendStaticRecord.setSendTime(StringKit.toString(sydzMap.get("rowStart"))); + sendStaticRecord.setReceiveTime(StringKit.toString(sydzMap.get("rowEnd"))); + sendStaticRecord.setTableName("v_sy_sydz"); + sendStaticRecordDao.insertRecord(sendStaticRecord); logger.info("sydzMap数据总量:" + countSydz + "," + "当前处理下标:" + sydzMap.get("rowStart") + "/" + sydzMap.get("rowEnd")); } @@ -111,5 +95,74 @@ public class VSySydzTask { } } + @Scheduled(initialDelay = 100, fixedDelay = 3000) + public void transSydz() { + + try { + Map mapPara = new HashMap(); + mapPara.put("tableName", "v_sy_sydz"); + List sendStaticRecordDaoList = sendStaticRecordDao.getList(mapPara); + + if(sendStaticRecordDaoList!=null && sendStaticRecordDaoList.size()>0){ + }else { + return; + } + + CountDownLatch latch = new CountDownLatch(sendStaticRecordDaoList.size()); + ExecutorService sydzPool = Executors.newFixedThreadPool(50); + for (VillageSendStaticRecord bean : sendStaticRecordDaoList) { + sydzPool.submit(() -> { + cleraSydz(bean); + latch.countDown(); + }); + } + + try { + // Wait for all threads to complete + latch.await(); + } catch (InterruptedException e) { + e.printStackTrace(); + } + // 关闭线程池 + sydzPool.shutdown(); + + } catch (Exception e) { + logger.info(StringKit.getTrace(e)); + } + } + + private void cleraSydz(VillageSendStaticRecord bean) { + VillageSendStaticRecord beanCp = new VillageSendStaticRecord(); + BeanUtils.copyProperties(bean,beanCp); + try { + String rowStart = StringKit.toString(beanCp.getSendTime()); + String rowEnd = beanCp.getReceiveTime(); + Map sydzMap = new HashMap(); + sydzMap.put("rowStart", rowStart); + sydzMap.put("rowEnd", rowEnd); + List sydzs = sydzOracleService.getSydzList(sydzMap); + for (VSySydzOracle sydz : sydzs) { + VSySydzMysql sBean = new VSySydzMysql(); + BeanUtils.copyProperties(sydz, sBean); + //确定一个数据是否唯一 + VSySydzMysql checkSydz = sydzMysqlService.selectVSySydzById(sydz.getDZDXTYMC()); + if (checkSydz == null) { + sydzMysqlService.insertVSySydz(sBean); + logger.info("sydz-" + sydz.getDZDXTYMC() + ":插入成功"); + } else { + sydzMysqlService.updateVSySydzById(sBean); + logger.info("sydz-" + sydz.getDZDXTYMC() + ":更新成功"); + } + } + + beanCp.setResultStatus("1"); + sendStaticRecordDao.updateRecord(beanCp); + } catch (Exception e) { + beanCp.setResultStatus("2"); + sendStaticRecordDao.updateRecord(beanCp); + logger.info(StringKit.getTrace(e)); + } + } + } diff --git a/src/main/java/com/ssf/mysqloracletest/utils/ConfigParam.java b/src/main/java/com/ssf/mysqloracletest/utils/ConfigParam.java index 405018e..529159a 100644 --- a/src/main/java/com/ssf/mysqloracletest/utils/ConfigParam.java +++ b/src/main/java/com/ssf/mysqloracletest/utils/ConfigParam.java @@ -42,4 +42,8 @@ public class ConfigParam { public static String metaRealEstateInfoSwitch = StringKit.toString(PropertiesUtil.queryPropertiesByKey("metaRealEstateInfoSwitch")); + public static String sydzToEstateInfoSwitch = StringKit.toString(PropertiesUtil.queryPropertiesByKey("sydzToEstateInfoSwitch")); + + public static String syryToActualInfoSwitch = StringKit.toString(PropertiesUtil.queryPropertiesByKey("syryToActualInfoSwitch")); + } diff --git a/src/main/java/com/ssf/mysqloracletest/utils/StringKit.java b/src/main/java/com/ssf/mysqloracletest/utils/StringKit.java index 289fac1..f7c545c 100644 --- a/src/main/java/com/ssf/mysqloracletest/utils/StringKit.java +++ b/src/main/java/com/ssf/mysqloracletest/utils/StringKit.java @@ -194,7 +194,8 @@ public class StringKit { .replaceAll("六单元", "6单元") .replaceAll("七单元", "7单元") .replaceAll("八单元", "8单元") - .replaceAll("九单元", "9单元"); + .replaceAll("九单元", "9单元") + .replaceAll("十单元", "10单元"); return input; } diff --git a/src/main/resources/mapper/VSwryGjxxOracleMapper.xml b/src/main/resources/mapper/VSwryGjxxOracleMapper.xml index 7bf4a87..9226ab9 100644 --- a/src/main/resources/mapper/VSwryGjxxOracleMapper.xml +++ b/src/main/resources/mapper/VSwryGjxxOracleMapper.xml @@ -45,8 +45,14 @@ WHERE t2.rn = ]]> ${rowStart} + + + + diff --git a/src/main/resources/mapper/VSySydzMysqlMapper.xml b/src/main/resources/mapper/VSySydzMysqlMapper.xml index f64b042..62c021e 100644 --- a/src/main/resources/mapper/VSySydzMysqlMapper.xml +++ b/src/main/resources/mapper/VSySydzMysqlMapper.xml @@ -17,7 +17,12 @@ + + DZDXTYMC = #{DZDXTYMC}, DZYSID = #{DZYSID}, SJDZYSID = #{SJDZYSID}, + status = #{status}, where DZDXMC = #{DZDXMC} + + update v_sy_sydz + + DZDXMC = #{DZDXMC}, + CJSJ = #{CJSJ}, + ZRQDM = #{ZRQDM}, + JDZB = #{JDZB}, + WDZB = #{WDZB}, + + DZDXTYMC = #{DZDXTYMC}, + DZYSID = #{DZYSID}, + status = #{status}, + + + where SJDZYSID = #{SJDZYSID} + + \ No newline at end of file diff --git a/src/main/resources/mapper/VSySyrkMysqlMapper.xml b/src/main/resources/mapper/VSySyrkMysqlMapper.xml index a0f926e..bef18c8 100644 --- a/src/main/resources/mapper/VSySyrkMysqlMapper.xml +++ b/src/main/resources/mapper/VSySyrkMysqlMapper.xml @@ -54,6 +54,11 @@ where ID = #{ID} limit 1 + + insert into v_sy_syrk diff --git a/src/main/resources/mapper/VillageSendRecordStaticMapper.xml b/src/main/resources/mapper/VillageSendRecordStaticMapper.xml new file mode 100644 index 0000000..7d40239 --- /dev/null +++ b/src/main/resources/mapper/VillageSendRecordStaticMapper.xml @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + insert into village_send_static_record + ( + `village_code`, + `village_name`, + `device_code`, + `table_name`, + `table_id`, + `send_time`, + `receive_time`, + `manufactor_no`, + `receipt_id`, + `result_status`, + `result_remark`, + `c1` + ) + values + ( + #{villageCode}, + #{villageName}, + #{deviceCode}, + #{tableName}, + #{tableId}, + #{sendTime}, + #{receiveTime}, + #{manufactorNo}, + #{receiptId}, + #{resultStatus}, + #{resultRemark}, + #{c1} + ) + + + + insert into village_send_static_record + ( + `village_code`, + `village_name`, + `device_code`, + `table_name`, + `table_id`, + `send_time`, + `receive_time`, + `manufactor_no`, + `receipt_id`, + `result_status`, + `result_remark`, + `c1` + ) + values + + (#{item.villageCode}, + #{item.villageName}, + #{item.deviceCode}, + #{item.tableName}, + #{item.tableId}, + #{item.sendTime}, + #{item.receiveTime}, + #{item.manufactorNo}, + #{item.receiptId}, + #{item.resultStatus}, + #{item.resultRemark}, + #{item.c1}) + + + + + + update village_send_static_record + + `receive_time` = #{receiveTime}, + `receipt_id` = #{receiptId}, + `result_status` = #{resultStatus}, + `result_remark` = #{resultRemark}, + `c1` = #{c1}, + `c2` = #{c2}, + `isactive` = #{isactive}, + + where 1=1 + and id = #{id} + and village_code = #{villageCode} + and `table_name` = #{tableName} + and `result_remark` = #{resultRemark} + and manufactor_no = #{manufactorNo} + + + + update village_send_static_record + + `receive_time` = #{receiveTime}, + `receipt_id` = #{receiptId}, + `result_status` = #{resultStatus}, + `result_remark` = #{resultRemark}, + `c1` = #{c1}, + `c2` = #{c2}, + `isactive` = #{isactive}, + + where 1=1 + and table_id = #{tableId} + and village_code = #{villageCode} + and `table_name` = #{tableName} + and `result_status` = #{resultStatus} + and `result_remark` = #{resultRemark} + and manufactor_no = #{manufactorNo} + + + + + + + + + + + + + \ No newline at end of file