feats

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

@@ -0,0 +1,139 @@
+package com.huiju.estateagents.controller;
+
+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.entity.TpNews;
+import com.huiju.estateagents.service.ITpNewsService;
+import io.swagger.annotations.Api;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+
+
+/**
+ * <p>
+    * 资讯表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@RestController
+@RequestMapping("/api")
+@Api(value = "物业服务", tags = "物业服务")
+public class TpNewsController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TpNewsController.class);
+
+    @Autowired
+    ITpNewsService iTpNewsService;
+
+    /**
+     * 列表
+     * @param pageNum
+     * @param pageSize
+     * @param newsName
+     * @param client
+     * @param request
+     * @return
+     */
+    @GetMapping("/{client}/property-news")
+    public ResponseBean newsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                 @RequestParam(value = "newsName", required = false) String newsName,
+                                 @PathVariable String client,
+                                 HttpServletRequest request) {
+        Integer orgId = getOrgId(request);
+
+        Integer status = null;
+        if ("wx".equals(client)) {
+            status = CommConstant.IS_PUBLISH;
+        }
+
+        IPage<TpNews> page = new Page<>(pageNum, pageSize);
+        IPage<TpNews> result = iTpNewsService.getListBy(page, orgId, newsName, status);
+
+        return ResponseBean.success(result);
+    }
+
+    /**
+     * 获取详情
+     * @param client
+     * @param id
+     * @param request
+     * @return
+     */
+    @GetMapping("/{client}/property-news/{id}")
+    public ResponseBean getNewsByID(@PathVariable String client,
+                                    @PathVariable Integer id,
+                                    HttpServletRequest request) {
+        Integer orgId = getOrgId(request);
+
+        TpNews tpNews = iTpNewsService.getById(id);
+        if (!orgId.equals(tpNews.getOrgId()) || CommConstant.STATUS_DELETE.equals(tpNews.getStatus())) {
+            return ResponseBean.error("未找到对应内容", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        return ResponseBean.success(tpNews);
+    }
+
+    @PostMapping("/admin/property-news")
+    public ResponseBean save(@RequestBody TpNews news, HttpServletRequest request){
+        news.setOrgId(getOrgId(request));
+        news.setCreateDate(LocalDateTime.now());
+
+        if (news.getStatus() == null) {
+            news.setStatus(CommConstant.NOT_PUBLISH);
+        }
+
+        if (!iTpNewsService.save(news)) {
+            return ResponseBean.error("新增内容出错", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        return ResponseBean.success(news);
+    }
+
+    @PutMapping(value="/admin/property-news/{id}")
+    public ResponseBean taNewsUpdate(@PathVariable Integer id,
+                                     @RequestBody TpNews tpNews,
+                                     HttpServletRequest request){
+        Integer orgId = getOrgId(request);
+
+        tpNews.setNewsId(id);
+        if (tpNews.getOrgId() == null) {
+            tpNews.setOrgId(orgId);
+        } else if (!orgId.equals(tpNews.getOrgId())) {
+            return ResponseBean.error("您无权修改当前内容", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        if (!iTpNewsService.updateById(tpNews)) {
+            return ResponseBean.error("更新内容出错", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        return ResponseBean.success(tpNews);
+    }
+
+    @DeleteMapping("/admin/property-news/{id}")
+    public ResponseBean taNewsUpdate(@PathVariable Integer id,
+                                     HttpServletRequest request){
+        Integer orgId = getOrgId(request);
+
+        TpNews tpNews = iTpNewsService.getById(id);
+        if (!orgId.equals(tpNews.getOrgId())) {
+            return ResponseBean.error("您无权删除当前内容", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        tpNews.setStatus(CommConstant.STATUS_DELETE);
+        if (!iTpNewsService.updateById(tpNews)) {
+            return ResponseBean.error("删除内容出错", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        return ResponseBean.success("删除成功");
+    }
+}

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

@@ -0,0 +1,117 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 资讯表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TpNews implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 咨询ID
+     */
+    @TableId(value = "news_id", type = IdType.AUTO)
+    private Integer newsId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+    /**
+     * 资讯图片
+     */
+    private String newsImg;
+
+    /**
+     * 分享图片
+     */
+    private String shareImg;
+
+    /**
+     * 资讯标题
+     */
+    private String newsName;
+
+    /**
+     * 资讯类型id
+     */
+    private Integer newsTypeId;
+
+    /**
+     * 资讯详情类型 0是链接1是自定义
+     */
+    private String newsDetailType;
+
+    /**
+     * 资讯详情 0的情况下存链接，1的情况下存富文本
+     */
+    private String newsDetail;
+
+    /**
+     * 资讯状态 0是已发布1是未发布
+     */
+    private Integer newsStatus;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 阅读量
+     */
+    private Integer pvNum;
+
+    /**
+     * 点赞量
+     */
+    private Integer favorNum;
+
+    /**
+     * 收藏量
+     */
+    private Integer saveNum;
+
+    /**
+     * 分享数量
+     */
+    private Integer shareNum;
+
+    /**
+     * 权重
+     */
+    private Integer weight;
+
+    private Integer cityId;
+
+}

src/main/java/com/huiju/estateagents/mapper/TpNewsMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TpNews;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 资讯表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@Mapper
+public interface TpNewsMapper extends BaseMapper<TpNews> {
+
+}

src/main/java/com/huiju/estateagents/property/controller/TpTicketController.java

@@ -58,7 +58,7 @@ public class TpTicketController extends BaseController {
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "id:工单编号")
     })
 
-    @RequestMapping(value = "/ticketDetails", method = RequestMethod.POST)
+    @RequestMapping(value = "/admin/ticketDetails", method = RequestMethod.POST)
     public ResponseBean ticketDetails(@RequestBody String parameter, HttpServletRequest request){
         TaUser userElement = getTaUser(request);
         ResponseBean  responseBean = tpTicketService.ticketDetails(parameter,userElement.getUserId(),userElement.getOrgId());

src/main/java/com/huiju/estateagents/service/ITpNewsService.java

@@ -0,0 +1,19 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TpNews;
+
+
+/**
+ * <p>
+ * 资讯表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+public interface ITpNewsService extends IService<TpNews> {
+
+    IPage<TpNews> getListBy(IPage<TpNews> page, Integer orgId, String newsName, Integer status);
+}

src/main/java/com/huiju/estateagents/service/impl/TpNewsServiceImpl.java

@@ -0,0 +1,36 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.mapper.TpNewsMapper;
+import com.huiju.estateagents.service.*;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 资讯表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@Service
+public class TpNewsServiceImpl extends ServiceImpl<TpNewsMapper, TpNews> implements ITpNewsService {
+
+    @Override
+    public IPage<TpNews> getListBy(IPage<TpNews> page, Integer orgId, String newsName, Integer status) {
+        QueryWrapper<TpNews> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id", orgId);
+        queryWrapper.eq(status != null, "status", status);
+        queryWrapper.gt(status == null, "status", CommConstant.STATUS_DELETE);
+        queryWrapper.like(!StringUtils.isEmpty(newsName), "news_name", "%" + newsName + "%");
+        queryWrapper.orderByDesc("weight");
+        queryWrapper.orderByDesc("create_date");
+
+        return page(page, queryWrapper);
+    }
+}

src/main/resources/application-dev.yml

@@ -41,12 +41,12 @@ wx:
     id: WiBYjqkE9KvwDv1WSq5vniGU4P0gvwlat-5ENYKpfxg
     keywords: 6
 ali:
-  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
-  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
+  accessKeyId: LTAIGQtIi28MfXms
+  accessKeySecret: b6maakcdzEywmkhcK15rStx54hOiIA
   oss:
     endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: njcj
-    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
+    bucketName: zhiyun-image
+    bucketURL: https://zhiyun-image.oss-accelerate.aliyuncs.com
 
 # 手机短信服务
 sms:

src/main/resources/mapper/TpNewsMapper.xml

@@ -0,0 +1,5 @@
+<?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.huiju.estateagents.mapper.TpNewsMapper">
+
+</mapper>