suzhou-jichuang-lanhai
/
JinJiHuJava
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

测试环境

Browse Source
duhanyu
杜函宇 4 months ago
parent cc55f3ecef
commit 053f43a46b
8 changed files with 96 additions and 96 deletions
Show Stats Download Patch File Download Diff File

64
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/ProjectTrackingResponse.java
Unescape View File

@ -21,39 +21,39 @@ import java.util.Date;
public class ProjectTrackingResponse { public class ProjectTrackingResponse {
@ApiModelProperty("项目大类名字") // @ApiModelProperty("项目大类名字")
private String enterpriseDirectory; // private String enterpriseDirectory;
//
//
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "填报开始时间", width = 30, dateFormat = "yyyy-MM-dd") // @Excel(name = "填报开始时间", width = 30, dateFormat = "yyyy-MM-dd")
private LocalDate startTime; // 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")
// * 提醒时间 // @Excel(name = "填报结束时间", width = 30, dateFormat = "yyyy-MM-dd")
// */ // private LocalDate endTime;
// @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 Integer count;
// */ /**
// @ApiModelProperty("提醒内容") * 项目小类
// private String alertContent; */
@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;
} }

8
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JServicesListServiceImpl.java
Unescape View File

@ -29,11 +29,11 @@ public class JServicesListServiceImpl extends ServiceImpl<JServicesListMapper, J
*/ */
@Override @Override
public Page<JServicesList> page(Page<JServicesList> page, JServicesListRequest js) { public Page<JServicesList> page(Page<JServicesList> page, JServicesListRequest js) {
// if("3".equals(js.getServicesType())){ if("3".equals(js.getServicesType())){
// return baseMapper.page1(page, js); return baseMapper.page1(page, js);
// }else { }else {
return baseMapper.page(page, js); return baseMapper.page(page, js);
// } }
} }
/** /**

2
ruoyi-admin/src/main/resources/application.yml
Unescape View File

@ -34,7 +34,7 @@ spring:
# 国际化资源文件路径 # 国际化资源文件路径
basename: i18n/messages basename: i18n/messages
profiles: profiles:
active: test active: druid
# 文件上传 # 文件上传
servlet: servlet:
multipart: multipart:

32
ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml
Unescape View File

@ -54,22 +54,22 @@
ORDER BY CAST(c.dict_value AS UNSIGNED); ORDER BY CAST(c.dict_value AS UNSIGNED);
</select> </select>
<select id="getProjectTracking" resultType="com.ruoyi.jjh.ent.entity.response.ProjectTrackingResponse"> <select id="getProjectTracking" resultType="com.ruoyi.jjh.ent.entity.response.ProjectTrackingResponse">
SELECT b.enterprise_directory, # SELECT b.enterprise_directory,
b.start_time, # b.start_time,
b.end_time, # b.end_time,
COUNT(*) as count # COUNT(*) as count
FROM bms_declaration_records a # FROM bms_declaration_records a
INNER JOIN bms_template_record b ON a.template_record_id = b.id # INNER JOIN bms_template_record b ON a.template_record_id = b.id
WHERE a.status != 0 # WHERE a.status != 0
GROUP BY a.template_record_id # GROUP BY a.template_record_id
order by count desc # order by count desc
# SELECT a.alert_time, SELECT a.alert_time,
# a.alert_content, a.alert_content,
# b.project_small_type b.project_small_type
# FROM j_smart_reminders a FROM j_smart_reminders a
# left JOIN j_project b on a.project_id = b.id left JOIN j_project b on a.project_id = b.id
# where a.alert_type = 4 and NOW() > a.alert_time where a.alert_type = 4 and NOW() > a.alert_time
# order by a.alert_time desc order by a.alert_time desc
</select> </select>
<select id="servicesDevelop" resultType="com.ruoyi.jjh.ent.entity.response.JServicesDevelopResponse"> <select id="servicesDevelop" resultType="com.ruoyi.jjh.ent.entity.response.JServicesDevelopResponse">
SELECT SELECT

56
ruoyi-admin/src/main/resources/mapper/jjh/ent/JServicesListMapper.xml
Unescape View File

@ -54,34 +54,34 @@
</select> </select>
<select id="selectAllServicesCount" <select id="selectAllServicesCount"
resultType="com.ruoyi.jjh.ent.entity.response.JServicesListCountResponse"> resultType="com.ruoyi.jjh.ent.entity.response.JServicesListCountResponse">
SELECT # SELECT
IFNULL( ROUND( SUM( a.revenue ) / 100000, 1 ), '-' ) AS allRevenue, # IFNULL( ROUND( SUM( a.revenue ) / 100000, 1 ), '-' ) AS allRevenue,
IFNULL( ROUND( a.add_value, 1 ), '-' ) AS addValue, # IFNULL( ROUND( a.add_value, 1 ), '-' ) AS addValue,
a.type AS servicesType, # a.type AS servicesType,
b.qyCount AS qyCount # b.qyCount AS qyCount
FROM # FROM
j_total_revenue a # j_total_revenue a
LEFT JOIN ( SELECT a.services_type, count( * ) AS qyCount FROM j_services_list a GROUP BY a.services_type ) AS b ON a.type = b.services_type # LEFT JOIN ( SELECT a.services_type, count( * ) AS qyCount FROM j_services_list a GROUP BY a.services_type ) AS b ON a.type = b.services_type
WHERE # WHERE
a.years = YEAR (NOW()) - 1 # a.years = YEAR (NOW()) - 1
GROUP BY # GROUP BY
a.type, # a.type,
b.qyCount # b.qyCount
# SELECT SELECT
# IFNULL( ROUND( a.revenue / 100000, 1 ), '-' ) AS allRevenue, IFNULL( ROUND( a.revenue / 100000, 1 ), '-' ) AS allRevenue,
# IFNULL( ROUND( a.add_value, 1 ), '-' ) AS addValue, IFNULL( ROUND( a.add_value, 1 ), '-' ) AS addValue,
# a.type AS servicesType, a.type AS servicesType,
# CASE CASE
#
# WHEN a.type = 3 THEN WHEN a.type = 3 THEN
# ( SELECT COUNT(*) FROM bms_enterprise_basic_info WHERE type = 1 ) ELSE b.qyCount ( SELECT COUNT(*) FROM bms_enterprise_basic_info WHERE type = 1 ) ELSE b.qyCount
# END AS qyCount END AS qyCount
# FROM FROM
# j_total_revenue a j_total_revenue a
# LEFT JOIN ( SELECT a.services_type, COUNT(*) AS qyCount FROM j_services_list a GROUP BY a.services_type ) AS b ON a.type = b.services_type LEFT JOIN ( SELECT a.services_type, COUNT(*) AS qyCount FROM j_services_list a GROUP BY a.services_type ) AS b ON a.type = b.services_type
# WHERE WHERE
# a.years = YEAR (NOW()) - 1 a.years = YEAR (NOW()) - 1
# ORDER BY FIELD(a.type, 3, 1, 2, 4); ORDER BY FIELD(a.type, 3, 1, 2, 4);
</select> </select>

12
ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java
Unescape View File

@ -41,12 +41,12 @@ public class XssFilter implements Filter {
throws IOException, ServletException { throws IOException, ServletException {
HttpServletRequest req = (HttpServletRequest) request; HttpServletRequest req = (HttpServletRequest) request;
HttpServletResponse resp = (HttpServletResponse) response; HttpServletResponse resp = (HttpServletResponse) response;
resp.setHeader("Access-Control-Allow-Origin", "http://39.101.188.84:9999"); // 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-Origin", "https://idp.sipac.gov.cn");
resp.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE, PUT"); // resp.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE, PUT");
resp.setHeader("Access-Control-Max-Age", "3600"); // 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-Headers", "x-requested-with,Authorization,isrepeatsubmit,Content-Type");
resp.setHeader("Access-Control-Allow-Credentials", "true"); // resp.setHeader("Access-Control-Allow-Credentials", "true");
if (handleExcludeURL(req, resp)) { if (handleExcludeURL(req, resp)) {
chain.doFilter(request, response); chain.doFilter(request, response);
return; return;

16
ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java
Unescape View File

@ -43,14 +43,14 @@ public class FilterConfig {
initParameters.put("excludes", excludes); initParameters.put("excludes", excludes);
registration.setInitParameters(initParameters); registration.setInitParameters(initParameters);
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); // UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
CorsConfiguration config = new CorsConfiguration(); // CorsConfiguration config = new CorsConfiguration();
config.setAllowCredentials(true); // config.setAllowCredentials(true);
config.addAllowedOrigin("http://39.101.188.84:9999"); // config.addAllowedOrigin("http://39.101.188.84:9999");
config.addAllowedHeader("*"); // config.addAllowedHeader("*");
config.addAllowedMethod("*"); // config.addAllowedMethod("*");
source.registerCorsConfiguration("/**", config); // CORS 配置对所有接口都有效 // source.registerCorsConfiguration("/**", config); // CORS 配置对所有接口都有效
registration.setOrder(0); // registration.setOrder(0);
return registration; return registration;
} }

2
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
Unescape View File

@ -84,7 +84,7 @@ public class SysLoginService {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
// 验证码校验 // 验证码校验
// validateCaptcha(username, code, uuid); validateCaptcha(username, code, uuid);
// 登录前置校验 // 登录前置校验
loginPreCheck(username, strP); loginPreCheck(username, strP);
Map<String, Object> map = redisCache.getCacheObject(username + strP); Map<String, Object> map = redisCache.getCacheObject(username + strP);

Write Preview
Loading…
Cancel
Save