From 4a75038499efb5c3852692e4177d42ba8da803a3 Mon Sep 17 00:00:00 2001
From: ky <592468495@qq.com>
Date: Tue, 28 Jul 2020 14:59:32 +0800
Subject: [PATCH] p
---
.../com/yhjd/controller/AdminController.java | 8 ++++----
.../java/com/yhjd/handler/MenuHandler.java | 18 ++++++++++++++++--
src/main/java/com/yhjd/handler/MsgHandler.java | 12 +++++++-----
.../yhjd/service/impl/AdminServiceImpl.java | 6 +++---
.../com/yhjd/service/impl/UserServiceImpl.java | 2 +-
5 files changed, 31 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/yhjd/controller/AdminController.java b/src/main/java/com/yhjd/controller/AdminController.java
index c60b93d..fb50d63 100644
--- a/src/main/java/com/yhjd/controller/AdminController.java
+++ b/src/main/java/com/yhjd/controller/AdminController.java
@@ -23,11 +23,11 @@ public class AdminController {
@ApiOperation(value = "login", notes = "login")
@ResponseBody
public Result login(String name,String password) {
- String login = adminService.login(name, password);
- if(login.equals("登陆成功")){
- return ResultBuilder.withPayload(login).build();
+ boolean login = adminService.login(name, password);
+ if(login){
+ return ResultBuilder.withPayload("success").build();
}else {
- return ResultBuilder.error(login).build();
+ return ResultBuilder.error("fail").build();
}
}
diff --git a/src/main/java/com/yhjd/handler/MenuHandler.java b/src/main/java/com/yhjd/handler/MenuHandler.java
index aa1c406..d5de285 100644
--- a/src/main/java/com/yhjd/handler/MenuHandler.java
+++ b/src/main/java/com/yhjd/handler/MenuHandler.java
@@ -6,11 +6,14 @@ import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
import me.chanjar.weixin.mp.bean.message.WxMpXmlOutNewsMessage;
import me.chanjar.weixin.mp.builder.outxml.NewsBuilder;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadPoolExecutor;
import static me.chanjar.weixin.common.api.WxConsts.EventType;
@@ -32,7 +35,7 @@ public class MenuHandler extends AbstractHandler {
}
if(wxMessage.getEventKey().equals("公司动态")){
- msg = "该系统需要认证才可使用 点我认证";
+ msg = "该系统需要认证才可使用 点我认证";
}
if(wxMessage.getEventKey().equals("检修智库")){
List articles = new ArrayList<>();
@@ -45,6 +48,17 @@ public class MenuHandler extends AbstractHandler {
return new NewsBuilder().articles(articles).fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser()).build();
}
+ if(wxMessage.getEventKey().equals("虹杨基地指南")){
+ List articles = new ArrayList<>();
+ WxMpXmlOutNewsMessage.Item item = new WxMpXmlOutNewsMessage.Item();
+ item.setTitle("虹杨基地服务指南");
+ item.setDescription("内部资料，请勿外泄");
+ item.setPicUrl("http://backend.emaylearningsh.com/img/2d4bcd51-3daa-4137-90e0-26df8b67397b.png");
+ item.setUrl("http://wxx.emaylearningsh.com/h5/task/brief?id=47d78998-6864-4840-8da6-4136dda5561c");
+ articles.add(item);
+ return new NewsBuilder().articles(articles).fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser()).build();
+ }
+
if(wxMessage.getEventKey().equals("聚焦QC创新")){
List articles = new ArrayList<>();
WxMpXmlOutNewsMessage.Item item = new WxMpXmlOutNewsMessage.Item();
@@ -127,7 +141,7 @@ public class MenuHandler extends AbstractHandler {
}
if(wxMessage.getEventKey().equals("我的地盘")){
- msg = "该系统需要认证才可使用 点我认证";
+ msg = "该系统需要认证才可使用 点我认证";
}
return WxMpXmlOutMessage.TEXT().content(msg)
diff --git a/src/main/java/com/yhjd/handler/MsgHandler.java b/src/main/java/com/yhjd/handler/MsgHandler.java
index 3d72f22..ca02c96 100644
--- a/src/main/java/com/yhjd/handler/MsgHandler.java
+++ b/src/main/java/com/yhjd/handler/MsgHandler.java
@@ -3,6 +3,7 @@ package com.yhjd.handler;
import com.yhjd.entity.Misson;
import com.yhjd.mapper.MissonMapper;
import com.yhjd.util.JsonUtils;
+import io.swagger.models.auth.In;
import me.chanjar.weixin.common.error.WxErrorException;
import me.chanjar.weixin.common.session.WxSessionManager;
import me.chanjar.weixin.mp.api.WxMpService;
@@ -15,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -41,11 +43,11 @@ public class MsgHandler extends AbstractHandler {
//当用户输入关键词如“你好”，“客服”等，并且有客服在线时，把消息转发给在线客服
try {
if (StringUtils.startsWithAny(wxMessage.getContent(), "你好", "客服")
- && weixinService.getKefuService().kfOnlineList()
- .getKfOnlineList().size() > 0) {
+ && weixinService.getKefuService().kfOnlineList()
+ .getKfOnlineList().size() > 0) {
return WxMpXmlOutMessage.TRANSFER_CUSTOMER_SERVICE()
- .fromUser(wxMessage.getToUser())
- .toUser(wxMessage.getFromUser()).build();
+ .fromUser(wxMessage.getToUser())
+ .toUser(wxMessage.getFromUser()).build();
}
} catch (WxErrorException e) {
e.printStackTrace();
@@ -67,7 +69,7 @@ public class MsgHandler extends AbstractHandler {
Item item = new Item();
item.setTitle(name);
item.setDescription(result.getDescription());
- item.setPicUrl("http://backend.emaylearningsh.com/img/"+result.getPreviewUrl());
+ item.setPicUrl("http://backend.emaylearningsh.com/img/" + result.getPreviewUrl());
item.setUrl(result.getH5Url());
articles.add(item);
// return new TextBuilder().build(content, wxMessage, weixinService);
diff --git a/src/main/java/com/yhjd/service/impl/AdminServiceImpl.java b/src/main/java/com/yhjd/service/impl/AdminServiceImpl.java
index cd7a6a1..8d55b61 100644
--- a/src/main/java/com/yhjd/service/impl/AdminServiceImpl.java
+++ b/src/main/java/com/yhjd/service/impl/AdminServiceImpl.java
@@ -24,12 +24,12 @@ public class AdminServiceImpl extends ServiceImpl implements
@Autowired
AdminMapper adminMapper;
- public String login(String name, String password){
+ public boolean login(String name, String password){
List users = adminMapper.selectList(new EntityWrapper().eq("name", name).and().eq("password", password));
if(users.size()>0){
- return "登录成功";
+ return true;
}else {
- return "登录失败";
+ return false;
}
}
}
diff --git a/src/main/java/com/yhjd/service/impl/UserServiceImpl.java b/src/main/java/com/yhjd/service/impl/UserServiceImpl.java
index c43ab74..4e44991 100644
--- a/src/main/java/com/yhjd/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/yhjd/service/impl/UserServiceImpl.java
@@ -80,7 +80,7 @@ public class UserServiceImpl extends ServiceImpl implements IU
userWrapper.eq("telephone", num);
}
if(!workNum.equals("")){
- userWrapper.eq("work_num", workNum);
+ userWrapper.eq("work_num", workNum).or().eq("erp_num",workNum);
}
List users = userMapper.selectList(userWrapper);
if(users.size()>0){