feat:轮播图调整

ruoyi-admin/src/main/java/com/ruoyi/web/controller/home/HomeController.java

@@ -75,7 +75,7 @@ public class HomeController {
 	@GetMapping("/home")
 	public String home(ModelMap mmap) {
 		//最新通知
-		List<SysNotice> urlList = noticeService.selectNoticeHomeUrl(new SysNotice());
+		List<SysWork> urlList = workService.selectWorkHomeUrl(new SysWork());
 		mmap.put("urlList", urlList);
 		List<SysNotice> list = noticeService.selectNoticeHomeList(new SysNotice());
 		mmap.put("noticeList", list);
@@ -132,7 +132,7 @@ public class HomeController {
 	@GetMapping("/base.html")
 	public String base(ModelMap mmap) {
 		//最新通知
-		List<SysNotice> urlList = noticeService.selectNoticeHomeUrl(new SysNotice());
+		List<SysWork> urlList = workService.selectWorkHomeUrl(new SysWork());
 		mmap.put("urlList", urlList);
 		List<SysNotice> list = noticeService.selectNoticeHomeList(new SysNotice());
 		mmap.put("noticeList", list);

ruoyi-admin/src/main/resources/templates/home/base.html

@@ -396,7 +396,7 @@
                 <div class="layui-carousel" id="ID-carousel-demo-image" style="width: 650px;height: 433px;">
                     <div carousel-item>
                         <tbody th:each="url,status : ${urlList}">
-                        <img th:src="${url.noticeUrl}">
+                        <img th:src="${url.imgUrl}">
                         </tbody>
                     </div>
                 </div>

ruoyi-admin/src/main/resources/templates/system/notice/add.html

@@ -30,22 +30,7 @@
 				    <div class="summernote"></div>
 				</div>
 			</div>
-			<div class="form-group">
+
-				<label class="col-sm-2 control-label is-required">轮播图片上传：</label>
-				<br/>
-				<div class="fileinput fileinput-new" data-provides="fileinput">
-					<div class="fileinput-preview thumbnail" data-trigger="fileinput" style="width: 200px; height: 150px;"></div>
-					<div>
-						<span class="btn btn-white btn-file">
-							<span class="fileinput-new">选择图片</span>
-							<span class="fileinput-exists">更改</span>
-							<input type="file" id="noticeUrlId" required>
-							<input type="hidden" id="noticeUrl" name="noticeUrl">
-						</span>
-						<a href="#" class="btn btn-white fileinput-exists" data-dismiss="fileinput">清除</a>
-					</div>
-				</div>
-			</div>
 			<div class="form-group">
 				<label class="col-sm-2 control-label">文件上传：</label>
 				<br/>
@@ -127,33 +112,7 @@
 				$.operate.save(prefix + "/add", $('#form-notice-add').serialize());
 	        }
 	    }
-		//图片上传
-		$('#noticeUrlId').on('change.bs.fileinput ', function (e) {
-			// 处理自己的业务
-			var file = e.target.files[0];
-			var data = new FormData();
-			data.append("file", file);
-			$.ajax({
-				type: "POST",
-				url: ctx + "common/upload",
-				data: data,
-				cache: false,
-				contentType: false,
-				processData: false,
-				dataType: 'json',
-				success: function(result) {
-					if (result.code == web_status.SUCCESS) {
-						$("#noticeUrl").val(result.url);
-					} else {
-						$.modal.alertError(result.msg);
-					}
-				},
-				error: function(error) {
-					$.modal.alertWarning("图片上传失败。");
-				}
-			});
 
-		});
 		//文件上传
 		$('#fileUrlId').on('change.bs.fileinput ', function (e) {
 			// 处理自己的业务

ruoyi-admin/src/main/resources/templates/system/notice/edit.html

@@ -31,25 +31,6 @@
                     <div id="editor" class="summernote"></div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-2 control-label is-required">轮播图片上传：</label>
-                <br/>
-                <div class="fileinput fileinput-new" data-provides="fileinput">
-                    <div class="fileinput-new thumbnail" style="width: 140px; height: 140px;">
-                        <img th:src="*{noticeUrl}">
-                    </div>
-                    <div class="fileinput-preview thumbnail" data-trigger="fileinput" style="width: 200px; height: 150px;"></div>
-                    <div>
-						<span class="btn btn-white btn-file">
-                            <span class="fileinput-new">选择图片</span>
-                            <span class="fileinput-exists">更改</span>
-							<input type="file" id="noticeUrlId">
-                            <input id="noticeUrl" name="noticeUrl" th:field="*{noticeUrl}" type="hidden">
-						</span>
-                        <a href="#" class="btn btn-white fileinput-exists" data-dismiss="fileinput">清除</a>
-                    </div>
-                </div>
-            </div>
 
             <div class="form-group">
                 <label class="col-sm-2 control-label">文件上传：</label>
@@ -137,33 +118,7 @@
 				$.operate.save(prefix + "/edit", $('#form-notice-edit').serialize());
 	        }
 	    }
-        //图片上传
-        $('#noticeUrlId').on('change.bs.fileinput ', function (e) {
-            // 处理自己的业务
-            var file = e.target.files[0];
-            var data = new FormData();
-            data.append("file", file);
-            $.ajax({
-                type: "POST",
-                url: ctx + "common/upload",
-                data: data,
-                cache: false,
-                contentType: false,
-                processData: false,
-                dataType: 'json',
-                success: function(result) {
-                    if (result.code == web_status.SUCCESS) {
-                        $("#noticeUrl").val(result.url);
-                    } else {
-                        $.modal.alertError(result.msg);
-                    }
-                },
-                error: function(error) {
-                    $.modal.alertWarning("图片上传失败。");
-                }
-            });
 
-        });
         //文件上传
         $('#fileUrlId').on('change.bs.fileinput ', function (e) {
             // 处理自己的业务

ruoyi-admin/src/main/resources/templates/system/work/add.html

@@ -21,6 +21,23 @@
 				    <div class="summernote"></div>
 				</div>
 			</div>
+
+			<div class="form-group">
+				<label class="col-sm-2 control-label is-required">轮播图片上传：</label>
+				<br/>
+				<div class="fileinput fileinput-new" data-provides="fileinput">
+					<div class="fileinput-preview thumbnail" data-trigger="fileinput" style="width: 200px; height: 150px;"></div>
+					<div>
+						<span class="btn btn-white btn-file">
+							<span class="fileinput-new">选择图片</span>
+							<span class="fileinput-exists">更改</span>
+							<input type="file" id="imgUrlId" required>
+							<input type="hidden" id="imgUrl" name="imgUrl">
+						</span>
+						<a href="#" class="btn btn-white fileinput-exists" data-dismiss="fileinput">清除</a>
+					</div>
+				</div>
+			</div>
 			<div class="form-group">
 				<label class="col-sm-2 control-label">文件上传：</label>
 				<br/>
@@ -103,6 +120,35 @@
 	        }
 	    }
 
+
+		//图片上传
+		$('#imgUrlId').on('change.bs.fileinput ', function (e) {
+			// 处理自己的业务
+			var file = e.target.files[0];
+			var data = new FormData();
+			data.append("file", file);
+			$.ajax({
+				type: "POST",
+				url: ctx + "common/upload",
+				data: data,
+				cache: false,
+				contentType: false,
+				processData: false,
+				dataType: 'json',
+				success: function(result) {
+					if (result.code == web_status.SUCCESS) {
+						$("#imgUrl").val(result.url);
+					} else {
+						$.modal.alertError(result.msg);
+					}
+				},
+				error: function(error) {
+					$.modal.alertWarning("图片上传失败。");
+				}
+			});
+
+		});
+
 		//文件上传
 		$('#fileUrlId').on('change.bs.fileinput ', function (e) {
 			// 处理自己的业务

ruoyi-admin/src/main/resources/templates/system/work/edit.html

@@ -22,6 +22,25 @@
                     <div id="editor" class="summernote"></div>
                 </div>
             </div>
+            <div class="form-group">
+                <label class="col-sm-2 control-label is-required">轮播图片上传：</label>
+                <br/>
+                <div class="fileinput fileinput-new" data-provides="fileinput">
+                    <div class="fileinput-new thumbnail" style="width: 140px; height: 140px;">
+                        <img th:src="*{imgUrl}">
+                    </div>
+                    <div class="fileinput-preview thumbnail" data-trigger="fileinput" style="width: 200px; height: 150px;"></div>
+                    <div>
+						<span class="btn btn-white btn-file">
+                            <span class="fileinput-new">选择图片</span>
+                            <span class="fileinput-exists">更改</span>
+							<input type="file" id="imgUrlId">
+                            <input id="imgUrl" name="imgUrl" th:field="*{imgUrl}" type="hidden">
+						</span>
+                        <a href="#" class="btn btn-white fileinput-exists" data-dismiss="fileinput">清除</a>
+                    </div>
+                </div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-2 control-label">文件上传：</label>
                 <br/>
@@ -107,6 +126,34 @@
 				$.operate.save(prefix + "/edit", $('#form-work-edit').serialize());
 	        }
 	    }
+
+        //图片上传
+        $('#imgUrlId').on('change.bs.fileinput ', function (e) {
+            // 处理自己的业务
+            var file = e.target.files[0];
+            var data = new FormData();
+            data.append("file", file);
+            $.ajax({
+                type: "POST",
+                url: ctx + "common/upload",
+                data: data,
+                cache: false,
+                contentType: false,
+                processData: false,
+                dataType: 'json',
+                success: function(result) {
+                    if (result.code == web_status.SUCCESS) {
+                        $("#imgUrl").val(result.url);
+                    } else {
+                        $.modal.alertError(result.msg);
+                    }
+                },
+                error: function(error) {
+                    $.modal.alertWarning("图片上传失败。");
+                }
+            });
+        });
+
         //文件上传
         $('#fileUrlId').on('change.bs.fileinput ', function (e) {
             // 处理自己的业务

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysWork.java

@@ -40,6 +40,9 @@ public class SysWork extends BaseEntity {
     /** 文件地址 */
     private String fileName;
 
+    /** 首页图片*/
+    private String imgUrl;
+
 
 
     public String getWorkId()
@@ -116,6 +119,14 @@ public class SysWork extends BaseEntity {
         return fileName;
     }
 
+    public String getImgUrl() {
+        return imgUrl;
+    }
+
+    public void setImgUrl(String imgUrl) {
+        this.imgUrl = imgUrl;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -131,6 +142,7 @@ public class SysWork extends BaseEntity {
                 .append("type", getType())
                 .append("fileUrl",getFileUrl())
                 .append("fileName",getFileName())
+                .append("imgUrl",getImgUrl())
                 .toString();
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysWorkMapper.java

@@ -58,4 +58,12 @@ public interface SysWorkMapper {
      * @return 公告集合
      */
     public List<SysWork> selectSysWorkHomeList(SysWork work);
+
+    /**
+     * 查询工作列表
+     *
+     * @param work 工作信息
+     * @return 公告集合
+     */
+    public List<SysWork> selectWorkHomeUrl(SysWork work);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysWorkService.java

@@ -59,4 +59,12 @@ public interface ISysWorkService {
      */
     public List<SysWork> selectSysWorkHomeList(SysWork work);
 
+    /**
+     * 查询工作列表
+     *
+     * @param work 工作信息
+     * @return 公告集合
+     */
+    public List<SysWork> selectWorkHomeUrl(SysWork work);
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysWorkServiceImpl.java

@@ -89,4 +89,17 @@ public class SysWorkServiceImpl implements ISysWorkService {
     {
         return workMapper.selectSysWorkHomeList(work);
     }
+
+
+    /**
+     * 查询工作列表
+     *
+     * @param work 工作信息
+     * @return 工作集合
+     */
+    @Override
+    public List<SysWork> selectWorkHomeUrl(SysWork work)
+    {
+        return workMapper.selectWorkHomeUrl(work);
+    }
 }

ruoyi-system/src/main/resources/mapper/system/SysWorkMapper.xml

@@ -17,10 +17,11 @@
         <result property="type"         column="type"          />
         <result property="fileUrl"         column="file_url"          />
         <result property="fileName"         column="file_name"          />
+        <result property="imgUrl"         column="img_url"          />
     </resultMap>
 
     <sql id="selectSysWorkVo">
-        select work_id, work_title, work_content, status, create_by, create_time, update_by, update_time, remark,type,file_url,file_name
+        select work_id, work_title, work_content, status, create_by, create_time, update_by, update_time, remark,type,file_url,file_name,img_url
         from sys_work
     </sql>
 
@@ -56,6 +57,7 @@
         <if test="type != null and createBy != ''">type,</if>
         <if test="fileUrl != null and fileUrl != '' ">file_url, </if>
         <if test="fileName != null and fileName != '' ">file_name, </if>
+        <if test="imgUrl != null and imgUrl != '' ">img_url, </if>
         create_time
         )values(
         <if test="workId != null and workId != ''">#{workId}, </if>
@@ -67,6 +69,7 @@
         <if test="type != null and type != ''">#{type},</if>
         <if test="fileUrl != null and fileUrl != ''">#{fileUrl}, </if>
         <if test="fileName != null and fileName != ''">#{fileName}, </if>
+        <if test="imgUrl != null and imgUrl != ''">#{imgUrl}, </if>
         now()
         )
     </insert>
@@ -80,6 +83,7 @@
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="fileUrl != null">file_url = #{fileUrl}, </if>
             <if test="fileName != null">file_name = #{fileName}, </if>
+            <if test="imgUrl != null">img_url = #{imgUrl}, </if>
             update_time = now()
         </set>
         where work_id = #{workId}
@@ -106,4 +110,15 @@
         order by create_time desc limit 10
     </select>
 
+    <select id="selectWorkHomeUrl" parameterType="SysWork" resultMap="SysWorkResult">
+        <include refid="selectSysWorkVo"/>
+        <where>
+            <if test="workTitle != null and workTitle != ''">
+                AND work_title like concat('%', #{workTitle}, '%')
+            </if>
+            AND status = '0'
+        </where>
+        order by create_time desc limit 6
+    </select>
+
 </mapper>