yinzuomei
5 years ago
134 changed files with 4797 additions and 163 deletions
@ -0,0 +1,212 @@ |
|||
package com.epmet.commons.tools.validator; |
|||
|
|||
import org.slf4j.Logger; |
|||
import org.slf4j.LoggerFactory; |
|||
|
|||
import java.text.SimpleDateFormat; |
|||
import java.util.Calendar; |
|||
import java.util.GregorianCalendar; |
|||
import java.util.Hashtable; |
|||
import java.util.regex.Matcher; |
|||
import java.util.regex.Pattern; |
|||
|
|||
import static java.util.regex.Pattern.*; |
|||
|
|||
/** |
|||
* 身份证号校验 |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2020/6/18 9:59 |
|||
*/ |
|||
public class IdCardNoValidatorUtils { |
|||
|
|||
private static Logger logger = LoggerFactory.getLogger(IdCardNoValidatorUtils.class); |
|||
|
|||
/** |
|||
* 身份证验证 |
|||
* |
|||
* @param idCardNo |
|||
* @return 校验信息，correct为成功，失败会返回对应的失败原因 |
|||
*/ |
|||
public static boolean checkIsIdCardNo(String idCardNo) { |
|||
String[] wf = {"1", "0", "X", "9", "8", "7", "6", "5", "4", "3", "2"}; |
|||
String[] checkCode = {"7", "9", "10", "5", "8", "4", "2", "1", "6", "3", "7", "9", "10", "5", "8", "4", "2"}; |
|||
String iDCardNo = ""; |
|||
try { |
|||
//判断号码的长度 15位或18位
|
|||
if (idCardNo.length() != 15 && idCardNo.length() != 18) { |
|||
logger.error(String.format("校验身份证号:%s错误:%s", idCardNo, "身份证号码长度应该为15位或18位")); |
|||
return false; |
|||
} |
|||
if (idCardNo.length() == 18) { |
|||
String lastStr = idCardNo.substring(idCardNo.length() - 1); |
|||
if (!Character.isDigit(lastStr.charAt(0))) { |
|||
if (Character.isLowerCase(lastStr.charAt(0))) { |
|||
logger.error(String.format("校验身份证号:%s错误:%s", idCardNo, "18身份证号最后一位字母需要大写")); |
|||
return false; |
|||
} |
|||
} else { |
|||
logger.info(String.format("身份证号%s最后一位为数字")); |
|||
} |
|||
} |
|||
if (idCardNo.length() == 18) { |
|||
iDCardNo = idCardNo.substring(0, 17); |
|||
} else if (idCardNo.length() == 15) { |
|||
iDCardNo = idCardNo.substring(0, 6) + "19" + idCardNo.substring(6, 15); |
|||
} |
|||
if (isStrNum(iDCardNo) == false) { |
|||
logger.error(String.format("校验身份证号:%s错误:%s", idCardNo, "身份证15位号码都应为数字;18位号码除最后一位外,都应为数字")); |
|||
return false; |
|||
} |
|||
//判断出生年月
|
|||
String strYear = iDCardNo.substring(6, 10);// 年份
|
|||
String strMonth = iDCardNo.substring(10, 12);// 月份
|
|||
String strDay = iDCardNo.substring(12, 14);// 月份
|
|||
if (isStrDate(strYear + "-" + strMonth + "-" + strDay) == false) { |
|||
logger.error(String.format("校验身份证号:%s错误:%s", idCardNo, "身份证生日无效")); |
|||
return false; |
|||
} |
|||
GregorianCalendar gc = new GregorianCalendar(); |
|||
SimpleDateFormat s = new SimpleDateFormat("yyyy-MM-dd"); |
|||
if ((gc.get(Calendar.YEAR) - Integer.parseInt(strYear)) > 150 || (gc.getTime().getTime() - s.parse(strYear + "-" + strMonth + "-" + strDay).getTime()) < 0) { |
|||
logger.error(String.format("校验身份证号:%s错误:%s", idCardNo, "身份证生日不在有效范围")); |
|||
return false; |
|||
} |
|||
if (Integer.parseInt(strMonth) > 12 || Integer.parseInt(strMonth) == 0) { |
|||
logger.error(String.format("校验身份证号:%s错误:%s", idCardNo, "身份证月份无效")); |
|||
return false; |
|||
} |
|||
if (Integer.parseInt(strDay) > 31 || Integer.parseInt(strDay) == 0) { |
|||
logger.error(String.format("校验身份证号:%s错误:%s", idCardNo, "身份证日期无效")); |
|||
return false; |
|||
} |
|||
//判断地区码
|
|||
Hashtable h = GetAreaCode(); |
|||
if (h.get(iDCardNo.substring(0, 2)) == null) { |
|||
logger.error(String.format("校验身份证号:%s错误:%s", idCardNo, "身份证地区编码错误")); |
|||
return false; |
|||
} |
|||
//判断最后一位
|
|||
int theLastOne = 0; |
|||
for (int i = 0; i < 17; i++) { |
|||
theLastOne = theLastOne + Integer.parseInt(String.valueOf(iDCardNo.charAt(i))) * Integer.parseInt(checkCode[i]); |
|||
} |
|||
int modValue = theLastOne % 11; |
|||
String strVerifyCode = wf[modValue]; |
|||
iDCardNo = iDCardNo + strVerifyCode; |
|||
|
|||
if (idCardNo.length() == 18 && !iDCardNo.equals(idCardNo)) { |
|||
logger.error(String.format("校验身份证号:%s错误:%s", idCardNo, "身份证无效，不是合法的身份证号码")); |
|||
return false; |
|||
} |
|||
|
|||
} catch (Exception e) { |
|||
logger.error(String.format("校验身份证号方法异常")); |
|||
e.printStackTrace(); |
|||
} |
|||
return true; |
|||
} |
|||
|
|||
/** |
|||
* 地区代码 |
|||
* |
|||
* @return Hashtable |
|||
*/ |
|||
private static Hashtable GetAreaCode() { |
|||
Hashtable<String, String> hashtable = new Hashtable<String, String>(); |
|||
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 |
|||
*/ |
|||
private static boolean isStrNum(String str) { |
|||
Pattern pattern = compile("[0-9]*"); |
|||
Matcher isNum = pattern.matcher(str); |
|||
if (isNum.matches()) { |
|||
return true; |
|||
} else { |
|||
return false; |
|||
} |
|||
} |
|||
|
|||
/** |
|||
* 判断字符串是否为日期格式 |
|||
* |
|||
* @param strDate |
|||
* @return |
|||
*/ |
|||
public static boolean isStrDate(String strDate) { |
|||
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])))))?$"); |
|||
Matcher m = pattern.matcher(strDate); |
|||
if (m.matches()) { |
|||
return true; |
|||
} else { |
|||
return false; |
|||
} |
|||
} |
|||
|
|||
|
|||
//根据身份证号判断性别 1男2女0未知
|
|||
public static String getGender(String idCard) { |
|||
String gender = "0"; |
|||
if (!IdCardNoValidatorUtils.checkIsIdCardNo(idCard)) { |
|||
return gender; |
|||
} |
|||
if (idCard.length() == 18) { |
|||
if (Integer.parseInt(idCard.substring(16).substring(0, 1)) % 2 == 0) { |
|||
gender = "2"; |
|||
} else { |
|||
gender = "1"; |
|||
} |
|||
} else if (idCard.length() == 15) { |
|||
String usex = idCard.substring(14, 15); |
|||
if (Integer.parseInt(usex) % 2 == 0) { |
|||
gender = "2"; |
|||
} else { |
|||
gender = "1"; |
|||
} |
|||
} |
|||
return gender; |
|||
} |
|||
|
|||
} |
|||
|
|||
@ -0,0 +1,26 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import javax.validation.constraints.NotEmpty; |
|||
import javax.validation.constraints.NotNull; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 权限配置-操作默认范围form dto |
|||
*/ |
|||
@Data |
|||
public class AccessConfigOpeDefaultScopesFormDTO { |
|||
|
|||
public interface ListOpeDefaultScopesGroup {} |
|||
public interface SaveOpeDefaultScopesGroup {} |
|||
|
|||
@NotBlank(message = "角色Key不能为空", groups = { ListOpeDefaultScopesGroup.class, SaveOpeDefaultScopesGroup.class }) |
|||
private String roleKey; |
|||
|
|||
@NotBlank(message = "操作Key不能为空", groups = { ListOpeDefaultScopesGroup.class, SaveOpeDefaultScopesGroup.class }) |
|||
private String operationKey; |
|||
|
|||
private List<String> scopeKeys; |
|||
} |
|||
@ -0,0 +1,18 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 角色默认操作权限列表from DTO |
|||
*/ |
|||
@Data |
|||
public class AccessConfigRoleDefaultOpesFormDTO { |
|||
|
|||
@NotBlank(message = "角色Key不能为空") |
|||
private String roleKey; |
|||
|
|||
private List<String> operationKeys; |
|||
} |
|||
@ -0,0 +1,16 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* 权限配置-操作的默认范围result dto |
|||
*/ |
|||
@Data |
|||
public class AccessConfigOpeDefaultScopesResultDTO { |
|||
private String scopeKey; |
|||
private String scopeName; |
|||
private String scopeIndex; |
|||
private String operationKey; |
|||
private String roleKey; |
|||
private Boolean assigned; |
|||
} |
|||
@ -0,0 +1,20 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
@Data |
|||
public class OperationScopeDefaultResultDTO { |
|||
|
|||
private String roleKey; |
|||
|
|||
/** |
|||
* 操作key |
|||
*/ |
|||
private String operationKey; |
|||
|
|||
/** |
|||
* 范围key |
|||
*/ |
|||
private String scopeKey; |
|||
|
|||
} |
|||
@ -0,0 +1,64 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.dao; |
|||
|
|||
import com.epmet.commons.mybatis.dao.BaseDao; |
|||
import com.epmet.dto.result.AccessConfigOpeDefaultScopesResultDTO; |
|||
import com.epmet.dto.result.OperationScopeDefaultResultDTO; |
|||
import com.epmet.entity.OperationScopeDefaultEntity; |
|||
import org.apache.ibatis.annotations.Mapper; |
|||
import org.apache.ibatis.annotations.Param; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 默认操作范围表 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2020-06-17 |
|||
*/ |
|||
@Mapper |
|||
public interface OperationScopeDefaultDao extends BaseDao<OperationScopeDefaultEntity> { |
|||
List<OperationScopeDefaultEntity> listAllValid(); |
|||
|
|||
/** |
|||
* 根据角色key和操作key查询默认操作权限列表 |
|||
* @param roleKey |
|||
* @return |
|||
*/ |
|||
List<OperationScopeDefaultResultDTO> listDefaultOpeScopes(@Param("roleKey") String roleKey); |
|||
|
|||
/** |
|||
* 查询操作的默认范围 |
|||
* @param roleKey |
|||
* @param operationKey |
|||
* @return |
|||
*/ |
|||
List<AccessConfigOpeDefaultScopesResultDTO> listOpeDefaultScopes4Config( |
|||
@Param("roleKey") String roleKey, |
|||
@Param("operationKey") String operationKey); |
|||
|
|||
List<OperationScopeDefaultEntity> listOpeDefaultScopesByRoleAndOpeKey( |
|||
@Param("roleKey") String roleKey, |
|||
@Param("operationKey") String operationKey); |
|||
|
|||
int delete( |
|||
@Param("roleKey") String roleKey, |
|||
@Param("operationKey") String operationKey, |
|||
@Param("scopeKey") String scopeKey); |
|||
} |
|||
@ -0,0 +1,53 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.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 2020-06-17 |
|||
*/ |
|||
@Data |
|||
@EqualsAndHashCode(callSuper=false) |
|||
@TableName("operation_scope_default") |
|||
public class OperationScopeDefaultEntity extends BaseEpmetEntity { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
private String roleKey; |
|||
|
|||
/** |
|||
* 操作key |
|||
*/ |
|||
private String operationKey; |
|||
|
|||
/** |
|||
* 范围key |
|||
*/ |
|||
private String scopeKey; |
|||
|
|||
} |
|||
@ -0,0 +1,77 @@ |
|||
<?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.dao.OperationScopeDefaultDao"> |
|||
|
|||
<resultMap type="com.epmet.entity.OperationScopeDefaultEntity" id="operationScopeDefaultMap"> |
|||
<result property="id" column="ID"/> |
|||
<result property="roleKey" column="ROLE_KEY"/> |
|||
<result property="operationKey" column="OPERATION_KEY"/> |
|||
<result property="scopeKey" column="SCOPE_KEY"/> |
|||
<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"/> |
|||
</resultMap> |
|||
|
|||
<delete id="delete"> |
|||
DELETE |
|||
FROM operation_scope_default |
|||
WHERE ROLE_KEY = #{roleKey} |
|||
AND OPERATION_KEY = #{operationKey} |
|||
AND SCOPE_KEY = #{scopeKey} |
|||
</delete> |
|||
|
|||
<select id="listAllValid" resultType="com.epmet.entity.OperationScopeDefaultEntity"> |
|||
SELECT * |
|||
FROM operation_scope_default WHERE DEL_FLAG=0 |
|||
</select> |
|||
|
|||
<!--根据角色key和操作key查询默认操作权限列表--> |
|||
<select id="listDefaultOpeScopes" resultType="com.epmet.dto.result.OperationScopeDefaultResultDTO"> |
|||
SELECT id, |
|||
role_key, |
|||
operation_key, |
|||
scope_key, |
|||
del_flag, |
|||
revision, |
|||
created_by, |
|||
created_time, |
|||
updated_by, |
|||
updated_time |
|||
FROM operation_scope_default |
|||
WHERE ROLE_KEY = #{roleKey} |
|||
</select> |
|||
|
|||
<!--查询操作的默认范围--> |
|||
<select id="listOpeDefaultScopes4Config" |
|||
resultType="com.epmet.dto.result.AccessConfigOpeDefaultScopesResultDTO"> |
|||
SELECT os.SCOPE_KEY, |
|||
os.SCOPE_NAME, |
|||
os.SCOPE_INDEX, |
|||
rs.OPERATION_KEY, |
|||
rs.ROLE_KEY, |
|||
CASE |
|||
WHEN rs.ROLE_KEY IS NULL |
|||
THEN FALSE |
|||
ELSE TRUE |
|||
END AS assigned |
|||
FROM operation_scope os |
|||
LEFT JOIN operation_scope_default rs |
|||
ON (os.SCOPE_KEY = rs.SCOPE_KEY AND rs.DEL_FLAG = 0 AND rs.ROLE_KEY = #{roleKey} AND |
|||
OPERATION_KEY = #{operationKey}) |
|||
WHERE os.DEL_FLAG = 0 |
|||
ORDER BY os.SORT ASC |
|||
</select> |
|||
|
|||
<select id="listOpeDefaultScopesByRoleAndOpeKey" resultType="com.epmet.entity.OperationScopeDefaultEntity"> |
|||
SELECT * |
|||
FROM operation_scope_default |
|||
WHERE ROLE_KEY = #{roleKey} |
|||
AND OPERATION_KEY = #{operationKey} |
|||
</select> |
|||
|
|||
|
|||
</mapper> |
|||
@ -0,0 +1,31 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 删除党员入参DTO |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2020/6/18 18:05 |
|||
*/ |
|||
@Data |
|||
public class DeletePartyMemberFormDTO implements Serializable { |
|||
private static final long serialVersionUID = 2325963253025239121L; |
|||
|
|||
public interface AddUserInternalGroup {} |
|||
/** |
|||
* 党员id |
|||
*/ |
|||
@NotBlank(message = "党员id不能为空",groups = {PartyMemberIdFormDTO.AddUserInternalGroup.class}) |
|||
private String partyMemberId; |
|||
|
|||
/** |
|||
* 党支部id |
|||
*/ |
|||
@NotBlank(message = "党支部id不能为空",groups = {PartyMemberIdFormDTO.AddUserInternalGroup.class}) |
|||
private String partyBranchId; |
|||
|
|||
} |
|||
@ -0,0 +1,50 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; |
|||
import lombok.Data; |
|||
import org.hibernate.validator.constraints.Length; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 添加党支部入参DTO |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2020/6/17 12:35 |
|||
*/ |
|||
@Data |
|||
public class PartyBranchAddFormDTO implements Serializable { |
|||
private static final long serialVersionUID = -8102877381223078842L; |
|||
|
|||
public interface AddUserInternalGroup { |
|||
} |
|||
|
|||
public interface AddUserShowGroup extends CustomerClientShowGroup { |
|||
} |
|||
|
|||
/** |
|||
* 客户id |
|||
*/ |
|||
@NotBlank(message = "客户id不能为空", groups = {AddUserInternalGroup.class}) |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 网格id |
|||
*/ |
|||
@NotBlank(message = "网格id不能为空", groups = {AddUserInternalGroup.class}) |
|||
private String gridId; |
|||
|
|||
/** |
|||
* 党支部名称 |
|||
*/ |
|||
@NotBlank(message = "请输入支部名称", groups = {AddUserShowGroup.class}) |
|||
@Length(max = 20, message = "支部名称不能超过20个字", groups = AddUserShowGroup.class) |
|||
private String partyBranchName; |
|||
|
|||
/** |
|||
* 党支部概要信息 |
|||
*/ |
|||
@Length(max = 500, message = "支部概要信息不能超过500个字", groups = AddUserShowGroup.class) |
|||
private String profile; |
|||
} |
|||
@ -0,0 +1,40 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; |
|||
import lombok.Data; |
|||
import org.hibernate.validator.constraints.Length; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 修改党支部信息入参DTO |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2020/6/17 14:00 |
|||
*/ |
|||
@Data |
|||
public class PartyBranchEditFormDTO implements Serializable { |
|||
private static final long serialVersionUID = -6739109166420798965L; |
|||
public interface AddUserInternalGroup { |
|||
} |
|||
|
|||
public interface AddUserShowGroup extends CustomerClientShowGroup { |
|||
} |
|||
|
|||
@NotBlank(message = "党支部id不能为空", groups = {AddUserInternalGroup.class}) |
|||
private String partyBranchId; |
|||
/** |
|||
* 党支部名称 |
|||
*/ |
|||
@NotBlank(message = "请输入支部名称", groups = {AddUserShowGroup.class}) |
|||
@Length(max = 20, message = "支部名称不能超过20个字", groups = AddUserShowGroup.class) |
|||
private String partyBranchName; |
|||
|
|||
/** |
|||
* 党支部概要信息 |
|||
*/ |
|||
@NotBlank(message = "请输入支部概要信息", groups = {AddUserShowGroup.class}) |
|||
@Length(max = 500, message = "支部概要信息不能超过500个字", groups = AddUserShowGroup.class) |
|||
private String profile; |
|||
} |
|||
@ -0,0 +1,24 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 党支部id |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2020/6/17 17:02 |
|||
*/ |
|||
@Data |
|||
public class PartyBranchIdFormDTO implements Serializable { |
|||
private static final long serialVersionUID = 5321430865413383354L; |
|||
public interface AddUserInternalGroup { |
|||
} |
|||
/** |
|||
* 党支部id |
|||
*/ |
|||
@NotBlank(message = "党支部id不能为空",groups = {AddUserInternalGroup.class}) |
|||
private String partyBranchId; |
|||
} |
|||
@ -0,0 +1,29 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 3、党支部列表查询入参DTO |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2020/6/17 16:11 |
|||
*/ |
|||
@Data |
|||
public class PartyBranchListFormDTO implements Serializable { |
|||
public interface AddUserInternalGroup { |
|||
} |
|||
/** |
|||
* 客户id |
|||
*/ |
|||
@NotBlank(message = "客户id不能为空", groups = {PartyBranchListFormDTO.AddUserInternalGroup.class}) |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 网格id |
|||
*/ |
|||
@NotBlank(message = "网格id不能为空", groups = {PartyBranchListFormDTO.AddUserInternalGroup.class}) |
|||
private String gridId; |
|||
} |
|||
@ -0,0 +1,24 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 党员id |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2020/6/18 14:48 |
|||
*/ |
|||
@Data |
|||
public class PartyMemberIdFormDTO implements Serializable { |
|||
private static final long serialVersionUID = 3088195909670495675L; |
|||
|
|||
public interface AddUserInternalGroup {} |
|||
/** |
|||
* 党员id |
|||
*/ |
|||
@NotBlank(message = "党员id不能为空",groups = {AddUserInternalGroup.class}) |
|||
private String partyMemberId; |
|||
} |
|||
@ -0,0 +1,42 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 新增、修改党员入参DTO |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2020/6/17 22:15 |
|||
*/ |
|||
@Data |
|||
public class SaveOrUpdateParyMemberFormDTO implements Serializable { |
|||
private static final long serialVersionUID = -6896349967046364830L; |
|||
|
|||
public interface UpdatePatyMemberGroup { |
|||
} |
|||
|
|||
public interface SavePatyMemberGroup { |
|||
} |
|||
|
|||
public interface AddUserShowGroup extends CustomerClientShowGroup { |
|||
} |
|||
|
|||
@NotBlank(message = "党支部id不能为空", groups = {SavePatyMemberGroup.class}) |
|||
private String partyBranchId; |
|||
|
|||
@NotBlank(message = "姓名不能为空", groups = {AddUserShowGroup.class}) |
|||
private String name; |
|||
|
|||
@NotBlank(message = "身份证不能为空", groups = {AddUserShowGroup.class}) |
|||
private String idCard; |
|||
|
|||
@NotBlank(message = "手机号不能为空", groups = {AddUserShowGroup.class}) |
|||
private String mobile; |
|||
|
|||
@NotBlank(message = "党员id不能为空", groups = {UpdatePatyMemberGroup.class}) |
|||
private String partyMemberId; |
|||
} |
|||
@ -0,0 +1,20 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 添加党支部返参DTO |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2020/6/17 12:45 |
|||
*/ |
|||
@Data |
|||
public class PartyBranchAddResultDTO implements Serializable { |
|||
private static final long serialVersionUID = 5610858988982913682L; |
|||
/** |
|||
* 党支部id |
|||
*/ |
|||
private String partyBranchId; |
|||
} |
|||
@ -0,0 +1,48 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 党支部详情信息返参 |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2020/6/17 21:45 |
|||
*/ |
|||
@Data |
|||
public class PartyBranchInfoResultDTO implements Serializable { |
|||
private static final long serialVersionUID = 1184531127569286576L; |
|||
|
|||
/** |
|||
* 党支部id |
|||
*/ |
|||
private String partyBranchId; |
|||
|
|||
/** |
|||
* 党支部名称 |
|||
*/ |
|||
private String partyBranchName; |
|||
|
|||
/** |
|||
* 党支部概要 |
|||
*/ |
|||
private String profile; |
|||
|
|||
/** |
|||
* 党支部所属网格名称 |
|||
*/ |
|||
private String gridName; |
|||
|
|||
/** |
|||
* 党支部所属网格id |
|||
*/ |
|||
private String gridId; |
|||
|
|||
public PartyBranchInfoResultDTO(){ |
|||
this.partyBranchId=""; |
|||
this.partyBranchName=""; |
|||
this.profile=""; |
|||
this.gridName=""; |
|||
} |
|||
} |
|||
@ -0,0 +1,29 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 3、党支部列表查询返参DTO |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2020/6/17 16:13 |
|||
*/ |
|||
@Data |
|||
public class PartyBranchListResultDTO implements Serializable { |
|||
private static final long serialVersionUID = 8342529186641647970L; |
|||
/** |
|||
* 支部id |
|||
*/ |
|||
private String partyBranchId; |
|||
/** |
|||
* 支部名称 |
|||
*/ |
|||
private String partyBranchName; |
|||
|
|||
/** |
|||
* 党员总数 |
|||
*/ |
|||
private Integer totalPartyMember; |
|||
} |
|||
@ -0,0 +1,17 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 党员id:添加党员后返参、修改党员后返参 |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2020/6/17 22:13 |
|||
*/ |
|||
@Data |
|||
public class PartyMemberIdResultDTO implements Serializable { |
|||
private static final long serialVersionUID = 7467454908831748131L; |
|||
private String partyMemberId; |
|||
} |
|||
@ -0,0 +1,72 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 党员信息详情返参DTO |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2020/6/18 15:19 |
|||
*/ |
|||
@Data |
|||
public class PartyMemberInfoDetailResultDTO implements Serializable { |
|||
private static final long serialVersionUID = -4887670791276512339L; |
|||
/** |
|||
* 党员id |
|||
*/ |
|||
private String partyMemberId; |
|||
|
|||
/** |
|||
* 姓名 |
|||
*/ |
|||
private String name; |
|||
|
|||
/** |
|||
* 身份证号 |
|||
*/ |
|||
private String idCard; |
|||
|
|||
/** |
|||
* 手机号 |
|||
*/ |
|||
private String mobile; |
|||
|
|||
/** |
|||
* 1男2女0未知 |
|||
*/ |
|||
private String gender; |
|||
|
|||
/** |
|||
* true已激活，false未激活 |
|||
*/ |
|||
private Boolean status; |
|||
|
|||
/** |
|||
* 返回：账号于2019年10月31日在海泊桥社区-第一网格激活 |
|||
*/ |
|||
private String activeDesc; |
|||
|
|||
/** |
|||
* 党支部名称（机关-网格-支部名） |
|||
*/ |
|||
private String partyBranchName; |
|||
|
|||
/** |
|||
* 党支部id |
|||
*/ |
|||
private String partyBranchId; |
|||
|
|||
public PartyMemberInfoDetailResultDTO(){ |
|||
this.partyMemberId=""; |
|||
this.name=""; |
|||
this.idCard=""; |
|||
this.mobile=""; |
|||
this.gender=""; |
|||
this.status=Boolean.FALSE; |
|||
this.activeDesc=""; |
|||
this.partyBranchName=""; |
|||
this.partyBranchId=""; |
|||
} |
|||
} |
|||
@ -0,0 +1,30 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 党员列表返参DTO |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2020/6/18 10:04 |
|||
*/ |
|||
@Data |
|||
public class PartyMemberInfoResultDTO implements Serializable { |
|||
private static final long serialVersionUID = 627412197353847930L; |
|||
/** |
|||
* 党员id |
|||
*/ |
|||
private String partyMemberId; |
|||
|
|||
/** |
|||
* 姓名 |
|||
*/ |
|||
private String name; |
|||
|
|||
/** |
|||
* 性别1男2女0未知 |
|||
*/ |
|||
private String gender; |
|||
} |
|||
@ -0,0 +1,179 @@ |
|||
package com.epmet.controller; |
|||
|
|||
import com.epmet.commons.tools.annotation.RequirePermission; |
|||
import com.epmet.commons.tools.enums.RequirePermissionEnum; |
|||
import com.epmet.commons.tools.utils.Result; |
|||
import com.epmet.commons.tools.validator.ValidatorUtils; |
|||
import com.epmet.dto.form.*; |
|||
import com.epmet.dto.result.*; |
|||
import com.epmet.service.PartyBranchManageService; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.web.bind.annotation.PostMapping; |
|||
import org.springframework.web.bind.annotation.RequestBody; |
|||
import org.springframework.web.bind.annotation.RequestMapping; |
|||
import org.springframework.web.bind.annotation.RestController; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 基层治理-支部管理 |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2020/6/17 12:25 |
|||
*/ |
|||
@RestController |
|||
@RequestMapping("partybranch") |
|||
public class PartyBranchManageController { |
|||
@Autowired |
|||
private PartyBranchManageService partyBranchManageService; |
|||
|
|||
/** |
|||
* @param formDTO |
|||
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.PartyBranchAddResultDTO> |
|||
* @author yinzuomei |
|||
* @description 添加党支部 |
|||
* @Date 2020/6/17 12:47 |
|||
**/ |
|||
@PostMapping("add") |
|||
@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_PARTY_BRANCH_ADD) |
|||
public Result<PartyBranchAddResultDTO> addPartyBranch(@RequestBody PartyBranchAddFormDTO formDTO) { |
|||
ValidatorUtils.validateEntity(formDTO, PartyBranchAddFormDTO.AddUserShowGroup.class, PartyBranchAddFormDTO.AddUserInternalGroup.class); |
|||
PartyBranchAddResultDTO partyBranchAddResultDTO = partyBranchManageService.addPartyBranch(formDTO); |
|||
return new Result<PartyBranchAddResultDTO>().ok(partyBranchAddResultDTO); |
|||
} |
|||
|
|||
/** |
|||
* @param formDTO |
|||
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.PartyBranchAddResultDTO> |
|||
* @author yinzuomei |
|||
* @description 修改党支部信息 |
|||
* @Date 2020/6/17 15:31 |
|||
**/ |
|||
@PostMapping("edit") |
|||
@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_PARTY_BRANCH_EDIT) |
|||
public Result<PartyBranchAddResultDTO> editPartyBranch(@RequestBody PartyBranchEditFormDTO formDTO) { |
|||
ValidatorUtils.validateEntity(formDTO, PartyBranchEditFormDTO.AddUserShowGroup.class, PartyBranchEditFormDTO.AddUserInternalGroup.class); |
|||
partyBranchManageService.editPartyBranch(formDTO); |
|||
PartyBranchAddResultDTO partyBranchAddResultDTO = new PartyBranchAddResultDTO(); |
|||
partyBranchAddResultDTO.setPartyBranchId(formDTO.getPartyBranchId()); |
|||
return new Result<PartyBranchAddResultDTO>().ok(partyBranchAddResultDTO); |
|||
} |
|||
|
|||
/** |
|||
* @param formDTO |
|||
* @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.PartyBranchListResultDTO>> |
|||
* @author yinzuomei |
|||
* @description 党支部列表查询 |
|||
* @Date 2020/6/17 16:15 |
|||
**/ |
|||
@PostMapping("list") |
|||
public Result<List<PartyBranchListResultDTO>> listPartyBranch(@RequestBody PartyBranchListFormDTO formDTO) { |
|||
ValidatorUtils.validateEntity(formDTO, PartyBranchListFormDTO.AddUserInternalGroup.class); |
|||
return new Result<List<PartyBranchListResultDTO>>().ok(partyBranchManageService.listPartyBranch(formDTO)); |
|||
} |
|||
|
|||
/** |
|||
* @param formDTO |
|||
* @return com.epmet.commons.tools.utils.Result |
|||
* @author yinzuomei |
|||
* @description 删除党支部 |
|||
* @Date 2020/6/17 18:23 |
|||
**/ |
|||
@PostMapping("delete") |
|||
@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_PARTY_BRANCH_DELETE) |
|||
public Result deleteBranch(@RequestBody PartyBranchIdFormDTO formDTO) { |
|||
ValidatorUtils.validateEntity(formDTO); |
|||
partyBranchManageService.deleteBranch(formDTO.getPartyBranchId()); |
|||
return new Result(); |
|||
} |
|||
|
|||
/** |
|||
* @param formDTO |
|||
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.PartyBranchInfoResultDTO> |
|||
* @author yinzuomei |
|||
* @description 5、党支部详情信息查询 |
|||
* @Date 2020/6/17 21:49 |
|||
**/ |
|||
@PostMapping("info") |
|||
public Result<PartyBranchInfoResultDTO> queryPartyBranchInfo(@RequestBody PartyBranchIdFormDTO formDTO) { |
|||
ValidatorUtils.validateEntity(formDTO,PartyBranchIdFormDTO.AddUserInternalGroup.class); |
|||
PartyBranchInfoResultDTO partyBranchInfoResultDTO = partyBranchManageService.queryPartyBranchInfo(formDTO.getPartyBranchId()); |
|||
return new Result<PartyBranchInfoResultDTO>().ok(partyBranchInfoResultDTO); |
|||
} |
|||
|
|||
/** |
|||
* @return com.epmet.commons.tools.utils.Result<java.util.List> |
|||
* @param formDTO |
|||
* @author yinzuomei |
|||
* @description 6、党员列表查询 |
|||
* @Date 2020/6/18 0:17 |
|||
**/ |
|||
@PostMapping("/partymember/list") |
|||
public Result<List<PartyMemberInfoResultDTO>> listPartyMember(@RequestBody PartyBranchIdFormDTO formDTO){ |
|||
ValidatorUtils.validateEntity(formDTO,PartyBranchIdFormDTO.AddUserInternalGroup.class); |
|||
List<PartyMemberInfoResultDTO> list=partyBranchManageService.listPartyMember(formDTO.getPartyBranchId()); |
|||
return new Result<List<PartyMemberInfoResultDTO>>().ok(list); |
|||
} |
|||
|
|||
/** |
|||
* @param formDTO |
|||
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.PartyMemberIdResultDTO> |
|||
* @author yinzuomei |
|||
* @description 7、添加党员 |
|||
* @Date 2020/6/17 22:25 |
|||
**/ |
|||
@PostMapping("/partymember/add") |
|||
@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_PARTY_MEMBER_ADD) |
|||
public Result<PartyMemberIdResultDTO> addPartyMember(@RequestBody SaveOrUpdateParyMemberFormDTO formDTO) { |
|||
ValidatorUtils.validateEntity(formDTO, SaveOrUpdateParyMemberFormDTO.AddUserShowGroup.class |
|||
, SaveOrUpdateParyMemberFormDTO.SavePatyMemberGroup.class); |
|||
PartyMemberIdResultDTO partyMemberIdResultDTO = new PartyMemberIdResultDTO(); |
|||
partyMemberIdResultDTO.setPartyMemberId(partyBranchManageService.addPartyMember(formDTO)); |
|||
return new Result<PartyMemberIdResultDTO>().ok(partyMemberIdResultDTO); |
|||
} |
|||
|
|||
/** |
|||
* @param formDTO |
|||
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.PartyMemberIdResultDTO> |
|||
* @author yinzuomei |
|||
* @description 8、编辑党员 |
|||
* @Date 2020/6/17 23:29 |
|||
**/ |
|||
@PostMapping("/partymember/edit") |
|||
@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_PARTY_MEMBER_EDIT) |
|||
public Result<PartyMemberIdResultDTO> editPartyMember(@RequestBody SaveOrUpdateParyMemberFormDTO formDTO) { |
|||
ValidatorUtils.validateEntity(formDTO, SaveOrUpdateParyMemberFormDTO.AddUserShowGroup.class |
|||
, SaveOrUpdateParyMemberFormDTO.UpdatePatyMemberGroup.class); |
|||
PartyMemberIdResultDTO partyMemberIdResultDTO = new PartyMemberIdResultDTO(); |
|||
partyMemberIdResultDTO.setPartyMemberId(partyBranchManageService.editPartyMember(formDTO)); |
|||
return new Result<PartyMemberIdResultDTO>().ok(partyMemberIdResultDTO); |
|||
} |
|||
|
|||
/** |
|||
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.PartyMemberInfoDetailResultDTO> |
|||
* @param formDTO |
|||
* @author yinzuomei |
|||
* @description 10、党员详情 |
|||
* @Date 2020/6/18 15:25 |
|||
**/ |
|||
@PostMapping("/partymember/detail") |
|||
public Result<PartyMemberInfoDetailResultDTO> queryPartyMemberDetail(@RequestBody PartyMemberIdFormDTO formDTO){ |
|||
ValidatorUtils.validateEntity(formDTO, PartyMemberIdFormDTO.AddUserInternalGroup.class); |
|||
return new Result<PartyMemberInfoDetailResultDTO>().ok(partyBranchManageService.queryPartyMemberDetail(formDTO.getPartyMemberId())); |
|||
} |
|||
|
|||
/** |
|||
* @return com.epmet.commons.tools.utils.Result |
|||
* @param deletePartyMemberFormDTO |
|||
* @author yinzuomei |
|||
* @description 删除党员 |
|||
* @Date 2020/6/18 17:51 |
|||
**/ |
|||
@PostMapping("partymember/delete") |
|||
@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_PARTY_MEMBER_DELETE) |
|||
public Result deletePartyMember(@RequestBody DeletePartyMemberFormDTO deletePartyMemberFormDTO){ |
|||
ValidatorUtils.validateEntity(deletePartyMemberFormDTO, DeletePartyMemberFormDTO.AddUserInternalGroup.class); |
|||
partyBranchManageService.deletePartyMember(deletePartyMemberFormDTO); |
|||
return new Result(); |
|||
} |
|||
} |
|||
@ -0,0 +1,104 @@ |
|||
package com.epmet.service; |
|||
|
|||
import com.epmet.dto.form.*; |
|||
import com.epmet.dto.result.*; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 基层治理-支部管理 |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2020/6/17 12:47 |
|||
*/ |
|||
public interface PartyBranchManageService { |
|||
/** |
|||
* @param formDTO |
|||
* @return com.epmet.dto.result.PartyBranchAddResultDTO |
|||
* @author yinzuomei |
|||
* @description 添加党支部 |
|||
* @Date 2020/6/17 13:24 |
|||
**/ |
|||
PartyBranchAddResultDTO addPartyBranch(PartyBranchAddFormDTO formDTO); |
|||
|
|||
/** |
|||
* @param formDTO |
|||
* @return com.epmet.dto.result.PartyBranchAddResultDTO |
|||
* @author yinzuomei |
|||
* @description 修改党支部信息 |
|||
* @Date 2020/6/17 14:30 |
|||
**/ |
|||
void editPartyBranch(PartyBranchEditFormDTO formDTO); |
|||
|
|||
/** |
|||
* @param formDTO |
|||
* @return java.util.List<com.epmet.dto.result.PartyBranchListResultDTO> |
|||
* @author yinzuomei |
|||
* @description 党支部列表查询 |
|||
* @Date 2020/6/17 16:15 |
|||
**/ |
|||
List<PartyBranchListResultDTO> listPartyBranch(PartyBranchListFormDTO formDTO); |
|||
|
|||
/** |
|||
* @return void |
|||
* @param partyBranchId |
|||
* @author yinzuomei |
|||
* @description 删除党支部 |
|||
* @Date 2020/6/17 17:04 |
|||
**/ |
|||
void deleteBranch(String partyBranchId); |
|||
|
|||
/** |
|||
* @return com.epmet.dto.result.PartyBranchInfoResultDTO |
|||
* @param partyBranchId |
|||
* @author yinzuomei |
|||
* @description 5、党支部详情信息查询 |
|||
* @Date 2020/6/17 21:49 |
|||
**/ |
|||
PartyBranchInfoResultDTO queryPartyBranchInfo(String partyBranchId); |
|||
|
|||
/** |
|||
* @return java.util.List<com.epmet.dto.result.PartyMemberInfoResultDTO> |
|||
* @param partyBranchId |
|||
* @author yinzuomei |
|||
* @description 党员列表查询 |
|||
* @Date 2020/6/18 10:06 |
|||
**/ |
|||
List<PartyMemberInfoResultDTO> listPartyMember(String partyBranchId); |
|||
|
|||
/** |
|||
* @return java.lang.String |
|||
* @param formDTO |
|||
* @author yinzuomei |
|||
* @description 7、添加党员 |
|||
* @Date 2020/6/17 22:26 |
|||
**/ |
|||
String addPartyMember(SaveOrUpdateParyMemberFormDTO formDTO); |
|||
|
|||
/** |
|||
* @return java.lang.String |
|||
* @param formDTO |
|||
* @author yinzuomei |
|||
* @description 8、编辑党员 |
|||
* @Date 2020/6/17 23:29 |
|||
**/ |
|||
String editPartyMember(SaveOrUpdateParyMemberFormDTO formDTO); |
|||
|
|||
/** |
|||
* @param partyMemberId |
|||
* @return com.epmet.dto.result.PartyMemberInfoDetailResultDTO |
|||
* @author yinzuomei |
|||
* @description 10、党员详情：根据党员id查询党员详情 |
|||
* @Date 2020/6/18 15:25 |
|||
**/ |
|||
PartyMemberInfoDetailResultDTO queryPartyMemberDetail(String partyMemberId); |
|||
|
|||
/** |
|||
* @return void |
|||
* @param deletePartyMemberFormDTO |
|||
* @author yinzuomei |
|||
* @description 删除党员 |
|||
* @Date 2020/6/18 17:51 |
|||
**/ |
|||
void deletePartyMember(DeletePartyMemberFormDTO deletePartyMemberFormDTO); |
|||
} |
|||
@ -0,0 +1,219 @@ |
|||
package com.epmet.service.impl; |
|||
|
|||
import com.alibaba.fastjson.JSON; |
|||
import com.epmet.commons.tools.exception.EpmetErrorCode; |
|||
import com.epmet.commons.tools.exception.RenException; |
|||
import com.epmet.commons.tools.utils.ConvertUtils; |
|||
import com.epmet.commons.tools.utils.Result; |
|||
import com.epmet.dto.CustomerPartyBranchDTO; |
|||
import com.epmet.dto.form.*; |
|||
import com.epmet.dto.result.*; |
|||
import com.epmet.feign.GovOrgOpenFeignClient; |
|||
import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO; |
|||
import com.epmet.resi.partymember.dto.partymember.form.DelPartyMemberBaseInfoFormDTO; |
|||
import com.epmet.resi.partymember.dto.partymember.form.PartyMemberBaseInfoAddFormDTO; |
|||
import com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO; |
|||
import com.epmet.resi.partymember.dto.partymember.result.PartymemberBaseInfoResultDTO; |
|||
import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient; |
|||
import com.epmet.service.PartyBranchManageService; |
|||
import org.apache.commons.lang3.StringUtils; |
|||
import org.apache.logging.log4j.LogManager; |
|||
import org.apache.logging.log4j.Logger; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.stereotype.Service; |
|||
|
|||
import java.util.ArrayList; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 基层治理-支部管理 |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2020/6/17 13:23 |
|||
*/ |
|||
@Service |
|||
public class PartyBranchManageServiceImpl implements PartyBranchManageService { |
|||
private Logger logger = LogManager.getLogger(PartyBranchManageServiceImpl.class); |
|||
@Autowired |
|||
private GovOrgOpenFeignClient govOrgOpenFeignClient; |
|||
@Autowired |
|||
private ResiPartyMemberOpenFeignClient resiPartyMemberOpenFeignClient; |
|||
|
|||
@Override |
|||
public PartyBranchAddResultDTO addPartyBranch(PartyBranchAddFormDTO formDTO) { |
|||
CustomerPartyBranchDTO customerPartyBranchDTO = ConvertUtils.sourceToTarget(formDTO, CustomerPartyBranchDTO.class); |
|||
customerPartyBranchDTO.setTotalPartyMember(0); |
|||
PartyBranchAddResultDTO partyBranchAddResultDTO = new PartyBranchAddResultDTO(); |
|||
Result<String> result = govOrgOpenFeignClient.savePartyBranch(customerPartyBranchDTO); |
|||
if (result.success()) { |
|||
partyBranchAddResultDTO.setPartyBranchId(result.getData()); |
|||
} else { |
|||
logger.error("添加党支部错误,调用gov-org-server接口返回失败"); |
|||
} |
|||
return partyBranchAddResultDTO; |
|||
} |
|||
|
|||
@Override |
|||
public void editPartyBranch(PartyBranchEditFormDTO formDTO) { |
|||
CustomerPartyBranchDTO customerPartyBranchDTO = ConvertUtils.sourceToTarget(formDTO, CustomerPartyBranchDTO.class); |
|||
customerPartyBranchDTO.setId(formDTO.getPartyBranchId()); |
|||
Result<String> result = govOrgOpenFeignClient.updatePartyBranch(customerPartyBranchDTO); |
|||
if (result.success()) { |
|||
logger.info("修改党支部信息成功"); |
|||
} |
|||
} |
|||
|
|||
@Override |
|||
public List<PartyBranchListResultDTO> listPartyBranch(PartyBranchListFormDTO formDTO) { |
|||
ListPartyBranchFormDTO listPartyBranchFormDTO = ConvertUtils.sourceToTarget(formDTO, ListPartyBranchFormDTO.class); |
|||
Result<List<ListPartyBranchResultDTO>> result = govOrgOpenFeignClient.listPartyBranch(listPartyBranchFormDTO); |
|||
List<ListPartyBranchResultDTO> resultList=result.getData(); |
|||
if (result.success()) { |
|||
List<PartyBranchListResultDTO> list = ConvertUtils.sourceToTarget(resultList, PartyBranchListResultDTO.class); |
|||
return list; |
|||
} else { |
|||
logger.error(String.format("党支部列表查询失败入参:"), JSON.toJSONString(formDTO)); |
|||
} |
|||
return new ArrayList<>(); |
|||
} |
|||
|
|||
@Override |
|||
public void deleteBranch(String partyBranchId) { |
|||
Result<CustomerPartyBranchDTO> customerPartyBranchDTOResult = govOrgOpenFeignClient.getPartyBranchById(partyBranchId); |
|||
if (!customerPartyBranchDTOResult.success()||null==customerPartyBranchDTOResult.getData()) { |
|||
logger.error(String.format("查询党支部信息失败入参:partyBranchId=%s",partyBranchId)); |
|||
return; |
|||
}else{ |
|||
if (null != customerPartyBranchDTOResult.getData() && customerPartyBranchDTOResult.getData().getTotalPartyMember() > 0) { |
|||
throw new RenException(EpmetErrorCode.CANNOT_DELETE_PARTY_BRANCH.getCode()); |
|||
} |
|||
} |
|||
Result delteResult=govOrgOpenFeignClient.deletePartyBranchById(partyBranchId); |
|||
if(!delteResult.success()){ |
|||
logger.error(String.format("删除党支部失败入参:partyBranchId=%s",partyBranchId)); |
|||
} |
|||
} |
|||
|
|||
@Override |
|||
public PartyBranchInfoResultDTO queryPartyBranchInfo(String partyBranchId) { |
|||
PartyBranchInfoResultDTO partyBranchInfo = new PartyBranchInfoResultDTO(); |
|||
Result<CustomerPartyBranchDTO> customerPartyBranchDTOResult = govOrgOpenFeignClient.getPartyBranchById(partyBranchId); |
|||
if (!customerPartyBranchDTOResult.success() || null == customerPartyBranchDTOResult.getData()) { |
|||
logger.error(String.format("党支部详情信息查询异常,partyBranchId=%s", partyBranchId)); |
|||
return partyBranchInfo; |
|||
} |
|||
partyBranchInfo.setPartyBranchId(partyBranchId); |
|||
partyBranchInfo.setPartyBranchName(customerPartyBranchDTOResult.getData().getPartyBranchName()); |
|||
partyBranchInfo.setProfile(customerPartyBranchDTOResult.getData().getProfile()); |
|||
partyBranchInfo.setGridId(customerPartyBranchDTOResult.getData().getGridId()); |
|||
Result<GridInfoResultDTO> gridInfoResult = govOrgOpenFeignClient.queryGridInfo(customerPartyBranchDTOResult.getData().getGridId()); |
|||
if (gridInfoResult.success() && null != gridInfoResult.getData() && StringUtils.isNotBlank(gridInfoResult.getData().getParentAgencyName())) { |
|||
partyBranchInfo.setGridName(String.format("%s-%s", gridInfoResult.getData().getParentAgencyName(), gridInfoResult.getData().getGridName())); |
|||
} else { |
|||
logger.error(String.format("查询网格基本信息失败,gridId=%s", customerPartyBranchDTOResult.getData().getGridId())); |
|||
} |
|||
return partyBranchInfo; |
|||
} |
|||
|
|||
@Override |
|||
public List<PartyMemberInfoResultDTO> listPartyMember(String partyBranchId) { |
|||
Result<List<PartymemberBaseInfoResultDTO>> result = resiPartyMemberOpenFeignClient.listPartyMemberBaseInfo(partyBranchId); |
|||
if (result.success()) { |
|||
List<PartyMemberInfoResultDTO> list = ConvertUtils.sourceToTarget(result.getData(), PartyMemberInfoResultDTO.class); |
|||
return list; |
|||
} |
|||
logger.error("党员列表查询失败"); |
|||
return new ArrayList<>(); |
|||
} |
|||
|
|||
@Override |
|||
public String addPartyMember(SaveOrUpdateParyMemberFormDTO formDTO) { |
|||
//1、查询党支部信息
|
|||
Result<CustomerPartyBranchDTO> customerPartyBranchResult = govOrgOpenFeignClient.getPartyBranchById(formDTO.getPartyBranchId()); |
|||
if (!customerPartyBranchResult.success() || null == customerPartyBranchResult.getData()) { |
|||
throw new RenException("党支部信息获取失败"); |
|||
} |
|||
//2、构造党员入参
|
|||
CustomerPartyBranchDTO customerPartyBranch = customerPartyBranchResult.getData(); |
|||
PartyMemberBaseInfoAddFormDTO partyMemberBaseInfoAddFormDTO = this.getPartyMemberBaseInfoAddFormDTO(formDTO, customerPartyBranch); |
|||
Result<String> result = resiPartyMemberOpenFeignClient.addPartyMemberBaseInfo(partyMemberBaseInfoAddFormDTO); |
|||
//3、党支部总人数+1
|
|||
if (result.success() && StringUtils.isNotBlank(result.getData())) { |
|||
//党支部总人数+1
|
|||
customerPartyBranch.setTotalPartyMember(customerPartyBranch.getTotalPartyMember() + 1); |
|||
Result<String> updatePartyBranchResult = govOrgOpenFeignClient.updatePartyBranch(customerPartyBranch); |
|||
if (updatePartyBranchResult.success()) { |
|||
logger.info(String.format("党支部(%s)总人数+1", formDTO.getPartyBranchId())); |
|||
} |
|||
} else { |
|||
logger.error("添加党员异常"); |
|||
throw new RenException(result.getCode()); |
|||
} |
|||
return result.getData(); |
|||
} |
|||
|
|||
@Override |
|||
public String editPartyMember(SaveOrUpdateParyMemberFormDTO formDTO) { |
|||
PartymemberBaseInfoDTO partymemberBaseInfoDTO = new PartymemberBaseInfoDTO(); |
|||
partymemberBaseInfoDTO.setIdCard(formDTO.getIdCard().trim()); |
|||
partymemberBaseInfoDTO.setName(formDTO.getName().trim()); |
|||
partymemberBaseInfoDTO.setMobile(formDTO.getMobile().trim()); |
|||
partymemberBaseInfoDTO.setId(formDTO.getPartyMemberId()); |
|||
Result<String> updateResult = resiPartyMemberOpenFeignClient.update(partymemberBaseInfoDTO); |
|||
if (updateResult.success() && StringUtils.isNotBlank(updateResult.getData())) { |
|||
logger.info("修改党员信息成功"); |
|||
return updateResult.getData(); |
|||
}else{ |
|||
logger.error("修改党员信息失败"); |
|||
throw new RenException(updateResult.getCode()); |
|||
} |
|||
} |
|||
|
|||
@Override |
|||
public PartyMemberInfoDetailResultDTO queryPartyMemberDetail(String partyMemberId) { |
|||
PartyMemberInfoDetailResultDTO partyMemberInfoDetailResultDTO=new PartyMemberInfoDetailResultDTO(); |
|||
Result<PartyMemberBaseInfoDetailResultDTO> partyMemberResult=resiPartyMemberOpenFeignClient.queryPartyMemberBaseInfoById(partyMemberId); |
|||
if(partyMemberResult.success()&&null!=partyMemberResult.getData()){ |
|||
partyMemberInfoDetailResultDTO=ConvertUtils.sourceToTarget(partyMemberResult.getData(),PartyMemberInfoDetailResultDTO.class); |
|||
Result<CustomerPartyBranchDTO> partyBranchDTOResult=govOrgOpenFeignClient.getPartyBranchById(partyMemberResult.getData().getPartyBranchId()); |
|||
if(partyBranchDTOResult.success()){ |
|||
String agencyName=partyBranchDTOResult.getData().getAgencyName(); |
|||
String gridName=partyBranchDTOResult.getData().getGridName(); |
|||
String branchName=partyBranchDTOResult.getData().getPartyBranchName(); |
|||
partyMemberInfoDetailResultDTO.setPartyBranchName(String.format("%s-%s-%s",agencyName,gridName,branchName)); |
|||
return partyMemberInfoDetailResultDTO; |
|||
}else{ |
|||
logger.error("党员详情查询异常"); |
|||
} |
|||
} |
|||
return partyMemberInfoDetailResultDTO ; |
|||
} |
|||
|
|||
@Override |
|||
public void deletePartyMember(DeletePartyMemberFormDTO deletePartyMemberFormDTO) { |
|||
DelPartyMemberBaseInfoFormDTO formDTO = ConvertUtils.sourceToTarget(deletePartyMemberFormDTO, DelPartyMemberBaseInfoFormDTO.class); |
|||
Result result = resiPartyMemberOpenFeignClient.deltePartyMemberBaseInfo(formDTO); |
|||
if (!result.success()) { |
|||
throw new RenException(result.getCode()); |
|||
} |
|||
//党支部总人数-1
|
|||
Result decrResult = govOrgOpenFeignClient.decrPartyBranchMember(deletePartyMemberFormDTO.getPartyBranchId()); |
|||
if (decrResult.success()) { |
|||
logger.info("删除党员成功,党支部总人数已-1"); |
|||
} |
|||
} |
|||
|
|||
private PartyMemberBaseInfoAddFormDTO getPartyMemberBaseInfoAddFormDTO(SaveOrUpdateParyMemberFormDTO formDTO, |
|||
CustomerPartyBranchDTO customerPartyBranchDTO) { |
|||
PartyMemberBaseInfoAddFormDTO partyMemberBaseInfoAddFormDTO=new PartyMemberBaseInfoAddFormDTO(); |
|||
partyMemberBaseInfoAddFormDTO.setBranchId(formDTO.getPartyBranchId()); |
|||
partyMemberBaseInfoAddFormDTO.setIdCard(formDTO.getIdCard().trim()); |
|||
partyMemberBaseInfoAddFormDTO.setMobile(formDTO.getMobile().trim()); |
|||
partyMemberBaseInfoAddFormDTO.setName(formDTO.getName().trim()); |
|||
|
|||
partyMemberBaseInfoAddFormDTO.setBranch(customerPartyBranchDTO.getPartyBranchName()); |
|||
partyMemberBaseInfoAddFormDTO.setOrganization(customerPartyBranchDTO.getAgencyName()); |
|||
partyMemberBaseInfoAddFormDTO.setCustomerId(customerPartyBranchDTO.getCustomerId()); |
|||
return partyMemberBaseInfoAddFormDTO; |
|||
} |
|||
} |
|||
@ -0,0 +1,111 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.dto; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
|
|||
|
|||
/** |
|||
* 党支部信息 |
|||
* |
|||
* @author yinzuomei yinzuomei@elink-cn.com |
|||
* @since v1.0.0 2020-06-17 |
|||
*/ |
|||
@Data |
|||
public class CustomerPartyBranchDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 主键 |
|||
*/ |
|||
private String id; |
|||
|
|||
/** |
|||
* 支部名称 |
|||
*/ |
|||
private String partyBranchName; |
|||
|
|||
/** |
|||
* 概要 |
|||
*/ |
|||
private String profile; |
|||
|
|||
/** |
|||
* 党支部所属网格id |
|||
*/ |
|||
private String gridId; |
|||
|
|||
/** |
|||
* 客户id |
|||
*/ |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 党员总数 |
|||
*/ |
|||
private Integer totalPartyMember; |
|||
|
|||
/** |
|||
* 删除标识 |
|||
*/ |
|||
private String delFlag; |
|||
|
|||
/** |
|||
* 乐观锁 |
|||
*/ |
|||
private Integer revision; |
|||
|
|||
/** |
|||
* 创建人 |
|||
*/ |
|||
private String createdBy; |
|||
|
|||
/** |
|||
* 创建时间 |
|||
*/ |
|||
private Date createdTime; |
|||
|
|||
/** |
|||
* 更新人 |
|||
*/ |
|||
private String updatedBy; |
|||
|
|||
/** |
|||
* 更新时间 |
|||
*/ |
|||
private Date updatedTime; |
|||
|
|||
/** |
|||
* 网格名称 |
|||
*/ |
|||
private String gridName; |
|||
|
|||
/** |
|||
* 网格所属机关id |
|||
*/ |
|||
private String agencyId; |
|||
|
|||
/** |
|||
* 网格所属机关名字 |
|||
*/ |
|||
private String agencyName; |
|||
} |
|||
@ -0,0 +1,29 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 党支部列表查询 |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2020/6/17 16:27 |
|||
*/ |
|||
@Data |
|||
public class ListPartyBranchFormDTO implements Serializable { |
|||
private static final long serialVersionUID = -5693132528876149747L; |
|||
|
|||
/** |
|||
* 客户id |
|||
*/ |
|||
@NotBlank(message = "客户id不能为空") |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 网格id |
|||
*/ |
|||
@NotBlank(message = "网格id不能为空") |
|||
private String gridId; |
|||
} |
|||
@ -0,0 +1,29 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 党支部列表查询返参 |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2020/6/17 16:30 |
|||
*/ |
|||
@Data |
|||
public class ListPartyBranchResultDTO implements Serializable { |
|||
private static final long serialVersionUID = 2306892144298853581L; |
|||
/** |
|||
* 支部id |
|||
*/ |
|||
private String partyBranchId; |
|||
/** |
|||
* 支部名称 |
|||
*/ |
|||
private String partyBranchName; |
|||
|
|||
/** |
|||
* 党员总数 |
|||
*/ |
|||
private Integer totalPartyMember; |
|||
} |
|||
@ -0,0 +1,132 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.controller; |
|||
|
|||
import com.epmet.commons.tools.exception.EpmetErrorCode; |
|||
import com.epmet.commons.tools.exception.RenException; |
|||
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.dto.CustomerPartyBranchDTO; |
|||
import com.epmet.dto.form.ListPartyBranchFormDTO; |
|||
import com.epmet.dto.result.ListPartyBranchResultDTO; |
|||
import com.epmet.excel.CustomerPartyBranchExcel; |
|||
import com.epmet.service.CustomerPartyBranchService; |
|||
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 yinzuomei yinzuomei@elink-cn.com |
|||
* @since v1.0.0 2020-06-17 |
|||
*/ |
|||
@RestController |
|||
@RequestMapping("customerpartybranch") |
|||
public class CustomerPartyBranchController { |
|||
|
|||
@Autowired |
|||
private CustomerPartyBranchService customerPartyBranchService; |
|||
|
|||
@GetMapping("page") |
|||
public Result<PageData<CustomerPartyBranchDTO>> page(@RequestParam Map<String, Object> params){ |
|||
PageData<CustomerPartyBranchDTO> page = customerPartyBranchService.page(params); |
|||
return new Result<PageData<CustomerPartyBranchDTO>>().ok(page); |
|||
} |
|||
|
|||
@GetMapping("get/{id}") |
|||
public Result<CustomerPartyBranchDTO> get(@PathVariable("id") String id){ |
|||
CustomerPartyBranchDTO data = customerPartyBranchService.get(id); |
|||
return new Result<CustomerPartyBranchDTO>().ok(data); |
|||
} |
|||
|
|||
@PostMapping("save") |
|||
public Result<String> save(@RequestBody CustomerPartyBranchDTO dto){ |
|||
//效验数据
|
|||
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); |
|||
return new Result<String>().ok(customerPartyBranchService.save(dto)); |
|||
} |
|||
|
|||
@PutMapping("update") |
|||
public Result update(@RequestBody CustomerPartyBranchDTO dto){ |
|||
//效验数据
|
|||
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); |
|||
customerPartyBranchService.update(dto); |
|||
return new Result(); |
|||
} |
|||
|
|||
@DeleteMapping |
|||
public Result delete(@RequestBody String[] ids){ |
|||
//效验数据
|
|||
AssertUtils.isArrayEmpty(ids, "id"); |
|||
customerPartyBranchService.delete(ids); |
|||
return new Result(); |
|||
} |
|||
|
|||
@GetMapping("delete/{id}") |
|||
public Result deleteById(@PathVariable("id") String id){ |
|||
CustomerPartyBranchDTO data = customerPartyBranchService.get(id); |
|||
if(null!=data&&data.getTotalPartyMember()>0){ |
|||
throw new RenException(EpmetErrorCode.CANNOT_DELETE_PARTY_BRANCH.getCode()); |
|||
} |
|||
customerPartyBranchService.deleteById(id); |
|||
return new Result(); |
|||
} |
|||
|
|||
@GetMapping("export") |
|||
public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception { |
|||
List<CustomerPartyBranchDTO> list = customerPartyBranchService.list(params); |
|||
ExcelUtils.exportExcelToTarget(response, null, list, CustomerPartyBranchExcel.class); |
|||
} |
|||
|
|||
/** |
|||
* @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.form.ListPartyBranchFormDTO>> |
|||
* @param formDTO |
|||
* @author yinzuomei |
|||
* @description 党支部列表查询,供gov-grid服务调用 |
|||
* @Date 2020/6/17 16:33 |
|||
**/ |
|||
@PostMapping("listpartybranch") |
|||
public Result<List<ListPartyBranchResultDTO>> listpartybranch(@RequestBody ListPartyBranchFormDTO formDTO){ |
|||
ValidatorUtils.validateEntity(formDTO); |
|||
return new Result<List<ListPartyBranchResultDTO>>().ok(customerPartyBranchService.listpartybranch(formDTO)); |
|||
} |
|||
|
|||
/** |
|||
* @return com.epmet.commons.tools.utils.Result |
|||
* @param partyBranchId |
|||
* @author yinzuomei |
|||
* @description 党支部人数-1 |
|||
* @Date 2020/6/18 18:31 |
|||
**/ |
|||
@GetMapping("decrPartyBranchMember/{partyBranchId}") |
|||
public Result decrPartyBranchMember(@PathVariable("partyBranchId") String partyBranchId){ |
|||
customerPartyBranchService.decrPartyBranchMember(partyBranchId); |
|||
return new Result(); |
|||
} |
|||
} |
|||
@ -0,0 +1,41 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.dao; |
|||
|
|||
import com.epmet.commons.mybatis.dao.BaseDao; |
|||
import com.epmet.dto.form.ListPartyBranchFormDTO; |
|||
import com.epmet.dto.result.ListPartyBranchResultDTO; |
|||
import com.epmet.entity.CustomerPartyBranchEntity; |
|||
import org.apache.ibatis.annotations.Mapper; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 党支部信息 |
|||
* |
|||
* @author yinzuomei yinzuomei@elink-cn.com |
|||
* @since v1.0.0 2020-06-17 |
|||
*/ |
|||
@Mapper |
|||
public interface CustomerPartyBranchDao extends BaseDao<CustomerPartyBranchEntity> { |
|||
//根据客户id、网格id查询党支部列表
|
|||
List<ListPartyBranchResultDTO> selectListPartyBranchResultDTO(ListPartyBranchFormDTO formDTO); |
|||
|
|||
//党支部人数-1
|
|||
int decrPartyBranchMember(String partyBranchId); |
|||
} |
|||
@ -0,0 +1,66 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.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 yinzuomei yinzuomei@elink-cn.com |
|||
* @since v1.0.0 2020-06-17 |
|||
*/ |
|||
@Data |
|||
@EqualsAndHashCode(callSuper=false) |
|||
@TableName("customer_party_branch") |
|||
public class CustomerPartyBranchEntity extends BaseEpmetEntity { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 支部名称 |
|||
*/ |
|||
private String partyBranchName; |
|||
|
|||
/** |
|||
* 概要 |
|||
*/ |
|||
private String profile; |
|||
|
|||
/** |
|||
* 党支部所属网格id |
|||
*/ |
|||
private String gridId; |
|||
|
|||
/** |
|||
* 客户id |
|||
*/ |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 党员总数 |
|||
*/ |
|||
private Integer totalPartyMember; |
|||
|
|||
} |
|||
@ -0,0 +1,71 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.excel; |
|||
|
|||
import cn.afterturn.easypoi.excel.annotation.Excel; |
|||
import lombok.Data; |
|||
|
|||
import java.util.Date; |
|||
|
|||
/** |
|||
* 党支部信息 |
|||
* |
|||
* @author yinzuomei yinzuomei@elink-cn.com |
|||
* @since v1.0.0 2020-06-17 |
|||
*/ |
|||
@Data |
|||
public class CustomerPartyBranchExcel { |
|||
|
|||
@Excel(name = "主键") |
|||
private String id; |
|||
|
|||
@Excel(name = "支部名称") |
|||
private String partyBranchName; |
|||
|
|||
@Excel(name = "概要") |
|||
private String profile; |
|||
|
|||
@Excel(name = "党支部所属网格id") |
|||
private String gridId; |
|||
|
|||
@Excel(name = "客户id") |
|||
private String customerId; |
|||
|
|||
@Excel(name = "党员总数") |
|||
private Integer totalPartymember; |
|||
|
|||
@Excel(name = "删除标识") |
|||
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; |
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,47 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.redis; |
|||
|
|||
import com.epmet.commons.tools.redis.RedisUtils; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.stereotype.Component; |
|||
|
|||
/** |
|||
* 党支部信息 |
|||
* |
|||
* @author yinzuomei yinzuomei@elink-cn.com |
|||
* @since v1.0.0 2020-06-17 |
|||
*/ |
|||
@Component |
|||
public class CustomerPartyBranchRedis { |
|||
@Autowired |
|||
private RedisUtils redisUtils; |
|||
|
|||
public void delete(Object[] ids) { |
|||
|
|||
} |
|||
|
|||
public void set(){ |
|||
|
|||
} |
|||
|
|||
public String get(String id){ |
|||
return null; |
|||
} |
|||
|
|||
} |
|||
@ -0,0 +1,115 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.service; |
|||
|
|||
import com.epmet.commons.mybatis.service.BaseService; |
|||
import com.epmet.commons.tools.page.PageData; |
|||
import com.epmet.dto.CustomerPartyBranchDTO; |
|||
import com.epmet.dto.form.ListPartyBranchFormDTO; |
|||
import com.epmet.dto.result.ListPartyBranchResultDTO; |
|||
import com.epmet.entity.CustomerPartyBranchEntity; |
|||
|
|||
import java.util.List; |
|||
import java.util.Map; |
|||
|
|||
/** |
|||
* 党支部信息 |
|||
* |
|||
* @author yinzuomei yinzuomei@elink-cn.com |
|||
* @since v1.0.0 2020-06-17 |
|||
*/ |
|||
public interface CustomerPartyBranchService extends BaseService<CustomerPartyBranchEntity> { |
|||
|
|||
/** |
|||
* 默认分页 |
|||
* |
|||
* @param params |
|||
* @return PageData<CustomerPartyBranchDTO> |
|||
* @author generator |
|||
* @date 2020-06-17 |
|||
*/ |
|||
PageData<CustomerPartyBranchDTO> page(Map<String, Object> params); |
|||
|
|||
/** |
|||
* 默认查询 |
|||
* |
|||
* @param params |
|||
* @return java.util.List<CustomerPartyBranchDTO> |
|||
* @author generator |
|||
* @date 2020-06-17 |
|||
*/ |
|||
List<CustomerPartyBranchDTO> list(Map<String, Object> params); |
|||
|
|||
/** |
|||
* 单条查询 |
|||
* |
|||
* @param id |
|||
* @return CustomerPartyBranchDTO |
|||
* @author generator |
|||
* @date 2020-06-17 |
|||
*/ |
|||
CustomerPartyBranchDTO get(String id); |
|||
|
|||
/** |
|||
* 默认保存 |
|||
* |
|||
* @param dto |
|||
* @return void |
|||
* @author generator |
|||
* @date 2020-06-17 |
|||
*/ |
|||
String save(CustomerPartyBranchDTO dto); |
|||
|
|||
/** |
|||
* 默认更新 |
|||
* |
|||
* @param dto |
|||
* @return void |
|||
* @author generator |
|||
* @date 2020-06-17 |
|||
*/ |
|||
void update(CustomerPartyBranchDTO dto); |
|||
|
|||
/** |
|||
* 批量删除 |
|||
* |
|||
* @param ids |
|||
* @return void |
|||
* @author generator |
|||
* @date 2020-06-17 |
|||
*/ |
|||
void delete(String[] ids); |
|||
|
|||
/** |
|||
* @return java.util.List<com.epmet.dto.form.ListPartyBranchFormDTO> |
|||
* @param formDTO |
|||
* @author yinzuomei |
|||
* @description 党支部列表查询,供gov-grid服务调用 |
|||
* @Date 2020/6/17 16:33 |
|||
**/ |
|||
List<ListPartyBranchResultDTO> listpartybranch(ListPartyBranchFormDTO formDTO); |
|||
|
|||
/** |
|||
* @return void |
|||
* @param partyBranchId |
|||
* @author yinzuomei |
|||
* @description 党支部人数-1 |
|||
* @Date 2020/6/18 18:31 |
|||
**/ |
|||
void decrPartyBranchMember(String partyBranchId); |
|||
} |
|||
@ -0,0 +1,137 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.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.dao.CustomerPartyBranchDao; |
|||
import com.epmet.dto.CustomerAgencyDTO; |
|||
import com.epmet.dto.CustomerGridDTO; |
|||
import com.epmet.dto.CustomerPartyBranchDTO; |
|||
import com.epmet.dto.form.ListPartyBranchFormDTO; |
|||
import com.epmet.dto.result.ListPartyBranchResultDTO; |
|||
import com.epmet.entity.CustomerPartyBranchEntity; |
|||
import com.epmet.redis.CustomerPartyBranchRedis; |
|||
import com.epmet.service.CustomerAgencyService; |
|||
import com.epmet.service.CustomerGridService; |
|||
import com.epmet.service.CustomerPartyBranchService; |
|||
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 yinzuomei yinzuomei@elink-cn.com |
|||
* @since v1.0.0 2020-06-17 |
|||
*/ |
|||
@Service |
|||
public class CustomerPartyBranchServiceImpl extends BaseServiceImpl<CustomerPartyBranchDao, CustomerPartyBranchEntity> implements CustomerPartyBranchService { |
|||
|
|||
@Autowired |
|||
private CustomerPartyBranchRedis customerPartyBranchRedis; |
|||
@Autowired |
|||
private CustomerGridService customerGridService; |
|||
@Autowired |
|||
private CustomerAgencyService customerAgencyService; |
|||
|
|||
@Override |
|||
public PageData<CustomerPartyBranchDTO> page(Map<String, Object> params) { |
|||
IPage<CustomerPartyBranchEntity> page = baseDao.selectPage( |
|||
getPage(params, FieldConstant.CREATED_TIME, false), |
|||
getWrapper(params) |
|||
); |
|||
return getPageData(page, CustomerPartyBranchDTO.class); |
|||
} |
|||
|
|||
@Override |
|||
public List<CustomerPartyBranchDTO> list(Map<String, Object> params) { |
|||
List<CustomerPartyBranchEntity> entityList = baseDao.selectList(getWrapper(params)); |
|||
|
|||
return ConvertUtils.sourceToTarget(entityList, CustomerPartyBranchDTO.class); |
|||
} |
|||
|
|||
private QueryWrapper<CustomerPartyBranchEntity> getWrapper(Map<String, Object> params){ |
|||
String id = (String)params.get(FieldConstant.ID_HUMP); |
|||
|
|||
QueryWrapper<CustomerPartyBranchEntity> wrapper = new QueryWrapper<>(); |
|||
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); |
|||
|
|||
return wrapper; |
|||
} |
|||
|
|||
@Override |
|||
public CustomerPartyBranchDTO get(String id) { |
|||
CustomerPartyBranchEntity entity = baseDao.selectById(id); |
|||
CustomerPartyBranchDTO customerPartyBranchDTO=ConvertUtils.sourceToTarget(entity, CustomerPartyBranchDTO.class); |
|||
if(null!=customerPartyBranchDTO){ |
|||
CustomerGridDTO customerGridDTO=customerGridService.get(entity.getGridId()); |
|||
if(null!=customerGridDTO){ |
|||
customerPartyBranchDTO.setGridName(customerGridDTO.getGridName()); |
|||
CustomerAgencyDTO customerAgencyDTO=customerAgencyService.get(customerGridDTO.getPid()); |
|||
if(null!=customerAgencyDTO){ |
|||
customerPartyBranchDTO.setAgencyId(customerAgencyDTO.getId()); |
|||
customerPartyBranchDTO.setAgencyName(customerAgencyDTO.getOrganizationName()); |
|||
} |
|||
} |
|||
} |
|||
return customerPartyBranchDTO; |
|||
} |
|||
|
|||
@Override |
|||
@Transactional(rollbackFor = Exception.class) |
|||
public String save(CustomerPartyBranchDTO dto) { |
|||
CustomerPartyBranchEntity entity = ConvertUtils.sourceToTarget(dto, CustomerPartyBranchEntity.class); |
|||
insert(entity); |
|||
return entity.getId(); |
|||
} |
|||
|
|||
@Override |
|||
@Transactional(rollbackFor = Exception.class) |
|||
public void update(CustomerPartyBranchDTO dto) { |
|||
CustomerPartyBranchEntity entity = ConvertUtils.sourceToTarget(dto, CustomerPartyBranchEntity.class); |
|||
updateById(entity); |
|||
} |
|||
|
|||
@Override |
|||
@Transactional(rollbackFor = Exception.class) |
|||
public void delete(String[] ids) { |
|||
// 逻辑删除（@TableLogic 注解）
|
|||
baseDao.deleteBatchIds(Arrays.asList(ids)); |
|||
} |
|||
|
|||
@Override |
|||
public List<ListPartyBranchResultDTO> listpartybranch(ListPartyBranchFormDTO formDTO) { |
|||
return baseDao.selectListPartyBranchResultDTO(formDTO); |
|||
} |
|||
|
|||
@Override |
|||
public void decrPartyBranchMember(String partyBranchId) { |
|||
baseDao.decrPartyBranchMember(partyBranchId); |
|||
} |
|||
|
|||
} |
|||
@ -0,0 +1,45 @@ |
|||
<?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.dao.CustomerPartyBranchDao"> |
|||
|
|||
<resultMap type="com.epmet.entity.CustomerPartyBranchEntity" id="customerPartyBranchMap"> |
|||
<result property="id" column="ID"/> |
|||
<result property="partyBranchName" column="PARTY_BRANCH_NAME"/> |
|||
<result property="profile" column="PROFILE"/> |
|||
<result property="gridId" column="GRID_ID"/> |
|||
<result property="customerId" column="CUSTOMER_ID"/> |
|||
<result property="totalPartyMember" column="TOTAL_PARTY_MEMBER"/> |
|||
<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"/> |
|||
</resultMap> |
|||
|
|||
<!-- 根据客户id、网格id查询党支部列表 --> |
|||
<select id="selectListPartyBranchResultDTO" parameterType="com.epmet.dto.form.ListPartyBranchFormDTO" |
|||
resultType="com.epmet.dto.result.ListPartyBranchResultDTO"> |
|||
SELECT |
|||
id as partyBranchId, |
|||
PARTY_BRANCH_NAME as partyBranchName, |
|||
TOTAL_PARTY_MEMBER AS totalPartyMember |
|||
FROM |
|||
customer_party_branch |
|||
WHERE |
|||
DEL_FLAG = '0' |
|||
AND CUSTOMER_ID =#{customerId} |
|||
AND GRID_ID = #{gridId} |
|||
ORDER BY |
|||
CREATED_TIME DESC |
|||
</select> |
|||
<!-- 党支部人数-1 --> |
|||
<update id="decrPartyBranchMember" parameterType="java.lang.String"> |
|||
UPDATE customer_party_branch |
|||
SET TOTAL_PARTY_MEMBER = TOTAL_PARTY_MEMBER - 1 |
|||
WHERE |
|||
id = #{partyBranchId} |
|||
AND DEL_FLAG = '0' |
|||
</update> |
|||
</mapper> |
|||
@ -0,0 +1,81 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.resi.partymember.dto.partymember; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
import lombok.Data; |
|||
|
|||
|
|||
/** |
|||
* 党支部党员关系表 |
|||
* |
|||
* @author yinzuomei yinzuomei@elink-cn.com |
|||
* @since v1.0.0 2020-06-17 |
|||
*/ |
|||
@Data |
|||
public class PartyBranchMembersDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 主键 |
|||
*/ |
|||
private String id; |
|||
|
|||
/** |
|||
* 党支部id，customer_party_branch.id |
|||
*/ |
|||
private String branchId; |
|||
|
|||
/** |
|||
* 党员库表主键,partymember_base_info.id |
|||
*/ |
|||
private String partymemberBaseInfoId; |
|||
|
|||
/** |
|||
* 删除标识 |
|||
*/ |
|||
private String delFlag; |
|||
|
|||
/** |
|||
* 乐观锁 |
|||
*/ |
|||
private Integer revision; |
|||
|
|||
/** |
|||
* 创建人 |
|||
*/ |
|||
private String createdBy; |
|||
|
|||
/** |
|||
* 创建时间 |
|||
*/ |
|||
private Date createdTime; |
|||
|
|||
/** |
|||
* 更新人 |
|||
*/ |
|||
private String updatedBy; |
|||
|
|||
/** |
|||
* 更新时间 |
|||
*/ |
|||
private Date updatedTime; |
|||
|
|||
} |
|||
@ -0,0 +1,101 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.resi.partymember.dto.partymember; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
import lombok.Data; |
|||
|
|||
|
|||
/** |
|||
* 党员认证记录表 |
|||
* |
|||
* @author yinzuomei yinzuomei@elink-cn.com |
|||
* @since v1.0.0 2020-06-17 |
|||
*/ |
|||
@Data |
|||
public class PartymemberAuthRecordDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 主键 |
|||
*/ |
|||
private String id; |
|||
|
|||
/** |
|||
* partymember_base_info.id |
|||
*/ |
|||
private String partymemberBaseInfoId; |
|||
|
|||
/** |
|||
* 认证居民id |
|||
*/ |
|||
private String userId; |
|||
|
|||
/** |
|||
* 认证时间(和partymember_info表时间一致) |
|||
*/ |
|||
private Date authTime; |
|||
|
|||
/** |
|||
* 认证网格id |
|||
*/ |
|||
private String gridId; |
|||
|
|||
/** |
|||
* 认证客户id |
|||
*/ |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 认证的描述：账户于2020年10月30号在海泊桥社区-第一网格激活 |
|||
*/ |
|||
private String authDesc; |
|||
|
|||
/** |
|||
* 删除标识 |
|||
*/ |
|||
private String delFlag; |
|||
|
|||
/** |
|||
* 乐观锁 |
|||
*/ |
|||
private Integer revision; |
|||
|
|||
/** |
|||
* 创建人 |
|||
*/ |
|||
private String createdBy; |
|||
|
|||
/** |
|||
* 创建时间 |
|||
*/ |
|||
private Date createdTime; |
|||
|
|||
/** |
|||
* 更新人 |
|||
*/ |
|||
private String updatedBy; |
|||
|
|||
/** |
|||
* 更新时间 |
|||
*/ |
|||
private Date updatedTime; |
|||
|
|||
} |
|||
@ -0,0 +1,31 @@ |
|||
package com.epmet.resi.partymember.dto.partymember.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 删除党员入参DTO |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2020/6/18 18:09 |
|||
*/ |
|||
@Data |
|||
public class DelPartyMemberBaseInfoFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 2735219691600150687L; |
|||
public interface AddUserInternalGroup {} |
|||
|
|||
/** |
|||
* 党员id |
|||
*/ |
|||
@NotBlank(message = "党员id不能为空",groups = {DelPartyMemberBaseInfoFormDTO.AddUserInternalGroup.class}) |
|||
private String partyMemberId; |
|||
|
|||
/** |
|||
* 党支部id |
|||
*/ |
|||
@NotBlank(message = "党支部id不能为空",groups = {DelPartyMemberBaseInfoFormDTO.AddUserInternalGroup.class}) |
|||
private String partyBranchId; |
|||
} |
|||
@ -0,0 +1,64 @@ |
|||
package com.epmet.resi.partymember.dto.partymember.form; |
|||
|
|||
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 添加党员入参DTO |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2020/6/17 22:42 |
|||
*/ |
|||
@Data |
|||
public class PartyMemberBaseInfoAddFormDTO implements Serializable { |
|||
public interface AddUserInternalGroup { |
|||
} |
|||
|
|||
public interface AddUserShowGroup extends CustomerClientShowGroup { |
|||
} |
|||
|
|||
/** |
|||
* 客户Id (customer.id) |
|||
*/ |
|||
@NotBlank(message = "客户id不能为空", groups = {AddUserInternalGroup.class}) |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 党支部id |
|||
*/ |
|||
@NotBlank(message = "党支部id不能为空", groups = {AddUserInternalGroup.class}) |
|||
private String branchId; |
|||
|
|||
/** |
|||
* 姓名 |
|||
*/ |
|||
@NotBlank(message = "姓名不能为空", groups = {AddUserShowGroup.class}) |
|||
private String name; |
|||
|
|||
/** |
|||
* 身份证号 |
|||
*/ |
|||
@NotBlank(message = "身份证号不能为空", groups = {AddUserShowGroup.class}) |
|||
private String idCard; |
|||
|
|||
/** |
|||
* 手机号 |
|||
*/ |
|||
@NotBlank(message = "手机号不能为空", groups = {AddUserShowGroup.class}) |
|||
private String mobile; |
|||
|
|||
/** |
|||
* 所在党组织（网格直属机关的名字） |
|||
*/ |
|||
@NotBlank(message = "党组织不能为空", groups = {AddUserShowGroup.class}) |
|||
private String organization; |
|||
|
|||
/** |
|||
* 所在党支部 |
|||
*/ |
|||
@NotBlank(message = "党支部名称不能为空", groups = {AddUserShowGroup.class}) |
|||
private String branch; |
|||
} |
|||
@ -0,0 +1,56 @@ |
|||
package com.epmet.resi.partymember.dto.partymember.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 党员详情返参DTO |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2020/6/18 15:31 |
|||
*/ |
|||
@Data |
|||
public class PartyMemberBaseInfoDetailResultDTO implements Serializable { |
|||
private static final long serialVersionUID = -1416472090639851835L; |
|||
|
|||
/** |
|||
* 党员id |
|||
*/ |
|||
private String partyMemberId; |
|||
|
|||
/** |
|||
* 姓名 |
|||
*/ |
|||
private String name; |
|||
|
|||
/** |
|||
* 身份证号 |
|||
*/ |
|||
private String idCard; |
|||
|
|||
/** |
|||
* 手机号 |
|||
*/ |
|||
private String mobile; |
|||
|
|||
/** |
|||
* 1男2女0未知 |
|||
*/ |
|||
private String gender; |
|||
|
|||
/** |
|||
* true已激活，false未激活 |
|||
*/ |
|||
private Boolean status; |
|||
|
|||
/** |
|||
* 返回：账号于2019年10月31日在海泊桥社区-第一网格激活 |
|||
*/ |
|||
private String activeDesc; |
|||
|
|||
/** |
|||
* 党支部id |
|||
*/ |
|||
private String partyBranchId; |
|||
} |
|||
@ -0,0 +1,31 @@ |
|||
package com.epmet.resi.partymember.dto.partymember.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 党员列表 |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2020/6/18 10:15 |
|||
*/ |
|||
@Data |
|||
public class PartymemberBaseInfoResultDTO implements Serializable { |
|||
private static final long serialVersionUID = 8406798885012269801L; |
|||
|
|||
/** |
|||
* 党员id |
|||
*/ |
|||
private String partyMemberId; |
|||
|
|||
/** |
|||
* 党员姓名 |
|||
*/ |
|||
private String name; |
|||
|
|||
/** |
|||
* 性别 |
|||
*/ |
|||
private String gender; |
|||
} |
|||
@ -0,0 +1,94 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.modules.partymember.controller; |
|||
|
|||
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.modules.partymember.excel.PartyBranchMembersExcel; |
|||
import com.epmet.modules.partymember.service.PartyBranchMembersService; |
|||
import com.epmet.resi.partymember.dto.partymember.PartyBranchMembersDTO; |
|||
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 yinzuomei yinzuomei@elink-cn.com |
|||
* @since v1.0.0 2020-06-17 |
|||
*/ |
|||
@RestController |
|||
@RequestMapping("partybranchmembers") |
|||
public class PartyBranchMembersController { |
|||
|
|||
@Autowired |
|||
private PartyBranchMembersService partyBranchMembersService; |
|||
|
|||
@GetMapping("page") |
|||
public Result<PageData<PartyBranchMembersDTO>> page(@RequestParam Map<String, Object> params){ |
|||
PageData<PartyBranchMembersDTO> page = partyBranchMembersService.page(params); |
|||
return new Result<PageData<PartyBranchMembersDTO>>().ok(page); |
|||
} |
|||
|
|||
@GetMapping("{id}") |
|||
public Result<PartyBranchMembersDTO> get(@PathVariable("id") String id){ |
|||
PartyBranchMembersDTO data = partyBranchMembersService.get(id); |
|||
return new Result<PartyBranchMembersDTO>().ok(data); |
|||
} |
|||
|
|||
@PostMapping |
|||
public Result save(@RequestBody PartyBranchMembersDTO dto){ |
|||
//效验数据
|
|||
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); |
|||
partyBranchMembersService.save(dto); |
|||
return new Result(); |
|||
} |
|||
|
|||
@PutMapping |
|||
public Result update(@RequestBody PartyBranchMembersDTO dto){ |
|||
//效验数据
|
|||
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); |
|||
partyBranchMembersService.update(dto); |
|||
return new Result(); |
|||
} |
|||
|
|||
@DeleteMapping |
|||
public Result delete(@RequestBody String[] ids){ |
|||
//效验数据
|
|||
AssertUtils.isArrayEmpty(ids, "id"); |
|||
partyBranchMembersService.delete(ids); |
|||
return new Result(); |
|||
} |
|||
|
|||
@GetMapping("export") |
|||
public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception { |
|||
List<PartyBranchMembersDTO> list = partyBranchMembersService.list(params); |
|||
ExcelUtils.exportExcelToTarget(response, null, list, PartyBranchMembersExcel.class); |
|||
} |
|||
|
|||
} |
|||
@ -0,0 +1,94 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.modules.partymember.controller; |
|||
|
|||
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.modules.partymember.excel.PartymemberAuthRecordExcel; |
|||
import com.epmet.modules.partymember.service.PartymemberAuthRecordService; |
|||
import com.epmet.resi.partymember.dto.partymember.PartymemberAuthRecordDTO; |
|||
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 yinzuomei yinzuomei@elink-cn.com |
|||
* @since v1.0.0 2020-06-17 |
|||
*/ |
|||
@RestController |
|||
@RequestMapping("partymemberauthrecord") |
|||
public class PartymemberAuthRecordController { |
|||
|
|||
@Autowired |
|||
private PartymemberAuthRecordService partymemberAuthRecordService; |
|||
|
|||
@GetMapping("page") |
|||
public Result<PageData<PartymemberAuthRecordDTO>> page(@RequestParam Map<String, Object> params){ |
|||
PageData<PartymemberAuthRecordDTO> page = partymemberAuthRecordService.page(params); |
|||
return new Result<PageData<PartymemberAuthRecordDTO>>().ok(page); |
|||
} |
|||
|
|||
@GetMapping("{id}") |
|||
public Result<PartymemberAuthRecordDTO> get(@PathVariable("id") String id){ |
|||
PartymemberAuthRecordDTO data = partymemberAuthRecordService.get(id); |
|||
return new Result<PartymemberAuthRecordDTO>().ok(data); |
|||
} |
|||
|
|||
@PostMapping |
|||
public Result save(@RequestBody PartymemberAuthRecordDTO dto){ |
|||
//效验数据
|
|||
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); |
|||
partymemberAuthRecordService.save(dto); |
|||
return new Result(); |
|||
} |
|||
|
|||
@PutMapping |
|||
public Result update(@RequestBody PartymemberAuthRecordDTO dto){ |
|||
//效验数据
|
|||
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); |
|||
partymemberAuthRecordService.update(dto); |
|||
return new Result(); |
|||
} |
|||
|
|||
@DeleteMapping |
|||
public Result delete(@RequestBody String[] ids){ |
|||
//效验数据
|
|||
AssertUtils.isArrayEmpty(ids, "id"); |
|||
partymemberAuthRecordService.delete(ids); |
|||
return new Result(); |
|||
} |
|||
|
|||
@GetMapping("export") |
|||
public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception { |
|||
List<PartymemberAuthRecordDTO> list = partymemberAuthRecordService.list(params); |
|||
ExcelUtils.exportExcelToTarget(response, null, list, PartymemberAuthRecordExcel.class); |
|||
} |
|||
|
|||
} |
|||
@ -0,0 +1,36 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.modules.partymember.dao; |
|||
|
|||
import com.epmet.commons.mybatis.dao.BaseDao; |
|||
import com.epmet.modules.partymember.entity.PartyBranchMembersEntity; |
|||
import org.apache.ibatis.annotations.Mapper; |
|||
import org.apache.ibatis.annotations.Param; |
|||
|
|||
/** |
|||
* 党支部党员关系表 |
|||
* |
|||
* @author yinzuomei yinzuomei@elink-cn.com |
|||
* @since v1.0.0 2020-06-17 |
|||
*/ |
|||
@Mapper |
|||
public interface PartyBranchMembersDao extends BaseDao<PartyBranchMembersEntity> { |
|||
int deletePartyBranchMember(@Param("partyBranchId") String partyBranchId, |
|||
@Param("partyMemberId") String partyMemberId, |
|||
@Param("userId") String userId); |
|||
} |
|||
@ -0,0 +1,41 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.modules.partymember.dao; |
|||
|
|||
import com.epmet.commons.mybatis.dao.BaseDao; |
|||
import com.epmet.modules.partymember.entity.PartymemberAuthRecordEntity; |
|||
import org.apache.ibatis.annotations.Mapper; |
|||
|
|||
/** |
|||
* 党员认证记录表 |
|||
* |
|||
* @author yinzuomei yinzuomei@elink-cn.com |
|||
* @since v1.0.0 2020-06-17 |
|||
*/ |
|||
@Mapper |
|||
public interface PartymemberAuthRecordDao extends BaseDao<PartymemberAuthRecordEntity> { |
|||
|
|||
/** |
|||
* @return com.epmet.modules.partymember.entity.PartymemberAuthRecordEntity |
|||
* @param partymemberBaseInfoId |
|||
* @author yinzuomei |
|||
* @description 根据党员库id,查询党员认证信息 |
|||
* @Date 2020/6/18 0:04 |
|||
**/ |
|||
PartymemberAuthRecordEntity selectByPartyMemberBaseInfoId(String partymemberBaseInfoId); |
|||
} |
|||
@ -0,0 +1,51 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.modules.partymember.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 yinzuomei yinzuomei@elink-cn.com |
|||
* @since v1.0.0 2020-06-17 |
|||
*/ |
|||
@Data |
|||
@EqualsAndHashCode(callSuper=false) |
|||
@TableName("party_branch_members") |
|||
public class PartyBranchMembersEntity extends BaseEpmetEntity { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 党支部id，customer_party_branch.id |
|||
*/ |
|||
private String branchId; |
|||
|
|||
/** |
|||
* 党员库表主键,partymember_base_info.id |
|||
*/ |
|||
private String partymemberBaseInfoId; |
|||
|
|||
} |
|||
@ -0,0 +1,71 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.modules.partymember.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 yinzuomei yinzuomei@elink-cn.com |
|||
* @since v1.0.0 2020-06-17 |
|||
*/ |
|||
@Data |
|||
@EqualsAndHashCode(callSuper=false) |
|||
@TableName("partymember_auth_record") |
|||
public class PartymemberAuthRecordEntity extends BaseEpmetEntity { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* partymember_base_info.id |
|||
*/ |
|||
private String partymemberBaseInfoId; |
|||
|
|||
/** |
|||
* 认证居民id |
|||
*/ |
|||
private String userId; |
|||
|
|||
/** |
|||
* 认证时间(和partymember_info表时间一致) |
|||
*/ |
|||
private Date authTime; |
|||
|
|||
/** |
|||
* 认证网格id |
|||
*/ |
|||
private String gridId; |
|||
|
|||
/** |
|||
* 认证客户id |
|||
*/ |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 认证的描述：账户于2020年10月30号在海泊桥社区-第一网格激活 |
|||
*/ |
|||
private String authDesc; |
|||
|
|||
} |
|||
@ -0,0 +1,62 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.modules.partymember.excel; |
|||
|
|||
import cn.afterturn.easypoi.excel.annotation.Excel; |
|||
import lombok.Data; |
|||
|
|||
import java.util.Date; |
|||
|
|||
/** |
|||
* 党支部党员关系表 |
|||
* |
|||
* @author yinzuomei yinzuomei@elink-cn.com |
|||
* @since v1.0.0 2020-06-17 |
|||
*/ |
|||
@Data |
|||
public class PartyBranchMembersExcel { |
|||
|
|||
@Excel(name = "主键") |
|||
private String id; |
|||
|
|||
@Excel(name = "党支部id，customer_party_branch.id") |
|||
private String branchId; |
|||
|
|||
@Excel(name = "党员库表主键,partymember_base_info.id") |
|||
private String partymemberBaseInfoId; |
|||
|
|||
@Excel(name = "删除标识") |
|||
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; |
|||
|
|||
|
|||
} |
|||
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue