|
@@ -1,23 +1,19 @@
|
|
package cn.com.ctop.okr.service.impl;
|
|
package cn.com.ctop.okr.service.impl;
|
|
|
|
|
|
-import cn.com.ctop.okr.dto.OkrDto;
|
|
|
|
import cn.com.ctop.okr.dto.UserInfoDto;
|
|
import cn.com.ctop.okr.dto.UserInfoDto;
|
|
-import cn.com.ctop.okr.entity.OkrContentStatus;
|
|
|
|
-import cn.com.ctop.okr.entity.OkrKrInfo;
|
|
|
|
-import cn.com.ctop.okr.entity.OkrObjectInfo;
|
|
|
|
-import cn.com.ctop.okr.entity.OkrTaskInfo;
|
|
|
|
|
|
+import cn.com.ctop.okr.entity.*;
|
|
import cn.com.ctop.okr.mapper.*;
|
|
import cn.com.ctop.okr.mapper.*;
|
|
import cn.com.ctop.okr.service.OkrService;
|
|
import cn.com.ctop.okr.service.OkrService;
|
|
import cn.com.ctop.okr.utils.DateUtils;
|
|
import cn.com.ctop.okr.utils.DateUtils;
|
|
import cn.com.ctop.okr.vo.LoginUser;
|
|
import cn.com.ctop.okr.vo.LoginUser;
|
|
|
|
+import com.alibaba.fastjson.JSONObject;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.apache.commons.lang.StringUtils;
|
|
import org.apache.commons.lang.StringUtils;
|
|
import org.apache.shiro.SecurityUtils;
|
|
import org.apache.shiro.SecurityUtils;
|
|
-import org.apache.shiro.crypto.hash.Hash;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
-import org.springframework.util.StopWatch;
|
|
|
|
|
|
|
|
|
|
+import java.time.Year;
|
|
import java.util.*;
|
|
import java.util.*;
|
|
|
|
|
|
@Service
|
|
@Service
|
|
@@ -109,16 +105,50 @@ public class OkrServiceImpl implements OkrService {
|
|
public void insertTaskInfo(OkrTaskInfo taskInfo){
|
|
public void insertTaskInfo(OkrTaskInfo taskInfo){
|
|
//LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
//LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
|
+ Integer year = DateUtils.getYear(new Date());
|
|
|
|
+ Integer quarter = DateUtils.getQuarter(new Date());
|
|
taskInfo.setUserId(userId);
|
|
taskInfo.setUserId(userId);
|
|
- taskInfo.setYear(DateUtils.getYear(new Date()));
|
|
|
|
- taskInfo.setQuarter(DateUtils.getQuarter(new Date()));
|
|
|
|
|
|
+ taskInfo.setYear(year);
|
|
|
|
+ taskInfo.setQuarter(quarter);
|
|
okrTaskInfoMapper.insertTaskInfo(taskInfo);
|
|
okrTaskInfoMapper.insertTaskInfo(taskInfo);
|
|
|
|
+
|
|
|
|
+ //日志留存
|
|
|
|
+ OkrLog okrLog = new OkrLog();
|
|
|
|
+ okrLog.setType(1); //操作:1.创建2.修改3.删除
|
|
|
|
+ if(taskInfo.getType() == 1){
|
|
|
|
+ okrLog.setOperation(3); //日志类型:1.目标2.关键成果3.本周任务4.未来四周任务5.状态指标
|
|
|
|
+ }else{
|
|
|
|
+ okrLog.setOperation(4);
|
|
|
|
+ }
|
|
|
|
+ okrLog.setOperationId(taskInfo.getId());
|
|
|
|
+ okrLog.setYear(year);
|
|
|
|
+ okrLog.setQuarter(quarter);
|
|
|
|
+ okrLog.setContent(JSONObject.toJSONString(taskInfo));
|
|
|
|
+ okrLog.setUserId(userId);
|
|
|
|
+ okrLogMapper.insertOkrLog(okrLog);
|
|
}
|
|
}
|
|
|
|
|
|
//更新任务
|
|
//更新任务
|
|
@Override
|
|
@Override
|
|
public void updateTaskInfo(OkrTaskInfo taskInfo){
|
|
public void updateTaskInfo(OkrTaskInfo taskInfo){
|
|
okrTaskInfoMapper.updateTaskInfo(taskInfo);
|
|
okrTaskInfoMapper.updateTaskInfo(taskInfo);
|
|
|
|
+
|
|
|
|
+ //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
|
+ String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
|
+ //日志留存
|
|
|
|
+ OkrLog okrLog = new OkrLog();
|
|
|
|
+ okrLog.setType(2); //操作:1.创建2.修改3.删除
|
|
|
|
+ if(taskInfo.getType() == 1){
|
|
|
|
+ okrLog.setOperation(3); //日志类型:1.目标2.关键成果3.本周任务4.未来四周任务5.状态指标
|
|
|
|
+ }else{
|
|
|
|
+ okrLog.setOperation(4);
|
|
|
|
+ }
|
|
|
|
+ okrLog.setOperationId(taskInfo.getId());
|
|
|
|
+ okrLog.setYear(DateUtils.getYear(new Date()));
|
|
|
|
+ okrLog.setQuarter(DateUtils.getQuarter(new Date()));
|
|
|
|
+ okrLog.setContent(JSONObject.toJSONString(taskInfo));
|
|
|
|
+ okrLog.setUserId(userId);
|
|
|
|
+ okrLogMapper.insertOkrLog(okrLog);
|
|
}
|
|
}
|
|
|
|
|
|
//保存任务
|
|
//保存任务
|
|
@@ -130,12 +160,36 @@ public class OkrServiceImpl implements OkrService {
|
|
content.setYear(DateUtils.getYear(new Date()));
|
|
content.setYear(DateUtils.getYear(new Date()));
|
|
content.setQuarter(DateUtils.getQuarter(new Date()));
|
|
content.setQuarter(DateUtils.getQuarter(new Date()));
|
|
okrContentStatusMapper.insertContentStatus(content);
|
|
okrContentStatusMapper.insertContentStatus(content);
|
|
|
|
+
|
|
|
|
+ //日志留存
|
|
|
|
+ OkrLog okrLog = new OkrLog();
|
|
|
|
+ okrLog.setType(1); //操作:1.创建2.修改3.删除
|
|
|
|
+ okrLog.setOperation(5); //日志类型:1.目标2.关键成果3.本周任务4.未来四周任务5.状态指标
|
|
|
|
+ okrLog.setOperationId(content.getId());
|
|
|
|
+ okrLog.setYear(DateUtils.getYear(new Date()));
|
|
|
|
+ okrLog.setQuarter(DateUtils.getQuarter(new Date()));
|
|
|
|
+ okrLog.setContent(JSONObject.toJSONString(content));
|
|
|
|
+ okrLog.setUserId(userId);
|
|
|
|
+ okrLogMapper.insertOkrLog(okrLog);
|
|
}
|
|
}
|
|
|
|
|
|
//更新任务
|
|
//更新任务
|
|
@Override
|
|
@Override
|
|
public void updateContentStatus(OkrContentStatus content){
|
|
public void updateContentStatus(OkrContentStatus content){
|
|
okrContentStatusMapper.updateContentStatus(content);
|
|
okrContentStatusMapper.updateContentStatus(content);
|
|
|
|
+
|
|
|
|
+ //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
|
+ String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
|
+ //日志留存
|
|
|
|
+ OkrLog okrLog = new OkrLog();
|
|
|
|
+ okrLog.setType(2); //操作:1.创建2.修改3.删除
|
|
|
|
+ okrLog.setOperation(5); //日志类型:1.目标2.关键成果3.本周任务4.未来四周任务5.状态指标
|
|
|
|
+ okrLog.setOperationId(content.getId());
|
|
|
|
+ okrLog.setYear(DateUtils.getYear(new Date()));
|
|
|
|
+ okrLog.setQuarter(DateUtils.getQuarter(new Date()));
|
|
|
|
+ okrLog.setContent(JSONObject.toJSONString(content));
|
|
|
|
+ okrLog.setUserId(userId);
|
|
|
|
+ okrLogMapper.insertOkrLog(okrLog);
|
|
}
|
|
}
|
|
|
|
|
|
//同时保存O和krList
|
|
//同时保存O和krList
|
|
@@ -151,17 +205,74 @@ public class OkrServiceImpl implements OkrService {
|
|
objectInfo.setQuarter(quarter);
|
|
objectInfo.setQuarter(quarter);
|
|
objectInfo.setUserId(userId);
|
|
objectInfo.setUserId(userId);
|
|
okrObjectInfoMapper.insertObjectInfo(objectInfo);
|
|
okrObjectInfoMapper.insertObjectInfo(objectInfo);
|
|
- okrKrInfoMapper.insertBatchOkrKrInfo(krList,userId, objectInfo.getId(),year,quarter);
|
|
|
|
|
|
+ //日志留存
|
|
|
|
+ OkrLog okrObjectLog = new OkrLog();
|
|
|
|
+ okrObjectLog.setType(1); //操作:1.创建2.修改3.删除
|
|
|
|
+ okrObjectLog.setOperation(1); //日志类型:1.目标2.关键成果3.本周任务4.未来四周任务5.状态指标
|
|
|
|
+ okrObjectLog.setOperationId(objectInfo.getId());
|
|
|
|
+ okrObjectLog.setYear(DateUtils.getYear(new Date()));
|
|
|
|
+ okrObjectLog.setQuarter(DateUtils.getQuarter(new Date()));
|
|
|
|
+ okrObjectLog.setContent(JSONObject.toJSONString(objectInfo));
|
|
|
|
+ okrObjectLog.setUserId(userId);
|
|
|
|
+ okrLogMapper.insertOkrLog(okrObjectLog);
|
|
|
|
+ //
|
|
|
|
+
|
|
|
|
+ // 由于需要返回主键id作为日志留存,故放弃批量插入的接口
|
|
|
|
+ // okrKrInfoMapper.insertBatchOkrKrInfo(krList,userId, objectInfo.getId(),year,quarter);
|
|
|
|
+ for(OkrKrInfo kr:krList){
|
|
|
|
+ kr.setUserId(userId);
|
|
|
|
+ kr.setObjectId(objectInfo.getId());
|
|
|
|
+ kr.setYear(year);
|
|
|
|
+ kr.setQuarter(quarter);
|
|
|
|
+ okrKrInfoMapper.insertOkrKrInfo(kr);
|
|
|
|
+
|
|
|
|
+ //日志留存
|
|
|
|
+ OkrLog okrKrLog = new OkrLog();
|
|
|
|
+ okrKrLog.setType(1); //操作:1.创建2.修改3.删除
|
|
|
|
+ okrKrLog.setOperation(2); //日志类型:1.目标2.关键成果3.本周任务4.未来四周任务5.状态指标
|
|
|
|
+ okrKrLog.setOperationId(objectInfo.getId());
|
|
|
|
+ okrKrLog.setYear(year);
|
|
|
|
+ okrKrLog.setQuarter(quarter);
|
|
|
|
+ okrKrLog.setContent(JSONObject.toJSONString(kr));
|
|
|
|
+ okrKrLog.setUserId(userId);
|
|
|
|
+ okrLogMapper.insertOkrLog(okrKrLog);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public void updateObject(OkrObjectInfo objectInfo){
|
|
public void updateObject(OkrObjectInfo objectInfo){
|
|
okrObjectInfoMapper.updateObjectInfo(objectInfo);
|
|
okrObjectInfoMapper.updateObjectInfo(objectInfo);
|
|
|
|
+
|
|
|
|
+ //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
|
+ String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
|
+ //日志留存
|
|
|
|
+ OkrLog okrLog = new OkrLog();
|
|
|
|
+ okrLog.setType(2); //操作:1.创建2.修改3.删除
|
|
|
|
+ okrLog.setOperation(1); //日志类型:1.目标2.关键成果3.本周任务4.未来四周任务5.状态指标
|
|
|
|
+ okrLog.setOperationId(objectInfo.getId());
|
|
|
|
+ okrLog.setYear(DateUtils.getYear(new Date()));
|
|
|
|
+ okrLog.setQuarter(DateUtils.getQuarter(new Date()));
|
|
|
|
+ okrLog.setContent(JSONObject.toJSONString(objectInfo));
|
|
|
|
+ okrLog.setUserId(userId);
|
|
|
|
+ okrLogMapper.insertOkrLog(okrLog);
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public void updateKr(OkrKrInfo okrKrInfo){
|
|
public void updateKr(OkrKrInfo okrKrInfo){
|
|
okrKrInfoMapper.updateKrInfo(okrKrInfo);
|
|
okrKrInfoMapper.updateKrInfo(okrKrInfo);
|
|
|
|
+
|
|
|
|
+ //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
|
+ String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
|
+ //日志留存
|
|
|
|
+ OkrLog okrLog = new OkrLog();
|
|
|
|
+ okrLog.setType(2); //操作:1.创建2.修改3.删除
|
|
|
|
+ okrLog.setOperation(2); //日志类型:1.目标2.关键成果3.本周任务4.未来四周任务5.状态指标
|
|
|
|
+ okrLog.setOperationId(okrKrInfo.getId());
|
|
|
|
+ okrLog.setYear(DateUtils.getYear(new Date()));
|
|
|
|
+ okrLog.setQuarter(DateUtils.getQuarter(new Date()));
|
|
|
|
+ okrLog.setContent(JSONObject.toJSONString(okrKrInfo));
|
|
|
|
+ okrLog.setUserId(userId);
|
|
|
|
+ okrLogMapper.insertOkrLog(okrLog);
|
|
}
|
|
}
|
|
|
|
|
|
//获取本季度同步给我OKR的同事的列表
|
|
//获取本季度同步给我OKR的同事的列表
|
|
@@ -180,21 +291,78 @@ public class OkrServiceImpl implements OkrService {
|
|
@Override
|
|
@Override
|
|
public void deleteObjectInfoById(OkrObjectInfo objectInfo){
|
|
public void deleteObjectInfoById(OkrObjectInfo objectInfo){
|
|
okrObjectInfoMapper.deleteObjectInfoById(objectInfo);
|
|
okrObjectInfoMapper.deleteObjectInfoById(objectInfo);
|
|
|
|
+
|
|
|
|
+ //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
|
+ String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
|
+ //日志留存
|
|
|
|
+ OkrLog okrLog = new OkrLog();
|
|
|
|
+ okrLog.setType(3); //操作:1.创建2.修改3.删除
|
|
|
|
+ okrLog.setOperation(1); //日志类型:1.目标2.关键成果3.本周任务4.未来四周任务5.状态指标
|
|
|
|
+ okrLog.setOperationId(objectInfo.getId());
|
|
|
|
+ okrLog.setYear(DateUtils.getYear(new Date()));
|
|
|
|
+ okrLog.setQuarter(DateUtils.getQuarter(new Date()));
|
|
|
|
+ okrLog.setContent(JSONObject.toJSONString(objectInfo));
|
|
|
|
+ okrLog.setUserId(userId);
|
|
|
|
+ okrLogMapper.insertOkrLog(okrLog);
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public void deleteKrById(OkrKrInfo krInfo){
|
|
public void deleteKrById(OkrKrInfo krInfo){
|
|
okrKrInfoMapper.deleteKrById(krInfo);
|
|
okrKrInfoMapper.deleteKrById(krInfo);
|
|
|
|
+
|
|
|
|
+ //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
|
+ String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
|
+ //日志留存
|
|
|
|
+ OkrLog okrLog = new OkrLog();
|
|
|
|
+ okrLog.setType(3); //操作:1.创建2.修改3.删除
|
|
|
|
+ okrLog.setOperation(2); //日志类型:1.目标2.关键成果3.本周任务4.未来四周任务5.状态指标
|
|
|
|
+ okrLog.setOperationId(krInfo.getId());
|
|
|
|
+ okrLog.setYear(DateUtils.getYear(new Date()));
|
|
|
|
+ okrLog.setQuarter(DateUtils.getQuarter(new Date()));
|
|
|
|
+ okrLog.setContent(JSONObject.toJSONString(krInfo));
|
|
|
|
+ okrLog.setUserId(userId);
|
|
|
|
+ okrLogMapper.insertOkrLog(okrLog);
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public void deleteContentStatusById(OkrContentStatus content){
|
|
public void deleteContentStatusById(OkrContentStatus content){
|
|
okrContentStatusMapper.deleteContentStatuaById(content);
|
|
okrContentStatusMapper.deleteContentStatuaById(content);
|
|
|
|
+
|
|
|
|
+ //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
|
+ String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
|
+ //日志留存
|
|
|
|
+ OkrLog okrLog = new OkrLog();
|
|
|
|
+ okrLog.setType(3); //操作:1.创建2.修改3.删除
|
|
|
|
+ okrLog.setOperation(5); //日志类型:1.目标2.关键成果3.本周任务4.未来四周任务5.状态指标
|
|
|
|
+ okrLog.setOperationId(content.getId());
|
|
|
|
+ okrLog.setYear(DateUtils.getYear(new Date()));
|
|
|
|
+ okrLog.setQuarter(DateUtils.getQuarter(new Date()));
|
|
|
|
+ okrLog.setContent(JSONObject.toJSONString(content));
|
|
|
|
+ okrLog.setUserId(userId);
|
|
|
|
+ okrLogMapper.insertOkrLog(okrLog);
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public void deleteTaskInfoById(OkrTaskInfo okrTaskInfo){
|
|
public void deleteTaskInfoById(OkrTaskInfo okrTaskInfo){
|
|
okrTaskInfoMapper.deleteTaskInfoById(okrTaskInfo);
|
|
okrTaskInfoMapper.deleteTaskInfoById(okrTaskInfo);
|
|
|
|
+
|
|
|
|
+ //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
|
+ String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
|
+ //日志留存
|
|
|
|
+ OkrLog okrLog = new OkrLog();
|
|
|
|
+ okrLog.setType(3); //操作:1.创建2.修改3.删除
|
|
|
|
+ if(okrTaskInfoMapper.selectById(okrTaskInfo.getId()).getType()==1){
|
|
|
|
+ okrLog.setOperation(3); //日志类型:1.目标2.关键成果3.本周任务4.未来四周任务5.状态指标
|
|
|
|
+ }else{
|
|
|
|
+ okrLog.setOperation(4);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ okrLog.setOperationId(okrTaskInfo.getId());
|
|
|
|
+ okrLog.setYear(DateUtils.getYear(new Date()));
|
|
|
|
+ okrLog.setQuarter(DateUtils.getQuarter(new Date()));
|
|
|
|
+ okrLog.setContent(JSONObject.toJSONString(okrTaskInfo));
|
|
|
|
+ okrLog.setUserId(userId);
|
|
|
|
+ okrLogMapper.insertOkrLog(okrLog);
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|