Commit c0d1bf75 by 陶光胜

修改

parent 0525100b
...@@ -4,6 +4,7 @@ import com.gic.api.base.commons.ServiceResponse; ...@@ -4,6 +4,7 @@ import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.EntityUtil; import com.gic.commons.util.EntityUtil;
import com.gic.commons.webapi.reponse.RestResponse; import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.enterprise.utils.UserDetailUtils; import com.gic.enterprise.utils.UserDetailUtils;
import com.gic.plug.web.qo.StoreWidgetCountQO;
import com.gic.plug.web.qo.StoreWidgetQO; import com.gic.plug.web.qo.StoreWidgetQO;
import com.gic.plug.web.vo.StoreRegionVO; import com.gic.plug.web.vo.StoreRegionVO;
import com.gic.plug.web.vo.StoreVO; import com.gic.plug.web.vo.StoreVO;
...@@ -67,12 +68,12 @@ public class StoreController { ...@@ -67,12 +68,12 @@ public class StoreController {
} }
@RequestMapping("get-store-count") @RequestMapping("get-store-count")
public RestResponse getStoreCount(String authSearchJson, String searchJson){ public RestResponse getStoreCount(@RequestBody StoreWidgetCountQO storeWidgetCountQO){
Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId(); Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
StoreSearchDTO storeSearchDTO = new StoreSearchDTO(); StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
storeSearchDTO.setEnterpriseId(enterpriseId); storeSearchDTO.setEnterpriseId(enterpriseId);
storeSearchDTO.setSearchJson(searchJson); storeSearchDTO.setSearchJson(storeWidgetCountQO.getSearchJson());
storeSearchDTO.setAuthSearchJson(authSearchJson); storeSearchDTO.setAuthSearchJson(storeWidgetCountQO.getAuthSearchJson());
ServiceResponse<Long> response = storeApiService.queryStoreCountFromES(storeSearchDTO); ServiceResponse<Long> response = storeApiService.queryStoreCountFromES(storeSearchDTO);
return RestResponse.success(response.getResult()); return RestResponse.success(response.getResult());
} }
......
package com.gic.plug.web.qo;
import java.io.Serializable;
public class StoreWidgetCountQO implements Serializable {
private String authSearchJson;
private String searchJson;
public String getAuthSearchJson() {
return authSearchJson;
}
public void setAuthSearchJson(String authSearchJson) {
this.authSearchJson = authSearchJson;
}
public String getSearchJson() {
return searchJson;
}
public void setSearchJson(String searchJson) {
this.searchJson = searchJson;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment