加入人脸状态

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

@@ -8,10 +8,7 @@ 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.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpSession;
 
@@ -30,17 +27,42 @@ public class MonitoringController extends BaseController {
 
     @ApiOperation(value = "获取监控列表数据",notes = "根据小区ID获取")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "path",dataType = "Integer",name = "communityId",value = "小区ID")
+            @ApiImplicitParam(paramType = "path",dataType = "Integer",name = "communityId",value = "小区ID"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNo",value = "第几页"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize",value = "一页多少行")
     })
-    @RequestMapping(value = "/monitoring/{communityId}",method = RequestMethod.POST)
-    public ResponseBean getList(@PathVariable("communityId") Integer communityId){
+    @RequestMapping(value = "/monitoring/{communityId}",method = RequestMethod.GET)
+    public ResponseBean getList(@PathVariable("communityId") Integer communityId,
+                                @RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
+                                @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
         ResponseBean response = new ResponseBean();
         if (!check(communityId)) {
             response.addError("小区不存在");
             return response;
         }
 
-        response = iMonitoringService.getByCommunityId(communityId);
+        response = iMonitoringService.getByCommunityId(communityId,pageNo,pageSize);
+        return response;
+    }
+
+
+    @ApiOperation(value = "获取监控列表token",notes = "根据小区ID获取")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path",dataType = "Integer",name = "communityId",value = "小区ID"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNo",value = "第几页"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize",value = "一页多少行")
+    })
+    @RequestMapping(value = "/monitoring/token/{communityId}",method = RequestMethod.GET)
+    public ResponseBean getMonitoringToken(@PathVariable("communityId") Integer communityId,
+                                @RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
+                                @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean response = new ResponseBean();
+        if (!check(communityId)) {
+            response.addError("小区不存在");
+            return response;
+        }
+
+        response = iMonitoringService.getMonitoringToken(communityId,pageNo,pageSize);
         return response;
     }
 

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

@@ -23,4 +23,5 @@ public interface TaFaceMapper{
      * @return
      */
     TaFace getByUserId(@Param("userid") Integer userid);
+
 }

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

@@ -45,6 +45,9 @@ public class TaUser {
     // 海康 卡片号
     private String hkCardNo;
 
+    // 人脸状态
+    private String faceStatus;
+
     public Integer getId() {
         return id;
     }
@@ -157,6 +160,14 @@ public class TaUser {
         this.verifyStatus = verifyStatus == null ? null : verifyStatus.trim();
     }
 
+    public String getFaceStatus() {
+        return faceStatus;
+    }
+
+    public void setFaceStatus(String faceStatus) {
+        this.faceStatus = faceStatus;
+    }
+
     public Integer getCreateUser() {
         return createUser;
     }

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

@@ -11,8 +11,19 @@ public interface IMonitoringService {
     /**
      * 根据小区ID查询 监控列表
      * @param communityId
+     * @param pageNo
+     * @param pageSize
      * @return
      */
-    ResponseBean getByCommunityId(Integer communityId);
+    ResponseBean getByCommunityId(Integer communityId,Integer pageNo, Integer pageSize);
+
+    /**
+     * 生成 Token
+     * @param communityId
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    ResponseBean getMonitoringToken(Integer communityId, Integer pageNo, Integer pageSize);
 
 }

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

@@ -84,6 +84,8 @@ public class FaceServicelimpl implements FaceServiceI {
             if (Constant.OWNER.equals(sysRole.getRoleName()) && "1".equals(taUser.getVerifyStatus())) {
                 ResponseBean resps=  checKout(faceImg,taFace,isA,uploadFile,userid);
                 if (resps.getCode().equals("0")) {
+                    taUser.setFaceStatus("1");
+                    taUserMapper.updateByPrimaryKeySelective(taUser);
                     resps.addSuccess("图片录入成功");
                 }else {
                     resps.addError(resps.getMessage());
@@ -94,6 +96,8 @@ public class FaceServicelimpl implements FaceServiceI {
             if (Constant.RELATION.equals(sysRole.getRoleName()) || Constant.TENANT.equals(sysRole.getDescription()) && "1".equals(taUser.getVerifyStatus())) {
                 ResponseBean resps=  checKout(faceImg,taFace,isA,uploadFile,userid);
                 if (resps.getCode().equals("0")) {
+                    taUser.setFaceStatus("1");
+                    taUserMapper.updateByPrimaryKeySelective(taUser);
                     resps.addSuccess("图片录入成功");
                 }else {
                     resps.addError(resps.getMessage());

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

@@ -1,5 +1,8 @@
 package com.community.huiju.service.impl;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.community.commom.hk.Digests;
+import com.community.commom.hk.HttpClientSSLUtils;
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.common.hk.HKConstant;
 import com.community.huiju.common.hk.HKOpenApi;
@@ -20,15 +23,16 @@ import java.util.Map;
 public class MonitoringServiceImpl implements IMonitoringService {
 
     @Override
-    public ResponseBean getByCommunityId(Integer communityId) {
+    public ResponseBean getByCommunityId(Integer communityId,Integer pageNo, Integer pageSize) {
 
         // TODO 数据是假数据, 后期在更改. 需要根据小区查询 组织中心编号
 
         ResponseBean response = new ResponseBean();
         Map<String,Object> parMap = Maps.newHashMap();
-        parMap.put("pageNo",1);
-        parMap.put("pageSize",100);
+        parMap.put("pageNo",pageNo);
+        parMap.put("pageSize",pageSize);
         parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        // 组织中心编号
         parMap.put("unitUuids","1048576");
 
         String result = HKOpenApi.getMonitoryPoint(parMap);
@@ -37,4 +41,32 @@ public class MonitoringServiceImpl implements IMonitoringService {
 
         return response;
     }
+
+    @Override
+    public ResponseBean getMonitoringToken(Integer communityId, Integer pageNo, Integer pageSize) {
+
+        // TODO 数据是假数据, 后期在更改. 需要根据小区查询 组织中心编号
+
+        ResponseBean response = new ResponseBean();
+        Map<String,Object> parMap = Maps.newHashMap();
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_MONITORY_POINT;
+        //设置APPKEY
+        parMap.put("appkey", HKConstant.APPKEY);
+        //设置时间参数
+        parMap.put("time", System.currentTimeMillis());
+        parMap.put("pageNo",pageNo);
+        parMap.put("pageSize",pageSize);
+        // 这里可以设置其他操作用户 parMap.put("opUserUuid",map.get("opUserUuid") == null?HKConstant.OP_USER_UUID:map.get("opUserUuid"));
+        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        // 组织中心编号
+        parMap.put("unitUuids","1048576");
+        String params =  JSON.toJSONString(parMap);
+        String token = Digests.buildToken(url + "?" + params, params, HKConstant.SECRET);
+
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("token",token);
+        response.addSuccess(map);
+
+        return response;
+    }
 }

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

@@ -61,6 +61,9 @@ public class TaUserServiceImpl implements ITaUserService {
     @Autowired
     private SysNationMapper sysNationMapper;
 
+    @Autowired
+    private TaFaceMapper taFaceMapper;
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public ResponseBean login(TaUser user) {
@@ -134,7 +137,12 @@ public class TaUserServiceImpl implements ITaUserService {
             taUserVO.setRole(taSysRole.getRoleName());
             // 人脸是否已录入
             // TODO 这里目前定死为已录入, 后期根据人脸业务做判断
-            taUserVO.setFace("register");
+            // taUserVO.setFace("register");
+            if ("1".equals(currentUser.getFaceStatus())) {
+                taUserVO.setFace("register");
+            } else {
+                taUserVO.setFace("unregister");
+            }
 
             ToCommunities communities = toCommunitiesMapper.selectByPrimaryKey(currentUser.getCommunityId());
             taUserVO.setCommunityName(communities.getCommunityName());
@@ -180,6 +188,7 @@ public class TaUserServiceImpl implements ITaUserService {
         user.setRemark("这是系统自动注册!");
         user.setCommunityId(3);
         user.setVerifyStatus("1");
+        user.setFaceStatus("0");
         //user.setLoginPassword(MD5Utils.encode(user.getLoginPassword()));
         taUserMapper.insertSelective(user);
 

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

@@ -20,13 +20,14 @@
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
     <result column="update_user" property="updateUser" jdbcType="INTEGER" />
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
-    <result column="hk_user_id" property="hkUserId" javaType="INTEGER" />
-    <result column="hk_card_no" property="hkCardNo" />
+    <result column="hk_user_id" property="hkUserId" jdbcType="INTEGER" />
+    <result column="hk_card_no" property="hkCardNo" jdbcType="VARCHAR" />
+    <result column="face_status" property="faceStatus" jdbcType="CHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, community_id, building_owner_info_id, head_portrait, user_name, login_name, login_password, 
+    id, community_id, building_owner_info_id, head_portrait, user_name, login_name, login_password,
     email, gender, status, remark, parent_id, accept_agreement_status, verify_status,
-    create_user, create_date, update_user, update_date,hk_user_id,hk_card_no
+    create_user, create_date, update_user, update_date, hk_user_id, hk_card_no, face_status
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select
@@ -44,7 +45,8 @@
       login_password, email, gender,
       status, remark, parent_id,
       accept_agreement_status, verify_status, create_user,
-      create_date, update_user, update_date, hk_user_id,hk_card_no
+      create_date, update_user, update_date,
+      hk_user_id, hk_card_no, face_status
       )
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{buildingOwnerInfoId,jdbcType=INTEGER},
       #{headPortrait,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{loginName,jdbcType=VARCHAR},
@@ -52,10 +54,10 @@
       #{status,jdbcType=CHAR}, #{remark,jdbcType=VARCHAR}, #{parentId,jdbcType=INTEGER},
       #{acceptAgreementStatus,jdbcType=CHAR}, #{verifyStatus,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER},
       #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP},
-      #{hkUserId,jdbcType=INTEGER},#{hkCardNo,jdbcType=VARCHAR}
+      #{hkUserId,jdbcType=INTEGER}, #{hkCardNo,jdbcType=VARCHAR}, #{faceStatus,jdbcType=CHAR}
       )
   </insert>
-  <insert id="insertSelective" useGeneratedKeys="true" keyProperty="id" parameterType="com.community.huiju.model.TaUser" >
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TaUser" >
     insert into ta_user
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -112,12 +114,15 @@
       <if test="updateDate != null" >
         update_date,
       </if>
-      <if test="hkUserId != null">
+      <if test="hkUserId != null" >
         hk_user_id,
       </if>
-      <if test="hkCardNo != null">
+      <if test="hkCardNo != null" >
         hk_card_no,
       </if>
+      <if test="faceStatus != null" >
+        face_status,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -174,12 +179,15 @@
       <if test="updateDate != null" >
         #{updateDate,jdbcType=TIMESTAMP},
       </if>
-      <if test="hkUserId != null">
+      <if test="hkUserId != null" >
         #{hkUserId,jdbcType=INTEGER},
       </if>
-      <if test="hkCardNo != null">
+      <if test="hkCardNo != null" >
         #{hkCardNo,jdbcType=VARCHAR},
       </if>
+      <if test="faceStatus != null" >
+        #{faceStatus,jdbcType=CHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TaUser" >
@@ -236,12 +244,15 @@
       <if test="updateDate != null" >
         update_date = #{updateDate,jdbcType=TIMESTAMP},
       </if>
-      <if test="hkUserId != null">
+      <if test="hkUserId != null" >
         hk_user_id = #{hkUserId,jdbcType=INTEGER},
       </if>
-      <if test="hkCardNo">
+      <if test="hkCardNo != null" >
         hk_card_no = #{hkCardNo,jdbcType=VARCHAR},
       </if>
+      <if test="faceStatus != null" >
+        face_status = #{faceStatus,jdbcType=CHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -265,7 +276,8 @@
       update_user = #{updateUser,jdbcType=INTEGER},
       update_date = #{updateDate,jdbcType=TIMESTAMP},
       hk_user_id = #{hkUserId,jdbcType=INTEGER},
-      hk_card_no = #{hkCardNo,jdbcType=VARCHAR}
+      hk_card_no = #{hkCardNo,jdbcType=VARCHAR},
+      face_status = #{faceStatus,jdbcType=CHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 

CODE/smart-community/zuul/src/main/resources/bootstrap.yml

@@ -26,7 +26,16 @@ eureka:
 
 zuul:
   host:
-    connect-timeout-millis: 200000
+    connect-timeout-millis: 60000
+    socket-timeout-millis: 60000
+
+hystrix:
+  command:
+    default:
+      execution:
+        isolation:
+          thread:
+            timeoutInMilliseconds: 60000
 
 
 ## Mybatis

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

@@ -112,6 +112,7 @@ export default {
       listLoading: true,
       importanceOptions: [1, 2, 3],
       calendarTypeOptions,
+      listQuery: [], // 接收查询参数,在返回给首页
       addForm: {
         title: '',
         sort: '1',
@@ -146,6 +147,9 @@ export default {
       communityList: s => s.list
     })
   },
+  created() {
+    this.listQuery = this.$route.params.listQuery
+  },
   methods: {
     ...mapActions('community', [
       'FetchCommunityList',
@@ -169,7 +173,7 @@ export default {
     },
     dialogForm(isVaule) {
       if (isVaule === '0') {
-        this.$router.push({ name: 'banner-index' })
+        this.$router.push({ name: 'banner-index', params: { listQuery: this.listQuery }})
       } else {
         this.createData()
         // console.log('添加banner的数据: ', this.addForm)
@@ -194,7 +198,7 @@ export default {
                 message: res.message,
                 type: 'success'
               })
-              this.$router.push({ name: 'banner-index' })
+              this.$router.push({ name: 'banner-index', params: { listQuery: this.listQuery }})
             } else {
               this.$notify({
                 title: '操作失败',

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

@@ -112,6 +112,7 @@ export default {
       listLoading: true,
       importanceOptions: [1, 2, 3],
       calendarTypeOptions,
+      listQuery: [],
       form: {
         title: '',
         sort: '1',
@@ -148,6 +149,7 @@ export default {
   },
   created() {
     this.getByBannerId(this.$route.params.id)
+    this.listQuery = this.$route.params.listQuery
   },
   methods: {
     ...mapActions('community', [
@@ -172,7 +174,7 @@ export default {
     },
     dialogForm(isVaule) {
       if (isVaule === '0') {
-        this.$router.push({ name: 'banner-index' })
+        this.$router.push({ name: 'banner-index', params: { listQuery: this.listQuery }})
       } else {
         this.updateData()
       }
@@ -196,7 +198,7 @@ export default {
                 message: res.message,
                 type: 'success'
               })
-              this.$router.push({ name: 'banner-index' })
+              this.$router.push({ name: 'banner-index', params: { listQuery: this.listQuery }})
             } else {
               this.$notify({
                 title: '操作失败',

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

@@ -19,7 +19,7 @@
 
     <el-row style="margin-top: 20px; margin-bottom: 20px;">
       <el-button type="primary" icon="el-icon-circle-plus" @click="dialogAddForm">添加</el-button>
-      <el-button type="primary" icon="el-icon-edit">设置轮播数</el-button>
+      <!-- <el-button type="primary" icon="el-icon-edit">设置轮播数</el-button> -->
     </el-row>
 
     <el-table
@@ -106,7 +106,6 @@
 // import { updateArticle, createBanner } from '@/api/banner' // getBanner
 import { mapState, mapActions } from 'vuex'
 import waves from '@/directive/waves' // Waves directive
-import { parseTime } from '@/utils/index'
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
 const calendarTypeOptions = [
   { key: 'CN', display_name: 'China' },
@@ -145,7 +144,7 @@ export default {
       listQuery: {
         pageNum: 1,
         pageSize: 5,
-        bannerTitle: undefined,
+        title: undefined,
         bannerPosition: undefined,
         bannerDescription: undefined,
         communityId: undefined
@@ -169,7 +168,7 @@ export default {
       bannerPositionArr: [
         { id: 1, value: '首页banner' },
         { id: 2, value: '服务banner' }
-      ],
+      ]
     }
   },
   computed: {
@@ -178,6 +177,10 @@ export default {
     })
   },
   created() {
+    const query = this.$route.params.listQuery
+    if (query !== undefined) {
+      this.listQuery = this.$route.params.listQuery
+    }
     this.getList()
     this.getCommuniryList()
   },
@@ -218,10 +221,10 @@ export default {
       })
     },
     dialogAddForm() {
-      this.$router.push({ name: 'banner-add' })
+      this.$router.push({ name: 'banner-add', params: { listQuery: this.listQuery }})
     },
     updateBanner(bannerId) {
-      this.$router.push({ name: 'banner-edi', params: { id: bannerId }})
+      this.$router.push({ name: 'banner-edi', params: { id: bannerId, listQuery: this.listQuery }})
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
@@ -270,7 +273,7 @@ export default {
     handleFilter() {
       this.listQuery.pageNum = 1
       this.listQuery.pageSize = 5
-      this.listQuery.bannerTitle = undefined
+      this.listQuery.title = undefined
       this.listQuery.bannerPosition = undefined
       this.listQuery.bannerDescription = undefined
       this.listQuery.communityId = undefined