解决冲突

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/DmpProductInfoController.java

@@ -34,7 +34,6 @@ public class DmpProductInfoController {
      * @param dmpProductInfo
      * @return
      */
-    @Transactional(rollbackFor = Exception.class)
     @PostMapping
     public ApiResult<Void> add(@RequestBody List<DmpProductInfo> dmpProductInfo){
         dmpProductInfoService.add(dmpProductInfo);
@@ -46,7 +45,6 @@ public class DmpProductInfoController {
      * @param dmpProductInfo
      * @return
      */
-    @Transactional(rollbackFor = Exception.class)
     @PutMapping
     public ApiResult<Void> edit(@RequestBody DmpProductInfo dmpProductInfo){
         dmpProductInfoService.update(dmpProductInfo);

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpDeviceInfoServiceImpl.java

@@ -547,6 +547,7 @@ public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoM
             dmpDeviceInfo.setCreatedBy(SecurityUtils.getUsername());
             dmpDeviceInfo.setCreatedTime(LocalDateTime.now());
             dmpDeviceInfo.setTenantId(SecurityUtils.getTenantId());
+
             if(dmpDeviceInfo.getServiceStatus() == null) {
                 dmpDeviceInfo.setServiceStatus(1);
             }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpProductInfoServiceImpl.java

@@ -29,6 +29,7 @@ import com.usky.iot.service.vo.DmpProductInfoRequest;
 import com.usky.transfer.RemoteTransferService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -70,6 +71,7 @@ public class DmpProductInfoServiceImpl extends AbstractCrudService<DmpProductInf
     private RemoteTsdbProxyService remoteTsdbProxyService;
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void add(List<DmpProductInfo> dmpProductInfo) {
         if (CollectionUtils.isEmpty(dmpProductInfo)) {
             throw new BusinessException("数据不能为空");
@@ -218,6 +220,7 @@ public class DmpProductInfoServiceImpl extends AbstractCrudService<DmpProductInf
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void update(DmpProductInfo dmpProductInfo) {
         dmpProductInfo.setUpdatedTime(new Date());
         if (checkNameUnique(dmpProductInfo)){