张氏APP 后台
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zqy
2 天以前 cedaeeed6d401aefebf93ea6ea21cc9e06d5f5db 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/EsSearchController.java


@@ -3,13 +3,15 @@


import com.ruoyi.common.core.domain.AjaxResult;


import com.ruoyi.common.core.domain.entity.EsModel;


import com.ruoyi.service.EsService;


import org.springframework.data.elasticsearch.core.SearchHits;


import org.springframework.web.bind.annotation.DeleteMapping;


import org.springframework.web.bind.annotation.GetMapping;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.RestController;


import com.ruoyi.service.ZfEconomyService;


import com.ruoyi.service.impl.InterfaceBasedSearchRouter;


import com.ruoyi.service.impl.ZfEconomyServiceImpl;


import org.springframework.format.annotation.DateTimeFormat;


import org.springframework.web.bind.annotation.*;




import javax.annotation.Resource;


import javax.websocket.server.PathParam;


import java.util.Date;


import java.util.List;




/**


@@ -25,8 +27,14 @@


    @Resource


    EsService esService;




    @Resource


    InterfaceBasedSearchRouter interfaceBasedSearchRouter;




    @Resource


    ZfEconomyServiceImpl zfEconomyService;




    @GetMapping()


    public AjaxResult search(String keyword){


    public AjaxResult search(@PathParam("keyword") String keyword){


        List<EsModel> byCondition = esService.findByCondition(keyword);


        return AjaxResult.success(byCondition);


    }


@@ -42,4 +50,22 @@


        List<EsModel> modelList = esService.getAll();


        return AjaxResult.success(modelList);


    }




    @GetMapping("/companion/{moduleCode}")


    public AjaxResult getAllbyCAY( @PathVariable("moduleCode") String moduleCode,@RequestParam(value = "companion", required = false) String companion,


                                   @RequestParam(value = "happenStartTime", required = false)


                                   @DateTimeFormat(pattern = "yyyy-MM-dd") Date happenStartTime,


                                   @RequestParam(value = "happenEndTime", required = false)


                                       @DateTimeFormat(pattern = "yyyy-MM-dd") Date happenEndTime){


        System.out.println("[[[[[["+moduleCode);


        System.out.println("[[[[[["+companion);






        System.out.println("[[[[[["+happenStartTime);


        System.out.println("[[[[[["+happenEndTime);




    return interfaceBasedSearchRouter.routeSearch(moduleCode,companion,happenStartTime,happenEndTime);


    }






}