轮播图版本区分

platform-admin/src/main/resources/com/platform/dao/TbCfHomePageDao.xml

@@ -47,9 +47,11 @@
         from tb_cf_home_page
         WHERE 1=1
         <if test="name != null and name.trim() != ''">
-            AND name LIKE concat('%',#{name},'%')
+            AND img_name LIKE concat('%',#{name},'%')
+        </if>
+        <if test="version != null and version.trim() != ''">
+            AND img_version =#{version}
         </if>
-
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
                 order by ${sidx} ${order}
@@ -67,7 +69,10 @@
         select count(*) from tb_cf_home_page
         WHERE 1=1
         <if test="name != null and name.trim() != ''">
-            AND name LIKE concat('%',#{name},'%')
+            AND img_name LIKE concat('%',#{name},'%')
+        </if>
+        <if test="version != null and version.trim() != ''">
+            AND img_version =#{version}
         </if>
     </select>
 

platform-admin/src/main/webapp/WEB-INF/page/sys/tbcfhomepage.html

@@ -98,9 +98,21 @@
     <div v-show="showList" style="height: 100%;">
         <Row :gutter="16">
             <div class="search-group">
-                <i-col span="4">
-                    <i-input v-model="q.name" @on-enter="query" placeholder="名称"/>
-                </i-col>
+                <span>
+                    名称：
+                    <i-input v-model="q.name" @on-enter="query" placeholder="名称" style="width:160px"/>
+                </span>
+
+                &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
+                <span>
+                    版本：
+                    <i-select v-model="q.version" @on-enter="query"
+                              placeholder="版本" style="width:160px">
+                        <i-option v-for="(el,i) in versionList" :key='i'
+                                  :value="el.value">{{el.label}}
+                                 </i-option>
+                    </i-select>
+                 </span>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>
             </div>
@@ -298,10 +310,10 @@
             <!--            </Form-item>-->
             <Form-item label="是否展示" prop="enableFlag">
                 <i-select placeholder="请选择" v-model="tbCfHomePage.enableFlag">
-                <i-option v-for="(el,i) in chooseOptions" :key='i'
-                          :value="el.value">{{el.label}}
-                </i-option>
-            </i-select>
+                    <i-option v-for="(el,i) in chooseOptions" :key='i'
+                              :value="el.value">{{el.label}}
+                    </i-option>
+                </i-select>
             </Form-item>
             <Form-item>
                 <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>

platform-admin/src/main/webapp/js/sys/tbcfhomepage.js

@@ -29,6 +29,20 @@ $(function () {
 let vm = new Vue({
     el: '#rrapp',
     data: {
+        versionList: [
+            {
+                value: 0,
+                label: 'app旧版'
+            },
+            {
+                value: 1,
+                label: 'app新版'
+            },
+            {
+                value: 2,
+                label: 'PC官网'
+            }
+        ],
         chooseOptions: null,
         typeActive: 0, //显示索引
         items: [
@@ -150,7 +164,8 @@ let vm = new Vue({
             ]
         },
         q: {
-            name: ''
+            name: '',
+            version: ''
         },
         version: '',
         versionOptions: [
@@ -288,14 +303,15 @@ let vm = new Vue({
             vm.showList = true;
             let page = $("#jqGrid").jqGrid('getGridParam', 'page');
             $("#jqGrid").jqGrid('setGridParam', {
-                postData: {'name': vm.q.name},
+                postData: {'name': vm.q.name, 'version': vm.q.version},
                 page: page
             }).trigger("reloadGrid");
             vm.handleReset('formValidate');
         },
         reloadSearch: function () {
             vm.q = {
-                name: ''
+                name: '',
+                version: ''
             };
             vm.reload();
         },

platform-common/src/main/java/com/platform/utils/OssUtil.java

@@ -382,11 +382,11 @@ public class OssUtil {
     }
 
     public static void main(String[] args) throws Exception {
-        File file = new File("C:\\Users\\Administrator\\Pictures\\year.jpg");
+        File file = new File("D:\\123.png");
         byte[] b = File2byte(file);
         System.out.println(b);
 //        boolean flag = deleteFile("https://diaosaas-prod.oss-cn-shenzhen.aliyuncs.com/africa-shop/Afrishop/157865444910310855.png");
-        String s = upload(b, "year.jpg", "Afrishop");
+        String s = upload(b, "afrishop", "Afrishop");
         System.out.println(s);
 //        System.out.println(flag);