diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java index 067fc1dd85..98a9dfaedd 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java @@ -21,6 +21,7 @@ import com.epmet.opendata.dto.result.CaLoudongResultDTO; import com.epmet.opendata.entity.CaLoudongEntity; import com.epmet.opendata.redis.CaLoudongRedis; import com.epmet.opendata.service.CaLoudongService; +import com.epmet.opendata.util.AesUtils; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.google.gson.JsonObject; @@ -107,7 +108,7 @@ public class CaLoudongServiceImpl extends BaseServiceImpl getPage(CaLoudongFormDTO dto) { PageHelper.startPage(dto.getPage(), dto.getLimit()); - List result = baseDao.getPage(dto.getCommunityName(),dto.getBuildingName()); + List result = baseDao.getPage(dto.getCommunityName(), dto.getBuildingName()); PageInfo info = new PageInfo<>(result); return new PageData<>(result, info.getTotal()); } @@ -150,15 +151,20 @@ public class CaLoudongServiceImpl extends BaseServiceImpl (pageNo * NumConstant.FIFTY)); } enum loudongEnum { LD("unicom", "ca_loudong"), + AES("key", "hriajrutnbghajsd") ; private String name; @@ -172,8 +178,11 @@ public class CaLoudongServiceImpl extends BaseServiceImpl result = baseDao.getPage(dto.getBuildingName(),dto.getCommunityName()); + List result = baseDao.getPage(dto.getBuildingName(), dto.getCommunityName()); PageInfo info = new PageInfo<>(result); return new PageData<>(result, info.getTotal()); } @@ -129,9 +130,13 @@ public class CaPingfangServiceImpl extends BaseServiceImpl (pageNo * NumConstant.FIFTY)); } @@ -145,6 +150,7 @@ public class CaPingfangServiceImpl extends BaseServiceImpl (pageNo * NumConstant.FIFTY)); } @@ -150,6 +155,7 @@ public class CaRentalServiceImpl extends BaseServiceImpl (pageNo * NumConstant.FIFTY)); } @@ -153,6 +158,7 @@ public class CaResidentServiceImpl extends BaseServiceImpl { - if(StringUtils.isNotBlank(item.getIdCard())) { + if (StringUtils.isNotBlank(item.getIdCard())) { Result client = openFeignClient.getByResiIdCard(item.getIdCard()); IcResiUserDTO clientData = client.getData(); item.setIcResiUser(clientData.getId()); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java index 895f055a30..a1bedc6f17 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java @@ -25,6 +25,7 @@ import com.epmet.opendata.entity.CaLoudongEntity; import com.epmet.opendata.entity.CaRotatorsEntity; import com.epmet.opendata.redis.CaRotatorsRedis; import com.epmet.opendata.service.CaRotatorsService; +import com.epmet.opendata.util.AesUtils; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; @@ -137,9 +138,13 @@ public class CaRotatorsServiceImpl extends BaseServiceImpl (pageNo * NumConstant.FIFTY)); } @@ -152,6 +157,7 @@ public class CaRotatorsServiceImpl extends BaseServiceImpl