修改需求

2 years ago · c67014b615
parent 3ad743f85d
commit c67014b615
8 changed files with 45 additions and 20 deletions
--- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/AddWeChatFriendRecordRepository.java
+++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/AddWeChatFriendRecordRepository.java
@ -18,6 +18,7 @@ package com.baiye.modules.system.repository;
 import com.baiye.modules.system.domain.AddWeChatFriendRecord;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;

 import java.util.List;

@ -33,7 +34,8 @@ public interface AddWeChatFriendRecordRepository extends JpaRepository<AddWeChat
     * @param clueId
     * @return
     */
-    AddWeChatFriendRecord findByClueId(Long clueId);
+    @Query("from AddWeChatFriendRecord where clueId = ?1 order by createTime desc")
+    List<AddWeChatFriendRecord> findByClueId(Long clueId);


    /**
--- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/WechatSendMessageRepository.java
+++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/WechatSendMessageRepository.java
@ -35,16 +35,17 @@ public interface WechatSendMessageRepository extends JpaRepository<WechatSendMes
     * @param userId
     * @return
     */
-    @Query(value = "from WechatSendMessage where status = 1 and userId = ?1 order by isDefault desc")
+    @Query(value = "from WechatSendMessage where status = 1 and userId = ?1 order by id desc")
    List<WechatSendMessage> findByUserId(Long userId);


    /**
     * 默认值查找
-     * @param num
+     * @param userId
     * @return
     */
-    WechatSendMessage findByIsDefault(Integer num);
+    @Query(value = "from WechatSendMessage where status = 1 and userId = ?1 and isDefault = 1 ")
+    WechatSendMessage findByIsDefaultAndId(Long userId);


    /**
@ -57,12 +58,14 @@ public interface WechatSendMessageRepository extends JpaRepository<WechatSendMes

    /**
     * 修改默认值
+     *
     * @param changeValue
     * @param originalValue
+     * @param userId
     */
    @Modifying
-    @Query(value = "UPDATE WechatSendMessage m set m.isDefault = ?1 where m.isDefault = ?2")
-    void updateDefaultByDefault(Integer changeValue,Integer originalValue);
+    @Query(value = "UPDATE WechatSendMessage m set m.isDefault = ?1 where m.isDefault = ?2 and m.userId = ?3")
+    void updateDefaultByDefault(Integer changeValue, Integer originalValue, Long userId);



--- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/rest/WechatSendMessageController.java
+++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/rest/WechatSendMessageController.java
@ -25,6 +25,7 @@ import com.google.common.collect.ImmutableMap;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@ -41,6 +42,7 @@ import java.util.Map;
 * @website https://el-admin.vip
 * @date 2022-07-01
 **/
+@Slf4j
@RestController
@RequiredArgsConstructor
@Api(tags = "WechatSendMessageController管理")
@ -95,10 +97,10 @@ public class WechatSendMessageController {
    }


-    @DeleteMapping
+    @GetMapping("deleteById")
    @ApiOperation("删除WechatSendMessage")
-    public ResponseEntity<Object> deleteWechatSendMessage(@RequestBody Long[] ids) {
-        wechatSendMessageService.deleteAll(ids);
+    public ResponseEntity<Object> deleteWechatSendMessage(@RequestParam("id") Long id) {
+        wechatSendMessageService.deleteId(id);
        return new ResponseEntity<>(HttpStatus.OK);
    }

--- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/WechatSendMessageService.java
+++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/WechatSendMessageService.java
@ -96,4 +96,12 @@ public interface WechatSendMessageService {
     * @param isDefault
     */
    void changeStatus(Long id, Integer isDefault);
+
+    /**
+     * 删除
+     *
+     * @param id
+     * @param id
+     */
+    void deleteId(Long id);
 }
--- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/AddWeChatWeChatFriendRecordServiceImpl.java
+++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/AddWeChatWeChatFriendRecordServiceImpl.java
@ -1,9 +1,11 @@
 package com.baiye.modules.system.service.impl;

+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.http.HttpStatus;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONUtil;
 import com.baiye.config.properties.WeChatProperties;
+import com.baiye.constant.DefaultNumberConstants;
 import com.baiye.constant.WeChatRequestConstants;
 import com.baiye.http.WeChatResponse;
 import com.baiye.model.dto.AddWeChatFriendRecordDTO;
@ -36,8 +38,8 @@ public class AddWeChatWeChatFriendRecordServiceImpl implements AddWeChatFriendRe

    @Override
    public AddWeChatFriendRecordDTO findByClueId(Long clueId) {
-        AddWeChatFriendRecord addWechatFriendRecord = addWeChatFriendRecordRepository.findByClueId(clueId);
-        return addWeChatFriendRecordMapper.toDto(addWechatFriendRecord);
+        List<AddWeChatFriendRecord> byClueId = addWeChatFriendRecordRepository.findByClueId(clueId);
+        return addWeChatFriendRecordMapper.toDto(CollUtil.isNotEmpty(byClueId) ? byClueId.get(DefaultNumberConstants.ZERO_NUMBER) : null);
    }

    @Override
--- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/WechatSendMessageServiceImpl.java
+++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/WechatSendMessageServiceImpl.java
@ -15,6 +15,7 @@
 */
 package com.baiye.modules.system.service.impl;

+import cn.hutool.core.util.ObjectUtil;
 import com.baiye.constant.DefaultNumberConstants;
 import com.baiye.exception.BadRequestException;
 import com.baiye.model.enums.ResponseCode;
@ -73,12 +74,13 @@ public class WechatSendMessageServiceImpl implements WechatSendMessageService {
    @Override
    @Transactional(rollbackFor = Exception.class)
    public WechatSendMessageDto create(WechatSendMessage resources) {
-        resources.setUserId( SecurityUtils.getCurrentUserId());
-      /*  WechatSendMessage byUserDefault =
-                wechatSendMessageRepository.findByUserDefault(userId);
+        Long currentUserId = SecurityUtils.getCurrentUserId();
+        resources.setUserId(currentUserId);
+        WechatSendMessage byUserDefault =
+                wechatSendMessageRepository.findByUserDefault(currentUserId);
        if (ObjectUtil.isNull(byUserDefault)) {
            resources.setIsDefault(DefaultNumberConstants.ONE_NUMBER);
-        }*/
+        }
        return wechatSendMessageMapper.toDto(wechatSendMessageRepository.save(resources));
    }

@ -126,16 +128,24 @@ public class WechatSendMessageServiceImpl implements WechatSendMessageService {
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void changeStatus(Long id, Integer isDefault) {
+        Long currentUserId = SecurityUtils.getCurrentUserId();
        WechatSendMessage byIsDefault =
-                wechatSendMessageRepository.findByIsDefault(DefaultNumberConstants.ONE_NUMBER);
+                wechatSendMessageRepository.findByIsDefaultAndId(currentUserId);
        if (byIsDefault != null &&
                isDefault == DefaultNumberConstants.ZERO_NUMBER &&
                byIsDefault.getId().equals(id)) {
            throw new BadRequestException(ResponseCode.TEMPLATE_CHANGE_ERROR.getDesc());
        }
        wechatSendMessageRepository.updateDefaultByDefault
-                (DefaultNumberConstants.ZERO_NUMBER, DefaultNumberConstants.ONE_NUMBER);
+                (DefaultNumberConstants.ZERO_NUMBER, DefaultNumberConstants.ONE_NUMBER,
+                        SecurityUtils.getCurrentUserId());
        wechatSendMessageRepository.updateDefaultById
                (DefaultNumberConstants.ONE_NUMBER, id);
    }
+
+    @Override
+    public void deleteId(Long id) {
+        wechatSendMessageRepository.deleteById(id);
+
+    }
 }
--- a/services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueRecordServiceImpl.java
+++ b/services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueRecordServiceImpl.java
@ -105,7 +105,6 @@ public class ClueRecordServiceImpl implements ClueRecordService {
    public void updateList(List<ClueRecord> clueRecords) {
        //导入文件记录失败修改状态
        clueRecords.forEach(cs -> cs.setStatus(false));
-        log.info("===================0.0执行更新0.0========================={}",clueRecords);
        clueRecordRepository.saveAll(clueRecords);
    }
 }
--- a/services/ad-platform-source/src/main/java/com/baiye/module/service/impl/UploadFileServiceImpl.java
+++ b/services/ad-platform-source/src/main/java/com/baiye/module/service/impl/UploadFileServiceImpl.java
@ -154,8 +154,7 @@ public class UploadFileServiceImpl implements UploadFileService {
        } else {
            clueRecord.setIsPass(DefaultNumberConstants.ZERO_NUMBER);
        }
-        clueRecordRepository.save(clueRecord);
-        return clueRecord;
+        return clueRecordRepository.save(clueRecord);
    }

    /**