埋点

cloud-system-api/src/main/java/com/yizhi/system/application/feign/DictionaryFeignClients.java

 package com.yizhi.system.application.feign;
 package com.yizhi.system.application.feign;
 
 
+import com.yizhi.system.application.vo.domain.Dictionary;
+import com.yizhi.util.application.domain.Response;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestParam;
 
 
+import java.util.List;
+
 /**
 /**
  * com.yizhi.application.feign
  * com.yizhi.application.feign
  *
  *
@@ -15,4 +19,9 @@ public interface DictionaryFeignClients {
 
 
     @GetMapping(value = "/dictionary/insertBySearchName")
     @GetMapping(value = "/dictionary/insertBySearchName")
     boolean insertBySearchName(@RequestParam("searchName") String searchName);
     boolean insertBySearchName(@RequestParam("searchName") String searchName);
+
+    @GetMapping(value = "/dictionary/child/listByCode")
+    Response<List<Dictionary>> listChildDictionary(@RequestParam(name = "code", defaultValue = "0") String code,
+                                                   @RequestParam(name = "includeParent", defaultValue = "false") Boolean includeParent,
+                                                   @RequestParam(name = "layer", defaultValue = "1") Integer layer);
 }
 }

cloud-system/src/main/java/com/yizhi/system/application/controller/api/AuthController.java

@@ -22,6 +22,7 @@ import com.yizhi.core.application.task.TaskExecutor;
 import com.yizhi.core.application.token.TokenHelper;
 import com.yizhi.core.application.token.TokenHelper;
 import com.yizhi.point.application.feign.PointListenerClients;
 import com.yizhi.point.application.feign.PointListenerClients;
 import com.yizhi.site.application.enums.FunctionTypeCode;
 import com.yizhi.site.application.enums.FunctionTypeCode;
+import com.yizhi.site.application.feign.api.EventTrackApiClients;
 import com.yizhi.site.application.feign.api.FunctionDisplayConfigApiClients;
 import com.yizhi.site.application.feign.api.FunctionDisplayConfigApiClients;
 import com.yizhi.site.application.feign.api.MyItemConfigApiClients;
 import com.yizhi.site.application.feign.api.MyItemConfigApiClients;
 import com.yizhi.site.application.feign.api.MyItemConfigDefaultApiClients;
 import com.yizhi.site.application.feign.api.MyItemConfigDefaultApiClients;
@@ -116,6 +117,9 @@ public class AuthController {
     @Autowired
     @Autowired
     private PointListenerClients pointListenerClients;
     private PointListenerClients pointListenerClients;
 
 
+    @Autowired
+    private EventTrackApiClients eventTrackApiClients;
+
 
 
     private static final Logger logger = LoggerFactory.getLogger(AuthController.class);
     private static final Logger logger = LoggerFactory.getLogger(AuthController.class);
     private static final String LOGIN_PASSWORD_ERROR_RECORD = "login:password:err:times:";
     private static final String LOGIN_PASSWORD_ERROR_RECORD = "login:password:err:times:";
@@ -288,7 +292,6 @@ public class AuthController {
             }
             }
             context.setAccountId(user.getId());
             context.setAccountId(user.getId());
             context.setOrgId(user.getOrgId());
             context.setOrgId(user.getOrgId());
-
             String token = createToken(user, context);
             String token = createToken(user, context);
             // 生成token(不是首次登陆)
             // 生成token(不是首次登陆)
             if (!firstLoginFlg) {
             if (!firstLoginFlg) {
@@ -310,10 +313,6 @@ public class AuthController {
             //登录成功，设置用户选择的语言
             //登录成功，设置用户选择的语言
             languageUtil.setStudentSelectLanguage(context, languageCode);
             languageUtil.setStudentSelectLanguage(context, languageCode);
 
 
-            // 新增登录积分
-            String shortDay = DateUtil.toShortDay(new Date());
-
-            pointListenerClients.addPoint("point_login", Long.valueOf(shortDay));
             logger.info("登陆处理结束");
             logger.info("登陆处理结束");
             return Response.ok(retMap);
             return Response.ok(retMap);
 
 
@@ -473,9 +472,15 @@ public class AuthController {
             if ("true".equals(user.getIsChecked())) {
             if ("true".equals(user.getIsChecked())) {
                 return ret;
                 return ret;
             }
             }
-            Integer terminalType = user.getTerminalType();
+            Integer terminalType = user.getTerminalType() == null ? APP : user.getTerminalType();
+            context.setSiteType(terminalType);
+            // 新增登录积分
+            String shortDay = DateUtil.toShortDay(new Date());
+            pointListenerClients.addPoint("point_login", Long.valueOf(shortDay));
+            // 添加登录埋点
+            eventTrackApiClients.addEvent("event_login",context.getAccountId());
             //添加登录日志
             //添加登录日志
-            addLoginRecord(context.getAccountId(), context.getCompanyId(), context.getSiteId(), context.getOrgId(), terminalType == null ? APP : terminalType);
+            addLoginRecord(context.getAccountId(), context.getCompanyId(), context.getSiteId(), context.getOrgId(), terminalType);
         }
         }
         return ret;
         return ret;
     }
     }

cloud-system/src/main/java/com/yizhi/system/application/controller/remote/DictionaryController.java

@@ -366,7 +366,6 @@ public class DictionaryController {
 
 
     }
     }
 
 
-
     /**
     /**
      * 检查该字典下是否有子数据
      * 检查该字典下是否有子数据
      *
      *