Merge remote-tracking branch 'origin/test_hhl_0102' into test_hhl_0102

@@ -8,11 +8,17 @@ 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.TkDeviceCagegoryDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceAccountService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceCagegoryService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @RestController
 @TbCoreComponent
@@ -23,6 +29,8 @@ import java.util.List;
 public class TkDeviceCagegoryController extends BaseController {
     private final TkDeviceCagegoryService tkDeviceCagegoryService;
 
+    private final TkDeviceAccountService tkDeviceAccountService;
+
     @PostMapping("/getCagegoryByParentid")
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
     @ApiOperation("根据父类型获取设备类别")
@@ -48,6 +56,12 @@ public class TkDeviceCagegoryController extends BaseController {
     @GetMapping("/delete")
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
     public ResponseEntity<Boolean> delete(@RequestParam("id") String id) throws ThingsboardException {
+        Map<String, Object> params = new HashMap<>();
+        params.put("categoryId", id);
+        TkPageData<TkDeviceAccountDTO> page = tkDeviceAccountService.page(params);
+        if (page != null && page.getTotal() > 0) {
+            throw new TkDataValidationException("类别下还有关联数据不能删除！");
+        }
         return ResponseEntity.ok(tkDeviceCagegoryService.delete(id));
     }
 

@@ -14,6 +14,7 @@ import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkDeviceAccountDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkRepairOrderDTO;
 import org.thingsboard.server.common.data.yunteng.enums.RepairOrderStatusEnum;
+import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceAccountService;
@@ -92,6 +93,8 @@ public class TkRepairOrderController extends BaseController {
             throws ThingsboardException {
         params.put(PAGE, page);
         params.put(PAGE_SIZE, pageSize);
+        String currentUserId = getCurrentUser().getCurrentUserId();
+        params.put("userId", currentUserId);
         return tkRepairOrderService.page(params);
     }
 

@@ -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()));
     }
 

@@ -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:

@@ -11,10 +11,7 @@ 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.TkDeviceCagegoryDTO;
-import org.thingsboard.server.common.data.yunteng.dto.TkSupplierDTO;
-import org.thingsboard.server.common.data.yunteng.dto.UserDTO;
+import org.thingsboard.server.common.data.yunteng.dto.*;
 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.TkDeviceAccountEntity;
@@ -24,6 +21,7 @@ import org.thingsboard.server.dao.yunteng.service.*;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 @Service
@@ -156,6 +154,21 @@ public class TkDeviceAccountServiceImpl extends AbstractBaseService<TkDeviceAcco
     }
 
     @Override
+    public List<TkDeviceAccountDTO> listBySupplierId(List<String> supplierIdList) throws ThingsboardException {
+        if (CollectionUtils.isEmpty(supplierIdList)) {
+            throw new TkDataValidationException("供应商id不能为空！");
+        }
+        QueryWrapper<TkDeviceAccountEntity> wrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<TkDeviceAccountEntity> lambda = wrapper.lambda();
+        TenantId tenantId = SpringBeanUtils.getTenantId();
+        lambda.eq(TkDeviceAccountEntity::getTenantId, tenantId.getId().toString());
+        lambda.in(TkDeviceAccountEntity::getSupplierId, supplierIdList);
+        List<TkDeviceAccountEntity> entities = baseMapper.selectList(wrapper);
+        return Optional.ofNullable(entities).map(all -> all.stream().map(item -> item.getDTO(TkDeviceAccountDTO.class))
+                .collect(Collectors.toList())).orElse(null);
+    }
+
+    @Override
     public boolean delete(String id) {
         int count = baseMapper.deleteById(id);
         return count > 0;

@@ -107,7 +107,7 @@ public class TkDeviceCagegoryServiceImpl extends AbstractBaseService<TkDeviceCag
         }
         TkDeviceCagegoryUtil utils = new TkDeviceCagegoryUtil(topMenuList, subMenu);
         List<TkDeviceCagegoryDTO> result = utils.getTree();
-        return result;
+        return Optional.ofNullable(result).orElse(new ArrayList<>());
     }
 
     private List<String> getFullTreeId(List<String> filterIdList, Map<String, String> idMap) {

@@ -12,6 +12,8 @@ import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidatio
 import org.thingsboard.server.common.data.yunteng.dto.TkPreserveDetailStatusDTO;
 import org.thingsboard.server.common.data.yunteng.enums.PreserveDetailStatusEnum;
 import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
+import org.thingsboard.server.dao.yunteng.entities.TenantBaseEntity;
+import org.thingsboard.server.dao.yunteng.entities.TkPreserveDetailEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkPreserveDetailStatusEntity;
 import org.thingsboard.server.dao.yunteng.mapper.TkPreserveDetailStatusMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
@@ -44,6 +46,15 @@ public class TkPreserveDetailStatusServiceImpl extends AbstractBaseService<TkPre
     }
 
     @Override
+    public void deleteNotInIdEqRecordId(String recordId, List<String> notinIds) throws ThingsboardException {
+        baseMapper.delete(new QueryWrapper<TkPreserveDetailStatusEntity>()
+                .lambda().eq(TkPreserveDetailStatusEntity::getPreserveRecordId, recordId)
+                .eq(TenantBaseEntity::getTenantId, SpringBeanUtils.getTenantId().getId().toString())
+                .notIn(TkPreserveDetailStatusEntity::getId, notinIds)
+        );
+    }
+
+    @Override
     public List<TkPreserveDetailStatusDTO> listByPreserveRecordId(List<String> preserveRecordId) throws ThingsboardException {
         if (CollectionUtils.isEmpty(preserveRecordId)) {
             throw new TkDataValidationException("保养记录id不能为空！");

@@ -88,11 +88,12 @@ public class TkPreserveRecordServcieImpl extends AbstractBaseService<TkPreserveR
     @Transactional
     public TkPreserveRecordDTO save(TkPreserveRecordDTO dto) throws ThingsboardException {
         checkDto(dto);
-
+        Boolean isAdd = false;
         TkPreserveRecordEntity entity = new TkPreserveRecordEntity();
         if (StringUtils.isBlank(dto.getId())) {
             dto.copyToEntity(entity);
             baseMapper.insert(entity);
+            isAdd = true;
         } else {
             LambdaQueryWrapper<TkPreserveRecordEntity> filter = new QueryWrapper<TkPreserveRecordEntity>().lambda()
                     .eq(TkPreserveRecordEntity::getId, dto.getId());
@@ -103,6 +104,14 @@ public class TkPreserveRecordServcieImpl extends AbstractBaseService<TkPreserveR
         String id = dto.getId();
         List<TkPreserveDetailStatusDTO> preserveDetailStatusList = dto.getPreserveDetailStatusList();
         if (CollectionUtils.isNotEmpty(preserveDetailStatusList)) {
+            List<String> detaulStatusIdList = preserveDetailStatusList.stream().filter(e -> StringUtils.isNotBlank(e.getId()))
+                    .map(BaseDTO::getId).collect(Collectors.toList());
+            if (isAdd == false) {
+                if (CollectionUtils.isEmpty(detaulStatusIdList)) {
+                    detaulStatusIdList.add("empty");
+                }
+                tkPreserveDetailStatusService.deleteNotInIdEqRecordId(id, detaulStatusIdList);
+            }
             for (TkPreserveDetailStatusDTO tkPreserveDetailStatusDTO : preserveDetailStatusList) {
                 tkPreserveDetailStatusDTO.setPreserveRecordId(id);
                 tkPreserveDetailStatusService.save(tkPreserveDetailStatusDTO);
@@ -133,7 +142,7 @@ public class TkPreserveRecordServcieImpl extends AbstractBaseService<TkPreserveR
             dto.setTenantId(SpringBeanUtils.getTenantId().getId().toString());
         }
 
-        if (dto.getPreserveStatus() != null) {
+        if (dto.getPreserveStatus() == null) {
             dto.setPreserveStatus(PreserveRecordStatusEnum.INCOMPLETE);
         }
     }

@@ -9,11 +9,7 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 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.DeviceDTO;
-import org.thingsboard.server.common.data.yunteng.dto.TkDeviceAccountDTO;
-import org.thingsboard.server.common.data.yunteng.dto.TkPreserveRecordDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkRepairOrderDTO;
 import org.thingsboard.server.common.data.yunteng.enums.RepairOrderStatusEnum;
 import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
@@ -30,7 +26,6 @@ import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
-import java.util.UUID;
 
 @Service
 @RequiredArgsConstructor
@@ -151,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

@@ -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);
+        }
     }
 
 

@@ -114,7 +114,7 @@ public class TkSupplierServiceImpl extends AbstractBaseService<TkSupplierMapper,
     }
 
     @Override
-    public boolean delete(String id) {
+    public boolean delete(String id){
         int count = baseMapper.deleteById(id);
         return count > 0;
     }

@@ -19,6 +19,8 @@ public interface TkDeviceAccountService extends BaseService<TkDeviceAccountEntit
 
     List<String> getIdByDeviceName(String deviceName) throws ThingsboardException;
 
+    List<TkDeviceAccountDTO> listBySupplierId(List<String> supplierId) throws ThingsboardException;
+
     boolean delete(String id);
 
 }

@@ -9,5 +9,7 @@ import java.util.List;
 public interface TkPreserveDetailStatusService  extends BaseService<TkPreserveDetailStatusEntity> {
     TkPreserveDetailStatusDTO save(TkPreserveDetailStatusDTO dto) throws ThingsboardException;
 
+    void deleteNotInIdEqRecordId(String recordId, List<String> notinIds) throws ThingsboardException;
+
     List<TkPreserveDetailStatusDTO> listByPreserveRecordId(List<String> preserveRecordId) throws ThingsboardException;
 }

@@ -16,7 +16,7 @@ public interface TkSupplierService extends BaseService<TkSupplierEntity> {
 
     TkSupplierDTO detail(String id) throws ThingsboardException;
 
-    boolean delete(String id);
+    boolean delete(String id) throws ThingsboardException;
 
-    boolean delete(List<String> ids);
+    boolean delete(List<String> ids) throws ThingsboardException;
 }

@@ -53,9 +53,12 @@
         inner join qg_device_account da on da.id=o.device_id
         inner join sys_user su2 on su2.id=da.director_id
         <where>
-            <if test="queryMap.id !=null ">
+            <if test="queryMap.id !=null and queryMap.id !=''">
                 AND o.id = #{queryMap.id}
             </if>
+            <if test="queryMap.userId !=null and queryMap.userId !=''">
+                AND (o.report_by = #{queryMap.userId} or o.creator=#{queryMap.userId} or da.director_id=#{queryMap.userId})
+            </if>
             <if test="queryMap.tenantId !=null and queryMap.tenantId !=''">
                 AND o.tenant_id = #{queryMap.tenantId}
             </if>