时空标准生成任务结果初版提交

common/common_utils/src/main/java/com/founder/commonutils/util/DateUtil.java

@@ -3,7 +3,9 @@ package com.founder.commonutils.util;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 日期工具类
@@ -80,4 +82,37 @@ public class DateUtil {
     public static String dateStr(String time) {
         return dateStr(Long.parseLong(time));
     }
+
+    /**
+     * <T>标识这是一个泛型方法
+     * @param list List<T>是一个泛型类
+     * @param limit
+     * @param <T>
+     * @return
+     * @throws Exception
+     */
+    public static <T> List pldata(List<T> list, int limit) throws Exception {
+        long start = System.currentTimeMillis();
+        int size = list.size();
+        long threadNum = size / limit;
+        int startnum = 0;
+        int endnum = 0;
+        List<List<T>> lists = new ArrayList<>();
+        for (int i = 0; i < threadNum + 1; i++) {
+            startnum = i * limit;
+            endnum = ((i + 1) * limit);
+            if (startnum > list.size()) {
+                break;
+            }
+            if (endnum > list.size()) {
+                endnum = list.size();
+            }
+            if (startnum == endnum) {
+                break;
+            }
+            List<T> pllist = list.subList(startnum, endnum);  //从fromIndex（包含），到toIndex（不包含）
+            lists.add(pllist);
+        }
+        return lists;
+    }
 }

service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkRegionalsResultController.java

@@ -10,9 +10,7 @@ import com.founder.commonutils.model.newPublicEntity.SkRegionalsDetail;
 import com.founder.commonutils.model.newPublicEntity.SkRegionalsPerson;
 import com.founder.commonutils.model.vo.param.SkRegionalsResultParam;
 import com.founder.commonutils.model.vo.param.SkRegionalsResultSaveParam;
-import com.founder.commonutils.util.Base64Util;
-import com.founder.commonutils.util.JsonUtils;
-import com.founder.commonutils.util.KeyUtil;
+import com.founder.commonutils.util.*;
 import com.founder.commonutils.model.newPublicEntity.SkRegionalsResult;
 import com.founder.publicapi.service.SkRegionalsDetailService;
 import com.founder.publicapi.service.SkRegionalsPersonService;
@@ -20,7 +18,6 @@ import com.founder.servicebase.controller.ExcelControllerInterface;
 import com.founder.servicebase.logs.OperLog;
 import com.founder.servicebase.logs.OperationType;
 import com.founder.publicapi.service.SkRegionalsResultService;
-import com.founder.commonutils.util.SpringUtil;
 import com.founder.servicebase.service.SkDictionaryService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
@@ -84,12 +81,12 @@ public class SkRegionalsResultController extends ApiController implements ExcelC
     @PostMapping("saveResult")
     @ApiOperation(value = "新增结果信息")
     @OperLog(message = "新增结果信息", operation = OperationType.ADD)
-    public MapRestResult saveResult(SkRegionalsResultSaveParam param, @RequestParam(required = false) MultipartFile img) throws IOException {
+    public MapRestResult saveResult(SkRegionalsResultSaveParam param) throws IOException {
         // 先通过任务编号查看该任务是否已有结果
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("taskid", param.getTaskid());
         if(skRegionalsResultService.list(queryWrapper).size()==0){
-            // 获取任务结果  阿里云读取json线上读取接口
+            // 获取任务结果  阿里云读取json  线上读取接口
             List<SkRegionalsResultSaveParam> listResult = JsonUtils.readJsonFromClassPath("data/getClhs.json", SkRegionalsResultSaveParam.class);
             // 结果批量入库
             // 数据批量落地
@@ -99,7 +96,7 @@ public class SkRegionalsResultController extends ApiController implements ExcelC
             // 数据批量分流
             List<List<SkRegionalsResultSaveParam>> pllist= null;
             try {
-                pllist = pllist;
+                pllist = DateUtil.pldata(listResult,flnum);
                 ExecutorService executorService = Executors.newCachedThreadPool();//按需分配线程池
                 // 入库成功list
                 List<SkRegionalsResultSaveParam> sucesslist = new ArrayList<>();
@@ -249,7 +246,7 @@ public class SkRegionalsResultController extends ApiController implements ExcelC
         List<SkRegionalsResultSaveParam> sucesslist = new ArrayList<>();
         listCameraAll.forEach(p ->{
             try{
-                // 入库
+                // 结果入库
                 String xxzjbh = KeyUtil.getUUIDKey("JG");// 结果表主键编号
                 SkRegionalsResult skRegionalsResult=new SkRegionalsResult();
                 BeanUtils.copyProperties(p,skRegionalsResult);// 保存字段复制
@@ -261,12 +258,13 @@ public class SkRegionalsResultController extends ApiController implements ExcelC
                     // 翻译表入库(根据结果中的车牌号、手机号等拿到人员证件号码入库)
                     skRegionalsDetail.setXxzjbh(KeyUtil.getUUIDKey("FY"));
                     skRegionalsDetail.setResultid(xxzjbh);// 翻译表
+                    skRegionalsDetail.setSfzhm("54");
                     skRegionalsDetail.setObjecttypename(skDictionaryService.findDmmcByDmAndDmlx(p.getObjecttype(), "ST"));// 类型名称
                     boolean savesDetail = skRegionalsDetailService.save(skRegionalsDetail);
                     if(savesDetail){
                         // 先查看号码对应人信息是否已存在
                         SkRegionalsPerson skRegionalsPerson=new SkRegionalsPerson();
-                        skRegionalsPerson.setSfzhm("11111");
+                        skRegionalsPerson.setSfzhm("54");
                         QueryWrapper queryWrapper = new QueryWrapper();
                         queryWrapper.eq("sfzhm", skRegionalsPerson.getSfzhm());
                         if(skRegionalsPersonService.list(queryWrapper).size()==0){

service/publicapi/src/main/java/com/founder/publicapi/controller/SkModelService/SkbsController.java

@@ -2,7 +2,10 @@ package com.founder.publicapi.controller.SkModelService;
 
 import com.founder.commonutils.model.newPublicEntity.SkTrail;
 import com.founder.commonutils.model.newPublicEntity.TogetherEntity;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
@@ -195,7 +198,10 @@ public class SkbsController {
     }
 
     @Data
-    class SkbsParam{
+    @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
+   static class SkbsParam{
         private TogetherEntity requestParams;
         private List<SkTrail> list;
     }