Merge remote-tracking branch 'origin/master'

signal-optimize-service/src/main/java/net/wanji/opt/controller/strategy/SceneController.java

@@ -12,7 +12,6 @@ import net.wanji.opt.dto.strategy.AddOrUpdateSceneDTO;
 import net.wanji.opt.dto.strategy.QuerySceneDTO;
 import net.wanji.opt.service.strategy.SceneService;
 import org.springframework.dao.DuplicateKeyException;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -48,10 +47,8 @@ public class SceneController {
         try {
             sceneService.addOrUpdateScene(addOrUpdateSceneDTO);
         } catch (DuplicateKeyException e) {
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             throw new DuplicateKeyException("场景编号或场景名称不可重复");
         } catch (UniqueException e) {
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             throw new UniqueException("应用策略或优化方法不可重复");
         }
         return JsonViewObject.newInstance().success();

signal-utc-service/src/main/java/net/wanji/utc/controller/ManufacturerApiController.java

@@ -15,6 +15,7 @@ import net.wanji.utc.po.ManufacturerApiInfoPO;
 import net.wanji.utc.service.systemadmin.ManufacturerApiInfoService;
 import net.wanji.utc.vo.systemadmin.ManufacturerApiInfoVO;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DuplicateKeyException;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -57,10 +58,12 @@ public class ManufacturerApiController {
     @ApiOperation(value = "接口添加或修改", notes = "接口添加或修改", consumes = MediaType.APPLICATION_JSON)
     @PostMapping(value = "/insertOrUpdate", consumes = MediaType.APPLICATION_JSON)
     public JsonViewObject insertOrUpdate(@RequestBody @Validated ManufacturerApiInfoInsertOrUpdateDTO inVO) {
+        try {
             manufacturerApiInfoService.insertOrUpdate(inVO);
-        JsonViewObject jsonViewObject = JsonViewObject.newInstance();
-
-        return jsonViewObject.success();
+        } catch (DuplicateKeyException e) {
+            throw new DuplicateKeyException("接口代码、接口名称、接口地址不可重复");
+        }
+        return JsonViewObject.newInstance().success();
     }
 
     @AspectLog(description = "接口删除", operationType = BaseEnum.OperationTypeEnum.QUERY)

signal-utc-service/src/main/java/net/wanji/utc/controller/ManufacturerController.java

@@ -14,6 +14,7 @@ import net.wanji.utc.dto.systemadmin.ManufacturerListDTO;
 import net.wanji.utc.po.ManufacturerInfoPO;
 import net.wanji.utc.service.systemadmin.ManufacturerService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DuplicateKeyException;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -64,10 +65,12 @@ public class ManufacturerController {
     @ApiOperation(value = "厂商添加或修改", notes = "厂商添加或修改", consumes = MediaType.APPLICATION_JSON)
     @PostMapping(value = "/insertOrUpdate", consumes = MediaType.APPLICATION_JSON)
     public JsonViewObject insertOrUpdate(@RequestBody @Validated ManufacturerInsertOrUpdateDTO inVO) {
+        try {
             manufacturerService.insertOrUpdate(inVO);
-        JsonViewObject jsonViewObject = JsonViewObject.newInstance();
-
-        return jsonViewObject.success();
+        } catch (DuplicateKeyException e) {
+            throw new DuplicateKeyException("厂商代码、厂商名称、厂商简称、平台地址、维护单位不可重复");
+        }
+        return JsonViewObject.newInstance().success();
     }
 
     @AspectLog(description = "厂商删除", operationType = BaseEnum.OperationTypeEnum.DELETE)