From 053f43a46b4165bed348f4832597b6105b773384 Mon Sep 17 00:00:00 2001 From: du <1725534722@qq.com> Date: Thu, 17 Oct 2024 13:53:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../response/ProjectTrackingResponse.java | 64 +++++++++---------- .../impl/JServicesListServiceImpl.java | 8 +-- .../src/main/resources/application.yml | 2 +- .../mapper/jjh/ent/JDataScreenMapper.xml | 32 +++++----- .../mapper/jjh/ent/JServicesListMapper.xml | 56 ++++++++-------- .../com/ruoyi/common/filter/XssFilter.java | 12 ++-- .../ruoyi/framework/config/FilterConfig.java | 16 ++--- .../web/service/SysLoginService.java | 2 +- 8 files changed, 96 insertions(+), 96 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 a1df51f..20c7bc5 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,39 +21,39 @@ import java.util.Date; public class ProjectTrackingResponse { - @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; +// @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 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; +// @JsonFormat(pattern = "yyyy-MM-dd") +// @Excel(name = "填报结束时间", width = 30, dateFormat = "yyyy-MM-dd") +// private LocalDate endTime; // // -// /** -// * 提醒内容 -// */ -// @ApiModelProperty("提醒内容") -// private String alertContent; +// @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 51aefbd..4143eaa 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 28a17ba..f04e035 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: test + active: druid # 文件上传 servlet: multipart: diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml index fa3689e..10bc364 100644 --- a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml @@ -54,22 +54,22 @@ ORDER BY CAST(c.dict_value AS UNSIGNED); 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 8e168ba..7c7cc41 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 @@ -41,12 +41,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"); +// 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/config/FilterConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java index 6eb0076..f13bf38 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java @@ -43,14 +43,14 @@ public class FilterConfig { initParameters.put("excludes", excludes); registration.setInitParameters(initParameters); - UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); - CorsConfiguration config = new CorsConfiguration(); - config.setAllowCredentials(true); - config.addAllowedOrigin("http://39.101.188.84:9999"); - config.addAllowedHeader("*"); - config.addAllowedMethod("*"); - source.registerCorsConfiguration("/**", config); // CORS 配置对所有接口都有效 - registration.setOrder(0); +// UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); +// CorsConfiguration config = new CorsConfiguration(); +// config.setAllowCredentials(true); +// config.addAllowedOrigin("http://39.101.188.84:9999"); +// config.addAllowedHeader("*"); +// config.addAllowedMethod("*"); +// source.registerCorsConfiguration("/**", config); // CORS 配置对所有接口都有效 +// registration.setOrder(0); return registration; } 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 d4fea5a..f13c6c5 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 @@ -84,7 +84,7 @@ public class SysLoginService { throw new RuntimeException(e); } // 验证码校验 -// validateCaptcha(username, code, uuid); + validateCaptcha(username, code, uuid); // 登录前置校验 loginPreCheck(username, strP); Map map = redisCache.getCacheObject(username + strP); From d9fc75048bd3081c38b2d817339a95d8e9f9029e Mon Sep 17 00:00:00 2001 From: du <1725534722@qq.com> Date: Fri, 18 Oct 2024 09:20:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E6=80=BB=E9=83=A8=E4=BC=81=E4=B8=9A=E6=95=B0=E9=87=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ent/entity/response/JHqCountResponse.java | 6 ++ .../mapper/JHeadQuartersRevenueMapper.java | 6 ++ .../impl/JHeadQuartersRevenueServiceImpl.java | 10 ++- .../BmsEnterpriseBasicInfoMapper.xml | 1 - .../jjh/ent/JHeadQuartersRevenueMapper.xml | 87 +++++++++++++++---- 5 files changed, 90 insertions(+), 20 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/JHqCountResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/JHqCountResponse.java index 980979e..e54f4a7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/JHqCountResponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/JHqCountResponse.java @@ -30,4 +30,10 @@ public class JHqCountResponse { @ApiModelProperty("区级") private Integer count3; + /** + * 全部 + */ + @ApiModelProperty("全部") + private Integer allCount; + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JHeadQuartersRevenueMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JHeadQuartersRevenueMapper.java index 5a39a30..9079784 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JHeadQuartersRevenueMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JHeadQuartersRevenueMapper.java @@ -25,8 +25,14 @@ public interface JHeadQuartersRevenueMapper extends BaseMapper page(Page page, @Param("req") JHeadQuartersRevenueRequest js); + Page page1(Page page,@Param("req") JHeadQuartersRevenueRequest js); /** * 查询总部企业数量 */ JHqCountResponse selectZbCount(); + + /** + * 查询总部企业全部的数量 + */ + Integer selectAllCount(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JHeadQuartersRevenueServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JHeadQuartersRevenueServiceImpl.java index 0561032..295b089 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JHeadQuartersRevenueServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JHeadQuartersRevenueServiceImpl.java @@ -27,7 +27,11 @@ public class JHeadQuartersRevenueServiceImpl extends ServiceImpl page(Page page, JHeadQuartersRevenueRequest js) { - return baseMapper.page(page, js); + if(js.getProjectSmallType()!=null){ + return baseMapper.page1(page, js); + }else { + return baseMapper.page(page, js); + } } @@ -36,6 +40,8 @@ public class JHeadQuartersRevenueServiceImpl extends ServiceImpl qymc like concat('%', #{req.enterpriseInfo}, '%') - or tyshxydm like concat('%', #{req.enterpriseInfo}, '%') diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JHeadQuartersRevenueMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JHeadQuartersRevenueMapper.xml index 084b536..1fe42c1 100644 --- a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JHeadQuartersRevenueMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JHeadQuartersRevenueMapper.xml @@ -5,8 +5,57 @@ + +