Browse Source

官网接口修改

wutt 5 years ago
parent
commit
cc1b18b23e

+ 15 - 3
official_backend/src/main/java/com/hssx/ysofficial/controller/ArticleController.java

@@ -3,12 +3,12 @@ package com.hssx.ysofficial.controller;
 
 
 import com.hssx.ysofficial.entity.Article;
 import com.hssx.ysofficial.entity.Article;
 import com.hssx.ysofficial.service.ArticleService;
 import com.hssx.ysofficial.service.ArticleService;
+import com.hssx.ysofficial.service.OnlineApplicationService;
 import com.hssx.ysofficial.utility.HttpRespMsg;
 import com.hssx.ysofficial.utility.HttpRespMsg;
+import com.hssx.ysofficial.utility.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 
 
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartFile;
 
 
 /**
 /**
@@ -24,6 +24,8 @@ import org.springframework.web.multipart.MultipartFile;
 public class ArticleController {
 public class ArticleController {
     @Autowired
     @Autowired
     private ArticleService articleService;
     private ArticleService articleService;
+    @Autowired
+    private OnlineApplicationService onlineApplicationService;
 
 
     @RequestMapping("/getArticle")
     @RequestMapping("/getArticle")
     public HttpRespMsg getArticle(){
     public HttpRespMsg getArticle(){
@@ -59,5 +61,15 @@ public class ArticleController {
     public HttpRespMsg switchArticlePosition(@RequestParam Integer id, @RequestParam Integer position){
     public HttpRespMsg switchArticlePosition(@RequestParam Integer id, @RequestParam Integer position){
         return articleService.switchPosition(id, position);
         return articleService.switchPosition(id, position);
     }
     }
+    /**
+     * 参数:pageNum 当前页码,pageSize 每页条数
+     * @param page
+     * @return
+     */
+    @PostMapping("/onlineApplyList")
+    @ResponseBody
+    public HttpRespMsg onlineApplyList(PageUtil page) {
+        return onlineApplicationService.getList(page);
+    }
 }
 }
 
 

+ 21 - 0
official_backend/src/main/java/com/hssx/ysofficial/controller/CompanyProductsController.java

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

+ 21 - 0
official_backend/src/main/java/com/hssx/ysofficial/controller/OnlineApplicationController.java

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

+ 71 - 0
official_backend/src/main/java/com/hssx/ysofficial/entity/CompanyProducts.java

@@ -0,0 +1,71 @@
+package com.hssx.ysofficial.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+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 Reiskuchen
+ * @since 2019-11-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("company_products")
+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;
+    }
+
+}

+ 90 - 0
official_backend/src/main/java/com/hssx/ysofficial/entity/OnlineApplication.java

@@ -0,0 +1,90 @@
+package com.hssx.ysofficial.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+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 Reiskuchen
+ * @since 2019-11-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("online_application")
+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;
+    }
+
+}

+ 16 - 0
official_backend/src/main/java/com/hssx/ysofficial/mapper/CompanyProductsMapper.java

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

+ 16 - 0
official_backend/src/main/java/com/hssx/ysofficial/mapper/OnlineApplicationMapper.java

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

+ 19 - 0
official_backend/src/main/java/com/hssx/ysofficial/service/OnlineApplicationService.java

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

+ 34 - 0
official_backend/src/main/java/com/hssx/ysofficial/service/impl/OnlineApplicationServiceImpl.java

@@ -0,0 +1,34 @@
+package com.hssx.ysofficial.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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hssx.ysofficial.entity.OnlineApplication;
+import com.hssx.ysofficial.mapper.OnlineApplicationMapper;
+import com.hssx.ysofficial.service.OnlineApplicationService;
+import com.hssx.ysofficial.utility.HttpRespMsg;
+import com.hssx.ysofficial.utility.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;
+    }
+}

+ 1 - 1
official_backend/src/main/java/com/hssx/ysofficial/utility/CodeGenerator.java

@@ -190,7 +190,7 @@ public class CodeGenerator {
         //单独生成逗号隔开
         //单独生成逗号隔开
 //        strategy.setInclude("");
 //        strategy.setInclude("");
         //全生成
         //全生成
-        strategy.setExclude();
+        strategy.setInclude("online_application","company_products");//表名,多个英文逗号分割
         //多个英文逗号隔开
         //多个英文逗号隔开
 //        strategy.setInclude(scanner("user").split(","));
 //        strategy.setInclude(scanner("user").split(","));
         strategy.setControllerMappingHyphenStyle(true);
         strategy.setControllerMappingHyphenStyle(true);

+ 58 - 0
official_backend/src/main/java/com/hssx/ysofficial/utility/PageUtil.java

@@ -0,0 +1,58 @@
+package com.hssx.ysofficial.utility;
+
+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;
+    }
+}

+ 20 - 0
official_backend/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.ysofficial.mapper.CompanyProductsMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.ysofficial.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>

+ 23 - 0
official_backend/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.ysofficial.mapper.OnlineApplicationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.ysofficial.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>