Merge branch 'master' of http://git.ycjcjy.com/xiangsong/xs-service

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

@@ -46,7 +46,7 @@ public class TpTicketController extends BaseController {
                     "status:流转状态(0:待分配  1:拒绝受理 2:待处理 3:正在处理 4:待评价 5:已评价 6:已终止'）" +
                     "tpUserId:当前处理人" )
     })
-    @RequestMapping(value = "/ticketLiset", method = RequestMethod.POST)
+    @RequestMapping(value = "/admin/ticketLiset", method = RequestMethod.POST)
     public ResponseBean ticketLiset(@RequestBody String parameter, HttpServletRequest request){
         TaUser userElement = getTaUser(request);
         ResponseBean  responseBean = tpTicketService.ticketLiset(parameter,userElement.getOrgId());
@@ -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/property/model/Message.java

@@ -1,6 +1,8 @@
 package com.huiju.estateagents.property.model;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -25,6 +27,7 @@ public class Message implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
     /**
      * 工单id 非工单不填

src/main/java/com/huiju/estateagents/property/model/TpTicket.java

@@ -98,6 +98,11 @@ public class TpTicket implements Serializable {
      */
     private Integer updateUser;
 
+    /**
+     * 用户姓名
+     */
+    @TableField(exist = false)
+    private String userName;
     /**
      * 更新时间
      */

src/main/java/com/huiju/estateagents/property/service/impl/BillServiceImpl.java

@@ -158,6 +158,8 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
         Map<String, Object> map = Maps.newHashMap();
         map.put("list",list);
         map.put("total",page.getTotal());
+        map.put("pageNum", page.getCurrent());
+        map.put("pageSize", page.getSize());
         responseBean.addSuccess(map);
         return responseBean;
     }

src/main/java/com/huiju/estateagents/property/service/impl/TaUserVerifyServiceImpl.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.property.common.Constant;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.common.base.messagePush;
@@ -17,6 +19,7 @@ import com.huiju.estateagents.property.model.*;
 import com.huiju.estateagents.property.service.ITaUserVerifyService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -40,10 +43,10 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
     private TaUserVerifyMapper taUserVerifyMapper;
 
     @Autowired
-    private UserMapper userMapper;
+    private TaUserMapper taUserMapper;
 
     @Autowired
-    private TaUserMapper taUserMapper;
+    private TaPersonMapper taPersonMapper;
 
     @Autowired
     private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
@@ -102,7 +105,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         // 校验房产
         hasUserVerify(userElement, userVerify, true);
 
-        User user = userMapper.selectById(userElement.getUserId());
+        TaUser user = taUserMapper.selectById(userElement.getUserId());
 
 
 //        TaUser taUser = taUserMapper.selectById(userVerify.getUserId());
@@ -156,7 +159,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
     private void hasUserVerify(TaUser userElement, TaUserVerify userVerify, boolean hasOwner){
         TaUserVerify hasUserVerify = null;
         // 校验这个房产有没有业主，只能存在一个业主
-        if (hasOwner && userVerify.getRoleId().intValue() == 1 && "1".equals(userVerify.getVerifyStatus())) {
+        if (hasOwner && "1".equals(userVerify.getVerifyStatus())) {
             hasUserVerify = taUserVerifyMapper.selectCommunityAndAddress(userElement.getOrgId(), userVerify.getPhaseId(),
                     userVerify.getBuildingId(), userVerify.getUnitId(),
                     userVerify.getLevelId(), userVerify.getRoomNoId());
@@ -181,7 +184,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
      * @param userVerify 审核数据
      * @return TpBuildingOwnerInfo
      */
-    private TpBuildingOwnerInfo insertBuildingOwnerInfo(TaUserVerify userVerify, User user) {
+    private TpBuildingOwnerInfo insertBuildingOwnerInfo(TaUserVerify userVerify, TaUser user) {
 //        TaUser taUser = taUserMapper.selectById(userVerify.getUserId());
         TpPhase tpPhase = tpPhaseMapper.selectById(userVerify.getPhaseId());
         TpBuilding tpBuilding = tpBuildingMapper.selectById(userVerify.getBuildingId());
@@ -207,7 +210,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         tpBuildingOwnerInfo.setPairStatus("1");
         tpBuildingOwnerInfo.setVerifyStatus("1");
         tpBuildingOwnerInfo.setCreateDate(LocalDateTime.now());
-        tpBuildingOwnerInfo.setCreateUser(user.getId());
+        tpBuildingOwnerInfo.setCreateUser(user.getUserId());
         tpBuildingOwnerInfo.setTaUserVerifyId(userVerify.getId());
 
         tpBuildingOwnerInfoMapper.insert(tpBuildingOwnerInfo);
@@ -235,7 +238,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         // 被审核的用户(APP端)
 //        TaUser taUser = taUserMapper.selectById(userVerify.getUserId());
         // 物业人员
-        User user = userMapper.selectById(userElement.getUserId());
+        TaUser user = taUserMapper.selectById(userElement.getUserId());
         TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityIdAndAddress(userVerify.getOrgId(), userVerify.getPhaseId(),
                 userVerify.getBuildingId(), userVerify.getUnitId(),
                 userVerify.getLevelId(), userVerify.getRoomNoId(),
@@ -292,8 +295,8 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
     public ResponseBean getToAuditNotApproved(Integer userVerifyId) {
         ResponseBean responseBean = new ResponseBean();
         TaUserVerify taUserVerify = taUserVerifyMapper.selectById(userVerifyId);
-        TaUser currentUser = taUserMapper.selectById(taUserVerify.getPersonId());
-        taUserVerify.setLoginName(currentUser.getLoginName());
+        TaPerson currentUser = taPersonMapper.selectById(taUserVerify.getPersonId());
+        taUserVerify.setLoginName(currentUser.getName());
 
         // 开始查询 业主
         TaUserVerify userVerify = taUserVerifyMapper.selectWxCommunityAndAddressAndRoleId(taUserVerify.getOrgId(), taUserVerify.getPhaseId(), taUserVerify.getBuildingId(), taUserVerify.getUnitId(), taUserVerify.getLevelId(), taUserVerify.getRoomNoId());

src/main/java/com/huiju/estateagents/property/service/impl/TpAnnouncementServiceImpl.java

@@ -201,8 +201,10 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
         //内容包含多个图转数组
         JSONArray contentImg = parseObject.getJSONArray("contentImg");
         Integer tdImagesUuid = parseObject.getInteger("id");
-        String[] contentImgArray = contentImg.toArray(new String[]{});
-        //修改图片时删除原来图片
+
+        if (null != contentImg){
+            String[] contentImgArray = contentImg.toArray(new String[]{});
+            //修改图片时删除原来图片
             QueryWrapper<TdImages> queryWrapper = new QueryWrapper<>();
             queryWrapper.lambda().eq(TdImages::getUuid, tdImagesUuid);
             queryWrapper.lambda().eq(TdImages::getType, "announcement");
@@ -217,6 +219,8 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
                 tdImages.setCreateUser(userId);
                 imagesMapper.insert(tdImages);
             }
+        }
+
                 // 公告发布成功删除时消息变为无效
                 Message message = new Message();
                 message.setMessageContent("公告“" + tpAnnouncement.getAnnouncementTitle() + "”还未发布，查看详情");

src/main/java/com/huiju/estateagents/property/service/impl/TpTicketServiceImpl.java

@@ -760,6 +760,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
 
 
         TpTicket tpTicket = JSONObject.parseObject(parameter, TpTicket.class);
+        tpTicket.setId(ticketId);
 
         // 删除旧图片链接
         Map<String, Object> map = Maps.newHashMap();

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>

src/main/resources/mapper/property/TpTicketMapper.xml

@@ -21,8 +21,7 @@
     us.user_name
     FROM
     tp_ticket p
-    LEFT JOIN ta_user AS us ON p.create_user=us.id
-    LEFT JOIN tp_user AS u ON p.tp_user_id = u.id
+    LEFT JOIN ta_user AS us ON p.create_user=us.user_id
 <where>
     <if test="ticket.id != null and ticket.id !=''">
         and  p.id like concat('%',#{ticket.id,jdbcType=INTEGER},'%')
@@ -34,13 +33,13 @@
         and p.ticket_title like concat('%',#{ticket.ticketTitle,jdbcType=VARCHAR},'%')
     </if>
     <if test="userName != null and userName !=''">
-        and us.user_name like concat('%',#{ userName,jdbcType=VARCHAR},'%')
+        and AS.user_name like concat('%',#{ userName,jdbcType=VARCHAR},'%')
     </if>
     <if test="ticket.status != null and ticket.status !=''">
         and  p.status=#{ticket.status,jdbcType=INTEGER}
     </if>
     <if test="updateUserNmae != null and updateUserNmae !=''">
-        and u.user_name like concat('%',#{ updateUserNmae,jdbcType=VARCHAR},'%')
+        and us.user_name like concat('%',#{ updateUserNmae,jdbcType=VARCHAR},'%')
     </if>
     and p.org_id=#{orgId,jdbcType=INTEGER}
 </where>

src/main/resources/mapper/property/UserMapper.xml

@@ -5,8 +5,8 @@
         SELECT
          user_name
         FROM
-        tp_user
-        WHERE id=#{id,jdbcType=INTEGER}
+        ta_user
+        WHERE user_id=#{id,jdbcType=INTEGER}
     </select>
 
     <select id="userList" resultType="com.huiju.estateagents.property.model.User" >