异常捕获，用于事务注解生效

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertCalledController.java

@@ -69,29 +69,33 @@ public class AlertCalledController extends BaseController {
     @ApiOperation(httpMethod = "POST", value = "新增警情接警记录", notes = "新增警情接警记录")
     @Transactional
     public ResponseModel<AlertCalledVo> saveAlertCalled(HttpServletRequest request, @RequestBody AlertCalledVo alertCalledVo) {
-        // 警情基本信息
-        AlertCalled alertCalled = alertCalledVo.getAlertCalled();
-        // 判断是否归并警情
-        if (alertCalled.getFatherAlert() != null) {
-            // 警情归并，设置当前警情状态为结束。
-            alertCalled.setAlertStatus(true);
-        } else {
-            // 警情报送
-            // ****************************************************待确认开发
-        }
-        iAlertCalledService.save(alertCalled);
-        // 动态表单
-        List<AlertFormValue> alertFormValuelist = alertCalledVo.getAlertFormValue();
-        // 填充警情主键
-        alertFormValuelist.stream().forEach(alertFormValue -> {
-            alertFormValue.setAlertCalledId(alertCalled.getSequenceNbr());
-            alertFormValue.setAlertTypeCode(alertCalled.getAlertTypeCode());
-        });
-        // 保存动态表单数据
-        iAlertFormValueService.saveBatch(alertFormValuelist);
-        iAlertCalledService.save(alertCalled);
-        
-        return ResponseHelper.buildResponse(alertCalledVo);
+      try {
+    	  // 警情基本信息
+          AlertCalled alertCalled = alertCalledVo.getAlertCalled();
+          // 判断是否归并警情
+          if (alertCalled.getFatherAlert() != null) {
+              // 警情归并，设置当前警情状态为结束。
+              alertCalled.setAlertStatus(true);
+          } else {
+              // 警情报送
+              // ****************************************************待确认开发
+          }
+          iAlertCalledService.save(alertCalled);
+          // 动态表单
+          List<AlertFormValue> alertFormValuelist = alertCalledVo.getAlertFormValue();
+          // 填充警情主键
+          alertFormValuelist.stream().forEach(alertFormValue -> {
+              alertFormValue.setAlertCalledId(alertCalled.getSequenceNbr());
+              alertFormValue.setAlertTypeCode(alertCalled.getAlertTypeCode());
+          });
+          // 保存动态表单数据
+          iAlertFormValueService.saveBatch(alertFormValuelist);
+          iAlertCalledService.save(alertCalled);
+          
+          return ResponseHelper.buildResponse(alertCalledVo);
+	} catch (Exception e) {
+		throw new RuntimeException("系统异常");
+	}
     }
 
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersController.java

@@ -68,13 +68,21 @@ public class FirefightersController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增消防队员", notes = "新增消防队员")
+    @Transactional
     public ResponseModel<Firefighters> saveFirefighters(HttpServletRequest request, @RequestBody FirefightersVo firefighters){
-        Firefighters firefighter= firefighters.getFirefighters();
-    	iFirefightersService.save(firefighter);
-        FirefightersContacts firefightersContact= firefighters.getFirefightersContacts();
-        firefightersContact.setFirefightersId(firefighter.getSequenceNbr());
-    	ifirefightersContactsService.save(firefightersContact);
-    	return ResponseHelper.buildResponse(firefighter);
+      
+    	try {
+    		   Firefighters firefighter= firefighters.getFirefighters();
+    	    	iFirefightersService.save(firefighter);
+    	        FirefightersContacts firefightersContact= firefighters.getFirefightersContacts();
+    	        firefightersContact.setFirefightersId(firefighter.getSequenceNbr());
+    	    	ifirefightersContactsService.save(firefightersContact);
+    	    	return ResponseHelper.buildResponse(firefighter);
+		} catch (Exception e) {
+		
+			throw new RuntimeException("系统异常");
+		}
+		
     }
 
     /**
@@ -124,12 +132,17 @@ public class FirefightersController extends BaseController {
     @ApiOperation(httpMethod = "PUT", value = "修改消防队员", notes = "修改消防队员")
     @Transactional
     public ResponseModel<Object> updateByIdFirefighters(HttpServletRequest request, @RequestBody FirefightersVo firefighters){
-        Firefighters firefighter= firefighters.getFirefighters();
-    	iFirefightersService.updateById(firefighter);
-    	ifirefightersContactsService.updateById(firefighters.getFirefightersContacts());
-    	//删除缓存
-        redisUtils.del(RedisKey.FIREFIGHTERS_ID+firefighter.getSequenceNbr(),RedisKey.FIREFIGHTERS_LIST_ID+firefighter.getSequenceNbr());
-    	return ResponseHelper.buildResponse(null);
+	    try {
+	    	Firefighters firefighter= firefighters.getFirefighters();
+	    	iFirefightersService.updateById(firefighter);
+	    	ifirefightersContactsService.updateById(firefighters.getFirefightersContacts());
+	    	//删除缓存
+	        redisUtils.del(RedisKey.FIREFIGHTERS_ID+firefighter.getSequenceNbr(),RedisKey.FIREFIGHTERS_LIST_ID+firefighter.getSequenceNbr());
+	    	return ResponseHelper.buildResponse(null);
+	    } catch (Exception e) {
+			
+			throw new RuntimeException("系统异常");
+		}
     }
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersPostController.java

@@ -65,11 +65,15 @@ public class FirefightersPostController extends BaseController {
     @ApiOperation(httpMethod = "POST", value = "新增岗位信息", notes = "新增岗位信息")
     @Transactional
     public ResponseModel<Object> saveFirefightersPost(HttpServletRequest request, @RequestBody FirefightersData firefightersData){    	
-    	
-    		iFirefightersPostService.save(firefightersData.getFirefightersPost());
-    		ifirefightersWorkexperienceService.save(firefightersData.getFirefightersWorkexperience());
-    		ifirefightersEducationService.save(firefightersData.getFirefightersEducation()) ;
-    		 return ResponseHelper.buildResponse(null);  	   	
+		    try {	
+		    		iFirefightersPostService.save(firefightersData.getFirefightersPost());
+		    		ifirefightersWorkexperienceService.save(firefightersData.getFirefightersWorkexperience());
+		    		ifirefightersEducationService.save(firefightersData.getFirefightersEducation()) ;
+		    		 return ResponseHelper.buildResponse(null);  
+		    } catch (Exception e) {
+				
+				throw new RuntimeException("系统异常");
+			}	 
      }
 
     /**
@@ -81,12 +85,17 @@ public class FirefightersPostController extends BaseController {
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
     @ApiOperation(httpMethod = "DELETE", value = "根据消防人员id删除岗位和学历信息", notes = "根据 id删除")
     public ResponseModel<Object> deleteById(HttpServletRequest request, @PathVariable Long id){
-    	iFirefightersPostService.update(new UpdateWrapper<FirefightersPost>().eq("firefighters_id", id).set("is_delete", 1));
-    	ifirefightersWorkexperienceService.update(new UpdateWrapper<FirefightersWorkexperience>().eq("firefighters_id", id).set("is_delete", 1));
-    	ifirefightersEducationService.update(new UpdateWrapper<FirefightersEducation>().eq("firefighters_id", id).set("is_delete", 1));
-        //删除缓存
-        redisUtils.del(RedisKey.EDUCATION_POST_EXPERIENCE_FIREFIGHTERS_ID+id);
-    	return ResponseHelper.buildResponse(null);  	
+	    try {
+	    	iFirefightersPostService.update(new UpdateWrapper<FirefightersPost>().eq("firefighters_id", id).set("is_delete", 1));
+	    	ifirefightersWorkexperienceService.update(new UpdateWrapper<FirefightersWorkexperience>().eq("firefighters_id", id).set("is_delete", 1));
+	    	ifirefightersEducationService.update(new UpdateWrapper<FirefightersEducation>().eq("firefighters_id", id).set("is_delete", 1));
+	        //删除缓存
+	        redisUtils.del(RedisKey.EDUCATION_POST_EXPERIENCE_FIREFIGHTERS_ID+id);
+	    	return ResponseHelper.buildResponse(null); 
+	    } catch (Exception e) {
+			
+			throw new RuntimeException("系统异常");
+		}	 
     }
 
 
@@ -100,14 +109,18 @@ public class FirefightersPostController extends BaseController {
     @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "修改岗位信息", notes = "修改岗位信息")
     public ResponseModel<Object> updateByIdFirefightersPost(HttpServletRequest request, @RequestBody FirefightersData firefightersData){
-        FirefightersPost firefightersPost= firefightersData.getFirefightersPost();
-    	    iFirefightersPostService.updateById(firefightersPost);
-    		ifirefightersWorkexperienceService.updateById(firefightersData.getFirefightersWorkexperience());
-    		ifirefightersEducationService.updateById(firefightersData.getFirefightersEducation());
-            //删除缓存
-            redisUtils.del(RedisKey.EDUCATION_POST_EXPERIENCE_FIREFIGHTERS_ID+firefightersPost.getSequenceNbr());
-            return ResponseHelper.buildResponse(null);
-    	 
+	     try {
+	    	    FirefightersPost firefightersPost= firefightersData.getFirefightersPost();
+	    	    iFirefightersPostService.updateById(firefightersPost);
+	    		ifirefightersWorkexperienceService.updateById(firefightersData.getFirefightersWorkexperience());
+	    		ifirefightersEducationService.updateById(firefightersData.getFirefightersEducation());
+	            //删除缓存
+	            redisUtils.del(RedisKey.EDUCATION_POST_EXPERIENCE_FIREFIGHTERS_ID+firefightersPost.getSequenceNbr());
+	            return ResponseHelper.buildResponse(null);
+	    } catch (Exception e) {
+			
+			throw new RuntimeException("系统异常");
+		}	 
     }