luyan
/
epmet-cloud-lingshan
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/dev'

master
yinzuomei 5 years ago
parent
5481f4de35 f84578f3a4
commit
578f6cec71
4 changed files with 33 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/IdCardNoValidatorUtils.java
  2. 3
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueSuggestionDao.java
  3. 11
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSuggestionServiceImpl.java
  4. 8
      epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueSuggestionDao.xml

20
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/IdCardNoValidatorUtils.java
View File

@ -35,14 +35,14 @@ public class IdCardNoValidatorUtils {
try {
//判断号码的长度 15位或18位
if (idCardNo.length() != 15 && idCardNo.length() != 18) {
logger.error(String.format("校验身份证号:%s错误:%s", idCardNo, "身份证号码长度应该为15位或18位"));
logger.warn(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身份证号最后一位字母需要大写"));
logger.warn(String.format("校验身份证号:%s错误:%s", idCardNo, "18身份证号最后一位字母需要大写"));
return false;
}
} else {
@ -55,7 +55,7 @@ public class IdCardNoValidatorUtils {
iDCardNo = idCardNo.substring(0, 6) + "19" + idCardNo.substring(6, 15);
}
if (isStrNum(iDCardNo) == false) {
logger.error(String.format("校验身份证号:%s错误:%s", idCardNo, "身份证15位号码都应为数字;18位号码除最后一位外,都应为数字"));
logger.warn(String.format("校验身份证号:%s错误:%s", idCardNo, "身份证15位号码都应为数字;18位号码除最后一位外,都应为数字"));
return false;
}
//判断出生年月
@ -63,27 +63,27 @@ public class IdCardNoValidatorUtils {
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, "身份证生日无效"));
logger.warn(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, "身份证生日不在有效范围"));
logger.warn(String.format("校验身份证号:%s错误:%s", idCardNo, "身份证生日不在有效范围"));
return false;
}
if (Integer.parseInt(strMonth) > 12 || Integer.parseInt(strMonth) == 0) {
logger.error(String.format("校验身份证号:%s错误:%s", idCardNo, "身份证月份无效"));
logger.warn(String.format("校验身份证号:%s错误:%s", idCardNo, "身份证月份无效"));
return false;
}
if (Integer.parseInt(strDay) > 31 || Integer.parseInt(strDay) == 0) {
logger.error(String.format("校验身份证号:%s错误:%s", idCardNo, "身份证日期无效"));
logger.warn(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, "身份证地区编码错误"));
logger.warn(String.format("校验身份证号:%s错误:%s", idCardNo, "身份证地区编码错误"));
return false;
}
//判断最后一位
@ -96,12 +96,12 @@ public class IdCardNoValidatorUtils {
iDCardNo = iDCardNo + strVerifyCode;
if (idCardNo.length() == 18 && !iDCardNo.equals(idCardNo)) {
logger.error(String.format("校验身份证号:%s错误:%s", idCardNo, "身份证无效，不是合法的身份证号码"));
logger.warn(String.format("校验身份证号:%s错误:%s", idCardNo, "身份证无效，不是合法的身份证号码"));
return false;
}
} catch (Exception e) {
logger.error(String.format("校验身份证号方法异常"));
logger.warn(String.format("校验身份证号方法异常"));
e.printStackTrace();
}
return true;

3
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueSuggestionDao.java
View File

@ -23,6 +23,7 @@ import com.epmet.dto.form.UserIssueSuggestionFormDTO;
import com.epmet.dto.result.IssueSuggestionResDTO;
import com.epmet.entity.IssueSuggestionEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -51,4 +52,6 @@ public interface IssueSuggestionDao extends BaseDao<IssueSuggestionEntity> {
* @Date 2020/11/18 14:27
**/
List<IssueSuggestionResDTO> selectListIssueSugByIssueId(String issueId);
IssueSuggestionEntity selectByUserIdAndIssueId(@Param("userId") String createdBy, @Param("issueId") String issueId);
}

11
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSuggestionServiceImpl.java
View File

@ -121,11 +121,20 @@ public class IssueSuggestionServiceImpl extends BaseServiceImpl<IssueSuggestionD
dto.setGridId(issueDTO.getGridId());
dto.setCustomerId(issueDTO.getCustomerId());
//插入
String suggestionId = "";
IssueSuggestionEntity originEntity = baseDao.selectByUserIdAndIssueId(dto.getCreatedBy(), dto.getIssueId());
if (null != originEntity) {
originEntity.setSuggestion(dto.getSuggestion());
originEntity.setPublicFlag(dto.getPublicFlag());
updateById(originEntity);
} else {
IssueSuggestionEntity entity = ConvertUtils.sourceToTarget(dto, IssueSuggestionEntity.class);
insert(entity);
suggestionId = entity.getId();
}
SaveIssueSuggestionResultDTO resultDTO = new SaveIssueSuggestionResultDTO();
resultDTO.setIssueId(dto.getIssueId());
resultDTO.setSuggestionId(entity.getId());
resultDTO.setSuggestionId(suggestionId);
return resultDTO;
}

8
epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueSuggestionDao.xml
View File

@ -12,6 +12,7 @@
i.DEL_FLAG = '0'
AND i.ISSUE_ID = #{issueId}
AND i.CREATED_BY=#{userId}
order by i.CREATED_TIME desc limit 1
</select>
<!-- 查询议题建议 -->
@ -33,4 +34,11 @@
ORDER BY
ig.CREATED_TIME DESC
</select>
<select id="selectByUserIdAndIssueId" parameterType="map" resultType="com.epmet.entity.IssueSuggestionEntity">
select * from issue_suggestion m
where m.del_flag='0'
and m.ISSUE_ID=#{issueId}
and m.CREATED_BY=#{userId}
</select>
</mapper>
Write Preview
Loading…
Cancel
Save