Merge branch 'pt' of dd.tall.wiki:ccsens_wiki/ccsenscloud into pt

tall/src/main/java/com/ccsens/tall/service/ExcelService.java

@@ -839,27 +839,27 @@ public class ExcelService implements IExcelService {
             }else {
                 throw new BaseException(CodeEnum.NOTNAME.addMsgLwb("延迟时间（自动延迟模式可用）"));
             }
-            //跳转任务
-            if(map.get("任务（节点）")!=null){
-             loopTo = ExcelUtil.getCellValue(row.getCell(16));
-
-            }else {
-//                throw new BaseException(CodeEnum.NOTNAME.addMsgLwb(""));
-            }
-            //跳转次数
-            if(map.get("任务（节点）")!=null){
-             loopTimes = ExcelUtil.getCellValue(row.getCell(17));
-            //这个不知道要不要先给你留着
-            }else {
-//                throw new BaseException(CodeEnum.NOTNAME.addMsgLwb(""));
-            }
-            //输入文件
-            if(map.get("任务（节点）")!=null){
-             input = ExcelUtil.getCellValue(row.getCell(18));
-
-            }else {
-//                throw new BaseException(CodeEnum.NOTNAME.addMsgLwb(""));
-            }
+//            //跳转任务
+//            if(map.get("任务（节点）")!=null){
+//             loopTo = ExcelUtil.getCellValue(row.getCell(16));
+//
+//            }else {
+////                throw new BaseException(CodeEnum.NOTNAME.addMsgLwb(""));
+//            }
+//            //跳转次数
+//            if(map.get("任务（节点）")!=null){
+//             loopTimes = ExcelUtil.getCellValue(row.getCell(17));
+//            //这个不知道要不要先给你留着
+//            }else {
+////                throw new BaseException(CodeEnum.NOTNAME.addMsgLwb(""));
+//            }
+//            //输入文件
+//            if(map.get("任务（节点）")!=null){
+//             input = ExcelUtil.getCellValue(row.getCell(18));
+//
+//            }else {
+////                throw new BaseException(CodeEnum.NOTNAME.addMsgLwb(""));
+//            }
             //一级任务
             if (StrUtil.isNotEmpty(task1)) {
                 ProTaskDetail firstTaskDetail = new ProTaskDetail();

tall/src/main/java/com/ccsens/tall/service/ProjectService.java

@@ -1221,6 +1221,13 @@ public class ProjectService implements IProjectService {
         taskDetail.setExecutorRole(pmRole.getId());
         taskDetail.setCheckerRole(pmRole.getId());
         taskDetailDao.insertSelective(taskDetail);
+        //分解任务
+        ProTaskSubTime proTaskSubTime = new ProTaskSubTime();
+        proTaskSubTime.setId(snowflake.nextId());
+        proTaskSubTime.setTaskDetailId(taskDetail.getId());
+        proTaskSubTime.setBeginTime(sysProject.getBeginTime());
+        proTaskSubTime.setEndTime(sysProject.getEndTime());
+        taskSubTimeDao.insertSelective(proTaskSubTime);
         //添加标签
         if(CollectionUtil.isNotEmpty(createProject.getLabelList())){
             createProject.getLabelList().forEach(labelId->{

tall/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: greenvalley
-    include: util-greenvalley,common
+    active: dev
+    include: util-dev,common
 

tall/src/main/resources/druid-dev.yml

@@ -16,6 +16,7 @@ spring:
       minEvictableIdleTimeMillis: 300000
       minIdle: 5
       password: 68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473
+#      password: 1b01d55a27843cfc487ce8dd6915fc22
       poolPreparedStatements: true
       servletLogSlowSql: true
       servletLoginPassword: 111111
@@ -28,7 +29,9 @@ spring:
       testWhileIdle: true
       timeBetweenEvictionRunsMillis: 60000
       url: jdbc:mysql://49.233.89.188:3306/tall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
+#      url: jdbc:mysql://49.232.6.143:3306/tall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
 #      url: jdbc:mysql://127.0.0.1/tall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
       username: root
       validationQuery: SELECT 1 FROM DUAL
-      env: CCSENS_TALL
+      env: CCSENS_TALL
+#      env: CCSENS_ENTERPRISE