Merge branch 'develop' of http://git.ycjcjy.com/fuxingfan/smartCommunity into develop

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("/")
@@ -79,11 +82,15 @@ 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 = "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 ="pageNum",defaultValue = "1") Integer pageNum,
+                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
 
 
         ResponseBean response = new ResponseBean();
@@ -91,7 +98,7 @@ public class BannerController {
         banner.setBannerTitle(bannerTitle);
         banner.setBannerPosition(bannerPosition);
         banner.setBannerDescription(bannerDescription);
-        response = iToBannerService.getBanner(banner);
+        response = iToBannerService.getBanner(banner,pageNum,pageSize);
         return response;
     }
 

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

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

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

@@ -12,6 +12,7 @@ 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.PageHelper;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -129,11 +130,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();
 
+        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);

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

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

CODE/smart-community/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]);
         }

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

@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+export function getBanner(...banner) {
+  return request({
+    url: '/banner/list',
+    method: 'get',
+    params: {
+      ...banner
+    }
+  });
+}

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

@@ -16,8 +16,8 @@ export function login(username, password) {
 export function getInfo(token) {
   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/router/index.js

@@ -56,14 +56,14 @@ export const constantRouterMap = [
   {
     path: '/banner',
     component: Layout,
-    redirect: '/banner/download',
+    redirect: '/banner/index',
     alwaysShow: true,
     meta: { title: '运营数据', icon: 'zip' },
     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/modules/user.js

@@ -50,7 +50,7 @@ const user = {
           } else {
             reject('getInfo: roles must be a non-null array !')
           }
-          commit('SET_NAME', data.name)
+          commit('SET_NAME', data.userName)
           commit('SET_AVATAR', data.avatar)
           resolve(response)
         }).catch(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/views/banner/index.vue

@@ -0,0 +1,62 @@
+<template>
+  <div class="search-header">
+    <el-form ref="form" :model="bannr" label-width="100px">
+      <el-form-item label="标题">
+        <el-input v-model="bannr.bannerTitle" />
+      </el-form-item>
+      <el-form-item label="跳转概述">
+        <el-input v-model="bannr.bannerDescription" />
+      </el-form-item>
+      <el-form-item label="适用社区">
+        <el-select v-model="bannr.communityId" placeholder="请选择社区">
+          <el-option label="智慧社区" value="shanghai" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="banner位置">
+        <el-select v-model="bannr.bannerPosition" placeholder="请选择banner位置">
+          <el-option label="首页banner" value="shanghai" />
+          <el-option label="服务员banner" value="beijing" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button>清空</el-button>
+        <el-button type="primary" @click="search">搜索</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'BannerIndex',
+  data() {
+    return {
+      bannr: {
+        bannerTitle: '',
+        bannerPosition: '',
+        bannerDescription: '',
+        communityId: '',
+        pageNum: '',
+        pageSize: ''
+      }
+    }
+  },
+  methods: {
+    search() {
+      console.log(this.bannr)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.search-header {
+  float: left;
+  margin: 20px;
+  .el-form-item {
+    float: left;
+    margin-left: 20px;
+  }
+}
+</style>
+

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>
@@ -149,6 +146,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;