Merge branch 'pre'

src/main/java/com/xjrsoft/module/activity/controller/ActivityInfoController.java

@@ -177,6 +177,42 @@ public class ActivityInfoController {
             infoVo.setStartDate(Date.from(((LocalDateTime)objectMap.get("start_time")).atZone(ZoneId.systemDefault()).toInstant()));
             infoVo.setEndDate(Date.from(((LocalDateTime)objectMap.get("end_time")).atZone(ZoneId.systemDefault()).toInstant()));
             infoVo.setPlace(objectMap.get("activity_location").toString());
+        }else if(category != null && category == 4){
+            String tableName = "moral_event";
+            Entity where = Entity.create(tableName);
+            where.set("id", id);
+            Map<String, Object> objectMap = SqlRunnerAdapter.db().dynamicSelectOne(tableName, where);
+            infoVo = new ActivityInfoVo();
+            infoVo.setName(objectMap.get("moral_event_name").toString());
+            infoVo.setContent(objectMap.get("event_content").toString());
+            infoVo.setStartDate(Date.from(((LocalDateTime)objectMap.get("event_start_time")).atZone(ZoneId.systemDefault()).toInstant()));
+            infoVo.setEndDate(Date.from(((LocalDateTime)objectMap.get("event_end_time")).atZone(ZoneId.systemDefault()).toInstant()));
+            infoVo.setPlace(objectMap.get("event_address").toString());
+            infoVo.setOrgName(objectMap.get("host_unit").toString());
+            infoVo.setDutyPerson(objectMap.get("event_leader").toString());
+        }else if(category != null && category == 5){
+            String tableName = "wf_teacher_training";
+            Entity where = Entity.create(tableName);
+            where.set("id", id);
+            Map<String, Object> objectMap = SqlRunnerAdapter.db().dynamicSelectOne(tableName, where);
+            infoVo = new ActivityInfoVo();
+            infoVo.setName(objectMap.get("training_name").toString());
+            infoVo.setContent(objectMap.get("training_topic").toString());
+            infoVo.setStartDate(Date.from(((LocalDateTime)objectMap.get("start_time")).atZone(ZoneId.systemDefault()).toInstant()));
+            infoVo.setEndDate(Date.from(((LocalDateTime)objectMap.get("end_time")).atZone(ZoneId.systemDefault()).toInstant()));
+            infoVo.setPlace(objectMap.get("training_address").toString());
+            infoVo.setDutyPerson(objectMap.get("person_in_charge").toString());
+        }else if(category != null && category == 6){
+            String tableName = "party_build_event";
+            Entity where = Entity.create(tableName);
+            where.set("id", id);
+            Map<String, Object> objectMap = SqlRunnerAdapter.db().dynamicSelectOne(tableName, where);
+            infoVo = new ActivityInfoVo();
+            infoVo.setName(objectMap.get("event_type").toString());
+            infoVo.setContent(objectMap.get("event_content").toString());
+            infoVo.setStartDate(Date.from(((LocalDateTime)objectMap.get("event_start_time")).atZone(ZoneId.systemDefault()).toInstant()));
+            infoVo.setEndDate(Date.from(((LocalDateTime)objectMap.get("event_end_time")).atZone(ZoneId.systemDefault()).toInstant()));
+            infoVo.setPlace(objectMap.get("event_address").toString());
         }
 
         return RT.ok(infoVo);

src/main/java/com/xjrsoft/module/job/AttenDanceWarnNoticeTask.java

@@ -200,7 +200,9 @@ public class AttenDanceWarnNoticeTask {
         }
         SimpleDateFormat sdf = new SimpleDateFormat();
         String table = "wechat_message_log";
+        long id = IdUtil.getSnowflakeNextId();
         Entity entity = Entity.create(table);
+        entity.set("id", id);
         entity.set("content", "消息推送人数：" + userList.size());
         entity.set("create_date", sdf.format(new Date()));
         entity.set("template_id", wechatTemplate);

src/main/java/com/xjrsoft/module/job/AttendanceMessageTask.java

@@ -34,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
@@ -302,9 +303,12 @@ public class AttendanceMessageTask {
             }
 
             if(isInsert){
+                SimpleDateFormat sdf = new SimpleDateFormat();
                 Entity entity = Entity.create(table);
+                entity.set("id", IdUtil.getSnowflakeNextId());
+                entity.set("content", "消息推送人数：" + userCount);
+                entity.set("create_date", sdf.format(new Date()));
                 entity.set("content", "消息推送人数：" + userCount);
-                entity.set("create_date", LocalDateTime.now());
                 entity.set("template_id", wechatTemplate);
                 entity.set("send_time", recentlyTime);
                 SqlRunnerAdapter.db().dynamicInsert(table, entity);