Merge remote-tracking branch 'origin/master'

sys-api-service/src/main/java/com/xy/entity/SysAgreement.java

@@ -0,0 +1,71 @@
+package com.xy.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author hechunping
+ * @since 2023-03-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="SysAgreement对象", description="")
+public class SysAgreement implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private Long id;
+
+    @ApiModelProperty(value = "标题")
+    private String title;
+
+    @ApiModelProperty(value = "类型")
+    private String type;
+
+    @ApiModelProperty(value = "内容")
+    private String content;
+
+    @ApiModelProperty(value = "版本")
+    private String version;
+
+    @ApiModelProperty(value = "是否显示：0=隐藏,1=显示")
+    private Boolean status;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUser;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "更新人")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long updateUser;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty(value = "逻辑删除")
+    @TableLogic
+    private Boolean deleted;
+
+
+}

sys-api-service/src/main/java/com/xy/mapper/SysAgreementMapper.java

@@ -0,0 +1,16 @@
+package com.xy.mapper;
+
+import com.xy.entity.SysAgreement;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author hechunping
+ * @since 2023-03-28
+ */
+public interface SysAgreementMapper extends BaseMapper<SysAgreement> {
+
+}

sys-api-service/src/main/java/com/xy/service/AlgorithmServiceImpl.java

@@ -3,6 +3,7 @@ package com.xy.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xy.annotate.Runners;
 import com.xy.dto.AlgorithmDto;
 import com.xy.entity.Algorithm;
 import com.xy.mapper.AlgorithmMapper;
@@ -84,6 +85,7 @@ public class AlgorithmServiceImpl extends ServiceImpl<AlgorithmMapper, Algorithm
     /**
      * 设置Redis,
      */
+    @Runners
     @PostMapping("redis")
     @ApiOperation("更新redis")
     public R setRedis() {

sys-api-service/src/main/java/com/xy/service/SysAgreementServiceImpl.java

@@ -0,0 +1,100 @@
+package com.xy.service;
+
+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.SysAgreementDto;
+import com.xy.entity.SysAgreement;
+import com.xy.mapper.SysAgreementMapper;
+import com.xy.utils.Emptys;
+import com.xy.utils.MybatisPlusQuery;
+import com.xy.utils.PageBean;
+import com.xy.utils.R;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+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 java.util.List;
+
+import static com.xy.utils.Beans.copy;
+import static com.xy.utils.PlusBeans.toIPage;
+import static com.xy.utils.PlusBeans.toPageBean;
+
+
+/**
+* <p>
+*  服务实现类
+* </p>
+*
+* @author hechunping
+* @since 2023-03-28
+*/
+@Service
+@AllArgsConstructor
+@Api(tags = "系统协议管理")
+public class SysAgreementServiceImpl extends ServiceImpl<SysAgreementMapper, SysAgreement> implements SysAgreementService {
+    @PostMapping("listByMember")
+    @ApiOperation("协议列表展示（对外公开）")
+    public R<List<SysAgreementDto.ListByMemberVo>> listByMember(@RequestBody @Validated SysAgreementDto.ListByMemberDto dto){
+        LambdaQueryWrapper<SysAgreement> lqw = new LambdaQueryWrapper<SysAgreement>()
+                .in(SysAgreement::getType,dto.getTypeList())
+                .eq(SysAgreement::getStatus,true);
+        return R.ok(copy(SysAgreementDto.ListByMemberVo.class,list(lqw)));
+    }
+
+
+    @PostMapping("obj")
+    @ApiOperation("对象查询")
+    public R<SysAgreementDto.Vo> obj(@RequestBody SysAgreementDto.Vo vo) {
+        SysAgreementDto.SelectList selectList = copy(SysAgreementDto.SelectList.class, vo);
+        List<SysAgreementDto.Vo> list = list(selectList).getData();
+        if(Emptys.check(list)) {
+            return R.ok(list.get(0));
+        }
+        return R.ok();
+    }
+
+    @PostMapping("list")
+    @ApiOperation("集合查询")
+    public R<List<SysAgreementDto.Vo>> list(@RequestBody SysAgreementDto.SelectList selectList) {
+        LambdaQueryWrapper<SysAgreement> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(selectList, SysAgreement.class).build();
+        List<SysAgreement> list = list(lambdaQueryWrapper);
+        return R.ok(copy(SysAgreementDto.Vo.class, list));
+    }
+
+    @PostMapping("page")
+    @ApiOperation("分页查询")
+    public R<PageBean<SysAgreementDto.Vo>> page(@RequestBody SysAgreementDto.Page page) {
+        PageBean pageBean = page.getPage();
+        LambdaQueryWrapper<SysAgreement> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(page, SysAgreement.class).build();
+        IPage<SysAgreement> iPage = page(toIPage(pageBean), lambdaQueryWrapper);
+        return R.ok(toPageBean(SysAgreementDto.Vo.class, iPage));
+    }
+
+    @PostMapping("save")
+    @ApiOperation("添加")
+    public R save(@RequestBody @Validated SysAgreementDto.Save save) {
+        SysAgreement saveInfo = copy(SysAgreement.class, save);
+        save(saveInfo);
+        return R.ok();
+    }
+
+    @PostMapping("update")
+    @ApiOperation("修改")
+    public R update(@RequestBody @Validated SysAgreementDto.Update update) {
+        SysAgreement updateInfo = copy(SysAgreement.class, update);
+        updateById(updateInfo);
+        return R.ok();
+    }
+
+    @PostMapping("del")
+    @ApiOperation("删除")
+    public R del(@RequestBody @Validated SysAgreementDto.Del dto){
+        removeBatchByIds(dto.getIds());
+        return R.ok();
+    }
+}

sys-api-service/src/main/java/com/xy/service/UserInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package com.xy.service;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -109,7 +110,12 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
         }
         UserInfo userInfo = getOne(lambdaQueryWrapper);
         if (userInfo != null) {
-            return R.fail("账号已存在");
+            if (ObjectUtil.equals(userInfo.getTel(), save.getTel())) {
+                return R.fail("手机号已存在!");
+            }
+            if (ObjectUtil.equals(userInfo.getMail(), save.getMail())) {
+                return R.fail("邮箱已存在!");
+            }
         }
         //添加权限用户
         AddDto addDto = copy(AddDto.class, save)

sys-api/src/main/java/com/xy/dto/SysAgreementDto.java

@@ -0,0 +1,137 @@
+package com.xy.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xy.utils.PageBean;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author hechunping
+ * @since 2023-03-28
+ */
+public class SysAgreementDto {
+
+    @Data
+    @Accessors(chain = true)
+    public static class Del {
+
+        @NotEmpty(message = "id不能为空")
+        @ApiModelProperty("唯一标识")
+        private List<Long> ids;
+    }
+
+    @Data
+    @Accessors(chain = true)
+    public static class ListByMemberDto {
+        @NotEmpty(message = "类型不能为空")
+        @ApiModelProperty(value = "类型")
+        private List<String> typeList;
+    }
+
+    @Data
+    @Accessors(chain = true)
+    public static class ListByMemberVo {
+        @ApiModelProperty(value = "id")
+        private Long id;
+
+        @ApiModelProperty(value = "标题")
+        private String title;
+
+        @ApiModelProperty(value = "类型")
+        private String type;
+
+        @ApiModelProperty(value = "内容")
+        private String content;
+
+        @ApiModelProperty(value = "版本")
+        private String version;
+    }
+
+    @Data
+    @Accessors(chain = true)
+    public static class SelectList extends Vo {
+
+    }
+
+    @Data
+    @Accessors(chain = true)
+    public static class Page extends Vo {
+
+        @ApiModelProperty(value = "分页对象", required = true)
+        private PageBean page;
+
+    }
+
+    @Data
+    @Accessors(chain = true)
+    public static class Save {
+        @ApiModelProperty(value = "标题")
+        private String title;
+
+        @ApiModelProperty(value = "类型")
+        private String type;
+
+        @ApiModelProperty(value = "内容")
+        private String content;
+
+        @ApiModelProperty(value = "版本")
+        private String version;
+
+        @ApiModelProperty(value = "是否显示：0=隐藏,1=显示")
+        private Boolean status;
+    }
+
+    @Data
+    @Accessors(chain = true)
+    public static class Update extends Save{
+        @ApiModelProperty(value = "id")
+        private Long id;
+    }
+
+    @Data
+    @Accessors(chain = true)
+    public static class Vo {
+
+        @ApiModelProperty(value = "id")
+        private Long id;
+
+        @ApiModelProperty(value = "标题")
+        private String title;
+
+        @ApiModelProperty(value = "类型")
+        private String type;
+
+        @ApiModelProperty(value = "内容")
+        private String content;
+
+        @ApiModelProperty(value = "版本")
+        private String version;
+
+        @ApiModelProperty(value = "是否显示：0=隐藏,1=显示")
+        private Boolean status;
+
+        @ApiModelProperty(value = "创建人")
+        private Long createUser;
+
+        @ApiModelProperty(value = "创建时间")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        private LocalDateTime createTime;
+
+        @ApiModelProperty(value = "更新人")
+        private Long updateUser;
+
+        @ApiModelProperty(value = "更新时间")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        private LocalDateTime updateTime;
+    }
+
+}

sys-api/src/main/java/com/xy/service/SysAgreementService.java

@@ -0,0 +1,16 @@
+package com.xy.service;
+
+import com.xy.annotate.RestMappingController;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author hechunping
+ * @since 2023-03-28
+ */
+@RestMappingController("/sys-agreement")
+public interface SysAgreementService {
+
+}