Commit e9db104a authored by 王蔡翾's avatar 王蔡翾
Browse files

优化

parent aa7286f0
...@@ -32,6 +32,25 @@ ...@@ -32,6 +32,25 @@
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
<version>${spring-boot.version}</version> <version>${spring-boot.version}</version>
</dependency> </dependency>
<!-- JWT 支持,比如 jjwt -->
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-api</artifactId>
<version>0.11.5</version>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-impl</artifactId>
<version>0.11.5</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-jackson</artifactId>
<version>0.11.5</version>
<scope>runtime</scope>
</dependency>
<!--mybatis-plus--> <!--mybatis-plus-->
<dependency> <dependency>
<groupId>com.baomidou</groupId> <groupId>com.baomidou</groupId>
......
package com.example.operation_platform.controller;
import com.example.operation_platform.model.entity.BsProjectEntity;
import com.example.operation_platform.service.BsProjectService;
import com.platform.controller.BaseController;
import com.platform.model.resp.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@RestController//接口方法返回对象,转换成json文本
@RequestMapping("/project")
@Api(tags = "项目管理")
public class BsProjectController extends BaseController {
@Resource
private BsProjectService bsProjectService;
@GetMapping("/list")
public Result<Object> queryList(){
return Result.data(bsProjectService.list());
}
@ApiOperation("新增")
@PostMapping("/addOrUpdate")
public Result<Boolean> addOrUpdate(@RequestBody BsProjectEntity entity){
return Result.data(bsProjectService.saveOrUpdate(entity));
}
@ApiOperation("删除")
@DeleteMapping("/delete")
public Result<Boolean> delete(@RequestParam("id")String Id){
return Result.data(bsProjectService.removeById(Id));
}
}
package com.example.operation_platform.controller;
import com.example.operation_platform.model.dto.BsWorkDTO;
import com.example.operation_platform.model.vo.BsWorkVO;
import com.example.operation_platform.service.BsWorkService;
import com.example.operation_platform.util.JwtUtil;
import com.platform.controller.BaseController;
import com.platform.model.resp.Result;
import com.platform.page.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@RestController//接口方法返回对象,转换成json文本
@RequestMapping("/work")
@Api(tags = "工单管理")
public class BsWorkController extends BaseController {
@Resource
private BsWorkService bsWorkService;
@Resource
private JwtUtil jwtUtil;
@PostMapping("/page")
public TableDataInfo page(@RequestBody BsWorkDTO bsWorkDTO,@RequestHeader("Authorization") String token) {
String name = jwtUtil.getUserNameFromToken(token);
bsWorkDTO.setLoginName(name);
startPage(bsWorkDTO.getPageNum(), bsWorkDTO.getPageSize());
return getDataTable(bsWorkService.queryWorkList(bsWorkDTO));
}
@ApiOperation("新增")
@PostMapping("/add")
public Result<Boolean> add(@RequestBody BsWorkDTO bsWorkDTO,@RequestHeader("Authorization") String token) {
String name = jwtUtil.getUserNameFromToken(token);
bsWorkDTO.setLoginName(name);
return Result.data(bsWorkService.addWork(bsWorkDTO));
}
@ApiOperation("删除")
@DeleteMapping("/delete")
public Result<Boolean> delete(@RequestParam("id") String id) {
return Result.data(bsWorkService.removeById(id));
}
@ApiOperation("处理")
@PostMapping("/handle")
public Result<Boolean> handle(@RequestBody BsWorkDTO bsWorkDTO,@RequestHeader("Authorization") String token) {
String name = jwtUtil.getUserNameFromToken(token);
bsWorkDTO.setLoginName(name);
return Result.data(bsWorkService.handleWork(bsWorkDTO));
}
@ApiOperation("确认")
@PostMapping("/confirm")
public Result<Boolean> confirm(@RequestBody BsWorkDTO bsWorkDTO) {
return Result.data(bsWorkService.confirmWork(bsWorkDTO));
}
@ApiOperation("关闭")
@PostMapping("/close")
public Result<Boolean> close(@RequestBody BsWorkDTO bsWorkDTO) {
return Result.data(bsWorkService.closeWork(bsWorkDTO));
}
@ApiOperation("转单")
@PostMapping("/transfer")
public Result<Boolean> transfer(@RequestBody BsWorkDTO bsWorkDTO) {
return Result.data(bsWorkService.transferWork(bsWorkDTO));
}
@ApiOperation("获取工单详情")
@GetMapping("/getWorkDetail")
public Result<BsWorkVO> getWorkDetail(@RequestParam("id") String id,@RequestHeader("Authorization") String token) {
String name = jwtUtil.getUserNameFromToken(token);
return Result.data(bsWorkService.getWorkDetail(id,name));
}
}
package com.example.operation_platform.controller;
import com.example.operation_platform.model.dto.BsWorkLevelDTO;
import com.example.operation_platform.model.vo.BsWorkLevelVO;
import com.example.operation_platform.service.BsWorkLevelService;
import com.platform.controller.BaseController;
import com.platform.model.resp.Result;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
@RestController//接口方法返回对象,转换成json文本
@RequestMapping("/workLevel")
public class BsWorkLevelController extends BaseController {
@Resource
private BsWorkLevelService bsWorkLevelService;
@ApiOperation("等级列表")
@GetMapping("/list")
public Result<List<BsWorkLevelVO>> queryList(){
return Result.data(bsWorkLevelService.queryWorkLevelList());
}
@ApiOperation("新增或更新")
@PostMapping("/saveOrUpdate")
public Result<Boolean> saveOrUpdate(@RequestBody BsWorkLevelDTO bsWorkLevelDTO){
return Result.data(bsWorkLevelService.saveOrUpdate(bsWorkLevelDTO));
}
@ApiOperation("删除")
@DeleteMapping("/delete")
public Result<Boolean> delete(@RequestParam("id") String id){
return Result.data(bsWorkLevelService.removeById(id));
}
}
package com.example.operation_platform.controller;
import com.example.operation_platform.model.entity.BsWorkTypeEntity;
import com.example.operation_platform.model.vo.BsWorkTypeVO;
import com.example.operation_platform.service.BsWorkTypeService;
import com.platform.controller.BaseController;
import com.platform.model.resp.Result;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
@RestController//接口方法返回对象,转换成json文本
@RequestMapping("/workType")
public class BsWorkTypeController extends BaseController {
@Resource
private BsWorkTypeService bsWorkTypeService;
@ApiOperation("类型列表")
@GetMapping("/list")
public Result<List<BsWorkTypeVO>> queryList(){
return Result.data(bsWorkTypeService.queryWorkTypeList());
}
@ApiOperation("新增或者更新")
@PostMapping("/saveOrUpdate")
public Result<Boolean> saveOrUpdate(@RequestBody BsWorkTypeEntity entity){
return Result.data(bsWorkTypeService.saveOrUpdate(entity));
}
@ApiOperation("删除")
@DeleteMapping("/delete")
public Result<Boolean> delete(@RequestParam("id") String Id){
return Result.data(bsWorkTypeService.removeById(Id));
}
}
...@@ -33,7 +33,7 @@ public class MessageController extends BaseController { ...@@ -33,7 +33,7 @@ public class MessageController extends BaseController {
} }
@PutMapping("/reset") @PutMapping("/reset")
public Result<MessageEntity> resetmessage(@RequestBody MessageDTO messageDTO) { public Result<MessageEntity> resetMessage(@RequestBody MessageDTO messageDTO) {
messageService.resetmessage(messageDTO); messageService.resetmessage(messageDTO);
return Result.success("重置成功"); return Result.success("重置成功");
} }
...@@ -51,11 +51,11 @@ public class MessageController extends BaseController { ...@@ -51,11 +51,11 @@ public class MessageController extends BaseController {
return Result.data(messageService.querypeopleId(stationId,robotId,droneId)); return Result.data(messageService.querypeopleId(stationId,robotId,droneId));
} }
@GetMapping("/stationid") @GetMapping("/stationid")
public Result<List<RobotAndDrone>> queryBystationId(@RequestParam(name = "stationId")String stationId) { public Result<List<RobotAndDrone>> queryByStationId(@RequestParam(name = "stationId")String stationId) {
return Result.data(messageService.queryrobotBystationId(stationId)); return Result.data(messageService.queryrobotBystationId(stationId));
} }
@GetMapping("/username") @GetMapping("/username")
public Result<List<MessageVO>> queryByworker(@RequestParam(name = "username")String username) { public Result<List<MessageVO>> queryByWorker(@RequestParam(name = "username")String username) {
return Result.data(messageService.querystationByworker(username)); return Result.data(messageService.querystationByworker(username));
} }
......
package com.example.operation_platform.controller;
import com.example.operation_platform.model.dto.UserDTO;
import com.example.operation_platform.model.entity.LoginEntity;
import com.example.operation_platform.model.entity.UserEntity;
import com.example.operation_platform.model.vo.UserVO;
import com.example.operation_platform.service.UserService;
import com.platform.controller.BaseController;
import com.platform.model.resp.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
@Api(tags = "PC端登录--使用OA相同账号")
@RestController//接口方法返回对象,转换成json文本
@RequestMapping("/user")
public class UserController extends BaseController {
@Resource
private UserService userService;
@ApiOperation("登录")
@PostMapping("/login")
public Result<LoginEntity> login(@RequestBody LoginEntity login){
return Result.data(userService.login(login));
}
@ApiOperation("分页")
@PostMapping("/page")
public Result<List<UserVO>> page(@RequestBody UserDTO userDTO){
return Result.data(userService.queryUserList(userDTO));
}
}
...@@ -7,12 +7,13 @@ import com.example.operation_platform.service.WorkerService; ...@@ -7,12 +7,13 @@ import com.example.operation_platform.service.WorkerService;
import com.platform.controller.BaseController; import com.platform.controller.BaseController;
import com.platform.model.resp.Result; import com.platform.model.resp.Result;
import com.platform.page.TableDataInfo; import com.platform.page.TableDataInfo;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
@Api("人员管理---用于H5页面登录(移动端设备运维)")
@RestController @RestController
@RequestMapping("/worker") @RequestMapping("/worker")
public class WorkerController extends BaseController { public class WorkerController extends BaseController {
...@@ -24,7 +25,7 @@ public class WorkerController extends BaseController { ...@@ -24,7 +25,7 @@ public class WorkerController extends BaseController {
return getDataTable(workerService.queryList(workerDTO)); return getDataTable(workerService.queryList(workerDTO));
} }
@PostMapping("/save")//人员新增 @PostMapping("/save")//人员新增
public Result save(@RequestBody WorkerDTO workerDTO) { public Result<Boolean> save(@RequestBody WorkerDTO workerDTO) {
boolean success = workerService.save(workerDTO); boolean success = workerService.save(workerDTO);
if (success) { if (success) {
// 获取新插入的 workerId // 获取新插入的 workerId
...@@ -57,12 +58,12 @@ public class WorkerController extends BaseController { ...@@ -57,12 +58,12 @@ public class WorkerController extends BaseController {
return Result.data(null); return Result.data(null);
} }
@PostMapping("/login") @PostMapping("/login")
public Result<WorkerEntity> login(@RequestBody WorkerDTO workerDTO) { public Result<WorkerVO> login(@RequestBody WorkerDTO workerDTO) {
WorkerVO workerVo = workerService.queryByUsername(workerDTO); WorkerVO workerVo = workerService.queryByUsername(workerDTO);
if (workerVo == null) { if (workerVo == null) {
return Result.fail("用户名或密码错误"); return Result.fail("用户名或密码错误");
} }
return Result.success("密码正确"); return Result.data(workerVo);
} }
@PutMapping("/resetPassword") @PutMapping("/resetPassword")
public Result<WorkerEntity> resetPassword(@RequestBody WorkerDTO workerDTO) { public Result<WorkerEntity> resetPassword(@RequestBody WorkerDTO workerDTO) {
......
package com.example.operation_platform.filter;
import com.example.operation_platform.util.JwtUtil;
import com.sun.istack.NotNull;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import lombok.var;
import org.springframework.core.Ordered;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Component;
import org.springframework.util.AntPathMatcher;
import org.springframework.web.filter.OncePerRequestFilter;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
@Slf4j
@Component
@RequiredArgsConstructor
public class JwtAuthFilter extends OncePerRequestFilter implements Ordered {
private final JwtUtil jwtUtil;
// 在类中定义
private final AntPathMatcher antPathMatcher = new AntPathMatcher();
// 定义开放接口路径(支持通配符)
private static final List<String> OPEN_API_PATHS = Arrays.asList(
"/user/login",
"/user/register",
"/role/list",
"/dept/list",
"/work/add"
);
@Override
protected void doFilterInternal(HttpServletRequest request,
@NotNull HttpServletResponse response,
@NotNull FilterChain filterChain) throws ServletException, IOException {
String path = request.getRequestURI();
// 判断是否为公开接口(使用 AntPathMatcher 进行通配符匹配)
boolean isPublicApi = OPEN_API_PATHS.stream()
.anyMatch(pattern -> antPathMatcher.match(pattern, path));
if (isPublicApi) {
log.info("[JWT 过滤器] 放行公开接口: {}", path);
filterChain.doFilter(request, response); // ✅ 直接放行,不校验 token
return;
}
// 1. 获取请求头中的 Authorization
String authHeader = request.getHeader(HttpHeaders.AUTHORIZATION);
// 2. 校验是否携带了 Bearer Token
if (authHeader == null || !authHeader.startsWith("Bearer ")) {
log.warn("[JWT 校验失败] 缺少或格式错误的 Authorization Header");
sendUnauthorized(response, "未提供有效的身份凭证");
return;
}
// 3. 提取 Token(去掉 "Bearer " 前缀)
String token = authHeader.substring(7).trim();
try {
// 4. 解析 & 校验 JWT Token
var claims = jwtUtil.parseToken(token);
// 5. 从 Token 中提取用户身份信息(根据你生成时的 claims 名称)
String userName = claims.get("name", String.class); // 你生成时放入的 key
if (userName == null) {
log.warn("[JWT 校验失败] Token 中缺少 name");
sendUnauthorized(response, "无效的用户身份信息");
return;
}
log.info("[JWT 校验成功] , 用户名: {}", userName);
// 6. 透传用户身份到下游服务(添加请求头)
// 注意:在普通Servlet环境中,我们设置请求属性而不是修改请求头
request.setAttribute("X-Username", userName);
// 如果需要设置请求头供后续控制器使用,可以考虑使用ThreadLocal或其他方式
// 或者在某些框架中可以使用自定义的RequestWrapper
// 7. 继续过滤器链,下游服务可以获取用户信息
filterChain.doFilter(request, response);
} catch (RuntimeException e) {
log.warn("[JWT 校验失败] Token 无效: {}", e.getMessage());
sendUnauthorized(response, "无效的 Token: " + e.getMessage());
}
}
/**
* 发送401未授权响应
*/
private void sendUnauthorized(HttpServletResponse response, String message) throws IOException {
response.setStatus(HttpStatus.UNAUTHORIZED.value());
response.setContentType("application/json;charset=UTF-8");
// 返回JSON格式的错误信息
String errorResponse = String.format("{\"code\": %d, \"message\": \"%s\"}",
HttpStatus.UNAUTHORIZED.value(), message);
response.getWriter().write(errorResponse);
}
@Override
public int getOrder() {
return Ordered.HIGHEST_PRECEDENCE; // 高优先级,最先执行
}
}
\ No newline at end of file
package com.example.operation_platform.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.example.operation_platform.model.entity.BsProjectEntity;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface BsProjectMapper extends BaseMapper<BsProjectEntity> {
List<BsProjectEntity> queryProjectList();
}
package com.example.operation_platform.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.example.operation_platform.model.dto.BsWorkLevelDTO;
import com.example.operation_platform.model.entity.BsWorkLevelEntity;
import com.example.operation_platform.model.vo.BsWorkLevelVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface BsWorkLevelMapper extends BaseMapper<BsWorkLevelEntity> {
List<BsWorkLevelVO> queryWorkLevelList();
BsWorkLevelVO queryByLevel(@Param("level") String level);
}
package com.example.operation_platform.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.example.operation_platform.model.dto.BsWorkDTO;
import com.example.operation_platform.model.entity.BsWorkEntity;
import com.example.operation_platform.model.vo.BsWorkVO;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface BsWorkMapper extends BaseMapper<BsWorkEntity> {
/**
* 查询工单列表
* @param bsWorkDTO
* @return
*/
List<BsWorkVO> queryWorkList(BsWorkDTO bsWorkDTO);
}
package com.example.operation_platform.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.example.operation_platform.model.entity.BsWorkOperationEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface BsWorkOperationMapper extends BaseMapper<BsWorkOperationEntity> {
List<BsWorkOperationEntity> queryOperationByWorkId(@Param("workId") String workId);
}
package com.example.operation_platform.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.example.operation_platform.model.entity.BsWorkTypeEntity;
import com.example.operation_platform.model.vo.BsWorkTypeVO;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface BsWorkTypeMapper extends BaseMapper<BsWorkTypeEntity> {
List<BsWorkTypeVO> queryWorkTypeList();
}
package com.example.operation_platform.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.example.operation_platform.model.dto.UserDTO;
import com.example.operation_platform.model.entity.UserEntity;
import com.example.operation_platform.model.vo.UserVO;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface UserMapper extends BaseMapper<UserEntity> {
List<UserVO> queryUserList(UserDTO userDTO);
}
package com.example.operation_platform.model.dto;
import com.example.operation_platform.model.entity.BsWorkEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = true)
public class BsWorkDTO extends BsWorkEntity {
private Integer pageNum;
private Integer pageSize;
@ApiModelProperty("当前登录用户名")
private String loginName;
@ApiModelProperty("工单处理流程描述")
private String remark;
}
package com.example.operation_platform.model.dto;
import com.example.operation_platform.model.entity.BsWorkLevelEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = true)
public class BsWorkLevelDTO extends BsWorkLevelEntity {
}
package com.example.operation_platform.model.dto;
import com.example.operation_platform.model.entity.UserEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = true)
public class UserDTO extends UserEntity {
private Integer pageNum;
private Integer pageSize;
}
package com.example.operation_platform.model.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@TableName("bs_project")
public class BsProjectEntity {
@TableId(type = IdType.ASSIGN_ID )
private String id;
@ApiModelProperty("项目名称")
@TableField("project_name")
private String projectName;
@ApiModelProperty("项目描述")
@TableField("description")
private String description;
}
package com.example.operation_platform.model.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@Data
@TableName ("bs_work")
public class BsWorkEntity {
@TableId(type = IdType.ASSIGN_ID )
private String id;
@ApiModelProperty("任务编号")
@TableField("code")
private String code;
@ApiModelProperty ("任务等级")
@TableField("level")
private String level;
@ApiModelProperty ("任务类型")
@TableField("type")
private String type;
@TableField("project_id")
@ApiModelProperty ("项目编号")
private String projectId;
@TableField("detail")
@ApiModelProperty ("任务详情")
private String detail;
@TableField ("status")
@ApiModelProperty ("任务状态")
private String status;
@TableField("create_time")
@ApiModelProperty ("创建时间")
private Date createTime;
@TableField("end_time")
@ApiModelProperty("截止时间")
private Date endTime;
@TableField("handle_time")
@ApiModelProperty("处理时间")
private Date handleTime;
@TableField("create_by")
@ApiModelProperty ("创建人")
private String createBy;
@TableField("handle_by")
@ApiModelProperty ("处理人")
private String handleBy;
@ApiModelProperty("工单处理附件")
@TableField("file_path")
private String filePath;
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment