表单的导出

hope-winery/src/main/java/com/ruoyi/winery/component/MiniComponent.java

@@ -5,9 +5,8 @@ import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.core.redis.RedisCache;
-import com.ruoyi.winery.domain.WineryMauser;
+import com.ruoyi.winery.domain.winery.WineryMauser;
 import com.ruoyi.winery.service.IWineryMauserService;
 
 import lombok.extern.slf4j.Slf4j;

hope-winery/src/main/java/com/ruoyi/winery/controller/NewsContentController.java

@@ -30,13 +30,13 @@ import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * 新闻资讯Controller
- * 
+ *
  * @author ruoyi
  * @date 2020-12-31
  */
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
-@RequestMapping("/news/news_content" )
+@RequestMapping("/news/news_content")
 public class NewsContentController extends BaseController {
 
     private final INewsContentService iNewsContentService;
@@ -46,27 +46,26 @@ public class NewsContentController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('news:news_content:list')")
     @GetMapping("/list")
-    public TableDataInfo list(NewsContent newsContent)
+    public TableDataInfo list(UsernamePasswordAuthenticationToken token, NewsContent newsContent) {
-    {
         startPage();
         LambdaQueryWrapper<NewsContent> lqw = Wrappers.lambdaQuery(newsContent);
-        if (newsContent.getDeptId() != null){
+
-            lqw.eq(NewsContent::getDeptId ,newsContent.getDeptId());
+        lqw.eq(NewsContent::getDeptId, getDeptId(token));
+
+        if (StringUtils.isNotBlank(newsContent.getNewsTitle())) {
+            lqw.eq(NewsContent::getNewsTitle, newsContent.getNewsTitle());
         }
-        if (StringUtils.isNotBlank(newsContent.getNewsTitle())){
+        if (StringUtils.isNotBlank(newsContent.getNewsBody())) {
-            lqw.eq(NewsContent::getNewsTitle ,newsContent.getNewsTitle());
+            lqw.eq(NewsContent::getNewsBody, newsContent.getNewsBody());
         }
-        if (StringUtils.isNotBlank(newsContent.getNewsBody())){
+        if (StringUtils.isNotBlank(newsContent.getNewsImage())) {
-            lqw.eq(NewsContent::getNewsBody ,newsContent.getNewsBody());
+            lqw.eq(NewsContent::getNewsImage, newsContent.getNewsImage());
         }
-        if (StringUtils.isNotBlank(newsContent.getNewsImage())){
+        if (newsContent.getNewsType() != null) {
-            lqw.eq(NewsContent::getNewsImage ,newsContent.getNewsImage());
+            lqw.eq(NewsContent::getNewsType, newsContent.getNewsType());
         }
-        if (newsContent.getNewsType() != null){
+        if (newsContent.getState() != null) {
-            lqw.eq(NewsContent::getNewsType ,newsContent.getNewsType());
+            lqw.eq(NewsContent::getState, newsContent.getState());
-        }
-        if (newsContent.getState() != null){
-            lqw.eq(NewsContent::getState ,newsContent.getState());
         }
         List<NewsContent> list = iNewsContentService.list(lqw);
         return getDataTable(list);
@@ -75,30 +74,30 @@ public class NewsContentController extends BaseController {
     /**
      * 导出新闻资讯列表
      */
-    @PreAuthorize("@ss.hasPermi('news:news_content:export')" )
+    @PreAuthorize("@ss.hasPermi('news:news_content:export')")
-    @Log(title = "新闻资讯" , businessType = BusinessType.EXPORT)
+    @Log(title = "新闻资讯", businessType = BusinessType.EXPORT)
-    @GetMapping("/export" )
+    @GetMapping("/export")
     public AjaxResult export(NewsContent newsContent) {
         LambdaQueryWrapper<NewsContent> lqw = new LambdaQueryWrapper<NewsContent>(newsContent);
         List<NewsContent> list = iNewsContentService.list(lqw);
-        ExcelUtil<NewsContent> util = new ExcelUtil<NewsContent>(NewsContent. class);
+        ExcelUtil<NewsContent> util = new ExcelUtil<NewsContent>(NewsContent.class);
-        return util.exportExcel(list, "news_content" );
+        return util.exportExcel(list, "news_content");
     }
 
     /**
      * 获取新闻资讯详细信息
      */
-    @PreAuthorize("@ss.hasPermi('news:news_content:query')" )
+    @PreAuthorize("@ss.hasPermi('news:news_content:query')")
-    @GetMapping(value = "/{id}" )
+    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id" ) String id) {
+    public AjaxResult getInfo(@PathVariable("id") String id) {
         return AjaxResult.success(iNewsContentService.getById(id));
     }
 
     /**
      * 新增新闻资讯
      */
-    @PreAuthorize("@ss.hasPermi('news:news_content:add')" )
+    @PreAuthorize("@ss.hasPermi('news:news_content:add')")
-    @Log(title = "新闻资讯" , businessType = BusinessType.INSERT)
+    @Log(title = "新闻资讯", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(UsernamePasswordAuthenticationToken token, @RequestBody NewsContent newsContent) {
         newsContent.setDeptId(getDeptId(token));
@@ -108,8 +107,8 @@ public class NewsContentController extends BaseController {
     /**
      * 修改新闻资讯
      */
-    @PreAuthorize("@ss.hasPermi('news:news_content:edit')" )
+    @PreAuthorize("@ss.hasPermi('news:news_content:edit')")
-    @Log(title = "新闻资讯" , businessType = BusinessType.UPDATE)
+    @Log(title = "新闻资讯", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody NewsContent newsContent) {
         return toAjax(iNewsContentService.updateById(newsContent) ? 1 : 0);
@@ -118,9 +117,9 @@ public class NewsContentController extends BaseController {
     /**
      * 删除新闻资讯
      */
-    @PreAuthorize("@ss.hasPermi('news:news_content:remove')" )
+    @PreAuthorize("@ss.hasPermi('news:news_content:remove')")
-    @Log(title = "新闻资讯" , businessType = BusinessType.DELETE)
+    @Log(title = "新闻资讯", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}" )
+    @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable String[] ids) {
         return toAjax(iNewsContentService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
     }

hope-winery/src/main/java/com/ruoyi/winery/controller/mini/MiniController.java

@@ -8,7 +8,7 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.winery.component.MiniComponent;
-import com.ruoyi.winery.domain.WineryCompanyRecord;
+import com.ruoyi.winery.domain.winery.WineryCompanyRecord;
 import com.ruoyi.winery.enums.IrrigationTypeEnum;
 import com.ruoyi.winery.enums.SoilTypeEnum;
 import com.ruoyi.winery.enums.WineryStatusEnum;

hope-winery/src/main/java/com/ruoyi/winery/controller/winery/WineryCompanyRecordController.java

@@ -1,21 +1,15 @@
-package com.ruoyi.winery.controller;
+package com.ruoyi.winery.controller.winery;
 
-import cn.hutool.json.JSON;
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 
-import java.security.Principal;
 import java.util.List;
 import java.util.Arrays;
 
-import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.utils.StringUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -28,7 +22,7 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.winery.domain.WineryCompanyRecord;
+import com.ruoyi.winery.domain.winery.WineryCompanyRecord;
 import com.ruoyi.winery.service.IWineryCompanyRecordService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;

hope-winery/src/main/java/com/ruoyi/winery/controller/winery/WineryFoodSafetyController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.winery.controller;
+package com.ruoyi.winery.controller.winery;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -22,7 +22,7 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.winery.domain.WineryFoodSafety;
+import com.ruoyi.winery.domain.winery.WineryFoodSafety;
 import com.ruoyi.winery.service.IWineryFoodSafetyService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;

hope-winery/src/main/java/com/ruoyi/winery/controller/winery/WineryGoodsController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.winery.controller;
+package com.ruoyi.winery.controller.winery;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -22,7 +22,7 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.winery.domain.WineryGoods;
+import com.ruoyi.winery.domain.winery.WineryGoods;
 import com.ruoyi.winery.service.IWineryGoodsService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;

hope-winery/src/main/java/com/ruoyi/winery/controller/winery/WineryGoodsSpecController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.winery.controller;
+package com.ruoyi.winery.controller.winery;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -22,7 +22,7 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.winery.domain.WineryGoodsSpec;
+import com.ruoyi.winery.domain.winery.WineryGoodsSpec;
 import com.ruoyi.winery.service.IWineryGoodsSpecService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;

hope-winery/src/main/java/com/ruoyi/winery/controller/winery/WineryMauserController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.winery.controller;
+package com.ruoyi.winery.controller.winery;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -22,7 +22,7 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.winery.domain.WineryMauser;
+import com.ruoyi.winery.domain.winery.WineryMauser;
 import com.ruoyi.winery.service.IWineryMauserService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;

hope-winery/src/main/java/com/ruoyi/winery/controller/winery/WineryOrdersController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.winery.controller;
+package com.ruoyi.winery.controller.winery;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -22,7 +22,7 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.winery.domain.WineryOrders;
+import com.ruoyi.winery.domain.winery.WineryOrders;
 import com.ruoyi.winery.service.IWineryOrdersService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;

hope-winery/src/main/java/com/ruoyi/winery/controller/winery/WineryWineSpecDetailController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.winery.controller;
+package com.ruoyi.winery.controller.winery;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -22,7 +22,7 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.winery.domain.WineryWineSpecDetail;
+import com.ruoyi.winery.domain.winery.WineryWineSpecDetail;
 import com.ruoyi.winery.service.IWineryWineSpecDetailService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;

hope-winery/src/main/java/com/ruoyi/winery/domain/winery/WineryCompanyRecord.java

@@ -1,4 +1,4 @@
-package com.ruoyi.winery.domain;
+package com.ruoyi.winery.domain.winery;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.winery.enums.IrrigationTypeEnum;

hope-winery/src/main/java/com/ruoyi/winery/domain/winery/WineryFoodSafety.java

@@ -1,4 +1,4 @@
-package com.ruoyi.winery.domain;
+package com.ruoyi.winery.domain.winery;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

hope-winery/src/main/java/com/ruoyi/winery/domain/winery/WineryGoods.java

@@ -1,4 +1,4 @@
-package com.ruoyi.winery.domain;
+package com.ruoyi.winery.domain.winery;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

hope-winery/src/main/java/com/ruoyi/winery/domain/winery/WineryGoodsSpec.java

@@ -1,4 +1,4 @@
-package com.ruoyi.winery.domain;
+package com.ruoyi.winery.domain.winery;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

hope-winery/src/main/java/com/ruoyi/winery/domain/winery/WineryMauser.java

@@ -1,4 +1,4 @@
-package com.ruoyi.winery.domain;
+package com.ruoyi.winery.domain.winery;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

hope-winery/src/main/java/com/ruoyi/winery/domain/winery/WineryOrders.java

@@ -1,4 +1,4 @@
-package com.ruoyi.winery.domain;
+package com.ruoyi.winery.domain.winery;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

hope-winery/src/main/java/com/ruoyi/winery/domain/winery/WineryWineSpecDetail.java

@@ -1,4 +1,4 @@
-package com.ruoyi.winery.domain;
+package com.ruoyi.winery.domain.winery;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

hope-winery/src/main/java/com/ruoyi/winery/mapper/WineryCompanyRecordMapper.java

@@ -1,6 +1,6 @@
 package com.ruoyi.winery.mapper;
 
-import com.ruoyi.winery.domain.WineryCompanyRecord;
+import com.ruoyi.winery.domain.winery.WineryCompanyRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

hope-winery/src/main/java/com/ruoyi/winery/mapper/WineryFoodSafetyMapper.java

@@ -1,6 +1,6 @@
 package com.ruoyi.winery.mapper;
 
-import com.ruoyi.winery.domain.WineryFoodSafety;
+import com.ruoyi.winery.domain.winery.WineryFoodSafety;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

hope-winery/src/main/java/com/ruoyi/winery/mapper/WineryGoodsMapper.java

@@ -1,6 +1,6 @@
 package com.ruoyi.winery.mapper;
 
-import com.ruoyi.winery.domain.WineryGoods;
+import com.ruoyi.winery.domain.winery.WineryGoods;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

hope-winery/src/main/java/com/ruoyi/winery/mapper/WineryGoodsSpecMapper.java

@@ -1,6 +1,6 @@
 package com.ruoyi.winery.mapper;
 
-import com.ruoyi.winery.domain.WineryGoodsSpec;
+import com.ruoyi.winery.domain.winery.WineryGoodsSpec;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

hope-winery/src/main/java/com/ruoyi/winery/mapper/WineryMauserMapper.java

@@ -1,6 +1,6 @@
 package com.ruoyi.winery.mapper;
 
-import com.ruoyi.winery.domain.WineryMauser;
+import com.ruoyi.winery.domain.winery.WineryMauser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

hope-winery/src/main/java/com/ruoyi/winery/mapper/WineryOrdersMapper.java

@@ -1,6 +1,6 @@
 package com.ruoyi.winery.mapper;
 
-import com.ruoyi.winery.domain.WineryOrders;
+import com.ruoyi.winery.domain.winery.WineryOrders;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

hope-winery/src/main/java/com/ruoyi/winery/mapper/WineryWineSpecDetailMapper.java

@@ -1,6 +1,6 @@
 package com.ruoyi.winery.mapper;
 
-import com.ruoyi.winery.domain.WineryWineSpecDetail;
+import com.ruoyi.winery.domain.winery.WineryWineSpecDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

hope-winery/src/main/java/com/ruoyi/winery/service/IWineryCompanyRecordService.java

@@ -1,6 +1,6 @@
 package com.ruoyi.winery.service;
 
-import com.ruoyi.winery.domain.WineryCompanyRecord;
+import com.ruoyi.winery.domain.winery.WineryCompanyRecord;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

hope-winery/src/main/java/com/ruoyi/winery/service/IWineryFoodSafetyService.java

@@ -1,6 +1,6 @@
 package com.ruoyi.winery.service;
 
-import com.ruoyi.winery.domain.WineryFoodSafety;
+import com.ruoyi.winery.domain.winery.WineryFoodSafety;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

hope-winery/src/main/java/com/ruoyi/winery/service/IWineryGoodsService.java

@@ -1,6 +1,6 @@
 package com.ruoyi.winery.service;
 
-import com.ruoyi.winery.domain.WineryGoods;
+import com.ruoyi.winery.domain.winery.WineryGoods;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

hope-winery/src/main/java/com/ruoyi/winery/service/IWineryGoodsSpecService.java

@@ -1,6 +1,6 @@
 package com.ruoyi.winery.service;
 
-import com.ruoyi.winery.domain.WineryGoodsSpec;
+import com.ruoyi.winery.domain.winery.WineryGoodsSpec;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

hope-winery/src/main/java/com/ruoyi/winery/service/IWineryMauserService.java

@@ -1,6 +1,6 @@
 package com.ruoyi.winery.service;
 
-import com.ruoyi.winery.domain.WineryMauser;
+import com.ruoyi.winery.domain.winery.WineryMauser;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

hope-winery/src/main/java/com/ruoyi/winery/service/IWineryOrdersService.java

@@ -1,6 +1,6 @@
 package com.ruoyi.winery.service;
 
-import com.ruoyi.winery.domain.WineryOrders;
+import com.ruoyi.winery.domain.winery.WineryOrders;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

hope-winery/src/main/java/com/ruoyi/winery/service/IWineryWineSpecDetailService.java

@@ -1,6 +1,6 @@
 package com.ruoyi.winery.service;
 
-import com.ruoyi.winery.domain.WineryWineSpecDetail;
+import com.ruoyi.winery.domain.winery.WineryWineSpecDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

hope-winery/src/main/java/com/ruoyi/winery/service/impl/WineryCompanyRecordServiceImpl.java

@@ -3,7 +3,7 @@ package com.ruoyi.winery.service.impl;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.winery.mapper.WineryCompanyRecordMapper;
-import com.ruoyi.winery.domain.WineryCompanyRecord;
+import com.ruoyi.winery.domain.winery.WineryCompanyRecord;
 import com.ruoyi.winery.service.IWineryCompanyRecordService;
 
 /**

hope-winery/src/main/java/com/ruoyi/winery/service/impl/WineryFoodSafetyServiceImpl.java

@@ -3,7 +3,7 @@ package com.ruoyi.winery.service.impl;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.winery.mapper.WineryFoodSafetyMapper;
-import com.ruoyi.winery.domain.WineryFoodSafety;
+import com.ruoyi.winery.domain.winery.WineryFoodSafety;
 import com.ruoyi.winery.service.IWineryFoodSafetyService;
 
 /**

hope-winery/src/main/java/com/ruoyi/winery/service/impl/WineryGoodsServiceImpl.java

@@ -3,7 +3,7 @@ package com.ruoyi.winery.service.impl;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.winery.mapper.WineryGoodsMapper;
-import com.ruoyi.winery.domain.WineryGoods;
+import com.ruoyi.winery.domain.winery.WineryGoods;
 import com.ruoyi.winery.service.IWineryGoodsService;
 
 /**

hope-winery/src/main/java/com/ruoyi/winery/service/impl/WineryGoodsSpecServiceImpl.java

@@ -3,7 +3,7 @@ package com.ruoyi.winery.service.impl;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.winery.mapper.WineryGoodsSpecMapper;
-import com.ruoyi.winery.domain.WineryGoodsSpec;
+import com.ruoyi.winery.domain.winery.WineryGoodsSpec;
 import com.ruoyi.winery.service.IWineryGoodsSpecService;
 
 /**

hope-winery/src/main/java/com/ruoyi/winery/service/impl/WineryMauserServiceImpl.java

@@ -3,7 +3,7 @@ package com.ruoyi.winery.service.impl;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.winery.mapper.WineryMauserMapper;
-import com.ruoyi.winery.domain.WineryMauser;
+import com.ruoyi.winery.domain.winery.WineryMauser;
 import com.ruoyi.winery.service.IWineryMauserService;
 
 /**

hope-winery/src/main/java/com/ruoyi/winery/service/impl/WineryOrdersServiceImpl.java

@@ -3,7 +3,7 @@ package com.ruoyi.winery.service.impl;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.winery.mapper.WineryOrdersMapper;
-import com.ruoyi.winery.domain.WineryOrders;
+import com.ruoyi.winery.domain.winery.WineryOrders;
 import com.ruoyi.winery.service.IWineryOrdersService;
 
 /**

hope-winery/src/main/java/com/ruoyi/winery/service/impl/WineryWineSpecDetailServiceImpl.java

@@ -3,7 +3,7 @@ package com.ruoyi.winery.service.impl;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.winery.mapper.WineryWineSpecDetailMapper;
-import com.ruoyi.winery.domain.WineryWineSpecDetail;
+import com.ruoyi.winery.domain.winery.WineryWineSpecDetail;
 import com.ruoyi.winery.service.IWineryWineSpecDetailService;
 
 /**

ruoyi-common/src/main/java/com/ruoyi/common/utils/file/CosUtils.java

@@ -18,6 +18,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.URLEncoder;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -77,8 +78,12 @@ public class CosUtils {
 
         COSObject cosObject = cosClient.getObject(getObjectRequest);
 
+        // 文件类型
         response.setContentType(cosObject.getObjectMetadata().getContentType());
+        // 文件大小
         response.setContentLengthLong(cosObject.getObjectMetadata().getContentLength());
+        // 文件名
+        response.setHeader("Content-Disposition", "attachment;filename=" + cosObject.getKey());
         OutputStream os = null;
         try {
             os = response.getOutputStream();
@@ -105,4 +110,22 @@ public class CosUtils {
     }
 
 
+    public String uploadFile(String type, String filename, File file) {
+
+
+        // 指定要上传到 COS 上对象键
+        String key = ReUtil.replaceAll(StrUtil.trim(Optional.of(filename).orElse(StrUtil.EMPTY)), SPECIAL_CHARACTERS, StrUtil.EMPTY);
+        // 生成 cos 客户端。
+        COSClient cosClient = new COSClient(cosCredentials, clientConfig);
+        try {
+            PutObjectResult putObjectResult = cosClient.putObject(properties.getBucketName(), type + "/" + key, file);
+        } catch (Exception e) {
+        } finally {
+
+            cosClient.shutdown();
+        }
+        return type + "/" + key;
+
+    }
+
 }

ruoyi-ui/src/views/news/news_content/index.vue

@@ -1,15 +1,15 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="部门ID" prop="deptId">
+<!--      <el-form-item label="部门ID" prop="deptId">-->
-        <el-input
+<!--        <el-input-->
-          v-model="queryParams.deptId"
+<!--          v-model="queryParams.deptId"-->
-          placeholder="请输入部门ID"
+<!--          placeholder="请输入部门ID"-->
-          clearable
+<!--          clearable-->
-          size="small"
+<!--          size="small"-->
-          @keyup.enter.native="handleQuery"
+<!--          @keyup.enter.native="handleQuery"-->
-        />
+<!--        />-->
-      </el-form-item>
+<!--      </el-form-item>-->
       <el-form-item label="新闻标题" prop="newsTitle">
         <el-input
           v-model="queryParams.newsTitle"
@@ -87,33 +87,33 @@
         >删除
         </el-button>
       </el-col>
-      <el-col :span="1.5">
+<!--      <el-col :span="1.5">-->
-        <el-button
+<!--        <el-button-->
-          type="warning"
+<!--          type="warning"-->
-          icon="el-icon-download"
+<!--          icon="el-icon-download"-->
-          size="mini"
+<!--          size="mini"-->
-          @click="handleExport"
+<!--          @click="handleExport"-->
-          v-hasPermi="['news:news_content:export']"
+<!--          v-hasPermi="['news:news_content:export']"-->
-        >导出
+<!--        >导出-->
-        </el-button>
+<!--        </el-button>-->
-      </el-col>
+<!--      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="news_contentList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="规格ID" align="center" prop="id" v-if="false"/>
-      <el-table-column label="部门ID" align="center" prop="deptId"/>
+<!--      <el-table-column label="部门ID" align="center" prop="deptId"/>-->
       <el-table-column label="新闻标题" align="center" prop="newsTitle"/>
 <!--      <el-table-column label="新闻详情" align="center" prop="newsBody"/>-->
-      <el-table-column label="新闻封面图" align="center" prop="newsImage">
+      <el-table-column label="新闻封面图" align="center" prop="newsImage" width="100px">
         <template slot-scope="scope">
           <el-image :src="scope.row.newsImage|getImageForKey" style="width: 60px; height: 60px"/>
         </template>
 
       </el-table-column>
       <el-table-column label="新闻类型" align="center" prop="newsType" :formatter="newsTypeFormat"/>
-      <el-table-column label="状态" align="center" prop="state" :formatter="stateFormat">
+      <el-table-column label="状态" align="center" prop="state" :formatter="stateFormat" width="100px">
         <template slot-scope="scope">
           <el-tag :type="scope.row.state === 1 ? 'success' : 'danger'">
             {{scope.row.state | getStateName(stateOptions)}}
@@ -151,8 +151,8 @@
     />
 
     <!-- 添加或修改新闻资讯对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <!--        <el-form-item label="部门ID" prop="deptId">-->
         <!--          <el-input v-model="form.deptId" placeholder="请输入部门ID"/>-->
         <!--        </el-form-item>-->
@@ -195,9 +195,10 @@
         </el-form-item>
 
         <el-form-item label="新闻详情" prop="newsBody">
+          <!--  <el-input v-model="form.newsBody" placeholder="请输入新闻详情" />-->
           <editor :value="form.newsBody" :height="400" :min-height="400" @on-change="onChangeNewsBody"/>
-          <!--          <el-input v-model="form.newsBody" placeholder="请输入新闻详情"/>-->
         </el-form-item>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>