Browse Source

image完善

chenzhengming 2 years ago
parent
commit
d3c112f31d

+ 2 - 0
ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -3,6 +3,7 @@ package com.ruoyi;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 /**
@@ -10,6 +11,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
  * 
  * @author ruoyi
  */
+@EnableTransactionManagement//事务
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
 public class RuoYiApplication
 {

+ 3 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/LcdInfoController.java

@@ -5,6 +5,7 @@ import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.system.domain.vo.LcdInfoVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -78,9 +79,9 @@ public class LcdInfoController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:info:add')")
     @Log(title = "消息", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody LcdInfo lcdInfo)
+    public AjaxResult add(@RequestBody LcdInfoVo lcdInfoVo)
     {
-        return toAjax(lcdInfoService.insertLcdInfo(lcdInfo));
+        return toAjax(lcdInfoService.insertLcdInfo(lcdInfoVo));
     }
 
     /**

+ 13 - 0
ruoyi-system/src/main/java/com/ruoyi/system/domain/LcdInfo.java

@@ -33,6 +33,18 @@ public class LcdInfo extends BaseEntity
     @Excel(name = "详细内容")
     private String detail;
 
+    /** 图片名称 */
+    @Excel(name = "图片名称")
+    private String image;
+
+    public String getImage() {
+        return image;
+    }
+
+    public void setImage(String image) {
+        this.image = image;
+    }
+
     public void setId(Long id)
     {
         this.id = id;
@@ -81,6 +93,7 @@ public class LcdInfo extends BaseEntity
                 .append("createTime", getCreateTime())
                 .append("updateBy", getUpdateBy())
                 .append("updateTime", getUpdateTime())
+                .append("image",getImage())
                 .toString();
     }
 }

+ 28 - 20
ruoyi-system/src/main/java/com/ruoyi/system/domain/PostNotice.java

@@ -33,41 +33,48 @@ public class PostNotice extends BaseEntity
     @Excel(name = "公告详情id")
     private String detailDetail;
 
-    public void setNoticeId(Long noticeId)
-    {
+    /** 图片名称 */
+    @Excel(name = "图片名称")
+    private String image;
+
+    public Long getNoticeId() {
+        return noticeId;
+    }
+
+    public void setNoticeId(Long noticeId) {
         this.noticeId = noticeId;
     }
 
-    public Long getNoticeId()
-    {
-        return noticeId;
+    public String getNoticeTitle() {
+        return noticeTitle;
     }
-    public void setNoticeTitle(String noticeTitle)
-    {
+
+    public void setNoticeTitle(String noticeTitle) {
         this.noticeTitle = noticeTitle;
     }
 
-    public String getNoticeTitle()
-    {
-        return noticeTitle;
+    public Date getNoticeTime() {
+        return noticeTime;
     }
-    public void setNoticeTime(Date noticeTime)
-    {
+
+    public void setNoticeTime(Date noticeTime) {
         this.noticeTime = noticeTime;
     }
 
-    public Date getNoticeTime()
-    {
-        return noticeTime;
+    public String getDetailDetail() {
+        return detailDetail;
     }
-    public void setDetailDetail(String detailDetail)
-    {
+
+    public void setDetailDetail(String detailDetail) {
         this.detailDetail = detailDetail;
     }
 
-    public String getDetailDetail()
-    {
-        return detailDetail;
+    public String getImage() {
+        return image;
+    }
+
+    public void setImage(String image) {
+        this.image = image;
     }
 
     @Override
@@ -81,6 +88,7 @@ public class PostNotice extends BaseEntity
                 .append("createTime", getCreateTime())
                 .append("updateBy", getUpdateBy())
                 .append("updateTime", getUpdateTime())
+                .append("image",getImage())
                 .toString();
     }
 }

+ 22 - 0
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/LcdInfoVo.java

@@ -0,0 +1,22 @@
+package com.ruoyi.system.domain.vo;
+
+import com.ruoyi.system.domain.LcdInfo;
+
+public class LcdInfoVo extends LcdInfo {
+    private String phonenumber;
+
+    public LcdInfoVo() {
+    }
+
+    public LcdInfoVo(String phonenumber) {
+        this.phonenumber = phonenumber;
+    }
+
+    public String getPhonenumber() {
+        return phonenumber;
+    }
+
+    public void setPhonenumber(String phonenumber) {
+        this.phonenumber = phonenumber;
+    }
+}

+ 3 - 2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/LcdInfoMapper.java

@@ -3,6 +3,7 @@ package com.ruoyi.system.mapper;
 import java.util.Date;
 import java.util.List;
 import com.ruoyi.system.domain.LcdInfo;
+import com.ruoyi.system.domain.vo.LcdInfoVo;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -32,10 +33,10 @@ public interface LcdInfoMapper
     /**
      * 新增消息
      *
-     * @param lcdInfo 消息
+     * @param lcdInfoVo 消息
      * @return 结果
      */
-    public int insertLcdInfo(LcdInfo lcdInfo);
+    public int insertLcdInfo(LcdInfoVo lcdInfoVo);
 
     /**
      * 修改消息

+ 3 - 2
ruoyi-system/src/main/java/com/ruoyi/system/service/ILcdInfoService.java

@@ -3,6 +3,7 @@ package com.ruoyi.system.service;
 import java.util.Date;
 import java.util.List;
 import com.ruoyi.system.domain.LcdInfo;
+import com.ruoyi.system.domain.vo.LcdInfoVo;
 
 /**
  * 消息Service接口
@@ -31,10 +32,10 @@ public interface ILcdInfoService
     /**
      * 新增消息
      *
-     * @param lcdInfo 消息
+     * @param lcdInfoVo 消息
      * @return 结果
      */
-    public int insertLcdInfo(LcdInfo lcdInfo);
+    public int insertLcdInfo(LcdInfoVo lcdInfoVo);
 
     /**
      * 修改消息

+ 7 - 4
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/LcdInfoServiceImpl.java

@@ -4,11 +4,13 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.vo.LcdInfoVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.LcdInfoMapper;
 import com.ruoyi.system.domain.LcdInfo;
 import com.ruoyi.system.service.ILcdInfoService;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 消息Service业务层处理
@@ -16,6 +18,7 @@ import com.ruoyi.system.service.ILcdInfoService;
  * @author ruoyi
  * @date 2023-01-14
  */
+@Transactional//涉及两张表要加事务
 @Service
 public class LcdInfoServiceImpl implements ILcdInfoService {
     @Autowired
@@ -46,13 +49,13 @@ public class LcdInfoServiceImpl implements ILcdInfoService {
     /**
      * 新增消息
      *
-     * @param lcdInfo 消息
+     * @param lcdInfoVo 消息
      * @return 结果
      */
     @Override
-    public int insertLcdInfo(LcdInfo lcdInfo) {
-        lcdInfo.setCreateTime(DateUtils.getNowDate());
-        return lcdInfoMapper.insertLcdInfo(lcdInfo);
+    public int insertLcdInfo(LcdInfoVo lcdInfoVo) {
+        lcdInfoVo.setCreateTime(DateUtils.getNowDate());
+        return lcdInfoMapper.insertLcdInfo(lcdInfoVo);
     }
 
     /**

+ 7 - 2
ruoyi-system/src/main/resources/mapper/system/LcdInfoMapper.xml

@@ -13,10 +13,11 @@
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="image"    column="image"/>
     </resultMap>
 
     <sql id="selectLcdInfoVo">
-        select id, title, send_time, detail, create_by, create_time, update_by, update_time from lcd_info
+        select id, title, send_time, detail, create_by, create_time, update_by, update_time, image from lcd_info
     </sql>
     <!--搜索消息列表,xml中>,
     <不能被正确解析,需要XML转义字符
@@ -50,7 +51,7 @@
         where id = #{id}
     </select>
 
-    <insert id="insertLcdInfo" parameterType="LcdInfo">
+    <insert id="insertLcdInfo" parameterType="LcdInfoVo" >
         insert into lcd_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
@@ -61,6 +62,7 @@
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="image != null">image,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -71,6 +73,7 @@
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="image != null">#{image},</if>
         </trim>
     </insert>
 
@@ -84,6 +87,8 @@
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="image != null">image = #{image},</if>
+
         </trim>
         where id = #{id}
     </update>

+ 6 - 1
ruoyi-system/src/main/resources/mapper/system/PostNoticeMapper.xml

@@ -13,10 +13,11 @@
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="image"    column="image"/>
     </resultMap>
 
     <sql id="selectPostNoticeVo">
-        select notice_id, notice_title, notice_time, detail_detail, create_by, create_time, update_by, update_time from post_notice
+        select notice_id, notice_title, notice_time, detail_detail, create_by, create_time, update_by, update_time ,image from post_notice
     </sql>
 
     <select id="selectPostNoticeList" parameterType="PostNotice" resultMap="PostNoticeResult">
@@ -57,6 +58,8 @@
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="image != null">image,</if>
+
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="noticeTitle != null">#{noticeTitle},</if>
@@ -66,6 +69,7 @@
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="image != null">#{image},</if>
         </trim>
     </insert>
 
@@ -79,6 +83,7 @@
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="image != null">image = #{image},</if>
         </trim>
         where notice_id = #{noticeId}
     </update>