From 36754ba47da7a3277d5be183a523c912a1dc4cef Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 31 三月 2022 15:07:08 +0800
Subject: [PATCH] service服务bug修复
---
src/main/java/com/ks/codegenerator/controller/GeneratorController.java | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ks/codegenerator/controller/GeneratorController.java b/src/main/java/com/ks/codegenerator/controller/GeneratorController.java
index 95e3bd8..e32272e 100644
--- a/src/main/java/com/ks/codegenerator/controller/GeneratorController.java
+++ b/src/main/java/com/ks/codegenerator/controller/GeneratorController.java
@@ -1,6 +1,8 @@
package com.ks.codegenerator.controller;
+import com.ks.codegenerator.utils.AndroidBuilder;
import com.ks.codegenerator.utils.ServiceBuilder;
+import com.ks.codegenerator.vo.ServiceVO;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.JsonUtil;
@@ -22,14 +24,21 @@
//鐢熸垚service
@RequestMapping("createService")
- public void service(String name, String pks, String subpks, PrintWriter out, HttpServletRequest request) {
- if (StringUtil.isNullOrEmpty(name) || StringUtil.isNullOrEmpty(pks) || StringUtil.isNullOrEmpty(subpks)) {
- out.print(JsonUtil.loadFalseResult("椤圭洰鍚嶇О锛岄」鐩寘鍚嶏紝搴旂敤鍖呭悕涓嶈兘涓虹┖"));
+ public void service(ServiceVO vo, PrintWriter out, HttpServletRequest request) {
+ if (StringUtil.isNullOrEmpty(vo.getName()) || StringUtil.isNullOrEmpty(vo.getPks()) || StringUtil.isNullOrEmpty(vo.getSubpks()) || StringUtil.isNullOrEmpty(vo.getChineseName())) {
+ out.print(JsonUtil.loadFalseResult("鍙傛暟涓嶅畬鏁�"));
return;
}
+
+ if (StringUtil.isNullOrEmpty(vo.getSqlDataBaseName()) || StringUtil.isNullOrEmpty(vo.getSqlTablePrefix()) || StringUtil.isNullOrEmpty(vo.getMongoDataBaseName())) {
+ out.print(JsonUtil.loadFalseResult("鍙傛暟涓嶅畬鏁�"));
+ return;
+ }
+
+
String rootPath = request.getServletContext().getRealPath("cache");
try {
- String path = new ServiceBuilder().setCacheDir(rootPath).setName(name).setPks(pks).setSubpks(subpks).build();
+ String path = new ServiceBuilder().setCacheDir(rootPath).setName(vo.getName()).setPks(vo.getPks()).setSubpks(vo.getSubpks()).setProjectChineseName(vo.getChineseName()).setMongoDatabaseName(vo.getMongoDataBaseName()).setSqlDatabaseName(vo.getSqlDataBaseName()).setSqlTablePrefix(vo.getSqlTablePrefix()).build();
out.print(JsonUtil.loadTrueResult(path));
} catch (Exception e) {
e.printStackTrace();
@@ -37,10 +46,26 @@
}
}
- @RequestMapping("downloadServiceZIP")
+ @RequestMapping("createAndroid")
+ public void android(String name, String pks, PrintWriter out, HttpServletRequest request) {
+ if (StringUtil.isNullOrEmpty(name) || StringUtil.isNullOrEmpty(pks)) {
+ out.print(JsonUtil.loadFalseResult("椤圭洰鍚嶇О锛岄」鐩寘鍚嶄笉鑳戒负绌�"));
+ return;
+ }
+ String rootPath = request.getServletContext().getRealPath("cache");
+ try {
+ String path = new AndroidBuilder().setCacheDir(rootPath).setName(name).setPks(pks).build();
+ out.print(JsonUtil.loadTrueResult(path));
+ } catch (Exception e) {
+ e.printStackTrace();
+ out.print(JsonUtil.loadFalseResult(e.getMessage()));
+ }
+ }
+
+ @RequestMapping("downloadZIP")
public void downloadServiceZIP(String name, HttpServletResponse response) throws IOException {
if (!new File(name).exists()) {
- response.sendError(406, "闂环宸茶鍒犻櫎");
+ response.sendError(406, "鏂囦欢宸茶鍒犻櫎");
return;
}
response.setHeader("content-disposition", "attachment;filename=" + new File(name).getName());
@@ -57,7 +82,6 @@
out.write(buffer, 0, len);
}
in.close();
-
}
--
Gitblit v1.8.0