elink-star
/
epmet-cloud-lingshan
forked from luyan/epmet-cloud-lingshan
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改逻辑

master
HAHA 3 years ago
parent
9b0e939ad7
commit
8ddadd948e
11 changed files with 132 additions and 119 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaLoudongDao.java
  2. 4
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaPingfangDao.java
  3. 4
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRentalDao.java
  4. 4
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaResidentDao.java
  5. 4
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRotatorsDao.java
  6. 47
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java
  7. 48
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaPingfangServiceImpl.java
  8. 39
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRentalServiceImpl.java
  9. 49
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaResidentServiceImpl.java
  10. 47
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java
  11. 1
      epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml

4
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaLoudongDao.java
View File

@ -42,5 +42,5 @@ public interface CaLoudongDao extends BaseDao<CaLoudongEntity> {
*/ */
CaLoudongDetailsResultDTO getLouDongDetails(@Param("buildingId") BigInteger buildingId); CaLoudongDetailsResultDTO getLouDongDetails(@Param("buildingId") BigInteger buildingId);
void deleteAll(); int deleteAll();
} }

4
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaPingfangDao.java
View File

@ -25,7 +25,7 @@ public interface CaPingfangDao extends BaseDao<CaPingfangEntity> {
List<CaPingfangResultDTO> getPage(@Param("buildingName") String buildingName, List<CaPingfangResultDTO> getPage(@Param("buildingName") String buildingName,
@Param("communityName") String communityName); @Param("communityName") String communityName);
void deleteAll(); int deleteAll();
/** /**
* 平房详情 * 平房详情
@ -34,4 +34,4 @@ public interface CaPingfangDao extends BaseDao<CaPingfangEntity> {
* @return * @return
*/ */
CaPingFangDetailsResultDTO getPingFangDetails(@Param("buildingId") String buildingId); CaPingFangDetailsResultDTO getPingFangDetails(@Param("buildingId") String buildingId);
} }

4
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRentalDao.java
View File

@ -30,7 +30,7 @@ public interface CaRentalDao extends BaseDao<CaRentalEntity> {
@Param("houseName") String houseName, @Param("houseName") String houseName,
@Param("renterName") String renterName); @Param("renterName") String renterName);
void deleteAll(); int deleteAll();
/** /**
* 出租房详情 * 出租房详情
@ -39,4 +39,4 @@ public interface CaRentalDao extends BaseDao<CaRentalEntity> {
* @return * @return
*/ */
CaRentalDetailsResultDTO getRentalDetails(@Param("rentalId") String rentalId); CaRentalDetailsResultDTO getRentalDetails(@Param("rentalId") String rentalId);
} }

4
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaResidentDao.java
View File

@ -29,7 +29,7 @@ public interface CaResidentDao extends BaseDao<CaResidentEntity> {
@Param("idCard") String idCard, @Param("idCard") String idCard,
@Param("telephone") String telephone); @Param("telephone") String telephone);
void deleteAll(); int deleteAll();
/** /**
* 人口基本信息详情 * 人口基本信息详情
@ -38,4 +38,4 @@ public interface CaResidentDao extends BaseDao<CaResidentEntity> {
* @return * @return
*/ */
CaResidentDetailsResultDTO getResidentDetails(@Param("idCard") String idCard); CaResidentDetailsResultDTO getResidentDetails(@Param("idCard") String idCard);
} }

4
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRotatorsDao.java
View File

@ -30,7 +30,7 @@ public interface CaRotatorsDao extends BaseDao<CaRotatorsEntity> {
@Param("idCard") String idCard, @Param("idCard") String idCard,
@Param("telephone") String telephone); @Param("telephone") String telephone);
void deleteAll(); int deleteAll();
/** /**
* 流动人口详情 * 流动人口详情
@ -39,4 +39,4 @@ public interface CaRotatorsDao extends BaseDao<CaRotatorsEntity> {
* @return * @return
*/ */
CaRotatorsDetailsResultDTO getRotatorsDetails(@Param("idCard") String idCard); CaRotatorsDetailsResultDTO getRotatorsDetails(@Param("idCard") String idCard);
} }

47
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java
View File

@ -135,28 +135,31 @@ public class CaLoudongServiceImpl extends BaseServiceImpl<CaLoudongDao, CaLoudon
*/ */
@Override @Override
public void preserLouDongVation(PreserVationFormDTO dto) { public void preserLouDongVation(PreserVationFormDTO dto) {
baseDao.deleteAll(); int i = baseDao.deleteAll();
dto.setPageNo(NumConstant.ONE); if (i >= 0) {
dto.setPageSize(NumConstant.FIFTY); dto.setPageNo(NumConstant.ONE);
dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM); dto.setPageSize(NumConstant.FIFTY);
dto.setTableName(CaWghDataConstant.UNICOM_LOUDONG); dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM);
dto.setTableName(CaWghDataConstant.UNICOM_LOUDONG);
dto.setWhereCase("delete_flag = 'normal'");
dto.setOrderBy("grid_id,update_date,building_id desc"); dto.setWhereCase("delete_flag = 'normal'");
dto.setOrderBy("grid_id,update_date,building_id desc");
int pageNo = 1;
int pageNo = 1;
int total = 0;
int total = 0;
do {
try { do {
total = listLouDong(dto); try {
pageNo++; total = listLouDong(dto);
dto.setPageNo(pageNo); pageNo++;
} catch (Exception e) { dto.setPageNo(pageNo);
e.printStackTrace(); } catch (Exception e) {
} e.printStackTrace();
} while (total > (pageNo * NumConstant.FIFTY)); }
} while (total > (pageNo * NumConstant.FIFTY));
}
} }

48
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaPingfangServiceImpl.java
View File

@ -114,29 +114,31 @@ public class CaPingfangServiceImpl extends BaseServiceImpl<CaPingfangDao, CaPing
*/ */
@Override @Override
public void preserPingFangVation(PreserVationFormDTO dto) { public void preserPingFangVation(PreserVationFormDTO dto) {
baseDao.deleteAll(); int i = baseDao.deleteAll();
if (i >= 0) {
dto.setPageNo(NumConstant.ONE); dto.setPageNo(NumConstant.ONE);
dto.setPageSize(NumConstant.FIFTY); dto.setPageSize(NumConstant.FIFTY);
dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM); dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM);
dto.setTableName(CaWghDataConstant.UNICOM_PINGFANG); dto.setTableName(CaWghDataConstant.UNICOM_PINGFANG);
dto.setWhereCase("delete_flag = 'normal'"); dto.setWhereCase("delete_flag = 'normal'");
dto.setOrderBy("grid_id,update_date,building_id desc"); dto.setOrderBy("grid_id,update_date,building_id desc");
int pageNo = 1; int pageNo = 1;
int total = 0; int total = 0;
do {
try {
total = listPingFang(dto);
pageNo++;
dto.setPageNo(pageNo);
} catch (Exception e) {
e.printStackTrace();
}
} while (total > (pageNo * NumConstant.FIFTY));
}
do {
try {
total = listPingFang(dto);
pageNo++;
dto.setPageNo(pageNo);
} catch (Exception e) {
e.printStackTrace();
}
} while (total > (pageNo * NumConstant.FIFTY));
} }
@ -149,7 +151,7 @@ public class CaPingfangServiceImpl extends BaseServiceImpl<CaPingfangDao, CaPing
private int listPingFang(PreserVationFormDTO dto) throws Exception { private int listPingFang(PreserVationFormDTO dto) throws Exception {
String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY);
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
obj.put(CaWghDataConstant.UNICOM_CONDITION,aes); obj.put(CaWghDataConstant.UNICOM_CONDITION, aes);
String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_UNICON, obj.toJSONString()).getData(); String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_UNICON, obj.toJSONString()).getData();
JSONObject toResult = JSON.parseObject(data); JSONObject toResult = JSON.parseObject(data);
Result result = ConvertUtils.mapToEntity(toResult, Result.class); Result result = ConvertUtils.mapToEntity(toResult, Result.class);

39
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRentalServiceImpl.java
View File

@ -119,29 +119,32 @@ public class CaRentalServiceImpl extends BaseServiceImpl<CaRentalDao, CaRentalEn
*/ */
@Override @Override
public void preserRentalVation(PreserVationFormDTO dto) { public void preserRentalVation(PreserVationFormDTO dto) {
baseDao.deleteAll(); int i = baseDao.deleteAll();
dto.setPageNo(NumConstant.ONE); if (i >= 0) {
dto.setPageSize(NumConstant.FIFTY); dto.setPageNo(NumConstant.ONE);
dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM); dto.setPageSize(NumConstant.FIFTY);
dto.setTableName(CaWghDataConstant.UNICOM_RENTAL); dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM);
dto.setTableName(CaWghDataConstant.UNICOM_RENTAL);
dto.setWhereCase("delete_flag = 'normal'"); dto.setWhereCase("delete_flag = 'normal'");
dto.setOrderBy("grid_id,update_date,rental_id desc"); dto.setOrderBy("grid_id,update_date,rental_id desc");
int pageNo = 1; int pageNo = 1;
int total = 0; int total = 0;
do { do {
try { try {
total = listRental(dto); total = listRental(dto);
pageNo++; pageNo++;
dto.setPageNo(pageNo); dto.setPageNo(pageNo);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} while (total > (pageNo * NumConstant.FIFTY)); } while (total > (pageNo * NumConstant.FIFTY));
}
} }

49
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaResidentServiceImpl.java
View File

@ -122,29 +122,30 @@ public class CaResidentServiceImpl extends BaseServiceImpl<CaResidentDao, CaResi
*/ */
@Override @Override
public void preserResidentVation(PreserVationFormDTO dto) { public void preserResidentVation(PreserVationFormDTO dto) {
baseDao.deleteAll(); int i = baseDao.deleteAll();
if (i >= 0) {
dto.setPageNo(NumConstant.ONE); dto.setPageNo(NumConstant.ONE);
dto.setPageSize(NumConstant.FIFTY); dto.setPageSize(NumConstant.FIFTY);
dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM); dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM);
dto.setTableName(CaWghDataConstant.UNICOM_RESIDENT); dto.setTableName(CaWghDataConstant.UNICOM_RESIDENT);
dto.setWhereCase("delete_flag = 'normal'"); dto.setWhereCase("delete_flag = 'normal'");
dto.setOrderBy("grid_id,update_date,resident_id desc"); dto.setOrderBy("grid_id,update_date,resident_id desc");
int pageNo = 1; int pageNo = 1;
int total = 0; int total = 0;
do { do {
try { try {
total = listResident(dto); total = listResident(dto);
pageNo++; pageNo++;
dto.setPageNo(pageNo); dto.setPageNo(pageNo);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} while (total > (pageNo * NumConstant.FIFTY)); } while (total > (pageNo * NumConstant.FIFTY));
}
} }
@Override @Override
@ -157,7 +158,7 @@ public class CaResidentServiceImpl extends BaseServiceImpl<CaResidentDao, CaResi
private int listResident(PreserVationFormDTO dto) throws Exception { private int listResident(PreserVationFormDTO dto) throws Exception {
String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY);
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
obj.put(CaWghDataConstant.UNICOM_CONDITION,aes); obj.put(CaWghDataConstant.UNICOM_CONDITION, aes);
String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_UNICON, obj.toJSONString()).getData(); String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_UNICON, obj.toJSONString()).getData();
JSONObject toResult = JSON.parseObject(data); JSONObject toResult = JSON.parseObject(data);
Result result = ConvertUtils.mapToEntity(toResult, Result.class); Result result = ConvertUtils.mapToEntity(toResult, Result.class);

47
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java
View File

@ -122,28 +122,31 @@ public class CaRotatorsServiceImpl extends BaseServiceImpl<CaRotatorsDao, CaRota
*/ */
@Override @Override
public void preserRotatorsVation(PreserVationFormDTO dto) { public void preserRotatorsVation(PreserVationFormDTO dto) {
baseDao.deleteAll(); int i = baseDao.deleteAll();
dto.setPageNo(NumConstant.ONE); if (i >= 0) {
dto.setPageSize(NumConstant.FIFTY); dto.setPageNo(NumConstant.ONE);
dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM); dto.setPageSize(NumConstant.FIFTY);
dto.setTableName(CaWghDataConstant.UNICOM_ROTATORS); dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM);
dto.setTableName(CaWghDataConstant.UNICOM_ROTATORS);
dto.setWhereCase("delete_flag = 'normal'");
dto.setOrderBy("grid_id,update_date,rotators_id desc"); dto.setWhereCase("delete_flag = 'normal'");
dto.setOrderBy("grid_id,update_date,rotators_id desc");
int pageNo = 1;
int pageNo = 1;
int total = 0;
int total = 0;
do {
try { do {
total = listRotators(dto); try {
pageNo++; total = listRotators(dto);
dto.setPageNo(pageNo); pageNo++;
} catch (Exception e) { dto.setPageNo(pageNo);
e.printStackTrace(); } catch (Exception e) {
} e.printStackTrace();
} while (total > (pageNo * NumConstant.FIFTY)); }
} while (total > (pageNo * NumConstant.FIFTY));
}
} }
@Override @Override

1
epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml
View File

@ -61,6 +61,7 @@
<delete id="deleteAll"> <delete id="deleteAll">
delete from ca_resident delete from ca_resident
</delete> </delete>
<select id="getPage" resultType="com.epmet.opendata.dto.result.CaResidentResultDTO"> <select id="getPage" resultType="com.epmet.opendata.dto.result.CaResidentResultDTO">
SELECT SELECT
resident_id, resident_id,

Write Preview
Loading…
Cancel
Save