merge

src/main/java/com/huiju/estateagents/controller/TaOfficeContactController.java

@@ -5,22 +5,19 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.DBUtils;
 import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.common.StringUtils;
-import org.checkerframework.checker.units.qual.A;
+import com.huiju.estateagents.entity.TaOfficeContact;
+import com.huiju.estateagents.service.ITaOfficeContactService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import com.huiju.estateagents.service.ITaOfficeContactService;
-import com.huiju.estateagents.entity.TaOfficeContact;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * <p>
@@ -31,7 +28,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2020-06-11
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaOfficeContactController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaOfficeContactController.class);
@@ -51,14 +48,24 @@ public class TaOfficeContactController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taOfficeContact",method= RequestMethod.GET)
+    @RequestMapping(value="/channel/taOfficeContact",method= RequestMethod.GET)
     public ResponseBean taOfficeContactList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                            @RequestParam(value ="company",required = false) String company,
+                                            @RequestParam(value ="name",required = false) String name,
+                                            @RequestParam(value ="phone",required = false) String phone,
+                                            @RequestParam(value ="status",required = false) Integer status
+                                            ){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<TaOfficeContact> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaOfficeContact> queryWrapper = new QueryWrapper<>();
+            queryWrapper.like(!StringUtils.isEmpty(company),"company",company);
+            queryWrapper.like(!StringUtils.isEmpty(name),"name",name);
+            queryWrapper.like(!StringUtils.isEmpty(phone),"phone",phone);
+            queryWrapper.eq(null != status,"status",status);
+            queryWrapper.gt("status", CommConstant.STATUS_DELETE);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaOfficeContact> result = iTaOfficeContactService.page(pg, queryWrapper);
@@ -76,8 +83,10 @@ public class TaOfficeContactController extends BaseController {
      * @param taOfficeContact 实体对象
      * @return
      */
-    @RequestMapping(value="/taOfficeContact",method= RequestMethod.POST)
-    public ResponseBean taOfficeContactAdd(@RequestBody TaOfficeContact taOfficeContact){
+    @RequestMapping(value="/office/taOfficeContact",method= RequestMethod.POST)
+    public ResponseBean taOfficeContactAdd(@RequestBody TaOfficeContact taOfficeContact, HttpServletRequest request, HttpServletResponse response){
+        response.setHeader("Access-Control-Allow-Origin","*");
+        response.setHeader("Access-Control-Allow-Methods","*");
         ResponseBean responseBean = new ResponseBean();
         try {
 
@@ -99,6 +108,20 @@ public class TaOfficeContactController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 保存对象
+     * @param taOfficeContact 实体对象
+     * @return
+     */
+    @RequestMapping(value="/office/taOfficeContact",method= RequestMethod.OPTIONS)
+    public ResponseBean taOfficeContactOptions(@RequestBody TaOfficeContact taOfficeContact, HttpServletRequest request, HttpServletResponse response){
+        response.setHeader("Access-Control-Allow-Origin","*");
+        response.setHeader("Access-Control-Allow-Methods","*");
+        response.setCharacterEncoding("utf-8");
+
+        return ResponseBean.success("success");
+    }
+
     /**
      * 根据id删除对象
      * @param id  实体ID

src/main/java/com/huiju/estateagents/controller/TaOfficeNewsController.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +20,9 @@ import com.huiju.estateagents.service.ITaOfficeNewsService;
 import com.huiju.estateagents.entity.TaOfficeNews;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * <p>
     * 资讯  前端控制器
@@ -27,7 +32,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2020-06-11
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaOfficeNewsController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaOfficeNewsController.class);
@@ -42,15 +47,20 @@ public class TaOfficeNewsController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taOfficeNews",method= RequestMethod.GET)
+    @RequestMapping(value="/channel/taOfficeNews",method= RequestMethod.GET)
     public ResponseBean taOfficeNewsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                         @RequestParam(value ="title",required = false) String title,
+                                         @RequestParam(value ="status",required = false) Integer status){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<TaOfficeNews> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaOfficeNews> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+            queryWrapper.like(!StringUtils.isEmpty(title),"title",title);
+            queryWrapper.eq(null != status,"status",status);
+            queryWrapper.gt("status", CommConstant.STATUS_DELETE);
+            queryWrapper.orderByDesc("weight","create_date");
 
             IPage<TaOfficeNews> result = iTaOfficeNewsService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
@@ -67,7 +77,7 @@ public class TaOfficeNewsController extends BaseController {
      * @param taOfficeNews 实体对象
      * @return
      */
-    @RequestMapping(value="/taOfficeNews",method= RequestMethod.POST)
+    @RequestMapping(value="/channel/taOfficeNews",method= RequestMethod.POST)
     public ResponseBean taOfficeNewsAdd(@RequestBody TaOfficeNews taOfficeNews){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -112,11 +122,12 @@ public class TaOfficeNewsController extends BaseController {
      * @param taOfficeNews 实体对象
      * @return
      */
-    @RequestMapping(value="/taOfficeNews/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/channel/taOfficeNews/{id}",method= RequestMethod.PUT)
     public ResponseBean taOfficeNewsUpdate(@PathVariable Integer id,
                                         @RequestBody TaOfficeNews taOfficeNews){
         ResponseBean responseBean = new ResponseBean();
         try {
+            taOfficeNews.setNewsId(id);
             if (iTaOfficeNewsService.updateById(taOfficeNews)){
                 responseBean.addSuccess(taOfficeNews);
             }else {
@@ -134,7 +145,7 @@ public class TaOfficeNewsController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taOfficeNews/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/channel/taOfficeNews/{id}",method= RequestMethod.GET)
     public ResponseBean taOfficeNewsGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -146,4 +157,36 @@ public class TaOfficeNewsController extends BaseController {
         }
         return responseBean;
     }
+
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/official/taOfficeNews",method= RequestMethod.GET)
+    public ResponseBean getOfficialNews(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                        @RequestParam(value ="pageSize",defaultValue = "100") Integer pageSize,
+                                        HttpServletRequest request, HttpServletResponse response){
+        response.setHeader("Access-Control-Allow-Origin","*");
+        response.setHeader("Access-Control-Allow-Methods","*");
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaOfficeNews> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaOfficeNews> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            queryWrapper.orderByDesc("weight","create_date");
+
+            IPage<TaOfficeNews> result = iTaOfficeNewsService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOfficeNewsList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

src/main/java/com/huiju/estateagents/entity/TaOfficeContact.java

@@ -1,14 +1,14 @@
 package com.huiju.estateagents.entity;
 
-import java.time.LocalDateTime;
-import java.io.Serializable;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 联系咨询 
@@ -70,5 +70,8 @@ public class TaOfficeContact implements Serializable {
      */
     private LocalDateTime createDate;
 
-
+    /**
+     * 状态
+     */
+    private Integer status;
 }

src/main/java/com/huiju/estateagents/entity/TaOfficeNews.java

@@ -2,12 +2,13 @@ package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 资讯 
@@ -64,5 +65,13 @@ public class TaOfficeNews implements Serializable {
      */
     private Integer status;
 
+    /**
+     * 置顶
+     */
+    private Integer weight;
 
+    /**
+     * 主图
+     */
+    private String thumb;
 }

src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java

@@ -77,7 +77,7 @@ public class AccessInterceptor implements HandlerInterceptor {
             "/api/fadd/",//所有的法大大回调放过
             "/api/third",
             "/api/third/redirect/",
-            "/api/officeweb/signup"     // 官网注册
+            "/api/official"
     };
 
     /*
@@ -100,7 +100,7 @@ public class AccessInterceptor implements HandlerInterceptor {
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object obj) throws Exception {
-        log.info("接口请求路径是{}",request.getRequestURI());
+        log.info("接口请求路径是{},方法类型{}",request.getRequestURI(),request.getMethod());
         //第三方权限校验
         String tokenHeader = request.getHeader("x-token");
         if (!StringUtils.isEmpty(tokenHeader)){