diff --git a/pom.xml b/pom.xml index 318d3f5e..778ecc67 100644 --- a/pom.xml +++ b/pom.xml @@ -132,18 +132,18 @@ ${mybatis-plus.version} - - - - - - - com.microsoft.sqlserver - mssql-jdbc - 8.4.1.jre8 + mysql + mysql-connector-java + 8.0.15 + + + + + + org.projectlombok lombok diff --git a/src/main/java/com/qs/serve/modules/qms/controller/QmsCategoryController.java b/src/main/java/com/qs/serve/modules/qms/controller/QmsCategoryController.java index c03608de..00630545 100644 --- a/src/main/java/com/qs/serve/modules/qms/controller/QmsCategoryController.java +++ b/src/main/java/com/qs/serve/modules/qms/controller/QmsCategoryController.java @@ -107,7 +107,7 @@ public class QmsCategoryController { @DeleteMapping("/deleteById/{id}") @SysLog(module = SystemModule.QUESTION, title = "问卷分类", biz = BizType.DELETE) @PreAuthorize("hasRole('qms:category:delete')") - public R deleteById(@PathVariable("id") String id){ + public R deleteById(@PathVariable("id") Long id){ boolean result = qmsCategoryService.removeById(id); return R.isTrue(result); } diff --git a/src/main/java/com/qs/serve/modules/qms/controller/QmsFormController.java b/src/main/java/com/qs/serve/modules/qms/controller/QmsFormController.java index ef507687..4e90cf3b 100644 --- a/src/main/java/com/qs/serve/modules/qms/controller/QmsFormController.java +++ b/src/main/java/com/qs/serve/modules/qms/controller/QmsFormController.java @@ -103,7 +103,7 @@ public class QmsFormController { @DeleteMapping("/deleteById/{id}") @SysLog(module = SystemModule.QUESTION, title = "问卷表单", biz = BizType.DELETE) @PreAuthorize("hasRole('qms:form:delete')") - public R deleteById(@PathVariable("id") String id){ + public R deleteById(@PathVariable("id") Long id){ boolean result = qmsFormService.removeById(id); return R.isTrue(result); } diff --git a/src/main/java/com/qs/serve/modules/qms/controller/QmsGroupController.java b/src/main/java/com/qs/serve/modules/qms/controller/QmsGroupController.java index 719c53a9..339f1230 100644 --- a/src/main/java/com/qs/serve/modules/qms/controller/QmsGroupController.java +++ b/src/main/java/com/qs/serve/modules/qms/controller/QmsGroupController.java @@ -230,7 +230,7 @@ public class QmsGroupController { public R save(@RequestBody @Valid QmsGroupBo param){ QmsGroup qmsGroup = CopierUtil.copy(param,new QmsGroup()); QmsForm qmsForm = qmsFormService.getById(qmsGroup.getFormId()); - qmsGroup.setId(IdUtil.getSnowFlakeId()+""); + //qmsGroup.setId(IdUtil.getSnowFlakeId()+""); qmsGroup.setFormContext(qmsForm.getFormContext()); qmsGroup.setVersion(qmsForm.getVersion()); qmsGroup.setPublishState(0); diff --git a/src/main/java/com/qs/serve/modules/qms/controller/api/QmsDraftApiController.java b/src/main/java/com/qs/serve/modules/qms/controller/api/QmsDraftApiController.java index 09a4e07f..b1f9053c 100644 --- a/src/main/java/com/qs/serve/modules/qms/controller/api/QmsDraftApiController.java +++ b/src/main/java/com/qs/serve/modules/qms/controller/api/QmsDraftApiController.java @@ -54,7 +54,6 @@ public class QmsDraftApiController { QmsDraft qmsDraft = qmsDraftService.getUserFormDraft(param.getGroupId()); if(qmsDraft==null){ qmsDraft = new QmsDraft(); - qmsDraft.setId(IdUtil.getSnowFlakeId()); qmsDraft.setGroupId(param.getGroupId()); qmsDraft.setContext(param.getContext()); qmsDraft.setUserId(AuthContextUtils.getWxUserId()); diff --git a/src/main/java/com/qs/serve/modules/qms/entity/QmsDraft.java b/src/main/java/com/qs/serve/modules/qms/entity/QmsDraft.java index f6ada089..d8c89889 100644 --- a/src/main/java/com/qs/serve/modules/qms/entity/QmsDraft.java +++ b/src/main/java/com/qs/serve/modules/qms/entity/QmsDraft.java @@ -26,7 +26,7 @@ public class QmsDraft implements Serializable { private static final long serialVersionUID = 1L; /** id */ - @TableId(type = IdType.INPUT) + @TableId(type = IdType.AUTO) private Long id; /** 用户id */ diff --git a/src/main/java/com/qs/serve/modules/qms/entity/QmsFormSubmit.java b/src/main/java/com/qs/serve/modules/qms/entity/QmsFormSubmit.java index 1ff78437..4e85836d 100644 --- a/src/main/java/com/qs/serve/modules/qms/entity/QmsFormSubmit.java +++ b/src/main/java/com/qs/serve/modules/qms/entity/QmsFormSubmit.java @@ -26,7 +26,7 @@ public class QmsFormSubmit implements Serializable { private static final long serialVersionUID = 1L; /** id */ - @TableId(type = IdType.INPUT) + @TableId(type = IdType.AUTO) private Long id; /** 标题 */ diff --git a/src/main/java/com/qs/serve/modules/qms/entity/QmsGroup.java b/src/main/java/com/qs/serve/modules/qms/entity/QmsGroup.java index 5a0af683..635b2779 100644 --- a/src/main/java/com/qs/serve/modules/qms/entity/QmsGroup.java +++ b/src/main/java/com/qs/serve/modules/qms/entity/QmsGroup.java @@ -32,7 +32,7 @@ public class QmsGroup implements Serializable { private static final long serialVersionUID = 1L; /** id */ - @TableId(type = IdType.INPUT) + @TableId(type = IdType.AUTO) private String id; /** 标题 */ diff --git a/src/main/java/com/qs/serve/modules/qms/entity/QmsGroupScope.java b/src/main/java/com/qs/serve/modules/qms/entity/QmsGroupScope.java index dbc1efa9..1b2454da 100644 --- a/src/main/java/com/qs/serve/modules/qms/entity/QmsGroupScope.java +++ b/src/main/java/com/qs/serve/modules/qms/entity/QmsGroupScope.java @@ -26,7 +26,7 @@ public class QmsGroupScope implements Serializable { private static final long serialVersionUID = 1L; /** */ - @TableId(type = IdType.INPUT) + @TableId(type = IdType.AUTO) private Long id; /** */ diff --git a/src/main/java/com/qs/serve/modules/qms/service/impl/QmsFormSubmitServiceImpl.java b/src/main/java/com/qs/serve/modules/qms/service/impl/QmsFormSubmitServiceImpl.java index 5790bdb5..d394efdd 100644 --- a/src/main/java/com/qs/serve/modules/qms/service/impl/QmsFormSubmitServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/qms/service/impl/QmsFormSubmitServiceImpl.java @@ -75,7 +75,6 @@ public class QmsFormSubmitServiceImpl extends ServiceImpl{ - obj.setId(IdUtil.getSnowFlakeId()); - }); this.saveBatch(list); } @@ -114,7 +111,6 @@ public class QmsGroupScopeServiceImpl extends ServiceImpl sysUsers = sysUserMapper.selectList(lqw); for (SysUser sysUser : sysUsers) { QmsGroupScope groupScope2 = new QmsGroupScope(); - groupScope2.setId(IdUtil.getSnowFlakeId()); groupScope2.setGroupId(groupId); groupScope2.setScopeType(isDeptType?3:4); groupScope2.setFinished(0); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 36016f3b..79aa56a4 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -6,12 +6,14 @@ server: #SpringBoot相关 spring: datasource: - #driver-class-name: com.mysql.cj.jdbc.Driver - driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver - url: jdbc:sqlserver://192.168.0.8:1433;DatabaseName=JSL_QMS - #url: jdbc:mysql://192.168.0.9:3333/qs-base-questionnaire?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true - username: sa - password: 123456Aa + #driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver + #url: jdbc:sqlserver://192.168.0.8:1433;DatabaseName=JSL_QMS + #username: sa + #password: 123456Aa + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://192.168.0.9:3333/qs-base-questionnaire?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true + username: root + password: 123456 redis: database: 4 host: 127.0.0.1 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index e4e8fc03..a882e01d 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -55,6 +55,7 @@ logging: druid.sql.Connection: info com.zaxxer.hikari.pool: info com.zaxxer.hikari.HikariConfig: info + com.qs.serve.modules.sys.mapper.SysOperationLogMapper: info java.io: warn io.netty: info io.undertow: info @@ -63,8 +64,8 @@ logging: # PageHelper分页插件 pagehelper: reasonable: false - helper-dialect: sqlserver -# autoRuntimeDialect: true + #helper-dialect: sqlserver + autoRuntimeDialect: true supportMethodsArguments: true params: count=countSql diff --git a/src/main/resources/mapper/sys/SysOperationLogMapper.xml b/src/main/resources/mapper/sys/SysOperationLogMapper.xml index 103c3138..d9536cea 100644 --- a/src/main/resources/mapper/sys/SysOperationLogMapper.xml +++ b/src/main/resources/mapper/sys/SysOperationLogMapper.xml @@ -58,7 +58,7 @@ err_msg, json_result, elapsed_time, user_agent, create_time, create_by, tenant_id,creator_name) VALUES ( #{title}, #{bizType}, #{interType}, #{codeMethod}, #{reqMethod}, #{reqUrl}, #{reqParam}, #{reqIp}, #{userType}, #{userId}, - #{errMsg}, #{jsonResult}, #{elapsedTime}, #{userAgent}, getdate(), #{userId}, #{tenantId},#{creatorName}); + #{errMsg}, #{jsonResult}, #{elapsedTime}, #{userAgent}, now(), #{userId}, #{tenantId},#{creatorName});