修复 bug, 去掉【跳转描述】字段；【URL】字段及及提示文案改成“跳转链接”

CODE/smart-community/operate-api/src/main/java/com/community/huiju/controller/BannerController.java

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpSession;
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * @author weiximei
@@ -107,12 +108,12 @@ public class BannerController {
 
     @ApiOperation(value = "删除banner",notes = "根据bannerId删除banner")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "path",dataType = "Integer",name = "bannerId",value = "banner的id")
+            @ApiImplicitParam(paramType = "body",dataType = "List<Integer>",name = "list",value = "banner的id")
     })
-    @RequestMapping(value = "/banner/{bannerId}",method = RequestMethod.DELETE)
-    public ResponseBean deleteBanner(@PathVariable(value = "bannerId") Integer bannerId){
+    @RequestMapping(value = "/banner",method = RequestMethod.DELETE)
+    public ResponseBean deleteBanner(@RequestBody List<Integer> list){
         ResponseBean response = new ResponseBean();
-        response = iToBannerService.deleteBanner(bannerId);
+        response = iToBannerService.deleteBanner(list);
         return response;
     }
 

CODE/smart-community/operate-api/src/main/java/com/community/huiju/dao/ToBannerMapper.java

@@ -34,4 +34,11 @@ public interface ToBannerMapper {
      */
     List<ToBanner> selectBanner(ToBanner toBanner);
 
+    /**
+     * 批量删除
+     * @param list
+     * @return
+     */
+    int deleteBanchBanner(List<Integer> list);
+
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/model/ToBanner.java

@@ -14,7 +14,7 @@ public class ToBanner {
     @Min(value = 0,message = "小区不能为空!")
     private Integer communityId;
 
-    @NotBlank(message = "跳转描述不能为空!")
+    // @NotBlank(message = "跳转描述不能为空!")
     private String bannerDescription;
 
     private Integer sort;

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/IToBannerService.java

@@ -3,6 +3,8 @@ package com.community.huiju.service;
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.model.ToBanner;
 
+import java.util.List;
+
 /**
  * banner 业务管理
  * @author weiximei
@@ -54,4 +56,11 @@ public interface IToBannerService {
      */
     ResponseBean deleteBanner(Integer bannerId);
 
+    /**
+     * 根据bannerId 删除 banner
+     * @param listBannerId
+     * @return
+     */
+    ResponseBean deleteBanner(List<Integer> listBannerId);
+
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ToBannerServiceImpl.java

@@ -107,6 +107,10 @@ public class ToBannerServiceImpl implements IToBannerService {
     public ResponseBean modifyBanner(ToBanner banner,Integer currentUserId) {
         ResponseBean response = new ResponseBean();
         if (Constant.BANNER_TYPE_ARTICLE.equals(banner.getBannerType())) {
+            if (StringUtils.isBlank(banner.getBannerTitle())) {
+                response.addError("Banner标题不能为空");
+                return response;
+            }
             if (StringUtils.isBlank(banner.getBannerContent())) {
                 response.addError("Banner内容不能为空");
                 return response;
@@ -195,4 +199,21 @@ public class ToBannerServiceImpl implements IToBannerService {
 
         return response;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseBean deleteBanner(List<Integer> listBannerId) {
+        ResponseBean responseBean = new ResponseBean();
+        if (listBannerId.isEmpty() || listBannerId.size() == 0) {
+            responseBean.addError("请选择需要删除的数据!");
+            return responseBean;
+        }
+        int rows = toBannerMapper.deleteBanchBanner(listBannerId);
+        if (rows > 0) {
+            responseBean.addSuccess("操作成功!");
+            return responseBean;
+        }
+        responseBean.addError("操作失败!");
+        return responseBean;
+    }
 }

CODE/smart-community/operate-api/src/main/resources/mapper/ToBannerMapper.xml

@@ -281,4 +281,12 @@
     </trim>
     order by create_date DESC
   </select>
+
+  <delete id="deleteBanchBanner" parameterType="list">
+    delete from to_banner
+    where id in
+    <foreach collection="list" item="item" separator="," index="index" open="(" close=")">
+      #{item,jdbcType=INTEGER}
+    </foreach>
+  </delete>
 </mapper>

VUECODE/smart-operate-manage/src/api/banner.js

@@ -27,11 +27,12 @@ export function updateBanner(banner) {
   })
 }
 
-// 删除 banner
+// 删除 banner, 批量[10,25,65]
 export function deleteBanner(bannerId) {
   return request({
-    url: '/banner/' + bannerId,
-    method: 'delete'
+    url: '/banner',
+    method: 'delete',
+    data: bannerId
   })
 }
 

VUECODE/smart-operate-manage/src/views/banner/addBanner/index.vue

@@ -41,19 +41,19 @@
           <!-- <el-option label="区域一" value="shanghai"/> -->
         </el-select>
       </el-form-item>
-      <el-form-item :label-width="formLabelWidth" label="跳转描述">
+      <!-- <el-form-item :label-width="formLabelWidth" label="跳转描述">
         <el-input
           v-model="addForm.bannerDescription"
           :autosize="{ minRows: 2, maxRows: 4}"
           type="textarea"
           placeholder="请输入跳转描述"/>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item :label-width="formLabelWidth" label="banner跳转">
         <el-radio v-model="addForm.bannerType" label="1" @change="showContent">外部超链接</el-radio>
         <el-radio v-model="addForm.bannerType" label="2" @change="showContent">自写文章</el-radio>
       </el-form-item>
-      <el-form-item v-if="showURLVisible" :label-width="formLabelWidth" label="URL">
-        <el-input v-model="addForm.externalLink" placeholder="URL"/>
+      <el-form-item v-if="showURLVisible" :label-width="formLabelWidth" label="跳转链接">
+        <el-input v-model="addForm.externalLink" placeholder="跳转链接"/>
       </el-form-item>
       <div v-if="showContentVisible">
         <el-form-item :label-width="formLabelWidth" label="内容标题">
@@ -201,15 +201,13 @@ export default {
         if (valid) {
           this.$store.dispatch('AddBanner', this.addForm).then((res) => {
             if (res.code === '0') {
-              this.$notify({
-                title: '操作成功!',
+              this.$message({
                 message: res.message,
                 type: 'success'
               })
               this.$router.push({ name: 'banner-index', params: { listQuery: this.listQuery }})
             } else {
-              this.$notify({
-                title: '操作失败',
+              this.$message({
                 message: res.message,
                 type: 'warning'
               })

VUECODE/smart-operate-manage/src/views/banner/ediBanner/index.vue

@@ -206,15 +206,13 @@ export default {
         if (valid) {
           this.$store.dispatch('UpdateBanner', this.form).then((res) => {
             if (res.code === '0') {
-              this.$notify({
-                title: '操作成功!',
+              this.$message({
                 message: res.message,
                 type: 'success'
               })
               this.$router.push({ name: 'banner-index', params: { listQuery: this.listQuery }})
             } else {
-              this.$notify({
-                title: '操作失败',
+              this.$message({
                 message: res.message,
                 type: 'warning'
               })

VUECODE/smart-operate-manage/src/views/banner/index.vue

@@ -19,6 +19,7 @@
 
     <el-row style="margin-top: 20px; margin-bottom: 20px;">
       <el-button type="primary" icon="el-icon-circle-plus" @click="dialogAddForm">添加</el-button>
+      <el-button type="danger" icon="el-icon-delete" @click="deleteBanner">删除</el-button>
       <!-- <el-button type="primary" icon="el-icon-edit">设置轮播数</el-button> -->
     </el-row>
 
@@ -31,14 +32,14 @@
       highlight-current-row
       style="width: 100%; margin-top: 20px;"
       @selection-change="handleSelectionChange">
-      <el-table-column label="选择" type="selection" sortable="custom" align="center" width="50">
+      <el-table-column label="选择" type="selection" sortable="custom" align="center" >
       </el-table-column>
-      <el-table-column label="编号" width="150px" align="center">
+      <el-table-column label="编号" align="center" min-width="30px">
         <template slot-scope="scope">
           <span>{{ scope.row.id }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="标题" align="center">
+      <el-table-column label="标题" align="center" min-width="250px">
         <template slot-scope="scope">
           <!-- <span class="link-type" @click="handleUpdate(scope.row)">{{ scope.row.title }}</span> -->
           <el-tag>{{ scope.row.title }}</el-tag>
@@ -79,10 +80,9 @@
           <span>{{ scope.row.updateUserName }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" class-name="status-col" width="300" align="center">
+      <el-table-column label="操作" class-name="status-col" align="center">
         <template slot-scope="scope">
           <el-button type="primary" icon="el-icon-edit" @click="updateBanner(scope.row.id)">修改</el-button>
-          <el-button type="danger" icon="el-icon-delete" @click="deleteBanner(scope.row.id)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -165,7 +165,8 @@ export default {
       bannerPositionArr: [
         { id: 1, value: '首页banner' },
         { id: 2, value: '服务banner' }
-      ]
+      ],
+      deleteBannerId: []
     }
   },
   computed: {
@@ -187,29 +188,35 @@ export default {
       'CreateCommunity',
       'UpdateCommunity'
     ]),
-    deleteBanner(bannerId) {
+    deleteBanner() {
       this.$confirm('您确定删除此banner吗?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        this.$store.dispatch('DeleteBanner', bannerId).then((res) => {
-          console.log('删除操作: ' + res.code)
-          if (res.code === '0') {
-            this.$notify({
-              title: '操作成功!',
-              message: res.message,
-              type: 'success'
-            })
-            this.getList()
-          } else {
-            this.$notify({
-              title: '操作失败',
-              message: res.message,
-              type: 'warning'
-            })
-          }
-        })
+        console.log(this.deleteBannerId)
+        if (this.deleteBannerId.length === 0) {
+          this.$message({
+            message: '请选择需要删除的数据!',
+            type: 'warning'
+          })
+        } else {
+          this.$store.dispatch('DeleteBanner', this.deleteBannerId).then((res) => {
+            if (res.code === '0') {
+              this.$message({
+                message: res.message,
+                type: 'success'
+              })
+              this.deleteBannerId = []
+              this.getList()
+            } else {
+              this.$message({
+                message: res.message,
+                type: 'warning'
+              })
+            }
+          })
+        }
       }).catch(() => {
         this.$message({
           type: 'info',
@@ -284,7 +291,11 @@ export default {
       row.status = status
     },
     handleSelectionChange(data) {
-      console.log('多选框 :', data)
+      this.deleteBannerId = []
+      const bannerIdArr = this.deleteBannerId
+      for (const i in data) {
+        bannerIdArr.push(data[i].id)
+      }
     },
     handleSearch() {
       this.getList()