diff --git a/src/main/java/com/example/meetingroom/controller/DepartController.java b/src/main/java/com/example/meetingroom/controller/DepartController.java index 1cb34418e8b0166371917bdcc5d9c384ce091689..564206680171af30c663aef97ccbd4f965c517c7 100644 --- a/src/main/java/com/example/meetingroom/controller/DepartController.java +++ b/src/main/java/com/example/meetingroom/controller/DepartController.java @@ -98,11 +98,11 @@ public class DepartController { //判断成功与否 if(departList == null){ - return ResultVo.error(500,"向展示部门信息失败",map); + return ResultVo.error(500,"向管理员展示部门信息失败",map); } map.put("departData", departList); System.out.println(departList); - return ResultVo.ok(200,"向展示部门信息成功",map); + return ResultVo.ok(200,"向管理员展示部门信息成功",map); } diff --git a/src/main/java/com/example/meetingroom/controller/EmployeeInfoController.java b/src/main/java/com/example/meetingroom/controller/EmployeeInfoController.java index 06a8f01dc2a53becbd36f8af35e0c12821b1a142..29c5717bf06f4f93f4988f227b993db8b8846a16 100644 --- a/src/main/java/com/example/meetingroom/controller/EmployeeInfoController.java +++ b/src/main/java/com/example/meetingroom/controller/EmployeeInfoController.java @@ -14,7 +14,10 @@ import org.apache.shiro.subject.Subject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.naming.Name; import javax.servlet.http.HttpServletRequest; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; @@ -27,7 +30,7 @@ import java.util.Map; */ @RestController @CrossOrigin() -@RequestMapping("/api") +@RequestMapping("/oper") public class EmployeeInfoController { @Autowired diff --git a/src/main/java/com/example/meetingroom/controller/EmployeeRegisterController.java b/src/main/java/com/example/meetingroom/controller/EmployeeRegisterController.java index 8cc477aebf1ee8a3d5d01dd47e585879456eacf8..3f78350179de6496f4e9a7215ab09320b4bf8840 100644 --- a/src/main/java/com/example/meetingroom/controller/EmployeeRegisterController.java +++ b/src/main/java/com/example/meetingroom/controller/EmployeeRegisterController.java @@ -24,15 +24,15 @@ import java.util.Map; */ @RestController @CrossOrigin -@RequestMapping("/api") +@RequestMapping("/oper") public class EmployeeRegisterController { @Autowired private EmployeeRegisterService employeeRegisterService; - @Autowired - private EmployeeInfoService employeeInfoService; +// @Autowired +// private EmployeeInfoService employeeInfoService; @Autowired private RoleService roleService; @@ -74,8 +74,7 @@ public class EmployeeRegisterController { } -// @RequestMapping(value = "/deleteEmployeeRegister",method = RequestMethod.DELETE) - @DeleteMapping("/employeeRegister/{id}") + @DeleteMapping("/super/employeeRegister/{id}") public ResultVo deleteEmployeeRegister(@PathVariable("id")String id){ judge = employeeRegisterService.deleteEmployeeRegister(id); diff --git a/src/main/java/com/example/meetingroom/controller/RoleController.java b/src/main/java/com/example/meetingroom/controller/RoleController.java index fc3bff84cb2e9497dc518e8f9cdcac37090ec61f..5e223362ab621618df13499cee5b8abbd190a8bf 100644 --- a/src/main/java/com/example/meetingroom/controller/RoleController.java +++ b/src/main/java/com/example/meetingroom/controller/RoleController.java @@ -26,9 +26,9 @@ public class RoleController { /** * @return - * 查询所有权限,用于员工表权限修改 + * 查询所有权限,用于员工表权限展示 */ - @GetMapping("/api/role") + @GetMapping("/oper/role") public ResultVo seleteRoleList(){ List roleList = roleService.selectRoleList(); @@ -40,7 +40,6 @@ public class RoleController { return ResultVo.error(500,"展示权限信息失败",map); } map.put("权限信息", roleList); -// System.out.println(roleList); return ResultVo.ok(200,"展示权限信息成功",map); } } diff --git a/src/main/java/com/example/meetingroom/controller/RoomInfoController.java b/src/main/java/com/example/meetingroom/controller/RoomInfoController.java index c4e01b00f0900d8c9b8b3cecf1d0f4f873ccea8e..f9422c00a04cb3528fc64e1a532f6ab5529b3693 100644 --- a/src/main/java/com/example/meetingroom/controller/RoomInfoController.java +++ b/src/main/java/com/example/meetingroom/controller/RoomInfoController.java @@ -39,16 +39,13 @@ public class RoomInfoController { judge = roomInfoService.updateRoomInfo(roomInfo); Map map = new HashMap<>(); -// map.put("超管修改会议室信息", judge); - -// System.out.println(judge); //判断成功与否 if(judge != 1){ return ResultVo.error(500,"超管修改会议室失败",map); } -// System.out.println(ResultVo.ok(200, "超管修改会议室成功", map).toString()); + return ResultVo.ok(200,"超管修改会议室成功",map); @@ -65,7 +62,6 @@ public class RoomInfoController { judge = roomInfoService.deleteRoomInfo(id); Map map = new HashMap<>(); -// map.put("超管删除会议室信息", judge); //判断成功与否 if(judge != 1){ @@ -85,7 +81,6 @@ public class RoomInfoController { judge = roomInfoService.insertRoomInfo(roomInfo); Map map = new HashMap<>(); -// map.put("超管新增会议室信息", judge); //判断成功与否 if(judge != 1){ diff --git a/src/main/java/com/example/meetingroom/dao/EmployeeRegisterDao.java b/src/main/java/com/example/meetingroom/dao/EmployeeRegisterDao.java index 8d37a7fbad1437e3545e5d6a2dd71457f5f7f70e..3cea2971b10157a1192b30061b90b95ec413628b 100644 --- a/src/main/java/com/example/meetingroom/dao/EmployeeRegisterDao.java +++ b/src/main/java/com/example/meetingroom/dao/EmployeeRegisterDao.java @@ -75,6 +75,11 @@ public interface EmployeeRegisterDao { */ String selectEmployeeInfoPasswode(String phont); + /** + * 插入新的注册用户 + * @param register + * @return + */ int insertRegister(EmployeeRegister register); } diff --git a/src/main/java/com/example/meetingroom/dao/RoleDao.java b/src/main/java/com/example/meetingroom/dao/RoleDao.java index a34fd312bc29c10a3d267a310ed216a912b2ffd1..fad873a8ebea3f829266edf4e69a4c9ea4335758 100644 --- a/src/main/java/com/example/meetingroom/dao/RoleDao.java +++ b/src/main/java/com/example/meetingroom/dao/RoleDao.java @@ -16,7 +16,7 @@ public interface RoleDao { /** * @return int 0或1 - * 查询所有权限,用于员工表权限修改 + * 查询所有权限,用于员工表权限展示 */ List selectRoleList(); diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index c049b08d2c2f1215601edc3635daa5b3c0392cc1..19cbf324a7b0752a256f0d0b314fcd2261022eec 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -30,12 +30,4 @@ sendMessage: sdkAppId: "1400503015" templateCodePass: "1113098" templateCodeNotPass: "1113009" - signName: "江岸摆渡" - -#阿里云对象存储 -sendOss: - ENDPOINT: "oss-cn-shenzhen.aliyuncs.com" # 外网访问地址 - ACCESSKEYID: "LTAI4G92xKXsNh8UtbFyNCZw" - ACCESSKEYSECERT: "6UrL5dApnI76kqvuTFRWLUxBNN0nwQ" - BUCKETNAME: "chensiran" # 仓库名称 - SUFFER_URL: "http://chensiran.oss-cn-shenzhen.aliyuncs.com/" # 上传成功后返回的URL \ No newline at end of file + signName: "江岸摆渡" \ No newline at end of file