[agent-pipeline] pipe-20260328094842-38e9 round-1
This commit is contained in:
@@ -17,11 +17,16 @@ public class ScheduleController {
|
||||
private final ScheduleService scheduleService;
|
||||
|
||||
@GetMapping("/list")
|
||||
public ResponseEntity<ApiResponse<Map<String, Object>>> getScheduleList(
|
||||
public ResponseEntity<Map<String, Object>> getScheduleList(
|
||||
@RequestAttribute("companyCode") String companyCode,
|
||||
@RequestParam Map<String, Object> params) {
|
||||
params.put("companyCode", companyCode);
|
||||
return ResponseEntity.ok(ApiResponse.success(scheduleService.getScheduleList(params)));
|
||||
List<Map<String, Object>> list = scheduleService.getScheduleList(params);
|
||||
Map<String, Object> resp = new LinkedHashMap<>();
|
||||
resp.put("success", true);
|
||||
resp.put("data", list);
|
||||
resp.put("total", list.size());
|
||||
return ResponseEntity.ok(resp);
|
||||
}
|
||||
|
||||
@GetMapping("/{scheduleId}")
|
||||
|
||||
@@ -19,13 +19,9 @@ public class ScheduleService extends BaseService {
|
||||
|
||||
private static final String NS = "schedule.";
|
||||
|
||||
public Map<String, Object> getScheduleList(Map<String, Object> params) {
|
||||
public List<Map<String, Object>> getScheduleList(Map<String, Object> params) {
|
||||
commonService.applyCompanyCodeFilter(params);
|
||||
List<Map<String, Object>> list = sqlSession.selectList(NS + "getScheduleList", params);
|
||||
Map<String, Object> result = new LinkedHashMap<>();
|
||||
result.put("data", list);
|
||||
result.put("total", list.size());
|
||||
return result;
|
||||
return sqlSession.selectList(NS + "getScheduleList", params);
|
||||
}
|
||||
|
||||
public Map<String, Object> getScheduleInfo(Map<String, Object> params) {
|
||||
|
||||
@@ -20,6 +20,7 @@ public class ScreenManagementService extends BaseService {
|
||||
|
||||
private static final String NS = "screenManagement.";
|
||||
private final ObjectMapper objectMapper;
|
||||
private final CommonService commonService;
|
||||
|
||||
// ═══════════════════════════════════════════════════════════
|
||||
// Screen CRUD
|
||||
@@ -257,6 +258,7 @@ public class ScreenManagementService extends BaseService {
|
||||
|
||||
List<Map<String, Object>> data = sqlSession.selectList(NS + "selectDeletedScreenList", params);
|
||||
int total = sqlSession.selectOne(NS + "countDeletedScreenList", params);
|
||||
data = commonService.toCamelCaseKeysList(data);
|
||||
|
||||
Map<String, Object> result = new LinkedHashMap<>();
|
||||
result.put("data", data);
|
||||
|
||||
Reference in New Issue
Block a user