fix

chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/CryptoServiceServiceImpl.java

@@ -2,6 +2,7 @@ package com.sunyard.chsm.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.sunyard.chsm.dto.CryptoServiceDTO;
 import com.sunyard.chsm.enums.ApiFunEnum;
@@ -105,6 +106,7 @@ public class CryptoServiceServiceImpl implements CryptoServiceService {
         checkName(save.getName());
 
         CryptoService service = new CryptoService();
+        service.setId(IdWorker.getId());
         service.setName(save.getName());
 
         DeviceGroup deviceGroup = spDeviceGroupMapper.selectById(save.getDeviceGroupId());
@@ -180,6 +182,7 @@ public class CryptoServiceServiceImpl implements CryptoServiceService {
                 .filter(it -> apiList.contains(it.getCode()))
                 .map(it -> {
                     CryptoServiceApi serviceApi = new CryptoServiceApi();
+                    serviceApi.setId(IdWorker.getId());
                     serviceApi.setCryptoServiceId(serviceId);
                     serviceApi.setApiGroup(it.getGroup().getCode());
                     serviceApi.setApiCode(it.getCode());

chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/DeviceGroupServiceImpl.java

@@ -2,6 +2,7 @@ package com.sunyard.chsm.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.sunyard.chsm.dto.DeviceGroupDTO;
 import com.sunyard.chsm.mapper.SpDeviceGroupMapper;
@@ -84,6 +85,7 @@ public class DeviceGroupServiceImpl implements DeviceGroupService {
         checkName(save.getName());
 
         DeviceGroup add = new DeviceGroup();
+        add.setId(IdWorker.getId());
         add.setName(save.getName());
         add.setRemark(save.getRemark());
         add.setCreateTime(LocalDateTime.now());

chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/DeviceServiceImpl.java

@@ -2,6 +2,7 @@ package com.sunyard.chsm.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.sunyard.chsm.dto.DeviceDTO;
 import com.sunyard.chsm.enums.ManufacturerEnum;
@@ -123,7 +124,7 @@ public class DeviceServiceImpl implements DeviceService {
 
         Device device = new Device();
         BeanUtils.copyProperties(save, device);
-        device.setId(null);
+        device.setId(IdWorker.getId());
         device.setGroupId(0L);
         device.setGroupName("");
         device.setWeight(1);

chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/KeyTemplateServiceImpl.java

@@ -2,6 +2,7 @@ package com.sunyard.chsm.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.sunyard.chsm.dto.KeyTemplateDTO;
 import com.sunyard.chsm.enums.KeyAlg;
@@ -78,6 +79,7 @@ public class KeyTemplateServiceImpl implements KeyTemplateService {
         checkCode(save.getCode());
 
         KeyTemplate add = mapToEntity(save);
+        add.setId(IdWorker.getId());
         add.setCreateTime(LocalDateTime.now());
 
         keyTemplateMapper.insert(add);

chsm-web-manage/src/main/java/com/sunyard/ssp/common/exception/GlobalExceptionResolver.java

@@ -1,10 +1,7 @@
 package com.sunyard.ssp.common.exception;
 
 import com.sunyard.chsm.model.R;
-import com.sunyard.ssp.common.Result;
-import com.sunyard.ssp.utils.ResultUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.mybatis.spring.MyBatisSystemException;
 import org.springframework.validation.BindException;
 import org.springframework.validation.FieldError;
 import org.springframework.web.bind.MethodArgumentNotValidException;
@@ -31,38 +28,15 @@ import java.util.Optional;
 @RestControllerAdvice
 public class GlobalExceptionResolver {
 
-    /**
-     * 处理所有不可知异常
-     *
-     * @param e 异常
-     * @return json结果
-     */
-//    @ExceptionHandler(Exception.class)
-//    @ResponseBody
-//    public Result<Object> handleException(Exception e) {
-//        // 打印异常堆栈信息
-//        return new ResultUtil().setErrorMsg(e.getMessage());
-//    }
-
-    /**
-     * 数据持久层
-     */
-    @ExceptionHandler(MyBatisSystemException.class)
-    @ResponseBody
-    public Result<Object> handleMyBatisSystemException(MyBatisSystemException e) {
-        log.info("数据持久层");
-        return new ResultUtil().setErrorMsg(e.getLocalizedMessage());
-    }
-
     /**
      * 校验器
      */
     @ExceptionHandler(BindException.class)
     @ResponseBody
-    public Result<Object> handleBindException(BindException e) {
-        log.info("校验器");
+    public R<?> handleBindException(BindException e) {
+        log.info("校验器异常", e);
         FieldError fieldError = e.getBindingResult().getFieldError();
-        return new ResultUtil().setErrorMsg(fieldError.getDefaultMessage());
+        return R.error(400, fieldError.getDefaultMessage());
     }
 
     @ExceptionHandler(MethodArgumentNotValidException.class)

chsm-web-manage/src/main/java/com/sunyard/ssp/modules/monitor/log/serviceimpl/LogDownloadServiceImpl.java

@@ -17,7 +17,7 @@ import java.util.zip.ZipOutputStream;
 @Service
 public class LogDownloadServiceImpl implements LogDownloadService {
 
-    private static final String LOG_BASE_PATH = "/app/log/";
+    private static final String LOG_BASE_PATH = "./log/";
     private static final DateTimeFormatter folderFormatter = DateTimeFormatter.ofPattern("yyyy-MM"); // 用于遍历月份的目录格式
     private static final DateTimeFormatter fileFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); // 用于解析文件名中的日期格式