2.0.0 修改看地计划权限问题

air/src/main/java/com/air/applets/controller/PlanSpotController.java

@@ -1,5 +1,6 @@
 package com.air.applets.controller;
 
+import cn.hutool.core.util.StrUtil;
 import com.air.applets.entity.PlanSpot;
 import com.air.applets.service.PlanSpotService;
 import com.air.applets.vo.PlanLandSpotVo;
@@ -7,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cinderella.framework.common.core.util.R;
 import com.cinderella.framework.common.data.mybatis.QueryPage;
+import com.cinderella.framework.common.security.util.SecurityUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -49,7 +51,7 @@ public class PlanSpotController {
      * @return R
      */
     @ApiOperation(value = "通过计划id查询详情", notes = "通过计划id查询详情")
-    @GetMapping("/{planId}")
+    @GetMapping("/getSpotListByPlanId/{planId}")
     public R<PlanLandSpotVo> getSpotListByPlanId(@PathVariable("planId") Integer planId) {
         return R.ok(planSpotService.getSpotListByPlanId(planId), "查询成功");
     }
@@ -75,6 +77,13 @@ public class PlanSpotController {
     @ApiOperation(value = "修改计划详情（包含点位和计划基础信息）", notes = "修改计划详情（包含点位和计划基础信息）")
     @PutMapping
     public R<Boolean> updateById(@RequestBody @Validated PlanLandSpotVo planLandSpotVo) {
+        String createUserId = planLandSpotVo.getPlanLandVo().getCreateUserId();
+        if (StrUtil.isEmpty(createUserId)){
+            R.failed("创建用户id不能为空");
+        }
+        if (!createUserId.equals(SecurityUtils.getUserId().toString())){
+            R.failed("没有权限修改");
+        }
         return R.ok(planSpotService.updatePlanSpot(planLandSpotVo), "保存成功");
     }
 

air/src/main/java/com/air/applets/entity/ViewLand.java

@@ -28,6 +28,8 @@ public class ViewLand extends Model<ViewLand> {
     private String landListedId;
     @ApiModelProperty(value = "特征名字")
     private String characteristicName;
+    @ApiModelProperty(value = "地块编号")
+    private String landCode;
     @ApiModelProperty(value = "土地出让面积(㎡)")
     private BigDecimal landTransferSquare;
     @ApiModelProperty(value = "出让价款起始价（万元）")

air/src/main/java/com/air/applets/vo/PlanLandVo.java

@@ -33,4 +33,8 @@ public class PlanLandVo extends Model<PlanLandVo> {
     @NotBlank(message = "计划耗时时间不能为空")
     @ApiModelProperty(value = "计划耗时时间",required = true)
     private String planTime;
+    @ApiModelProperty(value="创建人")
+    private String createUserId;
+
+
 }

air/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 9002
+  port: 9003
 
 spring:
   application:
@@ -11,7 +11,8 @@ spring:
       username: air
       password: air123456
 #      url: jdbc:mysql://127.0.0.1:4000/air?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
-      url: jdbc:mysql://124.71.210.242:4000/air?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
+#      url: jdbc:mysql://124.71.210.242:4000/air_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
+      url: jdbc:mysql://127.0.0.1:4000/air_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
       stat-view-servlet:
         enabled: true
         url-pattern: /druid/*
@@ -28,13 +29,13 @@ spring:
             multi-statement-allow: true
       only-show-slow-sql: false
   redis:
-    key-prefix: 'a:'
+    key-prefix: 'at:'
     host: 127.0.0.1
   servlet:
     multipart:
       max-file-size: 100MB
       max-request-size: 100MB
-#      location: /opt/air/tmp_files
+      location: /opt/air/tmp_files
   freemarker:
     allow-request-override: false
     allow-session-override: false
@@ -48,8 +49,6 @@ spring:
     expose-spring-macro-helpers: true
     prefer-file-system-access: true
     suffix: .ftl
-
-
     template-loader-path: classpath:/templates/
   cache:
     redis:
@@ -85,7 +84,8 @@ security:
         - /applets/landlisted/calendar/**
         - /applets/landlisted/list/**
         - /cityArea/**
-        - /**
+        - /planSpot/getSpotListByPlanId/**
+#        - /**
 
 # 文件系统
 minio:
@@ -108,7 +108,7 @@ logging:
 #内置字典允许编辑
 sys.dict.modify.enable: true
 #注册接口[register/mobile]需要图片验证码
-sys.register.mobileRegisterNeedGraphCode: true
+sys.register.mobileRegisterNeedGraphCode: false
 #注册接口[register/mobile]不需要短信验证码
 sys.register.mobileRegisterNeedSmsCode: false
 #社交登录[social/register-bind]不需要短信验证码
@@ -132,5 +132,4 @@ swagger:
 ignore:
   clients:
     - app
-#启用定时任务
-#scheduling.enabled: true
+