增加客户ID字段，增加调用产品feign功能

epmet-plugins-module/pli-power-base/pli-power-base-server/pom.xml

@@ -187,7 +187,7 @@
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
-                <nacos.ip>192.168.43.98</nacos.ip>
+                <nacos.ip>192.168.43.168</nacos.ip>
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
 

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentBlacklistEntity.java

@@ -71,4 +71,9 @@ public class RentBlacklistEntity extends BaseEpmetEntity {
      */
 	private String removeReason;
 
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentContractFileEntity.java

@@ -36,4 +36,9 @@ public class RentContractFileEntity extends BaseEpmetEntity {
      */
 	private String fileType;
 
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentContractInfoEntity.java

@@ -136,4 +136,9 @@ public class RentContractInfoEntity extends BaseEpmetEntity {
      */
 	private String reason;
 
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentTenantInfoEntity.java

@@ -54,6 +54,11 @@ public class RentTenantInfoEntity extends BaseEpmetEntity {
      */
 	private String type;
 
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
 	/**
 	 * 头像列表
 	 */

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentBlacklistServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.plugin.power.modules.rent.dao.RentBlacklistDao;
@@ -34,6 +35,9 @@ public class RentBlacklistServiceImpl extends BaseServiceImpl<RentBlacklistDao,
     @Autowired
     private RentBlacklistRedis rentBlacklistRedis;
 
+    @Autowired
+    LoginUserUtil loginUserUtil;
+
     @Override
     public PageData<RentBlacklistDTO> page(Map<String, Object> params) {
         IPage<RentBlacklistEntity> page = baseDao.selectPage(
@@ -85,6 +89,7 @@ public class RentBlacklistServiceImpl extends BaseServiceImpl<RentBlacklistDao,
         }
 
         RentBlacklistEntity entity = ConvertUtils.sourceToTarget(dto, RentBlacklistEntity.class);
+        entity.setCustomerId(loginUserUtil.getLoginUserCustomerId());
         insert(entity);
     }
 

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java

@@ -7,6 +7,7 @@ import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.plugin.power.dto.rent.RentContractFileDTO;
 import com.epmet.plugin.power.dto.rent.RentContractInfoDTO;
@@ -41,6 +42,9 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
     @Autowired
     private RentContractInfoRedis rentContractInfoRedis;
 
+    @Autowired
+    LoginUserUtil loginUserUtil;
+
     @Autowired
     private RentTenantInfoService rentTenantInfoService;
 
@@ -141,6 +145,7 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
     @Transactional(rollbackFor = Exception.class)
     public void save(RentContractInfoDTO dto) {
         RentContractInfoEntity entity = ConvertUtils.sourceToTarget(dto, RentContractInfoEntity.class);
+        entity.setCustomerId(loginUserUtil.getLoginUserCustomerId());
         insert(entity);
         updateTenantAndFile(entity.getId(), dto);
     }
@@ -150,8 +155,8 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
     public void review(RentContractInfoDTO dto) {
         RentContractInfoEntity entity = ConvertUtils.sourceToTarget(dto, RentContractInfoEntity.class);
         updateById(entity);
-        if(NumConstant.ONE_STR.equals(entity.getState())){
+        if (NumConstant.ONE_STR.equals(entity.getState())) {
-
+            // todo 更新头像到产品人员库
         }
     }
 
@@ -191,6 +196,7 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
                 }
                 tenant.setContractId(contractId);
                 tenant.setType(NumConstant.ONE_STR);
+                tenant.setCustomerId(loginUserUtil.getLoginUserCustomerId());
             });
             rentTenantInfoService.insertBatch(tenantList);
             // 处理租客头像
@@ -202,6 +208,7 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
                     imgList.forEach(img -> {
                         img.setReferenceId(tenant.getId());
                         img.setFileType(NumConstant.ZERO_STR);
+                        img.setCustomerId(loginUserUtil.getLoginUserCustomerId());
                     });
                     rentContractFileService.insertBatch(imgList);
                 }
@@ -215,6 +222,7 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
             fileList.forEach(item -> {
                 item.setReferenceId(contractId);
                 item.setFileType(NumConstant.ONE_STR);
+                item.setCustomerId(loginUserUtil.getLoginUserCustomerId());
             });
             rentContractFileService.insertBatch(fileList);
         }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentTenantInfoServiceImpl.java

@@ -7,6 +7,7 @@ import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.plugin.power.dto.rent.RentTenantInfoDTO;
 import com.epmet.plugin.power.modules.rent.dao.RentTenantInfoDao;
@@ -36,6 +37,9 @@ public class RentTenantInfoServiceImpl extends BaseServiceImpl<RentTenantInfoDao
     @Autowired
     private RentTenantInfoRedis rentTenantInfoRedis;
 
+    @Autowired
+    LoginUserUtil loginUserUtil;
+
     @Autowired
     private RentContractFileService rentContractFileService;
 
@@ -77,19 +81,26 @@ public class RentTenantInfoServiceImpl extends BaseServiceImpl<RentTenantInfoDao
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(RentTenantInfoDTO dto) {
-        RentTenantInfoEntity entity = ConvertUtils.sourceToTarget(dto, RentTenantInfoEntity.class);
-        insert(entity);
         // 处理头像
         if (dto.getImgList().isEmpty()) {
             throw new EpmetException("照片不能为空");
         } else {
+            RentTenantInfoEntity entity = ConvertUtils.sourceToTarget(dto, RentTenantInfoEntity.class);
+            entity.setCustomerId(loginUserUtil.getLoginUserCustomerId());
+            insert(entity);
+
             List<RentContractFileEntity> imgList = ConvertUtils.sourceToTarget(dto.getImgList(), RentContractFileEntity.class);
             imgList.forEach(img -> {
                 img.setReferenceId(entity.getId());
                 img.setFileType(NumConstant.ZERO_STR);
+                img.setCustomerId(loginUserUtil.getLoginUserCustomerId());
             });
             rentContractFileService.insertBatch(imgList);
         }
+
+        if (NumConstant.ZERO_STR.equals(dto.getType())) {
+            // todo 更新头像到产品人员库
+        }
     }
 
     @Override