岗位命名规范

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPositionService.java

@@ -42,7 +42,7 @@ public interface IPositionService {
      *
      * @return
      */
-    List findPositionAll();
+    List listPosition();
 
     /**
      * 根据Key 数据

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PositionController.java

@@ -40,7 +40,7 @@ public class PositionController {
     @Autowired
     private IPositionService positionService;
 
-    @PutMapping(value="/insert")
+    @PostMapping(value="/insert")
     @ApiOperation(value="添加岗位",notes="返回内容添加岗位")
     public ResultBean insertPosition(Position position){
         try {
@@ -49,7 +49,7 @@ public class PositionController {
 
             //条件验证
             ValidatorBean.beginValid(position)
-                    .notNull("positionName",position.getPositionName())
+                    .notNull("positionName",position.getName())
                     .notNull("positionCode",position.getPositionCode());
 
             //新增初始化
@@ -76,7 +76,7 @@ public class PositionController {
             //条件验证
             ValidatorBean.beginValid(position)
                     .notNull("id",position.getId())
-                    .notNull("positionName",position.getPositionName())
+                    .notNull("positionName",position.getName())
                     .notNull("positionCode",position.getPositionCode());
 
             //修改初始化
@@ -93,9 +93,9 @@ public class PositionController {
         }
     }
 
-    @DeleteMapping(value="/delete")
+    @DeleteMapping(value="/delete/{id}")
     @ApiOperation(value="删除岗位",notes="根据岗位id删除信息")
-    public ResultBean deletePosition(String id){
+    public ResultBean deletePosition(@PathVariable("id") String id){
         try {
             //条件验证
             ValidatorBean.checkNotNull(id,"id为空");
@@ -115,7 +115,7 @@ public class PositionController {
     @ApiOperation(value="查询所有岗位",notes="查询所有岗位")
     public ResultBean findPositionAll(){
         try{
-            List<Position> positionList = positionService.findPositionAll();
+            List<Position> positionList = positionService.listPosition();
             return ResultBean.success("操作成功").setResultList(positionList)
                                 .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
@@ -161,7 +161,7 @@ public class PositionController {
         }
     }
 
-    @DeleteMapping(value = "/delete/ids")
+    @DeleteMapping(value = "/batch-delete")
     @ApiOperation(value = "根据id批量删除", notes = "根据id批量删除")
     public ResultBean deletePositionByIds(String[] ids){
         try{

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PositionServiceImpl.java

@@ -41,7 +41,7 @@ public class PositionServiceImpl implements IPositionService {
         if (position.getParentId() != null) {
             LOGGER.info("岗位信息 POSITION parentId:{}", position.getParentId());
             Position parentPosition = positionRDao.getById(position.getParentId());
-            position.setRedParentName(parentPosition.getPositionName());
+            position.setRedParentName(parentPosition.getName());
         }
 
         // 添加岗位
@@ -55,7 +55,7 @@ public class PositionServiceImpl implements IPositionService {
         if (position.getParentId() != null) {
             LOGGER.info("岗位信息 POSITION parentId:{}", position.getParentId());
             Position parentPosition = positionRDao.getById(position.getParentId());
-            position.setRedParentName(parentPosition.getPositionName());
+            position.setRedParentName(parentPosition.getName());
         }
 
         // 修改岗位信息
@@ -83,8 +83,8 @@ public class PositionServiceImpl implements IPositionService {
     }
 
     @Override
-    public List findPositionAll() {
+    public List listPosition() {
-        LOGGER.info("岗位信息 find-all");
+        LOGGER.info("岗位信息 Position list");
         return positionRDao.list();
     }
 

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserServiceImpl.java

@@ -144,7 +144,7 @@ public class SysUserServiceImpl implements ISysUserService {
             // 冗余部分信息
             sysUser.setRedDepartmentName(dep.getDepartmentName());
             sysUser.setRedRoleName(sysRole.getName());
-            sysUser.setRedPositionName(pos.getPositionName());
+            sysUser.setRedPositionName(pos.getName());
             sysUser.setOrganizeId(organize.getId());
             sysUser.setRedOrganizeName(organize.getRedParentName());