Merge remote-tracking branch 'origin/master'

src/main/java/com/huiju/estateagents/controller/TaEventPropertiesController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaEventProperties;
 import com.huiju.estateagents.service.ITaEventPropertiesService;
 import org.slf4j.Logger;
@@ -27,7 +28,7 @@ import com.huiju.estateagents.base.BaseController;
  * @since 2019-08-06
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaEventPropertiesController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaEventPropertiesController.class);
@@ -42,14 +43,19 @@ public class TaEventPropertiesController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taEventProperties",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/taEventProperties",method= RequestMethod.GET)
     public ResponseBean taEventPropertiesList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                      @RequestParam(value ="eventType", required = false) String eventType,
+                                      @RequestParam(value ="buildingId",required = false) String buildingId
+    ){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<TaEventProperties> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaEventProperties> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq(!StringUtils.isEmpty(eventType), "event_type", eventType);
+            queryWrapper.eq(!StringUtils.isEmpty(buildingId), "building_id", buildingId);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaEventProperties> result = iTaEventPropertiesService.page(pg, queryWrapper);