elink-star
/
epmet-plugins
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'develop' into test

test
zhangyuan 3 years ago
parent
a65a70d8ca 3dcf3db998
commit
ee2078d195
40 changed files with 580 additions and 2518 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 127
      epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/change/ChangeDeathDTO.java
  2. 114
      epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/change/ChangeWelfareDTO.java
  3. 20
      epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/change/CheckWelfareByIdCardDTO.java
  4. 0
      epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/change/form/.gitkeep
  5. 0
      epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/change/result/.gitkeep
  6. 161
      epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentHouseDTO.java
  7. 355
      epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/utils/IdentityNoUtils.java
  8. 95
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/controller/ChangeRelocationController.java
  9. 109
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/controller/ChangeWelfareController.java
  10. 16
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/dao/ChangeDeathDao.java
  11. 16
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/dao/ChangeRelocationDao.java
  12. 35
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/dao/ChangeWelfareDao.java
  13. 84
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/entity/ChangeDeathEntity.java
  14. 153
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/entity/ChangeRelocationEntity.java
  15. 84
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/entity/ChangeWelfareEntity.java
  16. 72
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/excel/ChangeDeathExcel.java
  17. 127
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/excel/ChangeRelocationExcel.java
  18. 75
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/excel/ChangeWelfareExcel.java
  19. 30
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/redis/ChangeDeathRedis.java
  20. 30
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/redis/ChangeRelocationRedis.java
  21. 79
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/service/ChangeDeathService.java
  22. 88
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/service/ChangeRelocationService.java
  23. 107
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/service/ChangeWelfareService.java
  24. 147
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/service/impl/ChangeDeathServiceImpl.java
  25. 171
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/service/impl/ChangeRelocationServiceImpl.java
  26. 159
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/service/impl/ChangeWelfareServiceImpl.java
  27. 2
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentContractFileController.java
  28. 45
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentHouseController.java
  29. 2
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentTenantInfoController.java
  30. 16
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/dao/RentHouseDao.java
  31. 160
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentHouseEntity.java
  32. 45
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/excel/RentHouseExcel.java
  33. 8
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/redis/RentHouseRedis.java
  34. 78
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/RentHouseService.java
  35. 16
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java
  36. 120
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentHouseServiceImpl.java
  37. 28
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/change/ChangeDeathDao.xml
  38. 39
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/change/ChangeRelocationDao.xml
  39. 41
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/change/ChangeWelfareDao.xml
  40. 44
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentHouseDao.xml

127
epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/change/ChangeDeathDTO.java
View File

@ -1,127 +0,0 @@
package com.epmet.plugin.power.dto.change;
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-05-05
*/
@Data
public class ChangeDeathDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
private String id;
/**
* epmet用户主键
*/
@NotBlank(message = "用户ID不能为空")
private String userId;
/**
* epmet网格ID
*/
private String gridId;
/**
* 姓名
*/
@NotBlank(message = "姓名不能为空")
private String name;
/**
* 身份证
*/
@NotBlank(message = "身份证不能为空")
private String idCard;
/**
* 手机号
*/
@NotBlank(message = "手机号不能为空")
private String mobile;
/**
* 性别 0女 1男
*/
@NotBlank(message = "性别不能为空")
private String gender;
/**
* 类型 0 租客 1 房东
*/
private String type;
/**
* 加入时间
*/
private String joinDate;
/**
* 加入原因
*/
private String joinReason;
/**
* 移除时间
*/
private String removeDate;
/**
* 移除原因
*/
private String removeReason;
/**
* 删除标记 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 Boolean welfareFlag;
}

114
epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/change/ChangeWelfareDTO.java
View File

@ -1,114 +0,0 @@
package com.epmet.plugin.power.dto.change;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
* 福利表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-05-09
*/
@Data
public class ChangeWelfareDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
private String id;
/**
* epmet用户主键
*/
private String userId;
/**
* epmet网格ID
*/
private String gridId;
/**
* 姓名
*/
private String name;
/**
* 身份证
*/
private String idCard;
/**
* 手机号
*/
private String mobile;
/**
* 性别 0女 1男
*/
private String gender;
/**
* 类型
*/
private String type;
/**
* 加入时间
*/
private String joinDate;
/**
* 加入原因
*/
private String joinReason;
/**
* 移除时间
*/
private String removeDate;
/**
* 移除原因
*/
private String removeReason;
/**
* 删除标记 0：未删除，1：已删除
*/
private String delFlag;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
/**
* 客户ID
*/
private String customerId;
}

20
epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/change/CheckWelfareByIdCardDTO.java
View File

@ -1,20 +0,0 @@
package com.epmet.plugin.power.dto.change;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* @program: epmet-plugins
* @description:
* @author: wangtong
* @create: 2022-05-09 13:52
**/
@Data
public class CheckWelfareByIdCardDTO implements Serializable {
@NotBlank(message = "身份证不能为空")
private String idCard;
}

0
epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/change/form/.gitkeep
View File

0
epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/change/result/.gitkeep
View File

161
epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/change/ChangeRelocationDTO.java → epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentHouseDTO.java
View File

@ -1,204 +1,195 @@
package com.epmet.plugin.power.dto.change; package com.epmet.plugin.power.dto.rent;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import lombok.Data;
import java.math.BigDecimal;
/** /**
* 合同表 * 房屋信息
* *
* @author generator generator@elink-cn.com * @author generator generator@elink-cn.com
* @since v1.0.0 2022-05-06 * @since v1.0.0 2022-05-11
*/ */
@Data @Data
public class ChangeRelocationDTO implements Serializable { public class RentHouseDTO implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 主键 * 房屋主键
*/ */
private String id; private String id;
/** /**
* 姓名 * 客户id
*/
private String name;
/**
* 性别
*/ */
private String gender; private String customerId;
/** /**
* 年龄 * 小区id
*/ */
private String age; private String neighborHoodId;
/** /**
* 组织PID * 片区id，neighbor_hood_part.id,可为空。
*/ */
private String pid; private String partId;
/** /**
* 组织ID * 所属楼栋id
*/ */
private String agencyId; private String buildingId;
/** /**
* 组织名 * 所属单元id
*/ */
private String agencyName; private String buildingUnitId;
/** /**
* 组织ID * 房屋名字后台插入时生成
*/ */
private String gridId; private String houseName;
/** /**
* 组织名 * 门牌号
*/ */
private String gridName; private String doorName;
/** /**
* 房屋小区ID * 房屋类型，1楼房，2平房，3别墅
*/ */
private String villageId; private String houseType;
/** /**
* 房屋小区 * 存储字典value
*/ */
private String villageName; private String purpose;
/** /**
* 楼号ID * 1：出租 0：自住 2：闲置
*/ */
private String buildId; private Integer rentFlag;
/** /**
* 楼号 * 房主姓名
*/ */
private String buildName; private String ownerName;
/** /**
* 单元ID * 房主电话
*/ */
private String unitId; private String ownerPhone;
/** /**
* 单元 * 房主身份证号
*/ */
private String unitName; private String ownerIdCard;
/** /**
* 房屋ID * 排序
*/ */
private String homeId; private BigDecimal sort;
/** /**
* 房屋 * 删除标识 0未删除、1已删除
*/ */
private String homeName; private String delFlag;
/** /**
* 外迁详细地址 * 乐观锁
*/ */
private String address; private Integer revision;
/** /**
* 操作类型【客户外out,客户内in】 * 创建人
*/ */
private String type; private String createdBy;
/** /**
* 原房主姓名 * 创建时间
*/ */
private String ownerName; private Date createdTime;
/** /**
* 原网格信息 * 更新人
*/ */
private String oldDept; private String updatedBy;
/** /**
* 原房屋信息 * 更新时间
*/ */
private String oldAddress; private Date updatedTime;
/** /**
* 原房间号 * 社区ID
*/ */
private String oldHome; private String communityId;
/** /**
* 浅出原因 * 社区
*/ */
private String reason; private String communityName;
/** /**
* 删除标记 0：未删除，1：已删除 * 网格ID
*/ */
private String delFlag; private String gridId;
/** /**
* 乐观锁 * 网格
*/ */
private Integer revision; private String gridName;
/** /**
* 创建人 * 房屋小区ID
*/ */
private String createdBy; private String villageId;
/** /**
* 创建时间 * 房屋小区
*/ */
private Date createdTime; private String villageName;
/** /**
* 更新人 * 楼号ID
*/ */
private String updatedBy; private String buildId;
/** /**
* 更新时间 * 楼号
*/ */
private Date updatedTime; private String buildName;
/** /**
* 客户ID * 单元ID
*/ */
private String customerId; private String unitId;
/** /**
* 迁出时间 * 单元
*/ */
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private String unitName;
@JSONField(format = "yyyy-MM-dd")
private Date outOfTime;
/** /**
* 身份证号 * 房屋ID
*/ */
private String idCard; private String homeId;
/** /**
* 手机号 * 房屋
*/ */
private String mobile; private String homeName;
/** /**
* epmet用户主键 * 购房日期
*/ */
private String icUserId; private String purchaseDate;
/** /**
* 是否保存为福利人员 * 是否更新
*/ */
private Boolean welfareFlag; private Boolean needUpdate;
} }

355
epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/utils/IdentityNoUtils.java
View File

@ -1,355 +0,0 @@
package com.epmet.plugin.power.utils;
import org.apache.commons.lang3.StringUtils;
import java.io.Serializable;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.Date;
import java.util.Hashtable;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
* 身份证号工具
*
* @author yujintao
* @email yujintao@elink-cn.com
* @date 2019/9/7 13:11
*/
public class IdentityNoUtils implements Serializable {
/**
* 15位身份证号
*/
private static final Integer FIFTEEN_ID_CARD = 15;
/**
* 18位身份证号
*/
private static final Integer EIGHTEEN_ID_CARD = 18;
/**
* 数字格式校验
*/
private static Pattern NUMBER_PATTERN = Pattern.compile("[0-9]*");
/**
* 日期格式校验
*/
private static Pattern DATE_PATTERN = Pattern.compile("^((\\d{2}(([02468][048])|([13579][26]))[\\-\\/\\s]?((((0?[13578])|(1[02]))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(3[01])))|(((0?[469])|(11))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])))))|(\\d{2}(([02468][1235679])|([13579][01345789]))[\\-\\/\\s]?((((0?[13578])|(1[02]))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(3[01])))|(((0?[469])|(11))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/\\s]?((0?[1-9])|(1[0-9])|(2[0-8]))))))(\\s(((0?[0-9])|([1-2][0-3]))\\:([0-5]?[0-9])((\\s)|(\\:([0-5]?[0-9])))))?$");
/**
* 18位身份证中最后一位校验码
*/
private final static char[] VERIFY_CODE = {'1', '0', 'X', '9', '8', '7', '6', '5', '4', '3', '2'};
/**
* 18位身份证中，各个数字的生成校验码时的权值
*/
private final static int[] VERIFY_CODE_WEIGHT = {7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2};
/**
* 根据身份证号获取性别 0女；1男
*
* @param IDCard 完整身份证号码
* @return java.lang.String
* @author work@yujt.net.cn
* @date 2019/9/20 14:26
*/
public static String getSex(String IDCard) {
if (StringUtils.isNotBlank(IDCard)) {
if (IDCard.length() == FIFTEEN_ID_CARD) {
if (Integer.parseInt(IDCard.substring(14, 15)) % 2 == 0) {
return sexEnum.FEMALE.value;
} else {
return sexEnum.MALE.value;
}
} else if (IDCard.length() == EIGHTEEN_ID_CARD) {
if (Integer.parseInt(IDCard.substring(16).substring(0, 1)) % 2 == 0) {
return sexEnum.FEMALE.value;
} else {
return sexEnum.MALE.value;
}
}
}
return null;
}
/**
* 根据身份证号获取年龄
*
* @param IDCard 完整身份证号码
* @return java.lang.Integer
* @author work@yujt.net.cn
* @date 2019/9/20 14:26
*/
public static Integer getAge(String IDCard) {
int age;
LocalDate now = LocalDate.now();
int nowYear = now.getYear();
int nowMonth = now.getMonthValue();
int cardYear = 0;
int cardMonth = 0;
if (StringUtils.isNotBlank(IDCard) && isValid(IDCard)) {
if (IDCard.length() == FIFTEEN_ID_CARD) {
// 身份证上的年份(15位身份证为1980年前的)
String uyear = "19" + IDCard.substring(6, 8);
cardYear = Integer.parseInt(uyear);
// 身份证上的月份
String uyue = IDCard.substring(8, 10);
cardMonth = Integer.parseInt(uyue);
} else if (IDCard.length() == EIGHTEEN_ID_CARD) {
// 身份证上的年份
String year = IDCard.substring(6).substring(0, 4);
cardYear = Integer.parseInt(year);
// 身份证上的月份
String yue = IDCard.substring(10).substring(0, 2);
cardMonth = Integer.parseInt(yue);
}
}
// 当前月份大于用户出身的月份表示已过生日
if (cardMonth <= nowMonth) {
age = nowYear - cardYear + 1;
// 当前用户还没过生
} else {
age = nowYear - cardYear;
}
return age;
}
/**
* 根据身份证号获取出生日期
*
* @param IDCard 完整身份证号码
* @return java.lang.String
* @author work@yujt.net.cn
* @date 2019/9/20 14:26
*/
public static String getBirthday(String IDCard) {
String year = "";
String month = "";
String day = "";
if (StringUtils.isNotBlank(IDCard)) {
//15位身份证号
if (IDCard.length() == FIFTEEN_ID_CARD) {
// 身份证上的年份(15位身份证为1980年前的)
year = "19" + IDCard.substring(6, 8);
//身份证上的月份
month = IDCard.substring(8, 10);
//身份证上的日期
day = IDCard.substring(10, 12);
//18位身份证号
} else if (IDCard.length() == EIGHTEEN_ID_CARD) {
// 身份证上的年份
year = IDCard.substring(6).substring(0, 4);
// 身份证上的月份
month = IDCard.substring(10).substring(0, 2);
//身份证上的日期
day = IDCard.substring(12).substring(0, 2);
}
}
return year + "-" + month + "-" + day;
}
/**
* 身份证验证是否有效
*
* @param id 号码内容
* @return boolean
* @author
* @date
*/
public static boolean isValid(String id) {
Boolean validResult = true;
//校验长度只能为15或18
int len = id.length();
if (len != FIFTEEN_ID_CARD && len != EIGHTEEN_ID_CARD) {
validResult = false;
}
//校验生日
if (!validDate(id)) {
validResult = false;
}
return validResult;
}
/**
* 校验生日
*
* @param id
* @return
*/
private static boolean validDate(String id) {
try {
String birth = id.length() == FIFTEEN_ID_CARD ? "19" + id.substring(6, 12) : id.substring(6, 14);
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
Date birthDate = sdf.parse(birth);
if (!birth.equals(sdf.format(birthDate))) {
return false;
}
} catch (ParseException e) {
return false;
}
return true;
}
/**
* 验证身份证号码，验证通过返回null
*
* @param idStr 完整身份证号码
* @return java.lang.String
* @author work@yujt.net.cn
* @date 2019/9/20 14:26
*/
public static String IdentityNoVerification(String idStr) {
String iDCardNo = null;
//判断号码的长度 15位或18位
if (idStr.length() != FIFTEEN_ID_CARD && idStr.length() != EIGHTEEN_ID_CARD) {
return "身份证号码长度应该为15位或18位";
}
if (idStr.length() == EIGHTEEN_ID_CARD) {
iDCardNo = idStr.substring(0, 17);
} else if (idStr.length() == FIFTEEN_ID_CARD) {
iDCardNo = idStr.substring(0, 6) + "19" + idStr.substring(6, 15);
}
if (isStrNum(iDCardNo) == false) {
return "身份证15位号码都应为数字;18位号码除最后一位外,都应为数字";
}
//判断出生年月
int year = Integer.parseInt(iDCardNo.substring(6, 10));
String strMonth = iDCardNo.substring(10, 12);
String strDay = iDCardNo.substring(12, 14);
String birthDay = year + "-" + strMonth + "-" + strDay;
if (isStrDate(birthDay) == false) {
return "身份证生日无效";
}
LocalDate now = LocalDate.now();
if ((now.getYear() - year) > 150 || now.isBefore(LocalDate.parse(birthDay))) {
return "身份证生日不在有效范围";
}
int month = Integer.parseInt(strMonth);
if (month > 12 || month == 0) {
return "身份证月份无效";
}
int day = Integer.parseInt(strDay);
if (day > 31 || day == 0) {
return "身份证日期无效";
}
//判断地区码
Hashtable h = GetAreaCode();
if (h.get(iDCardNo.substring(0, 2)) == null) {
return "身份证地区编码错误";
}
//判断最后一位
int theLastOne = 0;
for (int i = 0; i < 17; i++) {
theLastOne = theLastOne + Integer.parseInt(String.valueOf(iDCardNo.charAt(i))) * VERIFY_CODE_WEIGHT[i];
}
int modValue = theLastOne % 11;
char strVerifyCode = VERIFY_CODE[modValue];
iDCardNo = iDCardNo + strVerifyCode;
if (idStr.length() == EIGHTEEN_ID_CARD && !iDCardNo.equals(idStr)) {
return "身份证无效，不是合法的身份证号码";
}
return null;
}
/**
* 地区代码
*
* @return Hashtable
*/
private static Hashtable GetAreaCode() {
Hashtable<String, String> hashtable = new Hashtable<>();
hashtable.put("11", "北京");
hashtable.put("12", "天津");
hashtable.put("13", "河北");
hashtable.put("14", "山西");
hashtable.put("15", "内蒙古");
hashtable.put("21", "辽宁");
hashtable.put("22", "吉林");
hashtable.put("23", "黑龙江");
hashtable.put("31", "上海");
hashtable.put("32", "江苏");
hashtable.put("33", "浙江");
hashtable.put("34", "安徽");
hashtable.put("35", "福建");
hashtable.put("36", "江西");
hashtable.put("37", "山东");
hashtable.put("41", "河南");
hashtable.put("42", "湖北");
hashtable.put("43", "湖南");
hashtable.put("44", "广东");
hashtable.put("45", "广西");
hashtable.put("46", "海南");
hashtable.put("50", "重庆");
hashtable.put("51", "四川");
hashtable.put("52", "贵州");
hashtable.put("53", "云南");
hashtable.put("54", "西藏");
hashtable.put("61", "陕西");
hashtable.put("62", "甘肃");
hashtable.put("63", "青海");
hashtable.put("64", "宁夏");
hashtable.put("65", "新疆");
hashtable.put("71", "台湾");
hashtable.put("81", "香港");
hashtable.put("82", "澳门");
hashtable.put("91", "国外");
return hashtable;
}
/**
* 判断字符串是否为数字
*
* @param str
* @return boolean
* @author work@yujt.net.cn
* @date 2019/9/20 13:58
*/
private static boolean isStrNum(String str) {
Matcher isNum = NUMBER_PATTERN.matcher(str);
if (isNum.matches()) {
return true;
} else {
return false;
}
}
/**
* 判断字符串是否为日期格式
*
* @param strDate
* @return boolean
* @author work@yujt.net.cn
* @date 2019/9/20 13:57
*/
public static boolean isStrDate(String strDate) {
Matcher m = DATE_PATTERN.matcher(strDate);
if (m.matches()) {
return true;
} else {
return false;
}
}
enum sexEnum {
/**
* 暂停
*/
FEMALE("0"),
/**
* 正常
*/
MALE("1");
private String value;
sexEnum(String value) {
this.value = value;
}
public String value() {
return value;
}
}
}

95
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/controller/ChangeRelocationController.java
View File

@ -1,95 +0,0 @@
package com.epmet.plugin.power.modules.change.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.change.ChangeRelocationDTO;
import com.epmet.plugin.power.modules.change.excel.ChangeRelocationExcel;
import com.epmet.plugin.power.modules.change.service.ChangeRelocationService;
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-06
*/
@RestController
@RequestMapping("changeRelocation")
public class ChangeRelocationController {
@Autowired
private ChangeRelocationService changeRelocationService;
@RequestMapping("page")
public Result<PageData<ChangeRelocationDTO>> page(@RequestParam Map<String, Object> params){
PageData<ChangeRelocationDTO> page = changeRelocationService.page(params);
return new Result<PageData<ChangeRelocationDTO>>().ok(page);
}
@RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
public Result<ChangeRelocationDTO> get(@PathVariable("id") String id){
ChangeRelocationDTO data = changeRelocationService.get(id);
return new Result<ChangeRelocationDTO>().ok(data);
}
@NoRepeatSubmit
@PostMapping("save")
public Result save(@RequestBody ChangeRelocationDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
changeRelocationService.save(dto);
return new Result();
}
@NoRepeatSubmit
@PostMapping("update")
public Result update(@RequestBody ChangeRelocationDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
changeRelocationService.update(dto);
return new Result();
}
@RequestMapping(value = "delete", method = {RequestMethod.POST, RequestMethod.DELETE})
public Result delete(@RequestBody String[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
changeRelocationService.delete(ids);
return new Result();
}
@GetMapping("export")
public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<ChangeRelocationDTO> list = changeRelocationService.list(params);
ExcelUtils.exportExcelToTarget(response, null, list, ChangeRelocationExcel.class);
}
/**
* @describe: 保存迁出信息
* @author wangtong
* @date 2022/5/7 9:49
* @params [dto]
* @return com.epmet.commons.tools.utils.Result
*/
@NoRepeatSubmit
@PostMapping("saveOutOfInfo")
public Result saveOutOfInfo(@RequestBody ChangeRelocationDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
return changeRelocationService.saveOutOfInfo(dto);
}
}

109
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/controller/ChangeWelfareController.java
View File

@ -1,109 +0,0 @@
package com.epmet.plugin.power.modules.change.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.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.plugin.power.dto.change.ChangeWelfareDTO;
import com.epmet.plugin.power.dto.change.CheckWelfareByIdCardDTO;
import com.epmet.plugin.power.modules.change.excel.ChangeWelfareExcel;
import com.epmet.plugin.power.modules.change.service.ChangeWelfareService;
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-09
*/
@RestController
@RequestMapping("changeWelfare")
public class ChangeWelfareController {
@Autowired
private ChangeWelfareService changeWelfareService;
@RequestMapping("page")
public Result<PageData<ChangeWelfareDTO>> page(@RequestParam Map<String, Object> params){
PageData<ChangeWelfareDTO> page = changeWelfareService.page(params);
return new Result<PageData<ChangeWelfareDTO>>().ok(page);
}
@RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
public Result<ChangeWelfareDTO> get(@PathVariable("id") String id){
ChangeWelfareDTO data = changeWelfareService.get(id);
return new Result<ChangeWelfareDTO>().ok(data);
}
@NoRepeatSubmit
@PostMapping("save")
public Result save(@RequestBody ChangeWelfareDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
return changeWelfareService.save(dto);
}
@NoRepeatSubmit
@PostMapping("update")
public Result update(@RequestBody ChangeWelfareDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
changeWelfareService.update(dto);
return new Result();
}
@RequestMapping(value = "delete", method = {RequestMethod.POST, RequestMethod.DELETE})
public Result delete(@RequestBody String[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
changeWelfareService.delete(ids);
return new Result();
}
@GetMapping("export")
public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<ChangeWelfareDTO> list = changeWelfareService.list(params);
ExcelUtils.exportExcelToTarget(response, null, list, ChangeWelfareExcel.class);
}
/**
* @describe: 移除福利人员
* @author wangtong
* @date 2022/5/9 11:11
* @params [dto]
* @return com.epmet.commons.tools.utils.Result
*/
@NoRepeatSubmit
@PostMapping("removeWelfare")
public Result removeWelfare(@RequestBody ChangeWelfareDTO dto){
return changeWelfareService.removeWelfare(dto);
}
/**
* @describe: 通过身份证号查询是否属于福利人员，是-true，否-false
* @author wangtong
* @date 2022/5/9 13:52
* @params [dto]
* @return com.epmet.commons.tools.utils.Result
*/
@NoRepeatSubmit
@GetMapping("checkWelfareByIdCard")
public Boolean checkWelfareByIdCard(CheckWelfareByIdCardDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
return changeWelfareService.checkWelfareByIdCard(dto);
}
}

16
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/dao/ChangeDeathDao.java
View File

@ -1,16 +0,0 @@
package com.epmet.plugin.power.modules.change.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.plugin.power.modules.change.entity.ChangeDeathEntity;
import org.apache.ibatis.annotations.Mapper;
/**
* 死亡名单表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-05-05
*/
@Mapper
public interface ChangeDeathDao extends BaseDao<ChangeDeathEntity> {
}

16
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/dao/ChangeRelocationDao.java
View File

@ -1,16 +0,0 @@
package com.epmet.plugin.power.modules.change.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.plugin.power.modules.change.entity.ChangeRelocationEntity;
import org.apache.ibatis.annotations.Mapper;
/**
* 合同表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-05-06
*/
@Mapper
public interface ChangeRelocationDao extends BaseDao<ChangeRelocationEntity> {
}

35
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/dao/ChangeWelfareDao.java
View File

@ -1,35 +0,0 @@
package com.epmet.plugin.power.modules.change.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.plugin.power.dto.change.ChangeWelfareDTO;
import com.epmet.plugin.power.modules.change.entity.ChangeWelfareEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* 福利表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-05-09
*/
@Mapper
public interface ChangeWelfareDao extends BaseDao<ChangeWelfareEntity> {
/**
* @describe: 通过身份证号查询福利人员
* @author wangtong
* @date 2022/5/9 13:59
* @params [idCard]
* @return com.epmet.plugin.power.modules.change.entity.ChangeWelfareEntity
*/
ChangeWelfareEntity selectByIdCard(@Param("idCard") String idCard);
/**
* @describe: 移除福利人员
* @author wangtong
* @date 2022/5/9 14:36
* @params [dto]
* @return com.epmet.commons.tools.utils.Result
*/
void removeWelfare(ChangeWelfareDTO dto);
}

84
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/entity/ChangeDeathEntity.java
View File

@ -1,84 +0,0 @@
package com.epmet.plugin.power.modules.change.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-05
*/
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("pli_change_death")
public class ChangeDeathEntity extends BaseEpmetEntity {
private static final long serialVersionUID = 1L;
/**
* epmet用户主键
*/
private String userId;
/**
* epmet网格ID
*/
private String gridId;
/**
* 姓名
*/
private String name;
/**
* 身份证
*/
private String idCard;
/**
* 手机号
*/
private String mobile;
/**
* 性别 0女 1男
*/
private String gender;
/**
* 类型 0 租客 1 房东
*/
private String type;
/**
* 加入时间
*/
private String joinDate;
/**
* 加入原因
*/
private String joinReason;
/**
* 移除时间
*/
private String removeDate;
/**
* 移除原因
*/
private String removeReason;
/**
* 客户ID
*/
private String customerId;
}

153
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/entity/ChangeRelocationEntity.java
View File

@ -1,153 +0,0 @@
package com.epmet.plugin.power.modules.change.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-06
*/
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("pli_change_relocation")
public class ChangeRelocationEntity extends BaseEpmetEntity {
private static final long serialVersionUID = 1L;
/**
* 姓名
*/
private String name;
/**
* 性别
*/
private String gender;
/**
* 年龄
*/
private String age;
/**
* 组织PID
*/
private String pid;
/**
* 组织ID
*/
private String agencyId;
/**
* 组织名
*/
private String agencyName;
/**
* 房屋小区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 address;
/**
* 操作类型【客户外out,客户内in】
*/
private String type;
/**
* 原房主姓名
*/
private String ownerName;
/**
* 原网格信息
*/
private String oldDept;
/**
* 原房屋信息
*/
private String oldAddress;
/**
* 原房间号
*/
private String oldHome;
/**
* 浅出原因
*/
private String reason;
/**
* 客户ID
*/
private String customerId;
/**
* 迁出时间
*/
private Date outOfTime;
/**
* 身份证号
*/
private String idCard;
/**
* 手机号
*/
private String mobile;
/**
* epmet用户主键
*/
private String icUserId;
}

84
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/entity/ChangeWelfareEntity.java
View File

@ -1,84 +0,0 @@
package com.epmet.plugin.power.modules.change.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-09
*/
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("pli_change_welfare")
public class ChangeWelfareEntity extends BaseEpmetEntity {
private static final long serialVersionUID = 1L;
/**
* epmet用户主键
*/
private String userId;
/**
* epmet网格ID
*/
private String gridId;
/**
* 姓名
*/
private String name;
/**
* 身份证
*/
private String idCard;
/**
* 手机号
*/
private String mobile;
/**
* 性别 0女 1男
*/
private String gender;
/**
* 类型
*/
private String type;
/**
* 加入时间
*/
private String joinDate;
/**
* 加入原因
*/
private String joinReason;
/**
* 移除时间
*/
private String removeDate;
/**
* 移除原因
*/
private String removeReason;
/**
* 客户ID
*/
private String customerId;
}

72
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/excel/ChangeDeathExcel.java
View File

@ -1,72 +0,0 @@
package com.epmet.plugin.power.modules.change.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-05
*/
@Data
public class ChangeDeathExcel {
// @Excel(name = "主键")
// private String id;
// @Excel(name = "epmet用户主键")
// private String userId;
@Excel(name = "姓名")
private String name;
@Excel(name = "身份证")
private String idCard;
@Excel(name = "手机号")
private String mobile;
@Excel(name = "性别",replace = { "男_1", "女_0"} )
private String gender;
@Excel(name = "类型",replace = { "房东_1", "租客_0"} )
private String type;
@Excel(name = "加入时间")
private String joinDate;
@Excel(name = "加入原因")
private String joinReason;
// @Excel(name = "移除时间")
// private String removeDate;
//
// @Excel(name = "移除原因")
// private String removeReason;
// @Excel(name = "删除标记 0：未删除，1：已删除")
// private String delFlag;
//
// @Excel(name = "乐观锁")
// private Integer revision;
//
// @Excel(name = "创建人")
// private String createdBy;
@Excel(name = "创建时间", format = "yyyy-MM-dd HH:mm:ss")
private Date createdTime;
// @Excel(name = "更新人")
// private String updatedBy;
//
// @Excel(name = "更新时间")
// private Date updatedTime;
// @Excel(name = "客户ID")
// private String customerId;
}

127
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/excel/ChangeRelocationExcel.java
View File

@ -1,127 +0,0 @@
package com.epmet.plugin.power.modules.change.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-06
*/
@Data
public class ChangeRelocationExcel {
// @Excel(name = "主键")
// private String id;
@Excel(name = "姓名")
private String name;
@Excel(name = "所属网格")
private String agencyName;
@Excel(name = "所属房屋")
private String oldAddress;
@Excel(name = "手机号")
private String mobile;
@Excel(name = "身份证号")
private String idCard;
@Excel(name = "性别")
private String gender;
@Excel(name = "年龄")
private String age;
@Excel(name = "迁出时间", format = "yyyy-MM-dd")
private Date outOfTime;
@Excel(name = "迁出原因")
private String reason;
@Excel(name = "迁往何地")
private String address;
@Excel(name = "户主姓名")
private String ownerName;
// @Excel(name = "组织PID")
// private String pid;
// @Excel(name = "组织ID")
// private String agencyId;
// @Excel(name = "房屋小区ID")
// private String villageId;
// @Excel(name = "房屋小区")
// private String villageName;
// @Excel(name = "楼号ID")
// private String buildId;
// @Excel(name = "楼号")
// private String buildName;
// @Excel(name = "单元ID")
// private String unitId;
// @Excel(name = "单元")
// private String unitName;
// @Excel(name = "房屋ID")
// private String homeId;
// @Excel(name = "房屋")
// private String homeName;
// @Excel(name = "操作类型",replace = { "客户外_out", "客户内_in"} )
// private String type;
//
//
//
// @Excel(name = "原网格信息")
// private String oldDept;
//
// @Excel(name = "原房间号")
// private String oldHome;
// @Excel(name = "删除标记 0：未删除，1：已删除")
// private String delFlag;
//
// @Excel(name = "乐观锁")
// private Integer revision;
//
// @Excel(name = "创建人")
// private String createdBy;
// @Excel(name = "创建时间", format = "yyyy-MM-dd HH:mm:ss")
// private Date createdTime;
// @Excel(name = "更新人")
// private String updatedBy;
//
// @Excel(name = "更新时间")
// private Date updatedTime;
//
// @Excel(name = "客户ID")
// private String customerId;
}

75
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/excel/ChangeWelfareExcel.java
View File

@ -1,75 +0,0 @@
package com.epmet.plugin.power.modules.change.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-09
*/
@Data
public class ChangeWelfareExcel {
@Excel(name = "主键")
private String id;
@Excel(name = "epmet用户主键")
private String userId;
@Excel(name = "epmet网格ID")
private String gridId;
@Excel(name = "姓名")
private String name;
@Excel(name = "身份证")
private String idCard;
@Excel(name = "手机号")
private String mobile;
@Excel(name = "性别 0女 1男")
private String gender;
@Excel(name = "类型")
private String type;
@Excel(name = "加入时间")
private String joinDate;
@Excel(name = "加入原因")
private String joinReason;
@Excel(name = "移除时间")
private String removeDate;
@Excel(name = "移除原因")
private String removeReason;
@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;
}

30
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/redis/ChangeDeathRedis.java
View File

@ -1,30 +0,0 @@
package com.epmet.plugin.power.modules.change.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-05
*/
@Component
public class ChangeDeathRedis {
@Autowired
private RedisUtils redisUtils;
public void delete(Object[] ids) {
}
public void set(){
}
public String get(String id){
return null;
}
}

30
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/redis/ChangeRelocationRedis.java
View File

@ -1,30 +0,0 @@
package com.epmet.plugin.power.modules.change.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-06
*/
@Component
public class ChangeRelocationRedis {
@Autowired
private RedisUtils redisUtils;
public void delete(Object[] ids) {
}
public void set(){
}
public String get(String id){
return null;
}
}

79
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/service/ChangeDeathService.java
View File

@ -1,79 +0,0 @@
package com.epmet.plugin.power.modules.change.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.change.ChangeDeathDTO;
import com.epmet.plugin.power.modules.change.entity.ChangeDeathEntity;
import java.util.List;
import java.util.Map;
/**
* 死亡名单表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-05-05
*/
public interface ChangeDeathService extends BaseService<ChangeDeathEntity> {
/**
* 默认分页
*
* @param params
* @return PageData<ChangeDeathDTO>
* @author generator
* @date 2022-05-05
*/
PageData<ChangeDeathDTO> page(Map<String, Object> params);
/**
* 默认查询
*
* @param params
* @return java.util.List<ChangeDeathDTO>
* @author generator
* @date 2022-05-05
*/
List<ChangeDeathDTO> list(Map<String, Object> params);
/**
* 单条查询
*
* @param id
* @return ChangeDeathDTO
* @author generator
* @date 2022-05-05
*/
ChangeDeathDTO get(String id);
/**
* 默认保存
*
* @param dto
* @return void
* @author generator
* @date 2022-05-05
*/
Result save(ChangeDeathDTO dto);
/**
* 默认更新
*
* @param dto
* @return void
* @author generator
* @date 2022-05-05
*/
void update(ChangeDeathDTO dto);
/**
* 批量删除
*
* @param ids
* @return void
* @author generator
* @date 2022-05-05
*/
void delete(String[] ids);
}

88
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/service/ChangeRelocationService.java
View File

@ -1,88 +0,0 @@
package com.epmet.plugin.power.modules.change.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.change.ChangeRelocationDTO;
import com.epmet.plugin.power.modules.change.entity.ChangeRelocationEntity;
import java.util.List;
import java.util.Map;
/**
* 合同表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-05-06
*/
public interface ChangeRelocationService extends BaseService<ChangeRelocationEntity> {
/**
* 默认分页
*
* @param params
* @return PageData<ChangeRelocationDTO>
* @author generator
* @date 2022-05-06
*/
PageData<ChangeRelocationDTO> page(Map<String, Object> params);
/**
* 默认查询
*
* @param params
* @return java.util.List<ChangeRelocationDTO>
* @author generator
* @date 2022-05-06
*/
List<ChangeRelocationDTO> list(Map<String, Object> params);
/**
* 单条查询
*
* @param id
* @return ChangeRelocationDTO
* @author generator
* @date 2022-05-06
*/
ChangeRelocationDTO get(String id);
/**
* 默认保存
*
* @param dto
* @return void
* @author generator
* @date 2022-05-06
*/
void save(ChangeRelocationDTO dto);
/**
* 默认更新
*
* @param dto
* @return void
* @author generator
* @date 2022-05-06
*/
void update(ChangeRelocationDTO dto);
/**
* 批量删除
*
* @param ids
* @return void
* @author generator
* @date 2022-05-06
*/
void delete(String[] ids);
/**
* @describe: 保存迁出信息
* @author wangtong
* @date 2022/5/7 9:49
* @params [dto]
* @return com.epmet.commons.tools.utils.Result
*/
Result saveOutOfInfo(ChangeRelocationDTO dto);
}

107
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/service/ChangeWelfareService.java
View File

@ -1,107 +0,0 @@
package com.epmet.plugin.power.modules.change.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.change.ChangeWelfareDTO;
import com.epmet.plugin.power.dto.change.CheckWelfareByIdCardDTO;
import com.epmet.plugin.power.modules.change.entity.ChangeWelfareEntity;
import java.util.List;
import java.util.Map;
/**
* 福利表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-05-09
*/
public interface ChangeWelfareService extends BaseService<ChangeWelfareEntity> {
/**
* 默认分页
*
* @param params
* @return PageData<ChangeWelfareDTO>
* @author generator
* @date 2022-05-09
*/
PageData<ChangeWelfareDTO> page(Map<String, Object> params);
/**
* 默认查询
*
* @param params
* @return java.util.List<ChangeWelfareDTO>
* @author generator
* @date 2022-05-09
*/
List<ChangeWelfareDTO> list(Map<String, Object> params);
/**
* 单条查询
*
* @param id
* @return ChangeWelfareDTO
* @author generator
* @date 2022-05-09
*/
ChangeWelfareDTO get(String id);
/**
* 默认保存
*
* @param dto
* @return void
* @author generator
* @date 2022-05-09
*/
Result save(ChangeWelfareDTO dto);
/**
* 默认更新
*
* @param dto
* @return void
* @author generator
* @date 2022-05-09
*/
void update(ChangeWelfareDTO dto);
/**
* 批量删除
*
* @param ids
* @return void
* @author generator
* @date 2022-05-09
*/
void delete(String[] ids);
/**
* @describe: 移除福利人员
* @author wangtong
* @date 2022/5/9 11:11
* @params [dto]
* @return com.epmet.commons.tools.utils.Result
*/
Result removeWelfare(ChangeWelfareDTO dto);
/**
* @describe: 通过身份证号查询是否属于福利人员，是-true，否-false
* @author wangtong
* @date 2022/5/9 13:54
* @params [dto]
* @return java.lang.Boolean
*/
Boolean checkWelfareByIdCard(CheckWelfareByIdCardDTO dto);
/**
* @describe: 保存福利人员
* @author wangtong
* @date 2022/5/9 14:10
* @params []
* @return com.epmet.commons.tools.utils.Result
*/
Result saveWelfareInfo(ChangeWelfareDTO dto);
}

147
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/service/impl/ChangeDeathServiceImpl.java
View File

@ -1,147 +0,0 @@
package com.epmet.plugin.power.modules.change.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.page.PageData;
import com.epmet.commons.tools.security.user.LoginUserUtil;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.DateUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.form.RentTenantDataFormDTO;
import com.epmet.dto.result.RentTenantDataResultDTO;
import com.epmet.feign.EpmetUserOpenFeignClient;
import com.epmet.plugin.power.dto.change.ChangeDeathDTO;
import com.epmet.plugin.power.dto.change.ChangeWelfareDTO;
import com.epmet.plugin.power.modules.change.dao.ChangeDeathDao;
import com.epmet.plugin.power.modules.change.entity.ChangeDeathEntity;
import com.epmet.plugin.power.modules.change.redis.ChangeDeathRedis;
import com.epmet.plugin.power.modules.change.service.ChangeDeathService;
import com.epmet.plugin.power.modules.change.service.ChangeWelfareService;
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-05
*/
@Service
public class ChangeDeathServiceImpl extends BaseServiceImpl<ChangeDeathDao, ChangeDeathEntity> implements ChangeDeathService {
@Autowired
private ChangeDeathRedis changeDeathRedis;
@Autowired
private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
@Autowired
LoginUserUtil loginUserUtil;
@Autowired
private ChangeWelfareService changeWelfareService;
@Override
public PageData<ChangeDeathDTO> page(Map<String, Object> params) {
IPage<ChangeDeathEntity> page = baseDao.selectPage(
getPage(params, FieldConstant.CREATED_TIME, false),
getWrapper(params)
);
return getPageData(page, ChangeDeathDTO.class);
}
@Override
public List<ChangeDeathDTO> list(Map<String, Object> params) {
List<ChangeDeathEntity> entityList = baseDao.selectList(getWrapper(params));
return ConvertUtils.sourceToTarget(entityList, ChangeDeathDTO.class);
}
private QueryWrapper<ChangeDeathEntity> getWrapper(Map<String, Object> params){
String id = (String) params.get(FieldConstant.ID_HUMP);
String name = (String) params.get("name");
String idCard = (String) params.get("idCard");
String mobile = (String) params.get("mobile");
String startTime = (String) params.get("startTime");
String endTime = (String) params.get("endTime");
QueryWrapper<ChangeDeathEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
wrapper.eq(StringUtils.isNotBlank(name), "NAME", name);
wrapper.eq(StringUtils.isNotBlank(idCard), "ID_CARD", idCard);
wrapper.eq(StringUtils.isNotBlank(mobile), "MOBILE", mobile);
wrapper.ge(StringUtils.isNotBlank(startTime), "JOIN_DATE", startTime);
wrapper.le(StringUtils.isNotBlank(endTime), "JOIN_DATE", endTime);
return wrapper;
}
@Override
public ChangeDeathDTO get(String id) {
ChangeDeathEntity entity = baseDao.selectById(id);
return ConvertUtils.sourceToTarget(entity, ChangeDeathDTO.class);
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result save(ChangeDeathDTO dto) {
RentTenantDataFormDTO formDTO = new RentTenantDataFormDTO();
formDTO.setUserId(dto.getUserId());
formDTO.setCustomerId(loginUserUtil.getLoginUserCustomerId());
ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class);
Result<RentTenantDataResultDTO> result = epmetUserOpenFeignClient.getRentResiUserInfo(formDTO);
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()) {
return new Result().error("该人员已经迁入死亡人口");
}
dto.setJoinDate(DateUtils.format(new Date()));
ChangeDeathEntity entity = ConvertUtils.sourceToTarget(dto, ChangeDeathEntity.class);
entity.setCustomerId(loginUserUtil.getLoginUserCustomerId());
insert(entity);
if(dto.getWelfareFlag() != null && dto.getWelfareFlag()){
ChangeWelfareDTO formDto = new ChangeWelfareDTO();
formDto.setUserId(dto.getUserId());
formDto.setName(dto.getName());
formDto.setIdCard(result.getData().getIdCard());
formDto.setMobile(result.getData().getMobile());
formDto.setGridId(result.getData().getGridId());
formDto.setGender(dto.getGender());
formDto.setJoinReason("迁入死亡人口选定");
formDto.setCustomerId(dto.getCustomerId());
formDto.setCustomerId(formDTO.getCustomerId());
changeWelfareService.saveWelfareInfo(formDto);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(ChangeDeathDTO dto) {
ChangeDeathEntity entity = ConvertUtils.sourceToTarget(dto, ChangeDeathEntity.class);
updateById(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(String[] ids) {
// 逻辑删除（@TableLogic 注解）
baseDao.deleteBatchIds(Arrays.asList(ids));
}
}

171
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/service/impl/ChangeRelocationServiceImpl.java
View File

@ -1,171 +0,0 @@
package com.epmet.plugin.power.modules.change.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.page.PageData;
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.validator.ValidatorUtils;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.form.RentTenantDataFormDTO;
import com.epmet.dto.result.RentTenantDataResultDTO;
import com.epmet.feign.EpmetUserOpenFeignClient;
import com.epmet.plugin.power.dto.change.ChangeRelocationDTO;
import com.epmet.plugin.power.dto.change.ChangeWelfareDTO;
import com.epmet.plugin.power.modules.change.dao.ChangeRelocationDao;
import com.epmet.plugin.power.modules.change.entity.ChangeRelocationEntity;
import com.epmet.plugin.power.modules.change.redis.ChangeRelocationRedis;
import com.epmet.plugin.power.modules.change.service.ChangeRelocationService;
import com.epmet.plugin.power.modules.change.service.ChangeWelfareService;
import com.epmet.plugin.power.utils.IdentityNoUtils;
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-06
*/
@Service
public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocationDao, ChangeRelocationEntity> implements ChangeRelocationService {
@Autowired
private ChangeRelocationRedis changeRelocationRedis;
@Autowired
LoginUserUtil loginUserUtil;
@Autowired
private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
@Autowired
private ChangeWelfareService changeWelfareService;
@Override
public PageData<ChangeRelocationDTO> page(Map<String, Object> params) {
IPage<ChangeRelocationEntity> page = baseDao.selectPage(
getPage(params, FieldConstant.CREATED_TIME, false),
getWrapper(params)
);
return getPageData(page, ChangeRelocationDTO.class);
}
@Override
public List<ChangeRelocationDTO> list(Map<String, Object> params) {
List<ChangeRelocationEntity> entityList = baseDao.selectList(getWrapper(params));
return ConvertUtils.sourceToTarget(entityList, ChangeRelocationDTO.class);
}
private QueryWrapper<ChangeRelocationEntity> getWrapper(Map<String, Object> params){
String id = (String)params.get(FieldConstant.ID_HUMP);
String name = (String) params.get("name");
String idCard = (String) params.get("idCard");
String mobile = (String) params.get("mobile");
String startTime = (String) params.get("startTime");
String endTime = (String) params.get("endTime");
String gridId = (String) params.get("gridId");
String villageId = (String) params.get("villageId");
String buildId = (String) params.get("buildId");
String unitId = (String) params.get("unitId");
String homeId = (String) params.get("homeId");
QueryWrapper<ChangeRelocationEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
wrapper.eq(StringUtils.isNotBlank(name), "NAME", name);
wrapper.eq(StringUtils.isNotBlank(idCard), "ID_CARD", idCard);
wrapper.eq(StringUtils.isNotBlank(mobile), "MOBILE", mobile);
wrapper.ge(StringUtils.isNotBlank(startTime), "OUT_OF_TIME", startTime);
wrapper.le(StringUtils.isNotBlank(endTime), "OUT_OF_TIME", endTime);
wrapper.eq(StringUtils.isNotBlank(gridId), "AGENCY_ID", gridId);
wrapper.eq(StringUtils.isNotBlank(villageId), "VILLAGE_ID", villageId);
wrapper.eq(StringUtils.isNotBlank(buildId), "BUILD_ID", buildId);
wrapper.eq(StringUtils.isNotBlank(unitId), "UNIT_ID", unitId);
wrapper.eq(StringUtils.isNotBlank(homeId), "HOME_ID", homeId);
return wrapper;
}
@Override
public ChangeRelocationDTO get(String id) {
ChangeRelocationEntity entity = baseDao.selectById(id);
return ConvertUtils.sourceToTarget(entity, ChangeRelocationDTO.class);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void save(ChangeRelocationDTO dto) {
ChangeRelocationEntity entity = ConvertUtils.sourceToTarget(dto, ChangeRelocationEntity.class);
insert(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(ChangeRelocationDTO dto) {
ChangeRelocationEntity entity = ConvertUtils.sourceToTarget(dto, ChangeRelocationEntity.class);
updateById(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(String[] ids) {
// 逻辑删除（@TableLogic 注解）
baseDao.deleteBatchIds(Arrays.asList(ids));
}
@Override
public Result saveOutOfInfo(ChangeRelocationDTO dto) {
RentTenantDataFormDTO formDTO = new RentTenantDataFormDTO();
formDTO.setUserId(dto.getIcUserId());
formDTO.setCustomerId(loginUserUtil.getLoginUserCustomerId());
ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class);
Result<RentTenantDataResultDTO> result = epmetUserOpenFeignClient.getRentResiUserInfo(formDTO);
dto.setIdCard(result.getData().getIdCard());
dto.setMobile(result.getData().getMobile());
ChangeRelocationEntity entity = ConvertUtils.sourceToTarget(dto, ChangeRelocationEntity.class);
entity.setPid(dto.getAgencyId());
entity.setAgencyId(dto.getGridId());
entity.setAgencyName(dto.getGridName());
entity.setAge(IdentityNoUtils.getAge(result.getData().getIdCard()).toString());
entity.setAddress(dto.getVillageName()+dto.getBuildName()+dto.getUnitName()+dto.getHomeName());
insert(entity);
if(dto.getWelfareFlag() != null && dto.getWelfareFlag()){
ChangeWelfareDTO formDto = new ChangeWelfareDTO();
formDto.setUserId(dto.getIcUserId());
formDto.setName(dto.getName());
formDto.setIdCard(result.getData().getIdCard());
formDto.setMobile(result.getData().getMobile());
formDto.setGridId(result.getData().getGridId());
if(StringUtils.isNotBlank(dto.getGender())){
if("女".equals(dto.getGender())){
formDto.setGender("0");
}else if("男".equals(dto.getGender())){
formDto.setGender("1");
}
}
formDto.setJoinReason("迁出人员选定");
formDto.setCustomerId(dto.getCustomerId());
formDto.setCustomerId(formDTO.getCustomerId());
changeWelfareService.saveWelfareInfo(formDto);
}
return new Result();
}
}

159
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/service/impl/ChangeWelfareServiceImpl.java
View File

@ -1,159 +0,0 @@
package com.epmet.plugin.power.modules.change.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.page.PageData;
import com.epmet.commons.tools.security.user.LoginUserUtil;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.DateUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.form.RentTenantDataFormDTO;
import com.epmet.dto.result.RentTenantDataResultDTO;
import com.epmet.feign.EpmetUserOpenFeignClient;
import com.epmet.plugin.power.dto.change.ChangeWelfareDTO;
import com.epmet.plugin.power.dto.change.CheckWelfareByIdCardDTO;
import com.epmet.plugin.power.modules.change.dao.ChangeWelfareDao;
import com.epmet.plugin.power.modules.change.entity.ChangeWelfareEntity;
import com.epmet.plugin.power.modules.change.redis.ChangeWelfareRedis;
import com.epmet.plugin.power.modules.change.service.ChangeWelfareService;
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-09
*/
@Service
public class ChangeWelfareServiceImpl extends BaseServiceImpl<ChangeWelfareDao, ChangeWelfareEntity> implements ChangeWelfareService {
@Autowired
private ChangeWelfareRedis changeWelfareRedis;
@Autowired
LoginUserUtil loginUserUtil;
@Autowired
private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
@Override
public PageData<ChangeWelfareDTO> page(Map<String, Object> params) {
IPage<ChangeWelfareEntity> page = baseDao.selectPage(
getPage(params, FieldConstant.CREATED_TIME, false),
getWrapper(params)
);
return getPageData(page, ChangeWelfareDTO.class);
}
@Override
public List<ChangeWelfareDTO> list(Map<String, Object> params) {
List<ChangeWelfareEntity> entityList = baseDao.selectList(getWrapper(params));
return ConvertUtils.sourceToTarget(entityList, ChangeWelfareDTO.class);
}
private QueryWrapper<ChangeWelfareEntity> getWrapper(Map<String, Object> params){
String id = (String) params.get(FieldConstant.ID_HUMP);
String name = (String) params.get("name");
String idCard = (String) params.get("idCard");
String mobile = (String) params.get("mobile");
String startTime = (String) params.get("startTime");
String endTime = (String) params.get("endTime");
QueryWrapper<ChangeWelfareEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
wrapper.eq(StringUtils.isNotBlank(name), "NAME", name);
wrapper.eq(StringUtils.isNotBlank(idCard), "ID_CARD", idCard);
wrapper.eq(StringUtils.isNotBlank(mobile), "MOBILE", mobile);
wrapper.ge(StringUtils.isNotBlank(startTime), "JOIN_DATE", startTime);
wrapper.le(StringUtils.isNotBlank(endTime), "JOIN_DATE", endTime);
return wrapper;
}
@Override
public ChangeWelfareDTO get(String id) {
ChangeWelfareEntity entity = baseDao.selectById(id);
return ConvertUtils.sourceToTarget(entity, ChangeWelfareDTO.class);
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result save(ChangeWelfareDTO dto) {
RentTenantDataFormDTO formDTO = new RentTenantDataFormDTO();
formDTO.setUserId(dto.getUserId());
formDTO.setCustomerId(loginUserUtil.getLoginUserCustomerId());
ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class);
Result<RentTenantDataResultDTO> result = epmetUserOpenFeignClient.getRentResiUserInfo(formDTO);
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()) {
return new Result().error("该人员已经迁入福利人口");
}
dto.setJoinDate(DateUtils.format(new Date()));
ChangeWelfareEntity entity = ConvertUtils.sourceToTarget(dto, ChangeWelfareEntity.class);
entity.setCustomerId(loginUserUtil.getLoginUserCustomerId());
insert(entity);
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(ChangeWelfareDTO dto) {
ChangeWelfareEntity entity = ConvertUtils.sourceToTarget(dto, ChangeWelfareEntity.class);
updateById(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(String[] ids) {
// 逻辑删除（@TableLogic 注解）
baseDao.deleteBatchIds(Arrays.asList(ids));
}
@Override
public Result removeWelfare(ChangeWelfareDTO dto) {
if(StringUtils.isBlank(dto.getId())){
return new Result().error("id不可为空");
}
dto.setRemoveDate(DateUtils.format(new Date()));
baseDao.removeWelfare(dto);
return new Result().ok("移除成功");
}
@Override
public Boolean checkWelfareByIdCard(CheckWelfareByIdCardDTO dto) {
ChangeWelfareEntity entity = baseDao.selectByIdCard(dto.getIdCard());
return entity == null? false: true;
}
@Override
public Result saveWelfareInfo(ChangeWelfareDTO dto) {
Map<String, Object> params = new HashMap<>(4);
params.put("idCard", dto.getIdCard());
if (!list(params).isEmpty()) {
return new Result().error("该人员已经迁入福利人口");
}
dto.setJoinDate(DateUtils.format(new Date()));
ChangeWelfareEntity entity = ConvertUtils.sourceToTarget(dto, ChangeWelfareEntity.class);
insert(entity);
return new Result();
}
}

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

@ -63,7 +63,7 @@ public class RentContractFileController {
return new Result(); return new Result();
} }
@PostMapping("delete") @RequestMapping(value = "delete", method = {RequestMethod.POST, RequestMethod.DELETE})
public Result delete(@RequestBody String[] ids) { public Result delete(@RequestBody String[] ids) {
//效验数据 //效验数据
AssertUtils.isArrayEmpty(ids, "id"); AssertUtils.isArrayEmpty(ids, "id");

45
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/controller/ChangeDeathController.java → epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentHouseController.java
View File

@ -1,4 +1,4 @@
package com.epmet.plugin.power.modules.change.controller; package com.epmet.plugin.power.modules.rent.controller;
import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.aop.NoRepeatSubmit;
import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.page.PageData;
@ -9,9 +9,9 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.plugin.power.dto.change.ChangeDeathDTO; import com.epmet.plugin.power.dto.rent.RentHouseDTO;
import com.epmet.plugin.power.modules.change.excel.ChangeDeathExcel; import com.epmet.plugin.power.modules.rent.excel.RentHouseExcel;
import com.epmet.plugin.power.modules.change.service.ChangeDeathService; import com.epmet.plugin.power.modules.rent.service.RentHouseService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -21,44 +21,45 @@ import java.util.Map;
/** /**
* 死亡名单表 * 房屋信息
* *
* @author generator generator@elink-cn.com * @author generator generator@elink-cn.com
* @since v1.0.0 2022-05-05 * @since v1.0.0 2022-05-11
*/ */
@RestController @RestController
@RequestMapping("rentDeath") @RequestMapping("rentHouse")
public class ChangeDeathController { public class RentHouseController {
@Autowired @Autowired
private ChangeDeathService changeDeathService; private RentHouseService rentHouseService;
@RequestMapping("page") @RequestMapping("page")
public Result<PageData<ChangeDeathDTO>> page(@RequestParam Map<String, Object> params){ public Result<PageData<RentHouseDTO>> page(@RequestParam Map<String, Object> params){
PageData<ChangeDeathDTO> page = changeDeathService.page(params); PageData<RentHouseDTO> page = rentHouseService.page(params);
return new Result<PageData<ChangeDeathDTO>>().ok(page); return new Result<PageData<RentHouseDTO>>().ok(page);
} }
@RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
public Result<ChangeDeathDTO> get(@PathVariable("id") String id){ public Result<RentHouseDTO> get(@PathVariable("id") String id){
ChangeDeathDTO data = changeDeathService.get(id); RentHouseDTO data = rentHouseService.get(id);
return new Result<ChangeDeathDTO>().ok(data); return new Result<RentHouseDTO>().ok(data);
} }
@NoRepeatSubmit @NoRepeatSubmit
@PostMapping("save") @PostMapping("save")
public Result save(@RequestBody ChangeDeathDTO dto){ public Result save(@RequestBody RentHouseDTO dto){
//效验数据 //效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
return changeDeathService.save(dto); rentHouseService.save(dto);
return new Result();
} }
@NoRepeatSubmit @NoRepeatSubmit
@PostMapping("update") @PostMapping("update")
public Result update(@RequestBody ChangeDeathDTO dto){ public Result update(@RequestBody RentHouseDTO dto){
//效验数据 //效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
changeDeathService.update(dto); rentHouseService.update(dto);
return new Result(); return new Result();
} }
@ -66,14 +67,14 @@ public class ChangeDeathController {
public Result delete(@RequestBody String[] ids){ public Result delete(@RequestBody String[] ids){
//效验数据 //效验数据
AssertUtils.isArrayEmpty(ids, "id"); AssertUtils.isArrayEmpty(ids, "id");
changeDeathService.delete(ids); rentHouseService.delete(ids);
return new Result(); return new Result();
} }
@GetMapping("export") @GetMapping("export")
public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception { public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<ChangeDeathDTO> list = changeDeathService.list(params); List<RentHouseDTO> list = rentHouseService.list(params);
ExcelUtils.exportExcelToTarget(response, null, list, ChangeDeathExcel.class); ExcelUtils.exportExcelToTarget(response, null, list, RentHouseExcel.class);
} }

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

@ -76,7 +76,7 @@ public class RentTenantInfoController {
return new Result(); return new Result();
} }
@PostMapping("delete") @RequestMapping(value = "delete", method = {RequestMethod.POST, RequestMethod.DELETE})
public Result delete(@RequestBody String[] ids) { public Result delete(@RequestBody String[] ids) {
//效验数据 //效验数据
AssertUtils.isArrayEmpty(ids, "id"); AssertUtils.isArrayEmpty(ids, "id");

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

@ -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> {
}

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

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

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

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

8
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/change/redis/ChangeWelfareRedis.java → epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/redis/RentHouseRedis.java
View File

@ -1,17 +1,17 @@
package com.epmet.plugin.power.modules.change.redis; package com.epmet.plugin.power.modules.rent.redis;
import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.commons.tools.redis.RedisUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
/** /**
* 福利表 * 房屋信息
* *
* @author generator generator@elink-cn.com * @author generator generator@elink-cn.com
* @since v1.0.0 2022-05-09 * @since v1.0.0 2022-05-11
*/ */
@Component @Component
public class ChangeWelfareRedis { public class RentHouseRedis {
@Autowired @Autowired
private RedisUtils redisUtils; private RedisUtils redisUtils;

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

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

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

@ -13,8 +13,10 @@ import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.IdCardNoValidatorUtils; import com.epmet.commons.tools.validator.IdCardNoValidatorUtils;
import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.CustomerAgencyDTO;
import com.epmet.dto.IcHouseDTO;
import com.epmet.dto.IcResiUserAttachmentDTO; import com.epmet.dto.IcResiUserAttachmentDTO;
import com.epmet.dto.IcResiUserDTO; import com.epmet.dto.IcResiUserDTO;
import com.epmet.dto.form.IcHouseAddFormDTO;
import com.epmet.dto.form.RentTenantFormDTO; import com.epmet.dto.form.RentTenantFormDTO;
import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient;
import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient;
@ -162,7 +164,7 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
public void review(RentContractInfoDTO dto) { public void review(RentContractInfoDTO dto) {
RentContractInfoEntity entity = ConvertUtils.sourceToTarget(dto, RentContractInfoEntity.class); RentContractInfoEntity entity = ConvertUtils.sourceToTarget(dto, RentContractInfoEntity.class);
updateById(entity); updateById(entity);
// 如果审核通过，就去更新基础库头像信息以及居民信息 // 如果审核通过，就去更新基础库头像信息以及居民信息，最后更新房屋的状态
if (NumConstant.ONE_STR.equals(entity.getState())) { if (NumConstant.ONE_STR.equals(entity.getState())) {
// 获取基本信息 // 获取基本信息
RentContractInfoDTO contractDto = get(dto.getId()); RentContractInfoDTO contractDto = get(dto.getId());
@ -215,6 +217,12 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
epmetUserOpenFeignClient.updateImage(formDTO); epmetUserOpenFeignClient.updateImage(formDTO);
}); });
// 更新房屋的状态为租赁
Result<IcHouseDTO> houseInfo = govOrgOpenFeignClient.get(dto.getHomeId());
IcHouseAddFormDTO formDTO = ConvertUtils.sourceToTarget(houseInfo.getData(), IcHouseAddFormDTO.class);
formDTO.setRentFlag(NumConstant.ONE);
govOrgOpenFeignClient.houseUpdate(formDTO);
} }
} }
@ -242,12 +250,12 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
rentContractFileService.deletePhysical(params); rentContractFileService.deletePhysical(params);
if (null == dto.getTenantList() || dto.getTenantList().isEmpty()) { if (null == dto.getTenantList() || dto.getTenantList().isEmpty()) {
return new Result().error("租客不能为空"); throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "租客不能为空");
} else { } else {
List<RentTenantInfoEntity> tenantList = ConvertUtils.sourceToTarget(dto.getTenantList(), RentTenantInfoEntity.class); List<RentTenantInfoEntity> tenantList = ConvertUtils.sourceToTarget(dto.getTenantList(), RentTenantInfoEntity.class);
long idCardNum = tenantList.stream().map(RentTenantInfoEntity::getIdCard).collect(Collectors.toList()).stream().distinct().count(); long idCardNum = tenantList.stream().map(RentTenantInfoEntity::getIdCard).collect(Collectors.toList()).stream().distinct().count();
if (tenantList.size() != idCardNum) { if (tenantList.size() != idCardNum) {
return new Result().error("租客身份证重复"); throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "租客身份证重复");
} }
tenantList.forEach(tenant -> { tenantList.forEach(tenant -> {
@ -279,7 +287,7 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
} }
if (null == dto.getFileList() || dto.getFileList().isEmpty()) { if (null == dto.getFileList() || dto.getFileList().isEmpty()) {
return new Result().error("合同附件不能为空"); throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "合同附件不能为空");
} else { } else {
List<RentContractFileEntity> fileList = ConvertUtils.sourceToTarget(dto.getFileList(), RentContractFileEntity.class); List<RentContractFileEntity> fileList = ConvertUtils.sourceToTarget(dto.getFileList(), RentContractFileEntity.class);
fileList.forEach(item -> { fileList.forEach(item -> {

120
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentHouseServiceImpl.java
View File

@ -0,0 +1,120 @@
package com.epmet.plugin.power.modules.rent.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.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.dto.form.IcHouseAddFormDTO;
import com.epmet.feign.GovOrgOpenFeignClient;
import com.epmet.plugin.power.dto.rent.RentHouseDTO;
import com.epmet.plugin.power.modules.rent.dao.RentHouseDao;
import com.epmet.plugin.power.modules.rent.entity.RentHouseEntity;
import com.epmet.plugin.power.modules.rent.redis.RentHouseRedis;
import com.epmet.plugin.power.modules.rent.service.RentHouseService;
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-11
*/
@Service
public class RentHouseServiceImpl extends BaseServiceImpl<RentHouseDao, RentHouseEntity> implements RentHouseService {
@Autowired
private RentHouseRedis rentHouseRedis;
@Autowired
private GovOrgOpenFeignClient govOrgOpenFeignClient;
@Override
public PageData<RentHouseDTO> page(Map<String, Object> params) {
IPage<RentHouseEntity> page = baseDao.selectPage(
getPage(params, FieldConstant.CREATED_TIME, false),
getWrapper(params)
);
return getPageData(page, RentHouseDTO.class);
}
@Override
public List<RentHouseDTO> list(Map<String, Object> params) {
List<RentHouseEntity> entityList = baseDao.selectList(getWrapper(params));
return ConvertUtils.sourceToTarget(entityList, RentHouseDTO.class);
}
private QueryWrapper<RentHouseEntity> getWrapper(Map<String, Object> params) {
String id = (String) params.get(FieldConstant.ID_HUMP);
String gridId = (String) params.get("gridId");
String villageId = (String) params.get("villageId");
String buildId = (String) params.get("buildId");
String unitId = (String) params.get("unitId");
String homeId = (String) params.get("homeId");
String ownerName = (String) params.get("ownerName");
String ownerPhone = (String) params.get("ownerPhone");
String ownerIdCard = (String) params.get("ownerIdCard");
String rentFlag = (String) params.get("rentFlag");
String startTime = (String) params.get("startTime");
String endTime = (String) params.get("endTime");
QueryWrapper<RentHouseEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
wrapper.eq(StringUtils.isNotBlank(gridId), "GRID_ID", gridId);
wrapper.eq(StringUtils.isNotBlank(villageId), "VILLAGE_ID", villageId);
wrapper.eq(StringUtils.isNotBlank(buildId), "BUILD_ID", buildId);
wrapper.eq(StringUtils.isNotBlank(unitId), "UNIT_ID", unitId);
wrapper.eq(StringUtils.isNotBlank(homeId), "HOME_ID", homeId);
wrapper.eq(StringUtils.isNotBlank(ownerName), "OWNER_NAME", ownerName);
wrapper.eq(StringUtils.isNotBlank(ownerPhone), "OWNER_PHONE", ownerPhone);
wrapper.eq(StringUtils.isNotBlank(ownerIdCard), "OWNER_ID_CARD", ownerIdCard);
wrapper.eq(StringUtils.isNotBlank(rentFlag), "RENT_FLAG", rentFlag);
wrapper.ge(StringUtils.isNotBlank(startTime), "PURCHASE_DATE", startTime);
wrapper.le(StringUtils.isNotBlank(endTime), "PURCHASE_DATE", endTime);
return wrapper;
}
@Override
public RentHouseDTO get(String id) {
RentHouseEntity entity = baseDao.selectById(id);
return ConvertUtils.sourceToTarget(entity, RentHouseDTO.class);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void save(RentHouseDTO dto) {
RentHouseEntity entity = ConvertUtils.sourceToTarget(dto, RentHouseEntity.class);
insert(entity);
// 更新房屋的租赁状态
if (dto.getNeedUpdate()) {
IcHouseAddFormDTO formDTO = ConvertUtils.sourceToTarget(dto, IcHouseAddFormDTO.class);
govOrgOpenFeignClient.houseUpdate(formDTO);
}
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(RentHouseDTO dto) {
RentHouseEntity entity = ConvertUtils.sourceToTarget(dto, RentHouseEntity.class);
updateById(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(String[] ids) {
// 逻辑删除（@TableLogic 注解）
baseDao.deleteBatchIds(Arrays.asList(ids));
}
}

28
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/change/ChangeDeathDao.xml
View File

@ -1,28 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.epmet.plugin.power.modules.change.dao.ChangeDeathDao">
<resultMap type="com.epmet.plugin.power.modules.change.entity.ChangeDeathEntity" id="rentDeathMap">
<result property="id" column="ID"/>
<result property="userId" column="USER_ID"/>
<result property="name" column="NAME"/>
<result property="idCard" column="ID_CARD"/>
<result property="mobile" column="MOBILE"/>
<result property="gender" column="GENDER"/>
<result property="type" column="TYPE"/>
<result property="joinDate" column="JOIN_DATE"/>
<result property="joinReason" column="JOIN_REASON"/>
<result property="removeDate" column="REMOVE_DATE"/>
<result property="removeReason" column="REMOVE_REASON"/>
<result property="delFlag" column="DEL_FLAG"/>
<result property="revision" column="REVISION"/>
<result property="createdBy" column="CREATED_BY"/>
<result property="createdTime" column="CREATED_TIME"/>
<result property="updatedBy" column="UPDATED_BY"/>
<result property="updatedTime" column="UPDATED_TIME"/>
<result property="customerId" column="CUSTOMER_ID"/>
</resultMap>
</mapper>

39
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/change/ChangeRelocationDao.xml
View File

@ -1,39 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.epmet.plugin.power.modules.change.dao.ChangeRelocationDao">
<resultMap type="com.epmet.plugin.power.modules.change.entity.ChangeRelocationEntity" id="changeRelocationMap">
<result property="id" column="ID"/>
<result property="name" column="NAME"/>
<result property="gender" column="GENDER"/>
<result property="age" column="AGE"/>
<result property="pid" column="PID"/>
<result property="agencyId" column="AGENCY_ID"/>
<result property="agencyName" column="AGENCY_NAME"/>
<result property="villageId" column="VILLAGE_ID"/>
<result property="villageName" column="VILLAGE_NAME"/>
<result property="buildId" column="BUILD_ID"/>
<result property="buildName" column="BUILD_NAME"/>
<result property="unitId" column="UNIT_ID"/>
<result property="unitName" column="UNIT_NAME"/>
<result property="homeId" column="HOME_ID"/>
<result property="homeName" column="HOME_NAME"/>
<result property="address" column="ADDRESS"/>
<result property="type" column="TYPE"/>
<result property="ownerName" column="OWNER_NAME"/>
<result property="oldDept" column="OLD_DEPT"/>
<result property="oldAddress" column="OLD_ADDRESS"/>
<result property="oldHome" column="OLD_HOME"/>
<result property="reason" column="REASON"/>
<result property="delFlag" column="DEL_FLAG"/>
<result property="revision" column="REVISION"/>
<result property="createdBy" column="CREATED_BY"/>
<result property="createdTime" column="CREATED_TIME"/>
<result property="updatedBy" column="UPDATED_BY"/>
<result property="updatedTime" column="UPDATED_TIME"/>
<result property="customerId" column="CUSTOMER_ID"/>
</resultMap>
</mapper>

41
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/change/ChangeWelfareDao.xml
View File

@ -1,41 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.epmet.plugin.power.modules.change.dao.ChangeWelfareDao">
<resultMap type="com.epmet.plugin.power.modules.change.entity.ChangeWelfareEntity" id="changeWelfareMap">
<result property="id" column="ID"/>
<result property="userId" column="USER_ID"/>
<result property="gridId" column="GRID_ID"/>
<result property="name" column="NAME"/>
<result property="idCard" column="ID_CARD"/>
<result property="mobile" column="MOBILE"/>
<result property="gender" column="GENDER"/>
<result property="type" column="TYPE"/>
<result property="joinDate" column="JOIN_DATE"/>
<result property="joinReason" column="JOIN_REASON"/>
<result property="removeDate" column="REMOVE_DATE"/>
<result property="removeReason" column="REMOVE_REASON"/>
<result property="delFlag" column="DEL_FLAG"/>
<result property="revision" column="REVISION"/>
<result property="createdBy" column="CREATED_BY"/>
<result property="createdTime" column="CREATED_TIME"/>
<result property="updatedBy" column="UPDATED_BY"/>
<result property="updatedTime" column="UPDATED_TIME"/>
<result property="customerId" column="CUSTOMER_ID"/>
</resultMap>
<select id="selectByIdCard" resultType="com.epmet.plugin.power.modules.change.entity.ChangeWelfareEntity">
select * from pli_change_welfare
where ID_CARD=#{idCard}
and del_flag='0'
</select>
<update id="removeWelfare">
update pli_change_welfare
set REMOVE_DATE=#{removeDate},
REMOVE_REASON=#{removeReason},
del_flag='1'
where id=#{id}
</update>
</mapper>

44
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentHouseDao.xml
View File

@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.epmet.plugin.power.modules.rent.dao.RentHouseDao">
<resultMap type="com.epmet.plugin.power.modules.rent.entity.RentHouseEntity" id="rentHouseMap">
<result property="id" column="ID"/>
<result property="customerId" column="CUSTOMER_ID"/>
<result property="neighborHoodId" column="NEIGHBOR_HOOD_ID"/>
<result property="partId" column="PART_ID"/>
<result property="buildingId" column="BUILDING_ID"/>
<result property="buildingUnitId" column="BUILDING_UNIT_ID"/>
<result property="houseName" column="HOUSE_NAME"/>
<result property="doorName" column="DOOR_NAME"/>
<result property="houseType" column="HOUSE_TYPE"/>
<result property="purpose" column="PURPOSE"/>
<result property="rentFlag" column="RENT_FLAG"/>
<result property="ownerName" column="OWNER_NAME"/>
<result property="ownerPhone" column="OWNER_PHONE"/>
<result property="ownerIdCard" column="OWNER_ID_CARD"/>
<result property="sort" column="SORT"/>
<result property="delFlag" column="DEL_FLAG"/>
<result property="revision" column="REVISION"/>
<result property="createdBy" column="CREATED_BY"/>
<result property="createdTime" column="CREATED_TIME"/>
<result property="updatedBy" column="UPDATED_BY"/>
<result property="updatedTime" column="UPDATED_TIME"/>
<result property="communityId" column="COMMUNITY_ID"/>
<result property="communityName" column="COMMUNITY_NAME"/>
<result property="gridId" column="GRID_ID"/>
<result property="gridName" column="GRID_NAME"/>
<result property="villageId" column="VILLAGE_ID"/>
<result property="villageName" column="VILLAGE_NAME"/>
<result property="buildId" column="BUILD_ID"/>
<result property="buildName" column="BUILD_NAME"/>
<result property="unitId" column="UNIT_ID"/>
<result property="unitName" column="UNIT_NAME"/>
<result property="homeId" column="HOME_ID"/>
<result property="homeName" column="HOME_NAME"/>
<result property="purchaseDate" column="PURCHASE_DATE"/>
</resultMap>
</mapper>
Write Preview
Loading…
Cancel
Save