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

pom.xml

@@ -91,6 +91,42 @@
 			<artifactId>dom4j</artifactId>
 			<version>2.1.1</version>
 		</dependency>
+		<dependency>
+			<groupId>org.jodd</groupId>
+			<artifactId>jodd-bean</artifactId>
+			<version>3.7.1</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-collections</groupId>
+			<artifactId>commons-collections</artifactId>
+			<version>3.2.1</version>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>1.4</version>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.8.1</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/commons-lang/commons-lang -->
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>2.6</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>26.0-jre</version>
+		</dependency>
 	</dependencies>
 
 	<profiles>

src/main/java/com/huiju/estateagents/common/BeanTools.java

@@ -0,0 +1,137 @@
+package com.huiju.estateagents.common;
+
+import jodd.bean.BeanCopy;
+import jodd.typeconverter.TypeConverterManager;
+import org.apache.commons.collections.BeanMap;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.BeanWrapper;
+import org.springframework.beans.BeanWrapperImpl;
+
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Method;
+import java.util.*;
+
+@SuppressWarnings("deprecation")
+public final class BeanTools {
+
+    private static Map<String, Object> toBeanMethodMap = new HashMap<String, Object>();
+
+    /**
+     * <pre>
+     * 功能：实现BEAN的属性对拷
+     * 创建人：JokenWang
+     * </pre>
+     *
+     * @param fromBean        待转换的源bean
+     * @param toBeanClassName 转换成目标bean的名称 形如：ItemSeries.class.getName()
+     * @return 目标BEAN类
+     */
+    public static <T> T convertBean(Object fromBean, Class<T> toBeanClassName) {
+        T toBean = null;
+        try {
+            toBean = getBeanInstance(toBeanClassName.getName());
+            return convertBean(fromBean, toBean);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return toBean;
+    }
+
+    private static <T> T convertBean(Object fromBean, T toBean) {
+        TypeConverterManager.register(String.class, new StringConverter());
+        BeanCopy.beans(fromBean, toBean).copy();
+        return toBean;
+    }
+
+    public static Method getDeclaredMethod(Object object, String methodName, Class<?>... parameterTypes) {
+        Method method;
+        for (Class<?> clazz = object.getClass(); clazz != Object.class; clazz = clazz.getSuperclass()) {
+            try {
+                method = clazz.getDeclaredMethod(methodName, parameterTypes);
+                return method;
+            } catch (Exception ignored) {
+
+            }
+        }
+        return null;
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> T getBeanInstance(String clazzName)
+            throws InstantiationException, IllegalAccessException, ClassNotFoundException {
+
+        return (T) Class.forName(clazzName).newInstance();
+    }
+
+    public static Map<String, Object> toBeanMethodMap(String toBean)
+            throws InstantiationException, IllegalAccessException, ClassNotFoundException {
+
+        Class<?> toBeanClazz = getBeanInstance(toBean).getClass();
+        Method[] toBeanMethods = toBeanClazz.getDeclaredMethods();
+        if (!toBeanClazz.isInstance(Object.class))// 非超类Object
+        {
+            for (Method method : toBeanMethods) {
+                String methodName = method.getName();
+                toBeanMethodMap.put(methodName, method);
+            }
+
+            Class<?> toBeanSuperclazz = toBeanClazz.getSuperclass();// 获取父类
+            toBeanMethodMap(toBeanSuperclazz.getName());
+        }
+
+        return toBeanMethodMap;
+    }
+
+    public static Map<String, Object> toMap(Object object) {
+        Map<String, Object> map = new HashMap<String, Object>();
+
+        if (object == null) {
+            return map;
+        }
+
+        BeanMap beanMap;
+        beanMap = new BeanMap(object);
+        @SuppressWarnings("unchecked")
+        Iterator<String> it = beanMap.keyIterator();
+        while (it.hasNext()) {
+            String name = it.next();
+            Object value = beanMap.get(name);
+            // 转换时会将类名也转换成属性，此处去掉
+            if (value != null && !name.equals("class")) {
+                map.put(name, value);
+            }
+        }
+
+        return map;
+    }
+
+    public static Map<String, Object> toMap(Object... objs) {
+        Map<String, Object> map = new HashMap<>();
+        for (Object object : objs) {
+            if (object != null) {
+                map.putAll(toMap(object));
+            }
+        }
+        return map;
+    }
+
+    public static String[] getNullPropertyNames (Object source) {
+        final BeanWrapper src = new BeanWrapperImpl(source);
+        PropertyDescriptor[] pds = src.getPropertyDescriptors();
+
+        Set<String> emptyNames = new HashSet<String>();
+        for(PropertyDescriptor pd : pds) {
+            Object srcValue = src.getPropertyValue(pd.getName());
+            if (srcValue == null) {
+                emptyNames.add(pd.getName());
+            }
+        }
+        String[] result = new String[emptyNames.size()];
+        return emptyNames.toArray(result);
+    }
+
+    public static void copyProperties(Object src, Object target) {
+        BeanUtils.copyProperties(src, target, getNullPropertyNames(src));
+    }
+
+}

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -43,11 +43,22 @@ public class CommConstant {
      */
     public final static String FAVOR_CONSULTANT = "consultant";
 
+    /**
+     * 点赞资讯
+     */
+    public final static String FAVOR_NEWS = "news";
+
     /**
      * 点赞项目
      */
     public final static String FAVOR_PROJECT = "project";
-    
+
+    /**
+     * 活动点赞
+     */
+    public final static String FAVOR_ACTIVITY = "activity";
+
+
     /**
      * 兑换商品
      */
@@ -68,15 +79,22 @@ public class CommConstant {
      */
     public final static String POINTS_AUTHORIZE = "authorize";
 
+
     /**
      * 小程序默认首页
      */
     public final static String MINIAPP_INDEX = "/index/index";
 
     public final static String MINIAPP_DEFAULT_AVATAR = "https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/default_avatar.jpg";
-    
+
+
     /**
      * 未领取
      */
     public static final Integer STATUS_UNACCALIMED = 0;
+
+
+
+
+
 }

src/main/java/com/huiju/estateagents/common/StringConverter.java

@@ -0,0 +1,72 @@
+package com.huiju.estateagents.common;
+
+import jodd.typeconverter.TypeConversionException;
+import jodd.typeconverter.TypeConverter;
+import jodd.util.ArraysUtil;
+
+import java.sql.Clob;
+import java.sql.SQLException;
+import java.util.Date;
+
+public class StringConverter implements TypeConverter<String> {
+
+    public String convert(Object value) {
+        if (value == null) {
+            return null;
+        }
+
+        if (value instanceof CharSequence) { // for speed
+            return value.toString();
+        }
+        Class<?> type = value.getClass();
+        if (type == Class.class) {
+            return ((Class<?>) value).getName();
+        }
+        if (type.isArray()) {
+            if (type == char[].class) {
+                char[] charArray = (char[]) value;
+                return new String(charArray);
+            }
+            if (type == int[].class) {
+                return ArraysUtil.toString((int[]) value);
+            }
+            if (type == long[].class) {
+                return ArraysUtil.toString((long[]) value);
+            }
+            if (type == byte[].class) {
+                return ArraysUtil.toString((byte[]) value);
+            }
+            if (type == float[].class) {
+                return ArraysUtil.toString((float[]) value);
+            }
+            if (type == double[].class) {
+                return ArraysUtil.toString((double[]) value);
+            }
+            if (type == short[].class) {
+                return ArraysUtil.toString((short[]) value);
+            }
+            if (type == boolean[].class) {
+                return ArraysUtil.toString((boolean[]) value);
+            }
+            return ArraysUtil.toString((Object[]) value);
+        }
+        if (value instanceof Clob) {
+            Clob clob = (Clob) value;
+            try {
+                long length = clob.length();
+                if (length > Integer.MAX_VALUE) {
+                    throw new TypeConversionException("Clob is too big.");
+                }
+                return clob.getSubString(1, (int) length);
+            } catch (SQLException sex) {
+                throw new TypeConversionException(value, sex);
+            }
+        }
+        if (value instanceof Date) {
+            java.text.DateFormat format1 = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            return format1.format(value);
+        }
+
+        return value.toString();
+    }
+}

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

@@ -0,0 +1,149 @@
+package com.huiju.estateagents.controller;
+
+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.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.ExtendContent;
+import com.huiju.estateagents.service.IExtendContentService;
+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 org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    * 辅助内容表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@RestController
+@RequestMapping("/api")
+public class ExtendContentController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(ExtendContentController.class);
+
+    @Autowired
+    public IExtendContentService iExtendContentService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/extendContent",method= RequestMethod.GET)
+    public ResponseBean extendContentList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<ExtendContent> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<ExtendContent> result = iExtendContentService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("extendContentList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param extendContent 实体对象
+     * @return
+     */
+    @RequestMapping(value="/extendContent",method= RequestMethod.POST)
+    public ResponseBean extendContentAdd(@RequestBody ExtendContent extendContent){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iExtendContentService.save(extendContent)){
+                responseBean.addSuccess(extendContent);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("extendContentAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/extendContent/{id}", method= RequestMethod.DELETE)
+    public ResponseBean extendContentDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iExtendContentService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("extendContentDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param extendContent 实体对象
+     * @return
+     */
+    @RequestMapping(value="/extendContent/{id}",method= RequestMethod.PUT)
+    public ResponseBean extendContentUpdate(@PathVariable Integer id,
+                                        @RequestBody ExtendContent extendContent){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iExtendContentService.updateById(extendContent)){
+                responseBean.addSuccess(extendContent);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("extendContentUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/extendContent/{id}",method= RequestMethod.GET)
+    public ResponseBean extendContentGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iExtendContentService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("extendContentDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,19 @@
+package com.huiju.estateagents.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 微信首页
+ */
+@RestController
+@RequestMapping("/api")
+public class IndexController {
+
+
+
+
+
+
+
+}

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

@@ -5,7 +5,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
+import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
 import com.huiju.estateagents.service.ITaBuildingDynamicService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
@@ -14,6 +16,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
+import javax.swing.*;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
@@ -58,17 +61,35 @@ public class TaBuildingDynamicController extends BaseController {
     }
 
     @RequestMapping(value = "/wx/buildingDynamiceList", method = RequestMethod.GET)
-    public ResponseBean wxBuildingDynamiceList(@RequestParam("pageNum")Integer pageNum, @RequestParam("pageSize")Integer pageSize, HttpSession session){
-        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize);
+    public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
+                                               @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
+                                               HttpServletRequest request){
+        String openid = JWTUtils.getSubject(request);
+        /* buildingId 正在设计中*/
+        Integer buildingId = null;
+        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId);
         return responseBean;
     }
 
     @RequestMapping(value = "/wx/buildingDynamiceInfo/{dynamicId}", method = RequestMethod.GET)
-    public ResponseBean iBuildingDynamicInfo(@PathVariable(value = "dynamicId") String dynamicId, HttpSession session){
-        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceInfo(dynamicId);
+    public ResponseBean iBuildingDynamicInfo(@PathVariable(value = "dynamicId") String dynamicId,
+                                             @RequestParam("buildingId")Integer buildingId){
+        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceInfo(dynamicId,buildingId);
         return responseBean;
     }
 
+    @RequestMapping(value = "/wx/activityDynamicEnlistAdd", method = RequestMethod.POST)
+
+    public ResponseBean taActivityDynamicEnlist(@RequestParam("dynamicId")Integer dynamicId,
+                                                @RequestParam("phone")String phone,
+                                                @RequestParam("name")String name,
+                                                HttpServletRequest request){
+        String openid = JWTUtils.getSubject(request);
+        ResponseBean  responseBean = iBuildingDynamicService.taActivityDynamicEnlistAdd(dynamicId,phone,name);
+        return responseBean;
+    }
+
+
     @RequestMapping(value = "/admin/buildingDynamic/add" ,method =RequestMethod.POST)
     public  ResponseBean buildingDynamicAdd(@RequestBody String parameter){
         ResponseBean responseBean = new ResponseBean();

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

@@ -44,21 +44,25 @@ public class TaNewsController extends BaseController {
      */
     @RequestMapping(value="/taNews",method= RequestMethod.GET)
     public ResponseBean taNewsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            //使用分页插件
-		    IPage<TaNews> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaNews> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                   @RequestParam(value = "buildingId") Integer buildingId,
+                                   @RequestParam(value = "orgId") Integer orgId,
+                                   @RequestParam(value = "newsTypeId") Integer newsTypeId,
+                                   @RequestParam(value = "newsStatus") Integer newsStatus){
+        ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, buildingId, orgId, newsTypeId, newsStatus);
+        return responseBean;
+    }
 
-            IPage<TaNews> result = iTaNewsService.page(pg, queryWrapper);
-            responseBean.addSuccess(result);
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taNewsList -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
+    /**
+     * 微信 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/wx/taNews",method= RequestMethod.GET)
+    public ResponseBean wxTaNewsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, null, null, null, null);
         return responseBean;
     }
 
@@ -69,18 +73,7 @@ public class TaNewsController extends BaseController {
      */
     @RequestMapping(value="/taNews",method= RequestMethod.POST)
     public ResponseBean taNewsAdd(@RequestBody TaNews taNews){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            if (iTaNewsService.save(taNews)){
-                responseBean.addSuccess(taNews);
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taNewsAdd -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
+        ResponseBean responseBean = iTaNewsService.addTaNews(taNews);
         return responseBean;
     }
 
@@ -91,18 +84,7 @@ public class TaNewsController extends BaseController {
     @ResponseBody
     @RequestMapping(value="/taNews/{id}", method= RequestMethod.DELETE)
     public ResponseBean taNewsDelete(@PathVariable Integer id){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            if(iTaNewsService.removeById(id)){
-                responseBean.addSuccess("success");
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taNewsDelete -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
+        ResponseBean responseBean = iTaNewsService.deleteTaNews(id);
         return responseBean;
     }
 
@@ -115,18 +97,8 @@ public class TaNewsController extends BaseController {
     @RequestMapping(value="/taNews/{id}",method= RequestMethod.PUT)
     public ResponseBean taNewsUpdate(@PathVariable Integer id,
                                         @RequestBody TaNews taNews){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            if (iTaNewsService.updateById(taNews)){
-                responseBean.addSuccess(taNews);
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taNewsUpdate -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
+        taNews.setNewsId(id);
+        ResponseBean responseBean = iTaNewsService.updateTaNews(taNews);
         return responseBean;
     }
 
@@ -136,14 +108,28 @@ public class TaNewsController extends BaseController {
      */
     @RequestMapping(value="/taNews/{id}",method= RequestMethod.GET)
     public ResponseBean taNewsGet(@PathVariable Integer id){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            responseBean.addSuccess(iTaNewsService.getById(id));
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taNewsDelete -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
+        ResponseBean responseBean = iTaNewsService.getTaNewsById(id);
+        return responseBean;
+    }
+
+    /**
+     * 微信 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/wx/taNews/{id}",method= RequestMethod.GET)
+    public ResponseBean wxTaNewsGet(@PathVariable Integer id){
+        ResponseBean responseBean = iTaNewsService.getWxTaNewsById(id);
+        return responseBean;
+    }
+
+    /**
+     * 微信 资讯阅读量+1
+     * @param id
+     * @return
+     */
+    @RequestMapping(value = "/wx/taNews/pvNum/{id}", method = RequestMethod.PUT)
+    public ResponseBean wxTaPvNum(@PathVariable Integer id) {
+        ResponseBean responseBean = iTaNewsService.wxTaPvNum(id);
         return responseBean;
     }
 }

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

@@ -44,21 +44,10 @@ public class TaNewsTypeController extends BaseController {
      */
     @RequestMapping(value="/taNewsType",method= RequestMethod.GET)
     public ResponseBean taNewsTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            //使用分页插件
-		    IPage<TaNewsType> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaNewsType> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<TaNewsType> result = iTaNewsTypeService.page(pg, queryWrapper);
-            responseBean.addSuccess(result);
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taNewsTypeList -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
+                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                       @RequestParam(value = "buildingId", required = false) Integer buildingId,
+                                       @RequestParam(value = "orgId", required = false) Integer orgId){
+        ResponseBean responseBean = iTaNewsTypeService.getList(pageNum, pageSize, buildingId, orgId);
         return responseBean;
     }
 
@@ -69,18 +58,7 @@ public class TaNewsTypeController extends BaseController {
      */
     @RequestMapping(value="/taNewsType",method= RequestMethod.POST)
     public ResponseBean taNewsTypeAdd(@RequestBody TaNewsType taNewsType){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            if (iTaNewsTypeService.save(taNewsType)){
-                responseBean.addSuccess(taNewsType);
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taNewsTypeAdd -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
+        ResponseBean responseBean = iTaNewsTypeService.addTaNewsType(taNewsType);
         return responseBean;
     }
 
@@ -91,18 +69,7 @@ public class TaNewsTypeController extends BaseController {
     @ResponseBody
     @RequestMapping(value="/taNewsType/{id}", method= RequestMethod.DELETE)
     public ResponseBean taNewsTypeDelete(@PathVariable Integer id){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            if(iTaNewsTypeService.removeById(id)){
-                responseBean.addSuccess("success");
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taNewsTypeDelete -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
+        ResponseBean responseBean = iTaNewsTypeService.deleteTaNewsType(id);
         return responseBean;
     }
 
@@ -115,18 +82,8 @@ public class TaNewsTypeController extends BaseController {
     @RequestMapping(value="/taNewsType/{id}",method= RequestMethod.PUT)
     public ResponseBean taNewsTypeUpdate(@PathVariable Integer id,
                                         @RequestBody TaNewsType taNewsType){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            if (iTaNewsTypeService.updateById(taNewsType)){
-                responseBean.addSuccess(taNewsType);
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taNewsTypeUpdate -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
+        taNewsType.setNewsTypeId(id);
+        ResponseBean responseBean = iTaNewsTypeService.updateTaNewsType(taNewsType);
         return responseBean;
     }
 
@@ -136,14 +93,8 @@ public class TaNewsTypeController extends BaseController {
      */
     @RequestMapping(value="/taNewsType/{id}",method= RequestMethod.GET)
     public ResponseBean taNewsTypeGet(@PathVariable Integer id){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            responseBean.addSuccess(iTaNewsTypeService.getById(id));
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taNewsTypeDelete -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
+        ResponseBean responseBean = iTaNewsTypeService.getTaNewsTypeById(id);
         return responseBean;
     }
+
 }

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

@@ -0,0 +1,55 @@
+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}/save/{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}/save/{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/ExtendContent.java

@@ -0,0 +1,90 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+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;
+
+/**
+ * <p>
+ * 辅助内容表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_extend_content")
+public class ExtendContent implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 内容ID
+     */
+    @TableId(value = "content_id", type = IdType.AUTO)
+    private Integer contentId;
+
+    /**
+     * 打开方式
+     */
+    private String showType;
+
+    /**
+     * 发布位置
+     */
+    private String showPosition;
+
+    /**
+     * 类型
+     */
+    private String contentType;
+
+    /**
+     * 链接ID
+     */
+    private String targetId;
+
+    /**
+     * 图片
+     */
+    private String image;
+
+    /**
+     * 自定义内容
+     */
+    private String content;
+
+    /**
+     * 内容标题
+     */
+    private String title;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+
+}

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

@@ -0,0 +1,59 @@
+package com.huiju.estateagents.entity;
+
+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>
+ * 点赞表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaActivityDynamicEnlist implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 报名ID
+     */
+    @TableId(value = "favor_id", type = IdType.AUTO)
+    private Integer enlist_id;
+
+    /**
+     * 活动ID
+     */
+    private String dynamic_id;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 楼盘id
+     */
+    private String building_id;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+
+}

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

@@ -81,4 +81,43 @@ public class TaBuildingDynamic implements Serializable {
     @TableField(exist = false)
     private TaBuilding building;
 
+    /**
+     * 活动总开关判断活动是否能开始报名_1:可以，0:不可以
+     */
+    private  String isEnlist;
+
+    /**
+     * 活动开始时间
+     */
+    private LocalDateTime startDate;
+
+    /**
+     * 活动结束时间
+     */
+    private  LocalDateTime endDate;
+
+    /**
+     *  报名开始时间
+     */
+    private  LocalDateTime enlistStart;
+
+    /**
+     * 报名结束时间
+     */
+    private  LocalDateTime enlistEnd;
+
+    /**
+     * 活动的当前状态1:进行中，2:未开始,3:结束
+     */
+    @TableField(exist = false)
+    private  Integer activityCondition;
+
+    /**
+     * 报名总数
+     */
+    @TableField(exist = false)
+    private  int count;
+
+
+
 }

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

@@ -1,5 +1,8 @@
 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;
@@ -25,6 +28,7 @@ public class TaNews implements Serializable {
     /**
      * 咨询ID
      */
+    @TableId(value = "news_id", type = IdType.AUTO)
     private Integer newsId;
 
     /**
@@ -77,5 +81,9 @@ public class TaNews implements Serializable {
      */
     private LocalDateTime createDate;
 
-
+    /**
+     * 类型
+     */
+    @TableField(exist = false)
+    private TaNewsType newsType;
 }

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

@@ -0,0 +1,76 @@
+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/exception/EstaException.java

@@ -0,0 +1,17 @@
+package com.huiju.estateagents.exception;
+
+
+/**
+ * @author weiximei
+ */
+public class EstaException extends RuntimeException {
+
+
+    public EstaException(String msg, Throwable t) {
+        super(msg, t);
+    }
+
+    public EstaException(String msg) {
+        super(msg);
+    }
+}

src/main/java/com/huiju/estateagents/exception/ExceptionHandleAdice.java

@@ -0,0 +1,65 @@
+package com.huiju.estateagents.exception;
+
+import com.huiju.estateagents.base.ResponseBean;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.ObjectError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+/**
+ * 统一异常出口
+ * @author weiximei
+ */
+@ControllerAdvice
+@ResponseBody
+@Slf4j
+public class ExceptionHandleAdice {
+
+
+    @ExceptionHandler(Exception.class)
+    public ResponseBean handleException(Exception e){
+        log.error(e.getMessage(),e);
+        ResponseBean response = new ResponseBean();
+        response.addError("系统异常,请稍后重试!");
+        return response;
+    }
+
+    @ExceptionHandler(RuntimeException.class)
+    public ResponseBean handleException(RuntimeException e){
+        log.error(e.getMessage(),e);
+        ResponseBean response = new ResponseBean();
+        response.addError(e.getMessage());
+        return response;
+    }
+
+
+    @ExceptionHandler(EstaException.class)
+    public ResponseBean handleException(EstaException e) {
+        log.error(e.getMessage(),e);
+        ResponseBean response = new ResponseBean();
+        response.addError(e.getMessage());
+        return response;
+    }
+
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseBean handlelllewgalParamException(MethodArgumentNotValidException e){
+        ResponseBean response = new ResponseBean();
+
+        List<ObjectError> errors  =e.getBindingResult().getAllErrors();
+        String message = "参数不合法";
+        if (errors.size() >0) {
+            message = errors.get(0).getDefaultMessage();
+        }
+
+        response.addError(message);
+
+        return response;
+    }
+
+
+}

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

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

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

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 楼盘户型对应图片表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+@Mapper
+public interface TaActivityDynamicEnlistMapper extends BaseMapper<TaActivityDynamicEnlist> {
+
+}

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 
 /**
  * <p>
@@ -43,4 +44,13 @@ public interface TaBuildingDynamicMapper extends BaseMapper<TaBuildingDynamic> {
      * @param buildingDynamic
      */
     void buildingDynamicUpdate(TaBuildingDynamic buildingDynamic);
+
+    /**
+     * 某个字段值 +1
+     * @param newsId
+     * @param field
+     * @param increment
+     */
+    @Update("UPDATE ta_building_dynamic  SET ${field} = IFNULL(${field}, 0) + #{increment}  WHERE dynamic_id = #{newsId}")
+    void setFieldNum(@Param("newsId") String newsId, @Param("field") String field, @Param("increment") int increment);
 }

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

@@ -3,6 +3,8 @@ package com.huiju.estateagents.mapper;
 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>
@@ -15,4 +17,13 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaNewsMapper extends BaseMapper<TaNews> {
 
+    /**
+     * 某个字段值 +1
+     * @param newsId
+     * @param field
+     * @param increment
+     */
+    @Update("UPDATE ta_news  SET ${field} = IFNULL(${field}, 0) + #{increment}  WHERE news_id = #{newsId}")
+    void setFieldNum(@Param("newsId") String newsId, @Param("field") String field, @Param("increment") int increment);
+
 }

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

@@ -0,0 +1,18 @@
+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/IExtendContentService.java

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.ExtendContent;
+
+/**
+ * <p>
+ * 辅助内容表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+public interface IExtendContentService extends IService<ExtendContent> {
+
+}

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

@@ -33,14 +33,14 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      * 微信小程序 项目动态管理列表
      * @return
      */
-    ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize);
+    ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,Integer buildingId);
 
     /**
      * 微信小程序 项目详情
      * @param dynamicId
      * @return
      */
-    ResponseBean getWxBuildingDynamiceInfo(String dynamicId);
+    ResponseBean getWxBuildingDynamiceInfo(String dynamicId,Integer buildingId);
 
     /**
      * 动态管理添加
@@ -63,4 +63,12 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      */
     ResponseBean buildingDynamicUpdate(HashMap<Object, Object> map);
 
+    /**
+     * 报名活动
+     * @param dynamicId
+     * @param phone
+     * @param name
+     * @return
+     */
+    ResponseBean taActivityDynamicEnlistAdd(Integer dynamicId, String phone, String name);
 }

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

@@ -1,6 +1,8 @@
 package com.huiju.estateagents.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaNews;
 
 /**
@@ -13,4 +15,56 @@ import com.huiju.estateagents.entity.TaNews;
  */
 public interface ITaNewsService extends IService<TaNews> {
 
+    /**
+     * 查询资讯列表
+     * @param pageNum
+     * @param pageSize
+     * @param buildingId
+     * @param orgId
+     * @param newsTypeId
+     * @return
+     */
+    ResponseBean getList(Integer pageNum, Integer pageSize, Integer buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus);
+
+    /**
+     * 根据Id查询资讯数据
+     * @param newsId
+     * @return
+     */
+    ResponseBean getTaNewsById(Integer newsId);
+
+    /**
+     * 修改资讯数据
+     * @param taNews
+     * @return
+     */
+    ResponseBean updateTaNews(TaNews taNews);
+
+    /**
+     * add资讯数据
+     * @param taNews
+     * @return
+     */
+    ResponseBean addTaNews(TaNews taNews);
+
+    /**
+     * 删除资讯
+     * @param newsId
+     * @return
+     */
+    ResponseBean deleteTaNews(Integer newsId);
+
+    /**
+     * 微信 根据Id查询资讯数据
+     * @param newsId
+     * @return
+     */
+    ResponseBean getWxTaNewsById(Integer newsId);
+
+    /**
+     * 微信 阅读量 +1
+     * @param id
+     * @return
+     */
+    ResponseBean wxTaPvNum(Integer id);
 }

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaNewsType;
 
 /**
@@ -13,4 +14,42 @@ import com.huiju.estateagents.entity.TaNewsType;
  */
 public interface ITaNewsTypeService extends IService<TaNewsType> {
 
+    /**
+     * 查询资讯类型列表
+     * @param pageNum
+     * @param pageSize
+     * @param buildingId
+     * @param orgId
+     * @return
+     */
+    ResponseBean getList(Integer pageNum, Integer pageSize, Integer buildingId, Integer orgId);
+
+    /**
+     * 根据Id查询资讯类型数据
+     * @param newsTypeId
+     * @return
+     */
+    ResponseBean getTaNewsTypeById(Integer newsTypeId);
+
+    /**
+     * 修改资讯类型数据
+     * @param taNewsType
+     * @return
+     */
+    ResponseBean updateTaNewsType(TaNewsType taNewsType);
+
+    /**
+     * add资讯类型数据
+     * @param taNewsType
+     * @return
+     */
+    ResponseBean addTaNewsType(TaNewsType taNewsType);
+
+    /**
+     * 删除资讯类型
+     * @param newsTypeId
+     * @return
+     */
+    ResponseBean deleteTaNewsType(Integer newsTypeId);
+
 }

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

@@ -0,0 +1,22 @@
+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/ExtendContentServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.ExtendContent;
+import com.huiju.estateagents.mapper.ExtendContentMapper;
+import com.huiju.estateagents.service.IExtendContentService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 辅助内容表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@Service
+public class ExtendContentServiceImpl extends ServiceImpl<ExtendContentMapper, ExtendContent> implements IExtendContentService {
+
+}

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

@@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
 import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
+import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
 import com.huiju.estateagents.mapper.TaBuildingDynamicMapper;
 import com.huiju.estateagents.mapper.TaBuildingMapper;
 import com.huiju.estateagents.service.ITaBuildingDynamicService;
@@ -22,6 +24,7 @@ import java.text.SimpleDateFormat;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -43,6 +46,11 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     @Autowired
     private TaBuildingMapper buildingMapper;
 
+
+    @Autowired
+    private TaActivityDynamicEnlistMapper taActivityDynamicEnlistMapper;
+
+
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         CustomDateEditor editor = new CustomDateEditor(df, true);//true表示允许为空，false反之
@@ -72,30 +80,43 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     }
 
     @Override
-    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize) {
+    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,Integer buildingId) {
         Page<TaBuildingDynamic> page = new Page<>();
         page.setCurrent(pageNum);
         page.setSize(pageSize);
         QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
+        buildingDynamicQueryWrapper.eq("building_id", buildingId);
         buildingDynamicQueryWrapper.eq("status", "1");
         buildingDynamicQueryWrapper.orderByDesc("create_date");
         IPage<TaBuildingDynamic> buildingDynamicIPage = buildingDynamicMapper.selectPage(page, buildingDynamicQueryWrapper);
         List<TaBuildingDynamic> records = buildingDynamicIPage.getRecords();
-        records.forEach(e -> {
-            QueryWrapper<TaBuilding> buildingQueryWrapper = new QueryWrapper<>();
-            buildingQueryWrapper.eq("building_id", e.getBuildingId());
-            TaBuilding building = buildingMapper.selectOne(buildingQueryWrapper);
-            e.setBuilding(building);
-        });
-
-        return ResponseBean.success(buildingDynamicIPage);
+        // 判断换当前列表活动状态—1:进行中(展示活动报名截止时间)，2:未开始（展示活动报名时间）,3:结束（不展示）
+        for (TaBuildingDynamic taBuildingDynamic:records){
+            // 获取当前时间状态
+            taBuildingDynamic= timeCondition(taBuildingDynamic);
+        }
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("list", records);
+        map.put("total", buildingDynamicIPage.getTotal());
+        map.put("pageNum", buildingDynamicIPage.getCurrent());
+        map.put("pageSize", buildingDynamicIPage.getSize());
+        return ResponseBean.success(map);
     }
 
     @Override
-    public ResponseBean getWxBuildingDynamiceInfo(String dynamicId) {
+    public ResponseBean getWxBuildingDynamiceInfo(String dynamicId,Integer buildingId) {
         QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
         buildingDynamicQueryWrapper.eq("dynamic_id", dynamicId);
+        buildingDynamicQueryWrapper.eq("status",1);
         TaBuildingDynamic buildingDynamic = buildingDynamicMapper.selectOne(buildingDynamicQueryWrapper);
+        // 获取报名总数
+        QueryWrapper<TaActivityDynamicEnlist> taActivityDynamicEnlist = new QueryWrapper<>();
+        taActivityDynamicEnlist.eq("dynamic_id", dynamicId);
+        taActivityDynamicEnlist.eq("building_id",buildingId);
+        int applyCount= taActivityDynamicEnlistMapper.selectCount(taActivityDynamicEnlist);
+        buildingDynamic.setCount(applyCount);
+        // 获取当前时间状态
+        buildingDynamic = timeCondition(buildingDynamic);
         return ResponseBean.success(buildingDynamic);
     }
 
@@ -155,5 +176,42 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         return ResponseBean.success("成功");
     }
 
+    @Override
+    public ResponseBean taActivityDynamicEnlistAdd(Integer dynamicId, String phone, String name) {
+        // 查询当前活动属于哪个楼盘
+        TaBuildingDynamic taBuildingDynamic= buildingDynamicMapper.iBuildingDynamicSelectId(dynamicId+"");
+
+        TaActivityDynamicEnlist taActivityDynamicEnlist= new TaActivityDynamicEnlist();
+        taActivityDynamicEnlist.setCreateDate(LocalDateTime.now())
+                               .setDynamic_id(dynamicId+"")
+                               .setPhone(phone).setName(name)
+                               .setBuilding_id(taBuildingDynamic.getDynamicId());
+        taActivityDynamicEnlistMapper.insert(taActivityDynamicEnlist);
+        return ResponseBean.success("成功");
+    }
 
+    // 根据报名开始时间和结束时间判断当前图标状态
+    private  TaBuildingDynamic  timeCondition(TaBuildingDynamic taBuildingDynamic){
+        Long currentTime = LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli();
+        if (null == taBuildingDynamic.getEnlistEnd () && null == taBuildingDynamic.getEnlistStart()){
+            return  taBuildingDynamic;
+        }
+        // 报名截止时间
+        Long enlistEnd = taBuildingDynamic.getEnlistEnd ().toInstant(ZoneOffset.of("+8")).toEpochMilli();
+        // 报名开始时间
+        Long enlistStart = taBuildingDynamic.getEnlistStart().toInstant(ZoneOffset.of("+8")).toEpochMilli();
+        // (1:进行中)当前时间小于报名截止时间,并且报名状态为1
+        if ("1".equals(taBuildingDynamic.getIsEnlist()) && currentTime <= enlistEnd ) {
+            taBuildingDynamic.setActivityCondition(1);
+        }
+        //(2:未开始)当前时间是否小于报名时间,并且报名状态为1
+        if (!"1".equals(taBuildingDynamic.getIsEnlist()) && currentTime <= enlistStart){
+            taBuildingDynamic.setActivityCondition(2);
+        }
+        //(3:结束)当前时间大于报名结束时间,并且报名状态为1
+        if ("1".equals(taBuildingDynamic.getIsEnlist()) && currentTime >= enlistEnd){
+            taBuildingDynamic.setActivityCondition(3);
+        }
+        return taBuildingDynamic;
+    }
 }

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

@@ -3,9 +3,12 @@ package com.huiju.estateagents.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.entity.TaFavor;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.mapper.TaBuildingDynamicMapper;
 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;
@@ -34,6 +37,12 @@ public class TaFavorServiceImpl extends ServiceImpl<TaFavorMapper, TaFavor> impl
     @Autowired
     TaFavorMapper taFavorMapper;
 
+    @Autowired
+    private TaNewsMapper taNewsMapper;
+
+    @Autowired
+    private TaBuildingDynamicMapper taBuildingDynamicMapper;
+
     @Override
     public ResponseBean postLike(String openid, String typeOf, String like) {
         List<TaPerson> persons = getPersonsByOpenId(openid);
@@ -73,6 +82,16 @@ public class TaFavorServiceImpl extends ServiceImpl<TaFavorMapper, TaFavor> impl
             taPersonMapper.setFieldIncrement(like,"like_num", 1);
         }
 
+        // 如果是资讯点赞, 则 +1
+        if(typeOf.equals(CommConstant.FAVOR_NEWS)) {
+            taNewsMapper.setFieldNum(like, "favor_num", 1);
+        }
+
+        // 如果是活动点赞, 则 +1
+        if(typeOf.equals(CommConstant.FAVOR_ACTIVITY)) {
+            taBuildingDynamicMapper.setFieldNum(like, "favor_num", 1);
+        }
+
         return ResponseBean.success("");
     }
 
@@ -102,10 +121,21 @@ public class TaFavorServiceImpl extends ServiceImpl<TaFavorMapper, TaFavor> impl
         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);
+        }
+
+
+        // 如果是活动点赞, 则 -1
+        if(typeOf.equals(CommConstant.FAVOR_ACTIVITY)) {
+            taBuildingDynamicMapper.setFieldNum(like, "favor_num", 1);
+        }
+
         return ResponseBean.success("");
     }
 

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

@@ -1,11 +1,32 @@
 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.plugins.pagination.Page;
 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 com.huiju.estateagents.service.ITaNewsService;
+import com.huiju.estateagents.service.ITaNewsTypeService;
+import org.springframework.beans.BeanUtils;
+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>
  * 资讯表  服务实现类
@@ -17,4 +38,147 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> implements ITaNewsService {
 
+    @Autowired
+    private ITaNewsTypeService iTaNewsTypeService;
+
+    @Autowired
+    private ITaBuildingService iTaBuildingService;
+
+    @Autowired
+    private TaFavorMapper taFavorMapper;
+
+    @Autowired
+    private TaNewsMapper taNewsMapper;
+
+
+    @Override
+    public ResponseBean getList(Integer pageNum, Integer pageSize, Integer buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus) {
+        ResponseBean responseBean = new ResponseBean();
+
+        IPage<TaNews> page = new Page<>();
+        page.setCurrent(pageNum);
+        page.setSize(pageSize);
+
+        QueryWrapper<TaNews> taNewsQueryWrapper = new QueryWrapper<>();
+        taNewsQueryWrapper.eq(buildingId != null,"building_id", buildingId);
+        taNewsQueryWrapper.eq(orgId != null,"org_id", orgId);
+        taNewsQueryWrapper.eq(newsTypeId != null,"news_type_id", newsTypeId);
+        taNewsQueryWrapper.eq(newsStatus != null, "news_status", newsStatus);
+        taNewsQueryWrapper.eq("status", 1);
+        taNewsQueryWrapper.orderByDesc("create_date");
+        IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);
+
+        List<TaNews> records = taNewsIPage.getRecords();
+        records.forEach(e -> {
+            TaNewsType newsType = iTaNewsTypeService.getById(e.getNewsTypeId());
+            e.setNewsType(newsType);
+        });
+
+        responseBean.addSuccess(taNewsIPage);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean getTaNewsById(Integer newsId) {
+        ResponseBean responseBean = new ResponseBean();
+        if (null == newsId) {
+            responseBean.addError("编号不能为空！");
+        }
+        responseBean.addSuccess(this.getById(newsId));
+        return  responseBean;
+    }
+
+    @Override
+    public ResponseBean updateTaNews(TaNews taNews) {
+        ResponseBean responseBean = new ResponseBean();
+        TaNews oldNews = this.getById(taNews.getNewsId());
+        if (null == oldNews) {
+            responseBean.addError("资讯不存在！");
+            return responseBean;
+        }
+
+        //-- 校验 公司，楼盘，资讯类型
+        check(taNews);
+
+        BeanTools.copyProperties(taNews, oldNews);
+        responseBean.addSuccess(this.updateById(oldNews));
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean addTaNews(TaNews taNews) {
+        ResponseBean responseBean = new ResponseBean();
+        check(taNews);
+
+        taNews.setCreateDate(LocalDateTime.now());
+        taNews.setStatus(1);
+        this.save(taNews);
+        responseBean.addSuccess(taNews);
+        return responseBean;
+    }
+
+    private void check(TaNews taNews) {
+        //-- 校验 公司，楼盘，资讯类型
+        // TODO 公司校验没有写 taNews.getOrgId()
+
+        TaBuilding taBuilding = iTaBuildingService.getById(taNews.getBuildingId());
+        if (null == taBuilding) {
+            throw new EstaException("楼盘不存在！");
+        }
+        TaNewsType taNewsType = iTaNewsTypeService.getById(taNews.getNewsTypeId());
+        if (null == taNewsType) {
+            throw new EstaException("资讯类型不存在！");
+        }
+    }
+
+    @Override
+    public ResponseBean deleteTaNews(Integer newsId) {
+        ResponseBean responseBean = getTaNewsById(newsId);
+        if (1 == responseBean.getCode()) {
+            return responseBean;
+        }
+        TaNews taNews = (TaNews) responseBean.getData();
+        if (null == taNews) {
+            responseBean.addError("数据不存!");
+        }
+
+        // 修改状态
+        taNews.setStatus(0);
+        this.updateById(taNews);
+
+        responseBean.addSuccess(taNews);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean getWxTaNewsById(Integer newsId) {
+        ResponseBean responseBean = getTaNewsById(newsId);
+        if (1 == responseBean.getCode()) {
+            return responseBean;
+        }
+        TaNews taNews = (TaNews) responseBean.getData();
+        if (null == taNews) {
+            responseBean.addError("数据不存!");
+        }
+
+        responseBean.addSuccess(taNews);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean wxTaPvNum(Integer id) {
+        ResponseBean responseBean = getTaNewsById(id);
+        if (1 == responseBean.getCode()) {
+            return responseBean;
+        }
+        TaNews taNews = (TaNews) responseBean.getData();
+        if (null == taNews) {
+            responseBean.addError("数据不存!");
+        }
+
+        taNewsMapper.setFieldNum(id + "", "pv_num", 1);
+
+        responseBean.addSuccess((Object)"");
+        return responseBean;
+    }
 }

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

@@ -1,11 +1,22 @@
 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.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.BeanTools;
+import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaNewsType;
+import com.huiju.estateagents.exception.EstaException;
 import com.huiju.estateagents.mapper.TaNewsTypeMapper;
+import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.ITaNewsTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 资讯类型表  服务实现类
@@ -17,4 +28,93 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaNewsTypeServiceImpl extends ServiceImpl<TaNewsTypeMapper, TaNewsType> implements ITaNewsTypeService {
 
+    @Autowired
+    private ITaBuildingService iTaBuildingService;
+
+
+    @Override
+    public ResponseBean getList(Integer pageNum, Integer pageSize, Integer buildingId, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+        IPage<TaNewsType> page = new Page<>();
+        page.setCurrent(pageNum);
+        page.setSize(pageSize);
+
+        QueryWrapper<TaNewsType> taNewsQueryWrapper = new QueryWrapper<>();
+        taNewsQueryWrapper.eq(buildingId != null,"building_id", buildingId);
+        taNewsQueryWrapper.eq(orgId != null,"org_id", orgId);
+        taNewsQueryWrapper.eq("status", 1);
+        taNewsQueryWrapper.orderByDesc("create_date");
+        IPage<TaNewsType> typeIPage = this.page(page, taNewsQueryWrapper);
+
+        responseBean.addSuccess(typeIPage);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean getTaNewsTypeById(Integer newsTypeId) {
+        ResponseBean responseBean = new ResponseBean();
+        if (null == newsTypeId) {
+            responseBean.addError("资讯类型编号不存在!");
+        }
+        responseBean.addSuccess(this.getById(newsTypeId));
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean updateTaNewsType(TaNewsType taNewsType) {
+        ResponseBean responseBean =  new ResponseBean();
+        TaNewsType oldTaNewsType = this.getById(taNewsType.getNewsTypeId());
+        if (null == oldTaNewsType) {
+            responseBean.addError("资讯类型不存在！");
+            return responseBean;
+        }
+
+        //-- 校验 公司，楼盘
+        // TODO 没有校验公司  taNewsType.getOrgId();
+        check(taNewsType);
+
+        BeanTools.copyProperties(taNewsType, oldTaNewsType);
+        this.updateById(oldTaNewsType);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean addTaNewsType(TaNewsType taNewsType) {
+        ResponseBean responseBean = new ResponseBean();
+
+        //-- 校验 公司，楼盘
+        check(taNewsType);
+
+        taNewsType.setCreateDate(LocalDateTime.now());
+        this.save(taNewsType);
+        responseBean.addSuccess(taNewsType);
+        return responseBean;
+    }
+
+    private void check(TaNewsType taNewsType) {
+        TaBuilding taBuilding = iTaBuildingService.getById(taNewsType.getBuildingId());
+        if (null == taBuilding) {
+            throw new EstaException("楼盘不存在！");
+        }
+    }
+
+    @Override
+    public ResponseBean deleteTaNewsType(Integer newsTypeId) {
+        ResponseBean responseBean = getTaNewsTypeById(newsTypeId);
+        if (1 == responseBean.getCode()) {
+            return responseBean;
+        }
+        TaNewsType taNewsType = (TaNewsType) responseBean.getData();
+        if (null == taNewsType) {
+            responseBean.addError("数据不存!");
+        }
+
+        // 修改状态
+        taNewsType.setStatus(0);
+        this.updateById(taNewsType);
+
+        responseBean.addSuccess(taNewsType);
+        return responseBean;
+    }
+
 }

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

@@ -0,0 +1,134 @@
+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.TaBuildingDynamicMapper;
+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;
+
+    @Autowired
+    private TaBuildingDynamicMapper taBuildingDynamicMapper;
+
+    @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("saved_target", 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);
+        }
+
+        // 如果是活动收藏, 则 +1
+        if(typeOf.equals(CommConstant.FAVOR_ACTIVITY)) {
+            taBuildingDynamicMapper.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("saved_target", 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("saved_target", like);
+        condition.put("tagert_type", typeOf);
+        taSaveMapper.deleteByMap(condition);
+
+        // 如果是收藏资讯, 则 - 1
+        if (typeOf.equals(CommConstant.FAVOR_NEWS)) {
+            taNewsMapper.setFieldNum(taPerson.getPersonId(),"save_num", -1);
+        }
+
+        // 如果是活动收藏, 则 - 1
+        if(typeOf.equals(CommConstant.FAVOR_ACTIVITY)) {
+            taBuildingDynamicMapper.setFieldNum(like, "save_num", -1);
+        }
+
+        return ResponseBean.success("");
+    }
+
+    List<TaPerson> getPersonsByOpenId(String openid) {
+        return taPersonMapper.getPersonByOpenId(openid);
+    }
+}

src/main/resources/mapper/ExtendContentMapper.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.ExtendContentMapper">
+
+</mapper>

src/main/resources/mapper/TaActivityDynamicEnlistMapper.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.TaActivityDynamicEnlistMapper">
+
+</mapper>