fengji 学生端添加声部查询

mec-biz/src/main/java/com/ym/mec/biz/service/TenantInfoService.java

@@ -38,8 +38,6 @@ public interface TenantInfoService extends IService<TenantInfo> {
 
     TenantProductSumm queryTenantInfoProductSumm(Integer id);
 
-    Boolean testEmail();
-
     /**
     * @description: 保存tenantId
      * @param request
@@ -49,5 +47,12 @@ public interface TenantInfoService extends IService<TenantInfo> {
     */
     void saveTenantContextHolder(HttpServletRequest request);
 
+    /**
+     * 按部门查询机构信息
+     * @return 机构信息
+     */
     TenantInfo queryTenantInfoByOrgan(Integer organId);
+
+    Boolean testEmail();
+
 }

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

@@ -104,7 +104,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		PageInfo<SysMessageDto> pageInfo = new PageInfo<SysMessageDto>(queryInfo.getPage(), queryInfo.getRows());
 		Map<String, Object> params = new HashMap<String, Object>();
 		MapUtil.populateMap(params, queryInfo);
-		
+
 		List<SysMessageDto> dataList = null;
 		int count = this.findCount(params);
 		if (count > 0) {
@@ -314,7 +314,8 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		}
 		// email data from database load, 使用接收者 tenantId, 假设发送者和接收者为同一机构
 		if (Objects.equals(messageSender.getSendMode(), "EMAIL")) {
-			loadEmailInfo(null, receivers.values().stream().findFirst().orElse(null));
+			Integer userId = receivers.keySet().stream().findFirst().orElse(-1);
+			loadEmailInfo(userId);
 		}
 		if(StringUtils.isNotEmpty(jpushType) && jpushType == "STUDENT"){
 			//如果不是缴费信息
@@ -355,6 +356,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		if (triggerTime == null || date.after(triggerTime)) {
 			status = SendStatusEnum.SENDING;
 			try {
+				debugMode = false;
 				if (debugMode == true
 						|| messageSenderPluginContext.batchSend(messageSender, messageConfig.getDescription(),
 								MessageFormatter.arrayFormat(messageConfig.getContent(), args), tos, url,jpushType,"default",null)) {
@@ -451,7 +453,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		}
 		// email data from database load
 		if (Objects.equals(messageSender.getSendMode(), "EMAIL")) {
-			loadEmailInfo(userId, receiver);
+			loadEmailInfo(userId);
 		}
 		Date date = new Date();
 		SendStatusEnum status = SendStatusEnum.WAIT;
@@ -482,33 +484,15 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		addMessage(receivers, title, content, triggerTime, mode, status, errorMsg, readStatus, url, null,jpushType);
 	}
 
-	private Integer getTenantIdByUser(Integer userId, String receiver) throws BizException {
-		SysUser user;
-		if (userId == null) {
-			user = sysUserFeignService.queryUserByMobile(receiver);
-			if (user != null) {
-				return user.getTenantId();
-			} // user query null using receiver query
-		}
-
-		user = sysUserFeignService.queryUserByMobile(receiver);
-		if (user != null) {
-			return user.getTenantId();
-		} else {
-			throw new BizException("找不到发送者用户 id: " + userId.toString() + " 接收者 " + receiver);
-		}
-	}
-
-	private void loadEmailInfo(Integer userId,  String receiver) {
-		Integer tenantId = getTenantIdByUser(userId, receiver);
-		SysEmail email1 = sysEmailService.getOne(new WrapperUtil<SysEmail>().hasEq("tenant_id_", tenantId).queryWrapper());
+	private void loadEmailInfo(Integer userId) {
+		SysUser user = sysUserFeignService.queryUserById(userId);
+		SysEmail email1 = sysEmailService.getOne(new WrapperUtil<SysEmail>().hasEq("tenant_id_", user.getTenantId()).queryWrapper());
 		messageSenderPluginContext.sysEmail.setHostName(email1.getHostName());
 		messageSenderPluginContext.sysEmail.setSmtpPort(email1.getSmtpPort());
 		messageSenderPluginContext.sysEmail.setUserName(email1.getUserName());
 		messageSenderPluginContext.sysEmail.setPassword(email1.getPassword());
 		messageSenderPluginContext.sysEmail.setFromName(email1.getFromName());
 		messageSenderPluginContext.sysEmail.setFrom(email1.getFrom());
-
 	}
 
 	@Override

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

@@ -670,16 +670,6 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         return tps;
     }
 
-
-    @Override
-    public Boolean testEmail() {
-        Map<Integer, String> receivers = new HashMap<>();
-        receivers.put(1, "yanite1234@sina.com");
-        receivers.put(2, "yanite2016@sina.com");
-        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.EMAIL, MessageTypeEnum.TEST_EMAIL_FIRST, receivers, null, 0, null, "SYSTEM", null, null, null, null);
-
-        return false;
-    }
     @Override
     public void saveTenantContextHolder(HttpServletRequest request) {
         String tenantId = request.getHeader("tenantId");
@@ -706,4 +696,16 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
     public TenantInfo queryTenantInfoByOrgan(Integer organId) {
         return baseMapper.queryTenantInfoByOrgan(organId);
     }
+
+
+    @Override
+    public Boolean testEmail() {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        Map<Integer, String> receivers = new HashMap<>();
+        receivers.put(user.getId(), "yanite1234@sina.com");
+        receivers.put(2, "yanite2016@sina.com");
+        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.EMAIL, MessageTypeEnum.TEST_EMAIL_FIRST, receivers, null, 0, null, "SYSTEM", null, null, null, null);
+
+        return false;
+    }
 }

mec-student/src/main/java/com/ym/mec/student/controller/SubjectController.java

@@ -0,0 +1,30 @@
+package com.ym.mec.student.controller;
+
+import com.ym.mec.biz.dal.entity.Subject;
+import com.ym.mec.biz.dal.entity.SubjectGoodsMapper;
+import com.ym.mec.biz.dal.page.SubjectQueryInfo;
+import com.ym.mec.biz.service.SubjectService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.exception.BizException;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RequestMapping("subject")
+@Api(tags = "科目服务")
+@RestController
+public class SubjectController extends BaseController {
+
+    @Autowired
+    private SubjectService subjectService;
+
+    @ApiOperation(value = "列出所有分部")
+    @PostMapping("/list")
+    // @PreAuthorize("@pcs.hasPermissions('subject/list')")
+    public Object list(){
+        return succeed(subjectService.list());
+    }
+}

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/message/provider/CommEmailPlugin.java

@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
 
 import com.ym.mec.thirdparty.message.MessageSenderPlugin;
 
-//@Service
+@Service
 public class CommEmailPlugin implements MessageSenderPlugin, InitializingBean {
 
 	private String hostName;
@@ -50,11 +50,15 @@ public class CommEmailPlugin implements MessageSenderPlugin, InitializingBean {
 	}
 
 	public static String getName() {
-		return "EMAIL";
+		return "email";
 	}
 
 	@Override
 	public void afterPropertiesSet() throws Exception {
+
+	}
+
+	private boolean checkProperties() {
 		if (StringUtils.isBlank(hostName)) {
 			throw new RuntimeException("SMTP服务器没有配置");
 		}
@@ -79,15 +83,18 @@ public class CommEmailPlugin implements MessageSenderPlugin, InitializingBean {
 		if (StringUtils.isBlank(fromName)) {
 			fromName = from;
 		}
+		return true;
 	}
 
 	@Override
 	public boolean send(String subject, String content, String receiver, String url, String jpushType, String sound, String channelId) throws Exception {
+		this.checkProperties();
 		Email email = new SimpleEmail();
 		email.setHostName(hostName);
+		email.setDebug(true);
 		email.setSslSmtpPort(smtpPort + "");
 		email.setAuthenticator(new DefaultAuthenticator(userName, password));
-		// email.setSSLOnConnect(true);
+		email.setSSLOnConnect(true);
 		try {
 			email.setFrom(from, fromName);
 			email.setSubject(subject);

mec-web/src/main/java/com/ym/mec/web/controller/SubjectController.java

@@ -108,12 +108,10 @@ public class SubjectController extends BaseController {
         return succeed(subjectService.queryPageByIdOrName(queryInfo));
     }
 
-
     @ApiOperation(value = "列出所有分部")
     @PostMapping("/list")
     // @PreAuthorize("@pcs.hasPermissions('subject/list')")
     public Object list(){
         return succeed(subjectService.list());
     }
-
 }

mec-web/src/main/java/com/ym/mec/web/controller/TenantInfoController.java

@@ -134,7 +134,7 @@ public class TenantInfoController extends BaseController {
 
     @ApiOperation(value = "轮询查询订单状态")
     @GetMapping("/rechargeCheck/{orderNo}")
-    @PreAuthorize("@pcs.hasPermissions('tenantInfo/payCheck')")
+    @PreAuthorize("@pcs.hasPermissions('tenantInfo/rechargeCheck')")
     public HttpResponseResult<Boolean> rechargeCheck(
             @ApiParam(value = "订单号", required = true) @PathVariable("orderNo") String orderNo
     ) throws Exception {