diff --git a/pom.xml b/pom.xml index e12521e..ae04339 100644 --- a/pom.xml +++ b/pom.xml @@ -62,6 +62,10 @@ spring-boot-starter-web + + org.postgresql + postgresql + diff --git a/src/main/java/com/ssf/mysqloracletest/domain/TStrhEntityInfoKs.java b/src/main/java/com/ssf/mysqloracletest/domain/TStrhEntityInfoKs.java index 2b9c834..ff0907f 100644 --- a/src/main/java/com/ssf/mysqloracletest/domain/TStrhEntityInfoKs.java +++ b/src/main/java/com/ssf/mysqloracletest/domain/TStrhEntityInfoKs.java @@ -1,128 +1,164 @@ package com.ssf.mysqloracletest.domain; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @Data +@TableName(value ="t_strh_entity_info_ks") public class TStrhEntityInfoKs { /** * 对象ID */ + @TableField(value = "objectid") private String objectid; /** * 设备camerIdx */ + @TableField(value = "cameraidx") private String cameraidx; /** * 抓拍时间 */ + @TableField(value = "capturetime") private String capturetime; /** * 抓拍大图 */ + @TableField(value = "image") private String image; /** * 图片格式，如IMAGE_JPEG */ + @TableField(value = "image_format") private String image_format; /** * 人脸在大图中的位置 */ + @TableField(value = "vertices") private String vertices; /** * 抓拍小图 */ + @TableField(value = "smalimage") private String smalimage; /** * 图片格式，如IMAGE_JPEG */ + @TableField(value = "smalimage_format") private String smalimage_format; /** * 算法厂商原始id */ + @TableField(value = "objectid_old") private String objectid_old; /** * 最小年龄 */ + @TableField(value = "age_lower_limit") private String age_lower_limit; /** * 最大年龄 */ + @TableField(value = "age_up_limit") private String age_up_limit; + @TableField(value = "black_type") private String black_type; /** *帽子样式 */ + @TableField(value = "cap_style") private String cap_style; /** * 性别 */ + @TableField(value = "gender_code") private String gender_code; /** * 眼镜 */ + @TableField(value = "glass_style") private String glass_style; /** * 胡型 */ + @TableField(value = "mustache_style") private String mustache_style; /** * 口罩颜色 */ + @TableField(value = "respirator_color") private String respirator_color; /** * 年龄标识 */ + @TableField(value = "st_age") private String st_age; /** * 相似年龄 */ + @TableField(value = "st_age_value") private String st_age_value; /** * 是否遮挡 */ + @TableField(value = "st_expression") private String st_expression; /** * 头盔样式 */ + @TableField(value = "st_helmet_style") private String st_helmet_style; /** * 入库时间 */ + @TableField(value = "rksj") private String rksj; /** * 更新时间 */ + @TableField(value = "gxsj") private String gxsj; /** * 档案唯一ID */ + @TableField(value = "entityid") private String entityid; /** * 档案更新时间 */ + @TableField(value = "entityupdatetime") private String entityupdatetime; /** * 性别代码 */ + @TableField(value = "gender") private String gender; /** * 身份证号 */ + @TableField(value = "identityid") private String identityid; /** * 姓名 */ + @TableField(value = "name") private String name; /** * 籍贯 */ + @TableField(value = "natives") private String natives; + @TableField(value = "remark") private String remark; + @TableField(value = "yxx") private String yxx; /** *封面照 */ + @TableField(value = "storagepath") private String storagepath; + @TableField(value = "regionid") private String regionid; } diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/TransitUserRecordMapper.java b/src/main/java/com/ssf/mysqloracletest/mapper/TransitUserRecordMapper.java index f3152f1..41373bf 100644 --- a/src/main/java/com/ssf/mysqloracletest/mapper/TransitUserRecordMapper.java +++ b/src/main/java/com/ssf/mysqloracletest/mapper/TransitUserRecordMapper.java @@ -2,6 +2,7 @@ package com.ssf.mysqloracletest.mapper; import com.ssf.mysqloracletest.domain.TransitUserRecord; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; /** * @author 10503 @@ -9,6 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @createDate 2023-12-22 10:29:24 * @Entity com.ssf.mysqloracletest.domain.TransitUserRecord */ +@Mapper public interface TransitUserRecordMapper extends BaseMapper { } diff --git a/src/main/java/com/ssf/mysqloracletest/service/impl/TransitUserRecordServiceImpl.java b/src/main/java/com/ssf/mysqloracletest/service/impl/TransitUserRecordServiceImpl.java index 61c66a9..19e77e9 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/impl/TransitUserRecordServiceImpl.java +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/TransitUserRecordServiceImpl.java @@ -1,9 +1,11 @@ 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.TransitUserRecord; import com.ssf.mysqloracletest.service.TransitUserRecordService; import com.ssf.mysqloracletest.mapper.TransitUserRecordMapper; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; /** @@ -12,6 +14,8 @@ import org.springframework.stereotype.Service; * @createDate 2023-12-22 10:29:24 */ @Service +@DS("mysql") +@RequiredArgsConstructor public class TransitUserRecordServiceImpl extends ServiceImpl implements TransitUserRecordService{ diff --git a/src/main/java/com/ssf/mysqloracletest/task/MetaActualUnitUserInfoTask.java b/src/main/java/com/ssf/mysqloracletest/task/MetaActualUnitUserInfoTask.java index a4c238b..e444711 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/MetaActualUnitUserInfoTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/MetaActualUnitUserInfoTask.java @@ -102,6 +102,9 @@ public class MetaActualUnitUserInfoTask { @Scheduled(initialDelay = 100, fixedDelay = 3000) public void transCyryToPic() { + if (!"true".equals(ConfigParam.metaActualUnitUserInfoSwitch)) { + return; + } List impUserInfos = metaActualUnitUserInfoService.getListByPic(); for (MetaActualUnitUserInfo userInfo : impUserInfos) { VillageActualUserInfo userInfoPara = new VillageActualUserInfo(); diff --git a/src/main/java/com/ssf/mysqloracletest/task/MetaImpUserInfoTask.java b/src/main/java/com/ssf/mysqloracletest/task/MetaImpUserInfoTask.java index 9d947b8..322be0a 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/MetaImpUserInfoTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/MetaImpUserInfoTask.java @@ -107,6 +107,9 @@ public class MetaImpUserInfoTask { @Scheduled(initialDelay = 100, fixedDelay = 3000) public void transCyryToPic() { + if (!"true".equals(ConfigParam.metaImpUserSwitch)) { + return; + } List impUserInfos = metaImpUserInfoService.getListByPic(); for (MetaImpUserInfo userInfo : impUserInfos) { VillageActualUserInfo userInfoPara = new VillageActualUserInfo(); diff --git a/src/main/java/com/ssf/mysqloracletest/task/TStrhEntityInfoKsTask.java b/src/main/java/com/ssf/mysqloracletest/task/TStrhEntityInfoKsTask.java index 54b5894..71a3dce 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/TStrhEntityInfoKsTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/TStrhEntityInfoKsTask.java @@ -1,7 +1,9 @@ package com.ssf.mysqloracletest.task; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ssf.mysqloracletest.domain.TStrhEntityInfoKs; import com.ssf.mysqloracletest.domain.TransitUserRecord; @@ -36,8 +38,6 @@ public class TStrhEntityInfoKsTask { @Resource private TransitUserRecordService transitUserRecordService; - final int oncesCounts = NumKit.checkInt(ConfigParam.oncesCounts) == 0 ? 1000 : NumKit.checkInt(ConfigParam.oncesCounts); - String maxTime = "2023-10-01 00:00:00"; @Scheduled(initialDelay = 100, fixedDelay = 3000) @@ -47,19 +47,15 @@ public class TStrhEntityInfoKsTask { } try { - int countTStrh = tStrhEntityInfoKsService.count(); - + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); + queryWrapper.gt(TStrhEntityInfoKs::getCapturetime, maxTime); + int countTStrh = tStrhEntityInfoKsService.count(queryWrapper); if (countTStrh > 0) { - - int count = countTStrh / oncesCounts; - CountDownLatch latch = new CountDownLatch(countTStrh); - + int count = countTStrh / 200; for (int i = 0; i <= count; i++) { try { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.ge("captureTime", maxTime); - Page page = new Page<>(i + 1, 1000); - List resultList = tStrhEntityInfoKsService.page(page, queryWrapper).getRecords(); + Page page = new Page<>(i + 1, 200); + List resultList = tStrhEntityInfoKsService.page(page,queryWrapper).getRecords(); for (TStrhEntityInfoKs entityInfoKs : resultList) { TransitUserRecord transitUserRecord = new TransitUserRecord(); transitUserRecord.setDeviceCode(entityInfoKs.getCameraidx()); @@ -89,15 +85,8 @@ public class TStrhEntityInfoKsTask { } catch (Exception e) { logger.info("TSInfos:" + StringKit.getTrace(e)); } - latch.countDown(); } - try { - // Wait for all threads to complete - latch.await(); - } catch (InterruptedException e) { - e.printStackTrace(); - } } } catch (Exception e) { logger.info(StringKit.getTrace(e)); diff --git a/src/main/java/com/ssf/mysqloracletest/task/VSySydzTask.java b/src/main/java/com/ssf/mysqloracletest/task/VSySydzTask.java index be0e508..1b645e5 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/VSySydzTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/VSySydzTask.java @@ -97,6 +97,9 @@ public class VSySydzTask { @Scheduled(initialDelay = 100, fixedDelay = 3000) public void transSydz() { + if (!"true".equals(ConfigParam.sydzSwitch)) { + return; + } try { Map mapPara = new HashMap(); diff --git a/src/main/java/com/ssf/mysqloracletest/task/hunterToPicTask.java b/src/main/java/com/ssf/mysqloracletest/task/hunterToPicTask.java index 59771cf..d340a2d 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/hunterToPicTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/hunterToPicTask.java @@ -4,6 +4,7 @@ import com.ssf.mysqloracletest.domain.MetaHuntersInfo; import com.ssf.mysqloracletest.domain.VillageActualUserInfo; import com.ssf.mysqloracletest.service.MetaHuntersInfoService; import com.ssf.mysqloracletest.service.VillageActualUserInfoService; +import com.ssf.mysqloracletest.utils.ConfigParam; import com.ssf.mysqloracletest.utils.StringKit; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; @@ -32,6 +33,9 @@ public class hunterToPicTask { public void huntersToPic() { + if (!"true".equals(ConfigParam.sydzSwitch)) { + return; + } List huntersInfos = huntersInfoService.getHuntersList(); for (MetaHuntersInfo huntersInfo : huntersInfos) { String idcard = huntersInfo.getIdCard();