瀏覽代碼

OKR业务代码提交--修改

hcst_sunzhen 4 年之前
父節點
當前提交
1d0bb796b5

+ 27 - 1
src/main/java/cn/com/ctop/okr/controller/LoginController.java

@@ -1,11 +1,11 @@
 package cn.com.ctop.okr.controller;
 
 import cn.com.ctop.okr.entity.QYWxUserInfo;
-import cn.com.ctop.okr.qywx.constant.QYWxConstant;
 import cn.com.ctop.okr.service.CorpUserInfoService;
 import cn.com.ctop.okr.service.QYWxService;
 import cn.com.ctop.okr.utils.JwtUtil;
 import cn.com.ctop.okr.utils.RedisUtil;
+import cn.com.ctop.okr.vo.LoginUser;
 import cn.com.ctop.okr.vo.Result;
 import com.alibaba.fastjson.JSONObject;
 import lombok.val;
@@ -15,6 +15,8 @@ import me.chanjar.weixin.cp.api.impl.WxCpServiceImpl;
 import me.chanjar.weixin.cp.bean.WxCpOauth2UserInfo;
 import me.chanjar.weixin.cp.config.impl.WxCpDefaultConfigImpl;
 import org.apache.log4j.Logger;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,6 +24,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 @Controller
 @RequestMapping("/sys")
 public class LoginController {
@@ -170,5 +175,26 @@ public class LoginController {
         return result;
     }
 
+    /**
+     * 退出登录
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/logout")
+    public Result<Object> logout(HttpServletRequest request, HttpServletResponse response) {
+        //用户退出逻辑
+        Subject subject = SecurityUtils.getSubject();
+        //LoginUser sysUser = (LoginUser) subject.getPrincipal();
+        QYWxUserInfo sysUser = (QYWxUserInfo) subject.getPrincipal();
+
+        logger.info(" 用户名:  " + sysUser.getName() + ",退出成功! ");
+        subject.logout();
+
+        return Result.ok("退出登录成功!");
+    }
+
 
 }

+ 4 - 3
src/main/java/cn/com/ctop/okr/mapper/xml/OkrMemberMapper.xml

@@ -10,10 +10,11 @@
         okr_member a
         left join wx_user_info b on a.member_id = b.open_id
         where
-        user_id = #{userId}
+        a.user_id = #{userId}
         and
-        year = #{year}
-        and quarter = #{quarter}
+        a.year = #{year}
+        and
+        a.quarter = #{quarter}
         <if test="name">
             and b.name like concat('%',#{name},'%')
         </if>

+ 3 - 2
src/main/java/cn/com/ctop/okr/service/impl/OkrServiceImpl.java

@@ -32,7 +32,7 @@ public class OkrServiceImpl implements OkrService {
     @Autowired
     private OkrTaskInfoMapper okrTaskInfoMapper;
     @Autowired
-    private CorpUserInfoMapper corpUserInfoMapper;
+    private QYWxUserInfoMapper wxUserInfoMapper;
 
     @Override
     public Map<String, Object> getOkrInfo(String userId){
@@ -140,6 +140,7 @@ public class OkrServiceImpl implements OkrService {
     @Override
     public void updateTaskInfo(OkrTaskInfo taskInfo){
         okrTaskInfoMapper.updateTaskInfo(taskInfo);
+        taskInfo = okrTaskInfoMapper.selectById(taskInfo.getId());
 
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         String userId = sysUser.getOpenId();
@@ -320,7 +321,7 @@ public class OkrServiceImpl implements OkrService {
         for(OkrObjectInfo object:OkrObjectInfoList){
             Map<String, Object> okrmap = new HashMap<>();
             List<OkrKrInfo> krList = okrKrInfoMapper.getKrByObjectId(object.getId(), object.getUserId(), year, quarter);
-            CorpUserInfo userInfo = corpUserInfoMapper.getUserInfoByOpenId(object.getUserId());
+            QYWxUserInfo userInfo = wxUserInfoMapper.getUserInfoByOpenId(object.getUserId());
             okrmap.put("krList", krList);
             okrmap.put("object", object);
             okrmap.put("name",userInfo.getName());