xuanyan před 3 roky
rodič
revize
08d41fa38b

+ 12 - 0
smart-city-grid-yinchuan-manage/src/api/community/houseuser.js

@@ -71,6 +71,7 @@ export const elderlyList = (current, size, params) => {
   })
 }
 
+//脱敏数据
 export const getDetail = (id) => {
   return request({
     url: '/api/community/houseuser/detail',
@@ -81,6 +82,17 @@ export const getDetail = (id) => {
   })
 }
 
+//未脱敏数据
+export const getOne = (id) => {
+  return request({
+    url: '/api/community/houseuser/getOne',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
 export const remove = (ids) => {
   return request({
     url: '/api/community/houseuser/remove',

+ 5 - 0
smart-city-grid-yinchuan-manage/src/views/community/accessrecord.vue

@@ -87,6 +87,11 @@
               prop: "faceUrl",
               slot: true,
             },
+            {
+              label: "人脸底图",
+              prop: "baseUrl",
+              slot: true,
+            },
             {
               label: "社区",
               prop: "agencyName",

+ 7 - 1
smart-city-grid-yinchuan-manage/src/views/community/permanentPeople.vue

@@ -59,6 +59,7 @@
 import {
   getList,
   getDetail,
+  getOne,
   add,
   update,
   convertToHouseUser,
@@ -904,7 +905,12 @@ import CyExcelImport from "../../components/excel/cy-excel-import";
           });
       },
       beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
+        if (["edit"].includes(type)) {
+          getOne(this.form.id).then(res => {
+            this.form = res.data.data;
+          });
+        }
+        if (["view"].includes(type)) {
           getDetail(this.form.id).then(res => {
             this.form = res.data.data;
           });

+ 2 - 2
smart-city-grid-yinchuan-manage/src/views/community/personadd.vue

@@ -90,7 +90,7 @@
 </template>
 
 <script>
-import { add,update,getDetail, getMoreDetail } from "@/api/community/houseuser";
+import { add,update,getOne, getMoreDetail } from "@/api/community/houseuser";
 
 export default {
   name: "personadd",
@@ -409,7 +409,7 @@ export default {
   },
   created() {
     if (this.personId){
-      getDetail(this.personId).then(res =>{
+      getOne(this.personId).then(res =>{
         this.person = res.data.data;
         if (this.person.personTag){
           this.tag = this.person.personTag.split(",");

+ 2 - 0
smart-city-grid-yinchuan-server/src/main/java/org/springblade/community/accessrecord/entity/AccessRecord.java

@@ -91,6 +91,8 @@ public class AccessRecord extends BaseEntity {
 		@ApiModelProperty(value = "人脸")
 		private String faceUrl;
 
+		@ApiModelProperty(value = "底图")
+		private String baseUrl;
 	/**
 	 * 设备id
 	 */

+ 11 - 0
smart-city-grid-yinchuan-server/src/main/java/org/springblade/community/houseuser/controller/HouseuserController.java

@@ -117,6 +117,17 @@ public class HouseuserController extends BladeController {
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入houseuser")
 	public R<Houseuser> detail(Houseuser houseuser) {
+		Houseuser detail = houseuserService.getOne(Condition.getQueryWrapper(houseuser));
+		return R.data(HouseuserWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 详情未脱敏
+	 */
+	@GetMapping("/getOne")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入houseuser")
+	public R<Houseuser> getOne(Houseuser houseuser) {
 		Houseuser detail = houseuserService.getOne(Condition.getQueryWrapper(houseuser));
 		return R.data(detail);
 	}

+ 1 - 0
smart-city-grid-yinchuan-server/src/main/java/org/springblade/openinterface/facedevice/jvt/controller/DeviceController.java

@@ -228,6 +228,7 @@ public class DeviceController {
 			accessRecord.setFaceUrl(faceUrl);
 			accessRecord.setOrgPosition(residential.getOrgPosition());
 			accessRecord.setTenantId(residential.getTenantId());
+			accessRecord.setBaseUrl(houseuser.getImageUri());
 			this.accessRecordService.save(accessRecord);
 		}
 	}