fix 文章上传新增附件,新增小程序二维码查询

ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java

@@ -23,7 +23,7 @@ public class FileUploadUtils
     /**
      * 默认大小 50M
      */
-    public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024;
+    public static final long DEFAULT_MAX_SIZE = 100 * 1024 * 1024;
 
     /**
      * 默认的文件名最大长度 100

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

@@ -65,4 +65,11 @@ public interface ImageDataMapper
      * @return 结果
      */
     public int deleteImageDatasByImageIds(Long[] imageIds);
+
+    /**
+     * 根据新闻id删除附件
+     * @param newsId
+     * @return
+     */
+    public int deleteImageDatasByNewsId(Integer newsId);
 }

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

@@ -11,6 +11,8 @@ import com.ruoyi.system.mapper.ColumnNewsMapper;
 import com.ruoyi.common.core.domain.entity.ColumnNews;
 import com.ruoyi.system.service.IColumnNewsService;
 
+import static com.ruoyi.common.utils.SecurityUtils.getUsername;
+
 /**
  * 新闻信息Service业务层处理
  *
@@ -33,7 +35,8 @@ public class ColumnNewsServiceImpl implements IColumnNewsService {
      */
     @Override
     public ColumnNews selectColumnNewsByNewsId(Integer newsId) {
-        return columnNewsMapper.selectColumnNewsByNewsId(newsId);
+        ColumnNews columnNews = columnNewsMapper.selectColumnNewsByNewsId(newsId);
+        return columnNews;
     }
 
     /**
@@ -91,6 +94,9 @@ public class ColumnNewsServiceImpl implements IColumnNewsService {
         if (imageDatasList != null && imageDatasList.size() > 0) {
             for (ImageDatas imageDatas : imageDatasList) {
                 imageDatas.setNewsId(columnNews.getNewsId());
+                imageDatas.setCreateBy(getUsername());
+                imageDatas.setCreateTime(DateUtils.getNowDate());
+                imageDatas.setStatus("0");
                 imageDataMapper.insertImageDatas(imageDatas);
             }
         }
@@ -106,11 +112,16 @@ public class ColumnNewsServiceImpl implements IColumnNewsService {
     @Override
     public int updateColumnNews(ColumnNews columnNews) {
         columnNews.setUpdateTime(DateUtils.getNowDate());
+        imageDataMapper.deleteImageDatasByNewsId(columnNews.getNewsId());
         //判断附件信息是否存在
         List<ImageDatas> imageDatasList = columnNews.getImageDatasList();
         if (imageDatasList != null && imageDatasList.size() > 0) {
             for (ImageDatas imageDatas : imageDatasList) {
-                imageDataMapper.updateImageDatas(imageDatas);
+                imageDatas.setNewsId(columnNews.getNewsId());
+                imageDatas.setCreateBy(getUsername());
+                imageDatas.setCreateTime(DateUtils.getNowDate());
+                imageDatas.setStatus("0");
+                imageDataMapper.insertImageDatas(imageDatas);
             }
         }
         return columnNewsMapper.updateColumnNews(columnNews);

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

@@ -31,18 +31,9 @@
 
     <resultMap type="com.ruoyi.common.core.domain.entity.ImageDatas" id="ImageDataResult">
         <result property="imageId" column="image_id"/>
-        <result property="newsId" column="news_id"/>
         <result property="imageName" column="image_name"/>
         <result property="imageContent" column="image_content"/>
         <result property="imageIntroduce" column="image_introduce"/>
-        <result property="status" column="status"/>
-        <result property="type" column="type"/>
-        <result property="isDel" column="is_del"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="remark" column="remark"/>
     </resultMap>
 
     <sql id="selectColumnNewsVo">
@@ -95,14 +86,14 @@
         i.image_id, i.image_name,i.image_content,i.image_introduce
         from column_news n
         left join column_navigation_bar c on n.column_id = c.column_id
-        left join image_data i on n.news_id = i.news_id
+        left join image_data i on n.news_id = i.news_id and i.is_del = 'N'
         where n.news_id = #{newsId}
     </select>
 
     <select id="selectColumnNewsDetailMenHu" parameterType="Integer" resultMap="ColumnNewsResult">
         select n.news_id, n.news_title, n.column_id, n.news_content,n.is_rotation,n.views_num,n.reprint_url,n.author, n.status,n.release_time,  n.reason, n.create_by, n.create_time, n.update_by, n.update_time, n.remark,n.news_image,
         i.image_id, i.image_name,i.image_content,i.image_introduce
-        from column_news n left join image_data i on n.news_id = i.news_id
+        from column_news n left join image_data i on n.news_id = i.news_id and i.is_del = 'N'
         where n.news_id = #{newsId}  order by n.create_time DESC,n.update_time DESC
     </select>
 

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

@@ -52,7 +52,7 @@
     <insert id="insertImageDatas" parameterType="ImageDatas" useGeneratedKeys="true" keyProperty="imageId">
         insert into image_data
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="imageId != null and imageId != ''">image_id,</if>
+            <if test="newsId != null and newsId != ''">news_id,</if>
             <if test="imageName != null and imageName != ''">image_name,</if>
             <if test="imageContent != null">image_content,</if>
             <if test="imageIntroduce != null">image_introduce,</if>
@@ -66,7 +66,7 @@
             <if test="remark != null">remark,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="imageId != null and imageId != ''">#{imageId},</if>
+            <if test="newsId != null and newsId != ''">#{newsId},</if>
             <if test="imageName != null and imageName != ''">#{imageName},</if>
             <if test="imageContent != null">#{imageContent},</if>
             <if test="imageIntroduce != null">#{imageIntroduce},</if>
@@ -84,7 +84,7 @@
     <update id="updateImageDatas" parameterType="ImageDatas">
         update image_data
         <trim prefix="SET" suffixOverrides=",">
-            <if test="imageId != null and imageId != ''">image_id = #{imageId},</if>
+            <if test="newsId != null and newsId != ''">news_id = #{newsId},</if>
             <if test="imageName != null and imageName != ''">image_name = #{imageName},</if>
             <if test="imageContent != null">image_content = #{imageContent},</if>
             <if test="imageIntroduce != null">image_introduce = #{imageIntroduce},</if>
@@ -110,4 +110,9 @@
             #{imageId}
         </foreach>
     </delete>
+
+    <update id="deleteImageDatasByNewsId" parameterType="integer">
+        update image_data set is_del = 'Y'
+        where news_id = #{newsId}
+    </update>
 </mapper>