From ac420f4e24eb99dcb7cb39e4db689f8522bbbd19 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Fri, 15 Dec 2023 17:30:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9sql=E8=AF=AD=E6=B3=95?= =?UTF-8?q?=E4=B8=8D=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hz/pm/api/common/config/BeanConfig.java | 1 + .../com/hz/pm/api/common/constant/BizConst.java | 2 +- .../com/hz/pm/api/common/constant/BooleanBit.java | 17 +++++++ .../api/common/handler/BooleanBitTypeHandler.java | 58 ++++++++++++++++++++++ .../pm/api/dashboard/mapper/CockpitStatsMapper.xml | 2 +- .../pm/api/meeting/mapper/MeetingExpertMapper.xml | 8 +-- .../mapper/DeclaredStatisticsMapper.xml | 4 +- .../hz/pm/api/projectlib/mapper/ProjectMapper.java | 2 +- .../hz/pm/api/projectlib/mapper/ProjectMapper.xml | 12 ++--- .../mapper/ProjectRenewalFundDeclarationMapper.xml | 4 +- .../hz/pm/api/projectlib/model/entity/Project.java | 4 +- .../service/impl/ProjectServiceImpl.java | 41 +++++++-------- .../com/hz/pm/api/sys/mapper/ResourceMapper.xml | 2 +- .../security/auth/config/RedisSessionConfig.java | 5 +- hz-pm-api/src/main/resources/application-dev.yml | 10 ++-- 15 files changed, 120 insertions(+), 52 deletions(-) create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/common/constant/BooleanBit.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/common/handler/BooleanBitTypeHandler.java diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/config/BeanConfig.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/config/BeanConfig.java index 5b3ed37..4945c38 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/config/BeanConfig.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/config/BeanConfig.java @@ -108,4 +108,5 @@ public class BeanConfig { .setRetryHandler(new DefaultHttpRequestRetryHandler(2, true)) .build(); } + } diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/constant/BizConst.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/constant/BizConst.java index eb72be1..1434d28 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/constant/BizConst.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/constant/BizConst.java @@ -19,7 +19,7 @@ public interface BizConst { */ String LIMIT_1 = "limit 1"; - String COOKIE_KEY = "ND_PROJECT_MANAGEMENT_JSESSION"; + String COOKIE_KEY = "HZPM_SESSION"; /** * 一小时秒数 diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/constant/BooleanBit.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/constant/BooleanBit.java new file mode 100644 index 0000000..6c49d0a --- /dev/null +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/constant/BooleanBit.java @@ -0,0 +1,17 @@ +package com.hz.pm.api.common.constant; + +/** + *

+ * BooleanBit + *

+ * + * @author WendyYang + * @since 16:12 2023/12/15 + */ +public interface BooleanBit { + + int TRUE = 1; + + int FALSE = 0; + +} diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/handler/BooleanBitTypeHandler.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/handler/BooleanBitTypeHandler.java new file mode 100644 index 0000000..ce18868 --- /dev/null +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/handler/BooleanBitTypeHandler.java @@ -0,0 +1,58 @@ +package com.hz.pm.api.common.handler; + + +import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.type.BaseTypeHandler; +import org.apache.ibatis.type.JdbcType; +import org.apache.ibatis.type.MappedJdbcTypes; +import org.apache.ibatis.type.MappedTypes; + +import java.sql.CallableStatement; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; + +/** + *

+ * BooleanBitTypeHandler + *

+ * + * @author WendyYang + * @since 15:39 2023/12/15 + */ +@Slf4j +@MappedJdbcTypes(value = JdbcType.BIT) +@MappedTypes(value = {Boolean.class, boolean.class}) +public class BooleanBitTypeHandler extends BaseTypeHandler { + + public BooleanBitTypeHandler() { + log.info(this.getClass().getSimpleName()); + } + + @Override + public void setNonNullParameter(PreparedStatement ps, int i, Boolean parameter, JdbcType jdbcType) throws SQLException { + if (parameter == null) { + ps.setInt(i, 1); + } else { + ps.setInt(i, parameter ? 1 : 0); + } + } + + @Override + public Boolean getNullableResult(ResultSet rs, String columnName) throws SQLException { + Byte man = rs.getObject(columnName, Byte.class); + return man == null ? null : (man == 1); + } + + @Override + public Boolean getNullableResult(ResultSet rs, int columnIndex) throws SQLException { + Byte man = rs.getObject(columnIndex, Byte.class); + return man == null ? null : (man == 1); + } + + @Override + public Boolean getNullableResult(CallableStatement cs, int columnIndex) throws SQLException { + Byte man = cs.getObject(columnIndex, Byte.class); + return man == null ? null : (man == 1); + } +} \ No newline at end of file diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/mapper/CockpitStatsMapper.xml b/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/mapper/CockpitStatsMapper.xml index 241745b..2ad1cb2 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/mapper/CockpitStatsMapper.xml +++ b/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/mapper/CockpitStatsMapper.xml @@ -15,7 +15,7 @@ sum(CASE WHEN a.password_grade = 5 THEN 1 ELSE 0 end) monitorPasswordGrade5Num FROM nd_project_application a LEFT JOIN nd_project p ON a."project_code" = p."project_code" AND a."project_version" = p.version - WHERE p."newest" = TRUE + WHERE p."newest" = 1 AND p."area_code" =#{regionCode} diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/meeting/mapper/MeetingExpertMapper.xml b/hz-pm-api/src/main/java/com/hz/pm/api/meeting/mapper/MeetingExpertMapper.xml index 6ce0225..dd15ac2 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/meeting/mapper/MeetingExpertMapper.xml +++ b/hz-pm-api/src/main/java/com/hz/pm/api/meeting/mapper/MeetingExpertMapper.xml @@ -84,11 +84,11 @@ exists(select 1 from nd_expert_review ner where ner.meeting_id = m.id and ner.project_id = np.id and ner.create_by = - me.expert_id and is_final = true) + me.expert_id and is_final = 1) not exists(select 1 from nd_expert_review ner where ner.meeting_id = m.id and ner.project_id = np.id and ner.create_by = - me.expert_id and is_final = true) + me.expert_id and is_final = 1) @@ -111,9 +111,9 @@ from nd_project np inner join meeting_inner_project mip on mip.project_id = np.id inner join meeting m on m.id = mip.meeting_id inner join meeting_expert me on m.id = me.meeting_id - where m.is_inner_project = true and m.status != 3 and me.status = 3 and m.confirmed_roster = true + where m.is_inner_project = 1 and m.status != 3 and me.status = 3 and m.confirmed_roster = 1 - and if(me.is_headman,,) + and if(me.is_headman,'','') and me.expert_id = #{p.userId} diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/mapper/DeclaredStatisticsMapper.xml b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/mapper/DeclaredStatisticsMapper.xml index 186b0c1..41d0e3b 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/mapper/DeclaredStatisticsMapper.xml +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/mapper/DeclaredStatisticsMapper.xml @@ -16,7 +16,7 @@ sum(p.approval_amount) approvalAmount FROM nd_project p - WHERE build_org_code = #{orgCode} and project_year = #{year} and newest = true + WHERE build_org_code = #{orgCode} and project_year = #{year} and newest = 1 diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/mapper/ProjectMapper.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/mapper/ProjectMapper.java index e344974..329888e 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/mapper/ProjectMapper.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/mapper/ProjectMapper.java @@ -19,5 +19,5 @@ public interface ProjectMapper extends BaseMapper { Page pageAllWithPermission(Page page, @Param("req") ProjectListReq req); - Page pagelibWithPermission(Page page, @Param("req") ProjectListReq req); + Page pageLibWithPermission(Page page, @Param("req") ProjectListReq req); } diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/mapper/ProjectMapper.xml b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/mapper/ProjectMapper.xml index defa0af..3ddb4ae 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/mapper/ProjectMapper.xml +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/mapper/ProjectMapper.xml @@ -49,7 +49,7 @@ create_on, update_on FROM nd_project p - WHERE p.newest = TRUE + WHERE p.newest = 1 and p.id = #{req.id} @@ -140,7 +140,7 @@ FROM gov_biz_project_baseinfo b LEFT JOIN gov_biz_project_apply apply ON b.base_proj_id = apply.base_proj_id LEFT JOIN gov_biz_project_approve approve ON b.base_proj_id = approve.base_proj_id - WHERE b.deleted = false + WHERE b.deleted = 0 and b.id = #{req.id} @@ -231,7 +231,7 @@ FROM gov_operation_project_baseinfo b LEFT JOIN gov_biz_project_apply apply ON b.base_proj_id = apply.base_proj_id LEFT JOIN gov_biz_project_approve approve ON b.base_proj_id = approve.base_proj_id - WHERE b.deleted = false + WHERE b.deleted = 0 and b.id = #{req.id} @@ -298,7 +298,7 @@ ) ORDER BY update_on DESC - diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/user/security/auth/config/RedisSessionConfig.java b/hz-pm-api/src/main/java/com/hz/pm/api/user/security/auth/config/RedisSessionConfig.java index 2a80976..c3d5801 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/user/security/auth/config/RedisSessionConfig.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/user/security/auth/config/RedisSessionConfig.java @@ -13,9 +13,8 @@ import org.springframework.session.web.http.DefaultCookieSerializer; * 设置session的过期时间为一天 *

* - * @Author LiuXinXin - * @Date 2020/7/29 9:46 上午 - * @Version 1.0 + * @author LiuXinXin + * @since 2020/7/29 9:46 上午 **/ @Configuration @EnableRedisHttpSession diff --git a/hz-pm-api/src/main/resources/application-dev.yml b/hz-pm-api/src/main/resources/application-dev.yml index f6f9533..d1b96e5 100644 --- a/hz-pm-api/src/main/resources/application-dev.yml +++ b/hz-pm-api/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 68888 + port: 8002 servlet: context-path: /hzpm @@ -16,7 +16,7 @@ spring: timeout: 5000 host: 47.98.125.47 port: 26379 - database: 4 + database: 5 password: Ndkj1234 jedis: pool: @@ -25,7 +25,7 @@ spring: min-idle: 8 max-wait: 10000 application: - name: pm + name: hzpm jackson: default-property-inclusion: non_null time-zone: GMT+8 @@ -74,8 +74,8 @@ mybatis-plus: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl global-config: db-config: - logic-delete-value: true - logic-not-delete-value: false + logic-delete-value: 1 + logic-not-delete-value: 0 logging: config: classpath:logback-spring.xml #日志配置