فهرست منبع

OKR业务代码提交

hcst_sunzhen 5 سال پیش
والد
کامیت
5f5081e3ce
43فایلهای تغییر یافته به همراه556 افزوده شده و 675 حذف شده
  1. 1 0
      src/main/java/cn/com/ctop/okr/config/ShiroConfig.java
  2. 26 6
      src/main/java/cn/com/ctop/okr/controller/CorpController.java
  3. 0 21
      src/main/java/cn/com/ctop/okr/controller/LoginController.java
  4. 100 0
      src/main/java/cn/com/ctop/okr/controller/OkrController.java
  5. 0 258
      src/main/java/cn/com/ctop/okr/controller/TrackController.java
  6. 11 0
      src/main/java/cn/com/ctop/okr/dto/FeishuUserInfoDto.java
  7. 0 31
      src/main/java/cn/com/ctop/okr/entity/ClickInfo.java
  8. 0 36
      src/main/java/cn/com/ctop/okr/entity/ConvertInfo.java
  9. 21 0
      src/main/java/cn/com/ctop/okr/entity/OkrContentStatus.java
  10. 22 0
      src/main/java/cn/com/ctop/okr/entity/OkrKrInfo.java
  11. 23 0
      src/main/java/cn/com/ctop/okr/entity/OkrLog.java
  12. 21 0
      src/main/java/cn/com/ctop/okr/entity/OkrMember.java
  13. 21 0
      src/main/java/cn/com/ctop/okr/entity/OkrObjectInfo.java
  14. 22 0
      src/main/java/cn/com/ctop/okr/entity/OkrTaskInfo.java
  15. 0 26
      src/main/java/cn/com/ctop/okr/entity/TaobaoNotice.java
  16. 0 8
      src/main/java/cn/com/ctop/okr/mapper/ClickInfoMapper.java
  17. 0 7
      src/main/java/cn/com/ctop/okr/mapper/ConvertInfoMapper.java
  18. 5 0
      src/main/java/cn/com/ctop/okr/mapper/CorpUserInfoMapper.java
  19. 14 0
      src/main/java/cn/com/ctop/okr/mapper/OkrContentStatusMapper.java
  20. 13 0
      src/main/java/cn/com/ctop/okr/mapper/OkrKrInfoMapper.java
  21. 8 0
      src/main/java/cn/com/ctop/okr/mapper/OkrLogMapper.java
  22. 8 0
      src/main/java/cn/com/ctop/okr/mapper/OkrMemberMapper.java
  23. 14 0
      src/main/java/cn/com/ctop/okr/mapper/OkrObjectInfoMapper.java
  24. 13 0
      src/main/java/cn/com/ctop/okr/mapper/OkrTaskInfoMapper.java
  25. 0 8
      src/main/java/cn/com/ctop/okr/mapper/TaobaoNoticeMapper.java
  26. 11 0
      src/main/java/cn/com/ctop/okr/mapper/xml/CorpUserInfoMapper.xml
  27. 19 0
      src/main/java/cn/com/ctop/okr/mapper/xml/OkrContentStatusMapper.xml
  28. 20 0
      src/main/java/cn/com/ctop/okr/mapper/xml/OkrKrInfoMapper.xml
  29. 5 0
      src/main/java/cn/com/ctop/okr/mapper/xml/OkrLogMapper.xml
  30. 5 0
      src/main/java/cn/com/ctop/okr/mapper/xml/OkrMemberMapper.xml
  31. 19 0
      src/main/java/cn/com/ctop/okr/mapper/xml/OkrObjectInfoMapper.xml
  32. 38 0
      src/main/java/cn/com/ctop/okr/mapper/xml/OkrTaskInfoMapper.xml
  33. 0 7
      src/main/java/cn/com/ctop/okr/service/ClickInfoService.java
  34. 0 7
      src/main/java/cn/com/ctop/okr/service/ConvertInfoService.java
  35. 3 0
      src/main/java/cn/com/ctop/okr/service/CorpUserInfoService.java
  36. 8 0
      src/main/java/cn/com/ctop/okr/service/OkrService.java
  37. 0 8
      src/main/java/cn/com/ctop/okr/service/TaobaoNoticeService.java
  38. 0 11
      src/main/java/cn/com/ctop/okr/service/impl/ClickInfoServiceImpl.java
  39. 0 11
      src/main/java/cn/com/ctop/okr/service/impl/ConvertInfoServiceImpl.java
  40. 7 0
      src/main/java/cn/com/ctop/okr/service/impl/CorpUserInfoServiceImpl.java
  41. 78 0
      src/main/java/cn/com/ctop/okr/service/impl/OkrServiceImpl.java
  42. 0 54
      src/main/java/cn/com/ctop/okr/service/impl/TaobaoNoticeServiceImpl.java
  43. 0 176
      src/main/resources/application.yml

+ 1 - 0
src/main/java/cn/com/ctop/okr/config/ShiroConfig.java

@@ -148,6 +148,7 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/job/test/*", "anon");
         filterChainDefinitionMap.put("/job/test/*", "anon");
 
 
         filterChainDefinitionMap.put("/corp/*", "anon");
         filterChainDefinitionMap.put("/corp/*", "anon");
+        filterChainDefinitionMap.put("/okr/*", "anon");
 
 
 
 
         // 添加自己的过滤器并且取名为jwt
         // 添加自己的过滤器并且取名为jwt

+ 26 - 6
src/main/java/cn/com/ctop/okr/controller/CorpController.java

@@ -1,10 +1,13 @@
 package cn.com.ctop.okr.controller;
 package cn.com.ctop.okr.controller;
 
 
+import cn.com.ctop.okr.dto.FeishuUserInfoDto;
 import cn.com.ctop.okr.service.CorpUserInfoService;
 import cn.com.ctop.okr.service.CorpUserInfoService;
 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.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;
 
 
@@ -12,9 +15,9 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 
 
 @Controller
 @Controller
-@RequestMapping("/corp")
-public class CorpController {
-    private static Logger logger = Logger.getLogger(CorpController.class);
+@RequestMapping("/feishu")
+public class FeishuController {
+    private static Logger logger = Logger.getLogger(FeishuController.class);
 
 
     @Autowired
     @Autowired
     private CorpUserInfoService corpUserInfoService;
     private CorpUserInfoService corpUserInfoService;
@@ -38,9 +41,26 @@ public class CorpController {
         return result;
         return result;
     }
     }
 
 
+    /**
+     * 根据名字模糊查询飞书用户
+     * @param dto
+     * @param request
+     * @param response
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/getUserListByName")
+    public Result getUserListByName(@RequestBody FeishuUserInfoDto dto, HttpServletRequest request,
+                                    HttpServletResponse response){
+        Result result = new Result();
+        result.setSuccess(true);
 
 
-
-
-
+        if(StringUtils.isBlank(dto.getName())){
+            result.setSuccess(false);
+            result.setMessage("名字不能为空");
+        }
+        corpUserInfoService.getUserListByName(dto.getName());
+        return result;
+    }
 
 
 }
 }

+ 0 - 21
src/main/java/cn/com/ctop/okr/controller/LoginController.java

@@ -94,27 +94,6 @@ public class LoginController {
         }
         }
     }
     }
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     /**
     /**
      * 用户信息
      * 用户信息
      *
      *

+ 100 - 0
src/main/java/cn/com/ctop/okr/controller/OkrController.java

@@ -0,0 +1,100 @@
+package cn.com.ctop.okr.controller;
+
+import cn.com.ctop.okr.service.CorpUserInfoService;
+import cn.com.ctop.okr.service.OkrService;
+import cn.com.ctop.okr.utils.RedisUtil;
+import cn.com.ctop.okr.vo.Result;
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+
+@Controller
+@RequestMapping("/okr")
+public class OkrController {
+    private static Logger logger = Logger.getLogger(OkrController.class);
+    @Autowired
+    private RedisUtil redisUtil;
+    @Autowired
+    private OkrService okrService;
+
+
+    @ResponseBody
+    @RequestMapping(value = "/saveOrUpdateObject")
+    public Result saveOrUpdateObject(HttpServletRequest request,
+                                     HttpServletResponse response){
+
+        return null;
+    }
+
+    @ResponseBody
+    @RequestMapping(value = "/saveOrUpdateKR")
+    public Result saveOrUpdateKR(HttpServletRequest request,
+                                 HttpServletResponse response){
+
+        return null;
+    }
+
+
+    @ResponseBody
+    @RequestMapping(value = "/saveOrUpdateWeekTask")
+    public Result saveOrUpdateWeekTask(HttpServletRequest request,
+                                       HttpServletResponse response){
+
+        return null;
+    }
+
+    @ResponseBody
+    @RequestMapping(value = "/saveOrUpdateNextFourWeekTask")
+    public Result saveOrUpdateNextFourWeekTask(HttpServletRequest request,
+                                               HttpServletResponse response){
+
+
+
+
+
+        return null;
+    }
+
+    @ResponseBody
+    @RequestMapping(value = "/departAndUser")
+    public Result saveOrUpdateContentStatus(HttpServletRequest request,
+                                            HttpServletResponse response){
+
+        return null;
+    }
+
+
+
+    @ResponseBody
+    @RequestMapping(value = "/getOkrInfo")
+    public Result getOkrInfo(HttpServletRequest request,
+                                     HttpServletResponse response){
+        logger.info("okr/getOkrInfo 方法开始");
+        Result<Map<String,Object>> result = new Result();
+        result.setSuccess(true);
+
+        try {
+            Map<String, Object> map = okrService.getOkrInfo();
+            result.setResult(map);
+        }catch(Exception e){
+            logger.error(e.getMessage());
+            result.setSuccess(false);
+            result.setMessage("出错");
+        }finally {
+            logger.info("okr/getOkrInfo 方法结束");
+        }
+
+        return result;
+    }
+
+
+
+
+
+}

+ 0 - 258
src/main/java/cn/com/ctop/okr/controller/TrackController.java

@@ -1,258 +0,0 @@
-package cn.com.ctop.okr.controller;
-
-import cn.com.ctop.okr.entity.ConvertInfo;
-import cn.com.ctop.okr.service.ClickInfoService;
-import cn.com.ctop.okr.service.ConvertInfoService;
-import cn.com.ctop.okr.service.TaobaoNoticeService;
-import cn.com.ctop.okr.utils.HttpUtils;
-import org.apache.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Date;
-
-@Controller
-@RequestMapping("/")
-public class TrackController {
-    private static Logger logger = Logger.getLogger(TrackController.class);
-    @Autowired
-    private ClickInfoService clickInfoService;
-    @Autowired
-    private TaobaoNoticeService taobaoNoticeService;
-    @Autowired
-    private ConvertInfoService convertInfoService;
-    @ResponseBody
-    @RequestMapping(value = "/convert")
-    public String convert(HttpServletRequest request,
-                        HttpServletResponse response){
-        logger.info(request.getQueryString());
-        try {
-            //test
-            String clickId = request.getParameter("click_id");
-            String spaceId = request.getParameter("space_id");
-            String accountId = request.getParameter("account_id");
-            String os = request.getParameter("os_type");
-            String platform = request.getParameter("platform");
-            String advertisor = request.getParameter("advertisor");
-            String groupId = request.getParameter("group_id");
-            String campaignId = request.getParameter("compaign_id");
-            String creativeId = request.getParameter("creative_id");
-            String campaignName = request.getParameter("campaign_name");
-            String mac = request.getParameter("mac");
-            String macMd5 = request.getParameter("mac_md5");
-            String ts = request.getParameter("ts");
-            String osString = request.getParameter("os");
-            String ip = request.getParameter("ip");
-            String sence = request.getParameter("sence");
-            String imeiMd5 = null;
-            String idfaMd5 = null;
-            String oaid = null;
-            if(os != null){
-                if (os.equals("Android")){
-                    imeiMd5 = request.getParameter("imei_md5");
-                    oaid = request.getParameter("oaid");
-                }else if(os.equals("IOS")){
-                    idfaMd5 = request.getParameter("idfa_md5");
-                }
-            }
-            String callbackUrl = request.getParameter("callback_url");
-            String transformType = request.getParameter("transformType");
-            if (transformType != null){
-                if (transformType.equals("1")){
-                    if(platform !=null && platform.equals("bytedance")){
-                        callbackUrl = "https://ad.oceanengine.com/track/activate/?callback="+callbackUrl;
-                        callbackUrl = callbackUrl+"&event_type=0&conv_time="+new Date().getTime()+"&imei="+imeiMd5+"&oaid="+oaid;
-                    }else if(platform !=null && platform.equals("kuaishou")){
-                        callbackUrl = callbackUrl+"&event_type=1&event_time="+new Date().getTime();
-                    }
-
-                }else if (transformType.equals("2")){
-                    if(platform !=null && platform.equals("bytedance")){
-                        callbackUrl = "https://ad.oceanengine.com/track/activate/?callback="+callbackUrl;
-                        callbackUrl = callbackUrl+"&event_type=1&conv_time="+new Date().getTime()+"&imei="+imeiMd5+"&oaid="+oaid;
-                    }else if(platform !=null && platform.equals("kuaishou")){
-                        callbackUrl = callbackUrl+"&event_type=2&event_time="+new Date().getTime();
-                    }
-
-                }
-            }
-            String result = HttpUtils.httpGetRequest(callbackUrl);
-            ConvertInfo convertInfo = new ConvertInfo();
-            convertInfo.setCallbackUrl(callbackUrl);
-            try {
-                convertInfo.setClickId(Long.parseLong(clickId));
-            }catch (Exception e){
-
-            }
-            convertInfo.setTransformType(transformType);
-            convertInfo.setResponse(result);
-            convertInfo.setAdvertisor(advertisor);
-            convertInfo.setCampaignId(campaignId);
-            convertInfo.setCampaignName(campaignName);
-            convertInfo.setCreativeId(creativeId);
-            convertInfo.setGroupId(groupId);
-            convertInfo.setIdfaMd5(idfaMd5);
-            convertInfo.setImeiMd5(imeiMd5);
-            convertInfo.setIp(ip);
-            convertInfo.setMac(mac);
-            convertInfo.setMacMd5(macMd5);
-            convertInfo.setOaid(oaid);
-            convertInfo.setOsType(os);
-            convertInfo.setPlatform(platform);
-            convertInfo.setSence(sence);
-            convertInfo.setSpaceId(spaceId);
-            convertInfo.setAccountId(accountId);
-            try {
-                convertInfo.setTs(new Date(Long.parseLong(ts)));
-            } catch (NumberFormatException e) {
-
-            }
-            convertInfoService.save(convertInfo);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return "{\"code\":200,\"result\":\"success\"}";
-    }
-
-    @ResponseBody
-    @RequestMapping(value = "/convert2")
-    public String convert2(HttpServletRequest request,
-                          HttpServletResponse response){
-        logger.info(request.getQueryString());
-        try {
-            //test
-            String clickId = request.getParameter("click_id");
-            String spaceId = request.getParameter("space_id");
-            String accountId = request.getParameter("account_id");
-            String os = request.getParameter("os_type");
-            String platform = request.getParameter("platform");
-            String advertisor = request.getParameter("advertisor");
-            String groupId = request.getParameter("group_id");
-            String campaignId = request.getParameter("compaign_id");
-            String creativeId = request.getParameter("creative_id");
-            String campaignName = request.getParameter("campaign_name");
-            String mac = request.getParameter("mac");
-            String macMd5 = request.getParameter("mac_md5");
-            String ts = request.getParameter("ts");
-            String osString = request.getParameter("os");
-            String ip = request.getParameter("ip");
-            String sence = request.getParameter("sence");
-            String imeiMd5 = null;
-            String idfaMd5 = null;
-            String oaid = null;
-            if(os != null){
-                if (os.equals("Android")){
-                    imeiMd5 = request.getParameter("imei_md5");
-                    oaid = request.getParameter("oaid");
-                }else if(os.equals("IOS")){
-                    idfaMd5 = request.getParameter("idfa_md5");
-                }
-            }
-            String callbackUrl = request.getParameter("callback_url");
-            String transformType = request.getParameter("transformType");
-            String result = null;
-            if (transformType != null){
-                if (transformType.equals("2")) {
-                    if (platform != null && platform.equals("bytedance")) {
-                        callbackUrl = "https://ad.oceanengine.com/track/activate/?callback=" + callbackUrl;
-                        callbackUrl = callbackUrl + "&event_type=0&conv_time=" + new Date().getTime() + "&imei=" + imeiMd5 + "&oaid=" + oaid;
-                    } else if (platform != null && platform.equals("kuaishou")) {
-                        callbackUrl = callbackUrl + "&event_type=1&event_time=" + new Date().getTime();
-                    }
-                    result = HttpUtils.httpGetRequest(callbackUrl);
-                }
-//                }else if (transformType.equals("2")){
-//                    if(platform !=null && platform.equals("bytedance")){
-//                        callbackUrl = "https://ad.oceanengine.com/track/activate/?callback="+callbackUrl;
-//                        callbackUrl = callbackUrl+"&event_type=1&conv_time="+new Date().getTime()+"&imei="+imeiMd5+"&oaid="+oaid;
-//                    }else if(platform !=null && platform.equals("kuaishou")){
-//                        callbackUrl = callbackUrl+"&event_type=2&event_time="+new Date().getTime();
-//                    }
-//
-//                }
-            }
-
-            ConvertInfo convertInfo = new ConvertInfo();
-            convertInfo.setCallbackUrl(callbackUrl);
-            try {
-                convertInfo.setClickId(Long.parseLong(clickId));
-            }catch (Exception e){
-
-            }
-            convertInfo.setTransformType(transformType);
-            convertInfo.setResponse(result);
-            convertInfo.setAdvertisor(advertisor);
-            convertInfo.setCampaignId(campaignId);
-            convertInfo.setCampaignName(campaignName);
-            convertInfo.setCreativeId(creativeId);
-            convertInfo.setGroupId(groupId);
-            convertInfo.setIdfaMd5(idfaMd5);
-            convertInfo.setImeiMd5(imeiMd5);
-            convertInfo.setIp(ip);
-            convertInfo.setMac(mac);
-            convertInfo.setMacMd5(macMd5);
-            convertInfo.setOaid(oaid);
-            convertInfo.setOsType(os);
-            convertInfo.setPlatform(platform);
-            convertInfo.setSence(sence);
-            convertInfo.setSpaceId(spaceId);
-            convertInfo.setAccountId(accountId);
-            try {
-                convertInfo.setTs(new Date(Long.parseLong(ts)));
-            } catch (NumberFormatException e) {
-
-            }
-            convertInfoService.save(convertInfo);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return "{\"code\":200,\"result\":\"success\"}";
-    }
-
-    @ResponseBody
-    @RequestMapping(value = "/click")
-    public String click(HttpServletRequest request,
-                        HttpServletResponse response){
-        try {
-            logger.info(request.getQueryString());
-            String os = request.getParameter("os_type");
-            String spaceId = request.getParameter("space_id");
-            String advertisor = request.getParameter("advertisor");
-            String campaignId = request.getParameter("compaign_id");
-            String creativeId = request.getParameter("creative_id");
-            String campaignName = request.getParameter("campaign_name");
-            String dpaId = request.getParameter("dpa_id");
-            String dpaType = request.getParameter("dpa_type");
-            String imeiMd5 = null;
-            String idfaMd5 = null;
-            String oaid = null;
-            if(os != null){
-                if (os.equals("Android")){
-                    imeiMd5 = request.getParameter("imei_md5");
-                    oaid = request.getParameter("oaid");
-                }else if(os.equals("IOS")){
-                    idfaMd5 = request.getParameter("idfa_md5");
-                }
-            }
-            if(spaceId == null || spaceId.equals("")){
-                spaceId = "11709";
-            }
-            if (advertisor!= null && advertisor.equals("taobao")){
-                try {
-                    String convertUrl = "https://track.c-top.com.cn/convert?"+request.getQueryString();
-                    logger.info(convertUrl);
-                    taobaoNoticeService.sendNotice(spaceId,campaignId,campaignName,creativeId,imeiMd5,idfaMd5,oaid,dpaId,dpaType,convertUrl);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        } catch (NumberFormatException e) {
-            e.printStackTrace();
-        }
-        return "{\"code\":200,\"result\":\"success\"}";
-    }
-}

+ 11 - 0
src/main/java/cn/com/ctop/okr/dto/FeishuUserInfoDto.java

@@ -0,0 +1,11 @@
+package cn.com.ctop.okr.dto;
+
+import lombok.Data;
+
+@Data
+public class FeishuUserInfoDto {
+
+    private String openId;
+    private String name;
+
+}

+ 0 - 31
src/main/java/cn/com/ctop/okr/entity/ClickInfo.java

@@ -1,31 +0,0 @@
-package cn.com.ctop.okr.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-@Data
-@TableName("tb_click_info")
-public class ClickInfo {
-    @TableId(value = "id",type = IdType.AUTO)
-    private Long id;
-    private String platform;
-    private String advertisor;
-    private String osType;
-    private String oaid;
-    private String imeiMd5;
-    private String idfaMd5;
-    private String groupId;
-    private String campaignId;
-    private String creativeId;
-    private String campaignName;
-    private String mac;
-    private String macMd5;
-    private Date ts;
-    private String ip;
-    private String sence;
-    private String callbackUrl;
-    private Integer isConvert;
-}

+ 0 - 36
src/main/java/cn/com/ctop/okr/entity/ConvertInfo.java

@@ -1,36 +0,0 @@
-package cn.com.ctop.okr.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-@TableName("tb_convert_info_new")
-public class ConvertInfo {
-    @TableId(type = IdType.INPUT)
-    private Long id;
-    private Long clickId;
-    private String accountId;
-    private String spaceId;
-    private String platform;
-    private String advertisor;
-    private String osType;
-    private String oaid;
-    private String imeiMd5;
-    private String idfaMd5;
-    private String groupId;
-    private String campaignId;
-    private String creativeId;
-    private String campaignName;
-    private String mac;
-    private String macMd5;
-    private Date ts;
-    private String ip;
-    private String sence;
-    private String callbackUrl;
-    private String response;
-    private String transformType;
-}

+ 21 - 0
src/main/java/cn/com/ctop/okr/entity/OkrContentStatus.java

@@ -0,0 +1,21 @@
+package cn.com.ctop.okr.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@TableName("okr_content_status")
+public class OkrContentStatus {
+    @TableId(value = "id",type = IdType.AUTO)
+    private Long id;
+    private Integer quarter;
+    private Integer year;
+    private String content;
+    private Integer status;
+    private Date createTime;
+    private Date updateTime;
+}

+ 22 - 0
src/main/java/cn/com/ctop/okr/entity/OkrKrInfo.java

@@ -0,0 +1,22 @@
+package cn.com.ctop.okr.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@TableName("okr_kr_info")
+public class OkrKrInfo {
+    @TableId(value = "id",type = IdType.AUTO)
+    private Long id;
+    private Long objectId;
+    private String userId;
+    private String krInfo;
+    private Integer year;
+    private Integer quarter;
+    private Date createTime;
+    private Date updateTime;
+}

+ 23 - 0
src/main/java/cn/com/ctop/okr/entity/OkrLog.java

@@ -0,0 +1,23 @@
+package cn.com.ctop.okr.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@TableName("okr_log")
+public class OkrLog {
+    @TableId(value = "id",type = IdType.AUTO)
+    private Long id;
+    private Integer type;
+    private Integer quarter;
+    private Integer year;
+    private String oldContent;
+    private String newContent;
+    private Integer operation;
+    private Date createTime;
+    private Date updateTime;
+}

+ 21 - 0
src/main/java/cn/com/ctop/okr/entity/OkrMember.java

@@ -0,0 +1,21 @@
+package cn.com.ctop.okr.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@TableName("okr_member")
+public class OkrMember {
+    @TableId(value = "id",type = IdType.AUTO)
+    private Long id;
+    private String userId;
+    private String memberId;
+    private Integer year;
+    private Integer quarter;
+    private Date createTime;
+    private Date updateTime;
+}

+ 21 - 0
src/main/java/cn/com/ctop/okr/entity/OkrObjectInfo.java

@@ -0,0 +1,21 @@
+package cn.com.ctop.okr.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@TableName("okr_object_info")
+public class OkrObjectInfo {
+    @TableId(value = "id",type = IdType.AUTO)
+    private Long id;
+    private String userId;
+    private String objectInfo;
+    private Integer quarter;
+    private Integer year;
+    private Date createTime;
+    private Date updateTime;
+}

+ 22 - 0
src/main/java/cn/com/ctop/okr/entity/OkrTaskInfo.java

@@ -0,0 +1,22 @@
+package cn.com.ctop.okr.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@TableName("okr_task_info")
+public class OkrTaskInfo {
+    @TableId(value = "id",type = IdType.AUTO)
+    private Long id;
+    private String taskTitle;
+    private String taskInfo;
+    private Integer quarter;
+    private Integer year;
+    private Integer type;
+    private Date createTime;
+    private Date updateTime;
+}

+ 0 - 26
src/main/java/cn/com/ctop/okr/entity/TaobaoNotice.java

@@ -1,26 +0,0 @@
-package cn.com.ctop.okr.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-@Data
-@TableName("tb_taobao_notice")
-public class TaobaoNotice {
-    @TableId(type = IdType.INPUT)
-    private Long id;
-    private String oaid;
-    private String channel;
-    private String advertisingSpaceId;
-    private String taskId;
-    private String adid;
-    private String cid;
-    private String serviceProviderName;
-    private String imeiMd5;
-    private String idfaMd5;
-    private String callbackUrl;
-    private String app;
-    private String adname;
-    private String response;
-}

+ 0 - 8
src/main/java/cn/com/ctop/okr/mapper/ClickInfoMapper.java

@@ -1,8 +0,0 @@
-package cn.com.ctop.okr.mapper;
-
-import cn.com.ctop.okr.entity.ClickInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-public interface ClickInfoMapper extends BaseMapper<ClickInfo> {
-
-}

+ 0 - 7
src/main/java/cn/com/ctop/okr/mapper/ConvertInfoMapper.java

@@ -1,7 +0,0 @@
-package cn.com.ctop.okr.mapper;
-
-import cn.com.ctop.okr.entity.ConvertInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-public interface ConvertInfoMapper extends BaseMapper<ConvertInfo> {
-}

+ 5 - 0
src/main/java/cn/com/ctop/okr/mapper/CorpUserInfoMapper.java

@@ -1,12 +1,17 @@
 package cn.com.ctop.okr.mapper;
 package cn.com.ctop.okr.mapper;
 
 
+import cn.com.ctop.okr.dto.FeishuUserInfoDto;
 import cn.com.ctop.okr.entity.CorpUserInfo;
 import cn.com.ctop.okr.entity.CorpUserInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 
+import java.util.List;
+
 public interface CorpUserInfoMapper extends BaseMapper<CorpUserInfo> {
 public interface CorpUserInfoMapper extends BaseMapper<CorpUserInfo> {
 
 
     CorpUserInfo getUserInfoByOpenId(@Param("openId")String openId);
     CorpUserInfo getUserInfoByOpenId(@Param("openId")String openId);
 
 
     void replaceInfoUserInfo(@Param("user")CorpUserInfo userInfo);
     void replaceInfoUserInfo(@Param("user")CorpUserInfo userInfo);
+
+    List<FeishuUserInfoDto> getUserListByName(@Param("name")String name);
 }
 }

+ 14 - 0
src/main/java/cn/com/ctop/okr/mapper/OkrContentStatusMapper.java

@@ -0,0 +1,14 @@
+package cn.com.ctop.okr.mapper;
+
+import cn.com.ctop.okr.entity.OkrContentStatus;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface OkrContentStatusMapper extends BaseMapper<OkrContentStatus> {
+
+
+    List<OkrContentStatus> getContentStatusList(@Param("userId")String userId, @Param("year")Integer year, @Param("quarter")Integer quarter);
+
+}

+ 13 - 0
src/main/java/cn/com/ctop/okr/mapper/OkrKrInfoMapper.java

@@ -0,0 +1,13 @@
+package cn.com.ctop.okr.mapper;
+
+import cn.com.ctop.okr.entity.OkrContentStatus;
+import cn.com.ctop.okr.entity.OkrKrInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface OkrKrInfoMapper extends BaseMapper<OkrContentStatus> {
+
+    List<OkrKrInfo> getKrByObjectId(@Param("objectId")Long objectId, @Param("userId")String userId, @Param("year")Integer year, @Param("quarter")Integer quarter);
+}

+ 8 - 0
src/main/java/cn/com/ctop/okr/mapper/OkrLogMapper.java

@@ -0,0 +1,8 @@
+package cn.com.ctop.okr.mapper;
+
+import cn.com.ctop.okr.entity.OkrContentStatus;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface OkrLogMapper extends BaseMapper<OkrContentStatus> {
+
+}

+ 8 - 0
src/main/java/cn/com/ctop/okr/mapper/OkrMemberMapper.java

@@ -0,0 +1,8 @@
+package cn.com.ctop.okr.mapper;
+
+import cn.com.ctop.okr.entity.OkrContentStatus;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface OkrMemberMapper extends BaseMapper<OkrContentStatus> {
+
+}

+ 14 - 0
src/main/java/cn/com/ctop/okr/mapper/OkrObjectInfoMapper.java

@@ -0,0 +1,14 @@
+package cn.com.ctop.okr.mapper;
+
+import cn.com.ctop.okr.entity.OkrContentStatus;
+import cn.com.ctop.okr.entity.OkrObjectInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface OkrObjectInfoMapper extends BaseMapper<OkrObjectInfo> {
+   List<OkrObjectInfo> getQuarterObject(@Param("userId")String userId, @Param("year")Integer year, @Param("quarter")Integer quarter);
+
+
+}

+ 13 - 0
src/main/java/cn/com/ctop/okr/mapper/OkrTaskInfoMapper.java

@@ -0,0 +1,13 @@
+package cn.com.ctop.okr.mapper;
+
+import cn.com.ctop.okr.entity.OkrTaskInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface OkrTaskInfoMapper extends BaseMapper<OkrTaskInfo> {
+    List<OkrTaskInfo> getTaskInfo(@Param("userId")String userId, @Param("year")Integer year, @Param("quarter")Integer quarter, @Param("type")Integer type);
+
+
+}

+ 0 - 8
src/main/java/cn/com/ctop/okr/mapper/TaobaoNoticeMapper.java

@@ -1,8 +0,0 @@
-package cn.com.ctop.okr.mapper;
-
-import cn.com.ctop.okr.entity.TaobaoNotice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-public interface TaobaoNoticeMapper extends BaseMapper<TaobaoNotice> {
-
-}

+ 11 - 0
src/main/java/cn/com/ctop/okr/mapper/xml/CorpUserInfoMapper.xml

@@ -70,6 +70,17 @@
         )
         )
     </insert>
     </insert>
 
 
+    <select id="getUserListByName" resultType="cn.com.ctop.okr.dto.FeishuUserInfoDto">
+            select
+            open_id,
+            name
+        from
+        feishu_corp_user_info
+        where
+        name like concat('%', #{name}, '%');
+    </select>
+
+
 
 
 
 
 </mapper>
 </mapper>

+ 19 - 0
src/main/java/cn/com/ctop/okr/mapper/xml/OkrContentStatusMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.com.ctop.okr.mapper.OkrContentStatusMapper">
+
+    <select id="getContentStatusList" resultType="cn.com.ctop.okr.entity.OkrContentStatus">
+            select
+            *
+        from
+        okr_content_status
+        where
+        user_id = #{userId}
+        and
+        year = #{year}
+        and
+        quarter = #{quarter}
+    </select>
+
+
+</mapper>

+ 20 - 0
src/main/java/cn/com/ctop/okr/mapper/xml/OkrKrInfoMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.com.ctop.okr.mapper.OkrKrInfoMapper">
+
+    <select id="getKrByObjectId" resultType="cn.com.ctop.okr.entity.OkrKrInfo">
+        select
+        *
+        from
+        okr_kr_info
+        where
+        object_id = #{objectId}
+        and
+        user_id = #{userId}
+        and
+        year = #{year}
+        and
+        quarter = #{quarter}
+    </select>
+
+</mapper>

+ 5 - 0
src/main/java/cn/com/ctop/okr/mapper/xml/OkrLogMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.com.ctop.okr.mapper.OkrLogMapper">
+
+</mapper>

+ 5 - 0
src/main/java/cn/com/ctop/okr/mapper/xml/OkrMemberMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.com.ctop.okr.mapper.OkrMemberMapper">
+
+</mapper>

+ 19 - 0
src/main/java/cn/com/ctop/okr/mapper/xml/OkrObjectInfoMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.com.ctop.okr.mapper.OkrObjectInfoMapper">
+
+    <select id="getQuarterObject" resultType="cn.com.ctop.okr.entity.OkrObjectInfo">
+            select
+            *
+        from
+        okr_object_info
+        where
+        user_id = #{userId}
+        and
+        year = #{year}
+        and
+        quarter = #{quarter}
+    </select>
+
+
+</mapper>

+ 38 - 0
src/main/java/cn/com/ctop/okr/mapper/xml/OkrTaskInfoMapper.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.com.ctop.okr.mapper.OkrTaskInfoMapper">
+
+    <select id="getTaskInfo" resultType="cn.com.ctop.okr.entity.OkrTaskInfo">
+            select
+            *
+        from
+        okr_task_info
+        where
+        user_id = #{userId}
+        and
+        year = #{year}
+        and
+        quarter = #{quarter}
+        and
+        type = #{type}
+    </select>
+
+    <insert id="insertTaskInfo">
+        insert into
+        okr_task_info
+        (
+        task_title,
+        task_info,
+        year,
+        quarter,
+        )
+        values
+        (
+        #{info.taskTitle},
+        #{info.taskInfo},
+        #{info.year},
+        #{info.quarter}
+        )
+    </insert>
+
+</mapper>

+ 0 - 7
src/main/java/cn/com/ctop/okr/service/ClickInfoService.java

@@ -1,7 +0,0 @@
-package cn.com.ctop.okr.service;
-
-import cn.com.ctop.okr.entity.ClickInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-public interface ClickInfoService extends IService<ClickInfo> {
-}

+ 0 - 7
src/main/java/cn/com/ctop/okr/service/ConvertInfoService.java

@@ -1,7 +0,0 @@
-package cn.com.ctop.okr.service;
-
-import cn.com.ctop.okr.entity.ConvertInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-public interface ConvertInfoService extends IService<ConvertInfo> {
-}

+ 3 - 0
src/main/java/cn/com/ctop/okr/service/CorpUserInfoService.java

@@ -1,5 +1,6 @@
 package cn.com.ctop.okr.service;
 package cn.com.ctop.okr.service;
 
 
+import cn.com.ctop.okr.dto.FeishuUserInfoDto;
 import cn.com.ctop.okr.entity.CorpDepartInfo;
 import cn.com.ctop.okr.entity.CorpDepartInfo;
 import cn.com.ctop.okr.entity.CorpUserInfo;
 import cn.com.ctop.okr.entity.CorpUserInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -14,4 +15,6 @@ public interface CorpUserInfoService extends IService<CorpUserInfo> {
 
 
     void loadFeishuDepartAndUserInfo() throws Exception;
     void loadFeishuDepartAndUserInfo() throws Exception;
 
 
+    List<FeishuUserInfoDto> getUserListByName(String name);
+
 }
 }

+ 8 - 0
src/main/java/cn/com/ctop/okr/service/OkrService.java

@@ -0,0 +1,8 @@
+package cn.com.ctop.okr.service;
+
+import java.util.Map;
+
+public interface OkrService{
+
+    Map<String, Object> getOkrInfo();
+}

+ 0 - 8
src/main/java/cn/com/ctop/okr/service/TaobaoNoticeService.java

@@ -1,8 +0,0 @@
-package cn.com.ctop.okr.service;
-
-import cn.com.ctop.okr.entity.TaobaoNotice;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-public interface TaobaoNoticeService extends IService<TaobaoNotice> {
-    public void sendNotice(String spaceId,String campaignId,String campaignName,String creativeId,String imei,String idfa,String oaid,String dpaId,String dpaType,String callbackUrl);
-}

+ 0 - 11
src/main/java/cn/com/ctop/okr/service/impl/ClickInfoServiceImpl.java

@@ -1,11 +0,0 @@
-package cn.com.ctop.okr.service.impl;
-
-import cn.com.ctop.okr.entity.ClickInfo;
-import cn.com.ctop.okr.mapper.ClickInfoMapper;
-import cn.com.ctop.okr.service.ClickInfoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service
-public class ClickInfoServiceImpl extends ServiceImpl<ClickInfoMapper, ClickInfo> implements ClickInfoService {
-}

+ 0 - 11
src/main/java/cn/com/ctop/okr/service/impl/ConvertInfoServiceImpl.java

@@ -1,11 +0,0 @@
-package cn.com.ctop.okr.service.impl;
-
-import cn.com.ctop.okr.entity.ConvertInfo;
-import cn.com.ctop.okr.mapper.ConvertInfoMapper;
-import cn.com.ctop.okr.service.ConvertInfoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service
-public class ConvertInfoServiceImpl extends ServiceImpl<ConvertInfoMapper, ConvertInfo> implements ConvertInfoService {
-}

+ 7 - 0
src/main/java/cn/com/ctop/okr/service/impl/CorpUserInfoServiceImpl.java

@@ -1,5 +1,6 @@
 package cn.com.ctop.okr.service.impl;
 package cn.com.ctop.okr.service.impl;
 
 
+import cn.com.ctop.okr.dto.FeishuUserInfoDto;
 import cn.com.ctop.okr.entity.CorpDepartInfo;
 import cn.com.ctop.okr.entity.CorpDepartInfo;
 import cn.com.ctop.okr.entity.CorpUserDepartMap;
 import cn.com.ctop.okr.entity.CorpUserDepartMap;
 import cn.com.ctop.okr.entity.CorpUserInfo;
 import cn.com.ctop.okr.entity.CorpUserInfo;
@@ -173,6 +174,12 @@ public class CorpUserInfoServiceImpl extends ServiceImpl<CorpUserInfoMapper, Cor
         return corpUserInfoMapper.getUserInfoByOpenId(openId);
         return corpUserInfoMapper.getUserInfoByOpenId(openId);
     }
     }
 
 
+    //根据名字模糊查询飞书用户
+    @Override
+    public List<FeishuUserInfoDto> getUserListByName(String name){
+        return corpUserInfoMapper.getUserListByName(name);
+    }
+
 
 
 
 
 }
 }

+ 78 - 0
src/main/java/cn/com/ctop/okr/service/impl/OkrServiceImpl.java

@@ -0,0 +1,78 @@
+package cn.com.ctop.okr.service.impl;
+
+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.mapper.*;
+import cn.com.ctop.okr.service.OkrService;
+import cn.com.ctop.okr.utils.DateUtils;
+import cn.com.ctop.okr.vo.LoginUser;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.crypto.hash.Hash;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StopWatch;
+
+import java.util.*;
+
+@Service
+@Slf4j
+public class OkrServiceImpl implements OkrService {
+    @Autowired
+    private OkrContentStatusMapper okrContentStatusMapper;
+    @Autowired
+    private OkrKrInfoMapper okrKrInfoMapper;
+    @Autowired
+    private OkrLogMapper okrLogMapper;
+    @Autowired
+    private OkrMemberMapper okrMemberMapper;
+    @Autowired
+    private OkrObjectInfoMapper okrObjectInfoMapper;
+    @Autowired
+    private OkrTaskInfoMapper okrTaskInfoMapper;
+
+    @Override
+    public Map<String, Object> getOkrInfo(){
+        Map<String, Object> map = new HashMap<>();
+        //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String userId = "ou_03c4826ae66623a53f2af456ff3661a1";
+
+        //季度
+        Map<String, Object> timeMap = new HashMap<>();
+        Integer quarter = DateUtils.getQuarter(new Date());
+        Integer year = DateUtils.getYear(new Date());
+        timeMap.put("year",year);
+        timeMap.put("quarter",quarter);
+
+        //本周任务信息
+        List<OkrTaskInfo> taskInfoList = okrTaskInfoMapper.getTaskInfo(userId, year, quarter, 1);
+
+        //未来四周任务信息
+        List<OkrTaskInfo> taskFourWeekList = okrTaskInfoMapper.getTaskInfo(userId, year, quarter, 2);
+
+        //OKR信息
+        List<OkrObjectInfo> OkrObjectInfoList = okrObjectInfoMapper.getQuarterObject(userId, year, quarter);
+        List<Map<String, Object>> okrList = new ArrayList<>();
+        for (OkrObjectInfo okrObjectInfo:OkrObjectInfoList){
+            Map<String, Object> okrMap = new HashMap<>();
+            List<OkrKrInfo> OkrKrInfoList = okrKrInfoMapper.getKrByObjectId(okrObjectInfo.getId(),userId, year, quarter);
+            okrMap.put("objectInfo",okrObjectInfo);
+            okrMap.put("krList",OkrKrInfoList);
+            okrList.add(okrMap);
+        }
+
+        //状态信息
+        List<OkrContentStatus> contentStatusList = okrContentStatusMapper.getContentStatusList(userId, year, quarter);
+
+        map.put("time", timeMap);
+        map.put("taskInfoList",taskInfoList);
+        map.put("taskFourWeekList",taskFourWeekList);
+        map.put("okr",okrList);
+        map.put("status", contentStatusList);
+
+        return map;
+    }
+
+}

+ 0 - 54
src/main/java/cn/com/ctop/okr/service/impl/TaobaoNoticeServiceImpl.java

@@ -1,54 +0,0 @@
-package cn.com.ctop.okr.service.impl;
-
-import cn.com.ctop.okr.entity.TaobaoNotice;
-import cn.com.ctop.okr.mapper.TaobaoNoticeMapper;
-import cn.com.ctop.okr.service.TaobaoNoticeService;
-import cn.com.ctop.okr.utils.HttpUtils;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.log4j.Logger;
-
-@Service
-public class TaobaoNoticeServiceImpl extends ServiceImpl<TaobaoNoticeMapper, TaobaoNotice> implements TaobaoNoticeService {
-    private static Logger logger = Logger.getLogger(TaobaoNoticeServiceImpl.class);
-    public void sendNotice(String spaceId,String campaignId,String campaignName,String creativeId,String imei,String idfa,String oaid,String dpaId,String dpaType,String callbackUrl){
-        TaobaoNotice taobaoNotice = new TaobaoNotice();
-        taobaoNotice.setAdid(campaignId);
-        taobaoNotice.setAdname(campaignName);
-        taobaoNotice.setAdvertisingSpaceId(spaceId);
-        taobaoNotice.setApp("1");
-        taobaoNotice.setCallbackUrl(callbackUrl);
-        taobaoNotice.setChannel("2200803434135");
-        taobaoNotice.setCid(creativeId);
-        taobaoNotice.setOaid(oaid);
-        taobaoNotice.setIdfaMd5(idfa);
-        taobaoNotice.setImeiMd5(imei);
-        taobaoNotice.setServiceProviderName("北京汇创思拓数字科技有限公司");
-        taobaoNotice.setTaskId("346834137");
-
-        String url = "https://wcp.taobao.com/adstrack/track.json?action=2";
-        Map<String,Object> paramMap = new HashMap<>();
-        paramMap.put("adid",taobaoNotice.getAdid());
-        paramMap.put("oaid",taobaoNotice.getOaid());
-        paramMap.put("adname",taobaoNotice.getAdname());
-        paramMap.put("advertisingSpaceId",taobaoNotice.getAdvertisingSpaceId());
-        paramMap.put("app",taobaoNotice.getApp());
-        paramMap.put("callbackUrl",taobaoNotice.getCallbackUrl());
-        paramMap.put("channel",taobaoNotice.getChannel());
-        paramMap.put("cid",taobaoNotice.getCid());
-        paramMap.put("imeiMd5",taobaoNotice.getImeiMd5());
-        paramMap.put("serviceProviderName",taobaoNotice.getServiceProviderName());
-        paramMap.put("taskId",taobaoNotice.getTaskId());
-        if (dpaId != null && !dpaId.equals("")){
-            paramMap.put("dpaId",dpaId);
-            paramMap.put("dpaType",dpaType);
-        }
-        String response = HttpUtils.httpPostParamRequest(url,paramMap,null);
-        logger.info(response);
-//        taobaoNotice.setResponse(response);
-//        this.save(taobaoNotice);
-    }
-}

+ 0 - 176
src/main/resources/application.yml

@@ -118,179 +118,3 @@ logging:
   config: classpath:logback-dev.xml
   config: classpath:logback-dev.xml
 
 
 
 
-
-
-
-
-
-#
-#server:
-#  port: 8088
-#  servlet:
-#    context-path: /jeecg-boot
-#    compression:
-#      enabled: true
-#      mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
-#
-#management:
-#  endpoints:
-#    web:
-#      exposure:
-#        include: metrics,httptrace
-#
-#spring:
-#  servlet:
-#    multipart:
-#      max-file-size: -1
-#      max-request-size: -1
-#  mail:
-#    host: smtp.163.com
-#    username: jeecgos@163.com
-#    password: ??
-#    properties:
-#      mail:
-#        smtp:
-#          auth: true
-#          starttls:
-#            enable: true
-#            required: true
-#  ## quartz定时任务,采用数据库方式
-#  #json 时间戳统一转换
-#  jackson:
-#    date-format:   yyyy-MM-dd HH:mm:ss
-#    time-zone:   GMT+8
-#  aop:
-#    proxy-target-class: true
-#  #配置freemarker
-#  #配置freemarker
-#  freemarker:
-#    # 设置模板后缀名
-#    suffix: .ftl
-#    # 设置文档类型
-#    content-type: text/html
-#    # 设置页面编码格式
-#    charset: UTF-8
-#    # 设置页面缓存
-#    cache: false
-#    prefer-file-system-access: false
-#    # 设置ftl文件路径
-#    template-loader-path:
-#      - classpath:/templates
-#  # 设置静态文件路径,js,css等
-#  mvc:
-#    static-path-pattern: /**
-#  resource:
-#    static-locations: classpath:/static/,classpath:/public/
-#  autoconfigure:
-#    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
-#  datasource:
-#    druid:
-#      stat-view-servlet:
-#        enabled: true
-#        loginUsername: admin
-#        loginPassword: 123456
-#      web-stat-filter:
-#        enabled: true
-#    dynamic:
-#      druid: # 全局druid参数,绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置)
-#        # 连接池的配置信息
-#        # 初始化大小,最小,最大
-#        connection-init-sql: set names utf8mb4
-#
-#        initial-size: 5
-#        min-idle: 5
-#        maxActive: 20
-#        # 配置获取连接等待超时的时间
-#        maxWait: 60000
-#        # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
-#        timeBetweenEvictionRunsMillis: 60000
-#        # 配置一个连接在池中最小生存的时间,单位是毫秒
-#        minEvictableIdleTimeMillis: 300000
-#        validationQuery: SELECT 1 FROM DUAL
-#        testWhileIdle: true
-#        testOnBorrow: false
-#        testOnReturn: false
-#        # 打开PSCache,并且指定每个连接上PSCache的大小
-#        poolPreparedStatements: true
-#        maxPoolPreparedStatementPerConnectionSize: 20
-#        # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
-#        filters: stat,slf4j
-#        # 通过connectProperties属性来打开mergeSql功能;慢SQL记录
-#        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
-#      #      datasource:
-#      #        master:
-#      #          url: jdbc:mysql://39.106.184.70:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
-#      #          username: hcst
-#      #          password: test@20190531
-#      datasource:
-#        master:
-#          url: jdbc:mysql://139.186.27.96:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
-#          username: hcst
-#          password: test@20190531
-#          driver-class-name: com.mysql.jdbc.Driver
-#  #redis 配置
-#  redis:
-#    database: 0
-#    host: 127.0.0.1
-#    lettuce:
-#      pool:
-#        max-active: 8   #最大连接数据库连接数,设 0 为没有限制
-#        max-idle: 8     #最大等待连接中的数量,设 0 为没有限制
-#        max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
-#        min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
-#      shutdown-timeout: 100ms
-#    password: ''
-#    port: 6379
-##mybatis plus 设置
-#mybatis-plus:
-#  mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml,classpath*:cn/com/ctop/**/xml/*Mapper.xml
-#  global-config:
-#    # 关闭MP3.0自带的banner
-#    banner: false
-#    db-config:
-#      #主键类型  0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)";
-#      id-type: 4
-#      # 默认数据库表下划线命名
-#      table-underline: true
-#  configuration:
-#    #  map-underscore-to-camel-case: false
-#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-#  #分页pageHelper
-#pagehelper:
-#  helper-dialect: mysql
-#  reasonable: true
-#  support-methods-arguments: true
-##jeecg专用配置
-#jeecg:
-#  ffmpeg:
-#    bin: D:\java\ffmpeg\bin\ffmpeg.exe
-#  path:
-#    #文件上传根目录 设置
-#    #文件上传根目录 设置
-#    upload: /data/upload
-#    #webapp文件路径
-#    webapp: /data/webapp
-#    video-upload: /data/upload/video/
-#    image-upload: /data/upload/image/
-#    chrome-driver: D://chromedriver.exe
-#    csv-upload: /data/upload/csv/
-#    report-history: /data/report/history/
-#    report-daily: /data/report/daily/
-#kuaishou:
-#  group-control:
-#    path: http://127.0.0.1
-#    port: 4723
-#logging:
-#  level:
-#    root: info
-#  config: classpath:logback-test.xml
-#chrome:
-#  script:
-#    clean: sh /mnt/webapp/cleanProcess.sh
-#oss:
-#  replace:
-#    replace-value: oss-cn-beijing
-#    replace-old-value: oss-cn-beijing
-#    download: /mnt/file/video/
-
-