意见反馈

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/MessageTypeEnum.java

@@ -117,6 +117,8 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     TEACHER_PUSH_EXTRA_REPLY("TEACHER_PUSH_EXTRA_REPLY", "训练回复提醒"),
     EXTRA_STUDENT_REPLY_IM("EXTRA_STUDENT_REPLY_IM", "训练回复提醒"),
 
+    PUSH_SUGGESTION_FEEDBACK_CONTENT("PUSH_SUGGESTION_FEEDBACK_CONTENT", "意见反馈"),
+
     TEACHER_PUSH_COURSE_SALARY_COMPLAINTS_RESULT("TEACHER_PUSH_COURSE_SALARY_COMPLAINTS_RESULT", "课酬申述结果"),
     TEACHER_PUSH_SALARY_CONFIRM("TEACHER_PUSH_SALARY_CONFIRM", "课酬确认"),
     STUDENT_PUSH_TRIAL_PRACTICE_CREATE("STUDENT_PUSH_TRIAL_PRACTICE_CREATE", "试听课安排"),

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysSuggestionServiceImpl.java

@@ -2,31 +2,21 @@ package com.ym.mec.biz.service.impl;
 
 import com.microsvc.toolkit.common.webportal.exception.BizException;
 import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dao.SysConfigDao;
-import com.ym.mec.biz.dal.dao.TeacherDao;
-import com.ym.mec.biz.dal.entity.SysMessage;
+import com.ym.mec.biz.dal.dao.SysSuggestionDao;
+import com.ym.mec.biz.dal.entity.SysSuggestion;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
-import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.biz.service.SysMessageService;
+import com.ym.mec.biz.service.SysSuggestionService;
 import com.ym.mec.biz.service.SysUserService;
-import com.ym.mec.common.page.PageInfo;
-import com.ym.mec.common.page.QueryInfo;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
-import com.ym.mec.util.collection.MapUtil;
-import com.ym.mec.util.date.DateUtil;
-import io.swagger.models.auth.In;
-import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.ym.mec.biz.dal.dao.SysSuggestionDao;
-import com.ym.mec.biz.dal.entity.SysSuggestion;
-import com.ym.mec.biz.service.SysSuggestionService;
-import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.common.service.impl.BaseServiceImpl;
-
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 @Service
 public class SysSuggestionServiceImpl extends BaseServiceImpl<Long, SysSuggestion>  implements SysSuggestionService {
@@ -36,11 +26,7 @@ public class SysSuggestionServiceImpl extends BaseServiceImpl<Long, SysSuggestio
 	@Autowired
 	private SysUserService sysUserService;
 	@Autowired
-	private SysConfigDao sysConfigDao;
-	@Autowired
 	private SysMessageService sysMessageService;
-	@Autowired
-	private TeacherDao teacherDao;
 
 	@Override
 	public BaseDAO<Long, SysSuggestion> getDAO() {
@@ -67,11 +53,10 @@ public class SysSuggestionServiceImpl extends BaseServiceImpl<Long, SysSuggestio
 		sysSuggestionDao.update(sysSuggestion);
 		if (sysSuggestion.getFeedbackFlag()) {
 			String notifyUrl = "feedback?id=" + sysSuggestion.getId();
-			String content = sysConfigDao.findConfigValue("suggestion_feedback_content");
-			StringBuffer sb = new StringBuffer("[");
-			sb.append(suggestion.getSuggestionTypeName()).append("]").append(DateUtil.format(suggestion.getCreateTime(),DateUtil.DEFAULT_PATTERN));
-			sysMessageService.sendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,suggestion.getUserId().intValue(),
-					sb.toString(),content,suggestion.getUserId().toString(),null,0,notifyUrl,"SYSTEM","STUDENT");
+			Map<Integer,String> userMap = new HashMap<>(1);
+			userMap.put(suggestion.getUserId().intValue(),suggestion.getUserId().toString());
+			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PUSH_SUGGESTION_FEEDBACK_CONTENT,
+					userMap, null, 0, notifyUrl, suggestion.getClientType());
 		}
 	}
 

mec-biz/src/main/resources/config/mybatis/SysSuggestionMapper.xml

@@ -132,7 +132,7 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="SysSuggestion" parameterType="map">
-        SELECT ss.*,CASE WHEN ss.client_type_='STUDENT' THEN su.username_ ELSE su.real_name_ END username_,
+        SELECT ss.*,CASE WHEN ss.client_type_ IN ('STUDENT','SCHOOL') THEN su.username_ ELSE su.real_name_ END username_,
         sut.type_ suggestionTypeName,sue.real_name_ operatorName
         FROM sys_suggestion ss
         LEFT JOIN sys_user su ON su.id_ = ss.user_id_