Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

project_data/sql/0.0.2/soc/soc.sql

@@ -1254,13 +1254,6 @@ delete from sys_role_menu where menu_id in(1714247486990786561) ;
 INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 1714247486990786561);
 INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (120, 1714247486990786561);
 
-INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 2208);
-INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 2209);
-INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 2210);
-INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 2211);
-INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 2212);
-INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 2213);
-
 delete from sys_role_menu where menu_id in(2208,2209,2210,2211,2212,2213,2196) ;
 
 INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 2196);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/TMonitoringRetrievalPlanServiceImpl.java

@@ -162,6 +162,103 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
                     tm.setPlanStatus(1);
                     tm.setIsDistribute("1");
                     baseMapper.updateById(tm);
+                    if (tMonitoringRetrievalPlan.getOrgType().equals("3")) {
+                        if (!tMonitoringRetrievalPlan.getPlanCycle().equals(ZERO.toString()) &&
+                                tMonitoringRetrievalPlan.getImmediately().equals(Boolean.TRUE)) {
+                            tm.setStartTime(new Date());
+                            int amount = 0;
+                            LocalDate lastDayOfMonth;
+                            switch (tMonitoringRetrievalPlan.getPlanCycle()) {
+                                case "1":
+                                    amount = 1;
+                                    break;
+                                case "2":
+                                    amount = 7;
+                                    break;
+                                case "3":
+                                    LocalDate currentDate = LocalDate.now();
+                                    lastDayOfMonth = currentDate.withDayOfMonth(currentDate.lengthOfMonth());
+                                    amount = lastDayOfMonth.getDayOfMonth() - currentDate.getDayOfMonth();
+                                    break;
+                                case "4":
+                                    amount = getDayNum(3);
+                                    break;
+                                case "5":
+                                    amount = getDayNum(6);
+                                    break;
+                                case "6":
+                                    amount = getDayNum(12);
+                                    break;
+                            }
+                            Calendar cal = Calendar.getInstance();
+                            cal.setTime(new Date());
+                            cal.add(Calendar.DATE, amount);
+                            Date time = cal.getTime();
+                            tm.setEndTime(time);
+                            tMonitoringRetrievalPlans.add(tm);
+                        }
+                    }else {
+                        SysOrg sysOrg = new SysOrg();
+                        sysOrg.setPath(tm.getOrgPath());
+                        sysOrg.setType(Integer.valueOf(tMonitoringRetrievalPlan.getOrgType()));
+                        List<SysOrg> sysOrgs = remoteOrgService.listByParentIdAndType(sysOrg, SecurityConstants.INNER);
+                        for (SysOrg s : sysOrgs) {
+                            TMonitoringRetrievalPlan plan = new TMonitoringRetrievalPlan();
+                            BeanUtils.copyProperties(tMonitoringRetrievalPlan, plan);
+                            plan.setPlanName(tMonitoringRetrievalPlan.getPlanName());
+                            plan.setOrgId(s.getId());
+                            plan.setOrgName(s.getShortName());
+                            plan.setRoleId(tMonitoringRetrievalPlan.getRoleId());
+                            plan.setRoleName(tMonitoringRetrievalPlan.getRoleName());
+                            plan.setOrgPath(s.getPath());
+                            plan.setOrgType(tMonitoringRetrievalPlan.getOrgType());
+                            plan.setPlanCycle(tMonitoringRetrievalPlan.getPlanCycle());
+                            plan.setPlanFrequency(tMonitoringRetrievalPlan.getPlanFrequency());
+                            plan.setPlanStatus(ZERO);
+                            plan.setCreateBy(SecurityUtils.getUsername());
+                            plan.setUpdateTime(DateUtils.getNowDate());
+                            plan.setUpdateBy(SecurityUtils.getUsername());
+                            plan.setCreateTime(DateUtils.getNowDate());
+                            plan.setDescription(tMonitoringRetrievalPlan.getDescription());
+                            plan.setCreateType(1);
+                            plan.setParentId(tMonitoringRetrievalPlan.getId());
+                            plan.setIsDistribute("1");
+                            if (!tMonitoringRetrievalPlan.getPlanCycle().equals(ZERO.toString()) &&
+                                    tMonitoringRetrievalPlan.getImmediately().equals(Boolean.TRUE)) {
+                                plan.setStartTime(new Date());
+                                int amount = 0;
+                                LocalDate lastDayOfMonth;
+                                switch (tMonitoringRetrievalPlan.getPlanCycle()) {
+                                    case "1":
+                                        amount = 1;
+                                        break;
+                                    case "2":
+                                        amount = 7;
+                                        break;
+                                    case "3":
+                                        LocalDate currentDate = LocalDate.now();
+                                        lastDayOfMonth = currentDate.withDayOfMonth(currentDate.lengthOfMonth());
+                                        amount = lastDayOfMonth.getDayOfMonth() - currentDate.getDayOfMonth();
+                                        break;
+                                    case "4":
+                                        amount = getDayNum(3);
+                                        break;
+                                    case "5":
+                                        amount = getDayNum(6);
+                                        break;
+                                    case "6":
+                                        amount = getDayNum(12);
+                                        break;
+                                }
+                                Calendar cal = Calendar.getInstance();
+                                cal.setTime(new Date());
+                                cal.add(Calendar.DATE, amount);
+                                Date time = cal.getTime();
+                                plan.setEndTime(time);
+                            }
+                            tMonitoringRetrievalPlans.add(plan);
+                        }
+                    }
                 }
             } else {
                 //查询符合的机构，需求是先把行社加入
@@ -338,16 +435,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
                 }
                 tMonitoringRetrievalPlans.add(plan);
             }
-       /*     if ((tMonitoringRetrievalPlan.getImmediately().equals(Boolean.TRUE) || tMonitoringRetrievalPlan.getPlanCycle().equals(ZERO.toString())) && CollectionUtils.isNotEmpty(tMonitoringRetrievalPlans)) {
-                try {
-                    iCoreMonitoringRetrievalTaskService.noCycleTask(tMonitoringRetrievalPlans);
-                } catch (Exception e) {
-                    throw new ServiceException("下发任务异常，请联系管理员");
-                }
-            }*/
         }
-
-        SysOrg sysOrg1 = remoteOrgService.selectSysOrgById(SecurityUtils.getLoginUser().getOrgId(), SecurityConstants.INNER);
         if ((tMonitoringRetrievalPlan.getImmediately().equals(Boolean.TRUE) || tMonitoringRetrievalPlan.getPlanCycle().equals(ZERO.toString())) && CollectionUtils.isNotEmpty(tMonitoringRetrievalPlans)) {
             try {
                 iCoreMonitoringRetrievalTaskService.noCycleTask(tMonitoringRetrievalPlans);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/impl/CoreMonitoringRetrievalTaskServiceImpl.java

@@ -414,7 +414,7 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         //获取计划
         QueryWrapper<TMonitoringRetrievalPlan> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(TMonitoringRetrievalPlan::getPlanCycle, cycle);
-        queryWrapper.lambda().eq(TMonitoringRetrievalPlan::getPlanStatus, 0);
+        queryWrapper.lambda().eq(TMonitoringRetrievalPlan::getPlanStatus, 1);
         queryWrapper.lambda().eq(TMonitoringRetrievalPlan::getIsDeleted, 0);
         queryWrapper.lambda().eq(TMonitoringRetrievalPlan::getCreateType, 1);
         List<TMonitoringRetrievalPlan> plans = itMonitoringRetrievalPlanService.list(queryWrapper);