Browse Source

Merge branch 'dev_zufangUpdate' into dev

dev
wanggongfeng 3 years ago
parent
commit
bdcd2e33d5
  1. 6
      epmet-cloud-generator/src/main/resources/application.yml
  2. 94
      epmet-cloud-generator/src/main/resources/template/index.vue.vm
  3. 24
      epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/PliPowerFeignClient.java
  4. 24
      epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/impl/PliPowerFeignClientFallBack.java
  5. 20
      epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/impl/PliPowerFeignClientFallBackFactory.java
  6. 3
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/impl/HikCommunityInfoServiceImpl.java
  7. 3
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/impl/HikDeviceInfoServiceImpl.java
  8. 2
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/utils/HkDeviceUtil.java
  9. 118
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java
  10. 4
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisLeaderDao.xml

6
epmet-cloud-generator/src/main/resources/application.yml

@ -9,9 +9,9 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
#MySQL配置 #MySQL配置
driverClassName: com.mysql.jdbc.Driver 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 url: jdbc:mysql://192.168.1.140:3306/epmet_pli_power?useUnicode=true&characterEncoding=UTF-8&useSSL=false
username: root username: epmet_pli_power_user
password: Abc@123456 password: EpmEt-db-UsEr
#oracle配置 #oracle配置
# driverClassName: oracle.jdbc.OracleDriver # driverClassName: oracle.jdbc.OracleDriver
# url: jdbc:oracle:thin:@192.168.10.10:1521:helowin # url: jdbc:oracle:thin:@192.168.10.10:1521:helowin

94
epmet-cloud-generator/src/main/resources/template/index.vue.vm

@ -1,50 +1,51 @@
<template> <template>
<el-card shadow="never" class="aui-card--fill"> <div class="mod-${moduleName}__${pathName}} resi-container">
<div class="mod-${moduleName}__${pathName}}"> <el-card ref="searchCard" class="search-card">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item> <el-form-item>
<el-input v-model="dataForm.${pk.attrname}" placeholder="${pk.attrname}" clearable></el-input> <el-input size="small" v-model="dataForm.${pk.attrname}" placeholder="${pk.attrname}" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button> <el-button type="primary" size="small" @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('${moduleName}:${pathName}:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('${moduleName}:${pathName}:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%"> </el-card>
<el-card class="resi-card-table">
<div class="resi-row-btn">
<el-button class="diy-button--add" type="primary" size="small" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
<el-button class="diy-button--add" type="danger" size="small" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
</div>
<el-table v-loading="dataListLoading" class="resi-table" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%" :height="tableHeight">
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
#foreach($column in $columns) #foreach($column in $columns)
<el-table-column prop="${column.attrname}" label="${column.comments}" header-align="center" align="center"></el-table-column> <el-table-column prop="${column.attrname}" label="${column.comments}" header-align="center" align="center"></el-table-column>
#end #end
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150"> <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="$hasPermission('${moduleName}:${pathName}:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button> <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
<el-button v-if="$hasPermission('${moduleName}:${pathName}:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button> <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination
:current-page="page" :current-page="page"
:page-sizes="[10, 20, 50, 100]" :page-sizes="[10, 20, 50, 100]"
:page-size="limit" :page-size="limit"
:total="total" :total="total"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle" @size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle"> @current-change="pageCurrentChangeHandle">
</el-pagination> </el-pagination>
<!-- 弹窗, 新增 / 修改 --> </el-card>
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update> <!-- 弹窗, 新增 / 修改 -->
</div> <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
</el-card> </div>
</template> </template>
<script> <script>
import mixinViewModule from '@/mixins/view-module' import mixinViewModule from '@/mixins/view-module'
import AddOrUpdate from './${pathName}-add-or-update' import AddOrUpdate from './${pathName}-add-or-update'
import { mapGetters } from 'vuex'
export default { export default {
mixins: [mixinViewModule], mixins: [mixinViewModule],
data () { data () {
@ -62,6 +63,45 @@ export default {
}, },
components: { components: {
AddOrUpdate AddOrUpdate
},
computed: {
...mapGetters(["clientHeight", "iframeHeight"]),
tableHeight() {
const h = this.clientHeight - 360 + this.iframeHeight;
const _h = this.clientHeight - 360;
return this.$store.state.inIframe ? h : _h;
},
} }
} }
</script> </script>
<style lang="scss" scoped>
@import "@/assets/scss/buttonstyle.scss";
.resi-container .resi-card-table {
::v-deep .el-table th {
color: #fff;
background-color: rgba(33, 149, 254, 1);
}
}
.resi-table {
::v-deep .el-button--text {
text-decoration: underline;
}
}
.search-card {
.el-card__body {
padding: 20px 20px 0 20px;
}
}
.resi-row-btn {
margin-bottom: 13px;
.upload-btn {
display: inline-block;
margin: 0 10px;
}
}
</style>

24
epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/PliPowerFeignClient.java

@ -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);
}

24
epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/impl/PliPowerFeignClientFallBack.java

@ -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);
}
}

20
epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/impl/PliPowerFeignClientFallBackFactory.java

@ -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<PliPowerFeignClient> {
private PliPowerFeignClientFallBack fallback = new PliPowerFeignClientFallBack();
@Override
public PliPowerFeignClient create(Throwable cause) {
log.error(String.format("FeignClient调用发生异常,异常信息:%s", ExceptionUtils.getThrowableErrorStackTrace(cause)));
return fallback;
}
}

3
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.entity.HikCommunityInfoEntity;
import com.epmet.plugin.power.modules.hik.redis.HikCommunityInfoRedis; import com.epmet.plugin.power.modules.hik.redis.HikCommunityInfoRedis;
import com.epmet.plugin.power.modules.hik.service.HikCommunityInfoService; import com.epmet.plugin.power.modules.hik.service.HikCommunityInfoService;
import com.epmet.plugin.power.modules.utils.HkDeviceUtil; import com.epmet.plugin.power.modules.hik.utils.HkDeviceUtil;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

3
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.HikCommunityInfoDao;
import com.epmet.plugin.power.modules.hik.dao.HikDeviceInfoDao; import com.epmet.plugin.power.modules.hik.dao.HikDeviceInfoDao;
import com.epmet.plugin.power.dto.hik.HikDeviceInfoDTO; 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.entity.HikDeviceInfoEntity;
import com.epmet.plugin.power.modules.hik.redis.HikDeviceInfoRedis; import com.epmet.plugin.power.modules.hik.redis.HikDeviceInfoRedis;
import com.epmet.plugin.power.modules.hik.service.HikDeviceInfoService; 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.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

2
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/utils/HkDeviceUtil.java → 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.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;

118
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.RentContractFileService;
import com.epmet.plugin.power.modules.rent.service.RentContractInfoService; import com.epmet.plugin.power.modules.rent.service.RentContractInfoService;
import com.epmet.plugin.power.modules.rent.service.RentTenantInfoService; 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.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -194,7 +194,7 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void savePc(RentContractInfoDTO dto) { public void savePc(RentContractInfoDTO dto) {
// PC 端新增,默认审核通过(0:待审核;1:通过;2:不通过) // PC 端新增,默认审核通过(0:待审核;1:通过;2:不通过)
dto.setState("1"); dto.setState("0");
// 是否是 PC 录入(0:否,1:是) // 是否是 PC 录入(0:否,1:是)
dto.setIsPcInput("1"); dto.setIsPcInput("1");
@ -206,63 +206,63 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
updateTenantAndFile(entity.getId(), dto); updateTenantAndFile(entity.getId(), dto);
// PC新增,默认审核通过,需要更新基础库头像信息以及居民信息,最后更新房屋的状态 // PC新增,默认审核通过,需要更新基础库头像信息以及居民信息,最后更新房屋的状态
if (NumConstant.ONE_STR.equals(entity.getState())) { // if (NumConstant.ONE_STR.equals(entity.getState())) {
// 获取基本信息 // // 获取基本信息
RentContractInfoDTO contractDto = get(entity.getId()); // RentContractInfoDTO contractDto = get(entity.getId());
//
// 获取租客信息 // // 获取租客信息
Map<String, Object> tenantParams = new HashMap<>(4); // Map<String, Object> tenantParams = new HashMap<>(4);
tenantParams.put("contractId", contractDto.getId()); // tenantParams.put("contractId", contractDto.getId());
List<RentTenantInfoDTO> tenantList = rentTenantInfoService.list(tenantParams); // List<RentTenantInfoDTO> tenantList = rentTenantInfoService.list(tenantParams);
//
tenantList.forEach(tenant -> { // tenantList.forEach(tenant -> {
RentTenantFormDTO formDTO = new RentTenantFormDTO(); // RentTenantFormDTO formDTO = new RentTenantFormDTO();
List<IcResiUserAttachmentDTO> images = new ArrayList<>(); // List<IcResiUserAttachmentDTO> images = new ArrayList<>();
formDTO.setCustomerId(loginUserUtil.getLoginUserCustomerId()); // formDTO.setCustomerId(loginUserUtil.getLoginUserCustomerId());
formDTO.setIdCard(tenant.getIdCard()); // formDTO.setIdCard(tenant.getIdCard());
formDTO.setType(NumConstant.ONE_STR); // formDTO.setType(NumConstant.ONE_STR);
//
List<RentContractFileDTO> imgList = rentContractFileService.listByRefAndType(tenant.getId(), NumConstant.ZERO_STR); // List<RentContractFileDTO> imgList = rentContractFileService.listByRefAndType(tenant.getId(), NumConstant.ZERO_STR);
//
imgList.forEach(img -> { // imgList.forEach(img -> {
// 更新基础库的人员头像 // // 更新基础库的人员头像
IcResiUserAttachmentDTO image = new IcResiUserAttachmentDTO(); // IcResiUserAttachmentDTO image = new IcResiUserAttachmentDTO();
image.setAttachmentUrl(img.getFileUrl()); // image.setAttachmentUrl(img.getFileUrl());
image.setCustomerId(loginUserUtil.getLoginUserCustomerId()); // image.setCustomerId(loginUserUtil.getLoginUserCustomerId());
images.add(image); // images.add(image);
}); // });
formDTO.setImages(images); // formDTO.setImages(images);
//
// 初始化居民信息 // // 初始化居民信息
IcResiUserDTO user = new IcResiUserDTO(); // IcResiUserDTO user = new IcResiUserDTO();
user.setCustomerId(loginUserUtil.getLoginUserCustomerId()); // user.setCustomerId(loginUserUtil.getLoginUserCustomerId());
user.setGridId(contractDto.getGridId()); // user.setGridId(contractDto.getGridId());
user.setVillageId(contractDto.getVillageId()); // user.setVillageId(contractDto.getVillageId());
user.setBuildId(contractDto.getBuildId()); // user.setBuildId(contractDto.getBuildId());
user.setUnitId(contractDto.getUnitId()); // user.setUnitId(contractDto.getUnitId());
user.setHomeId(contractDto.getHomeId()); // user.setHomeId(contractDto.getHomeId());
user.setName(tenant.getName()); // user.setName(tenant.getName());
user.setIdCard(tenant.getIdCard()); // user.setIdCard(tenant.getIdCard());
user.setMobile(tenant.getMobile()); // user.setMobile(tenant.getMobile());
user.setGender(IdCardNoValidatorUtils.getGender(tenant.getIdCard())); // user.setGender(IdCardNoValidatorUtils.getGender(tenant.getIdCard()));
//
user.setAgencyId(contractDto.getCommunityId()); // user.setAgencyId(contractDto.getCommunityId());
Result<CustomerAgencyDTO> agencyInfo = govOrgOpenFeignClient.getAgencyById(contractDto.getCommunityId()); // Result<CustomerAgencyDTO> agencyInfo = govOrgOpenFeignClient.getAgencyById(contractDto.getCommunityId());
user.setPids(agencyInfo.getData().getPids()); // user.setPids(agencyInfo.getData().getPids());
//
formDTO.setUser(user); // formDTO.setUser(user);
//
epmetUserOpenFeignClient.updateImage(formDTO); // epmetUserOpenFeignClient.updateImage(formDTO);
//
}); // });
//
// 更新房屋的状态为租赁 // // 更新房屋的状态为租赁
Result<IcHouseDTO> houseInfo = govOrgOpenFeignClient.get(dto.getHomeId()); // Result<IcHouseDTO> houseInfo = govOrgOpenFeignClient.get(dto.getHomeId());
IcHouseAddFormDTO formDTO = ConvertUtils.sourceToTarget(houseInfo.getData(), IcHouseAddFormDTO.class); // IcHouseAddFormDTO formDTO = ConvertUtils.sourceToTarget(houseInfo.getData(), IcHouseAddFormDTO.class);
formDTO.setRentFlag(NumConstant.ONE); // formDTO.setRentFlag(NumConstant.ONE);
formDTO.setHouseId(dto.getHomeId()); // formDTO.setHouseId(dto.getHomeId());
govOrgOpenFeignClient.houseUpdate(formDTO); // govOrgOpenFeignClient.houseUpdate(formDTO);
} // }
} }

4
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisLeaderDao.xml

@ -54,12 +54,14 @@
LEFT JOIN LEFT JOIN
pli_power_axis_tag AS ppat pli_power_axis_tag AS ppat
ON 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 WHERE
ppal.id = #{leaderId} ppal.id = #{leaderId}
AND AND
ppal.customer_id = #{customerId} ppal.customer_id = #{customerId}
and ppal.del_flag = '0' and ppal.del_flag = '0'
group by
ppal.id
</select> </select>

Loading…
Cancel
Save