Browse Source

2019/11/11

wuzhiqiang 5 years ago
parent
commit
d9486d4ef4

+ 48 - 2
src/main/java/com/yc/education/controller/admin/AdminsBackController.java

@@ -1,5 +1,6 @@
 package com.yc.education.controller.admin;
 package com.yc.education.controller.admin;
 
 
+import com.github.pagehelper.PageInfo;
 import com.yc.education.controller.BaseController;
 import com.yc.education.controller.BaseController;
 import com.yc.education.model.*;
 import com.yc.education.model.*;
 import com.yc.education.service.*;
 import com.yc.education.service.*;
@@ -24,6 +25,8 @@ import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpSession;
 import java.io.File;
 import java.io.File;
 import java.io.IOException;
 import java.io.IOException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.*;
 
 
 /**
 /**
@@ -47,6 +50,9 @@ public class AdminsBackController extends BaseController {
 
 
 	@Autowired
 	@Autowired
 	private IFunctionService iFunctionService;//功能模块
 	private IFunctionService iFunctionService;//功能模块
+
+	@Autowired
+	private IUserInfoService iUserInfoService;//用户
 	
 	
 	/**
 	/**
 	 * 跳转到后台管理登录页面   Lock-玄清
 	 * 跳转到后台管理登录页面   Lock-玄清
@@ -230,8 +236,48 @@ public class AdminsBackController extends BaseController {
 	 * @return
 	 * @return
 	 */
 	 */
 	@RequestMapping(value={"welcome.html"})
 	@RequestMapping(value={"welcome.html"})
-	public ModelAndView welcome(){
-		return new ModelAndView();
+	public ModelAndView welcome(String timeVal){
+		ModelAndView mav = new ModelAndView();
+
+		if ("".equals(timeVal) || timeVal == null || "1".equals(timeVal)){                       //查询今天  默认
+            List<BackHomePage> todayList  = ((List) iUserInfoService.todayList());
+            if (    todayList.get(0).getCreateDate() == null){                                 //如果今天日期为空,则把当前系统时间赋值给今天日期
+               todayList.get(0).setCreateDate(new Date());
+            }
+            mav.addObject("pageInfo",new PageInfo<BackHomePage>(todayList));
+        }
+		if ("2".equals(timeVal)){                                                           //查询昨天
+           List<BackHomePage> yesterdayList = ((List)iUserInfoService.yesterdayList());
+            if (yesterdayList.get(0).getCreateDate() == null){                         //如果昨天日期为空,获取昨天时间并赋值给集合
+                Calendar calendar=Calendar.getInstance();
+                calendar.set(Calendar.HOUR_OF_DAY,-24);
+                Date yesterday   =   calendar.getTime();//获取昨天日期
+                yesterdayList.get(0).setCreateDate(yesterday);
+            }
+            mav.addObject("pageInfo",new PageInfo<BackHomePage>(yesterdayList));
+        }
+
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Calendar c = Calendar.getInstance();
+		if ("3".equals(timeVal)){                                                     //最近七天
+		    List<BackHomePage> sevenDaysList  = ((List)iUserInfoService.sevenDaysList());
+
+		    Long time1 = c.getTimeInMillis();                                          //获取当前日期毫秒数
+
+            c.add(Calendar.DATE, - 7);
+            Date time2 = c.getTime();
+            Long preTime = Long.parseLong(sdf.format(time2));                           //获取当前日期前七天的那天日期的毫秒数
+            mav.addObject("pageInfo",new PageInfo<BackHomePage>(sevenDaysList));
+        }
+            String [] arr = new String[7];
+            for (int i=0;i<7;i++) {
+                c.add(Calendar.DAY_OF_MONTH, -i);
+                arr[6 - i] = sdf.format(c.getTime());  //从今天到前七天的连续日期
+        }
+		mav.addObject("timeVal",timeVal);
+
+		return mav;
 	}
 	}
 	
 	
 	/**
 	/**

+ 0 - 58
src/main/java/com/yc/education/controller/admin/BackHomePageController.java

@@ -1,58 +0,0 @@
-package com.yc.education.controller.admin;
-
-import com.yc.education.service.IUserInfoService;
-import com.yc.education.util.AjaxMessage;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.util.*;
-
-
-/**
- * @author wuzhiqiang
- * @create 2019-10-26 14:18
- * @Description  后台首页显示实时数据管理
- */
-@Controller
-@RequestMapping("admin")
-public class BackHomePageController {
-
-    @Autowired
-    private IUserInfoService iUserInfoService;//用户
-
-    @ResponseBody
-    @RequestMapping("homePageData.html")
-    public AjaxMessage<Object>  backHomePage(){
-        AjaxMessage<Object> am = new AjaxMessage<>();
-        List<Object> list = new ArrayList<>();
-
-        Integer  userNumber = iUserInfoService.listUserNumber();//查询用户总数
-        Integer  businessNumber = iUserInfoService.listBusinessNumber();//查询商家总数
-        Integer  providerNumber = iUserInfoService.listProviderNumber();//查询服务商总数
-        Integer  supplierNumber = iUserInfoService.listSupplierNumber();//查询经销商总数
-        Integer  carNumber    = iUserInfoService.listCarNumber();//查询车主总数
-
-        /*map.put("userNumber",userNumber);
-        map.put("businessNumber",businessNumber);
-        map.put("providerNumber",providerNumber);
-        map.put("supplierNumber",supplierNumber);
-        map.put("carNumber",carNumber);*/
-
-        list.add(userNumber);
-        list.add(businessNumber);
-        list.add(providerNumber);
-        list.add(supplierNumber);
-        list.add(carNumber);
-
-
-        am.setIs(true);
-        am.setData(list);
-
-
-        return am;
-    }
-
-
-}

+ 103 - 1
src/main/java/com/yc/education/controller/admin/MessageAdminController.java

@@ -6,12 +6,14 @@ import com.yc.education.model.UserInfo;
 import com.yc.education.service.IMessageService;
 import com.yc.education.service.IMessageService;
 import com.yc.education.service.IProviderService;
 import com.yc.education.service.IProviderService;
 import com.yc.education.service.IUserInfoService;
 import com.yc.education.service.IUserInfoService;
+import com.yc.education.util.ViewUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.ModelAndView;
 
 
+import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
@@ -35,7 +37,7 @@ public class MessageAdminController {
 
 
 
 
     /**
     /**
-     * 查询
+     * 查询系统消息
      * @param title
      * @param title
      * @param isRead
      * @param isRead
      * @param pageNum
      * @param pageNum
@@ -71,5 +73,105 @@ public class MessageAdminController {
         return mav;
         return mav;
     }
     }
 
 
+    /**
+     * 跳转到信息发布页面
+     * @return
+     */
+    @RequestMapping("messageRelease.html")
+    public ModelAndView messageRelease(){
+        return  new ModelAndView();
+    }
+
 
 
+    /**
+     * 发布消息
+     * @return
+     */
+    @RequestMapping("messageReleases.html")
+    public ModelAndView messageReleases(Message message){
+
+        message.setCreateDate(new Date());
+        message.setIsRead("0");
+        message.setStoreId(null);
+
+        if (message.getUserType().equals("0")){ //选择发送的对象是车主
+            List<UserInfo>  listAllOwnerCar  = iUserInfoService.listOwnerCarInfo();
+            if (listAllOwnerCar != null && listAllOwnerCar.size() != 0){
+                int row =0;
+                for (UserInfo  u1  : listAllOwnerCar){
+                    message.setUserId(u1.getId());
+                    String title = message.getTitle();
+                    String content = message.getContent();
+                    Long userId  = u1.getId();
+                    Long storeId = message.getStoreId();
+                    String  isRead = message.getIsRead();
+                    Date  createDate = message.getCreateDate();
+                     row += iMessageService.toInsert(title,content,userId,storeId,isRead,createDate);
+                }
+                if (row > 0){
+                    return ViewUtil.returnview(row,"messageList.html","消息列表");
+                }
+            }
+        }
+
+        if (message.getUserType().equals("1")){ //选择发送的对象是服务商
+            List<UserInfo>  listProviderInfo  = iUserInfoService.listProviderInfo();
+            if (listProviderInfo != null && listProviderInfo.size() != 0){
+                int row =0;
+                for (UserInfo  u1  : listProviderInfo){
+                    message.setUserId(u1.getId());
+                    String title = message.getTitle();
+                    String content = message.getContent();
+                    Long userId  = u1.getId();
+                    Long storeId = message.getStoreId();
+                    String  isRead = message.getIsRead();
+                    Date  createDate = message.getCreateDate();
+                    row += iMessageService.toInsert(title,content,userId,storeId,isRead,createDate);
+                }
+                if (row > 0){
+                    return ViewUtil.returnview(row,"messageList.html","消息列表");
+                }
+            }
+        }
+
+        if (message.getUserType().equals("2")){ //选择发送的对象是经销商
+            List<UserInfo>  listSupplierInfo  = iUserInfoService.listSupplierInfo();
+            if (listSupplierInfo != null && listSupplierInfo.size() != 0){
+                int row =0;
+                for (UserInfo  u1  : listSupplierInfo){
+                    message.setUserId(u1.getId());
+                    String title = message.getTitle();
+                    String content = message.getContent();
+                    Long userId  = u1.getId();
+                    Long storeId = message.getStoreId();
+                    String  isRead = message.getIsRead();
+                    Date  createDate = message.getCreateDate();
+                    row += iMessageService.toInsert(title,content,userId,storeId,isRead,createDate);
+                }
+                if (row > 0){
+                    return ViewUtil.returnview(row,"messageList.html","消息列表");
+                }
+            }
+        }
+        if (message.getUserType().equals("4")){ //选择发送的对象是全部
+            List<UserInfo>  listAllInfo  = iUserInfoService.listAllUsers();
+            if (listAllInfo != null && listAllInfo.size() != 0){
+                int row =0;
+                for (UserInfo  u1  : listAllInfo){
+                    message.setUserId(u1.getId());
+                    String title = message.getTitle();
+                    String content = message.getContent();
+                    Long userId  = u1.getId();
+                    Long storeId = message.getStoreId();
+                    String  isRead = message.getIsRead();
+                    Date  createDate = message.getCreateDate();
+                    row += iMessageService.toInsert(title,content,userId,storeId,isRead,createDate);
+                }
+                if (row > 0){
+                    return ViewUtil.returnview(row,"messageList.html","消息列表");
+                }
+            }
+        }
+        return ViewUtil.returnview(0,"messageList.html","消息列表");
+    }
 }
 }

+ 117 - 6
src/main/java/com/yc/education/controller/admin/ProviderAdminController.java

@@ -12,6 +12,7 @@ import com.yc.education.util.AjaxMessage;
 import com.yc.education.util.CommonCons;
 import com.yc.education.util.CommonCons;
 import com.yc.education.util.MapUtils;
 import com.yc.education.util.MapUtils;
 import com.yc.education.util.ViewUtil;
 import com.yc.education.util.ViewUtil;
+import jxl.write.DateTime;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Cell;
@@ -27,7 +28,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.ModelAndView;
 
 
+import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.io.*;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.text.DecimalFormat;
@@ -884,9 +887,13 @@ public class ProviderAdminController {
 
 
     //=================   适用poi导入表格数据   结束  ===========================
     //=================   适用poi导入表格数据   结束  ===========================
 
 
-
+    /**
+     * 数据导出
+     * @param dateVal
+     * @return
+     */
     @RequestMapping("providerExport.html")
     @RequestMapping("providerExport.html")
-    public  AjaxMessage<Object> providerExport(String dateVal){
+    public  void providerExport(String dateVal, HttpServletResponse response){
 
 
 
 
         HSSFWorkbook wb = new HSSFWorkbook();//创建文档对象
         HSSFWorkbook wb = new HSSFWorkbook();//创建文档对象
@@ -900,19 +907,123 @@ public class ProviderAdminController {
         cell.setCellValue("服务商商家信息表");
         cell.setCellValue("服务商商家信息表");
 
 
         row = sheet.createRow(1);//创建第二行存放数据库列字段
         row = sheet.createRow(1);//创建第二行存放数据库列字段
+        for (int i = 0;i<CommonCons.BUSINESS_EXPORT_FIELD.length;i++){
+            row.createCell(i).setCellValue(CommonCons.BUSINESS_EXPORT_FIELD[i]);
+        }
 
 
-        row.createCell(0).setCellValue("店铺名称");
 
 
         List<Provider> list = iProviderService.listAllProviderInfo();//查询服务商信息
         List<Provider> list = iProviderService.listAllProviderInfo();//查询服务商信息
+
+        List<Authentication> listAllAuthentication  = iAuthenticationService.listAuthenticationInfoProvider("","","","",1,Integer.MAX_VALUE);
+
+        List<Recommender> listAllRecommender  = iRecommenderService.listAllRecommender(1,Integer.MAX_VALUE);//查询所有推荐人信息
+        if (list != null && list.size()!=0) {
+
+            for (Provider provider : list) {
+
+                if (provider.getUserId() != null) {
+
+                    UserInfo userInfo = iUserInfoService.selectByKey(provider.getUserId());
+
+                    if (userInfo != null) {
+                        provider.setNickName(userInfo.getNickName());//设置用户昵称
+                    }
+                }
+                /*从认证表中获取认证时间*/
+                if (listAllAuthentication != null && listAllAuthentication.size()!=0){
+
+                    for (Authentication authentication : listAllAuthentication){
+
+                        if (authentication.getStoreId().equals(provider.getId())){
+                            provider.setAuTime(authentication.getCreateDate());//给认证时间赋值
+                        }
+                    }
+                }
+                /*从推荐人表中获取推荐人姓名,电话,城市*/
+                if (listAllRecommender != null && listAllRecommender.size()!= 0){
+                    for (Recommender recommender : listAllRecommender){
+                        if (recommender.getPhone().equals(provider.getReferrerPhone())){
+                            provider.setReferTelphon(recommender.getPhone());//设置推荐人电话
+                            provider.setReferName(recommender.getName());//设置推荐人姓名
+                            provider.setReferCity(recommender.getCity());//设置推荐人城市
+                        }
+                    }
+                }
+            }
+        }
+        SimpleDateFormat f = new SimpleDateFormat("yyyy-MM-dd");
         if (list != null && list.size()!=0){
         if (list != null && list.size()!=0){
             for (int i= 2 ;i<=list.size()+1;i++){
             for (int i= 2 ;i<=list.size()+1;i++){
                   row = sheet.createRow(i);//查出来的数据有多少条就创建多少行
                   row = sheet.createRow(i);//查出来的数据有多少条就创建多少行
-                        row.createCell(0).setCellValue(list.get(i-2).getName());
+                row.createCell(0).setCellValue(list.get(i-2).getName());
+                row.createCell(1).setCellValue(list.get(i-2).getNickName());
+                row.createCell(2).setCellValue(list.get(i-2).getCompanyName());
+                row.createCell(3).setCellValue(list.get(i-2).getProvince());
+                row.createCell(4).setCellValue(list.get(i-2).getCity());
+                row.createCell(5).setCellValue(list.get(i-2).getDistrict());
+
+                if ("1".equals(list.get(i-2).getParamType())){
+                    row.createCell(6).setCellValue("小型汽车服务");
+                }
+                if ("2".equals(list.get(i-2).getParamType())){
+                    row.createCell(6).setCellValue("商用车专修");
+                }
+                if ("3".equals(list.get(i-2).getParamType())){
+                    row.createCell(6).setCellValue("4S店");
+                }
+
+                row.createCell(7).setCellValue(list.get(i-2).getAuthPhone());
+                row.createCell(8).setCellValue(list.get(i-2).getTelphone());
+                row.createCell(9).setCellValue(f.format(list.get(i-2).getCreateDate()));
+                row.createCell(10).setCellValue(f.format(list.get(i-2).getModifiedDate()));
+
+                if ("0".equals(list.get(i-2).getStatus())){
+                    row.createCell(11).setCellValue("未认证");
+                }
+                if ("1".equals(list.get(i-2).getStatus())){
+                    row.createCell(11).setCellValue("已认证");
+                }
+                //row.createCell(12).setCellValue("list.get(i-2).getAuTime()");
+                //list.get(i-2).getAuTime().toString() != "" && list.get(i-2).getAuTime().toString() != null
+
+                if (list.get(i-2)!=null && list.get(i-2).getAuTime() != null){
+                    row.createCell(12).setCellValue(f.format(list.get(i-2).getAuTime()));
+                }else {
+                    row.createCell(12).setCellValue("");
+                }
+
+                row.createCell(13).setCellValue(list.get(i-2).getReferName());
+                row.createCell(14).setCellValue(list.get(i-2).getReferTelphon());
+                row.createCell(15).setCellValue(list.get(i-2).getReferCity());
+                row.createCell(16).setCellValue(list.get(i-2).getOperator());
+                row.createCell(17).setCellValue(list.get(i-2).getPv());
             }
             }
         }
         }
-        exportOutPutExcel("C:\\Users\\Admin\\Desktop\\test.xls", wb);
+        OutputStream outputStream = null;
+        try {
+            response.setContentType("application/msexcel");
+            response.setHeader("Content-Disposition","attachment;filename=" + new String("providerExport.xls".getBytes("utf-8"),"ISO-8859-1"));
+         outputStream = response.getOutputStream();
+            wb.write(outputStream);
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }finally {
+            try {
+                outputStream.flush();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            try {
+                outputStream.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+
+       // exportOutPutExcel("C:\\Users\\MI\\Desktop\\test.xls", wb);
 
 
-        return new AjaxMessage<>();
+      //  return ViewUtil.returnview(1,"providerList.html","商家列表");
     }
     }
 
 
     /**
     /**

+ 8 - 0
src/main/java/com/yc/education/mapper/MessageMapper.java

@@ -5,6 +5,7 @@ import com.yc.education.model.WMyCollection;
 import com.yc.education.util.MyMapper;
 import com.yc.education.util.MyMapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 
+import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
@@ -30,4 +31,11 @@ public interface MessageMapper extends MyMapper<Message> {
      * @return
      * @return
      */
      */
     List<Message> listAllMessageInfo(@Param("title")String title,@Param("isRead")String isRead);
     List<Message> listAllMessageInfo(@Param("title")String title,@Param("isRead")String isRead);
+
+    int toInsert(@Param("title") String title,
+                 @Param("content") String content,
+                 @Param("userId") Long userId,
+                 @Param("storeId") Long storeId,
+                 @Param("isRead") String isRead,
+                 @Param("createDate") Date createDate);
 }
 }

+ 12 - 0
src/main/java/com/yc/education/mapper/UserInfoMapper.java

@@ -1,5 +1,6 @@
 package com.yc.education.mapper;
 package com.yc.education.mapper;
 
 
+import com.yc.education.model.BackHomePage;
 import com.yc.education.model.UserInfo;
 import com.yc.education.model.UserInfo;
 import com.yc.education.util.MyMapper;
 import com.yc.education.util.MyMapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
@@ -53,6 +54,7 @@ public interface UserInfoMapper extends MyMapper<UserInfo> {
      * @return
      * @return
      */
      */
     List<UserInfo> listOwnerCarInfo(@Param("list")List<Object> list,@Param("nickName") String nickName,@Param("phone") String phone);
     List<UserInfo> listOwnerCarInfo(@Param("list")List<Object> list,@Param("nickName") String nickName,@Param("phone") String phone);
+    List<UserInfo> listOwnerCarInfo();
 
 
     /**
     /**
      * 用户修改
      * 用户修改
@@ -76,4 +78,14 @@ public interface UserInfoMapper extends MyMapper<UserInfo> {
     int listCarNumber();
     int listCarNumber();
 
 
     List<UserInfo> listAllUsers();
     List<UserInfo> listAllUsers();
+
+    List<UserInfo> todayList();
+
+    List<UserInfo> listProviderInfo();
+
+    List<UserInfo> listSupplierInfo();
+
+    List<UserInfo> yesterdayList();
+
+    List<BackHomePage> sevenDaysList();
 }
 }

+ 43 - 0
src/main/java/com/yc/education/model/BackHomePage.java

@@ -0,0 +1,43 @@
+package com.yc.education.model;
+
+import java.util.Date;
+
+public class BackHomePage {
+
+    private Integer ownerCarNumber;//车主数量
+    private Integer providerNumber;//服务商数量
+    private Integer supplierNumber;//经销商数量
+    private Date  createDate;//日期
+
+    public Integer getOwnerCarNumber() {
+        return ownerCarNumber;
+    }
+
+    public void setOwnerCarNumber(Integer ownerCarNumber) {
+        this.ownerCarNumber = ownerCarNumber;
+    }
+
+    public Integer getProviderNumber() {
+        return providerNumber;
+    }
+
+    public void setProviderNumber(Integer providerNumber) {
+        this.providerNumber = providerNumber;
+    }
+
+    public Integer getSupplierNumber() {
+        return supplierNumber;
+    }
+
+    public void setSupplierNumber(Integer supplierNumber) {
+        this.supplierNumber = supplierNumber;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+}

+ 3 - 0
src/main/java/com/yc/education/service/IMessageService.java

@@ -2,6 +2,7 @@ package com.yc.education.service;
 
 
 import com.yc.education.model.Message;
 import com.yc.education.model.Message;
 
 
+import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
@@ -26,4 +27,6 @@ public interface IMessageService  extends  IService<Message>{
      * @param msg
      * @param msg
      */
      */
     void saveUserIdAndMsg(Long userId, String msg);
     void saveUserIdAndMsg(Long userId, String msg);
+
+    int toInsert(String title, String content, Long userId, Long storeId, String isRead, Date createDate);
 }
 }

+ 12 - 0
src/main/java/com/yc/education/service/IUserInfoService.java

@@ -1,5 +1,6 @@
 package com.yc.education.service;
 package com.yc.education.service;
 
 
+import com.yc.education.model.BackHomePage;
 import com.yc.education.model.UserInfo;
 import com.yc.education.model.UserInfo;
 import org.apache.ibatis.annotations.Update;
 import org.apache.ibatis.annotations.Update;
 
 
@@ -69,6 +70,7 @@ public interface IUserInfoService  extends IService<UserInfo>  {      //继承
      * @return
      * @return
      */
      */
     List<UserInfo> listOwnerCarInfo(List<Object> list,String nickName, String phone,Integer pageNum, Integer pageSize);
     List<UserInfo> listOwnerCarInfo(List<Object> list,String nickName, String phone,Integer pageNum, Integer pageSize);
+    List<UserInfo> listOwnerCarInfo();
 
 
     int  listUserNumber();
     int  listUserNumber();
 
 
@@ -81,4 +83,14 @@ public interface IUserInfoService  extends IService<UserInfo>  {      //继承
     int listCarNumber();
     int listCarNumber();
 
 
     List<UserInfo> listAllUsers();
     List<UserInfo> listAllUsers();
+
+    List<UserInfo> todayList();
+
+    List<UserInfo> listProviderInfo();
+
+    List<UserInfo> listSupplierInfo();
+
+    List<UserInfo> yesterdayList();
+
+    List<BackHomePage> sevenDaysList();
 }
 }

+ 5 - 0
src/main/java/com/yc/education/service/impl/MessageServiceImpl.java

@@ -44,4 +44,9 @@ public class MessageServiceImpl extends BaseService<Message> implements IMessage
         message.setCreateDate(new Date());
         message.setCreateDate(new Date());
         mapper.insertSelective(message);
         mapper.insertSelective(message);
     }
     }
+
+    @Override
+    public int toInsert(String title, String content, Long userId,Long storeId,String isRead,Date createDate) {
+        return mapper.toInsert(title,content,userId,storeId,isRead,createDate);
+    }
 }
 }

+ 31 - 0
src/main/java/com/yc/education/service/impl/UserInfoServiceImpl.java

@@ -2,6 +2,7 @@ package com.yc.education.service.impl;
 
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
 import com.yc.education.mapper.UserInfoMapper;
 import com.yc.education.mapper.UserInfoMapper;
+import com.yc.education.model.BackHomePage;
 import com.yc.education.model.UserInfo;
 import com.yc.education.model.UserInfo;
 import com.yc.education.service.IUserInfoService;
 import com.yc.education.service.IUserInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -140,6 +141,11 @@ public class UserInfoServiceImpl extends BaseService<UserInfo> implements IUserI
         return userInfoMapper.listOwnerCarInfo(list,nickName,phone);
         return userInfoMapper.listOwnerCarInfo(list,nickName,phone);
     }
     }
 
 
+    @Override
+    public List<UserInfo> listOwnerCarInfo() {
+        return userInfoMapper.listOwnerCarInfo();
+    }
+
     @Override
     @Override
     public int listUserNumber() {
     public int listUserNumber() {
         return userInfoMapper.listUserNumber();
         return userInfoMapper.listUserNumber();
@@ -170,4 +176,29 @@ public class UserInfoServiceImpl extends BaseService<UserInfo> implements IUserI
     public List<UserInfo> listAllUsers() {
     public List<UserInfo> listAllUsers() {
         return userInfoMapper.listAllUsers();
         return userInfoMapper.listAllUsers();
     }
     }
+
+    @Override
+    public List<UserInfo> todayList() {
+        return userInfoMapper.todayList();
+    }
+
+    @Override
+    public List<UserInfo> listProviderInfo() {
+        return userInfoMapper.listProviderInfo();
+    }
+
+    @Override
+    public List<UserInfo> listSupplierInfo() {
+        return userInfoMapper.listSupplierInfo();
+    }
+
+    @Override
+    public List<UserInfo> yesterdayList() {
+        return userInfoMapper.yesterdayList();
+    }
+
+    @Override
+    public List<BackHomePage> sevenDaysList() {
+        return userInfoMapper.sevenDaysList();
+    }
 }
 }

+ 5 - 14
src/main/java/com/yc/education/test/mainTest.java

@@ -5,6 +5,7 @@ import com.yc.education.util.HttpRequest;
 import com.yc.education.util.SM4;
 import com.yc.education.util.SM4;
 
 
 import java.io.IOException;
 import java.io.IOException;
+import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Calendar;
@@ -59,20 +60,10 @@ public class mainTest {
         System.out.println((a-1)/12+1 );
         System.out.println((a-1)/12+1 );
 
 
 
 
-        ArrayList< String > list = new ArrayList<>( );
-        list.add("a");
-        list.add("b");
-        list.add("c");
-        list.add("d");
-        //0 1 2 3
-        for (int i = 0; i < 2; i++) {
-            System.out.println(list.subList(i*2,2*(i+1)) );
+        String[] arr = {"店铺名称","商家名称","用户昵称","用户电话"};
+        for (int i=0;i<arr.length;i++){
+            System.out.println(i);
+            System.out.println(arr[i]);
         }
         }
-
-        String st = "123a,b;c;d,e";
-
-        System.out.println(st.substring(3));
-        System.out.println(st.replace(";",",") );
-
     }
     }
 }
 }

+ 4 - 0
src/main/java/com/yc/education/util/CommonCons.java

@@ -199,5 +199,9 @@ public class CommonCons {
      * 26个大写英文字母 根据字母索引使用   wzq
      * 26个大写英文字母 根据字母索引使用   wzq
      */
      */
     public static final String  CAPITAL_ENGLISH_LETTER = "A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z";
     public static final String  CAPITAL_ENGLISH_LETTER = "A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z";
+    /**
+     * 商家导出字段数组   wzq
+     */
+    public static final String [] BUSINESS_EXPORT_FIELD = {"店铺名称","用户昵称","企业名称","省","市","区","服务类别","用户电话","店铺电话","入驻时间","最后登录时间","认证状态","认证时间","推荐人姓名","推荐人手机号","推荐人城市","录入人姓名","浏览量"};
 
 
 }
 }

+ 7 - 0
src/main/resources/mapper/MessageMapper.xml

@@ -45,5 +45,12 @@
             </if>
             </if>
 
 
         </where>
         </where>
+        order by id desc, create_date desc
     </select>
     </select>
+
+    <!--发布信息-->
+    <insert id="toInsert" parameterType="com.yc.education.model.Message">
+        insert into message (title,content,user_id,store_id,is_read,create_date) values
+        (#{title,jdbcType=VARCHAR},#{content,jdbcType=VARCHAR},#{userId,jdbcType=BIGINT},#{storeId,jdbcType=BIGINT},#{isRead,jdbcType=CHAR},#{createDate,jdbcType=DATE})
+    </insert>
 </mapper>
 </mapper>

+ 35 - 0
src/main/resources/mapper/UserInfoMapper.xml

@@ -25,6 +25,30 @@
         <result column="param_type" property="paramType" jdbcType="CHAR"/>
         <result column="param_type" property="paramType" jdbcType="CHAR"/>
     </resultMap>
     </resultMap>
 
 
+
+    <!--查询今天的用户信息-->
+    <select id="todayList"  resultType="com.yc.education.model.BackHomePage">
+     select a.ct ownerCarNumber,b.ct providerNumber ,`c`.ct supplierNumber,a.create_date createDate from
+     (SELECT count(*) ct,create_date FROM user_info where role = 0 and  day(create_date) = day(now())) a,
+     ( SELECT count(*) ct,create_date FROM user_info where  role = 1 and day(create_date) = day(now())) b,
+     (SELECT count(*) ct,create_date FROM user_info where   role = 2 and day(create_date) = day(now())) `c`
+    </select>
+    <!--查询昨天的用户信息-->
+    <select id="yesterdayList"  resultType="com.yc.education.model.BackHomePage">
+      select a.ct ownerCarNumber,b.ct providerNumber ,`c`.ct supplierNumber,ifnull(a.create_date,DATEDIFF(now(),a.create_date) = 1) from
+      (SELECT count(*) ct,create_date FROM user_info where role = 0 and  DATEDIFF(now(),create_date) = 1) a,
+      (SELECT count(*) ct,create_date FROM user_info where  role = 1 and DATEDIFF(now(),create_date) = 1) b,
+      (SELECT count(*) ct,create_date FROM user_info where   role = 2 and DATEDIFF(now(),create_date) = 1) `c`
+    </select>
+    <!--查询最近七天的用户信息-->
+    <select id="sevenDaysList"  resultType="com.yc.education.model.BackHomePage">
+     select  DATE_FORMAT(a.create_date,'%Y-%m-%d') createDate,
+        count((select role from user_info b where a.id = b.id and b.role = 1)) providerNumber ,
+        count((select role from user_info b where a.id = b.id and b.role = 2)) supplierNumber ,
+         count((select role from user_info b where a.id = b.id and b.role = 0)) ownerCarNumber
+           from user_info a  group by createDate order by createDate desc
+    </select>
+
     <!--查询所有用户-->
     <!--查询所有用户-->
     <select id="listAllUsers" resultMap="BaseResultMap">
     <select id="listAllUsers" resultMap="BaseResultMap">
         select * from user_info
         select * from user_info
@@ -65,6 +89,15 @@
 
 
         order by id
         order by id
     </select>
     </select>
+    <!--查询服务商信息-->
+    <select id="listProviderInfo" resultMap="BaseResultMap">
+        select * from user_info where role = 1
+    </select>
+    <!--查询经销商信息-->
+    <select id="listSupplierInfo" resultMap="BaseResultMap">
+        select * from user_info where role = 2
+    </select>
+
 
 
     <!--g根据电话号码查询用户昵称-->
     <!--g根据电话号码查询用户昵称-->
     <select id="listInfoByTelphone" resultMap="BaseResultMap">
     <select id="listInfoByTelphone" resultMap="BaseResultMap">
@@ -101,6 +134,8 @@
         select count(*) from user_info where role = 0
         select count(*) from user_info where role = 0
     </select>
     </select>
 
 
+
+
     <!--    <update id="updateByUserInfo" parameterType="java.util.Map">
     <!--    <update id="updateByUserInfo" parameterType="java.util.Map">
           update user_info a a.photo = #{userInfo.photo},a.nick_name = #{userInfo.nickName} ,a.longitude = #{userInfo.longitude} ,a.latitude = #{userInfo.latitude} ,a.modified_date = #{userInfo.modifiedDate} where a.openid = #{userInfo.openid}
           update user_info a a.photo = #{userInfo.photo},a.nick_name = #{userInfo.nickName} ,a.longitude = #{userInfo.longitude} ,a.latitude = #{userInfo.latitude} ,a.modified_date = #{userInfo.modifiedDate} where a.openid = #{userInfo.openid}
         </update>-->
         </update>-->

+ 2 - 2
src/main/webapp/WEB-INF/jsp/admin/messageList.jsp

@@ -56,7 +56,7 @@
     <div class="cl pd-5 bg-1 bk-gray mt-20">
     <div class="cl pd-5 bg-1 bk-gray mt-20">
 			<span class="l">
 			<span class="l">
                <%-- <a class="btn btn-danger radius"  href="javascript:;"  id="delete"    ><i class="Hui-iconfont">&#xe6e2;</i>批量删除</a>--%>
                <%-- <a class="btn btn-danger radius"  href="javascript:;"  id="delete"    ><i class="Hui-iconfont">&#xe6e2;</i>批量删除</a>--%>
-				<a class="btn btn-primary radius" href="messageAdd.html"><i
+				<a class="btn btn-primary radius" href="messageRelease.html"><i
                         class="Hui-iconfont">&#xe600;</i> 发布消息</a>
                         class="Hui-iconfont">&#xe600;</i> 发布消息</a>
 			</span>
 			</span>
         <span class="r">共有数据:<strong>${pageInfo.total}</strong> 条</span>
         <span class="r">共有数据:<strong>${pageInfo.total}</strong> 条</span>
@@ -124,7 +124,7 @@
                             <li><a href="messageList.html?title=${title}&isRead=${isRead}&pageNum=${nav}&pageSize=${pageInfo.pageSize}"
                             <li><a href="messageList.html?title=${title}&isRead=${isRead}&pageNum=${nav}&pageSize=${pageInfo.pageSize}"
                                    class="active">${nav}</a></li>
                                    class="active">${nav}</a></li>
                         </c:if>
                         </c:if>
-                        <c:if test="${nav != pageInfo.pageNum}">`
+                        <c:if test="${nav != pageInfo.pageNum}">
                             <li>
                             <li>
                                 <a href="messageList.html?title=${title}&isRead=${isRead}&pageNum=${nav}&pageSize=${pageInfo.pageSize}">${nav}</a>
                                 <a href="messageList.html?title=${title}&isRead=${isRead}&pageNum=${nav}&pageSize=${pageInfo.pageSize}">${nav}</a>
                             </li>
                             </li>

+ 202 - 0
src/main/webapp/WEB-INF/jsp/admin/messageRelease.jsp

@@ -0,0 +1,202 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%
+    String base = pageContext.getServletContext().getContextPath();
+%>
+<!--_meta 作为公共模版分离出去-->
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta charset="utf-8">
+    <script type="text/javascript">
+        window.UEDITOR_SERVER_URL = '<%=base%>';
+    </script>
+    <meta name="renderer" content="webkit|ie-comp|ie-stand">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport"
+          content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/>
+    <meta http-equiv="Cache-Control" content="no-siteapp"/>
+    <LINK rel="Bookmark" href="/favicon.ico">
+    <LINK rel="Shortcut Icon" href="/favicon.ico"/>
+
+    <link rel="stylesheet" type="text/css"
+          href="${pageContext.request.contextPath}/static/admin/index/h-ui/css/H-ui.min.css"/>
+    <link rel="stylesheet" type="text/css"
+          href="${pageContext.request.contextPath}/static/admin/index/h-ui.admin/css/H-ui.admin.css"/>
+    <link rel="stylesheet" type="text/css"
+          href="${pageContext.request.contextPath}/static/admin/index/Hui-iconfont/1.0.8/iconfont.css"/>
+    <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/static/admin/icheck/icheck.css"/>
+    <link rel="stylesheet" type="text/css"
+          href="${pageContext.request.contextPath}/static/admin/index/h-ui.admin/skin/default/skin.css" id="skin"/>
+    <link rel="stylesheet" type="text/css"
+          href="${pageContext.request.contextPath}/static/admin/index/h-ui.admin/css/style.css"/>
+
+    <script type="text/javascript"
+            src="${pageContext.request.contextPath}/static/admin/index/jquery/1.9.1/jquery.min.js"></script>
+    <script type="text/javascript" src="${pageContext.request.contextPath}/static/admin/index/layer/layer.js"></script>
+    <script type="text/javascript"
+            src="${pageContext.request.contextPath}/static/admin/js/jquery.validate.min.js"></script>
+    <script type="text/javascript"
+            src="${pageContext.request.contextPath}/static/admin/js/validate-methods.js"></script>
+    <script type="text/javascript" src="${pageContext.request.contextPath}/static/admin/js/messages_zh.min.js"></script>
+    <script type="text/javascript"
+            src="${pageContext.request.contextPath}/static/admin/icheck/jquery.icheck.min.js"></script>
+    <script src="${pageContext.request.contextPath}/static/admin/manage/js/WdatePicker.js"></script>
+
+    <script type="text/javascript">
+        $(function () {
+            $("#sub").click(function () {
+              /*  var infotitle = $("input[name='infotitle']").val();
+                var  helptypeid = $('#hsg option:selected').val();
+                var infosort = $("input[name='infosort']").val();
+
+                if (infotitle == null || infotitle == '') {
+                    layer.msg("名称不能为空~");
+                    return false;
+                }
+                if (infosort == null || infosort == '') {
+                    layer.msg("排序不能为空~");
+                    return false;
+                }
+                if (helptypeid == null || helptypeid == '') {
+                    layer.msg("类型不能为空~");
+                    return false;
+                }*/
+
+                $('#subform').submit();
+            });
+        });
+    </script>
+
+    <title>消息发布</title>
+</head>
+<body>
+<nav class="breadcrumb">
+    <a class="btn btn-success radius r" style="line-height:1.6em;margin-top:3px"
+       href="javascript:location.replace(location.href);" title="刷新"><i class="Hui-iconfont">&#xe68f;</i></a>
+</nav>
+<article class="page-container">
+    <form action="messageReleases.html" method="post" enctype="multipart/form-data" class="form form-horizontal" id="subform">
+
+
+        <%--<div class="row cl">
+            <label class="form-label col-xs-4 col-sm-1"><span class="c-red">*</span>服务分类:</label>
+            <div class="formControls col-xs-8 col-sm-9">
+                <select name="pId" id="pId" class="input-text">
+                    <option value="0">服务分类</option>
+                    <c:forEach items="${findall}" var="newtype">
+                        <option value="${newtype.id}">${newtype.name}</option>
+                    </c:forEach>
+                </select>
+            </div>
+        </div>--%>
+
+
+            <div class="row cl">
+                <label class="form-label col-xs-4 col-sm-1"><span class="c-red">*</span>发送对象:</label>
+                <div class="formControls col-xs-8 col-sm-9">
+                    <select name="userType" id="hsg" class="select">
+                        <option value="">请选择</option>
+                        <option value="0">车主</option>
+                        <option value="1">服务商</option>
+                        <option value="2">经销商</option>
+                        <option value="4">全部</option>
+                    </select>
+                </div>
+            </div>
+
+            <div class="row cl">
+                <label class="form-label col-xs-4 col-sm-1"><span class="c-red">*</span>消息类型:</label>
+                <div class="formControls col-xs-8 col-sm-9">
+                    <select name="title" class="select">
+                        <option value="">请选择</option>
+                        <option value="系统消息">系统消息</option>
+                        <option value="平台通知">平台通知</option>
+                        <option value="支付消息">支付消息</option>
+                    </select>
+                </div>
+            </div>
+
+
+
+        <div class="row cl">
+            <label class="form-label col-xs-4 col-sm-1"><span class="c-red"></span>消息内容:</label>
+            <div class="formControls col-xs-8 col-sm-9">
+                <textarea name="content" rows="5" cols="120">
+
+                </textarea>
+            </div>
+
+        </div>
+
+
+        <div class="row cl">
+            <div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-1">
+                <button type="button" class="btn btn-primary radius" id="sub" name="admin-role-save"><i class="Hui-iconfont">&#xe632;</i> 发布</button>
+            </div>
+        </div>
+    </form>
+</article>
+
+<!--请在下方写此页面业务相关的脚本-->
+<!-- 百度文本编辑器   引用文件 -->
+<link href="<%=base%>/static/ue/themes/default/css/ueditor.css" type="text/css" rel="stylesheet">
+<script src="<%=base%>/static/ue/ueditor.config.js" type="text/javascript"></script>
+<script src="<%=base%>/static/ue/ueditor.all.js" type="text/javascript"></script>
+<script type="text/javascript" src="<%=base%>/static/ue/lang/zh-cn/zh-cn.js"></script>
+
+<!-- 百度文本编辑器   js -->
+<script type="text/javascript">
+    $(function () {
+        var ue = UE.getEditor('introduction', {
+            //关闭字数统计
+            wordCount: false,
+            toolbars: [['fullscreen', 'source', '|', 'undo', 'redo', '|',
+                'bold', 'italic', 'underline', 'fontborder', 'strikethrough', 'superscript', 'subscript', 'removeformat', 'formatmatch', 'autotypeset', 'blockquote', 'pasteplain', '|', 'forecolor', 'backcolor', 'insertorderedlist', 'insertunorderedlist', 'selectall', 'cleardoc', '|',
+                'rowspacingtop', 'rowspacingbottom', 'lineheight', '|',
+                'customstyle', 'paragraph', 'fontfamily', 'fontsize', '|',
+                'directionalityltr', 'directionalityrtl', 'indent', '|',
+                'justifyleft', 'justifycenter', 'justifyright', 'justifyjustify', '|', 'touppercase', 'tolowercase', '|',
+                'link', 'unlink', 'anchor', '|', 'imagenone', 'imageleft', 'imageright', 'imagecenter', '|',
+                'insertimage', 'emotion', 'insertvideo', 'attachment', 'map', 'template', 'background', '|',
+                'horizontal', 'date', 'time', 'spechars', 'wordimage', '|',
+                'inserttable', 'deletetable', 'insertparagraphbeforetable', 'insertrow', 'deleterow', 'insertcol', 'deletecol', 'mergecells', 'mergeright', 'mergedown', 'splittocells', 'splittorows', 'splittocols', 'charts', '|',
+                'print', 'preview', 'searchreplace', 'help'
+            ]],
+            //关闭elementPath
+            elementPathEnabled: false,
+        });
+    });
+
+
+    var currentBrowserId;
+
+    function browserImage(targetId) {
+        currentBrowserId = targetId;
+        var weboxTemp = $.webox({
+            height: 600,
+            width: 1024,
+            bgvisibel: true,
+            title: '图片管理',
+            iframe: '<%=base%>/admin/image/imgbox.html?' + Math.random()
+        });
+    }
+
+    function setImagepath(imgPath) {
+        $('#' + currentBrowserId).val(imgPath);
+    }
+
+    function closeFrame() {
+        $('#locked .span').click();
+    }
+</script>
+
+
+<!--请在下方写此页面业务相关的脚本-->
+<script type="text/javascript">
+</script>
+<!--/请在上方写此页面业务相关的脚本-->
+</body>
+</html>

+ 4 - 4
src/main/webapp/WEB-INF/jsp/admin/providerList.jsp

@@ -72,11 +72,11 @@
             <button class="btn btn-success" type="submit"><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
             <button class="btn btn-success" type="submit"><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
         </div>
         </div>
     </form>
     </form>
-    <%--<form action="providerExport.html"  method="post" enctype="multipart/form-data">
-        <input type="month" name = "dateVal" >
+    <form action="providerExport.html"  method="post" enctype="multipart/form-data">
+      <%--  <input type="month" name = "dateVal" >--%>
         <button class="btn btn-success"  type="submit"><i class="Hui-iconfont"></i> 导出</button>
         <button class="btn btn-success"  type="submit"><i class="Hui-iconfont"></i> 导出</button>
-        &lt;%&ndash; <a class="btn btn-primary radius" href="providerExport.html"><i class="Hui-iconfont"></i> 导出</a>&ndash;%&gt;
-    </form>--%>
+        <%-- <a class="btn btn-primary radius" href="providerExport.html"><i class="Hui-iconfont"></i> 导出</a>--%>
+    </form>
     <div class="cl pd-5 bg-1 bk-gray mt-20">
     <div class="cl pd-5 bg-1 bk-gray mt-20">
 			<%--<span class="l">
 			<%--<span class="l">
                 <a class="btn btn-danger radius"  href="javascript:;"  id="delete"    ><i class="Hui-iconfont">&#xe6e2;</i>批量删除</a>
                 <a class="btn btn-danger radius"  href="javascript:;"  id="delete"    ><i class="Hui-iconfont">&#xe6e2;</i>批量删除</a>

+ 109 - 32
src/main/webapp/WEB-INF/jsp/admin/welcome.jsp

@@ -10,18 +10,24 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
 <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
 <meta http-equiv="Cache-Control" content="no-siteapp" />
 <meta http-equiv="Cache-Control" content="no-siteapp" />
-<!--[if lt IE 9]>
-<script type="text/javascript" src="${pageContext.request.contextPath}/static/admin/index/js/html5shiv.js"></script>
-<script type="text/javascript" src="{pageContext.request.contextPath}/static/admin/index/js/respond.min.js"></script>
-<![endif]-->
-<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/static/h-ui/css/H-ui.min.css" />
-<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/static/h-ui.admin/css/H-ui.admin.css" />
-<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/static/admin/index/css/iconfont.css" />
-<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/static/h-ui.admin/skin/default/skin.css" id="skin" />
-<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/static/h-ui.admin/css/style.css" />
-<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/static/h-ui.admin/css/well.css" />
-<!--[if IE 6]>
-<script type="text/javascript" src="${pageContext.request.contextPath}/static/admin/index/js/DD_belatedPNG_0.0.8a-min.js" ></script>
+    <link rel="stylesheet" type="text/css"
+          href="${pageContext.request.contextPath}/static/admin/index/h-ui/css/H-ui.min.css"/>
+    <link rel="stylesheet" type="text/css"
+          href="${pageContext.request.contextPath}/static/admin/index/h-ui.admin/css/H-ui.admin.css"/>
+    <link rel="stylesheet" type="text/css"
+          href="${pageContext.request.contextPath}/static/admin/index/Hui-iconfont/1.0.8/iconfont.css"/>
+    <link rel="stylesheet" type="text/css"
+          href="${pageContext.request.contextPath}/static/admin/index/h-ui.admin/skin/default/skin.css" id="skin"/>
+    <link rel="stylesheet" type="text/css"
+          href="${pageContext.request.contextPath}/static/admin/index/h-ui.admin/css/style.css"/>
+    <link href="${pageContext.request.contextPath}/static/admin/css/page.css" rel="stylesheet" type="text/css"/>
+    <script type="text/javascript"
+            src="${pageContext.request.contextPath}/static/admin/index/jquery/1.9.1/jquery.min.js"></script>
+    <script type="text/javascript" src="${pageContext.request.contextPath}/static/admin/index/layer/layer.js"></script>
+    <script type="text/javascript"
+            src="${pageContext.request.contextPath}/static/admin/index/h-ui/js/H-ui.min.js"></script>
+    <script type="text/javascript"
+            src="${pageContext.request.contextPath}/static/admin/index/h-ui.admin/js/H-ui.admin.js"></script>
 <script>DD_belatedPNG.fix('*');</script>
 <script>DD_belatedPNG.fix('*');</script>
 <![endif]-->
 <![endif]-->
     <script type="text/javascript" src="${pageContext.request.contextPath}/static/echarts/echarts.min.js"></script>
     <script type="text/javascript" src="${pageContext.request.contextPath}/static/echarts/echarts.min.js"></script>
@@ -31,21 +37,96 @@
 <title>我的桌面</title>
 <title>我的桌面</title>
 </head>
 </head>
 <body>
 <body>
-<style>
-    .nav-overview{width:90%;height:auto;margin: 30px auto;}
-    .widget-box-header{padding-bottom: 15px;position: relative;}
-    .widget-box-title{color: #333333;font-size: 14px;font-weight: bold;line-height: 14px;}
-    .widget-box-overview{background: #f8f8f8 none repeat scroll 0 0; margin-bottom: 40px;padding: 40px 10px;text-align: center;transition: padding 0.5s ease 0s;}
-    .widget-box-overview ul li h5{font-size: 26px;height: 1.5em;letter-spacing: -1px;line-height: 1.5em;}
-</style>
-<div class="box">
-    <%--<div id="chartmain" style="width: 800px;height:400px;"></div>--%>
-    <div id="sb">
+<nav class="breadcrumb">
+    <a class="btn btn-success radius r" style="line-height:1.6em;margin-top:3px"
+       href="javascript:location.replace(location.href);" title="刷新"><i class="Hui-iconfont">&#xe68f;</i></a>
+</nav>
+<div class="page-container">
+    <form action="welcome.html" method="post"   enctype="multipart/form-data">
+    <div class="text-c">
+    <span class="select-box inline">
+    <select name="timeVal" class="select">
+    <option value="">请选择</option>
+        <option value="1" <%--<c:if test="${timeVal == '1' || timeVal == null}">selected="selected"</c:if>--%> >今天</option>
+        <option value="2" <%--<c:if test="${timeVal == '2'}">selected="selected"</c:if>--%> >昨天</option>
+       <%-- <option value="3" &lt;%&ndash;<c:if test="${timeVal == '3'}">selected="selected"</c:if>&ndash;%&gt;>近一周</option>
+        <option value="4"&lt;%&ndash;<c:if test="${timeVal == '4'}">selected="selected"</c:if>&ndash;%&gt;>近30天</option>--%>
+
 
 
+    </select>
+    </span>
+    <button class="btn btn-success" type="submit"><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
+    </div>
+    </form>
+    <div class="cl pd-5 bg-1 bk-gray mt-20">
+			<%--<span class="l">
+                <a class="btn btn-danger radius"  href="javascript:;"  id="delete"    ><i class="Hui-iconfont">&#xe6e2;</i>批量删除</a>
+				<a class="btn btn-primary radius" href="ownerServiceTypeAdd.html"><i
+                        class="Hui-iconfont">&#xe600;</i> 添加类型</a>
+			</span>--%>
+        <span class="r">共有数据:<strong>${pageInfo.total }</strong> 条</span>
     </div>
     </div>
 
 
-</div>
 
 
+    <div class="mt-20">
+        <table class="table table-border table-bordered table-bg table-hover table-sort">
+            <thead>
+            <tr class="text-c">
+                <th width="80">时间</th>
+                <th width="120">服务商</th>
+                <th width="120">经销商</th>
+                <th width="120">车主</th>
+                <th width="120">商家总数</th>
+                <th width="120">用户总数</th>
+            </tr>
+            </thead>
+            <tbody>
+            <c:forEach items="${pageInfo.list }" var="item">
+                <tr class="text-c">
+
+                    <td class="text-l"> <fmt:formatDate value="${item.createDate}" pattern="yyyy-MM-dd"></fmt:formatDate> </td>
+                    <td class="text-l">${item.providerNumber}</td>
+                    <td class="text-l">${item.supplierNumber}</td>
+                    <td class="text-l">${item.ownerCarNumber}</td>
+                    <td class="text-l">${item.providerNumber + item.supplierNumber}</td>
+                    <td class="text-l">${item.providerNumber + item.supplierNumber + item.ownerCarNumber}</td>
+
+                </tr>
+            </c:forEach>
+            </tbody>
+        </table>
+    </div>
+
+    <div id="PageNum">
+        <section>
+            <div class="bd points-goods-list">
+                <ul class="pages">
+                    <li><a href="welcome.html?timeVal=${timeVal}&pageNum=1&pageSize=${pageSize}">首页</a></li>
+                    <li class="prev"><a
+                            href="welcome.html?timeVal=${timeVal}&pageNum=${pageInfo.prePage}&pageSize=${pageSize}">上一页</a>
+                    </li>
+                    <c:forEach items="${pageInfo.navigatepageNums}" var="nav">
+                        <c:if test="${nav == pageInfo.pageNum}">
+                            <li><a href="welcome.html?timeVal=${timeVal}&pageNum=${nav}&pageSize=${pageSize}"
+                                   class="active">${nav}</a></li>
+                        </c:if>
+                        <c:if test="${nav != pageInfo.pageNum}">
+                            <li>
+                                <a href="welcome.html?timeVal=${timeVal}&pageNum=${nav}&pageSize=${pageSize}">${nav}</a>
+                            </li>
+                        </c:if>
+                    </c:forEach>
+                    <li class="next"><a
+                            href="welcome.html?timeVal=${timeVal}&pageNum=${pageInfo.nextPage}&pageSize=${pageSize}">下一页</a>
+                    </li>
+                    <li>
+                        <a href="welcome.html?timeVal=${timeVal}&pageNum=${pageInfo.pages }&pageSize=${pageSize}">末页</a>
+                    </li>
+                </ul>
+            </div>
+        </section>
+</div>
+</div>
 <script type="text/javascript">
 <script type="text/javascript">
 /*    var option = {
 /*    var option = {
         tooltip : {
         tooltip : {
@@ -142,19 +223,19 @@
         $(function(){
         $(function(){
 */
 */
            /* console.log(i+"第二个");*/
            /* console.log(i+"第二个");*/
-            $.ajax({
+          /*  $.ajax({
                 type: "post",
                 type: "post",
                 url: "homePageData.html",
                 url: "homePageData.html",
                 dataType: "json",
                 dataType: "json",
                 success: function (ajax) {
                 success: function (ajax) {
-                  /*  console.log(ajax.data);*/
+                  /!*  console.log(ajax.data);*!/
                     if (ajax.is) {
                     if (ajax.is) {
                         var listData = ajax.data;
                         var listData = ajax.data;
                         $('#sb').append('<lable>用户总数:</lable>'+listData[0]+'<br>')
                         $('#sb').append('<lable>用户总数:</lable>'+listData[0]+'<br>')
                             .append('<lable>商家总数:</lable>'+listData[1]+'<br>')
                             .append('<lable>商家总数:</lable>'+listData[1]+'<br>')
                             .append('<lable>服务商总数:</lable>'+listData[2]+'<br>')
                             .append('<lable>服务商总数:</lable>'+listData[2]+'<br>')
                             .append('<lable>经销商总数:</lable>'+listData[3]+'<br>')
                             .append('<lable>经销商总数:</lable>'+listData[3]+'<br>')
-                            .append('<lable>车主总数:</lable>'+listData[4]+'<br>');
+                            .append('<lable>车主总数:</lable>'+listData[4]+'<br>');*/
 
 
                         /*option.series[0].data.push(listData[0]);
                         /*option.series[0].data.push(listData[0]);
                         option.series[1].data.push(listData[0]);
                         option.series[1].data.push(listData[0]);
@@ -168,16 +249,12 @@
                         //使用制定的配置项和数据显示图表
                         //使用制定的配置项和数据显示图表
                         myChart.setOption(option);*/
                         myChart.setOption(option);*/
 
 
-                    }
+                /*    }
                 }
                 }
-            });
+            });*/
        /* });*/
        /* });*/
 
 
   /*  }*/
   /*  }*/
-
-
-
-
 </script>
 </script>
 </body>
 </body>
 </html>
 </html>