Merge remote-tracking branch 'origin/master'

bound-link-api/blink-base/src/main/java/com/cloud/sa/base/common/code/UserErrorCode.java

@@ -34,7 +34,11 @@ public enum UserErrorCode implements ErrorCode {
     LOGIN_FAIL_LOCK(30010, "登录连续失败已经被锁定，无法登录"),
     LOGIN_FAIL_WILL_LOCK(30011, "登录连续失败将会锁定提醒"),
 
-    LOGIN_ACTIVE_TIMEOUT(30012, "长时间未操作系统，需要重新登录");
+    LOGIN_ACTIVE_TIMEOUT(30012, "长时间未操作系统，需要重新登录"),
+
+    ALREADY_NOT_EXIST(30013, "数据不存在");
+
+
 
     private final int code;
 

bound-link-api/blink-base/src/main/java/com/cloud/sa/base/common/domain/ResponseDTO.java

@@ -94,10 +94,6 @@ public class ResponseDTO<T> {
         return new ResponseDTO<>(OK_CODE, null, true, OK_MSG, data);
     }
 
-    public static <T> ResponseDTO<T> error(T data) {
-        return new ResponseDTO<>(OK_CODE, null, true, OK_MSG, data);
-    }
-
     public static <T> ResponseDTO<T> ok(T data, Map<String, Object> dataSet) {
         return new ResponseDTO<>(OK_CODE, null, true, OK_MSG, data, dataSet);
     }

bound-link-api/blink-base/src/main/java/com/cloud/sa/base/common/util/JobMapper.java

@@ -0,0 +1,17 @@
+package com.cloud.sa.base.common.util;
+
+import com.cloud.sa.base.module.support.job.api.domain.SmartJobEntityAddForm;
+import com.cloud.sa.base.module.support.job.repository.domain.SmartJobEntity;
+import org.mapstruct.Mapper;
+import org.mapstruct.MappingTarget;
+import org.mapstruct.NullValuePropertyMappingStrategy;
+
+@Mapper(
+    componentModel = "spring", // 如果你使用Spring
+    nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE
+)
+public interface JobMapper {
+    
+
+    void updateJobEntityFromAddForm(SmartJobEntityAddForm addForm, @MappingTarget SmartJobEntity jobEntity);
+}

bound-link-api/blink-base/src/main/java/com/cloud/sa/base/module/support/dict/controller/DictController.java

@@ -54,7 +54,7 @@ public class DictController extends SupportBaseController {
 
     @GetMapping("/dict/updateDisabled/{id}")
     public ResponseDTO<String> keyUpdateStatus(@PathVariable("id") long id){
-        return ResponseDTO.ok(dictService.updateStatus(id));
+        return dictService.updateStatus(id);
     }
 
 

bound-link-api/blink-base/src/main/java/com/cloud/sa/base/module/support/dict/service/DictService.java

@@ -209,15 +209,20 @@ public class DictService {
      * @param id
      * @return
      * */
-    public String updateStatus(long id){
+    public ResponseDTO<String> updateStatus(long id){
         DictKeyEntity dictKeyEntity = dictKeyDao.selectById(id);
+        if (dictKeyEntity == null) {
+            return ResponseDTO.error(UserErrorCode.ALREADY_EXIST);
+        }
+
         if(dictKeyEntity.getStatus() == 0){
             dictKeyEntity.setStatus(1);
         }else {
             dictKeyEntity.setStatus(0);
         }
-        int i = dictKeyDao.updateById(dictKeyEntity);
-        return i > 0 ? "操作成功" : "操作失败";
+
+        dictKeyDao.updateById(dictKeyEntity);
+        return ResponseDTO.ok();
     }
 
 

bound-link-api/blink-base/src/main/java/com/cloud/sa/base/module/support/job/api/SmartJobService.java

@@ -1,8 +1,10 @@
 package com.cloud.sa.base.module.support.job.api;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cloud.sa.base.common.domain.RequestUser;
 import com.cloud.sa.base.common.util.BlinkRequestUtil;
+import com.cloud.sa.base.common.util.JobMapper;
 import com.cloud.sa.base.module.support.job.api.domain.*;
 import com.cloud.sa.base.module.support.job.config.SmartJobAutoConfiguration;
 import com.cloud.sa.base.module.support.job.constant.SmartJobTriggerTypeEnum;
@@ -50,6 +52,9 @@ public class SmartJobService {
     @Resource
     private SmartJobClientManager jobClientManager;
 
+    @Resource
+    private JobMapper jobMapper;
+
     /**
      * 查询 定时任务详情
      *
@@ -231,6 +236,13 @@ public class SmartJobService {
      */
     public ResponseDTO<String> addJob(SmartJobEntityAddForm addForm) {
 
+        QueryWrapper<SmartJobEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("job_name", addForm.getJobName());
+        SmartJobEntity smartJobEntity = jobDao.selectOne(queryWrapper);
+        if (null != smartJobEntity) {
+            return ResponseDTO.error(UserErrorCode.ALREADY_EXIST);
+        }
+
         SmartJobEntity jobEntity = new SmartJobEntity();
 
         // 校验触发时间配置
@@ -243,8 +255,9 @@ public class SmartJobService {
             return ResponseDTO.userErrorParam("固定间隔错误：整数且大于0");
         }
         BeanUtils.copyProperties(addForm, jobEntity);
-        int i = jobDao.insert(jobEntity);
-        return i > 0 ? ResponseDTO.ok("新增成功") : ResponseDTO.error("新增失败");
+        jobMapper.updateJobEntityFromAddForm(addForm, jobEntity);
+        jobDao.insert(jobEntity);
+        return ResponseDTO.ok();
     }
 
     /**
@@ -257,7 +270,7 @@ public class SmartJobService {
      * @author huke
      */
     public ResponseDTO<String> delJob(Integer jobId) {
-        int i = jobDao.deleteById(jobId);
-        return i > 0 ? ResponseDTO.ok("删除成功") : ResponseDTO.error("删除失败");
+        jobDao.deleteById(jobId);
+        return ResponseDTO.ok();
     }
 }