yinq
/
zs_aucma-mes-back
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change: 优化控制器返回方式及增加查询上限

Browse Source 
将 Board 控制器中 AjaxResult.success() 替换为父类 success() 方法，并将 PDA 物料下拉列表查询上限从 30 调整为 300。
master
zch 1 month ago
parent 4ac38319b0
commit a46b3f21e8
5 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File

2
aucma-base/src/main/resources/mapper/base/BaseMaterialinfoMapper.xml
Unescape Escape View File

@ -100,7 +100,7 @@
ORDER BY ml.increment_date DESC, ml.material_code ORDER BY ml.increment_date DESC, ml.material_code
) )
<!-- PDA下拉列表做上限保护，防止一次检出过多数据影响手持端体验 --> <!-- PDA下拉列表做上限保护，防止一次检出过多数据影响手持端体验 -->
WHERE ROWNUM &lt;= 30 WHERE ROWNUM &lt;= 300
</select> </select>
<select id="selectBaseMaterialInfoByMaterialCodes" resultMap="BaseMaterialInfoResult"> <select id="selectBaseMaterialInfoByMaterialCodes" resultMap="BaseMaterialInfoResult">

22
aucma-report/src/main/java/com/aucma/report/controller/Board4Controller.java
Unescape Escape View File

@ -28,7 +28,7 @@ public class Board4Controller extends BaseController {
@Anonymous @Anonymous
@GetMapping("/productionTotal") @GetMapping("/productionTotal")
public AjaxResult getProductionTotal() { public AjaxResult getProductionTotal() {
return AjaxResult.success(board4Service.getProductionTotal()); return success(board4Service.getProductionTotal());
} }
/** /**
@ -37,7 +37,7 @@ public class Board4Controller extends BaseController {
@Anonymous @Anonymous
@GetMapping("/orderStatistics") @GetMapping("/orderStatistics")
public AjaxResult getOrderStatistics() { public AjaxResult getOrderStatistics() {
return AjaxResult.success(board4Service.getOrderStatistics()); return success(board4Service.getOrderStatistics());
} }
/** /**
@ -46,7 +46,7 @@ public class Board4Controller extends BaseController {
@Anonymous @Anonymous
@GetMapping("/orderProgressList") @GetMapping("/orderProgressList")
public AjaxResult getOrderProgressList() { public AjaxResult getOrderProgressList() {
return AjaxResult.success(board4Service.getOrderProgressList()); return success(board4Service.getOrderProgressList());
} }
/** /**
@ -55,7 +55,7 @@ public class Board4Controller extends BaseController {
@Anonymous @Anonymous
@GetMapping("/deviceStatus") @GetMapping("/deviceStatus")
public AjaxResult getDeviceStatus() { public AjaxResult getDeviceStatus() {
return AjaxResult.success(board4Service.getDeviceStatus()); return success(board4Service.getDeviceStatus());
} }
/** /**
@ -64,7 +64,7 @@ public class Board4Controller extends BaseController {
@Anonymous @Anonymous
@GetMapping("/alarmInfo") @GetMapping("/alarmInfo")
public AjaxResult getAlarmInfo() { public AjaxResult getAlarmInfo() {
return AjaxResult.success(board4Service.getAlarmInfo()); return success(board4Service.getAlarmInfo());
} }
/** /**
@ -73,7 +73,7 @@ public class Board4Controller extends BaseController {
@Anonymous @Anonymous
@GetMapping("/repairAnalysisList") @GetMapping("/repairAnalysisList")
public AjaxResult getRepairAnalysisList() { public AjaxResult getRepairAnalysisList() {
return AjaxResult.success(board4Service.getRepairAnalysisList()); return success(board4Service.getRepairAnalysisList());
} }
/** /**
@ -82,7 +82,7 @@ public class Board4Controller extends BaseController {
@Anonymous @Anonymous
@GetMapping("/repairTrendList") @GetMapping("/repairTrendList")
public AjaxResult getRepairTrendList() { public AjaxResult getRepairTrendList() {
return AjaxResult.success(board4Service.getRepairTrendList()); return success(board4Service.getRepairTrendList());
} }
/** /**
@ -91,7 +91,7 @@ public class Board4Controller extends BaseController {
@Anonymous @Anonymous
@GetMapping("/qualityStatistics") @GetMapping("/qualityStatistics")
public AjaxResult getQualityStatistics() { public AjaxResult getQualityStatistics() {
return AjaxResult.success(board4Service.getQualityStatistics()); return success(board4Service.getQualityStatistics());
} }
/** /**
@ -100,7 +100,7 @@ public class Board4Controller extends BaseController {
@Anonymous @Anonymous
@GetMapping("/qualityTraceList") @GetMapping("/qualityTraceList")
public AjaxResult getQualityTraceList() { public AjaxResult getQualityTraceList() {
return AjaxResult.success(board4Service.getQualityTraceList()); return success(board4Service.getQualityTraceList());
} }
/** /**
@ -109,7 +109,7 @@ public class Board4Controller extends BaseController {
@Anonymous @Anonymous
@GetMapping("/deviceProductionList") @GetMapping("/deviceProductionList")
public AjaxResult getDeviceProductionList() { public AjaxResult getDeviceProductionList() {
return AjaxResult.success(board4Service.getDeviceProductionList()); return success(board4Service.getDeviceProductionList());
} }
/** /**
@ -118,6 +118,6 @@ public class Board4Controller extends BaseController {
@Anonymous @Anonymous
@GetMapping("/deviceOpeningCountList") @GetMapping("/deviceOpeningCountList")
public AjaxResult getDeviceOpeningCountList() { public AjaxResult getDeviceOpeningCountList() {
return AjaxResult.success(board4Service.getDeviceOpeningCountList()); return success(board4Service.getDeviceOpeningCountList());
} }
} }

16
aucma-report/src/main/java/com/aucma/report/controller/Board5Controller.java
Unescape Escape View File

@ -28,7 +28,7 @@ public class Board5Controller extends BaseController {
@Anonymous @Anonymous
@GetMapping("/orderWorkStatistics") @GetMapping("/orderWorkStatistics")
public AjaxResult getOrderWorkStatistics() { public AjaxResult getOrderWorkStatistics() {
return AjaxResult.success(board5Service.getOrderWorkStatistics()); return success(board5Service.getOrderWorkStatistics());
} }
/** /**
@ -37,7 +37,7 @@ public class Board5Controller extends BaseController {
@Anonymous @Anonymous
@GetMapping("/repairTimeStatistics") @GetMapping("/repairTimeStatistics")
public AjaxResult getRepairTimeStatistics() { public AjaxResult getRepairTimeStatistics() {
return AjaxResult.success(board5Service.getRepairTimeStatistics()); return success(board5Service.getRepairTimeStatistics());
} }
/** /**
@ -46,7 +46,7 @@ public class Board5Controller extends BaseController {
@Anonymous @Anonymous
@GetMapping("/maintStatistics") @GetMapping("/maintStatistics")
public AjaxResult getMaintStatistics() { public AjaxResult getMaintStatistics() {
return AjaxResult.success(board5Service.getMaintStatistics()); return success(board5Service.getMaintStatistics());
} }
/** /**
@ -55,7 +55,7 @@ public class Board5Controller extends BaseController {
@Anonymous @Anonymous
@GetMapping("/inspectStatistics") @GetMapping("/inspectStatistics")
public AjaxResult getInspectStatistics() { public AjaxResult getInspectStatistics() {
return AjaxResult.success(board5Service.getInspectStatistics()); return success(board5Service.getInspectStatistics());
} }
/** /**
@ -64,7 +64,7 @@ public class Board5Controller extends BaseController {
@Anonymous @Anonymous
@GetMapping("/deviceStatusDistribution") @GetMapping("/deviceStatusDistribution")
public AjaxResult getDeviceStatusDistribution() { public AjaxResult getDeviceStatusDistribution() {
return AjaxResult.success(board5Service.getDeviceStatusDistribution()); return success(board5Service.getDeviceStatusDistribution());
} }
/** /**
@ -73,7 +73,7 @@ public class Board5Controller extends BaseController {
@Anonymous @Anonymous
@GetMapping("/faultSourceDistribution") @GetMapping("/faultSourceDistribution")
public AjaxResult getFaultSourceDistribution() { public AjaxResult getFaultSourceDistribution() {
return AjaxResult.success(board5Service.getFaultSourceDistribution()); return success(board5Service.getFaultSourceDistribution());
} }
/** /**
@ -82,7 +82,7 @@ public class Board5Controller extends BaseController {
@Anonymous @Anonymous
@GetMapping("/faultTrendList") @GetMapping("/faultTrendList")
public AjaxResult getFaultTrendList() { public AjaxResult getFaultTrendList() {
return AjaxResult.success(board5Service.getFaultTrendList()); return success(board5Service.getFaultTrendList());
} }
/** /**
@ -91,6 +91,6 @@ public class Board5Controller extends BaseController {
@Anonymous @Anonymous
@GetMapping("/productionTop5") @GetMapping("/productionTop5")
public AjaxResult getProductionTop5() { public AjaxResult getProductionTop5() {
return AjaxResult.success(board5Service.getProductionTop5()); return success(board5Service.getProductionTop5());
} }
} }

8
aucma-report/src/main/java/com/aucma/report/controller/BoardReportController.java
Unescape Escape View File

@ -34,7 +34,7 @@ public class BoardReportController extends BaseController {
*/ */
@PostMapping("/generalInterfaceList") @PostMapping("/generalInterfaceList")
public AjaxResult generalInterfaceList(@RequestBody HashMap<String, String> paramMap) { public AjaxResult generalInterfaceList(@RequestBody HashMap<String, String> paramMap) {
return AjaxResult.success(boardReportService.generalInterfaceList(paramMap)); return success(boardReportService.generalInterfaceList(paramMap));
} }
/** /**
@ -44,7 +44,7 @@ public class BoardReportController extends BaseController {
*/ */
@PostMapping("/boxFoamingProductionInterface") @PostMapping("/boxFoamingProductionInterface")
public AjaxResult boxFoamingProductionInterface(@RequestBody HashMap<String, String> paramMap) { public AjaxResult boxFoamingProductionInterface(@RequestBody HashMap<String, String> paramMap) {
return AjaxResult.success(boardReportService.boxFoamingProductionInterface(paramMap)); return success(boardReportService.boxFoamingProductionInterface(paramMap));
} }
/** /**
@ -54,7 +54,7 @@ public class BoardReportController extends BaseController {
*/ */
@PostMapping("/getCurrentTeamTimeList") @PostMapping("/getCurrentTeamTimeList")
public AjaxResult getCurrentTeamTimeList(@RequestBody HashMap<String, String> paramMap) { public AjaxResult getCurrentTeamTimeList(@RequestBody HashMap<String, String> paramMap) {
return AjaxResult.success(boardReportService.getCurrentTeamTimeList(paramMap)); return success(boardReportService.getCurrentTeamTimeList(paramMap));
} }
@ -65,7 +65,7 @@ public class BoardReportController extends BaseController {
*/ */
@PostMapping("/homePageInterface") @PostMapping("/homePageInterface")
public AjaxResult homePageInterface(@RequestBody HashMap<String, String> paramMap) { public AjaxResult homePageInterface(@RequestBody HashMap<String, String> paramMap) {
return AjaxResult.success(boardReportService.homePageInterface(paramMap)); return success(boardReportService.homePageInterface(paramMap));
} }
} }

4
aucma-report/src/main/java/com/aucma/report/controller/DeviceParamAnalysisController.java
Unescape Escape View File

@ -34,7 +34,7 @@ public class DeviceParamAnalysisController extends BaseController {
@PreAuthorize("@ss.hasPermi('baseDeviceParamVal:trace:list')") @PreAuthorize("@ss.hasPermi('baseDeviceParamVal:trace:list')")
@GetMapping("/paramOptions") @GetMapping("/paramOptions")
public AjaxResult paramOptions(DeviceParamReportQuery query) { public AjaxResult paramOptions(DeviceParamReportQuery query) {
return AjaxResult.success(deviceParamAnalysisService.selectParamOptions(query)); return success(deviceParamAnalysisService.selectParamOptions(query));
} }
/** /**
@ -52,7 +52,7 @@ public class DeviceParamAnalysisController extends BaseController {
@PreAuthorize("@ss.hasPermi('baseDeviceParamVal:trace:list')") @PreAuthorize("@ss.hasPermi('baseDeviceParamVal:trace:list')")
@GetMapping("/spc") @GetMapping("/spc")
public AjaxResult spc(DeviceParamReportQuery query) { public AjaxResult spc(DeviceParamReportQuery query) {
return AjaxResult.success(deviceParamAnalysisService.getSpcReport(query)); return success(deviceParamAnalysisService.getSpcReport(query));
} }
/** /**

Write Preview
Loading…
Cancel
Save