Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110

2023-07-11 212aa4ae1f54fe4d3e51b9695224f9f86cd1bd22

 service-report/src/main/java/com/java110/report/api/ReportInfoBackCityApi.java

@@ -1,8 +1,8 @@
package com.java110.report.api;

import com.alibaba.fastjson.JSONObject;
import com.java110.dto.reportInfoBackCity.ReportInfoBackCityDto;
import com.java110.po.reportInfoBackCity.ReportInfoBackCityPo;
import com.java110.dto.reportInfo.ReportInfoBackCityDto;
import com.java110.po.reportInfo.ReportInfoBackCityPo;
import com.java110.report.bmo.reportInfoBackCity.IDeleteReportInfoBackCityBMO;
import com.java110.report.bmo.reportInfoBackCity.IGetReportInfoBackCityBMO;
import com.java110.report.bmo.reportInfoBackCity.ISaveReportInfoBackCityBMO;
@@ -38,12 +38,21 @@
     */
    @RequestMapping(value = "/saveReportInfoBackCity", method = RequestMethod.POST)
    public ResponseEntity<String> saveReportInfoBackCity(@RequestBody JSONObject reqJson) {

        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");


        ReportInfoBackCityPo reportInfoBackCityPo = BeanConvertUtil.covertBean(reqJson, ReportInfoBackCityPo.class);
        return saveReportInfoBackCityBMOImpl.save(reportInfoBackCityPo);
        /*//正则匹配身份证号是否是正确的，15位或者17位数字+数字/x/X
        if (reqJson.containsKey("idCard") && !StringUtil.isEmpty(reqJson.getString("idCard"))) {
            if (reqJson.getString("idCard").matches("^\\d{15}|\\d{17}[\\dxX]$")) {
                ReportInfoBackCityPo reportInfoBackCityPo = BeanConvertUtil.covertBean(reqJson, ReportInfoBackCityPo.class);
                return saveReportInfoBackCityBMOImpl.save(reportInfoBackCityPo);
            } else {
                throw new IllegalArgumentException("身份证号格式不对！");
            }
        } else {
            ReportInfoBackCityPo reportInfoBackCityPo = BeanConvertUtil.covertBean(reqJson, ReportInfoBackCityPo.class);
            return saveReportInfoBackCityBMOImpl.save(reportInfoBackCityPo);
        }*/
    }

    /**
@@ -94,9 +103,17 @@
     */
    @RequestMapping(value = "/queryReportInfoBackCity", method = RequestMethod.GET)
    public ResponseEntity<String> queryReportInfoBackCity(@RequestParam(value = "communityId") String communityId,
                                                          @RequestParam(value = "name", required = false) String name,
                                                          @RequestParam(value = "idCard", required = false) String idCard,
                                                          @RequestParam(value = "source", required = false) String source,
                                                          @RequestParam(value = "tel", required = false) String tel,
                                                          @RequestParam(value = "page") int page,
                                                          @RequestParam(value = "row") int row) {
        ReportInfoBackCityDto reportInfoBackCityDto = new ReportInfoBackCityDto();
        reportInfoBackCityDto.setName(name);
        reportInfoBackCityDto.setIdCard(idCard);
        reportInfoBackCityDto.setSource(source);
        reportInfoBackCityDto.setTel(tel);
        reportInfoBackCityDto.setPage(page);
        reportInfoBackCityDto.setRow(row);
        reportInfoBackCityDto.setCommunityId(communityId);