diff --git a/epmet-cloud-generator/src/main/resources/application.yml b/epmet-cloud-generator/src/main/resources/application.yml index fa8e272..7607e93 100644 --- a/epmet-cloud-generator/src/main/resources/application.yml +++ b/epmet-cloud-generator/src/main/resources/application.yml @@ -9,9 +9,9 @@ spring: type: com.alibaba.druid.pool.DruidDataSource #MySQL配置 driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/epmet_pli_power?useUnicode=true&characterEncoding=UTF-8&useSSL=false - username: root - password: Abc@123456 + url: jdbc:mysql://192.168.1.140:3306/epmet_pli_power?useUnicode=true&characterEncoding=UTF-8&useSSL=false + username: epmet_pli_power_user + password: EpmEt-db-UsEr #oracle配置 # driverClassName: oracle.jdbc.OracleDriver # url: jdbc:oracle:thin:@192.168.10.10:1521:helowin diff --git a/epmet-cloud-generator/src/main/resources/template/index.vue.vm b/epmet-cloud-generator/src/main/resources/template/index.vue.vm index 25aba76..9b3ba8b 100644 --- a/epmet-cloud-generator/src/main/resources/template/index.vue.vm +++ b/epmet-cloud-generator/src/main/resources/template/index.vue.vm @@ -1,50 +1,51 @@ + diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/PliPowerFeignClient.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/PliPowerFeignClient.java deleted file mode 100644 index f75c5fc..0000000 --- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/PliPowerFeignClient.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.epmet.plugin.power.feign; - -import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.utils.Result; -import com.epmet.plugin.power.dto.visit.form.VisitorLogoutFormDTO; -import com.epmet.plugin.power.feign.impl.PliPowerFeignClientFallBackFactory; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -/** - * desc: 数据统计 对外feign client - * - * @return: - * @date: 2020/6/22 17:39 - * @author: jianjun liu - */ -@FeignClient(name = ServiceConstant.PLI_POWER_SERVER, fallbackFactory = PliPowerFeignClientFallBackFactory.class) -public interface PliPowerFeignClient { - - @PostMapping("/pli/power/visitVisitor/visitorlogout") - Result visitorLogout(@RequestBody VisitorLogoutFormDTO formDTO); - -} diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/impl/PliPowerFeignClientFallBack.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/impl/PliPowerFeignClientFallBack.java deleted file mode 100644 index 63986ce..0000000 --- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/impl/PliPowerFeignClientFallBack.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.epmet.plugin.power.feign.impl; - -import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.utils.ModuleUtils; -import com.epmet.commons.tools.utils.Result; -import com.epmet.plugin.power.dto.visit.form.VisitorLogoutFormDTO; -import com.epmet.plugin.power.feign.PliPowerFeignClient; - -/** - * desc: - * - * @return: - * @date: 2020/6/22 9:38 - * @author: jianjun liu - * email:liujianjun@git.elinkit.com.cn - */ -public class PliPowerFeignClientFallBack implements PliPowerFeignClient { - - @Override - public Result visitorLogout(VisitorLogoutFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.PLI_POWER_SERVER, "visitorLogout",formDTO); - } - -} diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/impl/PliPowerFeignClientFallBackFactory.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/impl/PliPowerFeignClientFallBackFactory.java deleted file mode 100644 index 99e35fa..0000000 --- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/impl/PliPowerFeignClientFallBackFactory.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.epmet.plugin.power.feign.impl; - -import com.epmet.commons.tools.exception.ExceptionUtils; -import com.epmet.plugin.power.feign.PliPowerFeignClient; -import feign.hystrix.FallbackFactory; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -@Component -@Slf4j -public class PliPowerFeignClientFallBackFactory implements FallbackFactory { - - private PliPowerFeignClientFallBack fallback = new PliPowerFeignClientFallBack(); - - @Override - public PliPowerFeignClient create(Throwable cause) { - log.error(String.format("FeignClient调用发生异常,异常信息:%s", ExceptionUtils.getThrowableErrorStackTrace(cause))); - return fallback; - } -} diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/impl/HikCommunityInfoServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/impl/HikCommunityInfoServiceImpl.java index d026706..73d1117 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/impl/HikCommunityInfoServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/impl/HikCommunityInfoServiceImpl.java @@ -19,8 +19,7 @@ import com.epmet.plugin.power.dto.hik.HikCommunityInfoDTO; import com.epmet.plugin.power.modules.hik.entity.HikCommunityInfoEntity; import com.epmet.plugin.power.modules.hik.redis.HikCommunityInfoRedis; import com.epmet.plugin.power.modules.hik.service.HikCommunityInfoService; -import com.epmet.plugin.power.modules.utils.HkDeviceUtil; -import com.fasterxml.jackson.databind.ObjectMapper; +import com.epmet.plugin.power.modules.hik.utils.HkDeviceUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/impl/HikDeviceInfoServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/impl/HikDeviceInfoServiceImpl.java index 5933489..550c7ff 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/impl/HikDeviceInfoServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/impl/HikDeviceInfoServiceImpl.java @@ -18,11 +18,10 @@ import com.epmet.plugin.power.dto.hik.HikCommunityInfoDTO; import com.epmet.plugin.power.modules.hik.dao.HikCommunityInfoDao; import com.epmet.plugin.power.modules.hik.dao.HikDeviceInfoDao; import com.epmet.plugin.power.dto.hik.HikDeviceInfoDTO; -import com.epmet.plugin.power.modules.hik.entity.HikCommunityInfoEntity; import com.epmet.plugin.power.modules.hik.entity.HikDeviceInfoEntity; import com.epmet.plugin.power.modules.hik.redis.HikDeviceInfoRedis; import com.epmet.plugin.power.modules.hik.service.HikDeviceInfoService; -import com.epmet.plugin.power.modules.utils.HkDeviceUtil; +import com.epmet.plugin.power.modules.hik.utils.HkDeviceUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/utils/HkDeviceUtil.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/utils/HkDeviceUtil.java similarity index 99% rename from epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/utils/HkDeviceUtil.java rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/utils/HkDeviceUtil.java index fd9689b..9c2b572 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/utils/HkDeviceUtil.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/utils/HkDeviceUtil.java @@ -1,4 +1,4 @@ -package com.epmet.plugin.power.modules.utils; +package com.epmet.plugin.power.modules.hik.utils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java index a583600..4e16ba4 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java @@ -39,7 +39,7 @@ import com.epmet.plugin.power.modules.rent.redis.RentContractInfoRedis; import com.epmet.plugin.power.modules.rent.service.RentContractFileService; import com.epmet.plugin.power.modules.rent.service.RentContractInfoService; import com.epmet.plugin.power.modules.rent.service.RentTenantInfoService; -import com.epmet.plugin.power.modules.utils.HkDeviceUtil; +import com.epmet.plugin.power.modules.hik.utils.HkDeviceUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -194,7 +194,7 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl tenantParams = new HashMap<>(4); - tenantParams.put("contractId", contractDto.getId()); - List tenantList = rentTenantInfoService.list(tenantParams); - - tenantList.forEach(tenant -> { - RentTenantFormDTO formDTO = new RentTenantFormDTO(); - List images = new ArrayList<>(); - formDTO.setCustomerId(loginUserUtil.getLoginUserCustomerId()); - formDTO.setIdCard(tenant.getIdCard()); - formDTO.setType(NumConstant.ONE_STR); - - List imgList = rentContractFileService.listByRefAndType(tenant.getId(), NumConstant.ZERO_STR); - - imgList.forEach(img -> { - // 更新基础库的人员头像 - IcResiUserAttachmentDTO image = new IcResiUserAttachmentDTO(); - image.setAttachmentUrl(img.getFileUrl()); - image.setCustomerId(loginUserUtil.getLoginUserCustomerId()); - images.add(image); - }); - formDTO.setImages(images); - - // 初始化居民信息 - IcResiUserDTO user = new IcResiUserDTO(); - user.setCustomerId(loginUserUtil.getLoginUserCustomerId()); - user.setGridId(contractDto.getGridId()); - user.setVillageId(contractDto.getVillageId()); - user.setBuildId(contractDto.getBuildId()); - user.setUnitId(contractDto.getUnitId()); - user.setHomeId(contractDto.getHomeId()); - user.setName(tenant.getName()); - user.setIdCard(tenant.getIdCard()); - user.setMobile(tenant.getMobile()); - user.setGender(IdCardNoValidatorUtils.getGender(tenant.getIdCard())); - - user.setAgencyId(contractDto.getCommunityId()); - Result agencyInfo = govOrgOpenFeignClient.getAgencyById(contractDto.getCommunityId()); - user.setPids(agencyInfo.getData().getPids()); - - formDTO.setUser(user); - - epmetUserOpenFeignClient.updateImage(formDTO); - - }); - - // 更新房屋的状态为租赁 - Result houseInfo = govOrgOpenFeignClient.get(dto.getHomeId()); - IcHouseAddFormDTO formDTO = ConvertUtils.sourceToTarget(houseInfo.getData(), IcHouseAddFormDTO.class); - formDTO.setRentFlag(NumConstant.ONE); - formDTO.setHouseId(dto.getHomeId()); - govOrgOpenFeignClient.houseUpdate(formDTO); - } +// if (NumConstant.ONE_STR.equals(entity.getState())) { +// // 获取基本信息 +// RentContractInfoDTO contractDto = get(entity.getId()); +// +// // 获取租客信息 +// Map tenantParams = new HashMap<>(4); +// tenantParams.put("contractId", contractDto.getId()); +// List tenantList = rentTenantInfoService.list(tenantParams); +// +// tenantList.forEach(tenant -> { +// RentTenantFormDTO formDTO = new RentTenantFormDTO(); +// List images = new ArrayList<>(); +// formDTO.setCustomerId(loginUserUtil.getLoginUserCustomerId()); +// formDTO.setIdCard(tenant.getIdCard()); +// formDTO.setType(NumConstant.ONE_STR); +// +// List imgList = rentContractFileService.listByRefAndType(tenant.getId(), NumConstant.ZERO_STR); +// +// imgList.forEach(img -> { +// // 更新基础库的人员头像 +// IcResiUserAttachmentDTO image = new IcResiUserAttachmentDTO(); +// image.setAttachmentUrl(img.getFileUrl()); +// image.setCustomerId(loginUserUtil.getLoginUserCustomerId()); +// images.add(image); +// }); +// formDTO.setImages(images); +// +// // 初始化居民信息 +// IcResiUserDTO user = new IcResiUserDTO(); +// user.setCustomerId(loginUserUtil.getLoginUserCustomerId()); +// user.setGridId(contractDto.getGridId()); +// user.setVillageId(contractDto.getVillageId()); +// user.setBuildId(contractDto.getBuildId()); +// user.setUnitId(contractDto.getUnitId()); +// user.setHomeId(contractDto.getHomeId()); +// user.setName(tenant.getName()); +// user.setIdCard(tenant.getIdCard()); +// user.setMobile(tenant.getMobile()); +// user.setGender(IdCardNoValidatorUtils.getGender(tenant.getIdCard())); +// +// user.setAgencyId(contractDto.getCommunityId()); +// Result agencyInfo = govOrgOpenFeignClient.getAgencyById(contractDto.getCommunityId()); +// user.setPids(agencyInfo.getData().getPids()); +// +// formDTO.setUser(user); +// +// epmetUserOpenFeignClient.updateImage(formDTO); +// +// }); +// +// // 更新房屋的状态为租赁 +// Result houseInfo = govOrgOpenFeignClient.get(dto.getHomeId()); +// IcHouseAddFormDTO formDTO = ConvertUtils.sourceToTarget(houseInfo.getData(), IcHouseAddFormDTO.class); +// formDTO.setRentFlag(NumConstant.ONE); +// formDTO.setHouseId(dto.getHomeId()); +// govOrgOpenFeignClient.houseUpdate(formDTO); +// } } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisLeaderDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisLeaderDao.xml index 7b2f449..84a6e7e 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisLeaderDao.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisLeaderDao.xml @@ -54,12 +54,14 @@ LEFT JOIN pli_power_axis_tag AS ppat ON - poas.CATEGORY_CODE = ppat.CATEGORY_CODE and ppat.del_flag = '0' + poas.CATEGORY_CODE = ppat.CATEGORY_CODE and ppat.del_flag = '0' and ppat.customer_id = #{customerId} WHERE ppal.id = #{leaderId} AND ppal.customer_id = #{customerId} and ppal.del_flag = '0' + group by + ppal.id