调整生成代码文件传参

Controllers/Client/MakeCodeController.cs

@@ -45,6 +45,7 @@ namespace Controllers.Client
                 Function.WriteLog(loginUser.username, "测试生成代码");
                 Function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(param), "测试生成代码");
                 ProjectService baseInfo = IProject.getProjectService(param.serviceId);
+                string versionNo = baseInfo.devLanguage + "-" + DateTime.Now.ToString("yyyyMMddHHmmssfff");
                 Function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(baseInfo), "测试生成代码");
                 List<int> databaseIds = baseInfo.databaseList.ToList();
                 Function.WriteLog("databaseIds:" + databaseIds.Count.ToString(), "测试生成代码");
@@ -54,11 +55,11 @@ namespace Controllers.Client
                     Function.WriteLog("tables:" + tables.Count.ToString(), "测试生成代码");
                     foreach(var table in tables)
                     {
-                        _DatabaseTableService.makeJavaModel(baseInfo, table, loginUser);
-                        _DatabaseTableService.makeJavaService(baseInfo, table, loginUser);
-                        _DatabaseTableService.makeJavaServiceImpl(baseInfo, table, loginUser);
-                        _DatabaseTableService.makeJavaMapper(baseInfo, table, loginUser);
-                        _DatabaseTableService.makeJavaMapperXml(baseInfo, table, loginUser);
+                        _DatabaseTableService.makeJavaModel(baseInfo, table, loginUser, versionNo);
+                        _DatabaseTableService.makeJavaService(baseInfo, table, loginUser, versionNo);
+                        _DatabaseTableService.makeJavaServiceImpl(baseInfo, table, loginUser, versionNo);
+                        _DatabaseTableService.makeJavaMapper(baseInfo, table, loginUser, versionNo);
+                        _DatabaseTableService.makeJavaMapperXml(baseInfo, table, loginUser, versionNo);
                     }
                 }
                 var apiGroups = _ApiGroupService.GetList(a => a.serviceId == param.serviceId);
@@ -71,17 +72,17 @@ namespace Controllers.Client
                     {
                         if(apiInfo.apiParamCount > 1)
                         {
-                            _DatabaseTableService.makeJavaDto(baseInfo, apiInfo, loginUser);
+                            _DatabaseTableService.makeJavaDto(baseInfo, apiInfo, loginUser, versionNo);
                         }
                         if(apiInfo.apiResParamCount > 0)
                         {
-                            _DatabaseTableService.makeJavaVo(baseInfo, apiInfo, loginUser);
+                            _DatabaseTableService.makeJavaVo(baseInfo, apiInfo, loginUser, versionNo);
                         }
                     }
                     List<string> controllerNameList = _ApiInfoService.GetList(m => m.serviceId == baseInfo.id).Select(m => m.controllerName).Distinct().ToList();
                     foreach(var controllerName in controllerNameList)
                     {
-                        _DatabaseTableService.makeJavaController(baseInfo, apiGroup, controllerName, loginUser);
+                        _DatabaseTableService.makeJavaController(baseInfo, apiGroup, controllerName, loginUser, versionNo);
                     }
                 }
                 Function.WriteLog("end\n\n\n", "测试生成代码");

Model/Custom/ProjectService.cs

@@ -9,6 +9,12 @@ namespace Custom
         /// ID
         /// </summary>
         public int id { get; set; }
+        
+
+        /// <summary>
+        /// 项目ID
+        /// </summary>
+        public int projectId { get; set; }
 
 
         /// <summary>

Services/DatabaseTableService.cs

@@ -223,7 +223,7 @@ namespace Services
         /// 生成java代码-model
         /// </summary>
         /// <returns>生成java代码-model</returns>
-        public void makeJavaModel(ProjectService baseInfo, DatabaseTable table, TokenModel loginUser)
+        public void makeJavaModel(ProjectService baseInfo, DatabaseTable table, TokenModel loginUser, string versionNo)
         {
             List<DatabaseField> fields = _DatabaseFieldService.GetList(m => m.tableId == table.id);
 
@@ -233,7 +233,7 @@ namespace Services
             pushData.Add("projectService", baseInfo);
             pushData.Add("databaseTable", table);
             pushData.Add("databaseFields", fields);
-            MakeHelper.Push(pushData, "model", "javaModel", loginUser.username);
+            MakeHelper.Push(pushData, "model", "javaModel", loginUser.username, "0", versionNo);
         }
 
 
@@ -241,7 +241,7 @@ namespace Services
         /// 生成java代码-service
         /// </summary>
         /// <returns>生成java代码-service</returns>
-        public void makeJavaService(ProjectService baseInfo, DatabaseTable table, TokenModel loginUser)
+        public void makeJavaService(ProjectService baseInfo, DatabaseTable table, TokenModel loginUser, string versionNo)
         {
             var apiInfos = _ApiInfoService.GetList(m => m.serviceId == baseInfo.id && m.linkTableId == table.id && m.apiKind < 3);
             foreach(ApiInfo apiInfo in apiInfos)
@@ -263,7 +263,7 @@ namespace Services
             pushData.Add("projectService", baseInfo);
             pushData.Add("databaseTable", table);
             pushData.Add("apiInfos", apiInfos);
-            MakeHelper.Push(pushData, "service", "javaService", loginUser.username);
+            MakeHelper.Push(pushData, "service", "javaService", loginUser.username, "0", versionNo);
         }
 
 
@@ -271,7 +271,7 @@ namespace Services
         /// 生成java代码-serviceImpl
         /// </summary>
         /// <returns>生成java代码-serviceImpl</returns>
-        public void makeJavaServiceImpl(ProjectService baseInfo, DatabaseTable table, TokenModel loginUser)
+        public void makeJavaServiceImpl(ProjectService baseInfo, DatabaseTable table, TokenModel loginUser, string versionNo)
         {
             var apiInfos = _ApiInfoService.GetList(m => m.serviceId == baseInfo.id && m.linkTableId == table.id && m.apiKind < 3);
             foreach(ApiInfo apiInfo in apiInfos)
@@ -293,7 +293,7 @@ namespace Services
             pushData.Add("projectService", baseInfo);
             pushData.Add("databaseTable", table);
             pushData.Add("apiInfos", apiInfos);
-            MakeHelper.Push(pushData, "serviceImpl", "javaServiceImpl", loginUser.username);
+            MakeHelper.Push(pushData, "serviceImpl", "javaServiceImpl", loginUser.username, "0", versionNo);
         }
 
 
@@ -301,7 +301,7 @@ namespace Services
         /// 生成java代码-dto
         /// </summary>
         /// <returns>生成java代码-dto</returns>
-        public void makeJavaDto(ProjectService baseInfo, ApiInfo apiInfo, TokenModel loginUser)
+        public void makeJavaDto(ProjectService baseInfo, ApiInfo apiInfo, TokenModel loginUser, string versionNo)
         {
             var apiGroup = _ApiGroupService.GetFirst(m => m.id == apiInfo.groupId) ?? new ApiGroup();
 
@@ -312,7 +312,7 @@ namespace Services
             pushData.Add("apiInfo", apiInfo);
             pushData.Add("apiGroup", apiGroup);
             pushData.Add("databaseFields", apiInfo.apiParam.Where(m => m.reqParam).ToList());
-            MakeHelper.Push(pushData, "dto", "javaDto", loginUser.username);
+            MakeHelper.Push(pushData, "dto", "javaDto", loginUser.username, "0", versionNo);
         }
 
 
@@ -320,7 +320,7 @@ namespace Services
         /// 生成java代码-vo
         /// </summary>
         /// <returns>生成java代码-vo</returns>
-        public void makeJavaVo(ProjectService baseInfo, ApiInfo apiInfo, TokenModel loginUser)
+        public void makeJavaVo(ProjectService baseInfo, ApiInfo apiInfo, TokenModel loginUser, string versionNo)
         {
             var apiGroup = _ApiGroupService.GetFirst(m => m.id == apiInfo.groupId) ?? new ApiGroup();
 
@@ -331,7 +331,7 @@ namespace Services
             pushData.Add("apiInfo", apiInfo);
             pushData.Add("apiGroup", apiGroup);
             pushData.Add("databaseFields", apiInfo.apiParam.Where(m => m.resParam).ToList());
-            MakeHelper.Push(pushData, "vo", "javaVo", loginUser.username);
+            MakeHelper.Push(pushData, "vo", "javaVo", loginUser.username, "0", versionNo);
         }
 
 
@@ -339,14 +339,14 @@ namespace Services
         /// 生成java代码-mapper
         /// </summary>
         /// <returns>生成java代码-mapper</returns>
-        public void makeJavaMapper(ProjectService baseInfo, DatabaseTable table, TokenModel loginUser)
+        public void makeJavaMapper(ProjectService baseInfo, DatabaseTable table, TokenModel loginUser, string versionNo)
         {
             Dictionary<string, object> pushData = new Dictionary<string, object>();
             pushData.Add("since", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
             pushData.Add("author", loginUser.username);
             pushData.Add("projectService", baseInfo);
             pushData.Add("databaseTable", table);
-            MakeHelper.Push(pushData, "mapper", "javaMapper", loginUser.username);
+            MakeHelper.Push(pushData, "mapper", "javaMapper", loginUser.username, "0", versionNo);
         }
 
 
@@ -354,7 +354,7 @@ namespace Services
         /// 生成java代码-mapperXml
         /// </summary>
         /// <returns>生成java代码-mapperXml</returns>
-        public void makeJavaMapperXml(ProjectService baseInfo, DatabaseTable table, TokenModel loginUser)
+        public void makeJavaMapperXml(ProjectService baseInfo, DatabaseTable table, TokenModel loginUser, string versionNo)
         {
             List<DatabaseField> fields = _DatabaseFieldService.GetList(m => m.tableId == table.id);
             
@@ -364,7 +364,7 @@ namespace Services
             pushData.Add("projectService", baseInfo);
             pushData.Add("databaseTable", table);
             pushData.Add("databaseFields", fields);
-            MakeHelper.Push(pushData, "mapperXml", "javaMapperXml", loginUser.username);
+            MakeHelper.Push(pushData, "mapperXml", "javaMapperXml", loginUser.username, "0", versionNo);
         }
 
 
@@ -372,7 +372,7 @@ namespace Services
         /// 生成java代码-controller
         /// </summary>
         /// <returns>生成java代码-controller</returns>
-        public void makeJavaController(ProjectService baseInfo, ApiGroup apiGroup, string controllerFilePath, TokenModel loginUser)
+        public void makeJavaController(ProjectService baseInfo, ApiGroup apiGroup, string controllerFilePath, TokenModel loginUser, string versionNo)
         {
             var apiInfos = _ApiInfoService.GetList(m => m.serviceId == baseInfo.id && m.controllerFilePath == controllerFilePath);
 
@@ -393,7 +393,7 @@ namespace Services
             pushData.Add("apiGroup", apiGroup);
             pushData.Add("apiInfos", apiInfos);
             pushData.Add("controllerName", controllerFilePath);
-            MakeHelper.Push(pushData, "controller", "javaController", loginUser.username);
+            MakeHelper.Push(pushData, "controller", "javaController", loginUser.username, "0", versionNo);
         }
     
     

Services/IService/IDatabaseTableService.cs

@@ -48,49 +48,49 @@ namespace Services
         /// 生成java代码-model
         /// </summary>
         /// <returns>生成java代码-model</returns>
-        void makeJavaModel(ProjectService baseInfo, DatabaseTable table, TokenModel loginUser);
+        void makeJavaModel(ProjectService baseInfo, DatabaseTable table, TokenModel loginUser, string versionNo);
 
         /// <summary>
         /// 生成java代码-service
         /// </summary>
         /// <returns>生成java代码-service</returns>
-        void makeJavaService(ProjectService baseInfo, DatabaseTable table, TokenModel loginUser);
+        void makeJavaService(ProjectService baseInfo, DatabaseTable table, TokenModel loginUser, string versionNo);
 
         /// <summary>
         /// 生成java代码-serviceImpl
         /// </summary>
         /// <returns>生成java代码-serviceImpl</returns>
-        void makeJavaServiceImpl(ProjectService baseInfo, DatabaseTable table, TokenModel loginUser);
+        void makeJavaServiceImpl(ProjectService baseInfo, DatabaseTable table, TokenModel loginUser, string versionNo);
 
         /// <summary>
         /// 生成java代码-dto
         /// </summary>
         /// <returns>生成java代码-dto</returns>
-        void makeJavaDto(ProjectService baseInfo, ApiInfo apiInfo, TokenModel loginUser);
+        void makeJavaDto(ProjectService baseInfo, ApiInfo apiInfo, TokenModel loginUser, string versionNo);
 
         /// <summary>
         /// 生成java代码-vo
         /// </summary>
         /// <returns>生成java代码-vo</returns>
-        void makeJavaVo(ProjectService baseInfo, ApiInfo apiInfo, TokenModel loginUser);
+        void makeJavaVo(ProjectService baseInfo, ApiInfo apiInfo, TokenModel loginUser, string versionNo);
 
         /// <summary>
         /// 生成java代码-mapper
         /// </summary>
         /// <returns>生成java代码-mapper</returns>
-        void makeJavaMapper(ProjectService baseInfo, DatabaseTable table, TokenModel loginUser);
+        void makeJavaMapper(ProjectService baseInfo, DatabaseTable table, TokenModel loginUser, string versionNo);
 
         /// <summary>
         /// 生成java代码-mapperXml
         /// </summary>
         /// <returns>生成java代码-mapperXml</returns>
-        void makeJavaMapperXml(ProjectService baseInfo, DatabaseTable table, TokenModel loginUser);
+        void makeJavaMapperXml(ProjectService baseInfo, DatabaseTable table, TokenModel loginUser, string versionNo);
 
         /// <summary>
         /// 生成java代码-controller
         /// </summary>
         /// <returns>生成java代码-controller</returns>
-        void makeJavaController(ProjectService baseInfo, ApiGroup apiGroup, string controllerFilePath, TokenModel loginUser);
+        void makeJavaController(ProjectService baseInfo, ApiGroup apiGroup, string controllerFilePath, TokenModel loginUser, string versionNo);
 
 
     }

Task/MakeHelper.cs

@@ -64,7 +64,7 @@ namespace Tasks
         }
 
 
-        public static void Push(Dictionary<string, object> pushData, string modePath, string fileType, string createBy = "系统", string dataId = "0")
+        public static void Push(Dictionary<string, object> pushData, string modePath, string fileType, string createBy = "系统", string dataId = "0", string versionNo = "0")
         { 
             MakeData makeData = new();
             string requestId = DateTime.Now.ToString("yyyyMMddHHmmssfff") + Function.get_Random(8);
@@ -74,6 +74,7 @@ namespace Tasks
             attach.Add("fileType", fileType);
             attach.Add("dataId", dataId);
             attach.Add("createBy", createBy);
+            attach.Add("versionNo", versionNo);
             makeData.attach = Newtonsoft.Json.JsonConvert.SerializeObject(attach);
             makeData.data = pushData;
             RabbitMQClient.Instance.Push("MakeQueue", Newtonsoft.Json.JsonConvert.SerializeObject(makeData));