diff --git a/SC-boot/linkage-admin/src/main/resources/application-dev.yml b/SC-boot/linkage-admin/src/main/resources/application-dev.yml index d18fe636..9efafc2d 100644 --- a/SC-boot/linkage-admin/src/main/resources/application-dev.yml +++ b/SC-boot/linkage-admin/src/main/resources/application-dev.yml @@ -29,14 +29,14 @@ spring: dynamic: enabled: true seata: false #分布式事务开关 - primary: master #设置默认的数据源或者数据源组,默认值即为master + primary: sc-boot #设置默认的数据源或者数据源组,默认值即为master strict: true #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源 - # datasource: - # master: - # url: jdbc:mysql://${spring.datasource.host}:${spring.datasource.port}/${spring.datasource.dbname}?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=UTC - # username: ${spring.datasource.username} - # password: ${spring.datasource.password} - # driver-class-name: com.mysql.cj.jdbc.Driver +# datasource: +# master: +# url: jdbc:mysql://${spring.datasource.host}:${spring.datasource.port}/${spring.datasource.dbname}?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=UTC +# username: ${spring.datasource.username} +# password: ${spring.datasource.password} +# driver-class-name: com.mysql.cj.jdbc.Driver #===================== Redis配置 ===================== redis: @@ -105,7 +105,7 @@ mybatis-plus: mapper-locations: classpath*:mapper/**/*.xml global-config: db-config: - logic-delete-field: delete_mark # 全局逻辑删除的实体字段名(since 3.3.0,配置后可以忽略不配置步骤2) + logic-delete-field: deleteMark # 全局逻辑删除的实体字段名(since 3.3.0,配置后可以忽略不配置步骤2) logic-delete-value: 1 # 逻辑已删除值(默认为 1) logic-not-delete-value: 0d # 逻辑未删除值(默认为 0) # @TableLogic //实体类配置这个，但前面配置了logic-delete-field于是可以不配置 diff --git a/SC-boot/linkage-common/src/main/java/jnpf/database/config/MybatisPlusMetaObjectHandler.java b/SC-boot/linkage-common/src/main/java/jnpf/database/config/MybatisPlusMetaObjectHandler.java index b3966d9c..35641c47 100644 --- a/SC-boot/linkage-common/src/main/java/jnpf/database/config/MybatisPlusMetaObjectHandler.java +++ b/SC-boot/linkage-common/src/main/java/jnpf/database/config/MybatisPlusMetaObjectHandler.java @@ -5,11 +5,11 @@ import jnpf.base.UserInfo; import jnpf.util.DateUtil; import jnpf.util.UserProvider; import jnpf.util.context.SpringContext; +import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.reflection.MetaObject; +import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Component; -import java.util.Date; - /** * MybatisPlus配置类 * @@ -19,22 +19,31 @@ import java.util.Date; * @date 2019年9月27日 上午9:18 */ @Component +@Slf4j +//@Configuration +//@Intercepts({@Signature(type = Executor.class, method = "update", args = {MappedStatement.class, Object.class})}) public class MybatisPlusMetaObjectHandler implements MetaObjectHandler { - +//@Autowired +private static ApplicationContext applicationContext; private UserProvider userProvider; @Override public void insertFill(MetaObject metaObject) { - userProvider = SpringContext.getBean(UserProvider.class); - UserInfo userInfo= userProvider.get(); - Object enabledMark = this.getFieldValByName("enabledMark", metaObject); +// userProvider= applicationContext.getBean(UserProvider.class); + UserProvider userProvider = SpringContext.getBean(UserProvider.class); + UserInfo userInfo= userProvider.get(); +// 可以在这里填充编码查询到编码规则自动填充 +// TableInfo tableInfo = this.findTableInfo(metaObject); +// String tableName = tableInfo.getTableName(); + log.info("start insert fill ...."); + System.out.println(userInfo); + + Object creatorUserId = this.getFieldValByName("creatorUserId", metaObject); Object creatorTime = this.getFieldValByName("creatorTime", metaObject); - Object creatorUser = this.getFieldValByName("creatorUser", metaObject); - if (enabledMark == null) { - this.setFieldValByName("enabledMark", 1, metaObject); - } + Object creatorUser = this.getFieldValByName("creatorUserName", metaObject); + if (creatorUserId == null) { this.setFieldValByName("creatorUserId", userInfo.getUserId(), metaObject); } @@ -42,18 +51,24 @@ public class MybatisPlusMetaObjectHandler implements MetaObjectHandler { this.setFieldValByName("creatorTime", DateUtil.getNowDate(), metaObject); } if (creatorUser == null) { - this.setFieldValByName("creatorUser", userInfo.getUserId(), metaObject); + this.setFieldValByName("creatorUserName", userInfo.getUserName(), metaObject); } } @Override public void updateFill(MetaObject metaObject) { - userProvider = SpringContext.getBean(UserProvider.class); + log.info("start update fill ...."); + UserProvider userProvider = SpringContext.getBean(UserProvider.class); + System.out.println(userProvider.get()); +// userProvider= applicationContext.getBean(UserProvider.class); UserInfo userInfo = userProvider.get(); - this.setFieldValByName("lastModifyTime", new Date(), metaObject); + + this.setFieldValByName("lastModifyTime", DateUtil.getNowDate(), metaObject); this.setFieldValByName("lastModifyUserId", userInfo.getUserId(), metaObject); - this.setFieldValByName("lastModifyUser", userInfo.getUserId(), metaObject); + this.setFieldValByName("lastModifyUserName", userInfo.getUserName(), metaObject); + Object deleteMark = this.getFieldValByName("deleteMark", metaObject); +// if (deleteMark!=null&&String.valueOf(deleteMark).equals("")) } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/entity/SupplierEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/entity/SupplierEntity.java index 7163904a..f99868ce 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/entity/SupplierEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/entity/SupplierEntity.java @@ -1,8 +1,6 @@ package jnpf.supplier.entity; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.util.Date; @@ -23,22 +21,22 @@ public class SupplierEntity { @TableId("ID") private String id; - @TableField("CREATOR_USER_ID") + @TableField(value = "CREATOR_USER_ID",fill = FieldFill.INSERT) private String creatorUserId; - @TableField("CREATOR_USER_NAME") + @TableField(value = "CREATOR_USER_NAME",fill = FieldFill.INSERT) private String creatorUserName; - @TableField("CREATOR_TIME") + @TableField(value = "CREATOR_TIME",fill = FieldFill.INSERT) private Date creatorTime; - @TableField("LAST_MODIFY_USER_ID") + @TableField(value = "LAST_MODIFY_USER_ID",fill = FieldFill.UPDATE) private String lastModifyUserId; - @TableField("LAST_MODIFY_USER_NAME") + @TableField(value = "LAST_MODIFY_USER_NAME",fill = FieldFill.UPDATE) private String lastModifyUserName; - @TableField("LAST_MODIFY_TIME") + @TableField(value = "LAST_MODIFY_TIME",fill = FieldFill.UPDATE) private Date lastModifyTime; @TableField("DELETE_USER_ID") @@ -51,6 +49,7 @@ public class SupplierEntity { private Date deleteTime; @TableField("DELETE_MARK") + @TableLogic private String deleteMark; @TableField("SUPPLIER_CODE")