问题修改

src/main/java/com/zzsn/leaderbase/config/QiyegaoguanExcutor.java

@@ -23,7 +23,7 @@ import java.util.concurrent.TimeUnit;
  * @Version 1.0
  * @Author: ZhangJingKun
  * @Date: 2024/4/7 11:18
- * @Content:
+ * @Content:  企业高管数据表中的数据导入到人物库中临时处理的逻辑
  */
 @Slf4j
 @Component
@@ -42,11 +42,6 @@ public class QiyegaoguanExcutor implements CommandLineRunner {
     @Autowired
     CharacterCorrelationEnterpriseService characterCorrelationEnterpriseService;
 
-    @Value("${offset}")
-    private int offset;
-    @Value("${size}")
-    private int size;
-
     @Override
     public void run(String... args) {
         scheduledExecutorService.scheduleAtFixedRate(()->{
@@ -56,11 +51,14 @@ public class QiyegaoguanExcutor implements CommandLineRunner {
 
 
     void run2(){
-        try (BufferedReader br = new BufferedReader(new FileReader("D:\\444.txt"))) {
+        try (BufferedReader br = new BufferedReader(new FileReader("D:\\555.txt"))) {
             String line;
             while ((line = br.readLine()) != null) {
                 // 处理每行的逻辑
                 String id = line.replace("\"", "");
+                String[] arr = line.split(",");
+                id = arr[0];
+                Long sort = Long.parseLong(arr[1]);
                 String uid = generatorIdService.getIdNo();
 
                 CharacterBasicInfo characterBasicInfo = new CharacterBasicInfo();
@@ -72,6 +70,7 @@ public class QiyegaoguanExcutor implements CommandLineRunner {
                 CharacterCorrelationEnterprise characterCorrelationEnterprise = new CharacterCorrelationEnterprise();
                 characterCorrelationEnterprise.setId(id);
                 characterCorrelationEnterprise.setUid(uid);
+                characterCorrelationEnterprise.setSort(sort);
                 characterCorrelationEnterpriseService.updateById(characterCorrelationEnterprise);
                 System.out.println("id:" + id);
             }

src/main/java/com/zzsn/leaderbase/controller/CharacterInfoController.java

@@ -31,13 +31,13 @@ public class CharacterInfoController {
         log.info("新增人物:{}",characterVo);
         //日期格式校验
         String birthday = characterVo.getBirthday();
-        if(!DateUtil.isValidDate(birthday))
+        if(!DateUtil.isDate(birthday))
             return Result.error(400, "出生日期格式不正确！");
         String takeOfficeTime = characterVo.getTakeOfficeTime();
-        if(!DateUtil.isValidDate(takeOfficeTime))
+        if(!DateUtil.isDate(takeOfficeTime))
             return Result.error(400, "任职开始时间格式不正确！");
         String takeOfficeTimeEnd = characterVo.getTakeOfficeTimeEnd();
-        if(!DateUtil.isValidDate(takeOfficeTime))
+        if(!DateUtil.isDate(takeOfficeTimeEnd))
             return Result.error(400, "任职结束时间格式不正确！");
         return characterInfoService.add(characterVo);
     }
@@ -74,13 +74,13 @@ public class CharacterInfoController {
         log.info("根据人物id修改信息:{}",characterVo);
         //日期格式校验
         String birthday = characterVo.getBirthday();
-        if(!DateUtil.isValidDate(birthday))
+        if(!DateUtil.isDate(birthday))
             return Result.error(400, "出生日期格式不正确！");
         String takeOfficeTime = characterVo.getTakeOfficeTime();
-        if(!DateUtil.isValidDate(takeOfficeTime))
+        if(!DateUtil.isDate(takeOfficeTime))
             return Result.error(400, "任职开始时间格式不正确！");
         String takeOfficeTimeEnd = characterVo.getTakeOfficeTimeEnd();
-        if(!DateUtil.isValidDate(takeOfficeTimeEnd))
+        if(!DateUtil.isDate(takeOfficeTimeEnd))
             return Result.error(400, "任职结束时间格式不正确！");
         return characterInfoService.edit(characterVo);
     }

src/main/java/com/zzsn/leaderbase/entity/CharacterCorrelationEnterprise.java

@@ -35,6 +35,8 @@ public class CharacterCorrelationEnterprise {
   private String benefitShare;
   //本届任期
   private String currentTerm;
+  //排序
+  private Long sort;
   //创建人
   private String createBy;
   //创建时间