Merge remote-tracking branch 'origin/dev' into dev

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/basic/service/impl/ClassServiceImpl.java

@@ -3,6 +3,7 @@ package com.usoftchina.smartschool.school.basic.service.impl;
 import com.usoftchina.smartschool.context.BaseContextHolder;
 import com.usoftchina.smartschool.exception.BizException;
 import com.usoftchina.smartschool.school.basic.service.ClassService;
+import com.usoftchina.smartschool.school.common.service.MessageLogService;
 import com.usoftchina.smartschool.school.dto.DocBaseDTO;
 import com.usoftchina.smartschool.school.exception.BizExceptionCode;
 import com.usoftchina.smartschool.school.mapper.SysClazzMapper;
@@ -32,6 +33,11 @@ public class ClassServiceImpl implements ClassService{
     private SysStudentMapper sysStudentMapper;
     @Autowired
     private SysTeacherMapper sysTeacherMapper;
+    @Autowired
+    private MessageLogService messageLogService;
+
+    private static final String CODE = "Class";
+    private static final String NAME = "班级资料";
 
     @Override
     public ClassForm getFormdata(Long id) {
@@ -69,6 +75,7 @@ public class ClassServiceImpl implements ClassService{
         //更新从表数据
         List<SysTeacherClazz> updateDetails = new ArrayList<>();
         //新增
+        DocBaseDTO docBaseDTO = null;
         if (StringUtils.isEmpty(id) || "0".equals(id.toString())) {
             clazz.setClazz_status(1);
             clazz.setClazz_nickname(clazz.getClazz_grade() + clazz.getClazz_name());
@@ -78,7 +85,9 @@ public class ClassServiceImpl implements ClassService{
                 teacher.setClazz_id(clazz.getClazz_id());
                 sysClazzMapper.insertTeacher(teacher);
             }
-            return new DocBaseDTO(clazz.getClazz_id());
+            docBaseDTO = new DocBaseDTO(clazz.getClazz_id(), CODE, NAME);
+            messageLogService.save(docBaseDTO);
+            return docBaseDTO;
         }
         //更新
         sysClazzMapper.updateByPrimaryKeySelective(clazz);
@@ -109,7 +118,9 @@ public class ClassServiceImpl implements ClassService{
                 sysClazzMapper.updateTeacher(item);
             }
         }
-        return new DocBaseDTO(clazz.getClazz_id());
+        docBaseDTO = new DocBaseDTO(clazz.getClazz_id(), CODE, NAME);
+        messageLogService.update(docBaseDTO);
+        return docBaseDTO;
     }
 
     @Override
@@ -133,12 +144,16 @@ public class ClassServiceImpl implements ClassService{
         if (check > 0) {
             throw new BizException(BizExceptionCode.EXISTS_CURRICULUM);
         }
+        DocBaseDTO docBaseDTO = new DocBaseDTO(id, CODE, NAME);
         sysClazzMapper.deleteByPrimaryKey(id);
         sysStudentMapper.deleteTeacher(id);
+        messageLogService.delete(docBaseDTO);
     }
 
     @Override
     public void deleteDetail(Long id) {
+        DocBaseDTO docBaseDTO = new DocBaseDTO(id, CODE, NAME);
         sysTeacherMapper.deleteDetail(id);
+        messageLogService.deleteDetail(docBaseDTO);
     }
 }

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/basic/service/impl/CurriculumServiceImpl.java

@@ -15,6 +15,7 @@ import com.usoftchina.smartschool.school.mapper.DataImportMapper;
 import com.usoftchina.smartschool.school.mapper.SysClazzMapper;
 import com.usoftchina.smartschool.school.mapper.SysGradeMapper;
 import com.usoftchina.smartschool.school.po.DataImportDetail;
+import com.usoftchina.smartschool.school.po.Operation;
 import com.usoftchina.smartschool.school.po.SubjectDO;
 import com.usoftchina.smartschool.school.wxschool.utils.ObjectUtils;
 import com.usoftchina.smartschool.school.wxschool.utils.StringUtils;
@@ -181,7 +182,7 @@ public class CurriculumServiceImpl implements CurriculumService {
                     curriculumMapper.updateDetailSelective(updateList);
                 }
             }
-            messageLogService.save(new DocBaseDTO(main.getId(), CODE, NAME));
+            messageLogService.update(new DocBaseDTO(main.getId(), CODE, NAME));
         }
         return new DocBaseDTO(main.getId(), CODE, NAME);
     }
@@ -312,6 +313,8 @@ public class CurriculumServiceImpl implements CurriculumService {
 
         curriculumMapper.updateByPublish(id);
         curriculumMapper.updateByPublishFrom(id, 1L);
+        DocBaseDTO docBaseDTO = new DocBaseDTO(id, CODE,  NAME);
+        messageLogService.customizeLog(docBaseDTO, Operation.PUBLISH);
     }
 
     @Override
@@ -332,6 +335,8 @@ public class CurriculumServiceImpl implements CurriculumService {
         }
         curriculumMapper.updateByRepublish(id);
         curriculumMapper.updateByPublishFrom(id, 0L);
+        DocBaseDTO docBaseDTO = new DocBaseDTO(id, CODE,  NAME);
+        messageLogService.customizeLog(docBaseDTO, Operation.REPUBLISH);
     }
 
     @Override

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/basic/service/impl/GradeServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.usoftchina.smartschool.context.BaseContextHolder;
 import com.usoftchina.smartschool.exception.BizException;
 import com.usoftchina.smartschool.school.basic.service.GradeService;
+import com.usoftchina.smartschool.school.common.service.MessageLogService;
 import com.usoftchina.smartschool.school.dto.DocBaseDTO;
 import com.usoftchina.smartschool.school.exception.BizExceptionCode;
 import com.usoftchina.smartschool.school.mapper.*;
@@ -46,6 +47,12 @@ public class GradeServiceImpl implements GradeService{
     @Autowired
     private HomeWorkMapper homeWorkMapper;
 
+    @Autowired
+    private MessageLogService messageLogService;
+
+    private static final String CODE = "Grade";
+    private static final String NAME = "年级资料";
+
     @Override
     public TreeNode getSchoolTree() {
         Long school_id = BaseContextHolder.getSchoolId();
@@ -179,7 +186,9 @@ public class GradeServiceImpl implements GradeService{
             throw new BizException(BizExceptionCode.REPEAT_GRADE_NAME);
         }
         sysGradeMapper.insertGrade(sysGrade);
-        return new DocBaseDTO(sysGrade.getGrade_id());
+        DocBaseDTO docBaseDTO = new DocBaseDTO(sysGrade.getGrade_id(), CODE,  NAME);
+        messageLogService.save(docBaseDTO);
+        return docBaseDTO;
     }
 
     @Override
@@ -197,7 +206,8 @@ public class GradeServiceImpl implements GradeService{
         sysClazz.setClazz_grade(gradeData.getGrade_name());
         sysClazz.setClazz_nickname(gradeData.getGrade_name()+sysClazz.getClazz_name());
         sysClazzMapper.insertSelective(sysClazz);
-        return new DocBaseDTO(sysClazz.getClazz_id());
+        DocBaseDTO docBaseDTO = new DocBaseDTO(sysClazz.getClazz_id(), "Class", "班级资料");
+        return docBaseDTO;
     }
 
     @Override
@@ -211,7 +221,9 @@ public class GradeServiceImpl implements GradeService{
         if (check > 0) {
             throw new BizException(BizExceptionCode.EXISTS_CLASS);
         }
+        DocBaseDTO docBaseDTO = new DocBaseDTO(id, CODE,  NAME);
         sysGradeMapper.deleteByPrimaryKey(id);
+        messageLogService.delete(docBaseDTO);
     }
 
     @Override
@@ -240,7 +252,9 @@ public class GradeServiceImpl implements GradeService{
         if(check > 0){
             throw new BizException(BizExceptionCode.HOMEWORK_RELEASE);
         }
+        DocBaseDTO docBaseDTO = new DocBaseDTO(id, "Class", "班级资料");
         sysClazzMapper.deleteByPrimaryKey(id);
+        messageLogService.delete(docBaseDTO);
     }
 
     @Override
@@ -254,7 +268,9 @@ public class GradeServiceImpl implements GradeService{
             List<SysClazz> clazzList = sysClazzMapper.selectBygrade(grade.getGrade_id());
             sysStudentMapper.updateGradeName(grade.getGrade_name(), clazzList);
         }
+        DocBaseDTO docBaseDTO = new DocBaseDTO(grade.getGrade_id(), CODE,  NAME);
         sysGradeMapper.updateByPrimaryKeySelective(grade);
+        messageLogService.update(docBaseDTO);
     }
 
     @Override
@@ -267,6 +283,8 @@ public class GradeServiceImpl implements GradeService{
         if (!oldClazz.getClazz_name().equals(sysClass.getClazz_name())) {
             sysStudentMapper.updateClazzName(sysClass.getClazz_name(), sysClass.getClazz_id());
         }
+        DocBaseDTO docBaseDTO = new DocBaseDTO(sysClass.getClazz_id(), "Class", "班级资料");
         sysClazzMapper.updateByPrimaryKeySelective(sysClass);
+        messageLogService.update(docBaseDTO);
     }
 }

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/basic/service/impl/SchoolServiceImpl.java

@@ -3,6 +3,8 @@ package com.usoftchina.smartschool.school.basic.service.impl;
 import com.usoftchina.smartschool.context.BaseContextHolder;
 import com.usoftchina.smartschool.exception.BizException;
 import com.usoftchina.smartschool.school.basic.service.SchoolService;
+import com.usoftchina.smartschool.school.common.service.MessageLogService;
+import com.usoftchina.smartschool.school.dto.DocBaseDTO;
 import com.usoftchina.smartschool.school.exception.BizExceptionCode;
 import com.usoftchina.smartschool.school.mapper.SysSchoolMapper;
 import com.usoftchina.smartschool.school.po.SysSchool;
@@ -20,6 +22,12 @@ public class SchoolServiceImpl implements SchoolService {
     @Autowired
     private SysSchoolMapper sysSchoolMapper;
 
+    @Autowired
+    private MessageLogService messageLogService;
+
+    private static final String CODE = "School";
+    private static final String NAME = "学校信息";
+
     @Override
     public SysSchool getFormData(Long id) {
         if (null == id || "0".equals(id)) {
@@ -36,6 +44,7 @@ public class SchoolServiceImpl implements SchoolService {
             throw new BizException(BizExceptionCode.USELESS_DATA);
         }
         sysSchoolMapper.updateByPrimaryKeySelective(school);
+        messageLogService.update(new DocBaseDTO(school.getSchool_id(), CODE, NAME));
     }
 
     @Override

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/basic/service/impl/SchoolTemplateServiceImpl.java

@@ -6,6 +6,7 @@ import com.usoftchina.smartschool.context.BaseContextHolder;
 import com.usoftchina.smartschool.exception.BizException;
 import com.usoftchina.smartschool.page.PageRequest;
 import com.usoftchina.smartschool.school.basic.service.SchoolTemplateService;
+import com.usoftchina.smartschool.school.common.service.MessageLogService;
 import com.usoftchina.smartschool.school.dto.DocBaseDTO;
 import com.usoftchina.smartschool.school.dto.ListReqDTO;
 import com.usoftchina.smartschool.school.exception.BizExceptionCode;
@@ -31,6 +32,12 @@ public class SchoolTemplateServiceImpl implements SchoolTemplateService {
     @Autowired
     private SchoolTemplateMapper schoolTemplateMapper;
 
+    @Autowired
+    private MessageLogService messageLogService;
+
+    private static final String CODE = "SchoolTemplate";
+    private static final String NAME = "消息模板";
+
     @Override
     public PageInfo<SchoolTemplate> getListData(PageRequest page, ListReqDTO listReqDTO) {
         PageHelper.startPage(page.getNumber(), page.getSize());
@@ -64,9 +71,11 @@ public class SchoolTemplateServiceImpl implements SchoolTemplateService {
         //新增
         if (StringUtils.isEmpty(formdata.getSt_id()) || "0".equals(formdata.getSt_id().toString())) {
             schoolTemplateMapper.insertSelective(formdata);
+            messageLogService.save(new DocBaseDTO(formdata.getSt_id(), CODE, NAME));
         } else {
             //更新
             schoolTemplateMapper.updateByPrimaryKeySelective(formdata);
+            messageLogService.update(new DocBaseDTO(formdata.getSt_id(), CODE, NAME));
         }
         return new DocBaseDTO(formdata.getSt_id());
     }

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/basic/service/impl/StudentServiceImpl.java

@@ -10,6 +10,7 @@ import com.usoftchina.smartschool.context.BaseContextHolder;
 import com.usoftchina.smartschool.exception.BizException;
 import com.usoftchina.smartschool.page.PageRequest;
 import com.usoftchina.smartschool.school.basic.service.StudentService;
+import com.usoftchina.smartschool.school.common.service.MessageLogService;
 import com.usoftchina.smartschool.school.dto.BatchDealBaseDTO;
 import com.usoftchina.smartschool.school.dto.DocBaseDTO;
 import com.usoftchina.smartschool.school.dto.ListReqDTO;
@@ -47,6 +48,11 @@ public class StudentServiceImpl implements StudentService{
     private SysGradeMapper sysGradeMapper;
     @Autowired
     private SysClazzMapper sysClazzMapper;
+    @Autowired
+    private MessageLogService messageLogService;
+
+    private static final String CODE = "Student";
+    private static final String NAME = "学生信息";
 
     @Override
     public PageInfo<SysStudent> getListData(PageRequest page, ListReqDTO listReqDTO) {
@@ -119,7 +125,9 @@ public class StudentServiceImpl implements StudentService{
                     sysStudentMapper.insertrelation(id, pr_id, item.getPs_relation());
                 }
             }
-            return new DocBaseDTO(id, null, "student");
+            DocBaseDTO docBaseDTO = new DocBaseDTO(id, CODE,  NAME);
+            messageLogService.save(docBaseDTO);
+            return docBaseDTO;
         }
         //更新学生
         if(sysStudentMapper.count(student.getStu_number(), student.getSchool_id()) > 0 &&
@@ -172,7 +180,9 @@ public class StudentServiceImpl implements StudentService{
                 sysStudentMapper.updateRelation(item.getParent_stu_id(), item.getPs_relation());
             }
         }
-        return new DocBaseDTO(id);
+        DocBaseDTO docBaseDTO = new DocBaseDTO(id, CODE,  NAME);
+        messageLogService.update(docBaseDTO);
+        return docBaseDTO;
     }
 
     private Long createAccount(String mobile){
@@ -291,6 +301,7 @@ public class StudentServiceImpl implements StudentService{
         }
         sysStudentMapper.deleteByPrimaryKey(id);
         sysStudentMapper.deleteRelation(id);
+        messageLogService.delete(new DocBaseDTO(id, CODE, NAME));
     }
 
     @Override
@@ -311,5 +322,6 @@ public class StudentServiceImpl implements StudentService{
             return;
         }
         sysStudentMapper.deleteRelationById(id);
+        messageLogService.deleteDetail(new DocBaseDTO(id, CODE, NAME));
     }
 }

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/basic/service/impl/SubjectServiceImpl.java

@@ -6,6 +6,7 @@ import com.usoftchina.smartschool.context.BaseContextHolder;
 import com.usoftchina.smartschool.exception.BizException;
 import com.usoftchina.smartschool.page.PageRequest;
 import com.usoftchina.smartschool.school.basic.service.SubjectService;
+import com.usoftchina.smartschool.school.common.service.MessageLogService;
 import com.usoftchina.smartschool.school.dto.BatchDealBaseDTO;
 import com.usoftchina.smartschool.school.dto.DocBaseDTO;
 import com.usoftchina.smartschool.school.dto.ListReqDTO;
@@ -27,7 +28,11 @@ public class SubjectServiceImpl implements SubjectService {
 
     @Autowired
     private SubjectMapper subjectMapper;
+    @Autowired
+    private MessageLogService messageLogService;
 
+    private static final String CODE = "Subject";
+    private static final String NAME = "科目信息";
 
     @Override
     public PageInfo<Subject> getListData(PageRequest page, ListReqDTO listReqDTO) {
@@ -51,6 +56,7 @@ public class SubjectServiceImpl implements SubjectService {
         Long id = formdata.getSubject_id();
         Long school = BaseContextHolder.getSchoolId();
         Integer check = 0;
+        DocBaseDTO docBaseDTO = null;
         if (StringUtils.isEmpty(id) || "0".equals(id.toString())) {
             formdata.setSchool_id(school);
             formdata.setSubject_status(1);
@@ -60,7 +66,9 @@ public class SubjectServiceImpl implements SubjectService {
                 throw new BizException(BizExceptionCode.EXISTS_SUBJECT);
             }
             subjectMapper.insertSelective(formdata);
-           id = formdata.getSubject_id();
+            id = formdata.getSubject_id();
+            docBaseDTO = new DocBaseDTO(id, CODE, NAME);
+            messageLogService.save(docBaseDTO);
         } else {
             //更新
             check = subjectMapper.checkSubject(formdata.getSubject_name(), BaseContextHolder.getSchoolId());
@@ -68,8 +76,10 @@ public class SubjectServiceImpl implements SubjectService {
                 throw new BizException(BizExceptionCode.EXISTS_SUBJECT);
             }
             subjectMapper.updateByPrimaryKeySelective(formdata);
+            docBaseDTO = new DocBaseDTO(formdata.getSubject_id(), CODE,  NAME);
+            messageLogService.update(docBaseDTO);
         }
-        return new DocBaseDTO(formdata.getSubject_id());
+        return docBaseDTO;
     }
 
     @Override
@@ -101,5 +111,6 @@ public class SubjectServiceImpl implements SubjectService {
             throw new BizException(BizExceptionCode.EXISTS_TEACHER_CLASS);
         }
         subjectMapper.deleteByPrimaryKey(id);
+        messageLogService.delete(new DocBaseDTO(id, CODE,  NAME));
     }
 }

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/basic/service/impl/TeacherServiceImpl.java

@@ -10,6 +10,7 @@ import com.usoftchina.smartschool.context.BaseContextHolder;
 import com.usoftchina.smartschool.exception.BizException;
 import com.usoftchina.smartschool.page.PageRequest;
 import com.usoftchina.smartschool.school.basic.service.TeacherService;
+import com.usoftchina.smartschool.school.common.service.MessageLogService;
 import com.usoftchina.smartschool.school.dto.BatchDealBaseDTO;
 import com.usoftchina.smartschool.school.dto.DocBaseDTO;
 import com.usoftchina.smartschool.school.dto.ListReqDTO;
@@ -42,6 +43,11 @@ public class TeacherServiceImpl implements TeacherService{
     private DataImportMapper dataImportMapper;
     @Autowired
     private AccountApi accountApi;
+    @Autowired
+    private MessageLogService messageLogService;
+
+    private static final String CODE = "Teacher";
+    private static final String NAME = "教职工信息";
 
     @Override
     public PageInfo<SysTeacher> getListData(PageRequest page, ListReqDTO listReqDTO) {
@@ -78,6 +84,7 @@ public class TeacherServiceImpl implements TeacherService{
         Long school_id = BaseContextHolder.getSchoolId();
         formdata.setSchool_id(school_id);
         formdata.setTeacher_status(1);
+        DocBaseDTO docBaseDTO = null;
         //新增教师
         if (StringUtils.isEmpty(formdata.getTeacher_id()) || "0".equals(formdata.getTeacher_id().toString())) {
             if(sysTeacherMapper.count(formdata.getTeacher_number(), formdata.getSchool_id()) > 0){
@@ -89,7 +96,8 @@ public class TeacherServiceImpl implements TeacherService{
                 formdata.setUser_id(userId);
             }
             sysTeacherMapper.insertSelective(formdata);
-
+            docBaseDTO = new DocBaseDTO(formdata.getTeacher_id(), CODE,  NAME);
+            messageLogService.save(docBaseDTO);
         } else {
             //更新教师
             if(sysTeacherMapper.count(formdata.getTeacher_number(), formdata.getSchool_id()) > 0 &&
@@ -97,8 +105,10 @@ public class TeacherServiceImpl implements TeacherService{
                 throw new BizException(BizExceptionCode.REPEAT_TEACHER_NUMBER);
             }
             sysTeacherMapper.updateByPrimaryKeySelective(formdata);
+            docBaseDTO = new DocBaseDTO(formdata.getTeacher_id(), CODE,  NAME);
+            messageLogService.update(docBaseDTO);
         }
-        return new DocBaseDTO(formdata.getTeacher_id(), null, null);
+        return docBaseDTO;
     }
 
     /**
@@ -199,6 +209,7 @@ public class TeacherServiceImpl implements TeacherService{
         }
         sysTeacherMapper.deleteByPrimaryKey(id);
         sysTeacherMapper.deleteRelation(id);
+        messageLogService.delete(new DocBaseDTO(id, CODE,  NAME));
     }
 
     @Override

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/business/service/impl/HomeWorkServiceImpl.java

@@ -6,6 +6,7 @@ import com.usoftchina.smartschool.context.BaseContextHolder;
 import com.usoftchina.smartschool.exception.BizException;
 import com.usoftchina.smartschool.page.PageRequest;
 import com.usoftchina.smartschool.school.business.service.HomeWorkService;
+import com.usoftchina.smartschool.school.common.service.MessageLogService;
 import com.usoftchina.smartschool.school.dto.BatchDealBaseDTO;
 import com.usoftchina.smartschool.school.dto.DocBaseDTO;
 import com.usoftchina.smartschool.school.dto.ListReqDTO;
@@ -50,6 +51,13 @@ public class HomeWorkServiceImpl implements HomeWorkService{
     private WechatApi wechatApi;
     @Autowired
     private SchoolTemplateMapper schoolTemplateMapper;
+    @Autowired
+    private MessageLogService messageLogService;
+
+    private static final String CODE = "HomeWork";
+    private static final String NAME = "作业";
+
+
     @Value("${smartschool.domain.wechat}")
     private String wechatBaseUrl;
 
@@ -60,6 +68,7 @@ public class HomeWorkServiceImpl implements HomeWorkService{
         }
         Long school_id = BaseContextHolder.getSchoolId();
         formdata.setSchool_id(school_id);
+        DocBaseDTO docBaseDTO = null;
         //新增
         if (StringUtils.isEmpty(formdata.getTask_id()) || "0".equals(formdata.getTask_id().toString())) {
             formdata.setTask_status(2);
@@ -75,14 +84,18 @@ public class HomeWorkServiceImpl implements HomeWorkService{
             formdata.setTask_creator(Creator);
             */
             homeWorkMapper.insertSelective(formdata);
+            docBaseDTO = new DocBaseDTO(formdata.getTask_id(), CODE, NAME);
+            messageLogService.save(docBaseDTO);
         } else {
             //更新
             homeWorkMapper.updateByPrimaryKeySelective(formdata);
+            docBaseDTO = new DocBaseDTO(formdata.getTask_id(), CODE,  NAME);
+            messageLogService.update(docBaseDTO);
             if(formdata.getTask_status()==1){
                 publish(formdata.getTask_id());
             }
         }
-        return new DocBaseDTO(formdata.getTask_id());
+        return docBaseDTO;
     }
 
     @Override
@@ -108,6 +121,7 @@ public class HomeWorkServiceImpl implements HomeWorkService{
             throw new BizException(BizExceptionCode.TASK_RELEASE_STATUS);
         }
         homeWorkMapper.deleteByPrimaryKey(id);
+        messageLogService.delete(new DocBaseDTO(id, CODE,  NAME));
     }
 
     @Override
@@ -169,6 +183,8 @@ public class HomeWorkServiceImpl implements HomeWorkService{
             wechatApi.largeMessages(transferDTO);
         }
         homeWorkMapper.updateByPublish(id);
+        DocBaseDTO docBaseDTO = new DocBaseDTO(id, CODE, NAME);
+        messageLogService.customizeLog(docBaseDTO, Operation.PUBLISH);
     }
 
     /**

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/business/service/impl/NoticeServiceImpl.java

@@ -6,6 +6,7 @@ import com.usoftchina.smartschool.context.BaseContextHolder;
 import com.usoftchina.smartschool.exception.BizException;
 import com.usoftchina.smartschool.page.PageRequest;
 import com.usoftchina.smartschool.school.business.service.NoticeService;
+import com.usoftchina.smartschool.school.common.service.MessageLogService;
 import com.usoftchina.smartschool.school.dto.BatchDealBaseDTO;
 import com.usoftchina.smartschool.school.dto.DocBaseDTO;
 import com.usoftchina.smartschool.school.dto.ListReqDTO;
@@ -14,10 +15,7 @@ import com.usoftchina.smartschool.school.exception.BizExceptionCode;
 import com.usoftchina.smartschool.school.mapper.NoticeMapper;
 import com.usoftchina.smartschool.school.mapper.SchoolTemplateMapper;
 import com.usoftchina.smartschool.school.mapper.SysSchoolMapper;
-import com.usoftchina.smartschool.school.po.Notify;
-import com.usoftchina.smartschool.school.po.SchoolNoticer;
-import com.usoftchina.smartschool.school.po.SchoolTemplate;
-import com.usoftchina.smartschool.school.po.SysSchool;
+import com.usoftchina.smartschool.school.po.*;
 import com.usoftchina.smartschool.utils.DateUtils;
 import com.usoftchina.smartschool.utils.StringUtils;
 import com.usoftchina.smartschool.wechat.api.WechatApi;
@@ -50,6 +48,12 @@ public class NoticeServiceImpl implements NoticeService{
     @Autowired
     private SchoolTemplateMapper schoolTemplateMapper;
 
+    @Autowired
+    private MessageLogService messageLogService;
+
+    private static final String CODE = "Notice";
+    private static final String NAME = "学校通知";
+
     @Value("${smartschool.domain.wechat}")
     private String baseWechatUrl;
 
@@ -61,6 +65,7 @@ public class NoticeServiceImpl implements NoticeService{
         }
         Long school_id = BaseContextHolder.getSchoolId();
         formdata.setSchool_id(school_id);
+        DocBaseDTO docBaseDTO = null;
         //新增
         if (StringUtils.isEmpty(formdata.getNotify_id()) || "0".equals(formdata.getNotify_id().toString())) {
             formdata.setNotify_status(2);
@@ -68,15 +73,18 @@ public class NoticeServiceImpl implements NoticeService{
             Calendar calendar= Calendar.getInstance();
             formdata.setCreate_date(calendar.getTime());
             noticeMapper.insertSelective(formdata);
-
+            docBaseDTO = new DocBaseDTO(formdata.getNotify_id(), CODE,  NAME);
+            messageLogService.save(docBaseDTO);
         } else {
             //更新
             noticeMapper.updateByPrimaryKeySelective(formdata);
+            docBaseDTO = new DocBaseDTO(formdata.getNotify_id(), CODE,  NAME);
+            messageLogService.update(docBaseDTO);
             if(formdata.getNotify_status()==1){
                 publish(formdata.getNotify_id());
             }
         }
-        return new DocBaseDTO(formdata.getNotify_id());
+        return docBaseDTO;
     }
 
     @Override
@@ -111,6 +119,7 @@ public class NoticeServiceImpl implements NoticeService{
             throw new BizException(BizExceptionCode.NOTICE_RELEASE_STATUS);
         }
         noticeMapper.deleteByPrimaryKey(id);
+        messageLogService.delete(new DocBaseDTO(id, CODE,  NAME));
     }
 
     @Override
@@ -175,5 +184,6 @@ public class NoticeServiceImpl implements NoticeService{
             wechatApi.largeMessages(transferDTO);
         }
         noticeMapper.updateByPublish(id);
+        messageLogService.customizeLog(new DocBaseDTO(id, CODE, NAME), Operation.PUBLISH);
     }
 }

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/business/service/impl/ScoreServiceImpl.java

@@ -7,6 +7,7 @@ import com.usoftchina.smartschool.context.BaseContextHolder;
 import com.usoftchina.smartschool.exception.BizException;
 import com.usoftchina.smartschool.page.PageRequest;
 import com.usoftchina.smartschool.school.business.service.ScoreService;
+import com.usoftchina.smartschool.school.common.service.MessageLogService;
 import com.usoftchina.smartschool.school.dto.BatchDealBaseDTO;
 import com.usoftchina.smartschool.school.dto.DocBaseDTO;
 import com.usoftchina.smartschool.school.dto.ListReqDTO;
@@ -66,6 +67,12 @@ public class ScoreServiceImpl implements ScoreService{
     @Autowired
     private SubjectMapper subjectMapper;
 
+    @Autowired
+    private MessageLogService messageLogService;
+
+    private static final String CODE = "Score";
+    private static final String NAME = "成绩发布";
+
     @Override
     public PageInfo<ScoreImportList> getListData(PageRequest page, ListReqDTO listReqDTO) {
         PageHelper.startPage(page.getNumber(), page.getSize());
@@ -104,6 +111,7 @@ public class ScoreServiceImpl implements ScoreService{
             throw new BizException(BizExceptionCode.EXISTS_TEACHER_CLASS);
         }
         scoreMapper.deleteByPrimaryKey(id);
+        messageLogService.delete(new DocBaseDTO(id, CODE, NAME));
     }
 
     @Override
@@ -287,6 +295,7 @@ public class ScoreServiceImpl implements ScoreService{
         }
         //更新已转标志
         scoreMapper.updateTurnPublish(id);
+        messageLogService.customizeLog(new DocBaseDTO(id, CODE, NAME), Operation.PUBLISH);
     }
 
     @Override

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/po/Operation.java

@@ -14,6 +14,14 @@ public enum Operation {
      * 删除
      */
     DELETE("删除操作", "删除成功"),
+    /**
+     * 发布
+     */
+    PUBLISH("发布操作", "发布成功"),
+    /**
+     * 取消发布
+     */
+    REPUBLISH("取消发布操作", "取消发布成功"),
     /**
      * 删除明细
      */

applications/school/school-server/src/main/resources/mapper/SchoolTemplateMapper.xml

@@ -28,6 +28,9 @@
       #{st_templateid,jdbcType=VARCHAR}, #{st_schoolid,jdbcType=BIGINT})
   </insert>
   <insert id="insertSelective" parameterType="com.usoftchina.smartschool.school.po.SchoolTemplate" >
+    <selectKey  resultType="java.lang.Long" keyProperty="st_id">
+      SELECT LAST_INSERT_ID() AS ID
+    </selectKey>
     insert into school_template
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="st_code != null" >