From 7d64716cb0d406f21cde03976fd273bd07fdc06f Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期二, 28 九月 2021 11:44:28 +0800
Subject: [PATCH] 更新用户-角色-菜单-权限
---
src/main/java/com/whyc/service/ProjectArchiveManageService.java | 100 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 72 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/whyc/service/ProjectArchiveManageService.java b/src/main/java/com/whyc/service/ProjectArchiveManageService.java
index 494a02c..b2ee024 100644
--- a/src/main/java/com/whyc/service/ProjectArchiveManageService.java
+++ b/src/main/java/com/whyc/service/ProjectArchiveManageService.java
@@ -1,11 +1,15 @@
package com.whyc.service;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
import com.whyc.mapper.ProjectArchiveManageMapper;
import com.whyc.mapper.ProjectManageMapper;
+import com.whyc.mapper.TestPlanMapper;
import com.whyc.pojo.ProjectArchiveExperiment;
import com.whyc.pojo.ProjectArchiveManage;
import com.whyc.pojo.ProjectManage;
+import com.whyc.pojo.TestPlan;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -22,6 +26,7 @@
@Resource
private ProjectManageMapper projectManageMapper;
+
public Response searchDocumentation(ProjectArchiveManage pam) {
Response<Object> response = new Response<>();
@@ -31,8 +36,8 @@
for (int i = 0; i < list.size(); i++) {
HashMap<String, String> map = new HashMap<>();
ProjectArchiveManage projectArchiveManage = list.get(i);
- map.put("鏂囦欢鍚�",projectArchiveManage.getProDocumentName());
- map.put("鏂囦欢璺緞",projectArchiveManage.getProFilePath());
+ map.put("name",projectArchiveManage.getProDocumentName());
+ map.put("url",projectArchiveManage.getProFilePath());
list1.add(map);
}
response.setMsg(1,"鏌ヨ鎴愬姛");
@@ -46,17 +51,29 @@
public Response delDocumentation(ProjectArchiveManage pam) {
Response<Object> response = new Response<>();
+ boolean bl;
try {
- projectArchiveManageMapper.delDocumentation(pam);
+ bl = projectArchiveManageMapper.delDocumentation(pam) > 0;
File file = new File(pam.getProFilePath());
- if (file.exists()){
+ if (file.exists()) {
+ File absoluteFile = file.getAbsoluteFile();
+ String name = absoluteFile.getName();
file.delete();
+ HashMap<Object, Object> map = new HashMap<>();
+ map.put("name", name);
+ map.put("url", pam.getProFilePath());
+ response.setData(map);
}
} catch (Exception e) {
e.printStackTrace();
- return response.setMsg(0,"鍒犻櫎澶辫触");
+ return response.setMsg(0, "鍒犻櫎澶辫触");
}
- response.setMsg(1,"鍒犻櫎鎴愬姛");
+ if (bl) {
+ response.setMsg(1, "鍒犻櫎鎴愬姛");
+ } else {
+ response.setMsg(0, "鍒犻櫎澶辫触");
+ }
+
return response;
}
@@ -75,19 +92,21 @@
return response;
}
- public Response searchArchiveByCondition(ProjectManage projectManage) {
- Response<Object> response = new Response<>();
+ /**
+ * 椤圭洰褰掓。绠＄悊-鏉′欢鏌ヨ
+ *
+ * @param pageNum
+ * @param pageSize
+ * @param projectManage
+ * @return
+ */
+ public Response<PageInfo<ProjectManage>> searchArchiveByCondition(int pageNum, int pageSize, ProjectManage projectManage) {
- try {
- List<ProjectManage> lists = projectManageMapper.searchArchiveByCondition(projectManage);
+ PageHelper.startPage(pageNum, pageSize);
+ List<ProjectManage> lists = projectManageMapper.searchArchiveByCondition(projectManage);
+ PageInfo<ProjectManage> projectManagePageInfo = new PageInfo<>(lists);
+ return new Response<PageInfo<ProjectManage>>().set(1, projectManagePageInfo);
- response.setMsg(1,"鏌ヨ鎴愬姛");
- response.setData(lists);
- } catch (Exception e) {
- e.printStackTrace();
- return response.setMsg(0,"鏌ヨ澶辫触");
- }
- return response;
}
/**
@@ -106,15 +125,15 @@
for (int i = 0; i < lists.size(); i++) {
ProjectArchiveManage pam = lists.get(i);
HashMap<Object, Object> map = new HashMap<>();
- map.put("鏂囨。鍚嶇О",pam.getProDocumentName());
- map.put("鏂囨。鏍煎紡",pam.getProDocumentFormat());
+ map.put("fileName",pam.getProDocumentName());
+ map.put("documentFormat",pam.getProDocumentFormat());
Date proArchiveDate = pam.getProArchiveDate();
String format = "";
if (null != proArchiveDate) {
format = new SimpleDateFormat("yyyy-MM-dd").format(proArchiveDate);
}
- map.put("褰掓。鏃ユ湡", format);
- map.put("涓嬭浇鍦板潃",pam.getProFilePath());
+ map.put("archiveDate", format);
+ map.put("url",pam.getProFilePath());
last.add(map);
}
}
@@ -153,6 +172,7 @@
* @param pam
* @return
*/
+ @Deprecated
public Response searchArchiveExperimentData(ProjectArchiveManage pam) {
Response<Object> response = new Response<>();
List<ProjectArchiveExperiment> lists = projectArchiveManageMapper.searchArchiveExperimentData(pam);
@@ -162,19 +182,19 @@
for (int i = 0; i < lists.size(); i++) {
ProjectArchiveExperiment pae = lists.get(i);
HashMap<Object, Object> map = new HashMap<>();
- map.put("璇曢獙鍚嶇О", pae.getProName2());
+ map.put("testName", pae.getProName2());
Date proUploadDate = pae.getProUploadDate();
String format1 = null;
if (null != proUploadDate) {
format1 = new SimpleDateFormat("yyyy-MM-dd").format(proUploadDate);
}
- map.put("涓婁紶鏃ユ湡", format1);
+ map.put("uploadDate", format1);
Date proArchiveDate = pae.getProArchiveDate();
String format = null;
if (null != proArchiveDate) {
format = new SimpleDateFormat("yyyy-MM-dd").format(proArchiveDate);
}
- map.put("褰掓。鏃ユ湡", format);
+ map.put("archiveDate", format);
// map.put("涓嬭浇鍦板潃",pam.getProFilePath());
last.add(map);
}
@@ -203,21 +223,21 @@
for (int i = 0; i < lists.size(); i++) {
ProjectArchiveManage pam = lists.get(i);
HashMap<Object, Object> map = new HashMap<>();
- map.put("鎴愭灉鍚嶇О", pam.getAchievementName());
- map.put("鎴愭灉绫诲瀷",pam.getAchievementType());
+ map.put("achievementName", pam.getAchievementName());
+ map.put("achievementType",pam.getAchievementType());
Date gainDate = pam.getGainDate();
String str1 = null;
if(null!=gainDate){
str1 = new SimpleDateFormat("yyyy-MM-dd").format(gainDate);
}
- map.put("鍙栧緱/鍙戣〃鏃ユ湡",str1);
+ map.put("publishedDate",str1);
Date proArchiveDate = pam.getProArchiveDate();
String str2 = null;
if(null!=proArchiveDate){
str2 = new SimpleDateFormat("yyyy-MM-dd").format(proArchiveDate);
}
- map.put("褰掓。鏃ユ湡",str2);
+ map.put("archiveDate",str2);
last.add(map);
}
}
@@ -229,4 +249,28 @@
}
return response;
}
+
+
+
+ @Resource
+ private TestPlanMapper testPlanMapper;
+ /**
+ * 椤圭洰褰掓。绠＄悊-璇曢獙鏁版嵁绠＄悊
+ * @param proNameCode
+ * @return
+ */
+ public Response searchArchiveExperimentData(String proNameCode) {
+ Response<Object> response = new Response<>();
+ try {
+ TestPlan testPlan = new TestPlan();
+ testPlan.setProId(proNameCode);
+ List<TestPlan> lists = testPlanMapper.searchArchiveExperimentData(testPlan);
+ response.setMsg(1, "鏌ヨ鎴愬姛");
+ response.setData(lists);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return response.setMsg(0, "鏌ヨ澶辫触");
+ }
+ return response;
+ }
}
--
Gitblit v1.9.1