category

common/src/main/java/com/koobietech/eas/common/constant/EnumType.java → common/src/main/java/com/koobietech/eas/common/constant/Disabled.java

@@ -1,6 +1,6 @@
 package com.koobietech.eas.common.constant;
 
-public enum EnumType {
-
-
+public enum Disabled {
+        N,
+        Y
 }

controller/src/main/java/com/koobietech/eas/controller/EasEduCategoryController.java

@@ -1,6 +1,10 @@
 package com.koobietech.eas.controller;
 
+import com.github.pagehelper.PageHelper;
+import com.koobietech.eas.common.constant.Disabled;
+import com.koobietech.eas.common.result.JsonPageResult;
 import com.koobietech.eas.common.result.JsonResult;
+import com.koobietech.eas.common.result.PageData;
 import com.koobietech.eas.mbg.model.EasEduCategory;
 import com.koobietech.eas.service.EasEduCategoryService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -9,6 +13,10 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
 import java.util.List;
 
 @RestController
@@ -24,7 +32,7 @@ public class EasEduCategoryController {
      * @return
      */
     @PostMapping(value = "/addEasEduCategory")
-    @Operation(summary = "添加课程" , description = "用于演示添加课程")
+    @Operation(summary = "添加课程" , description = "用于 添加课程")
     public JsonResult addEasEduCategory(@RequestBody EasEduCategory easEduCategory ){
         int add = easEduCategoryService.addEasEduCategory( easEduCategory );
         System.out.println( add );
@@ -37,7 +45,7 @@ public class EasEduCategoryController {
      * @return
      */
     @PostMapping(value = "/updateEasEduCategory")
-    @Operation(summary = "课程更新" , description = "用于演示课程更新")
+    @Operation(summary = "课程更新" , description = "用于 课程更新")
     public JsonResult updateEasEduCategory(@RequestBody EasEduCategory easEduCategory){
         int i = easEduCategoryService.updateEasEduCategory( easEduCategory );
         if (i > 0){
@@ -49,13 +57,13 @@ public class EasEduCategoryController {
 
     /**
      * 根据 Id 删除
-     * @param easEduCategory
+     * @param id
      * @return
      */
-    @GetMapping(value = "/deleteById")
-    @Operation(summary = "根据Id删除课程" , description = "用于演示根据Id删除课程")
-    public JsonResult deleteById(@RequestBody EasEduCategory easEduCategory){
-        int i = easEduCategoryService.deleteById(easEduCategory.getId());
+    @DeleteMapping(value = "/deleteById/{id}")
+    @Operation(summary = "根据Id删除课程" , description = "用于 根据Id删除课程")
+    public JsonResult deleteById(@PathVariable Integer id){
+        int i = easEduCategoryService.deleteById(id);
         if (i > 0){
             return JsonResult.ok();
         }else {
@@ -69,10 +77,16 @@ public class EasEduCategoryController {
      * @return
      */
     @GetMapping(value = "/selectById")
-    @Operation(summary = "根据Id查询对应课程" , description = "用于演示根据Id查询课程")
+    @Operation(summary = "根据Id查询对应课程" , description = "用于 根据Id查询课程")
     public JsonResult selectById(Integer id){
         EasEduCategory easEduCategory = easEduCategoryService.selectById(id);
-        System.out.println(easEduCategory);
+
+
+        System.out.println(
+                Disabled.valueOf(easEduCategory.getDisabled())
+        );
+
+
         return JsonResult.data( easEduCategory );
     }
 
@@ -81,9 +95,25 @@ public class EasEduCategoryController {
      * @return
      */
     @GetMapping(value = "/selectAll")
-    @Operation(summary = "查询全部课程" , description = "用于演示查询全部课程")
+    @Operation(summary = "查询全部课程" , description = "用于 查询全部课程")
     public JsonResult selectAll(){
         List<EasEduCategory> easEduCategories = easEduCategoryService.selectAll();
         return JsonResult.data( easEduCategories );
     }
+
+    /**
+     * 通过条件查询课程
+     * @param easEduCategory
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @PostMapping(value = "/selectByCondition")
+    @Operation(summary = "根据条件进行查询", description = "用于根据条件查询课程")
+    public JsonPageResult selectByCondition(@RequestBody EasEduCategory easEduCategory,
+                                            @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        PageData pageData = easEduCategoryService.selectByCondition(easEduCategory);
+        return JsonPageResult.data( pageData );
+    }
 }

controller/src/main/resources/application-local.yaml

@@ -0,0 +1,27 @@
+server:
+  port: 8080
+spring:
+  datasource:
+    url: jdbc:mysql://127.0.0.1:3306/eas?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=true&tinyInt1isBit=false
+    username: root
+    password: 1234
+    driver-class-name: com.mysql.cj.jdbc.Driver
+  redis:
+    host: localhost
+    database: 9
+    password:
+    port: 26379
+  security:
+    user:
+      name: admin
+      password: 123456
+springdoc:
+  version: v0.0.1
+  api-docs:
+    enabled: true
+  swagger-ui:
+    enabled: true
+knife4j:
+  enable: true
+  setting:
+    language: zh_cn

controller/src/main/resources/application.yaml

@@ -2,7 +2,7 @@ server:
   port: 8080
 spring:
   profiles:
-    active: dev
+    active: local
   main:
     allow-circular-references: true
   servlet:

mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasEduCategoryMapper.java

@@ -17,21 +17,15 @@ public interface EasEduCategoryMapper {
 
     int insertSelective(EasEduCategory record);
 
-    List<EasEduCategory> selectByExampleWithBLOBs(EasEduCategoryExample example);
-
     List<EasEduCategory> selectByExample(EasEduCategoryExample example);
 
     EasEduCategory selectByPrimaryKey(Integer id);
 
     int updateByExampleSelective(@Param("record") EasEduCategory record, @Param("example") EasEduCategoryExample example);
 
-    int updateByExampleWithBLOBs(@Param("record") EasEduCategory record, @Param("example") EasEduCategoryExample example);
-
     int updateByExample(@Param("record") EasEduCategory record, @Param("example") EasEduCategoryExample example);
 
     int updateByPrimaryKeySelective(EasEduCategory record);
 
-    int updateByPrimaryKeyWithBLOBs(EasEduCategory record);
-
     int updateByPrimaryKey(EasEduCategory record);
 }

mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduCategory.java

@@ -15,6 +15,14 @@ public class EasEduCategory implements Serializable {
     @Schema(description = "学科名称")
     private String name;
 
+    /**
+     * 学科描述
+     *
+     * @mbg.generated
+     */
+    @Schema(description = "学科描述")
+    private String description;
+
     /**
      * 创建时间
      *
@@ -47,14 +55,6 @@ public class EasEduCategory implements Serializable {
     @Schema(description = "状态")
     private String disabled;
 
-    /**
-     * 学科描述
-     *
-     * @mbg.generated
-     */
-    @Schema(description = "学科描述")
-    private String description;
-
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -73,6 +73,14 @@ public class EasEduCategory implements Serializable {
         this.name = name;
     }
 
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
     public Date getCreateTime() {
         return createTime;
     }
@@ -105,14 +113,6 @@ public class EasEduCategory implements Serializable {
         this.disabled = disabled;
     }
 
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -121,11 +121,11 @@ public class EasEduCategory implements Serializable {
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
         sb.append(", name=").append(name);
+        sb.append(", description=").append(description);
         sb.append(", createTime=").append(createTime);
         sb.append(", modifyTime=").append(modifyTime);
         sb.append(", createUid=").append(createUid);
         sb.append(", disabled=").append(disabled);
-        sb.append(", description=").append(description);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduCategoryExample.java

@@ -235,6 +235,76 @@ public class EasEduCategoryExample {
             return (Criteria) this;
         }
 
+        public Criteria andDescriptionIsNull() {
+            addCriterion("description is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionIsNotNull() {
+            addCriterion("description is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionEqualTo(String value) {
+            addCriterion("description =", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionNotEqualTo(String value) {
+            addCriterion("description <>", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionGreaterThan(String value) {
+            addCriterion("description >", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionGreaterThanOrEqualTo(String value) {
+            addCriterion("description >=", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionLessThan(String value) {
+            addCriterion("description <", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionLessThanOrEqualTo(String value) {
+            addCriterion("description <=", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionLike(String value) {
+            addCriterion("description like", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionNotLike(String value) {
+            addCriterion("description not like", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionIn(List<String> values) {
+            addCriterion("description in", values, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionNotIn(List<String> values) {
+            addCriterion("description not in", values, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionBetween(String value1, String value2) {
+            addCriterion("description between", value1, value2, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionNotBetween(String value1, String value2) {
+            addCriterion("description not between", value1, value2, "description");
+            return (Criteria) this;
+        }
+
         public Criteria andCreateTimeIsNull() {
             addCriterion("create_time is null");
             return (Criteria) this;

mbg/src/main/resources/com/koobietech/eas/mbg/mapper/EasEduCategoryMapper.xml

@@ -4,14 +4,12 @@
   <resultMap id="BaseResultMap" type="com.koobietech.eas.mbg.model.EasEduCategory">
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="description" jdbcType="VARCHAR" property="description" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="modify_time" jdbcType="TIMESTAMP" property="modifyTime" />
     <result column="create_uid" jdbcType="INTEGER" property="createUid" />
     <result column="disabled" jdbcType="CHAR" property="disabled" />
   </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.koobietech.eas.mbg.model.EasEduCategory">
-    <result column="description" jdbcType="LONGVARCHAR" property="description" />
-  </resultMap>
   <sql id="Example_Where_Clause">
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -71,27 +69,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, name, create_time, modify_time, create_uid, disabled
-  </sql>
-  <sql id="Blob_Column_List">
-    description
+    id, name, description, create_time, modify_time, create_uid, disabled
   </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="com.koobietech.eas.mbg.model.EasEduCategoryExample" resultMap="ResultMapWithBLOBs">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from eas_edu_category
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
   <select id="selectByExample" parameterType="com.koobietech.eas.mbg.model.EasEduCategoryExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
@@ -106,11 +85,9 @@
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs">
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
     from eas_edu_category
     where id = #{id,jdbcType=INTEGER}
   </select>
@@ -128,11 +105,11 @@
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
       SELECT LAST_INSERT_ID()
     </selectKey>
-    insert into eas_edu_category (name, create_time, modify_time, 
-      create_uid, disabled, description
+    insert into eas_edu_category (name, description, create_time, 
+      modify_time, create_uid, disabled
       )
-    values (#{name,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{modifyTime,jdbcType=TIMESTAMP}, 
-      #{createUid,jdbcType=INTEGER}, #{disabled,jdbcType=CHAR}, #{description,jdbcType=LONGVARCHAR}
+    values (#{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{modifyTime,jdbcType=TIMESTAMP}, #{createUid,jdbcType=INTEGER}, #{disabled,jdbcType=CHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.koobietech.eas.mbg.model.EasEduCategory">
@@ -144,6 +121,9 @@
       <if test="name != null">
         name,
       </if>
+      <if test="description != null">
+        description,
+      </if>
       <if test="createTime != null">
         create_time,
       </if>
@@ -156,14 +136,14 @@
       <if test="disabled != null">
         disabled,
       </if>
-      <if test="description != null">
-        description,
-      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="name != null">
         #{name,jdbcType=VARCHAR},
       </if>
+      <if test="description != null">
+        #{description,jdbcType=VARCHAR},
+      </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -176,9 +156,6 @@
       <if test="disabled != null">
         #{disabled,jdbcType=CHAR},
       </if>
-      <if test="description != null">
-        #{description,jdbcType=LONGVARCHAR},
-      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.koobietech.eas.mbg.model.EasEduCategoryExample" resultType="java.lang.Long">
@@ -196,6 +173,9 @@
       <if test="record.name != null">
         name = #{record.name,jdbcType=VARCHAR},
       </if>
+      <if test="record.description != null">
+        description = #{record.description,jdbcType=VARCHAR},
+      </if>
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
@@ -208,31 +188,16 @@
       <if test="record.disabled != null">
         disabled = #{record.disabled,jdbcType=CHAR},
       </if>
-      <if test="record.description != null">
-        description = #{record.description,jdbcType=LONGVARCHAR},
-      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByExampleWithBLOBs" parameterType="map">
-    update eas_edu_category
-    set id = #{record.id,jdbcType=INTEGER},
-      name = #{record.name,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      modify_time = #{record.modifyTime,jdbcType=TIMESTAMP},
-      create_uid = #{record.createUid,jdbcType=INTEGER},
-      disabled = #{record.disabled,jdbcType=CHAR},
-      description = #{record.description,jdbcType=LONGVARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
   <update id="updateByExample" parameterType="map">
     update eas_edu_category
     set id = #{record.id,jdbcType=INTEGER},
       name = #{record.name,jdbcType=VARCHAR},
+      description = #{record.description,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       modify_time = #{record.modifyTime,jdbcType=TIMESTAMP},
       create_uid = #{record.createUid,jdbcType=INTEGER},
@@ -247,6 +212,9 @@
       <if test="name != null">
         name = #{name,jdbcType=VARCHAR},
       </if>
+      <if test="description != null">
+        description = #{description,jdbcType=VARCHAR},
+      </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -259,25 +227,13 @@
       <if test="disabled != null">
         disabled = #{disabled,jdbcType=CHAR},
       </if>
-      <if test="description != null">
-        description = #{description,jdbcType=LONGVARCHAR},
-      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.koobietech.eas.mbg.model.EasEduCategory">
-    update eas_edu_category
-    set name = #{name,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      modify_time = #{modifyTime,jdbcType=TIMESTAMP},
-      create_uid = #{createUid,jdbcType=INTEGER},
-      disabled = #{disabled,jdbcType=CHAR},
-      description = #{description,jdbcType=LONGVARCHAR}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
   <update id="updateByPrimaryKey" parameterType="com.koobietech.eas.mbg.model.EasEduCategory">
     update eas_edu_category
     set name = #{name,jdbcType=VARCHAR},
+      description = #{description,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       modify_time = #{modifyTime,jdbcType=TIMESTAMP},
       create_uid = #{createUid,jdbcType=INTEGER},

mbg/src/main/resources/generator.properties

@@ -1,4 +1,4 @@
 jdbc.driverClass=com.mysql.cj.jdbc.Driver
-jdbc.connectionURL=jdbc:mysql://39.105.160.25:10992/eas?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=true&tinyInt1isBit=false
-jdbc.userId=eas
-jdbc.password=eas
+jdbc.connectionURL=jdbc:mysql://127.0.0.1:3306/eas?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=true&tinyInt1isBit=false
+jdbc.userId=root
+jdbc.password=1234

service/pom.xml

@@ -32,6 +32,12 @@
             <version>0.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.koobietech.eas</groupId>
+            <artifactId>common</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <parent>

service/src/main/java/com/koobietech/eas/service/EasEduCategoryService.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.service;
 
+import com.koobietech.eas.common.result.PageData;
 import com.koobietech.eas.mbg.model.EasEduCategory;
 import org.apache.ibatis.annotations.Select;
 
@@ -13,9 +14,10 @@ public interface EasEduCategoryService {
 
     int deleteById(int id);
 
-    @Select("SELECT * FROM eas_edu_category")
     EasEduCategory selectById( Integer id );
 
     List<EasEduCategory> selectAll();
 
+    PageData selectByCondition(EasEduCategory easEduCategory );
+
 }

service/src/main/java/com/koobietech/eas/service/impl/EasEduCategoryServiceImpl.java

@@ -1,11 +1,16 @@
 package com.koobietech.eas.service.impl;
 
+import com.koobietech.eas.common.result.PageData;
 import com.koobietech.eas.mbg.mapper.EasEduCategoryMapper;
 import com.koobietech.eas.mbg.model.EasEduCategory;
+import com.koobietech.eas.mbg.model.EasEduCategoryExample;
 import com.koobietech.eas.service.EasEduCategoryService;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
+import java.util.Objects;
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -16,6 +21,8 @@ public class EasEduCategoryServiceImpl implements EasEduCategoryService {
 
     @Override
     public int addEasEduCategory(EasEduCategory easEduCategory) {
+        easEduCategory.setCreateTime(new Date());
+        easEduCategory.setModifyTime(new Date());
        return  easEduCategoryMapper.insert(easEduCategory);
     }
 
@@ -31,6 +38,7 @@ public class EasEduCategoryServiceImpl implements EasEduCategoryService {
 
     @Override
     public EasEduCategory selectById(Integer id) {
+        System.out.println( "ID:" + id );
         return easEduCategoryMapper.selectByPrimaryKey( id );
     }
 
@@ -38,4 +46,36 @@ public class EasEduCategoryServiceImpl implements EasEduCategoryService {
     public List<EasEduCategory> selectAll() {
         return easEduCategoryMapper.selectByExample(null);
     }
+
+    @Override
+    public PageData selectByCondition(EasEduCategory easEduCategory) {
+        EasEduCategoryExample easEduCategoryExample = new EasEduCategoryExample();
+        EasEduCategoryExample.Criteria criteria = easEduCategoryExample.createCriteria();
+        if ( Objects.nonNull(easEduCategory) ) {
+            if (Objects.nonNull(easEduCategory.getId())) {
+                criteria.andIdEqualTo(easEduCategory.getId());
+            }
+            if (StringUtils.hasText(easEduCategory.getName())) {
+                criteria.andNameLike("%" + easEduCategory.getName() + "%");
+            }
+            if (StringUtils.hasText(easEduCategory.getDescription())) {
+                criteria.andDescriptionLike("%" + easEduCategory.getDescription() + "%");
+            }
+            if (Objects.nonNull(easEduCategory.getCreateTime())) {
+                criteria.andCreateTimeGreaterThan(easEduCategory.getCreateTime());
+            }
+            if (Objects.nonNull(easEduCategory.getModifyTime())) {
+                criteria.andCreateTimeGreaterThan(easEduCategory.getModifyTime());
+            }
+            if (Objects.nonNull(easEduCategory.getCreateUid())) {
+                criteria.andCreateUidEqualTo(easEduCategory.getCreateUid());
+            }
+            if (StringUtils.hasText(easEduCategory.getDisabled())) {
+                criteria.andDisabledEqualTo(easEduCategory.getDisabled());
+            }
+        }
+        List<EasEduCategory> easEduCategories = easEduCategoryMapper.selectByExample(easEduCategoryExample);
+        long l = easEduCategoryMapper.countByExample(easEduCategoryExample);
+        return PageData.init( easEduCategories, l );
+    }
 }