官网接口修改

official_backend/src/main/java/com/hssx/ysofficial/controller/ArticleController.java

@@ -2,6 +2,7 @@ package com.hssx.ysofficial.controller;
 
 
 import com.hssx.ysofficial.entity.Article;
+import com.hssx.ysofficial.entity.OnlineApplication;
 import com.hssx.ysofficial.service.ArticleService;
 import com.hssx.ysofficial.service.OnlineApplicationService;
 import com.hssx.ysofficial.utility.HttpRespMsg;
@@ -66,10 +67,18 @@ public class ArticleController {
      * @param page
      * @return
      */
-    @PostMapping("/onlineApplyList")
-    @ResponseBody
+    @RequestMapping("/onlineApplyList")
     public HttpRespMsg onlineApplyList(PageUtil page) {
         return onlineApplicationService.getList(page);
     }
+    /**
+     * 参数：
+     *  id：申请的记录id, isPass:审核通过
+     * @return
+     */
+    @RequestMapping("/onlineApplyUpdate")
+    public HttpRespMsg onlineApplyUpdate(OnlineApplication onlineApplication) {
+        return onlineApplicationService.onlineApplyUpdate(onlineApplication);
+    }
 }
 

official_backend/src/main/java/com/hssx/ysofficial/controller/CompanyProductsController.java

@@ -1,9 +1,17 @@
 package com.hssx.ysofficial.controller;
 
 
+import com.hssx.ysofficial.entity.CompanyProducts;
+import com.hssx.ysofficial.entity.OnlineApplication;
+import com.hssx.ysofficial.service.CompanyProductsService;
+import com.hssx.ysofficial.utility.HttpRespMsg;
+import com.hssx.ysofficial.utility.PageUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * <p>
@@ -14,8 +22,33 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2019-11-21
  */
 @RestController
-@RequestMapping("/company-products")
+@RequestMapping("/companyproducts")
 public class CompanyProductsController {
+    @Autowired
+    private CompanyProductsService companyProductsService;
+
+    /**
+     * 公司产品的录入
+     * 参数：
+     *  添加：title 产品名称 ,image_url 产品地址，introduction 产品简介，address 产品地址,file上传的文件（非必传）
+     *  修改 id：产品id
+     * @return
+     */
+    @RequestMapping("/addAndUpdate")
+    public HttpRespMsg addAndUpdate(CompanyProducts CompanyProducts, @RequestParam(required = false)MultipartFile file) {
+        return companyProductsService.addAndUpdate(CompanyProducts,file);
+    }
+
+    /**
+     * 公司产品的录入
+     * 参数：pageNum 当前页码，pageSize 每页条数
+     * @return
+     */
+    @RequestMapping("/companyProductsList")
+    public HttpRespMsg companyProductsList(PageUtil page) {
+        return companyProductsService.companyProductsList(page);
+    }
+
 
 }
 

official_backend/src/main/java/com/hssx/ysofficial/entity/Comment.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -55,6 +57,7 @@ public class Comment extends Model<Comment> {
      * 留言时间
      */
     @TableField("indate")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
 

official_backend/src/main/java/com/hssx/ysofficial/entity/OnlineApplication.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -67,6 +69,7 @@ public class OnlineApplication extends Model<OnlineApplication> {
      * 申请时间
      */
     @TableField("indate")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
     /**

official_backend/src/main/java/com/hssx/ysofficial/service/CompanyProductsService.java

@@ -0,0 +1,22 @@
+package com.hssx.ysofficial.service;
+
+import com.hssx.ysofficial.entity.CompanyProducts;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hssx.ysofficial.utility.HttpRespMsg;
+import com.hssx.ysofficial.utility.PageUtil;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * <p>
+ * 第一个数据是公司优势 其他是案例 服务类
+ * </p>
+ *
+ * @author Reiskuchen
+ * @since 2019-11-21
+ */
+public interface CompanyProductsService extends IService<CompanyProducts> {
+
+    HttpRespMsg addAndUpdate(CompanyProducts companyProducts, MultipartFile file);
+
+    HttpRespMsg companyProductsList(PageUtil page);
+}

official_backend/src/main/java/com/hssx/ysofficial/service/OnlineApplicationService.java

@@ -16,4 +16,6 @@ import com.hssx.ysofficial.utility.PageUtil;
 public interface OnlineApplicationService extends IService<OnlineApplication> {
 
     HttpRespMsg getList(PageUtil page);
+
+    HttpRespMsg onlineApplyUpdate(OnlineApplication onlineApplication);
 }

official_backend/src/main/java/com/hssx/ysofficial/service/impl/ArticleServiceImpl.java

@@ -68,7 +68,6 @@ public class ArticleServiceImpl extends ServiceImpl<ArticleMapper, Article> impl
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         if(article != null){
             Integer id = article.getId();
-
             if(multipartFile != null){
                 String fileName = multipartFile.getOriginalFilename();
                 File direction = new File(uploadPath);

official_backend/src/main/java/com/hssx/ysofficial/service/impl/CompanyProductsServiceImpl.java

@@ -0,0 +1,71 @@
+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.hssx.ysofficial.entity.CompanyProducts;
+import com.hssx.ysofficial.entity.OnlineApplication;
+import com.hssx.ysofficial.mapper.CompanyProductsMapper;
+import com.hssx.ysofficial.service.CompanyProductsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hssx.ysofficial.utility.HttpRespMsg;
+import com.hssx.ysofficial.utility.PageUtil;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.File;
+import java.util.UUID;
+
+/**
+ * <p>
+ * 第一个数据是公司优势 其他是案例 服务实现类
+ * </p>
+ *
+ * @author Reiskuchen
+ * @since 2019-11-21
+ */
+@Service
+public class CompanyProductsServiceImpl extends ServiceImpl<CompanyProductsMapper, CompanyProducts> implements CompanyProductsService {
+    @Resource
+    private CompanyProductsMapper companyProductsMapper;
+    @Value("${upload.path}")
+    private String uploadPath;
+
+    @Override
+    public HttpRespMsg addAndUpdate(CompanyProducts companyProducts, MultipartFile multipartFile) {
+        HttpRespMsg msg = new HttpRespMsg();
+        if(multipartFile != null){
+            String fileName = multipartFile.getOriginalFilename();
+            File direction = new File(uploadPath);
+            String rand = UUID.randomUUID().toString().replaceAll("-", "");
+            String suffix = fileName.substring(fileName.lastIndexOf("."));
+            String storedFileName = rand + suffix;
+            try {
+                File savedFile = new File(direction, storedFileName);
+                savedFile.createNewFile();
+                multipartFile.transferTo(savedFile);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            companyProducts.setImageUrl("/upload/" + storedFileName);
+        }
+        if (companyProducts.getId() != null) {
+            companyProductsMapper.insert(companyProducts);
+        }else {
+            companyProductsMapper.updateById(companyProducts);
+        }
+        return msg;
+    }
+
+    @Override
+    public HttpRespMsg companyProductsList(PageUtil page) {
+        HttpRespMsg msg = new HttpRespMsg();
+        Page<CompanyProducts> pages = new Page<>(page.getPageNum(),page.getPageSize());
+//        onlineApplicationMapper.selectList(new QueryWrapper<OnlineApplication>());
+        IPage<CompanyProducts> pageInfo = companyProductsMapper.selectPage(pages,new QueryWrapper<CompanyProducts>().orderByDesc("id"));
+        msg.data = pageInfo;
+        return msg;
+    }
+}

official_backend/src/main/java/com/hssx/ysofficial/service/impl/OnlineApplicationServiceImpl.java

@@ -31,4 +31,10 @@ public class OnlineApplicationServiceImpl extends ServiceImpl<OnlineApplicationM
         msg.data = pageInfo;
         return msg;
     }
+
+    @Override
+    public HttpRespMsg onlineApplyUpdate(OnlineApplication onlineApplication) {
+        onlineApplicationMapper.updateById(onlineApplication);
+        return new HttpRespMsg();
+    }
 }

official_backend/src/main/resources/application.properties

@@ -9,7 +9,10 @@ server.connection-timeout=18000000s
 #Mybatis-plus
 mybatis-plus.type-aliases-package=com.hssx.ysofficial.entity/*
 mybatis-plus.mapper-locations=mapper/*.xml
-
+#mybatis-plus.global-config.db-config.id-type=auto
+mybatis-plus.global-config.db-config.select-strategy=not_empty
+mybatis-plus.global-config.db-config.update-strategy=not_empty
+mybatis-plus.global-config.db-config.field-strategy=not_empty
 #Êý¾Ý¿â
 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