wwl il y a 4 ans
Parent
commit
df5bd908be

+ 4 - 3
zzjs-admin/src/main/java/com/miaxis/pc/controller/carousel/CarouselChartInfoController.java

@@ -2,6 +2,7 @@ package com.miaxis.pc.controller.carousel;
 
 import com.miaxis.carousel.domain.CarouselChartInfo;
 import com.miaxis.carousel.service.ICarouselChartInfoService;
+import com.miaxis.carousel.vo.CarouselChartInfoVo;
 import com.miaxis.common.annotation.Log;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;
@@ -39,9 +40,9 @@ public class CarouselChartInfoController extends BaseController{
             @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
             @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
     })
-    public ResponsePageInfo<CarouselChartInfo> list(@ModelAttribute CarouselChartInfo carouselChartInfo){
+    public ResponsePageInfo<CarouselChartInfoVo> list(@ModelAttribute CarouselChartInfo carouselChartInfo){
         startPage();
-        List<CarouselChartInfo> list = carouselChartInfoService.selectCarouselChartInfoList(carouselChartInfo);
+        List<CarouselChartInfoVo> list = carouselChartInfoService.selectCarouselChartInfoList(carouselChartInfo);
         return toResponsePageInfo(list);
     }
 
@@ -64,7 +65,7 @@ public class CarouselChartInfoController extends BaseController{
      */
     @PreAuthorize("@ss.hasPermi('carousel:carousel:remove')")
     @Log(title = "轮播图", businessType = BusinessTypeEnum.UPDATE)
-	@DeleteMapping("/{ids}")
+	@PutMapping("/{ids}")
     @ApiOperation("删除轮播图")
     public  Response<Integer> remove(
             @ApiParam(name = "ids", value = "轮播图ids参数", required = true)

+ 2 - 1
zzjs-service/src/main/java/com/miaxis/carousel/mapper/CarouselChartInfoMapper.java

@@ -3,6 +3,7 @@ package com.miaxis.carousel.mapper;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.carousel.domain.CarouselChartInfo;
+import com.miaxis.carousel.vo.CarouselChartInfoVo;
 
 /**
  * 轮播图Mapper接口
@@ -17,6 +18,6 @@ public interface CarouselChartInfoMapper extends BaseMapper<CarouselChartInfo> {
      * @param carouselChartInfo 轮播图
      * @return 轮播图集合
      */
-    List<CarouselChartInfo> selectCarouselChartInfoList(CarouselChartInfo carouselChartInfo);
+    List<CarouselChartInfoVo> selectCarouselChartInfoList(CarouselChartInfo carouselChartInfo);
 
 }

+ 2 - 1
zzjs-service/src/main/java/com/miaxis/carousel/service/ICarouselChartInfoService.java

@@ -3,6 +3,7 @@ package com.miaxis.carousel.service;
 import java.util.List;
 import com.miaxis.carousel.domain.CarouselChartInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.carousel.vo.CarouselChartInfoVo;
 import com.miaxis.common.core.domain.Response;
 
 /**
@@ -18,7 +19,7 @@ public interface ICarouselChartInfoService extends IService<CarouselChartInfo>{
      * @param carouselChartInfo 轮播图
      * @return 轮播图集合
      */
-    List<CarouselChartInfo> selectCarouselChartInfoList(CarouselChartInfo carouselChartInfo);
+    List<CarouselChartInfoVo> selectCarouselChartInfoList(CarouselChartInfo carouselChartInfo);
 
     /**
      * 删除轮播图(伪删除)

+ 2 - 1
zzjs-service/src/main/java/com/miaxis/carousel/service/impl/CarouselChartInfoServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.miaxis.carousel.domain.CarouselChartInfo;
 import com.miaxis.carousel.mapper.CarouselChartInfoMapper;
 import com.miaxis.carousel.service.ICarouselChartInfoService;
+import com.miaxis.carousel.vo.CarouselChartInfoVo;
 import com.miaxis.common.core.domain.Response;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -31,7 +32,7 @@ public class CarouselChartInfoServiceImpl extends ServiceImpl<CarouselChartInfoM
      * @return 轮播图
      */
     @Override
-    public List<CarouselChartInfo> selectCarouselChartInfoList(CarouselChartInfo carouselChartInfo){
+    public List<CarouselChartInfoVo> selectCarouselChartInfoList(CarouselChartInfo carouselChartInfo){
         return carouselChartInfoMapper.selectCarouselChartInfoList(carouselChartInfo);
     }
 

+ 39 - 0
zzjs-service/src/main/java/com/miaxis/carousel/vo/CarouselChartInfoVo.java

@@ -0,0 +1,39 @@
+package com.miaxis.carousel.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 轮播图对象返回参
+ *
+ * @author miaxis
+ * @date 2021-03-11
+ */
+@Data
+@ApiModel(value = "CarouselChartInfoVo", description = "轮播图对象返回参")
+public class CarouselChartInfoVo{
+
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    /** 图片名称 */
+    @ApiModelProperty(value = "图片名称")
+    private String pictureName;
+
+    /** 图片id--对应file_info的id */
+    @ApiModelProperty(value = "图片访问地址")
+    private String fileUrl;
+
+    /** 状态  0:有效(默认)、1:失效 (伪删除) */
+    @ApiModelProperty(value = "状态  0:有效(默认)、1:失效 (伪删除)")
+    private Integer status;
+
+}

+ 8 - 2
zzjs-service/src/main/resources/mapper/carousel/CarouselChartInfoMapper.xml

@@ -17,8 +17,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, picture_name, file_id, create_time, update_time, status from carousel_chart_info
     </sql>
 
-    <select id="selectCarouselChartInfoList" parameterType="CarouselChartInfo" resultMap="CarouselChartInfoResult">
-        <include refid="selectCarouselChartInfoVo"/>
+    <select id="selectCarouselChartInfoList" resultType="com.miaxis.carousel.vo.CarouselChartInfoVo">
+        select
+        ci.id,
+        ci.picture_name as pictureName,
+        f.file_url as fileUrl,
+        ci.status
+        from carousel_chart_info ci
+        LEFT JOIN file_info f on f.file_id = ci.file_id
         <where>
             <if test="pictureName != null  and pictureName != ''"> and picture_name like concat('%', #{pictureName}, '%')</if>
             <if test="fileId != null "> and file_id = #{fileId}</if>