optimize import detail log

java110-bean/src/main/java/com/java110/dto/log/AssetImportLogDetailDto.java

@@ -29,7 +29,7 @@ public class AssetImportLogDetailDto extends PageDto implements Serializable {
     private String stateName;
 
 
-    private Date createTime;
+    private String createTime;
 
     private String statusCd = "0";
 
@@ -84,13 +84,7 @@ public class AssetImportLogDetailDto extends PageDto implements Serializable {
     }
 
 
-    public Date getCreateTime() {
-        return createTime;
-    }
 
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
 
     public String getStatusCd() {
         return statusCd;
@@ -107,4 +101,12 @@ public class AssetImportLogDetailDto extends PageDto implements Serializable {
     public void setStateName(String stateName) {
         this.stateName = stateName;
     }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
 }

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

@@ -20,7 +20,9 @@
         select t.log_type,t.log_type logType,t.success_count,t.success_count successCount,t.log_id,t.log_id
         logId,t.remark,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id
         communityId,t.error_count,t.error_count errorCount,t.create_time createTime,t.state,td.`name`
-        logTypeName,td1.name stateName
+        logTypeName,td1.name stateName,
+        (select count(1) successCount from asset_import_log_detail a where a.log_id = t.log_id and a.status_cd = '0' and a.state = 'C') successCount,
+        (select count(1) errorCount from asset_import_log_detail a where a.log_id = t.log_id and a.status_cd = '0' and a.state = 'F') errorCount
         from asset_import_log t
         LEFT JOIN t_dict td on t.log_type = td.status_cd and td.table_name = 'asset_import_log' and td.table_columns =
         'log_type'

service-common/src/main/java/com/java110/common/api/AssetImportLogDetailApi.java

@@ -95,6 +95,7 @@ public class AssetImportLogDetailApi {
     @RequestMapping(value = "/queryAssetImportLogDetail", method = RequestMethod.GET)
     public ResponseEntity<String> queryAssetImportLogDetail(@RequestParam(value = "communityId") String communityId,
                                                             @RequestParam(value = "logId",required = false) String logId,
+                                                            @RequestParam(value = "state",required = false) String state,
                                                             @RequestParam(value = "page") int page,
                                                             @RequestParam(value = "row") int row) {
         AssetImportLogDetailDto assetImportLogDetailDto = new AssetImportLogDetailDto();
@@ -102,6 +103,7 @@ public class AssetImportLogDetailApi {
         assetImportLogDetailDto.setRow(row);
         assetImportLogDetailDto.setCommunityId(communityId);
         assetImportLogDetailDto.setLogId(logId);
+        assetImportLogDetailDto.setState(state);
         return getAssetImportLogDetailBMOImpl.get(assetImportLogDetailDto);
     }
 }

service-job/src/main/java/com/java110/job/importData/ImportDataExecutor.java

@@ -6,6 +6,7 @@ import com.java110.dto.log.AssetImportLogDetailDto;
 import com.java110.dto.log.AssetImportLogDto;
 import com.java110.intf.common.IAssetImportLogDetailInnerServiceSMO;
 import com.java110.intf.common.IAssetImportLogInnerServiceSMO;
+import com.java110.po.log.AssetImportLogPo;
 import com.java110.utils.factory.ApplicationContextFactory;
 import com.java110.utils.util.Assert;
 import org.slf4j.Logger;
@@ -67,7 +68,7 @@ public class ImportDataExecutor implements Runnable {
 
         String businessAdapt = importDataDto.getBusinessAdapt();
 
-        IImportDataAdapt importDataAdaptImpl = ApplicationContextFactory.getBean(businessAdapt+"QueueData", IImportDataAdapt.class);
+        IImportDataAdapt importDataAdaptImpl = ApplicationContextFactory.getBean(businessAdapt + "QueueData", IImportDataAdapt.class);
 
         if (importDataAdaptImpl == null) {
             return;
@@ -76,11 +77,11 @@ public class ImportDataExecutor implements Runnable {
         try {
             assetImportLogInnerServiceSMOImpl
                     = ApplicationContextFactory.getBean(IAssetImportLogInnerServiceSMO.class.getName(), IAssetImportLogInnerServiceSMO.class);
-        }catch (Exception e){
+        } catch (Exception e) {
         }
-        if(assetImportLogInnerServiceSMOImpl == null){
+        if (assetImportLogInnerServiceSMOImpl == null) {
             assetImportLogInnerServiceSMOImpl
-                    = ApplicationContextFactory.getBean("assetImportLogInnerServiceSMOImpl",IAssetImportLogInnerServiceSMO.class);
+                    = ApplicationContextFactory.getBean("assetImportLogInnerServiceSMOImpl", IAssetImportLogInnerServiceSMO.class);
         }
         Assert.hasLength(importDataDto.getLogId(), "未包含导入数据");
         Assert.hasLength(importDataDto.getCommunityId(), "未包含小区信息");
@@ -94,15 +95,21 @@ public class ImportDataExecutor implements Runnable {
             throw new IllegalArgumentException("没有需要导入的房产数据" + importDataDto.getLogId());
         }
 
+        //todo 修改为 导入中
+        AssetImportLogPo assetImportLogPo = new AssetImportLogPo();
+        assetImportLogPo.setLogId(importDataDto.getLogId());
+        assetImportLogPo.setState(AssetImportLogDto.STATE_DOING_IMPORT);
+        assetImportLogInnerServiceSMOImpl.updateAssetImportLog(assetImportLogPo);
+
         // todo 查询detail数据
         try {
             assetImportLogDetailInnerServiceSMOImpl
                     = ApplicationContextFactory.getBean(IAssetImportLogDetailInnerServiceSMO.class.getName(), IAssetImportLogDetailInnerServiceSMO.class);
-        }catch (Exception e){
+        } catch (Exception e) {
         }
-        if(assetImportLogDetailInnerServiceSMOImpl == null){
+        if (assetImportLogDetailInnerServiceSMOImpl == null) {
             assetImportLogDetailInnerServiceSMOImpl
-                    = ApplicationContextFactory.getBean("assetImportLogDetailInnerServiceSMOImpl",IAssetImportLogDetailInnerServiceSMO.class);
+                    = ApplicationContextFactory.getBean("assetImportLogDetailInnerServiceSMOImpl", IAssetImportLogDetailInnerServiceSMO.class);
         }
 
         // todo 查询 房产 导入数据
@@ -130,6 +137,12 @@ public class ImportDataExecutor implements Runnable {
                 e.printStackTrace();
             }
         }
+
+        //todo 修改为 处理完成
+        assetImportLogPo = new AssetImportLogPo();
+        assetImportLogPo.setLogId(importDataDto.getLogId());
+        assetImportLogPo.setState(AssetImportLogDto.STATE_COMPLETE_IMPORT);
+        assetImportLogInnerServiceSMOImpl.updateAssetImportLog(assetImportLogPo);
     }
 
     /**