Преглед на файлове

fix:bug
1.删除服务单元重启功能,(已完结服务单元)并入发布功能

caozixuan преди 1 година
родител
ревизия
d536a22cd3

+ 1 - 0
sop-api/src/main/java/com/qmth/sop/server/api/TBServiceController.java

@@ -96,6 +96,7 @@ public class TBServiceController {
     @RequestMapping(value = "/restart", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "重启成功", response = Result.class)})
     @OperationLog
+    @Deprecated
     public Result restartServiceUnit(@ApiParam(value = "服务单元id", required = true) @RequestParam String id) {
         tbServiceService.restartServiceUnit(SystemConstant.convertIdToLong(id));
         return ResultUtil.ok();

+ 0 - 2
sop-business/src/main/java/com/qmth/sop/business/entity/TBCrm.java

@@ -1,7 +1,5 @@
 package com.qmth.sop.business.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.sop.common.base.BaseEntity;

+ 1 - 0
sop-business/src/main/java/com/qmth/sop/business/service/TBServiceService.java

@@ -74,5 +74,6 @@ public interface TBServiceService extends IService<TBService> {
      *
      * @param serviceUnitId 服务单元id
      */
+    @Deprecated
     void restartServiceUnit(Long serviceUnitId);
 }

+ 3 - 2
sop-business/src/main/java/com/qmth/sop/business/service/impl/TBServiceServiceImpl.java

@@ -124,8 +124,8 @@ public class TBServiceServiceImpl extends ServiceImpl<TBServiceMapper, TBService
             throw ExceptionResultEnum.ERROR.exception("未找到服务单元");
         }
         ServiceStatusEnum status = tbService.getStatus();
-        if (!ServiceStatusEnum.NEW.equals(status)) {
-            throw ExceptionResultEnum.ERROR.exception(String.format("只有[%s]状态的服务单元可以被发布,当前状态[%s]", ServiceStatusEnum.NEW, status));
+        if (!ServiceStatusEnum.NEW.equals(status) && ServiceStatusEnum.FINISH.equals(status)) {
+            throw ExceptionResultEnum.ERROR.exception(String.format("只有[%s]状态的服务单元可以被发布,当前状态[%s]", ServiceStatusEnum.NEW + "或" + ServiceStatusEnum.FINISH, status));
         }
         // TODO: 2023/8/8 业务校验 服务单元完成了相关准备工作:服务范围划定、供应商划定
         List<SysDingGroup> sysDingGroupList = sysDingGroupService.list(new QueryWrapper<SysDingGroup>().lambda().eq(SysDingGroup::getServiceId,serviceUnitId));
@@ -152,6 +152,7 @@ public class TBServiceServiceImpl extends ServiceImpl<TBServiceMapper, TBService
         this.updateById(tbService);
     }
 
+    @Deprecated
     @Transactional
     @Override
     public void restartServiceUnit(Long serviceUnitId) {