4-25 代码提交 todo

demo-system/demo-system-api/src/main/java/com/yxt/demo/system/api/sys_role/SysRole.java

@@ -1,6 +1,7 @@
 package com.yxt.demo.system.api.sys_role;
 
 import com.yxt.demo.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -11,10 +12,10 @@ import lombok.Data;
 @Data
 public class SysRole extends BaseEntity {
     private static final long serialVersionUID = -1613625558809353237L;
-
+    @ApiModelProperty("角色名称")
     private String name;
-
+    @ApiModelProperty("排序")
     private int sort;
-
+    @ApiModelProperty("角色类型")
     private int type;
 }

demo-system/demo-system-api/src/main/java/com/yxt/demo/system/api/sys_role/SysRoleDto.java

@@ -0,0 +1,28 @@
+package com.yxt.demo.system.api.sys_role;
+
+import com.yxt.demo.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/4/24 11:28
+ * @Description
+ */
+@Data
+public class SysRoleDto implements Dto {
+    private static final long serialVersionUID = 2068661415449582838L;
+
+    @ApiModelProperty("角色名称")
+    @NotBlank(message = "角色名称不能为空")
+    private String name;
+    @ApiModelProperty("排序")
+    private int sort;
+    @ApiModelProperty("角色类型")
+    @NotBlank(message = "角色类型不能为空")
+    private int type;
+
+
+}

demo-system/demo-system-api/src/main/java/com/yxt/demo/system/api/sys_role/SysRoleFeign.java

@@ -1,9 +1,28 @@
 package com.yxt.demo.system.api.sys_role;
 
+import com.yxt.demo.common.core.result.ResultBean;
+import com.yxt.demo.system.api.sys_user.SysUserDto;
+import com.yxt.demo.system.api.sys_user.SysUserFeignFallback;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
 /**
  * @Author dimengzhe
  * @Date 2023/4/24 14:27
  * @Description
  */
+@Api(tags = "角色表")
+@FeignClient(
+        contextId = "demo-system-SysRole",
+        name = "demo-system",
+        path = "v1/sysrole",
+        fallback = SysRoleFeignFallback.class)
 public interface SysRoleFeign {
+
+    @ApiOperation(value = "添加角色")
+    @PostMapping("/addRole")
+    ResultBean addRole(@RequestBody SysRole sysRole);
 }

demo-system/demo-system-api/src/main/java/com/yxt/demo/system/api/sys_role/SysRoleFeignFallback.java

@@ -0,0 +1,12 @@
+package com.yxt.demo.system.api.sys_role;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/4/24 11:28
+ * @Description
+ */
+@Component
+public class SysRoleFeignFallback {
+}

demo-system/demo-system-api/src/main/java/com/yxt/demo/system/api/sys_score/SysScore.java

@@ -1,6 +1,7 @@
 package com.yxt.demo.system.api.sys_score;
 
 import com.yxt.demo.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -11,10 +12,10 @@ import lombok.Data;
 @Data
 public class SysScore extends BaseEntity {
     private static final long serialVersionUID = -1676424079241884880L;
-
+    @ApiModelProperty("类别")
     private String type;
-
+    @ApiModelProperty("类别Key")
     private String typeKey;
-
+    @ApiModelProperty("成绩")
     private String score;
 }

demo-system/demo-system-api/src/main/java/com/yxt/demo/system/api/sys_score/SysScoreDto.java

@@ -0,0 +1,24 @@
+package com.yxt.demo.system.api.sys_score;
+
+import com.yxt.demo.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author shkstart
+ * @create 2023-04-25-16:07
+ */
+@Data
+public class SysScoreDto implements Dto {
+
+    @ApiModelProperty("类别")
+    @NotBlank(message = "类别不能为空")
+    private String type;
+    @ApiModelProperty("类别Key")
+    @NotBlank(message = "类别Key不能为空")
+    private String typeKey;
+    @ApiModelProperty("成绩")
+    private String score;
+}

demo-system/demo-system-api/src/main/java/com/yxt/demo/system/api/sys_score/SysScoreFeign.java

@@ -1,9 +1,32 @@
 package com.yxt.demo.system.api.sys_score;
 
+import com.yxt.demo.common.core.result.ResultBean;
+import com.yxt.demo.system.api.sys_user.SysUserDto;
+import com.yxt.demo.system.api.sys_user.SysUserFeignFallback;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
 /**
  * @Author dimengzhe
  * @Date 2023/4/24 14:28
  * @Description
  */
+@Api(tags = "用户表")
+@FeignClient(
+        contextId = "demo-system-SysScore",
+        name = "demo-system",
+        path = "v1/sysscore",
+        fallback = SysScoreFeignFallback.class)
 public interface SysScoreFeign {
+
+    @ApiOperation(value = "查询成绩")
+    @PostMapping("/save")
+    ResultBean save(@RequestBody SysScoreDto sysScoreDto);
+
+    @ApiOperation(value = "成绩修改")
+    @PostMapping("/update")
+    ResultBean alterById(@RequestBody SysScore sysScore);
 }

demo-system/demo-system-api/src/main/java/com/yxt/demo/system/api/sys_score/SysScoreFeignFallback.java

@@ -0,0 +1,11 @@
+package com.yxt.demo.system.api.sys_score;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @author shkstart
+ * @create 2023-04-25-16:10
+ */
+@Component
+public class SysScoreFeignFallback {
+}

demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_role/SysRoleMapper.java

@@ -1,9 +1,14 @@
 package com.yxt.demo.system.biz.sys_role;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.demo.system.api.sys_role.SysRole;
+import org.springframework.data.repository.query.Param;
+
 /**
  * @Author dimengzhe
  * @Date 2023/4/24 14:27
  * @Description
  */
-public interface SysRoleMapper {
+public interface SysRoleMapper extends BaseMapper<SysRole> {
+    SysRole selectRole(@Param("name") String name);
 }

demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_role/SysRoleMapper.xml

@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.yxt.demo.system.biz.sys_role.SysRoleMapper">
+    <select id="selectRole" resultType="com.yxt.demo.system.biz.sys_role.SysRoleMapper">
+        select count(*) from sys_role where name == #{name}
+    </select>
 </mapper>

demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_role/SysRoleRest.java

@@ -1,9 +1,28 @@
 package com.yxt.demo.system.biz.sys_role;
 
+import com.yxt.demo.common.core.result.ResultBean;
+import com.yxt.demo.system.api.sys_role.SysRole;
+import com.yxt.demo.system.api.sys_role.SysRoleFeign;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 /**
  * @Author dimengzhe
  * @Date 2023/4/24 14:27
  * @Description
  */
-public class SysRoleRest {
+@Api(tags = "成绩表")
+@RestController
+@RequestMapping("v1/sysrole")
+public class SysRoleRest implements SysRoleFeign {
+    @Autowired
+    private SysRoleService sysRoleService;
+
+    @Override
+    public ResultBean addRole(SysRole sysRole) {
+        return sysRoleService.addRole(sysRole);
+    }
 }

demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_role/SysRoleService.java

@@ -1,9 +1,37 @@
 package com.yxt.demo.system.biz.sys_role;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.demo.common.core.result.ResultBean;
+import com.yxt.demo.common.jdbc.service.MybatisBaseService;
+import com.yxt.demo.system.api.sys_role.SysRole;
+import com.yxt.demo.system.api.sys_score.SysScore;
+import com.yxt.demo.system.api.sys_score.SysScoreDto;
+import com.yxt.demo.system.api.sys_user.SysUser;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 /**
  * @Author dimengzhe
  * @Date 2023/4/24 14:27
  * @Description
  */
-public class SysRoleService {
+@Service
+public class SysRoleService extends MybatisBaseService<SysRoleMapper, SysRole> {
+
+    @Autowired
+    private SysRoleMapper sysRoleMapper;
+
+    public ResultBean addRole(SysRole sysRole) {
+        ResultBean rb = ResultBean.fireFail();
+        SysRole sysRole1 = sysRoleMapper.selectRole(sysRole.getName());
+        if (sysRole1 != null){
+            int insert = baseMapper.insert(sysRole);
+            if (insert == 1){
+                return rb.success().setMsg("添加成功");
+            }else{
+                return rb;
+            }
+        }
+        return rb;
+    }
 }

demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_score/SysScoreMapper.java

@@ -1,9 +1,13 @@
 package com.yxt.demo.system.biz.sys_score;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.demo.system.api.sys_score.SysScore;
+import com.yxt.demo.system.api.sys_user.SysUser;
+
 /**
  * @Author dimengzhe
  * @Date 2023/4/24 14:28
  * @Description
  */
-public interface SysScoreMapper {
+public interface SysScoreMapper extends BaseMapper<SysScore> {
 }

demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_score/SysScoreRest.java

@@ -1,9 +1,38 @@
 package com.yxt.demo.system.biz.sys_score;
 
+import com.yxt.demo.common.core.result.ResultBean;
+import com.yxt.demo.system.api.sys_score.SysScore;
+import com.yxt.demo.system.api.sys_score.SysScoreDto;
+import com.yxt.demo.system.api.sys_score.SysScoreFeign;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 /**
  * @Author dimengzhe
  * @Date 2023/4/24 14:28
  * @Description
  */
-public class SysScoreRest {
+@Api(tags = "成绩表")
+@RestController
+@RequestMapping("v1/sysscore")
+public class SysScoreRest implements SysScoreFeign {
+    @Autowired
+    private SysScoreService sysScoreService;
+
+    /**
+     * @Description //描述： 添加成绩
+     * @Param [sysScoreDto]
+     * @return com.yxt.demo.common.core.result.ResultBean
+    **/
+    @Override
+    public ResultBean save(SysScoreDto sysScoreDto) {
+        return sysScoreService.save(sysScoreDto);
+    }
+
+
+    public ResultBean alterById(SysScore sysScore){
+        return sysScoreService.alterById(sysScore);
+    }
 }

demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_score/SysScoreService.java

@@ -1,9 +1,35 @@
 package com.yxt.demo.system.biz.sys_score;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.demo.common.core.result.ResultBean;
+import com.yxt.demo.common.jdbc.service.MybatisBaseService;
+import com.yxt.demo.system.api.sys_score.SysScore;
+import com.yxt.demo.system.api.sys_score.SysScoreDto;
+import org.springframework.stereotype.Service;
+
 /**
  * @Author dimengzhe
  * @Date 2023/4/24 14:28
  * @Description
  */
-public class SysScoreService {
+@Service
+public class SysScoreService extends MybatisBaseService<SysScoreMapper, SysScore>{
+
+    public ResultBean save(SysScoreDto sysScoreDto) {
+        ResultBean rb = ResultBean.fireFail();
+        SysScore sysScore = new SysScore();
+        BeanUtil.copyProperties(sysScoreDto, sysScore);
+        baseMapper.insert(sysScore);
+        return rb.success();
+    }
+
+    public ResultBean alterById(SysScore sysScore){
+        ResultBean rb = ResultBean.fireFail();
+        int i = baseMapper.updateById(sysScore);
+        if (i==1){
+            return rb.success().setMsg("修改成功");
+        }else {
+            return rb;
+        }
+    }
 }