产品信息完善

src/main/java/com/usky/dxtop/service/impl/CompanyServiceImpl.java

@@ -8,13 +8,18 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.usky.dxtop.common.constant.UserConstants;
 import com.usky.dxtop.common.core.page.CommonPage;
+import com.usky.dxtop.common.exception.CustomException;
 import com.usky.dxtop.common.utils.StringUtils;
 import com.usky.dxtop.mapper.CompanyMapper;
 import com.usky.dxtop.model.Company;
 import com.usky.dxtop.service.CompanyService;
+import com.usky.dxtop.service.SysFileService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Optional;
+
 /**
  * <p>
  *  服务实现类
@@ -26,6 +31,9 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> implements CompanyService {
 
+    @Autowired
+    private SysFileService sysFileService;
+
 
 
     @Transactional(rollbackFor = Exception.class)
@@ -62,8 +70,9 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean remove(Long id) {
-        Company company = new Company();
-        company.setId(id);
+        Company company = this.getById(id);
+        Optional.ofNullable(company).orElseThrow(() -> new CustomException("产品不存在"));
+        sysFileService.removeByBatchNo(company.getLogo());
         company.setDelFlag(true);
         return this.updateById(company);
     }

src/main/java/com/usky/dxtop/service/impl/SysFileServiceImpl.java

@@ -156,7 +156,7 @@ public class SysFileServiceImpl extends ServiceImpl<SysFileMapper, SysFile> impl
         LambdaQueryWrapper<SysFile> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(SysFile::getBatchNo, batchNo);
         List<SysFile> sysFileList = list(queryWrapper);
-        return this.deleteFiles(sysFileList);
+        return this.clearFiles(sysFileList);
     }
 
     @Override

src/main/java/com/usky/dxtop/service/job/FileJob.java

@@ -4,6 +4,7 @@ import com.usky.dxtop.model.SysFile;
 import com.usky.dxtop.service.SysFileService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
@@ -20,7 +21,8 @@ public class FileJob {
     @Autowired
     private SysFileService fileService;
 
-    private void deleteInvalidFile(String start) {
+    @Scheduled(cron = "0 0 0 */1 * ?")
+    public void deleteInvalidFile() {
         List<SysFile> sysFileList = fileService.getFileByExpireAt(new Date());
         if (CollectionUtils.isEmpty(sysFileList)) {
             return;

src/test/java/com/usky/dxtop/DxtopApplicationTests.java

@@ -3,6 +3,7 @@ package com.usky.dxtop;
 import com.usky.dxtop.service.config.rabbitmq.ChargeTransConfig;
 import com.usky.dxtop.service.config.rabbitmq.DishTransConfig;
 import com.usky.dxtop.service.config.rabbitmq.charge.ChargeProduceConfig;
+import com.usky.dxtop.service.job.FileJob;
 import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
@@ -31,6 +32,9 @@ class DxtopApplicationTests {
     @Qualifier(ChargeProduceConfig.TEMPLATE)
     private RabbitTemplate cart;
 
+    @Autowired
+    private FileJob fileJob;
+
 
     public String sendDirectMessageDish() {
         Map<String,Object> map = new HashMap<>();
@@ -92,5 +96,9 @@ class DxtopApplicationTests {
         map.put("account",1);
         chargeTransRabbitTemplate.convertAndSend(ChargeTransConfig.NAME, ChargeTransConfig.NAME, map);
     }
+    @Test
+    public void fileJob(){
+        fileJob.deleteInvalidFile();
+    }
 
 }