|
@@ -38,8 +38,9 @@ public class OkrServiceImpl implements OkrService {
|
|
|
public Map<String, Object> getOkrInfo(String userId){
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
if(StringUtils.isBlank(userId)){
|
|
|
- LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
- userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
+ QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
|
|
|
+ userId = sysUser.getOpenId();
|
|
|
+ //userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
}
|
|
|
|
|
|
//季度
|
|
@@ -81,8 +82,9 @@ public class OkrServiceImpl implements OkrService {
|
|
|
|
|
|
@Override
|
|
|
public void insertOkrMember(List<String> memberList){
|
|
|
- //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
- String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
+ QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
|
|
|
+ String userId = sysUser.getOpenId();
|
|
|
+ //String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
|
|
|
Integer quarter = DateUtils.getQuarter(new Date());
|
|
|
Integer year = DateUtils.getYear(new Date());
|
|
@@ -93,8 +95,9 @@ public class OkrServiceImpl implements OkrService {
|
|
|
|
|
|
@Override
|
|
|
public List<UserInfoDto> getMemberListByUserId(String name){
|
|
|
- //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
- String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
+ QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
|
|
|
+ String userId = sysUser.getOpenId();
|
|
|
+ //String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
|
|
|
Integer quarter = DateUtils.getQuarter(new Date());
|
|
|
Integer year = DateUtils.getYear(new Date());
|
|
@@ -105,8 +108,11 @@ public class OkrServiceImpl implements OkrService {
|
|
|
//保存任务
|
|
|
@Override
|
|
|
public void insertTaskInfo(OkrTaskInfo taskInfo){
|
|
|
- //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
- String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
+ QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
|
|
|
+ System.out.println("sysUser:"+ sysUser.getOpenId() + " name:" + sysUser.getName() );
|
|
|
+
|
|
|
+ //String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
+ String userId = sysUser.getOpenId();
|
|
|
Integer year = DateUtils.getYear(new Date());
|
|
|
Integer quarter = DateUtils.getQuarter(new Date());
|
|
|
taskInfo.setUserId(userId);
|
|
@@ -135,8 +141,9 @@ public class OkrServiceImpl implements OkrService {
|
|
|
public void updateTaskInfo(OkrTaskInfo taskInfo){
|
|
|
okrTaskInfoMapper.updateTaskInfo(taskInfo);
|
|
|
|
|
|
- //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
- String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
+ QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
|
|
|
+ String userId = sysUser.getOpenId();
|
|
|
+ //String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
//日志留存
|
|
|
OkrLog okrLog = new OkrLog();
|
|
|
okrLog.setType(2); //操作:1.创建2.修改3.删除
|
|
@@ -156,8 +163,9 @@ public class OkrServiceImpl implements OkrService {
|
|
|
//保存任务
|
|
|
@Override
|
|
|
public void insertContentStatus(OkrContentStatus content){
|
|
|
- //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
- String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
+ QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
|
|
|
+ String userId = sysUser.getOpenId();
|
|
|
+ //String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
content.setUserId(userId);
|
|
|
content.setYear(DateUtils.getYear(new Date()));
|
|
|
content.setQuarter(DateUtils.getQuarter(new Date()));
|
|
@@ -180,8 +188,9 @@ public class OkrServiceImpl implements OkrService {
|
|
|
public void updateContentStatus(OkrContentStatus content){
|
|
|
okrContentStatusMapper.updateContentStatus(content);
|
|
|
|
|
|
- //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
- String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
+ QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
|
|
|
+ String userId = sysUser.getOpenId();
|
|
|
+ //String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
//日志留存
|
|
|
OkrLog okrLog = new OkrLog();
|
|
|
okrLog.setType(2); //操作:1.创建2.修改3.删除
|
|
@@ -197,8 +206,9 @@ public class OkrServiceImpl implements OkrService {
|
|
|
//同时保存O和krList
|
|
|
@Override
|
|
|
public void insertObjectAndKrList(OkrObjectInfo objectInfo, List<OkrKrInfo> krList){
|
|
|
- //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
- String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
+ QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
|
|
|
+ String userId = sysUser.getOpenId();
|
|
|
+ //String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
|
|
|
Integer quarter = DateUtils.getQuarter(new Date());
|
|
|
Integer year = DateUtils.getYear(new Date());
|
|
@@ -245,8 +255,9 @@ public class OkrServiceImpl implements OkrService {
|
|
|
public void updateObject(OkrObjectInfo objectInfo){
|
|
|
okrObjectInfoMapper.updateObjectInfo(objectInfo);
|
|
|
|
|
|
- //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
- String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
+ QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
|
|
|
+ String userId = sysUser.getOpenId();
|
|
|
+ //String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
//日志留存
|
|
|
OkrLog okrLog = new OkrLog();
|
|
|
okrLog.setType(2); //操作:1.创建2.修改3.删除
|
|
@@ -263,8 +274,9 @@ public class OkrServiceImpl implements OkrService {
|
|
|
public void updateKr(OkrKrInfo okrKrInfo){
|
|
|
okrKrInfoMapper.updateKrInfo(okrKrInfo);
|
|
|
|
|
|
- //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
- String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
+ QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
|
|
|
+ String userId = sysUser.getOpenId();
|
|
|
+ //String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
//日志留存
|
|
|
OkrLog okrLog = new OkrLog();
|
|
|
okrLog.setType(2); //操作:1.创建2.修改3.删除
|
|
@@ -280,8 +292,9 @@ public class OkrServiceImpl implements OkrService {
|
|
|
//获取本季度同步给我OKR的同事的列表
|
|
|
@Override
|
|
|
public Map<String, Object> getSyncUserListByMemberId(Integer year, Integer quarter){
|
|
|
- //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
- String memberId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
+ QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
|
|
|
+ String memberId = sysUser.getOpenId();
|
|
|
+ //String memberId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
Integer isCurrentQuarter = null;
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
//List<List<Map<String, Object>>> list = new ArrayList<>();
|
|
@@ -325,8 +338,9 @@ public class OkrServiceImpl implements OkrService {
|
|
|
public void deleteObjectInfoById(OkrObjectInfo objectInfo){
|
|
|
okrObjectInfoMapper.deleteObjectInfoById(objectInfo);
|
|
|
|
|
|
- //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
- String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
+ QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
|
|
|
+ String userId = sysUser.getOpenId();
|
|
|
+ //String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
//日志留存
|
|
|
OkrLog okrLog = new OkrLog();
|
|
|
okrLog.setType(3); //操作:1.创建2.修改3.删除
|
|
@@ -343,8 +357,9 @@ public class OkrServiceImpl implements OkrService {
|
|
|
public void deleteKrById(OkrKrInfo krInfo){
|
|
|
okrKrInfoMapper.deleteKrById(krInfo);
|
|
|
|
|
|
- //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
- String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
+ QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
|
|
|
+ String userId = sysUser.getOpenId();
|
|
|
+ //String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
//日志留存
|
|
|
OkrLog okrLog = new OkrLog();
|
|
|
okrLog.setType(3); //操作:1.创建2.修改3.删除
|
|
@@ -361,8 +376,9 @@ public class OkrServiceImpl implements OkrService {
|
|
|
public void deleteContentStatusById(OkrContentStatus content){
|
|
|
okrContentStatusMapper.deleteContentStatuaById(content);
|
|
|
|
|
|
- //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
- String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
+ QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
|
|
|
+ String userId = sysUser.getOpenId();
|
|
|
+ //String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
//日志留存
|
|
|
OkrLog okrLog = new OkrLog();
|
|
|
okrLog.setType(3); //操作:1.创建2.修改3.删除
|
|
@@ -379,8 +395,9 @@ public class OkrServiceImpl implements OkrService {
|
|
|
public void deleteTaskInfoById(OkrTaskInfo okrTaskInfo){
|
|
|
okrTaskInfoMapper.deleteTaskInfoById(okrTaskInfo);
|
|
|
|
|
|
- //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
- String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
+ QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
|
|
|
+ String userId = sysUser.getOpenId();
|
|
|
+ //String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
//日志留存
|
|
|
OkrLog okrLog = new OkrLog();
|
|
|
okrLog.setType(3); //操作:1.创建2.修改3.删除
|
|
@@ -400,8 +417,9 @@ public class OkrServiceImpl implements OkrService {
|
|
|
|
|
|
@Override
|
|
|
public void insertOkrKrInfo(OkrKrInfo krInfo){
|
|
|
- //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
- String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
+ QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
|
|
|
+ String userId = sysUser.getOpenId();
|
|
|
+ //String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
|
|
|
Integer quarter = DateUtils.getQuarter(new Date());
|
|
|
Integer year = DateUtils.getYear(new Date());
|
|
@@ -430,4 +448,5 @@ public class OkrServiceImpl implements OkrService {
|
|
|
}
|
|
|
|
|
|
|
|
|
+
|
|
|
}
|