调整到mysql

pom.xml

@@ -132,18 +132,18 @@
             <version>${mybatis-plus.version}</version>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>mysql</groupId>-->
-<!--            <artifactId>mysql-connector-java</artifactId>-->
-<!--            <version>8.0.15</version>-->
-<!--        </dependency>-->
-
         <dependency>
-            <groupId>com.microsoft.sqlserver</groupId>
-            <artifactId>mssql-jdbc</artifactId>
-            <version>8.4.1.jre8</version>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.15</version>
         </dependency>
 
+<!--        <dependency>-->
+<!--            <groupId>com.microsoft.sqlserver</groupId>-->
+<!--            <artifactId>mssql-jdbc</artifactId>-->
+<!--            <version>8.4.1.jre8</version>-->
+<!--        </dependency>-->
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>

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);
     }

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);
     }

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);

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());

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 */

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;
 
     /** 标题 */

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;
 
     /** 标题 */

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;
 
     /**  */

src/main/java/com/qs/serve/modules/qms/service/impl/QmsFormSubmitServiceImpl.java

@@ -75,7 +75,6 @@ public class QmsFormSubmitServiceImpl extends ServiceImpl<QmsFormSubmitMapper,Qm
         //时间
         formSubmit.setSubmitTime(LocalDateTime.now());
         if(formSubmit.getId()==null){
-            formSubmit.setId(IdUtil.getSnowFlakeId());
             this.save(formSubmit);
         }else {
             this.updateById(formSubmit);

src/main/java/com/qs/serve/modules/qms/service/impl/QmsGroupScopeServiceImpl.java

@@ -89,9 +89,6 @@ public class QmsGroupScopeServiceImpl extends ServiceImpl<QmsGroupScopeMapper,Qm
                 list.add(groupScope);
             }
         }
-        list.forEach(obj->{
-            obj.setId(IdUtil.getSnowFlakeId());
-        });
         this.saveBatch(list);
     }
 
@@ -114,7 +111,6 @@ public class QmsGroupScopeServiceImpl extends ServiceImpl<QmsGroupScopeMapper,Qm
                 List<SysUser> 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);

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

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
 

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});
     </insert>
 
     <select id="selectSysOperationLogList" parameterType="com.qs.serve.modules.sys.entity.SysOperationLog" resultMap="sysOperationLogMap">