事件图片处理逻辑修改

src/main/java/com/zzsn/event/controller/EventManageController.java

@@ -20,7 +20,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.util.*;
 
@@ -93,17 +92,6 @@ public class EventManageController {
         return Result.OK(nodes);
     }
 
-    /**
-     * 2.17 上传icon
-     *
-     * @return
-     */
-    @PostMapping(value = "/upload")
-    @ResponseBody
-    public Result<?> uploadKnowledge(MultipartFile file) {
-        String url = eventService.upload(file);
-        return Result.OK(url);
-    }
 
     /**
      * 1.2 添加

src/main/java/com/zzsn/event/service/IEventService.java

@@ -89,15 +89,8 @@ public interface IEventService extends IService<Event> {
 
     void updateMain(AddEventParam addEventParam);
 
-    /**
-     * 获取专题绑定的关键词组列表
-     */
-    List<KeyWordsPage> bindKeyWordsList(String id);
-
     void deleteMain(String id);
 
-    String upload(MultipartFile file);
-
     List<StatisticsKeyWordVo> hotWords(String index, String id, Integer number);
 
     /**

src/main/java/com/zzsn/event/service/impl/EventServiceImpl.java

@@ -79,11 +79,6 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
     @Autowired
     private EsService esService;
 
-    @Value("${files.storage}")
-    String filesStorage;
-    @Value("${img.preview:}")
-    String imgPreview;
-
 
     @Override
     public List<SubjectKafkaVo> progressList(Date disableDate) {
@@ -97,24 +92,13 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
 
     @Override
     public EventVO queryInfo(String eventId) {
-        EventVO eventVO = baseMapper.queryInfo(eventId);
-        String eventIcon = eventVO.getEventIcon();
-        if (StringUtils.isNotEmpty(eventIcon)) {
-            eventVO.setEventIcon(imgPreview + eventIcon);
-        }
-        return eventVO;
+        return baseMapper.queryInfo(eventId);
     }
 
     @Override
     public IPage<EventManageVO> pageList(String eventName, Integer eventType, String startTime, String endTime, String order, String orderType, Integer pageNo, Integer pageSize) {
         int offset = (pageNo - 1) * pageSize;
         List<EventManageVO> pageList = baseMapper.pageList(eventName, eventType, startTime, endTime, order, orderType, offset, pageSize);
-        for (EventManageVO eventManageVO : pageList) {
-            String eventIcon = eventManageVO.getEventIcon();
-            if (StringUtils.isNotEmpty(eventIcon)) {
-                eventManageVO.setEventIcon(imgPreview + eventIcon);
-            }
-        }
         //获取总条数
         Integer count = baseMapper.totalCount(eventName, eventType, startTime, endTime);
         IPage<EventManageVO> pageData = new Page<>(pageNo, pageSize, count);
@@ -131,12 +115,6 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
         }
         List<EventFrontVO> pageList = baseMapper.frontPageList(eventName, eventType,labelField,labelName,type,order,orderType, offset, pageSize);
         if (CollectionUtils.isNotEmpty(pageList)) {
-            for (EventFrontVO eventFrontVO : pageList) {
-                String eventIcon = eventFrontVO.getEventIcon();
-                if (StringUtils.isNotEmpty(eventIcon)) {
-                    eventFrontVO.setEventIcon(imgPreview + eventIcon);
-                }
-            }
             //获取专题资讯的首发来源
             Map<String, String> map = getFirstMap(pageList);
             if (MapUtil.isNotEmpty(map)) {
@@ -230,10 +208,6 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
     public void updateMain(AddEventParam addEventParam) {
         Event subject = new Event();
         BeanUtils.copyProperties(addEventParam, subject);
-        String eventIcon = subject.getEventIcon();
-        if (StringUtils.isNotEmpty(eventIcon)) {
-            subject.setEventIcon(eventIcon.replace(imgPreview,""));
-        }
         String eventId = subject.getId();
         baseMapper.updateById(subject);
 
@@ -246,11 +220,6 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
     }
 
     @Override
-    public List<KeyWordsPage> bindKeyWordsList(String subjectId) {
-        return iKeyWordsService.bindKeyWordsList(subjectId);
-    }
-
-    @Override
     @Transactional
     public void deleteMain(String id) {
         //删除与信息源的关联关系
@@ -265,20 +234,6 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
     }
 
     @Override
-    public String upload(MultipartFile file) {
-        String filePath = null;
-        try {
-            String fileName = file.getOriginalFilename();  // 获取文件名称
-            filePath = getFilePath() + fileName;
-            file.transferTo(new File(filesStorage + filePath));
-            log.info("文件上传成功：" + fileName + "---" + filePath);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return filePath;
-    }
-
-    @Override
     public List<ModelVO> modelList() {
         return baseMapper.modelList();
     }
@@ -326,22 +281,4 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
         }
     }
 
-    //生成文件夹路径
-    private String getFilePath() {
-        LocalDate currentDate = LocalDate.now();
-        String current = currentDate.toString().replace("-", "");
-        String filePath = current + "/";
-        //判断文件夹是否存在，不存在创建
-        Path directory = Paths.get(filesStorage + filePath);
-        if (!Files.exists(directory)) {
-            try {
-                Files.createDirectories(directory);
-                log.info("文件夹创建成功：" + filePath);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        return filePath;
-    }
-
 }

src/main/resources/application-dev.yml

@@ -123,12 +123,8 @@ scheduling:
   enable: false
 serviceProject:
   url: https://clb.ciglobal.cn/clb-api/datapull/
-files:
-  storage: ${user.dir}/icon/
 scoreRule:
   weekScore: 10
   monthScore: 5
   yearScore: 3
   beforeYearScore: 1
-img:
-  preview: http://192.168.1.28:1688/event/

src/main/resources/application-pro.yml

@@ -120,12 +120,8 @@ scheduling:
   enable: true
 serviceProject:
   url: https://clb.ciglobal.cn/clb-api/datapull/
-files:
-  storage: ${user.dir}/icon/
 scoreRule:
   weekScore: 10
   monthScore: 5
   yearScore: 3
   beforeYearScore: 1
\ No newline at end of file
-img:
-  preview: https://clb.ciglobal.cn/clb-api/event/
\ No newline at end of file