|
@@ -1,17 +1,22 @@
|
|
package cn.com.ctop.okr.controller;
|
|
package cn.com.ctop.okr.controller;
|
|
|
|
|
|
-import cn.com.ctop.okr.service.CorpUserInfoService;
|
|
|
|
|
|
+import cn.com.ctop.okr.dto.OkrDto;
|
|
|
|
+import cn.com.ctop.okr.dto.UserInfoDto;
|
|
|
|
+import cn.com.ctop.okr.entity.OkrTaskInfo;
|
|
import cn.com.ctop.okr.service.OkrService;
|
|
import cn.com.ctop.okr.service.OkrService;
|
|
-import cn.com.ctop.okr.utils.RedisUtil;
|
|
|
|
import cn.com.ctop.okr.vo.Result;
|
|
import cn.com.ctop.okr.vo.Result;
|
|
|
|
+import org.apache.commons.lang.StringUtils;
|
|
import org.apache.log4j.Logger;
|
|
import org.apache.log4j.Logger;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Controller;
|
|
import org.springframework.stereotype.Controller;
|
|
|
|
+import org.springframework.util.StopWatch;
|
|
|
|
+import org.springframework.web.bind.annotation.RequestBody;
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
+import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
|
|
|
|
@Controller
|
|
@Controller
|
|
@@ -19,25 +24,74 @@ import java.util.Map;
|
|
public class OkrController {
|
|
public class OkrController {
|
|
private static Logger logger = Logger.getLogger(OkrController.class);
|
|
private static Logger logger = Logger.getLogger(OkrController.class);
|
|
@Autowired
|
|
@Autowired
|
|
- private RedisUtil redisUtil;
|
|
|
|
- @Autowired
|
|
|
|
private OkrService okrService;
|
|
private OkrService okrService;
|
|
|
|
|
|
-
|
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
- @RequestMapping(value = "/saveOrUpdateObject")
|
|
|
|
- public Result saveOrUpdateObject(HttpServletRequest request,
|
|
|
|
- HttpServletResponse response){
|
|
|
|
|
|
+ @RequestMapping(value = "/insertTaskInfo")
|
|
|
|
+ public Result insertTaskInfo(@RequestBody OkrDto dto ,
|
|
|
|
+ HttpServletRequest request,
|
|
|
|
+ HttpServletResponse response){
|
|
|
|
+
|
|
|
|
+ logger.info("okr/insertTaskInfo 方法开始");
|
|
|
|
+ Result result = new Result();
|
|
|
|
+ result.setSuccess(true);
|
|
|
|
+
|
|
|
|
+ OkrTaskInfo taskInfo = dto.getTaskInfo();
|
|
|
|
+ if(dto == null || dto.getTaskInfo() == null || StringUtils.isBlank(taskInfo.getTaskTitle()) ||
|
|
|
|
+ taskInfo.getType() == null || taskInfo.getPriority() == null
|
|
|
|
+ ){
|
|
|
|
+ result.setSuccess(false);
|
|
|
|
+ result.setMessage("任务标题、类型、优先级均不可为空");
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ try {
|
|
|
|
+ okrService.insertTaskInfo(taskInfo);
|
|
|
|
+ }catch(Exception e){
|
|
|
|
+ logger.error(e.getMessage());
|
|
|
|
+ result.setSuccess(false);
|
|
|
|
+ result.setMessage("error");
|
|
|
|
+ }finally {
|
|
|
|
+ logger.info("okr/insertTaskInfo 方法结束");
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return result;
|
|
|
|
|
|
- return null;
|
|
|
|
}
|
|
}
|
|
|
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
- @RequestMapping(value = "/saveOrUpdateKR")
|
|
|
|
- public Result saveOrUpdateKR(HttpServletRequest request,
|
|
|
|
|
|
+ @RequestMapping(value = "/updateTaskInfo")
|
|
|
|
+ public Result updateTaskInfo(@RequestBody OkrDto dto,
|
|
|
|
+ HttpServletRequest request,
|
|
HttpServletResponse response){
|
|
HttpServletResponse response){
|
|
|
|
|
|
- return null;
|
|
|
|
|
|
+ logger.info("okr/updateTaskInfo 方法开始");
|
|
|
|
+ Result result = new Result();
|
|
|
|
+ result.setSuccess(true);
|
|
|
|
+
|
|
|
|
+ if(dto == null || dto.getTaskInfo() ==null){
|
|
|
|
+ result.setSuccess(false);
|
|
|
|
+ result.setMessage("参数为空");
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ OkrTaskInfo taskInfo = dto.getTaskInfo();
|
|
|
|
+ if(taskInfo.getId() == null || StringUtils.isBlank(taskInfo.getTaskTitle())){
|
|
|
|
+ result.setSuccess(false);
|
|
|
|
+ result.setMessage("主键、任务标题均不可为空");
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ try {
|
|
|
|
+ okrService.updateTaskInfo(taskInfo);
|
|
|
|
+ }catch(Exception e){
|
|
|
|
+ logger.error(e.getMessage());
|
|
|
|
+ result.setSuccess(false);
|
|
|
|
+ result.setMessage("error");
|
|
|
|
+ }finally {
|
|
|
|
+ logger.info("okr/updateTaskInfo 方法结束");
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return result;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -46,6 +100,7 @@ public class OkrController {
|
|
public Result saveOrUpdateWeekTask(HttpServletRequest request,
|
|
public Result saveOrUpdateWeekTask(HttpServletRequest request,
|
|
HttpServletResponse response){
|
|
HttpServletResponse response){
|
|
|
|
|
|
|
|
+
|
|
return null;
|
|
return null;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -73,19 +128,20 @@ public class OkrController {
|
|
|
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
@RequestMapping(value = "/getOkrInfo")
|
|
@RequestMapping(value = "/getOkrInfo")
|
|
- public Result getOkrInfo(HttpServletRequest request,
|
|
|
|
- HttpServletResponse response){
|
|
|
|
|
|
+ public Result getOkrInfo(@RequestBody UserInfoDto dto,
|
|
|
|
+ HttpServletRequest request,
|
|
|
|
+ HttpServletResponse response){
|
|
logger.info("okr/getOkrInfo 方法开始");
|
|
logger.info("okr/getOkrInfo 方法开始");
|
|
Result<Map<String,Object>> result = new Result();
|
|
Result<Map<String,Object>> result = new Result();
|
|
result.setSuccess(true);
|
|
result.setSuccess(true);
|
|
|
|
|
|
try {
|
|
try {
|
|
- Map<String, Object> map = okrService.getOkrInfo();
|
|
|
|
|
|
+ Map<String, Object> map = okrService.getOkrInfo(dto.getUserId());
|
|
result.setResult(map);
|
|
result.setResult(map);
|
|
}catch(Exception e){
|
|
}catch(Exception e){
|
|
logger.error(e.getMessage());
|
|
logger.error(e.getMessage());
|
|
result.setSuccess(false);
|
|
result.setSuccess(false);
|
|
- result.setMessage("出错");
|
|
|
|
|
|
+ result.setMessage("error");
|
|
}finally {
|
|
}finally {
|
|
logger.info("okr/getOkrInfo 方法结束");
|
|
logger.info("okr/getOkrInfo 方法结束");
|
|
}
|
|
}
|
|
@@ -93,8 +149,88 @@ public class OkrController {
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @ResponseBody
|
|
|
|
+ @RequestMapping(value = "/saveOkrMember")
|
|
|
|
+ public Result saveOkrMember(@RequestBody UserInfoDto dto,
|
|
|
|
+ HttpServletRequest request,
|
|
|
|
+ HttpServletResponse response){
|
|
|
|
+ logger.info("/okr/getOkrInfo 方法开始");
|
|
|
|
+ Result result = new Result();
|
|
|
|
+ List<String> userIdList = dto.getUserIdList();
|
|
|
|
+ if(userIdList == null || userIdList.size() == 0){
|
|
|
|
+ result.setSuccess(false);
|
|
|
|
+ result.setMessage("同步人员不能为空");
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
|
|
|
|
+ try {
|
|
|
|
+ okrService.insertOkrMember(userIdList);
|
|
|
|
+ }catch (Exception e){
|
|
|
|
+ logger.error(e.getMessage());
|
|
|
|
+ result.setSuccess(false);
|
|
|
|
+ result.setMessage("error");
|
|
|
|
+ }finally{
|
|
|
|
+ logger.info("/okr/getOkrInfo 方法结束");
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * @param dto
|
|
|
|
+ * @param request
|
|
|
|
+ * @param response
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
|
|
+ @ResponseBody
|
|
|
|
+ @RequestMapping(value = "/getMemberListByUserId")
|
|
|
|
+ public Result<List<UserInfoDto>> getMemberListByUserId(@RequestBody UserInfoDto dto,
|
|
|
|
+ HttpServletRequest request,
|
|
|
|
+ HttpServletResponse response){
|
|
|
|
+ logger.info("/okr/getMemberListByUserId 方法开始");
|
|
|
|
+ Result<List<UserInfoDto>> result = new Result();
|
|
|
|
+
|
|
|
|
+ try {
|
|
|
|
+ List<UserInfoDto> userInfoList = okrService.getMemberListByUserId(dto.getName());
|
|
|
|
+ result.setResult(userInfoList);
|
|
|
|
+ }catch (Exception e){
|
|
|
|
+ logger.error(e.getMessage());
|
|
|
|
+ result.setSuccess(false);
|
|
|
|
+ result.setMessage("error");
|
|
|
|
+ }finally{
|
|
|
|
+ logger.info("/okr/getMemberListByUserId 方法结束");
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 获取本季度同步给我OKR的同事的列表
|
|
|
|
+ * @param request
|
|
|
|
+ * @param response
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
|
|
+ @ResponseBody
|
|
|
|
+ @RequestMapping(value = "/getSyncUserListByMemberId")
|
|
|
|
+ public Result<List<UserInfoDto>> getSyncUserListByMemberId(HttpServletRequest request,
|
|
|
|
+ HttpServletResponse response){
|
|
|
|
+ logger.info("/okr/getSyncUserListByMemberId 方法开始");
|
|
|
|
+ Result<List<UserInfoDto>> result = new Result();
|
|
|
|
+
|
|
|
|
+ try {
|
|
|
|
+ List<UserInfoDto> userInfoList = okrService.getSyncUserListByMemberId();
|
|
|
|
+ result.setResult(userInfoList);
|
|
|
|
+ }catch (Exception e){
|
|
|
|
+ logger.error(e.getMessage());
|
|
|
|
+ result.setSuccess(false);
|
|
|
|
+ result.setMessage("error");
|
|
|
|
+ }finally{
|
|
|
|
+ logger.info("/okr/getSyncUserListByMemberId 方法结束");
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|
}
|
|
}
|