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

@@ -228,7 +228,7 @@ INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type
 
 delete from sys_menu where menu_name in('公告通知','公告通知详情','公告通知编辑','新增公告通知','删除公告通知','发布公告通知','取消发布');
 delete from sys_menu where id in(2208,2209,2210,2211,2212,2213,2196);
-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 (2196, '公告通知', 2358, 1, 'core/message', 'core/message/index', NULL, 1, 0, 'C', '0', '0', 'core:notification:list', '1', 'dashboard', NULL, '超级管理员', '2023-09-13 17:50:26', '超级管理员', '2023-09-15 16:47:45', '');
+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 (2196, '公告通知', 2207, 1, 'core/message', 'core/message/index', NULL, 1, 0, 'C', '0', '0', 'core:notification:list', '1', 'dashboard', NULL, '超级管理员', '2023-09-13 17:50:26', '超级管理员', '2023-09-15 16:47:45', '');
 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 (2208, '公告通知详情', 2196, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:notification:query', '1', '#', NULL, '超级管理员', '2023-09-19 15:17:27', '', NULL, '');
 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 (2209, '公告通知编辑', 2196, 2, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:notification:edit', '1', '#', NULL, '超级管理员', '2023-09-19 15:17:56', '', NULL, '');
 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 (2210, '新增公告通知', 2196, 3, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:notification:add', '1', '#', NULL, '超级管理员', '2023-09-19 15:18:18', '', NULL, '');
@@ -1045,6 +1045,7 @@ BEGIN
       AND COLUMN_NAME = 'data_status'
   )
   THEN
+  THEN
 ALTER TABLE core_resumption_data
     ADD COLUMN `data_status` int NULL DEFAULT NULL COMMENT '数据状态：1保存未处理，2保存已处理';
 END IF;
@@ -1351,7 +1352,7 @@ SET FOREIGN_KEY_CHECKS = 1;
 DELETE from `sys_dict_type` WHERE dict_type='question_confirm_status' or dict_type='question_reform_status';
 INSERT INTO `sys_dict_type` (`dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( '问题确认状态', 'question_confirm_status', '0', '超级管理员', '2023-09-13 18:14:59', '', NULL, NULL);
 INSERT INTO `sys_dict_type` (`dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( '问题整改状态', 'question_reform_status', '0', '超级管理员', '2023-09-13 18:15:18', '', NULL, NULL);
-delete  from 'sys_dict_type' WHERE dict_type='send_time_type' or dict_type='message_type' or dict_type ='send_status';
+delete  from `sys_dict_type` WHERE dict_type='send_time_type' or dict_type='message_type' or dict_type ='send_status';
 INSERT INTO `sys_dict_type` (`dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
 VALUES ( '发送时间类型', 'send_time_type', '0', '超级管理员', '2023-09-13 18:14:59', '', NULL, NULL);
 INSERT INTO `sys_dict_type` (`dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)

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

@@ -99,22 +99,24 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         if (tMonitoringRetrievalPlan.getParams().get("beginTime") != null && tMonitoringRetrievalPlan.getParams().get("endTime") != null) {
             query.between("create_time", tMonitoringRetrievalPlan.getParams().get("beginTime"), tMonitoringRetrievalPlan.getParams().get("endTime"));
         }
+        query.orderByAsc("parent_id");
         query.orderByDesc("create_time");
         //获取数据
-        query.isNull(PARENT_ID);
+       // query.isNull(PARENT_ID);
         page = tMonitoringRetrievalPlanMapper.selectPage(page, query);
-        List<TMonitoringRetrievalPlan> records = page.getRecords();
-        List<TMonitoringRetrievalPlanVO> tMonitoringRetrievalPlanVOS = BeanHelper.copyProperties(records, TMonitoringRetrievalPlanVO.class);
-        for (TMonitoringRetrievalPlanVO monitoringRetrievalPlan : tMonitoringRetrievalPlanVOS) {
-            dealData(monitoringRetrievalPlan, tMonitoringRetrievalPlanVOS);
-        }
-        //抓换为TableDataInfo适配前端
-        TableDataInfo<TMonitoringRetrievalPlanVO> tableDataInfo = new TableDataInfo();
-        tableDataInfo.setMsg("操作成功");
-        tableDataInfo.setCode(200);
-        tableDataInfo.setTotal(page.getTotal());
-        tableDataInfo.setRows(tMonitoringRetrievalPlanVOS);
-        return tableDataInfo;
+//        List<TMonitoringRetrievalPlan> records = page.getRecords();
+//        List<TMonitoringRetrievalPlanVO> tMonitoringRetrievalPlanVOS = BeanHelper.copyProperties(records, TMonitoringRetrievalPlanVO.class);
+//        for (TMonitoringRetrievalPlanVO monitoringRetrievalPlan : tMonitoringRetrievalPlanVOS) {
+//            dealData(monitoringRetrievalPlan, tMonitoringRetrievalPlanVOS);
+//        }
+//        //抓换为TableDataInfo适配前端
+//        TableDataInfo<TMonitoringRetrievalPlanVO> tableDataInfo = new TableDataInfo();
+//        tableDataInfo.setMsg("操作成功");
+//        tableDataInfo.setCode(200);
+//        tableDataInfo.setTotal(page.getTotal());
+//        tableDataInfo.setRows(tMonitoringRetrievalPlanVOS);
+       // return tableDataInfo;
+        return TableDataInfo.build(page);
     }
 
     private void dealData(TMonitoringRetrievalPlanVO record, List<TMonitoringRetrievalPlanVO> records) {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/information/domain/CoreMessageCenter.java

@@ -1,5 +1,6 @@
 package com.xunmei.core.information.domain;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -29,6 +30,7 @@ public class CoreMessageCenter extends BaseEntity {
     /**
      * 主键
      */
+    @TableId
     @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 

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

@@ -87,56 +87,86 @@ public class CoreMessageSendServiceImpl extends ServiceImpl<CoreMessageSendMappe
             coreMessageSend.setSendTime(DateUtils.getNowDate());
         }
         if ("1".equals(coreMessageSend.getSendTimeType())) {
-            List<Long> collect = new ArrayList<>();
-            if (null != coreMessageSend.getSendRole()) {
-                List<CoreAnnouncementNotificationToRole> notificationToRoles = new ArrayList<>();
-                CoreAnnouncementNotificationToRole coreAnnouncementNotificationToRole = new CoreAnnouncementNotificationToRole();
-                coreAnnouncementNotificationToRole.setRoleId(coreMessageSend.getSendRole());
-                notificationToRoles.add(coreAnnouncementNotificationToRole);
-                List<SysUser> userListByRole = remoteUserService.getUserListByRole(notificationToRoles, SecurityConstants.INNER);
-                collect = userListByRole.stream().map(SysUser::getId).collect(Collectors.toList());
-            }
-            collect.add(coreMessageSend.getSendUser());
-            List<CoreMessageCenter> coreMessageCenterList = new ArrayList<>();
-            for (Long userId : collect) {
-                CoreMessageCenter coreMessageCenter = new CoreMessageCenter();
-                coreMessageCenter.setTitle(coreMessageSend.getTitle());
-                coreMessageCenter.setContent(coreMessageSend.getContent());
-                coreMessageCenter.setIsRead("0");
-                coreMessageCenter.setType("3");
-                coreMessageCenter.setCreateTime(DateUtils.getNowDate());
-                coreMessageCenter.setCreateBy(coreMessageSend.getCreateBy());
-                coreMessageCenter.setUserId(userId);
-                coreMessageCenterList.add(coreMessageCenter);
-            }
+//            List<Long> collect = new ArrayList<>();
+//            if (null != coreMessageSend.getSendRole()) {
+//                List<CoreAnnouncementNotificationToRole> notificationToRoles = new ArrayList<>();
+//                CoreAnnouncementNotificationToRole coreAnnouncementNotificationToRole = new CoreAnnouncementNotificationToRole();
+//                coreAnnouncementNotificationToRole.setRoleId(coreMessageSend.getSendRole());
+//                notificationToRoles.add(coreAnnouncementNotificationToRole);
+//                List<SysUser> userListByRole = remoteUserService.getUserListByRole(notificationToRoles, SecurityConstants.INNER);
+//                collect = userListByRole.stream().map(SysUser::getId).collect(Collectors.toList());
+//            }
+//            collect.add(coreMessageSend.getSendUser());
+//            List<CoreMessageCenter> coreMessageCenterList = new ArrayList<>();
+//            for (Long userId : collect) {
+//                CoreMessageCenter coreMessageCenter = new CoreMessageCenter();
+//                coreMessageCenter.setTitle(coreMessageSend.getTitle());
+//                coreMessageCenter.setContent(coreMessageSend.getContent());
+//                coreMessageCenter.setIsRead("0");
+//                coreMessageCenter.setType("3");
+//                coreMessageCenter.setCreateTime(DateUtils.getNowDate());
+//                coreMessageCenter.setCreateBy(coreMessageSend.getCreateBy());
+//                coreMessageCenter.setUserId(userId);
+//                coreMessageCenterList.add(coreMessageCenter);
+//            }
+            List<CoreMessageCenter> info = getInfo(coreMessageSend);
             coreMessageSend.setSendStatus("1");
             //立即生成消息
-            coreMessageCenterService.saveBatch(coreMessageCenterList);
+            coreMessageCenterService.saveBatch(info);
         } else {
+            Date sendTime = coreMessageSend.getSendTime();
+            Date date = new Date();
+            long nowTime = date.getTime();
+            long sTime =     sendTime.getTime();
             coreMessageSend.setSendStatus("2");
-            Mytest task=new Mytest();
-            long nowTime=System.currentTimeMillis();
+            List<CoreMessageCenter> info = getInfo(coreMessageSend);
+            Task task=new Task(info);
+            long n =sTime- nowTime;
             Timer timer=new Timer();
-            timer.schedule(task,new Date(nowTime),3000);
+            timer.schedule(task,n);
         }
         return coreMessageSendMapper.insert(coreMessageSend);
     }
 
-    class Mytest extends TimerTask {
+    class Task extends TimerTask {
+        List<CoreMessageCenter> coreMessageCenterList;
+        public Task( List<CoreMessageCenter> coreMessageCenterList){
+            this.coreMessageCenterList=coreMessageCenterList;
+        }
         @Override
         public void run() {
-            try {
-                System.out.println("begin timer=" + System.currentTimeMillis());
-                Thread.sleep(1000);
-                System.out.println("end timer" + System.currentTimeMillis());
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-
+            coreMessageCenterService.saveBatch(coreMessageCenterList);
         }
 
     }
-
+private List<CoreMessageCenter> getInfo(CoreMessageSend coreMessageSend){
+    List<Long> collect = new ArrayList<>();
+    if (null != coreMessageSend.getSendRole()) {
+        List<CoreAnnouncementNotificationToRole> notificationToRoles = new ArrayList<>();
+        CoreAnnouncementNotificationToRole coreAnnouncementNotificationToRole = new CoreAnnouncementNotificationToRole();
+        coreAnnouncementNotificationToRole.setRoleId(coreMessageSend.getSendRole());
+        notificationToRoles.add(coreAnnouncementNotificationToRole);
+        List<SysUser> userListByRole = remoteUserService.getUserListByRole(notificationToRoles, SecurityConstants.INNER);
+        collect = userListByRole.stream().map(SysUser::getId).collect(Collectors.toList());
+    }
+    collect.add(coreMessageSend.getSendUser());
+    List<CoreMessageCenter> coreMessageCenterList = new ArrayList<>();
+    for (Long userId : collect) {
+        CoreMessageCenter coreMessageCenter = new CoreMessageCenter();
+        coreMessageCenter.setTitle(coreMessageSend.getTitle());
+        coreMessageCenter.setContent(coreMessageSend.getContent());
+        coreMessageCenter.setIsRead("0");
+        coreMessageCenter.setType("3");
+        coreMessageCenter.setCreateTime(DateUtils.getNowDate());
+        coreMessageCenter.setCreateBy(coreMessageSend.getCreateBy());
+        coreMessageCenter.setUserId(userId);
+        coreMessageCenterList.add(coreMessageCenter);
+    }
+   // coreMessageSend.setSendStatus("1");
+    //立即生成消息
+  //  coreMessageCenterService.saveBatch(coreMessageCenterList);
+    return  coreMessageCenterList;
+}
     /**
      * 修改【请填写功能名称】
      *