修复mybatis-plus 自动id BUG

gis_admin/src/main/java/com/gis/admin/service/impl/SysUserServiceImpl.java

@@ -11,6 +11,7 @@ import com.gis.admin.entity.vo.RankVo;
 import com.gis.admin.mapper.SysBaseMapper;
 import com.gis.admin.service.IntegralService;
 import com.gis.common.base.entity.dto.UserPageDateDto;
+import com.gis.common.base.entity.po.LogEntity;
 import com.gis.common.base.exception.BaseRuntimeException;
 import com.gis.common.base.service.IBaseService;
 import com.gis.common.base.service.LogService;
@@ -194,7 +195,6 @@ public Result<SysUserEntity> search(UserPageDateDto param) {
 
 
     private void updatePassword(PasswordDto param) {
-//        SysUserEntity user = this.findByUserName(JwtUtil.getUsername(getToken()));
         SysUserEntity user = this.findByUserName(iBaseService.getUserName());
 
         // 验证原密码
@@ -303,15 +303,12 @@ public Result<SysUserEntity> search(UserPageDateDto param) {
         sysRoleService.saveUserRole(userId, Long.valueOf("2"));
 
         // 保存操作日志
-//        logService.save(new LogEntity(userId,"用户注册","新增用户", request.getRemoteAddr()));
+        logService.save(new LogEntity(userId,"用户注册","新增用户", iBaseService.getRemoteAddr()));
         return Result.success();
     }
 
     @Override
     public Result getRole() {
-//        Condition condition = new Condition(SysRoleEntity.class);
-//        condition.and().andEqualTo("isEnabled", 1);
-//        return Result.success(sysRoleService.findAll(condition));
         LambdaQueryWrapper<SysRoleEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(SysRoleEntity::getIsEnabled, 1);
         return Result.success(sysRoleService.list(wrapper));

gis_application/src/main/resources/application-dev.properties

@@ -59,7 +59,7 @@ server.file.path=E:\\data\\${project.en}_data
 #server.url.prefix=/data/
 #spring.mvc.static-path-pattern=/${server.url.prefix}/**
 #
-#spring.mvc.static-path-pattern=/**
+spring.mvc.static-path-pattern=/**
 ### \u5339\u914D\u8DEF\u5F84\uFF0C \u6CE8\u610Ffile\u540E\u9762\u7684/ \uFF0Cwindows:\\  , linxu:\u5168\u8DEF\u5F84, \u4E0D\u9700\u8981\u7279\u522B\u52A0\u659C\u6760
 spring.resources.static-locations=file:\\${server.file.path}
 

gis_application/src/main/resources/application-sit.properties

@@ -3,7 +3,7 @@
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.druid.username=root
-spring.datasource.druid.url=jdbc:mysql://8.135.106.227:3306/${project.en}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.druid.url=jdbc:mysql://8.135.106.227:3306/${project.en}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
 spring.datasource.druid.password=4dkk2021testproject%
 
 

gis_application/src/main/resources/application.properties

@@ -1,8 +1,5 @@
 server.port=8019
 
-# \u7EDF\u4E00\u8DEF\u5F84\u52A0\u524D\u7F00
-#server.servlet.context-path=/api
-
 spring.profiles.active=dev
 
 
@@ -13,7 +10,7 @@ project.sc=\u798F\u5DDE\u6D77\u519B\u519B\u53F2\u9986
 redis.prefix=${project.en}_token:
 
 # \u5141\u8BB8\u4E0A\u4F20\u6587\u4EF6\u540E\u7F00
-server.file.allow=.jpg,.gif,.png,.ico,.bmp,.jpeg,.zip,.zp,.rar,.mp3,.mp4,.avi,.mov,.4dage,.wav,.wma,.m4a,.obj,.pdf,audio
+server.file.allow=.jpg,.gif,.png,.ico,.bmp,.jpeg,.zip,.zp,.rar,.mp3,.mp4,.avi,.mov,.4dage,.wav,.wma,.m4a,.obj,.pdf,.audio
 
 
 
@@ -27,16 +24,6 @@ spring.servlet.multipart.max-request-size=2048MB
 
 
 
-##\u914D\u7F6E\u81EA\u52A8\u8BC6\u522B\u5B57\u6BB5\u8F6C\u6362
-#mybatis.configuration.mapUnderscoreToCamelCase=true
-#mapper.identity=MYSQL
-#mapper.mappers=tk.mybatis.mapper.common.Mapper
-##pager
-#pagehelper.helper-dialect=mysql
-#pagehelper.params=count=countSql
-#pagehelper.reasonable=false
-#pagehelper.support-methods-arguments=true
-
 #\u5F00\u542Fsql\u65E5\u5FD7
 mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 # \u8BE5\u914D\u7F6E\u5C31\u662F\u5C06\u5E26\u6709\u4E0B\u5212\u7EBF\u7684\u8868\u5B57\u6BB5\u6620\u5C04\u4E3A\u9A7C\u5CF0\u683C\u5F0F\u7684\u5B9E\u4F53\u7C7B\u5C5E\u6027
@@ -59,3 +46,5 @@ mybatis-plus.mapper-locations=classpath*:/mappers/**.xml
 
 
 
+
+

gis_cms/src/main/java/com/gis/cms/entity/po/CommentEntity.java

@@ -13,16 +13,14 @@ import java.io.Serializable;
  * 留言评论
  */
 @Data
-//@Table(name = "tb_comment")
 @TableName(value = "tb_comment")
 public class CommentEntity extends BaseEntity implements Serializable {
 
-    private static final long serialVersionUID = -8093446477843493946L;
 
+    private static final long serialVersionUID = 2117814945936381564L;
     @ApiModelProperty(value = "用户id")
     private Long userId;
 
-
     @ApiModelProperty(value = "留言")
     private String content;
 
@@ -35,16 +33,6 @@ public class CommentEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "是否显示真实姓名： 1：是， 0：否")
     private Integer isRealName;
 
-//    @Transient
-//    @ApiModelProperty(value = "真实姓名")
-//    private String realName;
-//
-//    @Transient
-//    @ApiModelProperty(value = "单位")
-//    private String unit;
-
-//    @ApiModelProperty(value = "昵称")
-//    private String nickName;
 
 
 

gis_cms/src/main/java/com/gis/cms/service/impl/CommentServiceImpl.java

@@ -106,7 +106,6 @@ public class CommentServiceImpl extends ServiceImpl<CommentMapper, CommentEntity
     @Override
     public Result saveEntity(CommentDto param) {
         CommentEntity entity = new CommentEntity();
-//        Long userId = getTokenUserId();
         Long userId = iBaseService.getUserId();
         BeanUtils.copyProperties(param, entity);
         entity.setUserId(userId);

gis_common/pom.xml

@@ -60,22 +60,7 @@
             <artifactId>fastjson</artifactId>
         </dependency>
 
-        <!-- mysql -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
 
-        <!--阿里数据库连接池 -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-        </dependency>
 
         <!-- knife4j aip 包-->
         <dependency>
@@ -95,19 +80,8 @@
         </dependency>
 
 
-        <!--&lt;!&ndash;tk.mybatis 依赖&ndash;&gt;-->
-        <!--<dependency>-->
-            <!--<groupId>tk.mybatis</groupId>-->
-            <!--<artifactId>mapper-spring-boot-starter</artifactId>-->
-        <!--</dependency>-->
 
 
-        <!--&lt;!&ndash;分页插件&ndash;&gt;-->
-        <!--<dependency>-->
-            <!--<groupId>com.github.pagehelper</groupId>-->
-            <!--<artifactId>pagehelper-spring-boot-starter</artifactId>-->
-        <!--</dependency>-->
-
         <!-- jwt -->
         <dependency>
             <groupId>com.auth0</groupId>
@@ -119,12 +93,23 @@
             <artifactId>jjwt</artifactId>
         </dependency>
 
-        <!-- 对象拷贝 -->
-        <!--<dependency>-->
-            <!--<groupId>cglib</groupId>-->
-            <!--<artifactId>cglib</artifactId>-->
-            <!--<version>3.2.5</version>-->
-        <!--</dependency>-->
+        <!-- mysql -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+
+        <!--阿里数据库连接池 -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+        </dependency>
+
 
     </dependencies>
 

gis_common/src/main/java/com/gis/common/base/entity/po/BaseEntity.java

@@ -1,6 +1,10 @@
 package com.gis.common.base.entity.po;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,15 +18,18 @@ public abstract class BaseEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @TableId(type = IdType.AUTO)  // mybatis-plus id自增
     @Column(name = "id")
     @ApiModelProperty(value = "对象ID")
     private Long id;
 
+    @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间")
 //    @Temporal(TemporalType.TIMESTAMP)
 //    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     @ApiModelProperty(value = "修改时间")
 //    @Temporal(TemporalType.TIMESTAMP)
 //    @JSONField(format = "yyyy-MM-dd HH:mm:ss")

gis_common/src/main/java/com/gis/common/base/service/IBaseService.java

@@ -19,6 +19,9 @@ public class IBaseService<T> {
     HttpServletRequest request;
 
 
+    public String getRemoteAddr(){
+        return request.getRemoteAddr();
+    }
 
     public String getToken(){
         return request.getHeader("token");

gis_common/src/main/java/com/gis/common/config/WebMvcConfig.java

@@ -3,6 +3,7 @@ package com.gis.common.config;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.alibaba.fastjson.support.config.FastJsonConfig;
 import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -65,5 +66,11 @@ public class WebMvcConfig implements WebMvcConfigurer {
     }
 
 
+//    @Bean
+//    public MetaObjectHandler metaObjectHandler(){
+//        return new MyBatisPlusMetaObjectHandler();
+//    }
+
+
 
 }

gis_pano/pom.xml

@@ -19,8 +19,4 @@
 
     </dependencies>
 
-
-
-
-
 </project>

pom.xml

@@ -44,12 +44,6 @@
     <shiro.version>1.7.1</shiro.version>
     <jwt.version>3.2.0</jwt.version>
     <jjwt.version>0.6.0</jjwt.version>
-    <!--<aliyun.core.version>4.0.3</aliyun.core.version>-->
-    <!--<aliyun.dysmsapi.version>1.1.0</aliyun.dysmsapi.version>-->
-    <!--<aliyun.oss.version>2.5.0</aliyun.oss.version>-->
-    <!--<tk.mybatis.version>2.0.2</tk.mybatis.version>-->
-    <!--<tk.mapper.version>4.0.3</tk.mapper.version>-->
-    <!--<pagehelper.version>1.2.5</pagehelper.version>-->
   </properties>
 
 
@@ -90,6 +84,12 @@
 
 
 
+      <!-- https://mvnrepository.com/artifact/org.springframework/spring-core -->
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-core</artifactId>
+        <version>5.2.20.RELEASE</version>
+      </dependency>
 
       <!-- springboot -->
       <dependency>
@@ -147,14 +147,6 @@
         <version>${druid.version}</version>
       </dependency>
 
-      <!--aliyun oss-->
-      <!--<dependency>-->
-        <!--<groupId>com.aliyun.oss</groupId>-->
-        <!--<artifactId>aliyun-sdk-oss</artifactId>-->
-        <!--<version>${aliyun.oss.version}</version>-->
-      <!--</dependency>-->
-
-
       <!-- mysql -->
       <dependency>
         <groupId>mysql</groupId>
@@ -211,28 +203,7 @@
       </dependency>
 
 
-      <!--&lt;!&ndash;tk.mybatis 依赖&ndash;&gt;-->
-      <!--<dependency>-->
-        <!--<groupId>tk.mybatis</groupId>-->
-        <!--<artifactId>mapper-spring-boot-starter</artifactId>-->
-        <!--<version>${tk.mybatis.version}</version>-->
-        <!--&lt;!&ndash; tk.mybatis 跟springboot jap 包冲突&ndash;&gt;-->
-        <!--<exclusions>-->
-          <!--<exclusion>-->
-            <!--<groupId>javax.persistence</groupId>-->
-            <!--<artifactId>persistence-api</artifactId>-->
-          <!--</exclusion>-->
-        <!--</exclusions>-->
-
-      <!--</dependency>-->
-
 
-      <!--&lt;!&ndash;分页插件&ndash;&gt;-->
-      <!--<dependency>-->
-        <!--<groupId>com.github.pagehelper</groupId>-->
-        <!--<artifactId>pagehelper-spring-boot-starter</artifactId>-->
-        <!--<version>${pagehelper.version}</version>-->
-      <!--</dependency>-->
 
     </dependencies>
   </dependencyManagement>