Merge branch 'dev_contract' into develop

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

@@ -1,8 +1,10 @@
 package com.epmet.plugin.power.dto.change;
 
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -51,6 +53,16 @@ public class ChangeRelocationDTO implements Serializable {
      */
 	private String agencyName;
 
+    /**
+     * 组织ID
+     */
+    private String gridId;
+
+    /**
+     * 组织名
+     */
+    private String gridName;
+
     /**
      * 房屋小区ID
      */
@@ -161,4 +173,25 @@ public class ChangeRelocationDTO implements Serializable {
      */
 	private String customerId;
 
-}
+    /**
+     * 迁出时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date outOfTime;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * epmet用户主键
+     */
+    private String icUserId;
+
+}

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

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

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

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

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

@@ -77,6 +77,19 @@ public class ChangeRelocationController {
         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);
+    }
 
 }

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

@@ -0,0 +1,82 @@
+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.ChangeWelfareDTO;
+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);
+        changeWelfareService.save(dto);
+        return new Result();
+    }
+
+    @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);
+    }
+
+
+
+}

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

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

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

@@ -1,7 +1,6 @@
 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;
@@ -131,4 +130,24 @@ public class ChangeRelocationEntity extends BaseEpmetEntity {
      */
 	private String customerId;
 
+	/**
+	 * 迁出时间
+	 */
+	private Date outOfTime;
+
+	/**
+	 * 身份证号
+	 */
+	private String idCard;
+
+	/**
+	 * 手机号
+	 */
+	private String mobile;
+
+	/**
+	 * epmet用户主键
+	 */
+	private String icUserId;
+
 }

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

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

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

@@ -14,11 +14,11 @@ import java.util.Date;
 @Data
 public class ChangeDeathExcel {
 
-    @Excel(name = "主键")
+//    @Excel(name = "主键")
-    private String id;
+//    private String id;
 
-    @Excel(name = "epmet用户主键")
+//    @Excel(name = "epmet用户主键")
-    private String userId;
+//    private String userId;
 
     @Excel(name = "姓名")
     private String name;
@@ -29,10 +29,10 @@ public class ChangeDeathExcel {
     @Excel(name = "手机号")
     private String mobile;
 
-    @Excel(name = "性别 0女 1男")
+    @Excel(name = "性别",replace = { "男_1", "女_0"} )
     private String gender;
 
-    @Excel(name = "类型 0 租客 1 房东")
+    @Excel(name = "类型",replace = { "房东_1", "租客_0"} )
     private String type;
 
     @Excel(name = "加入时间")
@@ -41,32 +41,32 @@ public class ChangeDeathExcel {
     @Excel(name = "加入原因")
     private String joinReason;
 
-    @Excel(name = "移除时间")
+//    @Excel(name = "移除时间")
-    private String removeDate;
+//    private String removeDate;
-
+//
-    @Excel(name = "移除原因")
+//    @Excel(name = "移除原因")
-    private String removeReason;
+//    private String removeReason;
-
+
-    @Excel(name = "删除标记 0：未删除，1：已删除")
+//    @Excel(name = "删除标记 0：未删除，1：已删除")
-    private String delFlag;
+//    private String delFlag;
-
+//
-    @Excel(name = "乐观锁")
+//    @Excel(name = "乐观锁")
-    private Integer revision;
+//    private Integer revision;
-
+//
-    @Excel(name = "创建人")
+//    @Excel(name = "创建人")
-    private String createdBy;
+//    private String createdBy;
-
+
-    @Excel(name = "创建时间")
+    @Excel(name = "创建时间", format = "yyyy-MM-dd HH:mm:ss")
     private Date createdTime;
 
-    @Excel(name = "更新人")
+//    @Excel(name = "更新人")
-    private String updatedBy;
+//    private String updatedBy;
-
+//
-    @Excel(name = "更新时间")
+//    @Excel(name = "更新时间")
-    private Date updatedTime;
+//    private Date updatedTime;
 
-    @Excel(name = "客户ID")
+//    @Excel(name = "客户ID")
-    private String customerId;
+//    private String customerId;
 
 
-}
+}

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

@@ -14,92 +14,114 @@ import java.util.Date;
 @Data
 public class ChangeRelocationExcel {
 
-    @Excel(name = "主键")
+//    @Excel(name = "主键")
-    private String id;
+//    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 = "组织PID")
+    @Excel(name = "迁出时间", format = "yyyy-MM-dd")
-    private String pid;
+    private Date outOfTime;
 
-    @Excel(name = "组织ID")
+    @Excel(name = "迁出原因")
-    private String agencyId;
+    private String reason;
 
-    @Excel(name = "组织名")
+    @Excel(name = "迁往何地")
-    private String agencyName;
+    private String address;
 
-    @Excel(name = "房屋小区ID")
+    @Excel(name = "户主姓名")
-    private String villageId;
+    private String ownerName;
 
-    @Excel(name = "房屋小区")
-    private String villageName;
 
-    @Excel(name = "楼号ID")
-    private String buildId;
 
-    @Excel(name = "楼号")
+//    @Excel(name = "组织PID")
-    private String buildName;
+//    private String pid;
 
-    @Excel(name = "单元ID")
+//    @Excel(name = "组织ID")
-    private String unitId;
+//    private String agencyId;
 
-    @Excel(name = "单元")
-    private String unitName;
 
-    @Excel(name = "房屋ID")
-    private String homeId;
 
-    @Excel(name = "房屋")
+//    @Excel(name = "房屋小区ID")
-    private String homeName;
+//    private String villageId;
 
-    @Excel(name = "外迁详细地址")
+//    @Excel(name = "房屋小区")
-    private String address;
+//    private String villageName;
 
-    @Excel(name = "操作类型【客户外out,客户内in】")
+//    @Excel(name = "楼号ID")
-    private String type;
+//    private String buildId;
 
-    @Excel(name = "原房主姓名")
+//    @Excel(name = "楼号")
-    private String ownerName;
+//    private String buildName;
 
-    @Excel(name = "原网格信息")
+//    @Excel(name = "单元ID")
-    private String oldDept;
+//    private String unitId;
 
-    @Excel(name = "原房屋信息")
+//    @Excel(name = "单元")
-    private String oldAddress;
+//    private String unitName;
 
-    @Excel(name = "原房间号")
+//    @Excel(name = "房屋ID")
-    private String oldHome;
+//    private String homeId;
 
-    @Excel(name = "浅出原因")
+//    @Excel(name = "房屋")
-    private String reason;
+//    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 = "创建人")
+//    @Excel(name = "删除标记 0：未删除，1：已删除")
-    private String createdBy;
+//    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 = "更新时间")
+//    @Excel(name = "创建时间", format = "yyyy-MM-dd HH:mm:ss")
-    private Date updatedTime;
+//    private Date createdTime;
 
-    @Excel(name = "客户ID")
+//    @Excel(name = "更新人")
-    private String customerId;
+//    private String updatedBy;
+//
+//    @Excel(name = "更新时间")
+//    private Date updatedTime;
+//
+//    @Excel(name = "客户ID")
+//    private String customerId;
 
 
-}
+}

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

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

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

@@ -0,0 +1,30 @@
+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-09
+ */
+@Component
+public class ChangeWelfareRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}

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

@@ -2,6 +2,7 @@ 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;
 
@@ -75,4 +76,13 @@ public interface ChangeRelocationService extends BaseService<ChangeRelocationEnt
      * @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);
+}

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

@@ -0,0 +1,78 @@
+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.plugin.power.dto.change.ChangeWelfareDTO;
+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
+     */
+    void 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);
+}

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

@@ -3,14 +3,23 @@ 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.constant.FieldConstant;
+import com.epmet.commons.tools.utils.Result;
-import com.epmet.plugin.power.modules.change.dao.ChangeRelocationDao;
+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.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.utils.IdentityNoUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -32,6 +41,12 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
     @Autowired
     private ChangeRelocationRedis changeRelocationRedis;
 
+    @Autowired
+    LoginUserUtil loginUserUtil;
+
+    @Autowired
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+
     @Override
     public PageData<ChangeRelocationDTO> page(Map<String, Object> params) {
         IPage<ChangeRelocationEntity> page = baseDao.selectPage(
@@ -50,9 +65,32 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
 
     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;
     }
@@ -84,4 +122,26 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
         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);
+        return new Result();
+    }
+
+}

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

@@ -0,0 +1,87 @@
+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.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.plugin.power.modules.change.dao.ChangeWelfareDao;
+import com.epmet.plugin.power.dto.change.ChangeWelfareDTO;
+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.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 福利表
+ *
+ * @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;
+
+    @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);
+
+        QueryWrapper<ChangeWelfareEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        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 void save(ChangeWelfareDTO dto) {
+        ChangeWelfareEntity entity = ConvertUtils.sourceToTarget(dto, ChangeWelfareEntity.class);
+        insert(entity);
+    }
+
+    @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));
+    }
+
+}

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

@@ -292,4 +292,4 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
         return new Result();
     }
 
-}
+}

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

@@ -0,0 +1,29 @@
+<?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>
+
+
+</mapper>