Merge branch 'server-165' of uskycloud/usky-modules into master

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionPlanSonServiceImpl.java

@@ -15,6 +15,8 @@ import com.usky.fire.mapper.PatrolInspectionRecordMapper;
 import com.usky.fire.service.*;
 import com.usky.fire.service.util.OnlineMethod;
 import com.usky.fire.service.vo.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -82,6 +84,8 @@ public class PatrolInspectionPlanSonServiceImpl extends AbstractCrudService<Patr
     @Autowired
     private PatrolInspectionAbnormalService patrolInspectionAbnormalService;
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(PatrolInspectionPlanSonServiceImpl.class);
+
     @Override
     public Map<String, Object> appPlanStatistics(String currentDate) {
         Integer planSonCount = 0;
@@ -396,143 +400,156 @@ public class PatrolInspectionPlanSonServiceImpl extends AbstractCrudService<Patr
 
     @Override
     public void addPatrolInspectionAbnormalData(){
+        LOGGER.info("巡检漏检定时任务 begin");
         DateTimeFormatter df1 = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         String datetime1 = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
         String datetime2 = LocalDateTime.now().minusHours(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
 
         List<PatrolInspectionPlanSon> list = patrolInspectionPlanSonMapper.selectInspectionPlanSonData(datetime1,datetime2);
         if(list.size() <=0){
-            throw new BusinessException("当前时间向前一小时没有漏检记录");
-        }
-        List<Integer> sonIdlist = new ArrayList<>();
-        for (int i = 0; i < list.size(); i++) {
-            sonIdlist.add(list.get(i).getId());
-        }
-        LambdaQueryWrapper<PatrolInspectionPlanSiteSon> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.in(PatrolInspectionPlanSiteSon::getPlanId,sonIdlist)
-                .eq(PatrolInspectionPlanSiteSon::getInspectionStatus,1);
-        List<PatrolInspectionPlanSiteSon> siteSonList = patrolInspectionPlanSiteSonService.list(queryWrapper);
-        if(CollectionUtils.isNotEmpty(siteSonList)){
-            List<Integer> siteIdList = new ArrayList<>();
-            List<Integer> noSonIdList = new ArrayList<>();
-            for (int i = 0; i < siteSonList.size(); i++) {
-                siteIdList.add(siteSonList.get(i).getSiteId());
-                noSonIdList.add(siteSonList.get(i).getPlanId());
-            }
-            //获取巡检地点
-            LambdaQueryWrapper<PatrolInspectionSite> queryWrapper1 = Wrappers.lambdaQuery();
-            queryWrapper1.in(PatrolInspectionSite::getId,siteIdList)
-                    .eq(PatrolInspectionSite::getEnable,1);
-            List<PatrolInspectionSite> siteList = patrolInspectionSiteService.list(queryWrapper1);
-            if(siteList.size() <= 0){
-                throw new BusinessException("查询巡检地点记录为空");
-            }
-            //获取巡检子计划
-            LambdaQueryWrapper<PatrolInspectionPlanSon> planSonQueryWrapper = Wrappers.lambdaQuery();
-            planSonQueryWrapper.in(PatrolInspectionPlanSon::getId,noSonIdList);
-            List<PatrolInspectionPlanSon> noPlanSonList = this.list(planSonQueryWrapper);
-            List<Integer> planIdList = new ArrayList<>();
-            List<Integer> personnelList = new ArrayList<>();
-            List<Integer> areaList = new ArrayList<>();
-            for (int i = 0; i < noPlanSonList.size(); i++) {
-                planIdList.add(noPlanSonList.get(i).getPlanId());
-                personnelList.add(noPlanSonList.get(i).getPersonnelId());
-                areaList.add(noPlanSonList.get(i).getAreaId());
-            }
-
-            //获取巡检计划
-            List<PatrolInspectionPlan> noPlanIdList = patrolInspectionPlanMapper.selectNoPlanList(planIdList);
-            //获取巡检人员
-            LambdaQueryWrapper<PatrolInspectionPersonnel> personnelQueryWrapper = Wrappers.lambdaQuery();
-            personnelQueryWrapper.in(PatrolInspectionPersonnel::getId,personnelList)
-                    .eq(PatrolInspectionPersonnel::getEnable,1);
-            List<PatrolInspectionPersonnel> inspectionPersonnelList = patrolInspectionPersonnelService.list(personnelQueryWrapper);
-            if(inspectionPersonnelList.size() <= 0){
-                throw new BusinessException("巡检人员信息不存在");
-            }
-            //获取巡检区域
-            LambdaQueryWrapper<PatrolInspectionArea> queryWrapperOne = Wrappers.lambdaQuery();
-            queryWrapperOne.in(PatrolInspectionArea::getId, areaList)
-                    .eq(PatrolInspectionArea::getEnable,1);
-            List<PatrolInspectionArea> areaInfoList = patrolInspectionAreaService.list(queryWrapperOne);
-            if(areaInfoList.size() <= 0){
-                throw new BusinessException("巡检区域不存在");
+            LOGGER.info("当前时间向前一小时没有漏检记录");
+        }else{
+            List<Integer> sonIdlist = new ArrayList<>();
+            for (int i = 0; i < list.size(); i++) {
+                sonIdlist.add(list.get(i).getId());
             }
+            LambdaQueryWrapper<PatrolInspectionPlanSiteSon> queryWrapper = Wrappers.lambdaQuery();
+            queryWrapper.in(PatrolInspectionPlanSiteSon::getPlanId,sonIdlist)
+                    .eq(PatrolInspectionPlanSiteSon::getInspectionStatus,1);
+            List<PatrolInspectionPlanSiteSon> siteSonList = patrolInspectionPlanSiteSonService.list(queryWrapper);
+            if(CollectionUtils.isNotEmpty(siteSonList)){
+                List<Integer> siteIdList = new ArrayList<>();
+                List<Integer> noSonIdList = new ArrayList<>();
+                for (int i = 0; i < siteSonList.size(); i++) {
+                    siteIdList.add(siteSonList.get(i).getSiteId());
+                    noSonIdList.add(siteSonList.get(i).getPlanId());
+                }
+                //获取巡检地点
+                LOGGER.info("获取巡检地点");
+                LambdaQueryWrapper<PatrolInspectionSite> queryWrapper1 = Wrappers.lambdaQuery();
+                if(CollectionUtils.isNotEmpty(siteIdList)){
+                    queryWrapper1.in(PatrolInspectionSite::getId,siteIdList)
+                            .eq(PatrolInspectionSite::getEnable,1);
+                }
+                List<PatrolInspectionSite> siteList = patrolInspectionSiteService.list(queryWrapper1);
+                if(siteList.size() <= 0){
+                    LOGGER.info("查询巡检地点记录为空");
+                }
+                //获取巡检子计划
+                LambdaQueryWrapper<PatrolInspectionPlanSon> planSonQueryWrapper = Wrappers.lambdaQuery();
+                if(CollectionUtils.isNotEmpty(noSonIdList)){
+                    planSonQueryWrapper.in(PatrolInspectionPlanSon::getId,noSonIdList);
+                }
+                List<PatrolInspectionPlanSon> noPlanSonList = this.list(planSonQueryWrapper);
+                List<Integer> planIdList = new ArrayList<>();
+                List<Integer> personnelList = new ArrayList<>();
+                List<Integer> areaList = new ArrayList<>();
+                for (int i = 0; i < noPlanSonList.size(); i++) {
+                    planIdList.add(noPlanSonList.get(i).getPlanId());
+                    personnelList.add(noPlanSonList.get(i).getPersonnelId());
+                    areaList.add(noPlanSonList.get(i).getAreaId());
+                }
 
-            for (int i = 0; i < siteSonList.size(); i++) {
-                PatrolInspectionAbnormal patrolInspectionAbnormal = new PatrolInspectionAbnormal();
-                Integer siteId = siteSonList.get(i).getSiteId();
-                Integer planSonId = siteSonList.get(i).getPlanId();
-                for (int j = 0; j < siteList.size(); j++) {
-                    if(siteId.equals(siteList.get(j).getId())){
-                        patrolInspectionAbnormal.setSiteNubmber(siteList.get(j).getSiteNubmber());
-                        patrolInspectionAbnormal.setSiteType(siteList.get(j).getSiteType());
-                        patrolInspectionAbnormal.setSiteName(siteList.get(j).getSiteName());
-                        patrolInspectionAbnormal.setLongitude(siteList.get(j).getLongitude());
-                        patrolInspectionAbnormal.setLatitude(siteList.get(j).getLatitude());
-                        patrolInspectionAbnormal.setSiteId(siteList.get(j).getId());
-                        patrolInspectionAbnormal.setCompanyId(siteList.get(j).getCompanyId());
-                        break;
-                    }
+                //获取巡检计划
+                List<PatrolInspectionPlan> noPlanIdList = patrolInspectionPlanMapper.selectNoPlanList(planIdList);
+                //获取巡检人员
+                LOGGER.info("获取巡检人员");
+                LambdaQueryWrapper<PatrolInspectionPersonnel> personnelQueryWrapper = Wrappers.lambdaQuery();
+                if(CollectionUtils.isNotEmpty(personnelList)){
+                    personnelQueryWrapper.in(PatrolInspectionPersonnel::getId,personnelList)
+                            .eq(PatrolInspectionPersonnel::getEnable,1);
+                }
+                List<PatrolInspectionPersonnel> inspectionPersonnelList = patrolInspectionPersonnelService.list(personnelQueryWrapper);
+                if(inspectionPersonnelList.size() <= 0){
+                    LOGGER.info("巡检人员信息不存在");
+                }
+                //获取巡检区域
+                LambdaQueryWrapper<PatrolInspectionArea> queryWrapperOne = Wrappers.lambdaQuery();
+                if(CollectionUtils.isNotEmpty(areaList)){
+                    queryWrapperOne.in(PatrolInspectionArea::getId, areaList)
+                            .eq(PatrolInspectionArea::getEnable,1);
+                }
+                List<PatrolInspectionArea> areaInfoList = patrolInspectionAreaService.list(queryWrapperOne);
+                if(areaInfoList.size() <= 0){
+                    LOGGER.info("巡检区域不存在");
                 }
 
-                for (int j = 0; j < noPlanSonList.size(); j++) {
-                    if(planSonId.equals(noPlanSonList.get(j).getId())){
-                        patrolInspectionAbnormal.setPlanId(noPlanSonList.get(j).getPlanId());
-                        patrolInspectionAbnormal.setPlanSonId(noPlanSonList.get(j).getId());
-                        patrolInspectionAbnormal.setTenantId(noPlanSonList.get(j).getTenantId());
-                        patrolInspectionAbnormal.setPlanType(noPlanSonList.get(j).getPlanType());
-                        Integer planType = noPlanSonList.get(j).getPlanType();
-                        String startDate = null;
-                        String endDate = null;
-                        if (planType.equals(1)) {
-                            startDate = df1.format(noPlanSonList.get(j).getInspectionDate()) + "T" + noPlanSonList.get(j).getStartTime();
-                            endDate = df1.format(noPlanSonList.get(j).getInspectionDate()) + "T" + noPlanSonList.get(j).getEndTime();
-                        } else {
-                            startDate = df1.format(noPlanSonList.get(j).getStartDate()) + "T" + noPlanSonList.get(j).getStartTime();
-                            endDate = df1.format(noPlanSonList.get(j).getEndDate()) + "T" + noPlanSonList.get(j).getEndTime();
+                for (int i = 0; i < siteSonList.size(); i++) {
+                    PatrolInspectionAbnormal patrolInspectionAbnormal = new PatrolInspectionAbnormal();
+                    Integer siteId = siteSonList.get(i).getSiteId();
+                    Integer planSonId = siteSonList.get(i).getPlanId();
+                    for (int j = 0; j < siteList.size(); j++) {
+                        if(siteId.equals(siteList.get(j).getId())){
+                            patrolInspectionAbnormal.setSiteNubmber(siteList.get(j).getSiteNubmber());
+                            patrolInspectionAbnormal.setSiteType(siteList.get(j).getSiteType());
+                            patrolInspectionAbnormal.setSiteName(siteList.get(j).getSiteName());
+                            patrolInspectionAbnormal.setLongitude(siteList.get(j).getLongitude());
+                            patrolInspectionAbnormal.setLatitude(siteList.get(j).getLatitude());
+                            patrolInspectionAbnormal.setSiteId(siteList.get(j).getId());
+                            patrolInspectionAbnormal.setCompanyId(siteList.get(j).getCompanyId());
+                            break;
                         }
+                    }
 
-                        patrolInspectionAbnormal.setStartDate(LocalDateTime.parse(startDate));
-                        patrolInspectionAbnormal.setEndDate(LocalDateTime.parse(endDate));
+                    for (int j = 0; j < noPlanSonList.size(); j++) {
+                        if(planSonId.equals(noPlanSonList.get(j).getId())){
+                            patrolInspectionAbnormal.setPlanId(noPlanSonList.get(j).getPlanId());
+                            patrolInspectionAbnormal.setPlanSonId(noPlanSonList.get(j).getId());
+                            patrolInspectionAbnormal.setTenantId(noPlanSonList.get(j).getTenantId());
+                            patrolInspectionAbnormal.setPlanType(noPlanSonList.get(j).getPlanType());
+                            Integer planType = noPlanSonList.get(j).getPlanType();
+                            String startDate = null;
+                            String endDate = null;
+                            if (planType.equals(1)) {
+                                startDate = df1.format(noPlanSonList.get(j).getInspectionDate()) + "T" + noPlanSonList.get(j).getStartTime();
+                                endDate = df1.format(noPlanSonList.get(j).getInspectionDate()) + "T" + noPlanSonList.get(j).getEndTime();
+                            } else {
+                                startDate = df1.format(noPlanSonList.get(j).getStartDate()) + "T" + noPlanSonList.get(j).getStartTime();
+                                endDate = df1.format(noPlanSonList.get(j).getEndDate()) + "T" + noPlanSonList.get(j).getEndTime();
+                            }
+
+                            patrolInspectionAbnormal.setStartDate(LocalDateTime.parse(startDate));
+                            patrolInspectionAbnormal.setEndDate(LocalDateTime.parse(endDate));
 
-                        Integer noAreaId = noPlanSonList.get(j).getAreaId();
-                        for (int k = 0; k < areaInfoList.size(); k++) {
-                            if(noAreaId.equals(areaInfoList.get(k).getId())){
-                                patrolInspectionAbnormal.setAreaName(areaInfoList.get(k).getAreaName());
-                                break;
+                            Integer noAreaId = noPlanSonList.get(j).getAreaId();
+                            for (int k = 0; k < areaInfoList.size(); k++) {
+                                if(noAreaId.equals(areaInfoList.get(k).getId())){
+                                    patrolInspectionAbnormal.setAreaName(areaInfoList.get(k).getAreaName());
+                                    break;
+                                }
                             }
-                        }
-                        Integer noPersonnelId = noPlanSonList.get(j).getPersonnelId();
-                        for (int k = 0; k < inspectionPersonnelList.size(); k++) {
-                            if(noPersonnelId.equals(inspectionPersonnelList.get(k).getId())){
-                                patrolInspectionAbnormal.setName(inspectionPersonnelList.get(k).getFullName());
-                                patrolInspectionAbnormal.setPhone(inspectionPersonnelList.get(k).getPhoneNumber());
-                                break;
+                            Integer noPersonnelId = noPlanSonList.get(j).getPersonnelId();
+                            for (int k = 0; k < inspectionPersonnelList.size(); k++) {
+                                if(noPersonnelId.equals(inspectionPersonnelList.get(k).getId())){
+                                    patrolInspectionAbnormal.setName(inspectionPersonnelList.get(k).getFullName());
+                                    patrolInspectionAbnormal.setPhone(inspectionPersonnelList.get(k).getPhoneNumber());
+                                    break;
+                                }
                             }
-                        }
-                        Integer planId = noPlanSonList.get(j).getPlanId();
-                        for (int k = 0; k < noPlanIdList.size(); k++) {
-                            if(planId.equals(noPlanIdList.get(k).getId())){
-                                patrolInspectionAbnormal.setRouteId(noPlanIdList.get(k).getRouteId());
-                                break;
+                            Integer planId = noPlanSonList.get(j).getPlanId();
+                            for (int k = 0; k < noPlanIdList.size(); k++) {
+                                if(planId.equals(noPlanIdList.get(k).getId())){
+                                    patrolInspectionAbnormal.setRouteId(noPlanIdList.get(k).getRouteId());
+                                    break;
+                                }
                             }
-                        }
 
-                        break;
+                            break;
+                        }
                     }
-                }
-                patrolInspectionAbnormal.setAbnormalStatus(1);
-                patrolInspectionAbnormal.setCreateTime(LocalDateTime.now());
-                patrolInspectionAbnormal.setCreator("YT_admin");
+                    patrolInspectionAbnormal.setAbnormalStatus(1);
+                    patrolInspectionAbnormal.setCreateTime(LocalDateTime.now());
+                    patrolInspectionAbnormal.setCreator("YT_admin");
 
 
-                patrolInspectionAbnormalService.save(patrolInspectionAbnormal);
+                    patrolInspectionAbnormalService.save(patrolInspectionAbnormal);
 
-            }
+                }
 
+            }
         }
 
+        LOGGER.info("巡检漏检定时任务 end");
     }
 
 

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/PmWorkContentServiceImpl.java

@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.datascope.annotation.DataScope;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.core.exception.BusinessException;
+import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.iot.domain.PmProject;
 import com.usky.iot.domain.PmReceive;
@@ -15,7 +15,6 @@ import com.usky.iot.domain.PmWorkReport;
 import com.usky.iot.mapper.*;
 import com.usky.iot.service.PmProjectService;
 import com.usky.iot.service.PmWorkContentService;
-import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.iot.service.vo.ProjectWorkTimeVO;
 import com.usky.iot.service.vo.UserWorkTimeVO;
 import com.usky.iot.service.vo.WorkHoursStatisticsVO;
@@ -25,7 +24,6 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.common.datascope.context.DataScopeContextHolder;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -90,6 +88,13 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
         return rIds;
     }
 
+    /**
+     * @description: 查询我收到的报告
+     * @author: fu
+     * @date: 2024/8/7 17:48
+     * @param: []
+     * @return: java.util.List<java.lang.Integer>
+     **/
     private List<Integer> receive() {
         Long userId = SecurityUtils.getUserId();
         Integer tenantId = SecurityUtils.getTenantId();
@@ -115,7 +120,14 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
         }
         return rIds;
     }
-
+    
+    /**
+     * @description: 负责人项目id查询
+     * @author: fu
+     * @date: 2024/8/7 17:14
+     * @param: []
+     * @return: java.util.List<java.lang.Integer>
+     **/
     private List<Integer> head() {
         Long userId = SecurityUtils.getUserId();
         Integer tenantId = SecurityUtils.getTenantId();
@@ -331,6 +343,13 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
         return reportList;
     }
 
+    /**
+     * @description: 用户名、账户名查询
+     * @author: fu
+     * @date: 2024/8/7 17:28
+     * @param: [userIds]
+     * @return: java.util.List<com.usky.system.domain.SysUser>
+     **/
     @Override
     public List<SysUser> nickNames(List<Long> userIds) {
         LambdaQueryWrapper<SysUser> usersQuery = Wrappers.lambdaQuery();
@@ -352,12 +371,19 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
 
     @Override
     public CommonPage<PmWorkReport> reportPage(Integer projectAscription, Integer pageNum, Integer pageSize, Integer reportId, String startDate, String endDate, Integer projectId) {
+        CommonPage<PmWorkReport> returnPage = new CommonPage<>(new ArrayList<>(), 0, pageSize, pageNum);
         Integer tenantId = SecurityUtils.getTenantId();
         Long userId = SecurityUtils.getUserId();
         String userName = SecurityUtils.getUsername();
         Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId();
         List<Integer> headProjects = head();
+        if (projectAscription == 1 && headProjects.isEmpty()){
+            return returnPage;
+        }
         List<Integer> receiveList2 = receive();
+        if (projectAscription == 2 && receiveList2.isEmpty()){
+            return returnPage;
+        }
         List<Long> userIds = new ArrayList<>();
         LambdaQueryWrapper<PmWorkContent> contentLambdaQuery = Wrappers.lambdaQuery();
         contentLambdaQuery.select(PmWorkContent::getReportId, PmWorkContent::getWorkContent, PmWorkContent::getWorkTime, PmWorkContent::getProjectName);
@@ -391,7 +417,7 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
         List<PmWorkContent> pmWorkContentList = pmWorkContentMapper.selectList(contentLambdaQuery);
         Set<Integer> reportIds = pmWorkContentList.stream().map(PmWorkContent::getReportId).collect(Collectors.toSet());
         if (reportIds.isEmpty()) {
-            return new CommonPage<>(new ArrayList<>(), 0, pageSize, pageNum);
+            return returnPage;
         }
 
         LambdaQueryWrapper<PmWorkReport> reportQuery = Wrappers.lambdaQuery();
@@ -404,6 +430,9 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
                     .orderByDesc(PmWorkReport::getCreateTime);
         }
         IPage<PmWorkReport> reportPage = pmWorkReportMapper.selectPage(new Page<>(pageNum, pageSize), reportQuery);
+        if (reportPage.getRecords() == null || reportPage.getRecords().isEmpty()){
+            return returnPage;
+        }
         List<PmWorkReport> reportList = reportPage.getRecords();
 
         LambdaQueryWrapper<PmReceive> statusQuery = Wrappers.lambdaQuery();
@@ -429,12 +458,16 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
             }
         });
 
-        List<SysUser> nickNames = nickNames(userIds);
-        Map<Long, String> userNicknameMap = nickNames.stream()
-                .collect(Collectors.toMap(SysUser::getUserId, SysUser::getNickName));
-        reportList.forEach(report -> {
-            report.setCreateBy(userNicknameMap.get(report.getSubmitterId()));
-        });
+        if (!userIds.isEmpty()) {
+            List<SysUser> nickNames = nickNames(userIds);
+            Map<Long, String> userNicknameMap = nickNames.stream()
+                    .collect(Collectors.toMap(SysUser::getUserId, SysUser::getNickName));
+            reportList.forEach(report -> {
+                report.setCreateBy(userNicknameMap.get(report.getSubmitterId()));
+            });
+        }else {
+
+        }
 
         return new CommonPage<>(reportList, reportPage.getTotal(), pageSize, pageNum);
     }

service-job/src/main/java/com/ruoyi/job/controller/SysJobController.java

@@ -1,35 +1,25 @@
 package com.ruoyi.job.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.common.core.utils.StringUtils;
-import com.usky.common.log.annotation.Log;
-import com.usky.common.log.enums.BusinessType;
-import com.usky.common.security.annotation.RequiresPermissions;
-import com.usky.common.security.utils.SecurityUtils;
-import org.quartz.SchedulerException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.job.domain.SysJob;
+import com.ruoyi.job.service.ISysJobService;
+import com.ruoyi.job.util.CronUtils;
+import com.ruoyi.job.util.ScheduleUtils;
 import com.usky.common.core.constant.Constants;
 import com.usky.common.core.exception.job.TaskException;
+import com.usky.common.core.utils.StringUtils;
 import com.usky.common.core.utils.poi.ExcelUtil;
 import com.usky.common.core.web.controller.BaseController;
 import com.usky.common.core.web.domain.AjaxResult;
 import com.usky.common.core.web.page.TableDataInfo;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.common.security.utils.SecurityUtils;
+import org.quartz.SchedulerException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import com.ruoyi.job.domain.SysJob;
-import com.ruoyi.job.service.ISysJobService;
-import com.ruoyi.job.util.CronUtils;
-import com.ruoyi.job.util.ScheduleUtils;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 调度任务信息操作处理
@@ -48,11 +38,11 @@ public class SysJobController extends BaseController
      */
 //    @RequiresPermissions("monitor:job:list")
     @GetMapping("/list")
-    public ApiResult<List<SysJob>> list(SysJob sysJob)
+    public TableDataInfo list(SysJob sysJob)
     {
         startPage();
         List<SysJob> list = jobService.selectJobList(sysJob);
-        return ApiResult.success(list);
+        return getDataTable(list);
     }
 
     /**

service-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java

@@ -81,7 +81,6 @@ public class ScheduleUtils
             // 防止创建时存在数据问题 先移除，然后在执行创建操作
             scheduler.deleteJob(getJobKey(jobId, jobGroup));
         }
-
         scheduler.scheduleJob(jobDetail, trigger);
 
         // 暂停任务

service-job/src/main/resources/mapper/job/SysJobLogMapper.xml

@@ -42,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				and date_format(create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
 			</if>
 		</where>
+		ORDER BY job_log_id DESC
 	</select>
 	
 	<select id="selectJobLogAll" resultMap="SysJobLogResult">