fix: 修复分页和设备取消/允许任务执行

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.quartz.SchedulerException;
 import org.quartz.SchedulerException;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
@@ -60,9 +61,8 @@ public class TkTaskCenterController extends BaseController {
 
 
   @PostMapping("/add")
   @PostMapping("/add")
   @ApiOperation(value = "新增任务中心")
   @ApiOperation(value = "新增任务中心")
-  //  @PreAuthorize(
-  //
-  // "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:task_center:add:post'})")
+  @PreAuthorize(
+      "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:task_center:add:post'})")
   public ResponseResult<TkTaskCenterDTO> save(
   public ResponseResult<TkTaskCenterDTO> save(
       @RequestBody @Validated(AddGroup.class) TkTaskCenterDTO taskCenter)
       @RequestBody @Validated(AddGroup.class) TkTaskCenterDTO taskCenter)
       throws ThingsboardException, SchedulerException {
       throws ThingsboardException, SchedulerException {
@@ -73,9 +73,8 @@ public class TkTaskCenterController extends BaseController {
   }
   }
 
 
   @PutMapping("/update")
   @PutMapping("/update")
-  //  @PreAuthorize(
-  //
-  // "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:task_center:update:update'})")
+  @PreAuthorize(
+      "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:task_center:update:update'})")
   @ApiOperation(value = "编辑任务中心")
   @ApiOperation(value = "编辑任务中心")
   public ResponseResult<TkTaskCenterDTO> update(
   public ResponseResult<TkTaskCenterDTO> update(
       @RequestBody @Validated(UpdateGroup.class) TkTaskCenterDTO taskCenter)
       @RequestBody @Validated(UpdateGroup.class) TkTaskCenterDTO taskCenter)
@@ -87,9 +86,8 @@ public class TkTaskCenterController extends BaseController {
   }
   }
 
 
   @PutMapping("/{id}/update/{state}")
   @PutMapping("/{id}/update/{state}")
-  //  @PreAuthorize(
-  //
-  // "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:task_center:update:update'})")
+  @PreAuthorize(
+      "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:task_center:update:state'})")
   @ApiOperation(value = "更新状态")
   @ApiOperation(value = "更新状态")
   public ResponseResult<Boolean> updateState(
   public ResponseResult<Boolean> updateState(
       @PathVariable("id") String id, @PathVariable("state") Integer state)
       @PathVariable("id") String id, @PathVariable("state") Integer state)
@@ -102,8 +100,8 @@ public class TkTaskCenterController extends BaseController {
   }
   }
 
 
   @DeleteMapping
   @DeleteMapping
-  //  @PreAuthorize(
-  //      "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:task_center:delete'})")
+  @PreAuthorize(
+      "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:task_center:delete'})")
   @ApiOperation(value = "删除任务中心")
   @ApiOperation(value = "删除任务中心")
   public ResponseResult<Boolean> deleteTaskCenter(@RequestBody DeleteDTO deleteDTO)
   public ResponseResult<Boolean> deleteTaskCenter(@RequestBody DeleteDTO deleteDTO)
       throws ThingsboardException, SchedulerException {
       throws ThingsboardException, SchedulerException {
@@ -112,9 +110,8 @@ public class TkTaskCenterController extends BaseController {
   }
   }
 
 
   @PutMapping("/{id}/update/{tbDeviceId}/{allow}")
   @PutMapping("/{id}/update/{tbDeviceId}/{allow}")
-  //  @PreAuthorize(
-  //
-  // "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:task_center:cancel'})")
+  @PreAuthorize(
+      "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:task_center:cancel:allow'})")
   @ApiOperation(value = "设备更新任务执行")
   @ApiOperation(value = "设备更新任务执行")
   public ResponseResult<Boolean> cancelOrAllowExecute(
   public ResponseResult<Boolean> cancelOrAllowExecute(
       @PathVariable("id") String taskId,
       @PathVariable("id") String taskId,

@@ -13,7 +13,7 @@ public class TkDeviceTaskCenterDTO extends BaseDTO {
   private String taskCenterId;
   private String taskCenterId;
 
 
   @ApiModelProperty(value = "是否允许执行：0不执行 1允许执行")
   @ApiModelProperty(value = "是否允许执行：0不执行 1允许执行")
-  private Integer state;
+  private Integer allowState;
 
 
   @ApiModelProperty(value = "租户ID")
   @ApiModelProperty(value = "租户ID")
   private String tenantId;
   private String tenantId;

@@ -15,5 +15,5 @@ public class TkDeviceTaskCenterEntity extends TenantBaseEntity {
 
 
   private String taskCenterId;
   private String taskCenterId;
 
 
-  private Integer state;
+  private Integer allowState;
 }
 }

@@ -48,7 +48,7 @@ public class TkDeviceTaskCenterServiceImpl
                 .eq(TkDeviceTaskCenterEntity::getTaskCenterId, taskCenterId)
                 .eq(TkDeviceTaskCenterEntity::getTaskCenterId, taskCenterId)
                 .eq(TkDeviceTaskCenterEntity::getTenantId, tenantId));
                 .eq(TkDeviceTaskCenterEntity::getTenantId, tenantId));
     if (null != entity) {
     if (null != entity) {
-      entity.setState(state);
+      entity.setAllowState(state);
       baseMapper.updateById(entity);
       baseMapper.updateById(entity);
     }
     }
     return false;
     return false;

@@ -81,8 +81,7 @@ public class TkReportFromConfigServiceImpl
         || null == report.getExecuteAttributes()) {
         || null == report.getExecuteAttributes()) {
       throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
       throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
     }
-    if (null != report.getExecuteAttributes()
-        && report.getExecuteAttributes().size() > FastIotConstants.MagicNumber.ZERO) {
+    if (report.getExecuteAttributes().size() > FastIotConstants.MagicNumber.ZERO) {
       report
       report
           .getExecuteAttributes()
           .getExecuteAttributes()
           .forEach(
           .forEach(
@@ -171,10 +170,7 @@ public class TkReportFromConfigServiceImpl
   public ReportFormConfigDTO findReportFormConfigById(String id) {
   public ReportFormConfigDTO findReportFormConfigById(String id) {
     return Optional.ofNullable(baseMapper.selectById(id))
     return Optional.ofNullable(baseMapper.selectById(id))
         .map(this::getReportFormConfigDTOByEntity)
         .map(this::getReportFormConfigDTOByEntity)
-        .orElseThrow(
-            () -> {
-              throw new TkDataValidationException(ErrorMessage.INTERNAL_ERROR.getMessage());
-            });
+        .orElseThrow(() -> new TkDataValidationException(ErrorMessage.INTERNAL_ERROR.getMessage()));
   }
   }
 
 
   private void addCheckSysJob(TkReportFormConfigEntity reportFormConfig) throws SchedulerException {
   private void addCheckSysJob(TkReportFormConfigEntity reportFormConfig) throws SchedulerException {
@@ -212,6 +208,7 @@ public class TkReportFromConfigServiceImpl
       } else {
       } else {
         // 修改cron表达式
         // 修改cron表达式
         sysJobDTO.setCronExpression(cronExpression);
         sysJobDTO.setCronExpression(cronExpression);
+        sysJobDTO.setJobName(reportFormConfig.getName());
         sysJobDTO.setStatus(
         sysJobDTO.setStatus(
             reportFormConfig.getStatus() == null
             reportFormConfig.getStatus() == null
                 ? StatusEnum.DISABLE.getIndex()
                 ? StatusEnum.DISABLE.getIndex()

@@ -30,6 +30,7 @@ import org.thingsboard.server.dao.yunteng.service.*;
 
 
 import javax.transaction.Transactional;
 import javax.transaction.Transactional;
 import java.util.*;
 import java.util.*;
+import java.util.stream.Collectors;
 
 
 @Service
 @Service
 @RequiredArgsConstructor
 @RequiredArgsConstructor
@@ -49,15 +50,17 @@ public class TkTaskCenterServiceImpl
         getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
         getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
     IPage<TkTaskCenterDTO> iPage = baseMapper.getPageData(page, queryMap);
     IPage<TkTaskCenterDTO> iPage = baseMapper.getPageData(page, queryMap);
     if (!iPage.getRecords().isEmpty()) {
     if (!iPage.getRecords().isEmpty()) {
-      iPage.getRecords().stream()
-          .peek(
+      iPage.setRecords(iPage.getRecords().stream()
+          .map(
               obj -> {
               obj -> {
                 String cacheName = FastIotConstants.CacheConfigKey.TASK_CENTER_INFOS;
                 String cacheName = FastIotConstants.CacheConfigKey.TASK_CENTER_INFOS;
                 String key =
                 String key =
                     FastIotConstants.CacheConfigKey.TASK_CENTER_EXECUTE_TIME + "_" + obj.getId();
                     FastIotConstants.CacheConfigKey.TASK_CENTER_EXECUTE_TIME + "_" + obj.getId();
                 Optional<Long> lastExecuteTime = cacheUtils.get(cacheName, key);
                 Optional<Long> lastExecuteTime = cacheUtils.get(cacheName, key);
                 lastExecuteTime.ifPresent(obj::setLastExecuteTime);
                 lastExecuteTime.ifPresent(obj::setLastExecuteTime);
-              });
+                return obj;
+              })
+          .collect(Collectors.toList()));
     }
     }
     return new TkPageData<>(iPage.getRecords(), iPage.getTotal());
     return new TkPageData<>(iPage.getRecords(), iPage.getTotal());
   }
   }
@@ -207,20 +210,20 @@ public class TkTaskCenterServiceImpl
     if (baseMapper.updateById(entity) > FastIotConstants.MagicNumber.ZERO) {
     if (baseMapper.updateById(entity) > FastIotConstants.MagicNumber.ZERO) {
       String sourceId = entity.getId();
       String sourceId = entity.getId();
       SysJobDTO queryJob = tkSysJobService.findSysJobBySourceId(sourceId);
       SysJobDTO queryJob = tkSysJobService.findSysJobBySourceId(sourceId);
+      TaskExecuteTimeDTO executeTime =
+              JacksonUtil.convertValue(entity.getExecuteTime(), TaskExecuteTimeDTO.class);
+      if (null == executeTime || StringUtils.isEmpty(executeTime.getCron())) {
+        throw new TkDataValidationException(ErrorMessage.CRON_INVALID.getMessage());
+      }
       if (null == queryJob) {
       if (null == queryJob) {
-        TaskExecuteTimeDTO executeTime =
-            JacksonUtil.convertValue(entity.getExecuteTime(), TaskExecuteTimeDTO.class);
-        if (null == executeTime || StringUtils.isEmpty(executeTime.getCron())) {
-          throw new TkDataValidationException(ErrorMessage.CRON_INVALID.getMessage());
-        }
         queryJob = new SysJobDTO();
         queryJob = new SysJobDTO();
         queryJob.setSourceId(sourceId);
         queryJob.setSourceId(sourceId);
-        queryJob.setJobName(entity.getName());
         queryJob.setInvokeTarget("rpcCommandTask.process('" + sourceId + "')");
         queryJob.setInvokeTarget("rpcCommandTask.process('" + sourceId + "')");
         queryJob.setJobGroup(JobGroupEnum.TASK_CENTER.name());
         queryJob.setJobGroup(JobGroupEnum.TASK_CENTER.name());
-        queryJob.setCronExpression(executeTime.getCron());
         queryJob.setTenantId(entity.getTenantId());
         queryJob.setTenantId(entity.getTenantId());
       }
       }
+      queryJob.setCronExpression(executeTime.getCron());
+      queryJob.setJobName(entity.getName());
       queryJob.setStatus(state);
       queryJob.setStatus(state);
       tkSysJobService.saveOrUpdateJob(queryJob);
       tkSysJobService.saveOrUpdateJob(queryJob);
       result = true;
       result = true;
@@ -244,11 +247,22 @@ public class TkTaskCenterServiceImpl
         // 查询设备信息
         // 查询设备信息
         DeviceDTO dto = tkDeviceService.findDeviceInfoByTbDeviceId(tenantId, tbDeviceId);
         DeviceDTO dto = tkDeviceService.findDeviceInfoByTbDeviceId(tenantId, tbDeviceId);
         Map<String, List<String>> map = targetContent.getCancelExecuteDevices();
         Map<String, List<String>> map = targetContent.getCancelExecuteDevices();
-        if (isAllow) {
-          map.get(dto.getDeviceProfileId()).remove(tbDeviceId);
-        } else {
-          map.get(dto.getDeviceProfileId()).add(tbDeviceId);
+        if (null == map) {
+          map = new HashMap<>();
+        }
+        List<String> cancelExecuteList = map.get(dto.getDeviceProfileId());
+        if (null != cancelExecuteList && !cancelExecuteList.isEmpty()) {
+          if (isAllow) {
+            cancelExecuteList.remove(tbDeviceId);
+          } else {
+            cancelExecuteList.add(tbDeviceId);
+          }
+        } else if (null == cancelExecuteList && !isAllow) {
+          cancelExecuteList = new ArrayList<>();
+          cancelExecuteList.add(tbDeviceId);
+          map.put(dto.getDeviceProfileId(), cancelExecuteList);
         }
         }
+        targetContent.setCancelExecuteDevices(map);
         entity.setExecuteTarget(JacksonUtil.convertValue(targetContent, JsonNode.class));
         entity.setExecuteTarget(JacksonUtil.convertValue(targetContent, JsonNode.class));
         baseMapper.updateById(entity);
         baseMapper.updateById(entity);
         tkDeviceTaskCenterService.updateStateByTbDeviceIdAndTaskCenterId(
         tkDeviceTaskCenterService.updateStateByTbDeviceIdAndTaskCenterId(
@@ -304,7 +318,7 @@ public class TkTaskCenterServiceImpl
       entity.setTbDeviceId(key);
       entity.setTbDeviceId(key);
       entity.setTaskCenterId(taskCenterId);
       entity.setTaskCenterId(taskCenterId);
       entity.setTenantId(tenantId);
       entity.setTenantId(tenantId);
-      entity.setState(StatusEnum.ENABLE.getIndex());
+      entity.setAllowState(StatusEnum.ENABLE.getIndex());
       saveList.add(entity);
       saveList.add(entity);
     }
     }
     tkDeviceTaskCenterService.insertBatch(saveList);
     tkDeviceTaskCenterService.insertBatch(saveList);

@@ -13,12 +13,13 @@
         <result property="executeTime" column="execute_time"
         <result property="executeTime" column="execute_time"
                 typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
                 typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
         <result property="createTime" column="create_time"/>
         <result property="createTime" column="create_time"/>
+        <result property="state" column="state"/>
         <result property="creator" column="creator"/>
         <result property="creator" column="creator"/>
         <result property="updater" column="updater"/>
         <result property="updater" column="updater"/>
         <result property="updateTime" column="update_time"/>
         <result property="updateTime" column="update_time"/>
         <result property="tenantId" column="tenant_id" />
         <result property="tenantId" column="tenant_id" />
         <association property="tkDeviceTaskCenter" javaType="org.thingsboard.server.common.data.yunteng.dto.task.TkDeviceTaskCenterDTO">
         <association property="tkDeviceTaskCenter" javaType="org.thingsboard.server.common.data.yunteng.dto.task.TkDeviceTaskCenterDTO">
-            <result property="state" column="state"/>
+            <result property="allowState" column="allow_state"/>
             <result property="taskCenterId" column="task_center_id"/>
             <result property="taskCenterId" column="task_center_id"/>
             <result property="tbDeviceId" column="tb_device_id"/>
             <result property="tbDeviceId" column="tb_device_id"/>
         </association>
         </association>
@@ -28,12 +29,12 @@
 
 
     <sql id="basicColumns">
     <sql id="basicColumns">
         tc.id,tc.name,tc.target_type,tc.execute_target,tc.execute_content,tc.execute_time,tc.create_time,tc.creator,
         tc.id,tc.name,tc.target_type,tc.execute_target,tc.execute_content,tc.execute_time,tc.create_time,tc.creator,
-        tc.updater,tc.update_time,tc.tenant_id
+        tc.updater,tc.update_time,tc.tenant_id,tc.state
     </sql>
     </sql>
 
 
     <sql id="detailColumns">
     <sql id="detailColumns">
         <include refid="basicColumns"/>
         <include refid="basicColumns"/>
-        ,tdc.state,tdc.task_center_id,tb_device_id
+        ,tdc.allow_state,tdc.task_center_id,tb_device_id
     </sql>
     </sql>
     <select id="getPageData" resultMap="dataMap">
     <select id="getPageData" resultMap="dataMap">
         SELECT
         SELECT