diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dfm/controller/BaseController.java b/ruoyi-admin/src/main/java/com/ruoyi/dfm/controller/BaseController.java
index 3be2747e6..d24577ee4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/dfm/controller/BaseController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/dfm/controller/BaseController.java
@@ -13,7 +13,9 @@ public class BaseController {
{
PrintWriter out = res.getWriter();
res.setContentType("text/html");
+ res.setHeader("Content-Type","text/json;charset=utf8");
res.setCharacterEncoding("utf-8");
+ res.setContentType("text/json;charset=utf8");
out.write(msg);
out.flush();
out.close();
@@ -23,7 +25,9 @@ public class BaseController {
{
PrintWriter out = res.getWriter();
res.setContentType("text/json");
+ res.setHeader("Content-Type","text/json;charset=utf8");
res.setCharacterEncoding("utf-8");
+ res.setContentType("text/json;charset=utf8");
out.write(msg);
out.flush();
out.close();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dfm/controller/ProjectController.java b/ruoyi-admin/src/main/java/com/ruoyi/dfm/controller/ProjectController.java
index ca85e2f03..860246841 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/dfm/controller/ProjectController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/dfm/controller/ProjectController.java
@@ -10,12 +10,14 @@ import com.ruoyi.dfm.service.ProjectService;
import com.ruoyi.dfm.service.UserService;
import com.ruoyi.dfm.util.PropertiesUtils;
import com.ruoyi.dfm.util.TimeUtil;
+import com.ruoyi.framework.util.ShiroUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.multipart.MultipartResolver;
@@ -50,16 +52,16 @@ public class ProjectController extends BaseController
public ModelAndView defaultHandle(HttpServletRequest req, HttpServletResponse res)
throws Exception
{
- return new ModelAndView("addProject");
+ return new ModelAndView("dfm/addProject");
}
- @RequestMapping("/getAddPage")
+ @RequestMapping("/add")
public ModelAndView getAddPage(HttpServletRequest req, HttpServletResponse res)
throws Exception
{
- return new ModelAndView("addProject");
+ return new ModelAndView("dfm/addProject");
}
- @RequestMapping("/add")
+ @RequestMapping("/addSave")
public ModelAndView add(HttpServletRequest request, HttpServletResponse res)
throws Exception
{
@@ -167,32 +169,35 @@ public class ProjectController extends BaseController
}
@RequestMapping("/getLastVersion")
- public void getLastVersion(HttpServletRequest req, HttpServletResponse res)
+ @ResponseBody
+ public Project getLastVersion(HttpServletRequest req, HttpServletResponse res)
throws Exception
{
- int uid = getUserInfo(req).getId();
+ int uid = ShiroUtils.getLoginUser().getId();
String projectName = req.getParameter("projectName");
Project project = this.projectService.getLastVersion(uid, projectName);
-
- String msg = "";
- if (project != null)
- {
- //msg = JSONObject.fromObject(project).toString();
- msg = JSON.toJSONString(project);
- }
-
- outputJson(res, msg);
+ return project;
+// String msg = "";
+// if (project != null)
+// {
+// //msg = JSONObject.fromObject(project).toString();
+// msg = JSON.toJSONString(project);
+// }
+//
+// outputJson(res, msg);
}
@RequestMapping("/getAttrValue")
- public void getAttrValue(HttpServletRequest req, HttpServletResponse res) throws Exception
+ @ResponseBody
+ public JSONArray getAttrValue(HttpServletRequest req, HttpServletResponse res) throws Exception
{
String attrName = req.getParameter("attrName");
List list = this.projectService.getAttrValue(attrName);
- String msg = "";
+// String msg = "";
+ JSONArray arr = new JSONArray();
if ((list != null) || (!(list.isEmpty())))
{
- JSONArray arr = new JSONArray();
+
for (int i = 0; i < list.size(); ++i)
{
JSONObject obj = new JSONObject();
@@ -201,10 +206,11 @@ public class ProjectController extends BaseController
obj.put("isDefault", ((Map)list.get(i)).get("F_IS_DEFAULT"));
arr.add(obj);
}
- msg = arr.toString();
+// msg = arr.toString();
}
- outputJson(res, msg);
+// outputJson(res, msg);
+ return arr;
}
@RequestMapping("/queueManage")
diff --git a/ruoyi-admin/src/main/resources/templates/dfm/addProject.html b/ruoyi-admin/src/main/resources/templates/dfm/addProject.html
new file mode 100644
index 000000000..ad381ee24
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/dfm/addProject.html
@@ -0,0 +1,772 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file