修改bug 2179

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

@@ -16,6 +16,7 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -36,13 +37,12 @@ import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersWorkexpe
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
-
 /**
-* 岗位信息
-*
-* @author tb
-* @date 2021-06-07
-*/
+ * 岗位信息
+ *
+ * @author tb
+ * @date 2021-06-07
+ */
 @RestController
 @Api(tags = "岗位信息Api")
 @RequestMapping(value = "/firefighters-post")
@@ -60,8 +60,10 @@ public class FirefightersPostController extends BaseController {
 	RedisUtils redisUtils;
 	@Value("${redis.cache.failure.time}")
 	private long time;
+
 	/**
 	 * 新增岗位信息
+	 * 
 	 * @return
 	 */
 	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@@ -70,7 +72,18 @@ public class FirefightersPostController extends BaseController {
 	@Transactional
 	public ResponseModel<Object> saveFirefightersPost(@RequestBody FirefightersDataDto firefightersDataDto) {
 		try {
+			/*---------修改bug:2179   解決崗位与学历可以重复添加导致的列表页展示消防人员信息呈现多条的情况  on 2021-08-21 陈浩---start*/
+			LambdaQueryWrapper<FirefightersPost> queryWrapper = new LambdaQueryWrapper<FirefightersPost>();
+			queryWrapper.eq(FirefightersPost::getFirefightersId, firefightersDataDto.getFirefightersPost().getFirefightersId());
+			FirefightersPost firefightersPost = iFirefightersPostService.getOne(queryWrapper);
+
+			if (firefightersPost == null) {
 				iFirefightersPostService.save(firefightersDataDto.getFirefightersPost());
+			} else {
+				iFirefightersPostService.update(firefightersDataDto.getFirefightersPost(), queryWrapper);
+			}
+			// iFirefightersPostService.save(firefightersDataDto.getFirefightersPost());
+			/*---------修改bug:2179   解決崗位与学历可以重复添加导致的列表页展示消防人员信息呈现多条的情况  on 2021-08-21 陈浩---end*/
 			ifirefightersWorkexperienceService.save(firefightersDataDto.getFirefightersWorkexperience());
 			ifirefightersEducationService.save(firefightersDataDto.getFirefightersEducation());
 			return ResponseHelper.buildResponse(null);
@@ -82,6 +95,7 @@ public class FirefightersPostController extends BaseController {
 
 	/**
 	 * 根据id删除
+	 * 
 	 * @param id
 	 * @return
 	 */
@@ -89,13 +103,16 @@ public class FirefightersPostController extends BaseController {
 	@RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
 	@ApiOperation(httpMethod = "DELETE", value = "根据消防人员id删除岗位和学历信息", notes = "根据 id删除")
 	@Transactional
-    public ResponseModel<Object> deleteById(@PathVariable Long id){
+	public ResponseModel<Object> deleteById(@PathVariable Long id) {
 		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);
+			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) {
 
@@ -105,6 +122,7 @@ public class FirefightersPostController extends BaseController {
 
 	/**
 	 * 修改岗位信息
+	 * 
 	 * @return
 	 */
 	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@@ -117,7 +135,7 @@ public class FirefightersPostController extends BaseController {
 			iFirefightersPostService.updateById(firefightersPost);
 			ifirefightersWorkexperienceService.updateById(firefightersDataDto.getFirefightersWorkexperience());
 			ifirefightersEducationService.updateById(firefightersDataDto.getFirefightersEducation());
-             //删除缓存
+			// 删除缓存
 			redisUtils.del(RedisKey.EDUCATION_POST_EXPERIENCE_FIREFIGHTERS_ID + firefightersPost.getSequenceNbr());
 			return ResponseHelper.buildResponse(null);
 		} catch (Exception e) {
@@ -126,10 +144,9 @@ public class FirefightersPostController extends BaseController {
 		}
 	}
 
-
-
 	/**
 	 * 根据id查询
+	 * 
 	 * @param id
 	 * @return
 	 */
@@ -137,24 +154,25 @@ public class FirefightersPostController extends BaseController {
 	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/{id}", method = RequestMethod.GET)
 	@ApiOperation(httpMethod = "GET", value = "根据消防员id查询", notes = "根据消防员id查询")
-    public ResponseModel<Object> selectById(@PathVariable Long id){
+	public ResponseModel<Object> selectById(@PathVariable Long id) {
 		@SuppressWarnings("rawtypes")
-            QueryWrapper queryWrapper=new QueryWrapper<>();
+		QueryWrapper queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("firefighters_id", id);
-        FirefightersDataDto firefightersDataDto = new FirefightersDataDto(ifirefightersWorkexperienceService.getOne(queryWrapper), ifirefightersEducationService.getOne(queryWrapper), iFirefightersPostService.getOne(queryWrapper));
+		FirefightersDataDto firefightersDataDto = new FirefightersDataDto(
+				ifirefightersWorkexperienceService.getOne(queryWrapper),
+				ifirefightersEducationService.getOne(queryWrapper), iFirefightersPostService.getOne(queryWrapper));
 		return ResponseHelper.buildResponse(firefightersDataDto);
 	}
 
-
-
 	/**
 	 * 列表分页查询
+	 * 
 	 * @return
 	 */
 	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
 	@ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
-    public IPage<FirefightersPost> listPage(String pageNum,String pageSize, FirefightersPost firefightersPost){
+	public IPage<FirefightersPost> listPage(String pageNum, String pageSize, FirefightersPost firefightersPost) {
 
 		Page<FirefightersPost> pageBean;
 		QueryWrapper<FirefightersPost> firefightersPostQueryWrapper = new QueryWrapper<>();
@@ -176,10 +194,11 @@ public class FirefightersPostController extends BaseController {
 						String fileValue = (String) field.get(firefightersPost);
 						firefightersPostQueryWrapper.eq(name, fileValue);
 					} else {
-                    	if(!name.equals(NameUtils.camel2Underline("serialVersionUID"))) {
+						if (!name.equals(NameUtils.camel2Underline("serialVersionUID"))) {
 							String fileValue = (String) field.get(firefightersPost);
 							firefightersPostQueryWrapper.eq(name, fileValue);
-                    }}
+						}
+					}
 				}
 			} catch (Exception e) {
 				throw new RuntimeException("系统异常");
@@ -194,5 +213,4 @@ public class FirefightersPostController extends BaseController {
 		page = iFirefightersPostService.page(pageBean, firefightersPostQueryWrapper);
 		return page;
 	}
-    }
-
+}