physical3/physical-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
ls
2025-01-16 10:01:09 +08:00
parent a442ef2d72
commit 749ca26f73
29 changed files with 76 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ClientController.java
View File

@@ -140,7 +140,7 @@ public class ClientController extends JeecgController<Client, IClientService> {
* @param request
* @param client
*/
@RequiresPermissions("database:client:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, Client client) {
return super.exportXls(request, client, Client.class, "委托方");
@@ -153,7 +153,7 @@ public class ClientController extends JeecgController<Client, IClientService> {
* @param response
* @return
*/
@RequiresPermissions("database:client:importExcel")
@RequiresPermissions("database:client:add")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, Client.class);

4
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/CnasTestController.java
View File

@@ -140,7 +140,7 @@ public class CnasTestController extends JeecgController<CnasTest, ICnasTestServi
* @param request
* @param cnasTest
*/
@RequiresPermissions("database:cnas_test:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, CnasTest cnasTest) {
return super.exportXls(request, cnasTest, CnasTest.class, "cnas测试参数列表");
@@ -153,7 +153,7 @@ public class CnasTestController extends JeecgController<CnasTest, ICnasTestServi
* @param response
* @return
*/
@RequiresPermissions("database:cnas_test:importExcel")
@RequiresPermissions("database:cnas_test:add")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, CnasTest.class);

4
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ComponentController.java
View File

@@ -140,7 +140,7 @@ public class ComponentController extends JeecgController<Component, IComponentSe
* @param request
* @param component
*/
@RequiresPermissions("database:component:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, Component component) {
return super.exportXls(request, component, Component.class, "元器件");
@@ -153,7 +153,7 @@ public class ComponentController extends JeecgController<Component, IComponentSe
* @param response
* @return
*/
@RequiresPermissions("database:component:importExcel")
@RequiresPermissions("database:component:add")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, Component.class);

4
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/DocumentFavoritesController.java
View File

@@ -170,7 +170,7 @@ public class DocumentFavoritesController extends JeecgController<DocumentFavorit
* @param request
* @param documentFavorites
*/
@RequiresPermissions("database:document_favorites:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, DocumentFavorites documentFavorites) {
return super.exportXls(request, documentFavorites, DocumentFavorites.class, "我的收藏文档");
@@ -183,7 +183,7 @@ public class DocumentFavoritesController extends JeecgController<DocumentFavorit
* @param response
* @return
*/
@RequiresPermissions("database:document_favorites:importExcel")
@RequiresPermissions("database:document_favorites:add")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, DocumentFavorites.class);

3
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/DocumentLibraryController.java
View File

@@ -239,7 +239,6 @@ public class DocumentLibraryController extends JeecgController<DocumentLibrary,
* @param request
* @param documentLibrary
*/
@RequiresPermissions("library:document_library:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, DocumentLibrary documentLibrary) {
return super.exportXls(request, documentLibrary, DocumentLibrary.class, "知识库");
@@ -252,7 +251,7 @@ public class DocumentLibraryController extends JeecgController<DocumentLibrary,
* @param response
* @return
*/
@RequiresPermissions("library:document_library:importExcel")
@RequiresPermissions("library:document_library:add")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, DocumentLibrary.class);

3
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/DocumentVisitHistoryController.java
View File

@@ -140,7 +140,6 @@ public class DocumentVisitHistoryController extends JeecgController<DocumentVisi
* @param request
* @param documentVisitHistory
*/
@RequiresPermissions("library:document_visit_history:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, DocumentVisitHistory documentVisitHistory) {
return super.exportXls(request, documentVisitHistory, DocumentVisitHistory.class, "文档访问历史");
@@ -153,7 +152,7 @@ public class DocumentVisitHistoryController extends JeecgController<DocumentVisi
* @param response
* @return
*/
@RequiresPermissions("library:document_visit_history:importExcel")
@RequiresPermissions("library:document_visit_history:add")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, DocumentVisitHistory.class);

4
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/EquipmentController.java
View File

@@ -147,7 +147,7 @@ public class EquipmentController extends JeecgController<Equipment, IEquipmentSe
* @param request
* @param equipment
*/
@RequiresPermissions("database:equipment:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, Equipment equipment) {
return super.exportXls(request, equipment, Equipment.class, "设备");
@@ -160,7 +160,7 @@ public class EquipmentController extends JeecgController<Equipment, IEquipmentSe
* @param response
* @return
*/
@RequiresPermissions("database:equipment:importExcel")
@RequiresPermissions("database:equipment:add")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, Equipment.class);

4
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentAnnealProcessController.java
View File

@@ -230,7 +230,7 @@ public class ExperimentAnnealProcessController extends JeecgController<Experimen
* @param request
* @param experimentAnnealProcess
*/
@RequiresPermissions("database:experiment_anneal_process:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ExperimentAnnealProcess experimentAnnealProcess) {
return super.exportXls(request, experimentAnnealProcess, ExperimentAnnealProcess.class, "退火过程");
@@ -243,7 +243,7 @@ public class ExperimentAnnealProcessController extends JeecgController<Experimen
* @param response
* @return
*/
@RequiresPermissions("database:experiment_anneal_process:importExcel")
@RequiresPermissions("database:experiment_anneal_process:add")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ExperimentAnnealProcess.class);

4
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
View File

@@ -246,7 +246,7 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
* @param request
* @param experiment
*/
@RequiresPermissions("database:experiment:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, Experiment experiment) {
return super.exportXls(request, experiment, Experiment.class, "试验管理");
@@ -259,7 +259,7 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
* @param response
* @return
*/
@RequiresPermissions("database:experiment:importExcel")
@RequiresPermissions("database:experiment:add")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, Experiment.class);

4
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDeviationConditionController.java
View File

@@ -156,7 +156,7 @@ public class ExperimentDeviationConditionController extends JeecgController<Expe
* @param request
* @param experimentDeviationCondition
*/
@RequiresPermissions("database:experiment_deviation_condition:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ExperimentDeviationCondition experimentDeviationCondition) {
return super.exportXls(request, experimentDeviationCondition, ExperimentDeviationCondition.class, "试验偏置条件信息");
@@ -169,7 +169,7 @@ public class ExperimentDeviationConditionController extends JeecgController<Expe
* @param response
* @return
*/
@RequiresPermissions("database:experiment_deviation_condition:importExcel")
@RequiresPermissions("database:experiment_deviation_condition:add")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ExperimentDeviationCondition.class);

4
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDeviationEquipmentController.java
View File

@@ -156,7 +156,7 @@ public class ExperimentDeviationEquipmentController extends JeecgController<Expe
* @param request
* @param experimentDeviationEquipment
*/
@RequiresPermissions("database:experiment_deviation_equipment:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ExperimentDeviationEquipment experimentDeviationEquipment) {
return super.exportXls(request, experimentDeviationEquipment, ExperimentDeviationEquipment.class, "试验加偏设备信息");
@@ -169,7 +169,7 @@ public class ExperimentDeviationEquipmentController extends JeecgController<Expe
* @param response
* @return
*/
@RequiresPermissions("database:experiment_deviation_equipment:importExcel")
@RequiresPermissions("database:experiment_deviation_equipment:add")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ExperimentDeviationEquipment.class);

4
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDocController.java
View File

@@ -231,7 +231,7 @@ public class ExperimentDocController extends JeecgController<ExperimentDoc, IExp
* @param request
* @param experimentDoc
*/
@RequiresPermissions("database:experiment_doc:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ExperimentDoc experimentDoc) {
return super.exportXls(request, experimentDoc, ExperimentDoc.class, "试验文档");
@@ -244,7 +244,7 @@ public class ExperimentDocController extends JeecgController<ExperimentDoc, IExp
* @param response
* @return
*/
@RequiresPermissions("database:experiment_doc:importExcel")
@RequiresPermissions("database:experiment_doc:add")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ExperimentDoc.class);

3
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentFileController.java
View File

@@ -151,7 +151,6 @@ public class ExperimentFileController extends JeecgController<ExperimentFile, IE
* @param request
* @param experimentFile
*/
@RequiresPermissions("database:experiment:edit")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ExperimentFile experimentFile) {
return super.exportXls(request, experimentFile, ExperimentFile.class, "试验文件");
@@ -164,7 +163,7 @@ public class ExperimentFileController extends JeecgController<ExperimentFile, IE
* @param response
* @return
*/
@RequiresPermissions("database:experiment:edit")
@RequiresPermissions("database:experiment:add")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ExperimentFile.class);

4
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentIrradiationBoardController.java
View File

@@ -156,7 +156,7 @@ public class ExperimentIrradiationBoardController extends JeecgController<Experi
* @param request
* @param experimentIrradiationBoard
*/
@RequiresPermissions("database:experiment_irradiation_board:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ExperimentIrradiationBoard experimentIrradiationBoard) {
return super.exportXls(request, experimentIrradiationBoard, ExperimentIrradiationBoard.class, "试验辐照板信息");
@@ -169,7 +169,7 @@ public class ExperimentIrradiationBoardController extends JeecgController<Experi
* @param response
* @return
*/
@RequiresPermissions("database:experiment_irradiation_board:importExcel")
@RequiresPermissions("database:experiment_irradiation_board:add")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ExperimentIrradiationBoard.class);

4
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentLogController.java
View File

@@ -140,7 +140,7 @@ public class ExperimentLogController extends JeecgController<ExperimentLog, IExp
* @param request
* @param experimentLog
*/
@RequiresPermissions("database:experiment_log:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ExperimentLog experimentLog) {
return super.exportXls(request, experimentLog, ExperimentLog.class, "试验日志");
@@ -153,7 +153,7 @@ public class ExperimentLogController extends JeecgController<ExperimentLog, IExp
* @param response
* @return
*/
@RequiresPermissions("database:experiment_log:importExcel")
@RequiresPermissions("database:experiment_log:add")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ExperimentLog.class);

4
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentRadiationProcessController.java
View File

@@ -248,7 +248,7 @@ public class ExperimentRadiationProcessController extends JeecgController<Experi
* @param request
* @param experimentRadiationProcess
*/
@RequiresPermissions("database:experiment_radiation_process:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ExperimentRadiationProcess experimentRadiationProcess) {
return super.exportXls(request, experimentRadiationProcess, ExperimentRadiationProcess.class, "辐照过程");
@@ -261,7 +261,7 @@ public class ExperimentRadiationProcessController extends JeecgController<Experi
* @param response
* @return
*/
@RequiresPermissions("database:experiment_radiation_process:importExcel")
@RequiresPermissions("database:experiment_radiation_process:add")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ExperimentRadiationProcess.class);

4
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentRatingController.java
View File

@@ -198,7 +198,7 @@ public class ExperimentRatingController extends JeecgController<ExperimentRating
* @param request
* @param experimentRating
*/
@RequiresPermissions("database:experiment_rating:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ExperimentRating experimentRating) {
return super.exportXls(request, experimentRating, ExperimentRating.class, "试验评分");
@@ -211,7 +211,7 @@ public class ExperimentRatingController extends JeecgController<ExperimentRating
* @param response
* @return
*/
@RequiresPermissions("database:experiment_rating:importExcel")
@RequiresPermissions("database:experiment_rating:add")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ExperimentRating.class);

4
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java
View File

@@ -220,7 +220,7 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
* @param request
* @param experimentReport
*/
@RequiresPermissions("database:experiment_report:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ExperimentReport experimentReport) {
return super.exportXls(request, experimentReport, ExperimentReport.class, "试验报告");
@@ -233,7 +233,7 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
* @param response
* @return
*/
@RequiresPermissions("database:experiment_report:importExcel")
@RequiresPermissions("database:experiment_report:add")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ExperimentReport.class);

4
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReviewController.java
View File

@@ -160,7 +160,7 @@ public class ExperimentReviewController extends JeecgController<ExperimentReview
* @param request
* @param experimentReview
*/
@RequiresPermissions("database:experiment_review:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ExperimentReview experimentReview) {
return super.exportXls(request, experimentReview, ExperimentReview.class, "试验评定");
@@ -173,7 +173,7 @@ public class ExperimentReviewController extends JeecgController<ExperimentReview
* @param response
* @return
*/
@RequiresPermissions("database:experiment_review:importExcel")
@RequiresPermissions("database:experiment_review:add")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ExperimentReview.class);

4
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentSampleInfoController.java
View File

@@ -153,7 +153,7 @@ public class ExperimentSampleInfoController extends JeecgController<ExperimentSa
* @param request
* @param experimentSampleInfo
*/
@RequiresPermissions("database:experiment_sample_info:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ExperimentSampleInfo experimentSampleInfo) {
return super.exportXls(request, experimentSampleInfo, ExperimentSampleInfo.class, "试验样品信息");
@@ -166,7 +166,7 @@ public class ExperimentSampleInfoController extends JeecgController<ExperimentSa
* @param response
* @return
*/
@RequiresPermissions("database:experiment_sample_info:importExcel")
@RequiresPermissions("database:experiment_sample_info:add")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ExperimentSampleInfo.class);

4
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentSequenceController.java
View File

@@ -127,7 +127,7 @@ public class ExperimentSequenceController extends JeecgController<ExperimentSequ
// * @param request
// * @param experimentSequence
// */
////@RequiresPermissions("database:experiment_sequence:exportXls")
////
//@RequestMapping(value = "/exportXls")
//public ModelAndView exportXls(HttpServletRequest request, ExperimentSequence experimentSequence) {
// return super.exportXls(request, experimentSequence, ExperimentSequence.class, "试验序列");
@@ -140,7 +140,7 @@ public class ExperimentSequenceController extends JeecgController<ExperimentSequ
// * @param response
// * @return
// */
////@RequiresPermissions("database:experiment_sequence:importExcel")
////@RequiresPermissions("database:experiment_sequence:add")
//@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
//public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
// return super.importExcel(request, response, ExperimentSequence.class);

4
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentTestProcessController.java
View File

@@ -249,7 +249,7 @@ public class ExperimentTestProcessController extends JeecgController<ExperimentT
* @param request
* @param experimentTestProcess
*/
@RequiresPermissions("database:experiment_test_process:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ExperimentTestProcess experimentTestProcess) {
return super.exportXls(request, experimentTestProcess, ExperimentTestProcess.class, "测试过程");
@@ -262,7 +262,7 @@ public class ExperimentTestProcessController extends JeecgController<ExperimentT
* @param response
* @return
*/
@RequiresPermissions("database:experiment_test_process:importExcel")
@RequiresPermissions("database:experiment_test_process:add")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ExperimentTestProcess.class);

4
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentUserController.java
View File

@@ -266,7 +266,7 @@ public class ExperimentUserController extends JeecgController<ExperimentUser, IE
* @param request
* @param experimentUser
*/
@RequiresPermissions("database:experiment_user:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ExperimentUser experimentUser) {
return super.exportXls(request, experimentUser, ExperimentUser.class, "试验人员");
@@ -279,7 +279,7 @@ public class ExperimentUserController extends JeecgController<ExperimentUser, IE
* @param response
* @return
*/
@RequiresPermissions("database:experiment_user:importExcel")
@RequiresPermissions("database:experiment_user:add")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ExperimentUser.class);

4
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/IrradiationStandardsController.java
View File

@@ -140,7 +140,7 @@ public class IrradiationStandardsController extends JeecgController<IrradiationS
* @param request
* @param irradiationStandards
*/
@RequiresPermissions("database:irradiation_standards:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, IrradiationStandards irradiationStandards) {
return super.exportXls(request, irradiationStandards, IrradiationStandards.class, "辐照标准");
@@ -153,7 +153,7 @@ public class IrradiationStandardsController extends JeecgController<IrradiationS
* @param response
* @return
*/
@RequiresPermissions("database:irradiation_standards:importExcel")
@RequiresPermissions("database:irradiation_standards:add")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, IrradiationStandards.class);

4
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/MigrationDataRecordController.java
View File

@@ -140,7 +140,7 @@ public class MigrationDataRecordController extends JeecgController<MigrationData
* @param request
* @param migrationDataRecord
*/
@RequiresPermissions("database:migration_data_record:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, MigrationDataRecord migrationDataRecord) {
return super.exportXls(request, migrationDataRecord, MigrationDataRecord.class, "迁移数据管理");
@@ -153,7 +153,7 @@ public class MigrationDataRecordController extends JeecgController<MigrationData
* @param response
* @return
*/
@RequiresPermissions("database:migration_data_record:importExcel")
@RequiresPermissions("database:migration_data_record:add")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, MigrationDataRecord.class);

4
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/NasaDataRecordController.java
View File

@@ -140,7 +140,7 @@ public class NasaDataRecordController extends JeecgController<NasaDataRecord, IN
* @param request
* @param nasaDataRecord
*/
@RequiresPermissions("database:nasa_data_record:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, NasaDataRecord nasaDataRecord) {
return super.exportXls(request, nasaDataRecord, NasaDataRecord.class, "NASA数据管理");
@@ -153,7 +153,7 @@ public class NasaDataRecordController extends JeecgController<NasaDataRecord, IN
* @param response
* @return
*/
@RequiresPermissions("database:nasa_data_record:importExcel")
@RequiresPermissions("database:nasa_data_record:add")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, NasaDataRecord.class);

3
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/RadiateTypeController.java
View File

@@ -140,7 +140,6 @@ public class RadiateTypeController extends JeecgController<RadiateType, IRadiate
* @param request
* @param radiateType
*/
@RequiresPermissions("database:radiate_type:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, RadiateType radiateType) {
return super.exportXls(request, radiateType, RadiateType.class, "辐射源类型");
@@ -153,7 +152,7 @@ public class RadiateTypeController extends JeecgController<RadiateType, IRadiate
* @param response
* @return
*/
@RequiresPermissions("database:radiate_type:importExcel")
@RequiresPermissions("database:radiate_type:add")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, RadiateType.class);

3
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/TestStandardsController.java
View File

@@ -140,7 +140,6 @@ public class TestStandardsController extends JeecgController<TestStandards, ITes
* @param request
* @param testStandards
*/
@RequiresPermissions("database:test_standards:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, TestStandards testStandards) {
return super.exportXls(request, testStandards, TestStandards.class, "测试标准");
@@ -153,7 +152,7 @@ public class TestStandardsController extends JeecgController<TestStandards, ITes
* @param response
* @return
*/
@RequiresPermissions("database:test_standards:importExcel")
@RequiresPermissions("database:test_standards:add")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, TestStandards.class);

49
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java
View File

@@ -521,31 +521,32 @@ public class LoginController {
@Operation(summary = "获取验证码")
@GetMapping(value = "/randomImage/{key}")
public Result<String> randomImage(HttpServletResponse response, @PathVariable("key") String key) {
Result<String> res = new Result<String>();
try {
//生成验证码
String code = RandomUtil.randomString(BASE_CHECK_CODES, 4);
//存到redis中
String lowerCaseCode = code.toLowerCase();
//Result<String> res = new Result<String>();
//try {
// //生成验证码
// String code = RandomUtil.randomString(BASE_CHECK_CODES, 4);
// //存到redis中
// String lowerCaseCode = code.toLowerCase();
//
// //update-begin-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906
// // 加入密钥作为混淆，避免简单的拼接，被外部利用，用户自定义该密钥即可
// String origin = lowerCaseCode + key + jeecgBaseConfig.getSignatureSecret();
// String realKey = Md5Util.md5Encode(origin, "utf-8");
// //update-end-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906
//
// redisUtil.set(realKey, lowerCaseCode, 60);
// log.info("获取验证码，Redis key = {}，checkCode = {}", realKey, code);
// //返回前端
// String base64 = RandImageUtil.generate(code);
// res.setSuccess(true);
// res.setResult(base64);
//} catch (Exception e) {
// log.error(e.getMessage(), e);
// res.error500("获取验证码失败,请检查redis配置!");
// return res;
//}
//update-begin-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906
// 加入密钥作为混淆，避免简单的拼接，被外部利用，用户自定义该密钥即可
String origin = lowerCaseCode + key + jeecgBaseConfig.getSignatureSecret();
String realKey = Md5Util.md5Encode(origin, "utf-8");
//update-end-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906
redisUtil.set(realKey, lowerCaseCode, 60);
log.info("获取验证码，Redis key = {}，checkCode = {}", realKey, code);
//返回前端
String base64 = RandImageUtil.generate(code);
res.setSuccess(true);
res.setResult(base64);
} catch (Exception e) {
log.error(e.getMessage(), e);
res.error500("获取验证码失败,请检查redis配置!");
return res;
}
return res;
return Result.ok();
}
/**