Merge remote-tracking branch 'origin/master'

authorize-api-service/src/main/java/com/xy/service/SysSystemValueService.java

@@ -1,16 +0,0 @@
-package com.xy.service;
-
-import com.xy.annotate.RestMappingController;
-
-/**
- * <p>
- * 系统属性表 服务类
- * </p>
- *
- * @author lijin
- * @since 2022-12-09
- */
-@RestMappingController("sys-system-value")
-public interface SysSystemValueService {
-
-}

authorize-api-service/src/main/java/com/xy/service/impl/SysSystemServiceImpl.java

@@ -40,7 +40,10 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
     @PostMapping("save")
     @ApiOperation("添加系统")
     public R<Long> save(@RequestBody @Validated SysSystemDto.Save save) {
-        long count = count(new LambdaQueryWrapper<SysSystem>().eq(SysSystem::getCode, save.getCode()));
+        long count = count(new LambdaQueryWrapper<SysSystem>()
+                .eq(SysSystem::getCode, save.getCode())
+                .eq(SysSystem::getSysUserId, SaTokenUtils.getId())
+        );
         if (count > 0) {
             return R.fail("标识已存在");
         }
@@ -68,7 +71,7 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
 
     @PostMapping("update")
     @ApiOperation("修改系统")
-    public R<Boolean> update(@RequestBody @Validated SysSystemDto.Update update) {
+    public R update(@RequestBody @Validated SysSystemDto.Update update) {
         SysSystem sysSystem = copy(SysSystem.class, update).update(Long.parseLong(SaTokenUtils.getId().toString()));
         updateById(sysSystem);
         return R.ok();

authorize-api-service/src/main/java/com/xy/service/impl/SysSystemUserServiceImpl.java

@@ -65,7 +65,7 @@ public class SysSystemUserServiceImpl extends ServiceImpl<SysSystemUserMapper, S
 
     @Override
     @ApiOperation("注册")
-    public R<Boolean> register(SysSystemUserDto.Login login) {
+    public R register(SysSystemUserDto.Login login) {
         //校验重复
         long count = count(new LambdaQueryWrapper<SysSystemUser>()
                 .eq(SysSystemUser::getAccount, login.getAccount())
@@ -95,7 +95,7 @@ public class SysSystemUserServiceImpl extends ServiceImpl<SysSystemUserMapper, S
 
     @PostMapping("update")
     @ApiOperation("修改")
-    public R<Boolean> update(@RequestBody @Validated SysSystemUserDto.Update update) {
+    public R update(@RequestBody @Validated SysSystemUserDto.Update update) {
         SysSystemUser sysSystemUser = new SysSystemUser()
                 .setId(update.getId())
                 .setStatus(Emptys.check(update.getStatus()) ? update.getStatus() : null)

authorize-api-service/src/main/java/com/xy/service/impl/SysSystemValueServiceImpl.java

@@ -1,10 +1,27 @@
 package com.xy.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xy.dto.SysSystemValueDto;
 import com.xy.entity.SysSystemValue;
 import com.xy.mapper.SysSystemValueMapper;
 import com.xy.service.SysSystemValueService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xy.utils.MybatisPlusQuery;
+import com.xy.utils.PageBean;
+import com.xy.utils.R;
+import com.xy.utils.SaTokenUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import static com.xy.utils.Beans.copy;
+import static com.xy.utils.PlusBeans.toIPage;
+import static com.xy.utils.PlusBeans.toPageBean;
+
 
 /**
  * <p>
@@ -15,6 +32,48 @@ import org.springframework.stereotype.Service;
  * @since 2022-12-09
  */
 @Service
+@Api(tags = "系统属性接口")
 public class SysSystemValueServiceImpl extends ServiceImpl<SysSystemValueMapper, SysSystemValue> implements SysSystemValueService {
 
+    @PostMapping("save")
+    @ApiOperation("添加")
+    public R<Boolean> save(@RequestBody @Validated SysSystemValueDto.Save save) {
+        long count = count(new LambdaQueryWrapper<SysSystemValue>()
+                .eq(SysSystemValue::getCode, save.getCode())
+                .eq(SysSystemValue::getSysId, save.getSysId())
+        );
+        if (count > 0) {
+            return R.fail("标识已存在");
+        }
+        SysSystemValue sysSystemValue = copy(SysSystemValue.class, save)
+                .create(Long.parseLong(SaTokenUtils.getId().toString()));
+        save(sysSystemValue);
+        return R.ok();
+    }
+
+    @Override
+    @ApiOperation("分页查询")
+    public R<PageBean<SysSystemValueDto.Vo>> page(SysSystemValueDto.Select select) {
+        LambdaQueryWrapper<SysSystemValue> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(select, SysSystemValue.class)
+                .ge(SysSystemValue::getCreateTime, select.getBeginCreateTime())
+                .le(SysSystemValue::getCreateTime, select.getEndCreateTime())
+                .build();
+        IPage<SysSystemValue> page = page(toIPage(select.getPage()), lambdaQueryWrapper);
+        return R.ok(toPageBean(SysSystemValueDto.Vo.class, page));
+    }
+
+    @PostMapping("update")
+    @ApiOperation("修改")
+    public R update(@RequestBody @Validated SysSystemValueDto.Update update) {
+        SysSystemValue sysSystemValue = copy(SysSystemValue.class, update).update(Long.parseLong(SaTokenUtils.getId().toString()));
+        updateById(sysSystemValue);
+        return R.ok();
+    }
+
+    @PostMapping("del")
+    @ApiOperation("删除")
+    public R del(@RequestBody @Validated SysSystemValueDto.Del del) {
+        removeByIds(del.getId());
+        return R.ok();
+    }
 }

authorize-api/src/main/java/com/xy/dto/SysSystemDto.java

@@ -8,7 +8,6 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -41,9 +40,6 @@ public class SysSystemDto {
         @ApiModelProperty("唯一标识")
         private Long id;
 
-        @ApiModelProperty("标识")
-        private String code;
-
         @ApiModelProperty("名称")
         private String name;
 

authorize-api/src/main/java/com/xy/dto/SysSystemValueDto.java

@@ -0,0 +1,131 @@
+package com.xy.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xy.utils.PageBean;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+@ApiModel("系统属性交互类")
+@Accessors(chain = true)
+public class SysSystemValueDto {
+
+    @Data
+    @ApiModel("添加类")
+    @Accessors(chain = true)
+    public static class Save {
+
+        @NotNull(message = "sysId不能为空")
+        @ApiModelProperty("系统id")
+        private Long sysId;
+
+        @NotBlank(message = "code不能为空")
+        @ApiModelProperty("属性编码")
+        private String code;
+
+        @NotBlank(message = "value不能为空")
+        @ApiModelProperty("属性值")
+        private String value;
+    }
+
+    @Data
+    @ApiModel("查询类")
+    @Accessors(chain = true)
+    public static class Select extends Vo {
+
+        @ApiModelProperty("分页对象")
+        private PageBean page;
+
+        @NotNull(message = "sysId不能为空")
+        @ApiModelProperty("系统id")
+        private Long sysId;
+
+        @JsonFormat(pattern = "yyyy-MM-dd")
+        @ApiModelProperty(value = "创建时间-起")
+        private LocalDate beginCreateTime;
+
+        @JsonFormat(pattern = "yyyy-MM-dd")
+        @ApiModelProperty(value = "创建时间-始")
+        private LocalDate endCreateTime;
+
+        public LocalDateTime getBeginCreateTime() {
+            return beginCreateTime == null ? null : beginCreateTime.atTime(0, 0, 0);
+        }
+
+        public LocalDateTime getEndCreateTime() {
+            return endCreateTime == null ? null : endCreateTime.atTime(23, 59, 59);
+        }
+    }
+
+    @Data
+    @ApiModel("修改类")
+    @Accessors(chain = true)
+    public static class Update {
+
+        @NotNull(message = "id不能为空")
+        @ApiModelProperty("唯一标识")
+        private Long id;
+
+        @ApiModelProperty("属性值")
+        private String value;
+
+        @ApiModelProperty("状态")
+        private Boolean status;
+
+    }
+
+    @Data
+    @ApiModel("修改类")
+    @Accessors(chain = true)
+    public static class Del {
+
+        @NotEmpty(message = "id不能为空s")
+        @ApiModelProperty("唯一标识")
+        private List<Long> id;
+    }
+
+
+    @Data
+    @ApiModel("返参类")
+    @Accessors(chain = true)
+    public static class Vo {
+
+        @ApiModelProperty("系统id")
+        private Long sysId;
+
+        @ApiModelProperty("属性编码")
+        private String code;
+
+        @ApiModelProperty("属性值")
+        private String value;
+
+        @ApiModelProperty("状态")
+        private Boolean status;
+
+        @ApiModelProperty("唯一标识")
+        private Long id;
+
+        @ApiModelProperty("创建时间")
+        private LocalDateTime createTime;
+
+        @ApiModelProperty("更新时间")
+        private LocalDateTime updateTime;
+
+        @ApiModelProperty("创建人")
+        private Long createUser;
+
+        @ApiModelProperty("更新人")
+        private Long updateUser;
+    }
+
+}

authorize-api/src/main/java/com/xy/service/SysSystemValueService.java

@@ -0,0 +1,30 @@
+package com.xy.service;
+
+import com.xy.annotate.RestMappingController;
+import com.xy.dto.SysSystemValueDto;
+import com.xy.utils.PageBean;
+import com.xy.utils.R;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * <p>
+ * 系统属性表 服务类
+ * </p>
+ *
+ * @author lijin
+ * @since 2022-12-09
+ */
+@RestMappingController("sys-system-value")
+public interface SysSystemValueService {
+
+    /**
+     * 分页查询
+     *
+     * @param select
+     * @return
+     */
+    @PostMapping("page")
+    R<PageBean<SysSystemValueDto.Vo>> page(@RequestBody @Validated SysSystemValueDto.Select select);
+}