guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

高处作业迁移补充

main
zhaoyu 2023-12-26 16:11:26 +08:00
parent c8e4eb4972
commit 42ea8d5208
13 changed files with 160 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/zcloud/controller/bus/RiskWarningController.java
View File

@ -9,6 +9,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@ -41,6 +42,9 @@ import com.zcloud.service.bus.RiskWarningService;
@RequestMapping("/riskwarning")
public class RiskWarningController extends BaseController {
@Value("${http.file.url}")
private String fileUrl;
@Autowired
private RiskWarningService riskwarningService;
@ -197,7 +201,7 @@ public class RiskWarningController extends BaseController {
pd = riskwarningService.findById(pd);
String FILEPATH = pd.get("FILEPATH").toString();
System.out.println(FILEPATH.length());
FileDownload.mfFileDownload(response, Const.HTTPFILEURL + FILEPATH, FILEPATH.substring(FILEPATH.length()<85?28:61, FILEPATH.length()));
FileDownload.mfFileDownload(response, fileUrl + FILEPATH, FILEPATH.substring(FILEPATH.length()<85?28:61, FILEPATH.length()));
}
/**导出到excel
* @param

8
src/main/java/com/zcloud/controller/bus/VideoController.java
View File

@ -8,6 +8,7 @@ import java.util.Map;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@ -38,6 +39,9 @@ import com.zcloud.util.Tools;
@RequestMapping("/video")
public class VideoController extends BaseController {
@Value("${http.file.url}")
private String fileUrl;
@Autowired
private VideoService videoService;
@ -74,8 +78,8 @@ public class VideoController extends BaseController {
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
//Smb.1sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
//pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
Smb.sshSftp(file, fileName,Const.HTTPFILEURL + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
pd.put("FILEPATH", Const.HTTPFILEURL + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
Smb.sshSftp(file, fileName,fileUrl + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
pd.put("FILEPATH", fileUrl + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
}
videoService.save(pd);

6
src/main/java/com/zcloud/controller/emergency/EmergencyDrillAttachmentController.java
View File

@ -7,6 +7,7 @@ import com.zcloud.service.emergency.EmergencyDrillAttachmentService;
import com.zcloud.util.*;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@ -27,6 +28,9 @@ import java.util.*;
@RequestMapping("/emergencydrillattachment")
public class EmergencyDrillAttachmentController extends BaseController {
@Value("${http.file.url}")
private String fileUrl;
@Autowired
private EmergencyDrillAttachmentService emergencydrillattachmentService;
@ -256,7 +260,7 @@ public class EmergencyDrillAttachmentController extends BaseController {
// FileDownload.fileDownload(response, PathUtil.getProjectpath() + FILEPATH, FILENAME);
//// FileDownload.mfFileDownload(response, this.getRequest().getScheme() + "://" + this.getRequest().getServerName() + ":" + this.getRequest().getServerPort() + FILEPATH, FILENAME); //不好用
//服务器
FileDownload.mfFileDownload(response, Const.HTTPFILEURL + FILEPATH, FILENAME);
FileDownload.mfFileDownload(response, fileUrl + FILEPATH, FILENAME);
} catch (Exception e) {
e.printStackTrace();
throw new Exception("=========文件下载异常：可能要下载的文件已经没有了=========");

6
src/main/java/com/zcloud/controller/emergency/EmergencyDrillReportController.java
View File

@ -7,6 +7,7 @@ import com.zcloud.service.emergency.EmergencyDrillReportService;
import com.zcloud.util.*;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@ -27,6 +28,9 @@ import java.util.*;
@RequestMapping("/emergencydrillreport")
public class EmergencyDrillReportController extends BaseController {
@Value("${http.file.url}")
private String fileUrl;
@Autowired
private EmergencyDrillReportService emergencydrillreportService;
@ -258,7 +262,7 @@ public class EmergencyDrillReportController extends BaseController {
// FileDownload.fileDownload(response, PathUtil.getProjectpath() + FILEPATH, FILENAME);
//// FileDownload.mfFileDownload(response, this.getRequest().getScheme() + "://" + this.getRequest().getServerName() + ":" + this.getRequest().getServerPort() + FILEPATH, FILENAME); //不好用
//服务器
FileDownload.mfFileDownload(response, Const.HTTPFILEURL + FILEPATH, FILENAME);
FileDownload.mfFileDownload(response, fileUrl + FILEPATH, FILENAME);
} catch (Exception e) {
e.printStackTrace();
throw new Exception("=========文件下载异常：可能要下载的文件已经没有了=========");

6
src/main/java/com/zcloud/controller/emergency/EmergencyPlanController.java
View File

@ -7,6 +7,7 @@ import com.zcloud.service.emergency.EmergencyPlanService;
import com.zcloud.util.*;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@ -27,6 +28,9 @@ import java.util.*;
@RequestMapping("/emergencyplan")
public class EmergencyPlanController extends BaseController {
@Value("${http.file.url}")
private String fileUrl;
@Autowired
private EmergencyPlanService emergencyplanService;
@ -283,7 +287,7 @@ public class EmergencyPlanController extends BaseController {
// FileDownload.fileDownload(response, PathUtil.getProjectpath() + FILEPATH, FILENAME);
//// FileDownload.mfFileDownload(response, this.getRequest().getScheme() + "://" + this.getRequest().getServerName() + ":" + this.getRequest().getServerPort() + FILEPATH, FILENAME); //不好用
//服务器
FileDownload.mfFileDownload(response, Const.HTTPFILEURL + FILEPATH, FILENAME);
FileDownload.mfFileDownload(response, fileUrl + FILEPATH, FILENAME);
} catch (Exception e) {
e.printStackTrace();
throw new Exception("=========文件下载异常：可能要下载的文件已经没有了=========");

6
src/main/java/com/zcloud/controller/filemanager/MfolderController.java
View File

@ -11,6 +11,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@ -43,6 +44,9 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
@RequestMapping("/mfolder")
public class MfolderController extends BaseController {
@Value("${http.file.url}")
private String fileUrl;
@Autowired
private MfolderService mfolderService;
@ -441,7 +445,7 @@ public class MfolderController extends BaseController {
pd = mfolderService.findById(pd);
String FILEPATH = pd.getString("FILEPATH");
// String fileName = pd.getString("NAME");
FileDownload.mfFileDownload(response, Const.HTTPFILEURL + FILEPATH, FILEPATH.substring(FILEPATH.length()<85?27:60, FILEPATH.length()));
FileDownload.mfFileDownload(response, fileUrl + FILEPATH, FILEPATH.substring(FILEPATH.length()<85?27:60, FILEPATH.length()));
} catch (Exception e) {
e.printStackTrace();
throw new NofileException("=========要下载的文件已经没有了=========");

6
src/main/java/com/zcloud/controller/filemanager/MfolderStipulateController.java
View File

@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@ -40,6 +41,9 @@ import net.sf.json.JSONArray;
@RequestMapping("/mfolderStipulate")
public class MfolderStipulateController extends BaseController {
@Value("${http.file.url}")
private String fileUrl;
@Autowired
private MfolderStipulateService mfolderService;
@ -426,7 +430,7 @@ public class MfolderStipulateController extends BaseController {
pd = mfolderService.findById(pd);
String FILEPATH = pd.getString("FILEPATH");
// String fileName = pd.getString("NAME");
FileDownload.mfFileDownload(response, Const.HTTPFILEURL + FILEPATH, FILEPATH.substring(FILEPATH.length()<85?27:60, FILEPATH.length()));
FileDownload.mfFileDownload(response, fileUrl + FILEPATH, FILEPATH.substring(FILEPATH.length()<85?27:60, FILEPATH.length()));
} catch (Exception e) {
throw new NofileStiException("=========要下载的文件已经没有了=========");
}

8
src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalController.java
View File

@ -24,6 +24,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.shiro.session.Session;
import org.apache.xmlgraphics.xmp.schemas.pdf.PDFAAdapter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@ -45,6 +46,9 @@ import java.util.stream.Collectors;
@RequestMapping("/safetyenvironmental")
public class SafetyEnvironmentalController extends BaseController {
@Value("${http.file.url}")
private String fileUrl;
@Autowired
private SafetyEnvironmentalService safetyenvironmentalService;
@Autowired
@ -653,7 +657,7 @@ public class SafetyEnvironmentalController extends BaseController {
String FILEPATH = pd.getString("INSPECTED_EXPLAIN_FILEPATH");
String FILENAME = pd.getString("INSPECTED_EXPLAIN_FILENAME");
//服务器
FileDownload.mfFileDownload(response, Const.HTTPFILEURL + FILEPATH, FILENAME);
FileDownload.mfFileDownload(response, fileUrl + FILEPATH, FILENAME);
} catch (Exception e) {
e.printStackTrace();
throw new Exception("=========文件下载异常：可能要下载的文件已经没有了=========");
@ -674,7 +678,7 @@ public class SafetyEnvironmentalController extends BaseController {
String FILEPATH = pd.getString("INSPECTED_EXPLAIN_FILEPATH");
String FILENAME = pd.getString("INSPECTED_EXPLAIN_FILENAME");
//服务器
FileDownload.mfFileDownload(response, Const.HTTPFILEURL + FILEPATH, FILENAME);
FileDownload.mfFileDownload(response, fileUrl + FILEPATH, FILENAME);
} catch (Exception e) {
e.printStackTrace();
}

6
src/main/java/com/zcloud/controller/majordangersource/MajorDangerSourceController.java
View File

@ -10,6 +10,7 @@ import com.zcloud.service.majordangersource.MajorDangerSourceLogService;
import com.zcloud.service.majordangersource.MonitoringDeviceDisableService;
import com.zcloud.util.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@ -35,6 +36,9 @@ import javax.servlet.http.HttpServletResponse;
@RequestMapping("/majordangersource")
public class MajorDangerSourceController extends BaseController {
@Value("${http.file.url}")
private String fileUrl;
@Autowired
private MajorDangerSourceService majordangersourceService;
@ -352,7 +356,7 @@ public class MajorDangerSourceController extends BaseController {
// FileDownload.fileDownload(response, PathUtil.getProjectpath() + FILEPATH, FILENAME);
//// FileDownload.mfFileDownload(response, this.getRequest().getScheme() + "://" + this.getRequest().getServerName() + ":" + this.getRequest().getServerPort() + FILEPATH, FILENAME); //不好用
//服务器
FileDownload.mfFileDownload(response, Const.HTTPFILEURL + FILEPATH, FILENAME);
FileDownload.mfFileDownload(response, fileUrl + FILEPATH, FILENAME);
} catch (Exception e) {
e.printStackTrace();
throw new Exception("=========文件下载异常：可能要下载的文件已经没有了=========");

6
src/main/java/com/zcloud/controller/majordangersource/MajorDangerSourceLogController.java
View File

@ -7,6 +7,7 @@ import com.zcloud.service.majordangersource.MajorDangerSourceLogService;
import com.zcloud.util.*;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@ -25,6 +26,9 @@ import java.util.*;
@RequestMapping("/majordangersourcelog")
public class MajorDangerSourceLogController extends BaseController {
@Value("${http.file.url}")
private String fileUrl;
@Autowired
private MajorDangerSourceLogService majorDangerSourceLogService;
@ -267,7 +271,7 @@ public class MajorDangerSourceLogController extends BaseController {
// FileDownload.fileDownload(response, PathUtil.getProjectpath() + FILEPATH, FILENAME);
//// FileDownload.mfFileDownload(response, this.getRequest().getScheme() + "://" + this.getRequest().getServerName() + ":" + this.getRequest().getServerPort() + FILEPATH, FILENAME); //不好用
//服务器
FileDownload.mfFileDownload(response, Const.HTTPFILEURL + FILEPATH, FILENAME);
FileDownload.mfFileDownload(response, fileUrl + FILEPATH, FILENAME);
} catch (Exception e) {
e.printStackTrace();
throw new Exception("=========文件下载异常：可能要下载的文件已经没有了=========");

6
src/main/java/com/zcloud/controller/tzsb/SpecialEquipmentController.java
View File

@ -11,6 +11,7 @@ import com.zcloud.service.tzsb.SpecialEquipmentService;
import com.zcloud.util.*;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@ -31,6 +32,9 @@ import java.util.*;
@RequestMapping("/specialequipment")
public class SpecialEquipmentController extends BaseController {
@Value("${http.file.url}")
private String fileUrl;
@Autowired
private SpecialEquipmentService specialequipmentService;
@Autowired
@ -488,7 +492,7 @@ public class SpecialEquipmentController extends BaseController {
// FileDownload.fileDownload(response, PathUtil.getProjectpath() + FILEPATH, FILENAME);
//// FileDownload.mfFileDownload(response, this.getRequest().getScheme() + "://" + this.getRequest().getServerName() + ":" + this.getRequest().getServerPort() + FILEPATH, FILENAME); //不好用
//服务器
FileDownload.mfFileDownload(response, Const.HTTPFILEURL + FILEPATH, FILENAME);
FileDownload.mfFileDownload(response, fileUrl + FILEPATH, FILENAME);
} catch (Exception e) {
e.printStackTrace();
throw new Exception("=========文件下载异常：可能要下载的文件已经没有了=========");

6
src/main/java/com/zcloud/util/HiddenExcelImgToSessionView.java
View File

@ -18,6 +18,7 @@ import org.apache.poi.ss.usermodel.HorizontalAlignment;
import org.apache.poi.ss.usermodel.VerticalAlignment;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.shiro.session.Session;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.servlet.view.document.AbstractXlsView;
import com.zcloud.entity.PageData;
@ -31,6 +32,9 @@ import net.coobird.thumbnailator.Thumbnails;
*/
public class HiddenExcelImgToSessionView extends AbstractXlsView{
@Value("${http.file.url}")
private String fileUrl;
@Override
protected void buildExcelDocument(Map<String, Object> model,
Workbook workbook, HttpServletRequest request,
@ -38,7 +42,7 @@ public class HiddenExcelImgToSessionView extends AbstractXlsView{
// TODO Auto-generated method stub
String proPath = PathUtil.getProjectpath();
Session session = Jurisdiction.getSession();
String beji = Const.HTTPFILEURL;
String beji = fileUrl;
//beji =beji.replaceAll("\\\\", "/");
// String beji = "https://qgqy.qhdsafety.com/file/";
Date date = new Date();

6
src/main/java/com/zcloud/util/HiddenExcelImgView.java
View File

@ -26,6 +26,7 @@ import org.apache.poi.ss.usermodel.HorizontalAlignment;
import org.apache.poi.ss.usermodel.VerticalAlignment;
import org.apache.poi.ss.usermodel.Workbook;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.servlet.view.document.AbstractXlsView;
import com.zcloud.entity.PageData;
@ -37,13 +38,16 @@ import com.zcloud.entity.PageData;
*/
public class HiddenExcelImgView extends AbstractXlsView{
@Value("${http.file.url}")
private String fileUrl;
@Override
protected void buildExcelDocument(Map<String, Object> model,
Workbook workbook, HttpServletRequest request,
HttpServletResponse response) throws Exception {
// TODO Auto-generated method stub
String proPath = PathUtil.getProjectpath();
String beji = Const.HTTPFILEURL;
String beji = fileUrl;
//beji =beji.replaceAll("\\\\", "/");
Date date = new Date();