Browse Source

定位修改,图片删除问题修复。

S0025136190 8 tháng trước cách đây
mục cha
commit
7b4f5c86a7

+ 2 - 0
takai-modules/takai-system/src/main/java/org/dromara/system/mapper/ImgTypeMapper.java

@@ -18,4 +18,6 @@ public interface ImgTypeMapper extends BaseMapperPlus<ImgType, ImgTypeVo> {
 
     ImgTypeVo selectByImgId(String imgId);
 
+    boolean batchDeleteByTypeC(List<String> list);
+
 }

+ 2 - 0
takai-modules/takai-system/src/main/java/org/dromara/system/mapper/SysImgMapper.java

@@ -25,4 +25,6 @@ public interface SysImgMapper extends BaseMapperPlus<SysImg, SysImgVo> {
 
     List<SysImgVo> selectByList(List<String> list);
 
+   boolean batchDeleteByType(List<String> list);
+
 }

+ 1 - 1
takai-modules/takai-system/src/main/java/org/dromara/system/service/impl/ImgTypeServiceImpl.java

@@ -62,7 +62,7 @@ public class ImgTypeServiceImpl implements IImgTypeService {
         //Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ImgType> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getTypeId()), ImgType::getTypeId, bo.getTypeId());
-//        lqw.eq(StringUtils.isNotBlank(bo.getTypeC()), ImgType::getTypeC, bo.getTypeC());
+        lqw.eq(StringUtils.isNotBlank(bo.getTypeC()), ImgType::getTypeC, bo.getTypeC());
 //        lqw.eq(StringUtils.isNotBlank(bo.getImgId()), ImgType::getImgId, bo.getImgId());
         return lqw;
     }

+ 8 - 2
takai-modules/takai-system/src/main/java/org/dromara/system/service/impl/PositionServiceImpl.java

@@ -56,6 +56,10 @@ public class PositionServiceImpl implements IPositionService {
 
     private final RegionMapper regionMapper;
 
+    private final SysImgMapper sysImgMapper;
+
+    private final ImgTypeMapper imgTypeMapper;
+
 
     /**
      * 查询【请填写功能名称】
@@ -199,7 +203,8 @@ public class PositionServiceImpl implements IPositionService {
                 positionCommunityService.insertByBo(pcBo);
             }
 
-            imgTypeService.batchDelete(List.of(bo.getPositionId()));
+//            imgTypeService.batchDelete(List.of(bo.getPositionId()));
+            imgTypeMapper.batchDeleteByTypeC(List.of(bo.getPositionId()));
             //图片更新
             String[] ossId = new String[bo.getSysimg().size()];
             for (int i=0; i<bo.getSysimg().size(); i++){
@@ -211,7 +216,8 @@ public class PositionServiceImpl implements IPositionService {
                 }
             }
 
-            sysImgService.batchDelete(List.of(ossId));
+//            sysImgService.batchDelete(List.of(ossId));
+            sysImgMapper.batchDeleteByType(List.of(ossId));
             for (SysImgBo voq : bo.getSysimg()){
                 //关联图片
                 ImgTypeBo types = new ImgTypeBo();

+ 2 - 1
takai-modules/takai-system/src/main/java/org/dromara/system/service/impl/SysImgServiceImpl.java

@@ -175,7 +175,7 @@ public class SysImgServiceImpl implements ISysImgService {
                     types.setTypeC("0");           // 图片类型
                     if("0".equals(bo.getImgType()) && StringUtils.isNotEmpty(bo.getPositionId())){
                         types.setTypeId(bo.getPositionId());
-                        types.setTypeC("0");           // 图片类型
+                        types.setTypeC("6");           // 图片类型
                     }
                     imgTypeService.insertByBo(types);
                 }
@@ -241,6 +241,7 @@ public class SysImgServiceImpl implements ISysImgService {
     public List<SysImgVo> selectByList(String positionId) {
         ImgTypeBo vo = new ImgTypeBo();
         vo.setTypeId(positionId);
+        vo.setTypeC("6");
         List<ImgTypeVo> imgVo =imgTypeServiceImpl.queryList(vo);
         if(imgVo != null && imgVo.size() > 0){
             List<String> imgIds = imgVo.stream().map(ImgTypeVo:: getImgId).collect(Collectors.toList());

+ 7 - 0
takai-modules/takai-system/src/main/resources/mapper/system/ImgTypeMapper.xml

@@ -18,4 +18,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select * from img_type where img_id = #{imgId}
     </select>
 
+    <delete id="batchDeleteByTypeC" parameterType="list">
+        DELETE FROM img_type WHERE type_c = '5' and type_id IN
+        <foreach item="item" collection="list" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
 </mapper>

+ 7 - 0
takai-modules/takai-system/src/main/resources/mapper/system/SysImgMapper.xml

@@ -71,4 +71,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </select>
 
+    <delete id="batchDeleteByType" parameterType="list">
+        DELETE FROM sys_img WHERE img_type = '5' AND oss_id IN
+        <foreach item="item" collection="list" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
 </mapper>