官网接口修改

official_backend/src/main/resources/application.properties

@@ -12,11 +12,11 @@ mybatis-plus.mapper-locations=mapper/*.xml
 
 #Êý¾Ý¿â
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://111.231.87.63:3306/cloud_model_website?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-#spring.datasource.url=jdbc:mysql://118.190.47.230:3306/cloud_model_website?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+#spring.datasource.url=jdbc:mysql://111.231.87.63:3306/cloud_model_website?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+spring.datasource.url=jdbc:mysql://118.190.47.230:3306/cloud_model_website?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 spring.datasource.username=root
-spring.datasource.password=Hssx2019.!
-#spring.datasource.password=p011430seya1026
+#spring.datasource.password=Hssx2019.!
+spring.datasource.password=p011430seya1026
 spring.datasource.hikari.max-lifetime=60000
 spring.datasource.hikari.IdleTimeout=60000
 spring.datasource.hikari.ConnectionTimeout=60000

src/main/java/com/hssx/website/controller/CompanyProductsController.java

@@ -0,0 +1,21 @@
+package com.hssx.website.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 第一个数据是公司优势 其他是案例 前端控制器
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-21
+ */
+@RestController
+@RequestMapping("/company-products")
+public class CompanyProductsController {
+
+}
+

src/main/java/com/hssx/website/controller/OnlineApplicationController.java

@@ -0,0 +1,21 @@
+package com.hssx.website.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-21
+ */
+@RestController
+@RequestMapping("/online-application")
+public class OnlineApplicationController {
+
+}
+

src/main/java/com/hssx/website/entity/CompanyProducts.java

@@ -0,0 +1,69 @@
+package com.hssx.website.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 第一个数据是公司优势 其他是案例
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class CompanyProducts extends Model<CompanyProducts> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 产品名称
+     */
+    @TableField("title")
+    private String title;
+
+    /**
+     * 产品图片地址
+     */
+    @TableField("image_url")
+    private String imageUrl;
+
+    /**
+     * 简介
+     */
+    @TableField("introduction")
+    private String introduction;
+
+    /**
+     * 地址
+     */
+    @TableField("address")
+    private String address;
+
+    /**
+     * 是否显示在首页 0不显示 1显示
+     */
+    @TableField("sticky")
+    private Integer sticky;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

src/main/java/com/hssx/website/entity/OnlineApplication.java

@@ -0,0 +1,88 @@
+package com.hssx.website.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class OnlineApplication extends Model<OnlineApplication> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 在线申请的主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 姓名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 手机号
+     */
+    @TableField("phone")
+    private String phone;
+
+    /**
+     * 企业名称
+     */
+    @TableField("business_name")
+    private String businessName;
+
+    /**
+     * 邮箱
+     */
+    @TableField("email")
+    private String email;
+
+    /**
+     * 备注说明
+     */
+    @TableField("content")
+    private String content;
+
+    /**
+     * 申请时间
+     */
+    @TableField("indate")
+    private LocalDateTime indate;
+
+    /**
+     * 是否已通过
+     */
+    @TableField("is_pass")
+    private Integer isPass;
+
+    /**
+     * 产品id
+     */
+    @TableField("products_id")
+    private Integer productsId;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

src/main/java/com/hssx/website/mapper/CompanyProductsMapper.java

@@ -0,0 +1,16 @@
+package com.hssx.website.mapper;
+
+import com.hssx.website.entity.CompanyProducts;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 第一个数据是公司优势 其他是案例 Mapper 接口
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-21
+ */
+public interface CompanyProductsMapper extends BaseMapper<CompanyProducts> {
+
+}

src/main/java/com/hssx/website/mapper/OnlineApplicationMapper.java

@@ -0,0 +1,16 @@
+package com.hssx.website.mapper;
+
+import com.hssx.website.entity.OnlineApplication;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-21
+ */
+public interface OnlineApplicationMapper extends BaseMapper<OnlineApplication> {
+
+}

src/main/java/com/hssx/website/service/CompanyProductsService.java

@@ -0,0 +1,16 @@
+package com.hssx.website.service;
+
+import com.hssx.website.entity.CompanyProducts;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 第一个数据是公司优势 其他是案例 服务类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-21
+ */
+public interface CompanyProductsService extends IService<CompanyProducts> {
+
+}

src/main/java/com/hssx/website/service/OnlineApplicationService.java

@@ -0,0 +1,16 @@
+package com.hssx.website.service;
+
+import com.hssx.website.entity.OnlineApplication;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-21
+ */
+public interface OnlineApplicationService extends IService<OnlineApplication> {
+
+}

src/main/java/com/hssx/website/service/impl/CompanyProductsServiceImpl.java

@@ -0,0 +1,20 @@
+package com.hssx.website.service.impl;
+
+import com.hssx.website.entity.CompanyProducts;
+import com.hssx.website.mapper.CompanyProductsMapper;
+import com.hssx.website.service.CompanyProductsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 第一个数据是公司优势 其他是案例 服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-21
+ */
+@Service
+public class CompanyProductsServiceImpl extends ServiceImpl<CompanyProductsMapper, CompanyProducts> implements CompanyProductsService {
+
+}

src/main/java/com/hssx/website/service/impl/OnlineApplicationServiceImpl.java

@@ -0,0 +1,20 @@
+package com.hssx.website.service.impl;
+
+import com.hssx.website.entity.OnlineApplication;
+import com.hssx.website.mapper.OnlineApplicationMapper;
+import com.hssx.website.service.OnlineApplicationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-21
+ */
+@Service
+public class OnlineApplicationServiceImpl extends ServiceImpl<OnlineApplicationMapper, OnlineApplication> implements OnlineApplicationService {
+
+}

src/main/resources/mapper/CompanyProductsMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hssx.website.mapper.CompanyProductsMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.website.entity.CompanyProducts">
+        <id column="id" property="id" />
+        <result column="title" property="title" />
+        <result column="image_url" property="imageUrl" />
+        <result column="introduction" property="introduction" />
+        <result column="address" property="address" />
+        <result column="sticky" property="sticky" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, title, image_url, introduction, address, sticky
+    </sql>
+
+</mapper>

src/main/resources/mapper/OnlineApplicationMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hssx.website.mapper.OnlineApplicationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.website.entity.OnlineApplication">
+        <id column="id" property="id" />
+        <result column="name" property="name" />
+        <result column="phone" property="phone" />
+        <result column="business_name" property="businessName" />
+        <result column="email" property="email" />
+        <result column="content" property="content" />
+        <result column="indate" property="indate" />
+        <result column="is_pass" property="isPass" />
+        <result column="products_id" property="productsId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, phone, business_name, email, content, indate, is_pass, products_id
+    </sql>
+
+</mapper>

website/src/main/java/com/hssx/website/controller/ArticleController.java

@@ -1,10 +1,15 @@
 package com.hssx.website.controller;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hssx.website.entity.Comment;
+import com.hssx.website.entity.OnlineApplication;
 import com.hssx.website.service.ArticleService;
 import com.hssx.website.service.CommentService;
+import com.hssx.website.service.CompanyProductsService;
+import com.hssx.website.service.OnlineApplicationService;
 import com.hssx.website.until.HttpRespMsg;
+import com.hssx.website.until.PageUtil;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -28,6 +33,8 @@ public class ArticleController {
     private ArticleService articleService;
     @Autowired
     private CommentService commentService;
+    @Autowired
+    private OnlineApplicationService onlineApplicationService;
 
     @ApiOperation("案例")
     @GetMapping("/index")
@@ -39,7 +46,8 @@ public class ArticleController {
     @ApiOperation("公司产品")
     @GetMapping("/goods")
     public String goods(Model model) {
-        model = articleService.getList(model);
+        System.out.println("开始加载接口");
+        model = articleService.getGoodsList(model);
         return "goods";
     }
 
@@ -58,5 +66,26 @@ public class ArticleController {
         msg.data = commentService.save(comment);
         return msg;
     }
+    @ApiOperation("在线申请")
+    @PostMapping("/onlineApply")
+    @ResponseBody
+    public HttpRespMsg onlineApply(OnlineApplication onlineApplication) {
+        onlineApplicationService.save(onlineApplication);
+        return  new HttpRespMsg();
+    }
+
+    /**
+     * 参数：pageNum 当前页码，pageSize 每页条数
+     * @param page
+     * @return
+     */
+    @ApiOperation("在线申请列表")
+    @PostMapping("/onlineApplyList")
+    @ResponseBody
+    public HttpRespMsg onlineApplyList(PageUtil page) {
+        return onlineApplicationService.getList(page);
+    }
+
+
 }
 

website/src/main/java/com/hssx/website/entity/CompanyProducts.java

@@ -0,0 +1,69 @@
+package com.hssx.website.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 第一个数据是公司优势 其他是案例
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class CompanyProducts extends Model<CompanyProducts> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 产品名称
+     */
+    @TableField("title")
+    private String title;
+
+    /**
+     * 产品图片地址
+     */
+    @TableField("image_url")
+    private String imageUrl;
+
+    /**
+     * 简介
+     */
+    @TableField("introduction")
+    private String introduction;
+
+    /**
+     * 地址
+     */
+    @TableField("address")
+    private String address;
+
+    /**
+     * 是否显示在首页 0不显示 1显示
+     */
+    @TableField("sticky")
+    private Integer sticky;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

website/src/main/java/com/hssx/website/entity/OnlineApplication.java

@@ -0,0 +1,82 @@
+package com.hssx.website.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class OnlineApplication extends Model<OnlineApplication> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 在线申请的主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 姓名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 手机号
+     */
+    @TableField("phone")
+    private String phone;
+
+    /**
+     * 企业名称
+     */
+    @TableField("business_name")
+    private String businessName;
+
+    /**
+     * 邮箱
+     */
+    @TableField("email")
+    private String email;
+
+    /**
+     * 备注说明
+     */
+    @TableField("content")
+    private String content;
+
+    /**
+     * 申请时间
+     */
+    @TableField("indate")
+    private LocalDateTime indate;
+
+    /**
+     * 是否已通过
+     */
+    @TableField("is_pass")
+    private Integer isPass;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

website/src/main/java/com/hssx/website/mapper/CompanyProductsMapper.java

@@ -0,0 +1,16 @@
+package com.hssx.website.mapper;
+
+import com.hssx.website.entity.CompanyProducts;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 第一个数据是公司优势 其他是案例 Mapper 接口
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-21
+ */
+public interface CompanyProductsMapper extends BaseMapper<CompanyProducts> {
+
+}

website/src/main/java/com/hssx/website/mapper/OnlineApplicationMapper.java

@@ -0,0 +1,16 @@
+package com.hssx.website.mapper;
+
+import com.hssx.website.entity.OnlineApplication;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-21
+ */
+public interface OnlineApplicationMapper extends BaseMapper<OnlineApplication> {
+
+}

website/src/main/java/com/hssx/website/service/ArticleService.java

@@ -15,4 +15,6 @@ import org.springframework.ui.Model;
 public interface ArticleService extends IService<Article> {
 
     Model getList(Model model);
+
+    Model getGoodsList(Model model);
 }

website/src/main/java/com/hssx/website/service/CompanyProductsService.java

@@ -0,0 +1,17 @@
+package com.hssx.website.service;
+
+import com.hssx.website.entity.CompanyProducts;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.ui.Model;
+
+/**
+ * <p>
+ * 第一个数据是公司优势 其他是案例 服务类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-21
+ */
+public interface CompanyProductsService extends IService<CompanyProducts> {
+
+}

website/src/main/java/com/hssx/website/service/OnlineApplicationService.java

@@ -0,0 +1,19 @@
+package com.hssx.website.service;
+
+import com.hssx.website.entity.OnlineApplication;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hssx.website.until.HttpRespMsg;
+import com.hssx.website.until.PageUtil;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-21
+ */
+public interface OnlineApplicationService extends IService<OnlineApplication> {
+
+    HttpRespMsg getList(PageUtil page);
+}

website/src/main/java/com/hssx/website/service/impl/ArticleServiceImpl.java

@@ -1,14 +1,9 @@
 package com.hssx.website.service.impl;
+import	java.lang.ref.Reference;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.hssx.website.entity.Article;
-import com.hssx.website.entity.BannerPictures;
-import com.hssx.website.entity.Comment;
-import com.hssx.website.entity.Cooperations;
-import com.hssx.website.mapper.ArticleMapper;
-import com.hssx.website.mapper.BannerPicturesMapper;
-import com.hssx.website.mapper.CommentMapper;
-import com.hssx.website.mapper.CooperationsMapper;
+import com.hssx.website.entity.*;
+import com.hssx.website.mapper.*;
 import com.hssx.website.service.ArticleService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
@@ -36,6 +31,8 @@ public class ArticleServiceImpl extends ServiceImpl<ArticleMapper, Article> impl
     private BannerPicturesMapper bannerPicturesMapper;
     @Resource
     private CommentMapper commentMapper;
+    @Resource
+    private CompanyProductsMapper companyProductsMapper;
 
     @Override
     public Model getList(Model model) {
@@ -52,4 +49,10 @@ public class ArticleServiceImpl extends ServiceImpl<ArticleMapper, Article> impl
         model.addAttribute("comment", comment);
         return model;
     }
+
+    @Override
+    public Model getGoodsList(Model model) {
+        model.addAttribute("companyProducts",companyProductsMapper.selectList(new QueryWrapper<CompanyProducts>().orderByDesc("id")));
+        return model;
+    }
 }

website/src/main/java/com/hssx/website/service/impl/CompanyProductsServiceImpl.java

@@ -0,0 +1,20 @@
+package com.hssx.website.service.impl;
+
+import com.hssx.website.entity.CompanyProducts;
+import com.hssx.website.mapper.CompanyProductsMapper;
+import com.hssx.website.service.CompanyProductsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 第一个数据是公司优势 其他是案例 服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-21
+ */
+@Service
+public class CompanyProductsServiceImpl extends ServiceImpl<CompanyProductsMapper, CompanyProducts> implements CompanyProductsService {
+
+}

website/src/main/java/com/hssx/website/service/impl/OnlineApplicationServiceImpl.java

@@ -0,0 +1,34 @@
+package com.hssx.website.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hssx.website.entity.OnlineApplication;
+import com.hssx.website.mapper.OnlineApplicationMapper;
+import com.hssx.website.service.OnlineApplicationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hssx.website.until.HttpRespMsg;
+import com.hssx.website.until.PageUtil;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * @author 吴涛涛
+ * @since 2019-11-21
+ */
+@Service
+public class OnlineApplicationServiceImpl extends ServiceImpl<OnlineApplicationMapper, OnlineApplication> implements OnlineApplicationService {
+    @Resource
+    private OnlineApplicationMapper onlineApplicationMapper;
+
+    @Override
+    public HttpRespMsg getList(PageUtil page) {
+        HttpRespMsg msg = new HttpRespMsg();
+        Page<OnlineApplication> pages = new Page<>(page.getPageNum(),page.getPageSize());
+//        onlineApplicationMapper.selectList(new QueryWrapper<OnlineApplication>());
+        IPage<OnlineApplication> pageInfo = onlineApplicationMapper.selectPage(pages,new QueryWrapper<OnlineApplication>().orderByDesc("id"));
+        msg.data = pageInfo;
+        return msg;
+    }
+}

website/src/main/java/com/hssx/website/until/PageUtil.java

@@ -0,0 +1,58 @@
+package com.hssx.website.until;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Author: 吴涛涛 cuiyi@itany.com
+ * Date : 2019 - 07 - 27 9:25
+ * Description:<描述> 模仿pagehelper参数的分页封装类
+ * Version: 1.0
+ */
+public class PageUtil<T> {
+    private Integer pageNum = 1;
+    private Integer total;
+    private Integer pageSize = 10;
+    private Integer pages;
+    private List<T> list = new ArrayList<>();
+
+    public Integer getPageNum() {
+        return pageNum;
+    }
+
+    public void setPageNum(Integer pageNum) {
+        this.pageNum = pageNum;
+    }
+
+    public Integer getTotal() {
+        return total;
+    }
+
+    public void setTotal(Integer total) {
+        this.total = total;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public Integer getPages() {
+        return pages;
+    }
+
+    public void setPages(Integer total) {
+        this.pages = total % this.pageSize == 0 ? total / this.pageSize : total / this.pageSize + 1;;
+    }
+
+    public List<T> getList() {
+        return list;
+    }
+
+    public void setList(List<T> list) {
+        this.list = list;
+    }
+}

website/src/main/resources/mapper/CompanyProductsMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hssx.website.mapper.CompanyProductsMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.website.entity.CompanyProducts">
+        <id column="id" property="id" />
+        <result column="title" property="title" />
+        <result column="image_url" property="imageUrl" />
+        <result column="introduction" property="introduction" />
+        <result column="address" property="address" />
+        <result column="sticky" property="sticky" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, title, image_url, introduction, address, sticky
+    </sql>
+
+</mapper>

website/src/main/resources/mapper/OnlineApplicationMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hssx.website.mapper.OnlineApplicationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.website.entity.OnlineApplication">
+        <id column="id" property="id" />
+        <result column="name" property="name" />
+        <result column="phone" property="phone" />
+        <result column="business_name" property="businessName" />
+        <result column="email" property="email" />
+        <result column="content" property="content" />
+        <result column="indate" property="indate" />
+        <result column="is_pass" property="isPass" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, phone, business_name, email, content, indate, is_pass
+    </sql>
+
+</mapper>

website/src/main/resources/templates/apply.html

@@ -180,20 +180,22 @@
                 $("#sub").click(function(){
                     var phone = $("#phone").val();
                     var name = $("#name").val();
-                    var enterprise = $("#enterprise").val();
-                    var email = $("#enterprise").val();
-                    var comment = $("#message").val();
-                    if(name == "" || phone == "" || comment == "" || enterprise == "" || email == ""){
+                    var businessName = $("#enterprise").val();
+                    var email = $("#email").val();
+                    var content = $("#message").val();
+                    if(name == "" || phone == "" || businessName == "" || content == "" || email == ""){
                         alert("请填写完整信息");
                     }else{
-                        $.post("/add", {
+                        $.post("/onlineApply", {
                             name: name,
                             phone: phone,
-                            comment: comment
+                            email:email,
+                            businessName:businessName,
+                            content:content
                         }, function (response) {
                             if(response.code == "ok"){
-                                alert("留言成功");
-                            }
+                                alert("申请成功");
+                                $(".form-group input,.form-group textarea").val("");                            }
                         })
                     }
                 });

website/src/main/resources/templates/goods.html

@@ -92,9 +92,9 @@
                                     <!--</div>-->
                                 <!--</div>-->
                             <!--</div>-->
-                            <div class="col-lg-4 col-md-6">
+                            <div class="col-lg-4 col-md-6" th:each="item:${companyProducts}">
                                 <div class="box-image-text">
-                                    <div class="image"><img src="./" alt="..." class="img-fluid">
+                                    <div class="image"><img th:src= "${{item.imageUrl}}" src="./" alt="..." class="img-fluid">
                                         <div class="overlay d-flex align-items-center justify-content-center">
                                             <a class="btn btn-template-outlined-white" href="apply">
                                                 <i class="fa fa-video-camera"> </i> 获取产品展示
@@ -105,8 +105,8 @@
                                         </div>
                                     </div>
                                     <div class="content">
-                                        <h4><a>Print</a></h4>
-                                        <p>shewing do an</p>
+                                        <h4 th:text="${{item.title}}"><!--<a>Print</a>--></h4>
+                                        <p th:text="${{item.introduction}}"></pth>
                                     </div>
                                 </div>
                             </div>

website/src/main/resources/templates/vendor/case.html

@@ -1,150 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>塑维</title>
-        <meta name="keywords" content="MES,MES系统,MES软件,制造执行系统,生产管理系统,生产协同,制造协同,生产流程管理,精益制造,智能制造,生产数字化,制造信息化"/>
-        <meta name="description" content="塑维智造是一款云端制造协同系统，通过数据和算法让生产更加高效。基于数据聚合、多角色协同、可视化分析、智能决策四大亮点，帮助企业缩短生产周期、降低库存积压、提升产能利用率、透明化制造流程，实现数据驱动下的精益制造。"/>
-        <meta name="description" content="">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <meta name="robots" content="all,follow">
-        <!-- Bootstrap CSS-->
-        <link rel="stylesheet" href="vendor/bootstrap/css/bootstrap.min.css">
-        <!-- Font Awesome CSS-->
-        <link rel="stylesheet" href="vendor/font-awesome/css/font-awesome.min.css">
-        <!-- Google fonts - Roboto-->
-        <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,700">
-        <!-- Bootstrap Select-->
-        <link rel="stylesheet" href="vendor/bootstrap-select/css/bootstrap-select.min.css">
-        <!-- owl carousel-->
-        <link rel="stylesheet" href="vendor/owl.carousel/assets/owl.carousel.css">
-        <link rel="stylesheet" href="vendor/owl.carousel/assets/owl.theme.default.css">
-        <!-- theme stylesheet-->
-        <link rel="stylesheet" href="css/style.blue.css" id="theme-stylesheet">
-        <!-- Custom stylesheet - for your changes-->
-        <link rel="stylesheet" href="css/custom.css">
-        <!-- Favicon and apple touch icons-->
-        <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
-        <!--<link rel="apple-touch-icon" href="img/apple-touch-icon.png">-->
-        <!--<link rel="apple-touch-icon" sizes="57x57" href="img/apple-touch-icon-57x57.png">-->
-        <!--<link rel="apple-touch-icon" sizes="72x72" href="img/apple-touch-icon-72x72.png">-->
-        <!--<link rel="apple-touch-icon" sizes="76x76" href="img/apple-touch-icon-76x76.png">-->
-        <!--<link rel="apple-touch-icon" sizes="114x114" href="img/apple-touch-icon-114x114.png">-->
-        <!--<link rel="apple-touch-icon" sizes="120x120" href="img/apple-touch-icon-120x120.png">-->
-        <!--<link rel="apple-touch-icon" sizes="144x144" href="img/apple-touch-icon-144x144.png">-->
-        <!--<link rel="apple-touch-icon" sizes="152x152" href="img/apple-touch-icon-152x152.png">-->
-        <!-- Tweaks for older IEs--><!--[if lt IE 9]>
-            <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
-            <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script><![endif]-->
-    </head>
-    <body>
-        <div id="all" class="about">
-            <!-- Navbar Start-->
-            <header class="nav-holder make-sticky">
-                <div id="navbar" role="navigation" class="navbar navbar-expand-lg">
-                <div class="container">
-                    <a href="index" class="navbar-brand home">
-                        <img src="img/logo.png" style="width:187px;" alt="Universal logo" class="d-none d-md-inline-block">
-                        <img src="img/logo-small.png" alt="Universal logo" class="d-inline-block d-md-none">
-                    </a>
-                    <button type="button" data-toggle="collapse" data-target="#navigation" class="navbar-toggler btn-template-outlined"><span class="sr-only">Toggle navigation</span><i class="fa fa-align-justify"></i></button>
-                    <div id="navigation" class="navbar-collapse collapse">
-                        <ul class="nav navbar-nav ml-auto">
-                            <li class="nav-item dropdown menu-large"><a href="index">首页 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown menu-large"><a href="product">公司优势 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown menu-large"><a href="partner">合作伙伴 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown active"><a href="case">成功案例 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown menu-large"><a href="goods">公司产品 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown menu-large">
-                                <a href="about.html">关于我们 <b class="caret"></b></a>
-                                <div class="qrcode">
-                                    <img src="img/qrCode.png" alt="..." class="img-fluid">
-                                    <div>请关注塑维公众号</div>
-                                </div>
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-                </div>
-            </header>
-            <!-- Navbar End-->
-            <div id="content">
-                <div class="container">
-                    <section class="bar">
-                        <!-- Image box with hover-->
-                        <div class="heading">
-                            <h2>成功案例</h2>
-                        </div>
-                        <div class="row mb-4">
-                            <div class="col-lg-4 col-md-6" th:each="item : ${cases}">
-                                <div class="box-image-text">
-                                    <div class="image"><img th:src="${{item.imageUrl}}" alt="..." class="img-fluid">
-                                        <div class="overlay d-flex align-items-center justify-content-center">
-                                            <a th:href="@{'caseDetail?id='+${item.id}}" class="btn btn-template-outlined-white">
-                                                <i class="fa fa-chain"> </i> 详情
-                                            </a>
-                                        </div>
-                                    </div>
-                                    <div class="content">
-                                        <h4><a th:href="@{'caseDetail?id='+${item.id}}" th:text="${item.title}">Print</a></h4>
-                                        <p th:text="${item.introduction}">shewing do an</p>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </section>
-                </div>
-            </div>
-            <!-- FOOTER -->
-            <footer class="main-footer">
-                <div class="container">
-                    <div class="row">
-                        <div class="col-lg-3">
-                            <h4 class="h6">联系我们</h4>
-                            <p class="text-uppercase">
-                                <br>电话: 400-1086-011
-                                <br>网址：<a href="http://www.yunzhusu.net" target="_blank">www.yunzhusu.net</a>
-                                <br>地址: 南京市雨花台区郁金香路36号国泰科创大厦2楼
-                            </p>
-                        </div>
-                        <div class="col-lg-3">
-                            <h4 class="h6">塑维产品</h4>
-                            <p class="text-uppercase">
-                                <br>百度: <a href="http://www.baidu.com" target="_blank">www.baidu.com</a>
-                                <br>官网：<a href="http://www.yunzhusu.net" target="_blank">www.yunzhusu.net</a>
-                                <br>云模：<a href="http://111.231.87.63:9098" target="_blank">www.yunsu.com</a>
-                            </p>
-                        </div>
-                        <div class="col-lg-6 bottom-code">
-                            <ul class="list-inline photo-stream">
-                                <li class="list-inline-item"><a href="#"><img src="img/qrCode.png" alt="..." class="img-fluid"></a></li>
-                            </ul>
-                            <h4 class="h6">官方微信公众号</h4>
-                        </div>
-                    </div>
-                </div>
-                <div class="container">
-                    <div class="row">
-                        <div class="col-lg-12 bottom-Copyright">
-                            Copyright © 1998 - 2019 Tencent. All Rights Reserved. 塑维公司 版权所有
-                        </div>
-                    </div>
-                </div>
-            </footer>
-        </div>
-        <!-- Javascript files-->
-        <script src="vendor/jquery/jquery.min.js"></script>
-        <script src="vendor/popper.js/umd/popper.min.js"> </script>
-        <script src="vendor/bootstrap/js/bootstrap.min.js"></script>
-        <script src="vendor/jquery.cookie/jquery.cookie.js"> </script>
-        <script src="vendor/waypoints/lib/jquery.waypoints.min.js"> </script>
-        <script src="vendor/jquery.counterup/jquery.counterup.min.js"> </script>
-        <script src="vendor/owl.carousel/owl.carousel.min.js"></script>
-        <script src="vendor/owl.carousel2.thumbs/owl.carousel2.thumbs.min.js"></script>
-        <script src="js/jquery.parallax-1.1.3.js"></script>
-        <script src="vendor/bootstrap-select/js/bootstrap-select.min.js"></script>
-        <script src="vendor/jquery.scrollto/jquery.scrollTo.min.js"></script>
-        <script src="js/front.js"></script>
-    </body>
-</html>

website/src/main/resources/templates/vendor/caseDetail.html

@@ -1,147 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>塑维</title>
-        <meta name="keywords" content="MES,MES系统,MES软件,制造执行系统,生产管理系统,生产协同,制造协同,生产流程管理,精益制造,智能制造,生产数字化,制造信息化"/>
-        <meta name="description" content="塑维智造是一款云端制造协同系统，通过数据和算法让生产更加高效。基于数据聚合、多角色协同、可视化分析、智能决策四大亮点，帮助企业缩短生产周期、降低库存积压、提升产能利用率、透明化制造流程，实现数据驱动下的精益制造。"/>
-        <meta name="description" content="">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <meta name="robots" content="all,follow">
-        <!-- Bootstrap CSS-->
-        <link rel="stylesheet" href="vendor/bootstrap/css/bootstrap.min.css">
-        <!-- Font Awesome CSS-->
-        <link rel="stylesheet" href="vendor/font-awesome/css/font-awesome.min.css">
-        <!-- Google fonts - Roboto-->
-        <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,700">
-        <!-- Bootstrap Select-->
-        <link rel="stylesheet" href="vendor/bootstrap-select/css/bootstrap-select.min.css">
-        <!-- owl carousel-->
-        <link rel="stylesheet" href="vendor/owl.carousel/assets/owl.carousel.css">
-        <link rel="stylesheet" href="vendor/owl.carousel/assets/owl.theme.default.css">
-        <!-- theme stylesheet-->
-        <link rel="stylesheet" href="css/style.blue.css" id="theme-stylesheet">
-        <!-- Custom stylesheet - for your changes-->
-        <link rel="stylesheet" href="css/custom.css">
-        <!-- Favicon and apple touch icons-->
-        <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
-        <!--<link rel="apple-touch-icon" href="img/apple-touch-icon.png">-->
-        <!--<link rel="apple-touch-icon" sizes="57x57" href="img/apple-touch-icon-57x57.png">-->
-        <!--<link rel="apple-touch-icon" sizes="72x72" href="img/apple-touch-icon-72x72.png">-->
-        <!--<link rel="apple-touch-icon" sizes="76x76" href="img/apple-touch-icon-76x76.png">-->
-        <!--<link rel="apple-touch-icon" sizes="114x114" href="img/apple-touch-icon-114x114.png">-->
-        <!--<link rel="apple-touch-icon" sizes="120x120" href="img/apple-touch-icon-120x120.png">-->
-        <!--<link rel="apple-touch-icon" sizes="144x144" href="img/apple-touch-icon-144x144.png">-->
-        <!--<link rel="apple-touch-icon" sizes="152x152" href="img/apple-touch-icon-152x152.png">-->
-        <!-- Tweaks for older IEs--><!--[if lt IE 9]>
-            <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
-            <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script><![endif]-->
-    </head>
-    <body>
-        <div id="all" class="about">
-            <!-- Navbar Start-->
-            <header class="nav-holder make-sticky">
-                <div id="navbar" role="navigation" class="navbar navbar-expand-lg">
-                <div class="container">
-                    <a href="index" class="navbar-brand home">
-                        <img src="img/logo.png" style="width:187px;" alt="Universal logo" class="d-none d-md-inline-block">
-                        <img src="img/logo-small.png" alt="Universal logo" class="d-inline-block d-md-none">
-                    </a>
-                    <button type="button" data-toggle="collapse" data-target="#navigation" class="navbar-toggler btn-template-outlined"><span class="sr-only">Toggle navigation</span><i class="fa fa-align-justify"></i></button>
-                    <div id="navigation" class="navbar-collapse collapse">
-                        <ul class="nav navbar-nav ml-auto">
-                            <li class="nav-item dropdown menu-large"><a href="index">首页 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown menu-large"><a href="product">公司优势 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown menu-large"><a href="partner">合作伙伴 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown active"><a href="case">成功案例 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown menu-large"><a href="goods">公司产品 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown menu-large">
-                                <a href="about.html">关于我们 <b class="caret"></b></a>
-                                <div class="qrcode">
-                                    <img src="img/qrCode.png" alt="..." class="img-fluid">
-                                    <div>请关注塑维公众号</div>
-                                </div>
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-                </div>
-            </header>
-            <!-- Navbar End-->
-            <div id="content">
-                <div class="container">
-                    <section class="bar no-padding-bottom">
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="heading">
-                                    <h2 th:text="${detail.title}"></h2>
-                                </div>
-                                <p class="lead no-mb" th:text="${detail.introduction}"></p>
-                            </div>
-                        </div>
-                    </section>
-                    <section class="bar">
-                        <div class="row portfolio-project">
-                            <div class="col-sm-12">
-                                <div class="heading">
-                                    <h3>案例介绍</h3>
-                                </div>
-                                <div class="col-sm-12" th:utext="${detail.content}"></div>
-                            </div>
-                        </div>
-                    </section>
-                </div>
-            </div>
-            <!-- FOOTER -->
-            <footer class="main-footer">
-                <div class="container">
-                    <div class="row">
-                        <div class="col-lg-3">
-                            <h4 class="h6">联系我们</h4>
-                            <p class="text-uppercase">
-                                <br>电话: 400-1086-011
-                                <br>网址：<a href="http://www.yunzhusu.net" target="_blank">www.yunzhusu.net</a>
-                                <br>地址: 南京市雨花台区郁金香路36号国泰科创大厦2楼
-                            </p>
-                        </div>
-                        <div class="col-lg-3">
-                            <h4 class="h6">塑维产品</h4>
-                            <p class="text-uppercase">
-                                <br>百度: <a href="http://www.baidu.com" target="_blank">www.baidu.com</a>
-                                <br>官网：<a href="http://www.yunzhusu.net" target="_blank">www.yunzhusu.net</a>
-                                <br>云模：<a href="http://111.231.87.63:9098" target="_blank">www.yunsu.com</a>
-                            </p>
-                        </div>
-                        <div class="col-lg-6 bottom-code">
-                            <ul class="list-inline photo-stream">
-                                <li class="list-inline-item"><a href="#"><img src="img/qrCode.png" alt="..." class="img-fluid"></a></li>
-                            </ul>
-                            <h4 class="h6">官方微信公众号</h4>
-                        </div>
-                    </div>
-                </div>
-                <div class="container">
-                    <div class="row">
-                        <div class="col-lg-12 bottom-Copyright">
-                            Copyright © 1998 - 2019 Tencent. All Rights Reserved. 塑维公司 版权所有
-                        </div>
-                    </div>
-                </div>
-            </footer>
-        </div>
-        <!-- Javascript files-->
-        <script src="vendor/jquery/jquery.min.js"></script>
-        <script src="vendor/popper.js/umd/popper.min.js"> </script>
-        <script src="vendor/bootstrap/js/bootstrap.min.js"></script>
-        <script src="vendor/jquery.cookie/jquery.cookie.js"> </script>
-        <script src="vendor/waypoints/lib/jquery.waypoints.min.js"> </script>
-        <script src="vendor/jquery.counterup/jquery.counterup.min.js"> </script>
-        <script src="vendor/owl.carousel/owl.carousel.min.js"></script>
-        <script src="vendor/owl.carousel2.thumbs/owl.carousel2.thumbs.min.js"></script>
-        <script src="js/jquery.parallax-1.1.3.js"></script>
-        <script src="vendor/bootstrap-select/js/bootstrap-select.min.js"></script>
-        <script src="vendor/jquery.scrollto/jquery.scrollTo.min.js"></script>
-        <script src="js/front.js"></script>
-    </body>
-</html>