From 1e55d1eade9285e8e595c56063d6ada4ce11311a Mon Sep 17 00:00:00 2001 From: dinggang <2498628697@qq.com> Date: Mon, 12 Dec 2022 08:37:22 +0800 Subject: [PATCH] .. --- config/db/V8.2__add_table.sql | 3 +-- .../common/config/JdbcTemplateFactory.java | 2 +- .../controller/ActTaskController.java | 19 ++++--------------- .../service/impl/ResourceServiceImpl.java | 7 +------ .../src/main/resources/db/V8.2__add_table.sql | 3 +-- 5 files changed, 8 insertions(+), 26 deletions(-) diff --git a/config/db/V8.2__add_table.sql b/config/db/V8.2__add_table.sql index 171d9fa0..b4ac3596 100644 --- a/config/db/V8.2__add_table.sql +++ b/config/db/V8.2__add_table.sql @@ -11,8 +11,7 @@ CREATE TABLE `t_ucs_lc_dept_rel` ( `district_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '地区名称', `type` int(0) NULL DEFAULT NULL COMMENT '部门类型', `lc_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '浪潮部门名称', - `lc_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '浪潮部门ID', - PRIMARY KEY (`ucs_id`) USING BTREE + `lc_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '浪潮部门ID' ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = 'ucs与浪潮部门名称对应表' ROW_FORMAT = Dynamic; SET FOREIGN_KEY_CHECKS = 1; diff --git a/renren-admin/src/main/java/io/renren/common/config/JdbcTemplateFactory.java b/renren-admin/src/main/java/io/renren/common/config/JdbcTemplateFactory.java index 06ce8421..c8ffb707 100644 --- a/renren-admin/src/main/java/io/renren/common/config/JdbcTemplateFactory.java +++ b/renren-admin/src/main/java/io/renren/common/config/JdbcTemplateFactory.java @@ -23,7 +23,7 @@ public class JdbcTemplateFactory { druidDataSource.setTimeBetweenEvictionRunsMillis(properties.getTimeBetweenEvictionRunsMillis()); druidDataSource.setMinEvictableIdleTimeMillis(properties.getMinEvictableIdleTimeMillis()); druidDataSource.setMaxEvictableIdleTimeMillis(properties.getMaxEvictableIdleTimeMillis()); - druidDataSource.setValidationQuery(properties.getValidationQuery()); + druidDataSource.setValidationQuery("select 1 FROM DUAL"); druidDataSource.setValidationQueryTimeout(properties.getValidationQueryTimeout()); druidDataSource.setTestOnBorrow(properties.isTestOnBorrow()); druidDataSource.setTestOnReturn(properties.isTestOnReturn()); diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/controller/ActTaskController.java b/renren-admin/src/main/java/io/renren/modules/activiti/controller/ActTaskController.java index a1ea38d4..af2e5078 100644 --- a/renren-admin/src/main/java/io/renren/modules/activiti/controller/ActTaskController.java +++ b/renren-admin/src/main/java/io/renren/modules/activiti/controller/ActTaskController.java @@ -66,13 +66,6 @@ public class ActTaskController { @Autowired protected TaskService taskService; - private JdbcTemplate lcJdbcTemplate; - - public void setLcJdbcTemplate(JdbcTemplate lcJdbcTemplate) { - this.lcJdbcTemplate = JdbcTemplateFactory.getJdbcTemplate(); - } - - /** * 获取用户任务列表 @@ -453,27 +446,23 @@ public class ActTaskController { @LogOperation("个人中心查询政务云资源申请列表") @ApiImplicitParams({ @ApiImplicitParam(name = "name", value = "业务名称", paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "applyType", value = "申请类型", paramType = "query", dataType = "String"), @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataType = "String"), @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query", required = true, dataType = "Integer"), @ApiImplicitParam(name = "pageSize", value = "分页大小", paramType = "query", required = true, dataType = "Integer") }) - public Result getZwyBusinessList(String name, String applyType, String status, int pageNum, int pageSize) { + public Result getZwyBusinessList(String name, String status, int pageNum, int pageSize) { UserDetail user = SecurityUser.getUser(); JdbcTemplate lcJdbcTemplate = JdbcTemplateFactory.getJdbcTemplate(); StringBuilder sql = new StringBuilder("SELECT BSNUM, BUSINESS_NAME, APPLYTYPE, to_char(CREATE_TIME,'yyyy-mm-dd hh24:mi:ss') AS \"CREATE_TIME\", STATUS " + "FROM VIEW_CLOUD_BUSINESS_INDEX WHERE 1 = 1 AND APPLYTYPE = '01' AND STATUS != '00' AND ACCOUNT = '" + user.getUsername() + "'"); if (!StringUtils.isEmpty(name)) { - sql.append(" AND BUSINESS_NAME LIKE CONCAT('%', ").append(name).append(", '%') "); - } - if (!StringUtils.isEmpty(applyType)) { - sql.append(" AND APPLYTYPE = '").append(applyType).append("'"); + sql.append(" AND BUSINESS_NAME LIKE ('%' || '").append(name).append("' || '%') "); } if (!StringUtils.isEmpty(status)) { sql.append(" AND STATUS = '").append(status).append("'"); } - sql.append("ORDER BY CREATE_TIME DESC"); + sql.append(" ORDER BY CREATE_TIME DESC"); logger.error("--->查询语句{}", sql); try { Map resultMap = new HashMap<>(); @@ -511,7 +500,7 @@ public class ActTaskController { if (!StringUtils.isEmpty(status)) { sql.append(" AND STATUS = '").append(status).append("'"); } - sql.append("ORDER BY CREATE_TIME DESC"); + sql.append(" ORDER BY CREATE_TIME DESC"); logger.error("--->查询语句{}", sql); try { Map resultMap = new HashMap<>(); diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java index 3d9fc8e0..daab8522 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java @@ -251,12 +251,6 @@ public class ResourceServiceImpl extends CrudServiceImpl