diff --git a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java index 56de748..498a10f 100644 --- a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java +++ b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java @@ -114,13 +114,14 @@ public class ApplicationEvent { // personalService.syncPerson(); // // petitionService.petitionModelTask(initDomain(List.of(40))); -// riskTaskService.eduModelTask(initDomain(List.of(34,41))); +// riskTaskService.eduAndAreaModelTask(initDomain(List.of(34,41))); +//// riskTaskService.eduModelTask(initDomain(List.of(34))); // riskTaskService.infoModelTask(initDomain(List.of(32,33))); // marriageService.marriageModelTask(initDomain(List.of(39,51))); // pointService.syncSecurity(initDomain(List.of(37))); // habitService.habitModelTask(start, initDomain(List.of(36,60,61,62))); // pointService.syncCarUser(initDomain(List.of(53))); -// riskTaskService.riskAreaModelTask(initDomain(List.of(41))); +//// riskTaskService.riskAreaModelTask(initDomain(List.of(41))); // pointService.syncScore(initDomain(List.of(43))); // pointService.syncViolence(initDomain(List.of(44))); // noControlService.syncNoControlData(initDomain(List.of(45))); @@ -170,10 +171,6 @@ public class ApplicationEvent { // pointService.syncKillSelf(initDomain(List.of(46))); // policeService.contradictModelTask(initDomain(List.of(38))); }); - - CompletableFutureUtil.runSync(() -> { - personalService.syncPersonImage(); - }); } TaskParamDomain initDomain(List modelIds) { diff --git a/src/main/java/com/biutag/supervisiondata/rest/ApiController.java b/src/main/java/com/biutag/supervisiondata/rest/ApiController.java index 17a646f..fdc0718 100644 --- a/src/main/java/com/biutag/supervisiondata/rest/ApiController.java +++ b/src/main/java/com/biutag/supervisiondata/rest/ApiController.java @@ -15,6 +15,7 @@ import com.biutag.supervisiondata.pojo.entity.wdpc.WdpcJJDAi; import com.biutag.supervisiondata.repository.GBaseSYRKXXRepository; import com.biutag.supervisiondata.repository.WdpcJJDAiRepository; import com.biutag.supervisiondata.service.ModelClueService; +import com.biutag.supervisiondata.service.PersonalService; import com.biutag.supervisiondata.service.RiskScoreRuleService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -59,6 +60,14 @@ public class ApiController { return RS.success(); } + private final PersonalService personalService; + + @GetMapping("/image") + public RS image() { + CompletableFutureUtil.runSync(() -> personalService.syncPersonImage()); + return RS.success(); + } + @GetMapping("/get/jjd") public String getJJD() { String data = (String) RedisDao.getInstance().leftPop("jjd"); diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/PersonalServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/PersonalServiceImpl.java index 0303514..a75d169 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/PersonalServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/PersonalServiceImpl.java @@ -526,7 +526,7 @@ public class PersonalServiceImpl implements PersonalService { int pageSize = 10000; infoList = wdpcPersonRepository.getBaseMapper().selectPersonImagePage(pageNo, pageSize); infos = new ArrayList<>(); - log.info("图像转base64开始:{}",infoList.size()); + log.info("保存:{}",infoList.size()); for (PersonImageInfo item : infoList) { if(p.get(item.getIdCode().toUpperCase()) != null) { continue; @@ -534,7 +534,7 @@ public class PersonalServiceImpl implements PersonalService { p.put(item.getIdCode().toUpperCase(), new Byte[0]); RiskPersonInfo info = new RiskPersonInfo(); info.setIdCode(item.getIdCode()); - info.setImageBase64(Media.JPEG.concat(Base64.getEncoder().encodeToString(item.getImage()))); + info.setImageBase64(Media.JPEG.concat(new String(item.getImage()))); infos.add(info); } infoRepository.saveOrUpdateBatch(infos, 1000);