Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents

# Conflicts:
#	src/main/java/com/huiju/estateagents/common/CommConstant.java

合并

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

+package com.huiju.estateagents.controller;
+
+
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.service.ITaSaveService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+ * 收藏表  前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@RestController
+@RequestMapping("/api")
+public class TaSaveController extends BaseController {
+
+    @Autowired
+    private ITaSaveService iTaSaveService;
+
+    /**
+     * 点赞
+     * @param typeOf
+     * @param id
+     * @param request
+     * @return
+     */
+    @PostMapping("/wx/{typeOf}/like/{id}")
+    public ResponseBean giveFavor(@PathVariable String typeOf, @PathVariable String id, HttpServletRequest request) {
+        String openid = JWTUtils.getSubject(request);
+
+        return iTaSaveService.postLike(openid, typeOf, id);
+    }
+
+    /**
+     * 取消赞
+     * @param typeOf
+     * @param id
+     * @param request
+     * @return
+     */
+    @DeleteMapping("/wx/{typeOf}/like/{id}")
+    public ResponseBean cancelFavor(@PathVariable String typeOf, @PathVariable String id, HttpServletRequest request) {
+        String openid = JWTUtils.getSubject(request);
+        return iTaSaveService.cancelLike(openid, typeOf, id);
+    }
+
+}

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

+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 收藏表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_save")
+public class TaSave implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 收藏ID
+     */
+    @TableId(value = "save_id", type = IdType.AUTO)
+    private Integer saveId;
+
+    /**
+     * 收藏人ID
+     */
+    private String personId;
+
+    /**
+     * 名称
+     */
+    private String nameOrnick;
+
+    /**
+     * 头像
+     */
+    private String photoOravatar;
+
+    /**
+     * 被收藏对象
+     */
+    private String savedTarget;
+
+    /**
+     * 收藏类型
+     */
+    private String tagertType;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+
+}

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

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaNews;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 
 /**
  * <p>
 @Mapper
 public interface TaNewsMapper extends BaseMapper<TaNews> {
 
+    /**
+     * 某个字段值 +1
+     * @param personId
+     * @param field
+     * @param increment
+     */
+    @Update("UPDATE ta_news  SET ${field} = IFNULL(${field}, 0) + #{increment}  WHERE news_id = #{newsId}")
+    void setFieldNum(@Param("newsId") String personId, @Param("field") String field, @Param("increment") int increment);
+
 }

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

+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaSave;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 收藏表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@Mapper
+public interface TaSaveMapper extends BaseMapper<TaSave> {
+
+}

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

+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaSave;
+
+/**
+ * <p>
+ * 收藏表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+public interface ITaSaveService extends IService<TaSave> {
+
+
+    ResponseBean postLike(String openid, String typeOf, String like);
+
+    ResponseBean cancelLike(String openid, String typeOf, String like);
+
+}

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

 import com.huiju.estateagents.entity.TaFavor;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.mapper.TaFavorMapper;
+import com.huiju.estateagents.mapper.TaNewsMapper;
 import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.service.ITaFavorService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
     @Autowired
     TaFavorMapper taFavorMapper;
 
+    @Autowired
+    private TaNewsMapper taNewsMapper;
+
     @Override
     public ResponseBean postLike(String openid, String typeOf, String like) {
         List<TaPerson> persons = getPersonsByOpenId(openid);
             taPersonMapper.setFieldIncrement(like,"like_num", 1);
         }
 
+        // 如果是资讯点赞, 则 +1
+        if(typeOf.equals(CommConstant.FAVOR_NEWS)) {
+            taNewsMapper.setFieldNum(like, "favor_num", 1);
+        }
+
         return ResponseBean.success("");
     }
 
         taFavorMapper.deleteByMap(condition);
 
         // 如果是点赞置业, 则人员点赞 - 1
-        if (typeOf == CommConstant.FAVOR_CONSULTANT) {
+        if (typeOf.equals(CommConstant.FAVOR_CONSULTANT)) {
             taPersonMapper.setFieldIncrement(taPerson.getPersonId(),"like_num", -1);
         }
 
+        // 如果是收藏资讯, 则 - 1
+        if (typeOf.equals(CommConstant.FAVOR_NEWS)) {
+            taNewsMapper.setFieldNum(taPerson.getPersonId(),"favor_num", -1);
+        }
+
         return ResponseBean.success("");
     }
 

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

 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.BeanTools;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaBuilding;
+import com.huiju.estateagents.entity.TaFavor;
 import com.huiju.estateagents.entity.TaNews;
 import com.huiju.estateagents.entity.TaNewsType;
 import com.huiju.estateagents.exception.EstaException;
+import com.huiju.estateagents.mapper.TaFavorMapper;
 import com.huiju.estateagents.mapper.TaNewsMapper;
 import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.ITaFavorService;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
     private ITaBuildingService iTaBuildingService;
 
     @Autowired
-    private ITaFavorService iTaFavorService;
+    private TaFavorMapper taFavorMapper;
 
 
 
             responseBean.addError("数据不存!");
         }
 
-        //-- 查询 点赞数，收藏数，阅读数
-
-
-
-
+        responseBean.addSuccess(taNews);
         return responseBean;
     }
 }

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

+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaSave;
+import com.huiju.estateagents.mapper.TaNewsMapper;
+import com.huiju.estateagents.mapper.TaPersonMapper;
+import com.huiju.estateagents.mapper.TaSaveMapper;
+import com.huiju.estateagents.service.ITaSaveService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 收藏表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@Service
+public class TaSaveServiceImpl extends ServiceImpl<TaSaveMapper, TaSave> implements ITaSaveService {
+
+
+    @Autowired
+    TaPersonMapper taPersonMapper;
+
+    @Autowired
+    private TaSaveMapper taSaveMapper;
+
+    @Autowired
+    private TaNewsMapper taNewsMapper;
+
+    @Override
+    public ResponseBean postLike(String openid, String typeOf, String like) {
+        List<TaPerson> persons = getPersonsByOpenId(openid);
+        if (null == persons || persons.size() != 1) {
+            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        TaPerson taPerson = persons.get(0);
+
+        // 是否被赞过
+        QueryWrapper<TaSave> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("person_id", taPerson.getPersonId());
+        queryWrapper.eq("be_favor", like);
+        queryWrapper.eq("tagert_type", typeOf);
+        List<TaSave> saves = taSaveMapper.selectList(queryWrapper);
+        if (null != saves && saves.size() > 0) {
+//            return ResponseBean.error("请不需要重复收藏", ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.success("");
+        }
+
+        // 写入收藏
+        TaSave taSave = new TaSave();
+        taSave.setSavedTarget(like);
+        taSave.setCreateDate(LocalDateTime.now());
+        taSave.setNameOrnick(taPerson.getNickname());
+        taSave.setPersonId(taPerson.getPersonId());
+        taSave.setPhotoOravatar(taPerson.getAvatarurl());
+        taSave.setTagertType(typeOf);
+
+        int row = taSaveMapper.insert(taSave);
+        if (row < 1) {
+            return ResponseBean.error("收藏失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        // 如果是资讯收藏, 则 +1
+        if(typeOf.equals(CommConstant.FAVOR_NEWS)) {
+            taNewsMapper.setFieldNum(like, "save_num", 1);
+        }
+
+        return ResponseBean.success("");
+    }
+
+    @Override
+    public ResponseBean cancelLike(String openid, String typeOf, String like) {
+        List<TaPerson> persons = getPersonsByOpenId(openid);
+        if (null == persons || persons.size() != 1) {
+            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        TaPerson taPerson = persons.get(0);
+
+        // 是否被赞过
+        QueryWrapper<TaSave> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("person_id", taPerson.getPersonId());
+        queryWrapper.eq("be_favor", like);
+        queryWrapper.eq("tagert_type", typeOf);
+        List<TaSave> saves = taSaveMapper.selectList(queryWrapper);
+        if (null == saves || saves.size() == 0) {
+            return ResponseBean.success("");
+        }
+
+        Map<String, Object> condition = new HashMap<>();
+        condition.put("person_id", taPerson.getPersonId());
+        condition.put("be_favor", like);
+        condition.put("tagert_type", typeOf);
+        taSaveMapper.deleteByMap(condition);
+
+        // 如果是收藏资讯, 则 - 1
+        if (typeOf.equals(CommConstant.FAVOR_NEWS)) {
+            taNewsMapper.setFieldNum(taPerson.getPersonId(),"save_num", -1);
+        }
+
+        return ResponseBean.success("");
+    }
+
+    List<TaPerson> getPersonsByOpenId(String openid) {
+        return taPersonMapper.getPersonByOpenId(openid);
+    }
+}