fix：修改bug

DESKTOP-71BH0QO\L、ming

2021-04-02 2ced4e05bc384e010836df6f3f0f13dd6a7f2d0f

fix：修改bug

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ParamRegularUtil.java

New file
@@ -0,0 +1,23 @@
package com.panzhihua.common.utlis;

import java.util.regex.Pattern;

/**
 * @Author: llming
 * @Description:参数正则匹配工具类
 */
public class ParamRegularUtil {
    /**
     * 车牌号校验
     * @param carNum
     */
    public static boolean carNumRegular(String carNum) {
        String pattern = "([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼]{1}(([A-HJ-Z]{1}[A-HJ-NP-Z0-9]{5})|([A-HJ-Z]{1}(([DF]{1}[A-HJ-NP-Z0-9]{1}[0-9]{4})|([0-9]{5}[DF]{1})))|([A-HJ-Z]{1}[A-D0-9]{1}[0-9]{3}警)))|([0-9]{6}使)|((([沪粤川云桂鄂陕蒙藏黑辽渝]{1}A)|鲁B|闽D|蒙E|蒙H)[0-9]{4}领)|(WJ[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼·•]{1}[0-9]{4}[TDSHBXJ0-9]{1})|([VKHBSLJNGCE]{1}[A-DJ-PR-TVY]{1}[0-9]{5})";
        return Pattern.matches(pattern, carNum);
    }

    public static void main(String[] args) {
        boolean cdsaf = carNumRegular("粤B12345");
        System.out.println(cdsaf);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngCarDAO.java

@@ -41,15 +41,15 @@
            " LEFT JOIN sys_user t3 ON t.create_by = t3.user_id " +
            " WHERE t.source =2 " +
            "<if test='pageComMngCarDTO.name != null and pageComMngCarDTO.name.trim() != &quot;&quot;'>" +
            " and t.user_name LIKE concat( #{pageComMngCarDTO.name}, '%' )  " +
            " and t.user_name LIKE concat( '%',#{pageComMngCarDTO.name}, '%' )  " +
            " </if> " +
            "<if test='pageComMngCarDTO.communityId != null and pageComMngCarDTO.communityId != 0'>" +
            " and t.community_id = #{pageComMngCarDTO.communityId} " +
            " </if> " +
            "<if test='pageComMngCarDTO.areaName != null and pageComMngCarDTO.areaName != 0'>" +
            " and t2.area_name LIKE concat( #{pageComMngCarDTO.areaName}, '%' )  " +
            "<if test='pageComMngCarDTO.areaName != null'>" +
            " and t2.area_name LIKE concat( '%',#{pageComMngCarDTO.areaName}, '%' )  " +
            " </if> " +
            " order by t.create_at desc"+
            " order by t.create_at desc" +
            "</script>")
    IPage<ComMngCarVO> pageQueryComMngCar(Page page, @Param(value = "pageComMngCarDTO") PageComMngCarDTO pageComMngCarDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngStructAreaDAO.java

@@ -43,7 +43,7 @@
            "AND community_id=#{comMngStructAreaVO.communityId} \n" +
            " </if> " +
            "<if test='comMngStructAreaVO.areaName != null and comMngStructAreaVO.areaName.trim() != &quot;&quot;'>" +
            "AND area_name = #{comMngStructAreaVO.areaName}" +
            "AND area_name = concat( '%',#{comMngStructAreaVO.areaName}, '%' )" +
            " </if> " +
            "</script>")
    IPage<ComMngStructAreaVO> pageArea(Page page, @Param("comMngStructAreaVO") ComMngStructAreaVO comMngStructAreaVO);

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngCarServiceImpl.java

@@ -13,6 +13,7 @@
import com.panzhihua.common.model.vos.community.ComMngCarVO;
import com.panzhihua.common.model.vos.user.SysUserVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.ParamRegularUtil;
import com.panzhihua.service_community.dao.ComMngCarDAO;
import com.panzhihua.service_community.dao.ComMngStructAreaDAO;
import com.panzhihua.service_community.model.dos.ComCvtServeDO;
@@ -84,13 +85,17 @@
            pageSize = 10l;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        page.setCurrent(pageNum.longValue());
        IPage<ComMngCarVO> iPage = comMngCarDAO.pageQueryComMngCar(page, pageComMngCarDTO);
        return R.ok(iPage);
    }

    @Override
    public R saveComMngCar(ComMngCarSaveDTO comMngCarSaveDTO) {
        boolean carResult = ParamRegularUtil.carNumRegular(comMngCarSaveDTO.getPlateNum());
        if(!carResult){
            return R.fail("车牌号有误！");
        }
        ComMngCarDO exist= comMngCarDAO.selectOne(new QueryWrapper<ComMngCarDO>()
                .lambda().eq(ComMngCarDO::getPlateNum, comMngCarSaveDTO.getPlateNum()).and(wrapper->wrapper.eq(ComMngCarDO::getSource,2)));
        /*if (comMngCarSaveDTO.getId()!=0 && exist.getId()!=comMngCarSaveDTO.getId()) {