Merge remote-tracking branch 'origin/master'

epmet-plugins-common/src/main/java/com/epmet/plugin/commons/redis/RedisKeys.java

@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.plugin.commons.redis;
+
+/**
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+public class RedisKeys {
+
+    /**
+     * redis前缀
+     */
+    private static String rootPrefix = "epmet:";
+
+    /**
+     * 海康accessToken
+     */
+    public static String getHikTokenKey() {
+        return rootPrefix.concat("hik:token");
+    }
+
+    /**
+     * 大华publicKey
+     */
+    public static String getDhPublicKey() {
+        return rootPrefix.concat("dh:public");
+    }
+
+    /**
+     * 大华token
+     */
+    public static String getDhToken() {
+        return rootPrefix.concat("dh:token");
+    }
+
+}

epmet-plugins-common/src/main/java/com/epmet/plugin/commons/utils/NumUtils.java

@@ -0,0 +1,30 @@
+package com.epmet.plugin.commons.utils;
+
+import com.epmet.commons.tools.constant.NumConstant;
+
+/***
+ * 数字处理相关通用方法
+ * @author work@yujt.net.cn
+ * @date 2022/5/12/0012 10:02
+ */
+public class NumUtils {
+
+    public final static int ONE_THOUSAND = 1000;
+
+    /**
+     * 获取数值
+     *
+     * @param number        数值，可能为空
+     * @param excludeZero   数字不能为0
+     * @param defaultNumber 默认值（数字为空值时 或 数值为0但excludeZero == true 时，使用默认值）
+     * @return int
+     * @author work@yujt.net.cn
+     * @date 2022/5/12/0012 10:11
+     */
+    public static int getNumberInt(Integer number, boolean excludeZero, int defaultNumber) {
+        if (null == number || (excludeZero && NumConstant.ZERO == number)) {
+            return defaultNumber;
+        }
+        return number;
+    }
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisServiceStationFormDTO.java

@@ -2,6 +2,7 @@ package com.epmet.plugin.power.dto.axis.form;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 @Data
@@ -9,7 +10,7 @@ public class PowerAxisServiceStationFormDTO implements Serializable {
     private static final long serialVersionUID = -8446905334792655596L;
 
     /**
-     *动力主轴节点id
+     * 动力主轴节点id
      */
     private String axisStructId;
     /**
@@ -19,5 +20,11 @@ public class PowerAxisServiceStationFormDTO implements Serializable {
     /**
      * 客户id
      */
+    @NotBlank(message = "所属客户不能为空")
     private String customerId;
+    /**
+     * 组织id
+     */
+    @NotBlank(message = "所属组织不能为空")
+    private String agencyId;
 }

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisStructLeaderFormDTO.java

@@ -3,7 +3,6 @@ package com.epmet.plugin.power.dto.axis.form;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**
@@ -32,5 +31,10 @@ public class PowerAxisStructLeaderFormDTO implements Serializable {
      */
     private String leaderName;
 
+    /**
+     * 客户id
+     */
+    private String customerId;
+
 
-}
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisStructViewFormDTO.java

@@ -2,6 +2,7 @@ package com.epmet.plugin.power.dto.axis.form;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 @Data
@@ -11,10 +12,12 @@ public class PowerAxisStructViewFormDTO implements Serializable {
     /**
      * 客户id
      */
+    @NotBlank(message = "所属客户不能为空")
     private String customerId;
 
     /**
      * 组织id
      */
+    @NotBlank(message = "所属组织不能为空")
     private String agencyId;
 }

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelHouseHoldViewListFormDTO.java

@@ -2,6 +2,8 @@ package com.epmet.plugin.power.dto.axis.form;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 @Data
@@ -17,15 +19,24 @@ public class PowerKernelHouseHoldViewListFormDTO implements Serializable {
     /**
      * 页码
      */
-    private int pageNo;
+    @NotNull(message = "页码不能为空")
+    private Integer pageNo;
 
     /**
      * 条数
      */
-    private int pageSize;
+    @NotNull(message = "页容量不能为空")
+    private Integer pageSize;
+
+    /**
+     * 组织id
+     */
+    @NotBlank(message = "所属组织不能为空")
+    private String agencyId;
 
     /**
      * 客户id
      */
+    @NotBlank(message = "所属客户不能为空")
     private String customerId;
 }

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelListPostitionFormDTO.java

@@ -13,16 +13,19 @@ public class PowerKernelListPostitionFormDTO implements Serializable {
     /**
      * 动力主轴id
      */
-    @NotBlank(message = "动力主轴节点不能为空")
     private String axisStructId;
 
     /**
      * 条数
      */
-    private int limit;
+    private Integer limit;
 
     /**
      * 客户id
      */
+    @NotBlank(message = "所属客户不能为空")
     private String customerId;
+
+    @NotBlank(message = "所属组织不能为空")
+    private String agencyId;
 }

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisStructViewResultDTO.java

@@ -22,7 +22,7 @@ public class PowerAxisStructViewResultDTO implements Serializable {
     /**
      * 党员数
      */
-    private int partyMemberNum;
+//    private int partyMemberNum;
 
     /**
      * 党员中心户数
@@ -37,5 +37,5 @@ public class PowerAxisStructViewResultDTO implements Serializable {
     /**
      * 志愿队伍数
      */
-    private int volunteerTeamNum;
+//    private int volunteerTeamNum;
 }

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/hik/HikCommunityInfoDTO.java

@@ -0,0 +1,94 @@
+package com.epmet.plugin.power.dto.hik;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 海康社区信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+@Data
+public class HikCommunityInfoDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 删除标记 0：未删除，1：已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 社区ID
+     */
+	private String communityId;
+
+    /**
+     * 社区名称
+     */
+	private String communityName;
+
+    /**
+     * 省代号
+     */
+	private String provinceCode;
+
+    /**
+     * 市代号
+     */
+	private String cityCode;
+
+    /**
+     * 区代号
+     */
+	private String countyCode;
+
+    /**
+     * 经度坐标值
+     */
+	private String longitude;
+
+    /**
+     * 维度坐标值
+     */
+	private String latitude;
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/hik/HikDeviceInfoDTO.java

@@ -0,0 +1,94 @@
+package com.epmet.plugin.power.dto.hik;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 海康设备信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+@Data
+public class HikDeviceInfoDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 删除标记 0：未删除，1：已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 社区ID
+     */
+	private String communityId;
+
+    /**
+     * 设备ID
+     */
+	private String deviceId;
+
+    /**
+     * 设备名称
+     */
+	private String deviceName;
+
+    /**
+     * 设备型号
+     */
+	private String deviceModel;
+
+    /**
+     * 设备序列号
+     */
+	private String deviceSerial;
+
+    /**
+     * 设备状态，0：离线，1：在线
+     */
+	private String deviceStatus;
+
+    /**
+     * 设备路径
+     */
+	private String devicePath;
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/hik/HikErrorInfoDTO.java

@@ -0,0 +1,79 @@
+package com.epmet.plugin.power.dto.hik;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 海康设备推送失败信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-23
+ */
+@Data
+public class HikErrorInfoDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 删除标记 0：未删除，1：已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 身份证号
+     */
+	private String idCard;
+
+    /**
+     * 错误类型 0：token，1：人员，2权限
+     */
+	private String errorType;
+
+    /**
+     * 错误详情
+     */
+	private String errorInfo;
+
+    /**
+     * 引用ID
+     */
+    private String referenceId;
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/hik/form/HikAuthorityFormDTO.java

@@ -0,0 +1,27 @@
+package com.epmet.plugin.power.dto.hik.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 海康社区人员权限信息下放
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+@Data
+public class HikAuthorityFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String communityId;
+
+    private String personId;
+
+    private Integer personType;
+
+    private String deviceId;
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/hik/form/HikPersonFormDTO.java

@@ -0,0 +1,33 @@
+package com.epmet.plugin.power.dto.hik.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 海康社区人员信息下放
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+@Data
+public class HikPersonFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String unionId;
+
+    private String personName;
+
+    private Integer gender;
+
+    private Integer credentialType;
+
+    private String credentialNumber;
+
+    private String mobile;
+
+    private String faceUrl;
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentBlacklistDTO.java

@@ -28,6 +28,11 @@ public class RentBlacklistDTO implements Serializable {
     @NotBlank(message = "用户ID不能为空")
 	private String userId;
 
+    /**
+     * epmet网格ID
+     */
+    private String gridId;
+
     /**
      * 姓名
      */

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentContractFileDTO.java

@@ -32,7 +32,7 @@ public class RentContractFileDTO implements Serializable {
 	private String fileUrl;
 
     /**
-     * 文件类型 0：图片，1 文件（合同）
+     * 文件类型 0：图片（人脸/头像），1 文件（合同），2 身份证照片，3 中介资料
      */
 	private String fileType;
 
@@ -66,4 +66,4 @@ public class RentContractFileDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentContractInfoDTO.java

@@ -123,6 +123,17 @@ public class RentContractInfoDTO implements Serializable {
     @NotBlank(message = "出租人手机不能为空")
 	private String lessorMobile;
 
+    /**
+     * 出租人与户主关系
+     */
+    private String lessorRelation;
+
+    /**
+     * 出租人现居住地址
+     */
+    @NotBlank(message = "出租人现居住地址不能为空")
+    private String lessorLiveAddress;
+
     /**
      * 承租人姓名
      */
@@ -141,6 +152,17 @@ public class RentContractInfoDTO implements Serializable {
     @NotBlank(message = "承租人手机不能为空")
 	private String lesseeMobile;
 
+    /**
+     * 承租人单位
+     */
+    private String lesseeUnit;
+
+    /**
+     * 承租人户籍地地址
+     */
+    @NotBlank(message = "承租人户籍地地址不能为空")
+    private String lesseeHouseAddress;
+
     /**
      * 签署日期
      */
@@ -181,8 +203,18 @@ public class RentContractInfoDTO implements Serializable {
     @NotEmpty
     private List<RentContractFileDTO> fileList;
 
+    /**
+     * 中介资料
+     */
+    private List<RentContractFileDTO> agencyImgList;
+
     /**
      * 是否黑名单
      */
     private String isBlack;
-}
+
+    /**
+     * 是否是PC录入（0：否，1：是）
+     */
+    private String isPcInput;
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentHouseDTO.java

@@ -0,0 +1,195 @@
+package com.epmet.plugin.power.dto.rent;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 房屋信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-11
+ */
+@Data
+public class RentHouseDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 房屋主键
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 小区id
+     */
+	private String neighborHoodId;
+
+    /**
+     * 片区id，neighbor_hood_part.id,可为空。
+     */
+	private String partId;
+
+    /**
+     * 所属楼栋id
+     */
+	private String buildingId;
+
+    /**
+     * 所属单元id
+     */
+	private String buildingUnitId;
+
+    /**
+     * 房屋名字后台插入时生成
+     */
+	private String houseName;
+
+    /**
+     * 门牌号
+     */
+	private String doorName;
+
+    /**
+     * 房屋类型，1楼房，2平房，3别墅
+     */
+	private String houseType;
+
+    /**
+     * 存储字典value
+     */
+	private String purpose;
+
+    /**
+     * 1：出租 0：自住  2：闲置
+     */
+	private Integer rentFlag;
+
+    /**
+     * 房主姓名
+     */
+	private String ownerName;
+
+    /**
+     * 房主电话
+     */
+	private String ownerPhone;
+
+    /**
+     * 房主身份证号
+     */
+	private String ownerIdCard;
+
+    /**
+     * 排序
+     */
+	private BigDecimal sort;
+
+    /**
+     * 删除标识 0未删除、1已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+    /**
+     * 社区ID
+     */
+	private String communityId;
+
+    /**
+     * 社区
+     */
+	private String communityName;
+
+    /**
+     * 网格ID
+     */
+	private String gridId;
+
+    /**
+     * 网格
+     */
+	private String gridName;
+
+    /**
+     * 房屋小区ID
+     */
+	private String villageId;
+
+    /**
+     * 房屋小区
+     */
+	private String villageName;
+
+    /**
+     * 楼号ID
+     */
+	private String buildId;
+
+    /**
+     * 楼号
+     */
+	private String buildName;
+
+    /**
+     * 单元ID
+     */
+	private String unitId;
+
+    /**
+     * 单元
+     */
+	private String unitName;
+
+    /**
+     * 房屋ID
+     */
+	private String homeId;
+
+    /**
+     * 房屋
+     */
+	private String homeName;
+
+    /**
+     * 购房日期
+     */
+	private String purchaseDate;
+
+    /**
+     * 是否更新
+     */
+    private Boolean needUpdate;
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentTenantInfoDTO.java

@@ -1,10 +1,12 @@
 package com.epmet.plugin.power.dto.rent;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 
 
@@ -58,10 +60,58 @@ public class RentTenantInfoDTO implements Serializable {
     @NotBlank(message = "人员类型不能为空")
     private String type;
 
+    /**
+     * 审核状态 0：未审核 1：审核通过 2：审核不通过（房东使用）
+     */
+    private String state;
+
+    /**
+     * 审核-原因
+     */
+    private String reason;
+
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss",
+            timezone = "GMT+8"
+    )
+    private Date createdTime;
+
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss",
+            timezone = "GMT+8"
+    )
+    private Date updatedTime;
+
+    /**
+     * 政治面貌
+     */
+    private String politicalStatus;
+
+    /**
+     * 是否服兵役【是:1 否:0】
+     */
+    private String isMilitary;
+
+    /**
+     * 国籍
+     */
+    private String nation;
+
+    /**
+     * 工作单位
+     */
+    private String unit;
+
     /**
      * 头像列表
      */
     @NotEmpty
     private List<RentContractFileDTO> imgList;
 
+    /**
+     * 身份证列表
+     */
+    @NotEmpty
+    private List<RentContractFileDTO> idCardImgList;
+
 }

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/DhTokenDTO.java

@@ -0,0 +1,39 @@
+package com.epmet.plugin.power.dto.visit;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 大华设备鉴权信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-04-22
+ */
+@Data
+public class DhTokenDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * loginName
+     */
+	private String loginName;
+
+    /**
+     * token
+     */
+    private String token;
+
+    /**
+     * publicKey
+     */
+	private String publicKey;
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/VisitVisitorDTO.java

@@ -0,0 +1,163 @@
+package com.epmet.plugin.power.dto.visit;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 租客表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-26
+ */
+@Data
+public class VisitVisitorDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 姓名
+     */
+	private String name;
+
+    /**
+     * 身份证
+     */
+	private String idCard;
+
+    /**
+     * 性别
+     */
+	private String gender;
+
+    /**
+     * 手机号
+     */
+	private String mobile;
+
+    /**
+     * 人员类型 0：访客 1：租客
+     */
+	private String type;
+
+    /**
+     * 审核状态 0：未审核 1：审核通过 2：审核不通过（房东使用）
+     */
+	private String state;
+
+    /**
+     * 审核原因
+     */
+	private String reason;
+
+    /**
+     * 删除标记 0：未删除，1：已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 来访事由
+     */
+	private String visitReason;
+
+    /**
+     * 头像
+     */
+	private String faceImg;
+
+    /**
+     * 小区
+     */
+	private String residential;
+
+    /**
+     * 楼栋
+     */
+	private String building;
+
+    /**
+     * 单元
+     */
+	private String unit;
+
+    /**
+     * 房屋
+     */
+	private String room;
+
+    /**
+     * 组织id
+     */
+    private String agencyId;
+
+    /**
+     * 上级组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 组织的所有上级组织id
+     */
+    private String agencyPids;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 小区ID
+     */
+    private String neighborhoodId;
+
+    /**
+     * 楼栋ID
+     */
+    private String buildingId;
+
+    /**
+     * 单元ID
+     */
+    private String unitId;
+
+    /**
+     * 房屋ID
+     */
+    private String houseId;
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/form/DhAuthFormDTO.java

@@ -0,0 +1,27 @@
+package com.epmet.plugin.power.dto.visit.form;
+
+import com.epmet.plugin.power.dto.visit.result.DhChannelResultDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 海康社区人员信息下放
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+@Data
+public class DhAuthFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String cardNumber;
+
+    private String timeQuantumId;
+
+    private List<DhChannelResultDTO> cardPrivilegeDetails;
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/form/DhCardPageFormDTO.java

@@ -0,0 +1,29 @@
+package com.epmet.plugin.power.dto.visit.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 海康社区人员信息下放
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+@Data
+public class DhCardPageFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer pageNum;
+
+    private Integer pageSize;
+
+    private String personCode;
+
+    private String cardNumber;
+
+    private String cardStatus;
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/form/DhChannelPageFormDTO.java

@@ -0,0 +1,25 @@
+package com.epmet.plugin.power.dto.visit.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 海康社区人员信息下放
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+@Data
+public class DhChannelPageFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer pageNum;
+
+    private Integer pageSize;
+
+    private String deviceGenre;
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/form/DhDeptFormDTO.java

@@ -0,0 +1,27 @@
+package com.epmet.plugin.power.dto.visit.form;
+
+import com.epmet.plugin.power.dto.visit.result.DhChannelResultDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 海康社区人员信息下放
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+@Data
+public class DhDeptFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String name;
+
+    private String description;
+
+    private Long parentId;
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/form/DhIdentityFormDTO.java

@@ -0,0 +1,29 @@
+package com.epmet.plugin.power.dto.visit.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 海康社区人员信息下放
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+@Data
+public class DhIdentityFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String name;
+
+    private Double subsidyAmount;
+
+    private Integer isCashRecharge;
+
+    private Integer isMachineRecharge;
+
+    private String description;
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/form/DhLoginPassFormDTO.java

@@ -0,0 +1,23 @@
+package com.epmet.plugin.power.dto.visit.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 海康社区人员信息下放
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+@Data
+public class DhLoginPassFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String loginName;
+
+    private String loginPass;
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/form/DhPersonCardFormDTO.java

@@ -0,0 +1,39 @@
+package com.epmet.plugin.power.dto.visit.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 海康社区人员信息下放
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+@Data
+public class DhPersonCardFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long personId;
+
+    private String personName;
+
+    private String cardNumber;
+
+    private String cardType;
+
+    private String category;
+
+    private String cardStatus;
+
+    private String startDate;
+
+    private String endDate;
+
+    private String cardPassword;
+
+    private String subSystems;
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/form/DhPersonCardListFormDTO.java

@@ -0,0 +1,22 @@
+package com.epmet.plugin.power.dto.visit.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 海康社区人员信息下放
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+@Data
+public class DhPersonCardListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private List<DhPersonCardFormDTO> objectList;
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/form/DhPersonDelFormDTO.java

@@ -0,0 +1,22 @@
+package com.epmet.plugin.power.dto.visit.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 海康社区人员信息下放
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+@Data
+public class DhPersonDelFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private List<Integer> personIds;
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/form/DhPersonFormDTO.java

@@ -0,0 +1,39 @@
+package com.epmet.plugin.power.dto.visit.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 海康社区人员信息下放
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+@Data
+public class DhPersonFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String paperType;
+
+    private String paperNumber;
+
+    private String name;
+
+    private String code;
+
+    private Long deptId;
+
+    private String sex;
+
+    private String birthday;
+
+    private String phone;
+
+    private String status;
+
+    private String personIdentityId;
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/form/DhPersonImgFormDTO.java

@@ -0,0 +1,23 @@
+package com.epmet.plugin.power.dto.visit.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 海康社区人员信息下放
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+@Data
+public class DhPersonImgFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String personCode;
+
+    private String base64file;
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/form/DhPersonPageFormDTO.java

@@ -0,0 +1,25 @@
+package com.epmet.plugin.power.dto.visit.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 海康社区人员信息下放
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+@Data
+public class DhPersonPageFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer pageNum;
+
+    private Integer pageSize;
+
+    private String code;
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/form/DhPlanFormDTO.java

@@ -0,0 +1,27 @@
+package com.epmet.plugin.power.dto.visit.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 海康社区人员信息下放
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+@Data
+public class DhPlanFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String detail;
+
+    private String memo;
+
+    private String name;
+
+    private Integer type;
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/form/DhPlanPageFormDTO.java

@@ -0,0 +1,25 @@
+package com.epmet.plugin.power.dto.visit.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 海康社区人员信息下放
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+@Data
+public class DhPlanPageFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer pageNum;
+
+    private Integer pageSize;
+
+    private String singleCondition;
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/form/DhPublicKeyFormDTO.java

@@ -0,0 +1,21 @@
+package com.epmet.plugin.power.dto.visit.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 海康社区人员信息下放
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+@Data
+public class DhPublicKeyFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String loginName;
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/form/VisitVisitorChartFormDTO.java

@@ -0,0 +1,27 @@
+package com.epmet.plugin.power.dto.visit.form;
+
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+
+/**
+ * 租客表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-26
+ */
+@Data
+public class VisitVisitorChartFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 时间
+     */
+	private String date;
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/form/VisitVisitorFormDTO.java

@@ -0,0 +1,109 @@
+package com.epmet.plugin.power.dto.visit.form;
+
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 租客表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-26
+ */
+@Data
+public class VisitVisitorFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 姓名
+     */
+    @NotBlank(message = "姓名不能为空",groups = {AddGroup.class, DefaultGroup.class})
+	private String name;
+
+    /**
+     * 身份证
+     */
+    @NotBlank(message = "身份证号不能为空",groups = {AddGroup.class, DefaultGroup.class})
+	private String idCard;
+
+    /**
+     * 性别
+     */
+    @NotBlank(message = "性别不能为空",groups = {AddGroup.class, DefaultGroup.class})
+	private String gender;
+
+    /**
+     * 手机号
+     */
+    @NotBlank(message = "联系方式不能为空",groups = {AddGroup.class, DefaultGroup.class})
+	private String mobile;
+
+    /**
+     * 人员类型 0：访客 1：租客
+     */
+	private String type;
+
+    /**
+     * 来访事由
+     */
+	private String visitReason;
+
+    /**
+     * 头像
+     */
+	private String faceImg;
+
+    /**
+     * 小区ID
+     */
+    private String neighborhoodId;
+
+    /**
+     * 楼栋ID
+     */
+    private String buildingId;
+
+    /**
+     * 单元ID
+     */
+    private String unitId;
+
+    /**
+     * 房屋ID
+     */
+    private String houseId;
+
+    /**
+     * 小区
+     */
+	private String residential;
+
+    /**
+     * 楼栋
+     */
+	private String building;
+
+    /**
+     * 单元
+     */
+	private String unit;
+
+    /**
+     * 房屋
+     */
+	private String room;
+
+    /**
+     * 客户ID
+     */
+    @NotBlank(message = "客户ID不能为空",groups = {AddGroup.class, DefaultGroup.class})
+    private String customerId;
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/form/VisitorLogoutFormDTO.java

@@ -0,0 +1,29 @@
+package com.epmet.plugin.power.dto.visit.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 访客登出
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-27
+ */
+@Data
+public class VisitorLogoutFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 数据更新至：yyyyMMdd; 
+     */
+	private String dateId;
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/result/DhChannelResultDTO.java

@@ -0,0 +1,23 @@
+package com.epmet.plugin.power.dto.visit.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 海康社区人员信息下放
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+@Data
+public class DhChannelResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String privilegeType;
+
+    private String resouceCode;
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/result/VisitVisitorChartResultDTO.java

@@ -0,0 +1,30 @@
+package com.epmet.plugin.power.dto.visit.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 租客表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-26
+ */
+@Data
+public class VisitVisitorChartResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 时间
+     */
+	private String hour;
+
+    /**
+     * 数量
+     */
+    private String num;
+
+
+}

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

@@ -0,0 +1,24 @@
+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.DATA_STATISTICAL_SERVER, fallbackFactory = PliPowerFeignClientFallBackFactory.class)
+public interface PliPowerFeignClient {
+
+    @PostMapping("/pli/power/visitVisitor/logout")
+    Result visitorLogout(@RequestBody VisitorLogoutFormDTO formDTO);
+
+}

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

@@ -0,0 +1,24 @@
+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.DATA_STATISTICAL_SERVER, "logout",formDTO);
+    }
+
+}

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

@@ -0,0 +1,20 @@
+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;
+    }
+}

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

@@ -83,6 +83,11 @@
             <version>RELEASE</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>net.coobird</groupId>
+            <artifactId>thumbnailator</artifactId>
+            <version>0.4.8</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -164,6 +169,15 @@
                 </dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
                 </dingTalk.robot.secret>
+
+                <!--海康云眸-->
+                <hik.cloud.url>https://api2.hik-cloud.com</hik.cloud.url>
+                <hik.cloud.client>111</hik.cloud.client>
+                <hik.cloud.secret>222</hik.cloud.secret>
+                <!--大华-->
+                <dh.cloud.url>http://112.6.213.175:8314</dh.cloud.url>
+                <dh.cloud.loginName>shundeju</dh.cloud.loginName>
+                <dh.cloud.loginPass>hg123456</dh.cloud.loginPass>
             </properties>
         </profile>
         <profile>
@@ -177,10 +191,10 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/epmet_pli_power?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_pli_power?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>root</spring.datasource.druid.username>
-                <spring.datasource.druid.password>Abc@123456</spring.datasource.druid.password>
+                <spring.datasource.druid.username>epmet_pli_power_user</spring.datasource.druid.username>
+                <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -193,7 +207,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.104</nacos.ip>
+                <nacos.ip>192.168.43.33</nacos.ip>
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
 
@@ -214,6 +228,15 @@
                 </dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
                 </dingTalk.robot.secret>
+
+                <!--海康云眸-->
+                <hik.cloud.url>https://api2.hik-cloud.com</hik.cloud.url>
+                <hik.cloud.client>111</hik.cloud.client>
+                <hik.cloud.secret>222</hik.cloud.secret>
+                <!--大华-->
+                <dh.cloud.url>http://112.6.213.175:8314</dh.cloud.url>
+                <dh.cloud.loginName>shundeju</dh.cloud.loginName>
+                <dh.cloud.loginPass>hg123456</dh.cloud.loginPass>
             </properties>
         </profile>
         <profile>
@@ -268,6 +291,15 @@
                 </dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
                 </dingTalk.robot.secret>
+
+                <!--海康云眸-->
+                <hik.cloud.url>https://api2.hik-cloud.com</hik.cloud.url>
+                <hik.cloud.client>111</hik.cloud.client>
+                <hik.cloud.secret>222</hik.cloud.secret>
+                <!--大华-->
+                <dh.cloud.url>http://112.6.213.175:8314</dh.cloud.url>
+                <dh.cloud.loginName>shundeju</dh.cloud.loginName>
+                <dh.cloud.loginPass>hg123456</dh.cloud.loginPass>
             </properties>
         </profile>
         <profile>
@@ -317,6 +349,15 @@
                 </dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
                 </dingTalk.robot.secret>
+
+                <!--海康云眸-->
+                <hik.cloud.url>https://api2.hik-cloud.com</hik.cloud.url>
+                <hik.cloud.client>90688b09bb9d40088f7be404ccb347c7</hik.cloud.client>
+                <hik.cloud.secret>7b1940707a4240be9c794c5a967a30c9</hik.cloud.secret>
+                <!--大华-->
+                <dh.cloud.url>http://112.6.213.175:8314</dh.cloud.url>
+                <dh.cloud.loginName>shundeju</dh.cloud.loginName>
+                <dh.cloud.loginPass>hg123456</dh.cloud.loginPass>
             </properties>
         </profile>
         <profile>
@@ -369,6 +410,15 @@
                 <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
                 <thread.threadPool.thread-name-prefix>epmet-user</thread.threadPool.thread-name-prefix>
                 <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
+
+                <!--海康云眸-->
+                <hik.cloud.url>https://api2.hik-cloud.com</hik.cloud.url>
+                <hik.cloud.client>90688b09bb9d40088f7be404ccb347c7</hik.cloud.client>
+                <hik.cloud.secret>7b1940707a4240be9c794c5a967a30c9</hik.cloud.secret>
+                <!--大华-->
+                <dh.cloud.url>http://112.6.213.175:8314</dh.cloud.url>
+                <dh.cloud.loginName>shundeju</dh.cloud.loginName>
+                <dh.cloud.loginPass>hg123456</dh.cloud.loginPass>
             </properties>
         </profile>
     </profiles>

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/config/DhCloudProperties.java

@@ -0,0 +1,56 @@
+package com.epmet.plugin.power.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 海康设备参数
+ *
+ * @author zhy
+ * @date 2022/5/20 14:59
+ */
+@Configuration
+@ConfigurationProperties(prefix = "dh.cloud")
+public class DhCloudProperties {
+
+    /**
+     * URL
+     */
+    private String url;
+
+    /**
+     * 账号
+     */
+    private String loginName;
+
+
+    /**
+     * 账号密码
+     */
+    private String loginPass;
+
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getLoginName() {
+        return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+        this.loginName = loginName;
+    }
+
+    public String getLoginPass() {
+        return loginPass;
+    }
+
+    public void setLoginPass(String loginPass) {
+        this.loginPass = loginPass;
+    }
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/config/HikCloudProperties.java

@@ -0,0 +1,54 @@
+package com.epmet.plugin.power.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 海康设备参数
+ *
+ * @author zhy
+ * @date 2022/5/20 14:59
+ */
+@Configuration
+@ConfigurationProperties(prefix = "hik.cloud")
+public class HikCloudProperties {
+
+    /**
+     * 应用ID
+     */
+    private String url;
+
+    /**
+     * 应用KEY
+     */
+    private String client;
+
+    /**
+     * 生成AccessToken密钥
+     */
+    private String secret;
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getClient() {
+        return client;
+    }
+
+    public void setClient(String client) {
+        this.client = client;
+    }
+
+    public String getSecret() {
+        return secret;
+    }
+
+    public void setSecret(String secret) {
+        this.secret = secret;
+    }
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisDataVisualController.java

@@ -46,7 +46,9 @@ public class PowerAxisDataVisualController {
      * @date 2022/4/22 19:53
      */
     @PostMapping("serviceStation/listPosition")
-    public Result<List<PowerAxisServiceStationResultDTO>> getListPostition(@RequestBody PowerAxisServiceStationFormDTO form) {
+    public Result<List<PowerAxisServiceStationResultDTO>> getListPostition(@RequestBody PowerAxisServiceStationFormDTO form, @LoginUser TokenDto tokenDto) {
+        form.setCustomerId(tokenDto.getCustomerId());
+        ValidatorUtils.validateEntity(form);
         return new Result().ok(powerServiceStationService.getListPosition(form));
     }
 
@@ -59,7 +61,9 @@ public class PowerAxisDataVisualController {
      * @date 2022/4/23 10:20
      */
     @PostMapping("axis/statistics")
-    public Result getStatistics(@RequestBody PowerAxisStructViewFormDTO form) {
+    public Result getStatistics(@RequestBody PowerAxisStructViewFormDTO form, @LoginUser TokenDto tokenDto) {
+        form.setCustomerId(tokenDto.getCustomerId());
+        ValidatorUtils.validateEntity(form);
         PowerAxisStructViewResultDTO result = powerAxisStructService.getStatistics(form);
         return new Result().ok(result);
     }
@@ -115,7 +119,9 @@ public class PowerAxisDataVisualController {
      * @date 2022/4/23 10:20
      */
     @PostMapping("kernelHousehold/list")
-    public ResultDTO getList(@RequestBody PowerKernelHouseHoldViewListFormDTO form) {
+    public ResultDTO getList(@RequestBody PowerKernelHouseHoldViewListFormDTO form, @LoginUser TokenDto tokenDto) {
+        form.setCustomerId(tokenDto.getCustomerId());
+        ValidatorUtils.validateEntity(form);
         List<PowerKernelHouseHoldViewListResultDTO> dto = powerKernelHouseholdService.getList(form);
         return ResultDTO.success("查询成功", dto, powerKernelHouseholdService.getTotal(form));
     }
@@ -130,8 +136,8 @@ public class PowerAxisDataVisualController {
      */
     @PostMapping("kernelHousehold/listPosition")
     public Result<List<PowerKernelListPostitionResultDTO>> getListPosition(@RequestBody PowerKernelListPostitionFormDTO form, @LoginUser TokenDto tokenDto) {
-        ValidatorUtils.validateEntity(form);
         form.setCustomerId(tokenDto.getCustomerId());
+        ValidatorUtils.validateEntity(form);
         return new Result().ok(powerKernelHouseholdService.getListPosition(form));
     }
 

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructController.java

@@ -1,9 +1,12 @@
 package com.epmet.plugin.power.modules.axis.controller;
 
 
+import com.alibaba.excel.util.StringUtils;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -97,7 +100,15 @@ public class PowerAxisStructController {
      * @date 2022/4/19/0019 14:17
      */
     @PostMapping("list4Tree")
-    public Result<List<PowerAxisStructLeaderResultDTO>> selectAllForTree(@RequestBody PowerAxisStructLeaderFormDTO formDto) {
+    public Result<List<PowerAxisStructLeaderResultDTO>> selectAllForTree(@RequestBody PowerAxisStructLeaderFormDTO formDto,@LoginUser TokenDto tokenDto) {
+        String agencyId = formDto.getAgencyId();
+        if (StringUtils.isBlank(agencyId)) {
+            CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+            if (null != staffInfo && StringUtils.isNotBlank(staffInfo.getAgencyId())) {
+                formDto.setAgencyId(staffInfo.getAgencyId());
+            }
+        }
+        formDto.setCustomerId(tokenDto.getCustomerId());
         return new Result().ok(powerAxisStructService.selectAllForTree(formDto));
     }
 

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisTagController.java

@@ -38,8 +38,8 @@ public class PowerAxisTagController {
     private PowerAxisTagService powerAxisTagService;
 
     @RequestMapping("page")
-    public Result<PageData<PowerAxisTagDTO>> page(@RequestParam Map<String, Object> params) {
-        PageData<PowerAxisTagDTO> page = powerAxisTagService.page(params);
+    public Result<PageData<PowerAxisTagDTO>> page(@LoginUser TokenDto tokenDto,@RequestParam Map<String, Object> params) {
+        PageData<PowerAxisTagDTO> page = powerAxisTagService.page(tokenDto,params);
         return new Result<PageData<PowerAxisTagDTO>>().ok(page);
     }
 
@@ -102,8 +102,8 @@ public class PowerAxisTagController {
      * @date 2022/4/19/0019 9:24
      */
     @PostMapping("listSimpleAll")
-    public Result<List<PowerAxisAllTagCategoryResultDTO>> listSimpleAll() {
-        return new Result().ok(powerAxisTagService.listSimpleAll());
+    public Result<List<PowerAxisAllTagCategoryResultDTO>> listSimpleAll(@LoginUser TokenDto tokenDto) {
+        return new Result().ok(powerAxisTagService.listSimpleAll(tokenDto));
     }
 
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerServiceStationController.java

@@ -1,8 +1,10 @@
 package com.epmet.plugin.power.modules.axis.controller;
 
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
@@ -48,7 +50,8 @@ public class PowerServiceStationController {
 
     @NoRepeatSubmit
     @PostMapping("save")
-    public Result save(@RequestBody PowerServiceStationDTO dto){
+    public Result save(@RequestBody PowerServiceStationDTO dto, @LoginUser TokenDto tokenDto){
+        dto.setCustomerId(tokenDto.getCustomerId());
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         powerServiceStationService.save(dto);

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java

@@ -2,16 +2,18 @@ package com.epmet.plugin.power.modules.axis.dao;
 
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.plugin.power.dto.axis.PowerAxisStructDTO;
-import com.epmet.plugin.power.dto.axis.form.*;
-import com.epmet.plugin.power.dto.axis.result.*;
+import com.epmet.plugin.power.dto.axis.form.PowerAxisListPositionFormDTO;
+import com.epmet.plugin.power.dto.axis.form.PowerAxisStructFormDTO;
+import com.epmet.plugin.power.dto.axis.form.PowerAxisStructLeaderFormDTO;
+import com.epmet.plugin.power.dto.axis.form.PowerAxisStructStructTreeFormDTO;
+import com.epmet.plugin.power.dto.axis.result.PowerAxisListPositionResultDTO;
+import com.epmet.plugin.power.dto.axis.result.PowerAxisStructLeaderResultDTO;
+import com.epmet.plugin.power.dto.axis.result.PowerAxisStructResultDTO;
+import com.epmet.plugin.power.dto.axis.result.PowerAxisStructTreeResultDTO;
 import com.epmet.plugin.power.modules.axis.entity.PowerAxisStructEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-import java.util.Map;
-
 import java.util.List;
 
 /**
@@ -75,19 +77,19 @@ public interface PowerAxisStructDao extends BaseDao<PowerAxisStructEntity> {
 
     List<String> getIdsByAgencyId(String agencyId, String customerId);
 
-    int queryGridParty(@Param("agencyId") String agencyId,@Param("customerId") String customerId,@Param("gridCateGoryCode") String gridCateGoryCode);
+    int queryGridParty(@Param("agencyId") String agencyId, @Param("customerId") String customerId, @Param("gridCateGoryCode") String gridCateGoryCode);
 
-    int queryGroupParty(@Param("agencyId") String agencyId,@Param("customerId") String customerId,@Param("groupCateGoryCode") String groupCateGoryCode);
+    int queryGroupParty(@Param("agencyId") String agencyId, @Param("customerId") String customerId, @Param("groupCateGoryCode") String groupCateGoryCode);
 
-    int getKernelHouseHold(PowerAxisStructViewFormDTO form);
+    int getKernelHouseHold(@Param("agencyId") String agencyId, @Param("customerId") String customerId);
 
-    int getServiceStation(PowerAxisStructViewFormDTO form);
+    int getServiceStation(@Param("agencyId") String agencyId, @Param("customerId") String customerId);
 
     List<PowerAxisStructTreeResultDTO> getStructTree(PowerAxisStructStructTreeFormDTO form);
 
     String queryCategoryCode(PowerAxisListPositionFormDTO form);
 
-    List<PowerAxisListPositionResultDTO> querylistPosition(@Param("customerId") String customerId,@Param("code") String code ,@Param("agencyId") String agencyId);
+    List<PowerAxisListPositionResultDTO> querylistPosition(@Param("customerId") String customerId, @Param("code") String code, @Param("agencyId") String agencyId);
 
     /**
      * 根据节点接报，组装其上级节点树
@@ -111,4 +113,19 @@ public interface PowerAxisStructDao extends BaseDao<PowerAxisStructEntity> {
      * @date 2022/4/24 19:29
      */
     String getCateGoryCode(String customerId, int level, String tagCateGory);
-}
+
+    /**
+     * 查询动力主轴跟节点
+     *
+     * @param customerId  客户
+     * @param agencyId    组织
+     * @param structLevel 级别 {@link com.epmet.plugin.power.enums.PowerTagLevelEnum#ROOT}
+     * @return java.lang.String
+     * @author work@yujt.net.cn
+     * @date 2022/5/12/0012 9:52
+     */
+    String getRootAxisStructId(@Param("customerId") String customerId,
+                               @Param("agencyId") String agencyId,
+                               @Param("structLevel") int structLevel);
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisTagDao.java

@@ -1,12 +1,15 @@
 package com.epmet.plugin.power.modules.axis.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.plugin.power.dto.axis.PowerAxisTagDTO;
 import com.epmet.plugin.power.dto.axis.result.PowerAxisAllTagCategoryResultDTO;
+import com.epmet.plugin.power.dto.axis.result.PowerAxisTagCategoryResultDTO;
 import com.epmet.plugin.power.modules.axis.entity.PowerAxisTagEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 动力主轴标签
@@ -24,7 +27,7 @@ public interface PowerAxisTagDao extends BaseDao<PowerAxisTagEntity> {
      * @author work@yujt.net.cn
      * @date 2022/4/19/0019 9:14
      */
-    List<PowerAxisAllTagCategoryResultDTO> listSimpleAll();
+    List<PowerAxisAllTagCategoryResultDTO> listSimpleAll(@Param("customerId") String customerId);
 
     /**
      * 根据ID查询节点等级
@@ -39,4 +42,9 @@ public interface PowerAxisTagDao extends BaseDao<PowerAxisTagEntity> {
     Integer selectStructLevelById(@Param("customerId") String customerId,
                                   @Param("tagCategory") String tagCategory,
                                   @Param("axisStructId") String axisStructId);
-}
+
+    List<PowerAxisTagCategoryResultDTO> selectByTagCategory(@Param("tagCategory") String tagCategory,
+                                                            @Param("customerId") String customerId);
+
+    List<PowerAxisTagDTO> getPageList(Map<String, Object> params);
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java

@@ -122,7 +122,6 @@ public interface PowerAxisStructService extends BaseService<PowerAxisStructEntit
     List<String> getIdByAgencyId(String agencyId);
 
     /**
-     *
      * 关键指标统计
      *
      * @param form
@@ -142,7 +141,7 @@ public interface PowerAxisStructService extends BaseService<PowerAxisStructEntit
      */
     List<PowerAxisStructTreeResultDTO> getStructTree(PowerAxisStructStructTreeFormDTO form);
 
-    List<PowerAxisListPositionResultDTO> getListPosition(int structLevel,PowerAxisDataListPositionFormDTO form);
+    List<PowerAxisListPositionResultDTO> getListPosition(int structLevel, PowerAxisDataListPositionFormDTO form);
 
     /**
      * 根据节点接报，组装其上级节点树
@@ -154,4 +153,16 @@ public interface PowerAxisStructService extends BaseService<PowerAxisStructEntit
      * @date 2022/4/23/0023 14:37
      */
     List<PowerAxisStructTreeResultDTO> listParentTreeByLevel(String structLevel, String customerId);
-}
+
+    /**
+     * 获取动力主轴根节点ID
+     *
+     * @param rootStructId 根节点ID，不为空直接返回该值
+     * @param customerId   客户
+     * @param agencyId     组织
+     * @return java.lang.String
+     * @author work@yujt.net.cn
+     * @date 2022/5/12/0012 10:26
+     */
+    String getRootAxisStructId(String rootStructId, String customerId, String agencyId);
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisTagService.java

@@ -3,6 +3,7 @@ package com.epmet.plugin.power.modules.axis.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.plugin.power.dto.axis.PowerAxisTagDTO;
 import com.epmet.plugin.power.dto.axis.result.PowerAxisAllTagCategoryResultDTO;
 import com.epmet.plugin.power.dto.axis.result.PowerAxisTagCategoryResultDTO;
@@ -27,7 +28,7 @@ public interface PowerAxisTagService extends BaseService<PowerAxisTagEntity> {
      * @author generator
      * @date 2022-04-18
      */
-    PageData<PowerAxisTagDTO> page(Map<String, Object> params);
+    PageData<PowerAxisTagDTO> page(TokenDto tokenDto,Map<String, Object> params);
 
     /**
      * 默认查询
@@ -96,7 +97,7 @@ public interface PowerAxisTagService extends BaseService<PowerAxisTagEntity> {
      * @author work@yujt.net.cn
      * @date 2022/4/19/0019 9:23
      */
-    List<PowerAxisAllTagCategoryResultDTO> listSimpleAll();
+    List<PowerAxisAllTagCategoryResultDTO> listSimpleAll(TokenDto tokenDto);
 
     /**
      * 根据标签编码，查询节点级别
@@ -121,4 +122,4 @@ public interface PowerAxisTagService extends BaseService<PowerAxisTagEntity> {
      * @date 2022/4/23/0023 15:51
      */
     Integer selectStructLevelById(String customerId, String tagCategory, String axisStructId);
-}
+}

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

@@ -2,7 +2,6 @@ package com.epmet.plugin.power.modules.axis.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
@@ -10,12 +9,11 @@ import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
+import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.TreeUtils;
-import com.epmet.dto.CustomerAgencyDTO;
-import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.plugin.power.dto.axis.PowerAxisStructDTO;
 import com.epmet.plugin.power.dto.axis.form.*;
 import com.epmet.plugin.power.dto.axis.result.*;
@@ -44,9 +42,6 @@ import java.util.Map;
 @Service
 public class PowerAxisStructServiceImpl extends BaseServiceImpl<PowerAxisStructDao, PowerAxisStructEntity> implements PowerAxisStructService {
 
-    @Autowired
-    private GovOrgOpenFeignClient govOrgOpenFeignClient;
-
     @Autowired
     private PowerAxisTagService powerAxisTagService;
 
@@ -148,8 +143,9 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl<PowerAxisStructD
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "同一组织下只允许存在一个顶级节点");
             }
         } else {
-            int parentStructLevel = powerAxisTagService.selectStructLevelById(customerId, PowerTagCategoryEnum.STRUCT.category(), structDto.getPid());
-            if (structLevel - parentStructLevel > NumConstant.ONE) {
+            Integer parentStructLevel = powerAxisTagService.selectStructLevelById(customerId, PowerTagCategoryEnum.STRUCT.category(), structDto.getPid());
+            parentStructLevel = parentStructLevel == null?0:parentStructLevel;
+            if (structLevel.intValue() - parentStructLevel.intValue() > NumConstant.ONE) {
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "无法跨级添加节点");
             }
         }
@@ -185,11 +181,7 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl<PowerAxisStructD
         }
         if (NumConstant.ZERO_STR.equals(pid)) {
             // 新增顶级节点
-            Result<CustomerAgencyDTO> agencyInfoResult = govOrgOpenFeignClient.getAgencyById(agencyId);
-            if (!agencyInfoResult.success()) {
-                throw new EpmetException(agencyInfoResult.getCode(), agencyInfoResult.getMsg());
-            }
-            CustomerAgencyDTO agencyInfo = agencyInfoResult.getData();
+            AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(agencyId);
             struct.setAgencyId(agencyInfo.getId());
             struct.setAgencyName(agencyInfo.getOrganizationName());
             struct.setAgencyType(agencyInfo.getLevel());
@@ -227,19 +219,19 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl<PowerAxisStructD
 
     @Override
     public PowerAxisStructViewResultDTO getStatistics(PowerAxisStructViewFormDTO form) {
-        form.setCustomerId(loginUserUtil.getLoginUserCustomerId());
-
+        String customerId = form.getCustomerId();
+        String agencyId = form.getAgencyId();
         // 查网格党支部数 grid_party
-        String gridCateGoryCode = baseDao.getCateGoryCode(form.getCustomerId(), PowerTagLevelEnum.CHILD_FIRST.level(), PowerTagCategoryEnum.STRUCT.category());
-        int gridParty = baseDao.queryGridParty(form.getAgencyId(), form.getCustomerId(), gridCateGoryCode);
+        String gridCateGoryCode = baseDao.getCateGoryCode(customerId, PowerTagLevelEnum.CHILD_FIRST.level(), PowerTagCategoryEnum.STRUCT.category());
+        int gridParty = baseDao.queryGridParty(agencyId, customerId, gridCateGoryCode);
 
         // 查楼院党小组数 group_party
-        String groupCateGoryCode = baseDao.getCateGoryCode(form.getCustomerId(), PowerTagLevelEnum.CHILD_SECOND.level(), PowerTagCategoryEnum.STRUCT.category());
-        int groupParty = baseDao.queryGroupParty(form.getAgencyId(), form.getCustomerId(), groupCateGoryCode);
+        String groupCateGoryCode = baseDao.getCateGoryCode(customerId, PowerTagLevelEnum.CHILD_SECOND.level(), PowerTagCategoryEnum.STRUCT.category());
+        int groupParty = baseDao.queryGroupParty(agencyId, customerId, groupCateGoryCode);
         // 查询党员中心户数
-        int kernelHouseHold = baseDao.getKernelHouseHold(form);
+        int kernelHouseHold = baseDao.getKernelHouseHold(agencyId, customerId);
         // 查询服务站数
-        int serviceStation = baseDao.getServiceStation(form);
+        int serviceStation = baseDao.getServiceStation(agencyId, customerId);
 
         PowerAxisStructViewResultDTO result = new PowerAxisStructViewResultDTO();
         result.setGridNum(gridParty);
@@ -274,4 +266,12 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl<PowerAxisStructD
         List<PowerAxisStructTreeResultDTO> result = baseDao.listParentTreeByLevel(Integer.parseInt(structLevel), customerId);
         return TreeUtils.build(result);
     }
-}
+
+    @Override
+    public String getRootAxisStructId(String rootStructId, String customerId, String agencyId) {
+        if (StringUtils.isNotBlank(rootStructId)) {
+            return rootStructId;
+        }
+        return baseDao.getRootAxisStructId(customerId, agencyId, PowerTagLevelEnum.ROOT.level());
+    }
+}

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

@@ -10,6 +10,7 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.plugin.power.dto.axis.PowerAxisTagDTO;
@@ -41,12 +42,16 @@ public class PowerAxisTagServiceImpl extends BaseServiceImpl<PowerAxisTagDao, Po
 
 
     @Override
-    public PageData<PowerAxisTagDTO> page(Map<String, Object> params) {
-        IPage<PowerAxisTagEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, true),
-                getWrapper(params)
-        );
-        return getPageData(page, PowerAxisTagDTO.class);
+    public PageData<PowerAxisTagDTO> page(TokenDto tokenDto,Map<String, Object> params) {
+//        IPage<PowerAxisTagEntity> page = baseDao.selectPage(
+//                getPage(params, FieldConstant.CREATED_TIME, true),
+//                getWrapper(params)
+//        );
+//        return getPageData(page, PowerAxisTagDTO.class);
+        params.put("customerId", tokenDto.getCustomerId());
+        IPage<PowerAxisTagDTO> page = getPage(params);
+        List<PowerAxisTagDTO> list = baseDao.getPageList(params);
+        return new PageData<>(list, page.getTotal());
     }
 
     @Override
@@ -102,18 +107,22 @@ public class PowerAxisTagServiceImpl extends BaseServiceImpl<PowerAxisTagDao, Po
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "缺少参数");
         }
 
-        QueryWrapper<PowerAxisTagEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq("TAG_CATEGORY", tagCategory)
-                .eq("FORBIDDEN_FLAG", EpmetDelFlagEnum.NORMAL.value())
-                .eq(FieldConstant.CUSTOMER_ID, customerId)
-                .orderByAsc("STRUCT_LEVEL", FieldConstant.CREATED_TIME);
+        List<PowerAxisTagCategoryResultDTO> res = baseDao.selectByTagCategory(tagCategory,customerId);
+        return res;
+
 
-        return ConvertUtils.sourceToTarget(baseDao.selectList(wrapper), PowerAxisTagCategoryResultDTO.class);
+//        QueryWrapper<PowerAxisTagEntity> wrapper = new QueryWrapper<>();
+//        wrapper.eq("TAG_CATEGORY", tagCategory)
+//                .eq("FORBIDDEN_FLAG", EpmetDelFlagEnum.NORMAL.value())
+//                .eq(FieldConstant.CUSTOMER_ID, customerId)
+//                .orderByAsc("STRUCT_LEVEL", FieldConstant.CREATED_TIME);
+//
+//        return ConvertUtils.sourceToTarget(baseDao.selectList(wrapper), PowerAxisTagCategoryResultDTO.class);
     }
 
     @Override
-    public List<PowerAxisAllTagCategoryResultDTO> listSimpleAll() {
-        return baseDao.listSimpleAll();
+    public List<PowerAxisAllTagCategoryResultDTO> listSimpleAll(TokenDto tokenDto) {
+        return baseDao.listSimpleAll(tokenDto.getCustomerId());
     }
 
     @Override
@@ -135,4 +144,4 @@ public class PowerAxisTagServiceImpl extends BaseServiceImpl<PowerAxisTagDao, Po
     public Integer selectStructLevelById(String customerId, String tagCategory, String axisStructId) {
         return baseDao.selectStructLevelById(customerId, tagCategory, axisStructId);
     }
-}
+}

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
@@ -14,6 +15,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IcHouseDTO;
 import com.epmet.dto.result.HouseInfoDTO;
 import com.epmet.feign.GovOrgOpenFeignClient;
+import com.epmet.plugin.commons.utils.NumUtils;
 import com.epmet.plugin.power.dto.axis.PowerKernelHouseholdDTO;
 import com.epmet.plugin.power.dto.axis.form.PowerKernelHouseFormDTO;
 import com.epmet.plugin.power.dto.axis.form.PowerKernelHouseHoldViewListFormDTO;
@@ -23,8 +25,10 @@ import com.epmet.plugin.power.dto.axis.result.PowerKernelListPostitionResultDTO;
 import com.epmet.plugin.power.dto.axis.result.PowerkernelMemberListResultDTO;
 import com.epmet.plugin.power.modules.axis.dao.PowerKernelHouseholdDao;
 import com.epmet.plugin.power.modules.axis.entity.PowerKernelHouseholdEntity;
+import com.epmet.plugin.power.modules.axis.service.PowerAxisStructService;
 import com.epmet.plugin.power.modules.axis.service.PowerKernelHouseholdService;
 import com.google.common.collect.Sets;
+import org.apache.commons.compress.utils.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -52,6 +56,9 @@ public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl<PowerKernel
     @Autowired
     private PowerKernelHouseholdService powerKernelHouseholdService;
 
+    @Autowired
+    private PowerAxisStructService powerAxisStructService;
+
     @Override
     public PageData<PowerKernelHouseholdDTO> page(Map<String, Object> params) {
 
@@ -121,8 +128,12 @@ public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl<PowerKernel
      */
     @Override
     public List<PowerKernelHouseHoldViewListResultDTO> getList(PowerKernelHouseHoldViewListFormDTO form) {
-        form.setPageNo((form.getPageNo() - 1) * form.getPageSize());
-        form.setCustomerId(loginUserUtil.getLoginUserCustomerId());
+        String axisStructId = powerAxisStructService.getRootAxisStructId(form.getAxisStructId(), form.getCustomerId(), form.getAgencyId());
+        if (StringUtils.isBlank(axisStructId)) {
+            return Lists.newArrayList();
+        }
+        form.setAxisStructId(axisStructId);
+        form.setPageNo((form.getPageNo() - NumConstant.ONE) * form.getPageSize());
         List<PowerKernelHouseHoldViewListResultDTO> list = baseDao.getList(form);
         for (PowerKernelHouseHoldViewListResultDTO dto : list) {
             List<String> nameList = dto.getKernelMemberList().stream().map(PowerkernelMemberListResultDTO::getKernelMemberName).distinct().collect(Collectors.toList());
@@ -133,13 +144,17 @@ public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl<PowerKernel
 
     @Override
     public long getTotal(PowerKernelHouseHoldViewListFormDTO form) {
-        form.setCustomerId(loginUserUtil.getLoginUserCustomerId());
         return baseDao.getTotal(form);
     }
 
     @Override
     public List<PowerKernelListPostitionResultDTO> getListPosition(PowerKernelListPostitionFormDTO form) {
-        return baseDao.queryListPosition(form.getAxisStructId(), form.getCustomerId(), form.getLimit());
+        String customerId = form.getCustomerId();
+        String axisStructId = powerAxisStructService.getRootAxisStructId(form.getAxisStructId(), customerId, form.getAgencyId());
+        if (StringUtils.isBlank(axisStructId)) {
+            return Lists.newArrayList();
+        }
+        return baseDao.queryListPosition(axisStructId, customerId, NumUtils.getNumberInt(form.getLimit(), true, NumUtils.ONE_THOUSAND));
     }
 
     @Override

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

@@ -6,14 +6,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 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.commons.utils.NumUtils;
 import com.epmet.plugin.power.dto.axis.PowerServiceStationDTO;
 import com.epmet.plugin.power.dto.axis.form.PowerAxisServiceStationFormDTO;
 import com.epmet.plugin.power.dto.axis.result.PowerAxisServiceStationResultDTO;
 import com.epmet.plugin.power.modules.axis.dao.PowerServiceStationDao;
 import com.epmet.plugin.power.modules.axis.entity.PowerServiceStationEntity;
+import com.epmet.plugin.power.modules.axis.service.PowerAxisStructService;
 import com.epmet.plugin.power.modules.axis.service.PowerServiceStationService;
+import org.apache.commons.compress.utils.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -32,9 +34,8 @@ import java.util.Map;
 @Service
 public class PowerServiceStationServiceImpl extends BaseServiceImpl<PowerServiceStationDao, PowerServiceStationEntity> implements PowerServiceStationService {
 
-
     @Autowired
-    private LoginUserUtil loginUser;
+    private PowerAxisStructService powerAxisStructService;
 
     @Override
     public PageData<PowerServiceStationDTO> page(Map<String, Object> params) {
@@ -74,7 +75,6 @@ public class PowerServiceStationServiceImpl extends BaseServiceImpl<PowerService
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(PowerServiceStationDTO dto) {
-        dto.setCustomerId(loginUser.getLoginUserCustomerId());
         PowerServiceStationEntity entity = ConvertUtils.sourceToTarget(dto, PowerServiceStationEntity.class);
         insert(entity);
     }
@@ -95,9 +95,13 @@ public class PowerServiceStationServiceImpl extends BaseServiceImpl<PowerService
 
     @Override
     public List<PowerAxisServiceStationResultDTO> getListPosition(PowerAxisServiceStationFormDTO form) {
-        form.setCustomerId(loginUser.getLoginUserCustomerId());
-        List<PowerAxisServiceStationResultDTO> list = baseDao.getListPosition(form);
-        return list;
+        String axisStructId = powerAxisStructService.getRootAxisStructId(form.getAxisStructId(), form.getCustomerId(), form.getAgencyId());
+        if (StringUtils.isBlank(axisStructId)) {
+            return Lists.newArrayList();
+        }
+        form.setAxisStructId(axisStructId);
+        form.setLimit(NumUtils.getNumberInt(form.getLimit(), true, NumUtils.ONE_THOUSAND));
+        return baseDao.getListPosition(form);
     }
 
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/controller/HikCommunityInfoController.java

@@ -0,0 +1,94 @@
+package com.epmet.plugin.power.modules.hik.controller;
+
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.plugin.power.dto.hik.HikCommunityInfoDTO;
+import com.epmet.plugin.power.modules.hik.excel.HikCommunityInfoExcel;
+import com.epmet.plugin.power.modules.hik.service.HikCommunityInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 海康社区信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+@RestController
+@RequestMapping("hikCommunityInfo")
+public class HikCommunityInfoController {
+
+    @Autowired
+    private HikCommunityInfoService hikCommunityInfoService;
+
+    @RequestMapping("page")
+    public Result<PageData<HikCommunityInfoDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<HikCommunityInfoDTO> page = hikCommunityInfoService.page(params);
+        return new Result<PageData<HikCommunityInfoDTO>>().ok(page);
+    }
+
+    @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
+    public Result<HikCommunityInfoDTO> get(@PathVariable("id") String id){
+        HikCommunityInfoDTO data = hikCommunityInfoService.get(id);
+        return new Result<HikCommunityInfoDTO>().ok(data);
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("save")
+    public Result save(@RequestBody HikCommunityInfoDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        hikCommunityInfoService.save(dto);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("update")
+    public Result update(@RequestBody HikCommunityInfoDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        hikCommunityInfoService.update(dto);
+        return new Result();
+    }
+
+    @RequestMapping(value = "delete", method = {RequestMethod.POST, RequestMethod.DELETE})
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        hikCommunityInfoService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<HikCommunityInfoDTO> list = hikCommunityInfoService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, HikCommunityInfoExcel.class);
+    }
+
+    /**
+     * @Description: 同步社区列表信息
+     * @Param: [formDto]
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result<>
+     * @Author: wgf
+     * @Date: 2022-05-23
+     */
+    @GetMapping("getCommunityList")
+    public Result getCommunityList() {
+        return hikCommunityInfoService.getCommunityList();
+    }
+
+
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/controller/HikDeviceInfoController.java

@@ -0,0 +1,94 @@
+package com.epmet.plugin.power.modules.hik.controller;
+
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.plugin.power.dto.hik.HikDeviceInfoDTO;
+import com.epmet.plugin.power.modules.hik.excel.HikDeviceInfoExcel;
+import com.epmet.plugin.power.modules.hik.service.HikDeviceInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 海康设备信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+@RestController
+@RequestMapping("hikDeviceInfo")
+public class HikDeviceInfoController {
+
+    @Autowired
+    private HikDeviceInfoService hikDeviceInfoService;
+
+    @RequestMapping("page")
+    public Result<PageData<HikDeviceInfoDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<HikDeviceInfoDTO> page = hikDeviceInfoService.page(params);
+        return new Result<PageData<HikDeviceInfoDTO>>().ok(page);
+    }
+
+    @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
+    public Result<HikDeviceInfoDTO> get(@PathVariable("id") String id){
+        HikDeviceInfoDTO data = hikDeviceInfoService.get(id);
+        return new Result<HikDeviceInfoDTO>().ok(data);
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("save")
+    public Result save(@RequestBody HikDeviceInfoDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        hikDeviceInfoService.save(dto);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("update")
+    public Result update(@RequestBody HikDeviceInfoDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        hikDeviceInfoService.update(dto);
+        return new Result();
+    }
+
+    @RequestMapping(value = "delete", method = {RequestMethod.POST, RequestMethod.DELETE})
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        hikDeviceInfoService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<HikDeviceInfoDTO> list = hikDeviceInfoService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, HikDeviceInfoExcel.class);
+    }
+
+    /**
+     * @Description: 同步设备列表信息
+     * @Param: [formDto]
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result<>
+     * @Author: wgf
+     * @Date: 2022-05-23
+     */
+    @GetMapping("getDeviceList")
+    public Result getDeviceList() {
+        return hikDeviceInfoService.getDeviceList();
+    }
+
+
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/controller/HikErrorInfoController.java

@@ -0,0 +1,82 @@
+package com.epmet.plugin.power.modules.hik.controller;
+
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.plugin.power.dto.hik.HikErrorInfoDTO;
+import com.epmet.plugin.power.modules.hik.excel.HikErrorInfoExcel;
+import com.epmet.plugin.power.modules.hik.service.HikErrorInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 海康设备推送失败信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-23
+ */
+@RestController
+@RequestMapping("hikErrorInfo")
+public class HikErrorInfoController {
+
+    @Autowired
+    private HikErrorInfoService hikErrorInfoService;
+
+    @RequestMapping("page")
+    public Result<PageData<HikErrorInfoDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<HikErrorInfoDTO> page = hikErrorInfoService.page(params);
+        return new Result<PageData<HikErrorInfoDTO>>().ok(page);
+    }
+
+    @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
+    public Result<HikErrorInfoDTO> get(@PathVariable("id") String id){
+        HikErrorInfoDTO data = hikErrorInfoService.get(id);
+        return new Result<HikErrorInfoDTO>().ok(data);
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("save")
+    public Result save(@RequestBody HikErrorInfoDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        hikErrorInfoService.save(dto);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("update")
+    public Result update(@RequestBody HikErrorInfoDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        hikErrorInfoService.update(dto);
+        return new Result();
+    }
+
+    @RequestMapping(value = "delete", method = {RequestMethod.POST, RequestMethod.DELETE})
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        hikErrorInfoService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<HikErrorInfoDTO> list = hikErrorInfoService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, HikErrorInfoExcel.class);
+    }
+
+
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/dao/HikCommunityInfoDao.java

@@ -0,0 +1,21 @@
+package com.epmet.plugin.power.modules.hik.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.plugin.power.dto.hik.HikCommunityInfoDTO;
+import com.epmet.plugin.power.modules.hik.entity.HikCommunityInfoEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 海康社区信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+@Mapper
+public interface HikCommunityInfoDao extends BaseDao<HikCommunityInfoEntity> {
+
+    List<HikCommunityInfoDTO> getCommunityInfoAll();
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/dao/HikDeviceInfoDao.java

@@ -0,0 +1,16 @@
+package com.epmet.plugin.power.modules.hik.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.plugin.power.modules.hik.entity.HikDeviceInfoEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 海康设备信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+@Mapper
+public interface HikDeviceInfoDao extends BaseDao<HikDeviceInfoEntity> {
+	
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/dao/HikErrorInfoDao.java

@@ -0,0 +1,27 @@
+package com.epmet.plugin.power.modules.hik.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.plugin.power.modules.hik.entity.HikErrorInfoEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.Map;
+
+/**
+ * 海康设备推送失败信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-23
+ */
+@Mapper
+public interface HikErrorInfoDao extends BaseDao<HikErrorInfoEntity> {
+
+    /**
+     * 物理删除
+     *
+     * @param params
+     * @return void
+     * @author zhy
+     * @date 2022/4/24 14:08
+     */
+    void deletePhysical(Map<String, Object> params);
+}

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

@@ -0,0 +1,64 @@
+package com.epmet.plugin.power.modules.hik.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 海康社区信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("pli_hik_community_info")
+public class HikCommunityInfoEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 社区ID
+     */
+	private String communityId;
+
+    /**
+     * 社区名称
+     */
+	private String communityName;
+
+    /**
+     * 省代号
+     */
+	private String provinceCode;
+
+    /**
+     * 市代号
+     */
+	private String cityCode;
+
+    /**
+     * 区代号
+     */
+	private String countyCode;
+
+    /**
+     * 经度坐标值
+     */
+	private String longitude;
+
+    /**
+     * 维度坐标值
+     */
+	private String latitude;
+
+}

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

@@ -0,0 +1,64 @@
+package com.epmet.plugin.power.modules.hik.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 海康设备信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("pli_hik_device_info")
+public class HikDeviceInfoEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 社区ID
+     */
+	private String communityId;
+
+    /**
+     * 设备ID
+     */
+	private String deviceId;
+
+    /**
+     * 设备名称
+     */
+	private String deviceName;
+
+    /**
+     * 设备型号
+     */
+	private String deviceModel;
+
+    /**
+     * 设备序列号
+     */
+	private String deviceSerial;
+
+    /**
+     * 设备状态，0：离线，1：在线
+     */
+	private String deviceStatus;
+
+    /**
+     * 设备路径
+     */
+	private String devicePath;
+
+}

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

@@ -0,0 +1,48 @@
+package com.epmet.plugin.power.modules.hik.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 海康设备推送失败信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-23
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("pli_hik_error_info")
+public class HikErrorInfoEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 身份证号
+     */
+	private String idCard;
+
+    /**
+     * 错误类型 0：token，1：人员，2权限
+     */
+	private String errorType;
+
+    /**
+     * 错误详情
+     */
+	private String errorInfo;
+
+	/**
+	 * 引用ID
+	 */
+	private String referenceId;
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/excel/HikCommunityInfoExcel.java

@@ -0,0 +1,63 @@
+package com.epmet.plugin.power.modules.hik.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 海康社区信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+@Data
+public class HikCommunityInfoExcel {
+
+    @Excel(name = "主键")
+    private String id;
+
+    @Excel(name = "删除标记 0：未删除，1：已删除")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+    @Excel(name = "客户ID")
+    private String customerId;
+
+    @Excel(name = "社区ID")
+    private String communityId;
+
+    @Excel(name = "社区名称")
+    private String communityName;
+
+    @Excel(name = "省代号")
+    private String provinceCode;
+
+    @Excel(name = "市代号")
+    private String cityCode;
+
+    @Excel(name = "区代号")
+    private String countyCode;
+
+    @Excel(name = "经度坐标值")
+    private String longitude;
+
+    @Excel(name = "维度坐标值")
+    private String latitude;
+
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/excel/HikDeviceInfoExcel.java

@@ -0,0 +1,63 @@
+package com.epmet.plugin.power.modules.hik.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 海康设备信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+@Data
+public class HikDeviceInfoExcel {
+
+    @Excel(name = "主键")
+    private String id;
+
+    @Excel(name = "删除标记 0：未删除，1：已删除")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+    @Excel(name = "客户ID")
+    private String customerId;
+
+    @Excel(name = "社区ID")
+    private String communityId;
+
+    @Excel(name = "设备ID")
+    private String deviceId;
+
+    @Excel(name = "设备名称")
+    private String deviceName;
+
+    @Excel(name = "设备型号")
+    private String deviceModel;
+
+    @Excel(name = "设备序列号")
+    private String deviceSerial;
+
+    @Excel(name = "设备状态，0：离线，1：在线")
+    private String deviceStatus;
+
+    @Excel(name = "设备路径")
+    private String devicePath;
+
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/excel/HikErrorInfoExcel.java

@@ -0,0 +1,51 @@
+package com.epmet.plugin.power.modules.hik.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 海康设备推送失败信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-23
+ */
+@Data
+public class HikErrorInfoExcel {
+
+    @Excel(name = "主键")
+    private String id;
+
+    @Excel(name = "删除标记 0：未删除，1：已删除")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+    @Excel(name = "客户ID")
+    private String customerId;
+
+    @Excel(name = "身份证号")
+    private String idCard;
+
+    @Excel(name = "错误类型 0：token，1：人员，2权限")
+    private String errorType;
+
+    @Excel(name = "错误详情")
+    private String errorInfo;
+
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/redis/HikCommunityInfoRedis.java

@@ -0,0 +1,30 @@
+package com.epmet.plugin.power.modules.hik.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 海康社区信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+@Component
+public class HikCommunityInfoRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/redis/HikDeviceInfoRedis.java

@@ -0,0 +1,30 @@
+package com.epmet.plugin.power.modules.hik.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 海康设备信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+@Component
+public class HikDeviceInfoRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/redis/HikErrorInfoRedis.java

@@ -0,0 +1,30 @@
+package com.epmet.plugin.power.modules.hik.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 海康设备推送失败信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-23
+ */
+@Component
+public class HikErrorInfoRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/HikCommunityInfoService.java

@@ -0,0 +1,87 @@
+package com.epmet.plugin.power.modules.hik.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.plugin.power.dto.hik.HikCommunityInfoDTO;
+import com.epmet.plugin.power.modules.hik.entity.HikCommunityInfoEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 海康社区信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+public interface HikCommunityInfoService extends BaseService<HikCommunityInfoEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<HikCommunityInfoDTO>
+     * @author generator
+     * @date 2022-05-20
+     */
+    PageData<HikCommunityInfoDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<HikCommunityInfoDTO>
+     * @author generator
+     * @date 2022-05-20
+     */
+    List<HikCommunityInfoDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return HikCommunityInfoDTO
+     * @author generator
+     * @date 2022-05-20
+     */
+    HikCommunityInfoDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-05-20
+     */
+    void save(HikCommunityInfoDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-05-20
+     */
+    void update(HikCommunityInfoDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2022-05-20
+     */
+    void delete(String[] ids);
+
+
+    /**
+     * 同步社区信息
+     * @param
+     * @return
+     */
+    Result getCommunityList();
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/HikDeviceInfoService.java

@@ -0,0 +1,86 @@
+package com.epmet.plugin.power.modules.hik.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.plugin.power.dto.hik.HikDeviceInfoDTO;
+import com.epmet.plugin.power.modules.hik.entity.HikDeviceInfoEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 海康设备信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+public interface HikDeviceInfoService extends BaseService<HikDeviceInfoEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<HikDeviceInfoDTO>
+     * @author generator
+     * @date 2022-05-20
+     */
+    PageData<HikDeviceInfoDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<HikDeviceInfoDTO>
+     * @author generator
+     * @date 2022-05-20
+     */
+    List<HikDeviceInfoDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return HikDeviceInfoDTO
+     * @author generator
+     * @date 2022-05-20
+     */
+    HikDeviceInfoDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-05-20
+     */
+    void save(HikDeviceInfoDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-05-20
+     */
+    void update(HikDeviceInfoDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2022-05-20
+     */
+    void delete(String[] ids);
+
+    /**
+     * 同步设备信息
+     * @param
+     * @return
+     */
+    Result getDeviceList();
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/HikErrorInfoService.java

@@ -0,0 +1,88 @@
+package com.epmet.plugin.power.modules.hik.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.plugin.power.dto.hik.HikErrorInfoDTO;
+import com.epmet.plugin.power.modules.hik.entity.HikErrorInfoEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 海康设备推送失败信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-23
+ */
+public interface HikErrorInfoService extends BaseService<HikErrorInfoEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<HikErrorInfoDTO>
+     * @author generator
+     * @date 2022-05-23
+     */
+    PageData<HikErrorInfoDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<HikErrorInfoDTO>
+     * @author generator
+     * @date 2022-05-23
+     */
+    List<HikErrorInfoDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return HikErrorInfoDTO
+     * @author generator
+     * @date 2022-05-23
+     */
+    HikErrorInfoDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-05-23
+     */
+    void save(HikErrorInfoDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-05-23
+     */
+    void update(HikErrorInfoDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2022-05-23
+     */
+    void delete(String[] ids);
+
+    /**
+     * 物理删除
+     *
+     * @param params
+     * @return void
+     * @author zhy
+     * @date 2022/4/24 14:08
+     */
+    void deletePhysical(Map<String, Object> params);
+}

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

@@ -0,0 +1,167 @@
+package com.epmet.plugin.power.modules.hik.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+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.commons.tools.utils.HttpClientManager;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.plugin.power.modules.hik.dao.HikCommunityInfoDao;
+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 org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+
+/**
+ * 海康社区信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+@Service
+public class HikCommunityInfoServiceImpl extends BaseServiceImpl<HikCommunityInfoDao, HikCommunityInfoEntity> implements HikCommunityInfoService {
+
+    @Autowired
+    private HikCommunityInfoRedis hikCommunityInfoRedis;
+
+    @Autowired
+    private HkDeviceUtil hkDeviceUtil;
+
+    @Autowired
+    private LoginUserUtil loginUserUtil;
+
+    // 参数
+    private Integer pageNo = 1;
+    private Integer pageSize = 10;
+
+    @Override
+    public PageData<HikCommunityInfoDTO> page(Map<String, Object> params) {
+        IPage<HikCommunityInfoEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, HikCommunityInfoDTO.class);
+    }
+
+    @Override
+    public List<HikCommunityInfoDTO> list(Map<String, Object> params) {
+        List<HikCommunityInfoEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, HikCommunityInfoDTO.class);
+    }
+
+    private QueryWrapper<HikCommunityInfoEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+        String communityName = (String)params.get("communityName");
+
+        QueryWrapper<HikCommunityInfoEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+        wrapper.like(StringUtils.isNotBlank(communityName), "COMMUNITY_NAME", communityName);
+
+        return wrapper;
+    }
+
+    @Override
+    public HikCommunityInfoDTO get(String id) {
+        HikCommunityInfoEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, HikCommunityInfoDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(HikCommunityInfoDTO dto) {
+        HikCommunityInfoEntity entity = ConvertUtils.sourceToTarget(dto, HikCommunityInfoEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(HikCommunityInfoDTO dto) {
+        HikCommunityInfoEntity entity = ConvertUtils.sourceToTarget(dto, HikCommunityInfoEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    @Override
+    public Result getCommunityList() {
+        // 请求路径
+        String url = "https://api2.hik-cloud.com/api/v1/estate/system/communities/actions/list";
+
+        // token
+        String token =hkDeviceUtil.getAccessToken();
+//        token = "Bearer ".concat(token);
+
+        Map<String, Object> headerMap = new HashMap<>(4);
+        headerMap.put("Authorization",token);
+
+        Map<String, Object> paramsMap = new HashMap<>(4);
+        paramsMap.put("pageNo", pageNo);
+        paramsMap.put("pageSize", pageSize);
+
+        JSONArray jsonArray = getJSONArrayListGET(url,false,paramsMap,headerMap,"请求社区列表信息失败");
+
+        List<HikCommunityInfoEntity> entityList = new ArrayList<HikCommunityInfoEntity>();
+        for (int i = 0; i < jsonArray.size(); i++) {
+            JSONObject jsonObj = jsonArray.getJSONObject(i);
+            //  转成对象实体
+            HikCommunityInfoEntity entity = JSONObject.toJavaObject(jsonObj ,HikCommunityInfoEntity.class);
+            entity.setCustomerId(loginUserUtil.getLoginUserCustomerId() == null ? "0001" : loginUserUtil.getLoginUserCustomerId());
+            entityList.add(entity);
+        }
+        insertBatch(entityList);
+
+        if(jsonArray != null && jsonArray.size() == 10){
+            pageNo++;
+            getCommunityList();
+        }
+
+        return new Result();
+    }
+
+    /**
+     * sendGet请求
+     * @param url
+     * @param isHttps
+     * @param paramsMap
+     * @param headerMap
+     * @param msg
+     * @return
+     */
+    public JSONArray getJSONArrayListGET(String url,Boolean isHttps,Map<String, Object> paramsMap,Map<String, Object> headerMap,String msg){
+        // 请求接口
+        String data = HttpClientManager.getInstance().sendGet(url,false,paramsMap, headerMap).getData();
+        if (null == data) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), msg);
+        }
+        JSONObject toResult = JSON.parseObject(data);
+
+        JSONObject dataList = JSON.parseObject(toResult.get("data").toString());
+
+        JSONArray rows = JSONArray.parseArray(dataList.get("rows").toString());
+
+        return rows;
+    }
+
+}

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

@@ -0,0 +1,170 @@
+package com.epmet.plugin.power.modules.hik.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+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.commons.tools.utils.HttpClientManager;
+import com.epmet.commons.tools.utils.Result;
+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 org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+
+/**
+ * 海康设备信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-20
+ */
+@Service
+public class HikDeviceInfoServiceImpl extends BaseServiceImpl<HikDeviceInfoDao, HikDeviceInfoEntity> implements HikDeviceInfoService {
+
+    @Autowired
+    private HikDeviceInfoRedis hikDeviceInfoRedis;
+
+    @Autowired
+    private HkDeviceUtil hkDeviceUtil;
+
+    @Autowired
+    private LoginUserUtil loginUserUtil;
+
+    @Autowired
+    private HikCommunityInfoDao hikCommunityInfoDao;
+
+    @Override
+    public PageData<HikDeviceInfoDTO> page(Map<String, Object> params) {
+        IPage<HikDeviceInfoEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, HikDeviceInfoDTO.class);
+    }
+
+    @Override
+    public List<HikDeviceInfoDTO> list(Map<String, Object> params) {
+        List<HikDeviceInfoEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, HikDeviceInfoDTO.class);
+    }
+
+    private QueryWrapper<HikDeviceInfoEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+        String communityId = (String)params.get("communityId");
+
+        QueryWrapper<HikDeviceInfoEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+        wrapper.eq(StringUtils.isNotBlank(communityId), "COMMUNITY_ID", communityId);
+
+        return wrapper;
+    }
+
+    @Override
+    public HikDeviceInfoDTO get(String id) {
+        HikDeviceInfoEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, HikDeviceInfoDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(HikDeviceInfoDTO dto) {
+        HikDeviceInfoEntity entity = ConvertUtils.sourceToTarget(dto, HikDeviceInfoEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(HikDeviceInfoDTO dto) {
+        HikDeviceInfoEntity entity = ConvertUtils.sourceToTarget(dto, HikDeviceInfoEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    @Override
+    public Result getDeviceList() {
+        // 请求路径
+        String url = "https://api2.hik-cloud.com/api/v1/estate/devices/actions/listByCommunityId";
+
+        // token
+        String token =hkDeviceUtil.getAccessToken();
+//        token = "Bearer ".concat(token);
+
+        Map<String, String> headerMap = new HashMap<>(4);
+        headerMap.put("Authorization",token);
+
+        // 获取社区列表
+        List<HikCommunityInfoDTO> communityList = hikCommunityInfoDao.getCommunityInfoAll();
+
+        for(HikCommunityInfoDTO hikCommunityInfoDTO : communityList){
+            // 参数
+            Integer pageNo = 1;
+            Integer pageSize = 1000;
+            Map<String, Object> paramsMap = new HashMap<>(4);
+            paramsMap.put("pageNo", pageNo);
+            paramsMap.put("pageSize", pageSize);
+            paramsMap.put("communityId",hikCommunityInfoDTO.getCommunityId());
+            JSONArray jsonArray = getJSONArrayListPOST(url,JSON.toJSONString(paramsMap),headerMap,"请求设备列表信息失败");
+
+            List<HikDeviceInfoEntity> entityList = new ArrayList<HikDeviceInfoEntity>();
+            for (int i = 0; i < jsonArray.size(); i++) {
+                JSONObject jsonObj = jsonArray.getJSONObject(i);
+                //  转成对象实体
+                HikDeviceInfoEntity entity = JSONObject.toJavaObject(jsonObj ,HikDeviceInfoEntity.class);
+                entity.setCustomerId(loginUserUtil.getLoginUserCustomerId() == null ? "0001" : loginUserUtil.getLoginUserCustomerId());
+                entityList.add(entity);
+            }
+            insertBatch(entityList);
+        }
+
+        return new Result();
+    }
+
+    /**
+     * sendGet请求
+     * @param url
+     * @param jsonStrParam
+     * @param headerMap
+     * @param msg
+     * @return
+     */
+    public JSONArray getJSONArrayListPOST(String url,String jsonStrParam,Map<String, String> headerMap,String msg){
+        // 请求接口
+        String data = HttpClientManager.getInstance().sendPostByJSONAndHeader(url,jsonStrParam, headerMap).getData();
+        if (null == data) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), msg);
+        }
+        JSONObject toResult = JSON.parseObject(data);
+
+        JSONObject dataList = JSON.parseObject(toResult.get("data").toString());
+
+        JSONArray rows = JSONArray.parseArray(dataList.get("rows").toString());
+
+        return rows;
+    }
+
+}

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

@@ -0,0 +1,95 @@
+package com.epmet.plugin.power.modules.hik.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.plugin.power.modules.hik.dao.HikErrorInfoDao;
+import com.epmet.plugin.power.dto.hik.HikErrorInfoDTO;
+import com.epmet.plugin.power.modules.hik.entity.HikErrorInfoEntity;
+import com.epmet.plugin.power.modules.hik.redis.HikErrorInfoRedis;
+import com.epmet.plugin.power.modules.hik.service.HikErrorInfoService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 海康设备推送失败信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-23
+ */
+@Service
+public class HikErrorInfoServiceImpl extends BaseServiceImpl<HikErrorInfoDao, HikErrorInfoEntity> implements HikErrorInfoService {
+
+    @Autowired
+    private HikErrorInfoRedis hikErrorInfoRedis;
+
+    @Override
+    public PageData<HikErrorInfoDTO> page(Map<String, Object> params) {
+        IPage<HikErrorInfoEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, HikErrorInfoDTO.class);
+    }
+
+    @Override
+    public List<HikErrorInfoDTO> list(Map<String, Object> params) {
+        List<HikErrorInfoEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, HikErrorInfoDTO.class);
+    }
+
+    private QueryWrapper<HikErrorInfoEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<HikErrorInfoEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public HikErrorInfoDTO get(String id) {
+        HikErrorInfoEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, HikErrorInfoDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(HikErrorInfoDTO dto) {
+        HikErrorInfoEntity entity = ConvertUtils.sourceToTarget(dto, HikErrorInfoEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(HikErrorInfoDTO dto) {
+        HikErrorInfoEntity entity = ConvertUtils.sourceToTarget(dto, HikErrorInfoEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deletePhysical(Map<String, Object> params) {
+        if (!params.isEmpty()) {
+            baseDao.deletePhysical(params);
+        }
+    }
+
+}

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

@@ -70,6 +70,7 @@ public class RentBlacklistController {
         return new Result();
     }
 
+    @NoRepeatSubmit
     @GetMapping("export")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<RentBlacklistDTO> list = rentBlacklistService.list(params);

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

@@ -63,7 +63,7 @@ public class RentContractFileController {
         return new Result();
     }
 
-    @PostMapping("delete")
+    @RequestMapping(value = "delete", method = {RequestMethod.POST, RequestMethod.DELETE})
     public Result delete(@RequestBody String[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -71,11 +71,4 @@ public class RentContractFileController {
         return new Result();
     }
 
-    @GetMapping("export")
-    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<RentContractFileDTO> list = rentContractFileService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, RentContractFileExcel.class);
-    }
-
-
 }

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

@@ -50,7 +50,17 @@ public class RentContractInfoController {
     public Result save(@RequestBody RentContractInfoDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        return rentContractInfoService.save(dto);
+        rentContractInfoService.save(dto);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("savePc")
+    public Result savePc(@RequestBody RentContractInfoDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        rentContractInfoService.savePc(dto);
+        return new Result();
     }
 
     @NoRepeatSubmit
@@ -62,6 +72,23 @@ public class RentContractInfoController {
         return new Result();
     }
 
+    @NoRepeatSubmit
+    @PostMapping("send")
+    public Result send(@RequestBody RentContractInfoDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        rentContractInfoService.send(dto);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("resend/{id}")
+    public Result resend(@PathVariable("id") String id) {
+        //效验数据
+        rentContractInfoService.resend(id);
+        return new Result();
+    }
+
     @NoRepeatSubmit
     @PostMapping("update")
     public Result update(@RequestBody RentContractInfoDTO dto) {
@@ -71,6 +98,15 @@ public class RentContractInfoController {
         return new Result();
     }
 
+    @NoRepeatSubmit
+    @PostMapping("updatePc")
+    public Result updatePc(@RequestBody RentContractInfoDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        rentContractInfoService.updatePc(dto);
+        return new Result();
+    }
+
     @DeleteMapping("delete")
     public Result delete(@RequestBody String[] ids) {
         //效验数据
@@ -79,6 +115,7 @@ public class RentContractInfoController {
         return new Result();
     }
 
+    @NoRepeatSubmit
     @GetMapping("export")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<RentContractInfoDTO> list = rentContractInfoService.list(params);

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

@@ -0,0 +1,89 @@
+package com.epmet.plugin.power.modules.rent.controller;
+
+import com.alibaba.nacos.client.naming.utils.CollectionUtils;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.plugin.power.dto.rent.RentHouseDTO;
+import com.epmet.plugin.power.modules.rent.excel.RentHouseExcel;
+import com.epmet.plugin.power.modules.rent.service.RentHouseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 房屋信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-11
+ */
+@RestController
+@RequestMapping("rentHouse")
+public class RentHouseController {
+
+    @Autowired
+    private RentHouseService rentHouseService;
+
+    @RequestMapping("page")
+    public Result<PageData<RentHouseDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<RentHouseDTO> page = rentHouseService.page(params);
+        return new Result<PageData<RentHouseDTO>>().ok(page);
+    }
+
+    @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
+    public Result<RentHouseDTO> get(@PathVariable("id") String id){
+        RentHouseDTO data = rentHouseService.get(id);
+        return new Result<RentHouseDTO>().ok(data);
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("save")
+    public Result save(@RequestBody RentHouseDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        rentHouseService.save(dto);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("update")
+    public Result update(@RequestBody RentHouseDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        rentHouseService.update(dto);
+        return new Result();
+    }
+
+    @RequestMapping(value = "delete", method = {RequestMethod.POST, RequestMethod.DELETE})
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        rentHouseService.delete(ids);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<RentHouseDTO> list = rentHouseService.list(params);
+        if(CollectionUtils.isEmpty(list)){
+            RentHouseDTO dto = new RentHouseDTO();
+            dto.setId("");
+            list.add(dto);
+        }
+        ExcelUtils.exportExcelToTarget(response, null, list, RentHouseExcel.class);
+    }
+
+
+
+}

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

@@ -7,8 +7,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.plugin.power.dto.rent.RentTenantInfoDTO;
 import com.epmet.plugin.power.modules.rent.excel.RentTenantInfoExcel;
 import com.epmet.plugin.power.modules.rent.service.RentTenantInfoService;
@@ -39,6 +39,12 @@ public class RentTenantInfoController {
         return new Result<PageData<RentTenantInfoDTO>>().ok(page);
     }
 
+    @RequestMapping("landlord/page")
+    public Result<PageData<RentTenantInfoDTO>> page4Landlord(@RequestParam Map<String, Object> params) {
+        PageData<RentTenantInfoDTO> page = rentTenantInfoService.page4Landlord(params);
+        return new Result<PageData<RentTenantInfoDTO>>().ok(page);
+    }
+
     @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
     public Result<RentTenantInfoDTO> get(@PathVariable("id") String id) {
         RentTenantInfoDTO data = rentTenantInfoService.get(id);
@@ -53,6 +59,14 @@ public class RentTenantInfoController {
         return rentTenantInfoService.save(dto);
     }
 
+    @NoRepeatSubmit
+    @PostMapping("landlord/review")
+    public Result review(@RequestBody RentTenantInfoDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        return rentTenantInfoService.review(dto);
+    }
+
     @NoRepeatSubmit
     @PostMapping("update")
     public Result update(@RequestBody RentTenantInfoDTO dto) {
@@ -62,7 +76,7 @@ public class RentTenantInfoController {
         return new Result();
     }
 
-    @PostMapping("delete")
+    @RequestMapping(value = "delete", method = {RequestMethod.POST, RequestMethod.DELETE})
     public Result delete(@RequestBody String[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
@@ -70,11 +84,11 @@ public class RentTenantInfoController {
         return new Result();
     }
 
+    @NoRepeatSubmit
     @GetMapping("export")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<RentTenantInfoDTO> list = rentTenantInfoService.list(params);
         ExcelUtils.exportExcelToTarget(response, null, list, RentTenantInfoExcel.class);
     }
 
-
 }

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

@@ -0,0 +1,16 @@
+package com.epmet.plugin.power.modules.rent.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.plugin.power.modules.rent.entity.RentHouseEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 房屋信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-11
+ */
+@Mapper
+public interface RentHouseDao extends BaseDao<RentHouseEntity> {
+	
+}

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

@@ -1,9 +1,11 @@
 package com.epmet.plugin.power.modules.rent.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.plugin.power.dto.rent.RentTenantInfoDTO;
 import com.epmet.plugin.power.modules.rent.entity.RentTenantInfoEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -25,4 +27,14 @@ public interface RentTenantInfoDao extends BaseDao<RentTenantInfoEntity> {
      */
     void deletePhysical(Map<String, Object> params);
 
+    /**
+     * 查询房东列表
+     *
+     * @param params
+     * @return java.util.List<com.epmet.plugin.power.dto.rent.RentTenantInfoDTO>
+     * @author zhy
+     * @date 2022/5/5 13:57
+     */
+    List<RentTenantInfoDTO> getLandlordList(Map<String, Object> params);
+
 }

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

@@ -26,6 +26,11 @@ public class RentBlacklistEntity extends BaseEpmetEntity {
      */
 	private String userId;
 
+	/**
+	 * epmet网格ID
+	 */
+	private String gridId;
+
     /**
      * 姓名
      */

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

@@ -31,9 +31,9 @@ public class RentContractFileEntity extends BaseEpmetEntity {
      */
 	private String fileUrl;
 
-    /**
-     * 文件类型 0：图片，1 文件（合同）
-     */
+	/**
+	 * 文件类型 0：图片（人脸/头像），1 文件（合同），2 身份证照片，3 中介资料
+	 */
 	private String fileType;
 
 	/**

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

@@ -106,6 +106,16 @@ public class RentContractInfoEntity extends BaseEpmetEntity {
      */
 	private String lessorMobile;
 
+	/**
+	 * 出租人与户主关系
+	 */
+	private String lessorRelation;
+
+	/**
+	 * 出租人现居住地址
+	 */
+	private String lessorLiveAddress;
+
     /**
      * 承租人姓名
      */
@@ -121,6 +131,16 @@ public class RentContractInfoEntity extends BaseEpmetEntity {
      */
 	private String lesseeMobile;
 
+	/**
+	 * 承租人单位
+	 */
+	private String lesseeUnit;
+
+	/**
+	 * 承租人户籍地地址
+	 */
+	private String lesseeHouseAddress;
+
     /**
      * 签署日期
      */
@@ -151,4 +171,9 @@ public class RentContractInfoEntity extends BaseEpmetEntity {
 	 */
 	private String customerId;
 
+	/**
+	 * 是否是PC录入（0：否，1：是）
+	 */
+	private String isPcInput;
+
 }

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

@@ -0,0 +1,160 @@
+package com.epmet.plugin.power.modules.rent.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 房屋信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("pli_rent_house")
+public class RentHouseEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 小区id
+     */
+	private String neighborHoodId;
+
+    /**
+     * 片区id，neighbor_hood_part.id,可为空。
+     */
+	private String partId;
+
+    /**
+     * 所属楼栋id
+     */
+	private String buildingId;
+
+    /**
+     * 所属单元id
+     */
+	private String buildingUnitId;
+
+    /**
+     * 房屋名字后台插入时生成
+     */
+	private String houseName;
+
+    /**
+     * 门牌号
+     */
+	private String doorName;
+
+    /**
+     * 房屋类型，1楼房，2平房，3别墅
+     */
+	private String houseType;
+
+    /**
+     * 存储字典value
+     */
+	private String purpose;
+
+    /**
+     * 1：出租 0：自住  2：闲置
+     */
+	private Integer rentFlag;
+
+    /**
+     * 房主姓名
+     */
+	private String ownerName;
+
+    /**
+     * 房主电话
+     */
+	private String ownerPhone;
+
+    /**
+     * 房主身份证号
+     */
+	private String ownerIdCard;
+
+    /**
+     * 排序
+     */
+	private BigDecimal sort;
+
+    /**
+     * 社区ID
+     */
+	private String communityId;
+
+    /**
+     * 社区
+     */
+	private String communityName;
+
+    /**
+     * 网格ID
+     */
+	private String gridId;
+
+    /**
+     * 网格
+     */
+	private String gridName;
+
+    /**
+     * 房屋小区ID
+     */
+	private String villageId;
+
+    /**
+     * 房屋小区
+     */
+	private String villageName;
+
+    /**
+     * 楼号ID
+     */
+	private String buildId;
+
+    /**
+     * 楼号
+     */
+	private String buildName;
+
+    /**
+     * 单元ID
+     */
+	private String unitId;
+
+    /**
+     * 单元
+     */
+	private String unitName;
+
+    /**
+     * 房屋ID
+     */
+	private String homeId;
+
+    /**
+     * 房屋
+     */
+	private String homeName;
+
+    /**
+     * 购房日期
+     */
+	private String purchaseDate;
+
+}

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

@@ -54,15 +54,51 @@ public class RentTenantInfoEntity extends BaseEpmetEntity {
      */
 	private String type;
 
+	/**
+	 * 审核状态 0：未审核 1：审核通过 2：审核不通过（房东使用）
+	 */
+	private String state;
+
+	/**
+	 * 审核-原因
+	 */
+	private String reason;
+
 	/**
 	 * 客户ID
 	 */
 	private String customerId;
 
+	/**
+	 * 政治面貌
+	 */
+	private String politicalStatus;
+
+	/**
+	 * 是否服兵役【是:1 否:0】
+	 */
+	private String isMilitary;
+
+	/**
+	 * 国籍
+	 */
+	private String nation;
+
+	/**
+	 * 工作单位
+	 */
+	private String unit;
+
 	/**
 	 * 头像列表
 	 */
 	@TableField(exist = false)
 	private List<RentContractFileDTO> imgList;
 
+	/**
+	 * 身份证照片列表
+	 */
+	@TableField(exist = false)
+	private List<RentContractFileDTO> idCardImgList;
+
 }

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

@@ -0,0 +1,45 @@
+package com.epmet.plugin.power.modules.rent.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+/**
+ * 房屋信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-11
+ */
+@Data
+public class RentHouseExcel {
+
+    @Excel(name = "所属小区")
+    private String villageName;
+
+    @Excel(name = "所属楼栋")
+    private String buildName;
+
+    @Excel(name = "单元号")
+    private String unitName;
+
+    @Excel(name = "门牌号")
+    private String homeName;
+
+    @Excel(name = "类型", replace = {"楼房_1", "平房_2", "别墅_3"})
+    private String houseType;
+
+    @Excel(name = "用途", replace = {"住宅_1", "商业_2", "办公_3", "工业_4", "仓储_5", "商住混用_6", "其他_7"})
+    private String purpose;
+
+    @Excel(name = "房屋状态", replace = {"出租_1", "闲置_2", "自住_0"})
+    private Integer rentFlag;
+
+    @Excel(name = "房主姓名")
+    private String ownerName;
+
+    @Excel(name = "房主电话")
+    private String ownerPhone;
+
+    @Excel(name = "房主身份证")
+    private String ownerIdCard;
+
+}

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

@@ -0,0 +1,30 @@
+package com.epmet.plugin.power.modules.rent.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 房屋信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-11
+ */
+@Component
+public class RentHouseRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}

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

@@ -85,4 +85,15 @@ public interface RentContractFileService extends BaseService<RentContractFileEnt
      * @date 2022/4/24 14:08
      */
     void deletePhysical(Map<String, Object> params);
+
+    /**
+     * 查出对应资料
+     *
+     * @param referenceId
+     * @param fileType
+     * @return java.util.List<com.epmet.plugin.power.dto.rent.RentContractFileDTO>
+     * @author zhy
+     * @date 2022/5/17 20:31
+     */
+    List<RentContractFileDTO> listByRefAndType(String referenceId, String fileType);
 }

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

@@ -55,7 +55,17 @@ public interface RentContractInfoService extends BaseService<RentContractInfoEnt
      * @author generator
      * @date 2022-04-22
      */
-    Result save(RentContractInfoDTO dto);
+    void save(RentContractInfoDTO dto);
+
+    /**
+     * 默认保存(PC 端)
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-04-22
+     */
+    void savePc(RentContractInfoDTO dto);
 
     /**
      * 审核
@@ -67,6 +77,26 @@ public interface RentContractInfoService extends BaseService<RentContractInfoEnt
      */
     void review(RentContractInfoDTO dto);
 
+    /**
+     * 下发
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-04-22
+     */
+    void send(RentContractInfoDTO dto);
+
+    /**
+     * 重新下发
+     *
+     * @param id
+     * @return void
+     * @author generator
+     * @date 2022-04-22
+     */
+    void resend(String id);
+
     /**
      * 默认更新
      *
@@ -77,6 +107,16 @@ public interface RentContractInfoService extends BaseService<RentContractInfoEnt
      */
     void update(RentContractInfoDTO dto);
 
+    /**
+     * 默认更新(PC端)
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-04-22
+     */
+    void updatePc(RentContractInfoDTO dto);
+
     /**
      * 批量删除
      *
@@ -86,4 +126,4 @@ public interface RentContractInfoService extends BaseService<RentContractInfoEnt
      * @date 2022-04-22
      */
     void delete(String[] ids);
-}
+}

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

@@ -0,0 +1,78 @@
+package com.epmet.plugin.power.modules.rent.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.plugin.power.dto.rent.RentHouseDTO;
+import com.epmet.plugin.power.modules.rent.entity.RentHouseEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 房屋信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-11
+ */
+public interface RentHouseService extends BaseService<RentHouseEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<RentHouseDTO>
+     * @author generator
+     * @date 2022-05-11
+     */
+    PageData<RentHouseDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<RentHouseDTO>
+     * @author generator
+     * @date 2022-05-11
+     */
+    List<RentHouseDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return RentHouseDTO
+     * @author generator
+     * @date 2022-05-11
+     */
+    RentHouseDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-05-11
+     */
+    void save(RentHouseDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-05-11
+     */
+    void update(RentHouseDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2022-05-11
+     */
+    void delete(String[] ids);
+}

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

@@ -27,6 +27,16 @@ public interface RentTenantInfoService extends BaseService<RentTenantInfoEntity>
      */
     PageData<RentTenantInfoDTO> page(Map<String, Object> params);
 
+    /**
+     * 房东分页
+     *
+     * @param params
+     * @return PageData<RentTenantInfoDTO>
+     * @author generator
+     * @date 2022-04-22
+     */
+    PageData<RentTenantInfoDTO> page4Landlord(Map<String, Object> params);
+
     /**
      * 默认查询
      *
@@ -48,7 +58,7 @@ public interface RentTenantInfoService extends BaseService<RentTenantInfoEntity>
     RentTenantInfoDTO get(String id);
 
     /**
-     * 默认保存
+     * 默认保存-房东信息
      *
      * @param dto
      * @return void
@@ -57,6 +67,16 @@ public interface RentTenantInfoService extends BaseService<RentTenantInfoEntity>
      */
     Result save(RentTenantInfoDTO dto);
 
+    /**
+     * 审核
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-04-22
+     */
+    Result review(RentTenantInfoDTO dto);
+
     /**
      * 默认更新
      *
@@ -86,4 +106,5 @@ public interface RentTenantInfoService extends BaseService<RentTenantInfoEntity>
      * @date 2022/4/24 14:08
      */
     void deletePhysical(Map<String, Object> params);
+
 }

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

@@ -43,10 +43,11 @@ public class RentBlacklistServiceImpl extends BaseServiceImpl<RentBlacklistDao,
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
     @Autowired
-    LoginUserUtil loginUserUtil;
+    private LoginUserUtil loginUserUtil;
 
     @Override
     public PageData<RentBlacklistDTO> page(Map<String, Object> params) {
+        params.put("customerId", loginUserUtil.getLoginUserCustomerId());
         IPage<RentBlacklistEntity> page = baseDao.selectPage(
                 getPage(params, FieldConstant.CREATED_TIME, false),
                 getWrapper(params)
@@ -56,6 +57,7 @@ public class RentBlacklistServiceImpl extends BaseServiceImpl<RentBlacklistDao,
 
     @Override
     public List<RentBlacklistDTO> list(Map<String, Object> params) {
+        params.put("customerId", loginUserUtil.getLoginUserCustomerId());
         List<RentBlacklistEntity> entityList = baseDao.selectList(getWrapper(params));
 
         return ConvertUtils.sourceToTarget(entityList, RentBlacklistDTO.class);
@@ -68,6 +70,7 @@ public class RentBlacklistServiceImpl extends BaseServiceImpl<RentBlacklistDao,
         String mobile = (String) params.get("mobile");
         String startTime = (String) params.get("startTime");
         String endTime = (String) params.get("endTime");
+        String customerId = (String) params.get("customerId");
 
         QueryWrapper<RentBlacklistEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -76,6 +79,7 @@ public class RentBlacklistServiceImpl extends BaseServiceImpl<RentBlacklistDao,
         wrapper.eq(StringUtils.isNotBlank(mobile), "MOBILE", mobile);
         wrapper.ge(StringUtils.isNotBlank(startTime), "JOIN_DATE", startTime);
         wrapper.le(StringUtils.isNotBlank(endTime), "JOIN_DATE", endTime);
+        wrapper.eq(StringUtils.isNotBlank(customerId), "CUSTOMER_ID", customerId);
 
         return wrapper;
     }
@@ -97,6 +101,7 @@ public class RentBlacklistServiceImpl extends BaseServiceImpl<RentBlacklistDao,
 
         dto.setIdCard(result.getData().getIdCard());
         dto.setMobile(result.getData().getMobile());
+        dto.setGridId(result.getData().getGridId());
         Map<String, Object> params = new HashMap<>(4);
         params.put("idCard", dto.getIdCard());
         if (!list(params).isEmpty()) {