bug修复

胡翰林
1 parent 7565d561
Showing 7 changed files with 27 additions and 19 deletions
application/src/main/java/org/thingsboard/server/controller/yunteng/TkSupplierController.java
application/src/main/resources/thingsboard.yml
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceAccountServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkRepairOrderServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkRepairRecordServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkSupplierServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkSupplierService.java
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkSupplierController.java
View file @c030fc7
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkSupplierController.java
View file @c030fc7
@@ -4,13 +4,17 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.dto.TkDeviceAccountDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkSupplierDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceAccountService;
 import org.thingsboard.server.dao.yunteng.service.TkSupplierService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
@@ -28,6 +32,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 public class TkSupplierController extends BaseController {
     private final TkSupplierService tkSupplierService;
+    private final TkDeviceAccountService tkDeviceAccountService;
     @PostMapping("/pageData")
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
@@ -61,6 +66,10 @@ public class TkSupplierController extends BaseController {
     @PostMapping("/delete")
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
     public ResponseEntity<Boolean> delete(@RequestBody TkSupplierDTO param) throws ThingsboardException {
+        List<TkDeviceAccountDTO> tkDeviceAccountDTOS = tkDeviceAccountService.listBySupplierId(param.getIds());
+        if (CollectionUtils.isNotEmpty(tkDeviceAccountDTOS)) {
+            throw new TkDataValidationException("存在关联的供应商无法删除！");
+        }
         return ResponseEntity.ok(tkSupplierService.delete(param.getIds()));
     }
--- a/application/src/main/resources/thingsboard.yml
View file @c030fc7
+++ b/application/src/main/resources/thingsboard.yml
View file @c030fc7
@@ -31,7 +31,7 @@ server:
   # Server bind-address
   address: "${HTTP_BIND_ADDRESS:0.0.0.0}"
   # Server bind port
-  port: "${HTTP_BIND_PORT:8080}"
+  port: "${HTTP_BIND_PORT:9527}"
   # Server forward headers strategy
   forward_headers_strategy: "${HTTP_FORWARD_HEADERS_STRATEGY:NONE}"
   # Server SSL configuration
@@ -766,7 +766,7 @@ spring:
   datasource:
     # Database driver for Spring JPA - org.postgresql.Driver
     driverClassName: "${SPRING_DRIVER_CLASS_NAME:org.postgresql.Driver}"
-    url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://10.9.0.221:5432/thingskit}"
+    url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://10.9.0.205:5432/thingskit}"
     username: "${SPRING_DATASOURCE_USERNAME:postgres}"
     password: "${SPRING_DATASOURCE_PASSWORD:postgres}"
     hikari:
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceAccountServiceImpl.java
View file @c030fc7
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceAccountServiceImpl.java
View file @c030fc7
@@ -155,7 +155,7 @@ public class TkDeviceAccountServiceImpl extends AbstractBaseService<TkDeviceAcco
     @Override
     public List<TkDeviceAccountDTO> listBySupplierId(List<String> supplierIdList) throws ThingsboardException {
-        if (CollectionUtils.isNotEmpty(supplierIdList)) {
+        if (CollectionUtils.isEmpty(supplierIdList)) {
             throw new TkDataValidationException("供应商id不能为空！");
         }
         QueryWrapper<TkDeviceAccountEntity> wrapper = new QueryWrapper<>();
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkRepairOrderServiceImpl.java
View file @c030fc7
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkRepairOrderServiceImpl.java
View file @c030fc7
@@ -146,6 +146,10 @@ public class TkRepairOrderServiceImpl extends AbstractBaseService<TkRepairOrderM
         if (StringUtils.isBlank(dto.getTenantId())) {
             dto.setTenantId(SpringBeanUtils.getTenantId().getId().toString());
         }
+
+        if (dto.getStatus() == null) {
+            dto.setStatus(RepairOrderStatusEnum.SCHEDULING);
+        }
     }
     @Override
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkRepairRecordServiceImpl.java
View file @c030fc7
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkRepairRecordServiceImpl.java
View file @c030fc7
@@ -14,6 +14,7 @@ import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidatio
 import org.thingsboard.server.common.data.yunteng.dto.TkRepairOrderDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkRepairRecordDTO;
 import org.thingsboard.server.common.data.yunteng.dto.UserDTO;
+import org.thingsboard.server.common.data.yunteng.utils.DateTimeUtils;
 import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkRepairRecordEntity;
@@ -24,6 +25,7 @@ import org.thingsboard.server.dao.yunteng.service.TkRepairRecordService;
 import org.thingsboard.server.dao.yunteng.service.TkUserService;
 import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -39,9 +41,10 @@ public class TkRepairRecordServiceImpl extends AbstractBaseService<TkRepairRecor
     private final TkRepairOrderService tkRepairOrderService;
-
     private final TkUserService tkUserService;
+    private final String REPAIR_RECORD_CODE_PREFIX = "RRC_";
+
     @Override
     public TkPageData<TkRepairRecordDTO> page(Map<String, Object> params) throws ThingsboardException {
         params.put("tenantId", SpringBeanUtils.getTenantId().getId().toString());
@@ -94,6 +97,11 @@ public class TkRepairRecordServiceImpl extends AbstractBaseService<TkRepairRecor
         if (StringUtils.isBlank(dto.getTenantId())) {
             dto.setTenantId(SpringBeanUtils.getTenantId().getId().toString());
         }
+
+        if (StringUtils.isBlank(dto.getCode())) {
+            long time = new Date().getTime();
+            dto.setCode(REPAIR_RECORD_CODE_PREFIX + time);
+        }
     }
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkSupplierServiceImpl.java
View file @c030fc7
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkSupplierServiceImpl.java
View file @c030fc7
@@ -11,7 +11,6 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
-import org.thingsboard.server.common.data.yunteng.dto.TkDeviceAccountDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkSupplierDTO;
 import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
@@ -19,11 +18,8 @@ import org.thingsboard.server.dao.yunteng.entities.TenantBaseEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkSupplierEntity;
 import org.thingsboard.server.dao.yunteng.mapper.TkSupplierMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
-import org.thingsboard.server.dao.yunteng.service.TkDeviceAccountService;
 import org.thingsboard.server.dao.yunteng.service.TkSupplierService;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -33,9 +29,6 @@ import java.util.stream.Collectors;
 @Slf4j
 public class TkSupplierServiceImpl extends AbstractBaseService<TkSupplierMapper, TkSupplierEntity>
         implements TkSupplierService {
-
-    private TkDeviceAccountService tkDeviceAccountService;
-
     @Override
     public TkPageData<TkSupplierDTO> page(TkSupplierDTO condition) throws ThingsboardException {
         QueryWrapper<TkSupplierEntity> wrapper = new QueryWrapper<>();
@@ -121,13 +114,7 @@ public class TkSupplierServiceImpl extends AbstractBaseService<TkSupplierMapper,
     }
     @Override
-    public boolean delete(String id) throws ThingsboardException {
-        List<String> supplierId = new ArrayList<>();
-        supplierId.add(id);
-        List<TkDeviceAccountDTO> tkDeviceAccountDTOS = tkDeviceAccountService.listBySupplierId(supplierId);
-        if (CollectionUtils.isNotEmpty(tkDeviceAccountDTOS)) {
-            throw new TkDataValidationException("存在关联的供应商无法删除！");
-        }
+    public boolean delete(String id){
         int count = baseMapper.deleteById(id);
         return count > 0;
     }
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkSupplierService.java
View file @c030fc7
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkSupplierService.java
View file @c030fc7
@@ -18,5 +18,5 @@ public interface TkSupplierService extends BaseService<TkSupplierEntity> {
     boolean delete(String id) throws ThingsboardException;
-    boolean delete(List<String> ids);
+    boolean delete(List<String> ids) throws ThingsboardException;
 }