合并

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TransactionController.java

@@ -0,0 +1,67 @@
+package com.community.huiju.controller;
+
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.common.base.BaseController;
+import com.community.huiju.model.TpTransaction;
+import com.community.huiju.service.ITransactionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+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.RestController;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * <p>
+ * 物业web端二手交易表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2018-12-29
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "二手租赁相关信息", description = "二手租赁相关信息Api")
+public class TransactionController extends BaseController {
+	
+	@Autowired
+	private ITransactionService transactionService;
+	
+	@ApiOperation(value = "根据搜索条件获取二手租赁列表", notes = "根据搜索条件获取二手租赁列表")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "transactionId", value = "帖子编号"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "transactionTitle", value = "帖子标题（模糊查询）"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "status", value = "发布状态"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "isReported", value = "是否被举报"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")
+	})
+	@RequestMapping(value = "/transactions",method = RequestMethod.GET)
+	public ResponseBean getList(@RequestParam(value = "transactionId", required = false) Integer transactionId,
+	                            @RequestParam(value = "transactionTitle", required = false) String transactionTitle,
+	                            @RequestParam(value = "status", required = false) String status,
+	                            @RequestParam(value = "isReported", required = false) String isReported,
+	                            @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+	                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		TpTransaction tpTransaction = new TpTransaction();
+		tpTransaction.setId(transactionId);
+		tpTransaction.setTransactionTitle(transactionTitle);
+		tpTransaction.setStatus(status);
+		tpTransaction.setIsReported(isReported);
+		tpTransaction.setCommunityId(userElement.getCommunityId());
+		responseBean = transactionService.getTransactionList(tpTransaction,pageNum,pageSize);
+		return responseBean;
+	}
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TpTransactionMapper.java

@@ -0,0 +1,21 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.community.huiju.model.TpTransaction;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 物业web端二手交易表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2018-12-29
+ */
+public interface TpTransactionMapper extends BaseMapper<TpTransaction> {
+	
+	List<TpTransaction> selectListByParams(IPage page,@Param("tpTransaction") TpTransaction tpTransaction);
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpTransaction.java

@@ -0,0 +1,95 @@
+package com.community.huiju.model;
+
+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>
+ * 物业web端二手交易表
+ * </p>
+ *
+ * @author jobob
+ * @since 2018-12-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_transaction")
+public class TpTransaction implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    
+    private Integer id;
+    
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 住户app的用户id
+     */
+    private Integer taUserId;
+
+    /**
+     * 交易标题
+     */
+    private String transactionTitle;
+
+    /**
+     * 交易内容
+     */
+    private String transactionContent;
+
+    /**
+     * 查看人数
+     */
+    private Integer viewCount;
+
+    /**
+     * 0 是已作废 1 是已发布   
+     */
+    private String status;
+
+    /**
+     * 0 代表 二手（卖二手物品）  1 是代表 求购 （买二手物品） 2 是代表 租赁（租二手物品）
+     */
+    private String type;
+
+    /**
+     * 是否被举报 1是被举报 0或null是没被举报
+     */
+    private String isReported;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateDate;
+    
+    /**
+     * 创建人
+     */
+    private String userName;
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/ITransactionService.java

@@ -0,0 +1,19 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.model.TpTransaction;
+
+/**
+ * <p>
+ * 物业web端二手交易表 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2018-12-29
+ */
+public interface ITransactionService extends IService<TpTransaction> {
+	
+	ResponseBean getTransactionList(TpTransaction tpTransaction, Integer pageNum, Integer pageSize);
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TransactionServiceImpl.java

@@ -0,0 +1,47 @@
+package com.community.huiju.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+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.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.dao.TpTransactionMapper;
+import com.community.huiju.model.TpBuildingOwnerInfo;
+import com.community.huiju.model.TpTransaction;
+import com.community.huiju.service.ITransactionService;
+import com.google.common.collect.Maps;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 物业web端二手交易表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2018-12-29
+ */
+@Service
+public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpTransaction> implements ITransactionService {
+	
+	@Autowired
+	private TpTransactionMapper tpTransactionMapper;
+	
+	@Override
+	public ResponseBean getTransactionList(TpTransaction tpTransaction, Integer pageNum, Integer pageSize) {
+		ResponseBean responseBean = new ResponseBean();
+		Page page = new Page(pageNum,pageSize);
+		// 分页查询
+		List<TpTransaction> list = tpTransactionMapper.selectListByParams(page,tpTransaction);
+		Map<String, Object> map = Maps.newHashMap();
+		map.put("list",list);
+		map.put("total",page.getTotal());
+		responseBean.addSuccess(map);
+		return responseBean;
+	}
+}

CODE/smart-community/property-api/src/main/resources/mapper/TpTransactionMapper.xml

@@ -0,0 +1,35 @@
+<?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.community.huiju.dao.TpTransactionMapper">
+    <select id="selectListByParams" resultType="com.community.huiju.model.TpTransaction">
+        SELECT
+            t.id,
+            t.community_id AS communityId,
+            t.transaction_title AS transactionTitle,
+            t.view_count AS viewCount,
+            t.`status`,
+            t.type,
+            t.is_reported AS isReported,
+            t.create_date AS createDate,
+            u.user_name AS userName
+        FROM
+            tp_transaction t
+            LEFT JOIN ta_user u ON t.ta_user_id = u.id
+            AND u.community_id = #{tpTransaction.communityId}
+        WHERE
+            1 = 1
+            AND t.community_id = #{tpTransaction.communityId}
+        <if test="tpTransaction.id != null and tpTransaction.id != ''">
+            and t.id = #{tpTransaction.id}
+        </if>
+        <if test="tpTransaction.transactionTitle != null and tpTransaction.transactionTitle != ''">
+            and t.transaction_title like concat('%',#{tpTransaction.transactionTitle,jdbcType=VARCHAR},'%')
+        </if>
+        <if test="tpTransaction.status != null and tpTransaction.status != ''">
+            and t.status = #{tpTransaction.status}
+        </if>
+        <if test="tpTransaction.isReported != null and tpTransaction.isReported != ''">
+            and t.is_reported = #{tpTransaction.isReported}
+        </if>
+    </select>
+</mapper>

VUECODE/smart-property-manage/src/api/transaction.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+export function fetchList(query) {
+  return request({
+    url: '/transactions',
+    method: 'get',
+    params: query
+  })
+}

VUECODE/smart-property-manage/src/store/index.js

@@ -6,6 +6,7 @@ import banner from './modules/banner'
 import community from './modules/community'
 import trunkIndex from './modules/trunkIndex'
 import batchImport from './modules/batchImport'
+import transaction from './modules/transaction'
 import getters from './getters'
 import buildingOwnerInfo from './modules/buildingOwnerInfo'
 import activity from './modules/activity'
@@ -21,7 +22,8 @@ const store = new Vuex.Store({
     trunkIndex,
     batchImport,
     buildingOwnerInfo,
-    activity
+    activity,
+    transaction
   },
   getters
 })

VUECODE/smart-property-manage/src/store/modules/transaction.js

@@ -0,0 +1,36 @@
+import { fetchList } from '@/api/transaction'
+
+const transaction = {
+  namespaced: true,
+  state: {
+    total: '',
+    transactionList: []
+  },
+
+  mutations: {
+    SET_LIST: (state, list) => {
+      state.transactionList = list
+    },
+    SET_TOTAL: (state, total) => {
+      state.total = total
+    }
+  },
+
+  actions: {
+    // fetchList,获取社区列表
+    FetchTransactionList({ commit }, listQuery) {
+      return new Promise((resolve, reject) => {
+        fetchList(listQuery).then(response => {
+          const data = response.data
+          commit('SET_LIST', data.list)
+          commit('SET_TOTAL', data.total)
+          resolve()
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    }
+  }
+}
+
+export default transaction

VUECODE/smart-property-manage/src/views/social/transaction/index.vue

@@ -1,13 +1,272 @@
-
 <template>
-  <div>二手求购租赁</div>
+  <div class="app-container">
+    <div class="filter-container">
+      <el-input v-model="listQuery.transactionId" placeholder="帖子编号" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter"/>
+      <el-input v-model="listQuery.transactionTitle" placeholder="帖子标题" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter"/>
+      <el-select v-model="listQuery.status" placeholder="发布状态" style="width: 130px" class="filter-item">
+        <el-option label="已发布" value="1"/>
+        <el-option label="已作废" value="0"/>
+      </el-select>
+      <el-select v-model="listQuery.isReported" placeholder="是否被举报" class="filter-item" style="width: 130px">
+        <el-option label="无举报" value="0"/>
+        <el-option label="被举报" value="1"/>
+      </el-select>
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">查询</el-button>
+      <el-button v-waves class="filter-item" type="info" icon="el-icon-warning" @click="clearListQuery">清空</el-button>
+    </div>
+
+    <el-table
+      v-loading="listLoading"
+      :key="tableKey"
+      :data="transactionList"
+      border
+      fit
+      highlight-current-row
+      style="width: 100%; margin-top: 20px;"
+      @sort-change="sortChange">
+      <el-table-column
+        label="序号"
+        align="center"
+        type="index"
+        width="50"/>
+      <el-table-column label="编号" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.id }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="类型" align="center">
+        <template slot-scope="scope">
+          <span v-if="scope.row.type === '0'">二手</span>
+          <span v-if="scope.row.type === '1'">求购</span>
+          <span v-if="scope.row.type === '2'">租赁</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="标题" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.transactionTitle }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="查看人数" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.viewCount }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="发布人" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.userName }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="发布时间" align="center">
+        <template slot-scope="scope">
+          <span>{{ formatDate(scope.row.createDate) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="发布状态" align="center">
+        <template slot-scope="scope">
+          <span v-if="scope.row.status === '0'">已作废</span>
+          <span v-if="scope.row.status === '1'">已发布</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="举报状态" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.isReported === '1' ? "被举报" : "无举报" }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- <pagination v-show="total>0" :total="total" :current-page.sync="listQuery.pageNum" :limit.sync="listQuery.pageSize" :page-sizes="[5, 10, 20, 30]" @pagination="getList" /> -->
+    <el-pagination
+      :total="total"
+      :current-page="listQuery.pageNum"
+      :page-sizes="[5, 10, 20, 30]"
+      :page-size="listQuery.pageSize"
+      layout="total, sizes, prev, pager, next, jumper"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"/>
+
+  </div>
 </template>
+
 <script>
+import { mapState, mapActions, mapMutations } from 'vuex'
+import waves from '@/directive/waves' // Waves directive
+import { parseTime } from '@/utils'
+
 export default {
-  name: 'Index'
+  computed: {
+    ...mapState('transaction', {
+      transactionList: s => s.transactionList,
+      total: s => s.total
+    })
+  },
+  directives: { waves },
+  data() {
+    var _self = this
+    return {
+      events: {
+        click: (e) => {
+          // _self.postData.Coordinate = e.lnglat.lat + ',' + e.lnglat.lng
+          _self.detail.longitude = e.lnglat.lng
+          _self.detail.latitude = e.lnglat.lat
+        }
+      },
+      markers: [],
+      searchOption: {
+        city: '南京',
+        citylimit: false
+      },
+      listLoading: true,
+      listQuery: {
+        pageNum: 1,
+        pageSize: 20,
+        transactionId: undefined,
+        transactionTitle: undefined,
+        status: undefined,
+        isReported: undefined
+      },
+      tableKey: 0,
+      downloadLoading: false
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    ...mapMutations('transaction', {
+    }),
+    ...mapActions('transaction', [
+      'FetchTransactionList'
+    ]),
+    setCurrent(item) {
+      this.setDetail({ ...item })
+    },
+    getList() {
+      this.listLoading = true
+      this.FetchTransactionList(this.listQuery).then(() => {
+        this.listLoading = false
+      }).catch(() => {
+        this.loading = false
+        console.log('get list error')
+      })
+    },
+    clearListQuery() {
+      this.listQuery.pageNum = 1
+      this.listQuery.pageSize = 20
+      this.listQuery.transactionId = undefined
+      this.listQuery.transactionTitle = undefined
+      this.listQuery.status = undefined
+      this.listQuery.isReported = undefined
+      this.getList()
+    },
+    handleFilter() {
+      this.listQuery.pageNum = 1
+      this.getList()
+    },
+    handleModifyStatus(row, status) {
+      this.$message({
+        message: '操作成功',
+        type: 'success'
+      })
+      row.status = status
+    },
+    sortChange(data) {
+      const { prop, order } = data
+      if (prop === 'id') {
+        this.sortByID(order)
+      }
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.listQuery.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.listQuery.pageNum = val
+      this.getList()
+    },
+    sortByID(order) {
+      if (order === 'ascending') {
+        this.listQuery.sort = '+id'
+      } else {
+        this.listQuery.sort = '-id'
+      }
+      this.handleFilter()
+    },
+    handleUpdate(row) {
+      this.setCurrent(row)
+      this.dialogStatus = 'update'
+      this.dialogFormVisible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.getEditCityList()
+      this.getEditDistrictList()
+    },
+    handleLook(row) {
+      this.setCurrent(row)
+      this.dialogLookFormVisible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.getEditCityList()
+      this.getEditDistrictList()
+    },
+    handleCreate() {
+      this.resetDetail()
+      this.dialogStatus = 'create'
+      this.dialogFormVisible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    handleDelete(row) {
+      this.$notify({
+        title: '成功',
+        message: '删除成功',
+        type: 'success',
+        duration: 2000
+      })
+      const index = this.list.indexOf(row)
+      this.list.splice(index, 1)
+    },
+    handleDownload() {
+      this.downloadLoading = true
+      import('@/vendor/Export2Excel').then(excel => {
+        const tHeader = ['timestamp', 'title', 'type', 'importance', 'status']
+        const filterVal = ['timestamp', 'title', 'type', 'importance', 'status']
+        const data = this.formatJson(filterVal, this.list)
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: 'table-list'
+        })
+        this.downloadLoading = false
+      })
+    },
+    padDate(value) {
+      value = value < 10 ? '0' + value : value
+      return value
+    },
+    formatDate(val) {
+      var value = new Date(val)
+      var year = value.getFullYear()
+      var month = this.padDate(value.getMonth() + 1)
+      var day = this.padDate(value.getDate())
+      var hour = this.padDate(value.getHours())
+      var minutes = this.padDate(value.getMinutes())
+      var seconds = this.padDate(value.getSeconds())
+      return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
+    },
+    formatJson(filterVal, jsonData) {
+      return jsonData.map(v => filterVal.map(j => {
+        if (j === 'timestamp') {
+          return parseTime(v[j])
+        } else {
+          return v[j]
+        }
+      }))
+    },
+  }
 }
 </script>
-
-<style scoped>
-
-</style>