增加自动插入创建时间和修改时间等信息，修改代码模板

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java

@@ -5,6 +5,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -25,17 +26,21 @@ public class BaseEntity implements Serializable
     private String searchValue;
 
     /** 创建者 */
+    @TableField(fill = FieldFill.INSERT)
     private String createBy;
 
     /** 创建时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
     /** 更新者 */
+    @TableField(fill = FieldFill.UPDATE)
     private String updateBy;
 
     /** 更新时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(fill = FieldFill.UPDATE)
     private Date updateTime;
 
     /** 备注 */

ruoyi-equity/src/main/java/com/ruoyi/equity/controller/SendMessageRecordController.java

@@ -85,9 +85,9 @@ public class SendMessageRecordController extends BaseController
     @PreAuthorize("@ss.hasPermi('equity:send-message:add')")
     @Log(title = "消息发布", businessType = BusinessType.INSERT)
     @PostMapping
-    public R<Integer> add(@RequestBody SendMessageRecord sendMessageRecord)
+    public AjaxResult add(@RequestBody SendMessageRecord sendMessageRecord)
     {
-        return R.ok(sendMessageRecordService.insertSendMessageRecord(sendMessageRecord));
+        return toAjax(sendMessageRecordService.insertSendMessageRecord(sendMessageRecord));
     }
 
     /**
@@ -97,9 +97,9 @@ public class SendMessageRecordController extends BaseController
     @PreAuthorize("@ss.hasPermi('equity:send-message:edit')")
     @Log(title = "消息发布", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R<Integer> edit(@RequestBody SendMessageRecord sendMessageRecord)
+    public AjaxResult edit(@RequestBody SendMessageRecord sendMessageRecord)
     {
-        return R.ok(sendMessageRecordService.updateSendMessageRecord(sendMessageRecord));
+        return toAjax(sendMessageRecordService.updateSendMessageRecord(sendMessageRecord));
     }
 
     /**

ruoyi-equity/src/main/java/com/ruoyi/equity/controller/ShareholderInfoController.java

@@ -124,8 +124,8 @@ public class ShareholderInfoController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody ShareholderInfo shareholderInfo)
     {
-        int i = shareholderInfoService.insertShareholderInfo(shareholderInfo);
-        return toAjax(i);
+        Boolean state = shareholderInfoService.insertShareholderInfo(shareholderInfo);
+        return toAjax(state);
     }
 
     /**
@@ -135,9 +135,10 @@ public class ShareholderInfoController extends BaseController
     @PreAuthorize("@ss.hasPermi('equity:info:edit')")
     @Log(title = "股东信息", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R<Integer> edit(@RequestBody ShareholderInfo shareholderInfo)
+    public AjaxResult edit(@RequestBody ShareholderInfo shareholderInfo)
     {
-        return R.ok(shareholderInfoService.updateShareholderInfo(shareholderInfo));
+        Boolean state = shareholderInfoService.updateShareholderInfo(shareholderInfo);
+        return toAjax(state);
     }
 
     /**

ruoyi-equity/src/main/java/com/ruoyi/equity/domain/EquityTransferRecord.java

@@ -5,6 +5,7 @@ import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -21,6 +22,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2025-03-04
  */
+@TableName("e_equity_transfer_record")
 @EqualsAndHashCode(callSuper = true)
 @Data
 @ApiModel(value = "EquityTransferRecord", description = "股权转让记录实体")

ruoyi-equity/src/main/java/com/ruoyi/equity/mapper/BecomeShareholderRecordMapper.java

@@ -1,7 +1,10 @@
 package com.ruoyi.equity.mapper;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.equity.domain.BecomeShareholderRecord;
+import com.ruoyi.equity.domain.SendMessageRecord;
 import com.ruoyi.equity.domain.vo.BecomeShareholderRecordVO;
 
 /**
@@ -10,7 +13,7 @@ import com.ruoyi.equity.domain.vo.BecomeShareholderRecordVO;
  * @author ruoyi
  * @date 2025-03-04
  */
-public interface BecomeShareholderRecordMapper 
+public interface BecomeShareholderRecordMapper extends BaseMapper<BecomeShareholderRecord>
 {
     /**
      * 查询股东入股记录

ruoyi-equity/src/main/java/com/ruoyi/equity/service/IBecomeShareholderRecordService.java

@@ -34,7 +34,7 @@ public interface IBecomeShareholderRecordService
      * @param becomeShareholderRecord 股东入股记录
      * @return 结果
      */
-    public int insertBecomeShareholderRecord(BecomeShareholderRecord becomeShareholderRecord);
+    public Boolean insertBecomeShareholderRecord(BecomeShareholderRecord becomeShareholderRecord);
 
     /**
      * 修改股东入股记录
@@ -42,7 +42,7 @@ public interface IBecomeShareholderRecordService
      * @param becomeShareholderRecord 股东入股记录
      * @return 结果
      */
-    public int updateBecomeShareholderRecord(BecomeShareholderRecord becomeShareholderRecord);
+    public Boolean updateBecomeShareholderRecord(BecomeShareholderRecord becomeShareholderRecord);
 
     /**
      * 批量删除股东入股记录

ruoyi-equity/src/main/java/com/ruoyi/equity/service/IEquityTransferRecordService.java

@@ -36,7 +36,7 @@ public interface IEquityTransferRecordService extends IService<EquityTransferRec
      * @param equityTransferRecord 股权转让记录
      * @return 结果
      */
-    public int insertEquityTransferRecord(EquityTransferRecord equityTransferRecord);
+    public Boolean insertEquityTransferRecord(EquityTransferRecord equityTransferRecord);
 
     /**
      * 修改股权转让记录
@@ -44,7 +44,7 @@ public interface IEquityTransferRecordService extends IService<EquityTransferRec
      * @param equityTransferRecord 股权转让记录
      * @return 结果
      */
-    public int updateEquityTransferRecord(EquityTransferRecord equityTransferRecord);
+    public Boolean updateEquityTransferRecord(EquityTransferRecord equityTransferRecord);
 
     /**
      * 批量删除股权转让记录

ruoyi-equity/src/main/java/com/ruoyi/equity/service/ISendMessageRecordService.java

@@ -35,7 +35,7 @@ public interface ISendMessageRecordService extends IService<SendMessageRecord>
      * @param sendMessageRecord 消息发布
      * @return 结果
      */
-    public int insertSendMessageRecord(SendMessageRecord sendMessageRecord);
+    public Boolean insertSendMessageRecord(SendMessageRecord sendMessageRecord);
 
     /**
      * 修改消息发布
@@ -43,7 +43,7 @@ public interface ISendMessageRecordService extends IService<SendMessageRecord>
      * @param sendMessageRecord 消息发布
      * @return 结果
      */
-    public int updateSendMessageRecord(SendMessageRecord sendMessageRecord);
+    public Boolean updateSendMessageRecord(SendMessageRecord sendMessageRecord);
 
     /**
      * 批量删除消息发布

ruoyi-equity/src/main/java/com/ruoyi/equity/service/IShareholderInfoService.java

@@ -37,7 +37,7 @@ public interface IShareholderInfoService extends IService<ShareholderInfo>
      * @param shareholderInfo 股东信息
      * @return 结果
      */
-    public int insertShareholderInfo(ShareholderInfo shareholderInfo);
+    public Boolean insertShareholderInfo(ShareholderInfo shareholderInfo);
 
     /**
      * 修改股东信息
@@ -45,7 +45,7 @@ public interface IShareholderInfoService extends IService<ShareholderInfo>
      * @param shareholderInfo 股东信息
      * @return 结果
      */
-    public int updateShareholderInfo(ShareholderInfo shareholderInfo);
+    public Boolean updateShareholderInfo(ShareholderInfo shareholderInfo);
 
     /**
      * 批量删除股东信息

ruoyi-equity/src/main/java/com/ruoyi/equity/service/impl/BecomeShareholderRecordServiceImpl.java

@@ -11,13 +11,13 @@ import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.equity.domain.EquityChangeRecord;
-import com.ruoyi.equity.domain.EquityMessageRecord;
-import com.ruoyi.equity.domain.ShareholderInfo;
+import com.ruoyi.equity.domain.*;
 import com.ruoyi.equity.domain.vo.BecomeShareholderRecordVO;
 import com.ruoyi.equity.mapper.EquityChangeRecordMapper;
+import com.ruoyi.equity.mapper.EquityTransferRecordMapper;
 import com.ruoyi.equity.mapper.ShareholderInfoMapper;
 import com.ruoyi.equity.service.IEquityChangeRecordService;
 import com.ruoyi.equity.service.IEquityMessageRecordService;
@@ -26,7 +26,6 @@ import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.equity.mapper.BecomeShareholderRecordMapper;
-import com.ruoyi.equity.domain.BecomeShareholderRecord;
 import com.ruoyi.equity.service.IBecomeShareholderRecordService;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -37,7 +36,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @date 2025-03-04
  */
 @Service
-public class BecomeShareholderRecordServiceImpl implements IBecomeShareholderRecordService 
+public class BecomeShareholderRecordServiceImpl extends ServiceImpl<BecomeShareholderRecordMapper, BecomeShareholderRecord> implements IBecomeShareholderRecordService
 {
     @Autowired
     private BecomeShareholderRecordMapper becomeShareholderRecordMapper;
@@ -86,7 +85,7 @@ public class BecomeShareholderRecordServiceImpl implements IBecomeShareholderRec
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int insertBecomeShareholderRecord(BecomeShareholderRecord become)
+    public Boolean insertBecomeShareholderRecord(BecomeShareholderRecord become)
     {
         //校验股东和入股公司是否同一人
         if (become.getShareholderId().equals(become.getCompanyId())){
@@ -174,8 +173,7 @@ public class BecomeShareholderRecordServiceImpl implements IBecomeShareholderRec
         shareholderInfo.setControlledCompany(company.getShareholderId());
         shareholderInfo.setNodeType(company.getNodeType());
         shareholderInfoService.updateShareholderInfo(shareholderInfo);
-        become.setCreateTime(DateUtils.getNowDate());
-        return becomeShareholderRecordMapper.insertBecomeShareholderRecord(become);
+        return this.save(become);
     }
 
     /**
@@ -185,10 +183,9 @@ public class BecomeShareholderRecordServiceImpl implements IBecomeShareholderRec
      * @return 结果
      */
     @Override
-    public int updateBecomeShareholderRecord(BecomeShareholderRecord becomeShareholderRecord)
+    public Boolean updateBecomeShareholderRecord(BecomeShareholderRecord becomeShareholderRecord)
     {
-        becomeShareholderRecord.setUpdateTime(DateUtils.getNowDate());
-        return becomeShareholderRecordMapper.updateBecomeShareholderRecord(becomeShareholderRecord);
+        return this.updateById(becomeShareholderRecord);
     }
 
     /**

ruoyi-equity/src/main/java/com/ruoyi/equity/service/impl/EquityTransferRecordServiceImpl.java

@@ -85,7 +85,7 @@ public class EquityTransferRecordServiceImpl extends ServiceImpl<EquityTransferR
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int insertEquityTransferRecord(EquityTransferRecord equityTransferRecord)
+    public Boolean insertEquityTransferRecord(EquityTransferRecord equityTransferRecord)
     {
         //校验数据，判断转让方是否存在当前转让比例，判断转让后受让方是否超过100
         ShareholderInfo seller = shareholderInfoService.getById(equityTransferRecord.getEquitySellerId());
@@ -175,7 +175,7 @@ public class EquityTransferRecordServiceImpl extends ServiceImpl<EquityTransferR
         shareholderInfoService.updateById(buyer);
 
         equityTransferRecord.setCreateTime(DateUtils.getNowDate());
-        return equityTransferRecordMapper.insertEquityTransferRecord(equityTransferRecord);
+        return this.save(equityTransferRecord);
     }
 
     /**
@@ -185,10 +185,10 @@ public class EquityTransferRecordServiceImpl extends ServiceImpl<EquityTransferR
      * @return 结果
      */
     @Override
-    public int updateEquityTransferRecord(EquityTransferRecord equityTransferRecord)
+    public Boolean updateEquityTransferRecord(EquityTransferRecord equityTransferRecord)
     {
         equityTransferRecord.setUpdateTime(DateUtils.getNowDate());
-        return equityTransferRecordMapper.updateEquityTransferRecord(equityTransferRecord);
+        return this.updateById(equityTransferRecord);
     }
 
     /**

ruoyi-equity/src/main/java/com/ruoyi/equity/service/impl/SendMessageRecordServiceImpl.java

@@ -73,7 +73,7 @@ public class SendMessageRecordServiceImpl extends ServiceImpl<SendMessageRecordM
      * @return 结果
      */
     @Override
-    public int insertSendMessageRecord(SendMessageRecord sendMessageRecord)
+    public Boolean insertSendMessageRecord(SendMessageRecord sendMessageRecord)
     {
         sendMessageRecord.setSendTime(DateUtils.getNowDate());
         //查询当前公司以及所有下级节点
@@ -100,9 +100,7 @@ public class SendMessageRecordServiceImpl extends ServiceImpl<SendMessageRecordM
             //存入消息通知表中
             equityMessageRecordService.saveBatch(messages);
         }
-
-        sendMessageRecord.setCreateTime(DateUtils.getNowDate());
-        return sendMessageRecordMapper.insertSendMessageRecord(sendMessageRecord);
+        return this.save(sendMessageRecord);
     }
 
     /**
@@ -112,10 +110,9 @@ public class SendMessageRecordServiceImpl extends ServiceImpl<SendMessageRecordM
      * @return 结果
      */
     @Override
-    public int updateSendMessageRecord(SendMessageRecord sendMessageRecord)
+    public Boolean updateSendMessageRecord(SendMessageRecord sendMessageRecord)
     {
-        sendMessageRecord.setUpdateTime(DateUtils.getNowDate());
-        return sendMessageRecordMapper.updateSendMessageRecord(sendMessageRecord);
+        return this.updateById(sendMessageRecord);
     }
 
     /**

ruoyi-equity/src/main/java/com/ruoyi/equity/service/impl/ShareholderInfoServiceImpl.java

@@ -74,7 +74,7 @@ public class ShareholderInfoServiceImpl extends ServiceImpl<ShareholderInfoMappe
      * @return 结果
      */
     @Override
-    public int insertShareholderInfo(ShareholderInfo shareholderInfo) {
+    public Boolean insertShareholderInfo(ShareholderInfo shareholderInfo) {
         //校验是主体公司。
         if (shareholderInfo.getIsSubject() == 1){
         ShareholderInfo info = shareholderInfoMapper.getSubjectCompany();
@@ -82,8 +82,7 @@ public class ShareholderInfoServiceImpl extends ServiceImpl<ShareholderInfoMappe
             throw new OnlyOneMainCompanyAllowedException();
         }
         }
-        shareholderInfo.setCreateTime(DateUtils.getNowDate());
-        return shareholderInfoMapper.insertShareholderInfo(shareholderInfo);
+        return this.save(shareholderInfo);
     }
 
     /**
@@ -93,7 +92,7 @@ public class ShareholderInfoServiceImpl extends ServiceImpl<ShareholderInfoMappe
      * @return 结果
      */
     @Override
-    public int updateShareholderInfo(ShareholderInfo shareholderInfo) {
+    public Boolean updateShareholderInfo(ShareholderInfo shareholderInfo) {
         //校验是主体公司。
         if (shareholderInfo.getIsSubject() == 1){
             ShareholderInfo info = shareholderInfoMapper.getSubjectCompany();
@@ -101,8 +100,7 @@ public class ShareholderInfoServiceImpl extends ServiceImpl<ShareholderInfoMappe
                 throw new OnlyOneMainCompanyAllowedException();
             }
         }
-        shareholderInfo.setUpdateTime(DateUtils.getNowDate());
-        return shareholderInfoMapper.updateShareholderInfo(shareholderInfo);
+        return this.updateById(shareholderInfo);
     }
 
     /**

ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyMetaObjectHandler.java

@@ -0,0 +1,39 @@
+package com.ruoyi.framework.config;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.ruoyi.common.utils.SecurityUtils;
+import org.apache.ibatis.reflection.MetaObject;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+@Component
+public class MyMetaObjectHandler implements MetaObjectHandler {
+
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        // 设置创建时间和修改时间为当前时间
+        this.strictInsertFill(metaObject, "createTime", Date.class, new Date());
+        this.strictInsertFill(metaObject, "updateTime", Date.class, new Date());
+
+        // 设置创建人和修改人为当前登录用户，这里假设从某个地方获取当前用户
+        String currentUser = getCurrentUser();
+        this.strictInsertFill(metaObject, "createBy", String.class, currentUser);
+        this.strictInsertFill(metaObject, "updateBy", String.class, currentUser);
+    }
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        // 设置修改时间为当前时间
+        this.strictUpdateFill(metaObject, "updateTime", Date.class, new Date());
+
+        // 设置修改人为当前登录用户，这里假设从某个地方获取当前用户
+        String currentUser = getCurrentUser();
+        this.strictUpdateFill(metaObject, "updateBy", String.class, currentUser);
+    }
+
+    private String getCurrentUser() {
+        // 这里可以根据实际情况获取当前登录用户，例如从 SecurityContext 中获取
+        return SecurityUtils.getUsername(); // 示例返回值
+    }
+}

ruoyi-generator/src/main/resources/vm/java/controller.java.vm

@@ -93,9 +93,9 @@ public class ${ClassName}Controller extends BaseController
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')")
     @Log(title = "${functionName}", businessType = BusinessType.INSERT)
     @PostMapping
-    public R<Integer> add(@RequestBody ${ClassName} ${className})
+    public AjaxResult add(@RequestBody ${ClassName} ${className})
     {
-        return R.ok(${className}Service.insert${ClassName}(${className}));
+        return toAjax(${className}Service.insert${ClassName}(${className}));
     }
 
     /**
@@ -105,9 +105,9 @@ public class ${ClassName}Controller extends BaseController
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')")
     @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R<Integer> edit(@RequestBody ${ClassName} ${className})
+    public AjaxResult edit(@RequestBody ${ClassName} ${className})
     {
-        return R.ok(${className}Service.update${ClassName}(${className}));
+        return toAjax(${className}Service.update${ClassName}(${className}));
     }
 
     /**

ruoyi-generator/src/main/resources/vm/java/service.java.vm

@@ -34,7 +34,7 @@ public interface I${ClassName}Service extends IService<${ClassName}>
      * @param ${className} ${functionName}
      * @return 结果
      */
-    public int insert${ClassName}(${ClassName} ${className});
+    public Boolean insert${ClassName}(${ClassName} ${className});
 
     /**
      * 修改${functionName}
@@ -42,7 +42,7 @@ public interface I${ClassName}Service extends IService<${ClassName}>
      * @param ${className} ${functionName}
      * @return 结果
      */
-    public int update${ClassName}(${ClassName} ${className});
+    public Boolean update${ClassName}(${ClassName} ${className});
 
     /**
      * 批量删除${functionName}

ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm

@@ -67,19 +67,14 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
     @Transactional
 #end
     @Override
-    public int insert${ClassName}(${ClassName} ${className})
+    public Boolean insert${ClassName}(${ClassName} ${className})
     {
-#foreach ($column in $columns)
-#if($column.javaField == 'createTime')
-        ${className}.setCreateTime(DateUtils.getNowDate());
-#end
-#end
 #if($table.sub)
         int rows = ${className}Mapper.insert${ClassName}(${className});
         insert${subClassName}(${className});
         return rows;
 #else
-        return ${className}Mapper.insert${ClassName}(${className});
+        return this.save(${className});
 #end
     }
 
@@ -93,18 +88,13 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
     @Transactional
 #end
     @Override
-    public int update${ClassName}(${ClassName} ${className})
+    public Boolean update${ClassName}(${ClassName} ${className})
     {
-#foreach ($column in $columns)
-#if($column.javaField == 'updateTime')
-        ${className}.setUpdateTime(DateUtils.getNowDate());
-#end
-#end
 #if($table.sub)
         ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}());
         insert${subClassName}(${className});
 #end
-        return ${className}Mapper.update${ClassName}(${className});
+        return this.updateById(${className});
     }
 
     /**