Browse Source

Merge branch 'dev_5big_coverage'

dev
sunyuchao 3 years ago
parent
commit
1a23fb8c34
  1. 3
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCityManagementDao.java
  2. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcDangerousChemicalsDao.java
  3. 3
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPublicServiceDao.java
  4. 3
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcSuperiorResourceDao.java
  5. 8
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java
  6. 8
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPublicServiceExcelImportListener.java
  7. 8
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcSuperiorResourceExcelImportListener.java
  8. 12
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsImportListener.java
  9. 3
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcDangerousChemicalsService.java
  10. 4
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java
  11. 8
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java
  12. 5
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java
  13. 4
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java
  14. 58
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCityManagementDao.xml
  15. 64
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml
  16. 58
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml
  17. 58
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcSuperiorResourceDao.xml

3
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCityManagementDao.java

@ -5,6 +5,7 @@ import com.epmet.dto.form.IcCityManagementListFormDTO;
import com.epmet.dto.result.IcCityManagementListResultDTO; import com.epmet.dto.result.IcCityManagementListResultDTO;
import com.epmet.entity.IcCityManagementEntity; import com.epmet.entity.IcCityManagementEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@ -21,4 +22,6 @@ public interface IcCityManagementDao extends BaseDao<IcCityManagementEntity> {
void del(IcCityManagementEntity entity); void del(IcCityManagementEntity entity);
void importInsert(@Param("entityList") List<IcCityManagementEntity> entityList);
} }

2
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcDangerousChemicalsDao.java

@ -20,4 +20,6 @@ public interface IcDangerousChemicalsDao extends BaseDao<IcDangerousChemicalsEnt
List<IcDangerousChemicalsListResultDTO> selectDangerousChemicalsList(IcDangerousChemicalsListFormDTO formDTO); List<IcDangerousChemicalsListResultDTO> selectDangerousChemicalsList(IcDangerousChemicalsListFormDTO formDTO);
void del(IcDangerousChemicalsEntity entity); void del(IcDangerousChemicalsEntity entity);
void importInsert(List<IcDangerousChemicalsEntity> entityList);
} }

3
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPublicServiceDao.java

@ -5,6 +5,7 @@ import com.epmet.dto.form.IcPublicServiceListFormDTO;
import com.epmet.dto.result.IcPublicServiceListResultDTO; import com.epmet.dto.result.IcPublicServiceListResultDTO;
import com.epmet.entity.IcPublicServiceEntity; import com.epmet.entity.IcPublicServiceEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@ -20,4 +21,6 @@ public interface IcPublicServiceDao extends BaseDao<IcPublicServiceEntity> {
List<IcPublicServiceListResultDTO> selectPublicServiceList(IcPublicServiceListFormDTO formDTO); List<IcPublicServiceListResultDTO> selectPublicServiceList(IcPublicServiceListFormDTO formDTO);
void del(IcPublicServiceEntity entity); void del(IcPublicServiceEntity entity);
void importInsert(@Param("entityList") List<IcPublicServiceEntity> entityList);
} }

3
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcSuperiorResourceDao.java

@ -5,6 +5,7 @@ import com.epmet.dto.form.IcSuperiorResourceListFormDTO;
import com.epmet.dto.result.IcSuperiorResourceListResultDTO; import com.epmet.dto.result.IcSuperiorResourceListResultDTO;
import com.epmet.entity.IcSuperiorResourceEntity; import com.epmet.entity.IcSuperiorResourceEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@ -20,4 +21,6 @@ public interface IcSuperiorResourceDao extends BaseDao<IcSuperiorResourceEntity>
List<IcSuperiorResourceListResultDTO> selectSuperiorResourceList(IcSuperiorResourceListFormDTO formDTO); List<IcSuperiorResourceListResultDTO> selectSuperiorResourceList(IcSuperiorResourceListFormDTO formDTO);
void del(IcSuperiorResourceEntity entity); void del(IcSuperiorResourceEntity entity);
void importInsert(@Param("entityList") List<IcSuperiorResourceEntity> entityList);
} }

8
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java

@ -68,14 +68,14 @@ public class IcCityManagementExcelImportListener implements ReadListener<IcCityM
// 先校验数据 // 先校验数据
ValidatorUtils.validateEntity(data); ValidatorUtils.validateEntity(data);
existMap = null == existMap ? getExistMap(currentAgencyId) : existMap; /*existMap = null == existMap ? getExistMap(currentAgencyId) : existMap;
ValidatorUtils.validateEntity(data); ValidatorUtils.validateEntity(data);
if (StringUtils.isNotBlank(existMap.get(data.getName()))) { if (StringUtils.isNotBlank(existMap.get(data.getName()))) {
IcCityManagementExcel.RowRemarkMessage errorRow = ConvertUtils.sourceToTarget(data, IcCityManagementExcel.RowRemarkMessage.class); IcCityManagementExcel.RowRemarkMessage errorRow = ConvertUtils.sourceToTarget(data, IcCityManagementExcel.RowRemarkMessage.class);
errorRow.setErrorInfo("数据库存在当前场所数据"); errorRow.setErrorInfo("数据库存在当前场所数据");
errorRows.add(errorRow); errorRows.add(errorRow);
return; return;
} }*/
// 去除前后空格 // 去除前后空格
if (StringUtils.isNotBlank(data.getName())) { if (StringUtils.isNotBlank(data.getName())) {
@ -98,6 +98,8 @@ public class IcCityManagementExcelImportListener implements ReadListener<IcCityM
if(StringUtils.isNotBlank(data.getCapacityName())){ if(StringUtils.isNotBlank(data.getCapacityName())){
IcCityManagementEntity.setCapacity(Integer.parseInt(data.getCapacityName())); IcCityManagementEntity.setCapacity(Integer.parseInt(data.getCapacityName()));
} }
IcCityManagementEntity.setCreatedBy(currentUserId);
IcCityManagementEntity.setUpdatedBy(currentUserId);
datas.add(IcCityManagementEntity); datas.add(IcCityManagementEntity);
if (datas.size() == MAX_THRESHOLD) { if (datas.size() == MAX_THRESHOLD) {
@ -151,7 +153,7 @@ public class IcCityManagementExcelImportListener implements ReadListener<IcCityM
datas.forEach(d -> { datas.forEach(d -> {
d.setCategory(dictMap.get(d.getCategory())); d.setCategory(dictMap.get(d.getCategory()));
}); });
IcCityManagementServiceImpl.insertBatch(datas); IcCityManagementServiceImpl.importInsert(datas);
} finally { } finally {
datas.clear(); datas.clear();

8
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPublicServiceExcelImportListener.java

@ -68,14 +68,14 @@ public class IcPublicServiceExcelImportListener implements ReadListener<IcPublic
// 先校验数据 // 先校验数据
ValidatorUtils.validateEntity(data); ValidatorUtils.validateEntity(data);
existMap = null == existMap ? getExistMap(currentAgencyId) : existMap; /*existMap = null == existMap ? getExistMap(currentAgencyId) : existMap;
ValidatorUtils.validateEntity(data); ValidatorUtils.validateEntity(data);
if (StringUtils.isNotBlank(existMap.get(data.getName()))) { if (StringUtils.isNotBlank(existMap.get(data.getName()))) {
IcPublicServiceExcel.RowRemarkMessage errorRow = ConvertUtils.sourceToTarget(data, IcPublicServiceExcel.RowRemarkMessage.class); IcPublicServiceExcel.RowRemarkMessage errorRow = ConvertUtils.sourceToTarget(data, IcPublicServiceExcel.RowRemarkMessage.class);
errorRow.setErrorInfo("数据库存在当前场所数据"); errorRow.setErrorInfo("数据库存在当前场所数据");
errorRows.add(errorRow); errorRows.add(errorRow);
return; return;
} }*/
// 去除前后空格 // 去除前后空格
if (StringUtils.isNotBlank(data.getName())) { if (StringUtils.isNotBlank(data.getName())) {
@ -98,6 +98,8 @@ public class IcPublicServiceExcelImportListener implements ReadListener<IcPublic
if(StringUtils.isNotBlank(data.getCapacityName())){ if(StringUtils.isNotBlank(data.getCapacityName())){
IcPublicServiceEntity.setCapacity(Integer.parseInt(data.getCapacityName())); IcPublicServiceEntity.setCapacity(Integer.parseInt(data.getCapacityName()));
} }
IcPublicServiceEntity.setCreatedBy(currentUserId);
IcPublicServiceEntity.setUpdatedBy(currentUserId);
datas.add(IcPublicServiceEntity); datas.add(IcPublicServiceEntity);
if (datas.size() == MAX_THRESHOLD) { if (datas.size() == MAX_THRESHOLD) {
@ -151,7 +153,7 @@ public class IcPublicServiceExcelImportListener implements ReadListener<IcPublic
datas.forEach(d -> { datas.forEach(d -> {
d.setCategory(dictMap.get(d.getCategory())); d.setCategory(dictMap.get(d.getCategory()));
}); });
IcPublicServiceServiceImpl.insertBatch(datas); IcPublicServiceServiceImpl.importInsert(datas);
} finally { } finally {
datas.clear(); datas.clear();

8
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcSuperiorResourceExcelImportListener.java

@ -69,14 +69,14 @@ public class IcSuperiorResourceExcelImportListener implements ReadListener<IcSup
// 先校验数据 // 先校验数据
ValidatorUtils.validateEntity(data); ValidatorUtils.validateEntity(data);
existMap = null == existMap ? getExistMap(currentAgencyId) : existMap; /* existMap = null == existMap ? getExistMap(currentAgencyId) : existMap;
ValidatorUtils.validateEntity(data); ValidatorUtils.validateEntity(data);
if (StringUtils.isNotBlank(existMap.get(data.getName()))) { if (StringUtils.isNotBlank(existMap.get(data.getName()))) {
IcSuperiorResourceExcel.RowRemarkMessage errorRow = ConvertUtils.sourceToTarget(data, IcSuperiorResourceExcel.RowRemarkMessage.class); IcSuperiorResourceExcel.RowRemarkMessage errorRow = ConvertUtils.sourceToTarget(data, IcSuperiorResourceExcel.RowRemarkMessage.class);
errorRow.setErrorInfo("数据库存在当前场所数据"); errorRow.setErrorInfo("数据库存在当前场所数据");
errorRows.add(errorRow); errorRows.add(errorRow);
return; return;
} }*/
// 去除前后空格 // 去除前后空格
if (StringUtils.isNotBlank(data.getName())) { if (StringUtils.isNotBlank(data.getName())) {
@ -99,6 +99,8 @@ public class IcSuperiorResourceExcelImportListener implements ReadListener<IcSup
if(StringUtils.isNotBlank(data.getCapacityName())){ if(StringUtils.isNotBlank(data.getCapacityName())){
icSuperiorResourceEntity.setCapacity(Integer.parseInt(data.getCapacityName())); icSuperiorResourceEntity.setCapacity(Integer.parseInt(data.getCapacityName()));
} }
icSuperiorResourceEntity.setCreatedBy(currentUserId);
icSuperiorResourceEntity.setUpdatedBy(currentUserId);
datas.add(icSuperiorResourceEntity); datas.add(icSuperiorResourceEntity);
if (datas.size() == MAX_THRESHOLD) { if (datas.size() == MAX_THRESHOLD) {
@ -152,7 +154,7 @@ public class IcSuperiorResourceExcelImportListener implements ReadListener<IcSup
datas.forEach(d -> { datas.forEach(d -> {
d.setCategory(dictMap.get(d.getCategory())); d.setCategory(dictMap.get(d.getCategory()));
}); });
icSuperiorResourceServiceImpl.insertBatch(datas); icSuperiorResourceServiceImpl.importInsert(datas);
} finally { } finally {
datas.clear(); datas.clear();

12
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsImportListener.java

@ -46,13 +46,15 @@ public class DangerousChemicalsImportListener extends AnalysisEventListener<Dang
private CoverageService coverageService; private CoverageService coverageService;
private AgencyInfoCache agencyInfo; private AgencyInfoCache agencyInfo;
private IcDangerousChemicalsDao icDangerousChemicalsDao; private IcDangerousChemicalsDao icDangerousChemicalsDao;
private String currentUserId;
private List<DangerousChemicalsModel.RowRemarkMessage> errorRows = new ArrayList<>(); private List<DangerousChemicalsModel.RowRemarkMessage> errorRows = new ArrayList<>();
private List<DangerousChemicalsModel.RowRemarkMessage> otherRows = new ArrayList<>(); private List<DangerousChemicalsModel.RowRemarkMessage> otherRows = new ArrayList<>();
private List<IcDangerousChemicalsEntity> insertList = new ArrayList<>(); private List<IcDangerousChemicalsEntity> insertList = new ArrayList<>();
private Map<String,String> existMap = null; private Map<String,String> existMap = null;
public DangerousChemicalsImportListener(AgencyInfoCache agencyInfo, IcDangerousChemicalsService icDangerousChemicalsService, CoverageService coverageService, EpmetAdminOpenFeignClient adminOpenFeignClient, IcDangerousChemicalsDao icDangerousChemicalsDao){ public DangerousChemicalsImportListener(String currentUserId, AgencyInfoCache agencyInfo, IcDangerousChemicalsService icDangerousChemicalsService, CoverageService coverageService, EpmetAdminOpenFeignClient adminOpenFeignClient, IcDangerousChemicalsDao icDangerousChemicalsDao){
this.currentUserId = currentUserId;
this.agencyInfo = agencyInfo; this.agencyInfo = agencyInfo;
this.icDangerousChemicalsService = icDangerousChemicalsService; this.icDangerousChemicalsService = icDangerousChemicalsService;
this.coverageService = coverageService; this.coverageService = coverageService;
@ -65,19 +67,21 @@ public class DangerousChemicalsImportListener extends AnalysisEventListener<Dang
Integer rowNum = context.readRowHolder().getRowIndex() + NumConstant.ONE; Integer rowNum = context.readRowHolder().getRowIndex() + NumConstant.ONE;
data.setRowNum(rowNum); data.setRowNum(rowNum);
try { try {
existMap = null == existMap ? getExistMap(agencyInfo.getId()) : existMap;
ValidatorUtils.validateEntity(data); ValidatorUtils.validateEntity(data);
/*existMap = null == existMap ? getExistMap(agencyInfo.getId()) : existMap;
if (StringUtils.isNotBlank(existMap.get(data.getName()))){ if (StringUtils.isNotBlank(existMap.get(data.getName()))){
DangerousChemicalsModel.RowRemarkMessage errorRow = ConvertUtils.sourceToTarget(data, DangerousChemicalsModel.RowRemarkMessage.class); DangerousChemicalsModel.RowRemarkMessage errorRow = ConvertUtils.sourceToTarget(data, DangerousChemicalsModel.RowRemarkMessage.class);
errorRow.setErrorInfo("数据库存在该条数据"); errorRow.setErrorInfo("数据库存在该条数据");
errorRows.add(errorRow); errorRows.add(errorRow);
return; return;
} }*/
IcDangerousChemicalsEntity e = ConvertUtils.sourceToTarget(data, IcDangerousChemicalsEntity.class); IcDangerousChemicalsEntity e = ConvertUtils.sourceToTarget(data, IcDangerousChemicalsEntity.class);
e.setSourceType("import"); e.setSourceType("import");
e.setAgencyId(agencyInfo.getId()); e.setAgencyId(agencyInfo.getId());
e.setCustomerId(agencyInfo.getCustomerId()); e.setCustomerId(agencyInfo.getCustomerId());
e.setAgencyIdPath(agencyInfo.getPids().equals(NumConstant.ZERO_STR) || agencyInfo.getPids().equals("") ? agencyInfo.getId() : agencyInfo.getPids().concat(":").concat(agencyInfo.getId())); e.setAgencyIdPath(agencyInfo.getPids().equals(NumConstant.ZERO_STR) || agencyInfo.getPids().equals("") ? agencyInfo.getId() : agencyInfo.getPids().concat(":").concat(agencyInfo.getId()));
e.setCreatedBy(currentUserId);
e.setUpdatedBy(currentUserId);
insertList.add(e); insertList.add(e);
if (insertList.size() == NumConstant.ONE_HUNDRED){ if (insertList.size() == NumConstant.ONE_HUNDRED){
execPersist(); execPersist();
@ -157,7 +161,7 @@ public class DangerousChemicalsImportListener extends AnalysisEventListener<Dang
}); });
} }
if (CollectionUtils.isNotEmpty(groupByStatus.get(false))){ if (CollectionUtils.isNotEmpty(groupByStatus.get(false))){
icDangerousChemicalsService.insertBatch(groupByStatus.get(false)); icDangerousChemicalsService.importInsert(groupByStatus.get(false));
} }
} }
} finally { } finally {

3
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcDangerousChemicalsService.java

@ -10,6 +10,7 @@ import com.epmet.dto.result.IcDangerousChemicalsListResultDTO;
import com.epmet.entity.IcDangerousChemicalsEntity; import com.epmet.entity.IcDangerousChemicalsEntity;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.List;
/** /**
* 重点危化品企业 * 重点危化品企业
@ -79,4 +80,6 @@ public interface IcDangerousChemicalsService extends BaseService<IcDangerousChem
*/ */
void dangerousChemicalsImport(Path filePath, String importTaskId, TokenDto tokenDto); void dangerousChemicalsImport(Path filePath, String importTaskId, TokenDto tokenDto);
void importInsert(List<IcDangerousChemicalsEntity> entityList);
} }

4
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java

@ -293,5 +293,9 @@ public class IcCityManagementServiceImpl extends BaseServiceImpl<IcCityManagemen
} }
public void importInsert(List<IcCityManagementEntity> entityList){
baseDao.importInsert(entityList);
}
} }

8
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java

@ -30,6 +30,7 @@ import com.epmet.dto.result.IcCoverageCategoryDictListResultDTO;
import com.epmet.dto.result.IcDangerousChemicalsListResultDTO; import com.epmet.dto.result.IcDangerousChemicalsListResultDTO;
import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.dto.result.UploadImgResultDTO;
import com.epmet.entity.IcDangerousChemicalsEntity; import com.epmet.entity.IcDangerousChemicalsEntity;
import com.epmet.entity.IcSuperiorResourceEntity;
import com.epmet.feign.EpmetAdminOpenFeignClient; import com.epmet.feign.EpmetAdminOpenFeignClient;
import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
import com.epmet.feign.OssFeignClient; import com.epmet.feign.OssFeignClient;
@ -235,7 +236,7 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl<IcDangerous
if (null == agencyInfo){ if (null == agencyInfo){
throw new EpmetException("查询所属组织失败:"+staffInfo.getAgencyId()); throw new EpmetException("查询所属组织失败:"+staffInfo.getAgencyId());
} }
DangerousChemicalsImportListener listener = new DangerousChemicalsImportListener(agencyInfo,this,coverageService,adminOpenFeignClient,icDangerousChemicalsDao); DangerousChemicalsImportListener listener = new DangerousChemicalsImportListener(tokenDto.getUserId(), agencyInfo,this,coverageService,adminOpenFeignClient,icDangerousChemicalsDao);
EasyExcel.read(filePath.toFile(), DangerousChemicalsModel.class, listener).headRowNumber(1).sheet(0).doRead(); EasyExcel.read(filePath.toFile(), DangerousChemicalsModel.class, listener).headRowNumber(1).sheet(0).doRead();
String errorDesFileUrl = null; String errorDesFileUrl = null;
List<DangerousChemicalsModel.RowRemarkMessage> errorRows = listener.getErrorRows(); List<DangerousChemicalsModel.RowRemarkMessage> errorRows = listener.getErrorRows();
@ -305,4 +306,9 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl<IcDangerous
} }
} }
@Override
public void importInsert(List<IcDangerousChemicalsEntity> entityList){
baseDao.importInsert(entityList);
}
} }

5
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java

@ -19,7 +19,6 @@ import com.epmet.commons.tools.utils.FileUtils;
import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.Result;
import com.epmet.constants.ImportTaskConstants; import com.epmet.constants.ImportTaskConstants;
import com.epmet.dao.IcPublicServiceDao; import com.epmet.dao.IcPublicServiceDao;
import com.epmet.dao.IcSuperiorResourceDao;
import com.epmet.dto.IcPublicServiceDTO; import com.epmet.dto.IcPublicServiceDTO;
import com.epmet.dto.form.IcPublicServiceAddEditFormDTO; import com.epmet.dto.form.IcPublicServiceAddEditFormDTO;
import com.epmet.dto.form.IcPublicServiceListFormDTO; import com.epmet.dto.form.IcPublicServiceListFormDTO;
@ -294,4 +293,8 @@ public class IcPublicServiceServiceImpl extends BaseServiceImpl<IcPublicServiceD
} }
public void importInsert(List<IcPublicServiceEntity> entityList){
baseDao.importInsert(entityList);
}
} }

4
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java

@ -293,5 +293,9 @@ public class IcSuperiorResourceServiceImpl extends BaseServiceImpl<IcSuperiorRes
} }
public void importInsert(List<IcSuperiorResourceEntity> entityList){
baseDao.importInsert(entityList);
}
} }

58
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCityManagementDao.xml

@ -2,6 +2,64 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.epmet.dao.IcCityManagementDao"> <mapper namespace="com.epmet.dao.IcCityManagementDao">
<insert id="importInsert">
INSERT INTO ic_city_management
(
id,
customer_id,
agency_id,
agency_id_path,
source_type,
name,
category,
area_covered,
capacity,
address,
longitude,
latitude,
del_flag,
revision,
created_by,
created_time,
updated_by,
updated_time
)
VALUES
<foreach collection="entityList" item="i" separator=",">
(
REPLACE(UUID(), '-', ''),
#{i.customerId},
#{i.agencyId},
#{i.agencyIdPath},
#{i.sourceType},
#{i.name},
#{i.category},
#{i.areaCovered},
#{i.capacity},
#{i.address},
#{i.longitude},
#{i.latitude},
0,
0,
#{i.createdBy},
now(),
#{i.updatedBy},
now()
)
</foreach>
ON DUPLICATE KEY
UPDATE
source_type = values(source_type),
name = values(name),
category = values(category),
area_covered = values(area_covered),
capacity = values(capacity),
address = values(address),
longitude = null,
latitude = null,
updated_by = values(updated_by),
updated_time = NOW()
</insert>
<select id="selectCityManagementList" resultType="com.epmet.dto.result.IcCityManagementListResultDTO"> <select id="selectCityManagementList" resultType="com.epmet.dto.result.IcCityManagementListResultDTO">
SELECT SELECT

64
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml

@ -2,6 +2,70 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.epmet.dao.IcDangerousChemicalsDao"> <mapper namespace="com.epmet.dao.IcDangerousChemicalsDao">
<insert id="importInsert">
INSERT INTO ic_dangerous_chemicals
(
id,
customer_id,
agency_id,
agency_id_path,
source_type,
name,
category,
safe_distance,
danger_type,
principal_name,
principal_mobile,
address,
longitude,
latitude,
del_flag,
revision,
created_by,
created_time,
updated_by,
updated_time
)
VALUES
<foreach collection="entityList" item="i" separator=",">
(
REPLACE(UUID(), '-', ''),
#{i.customerId},
#{i.agencyId},
#{i.agencyIdPath},
#{i.sourceType},
#{i.name},
#{i.category},
#{i.safeDistance},
#{i.dangerType},
#{i.principalName},
#{i.principalMobile},
#{i.address},
#{i.longitude},
#{i.latitude},
0,
0,
#{i.createdBy},
now(),
#{i.updatedBy},
now()
)
</foreach>
ON DUPLICATE KEY
UPDATE
source_type = values(source_type),
name = values(name),
category = values(category),
safe_distance = values(safe_distance),
danger_type = values(danger_type),
principal_name = values(principal_name),
principal_mobile = values(principal_mobile),
address = values(address),
longitude = null,
latitude = null,
updated_by = values(updated_by),
updated_time = NOW()
</insert>
<select id="selectDangerousChemicalsList" resultType="com.epmet.dto.result.IcDangerousChemicalsListResultDTO"> <select id="selectDangerousChemicalsList" resultType="com.epmet.dto.result.IcDangerousChemicalsListResultDTO">
SELECT SELECT

58
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml

@ -2,6 +2,64 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.epmet.dao.IcPublicServiceDao"> <mapper namespace="com.epmet.dao.IcPublicServiceDao">
<insert id="importInsert">
INSERT INTO ic_public_service
(
id,
customer_id,
agency_id,
agency_id_path,
source_type,
name,
category,
area_covered,
capacity,
address,
longitude,
latitude,
del_flag,
revision,
created_by,
created_time,
updated_by,
updated_time
)
VALUES
<foreach collection="entityList" item="i" separator=",">
(
REPLACE(UUID(), '-', ''),
#{i.customerId},
#{i.agencyId},
#{i.agencyIdPath},
#{i.sourceType},
#{i.name},
#{i.category},
#{i.areaCovered},
#{i.capacity},
#{i.address},
#{i.longitude},
#{i.latitude},
0,
0,
#{i.createdBy},
now(),
#{i.updatedBy},
now()
)
</foreach>
ON DUPLICATE KEY
UPDATE
source_type = values(source_type),
name = values(name),
category = values(category),
area_covered = values(area_covered),
capacity = values(capacity),
address = values(address),
longitude = null,
latitude = null,
updated_by = values(updated_by),
updated_time = NOW()
</insert>
<select id="selectPublicServiceList" resultType="com.epmet.dto.result.IcPublicServiceListResultDTO"> <select id="selectPublicServiceList" resultType="com.epmet.dto.result.IcPublicServiceListResultDTO">
SELECT SELECT

58
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcSuperiorResourceDao.xml

@ -2,6 +2,64 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.epmet.dao.IcSuperiorResourceDao"> <mapper namespace="com.epmet.dao.IcSuperiorResourceDao">
<insert id="importInsert">
INSERT INTO ic_superior_resource
(
id,
customer_id,
agency_id,
agency_id_path,
source_type,
name,
category,
area_covered,
capacity,
address,
longitude,
latitude,
del_flag,
revision,
created_by,
created_time,
updated_by,
updated_time
)
VALUES
<foreach collection="entityList" item="i" separator=",">
(
REPLACE(UUID(), '-', ''),
#{i.customerId},
#{i.agencyId},
#{i.agencyIdPath},
#{i.sourceType},
#{i.name},
#{i.category},
#{i.areaCovered},
#{i.capacity},
#{i.address},
#{i.longitude},
#{i.latitude},
0,
0,
#{i.createdBy},
now(),
#{i.updatedBy},
now()
)
</foreach>
ON DUPLICATE KEY
UPDATE
source_type = values(source_type),
name = values(name),
category = values(category),
area_covered = values(area_covered),
capacity = values(capacity),
address = values(address),
longitude = null,
latitude = null,
updated_by = values(updated_by),
updated_time = NOW()
</insert>
<select id="selectSuperiorResourceList" resultType="com.epmet.dto.result.IcSuperiorResourceListResultDTO"> <select id="selectSuperiorResourceList" resultType="com.epmet.dto.result.IcSuperiorResourceListResultDTO">
SELECT SELECT

Loading…
Cancel
Save