后台*旅游标签接口

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/entity/TourTag.java

 package com.xxfc.platform.tour.entity;
 
 import java.io.Serializable;
-import java.util.Date;
 import javax.persistence.*;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 
 /**
  * 旅游路线标签
- * 
+ *
  * @author zjw
  * @email nishijjo@qq.com
  * @date 2019-06-06 11:41:51
  */
 @Data
 @Table(name = "tour_tag")
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class TourTag implements Serializable {
 	private static final long serialVersionUID = 1L;
-	
-	    //主键id
-    @Id
+
+	/**
+	 * 主键id
+	 */
+
+	@Id
 	@GeneratedValue(generator = "JDBC")
 	@ApiModelProperty("主键id")
     private Integer id;
-	
-	    //名称
-    @Column(name = "name")
+
+	/**
+	 * 名称
+	 */
+	@Column(name = "name")
 	@ApiModelProperty(value = "名称")
     private String name;
-	
-	    //图片
-    @Column(name = "img")
+
+	/**
+	 * 图片
+	 */
+
+	@Column(name = "img")
 	@ApiModelProperty(value = "图片")
     private String img;
-	
-	    //描述
-    @Column(name = "describe")
+
+	/**
+	 * 描述
+	 */
+	@Column(name = "describe")
 	@ApiModelProperty(value = "描述")
     private String describe;
-	
-	    //链接
-    @Column(name = "link")
+
+	/**
+	 * 链接
+	 */
+	@Column(name = "link")
 	@ApiModelProperty(value = "链接")
     private String link;
-	
-	    //是否热门：0-否；1-是
+
+	/**
+	 * 是否热门：0-否；1-是
+	 */
     @Column(name = "is_hot")
 	@ApiModelProperty(value = "是否热门：0-否；1-是")
     private Integer isHot;
-	
-	    //成单量
-    @Column(name = "count")
+
+	/**
+	 * 成单量
+	 */
+	@Column(name = "count")
 	@ApiModelProperty(value = "成单量")
     private Integer count;
-	
-	    //排序
+
+	/**
+	 * 排序
+	 */
     @Column(name = "rank")
 	@ApiModelProperty(value = "排序")
     private Integer rank;
 	
-	    //创建时间
+	/**
+	 * 创建时间
+	 */
     @Column(name = "ctr_time")
 	@ApiModelProperty(value = "创建时间")
     private Long ctrTime;
-	
-	    //更新时间
-    @Column(name = "upd_time")
+
+	/**
+	 * 更新时间
+	 */
+	@Column(name = "upd_time")
 	@ApiModelProperty(value = "更新时间", hidden = true )
     private Long updTime;
-	
-	    //是否删除:0-正常；1-删除
+
+	/**
+	 * 是否删除:0-正常；1-删除
+	 */
     @Column(name = "is_del")
 	@ApiModelProperty(value = "是否删除:0-正常；1-删除")
     private Integer isDel;

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/entity/TourTagBanner.java

 package com.xxfc.platform.tour.entity;
 
 import java.io.Serializable;
-import java.util.Date;
 import javax.persistence.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -18,55 +17,75 @@ import lombok.Data;
 @Table(name = "tour_tag_banner")
 public class TourTagBanner implements Serializable {
 	private static final long serialVersionUID = 1L;
-	
-	    //首页banner图主键
+
+	/**
+	 * 首页banner图主键
+	 */
     @Id
 	@GeneratedValue(generator = "JDBC")
 	@ApiModelProperty("首页banner图主键")
     private Long id;
 
-	//标签id
+	/**
+	 * 标签id
+	 */
 	@Column(name = "tag_id")
 	@ApiModelProperty(value = "标签id")
 	private Integer tagId;
 
 
-	//标题
+	/**
+	 * 标题
+	 */
     @Column(name = "title")
 	@ApiModelProperty(value = "标题")
     private String title;
-	
-	    //封面
-    @Column(name = "cover")
+
+	/**
+	 * 封面
+	 */
+	@Column(name = "cover")
 	@ApiModelProperty(value = "封面")
     private String cover;
-	
-	    //创建人
-    @Column(name = "crt_name")
+
+	/**
+	 * 创建人
+	 */
+	@Column(name = "crt_name")
 	@ApiModelProperty(value = "创建人")
     private String crtName;
-	
-	    //创建时间
+
+	/**
+	 * 创建时间
+	 */
     @Column(name = "crt_time")
 	@ApiModelProperty(value = "创建时间", hidden = true )
     private Long crtTime;
-	
-	    //更新人
-    @Column(name = "upd_name")
+
+	/**
+	 * 更新人
+	 */
+	@Column(name = "upd_name")
 	@ApiModelProperty(value = "更新人")
     private String updName;
-	
-	    //修改时间
-    @Column(name = "upd_time")
+
+	/**
+	 * 修改时间
+	 */
+	@Column(name = "upd_time")
 	@ApiModelProperty(value = "修改时间", hidden = true )
     private Long updTime;
-	
-	    //跳转链接
+
+	/**
+	 * 跳转链接
+	 */
     @Column(name = "url")
 	@ApiModelProperty(value = "跳转链接")
     private String url;
-	
-	    //是否删除，0否，1是
+
+	/**
+	 * 是否删除，0否，1是
+	 */
     @Column(name = "is_del")
 	@ApiModelProperty(value = "是否删除，0否，1是")
     private Integer isDel;

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/TourApplication.java

@@ -2,8 +2,6 @@ package com.xxfc.platform.tour;
 
 import com.ace.cache.EnableAceCache;
 import com.github.wxiaoqi.security.auth.client.EnableAceAuthClient;
-import com.spring4all.swagger.EnableSwagger2Doc;
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cache.annotation.EnableCaching;

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourTagBannerBiz.java

 package com.xxfc.platform.tour.biz;
 
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.tour.mapper.TourTagBannerMapper;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.xxfc.platform.tour.entity.TourTagBanner;
@@ -27,4 +27,16 @@ public class TourTagBannerBiz extends BaseBiz<TourTagBannerMapper,TourTagBanner>
         tourTagBanner.setIsDel(0);
         return  mapper.select(tourTagBanner);
     }
+
+
+    /**
+     * 分页查询旅游标签banner数据
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    public PageDataVO<TourTagBanner> findTourTagBannerWithPage(Integer pageNo,Integer pageSize){
+
+        return  PageDataVO.pageInfo(pageNo,pageSize,()->mapper.findAllByState(0));
+    }
 }
\ No newline at end of file

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourTagBiz.java

 package com.xxfc.platform.tour.biz;
 
-import com.ace.cache.annotation.Cache;
 import com.ace.cache.annotation.CacheClear;
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.tour.comstnt.RedisKey;
-import com.xxfc.platform.tour.entity.TourBanner;
 import com.xxfc.platform.tour.mapper.TourTagMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import com.xxfc.platform.tour.entity.TourTag;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 
+import java.time.Instant;
 import java.util.List;
 import java.util.Map;
 
@@ -28,14 +23,6 @@ import java.util.Map;
 @Service
 public class TourTagBiz extends BaseBiz<TourTagMapper,TourTag> {
 
-    @Autowired
-    private RedisTemplate redisTemplate;
-
-
-
-
-    @Autowired
-    private TourTagBiz tagBiz;
 
 //    @Cache(key = RedisKey.CONSTANT_CODE_PREFIX_HOTTAG)
     public List<TourTag> getHotTag() {
@@ -54,8 +41,6 @@ public class TourTagBiz extends BaseBiz<TourTagMapper,TourTag> {
         return PageDataVO.pageInfo((Integer)map.get("page"),(Integer)map.get("limit"),() -> mapper.findAllByIsDel(tag));
     }
 
-
-
     @CacheClear(key = RedisKey.CONSTANT_CODE_PREFIX_HOTTAG)
     public void update(TourTag banner) {
         this.updateSelectiveById(banner);
@@ -67,4 +52,34 @@ public class TourTagBiz extends BaseBiz<TourTagMapper,TourTag> {
         this.deleteById(id);
     }
 
+
+    /**
+     * 分页查询旅游标签
+     * @param pageNo 查询的当前
+     * @param pageSize 分页大小
+     * @return
+     */
+    public PageDataVO<TourTag> findTourTagWithPage(Integer pageNo, Integer pageSize) {
+       return PageDataVO.pageInfo(pageNo, pageSize, () -> mapper.findAllByIsDel(TourTag.builder().isDel(0).build()));
+    }
+
+    /**
+     * 根据主键id查询 旅游标签
+     * @param id
+     * @return
+     */
+    public TourTag findTourTagById(Integer id){
+        return  mapper.findById(id);
+    }
+
+    /**
+     * 保存旅游标签
+     * @param tourTag
+     * @return
+     */
+    public int saveTourTag(TourTag tourTag) {
+         tourTag.setCtrTime(Instant.now().toEpochMilli());
+         tourTag.setUpdTime(Instant.now().toEpochMilli());
+        return mapper.save(tourTag);
+    }
 }
\ No newline at end of file

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/mapper/TourTagBannerMapper.java

 package com.xxfc.platform.tour.mapper;
 
 import com.xxfc.platform.tour.entity.TourTagBanner;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import tk.mybatis.mapper.common.Mapper;
 
+import java.util.List;
+
 /**
  * 标签轮播图
  * 
@@ -11,5 +15,11 @@ import tk.mybatis.mapper.common.Mapper;
  * @date 2019-06-06 11:41:51
  */
 public interface TourTagBannerMapper extends Mapper<TourTagBanner> {
-	
+
+    /**
+     * 根据是否删除状态来查询数据
+     * @param isDel
+     */
+    @Select("select * from tour_tag_banner where id=#{isDel}")
+    List<TourTagBanner> findAllByState(@Param("isDel") int isDel);
 }

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/mapper/TourTagMapper.java

 package com.xxfc.platform.tour.mapper;
 
 import com.xxfc.platform.tour.entity.TourTag;
-import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 旅游路线标签
@@ -17,9 +16,28 @@ import java.util.Map;
  */
 @Repository
 public interface TourTagMapper extends Mapper<TourTag> {
-    @Select("select * from tour_tag where is_del=${isDel} and is_hot=${isHot} order by rank ASC")
+    @Select("select * from tour_tag where is_del=#{isDel} and is_hot=#{isHot} order by rank ASC")
     List<TourTag> findHotListTag(TourTag tag);
 
-    @Select("select * from tour_tag where is_del=${isDel} order by rank ASC")
+    @Select("select * from tour_tag where is_del=#{isDel} order by rank ASC")
+    @ResultMap(value = "tourTagMap")
     List<TourTag> findAllByIsDel(TourTag tagBanner);
+
+    /**
+     * 根据主要id查询
+     * @param id
+     * @return
+     */
+    @Select("select * from tour_tag where id=#{id}")
+    @ResultMap(value = "tourTagMap")
+    TourTag findById(Integer id);
+
+    /**
+     * 保存旅游标签
+     * @param tourTag
+     * @return
+     */
+    @Insert("insert tour_tag(`name`,`img`,`describe`,`link`,`is_hot`,`count`,`rank`,`ctr_time`,`upd_time`,`is_del`)" +
+            "values(#{name},#{img},#{describe},#{link},#{isHot},#{count},#{rank},#{ctrTime},#{updTime},#{isDel})")
+    int save(TourTag tourTag);
 }

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/admin/TourGoodController.java → xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/admin/TourGoodAdminController.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("good")
 @IgnoreClientToken
-public class TourGoodController extends BaseController<TourGoodBiz, TourGood> {
+public class TourGoodAdminController extends BaseController<TourGoodBiz, TourGood> {
 
     /**
      * 查询旅游路线列表

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/admin/TourTagAdminController.java

+package com.xxfc.platform.tour.rest.admin;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.tour.biz.TourTagBiz;
+import com.xxfc.platform.tour.entity.TourTag;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiResponse;
+import org.springframework.web.bind.annotation.*;
+
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description 旅游标签
+ * @data 2019/6/11 9:57
+ */
+@RestController
+@RequestMapping("/admin/tourTag")
+@Api(value = "后台*旅游标签")
+public class TourTagAdminController extends BaseController<TourTagBiz, TourTag> {
+
+    /**
+     * 分页查询标签
+     *
+     * @param pageNo   访问页
+     * @param pageSize 分页大小
+     * @return
+     */
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "pageNo",paramType = "query",dataType = "integer",defaultValue = "0"),
+            @ApiImplicitParam(name = "pageSize",paramType = "query",dataType = "integer",defaultValue = "10")
+    })
+    @ApiResponse(code = 200,message = "Success")
+    @GetMapping("/pages")
+    public ObjectRestResponse<PageDataVO> findTourTageWithPage(@RequestParam(name = "pageNoe", defaultValue = "0",required = false) Integer pageNo,
+                                                               @RequestParam(name = "pageSize", defaultValue = "10",required = false) Integer pageSize) {
+        PageDataVO<TourTag> pageDataVO = getBaseBiz().findTourTagWithPage(pageNo, pageSize);
+        return ObjectRestResponse.succ(pageDataVO);
+    }
+
+    /**
+     * 根据 id 查询旅游标签
+     * @param id
+     * @return
+     */
+    @Override
+    public ObjectRestResponse<TourTag> get(int id) {
+     TourTag tourTag = getBaseBiz().findTourTagById(id);
+     return ObjectRestResponse.succ(tourTag);
+    }
+
+    /**
+     * 保存旅游标签
+     * @param tourTag
+     * @return
+     */
+    @Override
+    public ObjectRestResponse<TourTag> add(@RequestBody TourTag tourTag) {
+        int insertRows = getBaseBiz().saveTourTag(tourTag);
+        if (insertRows>0){
+            return  ObjectRestResponse.succ();
+        }
+        return ObjectRestResponse.createDefaultFail();
+
+    }
+}
\ No newline at end of file

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/admin/TourTagBannerAdminController.java

+package com.xxfc.platform.tour.rest.admin;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.tour.biz.TourTagBannerBiz;
+import com.xxfc.platform.tour.entity.TourTagBanner;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import org.springframework.web.bind.annotation.*;
+
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description 旅游标签banner
+ * @data 2019/6/11 9:45
+ */
+@RestController
+@RequestMapping("/admin/tourTagBanner")
+@Api(value = "后台*旅游标签banner接口")
+public class TourTagBannerAdminController extends BaseController<TourTagBannerBiz,TourTagBanner> {
+
+
+    /**
+     * 分页查询旅游标签banner数据
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "pageNo",paramType = "query",dataType = "integer",defaultValue = "0"),
+            @ApiImplicitParam(name = "pageSize",paramType = "query",dataType = "integer",defaultValue = "10")
+    })
+     @GetMapping("/pages")
+    public ObjectRestResponse<PageDataVO<TourTagBanner>> findTourTagBannerWithPage(@RequestParam(name = "pageNo",required = false,defaultValue = "0")Integer pageNo,
+                                                                                   @RequestParam(name = "pageSize",required = false,defaultValue = "10")Integer pageSize){
+         PageDataVO<TourTagBanner> tagBannerPageDataVO = getBaseBiz().findTourTagBannerWithPage(pageNo, pageSize);
+         return ObjectRestResponse.succ(tagBannerPageDataVO);
+    }
+}
\ No newline at end of file