Merge remote-tracking branch 'origin/master'

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/policy/PolicyController.java

@@ -56,7 +56,6 @@ public class PolicyController {
 
     @PostMapping("/create")
     @Operation(summary = "创建政策法规")
-    @PreAuthorize("@ss.hasPermission('system:policy:create')")
     public CommonResult<Integer> createPolicy(@Valid @RequestBody PolicySaveReqVO createReqVO) {
         Integer policy = policyService.createPolicy(createReqVO);
         MaxkbdocumentVo maxkbdocumentVo =new MaxkbdocumentVo();
@@ -73,7 +72,6 @@ public class PolicyController {
 
     @PutMapping("/update")
     @Operation(summary = "更新政策法规")
-    @PreAuthorize("@ss.hasPermission('system:policy:update')")
     public CommonResult<Boolean> updatePolicy(@Valid @RequestBody PolicySaveReqVO updateReqVO) {
         policyService.updatePolicy(updateReqVO);
         String viewUrl = getViewUrl(updateReqVO.getId());
@@ -88,7 +86,6 @@ public class PolicyController {
     @DeleteMapping("/delete")
     @Operation(summary = "删除政策法规")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('system:policy:delete')")
     public CommonResult<Boolean> deletePolicy(@RequestParam("id") Integer id) {
         policyService.deletePolicy(id);
         String viewUrl = getViewUrl(id);
@@ -118,15 +115,14 @@ public class PolicyController {
 
     @GetMapping("/page")
     @Operation(summary = "获得政策法规分页")
-    @PreAuthorize("@ss.hasPermission('system:policy:query')")
     public CommonResult<PageResult<PolicyRespVO>> getPolicyPage(@Valid PolicyPageReqVO pageReqVO) {
         PageResult<PolicyDO> pageResult = policyService.getPolicyPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, PolicyRespVO.class));
     }
 
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出政策法规 Excel")
-    @PreAuthorize("@ss.hasPermission('system:policy:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportPolicyExcel(@Valid PolicyPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/policy/vo/PolicyPageReqVO.java

@@ -1,6 +1,13 @@
 package cn.iocoder.yudao.module.system.controller.admin.policy.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
 import lombok.*;
+
+import java.time.LocalDate;
 import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
@@ -17,6 +24,11 @@ public class PolicyPageReqVO extends PageParam {
 
     @Schema(description = "名称", example = "王五")
     private String name;
+    @Schema(description = "生效日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @JsonSerialize(using = LocalDateSerializer.class) // 序列化（响应）
+    @JsonDeserialize(using = LocalDateDeserializer.class) // 反序列化（请求）
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate effectiveDate;
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/policy/vo/PolicyRespDetailVO.java

@@ -2,9 +2,15 @@ package cn.iocoder.yudao.module.system.controller.admin.policy.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 政策法规 Response VO")
@@ -20,6 +26,12 @@ public class PolicyRespDetailVO {
     @ExcelProperty("名称")
     private String name;
 
+    @Schema(description = "生效日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @JsonSerialize(using = LocalDateSerializer.class) // 序列化（响应）
+    @JsonDeserialize(using = LocalDateDeserializer.class) // 反序列化（请求）
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate effectiveDate;
+
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/policy/vo/PolicyRespVO.java

@@ -1,7 +1,14 @@
 package cn.iocoder.yudao.module.system.controller.admin.policy.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+
+import java.time.LocalDate;
 import java.util.*;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
@@ -20,6 +27,12 @@ public class PolicyRespVO {
     @ExcelProperty("名称")
     private String name;
 
+    @Schema(description = "生效日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @JsonSerialize(using = LocalDateSerializer.class) // 序列化（响应）
+    @JsonDeserialize(using = LocalDateDeserializer.class) // 反序列化（请求）
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate effectiveDate;
+
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/policy/vo/PolicySaveReqVO.java

@@ -1,7 +1,15 @@
 package cn.iocoder.yudao.module.system.controller.admin.policy.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.*;
 
 @Schema(description = "管理后台 - 政策法规新增/修改 Request VO")
@@ -17,4 +25,9 @@ public class PolicySaveReqVO {
     @Schema(description = "内容")
     private String context;
 
+    @Schema(description = "生效日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @JsonSerialize(using = LocalDateSerializer.class) // 序列化（响应）
+    @JsonDeserialize(using = LocalDateDeserializer.class) // 反序列化（请求）
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate effectiveDate;
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/policy/PolicyDO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.system.dal.dataobject.policy;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
 import java.time.LocalDateTime;
@@ -36,4 +37,9 @@ public class PolicyDO extends BaseDO {
      */
     private String context;
 
+    /**
+     * 生效日期
+     */
+    private LocalDateTime effectiveDate;
+
 }