forked from luyan/epmet-cloud-lingshan
				
			
			
			
				Browse Source
			
			
			
			
				
		# Conflicts: # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.javamaster
				 24 changed files with 419 additions and 116 deletions
			
			
		@ -0,0 +1,51 @@ | 
				
			|||
package com.epmet.utils; | 
				
			|||
 | 
				
			|||
import com.epmet.commons.tools.constant.AppClientConstant; | 
				
			|||
import com.epmet.commons.tools.feign.ResultDataResolver; | 
				
			|||
import com.epmet.commons.tools.utils.EpmetRequestHolder; | 
				
			|||
import com.epmet.commons.tools.utils.Result; | 
				
			|||
import com.epmet.commons.tools.utils.SpringContextUtils; | 
				
			|||
import com.epmet.dto.form.ImportTaskCommonFormDTO; | 
				
			|||
import com.epmet.dto.result.ImportTaskCommonResultDTO; | 
				
			|||
import com.epmet.feign.EpmetCommonServiceOpenFeignClient; | 
				
			|||
 | 
				
			|||
/** | 
				
			|||
 * 导入任务工具类,用于创建/完成导入工具 | 
				
			|||
 */ | 
				
			|||
public class ImportTaskUtils implements ResultDataResolver { | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 创建导入任务,可能抛出8000异常,请考虑捕获异常 | 
				
			|||
     * @param originFileName 上传的文件的名称 | 
				
			|||
     * @param bizType 业务类型,见ImportTaskConstants常量 | 
				
			|||
     * @return Result | 
				
			|||
     */ | 
				
			|||
    public static Result<ImportTaskCommonResultDTO> createImportTask(String originFileName, String bizType) { | 
				
			|||
        ImportTaskCommonFormDTO form = new ImportTaskCommonFormDTO(); | 
				
			|||
        form.setOriginFileName(originFileName); | 
				
			|||
        form.setOperatorId(EpmetRequestHolder.getHeader(AppClientConstant.USER_ID)); | 
				
			|||
        form.setBizType(bizType); | 
				
			|||
 | 
				
			|||
        return SpringContextUtils.getBean(EpmetCommonServiceOpenFeignClient.class).createImportTask(form); | 
				
			|||
    } | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 结束导入任务 | 
				
			|||
     * @param taskId 任务ID | 
				
			|||
     * @param processStatus 处理状态 见ImportTaskConstants | 
				
			|||
     * @param resultDescFilePath 结果描述文件的路径 | 
				
			|||
     * @param resultDesc 结果简要描述文字 | 
				
			|||
     * @return Result | 
				
			|||
     */ | 
				
			|||
    public static Result finishImportTask(String taskId, String processStatus, String resultDescFilePath, String resultDesc) { | 
				
			|||
        ImportTaskCommonFormDTO form = new ImportTaskCommonFormDTO(); | 
				
			|||
        form.setTaskId(taskId); | 
				
			|||
        form.setOperatorId(EpmetRequestHolder.getHeader(AppClientConstant.USER_ID)); | 
				
			|||
        form.setProcessStatus(processStatus); | 
				
			|||
        form.setResultDescFilePath(resultDescFilePath); | 
				
			|||
        form.setResultDesc(resultDesc); | 
				
			|||
 | 
				
			|||
        return SpringContextUtils.getBean(EpmetCommonServiceOpenFeignClient.class).finishImportTask(form); | 
				
			|||
    } | 
				
			|||
 | 
				
			|||
} | 
				
			|||
@ -0,0 +1,16 @@ | 
				
			|||
package com.epmet.dao; | 
				
			|||
 | 
				
			|||
import com.epmet.commons.mybatis.dao.BaseDao; | 
				
			|||
import com.epmet.entity.IcFormListItemEntity; | 
				
			|||
import org.apache.ibatis.annotations.Mapper; | 
				
			|||
 | 
				
			|||
/** | 
				
			|||
 * 列表展示项 | 
				
			|||
 * | 
				
			|||
 * @author generator generator@elink-cn.com | 
				
			|||
 * @since v1.0.0 2022-04-14 | 
				
			|||
 */ | 
				
			|||
@Mapper | 
				
			|||
public interface IcFormListItemDao extends BaseDao<IcFormListItemEntity> { | 
				
			|||
	 | 
				
			|||
} | 
				
			|||
@ -0,0 +1,46 @@ | 
				
			|||
package com.epmet.entity; | 
				
			|||
 | 
				
			|||
import com.baomidou.mybatisplus.annotation.TableName; | 
				
			|||
import com.epmet.commons.mybatis.entity.BaseEpmetEntity; | 
				
			|||
import lombok.Data; | 
				
			|||
import lombok.EqualsAndHashCode; | 
				
			|||
 | 
				
			|||
/** | 
				
			|||
 * 列表展示项 | 
				
			|||
 * | 
				
			|||
 * @author generator generator@elink-cn.com | 
				
			|||
 * @since v1.0.0 2022-04-14 | 
				
			|||
 */ | 
				
			|||
@Data | 
				
			|||
@EqualsAndHashCode(callSuper=false) | 
				
			|||
@TableName("ic_form_list_item") | 
				
			|||
public class IcFormListItemEntity extends BaseEpmetEntity { | 
				
			|||
 | 
				
			|||
	private static final long serialVersionUID = 1L; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 客户id | 
				
			|||
     */ | 
				
			|||
	private String customerId; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * ic_form_item.id | 
				
			|||
     */ | 
				
			|||
	private String formItemId; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * ic_form.form_code,举例:resi_base_info | 
				
			|||
     */ | 
				
			|||
	private String formCode; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 表头宽度 | 
				
			|||
     */ | 
				
			|||
	private Integer width; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 排序 | 
				
			|||
     */ | 
				
			|||
	private Integer sort; | 
				
			|||
 | 
				
			|||
} | 
				
			|||
@ -0,0 +1,22 @@ | 
				
			|||
<?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.epmet.dao.IcFormListItemDao"> | 
				
			|||
 | 
				
			|||
    <resultMap type="com.epmet.entity.IcFormListItemEntity" id="icFormListItemMap"> | 
				
			|||
        <result property="id" column="ID"/> | 
				
			|||
        <result property="customerId" column="CUSTOMER_ID"/> | 
				
			|||
        <result property="formItemId" column="FORM_ITEM_ID"/> | 
				
			|||
        <result property="formCode" column="FORM_CODE"/> | 
				
			|||
        <result property="width" column="WIDTH"/> | 
				
			|||
        <result property="sort" column="SORT"/> | 
				
			|||
        <result property="delFlag" column="DEL_FLAG"/> | 
				
			|||
        <result property="revision" column="REVISION"/> | 
				
			|||
        <result property="createdBy" column="CREATED_BY"/> | 
				
			|||
        <result property="createdTime" column="CREATED_TIME"/> | 
				
			|||
        <result property="updatedBy" column="UPDATED_BY"/> | 
				
			|||
        <result property="updatedTime" column="UPDATED_TIME"/> | 
				
			|||
    </resultMap> | 
				
			|||
 | 
				
			|||
 | 
				
			|||
</mapper> | 
				
			|||
								
									Binary file not shown.
								
							
						
					
					Loading…
					
					
				
		Reference in new issue