optimize face record

java110-bean/src/main/java/com/java110/dto/machine/MachineRecordDto.java

@@ -30,6 +30,9 @@ public class MachineRecordDto extends PageDto implements Serializable {
     private String userId;
     private String similar;
     private String photo;
+    private String machineName;
+    private String locationTypeCd;
+
 
 
     private Date createTime;
@@ -173,4 +176,20 @@ public class MachineRecordDto extends PageDto implements Serializable {
     public void setPhoto(String photo) {
         this.photo = photo;
     }
+
+    public String getMachineName() {
+        return machineName;
+    }
+
+    public void setMachineName(String machineName) {
+        this.machineName = machineName;
+    }
+
+    public String getLocationTypeCd() {
+        return locationTypeCd;
+    }
+
+    public void setLocationTypeCd(String locationTypeCd) {
+        this.locationTypeCd = locationTypeCd;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/machineRecord/ApiMachineRecordDataVo.java

@@ -18,6 +18,12 @@ public class ApiMachineRecordDataVo implements Serializable {
 
     private String faceUrl;
 
+    private String machineName;
+    private String locationTypeCd;
+
+    private String locationObjName;
+    private String communityId;
+
 
     public String getMachineRecordId() {
         return machineRecordId;
@@ -106,4 +112,36 @@ public class ApiMachineRecordDataVo implements Serializable {
     public void setFaceUrl(String faceUrl) {
         this.faceUrl = faceUrl;
     }
+
+    public String getMachineName() {
+        return machineName;
+    }
+
+    public void setMachineName(String machineName) {
+        this.machineName = machineName;
+    }
+
+    public String getLocationTypeCd() {
+        return locationTypeCd;
+    }
+
+    public void setLocationTypeCd(String locationTypeCd) {
+        this.locationTypeCd = locationTypeCd;
+    }
+
+    public String getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+
+    public String getLocationObjName() {
+        return locationObjName;
+    }
+
+    public void setLocationObjName(String locationObjName) {
+        this.locationObjName = locationObjName;
+    }
 }

java110-db/src/main/resources/mapper/common/MachineRecordServiceDaoImplMapper.xml

@@ -120,12 +120,11 @@
         openTypeCd,t.id_card,t.id_card idCard,t.status_cd,t.status_cd statusCd,t.machine_record_id,t.machine_record_id
         machineRecordId,t.machine_id,t.machine_id machineId,t.name,t.tel,t.community_id,t.community_id
         communityId,t.b_id,t.b_id bId,t.file_id,t.file_id fileId,t.record_type_cd,t.record_type_cd recordTypeCd,td1.name
-        openTypeName,t.create_time createTime,t.similar
-        from machine_record t,t_dict td1
+        openTypeName,t.create_time createTime,t.similar,m.machine_name machineName,m.location_type_cd locationTypeCd
+        from machine_record t
+        left join t_dict td1 on  t.open_type_cd = td1.status_cd and td1.table_name = 'machine_record' and td1.table_columns = 'open_type_cd'
+        left join machine m on t.machine_id = m.machine_id and m.status_cd = '0'
         where 1 =1
-        and t.open_type_cd = td1.status_cd
-        and td1.table_name = 'machine_record'
-        and td1.table_columns = 'open_type_cd'
         <if test="fileTime !=null and fileTime != ''">
             and t.file_time= #{fileTime}
         </if>

service-common/src/main/java/com/java110/common/cmd/machineRecord/ListMachineRecordsCmd.java

@@ -5,11 +5,14 @@ import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.community.CommunityLocationDto;
 import com.java110.dto.file.FileRelDto;
+import com.java110.dto.machine.MachineDto;
 import com.java110.dto.machine.MachineRecordDto;
 import com.java110.dto.owner.OwnerDto;
 import com.java110.intf.common.IFileRelInnerServiceSMO;
 import com.java110.intf.common.IMachineRecordInnerServiceSMO;
+import com.java110.intf.community.ICommunityLocationInnerServiceSMO;
 import com.java110.utils.cache.MappingCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.exception.CmdException;
@@ -33,6 +36,9 @@ public class ListMachineRecordsCmd extends Cmd {
     @Autowired
     private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
 
+    @Autowired
+    private ICommunityLocationInnerServiceSMO communityLocationInnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         super.validatePageInfo(reqJson);
@@ -50,6 +56,7 @@ public class ListMachineRecordsCmd extends Cmd {
         if (count > 0) {
             machineRecords = BeanConvertUtil.covertBeanList(machineRecordInnerServiceSMOImpl.queryMachineRecords(machineRecordDto), ApiMachineRecordDataVo.class);
             freshFaceUrl(machineRecords);
+            refreshMachineLocation(machineRecords);
         } else {
             machineRecords = new ArrayList<>();
         }
@@ -65,6 +72,25 @@ public class ListMachineRecordsCmd extends Cmd {
         context.setResponseEntity(responseEntity);
     }
 
+    private void refreshMachineLocation(List<ApiMachineRecordDataVo> machineRecords) {
+        for (ApiMachineRecordDataVo machineDto : machineRecords) {
+            getMachineLocation(machineDto);
+        }
+    }
+
+    private void getMachineLocation(ApiMachineRecordDataVo machineDto) {
+        CommunityLocationDto communityLocationDto = new CommunityLocationDto();
+        communityLocationDto.setCommunityId(machineDto.getCommunityId());
+        communityLocationDto.setLocationId(machineDto.getLocationTypeCd());
+        List<CommunityLocationDto> communityLocationDtos = communityLocationInnerServiceSMOImpl.queryCommunityLocations(communityLocationDto);
+
+        if (communityLocationDtos == null || communityLocationDtos.size() < 1) {
+            return;
+        }
+
+        machineDto.setLocationObjName(communityLocationDtos.get(0).getLocationName());
+    }
+
     private void freshFaceUrl(List<ApiMachineRecordDataVo> machineRecords) {
 
         List<String> recordIds = new ArrayList<>();