diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java index 9294a5c..5af818f 100644 --- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java +++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java @@ -45,12 +45,14 @@ public class CommonUtils { * 中文正则 */ private static Pattern ZHONGWEN_PATTERN = Pattern.compile("[\u4e00-\u9fa5]"); +// private static Pattern ZHONGWEN_PATTERN = Pattern.compile("[-]"); /** * 文件名 正则字符串 * 文件名支持的字符串:字母数字中文.-_()() 除此之外的字符将被删除 */ - private static String FILE_NAME_REGEX = "[^A-Za-z\\.\\(\\)\\-()\\_0-9\\u4e00-\\u9fa5]"; + private static String FILE_NAME_REGEX = "[^A-Za-z\\.\\(\\)\\-()\\_0-9\\u4e00-\\u9fa5\\【\\】]"; +// private static String FILE_NAME_REGEX = "[^A-Za-z\\.\\(\\)\\-()\\_0-9]"; public static String uploadOnlineImage(byte[] data,String basePath,String bizPath,String uploadType){ String dbPath = null; diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/filter/StrAttackFilter.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/filter/StrAttackFilter.java index 18aa6cf..932c7a5 100644 --- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/filter/StrAttackFilter.java +++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/filter/StrAttackFilter.java @@ -12,7 +12,7 @@ public class StrAttackFilter { public static String filter(String str) throws PatternSyntaxException { // 清除掉所有特殊字符 - String regEx = "[`_《》~!@#$%^&*()+=|{}':;',\\[\\].<>?~!@#¥%……&*()——+|{}【】‘;:”“’。,、?]"; + String regEx = "[`_《》~!@#$%^&*()+=|{}':;',\\[\\].<>?~!@#¥%……&*()——+|{}‘;:”“’。,、?]"; Pattern p = Pattern.compile(regEx); Matcher m = p.matcher(str); return m.replaceAll("").trim(); @@ -20,7 +20,7 @@ public class StrAttackFilter { public static String filter2(String str) { // 清除掉所有特殊字符 - String regEx = "[`《》~!@#$%^&*()+=|{}':;',\\[\\]<>?~!@#¥%……&*()——+|{}【】‘;:”“’。,、?]"; + String regEx = "[`《》~!@#$%^&*()+=|{}':;',\\[\\]<>?~!@#¥%……&*()——+|{}‘;:”“’。,、?]"; Pattern p = Pattern.compile(regEx); Matcher m = p.matcher(str); return m.replaceAll("").trim(); diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/controller/KcKetangbiaoController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/controller/KcKetangbiaoController.java index 6345c58..5ec3911 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/controller/KcKetangbiaoController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/controller/KcKetangbiaoController.java @@ -122,6 +122,46 @@ public class KcKetangbiaoController extends JeecgController pageList = kcKetangbiaoService.getKclblist(page, kcKetangbiao); return Result.OK(pageList); } + + @ApiOperation(value="课堂表-分页列表查询", notes="课堂表-分页列表查询") + @GetMapping(value = "/getYylist") + public Result> getYylist(KcKetangbiao kcKetangbiao, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + Page page = new Page(pageNo, pageSize); + + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + QueryWrapper zjSqxxQueryWrapper = new QueryWrapper<>(); + zjSqxxQueryWrapper.eq("user_id",sysUser.getId()); + zjSqxxQueryWrapper.eq("sqfw","1"); + zjSqxxQueryWrapper.eq("sqzt","0"); + ZjSqxx zjSqxx = zjSqxxService.getOne(zjSqxxQueryWrapper); + String sfjx = "0"; + if(zjSqxx!=null){ + Date date = new Date(); + if(zjSqxx.getSqStartTime()!=null&&zjSqxx.getSqStartTime().getTime()>=date.getTime()){ + sfjx = "1"; + } + if(zjSqxx.getSqEndTime()!=null&&zjSqxx.getSqEndTime().getTime()<=date.getTime()){ + sfjx = "1"; + } + if(StringUtils.isNotBlank(zjSqxx.getXnxq())){ + kcKetangbiao.setXnxq(zjSqxx.getXnxq()); + } + if(StringUtils.isNotBlank(zjSqxx.getKkdw())){ + kcKetangbiao.setInKkdw(zjSqxx.getKkdw()); + } + if(StringUtils.isNotBlank(zjSqxx.getKcmc())){ + kcKetangbiao.setInKcmc(zjSqxx.getKcmc()); + } + } + if(StringUtils.equals("1",sfjx)){ + return Result.error("您未在授权期限内,不能进行查询!"); + } + IPage pageList = kcKetangbiaoService.getYylist(page, kcKetangbiao); + return Result.OK(pageList); + } /** * 添加 diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/mapper/KcKetangbiaoMapper.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/mapper/KcKetangbiaoMapper.java index bace92c..0a1f480 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/mapper/KcKetangbiaoMapper.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/mapper/KcKetangbiaoMapper.java @@ -21,4 +21,6 @@ public interface KcKetangbiaoMapper extends BaseMapper { IPage getKclblist(Page page, KcKetangbiao kcKetangbiao); IPage checklist(Page page, KcKetangbiao kcKetangbiao); + + IPage getYylist(Page page, KcKetangbiao kcKetangbiao); } diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/mapper/xml/KcKetangbiaoMapper.xml b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/mapper/xml/KcKetangbiaoMapper.xml index 2a33205..d221090 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/mapper/xml/KcKetangbiaoMapper.xml +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/kcKetangbiao/mapper/xml/KcKetangbiaoMapper.xml @@ -89,7 +89,94 @@ order by ktb.hh asc,kkdw.id asc,IF(tkxx.kcmc is null,'0','1') asc +