图片套版生成模块

module-material-store/src/main/java/cn/com/tenlion/materialstore/dao/materialaudio/IMaterialAudioDao.java

@@ -116,4 +116,5 @@ public interface IMaterialAudioDao {
      */
     Integer count(Map<String, Object> params) throws SearchException;
 
+    void removeByMaterialId(Map<String, Object> params) throws RemoveException;
 }

module-material-store/src/main/java/cn/com/tenlion/materialstore/dao/materiallink/IMaterialLinkDao.java

@@ -117,4 +117,5 @@ public interface IMaterialLinkDao {
      */
     Integer count(Map<String, Object> params) throws SearchException;
 
+    void removeByMaterialId(Map<String, Object> params) throws RemoveException;
 }

module-material-store/src/main/java/cn/com/tenlion/materialstore/dao/materialmap/IMaterialMapDao.java

@@ -117,4 +117,5 @@ public interface IMaterialMapDao {
      */
     Integer count(Map<String, Object> params) throws SearchException;
 
+    void removeByMaterialId(Map<String, Object> params) throws RemoveException;
 }

module-material-store/src/main/java/cn/com/tenlion/materialstore/dao/materialphoto/IMaterialPhotoDao.java

@@ -117,4 +117,5 @@ public interface IMaterialPhotoDao {
      */
     Integer count(Map<String, Object> params) throws SearchException;
 
+    void removeByMaterialId(Map<String, Object> params) throws RemoveException;
 }

module-material-store/src/main/java/cn/com/tenlion/materialstore/dao/materialtext/IMaterialTextDao.java

@@ -117,4 +117,5 @@ public interface IMaterialTextDao {
      */
     Integer count(Map<String, Object> params) throws SearchException;
 
+    void removeByMaterialId(Map<String, Object> params) throws RemoveException;
 }

module-material-store/src/main/java/cn/com/tenlion/materialstore/dao/materialvideo/IMaterialVideoDao.java

@@ -117,4 +117,5 @@ public interface IMaterialVideoDao {
      */
     Integer count(Map<String, Object> params) throws SearchException;
 
+    void removeByMaterialId(Map<String, Object> params) throws RemoveException;
 }

module-material-store/src/main/java/cn/com/tenlion/materialstore/service/materialaudio/IMaterialAudioService.java

@@ -187,4 +187,6 @@ public interface IMaterialAudioService {
 
     List<MaterialAudioDTO> getByMaterialId(String materialId);
 
+    void removeByMaterialId(String materialId);
+
 }

module-material-store/src/main/java/cn/com/tenlion/materialstore/service/materialaudio/impl/MaterialAudioServiceImpl.java

@@ -173,4 +173,11 @@ public class MaterialAudioServiceImpl extends DefaultBaseService implements IMat
         return materialAudioDao.list(params);
     }
 
+    @Override
+    public void removeByMaterialId(String materialId) {
+        Map<String, Object> params = super.getHashMap(2);
+        params.put("materialId", materialId);
+        materialAudioDao.removeByMaterialId(params);
+    }
+
 }

module-material-store/src/main/java/cn/com/tenlion/materialstore/service/materialdata/impl/MaterialDataServiceImpl.java

@@ -52,6 +52,7 @@ public class MaterialDataServiceImpl implements MaterialDataService {
         /**
          * 文字存储
          */
+        materialTextService.removeByMaterialId(dataVO.getMaterialId());
         if(textVOList != null && textVOList.size() > 0) {
             for (MaterialTextVO text : textVOList) {
                 text.setMaterialId(dataVO.getMaterialId());
@@ -61,6 +62,7 @@ public class MaterialDataServiceImpl implements MaterialDataService {
         /**
          * 照片存储
          */
+        materialPhotoService.removeByMaterialId(dataVO.getMaterialId());
         if(photoVOList != null && photoVOList.size() > 0) {
             for (MaterialPhotoVO photo : photoVOList) {
                 photo.setMaterialId(dataVO.getMaterialId());
@@ -70,6 +72,7 @@ public class MaterialDataServiceImpl implements MaterialDataService {
         /**
          * 音频存储
          */
+        materialAudioService.removeByMaterialId(dataVO.getMaterialId());
         if(audioVOList != null && audioVOList.size() > 0) {
             for (MaterialAudioVO audio : audioVOList) {
                 audio.setMaterialId(dataVO.getMaterialId());
@@ -79,6 +82,7 @@ public class MaterialDataServiceImpl implements MaterialDataService {
         /**
          * 视频存储
          */
+        materialVideoService.removeByMaterialId(dataVO.getMaterialId());
         if(videoVOList != null && videoVOList.size() > 0) {
             for (MaterialVideoVO video : videoVOList) {
                 video.setMaterialId(dataVO.getMaterialId());
@@ -88,6 +92,7 @@ public class MaterialDataServiceImpl implements MaterialDataService {
         /**
          * 经纬度存储
          */
+        materialMapService.removeByMaterialId(dataVO.getMaterialId());
         if(mapVOList != null && mapVOList.size() > 0) {
             for (MaterialMapVO map : mapVOList) {
                 map.setMaterialId(dataVO.getMaterialId());
@@ -97,6 +102,7 @@ public class MaterialDataServiceImpl implements MaterialDataService {
         /**
          * 链接存储
          */
+        materialLinkService.removeByMaterialId(dataVO.getMaterialId());
         if(linkVOList != null && linkVOList.size() > 0) {
             for (MaterialLinkVO link : linkVOList) {
                 link.setMaterialId(dataVO.getMaterialId());

module-material-store/src/main/java/cn/com/tenlion/materialstore/service/materiallink/IMaterialLinkService.java

@@ -187,4 +187,6 @@ public interface IMaterialLinkService {
 
     List<MaterialLinkDTO> getByMaterialId(String materialId);
 
+    void removeByMaterialId(String materialId);
+
 }

module-material-store/src/main/java/cn/com/tenlion/materialstore/service/materiallink/impl/MaterialLinkServiceImpl.java

@@ -175,4 +175,11 @@ public class MaterialLinkServiceImpl extends DefaultBaseService implements IMate
         return materialLinkDao.list(params);
     }
 
+    @Override
+    public void removeByMaterialId(String materialId) {
+        Map<String, Object> params = super.getHashMap(2);
+        params.put("materialId", materialId);
+        materialLinkDao.removeByMaterialId(params);
+    }
+
 }

module-material-store/src/main/java/cn/com/tenlion/materialstore/service/materialmap/IMaterialMapService.java

@@ -187,4 +187,6 @@ public interface IMaterialMapService {
 
     List<MaterialMapDTO> getByMaterialId(String materialId);
 
+    void removeByMaterialId(String materialId);
+
 }

module-material-store/src/main/java/cn/com/tenlion/materialstore/service/materialmap/impl/MaterialMapServiceImpl.java

@@ -175,4 +175,11 @@ public class MaterialMapServiceImpl extends DefaultBaseService implements IMater
         return materialMapDao.list(params);
     }
 
+    @Override
+    public void removeByMaterialId(String materialId) {
+        Map<String, Object> params = super.getHashMap(2);
+        params.put("materialId", materialId);
+        materialMapDao.removeByMaterialId(params);
+    }
+
 }

module-material-store/src/main/java/cn/com/tenlion/materialstore/service/materialphoto/IMaterialPhotoService.java

@@ -187,4 +187,6 @@ public interface IMaterialPhotoService {
 
     List<MaterialPhotoDTO> getByMaterialId(String materialId);
 
+    void removeByMaterialId(String materialId);
+
 }

module-material-store/src/main/java/cn/com/tenlion/materialstore/service/materialphoto/impl/MaterialPhotoServiceImpl.java

@@ -175,4 +175,11 @@ public class MaterialPhotoServiceImpl extends DefaultBaseService implements IMat
         return materialPhotoDao.list(params);
     }
 
+    @Override
+    public void removeByMaterialId(String materialId) {
+        Map<String, Object> params = super.getHashMap(2);
+        params.put("materialId", materialId);
+        materialPhotoDao.removeByMaterialId(params);
+    }
+
 }

module-material-store/src/main/java/cn/com/tenlion/materialstore/service/materialtext/IMaterialTextService.java

@@ -187,4 +187,6 @@ public interface IMaterialTextService {
 
     List<MaterialTextDTO> getByMaterialId(String materialId);
 
+    void removeByMaterialId(String materialId);
+
 }

module-material-store/src/main/java/cn/com/tenlion/materialstore/service/materialtext/impl/MaterialTextServiceImpl.java

@@ -175,4 +175,11 @@ public class MaterialTextServiceImpl extends DefaultBaseService implements IMate
         return materialTextDao.list(params);
     }
 
+    @Override
+    public void removeByMaterialId(String materialId) {
+        Map<String, Object> params = super.getHashMap(2);
+        params.put("materialId", materialId);
+        materialTextDao.removeByMaterialId(params);
+    }
+
 }

module-material-store/src/main/java/cn/com/tenlion/materialstore/service/materialvideo/IMaterialVideoService.java

@@ -187,4 +187,6 @@ public interface IMaterialVideoService {
 
     List<MaterialVideoDTO> getByMaterialId(String materialId);
 
+    void removeByMaterialId(String materialId);
+
 }

module-material-store/src/main/java/cn/com/tenlion/materialstore/service/materialvideo/impl/MaterialVideoServiceImpl.java

@@ -175,4 +175,11 @@ public class MaterialVideoServiceImpl extends DefaultBaseService implements IMat
         return materialVideoDao.list(params);
     }
 
+    @Override
+    public void removeByMaterialId(String materialId) {
+        Map<String, Object> params = super.getHashMap(2);
+        params.put("materialId", materialId);
+        materialVideoDao.removeByMaterialId(params);
+    }
+
 }

module-material-store/src/main/resources/mybatis/mapper/materialaudio/material-audio-mapper.xml

@@ -68,6 +68,14 @@
         )
     </insert>
 
+    <!-- 删除音频素材（物理） -->
+    <update id="removeByMaterialId" parameterType="map">
+        DELETE FROM
+            m_material_audio
+        WHERE
+            material_id = #{materialId}
+    </update>
+
     <!-- 删除音频素材 -->
     <update id="remove" parameterType="map">
         UPDATE

module-material-store/src/main/resources/mybatis/mapper/materiallink/material-link-mapper.xml

@@ -73,6 +73,14 @@
         )
     </insert>
 
+    <!-- 删除链接素材（物理） -->
+    <update id="removeByMaterialId" parameterType="map">
+        DELETE FROM
+            m_material_link
+        WHERE
+            material_id = #{materialId}
+    </update>
+
     <!-- 删除链接素材 -->
     <update id="remove" parameterType="map">
         UPDATE
@@ -233,10 +241,7 @@
                 #{materialLinkIds[${index}]}
             </foreach>
         </if>
-        <if test="materialId != '' and materialId != null">
+        ORDER BT t1.material_order
-            AND t1.material_id = #{materialId}
-        </if>
-        ORDER BY t1.material_order
     </select>
 
     <!-- 链接素材列表 -->

module-material-store/src/main/resources/mybatis/mapper/materialmap/material-map-mapper.xml

@@ -78,6 +78,14 @@
         )
     </insert>
 
+    <!-- 删除经纬度素材（物理） -->
+    <update id="removeByMaterialId" parameterType="map">
+        DELETE FROM
+            m_material_map
+        WHERE
+            material_id = #{materialId}
+    </update>
+
     <!-- 删除经纬度素材 -->
     <update id="remove" parameterType="map">
         UPDATE

module-material-store/src/main/resources/mybatis/mapper/materialphoto/material-photo-mapper.xml

@@ -68,6 +68,14 @@
         )
     </insert>
 
+    <!-- 删除经纬度素材（物理） -->
+    <update id="removeByMaterialId" parameterType="map">
+        DELETE FROM
+            m_material_photo
+        WHERE
+            material_id = #{materialId}
+    </update>
+
     <!-- 删除图片素材 -->
     <update id="remove" parameterType="map">
         UPDATE

module-material-store/src/main/resources/mybatis/mapper/materialtext/material-text-mapper.xml

@@ -73,6 +73,14 @@
         )
     </insert>
 
+    <!-- 删除文字素材（物理） -->
+    <update id="removeByMaterialId" parameterType="map">
+        DELETE FROM
+            m_material_text
+        WHERE
+            material_id = #{materialId}
+    </update>
+
     <!-- 删除文字素材 -->
     <update id="remove" parameterType="map">
         UPDATE

module-material-store/src/main/resources/mybatis/mapper/materialvideo/material-video-mapper.xml

@@ -68,6 +68,14 @@
         )
     </insert>
 
+    <!-- 删除视频素材（物理） -->
+    <update id="removeByMaterialId" parameterType="map">
+        DELETE FROM
+            m_material_video
+        WHERE
+            material_id = #{materialId}
+    </update>
+
     <!-- 删除视频素材 -->
     <update id="remove" parameterType="map">
         UPDATE