AjaxResult问题

boman-api/boman-api-gen/pom.xml

@@ -18,10 +18,10 @@
     <dependencies>
 
         <!-- RuoYi Common Core-->
-        <dependency>
-            <groupId>com.boman</groupId>
-            <artifactId>boman-common-core</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.boman</groupId>-->
+<!--            <artifactId>boman-common-core</artifactId>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>com.boman</groupId>

boman-api/boman-api-system/src/main/java/com/boman/system/api/RemoteDeptService.java

@@ -19,7 +19,7 @@ public interface RemoteDeptService {
      * 功能描述: 根据id查找
      *
      * @param id deptId
-     * @return com.boman.common.core.web.domain.AjaxResult
+     * @return com.boman.domain.dto.AjaxResult
      */
     @GetMapping(value = "/dept/getById/{id}")
     SysDept getById(@PathVariable("id") Long id);
@@ -28,7 +28,7 @@ public interface RemoteDeptService {
      * 功能描述: 拿到部门下所有的部门, 包含传过来的deptId
      *
      * @param deptId deptId
-     * @return com.boman.common.core.web.domain.AjaxResult
+     * @return com.boman.domain.dto.AjaxResult
      */
     @GetMapping("/dept/list/children/depts/{deptId}")
     List<SysDept> listChildrenDepts(@PathVariable(value = "deptId") Long deptId);

boman-api/boman-api-web-core/src/main/java/com/boman/web/core/api/RemoteObjService.java

@@ -22,7 +22,7 @@ public interface RemoteObjService {
      *
      * @param tableName tableName
      * @param pkName    pkName
-     * @return com.boman.common.core.web.domain.AjaxResult
+     * @return com.boman.domain.dto.AjaxResult
      */
     @GetMapping("common/tableName/{tableName}/pkName/{pkName}")
     Long getMaxId(@PathVariable("tableName") String tableName, @PathVariable("pkName") String pkName);
@@ -31,7 +31,7 @@ public interface RemoteObjService {
      * 功能描述: 批量导入数据
      *
      * @param dto dto
-     * @return com.boman.common.core.web.domain.AjaxResult
+     * @return com.boman.domain.dto.AjaxResult
      */
     @PostMapping("web-core/file/common/import")
     AjaxResult importCommonData(@RequestBody ImportExcelDto dto);
@@ -40,7 +40,7 @@ public interface RemoteObjService {
      * 功能描述: 根据表名和自定义字段查找
      *
      * @param dto dto
-     * @return com.boman.common.core.web.domain.AjaxResult
+     * @return com.boman.domain.dto.AjaxResult
      */
     @PostMapping("common/")
     AjaxResult getByMap(@RequestBody FormDataDto dto);

boman-modules/boman-file/src/main/java/com/boman/file/controller/SysFileController.java

@@ -56,7 +56,7 @@ public class SysFileController
         try {
             String url = sysFileService.uploadFileBase64(base64);
             AjaxResult ajax = AjaxResult.success();
-            ajax.put("fileName", FileUtils.getName(url));
+            ajax.put("name", FileUtils.getName(url));
             ajax.put("url", url);
             return ajax;
         } catch (Exception e) {

boman-web-core/src/main/java/com/boman/web/core/controller/AttendanceController.java

@@ -60,7 +60,7 @@ public class AttendanceController {
      *
      * @param tableName tableName
      * @param userName  userName
-     * @return com.boman.common.core.web.domain.AjaxResult
+     * @return com.boman.domain.dto.AjaxResult
      */
     @GetMapping("/attendanceTime/{tableName}/{userName}")
     public AjaxResult attendanceTime(@PathVariable("tableName") String tableName, @PathVariable("userName") String userName) {

boman-web-core/src/main/java/com/boman/web/core/service/TableServiceCmdService.java

@@ -128,7 +128,7 @@ public class TableServiceCmdService {
             buildBillRule(context.getTableName(), commitData, columns);
 
             commitData.put(context.getPkName(), maxId);
-            RowResult rowResult = saveService.insertRow(context, maxId);
+            RowResult rowResult = saveService.insertRow(context.getTableName(), commitData);
             if (RowResult.checkSuccess(rowResult)) {
                 LOGGER.info("保存成功，封装到数据库的数据为: {}", JSON.toJSONString(rowResult.getData()));
                 result = AjaxResult.success(maxId);

boman-web-core/src/main/java/com/boman/web/core/service/attendance/AttendanceService.java

@@ -47,7 +47,7 @@ public interface AttendanceService {
      *
      * @param tableName tableName
      * @param userName  userName
-     * @return com.boman.common.core.web.domain.AjaxResult
+     * @return com.boman.domain.dto.AjaxResult
      */
     JSONObject attendanceTime(String tableName, String userName);
 

boman-web-core/src/main/java/com/boman/web/core/service/attendance/AttendanceServiceImpl.java

@@ -218,7 +218,7 @@ public class AttendanceServiceImpl implements AttendanceService {
      *
      * @param tableName tableName
      * @param userName  userName
-     * @return com.boman.common.core.web.domain.AjaxResult
+     * @return com.boman.domain.dto.AjaxResult
      */
     @Override
     public JSONObject attendanceTime(String tableName, String userName) {

boman-web-core/src/main/java/com/boman/web/core/service/save/BaseSaveServiceImpl.java

@@ -22,18 +22,16 @@ public class BaseSaveServiceImpl implements IBaseSaveService {
 
     @Autowired
     private StandardlyMapper mapper;
-
     /**
      * 功能描述: 保存一行
      *
-     * @param context context
-     * @param maxId   最大的SEQ
+     * @param tableName  tableName
+     * @param commitData commitData
      * @return com.boman.system.common.RowResult
      */
     @Override
-    public RowResult insertRow(TableContext context, Long maxId) {
-        JSONObject commitData = context.getCommitData();
-        int ret = mapper.insert(context.getTableName(), commitData);
+    public RowResult insertRow(String tableName, JSONObject commitData) {
+        int ret = mapper.insert(tableName, commitData);
         if (ret > 0) {
             LOGGER.info("保存成功，保存的数据为：{}", commitData);
             commitData.put(FormDataConstant.SUCCESS_CNT, ret);

boman-web-core/src/main/java/com/boman/web/core/service/save/IBaseSaveService.java

@@ -1,6 +1,7 @@
 package com.boman.web.core.service.save;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.boman.web.core.domain.RowResult;
 import com.boman.web.core.domain.TableContext;
 
@@ -15,10 +16,10 @@ public interface IBaseSaveService {
     /**
      * 功能描述: 保存一行
      *
-     * @param context context
-     * @param maxId   最大的SEQ
+     * @param tableName  tableName
+     * @param commitData commitData
      * @return com.boman.system.common.RowResult
      */
-    RowResult insertRow(TableContext context, Long maxId);
+    RowResult insertRow(String tableName, JSONObject commitData);
 
 }