提交

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

@@ -54,4 +54,9 @@ public class CommConstant {
     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 final static String FAVOR_NEWS = "news";
 }

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/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/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,17 @@ 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;
     }
 }

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/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/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/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,49 @@ 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);
 }

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/impl/TaNewsServiceImpl.java

@@ -1,11 +1,27 @@
 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.TaNews;
+import com.huiju.estateagents.entity.TaNewsType;
+import com.huiju.estateagents.exception.EstaException;
 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.List;
+
 /**
  * <p>
  * 资讯表  服务实现类
@@ -17,4 +33,132 @@ 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 ITaFavorService iTaFavorService;
+
+
+
+    @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("数据不存!");
+        }
+
+        //-- 查询 点赞数，收藏数，阅读数
+
+
+
+
+        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;
+    }
+
 }