From e49b39e327e985a0e158e325d19167f910ccd05b Mon Sep 17 00:00:00 2001 From: du <1725534722@qq.com> Date: Sun, 29 Sep 2024 10:55:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=84=B1=E6=95=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../response/ProjectTrackingResponse.java | 55 ++++++++++++------- .../impl/JServicesListServiceImpl.java | 8 +-- .../src/main/resources/application.yml | 2 +- .../mapper/jjh/ent/JServicesListMapper.xml | 31 ++++++++--- .../com/ruoyi/common/filter/XssFilter.java | 6 ++ .../web/service/SysLoginService.java | 2 +- 6 files changed, 69 insertions(+), 35 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/ProjectTrackingResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/ProjectTrackingResponse.java index f59fd37..a1df51f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/ProjectTrackingResponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/ProjectTrackingResponse.java @@ -21,24 +21,39 @@ import java.util.Date; public class ProjectTrackingResponse { - /** - * 项目小类 - */ - @ApiModelProperty("项目小类") - private Integer projectSmallType; - - /** - * 提醒时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "提醒时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date alertTime; - - - /** - * 提醒内容 - */ - @ApiModelProperty("提醒内容") - private String alertContent; + @ApiModelProperty("项目大类名字") + private String enterpriseDirectory; + + + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "填报开始时间", width = 30, dateFormat = "yyyy-MM-dd") + private LocalDate startTime; + + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "填报结束时间", width = 30, dateFormat = "yyyy-MM-dd") + private LocalDate endTime; + + + @ApiModelProperty("数量") + private Integer count; +// /** +// * 项目小类 +// */ +// @ApiModelProperty("项目小类") +// private Integer projectSmallType; +// +// /** +// * 提醒时间 +// */ +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") +// @Excel(name = "提醒时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") +// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") +// private Date alertTime; +// +// +// /** +// * 提醒内容 +// */ +// @ApiModelProperty("提醒内容") +// private String alertContent; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JServicesListServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JServicesListServiceImpl.java index 4143eaa..51aefbd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JServicesListServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JServicesListServiceImpl.java @@ -29,11 +29,11 @@ public class JServicesListServiceImpl extends ServiceImpl page(Page page, JServicesListRequest js) { - if("3".equals(js.getServicesType())){ - return baseMapper.page1(page, js); - }else { +// if("3".equals(js.getServicesType())){ +// return baseMapper.page1(page, js); +// }else { return baseMapper.page(page, js); - } +// } } /** diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index ba65377..28a17ba 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -34,7 +34,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: internet + active: test # 文件上传 servlet: multipart: diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JServicesListMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JServicesListMapper.xml index 9ff0065..c187666 100644 --- a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JServicesListMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JServicesListMapper.xml @@ -55,20 +55,33 @@ diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java b/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java index a18a8e3..851c16a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java @@ -42,6 +42,12 @@ public class XssFilter implements Filter { throws IOException, ServletException { HttpServletRequest req = (HttpServletRequest) request; HttpServletResponse resp = (HttpServletResponse) response; + resp.setHeader("Access-Control-Allow-Origin", "http://39.101.188.84:9999"); +// resp.setHeader("Access-Control-Allow-Origin", "https://idp.sipac.gov.cn"); + resp.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE, PUT"); + resp.setHeader("Access-Control-Max-Age", "3600"); + resp.setHeader("Access-Control-Allow-Headers", "x-requested-with,Authorization,isrepeatsubmit,Content-Type"); + resp.setHeader("Access-Control-Allow-Credentials", "true"); if (handleExcludeURL(req, resp)) { chain.doFilter(request, response); return; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java index bc35b15..802e992 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java @@ -79,7 +79,7 @@ public class SysLoginService { throw new RuntimeException(e); } // 验证码校验 -// validateCaptcha(username, code, uuid); +// validateCaptcha(username, code, uuid); // 登录前置校验 loginPreCheck(username,strP); // 用户验证