增加场景码参数

src/main/java/com/fdkankan/site/controller/MarkingController.java

@@ -59,6 +59,8 @@ public class MarkingController  extends BaseController {
     @PostMapping("/list")
     @SaIgnore
     public ResultData list(@RequestBody MarkingSearchParam param){
+        VUtils.isTure(param.getProjectId() == null).throwMessage(ResultCode.PARAM_MISS);
+        VUtils.isTure(param.getNum() == null).throwMessage(ResultCode.PARAM_MISS);
         return ResultData.ok(markingService.pageList(param));
     }
     /**
@@ -75,6 +77,7 @@ public class MarkingController  extends BaseController {
      */
     @PostMapping("/addOrUpdate")
     public ResultData addOrUpdate(@RequestBody MarkingParam param){
+        VUtils.isTure(param.getNum() == null).throwMessage(ResultCode.PARAM_MISS);
         projectService.checkTokenPer(getToken(), param.getProjectId());
         if (Optional.ofNullable(param.getMarkingId()).isPresent()){
             // 写不为空的逻辑

src/main/java/com/fdkankan/site/entity/Marking.java

@@ -29,7 +29,11 @@ public class Marking extends BaseEntity{
     */
    @TableField(value = "project_id")
    private Integer projectId;
-
+   /**
+    * 场景编码
+    */
+   @TableField(value = "num")
+   private String num;
    /**
     * 1,待处理 2进行中 3未解决 4已解决
     */

src/main/java/com/fdkankan/site/request/MarkingSearchParam.java

@@ -13,6 +13,7 @@ public class MarkingSearchParam extends RequestBase {
      * 1,待处理 2进行中 3未解决 4已解决
      */
     private Integer markingStatus;
+    private String num;
 
     private String markingTitle;
 

src/main/java/com/fdkankan/site/service/IMarkingService.java

@@ -22,5 +22,6 @@ public interface IMarkingService extends IService<Marking> {
     void delMarking(Integer markingId,String token);
 
     List<Marking> findByProjectId(Integer projectId);
+    Marking findByProjectIdAndNum(Integer projectId,String num);
 
 }

src/main/java/com/fdkankan/site/service/impl/MarkingServiceImpl.java

@@ -55,7 +55,8 @@ public class MarkingServiceImpl extends ServiceImpl<IMarkingMapper, Marking> imp
         VUtils.isTure(param.getProjectId() == null).throwMessage(ResultCode.PARAM_MISS);
         MPJLambdaWrapper<Marking> wrapper = new MPJLambdaWrapper<Marking>()
                 .selectAll(Marking.class)
-                .eq(Marking::getProjectId,param.getProjectId());
+                .eq(Marking::getProjectId,param.getProjectId())
+                .eq(Marking::getNum,param.getNum());
         if (Optional.ofNullable(param.getMarkingStatus()).isPresent()) {
             wrapper.eq(Marking::getMarkingStatus,param.getMarkingStatus());
         }
@@ -102,4 +103,12 @@ public class MarkingServiceImpl extends ServiceImpl<IMarkingMapper, Marking> imp
         wrapper.eq(Marking::getProjectId,projectId);
         return list(wrapper);
     }
+
+    @Override
+    public Marking findByProjectIdAndNum(Integer projectId, String num) {
+        LambdaQueryWrapper<Marking> wrapper=new LambdaQueryWrapper<>();
+        wrapper.eq(Marking::getProjectId,projectId);
+        wrapper.eq(Marking::getNum,num);
+        return getOne(wrapper);
+    }
 }

src/main/java/com/fdkankan/site/service/impl/UserServiceImpl.java

@@ -56,4 +56,10 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         String userName = JwtUtil.getUserName(token);
         return findByUserName(userName);
     }
+
+    public static void main(String[] args) {
+        String userName = JwtUtil.getUserName( "eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiIxNTkxNTgxNjA0MSIsImxvZ2luVHlwZSI6InVzZXIiLCJ1c2VyTmFtZSI6IjE1OTE1ODE2MDQxIiwiaWF0IjoxNjg2MjkyMzI1LCJqdGkiOiIyMzkwMGMwNS03YWM1LTQ0OGYtODExNi02YWFhMzkyNDM4ZmEifQ.eRs9JIPSDi9K1mKuz6TU7d-mWb1jpLhEBudtTdjQ-wU");
+        System.out.println(userName);
+
+    }
 }