藏品bug修复

ruoyi-admin/src/main/java/com/ruoyi/web/controller/post/PostCollectionController.java

@@ -88,9 +88,15 @@ public class PostCollectionController extends BaseController
     @PostMapping("/add")
     public AjaxResult add(@RequestBody PostCollection postCollection)
     {
-        PostSeries postSeries=new PostSeries();
-        postSeries.setSeriesName(postCollection.getSeriesName());
-        if(postSeries.getExchangeFlag().equals('1')) {
+        PostSeries postSeries = postSeriesService.selectPostSeriesBySeriesName(postCollection.getSeriesName());
+        //获取到套系信息
+        System.out.println(postSeries);
+
+        if (postSeries==null) {
+            postCollection.setCreateBy(getUsername());
+            return toAjax(postCollectionService.insertPostCollection(postCollection)); }
+
+        if(postSeries.getExchangeFlag().equals("1")) {
             return AjaxResult.error("新增藏品"+postCollection.getCollectionName()+"失败，藏品所属套系"+postCollection.getSeriesName()+"已经上链，无法添加");
         }
         if(UserConstants.NOT_UNIQUE.equals(postCollectionService.checkName(postCollection)))
@@ -110,15 +116,17 @@ public class PostCollectionController extends BaseController
     @PutMapping("/edit")
     public AjaxResult edit(@RequestBody PostCollection postCollection)
     {
-        PostSeries postSeries=new PostSeries();
-        postSeries.setSeriesName(postCollection.getSeriesName());
-        if(postSeries.getExchangeFlag().equals('1')) {
-            return AjaxResult.error("修改藏品"+postCollection.getCollectionName()+"失败，藏品所属套系"+postCollection.getSeriesName()+"已经上链，无法添加");
+        PostSeries postSeries = postSeriesService.selectPostSeriesBySeriesName(postCollection.getSeriesName());
+        //获取到套系信息
+        System.out.println(postSeries);
+        if(postSeries ==null){
+            postCollection.setUpdateBy(getUsername());
+            return toAjax(postCollectionService.updatePostCollection(postCollection));
         }
-        if(UserConstants.NOT_UNIQUE.equals(postCollectionService.checkName(postCollection)))
-        {
-            return AjaxResult.error("修改藏品"+postCollection.getCollectionName()+"失败，藏品已经存在");
+        if(postSeries.getExchangeFlag().equals("1") && postSeries.getSeriesId() !=null) {
+            return AjaxResult.error("新增藏品"+postCollection.getCollectionName()+"失败，藏品所属套系"+postCollection.getSeriesName()+"已经上链，无法添加");
         }
+        postCollection.setUpdateBy(getUsername());
         return toAjax(postCollectionService.updatePostCollection(postCollection));
 
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/post/PostSeriesController.java

@@ -207,9 +207,9 @@ public class PostSeriesController extends BaseController {
             return AjaxResult.error("修改套系消息" + postSeries.getSeriesName() + "失败，套系已经上链");
         }
 
-        if (UserConstants.NOT_UNIQUE.equals(postSeriesService.checkSeriesNameUnique(postSeries))) {
-            return AjaxResult.error("修改消息" + postSeries.getSeriesName() + "失败，套系已经存在");
-        }
+//        if (UserConstants.NOT_UNIQUE.equals(postSeriesService.checkSeriesNameUnique(postSeries))) {
+//            return AjaxResult.error("修改套系消息" + postSeries.getSeriesName() + "失败，套系已经存在");
+//        }
         postSeries.setUpdateBy(getUsername());
         Date nowDate = new Date();
         nowDate = DateUtils.getNowDate();

ruoyi-post/src/main/java/com/ruoyi/post/mapper/PostSeriesMapper.java

@@ -28,6 +28,14 @@ public interface PostSeriesMapper
      */
     public List<PostSeries> selectPostSeriesList(PostSeries postSeries);
 
+    /**
+     * 查询邮贝套系信息;列表
+     *
+     * @param SeriesName 邮贝套系信息;
+     * @return 邮贝套系信息;集合
+     */
+    public PostSeries selectPostSeriesBySeriesName(String SeriesName);
+
     /**
      * 查询邮贝在售套系信息;列表
      *

ruoyi-post/src/main/java/com/ruoyi/post/service/IPostSeriesService.java

@@ -19,6 +19,14 @@ public interface IPostSeriesService
      */
     public PostSeries selectPostSeriesBySeriesId(long seriesId);
 
+    /**
+     * 查询邮贝套系信息;
+     *
+     * @param seriesName 邮贝套系昵称
+     * @return 邮贝套系信息;
+     */
+    public PostSeries selectPostSeriesBySeriesName(String seriesName);
+
     /**
      * 查询邮贝套系信息; 列表
      *

ruoyi-post/src/main/java/com/ruoyi/post/service/impl/PostSeriesServiceImpl.java

@@ -35,6 +35,11 @@ public class PostSeriesServiceImpl implements IPostSeriesService
         return postSeriesMapper.selectPostSeriesBySeriesId(seriesId);
     }
 
+    @Override
+    public PostSeries selectPostSeriesBySeriesName(String seriesName) {
+        return postSeriesMapper.selectPostSeriesBySeriesName(seriesName);
+    }
+
     /**
      * 查询邮贝套系信息; 列表
      * 

ruoyi-post/src/main/resources/mapper/PostCollectionMapper.xml

@@ -81,9 +81,9 @@
         insert into post_collection
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="collectionName != null and collectionName != ''">collection_name,</if>
-            <if test="collectionImage != null and collectionImage != ''">collection_image,</if>
+            <if test="collectionImage != null ">collection_image,</if>
             <if test="collectionDetails != null">collection_details,</if>
-            <if test="collection3dimage != null and collection3dimage != ''">collection_3dimage,</if>
+            <if test="collection3dimage != null ">collection_3dimage,</if>
             <if test="publisherName != null">publisher_name,</if>
             <if test="collectionPrice != null">collection_price,</if>
             <if test="collectionCounts != null">collection_counts,</if>
@@ -93,17 +93,12 @@
             <if test="endTime != null">end_time,</if>
             <if test="seriesName != null">series_name,</if>
             <if test="delFlag != null">del_flag,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="remark != null">remark,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="collectionName != null and collectionName != ''">#{collectionName},</if>
-            <if test="collectionImage != null and collectionImage != ''">#{collectionImage},</if>
+            <if test="collectionImage != null ">#{collectionImage},</if>
             <if test="collectionDetails != null">#{collectionDetails},</if>
-            <if test="collection3dimage != null and collection3dimage != ''">#{collection3dimage},</if>
+            <if test="collection3dimage != null ">#{collection3dimage},</if>
             <if test="publisherName != null">#{publisherName},</if>
             <if test="collectionPrice != null">#{collectionPrice},</if>
             <if test="collectionCounts != null">#{collectionCounts},</if>
@@ -113,11 +108,6 @@
             <if test="endTime != null">#{endTime},</if>
             <if test="seriesName != null">#{seriesName},</if>
             <if test="delFlag != null">#{delFlag},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="remark != null">#{remark},</if>
         </trim>
     </insert>
     <!--修改藏品-->
@@ -125,9 +115,9 @@
         update post_collection
         <trim prefix="SET" suffixOverrides=",">
             <if test="collectionName != null and collectionName != ''">collection_name = #{collectionName},</if>
-            <if test="collectionImage != null and collectionImage != ''">collection_image = #{collectionImage},</if>
+            <if test="collectionImage != null ">collection_image = #{collectionImage},</if>
             <if test="collectionDetails != null">collection_details = #{collectionDetails},</if>
-            <if test="collection3dimage != null and collection3dimage != ''">collection_3dimage = #{collection3dimage},</if>
+            <if test="collection3dimage != null ">collection_3dimage = #{collection3dimage},</if>
             <if test="publisherName != null">publisher_name = #{publisherName},</if>
             <if test="collectionPrice != null">collection_price = #{collectionPrice},</if>
             <if test="collectionCounts != null">collection_counts = #{collectionCounts},</if>
@@ -137,11 +127,6 @@
             <if test="endTime != null">end_time = #{endTime},</if>
             <if test="seriesName != null">series_name = #{seriesName},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <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="remark != null">remark = #{remark},</if>
         </trim>
         where collection_id = #{collectionId}
     </update>

ruoyi-post/src/main/resources/mapper/PostSeriesMapper.xml

@@ -180,4 +180,10 @@
         from post_series
         where series_name = #{seriesName} limit 1
     </select>
+<!--根据套系姓名匹配查询-->
+    <select id="selectPostSeriesBySeriesName" parameterType="String" resultMap="PostSeriesResult">
+        <include refid="selectPostSeriesVo"/>
+        and series_name = #{seriesName}
+    </select>
+
 </mapper>