合并本地文件

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/VistorController.java

@@ -0,0 +1,59 @@
+package com.community.huiju.controller;
+
+import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.model.TaVisitor;
+import com.community.huiju.service.TaVistorServiceI;
+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.*;
+
+import javax.servlet.http.HttpSession;
+import java.util.List;
+
+/**
+ * @author weichaochao
+ * @Title: VistorController
+ * @Description: 访客相关API
+ * @date 2018/11/1
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "访客相关的API", description = "访客相关的API")
+public class VistorController {
+
+    @Autowired
+    private TaVistorServiceI vistorServiceI;
+
+    @RequestMapping(value = "/vistorDetail/{communityId}", method = RequestMethod.POST)
+    @ApiOperation(value = "获取访客信息", notes = "获取访客信息")
+    @ApiImplicitParams({@ApiImplicitParam(name = "taVisitor", value = "访客", required = true, dataType = "TaVisitor"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id")})
+    public ResponseBean findVistorDetail(@PathVariable("communityId")Integer communityId, @RequestBody TaVisitor taVisitor, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        Integer userId = userElement.getId();
+        vistorServiceI.insertTaVistor(taVisitor, communityId, userId);
+        return  responseBean;
+    }
+
+    @RequestMapping(value = "/invateVistorHis/{communityId}", method = RequestMethod.GET)
+    @ApiOperation(value = "邀请历史", notes = "邀请历史")
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id")})
+    public ResponseBean invateHis(@PathVariable("communityId")Integer communityId, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        Integer userId = userElement.getId();
+        List<TaVisitor> taVisitors = vistorServiceI.invateHis(communityId, userId);
+        responseBean.addSuccess(taVisitors);
+        return  responseBean;
+    }
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TaVisitorLicenseMapper.java

@@ -0,0 +1,25 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TaVisitorLicense;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface TaVisitorLicenseMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaVisitorLicense record);
+
+    int insertSelective(TaVisitorLicense record);
+
+    TaVisitorLicense selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaVisitorLicense record);
+
+    int updateByPrimaryKey(TaVisitorLicense record);
+
+    void insertTaVistorLicense(TaVisitorLicense taVisitorLicense);
+
+    List<Integer> findTaVistorLicenseById(Integer id);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TaVisitorMapper.java

@@ -0,0 +1,27 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TaVisitor;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface TaVisitorMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaVisitor record);
+
+    int insertSelective(TaVisitor record);
+
+    TaVisitor selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaVisitor record);
+
+    int updateByPrimaryKey(TaVisitor record);
+
+    void insertVistorAndLicense();
+
+    List<TaVisitor> findAllVistors(@Param("communityId") Integer communityId, @Param("userId") Integer userId);
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TaVisitor.java

@@ -0,0 +1,166 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+import java.util.List;
+
+public class TaVisitor {
+    private Integer id;
+
+    private Integer communityId;
+
+    private String visitorName;
+
+    private String visitorTel;
+
+    private String visitorNum;
+
+    private Date visitorStatrtTime;
+
+    private Integer visitorEndTime;
+
+    private String drivingStatus;
+
+    private String payEntity;
+
+    private String visitorCode;
+
+    private Integer taUserId;
+
+    private Integer createUser;
+
+    private Date createDate;
+
+    private Integer updateUser;
+
+    private Date updateDate;
+
+    private List<Integer> carLicense;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public String getVisitorName() {
+        return visitorName;
+    }
+
+    public void setVisitorName(String visitorName) {
+        this.visitorName = visitorName == null ? null : visitorName.trim();
+    }
+
+    public String getVisitorTel() {
+        return visitorTel;
+    }
+
+    public void setVisitorTel(String visitorTel) {
+        this.visitorTel = visitorTel == null ? null : visitorTel.trim();
+    }
+
+    public String getVisitorNum() {
+        return visitorNum;
+    }
+
+    public void setVisitorNum(String visitorNum) {
+        this.visitorNum = visitorNum == null ? null : visitorNum.trim();
+    }
+
+    public Date getVisitorStatrtTime() {
+        return visitorStatrtTime;
+    }
+
+    public void setVisitorStatrtTime(Date visitorStatrtTime) {
+        this.visitorStatrtTime = visitorStatrtTime;
+    }
+
+    public Integer getVisitorEndTime() {
+        return visitorEndTime;
+    }
+
+    public void setVisitorEndTime(Integer visitorEndTime) {
+        this.visitorEndTime = visitorEndTime;
+    }
+
+    public String getDrivingStatus() {
+        return drivingStatus;
+    }
+
+    public void setDrivingStatus(String drivingStatus) {
+        this.drivingStatus = drivingStatus == null ? null : drivingStatus.trim();
+    }
+
+    public String getPayEntity() {
+        return payEntity;
+    }
+
+    public void setPayEntity(String payEntity) {
+        this.payEntity = payEntity == null ? null : payEntity.trim();
+    }
+
+    public String getVisitorCode() {
+        return visitorCode;
+    }
+
+    public void setVisitorCode(String visitorCode) {
+        this.visitorCode = visitorCode == null ? null : visitorCode.trim();
+    }
+
+    public Integer getTaUserId() {
+        return taUserId;
+    }
+
+    public void setTaUserId(Integer taUserId) {
+        this.taUserId = taUserId;
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Integer getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public List<Integer> getCarLicense() {
+        return carLicense;
+    }
+
+    public void setCarLicense(List<Integer> carLicense) {
+        this.carLicense = carLicense;
+    }
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TaVisitorLicense.java

@@ -0,0 +1,85 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TaVisitorLicense {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer visitorId;
+
+    private String license;
+
+    private Integer createUser;
+
+    private Date createDate;
+
+    private Integer updateUser;
+
+    private Date updateDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public Integer getVisitorId() {
+        return visitorId;
+    }
+
+    public void setVisitorId(Integer visitorId) {
+        this.visitorId = visitorId;
+    }
+
+    public String getLicense() {
+        return license;
+    }
+
+    public void setLicense(String license) {
+        this.license = license == null ? null : license.trim();
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Integer getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/TaVistorServiceI.java

@@ -0,0 +1,16 @@
+package com.community.huiju.service;
+
+import com.community.huiju.model.TaVisitor;
+
+import java.util.List;
+
+/**
+ * @author weichaochao
+ * @Title: TaVistorServiceI
+ * @Description: 访客相关service
+ * @date 2018/11/1
+ */
+public interface TaVistorServiceI {
+    void insertTaVistor(TaVisitor taVisitor, Integer communityId, Integer userId);
+    List<TaVisitor> invateHis(Integer communityId, Integer userId);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaVistorServiceImpl.java

@@ -0,0 +1,73 @@
+package com.community.huiju.service.impl;
+
+import com.community.commom.constant.Constant;
+import com.community.huiju.dao.TaVisitorLicenseMapper;
+import com.community.huiju.dao.TaVisitorMapper;
+import com.community.huiju.model.TaVisitor;
+import com.community.huiju.model.TaVisitorLicense;
+import com.community.huiju.service.TaVistorServiceI;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author weichaochao
+ * @Title: TaVistorServiceImpl
+ * @Description: 访客实现类
+ * @date 2018/11/1
+ */
+@Service("TaVistorServiceImpl")
+public class TaVistorServiceImpl implements TaVistorServiceI {
+
+    @Autowired
+    private TaVisitorMapper taVisitorMapper;
+
+    @Autowired
+    private TaVisitorLicenseMapper taVisitorLicenseMapper;
+
+    @Override
+    public void insertTaVistor(TaVisitor taVisitor, Integer communityId, Integer userId) {
+
+        //todo 推送到海康然后返回给我们一个vistor_code，暂未提供
+
+        taVisitor.setTaUserId(userId);
+        taVisitor.setUpdateUser(userId);
+        taVisitor.setCreateUser(userId);
+        taVisitor.setCreateDate(new Date());
+        taVisitor.setUpdateDate(new Date());
+
+        if (Constant.EFFECTIVE.equals(taVisitor.getDrivingStatus())){
+            taVisitorMapper.insertSelective(taVisitor);
+
+            for (Integer taCarLicense : taVisitor.getCarLicense()){
+                TaVisitorLicense taVisitorLicense = new TaVisitorLicense();
+                taVisitorLicense.setCommunityId(communityId);
+                taVisitorLicense.setVisitorId(taVisitor.getId());
+                taVisitorLicense.setLicense(taCarLicense.toString());
+                taVisitorLicense.setCreateUser(userId);
+                taVisitorLicense.setCreateDate(new Date());
+                taVisitorLicense.setUpdateUser(userId);
+                taVisitorLicense.setUpdateDate(new Date());
+                taVisitorLicenseMapper.insertSelective(taVisitorLicense);
+            }
+        } else{
+            taVisitorMapper.insertSelective(taVisitor);
+        }
+
+
+    }
+
+    @Override
+    public List<TaVisitor> invateHis(Integer communityId, Integer userId) {
+        List<TaVisitor> taVisitors = taVisitorMapper.findAllVistors(communityId, userId);
+        for (TaVisitor taVisitor : taVisitors){
+            if (Constant.EFFECTIVE.equals(taVisitor.getDrivingStatus())){
+                List<Integer> taVisitorLicenses = taVisitorLicenseMapper.findTaVistorLicenseById(taVisitor.getId());
+                taVisitor.setCarLicense(taVisitorLicenses);
+            }
+        }
+        return taVisitors;
+    }
+}

CODE/smart-community/app-api/src/main/resources/mapper/TaVisitorLicenseMapper.xml

@@ -0,0 +1,135 @@
+<?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.TaVisitorLicenseMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TaVisitorLicense" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="visitor_id" property="visitorId" jdbcType="INTEGER" />
+    <result column="license" property="license" jdbcType="VARCHAR" />
+    <result column="create_user" property="createUser" jdbcType="INTEGER" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+    <result column="update_user" property="updateUser" jdbcType="INTEGER" />
+    <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, visitor_id, license, create_user, create_date, update_user, update_date
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from ta_visitor_license
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from ta_visitor_license
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TaVisitorLicense" >
+    insert into ta_visitor_license (id, community_id, visitor_id, 
+      license, create_user, create_date, 
+      update_user, update_date)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{visitorId,jdbcType=INTEGER}, 
+      #{license,jdbcType=VARCHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, 
+      #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TaVisitorLicense" >
+    insert into ta_visitor_license
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="visitorId != null" >
+        visitor_id,
+      </if>
+      <if test="license != null" >
+        license,
+      </if>
+      <if test="createUser != null" >
+        create_user,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+      <if test="updateUser != null" >
+        update_user,
+      </if>
+      <if test="updateDate != null" >
+        update_date,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="visitorId != null" >
+        #{visitorId,jdbcType=INTEGER},
+      </if>
+      <if test="license != null" >
+        #{license,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TaVisitorLicense" >
+    update ta_visitor_license
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="visitorId != null" >
+        visitor_id = #{visitorId,jdbcType=INTEGER},
+      </if>
+      <if test="license != null" >
+        license = #{license,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        create_user = #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        update_user = #{updateUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        update_date = #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TaVisitorLicense" >
+    update ta_visitor_license
+    set community_id = #{communityId,jdbcType=INTEGER},
+      visitor_id = #{visitorId,jdbcType=INTEGER},
+      license = #{license,jdbcType=VARCHAR},
+      create_user = #{createUser,jdbcType=INTEGER},
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      update_user = #{updateUser,jdbcType=INTEGER},
+      update_date = #{updateDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <select id="findTaVistorLicenseById" resultType="java.lang.Integer" parameterType="java.lang.Integer" >
+    select
+      license
+    from ta_visitor_license
+    where visitor_id = #{id,jdbcType=INTEGER}
+  </select>
+</mapper>

CODE/smart-community/app-api/src/main/resources/mapper/TaVisitorMapper.xml

@@ -0,0 +1,319 @@
+<?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.TaVisitorMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TaVisitor" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="visitor_name" property="visitorName" jdbcType="VARCHAR" />
+    <result column="visitor_tel" property="visitorTel" jdbcType="VARCHAR" />
+    <result column="visitor_num" property="visitorNum" jdbcType="VARCHAR" />
+    <result column="visitor_statrt_time" property="visitorStatrtTime" jdbcType="TIMESTAMP" />
+    <result column="visitor_end_time" property="visitorEndTime" jdbcType="INTEGER" />
+    <result column="driving_status" property="drivingStatus" jdbcType="CHAR" />
+    <result column="pay_entity" property="payEntity" jdbcType="VARCHAR" />
+    <result column="visitor_code" property="visitorCode" jdbcType="VARCHAR" />
+    <result column="ta_user_id" property="taUserId" jdbcType="INTEGER" />
+    <result column="create_user" property="createUser" jdbcType="INTEGER" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+    <result column="update_user" property="updateUser" jdbcType="INTEGER" />
+    <result column="update_darte" property="updateDate" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, visitor_name, visitor_tel, visitor_num, visitor_statrt_time, visitor_end_time, 
+    driving_status, pay_entity, visitor_code, ta_user_id, create_user, create_date, update_user, 
+    update_darte
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from ta_visitor
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from ta_visitor
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TaVisitor" >
+    insert into ta_visitor (id, community_id, visitor_name, 
+      visitor_tel, visitor_num, visitor_statrt_time, 
+      visitor_end_time, driving_status, pay_entity, 
+      visitor_code, ta_user_id, create_user, 
+      create_date, update_user, update_darte
+      )
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{visitorName,jdbcType=VARCHAR}, 
+      #{visitorTel,jdbcType=VARCHAR}, #{visitorNum,jdbcType=VARCHAR}, #{visitorStatrtTime,jdbcType=TIMESTAMP}, 
+      #{visitorEndTime,jdbcType=INTEGER}, #{drivingStatus,jdbcType=CHAR}, #{payEntity,jdbcType=VARCHAR}, 
+      #{visitorCode,jdbcType=VARCHAR}, #{taUserId,jdbcType=INTEGER}, #{createUser,jdbcType=INTEGER}, 
+      #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TaVisitor" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
+    insert into ta_visitor
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="visitorName != null" >
+        visitor_name,
+      </if>
+      <if test="visitorTel != null" >
+        visitor_tel,
+      </if>
+      <if test="visitorNum != null" >
+        visitor_num,
+      </if>
+      <if test="visitorStatrtTime != null" >
+        visitor_statrt_time,
+      </if>
+      <if test="visitorEndTime != null" >
+        visitor_end_time,
+      </if>
+      <if test="drivingStatus != null" >
+        driving_status,
+      </if>
+      <if test="payEntity != null" >
+        pay_entity,
+      </if>
+      <if test="visitorCode != null" >
+        visitor_code,
+      </if>
+      <if test="taUserId != null" >
+        ta_user_id,
+      </if>
+      <if test="createUser != null" >
+        create_user,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+      <if test="updateUser != null" >
+        update_user,
+      </if>
+      <if test="updateDate != null" >
+        update_darte,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="visitorName != null" >
+        #{visitorName,jdbcType=VARCHAR},
+      </if>
+      <if test="visitorTel != null" >
+        #{visitorTel,jdbcType=VARCHAR},
+      </if>
+      <if test="visitorNum != null" >
+        #{visitorNum,jdbcType=VARCHAR},
+      </if>
+      <if test="visitorStatrtTime != null" >
+        #{visitorStatrtTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="visitorEndTime != null" >
+        #{visitorEndTime,jdbcType=INTEGER},
+      </if>
+      <if test="drivingStatus != null" >
+        #{drivingStatus,jdbcType=CHAR},
+      </if>
+      <if test="payEntity != null" >
+        #{payEntity,jdbcType=VARCHAR},
+      </if>
+      <if test="visitorCode != null" >
+        #{visitorCode,jdbcType=VARCHAR},
+      </if>
+      <if test="taUserId != null" >
+        #{taUserId,jdbcType=INTEGER},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TaVisitor" >
+    update ta_visitor
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="visitorName != null" >
+        visitor_name = #{visitorName,jdbcType=VARCHAR},
+      </if>
+      <if test="visitorTel != null" >
+        visitor_tel = #{visitorTel,jdbcType=VARCHAR},
+      </if>
+      <if test="visitorNum != null" >
+        visitor_num = #{visitorNum,jdbcType=VARCHAR},
+      </if>
+      <if test="visitorStatrtTime != null" >
+        visitor_statrt_time = #{visitorStatrtTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="visitorEndTime != null" >
+        visitor_end_time = #{visitorEndTime,jdbcType=INTEGER},
+      </if>
+      <if test="drivingStatus != null" >
+        driving_status = #{drivingStatus,jdbcType=CHAR},
+      </if>
+      <if test="payEntity != null" >
+        pay_entity = #{payEntity,jdbcType=VARCHAR},
+      </if>
+      <if test="visitorCode != null" >
+        visitor_code = #{visitorCode,jdbcType=VARCHAR},
+      </if>
+      <if test="taUserId != null" >
+        ta_user_id = #{taUserId,jdbcType=INTEGER},
+      </if>
+      <if test="createUser != null" >
+        create_user = #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        update_user = #{updateUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        update_darte = #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TaVisitor" >
+    update ta_visitor
+    set community_id = #{communityId,jdbcType=INTEGER},
+      visitor_name = #{visitorName,jdbcType=VARCHAR},
+      visitor_tel = #{visitorTel,jdbcType=VARCHAR},
+      visitor_num = #{visitorNum,jdbcType=VARCHAR},
+      visitor_statrt_time = #{visitorStatrtTime,jdbcType=TIMESTAMP},
+      visitor_end_time = #{visitorEndTime,jdbcType=INTEGER},
+      driving_status = #{drivingStatus,jdbcType=CHAR},
+      pay_entity = #{payEntity,jdbcType=VARCHAR},
+      visitor_code = #{visitorCode,jdbcType=VARCHAR},
+      ta_user_id = #{taUserId,jdbcType=INTEGER},
+      create_user = #{createUser,jdbcType=INTEGER},
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      update_user = #{updateUser,jdbcType=INTEGER},
+      update_darte = #{updateDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <insert id="insertVistorAndLicense" parameterType="com.community.huiju.model.TaVisitor" >
+    insert into ta_visitor
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="visitorName != null" >
+        visitor_name,
+      </if>
+      <if test="visitorTel != null" >
+        visitor_tel,
+      </if>
+      <if test="visitorNum != null" >
+        visitor_num,
+      </if>
+      <if test="visitorStatrtTime != null" >
+        visitor_statrt_time,
+      </if>
+      <if test="visitorEndTime != null" >
+        visitor_end_time,
+      </if>
+      <if test="drivingStatus != null" >
+        driving_status,
+      </if>
+      <if test="payEntity != null" >
+        pay_entity,
+      </if>
+      <if test="visitorCode != null" >
+        visitor_code,
+      </if>
+      <if test="taUserId != null" >
+        ta_user_id,
+      </if>
+      <if test="createUser != null" >
+        create_user,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+      <if test="updateUser != null" >
+        update_user,
+      </if>
+      <if test="updateDate != null" >
+        update_darte,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="visitorName != null" >
+        #{visitorName,jdbcType=VARCHAR},
+      </if>
+      <if test="visitorTel != null" >
+        #{visitorTel,jdbcType=VARCHAR},
+      </if>
+      <if test="visitorNum != null" >
+        #{visitorNum,jdbcType=VARCHAR},
+      </if>
+      <if test="visitorStatrtTime != null" >
+        #{visitorStatrtTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="visitorEndTime != null" >
+        #{visitorEndTime,jdbcType=INTEGER},
+      </if>
+      <if test="drivingStatus != null" >
+        #{drivingStatus,jdbcType=CHAR},
+      </if>
+      <if test="payEntity != null" >
+        #{payEntity,jdbcType=VARCHAR},
+      </if>
+      <if test="visitorCode != null" >
+        #{visitorCode,jdbcType=VARCHAR},
+      </if>
+      <if test="taUserId != null" >
+        #{taUserId,jdbcType=INTEGER},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+
+  <select id="findAllVistors" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from ta_visitor
+    where community_id = #{communityId,jdbcType=INTEGER}
+    and ta_user_id = #{userId,jdbcType=INTEGER}
+  </select>
+</mapper>

CODE/smart-community/community-common/src/main/java/com/community/commom/constant/Constant.java

@@ -63,10 +63,10 @@ public class Constant {
     /** banner类型公告**/
     public static final String BANNER = "banner";
 
-    /**有效状态**/
+    /**有效状态，开车**/
     public static final String EFFECTIVE = "1";
 
-    /**无效状态**/
+    /**无效状态，不开车**/
     public static final String INVALID = "0";
 
     /**业主角色**/

CODE/smart-community/operate-api/src/main/java/com/community/huiju/model/ToCommunities.java

@@ -1,5 +1,7 @@
 package com.community.huiju.model;
 
+import java.util.Date;
+
 public class ToCommunities {
     private Integer id;
 
@@ -20,6 +22,14 @@ public class ToCommunities {
     private String userName;
     
     private String loginName;
+    
+    private Integer createUser;
+    
+    private Date createDate;
+    
+    private Integer updateUser;
+    
+    private Date updateDate;
 
     public Integer getId() {
         return id;
@@ -100,4 +110,36 @@ public class ToCommunities {
     public void setLoginName(String loginName) {
         this.loginName = loginName;
     }
+    
+    public Integer getCreateUser() {
+        return createUser;
+    }
+    
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+    
+    public Date getCreateDate() {
+        return createDate;
+    }
+    
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+    
+    public Integer getUpdateUser() {
+        return updateUser;
+    }
+    
+    public void setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+    }
+    
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+    
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/IToSysRoleService.java

@@ -1,18 +1,18 @@
-package com.community.huiju.service;
-
-import com.community.huiju.model.ToSysRole;
-
-import java.util.List;
-
-/**
- * 角色 业务
- * @author weiximei
- */
-public interface IToSysRoleService {
-    /**
-     * 根据用户ID查询所有角色
-     * @param userId
-     * @return
-     */
-    List<ToSysRole> selectRoleByUserId(Integer userId);
-}
+package com.community.huiju.service;
+
+import com.community.huiju.model.ToSysRole;
+
+import java.util.List;
+
+/**
+ * 角色 业务
+ * @author weiximei
+ */
+public interface IToSysRoleService {
+    /**
+     * 根据用户ID查询所有角色
+     * @param userId
+     * @return
+     */
+    List<ToSysRole> selectRoleByUserId(Integer userId);
+}

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ToSysRoleServiceImpl.java

@@ -1,24 +1,24 @@
-package com.community.huiju.service.impl;
-
-import com.community.huiju.dao.ToSysRoleMapper;
-import com.community.huiju.model.ToSysRole;
-import com.community.huiju.service.IToSysRoleService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service("iToSysRoleService")
-@Slf4j
-public class ToSysRoleServiceImpl implements IToSysRoleService {
-
-    @Autowired
-    private ToSysRoleMapper toSysRoleMapper;
-
-    @Override
-    public List<ToSysRole> selectRoleByUserId(Integer userId) {
-
-        return toSysRoleMapper.selectRoleByUserId(userId);
-    }
-}
+package com.community.huiju.service.impl;
+
+import com.community.huiju.dao.ToSysRoleMapper;
+import com.community.huiju.model.ToSysRole;
+import com.community.huiju.service.IToSysRoleService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("iToSysRoleService")
+@Slf4j
+public class ToSysRoleServiceImpl implements IToSysRoleService {
+
+    @Autowired
+    private ToSysRoleMapper toSysRoleMapper;
+
+    @Override
+    public List<ToSysRole> selectRoleByUserId(Integer userId) {
+
+        return toSysRoleMapper.selectRoleByUserId(userId);
+    }
+}

CODE/smart-community/operate-api/src/main/resources/mapper/ToCommunitiesMapper.xml

@@ -12,10 +12,14 @@
     <result column="latitude" property="latitude" jdbcType="VARCHAR" />
     <result column="user_name" property="userName" jdbcType="VARCHAR" />
     <result column="login_name" property="loginName" jdbcType="VARCHAR" />
+    <result column="create_user" property="createUser" jdbcType="INTEGER" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+    <result column="update_user" property="updateUser" jdbcType="INTEGER" />
+    <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, community_name, community_alias, province_id, city_id, district_id, longitude, 
-    latitude,user_name,login_name
+    id, community_name, community_alias, province_id, city_id, district_id, longitude,
+    latitude,user_name,login_name,create_user,create_date,update_user,update_date
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 

VUECODE/smart-operate-manage/src/api/community.js

@@ -7,35 +7,3 @@ export function fetchList(query) {
     params: query
   })
 }
-
-export function fetchArticle(id) {
-  return request({
-    url: '/article/detail',
-    method: 'get',
-    params: { id }
-  })
-}
-
-export function fetchPv(pv) {
-  return request({
-    url: '/article/pv',
-    method: 'get',
-    params: { pv }
-  })
-}
-
-export function createArticle(data) {
-  return request({
-    url: '/article/create',
-    method: 'post',
-    data
-  })
-}
-
-export function updateArticle(data) {
-  return request({
-    url: '/article/update',
-    method: 'post',
-    data
-  })
-}

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

@@ -2,6 +2,7 @@ import Vue from 'vue'
 import Vuex from 'vuex'
 import app from './modules/app'
 import user from './modules/user'
+import community from './modules/community'
 import getters from './getters'
 
 Vue.use(Vuex)
@@ -9,7 +10,8 @@ Vue.use(Vuex)
 const store = new Vuex.Store({
   modules: {
     app,
-    user
+    user,
+    community
   },
   getters
 })

VUECODE/smart-operate-manage/src/store/modules/community.js

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

VUECODE/smart-operate-manage/src/views/community/communityTable.vue

@@ -1,20 +1,19 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <el-input :placeholder="$t('table.title')" v-model="listQuery.title" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter"/>
-      <el-select v-model="listQuery.importance" :placeholder="$t('table.importance')" clearable style="width: 90px" class="filter-item">
+      <el-input v-model="listQuery.title" placeholder="社区编号" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter"/>
+      <el-input v-model="listQuery.title" placeholder="社区名称" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter"/>
+      <el-select v-model="listQuery.importance" placeholder="省" clearable style="width: 90px" class="filter-item">
         <el-option v-for="item in importanceOptions" :key="item" :label="item" :value="item"/>
       </el-select>
-      <el-select v-model="listQuery.type" :placeholder="$t('table.type')" clearable class="filter-item" style="width: 130px">
+      <el-select v-model="listQuery.type" placeholder="市" clearable class="filter-item" style="width: 130px">
         <el-option v-for="item in calendarTypeOptions" :key="item.key" :label="item.display_name+'('+item.key+')'" :value="item.key"/>
       </el-select>
-      <el-select v-model="listQuery.sort" style="width: 140px" class="filter-item" @change="handleFilter">
-        <el-option v-for="item in sortOptions" :key="item.key" :label="item.label" :value="item.key"/>
+      <el-select v-model="listQuery.type" placeholder="区县乡" clearable class="filter-item" style="width: 130px">
+        <el-option v-for="item in calendarTypeOptions" :key="item.key" :label="item.display_name+'('+item.key+')'" :value="item.key"/>
       </el-select>
-      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">{{ $t('table.search') }}</el-button>
-      <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate">{{ $t('table.add') }}</el-button>
-      <el-button v-waves :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-download" @click="handleDownload">{{ $t('table.export') }}</el-button>
-      <el-checkbox v-model="showReviewer" class="filter-item" style="margin-left:15px;" @change="tableKey=tableKey+1">{{ $t('table.reviewer') }}</el-checkbox>
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">查询</el-button>
+      <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate">添加</el-button>
     </div>
 
     <el-table
@@ -26,57 +25,70 @@
       highlight-current-row
       style="width: 100%;"
       @sort-change="sortChange">
-      <el-table-column :label="$t('table.id')" prop="id" sortable="custom" align="center" width="65">
+      <el-table-column
+        label="序号"
+        align="center"
+        type="index"
+        width="50"/>
+      <el-table-column label="社区编号" prop="id" align="center" width="105">
         <template slot-scope="scope">
           <span>{{ scope.row.id }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('table.date')" width="150px" align="center">
+      <el-table-column label="社区名称" prop="id" align="center" width="105">
+        <template slot-scope="scope">
+          <span>{{ scope.row.communityName }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="社区别名" prop="id" align="center" width="105">
+        <template slot-scope="scope">
+          <span>{{ scope.row.communityAlias }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="所在地区" prop="id" align="center" width="305">
+        <template slot-scope="scope">
+          <span>{{ scope.row.province_id }}{{ scope.row.city_id }}{{ scope.row.district_id }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="物业人员数量" prop="id" align="center" width="105">
         <template slot-scope="scope">
-          <span>{{ scope.row.timestamp | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
+          <span>52</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('table.title')" min-width="150px">
+      <el-table-column label="已核业主数量" prop="id" align="center" width="105">
         <template slot-scope="scope">
-          <span class="link-type" @click="handleUpdate(scope.row)">{{ scope.row.title }}</span>
-          <el-tag>{{ scope.row.type | typeFilter }}</el-tag>
+          <span>123</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('table.author')" width="110px" align="center">
+      <el-table-column label="已核家属数量" prop="id" align="center" width="105">
         <template slot-scope="scope">
-          <span>{{ scope.row.author }}</span>
+          <span>345</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="showReviewer" :label="$t('table.reviewer')" width="110px" align="center">
+      <el-table-column label="已核租客数量" prop="id" align="center" width="105">
         <template slot-scope="scope">
-          <span style="color:red;">{{ scope.row.reviewer }}</span>
+          <span>234</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('table.importance')" width="80px">
+      <el-table-column label="物业管理员" prop="id" align="center" width="105">
         <template slot-scope="scope">
-          <svg-icon v-for="n in +scope.row.importance" :key="n" icon-class="star" class="meta-item__icon"/>
+          <span>{{ scope.row.userName }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('table.readings')" align="center" width="95">
+      <el-table-column label="高德坐标" prop="id" align="center" width="105">
         <template slot-scope="scope">
-          <span v-if="scope.row.pageviews" class="link-type" @click="handleFetchPv(scope.row.pageviews)">{{ scope.row.pageviews }}</span>
-          <span v-else>0</span>
+          <span>{{ scope.row.longitude }},{{ scope.row.latitude }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('table.status')" class-name="status-col" width="100">
+      <el-table-column label="录入时间" width="150px" align="center">
         <template slot-scope="scope">
-          <el-tag :type="scope.row.status | statusFilter">{{ scope.row.status }}</el-tag>
+          <span>{{ scope.row.createDate }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('table.actions')" align="center" width="230" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button type="primary" size="mini" @click="handleUpdate(scope.row)">{{ $t('table.edit') }}</el-button>
-          <el-button v-if="scope.row.status!='published'" size="mini" type="success" @click="handleModifyStatus(scope.row,'published')">{{ $t('table.publish') }}
-          </el-button>
-          <el-button v-if="scope.row.status!='draft'" size="mini" @click="handleModifyStatus(scope.row,'draft')">{{ $t('table.draft') }}
-          </el-button>
-          <el-button v-if="scope.row.status!='deleted'" size="mini" type="danger" @click="handleModifyStatus(scope.row,'deleted')">{{ $t('table.delete') }}
-          </el-button>
+          <el-button type="primary" size="mini" @click="handleUpdate(scope.row)">编辑</el-button>
+          <el-button v-if="scope.row.status!='published'" size="mini" type="success" @click="handleModifyStatus(scope.row,'published')">查看</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -85,32 +97,32 @@
 
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
       <el-form ref="dataForm" :rules="rules" :model="temp" label-position="left" label-width="70px" style="width: 400px; margin-left:50px;">
-        <el-form-item :label="$t('table.type')" prop="type">
+        <el-form-item label="类型" prop="type">
           <el-select v-model="temp.type" class="filter-item" placeholder="Please select">
             <el-option v-for="item in calendarTypeOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('table.date')" prop="timestamp">
+        <el-form-item label="时间" prop="timestamp">
           <el-date-picker v-model="temp.timestamp" type="datetime" placeholder="Please pick a date"/>
         </el-form-item>
-        <el-form-item :label="$t('table.title')" prop="title">
+        <el-form-item label="标题" prop="title">
           <el-input v-model="temp.title"/>
         </el-form-item>
-        <el-form-item :label="$t('table.status')">
+        <el-form-item label="状态">
           <el-select v-model="temp.status" class="filter-item" placeholder="Please select">
             <el-option v-for="item in statusOptions" :key="item" :label="item" :value="item"/>
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('table.importance')">
+        <el-form-item label="重要性">
           <el-rate v-model="temp.importance" :colors="['#99A9BF', '#F7BA2A', '#FF9900']" :max="3" style="margin-top:8px;"/>
         </el-form-item>
-        <el-form-item :label="$t('table.remark')">
+        <el-form-item label="点评">
           <el-input :autosize="{ minRows: 2, maxRows: 4}" v-model="temp.remark" type="textarea" placeholder="Please input"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogFormVisible = false">{{ $t('table.cancel') }}</el-button>
-        <el-button type="primary" @click="dialogStatus==='create'?createData():updateData()">{{ $t('table.confirm') }}</el-button>
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogStatus==='create'?createData():updateData()">确 定</el-button>
       </div>
     </el-dialog>
 
@@ -120,7 +132,7 @@
         <el-table-column prop="pv" label="Pv"/>
       </el-table>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="dialogPvVisible = false">{{ $t('table.confirm') }}</el-button>
+        <el-button type="primary" @click="dialogPvVisible = false">确 定</el-button>
       </span>
     </el-dialog>
 
@@ -128,7 +140,6 @@
 </template>
 
 <script>
-import { fetchList, fetchPv, createArticle, updateArticle } from '@/api/community'
 import waves from '@/directive/waves' // Waves directive
 import { parseTime } from '@/utils'
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
@@ -186,7 +197,7 @@ export default {
         id: undefined,
         importance: 1,
         remark: '',
-        timestamp: new Date(),
+        createData: '',
         title: '',
         type: '',
         status: 'published'
@@ -201,7 +212,7 @@ export default {
       pvData: [],
       rules: {
         type: [{ required: true, message: 'type is required', trigger: 'change' }],
-        timestamp: [{ type: 'date', required: true, message: 'timestamp is required', trigger: 'change' }],
+        createData: [{ type: 'date', required: true, message: 'createData is required', trigger: 'change' }],
         title: [{ required: true, message: 'title is required', trigger: 'blur' }]
       },
       downloadLoading: false
@@ -213,14 +224,17 @@ export default {
   methods: {
     getList() {
       this.listLoading = true
-      fetchList(this.listQuery).then(response => {
-        this.list = response.data.items
-        this.total = response.data.total
+      this.$store.dispatch('community/FetchList', this.listQuery).then((data) => {
+        this.list = data.items
+        this.total = data.total
 
         // Just to simulate the time of the request
         setTimeout(() => {
           this.listLoading = false
         }, 1.5 * 1000)
+      }).catch(() => {
+        this.loading = false
+        console.log('get list error')
       })
     },
     handleFilter() {
@@ -267,24 +281,6 @@ export default {
         this.$refs['dataForm'].clearValidate()
       })
     },
-    createData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.temp.id = parseInt(Math.random() * 100) + 1024 // mock a id
-          this.temp.author = 'vue-element-admin'
-          createArticle(this.temp).then(() => {
-            this.list.unshift(this.temp)
-            this.dialogFormVisible = false
-            this.$notify({
-              title: '成功',
-              message: '创建成功',
-              type: 'success',
-              duration: 2000
-            })
-          })
-        }
-      })
-    },
     handleUpdate(row) {
       this.temp = Object.assign({}, row) // copy obj
       this.temp.timestamp = new Date(this.temp.timestamp)
@@ -294,30 +290,6 @@ export default {
         this.$refs['dataForm'].clearValidate()
       })
     },
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          const tempData = Object.assign({}, this.temp)
-          tempData.timestamp = +new Date(tempData.timestamp) // change Thu Nov 30 2017 16:41:05 GMT+0800 (CST) to 1512031311464
-          updateArticle(tempData).then(() => {
-            for (const v of this.list) {
-              if (v.id === this.temp.id) {
-                const index = this.list.indexOf(v)
-                this.list.splice(index, 1, this.temp)
-                break
-              }
-            }
-            this.dialogFormVisible = false
-            this.$notify({
-              title: '成功',
-              message: '更新成功',
-              type: 'success',
-              duration: 2000
-            })
-          })
-        }
-      })
-    },
     handleDelete(row) {
       this.$notify({
         title: '成功',
@@ -328,12 +300,6 @@ export default {
       const index = this.list.indexOf(row)
       this.list.splice(index, 1)
     },
-    handleFetchPv(pv) {
-      fetchPv(pv).then(response => {
-        this.pvData = response.data.pvData
-        this.dialogPvVisible = true
-      })
-    },
     handleDownload() {
       this.downloadLoading = true
       import('@/vendor/Export2Excel').then(excel => {