Przeglądaj źródła

解决包引入报错问题

zhouzeyu@c-top.com.cn 3 lat temu
rodzic
commit
8e6abc7f6f

+ 15 - 12
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/label/controller/LbelController.java

@@ -1,9 +1,11 @@
 package cn.com.ctop.kuaishou.modules.label.controller;
 
-import cn.com.ctop.kuaishou.modules.clean.entity.KuaiShouAccountCleanTemplateInfo;
 import cn.com.ctop.kuaishou.modules.label.service.MaterialLabelService;
+import org.apache.ibatis.annotations.Param;
 import org.jeecg.common.api.vo.Result;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 
@@ -20,26 +22,27 @@ public class LbelController {
 
     @Resource
     MaterialLabelService materialTagService;
+
     /**
-     * 查询标签
+     * 查询所有指标数据
      *
      * @param
      * @return
      */
     @GetMapping("/filterMaterial")
-    public Result createCleanTemplate(){
-        return   materialTagService.filterMaterial();
+    public Result createCleanTemplate(@Param("type") String type) {
+        return materialTagService.filterMaterial(type);
     }
 
     /**
-     * 查询标签
+     * 根据指标数据打标签
      *
      * @param
      * @return
      */
-    @GetMapping ("/materialSpecificationLabel")
-    public Result materialSpecificationLabel(){
-        return   materialTagService.materialSpecificationLabel();
+    @GetMapping("/materialSpecificationLabel")
+    public Result materialSpecificationLabel(@Param("type") String type) {
+        return materialTagService.materialSpecificationLabel(type);
     }
 
     /**
@@ -48,8 +51,8 @@ public class LbelController {
      * @param
      * @return
      */
-    @GetMapping ("/SynchronousLabel")
-    public Result SynchronousLabel(){
-        return   materialTagService.SynchronousLabel();
+    @GetMapping("/SynchronousLabel")
+    public Result SynchronousLabel(@Param("type") String type) {
+        return materialTagService.SynchronousLabel(type);
     }
 }

+ 8 - 7
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/label/entity/MaterialLabelInfo.java

@@ -1,11 +1,12 @@
 package cn.com.ctop.kuaishou.modules.label.entity;
 
-import cn.com.ctop.common.module.annotation.Document;
-import cn.com.ctop.common.module.annotation.EsId;
-import cn.com.ctop.common.module.annotation.FieId;
-import cn.com.ctop.common.module.enums.AnalyzerType;
-import cn.com.ctop.common.module.enums.FieldType;
+
 import lombok.Data;
+import org.jeecg.common.aspect.annotation.Document;
+import org.jeecg.common.aspect.annotation.EsId;
+import org.jeecg.common.aspect.annotation.FieId;
+import org.jeecg.common.constant.AnalyzerType;
+import org.jeecg.common.constant.FieldType;
 
 @Data
 @Document(index = "material_label", type = "material")
@@ -26,10 +27,10 @@ public class MaterialLabelInfo {
     @FieId(type = FieldType.KEYWORD)
     private String confirmTime;
 
-    @FieId(type = FieldType.KEYWORD,analyzer = AnalyzerType.IK_SMART)
+    @FieId(type = FieldType.KEYWORD, analyzer = AnalyzerType.IK_SMART)
     private String tagCode;
 
-    @FieId(type = FieldType.KEYWORD,analyzer = AnalyzerType.IK_SMART)
+    @FieId(type = FieldType.KEYWORD, analyzer = AnalyzerType.IK_SMART)
     private String tagName;
 
     @FieId(type = FieldType.KEYWORD)