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

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/RemoteOrgService.java

@@ -53,7 +53,8 @@ public interface RemoteOrgService {
 
     @PostMapping("/dept/findListByOrgTypes")
     R<List<SysOrg>> listByTypes(@RequestBody OrgListByTypesConditionEto eto);
-
+    @PostMapping("/dept/listByParentIdAndType")
+    List<SysOrg>listByParentIdAndType(@RequestBody SysOrg sysOrg, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
     @GetMapping("/dept/top")
     SysOrg selectTopOrg(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
@@ -94,7 +95,6 @@ public interface RemoteOrgService {
      */
     @GetMapping("/org/getUpOrgs/{orgId}")
     List<Long> getUpOrgs(@PathVariable("orgId") Long orgId);
-
     /**
      * @param source
      * @return

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteOrgFallbackFactory.java

@@ -69,6 +69,11 @@ public class RemoteOrgFallbackFactory implements FallbackFactory<RemoteOrgServic
             }
 
             @Override
+            public List<SysOrg> listByParentIdAndType(SysOrg sysOrg, String source) {
+                return null;
+            }
+
+            @Override
             public SysOrg selectTopOrg(String source) {
                 return null;
             }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/controller/TMonitoringRetrievalPlanController.java

@@ -33,7 +33,6 @@ public class TMonitoringRetrievalPlanController extends BaseController {
     @RequiresPermissions("core:access:list")
     @GetMapping("/list")
     public TableDataInfo<TMonitoringRetrievalPlan> list(TMonitoringRetrievalPlan tMonitoringRetrievalPlan) {
-
         return tMonitoringRetrievalPlanService.selectPage(tMonitoringRetrievalPlan);
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/domain/TMonitoringRetrievalPlan.java

@@ -48,7 +48,8 @@ public class TMonitoringRetrievalPlan extends BaseEntity {
      */
     @ApiModelProperty(value = "计划名称")
     private String planName;
-
+    @ApiModelProperty(value = "是否显示下发")
+private String isDistribute;
     /**
      * 计划归属机构
      */

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/dto/CoreMonitoringTaskRegistrationDTO.java

@@ -17,7 +17,7 @@ import java.util.Date;
 @Data
 public class CoreMonitoringTaskRegistrationDTO  extends PageRequest {
     @ApiModelProperty(value = "月份")
-    private Date moth;
+    private String moth;
     private Long id;
 
     /** 计划id */

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

@@ -34,6 +34,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -53,7 +54,7 @@ import java.util.stream.Collectors;
 public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoringRetrievalPlanMapper, TMonitoringRetrievalPlan> implements ITMonitoringRetrievalPlanService {
     private static final Integer MINUS_ONE = -1;
     private static final Integer ZERO = 0;
-    private static final String PARENT_ID="parent_id";
+    private static final String PARENT_ID = "parent_id";
     @Autowired
     private TMonitoringRetrievalPlanMapper tMonitoringRetrievalPlanMapper;
     @Autowired
@@ -62,8 +63,6 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
     private RemoteOrgService remoteOrgService;
     @Autowired
     private RemoteRoleService remoteRoleService;
-    @Autowired
-    private RemoteOrgService orgService;
     @Lazy
     @Resource
     private ICoreMonitoringRetrievalTaskService iCoreMonitoringRetrievalTaskService;
@@ -138,10 +137,13 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         return tMonitoringRetrievalPlanMapper.selectById(id);
     }
 
+    @Transactional
     @Override
     public int distribute(Long id) {
         //查询
         TMonitoringRetrievalPlan tMonitoringRetrievalPlan = tMonitoringRetrievalPlanMapper.selectById(id);
+        tMonitoringRetrievalPlan.setIsDistribute("1");
+        tMonitoringRetrievalPlanMapper.updateById(tMonitoringRetrievalPlan);
         if (tMonitoringRetrievalPlan.getPlanStatus() == 1) {
             throw new ServiceException("禁用中，不能下发");
         }
@@ -151,20 +153,23 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         if (CollectionUtils.isNotEmpty(list1)) {
             throw new ServiceException("请勿重复下发");
         }
-        List<SysOrg> list = remoteOrgService.selectSysOrgByParentId(tMonitoringRetrievalPlan.getOrgId(), SecurityConstants.INNER);
+        SysOrg topOrg = remoteOrgService.selectSysOrgById(tMonitoringRetrievalPlan.getOrgId(), SecurityConstants.INNER);
+        SysOrg org = new SysOrg();
+        org.setType(3);
+        org.setPath(topOrg.getPath());
+        List<SysOrg> list = remoteOrgService.listByParentIdAndType(org, SecurityConstants.INNER);
         Integer i = ZERO;
         List<TMonitoringRetrievalPlan> tMonitoringRetrievalPlans = new ArrayList<>();
         for (SysOrg l : list) {
             TMonitoringRetrievalPlan monitoringRetrievalPlan = new TMonitoringRetrievalPlan();
-            BeanUtils.copyProperties(tMonitoringRetrievalPlan,monitoringRetrievalPlan);
+            BeanUtils.copyProperties(tMonitoringRetrievalPlan, monitoringRetrievalPlan);
             monitoringRetrievalPlan.setPlanName(tMonitoringRetrievalPlan.getPlanName());
             monitoringRetrievalPlan.setOrgId(l.getId());
             monitoringRetrievalPlan.setOrgName(l.getName());
             monitoringRetrievalPlan.setRoleId(tMonitoringRetrievalPlan.getRoleId());
             monitoringRetrievalPlan.setRoleName(tMonitoringRetrievalPlan.getRoleName());
             monitoringRetrievalPlan.setOrgPath(l.getPath());
-            monitoringRetrievalPlan.setOrgType("6");
-            monitoringRetrievalPlan.setRoleId(tMonitoringRetrievalPlan.getRoleId());
+            monitoringRetrievalPlan.setOrgType(tMonitoringRetrievalPlan.getOrgType());
             monitoringRetrievalPlan.setPlanCycle(tMonitoringRetrievalPlan.getPlanCycle());
             monitoringRetrievalPlan.setPlanFrequency(tMonitoringRetrievalPlan.getPlanFrequency());
             monitoringRetrievalPlan.setPlanStatus(ZERO);
@@ -173,16 +178,49 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
             monitoringRetrievalPlan.setUpdateBy(SecurityUtils.getUsername());
             monitoringRetrievalPlan.setCreateTime(DateUtils.getNowDate());
             monitoringRetrievalPlan.setDescription(tMonitoringRetrievalPlan.getDescription());
-            monitoringRetrievalPlan.setCreateType(1);
+            monitoringRetrievalPlan.setCreateType(ZERO);
             monitoringRetrievalPlan.setId(IdWorker.getId());
             monitoringRetrievalPlan.setParentId(tMonitoringRetrievalPlan.getId());
+            monitoringRetrievalPlan.setIsDistribute("1");
             i = tMonitoringRetrievalPlanMapper.insert(monitoringRetrievalPlan);
-            tMonitoringRetrievalPlans.add(monitoringRetrievalPlan);
+            if (tMonitoringRetrievalPlan.getOrgType().equals("3")) {
+                tMonitoringRetrievalPlans.add(monitoringRetrievalPlan);
+            } else {
+                SysOrg sysOrg = new SysOrg();
+                sysOrg.setPath(l.getPath());
+                sysOrg.setType(Integer.valueOf(tMonitoringRetrievalPlan.getOrgType()));
+                List<SysOrg> sysOrgs = remoteOrgService.listByParentIdAndType(sysOrg, SecurityConstants.INNER);
+                for (SysOrg s : sysOrgs) {
+                    TMonitoringRetrievalPlan plan = new TMonitoringRetrievalPlan();
+                    BeanUtils.copyProperties(monitoringRetrievalPlan, plan);
+                    plan.setPlanName(tMonitoringRetrievalPlan.getPlanName());
+                    plan.setOrgId(s.getId());
+                    plan.setOrgName(s.getName());
+                    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.setId(IdWorker.getId());
+                    plan.setParentId(monitoringRetrievalPlan.getId());
+                    plan.setIsDistribute("1");
+                    i = tMonitoringRetrievalPlanMapper.insert(plan);
+                    tMonitoringRetrievalPlans.add(plan);
+                }
+            }
             if (i < ZERO) {
                 return i;
             }
         }
-        if (tMonitoringRetrievalPlan.getPlanCycle().equals(ZERO.toString())) {
+        if (tMonitoringRetrievalPlan.getPlanCycle().equals(ZERO.toString()) && CollectionUtils.isNotEmpty(tMonitoringRetrievalPlans)) {
             iCoreMonitoringRetrievalTaskService.noCycleTask(tMonitoringRetrievalPlans);
         }
         return i;
@@ -220,15 +258,45 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         long id = IdWorker.getId();
         tMonitoringRetrievalPlan.setId(id);
         tMonitoringRetrievalPlan.setOrgPath(data.getPath());
-        if (tMonitoringRetrievalPlan.getOrgType().equals("1")) {
+        SysOrg sysOrg1 = remoteOrgService.selectSysOrgById(sysUser.getOrgId(), SecurityConstants.INNER);
 
+        if (sysOrg1.getType() == 1) {
             tMonitoringRetrievalPlan.setCreateType(ZERO);
+            tMonitoringRetrievalPlan.setIsDistribute(ZERO.toString());
         } else {
+            tMonitoringRetrievalPlan.setIsDistribute("1");
             tMonitoringRetrievalPlan.setCreateType(1);
-            //无周期调用
+            SysOrg sysOrg = new SysOrg();
+            sysOrg.setPath(sysOrg1.getPath());
+            sysOrg.setType(Integer.valueOf(tMonitoringRetrievalPlan.getOrgType()));
+            List<SysOrg> sysOrgs = remoteOrgService.listByParentIdAndType(sysOrg, SecurityConstants.INNER);
+            List<TMonitoringRetrievalPlan> tMonitoringRetrievalPlans = new ArrayList<>();
+            for (SysOrg l : sysOrgs) {
+                TMonitoringRetrievalPlan monitoringRetrievalPlan = new TMonitoringRetrievalPlan();
+                BeanUtils.copyProperties(tMonitoringRetrievalPlan, monitoringRetrievalPlan);
+                monitoringRetrievalPlan.setOrgId(l.getId());
+                monitoringRetrievalPlan.setOrgName(l.getName());
+                monitoringRetrievalPlan.setRoleId(tMonitoringRetrievalPlan.getRoleId());
+                monitoringRetrievalPlan.setRoleName(tMonitoringRetrievalPlan.getRoleName());
+                monitoringRetrievalPlan.setOrgPath(l.getPath());
+                monitoringRetrievalPlan.setOrgType("6");
+                monitoringRetrievalPlan.setRoleId(tMonitoringRetrievalPlan.getRoleId());
+                monitoringRetrievalPlan.setPlanCycle(tMonitoringRetrievalPlan.getPlanCycle());
+                monitoringRetrievalPlan.setPlanFrequency(tMonitoringRetrievalPlan.getPlanFrequency());
+                monitoringRetrievalPlan.setPlanStatus(ZERO);
+                monitoringRetrievalPlan.setCreateBy(SecurityUtils.getUsername());
+                monitoringRetrievalPlan.setUpdateTime(DateUtils.getNowDate());
+                monitoringRetrievalPlan.setUpdateBy(SecurityUtils.getUsername());
+                monitoringRetrievalPlan.setCreateTime(DateUtils.getNowDate());
+                monitoringRetrievalPlan.setDescription(tMonitoringRetrievalPlan.getDescription());
+                monitoringRetrievalPlan.setCreateType(1);
+                monitoringRetrievalPlan.setId(IdWorker.getId());
+                monitoringRetrievalPlan.setParentId(tMonitoringRetrievalPlan.getId());
+                tMonitoringRetrievalPlanMapper.insert(monitoringRetrievalPlan);
+                tMonitoringRetrievalPlans.add(monitoringRetrievalPlan);
+
+            }
             if (tMonitoringRetrievalPlan.getPlanCycle().equals(ZERO.toString())) {
-                List<TMonitoringRetrievalPlan> tMonitoringRetrievalPlans = new ArrayList<>();
-                tMonitoringRetrievalPlans.add(tMonitoringRetrievalPlan);
                 iCoreMonitoringRetrievalTaskService.noCycleTask(tMonitoringRetrievalPlans);
             }
         }
@@ -247,7 +315,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         tMonitoringRetrievalPlan.setUpdateBy(SecurityUtils.getUsername());
         if (tMonitoringRetrievalPlan.getOrgType().equals("1")) {
             tMonitoringRetrievalPlan.setCreateType(ZERO);
-        }else {
+        } else {
             tMonitoringRetrievalPlan.setCreateType(1);
         }
         return tMonitoringRetrievalPlanMapper.updateById(tMonitoringRetrievalPlan);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingPlanServiceImpl.java

@@ -442,7 +442,7 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
             CoreEduTrainingPlan coreEduTrainingPlan = new CoreEduTrainingPlan();
             BeanUtils.copyProperties(plan, coreEduTrainingPlan);
             coreEduTrainingPlan.setId(IdWorker.getId());
-            coreEduTrainingPlan.setBuildTaskNow(0);
+//            coreEduTrainingPlan.setBuildTaskNow(plan.getBuildTaskNow());
             coreEduTrainingPlan.setBelongOrgId(sysOrg.getId());
             coreEduTrainingPlan.setBelongOrgName(sysOrg.getName());
             coreEduTrainingPlan.setBelongOrgPath(sysOrg.getPath());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/mapper/CoreMonitoringRetrievalTaskMapper.java

@@ -74,8 +74,8 @@ public interface CoreMonitoringRetrievalTaskMapper extends BaseMapper<CoreMonito
 
     Page<CoreMonitoringRetrievalTaskVo> selectPageList(Page<CoreMonitoringRetrievalTaskVo> page, @Param("request") RetrievalTaskPageDto request);
 
-    Page<CoreMonitoringRetrievalTask> selectListApp(Page<CoreMonitoringRetrievalTask> page,@Param("request")CoreMonitoringTaskRegistrationDTO request);
-  //  Page<CoreEduTrainingPlanPageVo> selectPageData(Page<CoreEduTrainingPlanPageVo> page, @Param("request") CoreEduTrainingPlanPageDto request);
+    Page<CoreMonitoringRetrievalTask> selectListApp(Page<CoreMonitoringRetrievalTask> page, @Param("request") CoreMonitoringTaskRegistrationDTO request);
+
     List<TaskDataVo> selectTaskDataVoListByRetrievalTaskId(@Param("taskId") Long id);
 
     CoreMonitoringRetrievalTaskOneVo selectOneById(@Param("taskId") Long id);

soc-modules/soc-modules-core/src/main/resources/mapper/edu/CoreEduTrainingPlanMapper.xml

@@ -468,6 +468,12 @@
             and p.id in ( <include refid="pageRoleIncludeReuqest"/>)
         </if>
         <include refid="pageIncludeP"/>)
+        or ( p.standard=1 and p.issue=1 and p.deleted=0 and p.parent_id is null
+        <if test="request.planRoleId!=null">
+            and p.id in ( <include refid="pageRoleIncludeReuqest"/>)
+        </if>
+        <include refid="pageIncludeP"/>)
+        order by p.create_time desc
     </select>
     <select id="selectPageData1" resultType="com.xunmei.common.core.domain.edu.vo.CoreEduTrainingPlanPageVo">
         select p.id as id,

soc-modules/soc-modules-core/src/main/resources/mapper/retrieval/CoreMonitoringRetrievalTaskMapper.xml

@@ -4,78 +4,105 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xunmei.core.retrieval.mapper.CoreMonitoringRetrievalTaskMapper">
 
-    <resultMap type="com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask" id="CoreMonitoringRetrievalTaskResult">
-                <result property="id" column="id"/>
-                <result property="planId" column="plan_id"/>
-                <result property="taskName" column="task_name"/>
-                <result property="orgId" column="org_id"/>
-                <result property="orgPath" column="org_path"/>
-                <result property="orgName" column="org_name"/>
-                <result property="ymdDate" column="ymd_date"/>
-                <result property="ymdYear" column="ymd_year"/>
-                <result property="ymdHalfyear" column="ymd_halfyear"/>
-                <result property="ymdQuarter" column="ymd_quarter"/>
-                <result property="ymdMonth" column="ymd_month"/>
-                <result property="ymdWeek" column="ymd_week"/>
-                <result property="ymdDay" column="ymd_day"/>
-                <result property="cycle" column="cycle"/>
-                <result property="planStartTime" column="plan_start_time"/>
-                <result property="planEndTime" column="plan_end_time"/>
-                <result property="startTime" column="start_time"/>
-                <result property="endTime" column="end_time"/>
-                <result property="status" column="status"/>
-                <result property="roleId" column="role_id"/>
-                <result property="retrievalUser" column="retrieval_user"/>
-                <result property="orderNum" column="order_num"/>
-                <result property="batchNum" column="batch_num"/>
-                <result property="submitTime" column="submit_time"/>
-                <result property="exceptionCount" column="exception_count"/>
+    <resultMap type="com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask"
+               id="CoreMonitoringRetrievalTaskResult">
+        <result property="id" column="id"/>
+        <result property="planId" column="plan_id"/>
+        <result property="taskName" column="task_name"/>
+        <result property="orgId" column="org_id"/>
+        <result property="orgPath" column="org_path"/>
+        <result property="orgName" column="org_name"/>
+        <result property="ymdDate" column="ymd_date"/>
+        <result property="ymdYear" column="ymd_year"/>
+        <result property="ymdHalfyear" column="ymd_halfyear"/>
+        <result property="ymdQuarter" column="ymd_quarter"/>
+        <result property="ymdMonth" column="ymd_month"/>
+        <result property="ymdWeek" column="ymd_week"/>
+        <result property="ymdDay" column="ymd_day"/>
+        <result property="cycle" column="cycle"/>
+        <result property="planStartTime" column="plan_start_time"/>
+        <result property="planEndTime" column="plan_end_time"/>
+        <result property="startTime" column="start_time"/>
+        <result property="endTime" column="end_time"/>
+        <result property="status" column="status"/>
+        <result property="roleId" column="role_id"/>
+        <result property="retrievalUser" column="retrieval_user"/>
+        <result property="orderNum" column="order_num"/>
+        <result property="batchNum" column="batch_num"/>
+        <result property="submitTime" column="submit_time"/>
+        <result property="exceptionCount" column="exception_count"/>
     </resultMap>
 
     <sql id="selectCoreMonitoringRetrievalTaskVo">
-        select id, plan_id, task_name, org_id, org_path, org_name, ymd_date, ymd_year, ymd_halfyear, ymd_quarter, ymd_month, ymd_week, ymd_day, cycle, plan_start_time, plan_end_time, start_time, end_time, status, role_id, retrieval_user, order_num, batch_num, submit_time, exception_count
+        select id,
+               plan_id,
+               task_name,
+               org_id,
+               org_path,
+               org_name,
+               ymd_date,
+               ymd_year,
+               ymd_halfyear,
+               ymd_quarter,
+               ymd_month,
+               ymd_week,
+               ymd_day,
+               cycle,
+               plan_start_time,
+               plan_end_time,
+               start_time,
+               end_time,
+               status,
+               role_id,
+               retrieval_user,
+               order_num,
+               batch_num,
+               submit_time,
+               exception_count
         from core_monitoring_retrieval_task
     </sql>
 
-    <select id="selectCoreMonitoringRetrievalTaskList" parameterType="com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask"
+    <select id="selectCoreMonitoringRetrievalTaskList"
+            parameterType="com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask"
             resultMap="CoreMonitoringRetrievalTaskResult">
         <include refid="selectCoreMonitoringRetrievalTaskVo"/>
         <where>
-                        <if test="taskName != null  and taskName != ''">
-                            and task_name like concat('%', #{taskName}, '%')
-                        </if>
-                        <if test="cycle != null ">
-                            and cycle = #{cycle}
-                        </if>
-                        <if test="planStartTime != null ">
-                            and plan_start_time = #{planStartTime}
-                        </if>
-                        <if test="planEndTime != null ">
-                            and plan_end_time = #{planEndTime}
-                        </if>
-                        <if test="status != null ">
-                            and status = #{status}
-                        </if>
-                        <if test="planId !=null ">
-                            and plan_id=#{planId}
-                        </if>
+            <if test="taskName != null  and taskName != ''">
+                and task_name like concat('%', #{taskName}, '%')
+            </if>
+            <if test="cycle != null ">
+                and cycle = #{cycle}
+            </if>
+            <if test="planStartTime != null ">
+                and plan_start_time = #{planStartTime}
+            </if>
+            <if test="planEndTime != null ">
+                and plan_end_time = #{planEndTime}
+            </if>
+            <if test="status != null ">
+                and status = #{status}
+            </if>
+            <if test="planId !=null ">
+                and plan_id=#{planId}
+            </if>
 
         </where>
     </select>
 
     <select id="selectCoreMonitoringRetrievalTaskById" parameterType="Long"
             resultMap="CoreMonitoringRetrievalTaskResult">
-            <include refid="selectCoreMonitoringRetrievalTaskVo"/>
-            where id = #{id}
+        <include refid="selectCoreMonitoringRetrievalTaskVo"/>
+        where id = #{id}
     </select>
     <select id="selectPageList" resultType="com.xunmei.common.core.domain.retrieval.vo.CoreMonitoringRetrievalTaskVo">
-        select a.*,b.role_name as roleName,c.name as retrievalUserName from core_monitoring_retrieval_task a left join sys_role b on a.role_id = b.id left join sys_user c on a.retrieval_user = c.id
+        select a.*,b.role_name as roleName,c.name as retrievalUserName from core_monitoring_retrieval_task a left join
+        sys_role b on a.role_id = b.id left join sys_user c on a.retrieval_user = c.id
         where 1=1
         <if test="request.orgId != null ">
             and a.org_id = #{request.orgId}
         </if>
         <if test="request.orgPath != null  and request.orgPath != ''">
-            and a.org_path   like concat( #{request.orgPath}, '%')
+            and a.org_path like concat( #{request.orgPath}, '%')
         </if>
         <if test="request.taskName != null  and request.taskName != ''">
             and a.task_name like concat('%', #{request.taskName}, '%')
@@ -98,9 +125,9 @@
     <select id="selectListApp"
             resultType="com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask">
         SELECT
-            *
+        *
         FROM
-            core_monitoring_retrieval_task
+        core_monitoring_retrieval_task
         WHERE 1=1
         <if test="request.orgId != null ">
             and org_id = #{request.orgId}
@@ -108,218 +135,232 @@
         <if test="request.status !=null and request.status !='' ">
             and status =#{request.status}
         </if>
-     <if test="request.ymdDate !=null">
-         and ymd_date like concat('%', #{request.ymdDate}, '%')
-     </if>
+        <if test="request.moth !=null">
+            and ymd_date like concat('%', #{request.moth}, '%')
+        </if>
     </select>
     <select id="selectTaskDataVoListByRetrievalTaskId"
             resultType="com.xunmei.common.core.domain.retrieval.vo.TaskDataVo">
-        select  e.device_name as hostName,d.device_name as channelName,c.project,c.abnormal_illustrate as remark,c.situation
-        from core_monitoring_task_registration a left join core_monitoring_task_registration_monitor b on a.id=b.task_registration_id
-        inner join core_monitoring_task_monitor_info c on b.id=c.task_monitor_id
-        inner join sys_device d on d.id = b.video_channel
-        inner join sys_device e on e.id = b.`host`
-        where a.task_id=#{taskId}
+        select e.device_name         as hostName,
+               d.device_name         as channelName,
+               c.project,
+               c.abnormal_illustrate as remark,
+               c.situation
+        from core_monitoring_task_registration a
+                 left join core_monitoring_task_registration_monitor b on a.id = b.task_registration_id
+                 inner join core_monitoring_task_monitor_info c on b.id = c.task_monitor_id
+                 inner join sys_device d on d.id = b.video_channel
+                 inner join sys_device e on e.id = b.`host`
+        where a.task_id = #{taskId}
     </select>
     <select id="selectOneById"
             resultType="com.xunmei.common.core.domain.retrieval.vo.CoreMonitoringRetrievalTaskOneVo">
-        select  a.*,b.role_name as roleName,c.name as retrievalUserName from core_monitoring_retrieval_task a left join sys_role b on a.role_id = b.id left join sys_user c on a.retrieval_user = c.id
-        where a.id=#{taskId}
+        select a.*, b.role_name as roleName, c.name as retrievalUserName
+        from core_monitoring_retrieval_task a
+                 left join sys_role b on a.role_id = b.id
+                 left join sys_user c on a.retrieval_user = c.id
+        where a.id = #{taskId}
     </select>
 
-    <insert id="insertCoreMonitoringRetrievalTask" parameterType="com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask">
+    <insert id="insertCoreMonitoringRetrievalTask"
+            parameterType="com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask">
         insert into core_monitoring_retrieval_task
         <trim prefix="(" suffix=")" suffixOverrides=",">
-                    <if test="id != null">id,
-                    </if>
-                    <if test="planId != null">plan_id,
-                    </if>
-                    <if test="taskName != null">task_name,
-                    </if>
-                    <if test="orgId != null">org_id,
-                    </if>
-                    <if test="orgPath != null">org_path,
-                    </if>
-                    <if test="orgName != null">org_name,
-                    </if>
-                    <if test="ymdDate != null">ymd_date,
-                    </if>
-                    <if test="ymdYear != null">ymd_year,
-                    </if>
-                    <if test="ymdHalfyear != null">ymd_halfyear,
-                    </if>
-                    <if test="ymdQuarter != null">ymd_quarter,
-                    </if>
-                    <if test="ymdMonth != null">ymd_month,
-                    </if>
-                    <if test="ymdWeek != null">ymd_week,
-                    </if>
-                    <if test="ymdDay != null">ymd_day,
-                    </if>
-                    <if test="cycle != null">cycle,
-                    </if>
-                    <if test="planStartTime != null">plan_start_time,
-                    </if>
-                    <if test="planEndTime != null">plan_end_time,
-                    </if>
-                    <if test="startTime != null">start_time,
-                    </if>
-                    <if test="endTime != null">end_time,
-                    </if>
-                    <if test="status != null">status,
-                    </if>
-                    <if test="roleId != null">role_id,
-                    </if>
-                    <if test="retrievalUser != null">retrieval_user,
-                    </if>
-                    <if test="orderNum != null">order_num,
-                    </if>
-                    <if test="batchNum != null">batch_num,
-                    </if>
-                    <if test="submitTime != null">submit_time,
-                    </if>
-                    <if test="exceptionCount != null">exception_count,
-                    </if>
+            <if test="id != null">id,
+            </if>
+            <if test="planId != null">plan_id,
+            </if>
+            <if test="taskName != null">task_name,
+            </if>
+            <if test="orgId != null">org_id,
+            </if>
+            <if test="orgPath != null">org_path,
+            </if>
+            <if test="orgName != null">org_name,
+            </if>
+            <if test="ymdDate != null">ymd_date,
+            </if>
+            <if test="ymdYear != null">ymd_year,
+            </if>
+            <if test="ymdHalfyear != null">ymd_halfyear,
+            </if>
+            <if test="ymdQuarter != null">ymd_quarter,
+            </if>
+            <if test="ymdMonth != null">ymd_month,
+            </if>
+            <if test="ymdWeek != null">ymd_week,
+            </if>
+            <if test="ymdDay != null">ymd_day,
+            </if>
+            <if test="cycle != null">cycle,
+            </if>
+            <if test="planStartTime != null">plan_start_time,
+            </if>
+            <if test="planEndTime != null">plan_end_time,
+            </if>
+            <if test="startTime != null">start_time,
+            </if>
+            <if test="endTime != null">end_time,
+            </if>
+            <if test="status != null">status,
+            </if>
+            <if test="roleId != null">role_id,
+            </if>
+            <if test="retrievalUser != null">retrieval_user,
+            </if>
+            <if test="orderNum != null">order_num,
+            </if>
+            <if test="batchNum != null">batch_num,
+            </if>
+            <if test="submitTime != null">submit_time,
+            </if>
+            <if test="exceptionCount != null">exception_count,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-                    <if test="id != null">#{id},
-                    </if>
-                    <if test="planId != null">#{planId},
-                    </if>
-                    <if test="taskName != null">#{taskName},
-                    </if>
-                    <if test="orgId != null">#{orgId},
-                    </if>
-                    <if test="orgPath != null">#{orgPath},
-                    </if>
-                    <if test="orgName != null">#{orgName},
-                    </if>
-                    <if test="ymdDate != null">#{ymdDate},
-                    </if>
-                    <if test="ymdYear != null">#{ymdYear},
-                    </if>
-                    <if test="ymdHalfyear != null">#{ymdHalfyear},
-                    </if>
-                    <if test="ymdQuarter != null">#{ymdQuarter},
-                    </if>
-                    <if test="ymdMonth != null">#{ymdMonth},
-                    </if>
-                    <if test="ymdWeek != null">#{ymdWeek},
-                    </if>
-                    <if test="ymdDay != null">#{ymdDay},
-                    </if>
-                    <if test="cycle != null">#{cycle},
-                    </if>
-                    <if test="planStartTime != null">#{planStartTime},
-                    </if>
-                    <if test="planEndTime != null">#{planEndTime},
-                    </if>
-                    <if test="startTime != null">#{startTime},
-                    </if>
-                    <if test="endTime != null">#{endTime},
-                    </if>
-                    <if test="status != null">#{status},
-                    </if>
-                    <if test="roleId != null">#{roleId},
-                    </if>
-                    <if test="retrievalUser != null">#{retrievalUser},
-                    </if>
-                    <if test="orderNum != null">#{orderNum},
-                    </if>
-                    <if test="batchNum != null">#{batchNum},
-                    </if>
-                    <if test="submitTime != null">#{submitTime},
-                    </if>
-                    <if test="exceptionCount != null">#{exceptionCount},
-                    </if>
+            <if test="id != null">#{id},
+            </if>
+            <if test="planId != null">#{planId},
+            </if>
+            <if test="taskName != null">#{taskName},
+            </if>
+            <if test="orgId != null">#{orgId},
+            </if>
+            <if test="orgPath != null">#{orgPath},
+            </if>
+            <if test="orgName != null">#{orgName},
+            </if>
+            <if test="ymdDate != null">#{ymdDate},
+            </if>
+            <if test="ymdYear != null">#{ymdYear},
+            </if>
+            <if test="ymdHalfyear != null">#{ymdHalfyear},
+            </if>
+            <if test="ymdQuarter != null">#{ymdQuarter},
+            </if>
+            <if test="ymdMonth != null">#{ymdMonth},
+            </if>
+            <if test="ymdWeek != null">#{ymdWeek},
+            </if>
+            <if test="ymdDay != null">#{ymdDay},
+            </if>
+            <if test="cycle != null">#{cycle},
+            </if>
+            <if test="planStartTime != null">#{planStartTime},
+            </if>
+            <if test="planEndTime != null">#{planEndTime},
+            </if>
+            <if test="startTime != null">#{startTime},
+            </if>
+            <if test="endTime != null">#{endTime},
+            </if>
+            <if test="status != null">#{status},
+            </if>
+            <if test="roleId != null">#{roleId},
+            </if>
+            <if test="retrievalUser != null">#{retrievalUser},
+            </if>
+            <if test="orderNum != null">#{orderNum},
+            </if>
+            <if test="batchNum != null">#{batchNum},
+            </if>
+            <if test="submitTime != null">#{submitTime},
+            </if>
+            <if test="exceptionCount != null">#{exceptionCount},
+            </if>
         </trim>
     </insert>
 
-    <update id="updateCoreMonitoringRetrievalTask" parameterType="com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask">
+    <update id="updateCoreMonitoringRetrievalTask"
+            parameterType="com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask">
         update core_monitoring_retrieval_task
         <trim prefix="SET" suffixOverrides=",">
-                    <if test="planId != null">plan_id =
-                        #{planId},
-                    </if>
-                    <if test="taskName != null">task_name =
-                        #{taskName},
-                    </if>
-                    <if test="orgId != null">org_id =
-                        #{orgId},
-                    </if>
-                    <if test="orgPath != null">org_path =
-                        #{orgPath},
-                    </if>
-                    <if test="orgName != null">org_name =
-                        #{orgName},
-                    </if>
-                    <if test="ymdDate != null">ymd_date =
-                        #{ymdDate},
-                    </if>
-                    <if test="ymdYear != null">ymd_year =
-                        #{ymdYear},
-                    </if>
-                    <if test="ymdHalfyear != null">ymd_halfyear =
-                        #{ymdHalfyear},
-                    </if>
-                    <if test="ymdQuarter != null">ymd_quarter =
-                        #{ymdQuarter},
-                    </if>
-                    <if test="ymdMonth != null">ymd_month =
-                        #{ymdMonth},
-                    </if>
-                    <if test="ymdWeek != null">ymd_week =
-                        #{ymdWeek},
-                    </if>
-                    <if test="ymdDay != null">ymd_day =
-                        #{ymdDay},
-                    </if>
-                    <if test="cycle != null">cycle =
-                        #{cycle},
-                    </if>
-                    <if test="planStartTime != null">plan_start_time =
-                        #{planStartTime},
-                    </if>
-                    <if test="planEndTime != null">plan_end_time =
-                        #{planEndTime},
-                    </if>
-                    <if test="startTime != null">start_time =
-                        #{startTime},
-                    </if>
-                    <if test="endTime != null">end_time =
-                        #{endTime},
-                    </if>
-                    <if test="status != null">status =
-                        #{status},
-                    </if>
-                    <if test="roleId != null">role_id =
-                        #{roleId},
-                    </if>
-                    <if test="retrievalUser != null">retrieval_user =
-                        #{retrievalUser},
-                    </if>
-                    <if test="orderNum != null">order_num =
-                        #{orderNum},
-                    </if>
-                    <if test="batchNum != null">batch_num =
-                        #{batchNum},
-                    </if>
-                    <if test="submitTime != null">submit_time =
-                        #{submitTime},
-                    </if>
-                    <if test="exceptionCount != null">exception_count =
-                        #{exceptionCount},
-                    </if>
+            <if test="planId != null">plan_id =
+                #{planId},
+            </if>
+            <if test="taskName != null">task_name =
+                #{taskName},
+            </if>
+            <if test="orgId != null">org_id =
+                #{orgId},
+            </if>
+            <if test="orgPath != null">org_path =
+                #{orgPath},
+            </if>
+            <if test="orgName != null">org_name =
+                #{orgName},
+            </if>
+            <if test="ymdDate != null">ymd_date =
+                #{ymdDate},
+            </if>
+            <if test="ymdYear != null">ymd_year =
+                #{ymdYear},
+            </if>
+            <if test="ymdHalfyear != null">ymd_halfyear =
+                #{ymdHalfyear},
+            </if>
+            <if test="ymdQuarter != null">ymd_quarter =
+                #{ymdQuarter},
+            </if>
+            <if test="ymdMonth != null">ymd_month =
+                #{ymdMonth},
+            </if>
+            <if test="ymdWeek != null">ymd_week =
+                #{ymdWeek},
+            </if>
+            <if test="ymdDay != null">ymd_day =
+                #{ymdDay},
+            </if>
+            <if test="cycle != null">cycle =
+                #{cycle},
+            </if>
+            <if test="planStartTime != null">plan_start_time =
+                #{planStartTime},
+            </if>
+            <if test="planEndTime != null">plan_end_time =
+                #{planEndTime},
+            </if>
+            <if test="startTime != null">start_time =
+                #{startTime},
+            </if>
+            <if test="endTime != null">end_time =
+                #{endTime},
+            </if>
+            <if test="status != null">status =
+                #{status},
+            </if>
+            <if test="roleId != null">role_id =
+                #{roleId},
+            </if>
+            <if test="retrievalUser != null">retrieval_user =
+                #{retrievalUser},
+            </if>
+            <if test="orderNum != null">order_num =
+                #{orderNum},
+            </if>
+            <if test="batchNum != null">batch_num =
+                #{batchNum},
+            </if>
+            <if test="submitTime != null">submit_time =
+                #{submitTime},
+            </if>
+            <if test="exceptionCount != null">exception_count =
+                #{exceptionCount},
+            </if>
         </trim>
         where id = #{id}
     </update>
     <update id="updateTaskStart">
-        update core_monitoring_retrieval_task set status=3 where #{dateTimeNew}>plan_end_time and status!=2
+        update core_monitoring_retrieval_task
+        set status=3
+        where #{dateTimeNew} > plan_end_time
+          and status!=2
     </update>
 
     <delete id="deleteCoreMonitoringRetrievalTaskById" parameterType="Long">
         delete
-        from core_monitoring_retrieval_task where id = #{id}
+        from core_monitoring_retrieval_task
+        where id = #{id}
     </delete>
 
     <delete id="deleteCoreMonitoringRetrievalTaskByIds" parameterType="String">

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysDeptController.java

@@ -180,6 +180,12 @@ public class SysDeptController extends BaseController {
         return R.ok(orgService.listByTypes(eto.getOrgId(), eto.getOrgTypes()));
     }
 
+    @InnerAuth
+    @PostMapping("/listByParentIdAndType")
+    public List<SysOrg> listByParentIdAndType(@RequestBody SysOrg sysOrg) {
+        return orgService.listByParentIdAndType(sysOrg.getParentId(), sysOrg.getType(), sysOrg.getPath());
+    }
+
     /**
      * 获取顶级机构
      *

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysRoleController.java

@@ -89,9 +89,10 @@ public class SysRoleController extends BaseController {
         roleService.checkRoleDataScope(role.getId());
         if (!roleService.checkRoleNameUnique(role)) {
             return error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
-        } else if (!roleService.checkRoleKeyUnique(role)) {
-            return error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
         }
+/*        else if (!roleService.checkRoleKeyUnique(role)) {
+            return error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
+        }*/
         role.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(roleService.updateRole(role));
     }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/ISysOrgService.java

@@ -27,7 +27,7 @@ public interface ISysOrgService extends IService<SysOrg> {
     List<Long> findListByOrgType(Integer execOrgType);
 
     List<SysOrg> listByTypes(Long topId, List<String> types);
-
+    List<SysOrg> listByParentIdAndType(Long parentId, Integer type,String path);
     /**
      * 查询【机构管理】列表
      *

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysOrgServiceImpl.java

@@ -125,6 +125,20 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
         return sysOrgMapper.selectList(wrapper);
     }
 
+    @Override
+    public List<SysOrg> listByParentIdAndType(Long parentId, Integer type,String path) {
+        QueryWrapper queryWrapper=new QueryWrapper();
+        queryWrapper.eq("type",type);
+        if (null!=parentId){
+            queryWrapper.eq("parent_id",parentId);
+        }
+        queryWrapper.likeRight("path",path);
+        queryWrapper.eq("deleted",0);
+        List list = baseMapper.selectList(queryWrapper);
+        return list;
+    }
+
+
     /**
      * 查询【请填写功能名称】列表
      *