p

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();
         }
 
     }

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 = "该系统需要认证才可使用 <a href='http://zj220.emaylearningsh.com/common/auth?openid="+wxMessage.getFromUser()+"'>点我认证</a>";
+            msg = "该系统需要认证才可使用 <a href='http://zj220.emaylearningsh.com/common/auth?type=1&openid="+wxMessage.getFromUser()+"'>点我认证</a>";
         }
         if(wxMessage.getEventKey().equals("检修智库")){
             List<WxMpXmlOutNewsMessage.Item> 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<WxMpXmlOutNewsMessage.Item> 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<WxMpXmlOutNewsMessage.Item> articles = new ArrayList<>();
             WxMpXmlOutNewsMessage.Item item = new WxMpXmlOutNewsMessage.Item();
@@ -127,7 +141,7 @@ public class MenuHandler extends AbstractHandler {
         }
 
         if(wxMessage.getEventKey().equals("我的地盘")){
-            msg = "该系统需要认证才可使用 <a href='http://zj220.emaylearningsh.com/common/auth?openid="+wxMessage.getFromUser()+"'>点我认证</a>";
+            msg = "该系统需要认证才可使用 <a href='http://zj220.emaylearningsh.com/common/auth?type=2&openid="+wxMessage.getFromUser()+"'>点我认证</a>";
         }
 
         return WxMpXmlOutMessage.TEXT().content(msg)

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;
 

src/main/java/com/yhjd/service/impl/AdminServiceImpl.java

@@ -24,12 +24,12 @@ public class AdminServiceImpl extends ServiceImpl<AdminMapper, Admin> implements
     @Autowired
     AdminMapper adminMapper;
 
-    public String login(String name, String password){
+    public boolean login(String name, String password){
         List<Admin> users = adminMapper.selectList(new EntityWrapper<Admin>().eq("name", name).and().eq("password", password));
         if(users.size()>0){
-            return "登录成功";
+            return true;
         }else {
-            return "登录失败";
+            return false;
         }
     }
 }

src/main/java/com/yhjd/service/impl/UserServiceImpl.java

@@ -80,7 +80,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> 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<User> users = userMapper.selectList(userWrapper);
         if(users.size()>0){