物业类型

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

@@ -48,6 +48,7 @@ public class TpNewsController extends BaseController {
     public ResponseBean newsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                  @RequestParam(value = "newsName", required = false) String newsName,
+                                 @RequestParam(value = "newsTypeId", required = false) String newsTypeId,
                                  @PathVariable String client,
                                  HttpServletRequest request) {
         Integer orgId = getOrgId(request);
@@ -58,7 +59,7 @@ public class TpNewsController extends BaseController {
         }
 
         IPage<TpNews> page = new Page<>(pageNum, pageSize);
-        IPage<TpNews> result = iTpNewsService.getListBy(page, orgId, newsName, status);
+        IPage<TpNews> result = iTpNewsService.getListBy(page, orgId, newsName, status,newsTypeId);
 
         return ResponseBean.success(result);
     }

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

@@ -0,0 +1,133 @@
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TpNewsType;
+import com.huiju.estateagents.service.ITpNewsTypeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+    * 资讯类型表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@RestController
+@RequestMapping("/api")
+@Api(value = "物业服务类型", tags = "物业服务类型")
+public class TpNewsTypeController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TpNewsTypeController.class);
+
+    @Autowired
+    public ITpNewsTypeService iTpNewsTypeService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    // @ApiOperation(value = "查询资讯类型", notes = "查询资讯类型")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query",value = "项目id")
+    })
+    @RequestMapping(value="/admin/tpNewsType",method= RequestMethod.GET)
+    public ResponseBean tpNewsTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                       @RequestParam(value = "buildingId", required = false) String buildingId,
+                                       HttpServletRequest request){
+        ResponseBean responseBean = iTpNewsTypeService.getList(pageNum, pageSize, buildingId, getOrgId(request),getTaPersonBuildingListByUserId(request));
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param tpNewsType 实体对象
+     * @return
+     */
+    // @ApiOperation(value = "保存资讯类型", notes = "保存资讯类型")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "tpNewsType", name = "tpNewsType", paramType = "body",value = "资讯类型数据")
+    })
+    @RequestMapping(value="/admin/tpNewsType",method= RequestMethod.POST)
+    public ResponseBean tpNewsTypeAdd(@RequestBody TpNewsType tpNewsType, HttpServletRequest request){
+        ResponseBean responseBean = iTpNewsTypeService.addTpNewsType(tpNewsType, getOrgId(request));
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/admin/tpNewsType/{id}", method= RequestMethod.DELETE)
+    public ResponseBean tpNewsTypeDelete(@PathVariable Integer id){
+        ResponseBean responseBean = iTpNewsTypeService.deleteTpNewsType(id);
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param tpNewsType 实体对象
+     * @return
+     */
+    // @ApiOperation(value = "修改资讯类型", notes = "根据ID修改资讯类型")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "tpNewsType", name = "tpNewsType", paramType = "body",value = "资讯类型数据"),
+            @ApiImplicitParam(dataType = "Integer", name = "id", paramType = "path",value = "资讯id")
+    })
+    @RequestMapping(value="/admin/tpNewsType/{id}",method= RequestMethod.PUT)
+    public ResponseBean tpNewsTypeUpdate(@PathVariable Integer id,
+                                        @RequestBody TpNewsType tpNewsType, HttpServletRequest request){
+        tpNewsType.setNewsTypeId(id);
+        tpNewsType.setOrgId(getOrgId(request));
+        ResponseBean responseBean = iTpNewsTypeService.updateTpNewsType(tpNewsType);
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    // @ApiOperation(value = "咨询类型详情", notes = "咨询类型详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "Integer", name = "id", paramType = "path",value = "资讯id")
+    })
+    @RequestMapping(value="/admin/tpNewsType/{id}",method= RequestMethod.GET)
+    public ResponseBean tpNewsTypeGet(@PathVariable Integer id){
+        ResponseBean responseBean = iTpNewsTypeService.getTpNewsTypeById(id);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "查询物业服务类型列表", notes = "查询物业服务类型列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query",value = "项目id")
+    })
+    @RequestMapping(value="/wx/tpNewsType/list",method= RequestMethod.GET)
+    public ResponseBean getWxTpNewsTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                       @RequestParam(value = "buildingId", required = false) String buildingId,
+                                       HttpServletRequest request){
+        QueryWrapper<TpNewsType> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id",getOrgId(request));
+        return ResponseBean.success(iTpNewsTypeService.list(queryWrapper));
+    }
+
+}

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

@@ -0,0 +1,64 @@
+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-07-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TpNewsType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 资讯类型id
+     */
+    @TableId(value = "news_type_id", type = IdType.AUTO)
+    private Integer newsTypeId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+    /**
+     * 资讯类型图片
+     */
+    private String newsTypeImg;
+
+    /**
+     * 资讯类型名称
+     */
+    private String newsTypeName;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+
+}

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

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

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

@@ -15,5 +15,5 @@ import com.huiju.estateagents.entity.TpNews;
  */
 public interface ITpNewsService extends IService<TpNews> {
 
-    IPage<TpNews> getListBy(IPage<TpNews> page, Integer orgId, String newsName, Integer status);
+    IPage<TpNews> getListBy(IPage<TpNews> page, Integer orgId, String newsName, Integer status,String newsTypeId);
 }

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

@@ -0,0 +1,59 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TpNewsType;
+import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.entity.TpNewsType;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资讯类型表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+public interface ITpNewsTypeService extends IService<TpNewsType> {
+
+    /**
+     * 查询资讯类型列表
+     * @param pageNum
+     * @param pageSize
+     * @param buildingId
+     * @param orgId
+     * @return
+     */
+    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, List<TaPersonBuilding> personBuildingList);
+
+    /**
+     * 根据Id查询资讯类型数据
+     * @param newsTypeId
+     * @return
+     */
+    ResponseBean getTpNewsTypeById(Integer newsTypeId);
+
+    /**
+     * 修改资讯类型数据
+     * @param TpNewsType
+     * @return
+     */
+    ResponseBean updateTpNewsType(TpNewsType TpNewsType);
+
+    /**
+     * add资讯类型数据
+     * @param TpNewsType
+     * @return
+     */
+    ResponseBean addTpNewsType(TpNewsType TpNewsType, Integer orgId);
+
+    /**
+     * 删除资讯类型
+     * @param newsTypeId
+     * @return
+     */
+    ResponseBean deleteTpNewsType(Integer newsTypeId);
+
+}

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

@@ -22,9 +22,10 @@ import org.springframework.stereotype.Service;
 public class TpNewsServiceImpl extends ServiceImpl<TpNewsMapper, TpNews> implements ITpNewsService {
 
     @Override
-    public IPage<TpNews> getListBy(IPage<TpNews> page, Integer orgId, String newsName, Integer status) {
+    public IPage<TpNews> getListBy(IPage<TpNews> page, Integer orgId, String newsName, Integer status,String newsTypeId) {
         QueryWrapper<TpNews> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("org_id", orgId);
+        queryWrapper.eq(StringUtils.isEmpty(newsTypeId),"org_id", newsTypeId);
         queryWrapper.eq(status != null, "status", status);
         queryWrapper.gt(status == null, "status", CommConstant.STATUS_DELETE);
         queryWrapper.like(!StringUtils.isEmpty(newsName), "news_name", "%" + newsName + "%");

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

@@ -0,0 +1,140 @@
+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.*;
+import com.huiju.estateagents.entity.TpNewsType;
+import com.huiju.estateagents.exception.EstaException;
+import com.huiju.estateagents.mapper.TpNewsTypeMapper;
+import com.huiju.estateagents.mapper.TpNewsTypeMapper;
+import com.huiju.estateagents.service.*;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 物业服务类型表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@Service
+public class TpNewsTypeServiceImpl extends ServiceImpl<TpNewsTypeMapper, TpNewsType> implements ITpNewsTypeService {
+
+    @Autowired
+    private ITaBuildingService iTaBuildingService;
+
+    @Autowired
+    private ITpNewsService iTpNewsService;
+
+
+    @Override
+    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, List<TaPersonBuilding> personBuildingList) {
+        ResponseBean responseBean = new ResponseBean();
+        IPage<TpNewsType> page = new Page<>();
+        page.setCurrent(pageNum);
+        page.setSize(pageSize);
+
+        QueryWrapper<TpNewsType> taNewsQueryWrapper = new QueryWrapper<>();
+        taNewsQueryWrapper.eq(StringUtils.isNotBlank(buildingId),"building_id", buildingId);
+        taNewsQueryWrapper.eq(orgId != null,"org_id", orgId);
+        taNewsQueryWrapper.eq("status", 1);
+        taNewsQueryWrapper.in(personBuildingList.size() > 0,"building_id", personBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList()));
+        taNewsQueryWrapper.orderByDesc("create_date");
+        IPage<TpNewsType> typeIPage = this.page(page, taNewsQueryWrapper);
+
+        responseBean.addSuccess(typeIPage);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean getTpNewsTypeById(Integer newsTypeId) {
+        ResponseBean responseBean = new ResponseBean();
+        if (null == newsTypeId) {
+            responseBean.addError("物业服务类型编号不存在!");
+        }
+        responseBean.addSuccess(this.getById(newsTypeId));
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean updateTpNewsType(TpNewsType TpNewsType) {
+        ResponseBean responseBean =  new ResponseBean();
+        TpNewsType oldTpNewsType = this.getById(TpNewsType.getNewsTypeId());
+        if (null == oldTpNewsType) {
+            responseBean.addError("物业服务类型不存在！");
+            return responseBean;
+        }
+
+        //-- 校验 公司，楼盘
+        // TODO 没有校验公司  TpNewsType.getOrgId();
+        check(TpNewsType);
+
+        BeanTools.copyProperties(TpNewsType, oldTpNewsType);
+        this.updateById(oldTpNewsType);
+        responseBean.addSuccess(oldTpNewsType);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean addTpNewsType(TpNewsType TpNewsType, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        //-- 校验 公司，楼盘
+        check(TpNewsType);
+
+        TpNewsType.setCreateDate(LocalDateTime.now());
+        TpNewsType.setStatus(1);
+        TpNewsType.setOrgId(orgId);
+        this.save(TpNewsType);
+        responseBean.addSuccess(TpNewsType);
+        return responseBean;
+    }
+
+    private void check(TpNewsType TpNewsType) {
+//        TaBuilding taBuilding = iTaBuildingService.getById(TpNewsType.getBuildingId());
+//        if (null == taBuilding) {
+//            throw new EstaException("楼盘不存在！");
+//        }
+        if (TpNewsType.getStatus() != null && TpNewsType.getStatus() == -1) {
+            QueryWrapper<TpNews> queryWrapper = new QueryWrapper<>();
+            queryWrapper.gt("status", -1);
+            queryWrapper.eq("news_type_id", TpNewsType.getNewsTypeId());
+            Integer newsCount = iTpNewsService.count(queryWrapper);
+            if (newsCount != null && newsCount > 0) {
+                throw new EstaException("有物业服务正在使用此物业服务！");
+            }
+        }
+
+    }
+
+    @Override
+    public ResponseBean deleteTpNewsType(Integer newsTypeId) {
+        ResponseBean responseBean = getTpNewsTypeById(newsTypeId);
+        if (1 == responseBean.getCode()) {
+            return responseBean;
+        }
+        TpNewsType TpNewsType = (TpNewsType) responseBean.getData();
+        if (null == TpNewsType) {
+            responseBean.addError("数据不存!");
+        }
+
+        // 修改状态
+        TpNewsType.setStatus(0);
+        this.updateById(TpNewsType);
+
+        responseBean.addSuccess(TpNewsType);
+        return responseBean;
+    }
+
+}

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