Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>boman-api</artifactId>
+        <groupId>com.boman</groupId>
+        <version>2.5.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>boman-api-gen</artifactId>
+
+    <description>
+        boman-api-gen生成代码接口模块
+    </description>
+
+    <dependencies>
+
+        <!-- RuoYi Common Core-->
+        <dependency>
+            <groupId>com.boman</groupId>
+            <artifactId>boman-common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.boman</groupId>
+            <artifactId>boman-modules-gen</artifactId>
+            <version>2.5.0</version>
+        </dependency>
+
+    </dependencies>
+
+</project>

boman-api/boman-api-gen/src/main/java/com/boman/gen/api/RemoteGenTableService.java

@@ -0,0 +1,29 @@
+package com.boman.gen.api;
+
+import com.boman.common.core.constant.ServiceNameConstants;
+import com.boman.gen.domain.GenTable;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+/**
+ * 生成代码模块，远程调用入口，如需其他接口，在此添加
+ *
+ * @author shiqian
+ * @date 2021年04月06日 14:22
+ **/
+@FeignClient(contextId = "remoteGenTableService", value = ServiceNameConstants.GEN_SERVICE)
+public interface RemoteGenTableService {
+
+
+    /**
+     * 功能描述: 通过表名查找表信息
+     *
+     * @param tableName tableName
+     * @return GenTable
+     */
+    @GetMapping(value = "/gen/table/{tableName}")
+    GenTable getByTableName(@PathVariable("tableName") String tableName);
+
+
+}

boman-api/pom.xml

@@ -10,6 +10,7 @@
 
     <modules>
         <module>boman-api-system</module>
+        <module>boman-api-gen</module>
     </modules>
 
     <artifactId>boman-api</artifactId>

boman-common/boman-common-core/src/main/java/com/boman/common/core/constant/ServiceNameConstants.java

@@ -21,4 +21,9 @@ public class ServiceNameConstants
      * 文件服务的serviceid
      */
     public static final String FILE_SERVICE = "boman-file";
+
+    /**
+     * 代生成服务的serviceid
+     */
+    public static final String GEN_SERVICE = "boman-gen";
 }

boman-common/boman-common-core/src/main/java/com/boman/common/core/utils/obj/ObjectUtils.java

@@ -20,14 +20,14 @@ public class ObjectUtils {
     private static final String NULL = "null";
     private static final String UNDEFINED = "undefined";
 
-    public static  <T> Collection<T> requiredNonNull(Collection<T> input, String... errorMsg){
+    public static  <T> Collection<T> requireNonNull(Collection<T> input, String... errorMsg){
         if (null == input || input.size() == 0) {
             throw new IllegalArgumentException(errorMsg[0]);
         }
         return input;
     }
 
-    public static long[] requiredNonNull(long[] input, String... errorMsg){
+    public static long[] requireNonNull(long[] input, String... errorMsg){
         if (ArrayUtils.isEmpty(input)) {
             throw new IllegalArgumentException(errorMsg[0]);
         }
@@ -36,7 +36,7 @@ public class ObjectUtils {
     }
 
 
-    public static Long[] requiredNonNull(Long[] input, String... errorMsg){
+    public static Long[] requireNonNull(Long[] input, String... errorMsg){
         if (ArrayUtils.isEmpty(input)) {
             throw new IllegalArgumentException(errorMsg[0]);
         }

boman-modules/boman-gen/src/main/java/com/boman/gen/controller/GenController.java

@@ -95,6 +95,17 @@ public class GenController extends BaseController {
         return dataInfo;
     }
 
+    /**
+     * 功能描述: 根据表名查询表信息
+     *
+     * @param tableName tableName
+     * @return GenTable
+     */
+    @GetMapping(value = "/table/{tableName}")
+    public GenTable getByTableName(@PathVariable String tableName) {
+        return genTableService.selectGenTableByName(tableName);
+    }
+
     /**
      * 导入表结构（保存）
      */

boman-modules/boman-gen/src/main/java/com/boman/gen/controller/MyController.java

@@ -21,7 +21,6 @@ import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 import static com.boman.common.core.utils.obj.ObjectUtils.requireNonNull;
-import static com.boman.common.core.utils.obj.ObjectUtils.requiredNonNull;
 
 /**
  * @author shiqian
@@ -55,11 +54,11 @@ public class MyController extends BaseController {
         // load table and tableColumn
         List<Long> tableIdList = tableList.stream().map(GenTable::getTableId).collect(Collectors.toList());
         List<GenTableColumn> genTableColumns = genTableColumnService.listByTableIdList(tableIdList);
-        requiredNonNull(genTableColumns);
+        requireNonNull(genTableColumns);
         packTableAndInsertToRedis(tableList, genTableColumns);
 
         List<GenTableRelation> relationList = genTableRelationService.selectGenTableRelationList(new GenTableRelation());
-        requiredNonNull(relationList);
+        requireNonNull(relationList);
         // load gen_table_relation表数据到redis
         redisService.setCacheObject(RedisKey.RELATION_INFO, relationList, 12L, TimeUnit.DAYS);
 
@@ -86,7 +85,7 @@ public class MyController extends BaseController {
                     List<GenTable> collect = tableList.stream()
                             .filter(genTable -> genTable.getTableId().equals(childId))
                             .collect(Collectors.toList());
-                    tableListTemp.add(requireNonNull(collect).get(0));
+                    tableListTemp.add(collect.get(0));
                 }
             }
             table.setRelationList(tableListTemp);

boman-modules/boman-gen/src/main/java/com/boman/gen/service/GenTableServiceImpl.java

@@ -98,6 +98,17 @@ public class GenTableServiceImpl implements IGenTableService {
         return genTableMapper.selectDbTableListByNames(tableNames);
     }
 
+    /**
+     * 查询表名称业务信息
+     *
+     * @param tableName 表名称
+     * @return 业务信息
+     */
+    @Override
+    public GenTable selectGenTableByName(String tableName) {
+        return genTableMapper.selectGenTableByName(tableName);
+    }
+
     /**
      * 查询所有表信息
      *

boman-modules/boman-gen/src/main/java/com/boman/gen/service/IGenTableService.java

@@ -37,6 +37,14 @@ public interface IGenTableService
      */
     public List<GenTable> selectDbTableListByNames(String[] tableNames);
 
+    /**
+     * 查询表名称业务信息
+     *
+     * @param tableName 表名称
+     * @return 业务信息
+     */
+    GenTable selectGenTableByName(String tableName);
+
     /**
      * 查询所有表信息
      * 

boman-modules/boman-gen/src/main/resources/mapper/generator/GenTableMapper.xml

@@ -193,7 +193,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="triggerUpdate != null and triggerUpdate != ''">#{triggerUpdate},</if>
 			<if test="triggerDelete != null and triggerDelete != ''">#{triggerDelete},</if>
 			<if test="triggerSubmit != null and triggerSubmit !=''">#{triggerSubmit},</if>
- 			<if test="createBy != null and createBy != ''">#{#{}},</if>
+ 			<if test="createBy != null and createBy != ''">#{createBy},</if>
 			sysdate()
          )
     </insert>

boman-modules/boman-system/pom.xml

@@ -96,6 +96,13 @@
             <version>1.18.4</version>
         </dependency>
 
+<!--        远程调用-->
+        <dependency>
+            <groupId>com.boman</groupId>
+            <artifactId>boman-api-gen</artifactId>
+            <version>2.5.0</version>
+        </dependency>
+
     </dependencies>
 
     <build>

boman-modules/boman-system/src/main/java/com/boman/system/common/FormDataConstant.java

@@ -103,6 +103,9 @@ public class FormDataConstant {
     /**  数据库字段创建时间*/
     public static final String UPDATE_TIME = "UPDATE_TIME";
 
+    /**  数据库字段创建人*/
+    public static final String CREATE_BY = "create_by";
+
     /**  数据库字段创建时间*/
     public static final String CREATE_TIME = "create_time";
 

boman-modules/boman-system/src/main/java/com/boman/system/common/TableServiceCmdService.java

@@ -4,11 +4,13 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.boman.common.core.utils.DateUtils;
+import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.collection.CollectionUtils;
 import com.boman.common.core.utils.obj.ObjectUtils;
 import com.boman.common.core.web.domain.AjaxResult;
 import com.boman.common.redis.RedisKey;
 import com.boman.common.redis.service.RedisService;
+import com.boman.gen.api.RemoteGenTableService;
 import com.boman.gen.controller.MyController;
 import com.boman.gen.domain.GenTable;
 import com.boman.gen.domain.GenTableColumn;
@@ -26,6 +28,7 @@ import org.springframework.web.client.RestTemplate;
 import javax.annotation.Resource;
 import java.sql.Timestamp;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 import static com.boman.common.core.utils.obj.ObjectUtils.*;
@@ -56,6 +59,8 @@ public class TableServiceCmdService {
     private  RestTemplate restTemplate;
     @Resource
     private  ISysDictTypeService dictTypeService;
+    @Resource
+    private RemoteGenTableService remoteGenTableService;
 
     private static final Logger LOGGER = LoggerFactory.getLogger(TableServiceCmdService.class);
 
@@ -118,7 +123,7 @@ public class TableServiceCmdService {
     public AjaxResult objectDelete(BaseTableSaveDTO dto) {
         requireNonNull(dto.getTable());
         Long[] idArr = CollectionUtils.listToArray(dto.getIdList());
-        requiredNonNull(idArr);
+        requireNonNull(idArr);
         // 拿到pkName
         GenTable genTable = getTableFromRedisByTableName(RedisKey.TABLE_INFO, dto.getTable());
         String pkName = IdUtils.getPkName(genTable.getColumns());
@@ -145,7 +150,7 @@ public class TableServiceCmdService {
     public AjaxResult objectLogicDelete(BaseTableSaveDTO dto) {
         requireNonNull(dto.getTable());
         Long[] idArr = CollectionUtils.listToArray(dto.getIdList());
-        requiredNonNull(idArr);
+        requireNonNull(idArr);
 
         // 拿到pkName
         GenTable genTable = getTableFromRedisByTableName(RedisKey.TABLE_INFO, dto.getTable());
@@ -404,34 +409,38 @@ public class TableServiceCmdService {
                 if (!SubmitConstant.NOT_SUBMIT.equals(dbStatus)) {
                     commitDatum.put(SubmitConstant.SUBMIT_RESULT, SubmitConstant.NOT_ALLOWED);
                 } else {
-                    commitDatum.put(SubmitConstant.SUBMIT_USERID, 123);
-                    commitDatum.put(SubmitConstant.SUBMIT_TIME, new Timestamp(System.currentTimeMillis()));
-                    int effective = submitService.handlerSubmit(tableName, pkName, commitDatum, commitDatum.getLong(FormDataConstant.ID));
-                    if (effective > 0) {
-                        commitDatum.put(SubmitConstant.SUBMIT_RESULT, SubmitConstant.SUCCESS);
-                    } else {
-                        commitDatum.put(SubmitConstant.SUBMIT_RESULT, SubmitConstant.FAIL);
-                    }
+                    handlerSubmit(tableName, pkName, commitDatum);
                 }
             } else {
                 // 只有在已提交的情况下才能反提交, 下面是不允许
                 if (!SubmitConstant.SUBMITTED.equals(dbStatus)) {
                     commitDatum.put(SubmitConstant.SUBMIT_RESULT, SubmitConstant.NOT_ALLOWED);
                 } else {
-                    commitDatum.put(SubmitConstant.SUBMIT_USERID, 123);
-                    commitDatum.put(SubmitConstant.SUBMIT_TIME, new Timestamp(System.currentTimeMillis()));
-                    int effective = submitService.handlerSubmit(tableName, pkName, commitDatum, commitDatum.getLong(FormDataConstant.ID));
-                    if (effective > 0) {
-                        commitDatum.put(SubmitConstant.SUBMIT_RESULT, SubmitConstant.SUCCESS);
-                    } else {
-                        commitDatum.put(SubmitConstant.SUBMIT_RESULT, SubmitConstant.FAIL);
-                    }
+                    handlerSubmit(tableName, pkName, commitDatum);
                 }
             }
         }
         return AjaxResult.success(commitData);
     }
 
+    /**
+     * 功能描述: 处理提交和反提交
+     *
+     * @param tableName   tableName
+     * @param pkName      pkName
+     * @param commitDatum 返回给前台的数据
+     */
+    private void handlerSubmit(String tableName, String pkName, JSONObject commitDatum) {
+        commitDatum.put(FormDataConstant.CREATE_BY, SecurityUtils.getUserId());
+        commitDatum.put(FormDataConstant.CREATE_TIME, new Timestamp(System.currentTimeMillis()));
+        int effective = submitService.handlerSubmit(tableName, pkName, commitDatum, commitDatum.getLong(FormDataConstant.ID));
+        if (effective > 0) {
+            commitDatum.put(SubmitConstant.SUBMIT_RESULT, SubmitConstant.SUCCESS);
+        } else {
+            commitDatum.put(SubmitConstant.SUBMIT_RESULT, SubmitConstant.FAIL);
+        }
+    }
+
     private String getStatusFromFormData(JSONObject next, List<JSONObject> commitData) {
         for (JSONObject jsonObject : commitData) {
             if (jsonObject.getLong(FormDataConstant.ID).equals(next.getLong(FormDataConstant.ID))) {
@@ -486,10 +495,25 @@ public class TableServiceCmdService {
         }
         return null;
     }
-    // todo redis中未找到，要去查数据库，然后再塞进去
+
+    /**
+     * 功能描述: 查询表从redis中
+     *
+     * @param redisKeyPrefix 前缀
+     * @param tableName      表名
+     * @return com.boman.gen.domain.GenTable
+     */
     private GenTable getTableFromRedisByTableName(String redisKeyPrefix, String tableName) {
-        GenTable genTable = redisService.getCacheObject(redisKeyPrefix + requireNonNull(tableName));
-        return requireNonNull(genTable, "未找到表对应的信息");
+        String key = requireNonNull(redisKeyPrefix) + requireNonNull(tableName);
+        GenTable genTable = redisService.getCacheObject(key);
+        if (ObjectUtils.isEmpty(genTable)) {
+            genTable = remoteGenTableService.getByTableName(tableName);
+            requireNonNull(genTable, "未找到表对应的信息");
+            // {@link com.boman.gen.controller.MyController.packTableAndInsertToRedis} 失效时间
+            redisService.setCacheObject(key, genTable, 12L, TimeUnit.DAYS);
+        }
+
+        return genTable;
     }
 
     /**
@@ -503,7 +527,7 @@ public class TableServiceCmdService {
      * @return com.boman.common.core.web.domain.AjaxResult
      */
     public AjaxResult getByTableName(BaseTableSaveDTO condition) {
-//        requiredNonNull(condition.getTable(), "表名为空");
+        requireNonNull(condition.getTable(), "表名为空");
         GenTable genTable = getTableFromRedisByTableName(RedisKey.TABLE_INFO, condition.getTable());
         List<GenTableColumn> columns = genTable.getColumns();
         for (GenTableColumn column : columns) {

boman-modules/boman-system/src/main/java/com/boman/system/controller/ObjController.java

@@ -166,16 +166,16 @@ public class ObjController {
 
     /**
      * 功能描述: 表单提交接口, 更改的字段类型和字段值都是一致的
-     *               {
-     *                   "table": "sys_config",
-     *                   "idList": [
-     *                       3
-     *                   ],
-     *                   "fixedData": {
-     *                       "status": "1",
-     *                       "type": "FINISHED"
-     *                   }
-     *
+     *              {
+     *                  "table": "sys_test",
+     *                  "commitData": [
+     *                      {
+     *                          "id": 1,
+     *                          "status": "2",
+     *                          "remark": "提交了吧"
+     *                      }
+     *                  ]
+     *              }
      *
      * @param condition condition
      * @return com.boman.common.core.web.domain.AjaxResult

ruoyi-ui/src/views/index.vue

@@ -442,7 +442,8 @@ export default {
        console.log(that.calendarData)
        for (var i = 0 ; i < that.calendarData.length; i++) {
          // that.ary.push(that.calendarData[i].startDate)
-         that.ary.push(that.calendarData[i].begin_time.slice(0,10))
+         // that.ary.push(that.calendarData[i].begin_time.slice(0,10))
+         that.ary = that.calendarData[i].all_date
          console.log(that.calendarData[i].begin_time)
        }
        console.log(that.ary)
@@ -457,11 +458,11 @@ export default {
           let content = ''
           // console.log(data,37645)
           for (var i = 0 ; i < this.calendarData.length; i++) {
-          this.calendarData[i].begin_time = this.calendarData[i].begin_time.slice(0,10)
+          // this.calendarData[i].begin_time = this.calendarData[i].begin_time.slice(0,10)
             console.log(this.calendarData[i].begin_time,123)
-            if (date === this.calendarData[i].begin_time) {
-              content = this.calendarData[i].schedule_title + ` ` + this.calendarData[i].schedule_type
-            }
+            // if (date === this.calendarData[i].begin_time) {
+              content = this.calendarData[i].remind_type
+            // }
           }
           console.log(content)
           return content