Merge branch 'develop'

# Conflicts:
#	文档/MYSQL/smartCommunity.pdb
#	文档/MYSQL/smartCommunity.pdm

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

@@ -16,7 +16,10 @@ public class Constant {
     public static final String WEB_USER_SESSION = "webUser";
 
     /** 不需要权限的URL身份 **/
-    public static final String ROLE_NONE = "ROLE_NONEUSER";
+    public static final String ROLE_NONEUSER = "ROLE_NONEUSER";
+
+    /** 校验出现问题后的默认身份 **/
+    public static final String ROLE_NONE = "ROLE_NONE";
 
     /** app登陆类型 **/
     public static final String APP_LOGIN_TYPE = "app";
@@ -60,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/controller/BannerController.java

@@ -17,6 +17,9 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpSession;
 import javax.validation.Valid;
 
+/**
+ * @author weiximei
+ */
 @RestController
 @RefreshScope
 @RequestMapping("/")
@@ -28,10 +31,10 @@ public class BannerController {
 
     @ApiOperation(value = "添加Banner",notes = "添加Banner")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body",dataType = "ToBanner",name = "banner",value = "bannerTitle(标题)," +
+            @ApiImplicitParam(paramType = "body",dataType = "ToBanner",name = "banner",value = "title(标题)," +
                     "sort(权重),bannerCover(图片),bannerPosition(Banner位),communityId(小区)," +
                     "effTime(生效时间),expTime(失效时间),bannerType(Banner类型),externalLink(Banner的URL)," +
-                    "bannerContent(Banner内容)"),
+                    ",bannerTitle(内容标题),bannerContent(Banner内容)"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
     @RequestMapping(value = "/banner",method = RequestMethod.POST)
@@ -79,11 +82,17 @@ public class BannerController {
             @ApiImplicitParam(paramType = "query",dataType = "String",name = "bannerTitle",value = "bannerTitle(标题)"),
             @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "bannerPosition",value = "bannerPosition(Banner位)"),
             @ApiImplicitParam(paramType = "query",dataType = "String",name = "bannerDescription",value = "bannerDescription(跳转概述)"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "communityId",value = "communityId(小区)"),
+            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "pageNum", value = "分页第几页"),
+            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "pageSize", value = "分页每页长度")
     })
     @RequestMapping(value = "/banner/list",method = RequestMethod.GET)
-    public ResponseBean getBanner(@RequestParam(value = "bannerTitle") String bannerTitle,
-                                  @RequestParam(value = "bannerPosition") Integer bannerPosition,
-                                  @RequestParam(value = "bannerDescription") String bannerDescription){
+    public ResponseBean getBanner(@RequestParam(value = "bannerTitle", required = false) String bannerTitle,
+                                  @RequestParam(value = "bannerPosition", required = false) Integer bannerPosition,
+                                  @RequestParam(value = "bannerDescription", required = false) String bannerDescription,
+                                  @RequestParam(value = "communityId", required = false) Integer communityId,
+                                  @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
 
 
         ResponseBean response = new ResponseBean();
@@ -91,7 +100,8 @@ public class BannerController {
         banner.setBannerTitle(bannerTitle);
         banner.setBannerPosition(bannerPosition);
         banner.setBannerDescription(bannerDescription);
-        response = iToBannerService.getBanner(banner);
+        banner.setCommunityId(communityId);
+        response = iToBannerService.getBanner(banner,pageNum,pageSize);
         return response;
     }
 

CODE/smart-community/operate-api/src/main/java/com/community/huiju/controller/CommunityController.java

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author FXF
@@ -33,18 +34,31 @@ public class CommunityController {
 	
 	@ApiOperation(value = "根据搜索条件获取小区列表", notes = "根据搜索条件获取小区列表")
 	@ApiImplicitParams({
-			@ApiImplicitParam(paramType = "body", name = "toCommunities", dataType = "String",value =
-					"id:社区编号，communityName：社区名称（模糊查询）, provinceId:省份id,cityId:城市id,districtId:区县id"),
+			@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "communityId", value = "社区编号"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "communityName", value = "社区名称（模糊查询）"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "provinceId", value = "省份id"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "cityId", value = "城市id"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "districtId", value = "区县id"),
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")
 	})
-	@RequestMapping(value = "/communitys",method = RequestMethod.POST)
-	public ResponseBean getCommunitys(@RequestBody ToCommunities toCommunities,
+	@RequestMapping(value = "/communitys",method = RequestMethod.GET)
+	public ResponseBean getCommunitys(@RequestParam(value = "communityId", required = false) Integer communityId,
+	                                  @RequestParam(value = "communityName", required = false) String communityName,
+	                                  @RequestParam(value = "provinceId", required = false) Integer provinceId,
+	                                  @RequestParam(value = "cityId", required = false) Integer cityId,
+	                                  @RequestParam(value = "districtId", required = false) Integer districtId,
 	                                  @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
 	                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
 		ResponseBean responseBean = new ResponseBean();
-		List<ToCommunities> communitiesList = communityService.getCommunitys(toCommunities,pageNum,pageSize);
-		responseBean.addSuccess(communitiesList);
+		ToCommunities toCommunities = new ToCommunities();
+		toCommunities.setId(communityId);
+		toCommunities.setCommunityName(communityName);
+		toCommunities.setProvinceId(provinceId);
+		toCommunities.setCityId(cityId);
+		toCommunities.setDistrictId(districtId);
+		Map<String,Object> map = communityService.getCommunitys(toCommunities,pageNum,pageSize);
+		responseBean.addSuccess(map);
 		return responseBean;
 	}
 	

CODE/smart-community/operate-api/src/main/java/com/community/huiju/controller/UserController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
+import com.community.huiju.model.ToUser;
 import com.community.huiju.service.IToUserService;
 import com.community.huiju.vo.ToUserVO;
 import io.swagger.annotations.Api;
@@ -56,4 +57,24 @@ public class UserController {
     }
 
 
+    @ApiOperation(value = "获取用户信息",nickname = "获取用户信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+    })
+    @RequestMapping(value = "/user/info",method = RequestMethod.GET)
+    public ResponseBean getInfo(HttpSession session) {
+        ResponseBean response = new ResponseBean();
+
+        UserElement userElement = (UserElement) session.getAttribute(Constant.WEB_USER_SESSION);
+        if (null == userElement) {
+            response.addError("请登录!");
+            return response;
+        }
+
+        response = iToUserService.getInfo(userElement.getId());
+
+        return response;
+    }
+
+
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/dao/ToSysRoleMapper.java

@@ -3,6 +3,8 @@ package com.community.huiju.dao;
 import com.community.huiju.model.ToSysRole;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface ToSysRoleMapper {
     int deleteByPrimaryKey(Integer id);
@@ -16,4 +18,11 @@ public interface ToSysRoleMapper {
     int updateByPrimaryKeySelective(ToSysRole record);
 
     int updateByPrimaryKey(ToSysRole record);
+
+    /**
+     * 根据用户ID查询所有角色
+     * @param userId
+     * @return
+     */
+    List<ToSysRole> selectRoleByUserId(Integer userId);
 }

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

@@ -8,6 +8,7 @@ import java.util.Date;
 public class ToBanner {
     private Integer id;
 
+    @NotBlank(message = "标题不能为空!")
     private String title;
 
     @Min(value = 0,message = "小区不能为空!")
@@ -33,7 +34,6 @@ public class ToBanner {
     @NotBlank(message = "跳转的URL不能为空!")
     private String externalLink;
 
-    @NotBlank(message = "banner标题不能为空!")
     private String bannerTitle;
 
     private Integer createUser;

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/CommunityServiceI.java

@@ -3,6 +3,7 @@ package com.community.huiju.service;
 import com.community.huiju.model.ToCommunities;
 
 import java.util.List;
+import java.util.Map;
 
 public interface CommunityServiceI {
 	
@@ -13,7 +14,7 @@ public interface CommunityServiceI {
 	 * @param pageSize
 	 * @return
 	 */
-	List<ToCommunities> getCommunitys(ToCommunities toCommunities, Integer pageNum, Integer pageSize);
+	Map<String,Object> getCommunitys(ToCommunities toCommunities, Integer pageNum, Integer pageSize);
 	
 	/**
 	 * 添加新的小区

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

@@ -41,8 +41,10 @@ public interface IToBannerService {
      *
      *
      * @param banner
+     * @param pageNum
+     * @param pageSize
      * @return
      */
-    ResponseBean getBanner(ToBanner banner);
+    ResponseBean getBanner(ToBanner banner, Integer pageNum, Integer pageSize);
 
 }

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

@@ -0,0 +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);
+}

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

@@ -16,4 +16,11 @@ public interface IToUserService {
      */
     ResponseBean login(String loginName,String code);
 
+    /**
+     * 获取用户信息
+     * @param userId
+     * @return
+     */
+    ResponseBean getInfo(Integer userId);
+
 }

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

@@ -8,13 +8,16 @@ import com.community.huiju.model.ToCommunities;
 import com.community.huiju.model.TpUser;
 import com.community.huiju.model.TpUserCommunity;
 import com.community.huiju.service.CommunityServiceI;
+import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author FXF
@@ -41,12 +44,15 @@ public class CommunityServiceImpl implements CommunityServiceI {
 	 * @return
 	 */
 	@Override
-	public List<ToCommunities> getCommunitys(ToCommunities toCommunities, Integer pageNum, Integer pageSize) {
+	public Map<String,Object> getCommunitys(ToCommunities toCommunities, Integer pageNum, Integer pageSize) {
 		//使用分页插件
-		PageHelper.startPage(pageNum, pageSize);
+		Page page = PageHelper.startPage(pageNum, pageSize);
 		//获取数据
 		List<ToCommunities> list = toCommunitiesMapper.selectByCommunityName(toCommunities);
-		return list;
+		Map<String,Object> map = new HashMap<>();
+		map.put("items",list);
+		map.put("total",page.getTotal());
+		return map;
 	}
 	
 	@Override

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

@@ -12,6 +12,9 @@ import com.community.huiju.model.ToCommunities;
 import com.community.huiju.model.ToUser;
 import com.community.huiju.service.IToBannerService;
 import com.community.huiju.vo.ToBannerVO;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.google.common.collect.Maps;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +22,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -44,7 +48,7 @@ public class ToBannerServiceImpl implements IToBannerService {
     public ResponseBean addBanner(ToBanner banner,Integer currentUserId) {
 
         ResponseBean response = new ResponseBean();
-        if (!Constant.BANNER_TYPE_ARTICLE.equals(banner.getBannerType())) {
+        if (Constant.BANNER_TYPE_ARTICLE.equals(banner.getBannerType())) {
             if (StringUtils.isBlank(banner.getBannerContent())) {
                 response.addError("Banner内容不能为空");
                 return response;
@@ -129,11 +133,13 @@ public class ToBannerServiceImpl implements IToBannerService {
     }
 
     @Override
-    public ResponseBean getBanner(ToBanner banner) {
+    public ResponseBean getBanner(ToBanner banner,Integer pageNum, Integer pageSize) {
 
         ResponseBean response = new ResponseBean();
 
+        Page<ToBanner> page = PageHelper.startPage(pageNum,pageSize);
         List<ToBanner> bannerList = toBannerMapper.selectBanner(banner);
+
         List<ToBannerVO> bannerVOList = bannerList.stream().map(e->{
             ToBannerVO toBannerVO = new ToBannerVO();
             BeanUtils.copyProperties(e,toBannerVO);
@@ -141,8 +147,10 @@ public class ToBannerServiceImpl implements IToBannerService {
             ToCommunities toCommunities = toCommunitiesMapper.selectByPrimaryKey(e.getCommunityId());
             toBannerVO.setCommunityName(toCommunities.getCommunityName());
 
-            SysDictionary sysDictionary = sysDictionaryMapper.selectByPrimaryKey(e.getBannerPosition());
-            toBannerVO.setBannerPositionName(sysDictionary.getName());
+            // TODO banner位置名称
+            //SysDictionary sysDictionary = sysDictionaryMapper.selectByPrimaryKey(e.getBannerPosition());
+            //toBannerVO.setBannerPositionName(sysDictionary.getName());
+            toBannerVO.setBannerPositionName("首页banner");
 
             ToUser toUser = toUserMapper.selectByPrimaryKey(e.getUpdateUser());
             toBannerVO.setUpdateUserName(toUser.getUserName());
@@ -151,7 +159,10 @@ public class ToBannerServiceImpl implements IToBannerService {
 
         }).collect(Collectors.toList());
 
-        response.addSuccess(bannerVOList);
+        Map<String,Object> map = Maps.newHashMap();
+        map.put("item",bannerVOList);
+        map.put("total",page.getTotal());
+        response.addSuccess(map);
 
         return response;
     }

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

@@ -0,0 +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);
+    }
+}

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

@@ -3,7 +3,9 @@ package com.community.huiju.service.impl;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.utils.AccountValidatorUtil;
 import com.community.huiju.common.code.cache.AppkeyCache;
+import com.community.huiju.dao.ToSysRoleMapper;
 import com.community.huiju.dao.ToUserMapper;
+import com.community.huiju.model.ToSysRole;
 import com.community.huiju.model.ToUser;
 import com.community.huiju.service.IToUserService;
 import com.community.huiju.vo.ToUserVO;
@@ -13,6 +15,8 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service("iToUserServer")
 @Slf4j
 public class ToUserServerImpl implements IToUserService {
@@ -20,6 +24,9 @@ public class ToUserServerImpl implements IToUserService {
     @Autowired
     private ToUserMapper toUserMapper;
 
+    @Autowired
+    private ToSysRoleMapper toSysRoleMapper;
+
     @Override
     public ResponseBean login(String loginName, String code) {
 
@@ -52,4 +59,25 @@ public class ToUserServerImpl implements IToUserService {
         response.addSuccess(userVO);
         return response;
     }
+
+
+    @Override
+    public ResponseBean getInfo(Integer userId) {
+        ResponseBean response = new ResponseBean();
+        ToUser toUser = toUserMapper.selectByPrimaryKey(userId);
+        if (toUser == null) {
+            response.addError("用户不存在!");
+            return response;
+        }
+
+        ToUserVO toUserVO = new ToUserVO();
+        BeanUtils.copyProperties(toUser,toUserVO);
+
+        List<ToSysRole> sysRoleList = toSysRoleMapper.selectRoleByUserId(userId);
+        toUserVO.setRoles(sysRoleList);
+
+        response.addSuccess(toUserVO);
+
+        return response;
+    }
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/vo/ToUserVO.java

@@ -1,10 +1,12 @@
 package com.community.huiju.vo;
 
+import com.community.huiju.model.ToSysRole;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author weiximei
@@ -49,4 +51,7 @@ public class ToUserVO {
     /** 用户token **/
     private String token;
 
+    /** 角色 **/
+    private List<ToSysRole> roles;
+
 }

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

@@ -275,6 +275,10 @@
       <if test="bannerPosition != null">
        and banner_position = #{bannerPosition,jdbcType=INTEGER}
       </if>
+      <if test="communityId != null">
+       and community_id = #{communityId,jdbcType=INTEGER}
+      </if>
     </trim>
+    order by create_user DESC
   </select>
 </mapper>

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 

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

@@ -125,4 +125,10 @@
       update_date = #{updateDate,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
+
+  <select id="selectRoleByUserId" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select
+    role.*
+     from to_sys_user_role ur left join to_sys_role role on ur.role_id = role.id where ur.user_id=#{userId}
+  </select>
 </mapper>

CODE/smart-community/zuul/src/main/java/com/community/huiju/security/RestAuthenticationEntryPoint.java

@@ -35,10 +35,9 @@ public class RestAuthenticationEntryPoint implements AuthenticationEntryPoint {
             }else if (Status.RESPONSE_STATUS_803.getValue().equals(headerError)) {
                 result.addError(Status.RESPONSE_STATUS_803.getValue(),Status.RESPONSE_STATUS_803.getComment());
             }
+        } else {
+            result.addError(Status.RESPONSE_STATUS_888.getValue(),Status.RESPONSE_STATUS_888.getComment());
         }
-//        else {
-//            result.addError(Status.RESPONSE_STATUS_888.getValue(),Status.RESPONSE_STATUS_888.getComment());
-//        }
 
         try {
             //设置跨域请求 请求结果json刷到响应里

CODE/smart-community/zuul/src/main/java/com/community/huiju/security/RestPreAuthenticateProvider.java

@@ -1,11 +1,16 @@
 package com.community.huiju.security;
 
+import com.community.commom.constant.Constant;
 import com.community.huiju.exception.WisdomSecurityException;
 import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationToken;
 
+import java.util.Collection;
+import java.util.List;
+
 /**
  * 授权过程
  *
@@ -18,7 +23,13 @@ public class RestPreAuthenticateProvider implements AuthenticationProvider {
 
 
         TokenAuthrentication tokenAuthrentication = (TokenAuthrentication) authentication.getPrincipal();
-        if (null != tokenAuthrentication.getAuthorities() && tokenAuthrentication.getAuthorities().size() > 0) {
+        Collection<GrantedAuthority> grantedAuthorityList = tokenAuthrentication.getAuthorities();
+        if (null != grantedAuthorityList && grantedAuthorityList.size() > 0) {
+             boolean isNone= grantedAuthorityList.stream().anyMatch(e->e.getAuthority().equals(Constant.ROLE_NONE));
+             if (isNone) {
+                 tokenAuthrentication.setAuthenticated(false);
+                 return tokenAuthrentication;
+             }
             tokenAuthrentication.setAuthenticated(true);
             return tokenAuthrentication;
         }

CODE/smart-community/zuul/src/main/java/com/community/huiju/security/RestPreAuthenticatedProcessingFilter.java

@@ -57,7 +57,7 @@ public class RestPreAuthenticatedProcessingFilter extends AbstractPreAuthenticat
         // 不需要的拦截请求处理
         if (isNoneSecurity(request.getRequestURI().toString()) || "OPTIONS".equals(request.getMethod())){
             GrantedAuthority[] authorities = new GrantedAuthority[1];
-            GrantedAuthority roleNone = new SimpleGrantedAuthority(Constant.ROLE_NONE);
+            GrantedAuthority roleNone = new SimpleGrantedAuthority(Constant.ROLE_NONEUSER);
             authorities[0]=roleNone;
             grantedAuthorityList.add(authorities[0]);
             return new TokenAuthrentication(grantedAuthorityList);
@@ -89,7 +89,7 @@ public class RestPreAuthenticatedProcessingFilter extends AbstractPreAuthenticat
         }else {
             // 校验有问题后, 需要给个角色, 让流程继续下去
             GrantedAuthority[] authorities = new GrantedAuthority[1];
-            GrantedAuthority roleNone = new SimpleGrantedAuthority("ROLE_NONE");
+            GrantedAuthority roleNone = new SimpleGrantedAuthority(Constant.ROLE_NONE);
             authorities[0]=roleNone;
             grantedAuthorityList.add(authorities[0]);
         }

CODE/smart-community/zuul/src/main/resources/mapper/ToSysRoleMapper.xml

@@ -129,7 +129,7 @@
   <select id="selectRoleByUserId" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
     role.*
-     from to_sys_user_role ur left join ta_sys_role role on ur.role_id = role.id where ur.user_id=#{userId}
+     from to_sys_user_role ur left join to_sys_role role on ur.role_id = role.id where ur.user_id=#{userId}
   </select>
 
 </mapper>

VUECODE/smart-operate-manage/package.json

@@ -16,12 +16,14 @@
   "dependencies": {
     "axios": "0.18.0",
     "element-ui": "2.4.6",
+    "file-saver": "^2.0.0-rc.4",
     "js-cookie": "2.2.0",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "vue": "2.5.17",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vuex": "3.0.1",
+    "xlsx": "^0.14.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
@@ -58,6 +60,7 @@
     "rimraf": "2.6.2",
     "sass-loader": "7.0.3",
     "script-ext-html-webpack-plugin": "2.0.1",
+    "script-loader": "^0.7.2",
     "semver": "5.5.0",
     "shelljs": "0.8.2",
     "svg-sprite-loader": "3.8.0",

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

@@ -0,0 +1,37 @@
+import request from '@/utils/request'
+
+export function getBanner(banner) {
+  return request({
+    url: '/banner/list',
+    method: 'get',
+    params: banner
+  })
+}
+
+export function addBanner(banner) {
+  return request({
+    url: '/banner',
+    method: 'post',
+    data: banner
+  })
+}
+
+export function updateArticle(...banner) {
+  return request({
+    url: '/banner/list',
+    method: 'get',
+    params: {
+      ...banner
+    }
+  })
+}
+
+export function fetchPv(...banner) {
+  return request({
+    url: '/banner/list',
+    method: 'get',
+    params: {
+      ...banner
+    }
+  })
+}

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

@@ -0,0 +1,25 @@
+import request from '@/utils/request'
+
+export function fetchList(query) {
+  return request({
+    url: '/communitys',
+    method: 'get',
+    params: query
+  })
+}
+
+export function createCommunity(data) {
+  return request({
+    url: '/community/add',
+    method: 'post',
+    data
+  })
+}
+
+export function updateCommunity(data) {
+  return request({
+    url: '/community/update',
+    method: 'post',
+    data
+  })
+}

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

@@ -13,11 +13,11 @@ export function login(username, password) {
   return request(config)
 }
 
-export function getInfo(token) {
+export function getInfo() {
   return request({
     url: '/user/info',
-    method: 'get',
-    params: { token }
+    method: 'get'
+    // params: { token }
   })
 }
 

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

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function getList(params) {
   return request({
-    url: '/table/list',
+    url: '/banner/list',
     method: 'get',
     params
   })

VUECODE/smart-operate-manage/src/components/Pagination/index.vue

@@ -0,0 +1,99 @@
+<template>
+  <div :class="{'hidden':hidden}" class="pagination-container">
+    <el-pagination
+      :background="background"
+      :current-page.sync="currentPage"
+      :page-size.sync="pageSize"
+      :layout="layout"
+      :total="total"
+      v-bind="$attrs"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"/>
+  </div>
+</template>
+
+<script>
+import { scrollTo } from '@/utils/scrollTo'
+
+export default {
+  name: 'Pagination',
+  props: {
+    total: {
+      required: true,
+      type: Number
+    },
+    page: {
+      type: Number,
+      default: 1
+    },
+    limit: {
+      type: Number,
+      default: 20
+    },
+    pageSizes: {
+      type: Array,
+      default() {
+        return [10, 20, 30, 50]
+      }
+    },
+    layout: {
+      type: String,
+      default: 'total, sizes, prev, pager, next, jumper'
+    },
+    background: {
+      type: Boolean,
+      default: true
+    },
+    autoScroll: {
+      type: Boolean,
+      default: true
+    },
+    hidden: {
+      type: Boolean,
+      default: false
+    }
+  },
+  computed: {
+    currentPage: {
+      get() {
+        return this.page
+      },
+      set(val) {
+        this.$emit('update:page', val)
+      }
+    },
+    pageSize: {
+      get() {
+        return this.limit
+      },
+      set(val) {
+        this.$emit('update:limit', val)
+      }
+    }
+  },
+  methods: {
+    handleSizeChange(val) {
+      this.$emit('pagination', { page: this.currentPage, limit: val })
+      if (this.autoScroll) {
+        scrollTo(0, 800)
+      }
+    },
+    handleCurrentChange(val) {
+      this.$emit('pagination', { page: val, limit: this.pageSize })
+      if (this.autoScroll) {
+        scrollTo(0, 800)
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.pagination-container {
+  background: #fff;
+  padding: 32px 16px;
+}
+.pagination-container.hidden {
+  display: none;
+}
+</style>

VUECODE/smart-operate-manage/src/directive/clipboard/clipboard.js

@@ -0,0 +1,49 @@
+// Inspired by https://github.com/Inndy/vue-clipboard2
+const Clipboard = require('clipboard')
+if (!Clipboard) {
+  throw new Error('you should npm install `clipboard` --save at first ')
+}
+
+export default {
+  bind(el, binding) {
+    if (binding.arg === 'success') {
+      el._v_clipboard_success = binding.value
+    } else if (binding.arg === 'error') {
+      el._v_clipboard_error = binding.value
+    } else {
+      const clipboard = new Clipboard(el, {
+        text() { return binding.value },
+        action() { return binding.arg === 'cut' ? 'cut' : 'copy' }
+      })
+      clipboard.on('success', e => {
+        const callback = el._v_clipboard_success
+        callback && callback(e) // eslint-disable-line
+      })
+      clipboard.on('error', e => {
+        const callback = el._v_clipboard_error
+        callback && callback(e) // eslint-disable-line
+      })
+      el._v_clipboard = clipboard
+    }
+  },
+  update(el, binding) {
+    if (binding.arg === 'success') {
+      el._v_clipboard_success = binding.value
+    } else if (binding.arg === 'error') {
+      el._v_clipboard_error = binding.value
+    } else {
+      el._v_clipboard.text = function() { return binding.value }
+      el._v_clipboard.action = function() { return binding.arg === 'cut' ? 'cut' : 'copy' }
+    }
+  },
+  unbind(el, binding) {
+    if (binding.arg === 'success') {
+      delete el._v_clipboard_success
+    } else if (binding.arg === 'error') {
+      delete el._v_clipboard_error
+    } else {
+      el._v_clipboard.destroy()
+      delete el._v_clipboard
+    }
+  }
+}

VUECODE/smart-operate-manage/src/directive/clipboard/index.js

@@ -0,0 +1,13 @@
+import Clipboard from './clipboard'
+
+const install = function(Vue) {
+  Vue.directive('Clipboard', Clipboard)
+}
+
+if (window.Vue) {
+  window.clipboard = Clipboard
+  Vue.use(install); // eslint-disable-line
+}
+
+Clipboard.install = install
+export default Clipboard

VUECODE/smart-operate-manage/src/directive/el-dragDialog/drag.js

@@ -0,0 +1,77 @@
+export default{
+  bind(el, binding, vnode) {
+    const dialogHeaderEl = el.querySelector('.el-dialog__header')
+    const dragDom = el.querySelector('.el-dialog')
+    dialogHeaderEl.style.cssText += ';cursor:move;'
+    dragDom.style.cssText += ';top:0px;'
+
+    // 获取原有属性 ie dom元素.currentStyle 火狐谷歌 window.getComputedStyle(dom元素, null);
+    const getStyle = (function() {
+      if (window.document.currentStyle) {
+        return (dom, attr) => dom.currentStyle[attr]
+      } else {
+        return (dom, attr) => getComputedStyle(dom, false)[attr]
+      }
+    })()
+
+    dialogHeaderEl.onmousedown = (e) => {
+      // 鼠标按下，计算当前元素距离可视区的距离
+      const disX = e.clientX - dialogHeaderEl.offsetLeft
+      const disY = e.clientY - dialogHeaderEl.offsetTop
+
+      const dragDomWidth = dragDom.offsetWidth
+      const dragDomHeight = dragDom.offsetHeight
+
+      const screenWidth = document.body.clientWidth
+      const screenHeight = document.body.clientHeight
+
+      const minDragDomLeft = dragDom.offsetLeft
+      const maxDragDomLeft = screenWidth - dragDom.offsetLeft - dragDomWidth
+
+      const minDragDomTop = dragDom.offsetTop
+      const maxDragDomTop = screenHeight - dragDom.offsetTop - dragDomHeight
+
+      // 获取到的值带px 正则匹配替换
+      let styL = getStyle(dragDom, 'left')
+      let styT = getStyle(dragDom, 'top')
+
+      if (styL.includes('%')) {
+        styL = +document.body.clientWidth * (+styL.replace(/\%/g, '') / 100)
+        styT = +document.body.clientHeight * (+styT.replace(/\%/g, '') / 100)
+      } else {
+        styL = +styL.replace(/\px/g, '')
+        styT = +styT.replace(/\px/g, '')
+      }
+
+      document.onmousemove = function(e) {
+        // 通过事件委托，计算移动的距离
+        let left = e.clientX - disX
+        let top = e.clientY - disY
+
+        // 边界处理
+        if (-(left) > minDragDomLeft) {
+          left = -minDragDomLeft
+        } else if (left > maxDragDomLeft) {
+          left = maxDragDomLeft
+        }
+
+        if (-(top) > minDragDomTop) {
+          top = -minDragDomTop
+        } else if (top > maxDragDomTop) {
+          top = maxDragDomTop
+        }
+
+        // 移动当前元素
+        dragDom.style.cssText += `;left:${left + styL}px;top:${top + styT}px;`
+
+        // emit onDrag event
+        vnode.child.$emit('dragDialog')
+      }
+
+      document.onmouseup = function(e) {
+        document.onmousemove = null
+        document.onmouseup = null
+      }
+    }
+  }
+}

VUECODE/smart-operate-manage/src/directive/el-dragDialog/index.js

@@ -0,0 +1,13 @@
+import drag from './drag'
+
+const install = function(Vue) {
+  Vue.directive('el-drag-dialog', drag)
+}
+
+if (window.Vue) {
+  window['el-drag-dialog'] = drag
+  Vue.use(install); // eslint-disable-line
+}
+
+drag.install = install
+export default drag

VUECODE/smart-operate-manage/src/directive/permission/index.js

@@ -0,0 +1,13 @@
+import permission from './permission'
+
+const install = function(Vue) {
+  Vue.directive('permission', permission)
+}
+
+if (window.Vue) {
+  window['permission'] = permission
+  Vue.use(install); // eslint-disable-line
+}
+
+permission.install = install
+export default permission

VUECODE/smart-operate-manage/src/directive/permission/permission.js

@@ -0,0 +1,23 @@
+
+import store from '@/store'
+
+export default{
+  inserted(el, binding, vnode) {
+    const { value } = binding
+    const roles = store.getters && store.getters.roles
+
+    if (value && value instanceof Array && value.length > 0) {
+      const permissionRoles = value
+
+      const hasPermission = roles.some(role => {
+        return permissionRoles.includes(role)
+      })
+
+      if (!hasPermission) {
+        el.parentNode && el.parentNode.removeChild(el)
+      }
+    } else {
+      throw new Error(`need roles! Like v-permission="['admin','editor']"`)
+    }
+  }
+}

VUECODE/smart-operate-manage/src/directive/sticky.js

@@ -0,0 +1,91 @@
+const vueSticky = {}
+let listenAction
+vueSticky.install = Vue => {
+  Vue.directive('sticky', {
+    inserted(el, binding) {
+      const params = binding.value || {}
+      const stickyTop = params.stickyTop || 0
+      const zIndex = params.zIndex || 1000
+      const elStyle = el.style
+
+      elStyle.position = '-webkit-sticky'
+      elStyle.position = 'sticky'
+      // if the browser support css sticky（Currently Safari, Firefox and Chrome Canary）
+      // if (~elStyle.position.indexOf('sticky')) {
+      //     elStyle.top = `${stickyTop}px`;
+      //     elStyle.zIndex = zIndex;
+      //     return
+      // }
+      const elHeight = el.getBoundingClientRect().height
+      const elWidth = el.getBoundingClientRect().width
+      elStyle.cssText = `top: ${stickyTop}px; z-index: ${zIndex}`
+
+      const parentElm = el.parentNode || document.documentElement
+      const placeholder = document.createElement('div')
+      placeholder.style.display = 'none'
+      placeholder.style.width = `${elWidth}px`
+      placeholder.style.height = `${elHeight}px`
+      parentElm.insertBefore(placeholder, el)
+
+      let active = false
+
+      const getScroll = (target, top) => {
+        const prop = top ? 'pageYOffset' : 'pageXOffset'
+        const method = top ? 'scrollTop' : 'scrollLeft'
+        let ret = target[prop]
+        if (typeof ret !== 'number') {
+          ret = window.document.documentElement[method]
+        }
+        return ret
+      }
+
+      const sticky = () => {
+        if (active) {
+          return
+        }
+        if (!elStyle.height) {
+          elStyle.height = `${el.offsetHeight}px`
+        }
+
+        elStyle.position = 'fixed'
+        elStyle.width = `${elWidth}px`
+        placeholder.style.display = 'inline-block'
+        active = true
+      }
+
+      const reset = () => {
+        if (!active) {
+          return
+        }
+
+        elStyle.position = ''
+        placeholder.style.display = 'none'
+        active = false
+      }
+
+      const check = () => {
+        const scrollTop = getScroll(window, true)
+        const offsetTop = el.getBoundingClientRect().top
+        if (offsetTop < stickyTop) {
+          sticky()
+        } else {
+          if (scrollTop < elHeight + stickyTop) {
+            reset()
+          }
+        }
+      }
+      listenAction = () => {
+        check()
+      }
+
+      window.addEventListener('scroll', listenAction)
+    },
+
+    unbind() {
+      window.removeEventListener('scroll', listenAction)
+    }
+  })
+}
+
+export default vueSticky
+

VUECODE/smart-operate-manage/src/directive/waves/index.js

@@ -0,0 +1,13 @@
+import waves from './waves'
+
+const install = function(Vue) {
+  Vue.directive('waves', waves)
+}
+
+if (window.Vue) {
+  window.waves = waves
+  Vue.use(install); // eslint-disable-line
+}
+
+waves.install = install
+export default waves

VUECODE/smart-operate-manage/src/directive/waves/waves.css

@@ -0,0 +1,26 @@
+.waves-ripple {
+    position: absolute;
+    border-radius: 100%;
+    background-color: rgba(0, 0, 0, 0.15);
+    background-clip: padding-box;
+    pointer-events: none;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+    -webkit-transform: scale(0);
+    -ms-transform: scale(0);
+    transform: scale(0);
+    opacity: 1;
+}
+
+.waves-ripple.z-active {
+    opacity: 0;
+    -webkit-transform: scale(2);
+    -ms-transform: scale(2);
+    transform: scale(2);
+    -webkit-transition: opacity 1.2s ease-out, -webkit-transform 0.6s ease-out;
+    transition: opacity 1.2s ease-out, -webkit-transform 0.6s ease-out;
+    transition: opacity 1.2s ease-out, transform 0.6s ease-out;
+    transition: opacity 1.2s ease-out, transform 0.6s ease-out, -webkit-transform 0.6s ease-out;
+}

VUECODE/smart-operate-manage/src/directive/waves/waves.js

@@ -0,0 +1,42 @@
+import './waves.css'
+
+export default{
+  bind(el, binding) {
+    el.addEventListener('click', e => {
+      const customOpts = Object.assign({}, binding.value)
+      const opts = Object.assign({
+        ele: el, // 波纹作用元素
+        type: 'hit', // hit 点击位置扩散 center中心点扩展
+        color: 'rgba(0, 0, 0, 0.15)' // 波纹颜色
+      }, customOpts)
+      const target = opts.ele
+      if (target) {
+        target.style.position = 'relative'
+        target.style.overflow = 'hidden'
+        const rect = target.getBoundingClientRect()
+        let ripple = target.querySelector('.waves-ripple')
+        if (!ripple) {
+          ripple = document.createElement('span')
+          ripple.className = 'waves-ripple'
+          ripple.style.height = ripple.style.width = Math.max(rect.width, rect.height) + 'px'
+          target.appendChild(ripple)
+        } else {
+          ripple.className = 'waves-ripple'
+        }
+        switch (opts.type) {
+          case 'center':
+            ripple.style.top = (rect.height / 2 - ripple.offsetHeight / 2) + 'px'
+            ripple.style.left = (rect.width / 2 - ripple.offsetWidth / 2) + 'px'
+            break
+          default:
+            ripple.style.top = (e.pageY - rect.top - ripple.offsetHeight / 2 - document.documentElement.scrollTop || document.body.scrollTop) + 'px'
+            ripple.style.left = (e.pageX - rect.left - ripple.offsetWidth / 2 - document.documentElement.scrollLeft || document.body.scrollLeft) + 'px'
+        }
+        ripple.style.backgroundColor = opts.color
+        ripple.className = 'waves-ripple z-active'
+        return false
+      }
+    }, false)
+  }
+}
+

VUECODE/smart-operate-manage/src/permission.js

@@ -34,6 +34,7 @@ router.beforeEach((to, from, next) => {
       NProgress.done()
     }
   }
+  next()
 })
 
 router.afterEach(() => {

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

@@ -45,9 +45,9 @@ export const constantRouterMap = [
     meta: { title: '社区数据', icon: 'zip' },
     children: [
       {
-        path: 'download',
-        component: () => import('@/views/table/index'),
-        name: 'ExportZip',
+        path: 'community',
+        component: () => import('@/views/community/communityTable'),
+        name: 'community',
         meta: { title: '社区列表', icon: 'table' }
       }
     ]
@@ -56,14 +56,14 @@ export const constantRouterMap = [
   {
     path: '/banner',
     component: Layout,
-    redirect: '/banner/download',
+    redirect: '/banner/index',
     alwaysShow: true,
     meta: { title: '运营数据', icon: 'zip' },
-    children: [   
+    children: [
       {
-        path: 'download',
-        component: () => import('@/views/table/index'),
-        name: 'ExportZip',
+        path: 'index',
+        component: () => import('@/views/banner/index'),
+        name: 'banner-index',
         meta: { title: 'banner运营', icon: 'table' }
       }
     ]

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

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

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

@@ -0,0 +1,31 @@
+import { getBanner, addBanner } from '@/api/banner'
+
+const banner = {
+  actions: {
+
+    GetBanner({ commit }, listQuery) {
+      return new Promise((resolve, reject) => {
+        getBanner(listQuery).then(response => {
+          const data = response.data
+          resolve(data)
+        }).catch(error => {
+          reject(error)
+        })
+        resolve
+      })
+    },
+
+    // 添加 banner
+    AddBanner({ commit }, banner) {
+      return new Promise((resolve, reject) => {
+        addBanner(banner).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    }
+  }
+}
+
+export default banner

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

@@ -0,0 +1,84 @@
+import { fetchList, createCommunity, updateCommunity } from '@/api/community'
+
+const community = {
+  namespaced: true,
+  state: {
+    total: '',
+    list: [],
+    detail: {},
+  },
+
+  mutations: {
+    SET_LIST: (state, list) => {
+      state.list = list
+    },
+    Insert_LIST: (state, detail) => {
+      state.list = [detail, ...list]
+    },
+    UpdateList: (state, detail) => {
+      state.list = state.list.map(item => {
+        if (item.id === detail.id) {
+          return detail
+        }
+        return item
+      })
+    },
+    SET_TOTAL: (state, total) => {
+      state.total = total
+    },
+    setDetail: (state, item) => {
+      state.detail = item
+    },
+    resetDetail: (state) => {
+      state.detail = {
+        ...{
+          id: undefined,
+          importance: 1,
+          remark: '',
+          timestamp: new Date(),
+          title: '',
+          status: 'published',
+          type: ''
+        }
+      }
+    }
+  },
+
+  actions: {
+    // fetchList,获取社区列表
+    FetchCommunityList({ 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)
+        })
+      })
+    },
+
+    CreateCommunity({ commit }, datail) {
+      return new Promise((resolve, reject) => {
+        createCommunity(datail).then(response => {
+          resolve()
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+
+    UpdateCommunity({ commit }, datail) {
+      return new Promise((resolve, reject) => {
+        updateCommunity(datail).then(response => {
+          resolve()
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    }
+  }
+}
+
+export default community

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

@@ -33,7 +33,7 @@ const user = {
           const data = response.data
           setToken(data.token)
           commit('SET_TOKEN', data.token)
-          resolve()
+          resolve(response)
         }).catch(error => {
           reject(error)
         })
@@ -43,15 +43,15 @@ const user = {
     // 获取用户信息
     GetInfo({ commit, state }) {
       return new Promise((resolve, reject) => {
-        getInfo(state.token).then(response => {
+        getInfo().then(response => {
           const data = response.data
           if (data.roles && data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
             commit('SET_ROLES', data.roles)
           } else {
             reject('getInfo: roles must be a non-null array !')
           }
-          commit('SET_NAME', data.name)
-          commit('SET_AVATAR', data.avatar)
+          commit('SET_NAME', data.userName)
+          commit('SET_AVATAR', data.loginName)
           resolve(response)
         }).catch(error => {
           reject(error)

VUECODE/smart-operate-manage/src/utils/auth.js

@@ -1,6 +1,6 @@
 import Cookies from 'js-cookie'
 
-const TokenKey = 'Admin-Token'
+const TokenKey = 'X-Auth-Token'
 
 export function getToken() {
   return Cookies.get(TokenKey)

VUECODE/smart-operate-manage/src/utils/request.js

@@ -13,7 +13,7 @@ const service = axios.create({
 service.interceptors.request.use(
   config => {
     if (store.getters.token) {
-      config.headers['X-Token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+      config.headers['X-Auth-Token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
     }
     return config
   },
@@ -38,8 +38,8 @@ service.interceptors.response.use(
         duration: 5 * 1000
       })
 
-      // 50008:非法的token; 50012:其他客户端登录了;  50014:Token 过期了;
-      if (res.code === 50008 || res.code === 50012 || res.code === 50014) {
+      // 802:Token 身份凭证不存在; 50012:其他客户端登录了;  803:Token 过期了;
+      if (res.code === 802 || res.code === 50012 || res.code === 803) {
         MessageBox.confirm(
           '你已被登出，可以取消继续留在该页面，或者重新登录',
           '确定登出',

VUECODE/smart-operate-manage/src/utils/scrollTo.js

@@ -0,0 +1,50 @@
+Math.easeInOutQuad = function(t, b, c, d) {
+  t /= d / 2
+  if (t < 1) {
+    return c / 2 * t * t + b
+  }
+  t--
+  return -c / 2 * (t * (t - 2) - 1) + b
+}
+
+// requestAnimationFrame for Smart Animating http://goo.gl/sx5sts
+var requestAnimFrame = (function() {
+  return window.requestAnimationFrame || window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame || function(callback) { window.setTimeout(callback, 1000 / 60) }
+})()
+
+// because it's so fucking difficult to detect the scrolling element, just move them all
+function move(amount) {
+  document.documentElement.scrollTop = amount
+  document.body.parentNode.scrollTop = amount
+  document.body.scrollTop = amount
+}
+
+function position() {
+  return document.documentElement.scrollTop || document.body.parentNode.scrollTop || document.body.scrollTop
+}
+
+export function scrollTo(to, duration, callback) {
+  const start = position()
+  const change = to - start
+  const increment = 20
+  let currentTime = 0
+  duration = (typeof (duration) === 'undefined') ? 500 : duration
+  var animateScroll = function() {
+    // increment the time
+    currentTime += increment
+    // find the value with the quadratic in-out easing function
+    var val = Math.easeInOutQuad(currentTime, start, change, duration)
+    // move the document.body
+    move(val)
+    // do the animation unless its over
+    if (currentTime < duration) {
+      requestAnimFrame(animateScroll)
+    } else {
+      if (callback && typeof (callback) === 'function') {
+        // the animation is done so lets callback
+        callback()
+      }
+    }
+  }
+  animateScroll()
+}

VUECODE/smart-operate-manage/src/utils/validate.js

@@ -36,3 +36,11 @@ export function validatCode(str) {
   const reg = /^\d{4}$/
   return reg.test(str)
 }
+
+// 校验是否为空
+export function isNotValue(str) {
+  if (str.length > 0 && str !== ' ' && str === undefined && str === 'undefined') {
+    return true
+  }
+  return false
+}

VUECODE/smart-operate-manage/src/vendor/Export2Excel.js

@@ -0,0 +1,206 @@
+/* eslint-disable */
+require('script-loader!file-saver');
+import XLSX from 'xlsx'
+
+function generateArray(table) {
+  var out = [];
+  var rows = table.querySelectorAll('tr');
+  var ranges = [];
+  for (var R = 0; R < rows.length; ++R) {
+    var outRow = [];
+    var row = rows[R];
+    var columns = row.querySelectorAll('td');
+    for (var C = 0; C < columns.length; ++C) {
+      var cell = columns[C];
+      var colspan = cell.getAttribute('colspan');
+      var rowspan = cell.getAttribute('rowspan');
+      var cellValue = cell.innerText;
+      if (cellValue !== "" && cellValue == +cellValue) cellValue = +cellValue;
+
+      //Skip ranges
+      ranges.forEach(function (range) {
+        if (R >= range.s.r && R <= range.e.r && outRow.length >= range.s.c && outRow.length <= range.e.c) {
+          for (var i = 0; i <= range.e.c - range.s.c; ++i) outRow.push(null);
+        }
+      });
+
+      //Handle Row Span
+      if (rowspan || colspan) {
+        rowspan = rowspan || 1;
+        colspan = colspan || 1;
+        ranges.push({
+          s: {
+            r: R,
+            c: outRow.length
+          },
+          e: {
+            r: R + rowspan - 1,
+            c: outRow.length + colspan - 1
+          }
+        });
+      };
+
+      //Handle Value
+      outRow.push(cellValue !== "" ? cellValue : null);
+
+      //Handle Colspan
+      if (colspan)
+        for (var k = 0; k < colspan - 1; ++k) outRow.push(null);
+    }
+    out.push(outRow);
+  }
+  return [out, ranges];
+};
+
+function datenum(v, date1904) {
+  if (date1904) v += 1462;
+  var epoch = Date.parse(v);
+  return (epoch - new Date(Date.UTC(1899, 11, 30))) / (24 * 60 * 60 * 1000);
+}
+
+function sheet_from_array_of_arrays(data, opts) {
+  var ws = {};
+  var range = {
+    s: {
+      c: 10000000,
+      r: 10000000
+    },
+    e: {
+      c: 0,
+      r: 0
+    }
+  };
+  for (var R = 0; R != data.length; ++R) {
+    for (var C = 0; C != data[R].length; ++C) {
+      if (range.s.r > R) range.s.r = R;
+      if (range.s.c > C) range.s.c = C;
+      if (range.e.r < R) range.e.r = R;
+      if (range.e.c < C) range.e.c = C;
+      var cell = {
+        v: data[R][C]
+      };
+      if (cell.v == null) continue;
+      var cell_ref = XLSX.utils.encode_cell({
+        c: C,
+        r: R
+      });
+
+      if (typeof cell.v === 'number') cell.t = 'n';
+      else if (typeof cell.v === 'boolean') cell.t = 'b';
+      else if (cell.v instanceof Date) {
+        cell.t = 'n';
+        cell.z = XLSX.SSF._table[14];
+        cell.v = datenum(cell.v);
+      } else cell.t = 's';
+
+      ws[cell_ref] = cell;
+    }
+  }
+  if (range.s.c < 10000000) ws['!ref'] = XLSX.utils.encode_range(range);
+  return ws;
+}
+
+function Workbook() {
+  if (!(this instanceof Workbook)) return new Workbook();
+  this.SheetNames = [];
+  this.Sheets = {};
+}
+
+function s2ab(s) {
+  var buf = new ArrayBuffer(s.length);
+  var view = new Uint8Array(buf);
+  for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF;
+  return buf;
+}
+
+export function export_table_to_excel(id) {
+  var theTable = document.getElementById(id);
+  var oo = generateArray(theTable);
+  var ranges = oo[1];
+
+  /* original data */
+  var data = oo[0];
+  var ws_name = "SheetJS";
+
+  var wb = new Workbook(),
+    ws = sheet_from_array_of_arrays(data);
+
+  /* add ranges to worksheet */
+  // ws['!cols'] = ['apple', 'banan'];
+  ws['!merges'] = ranges;
+
+  /* add worksheet to workbook */
+  wb.SheetNames.push(ws_name);
+  wb.Sheets[ws_name] = ws;
+
+  var wbout = XLSX.write(wb, {
+    bookType: 'xlsx',
+    bookSST: false,
+    type: 'binary'
+  });
+
+  saveAs(new Blob([s2ab(wbout)], {
+    type: "application/octet-stream"
+  }), "test.xlsx")
+}
+
+export function export_json_to_excel({
+  header,
+  data,
+  filename,
+  autoWidth = true,
+  bookType=  'xlsx'
+} = {}) {
+  /* original data */
+  filename = filename || 'excel-list'
+  data = [...data]
+  data.unshift(header);
+  var ws_name = "SheetJS";
+  var wb = new Workbook(),
+    ws = sheet_from_array_of_arrays(data);
+
+  if (autoWidth) {
+    /*设置worksheet每列的最大宽度*/
+    const colWidth = data.map(row => row.map(val => {
+      /*先判断是否为null/undefined*/
+      if (val == null) {
+        return {
+          'wch': 10
+        };
+      }
+      /*再判断是否为中文*/
+      else if (val.toString().charCodeAt(0) > 255) {
+        return {
+          'wch': val.toString().length * 2
+        };
+      } else {
+        return {
+          'wch': val.toString().length
+        };
+      }
+    }))
+    /*以第一行为初始值*/
+    let result = colWidth[0];
+    for (let i = 1; i < colWidth.length; i++) {
+      for (let j = 0; j < colWidth[i].length; j++) {
+        if (result[j]['wch'] < colWidth[i][j]['wch']) {
+          result[j]['wch'] = colWidth[i][j]['wch'];
+        }
+      }
+    }
+    ws['!cols'] = result;
+  }
+
+  /* add worksheet to workbook */
+  wb.SheetNames.push(ws_name);
+  wb.Sheets[ws_name] = ws;
+
+  var wbout = XLSX.write(wb, {
+    bookType: bookType,
+    bookSST: false,
+    type: 'binary'
+  });
+  saveAs(new Blob([s2ab(wbout)], {
+    type: "application/octet-stream"
+  }), `${filename}.${bookType}`);
+}

VUECODE/smart-operate-manage/src/vendor/Export2Zip.js

@@ -0,0 +1,24 @@
+/* eslint-disable */
+require('script-loader!file-saver');
+import JSZip from 'jszip'
+
+export function export_txt_to_zip(th, jsonData, txtName, zipName) {
+  const zip = new JSZip()
+  const txt_name = txtName || 'file'
+  const zip_name = zipName || 'file'
+  const data = jsonData
+  let txtData = `${th}\r\n`
+  data.forEach((row) => {
+    let tempStr = ''
+    tempStr = row.toString()
+    txtData += `${tempStr}\r\n`
+  })
+  zip.file(`${txt_name}.txt`, txtData)
+  zip.generateAsync({
+    type: "blob"
+  }).then((blob) => {
+    saveAs(blob, `${zip_name}.zip`)
+  }, (err) => {
+    alert('导出失败')
+  })
+}

VUECODE/smart-operate-manage/src/views/banner/index.vue

@@ -0,0 +1,494 @@
+<template>
+  <div class="app-container">
+    <div class="filter-container">
+      <label>标题</label>
+      <el-input v-model="listQuery.title" placeholder="请输入标题" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter"/>
+      <label>跳转概述</label>
+      <el-input v-model="listQuery.bannerDescription" placeholder="请输入跳转概述" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter"/>
+      <label>选择小区</label>
+      <el-select v-model="listQuery.communityId" placeholder="选择小区" clearable style="width: 200px" class="filter-item">
+        <el-option v-for="item in importanceOptions" :key="item" :value="item" label="item"/>
+      </el-select>
+      <label>位置</label>
+      <el-select v-model="listQuery.bannerPosition" placeholder="banner位置" clearable class="filter-item" style="width: 200px">
+        <el-option v-for="item in calendarTypeOptions" :key="item.key" :value="item.key" label="item.display_name+'('+item.key+')'"/>
+      </el-select>
+      <el-button v-waves class="filter-item" type="info" icon="el-icon-warning" @click="handleFilter">清空</el-button>
+      <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-search" @click="handleSearch">搜索</el-button>
+    </div>
+
+    <el-row style="margin-top: 20px; margin-bottom: 20px;">
+      <el-button type="primary" icon="el-icon-circle-plus" @click="dialogFormVisible = true">添加</el-button>
+      <el-button type="primary" icon="el-icon-edit">修改</el-button>
+      <el-button type="danger" icon="el-icon-delete">删除</el-button>
+    </el-row>
+
+    <el-table
+      v-loading="listLoading"
+      :key="tableKey"
+      :data="list"
+      border
+      fit
+      highlight-current-row
+      style="width: 100%; margin-top: 20px;"
+      @sort-change="sortChange">
+      <el-table-column label="选择" type="selection" sortable="custom" align="center" width="100">
+        <!-- <template slot-scope="scope">
+          <span>{{ scope.row.id }}</span>
+        </template> -->
+      </el-table-column>
+      <el-table-column label="编号" width="150px" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.id }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="标题" min-width="150px" align="center">
+        <template slot-scope="scope">
+          <!-- <span class="link-type" @click="handleUpdate(scope.row)">{{ scope.row.title }}</span> -->
+          <el-tag>{{ scope.row.title }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="适用社区" width="200" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.communityName }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="banner位置" width="200" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.bannerPositionName }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="权重" width="200" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.sort }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="生效时间" align="center" width="200">
+        <template slot-scope="scope">
+          <span>{{ formatDate(scope.row.effTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="失效时间" class-name="status-col" width="200" align="center">
+        <template slot-scope="scope">
+          <span>{{ formatDate(scope.row.expTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="修改时间" class-name="status-col" width="200" align="center">
+        <template slot-scope="scope">
+          <span>{{ formatDate(scope.row.updateDate) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="修改人" class-name="status-col" width="200" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.updateUserName }}</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"/>
+
+    <el-dialog :visible.sync="dialogFormVisible" title="添加">
+      <el-form ref="addForm" :model="addForm" :rules="addFormRules">
+        <el-form-item :label-width="formLabelWidth" label="标题">
+          <el-input v-model="addForm.title"/>
+        </el-form-item>
+        <el-form-item :label-width="formLabelWidth" label="权重">
+          <el-input v-model="addForm.sort"/>
+        </el-form-item>
+        <el-form-item :label-width="formLabelWidth" label="banner图">
+          <el-input v-model="addForm.bannerCover"/>
+        </el-form-item>
+        <el-form-item :label-width="formLabelWidth" label="banner位">
+          <el-select v-model="addForm.bannerPosition" placeholder="请选择位置">
+            <el-option
+              v-for="item in bannerPositionArr"
+              :key="item.id"
+              :label="item.value"
+              :value="item.id"
+            />
+            <!-- <el-option v-for="item in bannerPositionArr" label="item.value" value="item.id"/> -->
+          </el-select>
+        </el-form-item>
+        <el-form-item :label-width="formLabelWidth" label="投放社区">
+          <el-select v-model="addForm.communityId" placeholder="请选择社区">
+            <el-option
+              v-for="item in communityArr"
+              :key="item.id"
+              :label="item.value"
+              :value="item.id"
+            />
+            <!-- <el-option label="区域一" value="shanghai"/> -->
+          </el-select>
+        </el-form-item>
+        <el-form-item :label-width="formLabelWidth" label="生效时间">
+          <el-date-picker
+            v-model="addForm.effTime"
+            type="datetime"
+            placeholder="选择日期时间"/>
+        </el-form-item>
+        <el-form-item :label-width="formLabelWidth" label="失效时间">
+          <el-date-picker
+            v-model="addForm.expTime"
+            type="datetime"
+            placeholder="选择日期时间"/>
+        </el-form-item>
+        <el-form-item :label-width="formLabelWidth" label="banner跳转">
+          <el-radio v-model="addForm.bannerType" label="1" @change="showContent">外部超链接</el-radio>
+          <el-radio v-model="addForm.bannerType" label="2" @change="showContent">自写文章</el-radio>
+        </el-form-item>
+        <el-form-item v-if="showURLVisible" :label-width="formLabelWidth" label="URL">
+          <el-input v-model="addForm.externalLink" placeholder="URL"/>
+        </el-form-item>
+        <div v-if="showContentVisible">
+          <el-form-item :label-width="formLabelWidth" label="内容标题">
+            <el-input v-model="addForm.bannerTitle" placeholder="内容标题"/>
+          </el-form-item>
+          <el-form-item :label-width="formLabelWidth" label="内容详情">
+            <el-input v-model="addForm.bannerContent" placeholder="内容详情"/>
+          </el-form-item>
+        </div>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogForm('0')">取 消</el-button>
+        <el-button type="primary" @click="dialogForm('1')">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :visible.sync="dialogPvVisible" title="Reading statistics"/>
+
+  </div>
+</template>
+
+<script>
+// import { updateArticle, createBanner } from '@/api/banner' // getBanner
+import waves from '@/directive/waves' // Waves directive
+import { isNotValue } from '@/utils/validate'
+import { parseTime } from '@/utils/index'
+import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
+const calendarTypeOptions = [
+  { key: 'CN', display_name: 'China' },
+  { key: 'US', display_name: 'USA' },
+  { key: 'JP', display_name: 'Japan' },
+  { key: 'EU', display_name: 'Eurozone' }
+]
+// arr to obj ,such as { CN : "China", US : "USA" }
+const calendarTypeKeyValue = calendarTypeOptions.reduce((acc, cur) => {
+  acc[cur.key] = cur.display_name
+  return acc
+}, {})
+export default {
+  name: 'ComplexTable',
+  components: { Pagination },
+  directives: { waves },
+  filters: {
+    statusFilter(status) {
+      const statusMap = {
+        published: 'success',
+        draft: 'info',
+        deleted: 'danger'
+      }
+      return statusMap[status]
+    },
+    typeFilter(type) {
+      return calendarTypeKeyValue[type]
+    }
+  },
+  data() {
+    const isTitle = (rule, value, callback) => {
+      if (!isNotValue(value)) {
+        callback(new Error('标题不能为空!'))
+      } else {
+        callback()
+      }
+    }
+    const isBannerCover = (rule, value, callback) => {
+      if (!isNotValue(value)) {
+        callback(new Error('banner图片不能为空!'))
+      } else {
+        callback()
+      }
+    }
+    const isBannerPosition = (rule, value, callback) => {
+      if (!isNotValue(value)) {
+        callback(new Error('banner位不能为空!'))
+      } else {
+        callback()
+      }
+    }
+    const isCommunityId = (rule, value, callback) => {
+      if (!isNotValue(value)) {
+        callback(new Error('小区不能为空!'))
+      } else {
+        callback()
+      }
+    }
+    const isEffTime = (rule, value, callback) => {
+      if (!isNotValue(value)) {
+        callback(new Error('生效时间不能为空'))
+      } else {
+        callback()
+      }
+    }
+    const isExpTime = (rule, value, callback) => {
+      if (!isNotValue(value)) {
+        callback(new Error('失效时间不能为空!'))
+      } else {
+        callback()
+      }
+    }
+    const isBannerType = (rule, value, callback) => {
+      if (!isNotValue(value)) {
+        callback(new Error('banner类型不能为空!'))
+      } else {
+        callback()
+      }
+    }
+    return {
+      tableKey: 0,
+      list: null,
+      total: 0,
+      listLoading: true,
+      listQuery: {
+        pageNum: 1,
+        pageSize: 5,
+        bannerTitle: undefined,
+        bannerPosition: undefined,
+        bannerDescription: undefined
+      },
+      importanceOptions: [1, 2, 3],
+      calendarTypeOptions,
+      addForm: {
+        title: '',
+        sort: '',
+        bannerCover: '',
+        bannerPosition: '',
+        communityId: '',
+        effTime: '',
+        expTime: '',
+        bannerType: '1',
+        externalLink: '',
+        bannerTitle: '',
+        bannerContent: ''
+      },
+      addFormRules: {
+        title: [{ required: true, trigger: 'blur', validator: isTitle }],
+        bannerCover: [{ required: true, trigger: 'blur', validator: isBannerCover }],
+        bannerPosition: [{ required: true, trigger: 'blur', validator: isBannerPosition }],
+        communityId: [{ required: true, trigger: 'blur', validator: isCommunityId }],
+        effTime: [{ required: true, trigger: 'blur', validator: isEffTime }],
+        expTime: [{ required: true, trigger: 'blur', validator: isExpTime }],
+        bannerType: [{ required: true, trigger: 'blur', validator: isBannerType }]
+      },
+      dialogFormVisible: false,
+      dialogStatus: '',
+      dialogPvVisible: false,
+      downloadLoading: false,
+      formLabelWidth: '120px',
+      showContentVisible: false,
+      showURLVisible: true,
+      bannerPositionArr: [
+        {id: 1, value: '首页banner'},
+        {id: 2, value: '服务banner'}
+      ],
+      communityArr: [
+        {id: 3, value: '智慧社区'},
+        {id: 2, value: '测试社区'}
+      ]
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    dialogForm(isVaule) {
+      if (isVaule === '0') {
+        this.dialogFormVisible = false
+      } else {
+        // 进行提交数据,成功后关闭dialog
+        this.createData()
+        this.dialogFormVisible = false
+        console.log('添加banner的数据: ', this.addForm)
+      }
+    },
+    showContent() {
+      if (this.addForm.bannerType === '1') {
+        this.showContentVisible = false
+        this.showURLVisible = true
+      } else {
+        this.showContentVisible = true
+        this.showURLVisible = false
+      }
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.listQuery.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.listQuery.pageNum = val
+      this.getList()
+    },
+    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
+    },
+    getList() {
+      this.listLoading = true
+      this.$store.dispatch('GetBanner', this.listQuery).then(response => {
+        this.list = response.item
+        this.total = response.total
+        // Just to simulate the time of the request
+        setTimeout(() => {
+          this.listLoading = false
+        }, 1.5 * 1000)
+      })
+    },
+    handleFilter() {
+      this.listQuery.page = 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)
+      }
+    },
+    sortByID(order) {
+      if (order === 'ascending') {
+        this.listQuery.sort = '+id'
+      } else {
+        this.listQuery.sort = '-id'
+      }
+      this.handleFilter()
+    },
+    resetTemp() {
+      this.temp = {
+        id: undefined,
+        importance: 1,
+        remark: '',
+        timestamp: new Date(),
+        title: '',
+        status: 'published',
+        type: ''
+      }
+    },
+    handleSearch() {
+      this.getList()
+    },
+    createData() {
+      this.$refs['addForm'].validate((valid) => {
+        if (valid) {
+          this.$store.dispatch('AddBanner', this.addForm).then((res) => {
+            if (res.code === '0') {
+              this.$notify({
+                title: '操作成功!',
+                message: res.message,
+                type: 'success'
+              })
+              this.getList()
+            } else {
+              this.$notify({
+                title: '操作失败',
+                message: res.message,
+                type: 'warning'
+              })
+            }
+          })
+        }
+      })
+    },
+    handleUpdate(row) {
+      this.temp = Object.assign({}, row) // copy obj
+      this.temp.timestamp = new Date(this.temp.timestamp)
+      this.dialogStatus = 'update'
+      this.dialogFormVisible = true
+      this.$nextTick(() => {
+        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: '成功',
+        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
+      })
+    },
+    formatJson(filterVal, jsonData) {
+      return jsonData.map(v => filterVal.map(j => {
+        if (j === 'timestamp') {
+          return parseTime(v[j])
+        } else {
+          return v[j]
+        }
+      }))
+    }
+  }
+}
+</script>

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

@@ -0,0 +1,352 @@
+<template>
+  <div class="app-container">
+    <div class="filter-container">
+      <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="市" 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.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">查询</el-button>
+      <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate">添加</el-button>
+    </div>
+
+    <el-table
+      v-loading="listLoading"
+      :key="tableKey"
+      :data="list"
+      border
+      fit
+      highlight-current-row
+      style="width: 100%;"
+      @sort-change="sortChange">
+      <el-table-column
+        label="序号"
+        align="center"
+        type="index"
+        width="50"/>
+      <el-table-column label="社区编号" align="center" width="105">
+        <template slot-scope="scope">
+          <span>{{ scope.row.id }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="社区名称" align="center" width="105">
+        <template slot-scope="scope">
+          <span>{{ scope.row.communityName }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="社区别名" align="center" width="105">
+        <template slot-scope="scope">
+          <span>{{ scope.row.communityAlias }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="所在地区" align="center" width="305">
+        <template slot-scope="scope">
+          <span>{{ scope.row.provinceId }}{{ scope.row.cityId }}{{ scope.row.districtId }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="物业人员数量" align="center" width="105">
+        <template slot-scope="scope">
+          <span>52</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="已核业主数量" align="center" width="105">
+        <template slot-scope="scope">
+          <span>123</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="已核家属数量" align="center" width="105">
+        <template slot-scope="scope">
+          <span>345</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="已核租客数量" align="center" width="105">
+        <template slot-scope="scope">
+          <span>234</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="物业管理员" align="center" width="105">
+        <template slot-scope="scope">
+          <span>{{ scope.row.userName }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="高德坐标" align="center" width="105">
+        <template slot-scope="scope">
+          <span>{{ scope.row.longitude }},{{ scope.row.latitude }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="录入时间" width="150px" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.createDate }}</span>
+        </template>
+      </el-table-column>
+      <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)">编辑</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>
+
+    <pagination v-show="total>0" :total="total" :current-page.sync="listQuery.pageNum" :page-size.sync="listQuery.pageSize" @pagination="getList" />
+
+    <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
+      <el-form ref="dataForm" :rules="rules" :model="detail" label-position="left" label-width="100px" style="width: 400px; margin-left:50px;">
+        <el-form-item label="社区名称">
+           <el-input v-model="detail.communityName"/>
+        </el-form-item>
+        <el-form-item label="社区别名">
+          <el-input v-model="detail.communityAlias"/>
+        </el-form-item>
+        <!-- <el-form-item label="所在区县" prop="title">
+          <el-input v-model="detail.title"/>
+        </el-form-item> -->
+        <el-form-item label="高德坐标">
+          <el-input v-model="detail.longitude"
+                    placeholder="经度"/>
+          <el-input v-model="detail.latitude"
+                    placeholder="纬度"/>
+        </el-form-item>
+        <el-form-item label="管理员姓名">
+          <el-input v-model="detail.userName"
+                    placeholder="建议先填写运营人员姓名"/>
+        </el-form-item>
+        <el-form-item label="管理员账号">
+          <el-input v-model="detail.loginName"
+                    placeholder="建议先填写运营人员手机号"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogStatus==='create'?createData():updateData()">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :visible.sync="dialogPvVisible" title="Reading statistics">
+      <el-table :data="pvData" border fit highlight-current-row style="width: 100%">
+        <el-table-column prop="key" label="Channel"/>
+        <el-table-column prop="pv" label="Pv"/>
+      </el-table>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="dialogPvVisible = false">确 定</el-button>
+      </span>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import { mapState, mapActions, mapMutations } from 'vuex'
+import waves from '@/directive/waves' // Waves directive
+import { parseTime } from '@/utils'
+import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
+
+const calendarTypeOptions = [
+  { key: 'CN', display_name: 'China' },
+  { key: 'US', display_name: 'USA' },
+  { key: 'JP', display_name: 'Japan' },
+  { key: 'EU', display_name: 'Eurozone' }
+]
+
+// arr to obj ,such as { CN : "China", US : "USA" }
+const calendarTypeKeyValue = calendarTypeOptions.reduce((acc, cur) => {
+  acc[cur.key] = cur.display_name
+  return acc
+}, {})
+
+export default {
+  name: 'ComplexTable',
+  components: { Pagination },
+  directives: { waves },
+  filters: {
+    statusFilter(status) {
+      const statusMap = {
+        published: 'success',
+        draft: 'info',
+        deleted: 'danger'
+      }
+      return statusMap[status]
+    },
+    typeFilter(type) {
+      return calendarTypeKeyValue[type]
+    }
+  },
+  computed: {
+    ...mapState('community', {
+      list: s => s.list,
+      detail: s => s.detail,
+      total: s => s.total,
+    }),
+  },
+  data() {
+    return {
+      tableKey: 0,
+      listLoading: true,
+      listQuery: {
+        pageNum: 1,
+        pageSize: 20,
+        importance: undefined,
+        title: undefined,
+        type: undefined,
+        sort: undefined
+      },
+      importanceOptions: [1, 2, 3],
+      calendarTypeOptions,
+      sortOptions: [{ label: 'ID Ascending', key: '+id' }, { label: 'ID Descending', key: '-id' }],
+      statusOptions: ['published', 'draft', 'deleted'],
+      showReviewer: false,
+      dialogFormVisible: false,
+      dialogStatus: '',
+      textMap: {
+        update: 'Edit',
+        create: 'Create'
+      },
+      dialogPvVisible: false,
+      pvData: [],
+      rules: {
+        type: [{ required: true, message: 'type 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
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    ...mapMutations('community',{
+      resetDetail: 'resetDetail',
+      setDetail: 'setDetail',
+    }),
+    ...mapActions('community', [
+      'FetchCommunityList',
+      'CreateCommunity',
+      'UpdateCommunity',
+    ]),
+    setCurrent(item) {
+      this.setDetail({...item})
+    },
+    getList() {
+      this.listLoading = true
+      this.FetchCommunityList(this.listQuery).then(() => {
+        this.listLoading = false 
+      }).catch(() => {
+        this.loading = false
+        console.log('get list error')
+      })
+    },
+    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)
+      }
+    },
+    sortByID(order) {
+      if (order === 'ascending') {
+        this.listQuery.sort = '+id'
+      } else {
+        this.listQuery.sort = '-id'
+      }
+      this.handleFilter()
+    },
+   handleCreate() {
+      this.resetDetail()
+      this.dialogStatus = 'create'
+      this.dialogFormVisible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    createData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.CreateCommunity(this.detail).then(() => {
+            this.dialogFormVisible = false
+            this.$notify({
+              title: '成功',
+              message: '创建成功',
+              type: 'success',
+              duration: 2000
+            })
+            this.getList()
+          })
+        }
+      })
+    },
+    handleUpdate(row) {
+      this.setCurrent(row)
+      this.dialogStatus = 'update'
+      this.dialogFormVisible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.UpdateCommunity(this.detail).then(() => {
+            this.dialogFormVisible = false
+            this.$notify({
+              title: '成功',
+              message: '更新成功',
+              type: 'success',
+              duration: 2000
+            })
+            this.getList()
+          })
+        }
+      })
+    },
+    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
+      })
+    },
+    formatJson(filterVal, jsonData) {
+      return jsonData.map(v => filterVal.map(j => {
+        if (j === 'timestamp') {
+          return parseTime(v[j])
+        } else {
+          return v[j]
+        }
+      }))
+    }
+  }
+}
+</script>

VUECODE/smart-operate-manage/src/views/login/index.vue

@@ -8,24 +8,21 @@
         </span>
         <el-input v-model="loginForm.username" name="username" type="text" auto-complete="on" placeholder="请输入手机号" />
       </el-form-item>
-      <el-form-item prop="password">
-        <span class="svg-container">
-          <svg-icon icon-class="password" />
-        </span>
-        <el-input
-          v-model="loginForm.password"
-          name="password"
-          type="text"
-          auto-complete="on"
-          placeholder="请输入验证码"
-          @keyup.enter.native="handleLogin" />
-      </el-form-item>
-      <el-button type="primary" @click="sendCode();">发送验证码</el-button>
-      <el-form-item>
-        <el-button :loading="loading" type="primary" style="width:100%;" @click.native.prevent="handleLogin">
-          登录
-        </el-button>
-      </el-form-item>
+      <div class="pwdSend">
+        <el-form-item prop="password">
+          <el-input
+            v-model="loginForm.password"
+            name="password"
+            type="text"
+            auto-complete="on"
+            placeholder="请输入验证码"
+            @keyup.enter.native="handleLogin" />
+        </el-form-item>
+        <el-button type="primary" @click="sendCode();">发送验证码</el-button>
+      </div>
+      <el-button :loading="loading" type="primary" style="width:100%;" @click.native.prevent="handleLogin">
+        登录
+      </el-button>
     </el-form>
   </div>
 </template>
@@ -76,9 +73,13 @@ export default {
       this.$refs.loginForm.validate(valid => {
         if (valid) {
           this.loading = true
-          this.$store.dispatch('Login', this.loginForm).then(() => {
-            this.loading = false
-            this.$router.push({ path: this.redirect || '/' })
+          this.$store.dispatch('Login', this.loginForm).then((res) => {
+            if (res.code === '0') {
+              this.loading = false
+              this.$router.push({ path: this.redirect || '/' })
+            } else {
+              this.loading = false
+            }
           }).catch(() => {
             this.loading = false
           })
@@ -87,6 +88,7 @@ export default {
           return false
         }
       })
+      this.$router.push({ path: this.redirect || '/' })
     },
     sendCode() {
       this.$store.dispatch('SendCode', this.loginForm.username).then((res) => {
@@ -149,6 +151,18 @@ $light_gray:#eee;
     max-width: 100%;
     padding: 35px 35px 15px 35px;
     margin: 120px auto;
+    .pwdSend {
+      float: left;
+      .el-form-item {
+        float: left;
+        .el-input {
+          float: left;
+        }
+      }
+      .el-button {
+        margin-left: 20px;
+      }
+    }
   }
   .tips {
     font-size: 14px;