Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc into V0.0.2

project_data/sql/0.0.2/soc/soc.sql

@@ -1860,6 +1860,7 @@ INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `co
 
 
 DELETE FROM sys_menu WHERE id IN(2359,2360,2361,2362,2363,2364,2365,2207);
+delete  from  sys_menu where  menu_name in ('消息发送管理','业务提醒配置')
 INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
 VALUES (2207, '信息中心', 0, 8, 'infoCore', NULL, NULL, 1, 0, 'M', '0', '0', 'core:send:list', '1', 'documentation', NULL, '超级管理员', '2023-09-21 10:37:52', '超级管理员', '2023-09-22 09:42:43', '');
 INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
@@ -1876,7 +1877,7 @@ INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `co
 VALUES (2364, '业务提醒配置', 2207, 3, 'configuration', 'core/configuration/index', NULL, 1, 1, 'C', '0', '0', 'core:configuration:query', '1', 'dashboard', NULL, '超级管理员', '2023-09-21 10:37:52', '超级管理员', '2023-09-22 09:42:43', '');
 INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
 VALUES (2365, '提交', 2364, 1, NULL, NULL, NULL, 1, 0, 'F', '0', '0', 'core:configuration:add', '1', NULL, NULL, '超级管理员', '2023-09-21 10:37:52', '超级管理员', '2023-09-22 09:42:43', '');
-delete from sys_role_menu where menu_id in(2359,2360,2361,2362,2363,2364,2365) ;
+delete from sys_role_menu where menu_id in(2359,2360,2361,2362,2363,2364,2365,2201) ;
 INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 2359);
 INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 2360);
 INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 2361);
@@ -1884,7 +1885,8 @@ INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 2362);
 INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 2363);
 INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 2364);
 INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 2365);
-
+INSERT INTO `sys_role_menu` VALUES (120, 2201);
+INSERT INTO `sys_role_menu` VALUES (116, 2201);
 INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (120, 2359);
 INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (120, 2360);
 INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (120, 2361);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/information/service/impl/CoreMessageSendServiceImpl.java

@@ -109,7 +109,14 @@ public class CoreMessageSendServiceImpl extends ServiceImpl<CoreMessageSendMappe
             long id = IdWorker.getId();
             coreMessageSend.setId(id);
             timerHt.put(String.valueOf(id), timer);
-            timer.schedule(task, n);
+            if (n < 0) {
+                List<CoreMessageCenter> info1 = getInfo(coreMessageSend);
+                coreMessageSend.setSendStatus("1");
+                //立即生成消息
+                coreMessageCenterService.saveBatch(info1);
+            } else {
+                timer.schedule(task, n);
+            }
         }
         return coreMessageSendMapper.insert(coreMessageSend);
     }
@@ -143,7 +150,7 @@ public class CoreMessageSendServiceImpl extends ServiceImpl<CoreMessageSendMappe
             List<SysUser> userListByRole = remoteUserService.getUserListByRole(notificationToRoles, SecurityConstants.INNER);
             collect = userListByRole.stream().map(SysUser::getId).collect(Collectors.toList());
         }
-        if (!collect.contains(coreMessageSend.getSendUser())){
+        if (!collect.contains(coreMessageSend.getSendUser())) {
             collect.add(coreMessageSend.getSendUser());
         }
         List<CoreMessageCenter> coreMessageCenterList = new ArrayList<>();

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/controller/ApiPlanController.java

@@ -152,7 +152,7 @@ public class ApiPlanController {
                 planOfOrgType = plan.getPlanOfOrgType();
             }
             //判断是否是编辑并且计划所属任务不存在已完成或者逾期,需要删除所有任务重新生成
-            boolean isEditAll = info.getHasEdit() == null && info.getId() != null;
+            boolean isEditAll = info.getHasEdit() == null && info.getId() != null&&info.getBuildTaskNow()>0;
             //如果计划所属机构类型为行社并且勾选立即执行,新增的时候立即生成任务
             if ( isEditAll) {
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/controller/CoreSafecheckPlanController.java

@@ -119,9 +119,10 @@ public class CoreSafecheckPlanController extends BaseController {
     @Log(title = "常规安全检查计划", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CoreSafecheckPlan coreSafecheckPlan) throws Exception {
+        Long planId = coreSafecheckPlan.getId();
         Long returnId = coreSafecheckPlanService.insertCoreSafecheckPlan(coreSafecheckPlan);
         //判断是否是编辑并且计划所属任务不存在已完成或者逾期,需要删除所有任务重新生成
-        boolean isEditAll = coreSafecheckPlan.getHasEdit() == null && coreSafecheckPlan.getId() != null;
+        boolean isEditAll = coreSafecheckPlan.getHasEdit() == null && planId != null&&coreSafecheckPlan.isBuildTaskNow();
         //如果是新增计划并且勾选立即执行并且是行社或者无周期,立即生成计划
         if (isEditAll) {
             CoreSafecheckPlan plan = coreSafecheckPlanService.getById(returnId);
@@ -130,15 +131,15 @@ public class CoreSafecheckPlanController extends BaseController {
             plans.add(plan);
             jobBusiness.createTaskByPlans(plans);
         }
-        if (isEditAll) {
-            CoreSafecheckPlan plan = coreSafecheckPlanService.getById(returnId);
-//获取父计划下面所有父id相等并且未删除并且已启用的计划
-            List<CoreSafecheckPlan> plans = coreSafecheckPlanService.list(new LambdaQueryWrapper<CoreSafecheckPlan>().eq(CoreSafecheckPlan::getParentId, plan.getId()).eq(CoreSafecheckPlan::getIsDeleted, 0).eq(CoreSafecheckPlan::getPlanStatus, 1));
-            if(plan.getPlanOfOrgType()==3) {
-                plans.add(plan);
-            }
-            jobBusiness.createTaskByPlans(plans);
-        }
+//        if (isEditAll) {
+//            CoreSafecheckPlan plan = coreSafecheckPlanService.getById(returnId);
+////获取父计划下面所有父id相等并且未删除并且已启用的计划
+//            List<CoreSafecheckPlan> plans = coreSafecheckPlanService.list(new LambdaQueryWrapper<CoreSafecheckPlan>().eq(CoreSafecheckPlan::getParentId, plan.getId()).eq(CoreSafecheckPlan::getIsDeleted, 0).eq(CoreSafecheckPlan::getPlanStatus, 1));
+//            if(plan.getPlanOfOrgType()==3) {
+//                plans.add(plan);
+//            }
+//            jobBusiness.createTaskByPlans(plans);
+//        }
         return success();
     }
 

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

@@ -448,8 +448,8 @@ public class SysUserController extends BaseController {
     }
 
     @GetMapping("/selectAllUser")
-    public AjaxResult selectAllUser() {
-        return success(userService.selectAllUser());
+    public AjaxResult selectAllUser(@PathVariable(value = "userName", required = false) String userName) {
+        return success(userService.selectAllUser(userName));
     }
 
     @ApiOperation(value = "通过角色和机构获取用户")

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysUserMapper.java

@@ -27,7 +27,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      */
     List<SysUser> selectUserList(SysUser sysUser);
 
-    List<SysUser> selectAllUser();
+    List<SysUser> selectAllUser(@Param("userName") String userName);
 
     /**
      * sql重写分页数据

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

@@ -224,7 +224,7 @@ public interface ISysUserService extends IService<SysUser> {
 
     List<SysUser> selectUserListByRoleAndOrg(SysRoleOrgDTO sysRoleOrgDTO);
 
-    List<SysUser> selectAllUser();
+    List<SysUser> selectAllUser(String userName);
 
     List<UserExport> down(SysUser user);
 

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

@@ -613,8 +613,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     @Override
-    public List<SysUser> selectAllUser() {
-        return userMapper.selectAllUser();
+    public List<SysUser> selectAllUser(String userName) {
+        return userMapper.selectAllUser(userName);
     }
 
     @Override

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -586,6 +586,9 @@
     <select id="selectAllUser" resultType="com.xunmei.system.api.domain.SysUser">
         select  * from
             sys_user where  deleted=0 and is_lock =0 and locked=0
+        <if test="userName != null and userName != ''">
+            AND name like concat('%', #{userName}, '%')
+        </if>
     </select>
     <select id="selectUserListByRole" resultType="com.xunmei.system.api.domain.SysUser">
         select a.* from sys_user a left join sys_user_role b on a.id = b.user_id where