Merge branch 'develop_tzs_register' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/TaskModelDto.java

@@ -24,12 +24,12 @@ public class TaskModelDto {
         private String taskCode;
 
          /**
-         * 备注-非必输
+         * 摘要-来源
          */
         private String taskContent;
 
         /**
-         * 摘要-来源
+         * 描述-非必输
          */
         private String taskDesc;
         /**

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CommonServiceImpl.java

@@ -612,8 +612,8 @@ public class CommonServiceImpl implements ICommonService {
     /**
      * 待办新增接口
      **/
-    public void buildTaskModel(TaskModelDto obj){
-
+    public void buildTaskModel(List<TaskModelDto> list){
+        list.forEach(obj->{
             TaskV2Model model = new TaskV2Model();
             ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
             String urlParams = "";
@@ -633,6 +633,8 @@ public class CommonServiceImpl implements ICommonService {
             model.setCreateDate(new Date());
             model.setRecUserId(reginParams.getUserModel().getUserId());
             Systemctl.taskV2Client.create(model);
+        });
+
     }
 
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/utils/JsonUtils.java

@@ -6,8 +6,11 @@ import org.springframework.core.io.Resource;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.util.List;
 import java.util.Map;
 
+import static com.alibaba.fastjson.JSON.parseArray;
+
 
 public class JsonUtils {
     //将json文件转化为Map<list<Map<>>>
@@ -20,4 +23,18 @@ public class JsonUtils {
         }
         return JSONObject.parseObject(json, Map.class);
     }
+
+    //将json文件转化为List<Map>
+    public static  List<Map> getResourceList(Resource resource) {
+        String json = null;
+        try {
+            json = IOUtils.toString(resource.getInputStream(), String.valueOf(StandardCharsets.UTF_8));
+        } catch (IOException e) {
+            throw new RuntimeException(resource + "json文件转化失败");
+        }
+        List<Map> list = parseArray(json, Map.class);
+        return list;
+    }
+
+
 }