1

src/main/java/com/fdkankan/agent/controller/ContactUsController.java

@@ -50,5 +50,11 @@ public class ContactUsController {
                        @RequestParam(required = false,defaultValue = "zh")String lang)  {
         contactUsService.exportPoint(req,resp,lang);
     }
+
+    @GetMapping("/getAllCountry")
+    public ResultData getAllCountry(){
+
+        return ResultData.ok(contactUsService.getAllCountry());
+    }
 }
 

src/main/java/com/fdkankan/agent/service/IContactUsService.java

@@ -10,6 +10,7 @@ import com.fdkankan.agent.request.ContactUsParam;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * <p>
@@ -28,4 +29,6 @@ public interface IContactUsService extends IService<ContactUs> {
     Page<ContactUsPoint> pointPageList(ContactUsParam param);
 
     void exportPoint(HttpServletRequest req, HttpServletResponse resp, String lang);
+
+    List<String> getAllCountry();
 }

src/main/java/com/fdkankan/agent/service/impl/ContactUsServiceImpl.java

@@ -24,6 +24,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -64,6 +65,14 @@ public class ContactUsServiceImpl extends ServiceImpl<IContactUsMapper, ContactU
     }
 
     @Override
+    public List<String> getAllCountry() {
+        LambdaQueryWrapper<ContactUs> wrapper = new LambdaQueryWrapper<>();
+        wrapper.groupBy(ContactUs::getCountry);
+        List<ContactUs> list = this.list(wrapper);
+        return list.stream().map(ContactUs::getCountry).collect(Collectors.toList());
+    }
+
+    @Override
     public void export(HttpServletRequest req, HttpServletResponse resp, String lang) {
         contactUsParam.setPageNum(1);
         contactUsParam.setPageSize(999999);

src/main/java/com/fdkankan/agent/service/impl/UserServiceImpl.java

@@ -124,9 +124,9 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
 
         try {
             if("en".equals(param.getLang())){
-                excelService.commonExport(req,resp,new Date().getTime() +"user",voListEn, UserVoEn.class);
+                excelService.commonExport(req,resp,new Date().getTime()/1000 +"user",voListEn, UserVoEn.class);
             }else {
-                excelService.commonExport(req,resp,new Date().getTime() +"用户管理",voList, UserVo.class);
+                excelService.commonExport(req,resp,new Date().getTime()/1000 +"用户管理",voList, UserVo.class);
             }
         } catch (Exception e) {
             throw new RuntimeException(e);