Merge branch 'usky-zyj' of uskycloud/usky-modules into master

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/impl/BaseAlarmServiceImpl.java

@@ -120,10 +120,14 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
                     return saveResult;
                 }
             }else {
-                throw new BusinessException("告警数据投递失败，请检查产品编码、设备编号、告警类型，是否有误;设备是否激活");
+                //throw new BusinessException("告警数据投递失败，请检查产品编码、设备编号、告警类型，是否有误;设备是否激活");
+                log.error("告警数据投递失败，请检查产品编码、设备编号、告警类型，是否有误;设备是否激活");
+                return false;
             }
         }else {
-            throw new BusinessException("告警数据投递失败，请检查产品编码、设备编号、告警类型，不能为空");
+            //throw new BusinessException("告警数据投递失败，请检查产品编码、设备编号、告警类型，不能为空");
+            log.error("告警数据投递失败，请检查产品编码、设备编号、告警类型，不能为空");
+            return false;
         }
     }
 

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

@@ -9,6 +9,7 @@ import com.usky.iot.domain.DmpProductInfo;
 import com.usky.iot.service.DmpProductInfoService;
 import com.usky.iot.service.vo.DmpProductInfoRequest;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -33,6 +34,7 @@ public class DmpProductInfoController {
      * @param dmpProductInfo
      * @return
      */
+    @Transactional(rollbackFor = Exception.class)
     @PostMapping
     public ApiResult<Void> add(@RequestBody List<DmpProductInfo> dmpProductInfo){
         dmpProductInfoService.add(dmpProductInfo);
@@ -44,6 +46,7 @@ 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

@@ -548,7 +548,10 @@ public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoM
             dmpDeviceInfo.setCreatedTime(LocalDateTime.now());
             dmpDeviceInfo.setTenantId(SecurityUtils.getTenantId());
 
-            dmpDeviceInfo.setServiceStatus(1);
+            if(dmpDeviceInfo.getServiceStatus() == null) {
+                dmpDeviceInfo.setServiceStatus(1);
+            }
+
             if (StringUtils.isBlank(dmpDeviceInfo.getDeviceUuid())) {
                 dmpDeviceInfo.setDeviceUuid(UUIDUtils.uuid().substring(0, 16));
             }