营地

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/GroupController.java

@@ -15,10 +15,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 import tk.mybatis.mapper.entity.Example;
 
 import java.util.ArrayList;
@@ -53,7 +50,11 @@ public class GroupController extends BaseController<GroupBiz, Group> {
 
         return baseBiz.selectByExample(example);
     }
-
+    @GetMapping(value = "/list_all")
+    @ResponseBody
+    public List<Group> listAll() {
+        return baseBiz.selectListAll();
+    }
 
 
     @RequestMapping(value = "/{id}/user", method = RequestMethod.PUT)

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/dto/CampsiteShopPageDTO.java

@@ -95,6 +95,9 @@ public class CampsiteShopPageDTO implements Serializable {
     @ApiModelProperty(value = "電話")
     private String phone;
 
+    @ApiModelProperty("地址")
+    private String address;
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/vo/CampsiteShopPageVo.java

@@ -100,4 +100,7 @@ public class CampsiteShopPageVo implements Serializable {
 
     @ApiModelProperty(value = "電話")
     private String phone;
+
+    @ApiModelProperty("地址")
+    private String address;
 }

xx-campsite/xx-campsite-server/src/main/resources/mapper/CampsiteShopMapper.xml

@@ -37,14 +37,14 @@
     <!--根据类型查询全部-->
     <select id="findAllCampsiteShopsByType" resultType="com.xxfc.platform.campsite.dto.CampsiteShopPageDTO">
         select cs.id as `id`,cs.name as `name`,cs.logo as `logo`,cs.url as `url`,cs.province_name as `provinceName`,cs.city_name as `cityName`,cs.service_phone as `phone`,
-        cs.longitude as `longitude`,cs.latitude as `latitude`,cs.hot as `hot`,cs.crt_time as `crtTime`,ct.id as `storeId`,ct.name as `storeTypeName`
+        cs.longitude as `longitude`,cs.latitude as `latitude`,`address` as `address`,cs.hot as `hot`,cs.crt_time as `crtTime`,ct.id as `storeId`,ct.name as `storeTypeName`
         FROM `campsite_shop_tag`  cst
         left JOIN `campsite_shop` cs on cst.shop_id=cs.id
         left JOIN `campsite_tag` ct on cst.tag_id=ct.id
         where cs.sale_state=1 and cs.is_del=0
         <if test="typeId!=null">
             and cst.tag_id=#{typeId}
-        </if>
+        </if> order by `crtTime`  DESC
     </select>
 
     <!--首页查询全部-->