整理代码

common/service_base/src/main/java/com/founder/servicebase/SwaggerConfig.java

@@ -15,8 +15,8 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @Configuration//配置类
 @EnableSwagger2 //swagger注解
 public class SwaggerConfig {
-    public static final String asjApi = "com.founder.demo.controller1";
-    public static final String carApi = "com.founder.demo.controller2";
+    public static final String asjApi = "com.founder.asj";
+    //public static final String carApi = "com.founder.asj.controller2";
     @Bean
     public Docket asjApi(){
         return new Docket(DocumentationType.SWAGGER_2)
@@ -29,7 +29,7 @@ public class SwaggerConfig {
                 .build();
 
     }
-    @Bean
+    /*@Bean
     public Docket carApi(){
         return new Docket(DocumentationType.SWAGGER_2)
                 .groupName("carApi")
@@ -40,7 +40,7 @@ public class SwaggerConfig {
                 .paths(Predicates.not(PathSelectors.regex("/error.*")))
                 .build();
 
-    }
+    }*/
     private ApiInfo webApiInfo(){
 
         return new ApiInfoBuilder()

pom.xml

@@ -78,6 +78,15 @@
                 <version>${velocity.version}</version>
             </dependency>
 
+            <!-- 数据库驱动包 -->
+            <dependency>
+                <groupId>org.oracle</groupId>
+                <artifactId>ojdbc-10</artifactId>
+                <version>10</version>
+                <scope>system</scope>
+                <systemPath>${project.basedir}/libs/ojdbc-10.jar</systemPath>
+            </dependency>
+
             <!--swagger-->
             <dependency>
                 <groupId>io.springfox</groupId>

service/asj/src/main/java/com/founder/demo/controller1/EduCourseController.java → service/asj/src/main/java/com/founder/asj/controller/EduCourseController.java

-package com.founder.demo.controller1;
+package com.founder.asj.controller;
 
 
+import com.founder.asj.entity.EduCourse;
+import com.founder.asj.service.EduCourseService;
 import com.founder.commonutils.R;
-import com.founder.demo.entity.EduCourse;
-import com.founder.demo.service.EduCourseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

service/asj/src/main/java/com/founder/demo/controller1/EduTeacherController.java → service/asj/src/main/java/com/founder/asj/controller/EduTeacherController.java

-package com.founder.demo.controller1;
+package com.founder.asj.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.founder.demo.entity.EduTeacher;
+import com.founder.asj.entity.EduTeacher;
+import com.founder.asj.entity.vo.TeacherQuery;
+import com.founder.asj.service.EduTeacherService;
 import com.founder.commonutils.R;
-import com.founder.demo.entity.vo.TeacherQuery;
-import com.founder.demo.service.EduTeacherService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;

service/asj/src/main/java/com/founder/asj/controller/TbStAsjController.java

+package com.founder.asj.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.founder.asj.entity.TbStAsj;
+import com.founder.asj.entity.vo.AsjQuery;
+import com.founder.asj.service.TbStAsjService;
+import com.founder.commonutils.R;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 案事件基本信息 前端控制器
+ * </p>
+ *
+ * @author Guojunfeng
+ * @since 2021-03-03
+ */
+@Api(description = "案事件管理")
+@RestController
+@RequestMapping("/asj")
+public class TbStAsjController {
+
+    @Autowired
+    private TbStAsjService tbStAsjService;
+
+    @ApiOperation(value = "按条件查询案件")
+    @PostMapping("getAsj")
+    public R getAsj(@RequestBody AsjQuery asjQuery) {
+        QueryWrapper<TbStAsj> wrapper = new QueryWrapper<>();
+        String asjbh = asjQuery.getAsjbh();
+        String ajmc = asjQuery.getAjmc();
+        String xsjqlbdm = asjQuery.getXsjqlbdm();
+        Date begin = asjQuery.getBegin();
+        Date end = asjQuery.getEnd();
+        //判断条件值是否为空，如果不为空拼接条件
+        if (!StringUtils.isEmpty(asjbh)) {
+            wrapper.eq("asjbh", asjbh);
+        }
+        if (!StringUtils.isEmpty(ajmc)) {
+            wrapper.like("ajmc", ajmc);
+        }
+        if (!StringUtils.isEmpty(xsjqlbdm)) {
+            wrapper.eq("xsjqlbdm", xsjqlbdm);
+        }
+        if (!StringUtils.isEmpty(begin)) {
+            wrapper.ge("ASJFSSJ_ASJFSKSSJ", begin);
+        }
+        if (!StringUtils.isEmpty(end)) {
+            wrapper.le("ASJFSSJ_ASJFSJSSJ", end);
+        }
+        List<TbStAsj> list = tbStAsjService.list(wrapper);
+        return R.ok().data("asj", list);
+    }
+
+    @ApiOperation(value = "获取所有案件（带分页）")
+    @GetMapping("getPageAsj/{current}/{limit}")
+    public R getPageAsj(@PathVariable long current,
+                        @PathVariable long limit) {
+        //创建page对象
+        Page<TbStAsj> pageAsj = new Page<>(current, limit);
+        tbStAsjService.page(pageAsj, null);
+        long total = pageAsj.getTotal();//总记录数
+        List<TbStAsj> records = pageAsj.getRecords(); //数据list集合
+        return R.ok().data("total", total).data("rows", records);
+    }
+
+    @ApiOperation(value = "带条件查询所有案件（带分页）")
+    @PostMapping("getPageAsjCondition/{current}/{limit}")
+    public R getPageAsjCondition(@PathVariable long current, @PathVariable long limit,
+                                 @RequestBody(required = false) AsjQuery asjQuery) {
+        //创建page对象
+        Page<TbStAsj> pageAsj = new Page<>(current, limit);
+        //构建条件
+        QueryWrapper<TbStAsj> wrapper = new QueryWrapper<>();
+        String asjbh = asjQuery.getAsjbh();
+        String ajmc = asjQuery.getAjmc();
+        String xsjqlbdm = asjQuery.getXsjqlbdm();
+        Date begin = asjQuery.getBegin();
+        Date end = asjQuery.getEnd();
+        //判断条件值是否为空，如果不为空拼接条件
+        if (!StringUtils.isEmpty(asjbh)) {
+            wrapper.eq("asjbh", asjbh);
+        }
+        if (!StringUtils.isEmpty(ajmc)) {
+            wrapper.like("ajmc", ajmc);
+        }
+        if (!StringUtils.isEmpty(xsjqlbdm)) {
+            wrapper.eq("xsjqlbdm", xsjqlbdm);
+        }
+        if (!StringUtils.isEmpty(begin)) {
+            wrapper.ge("ASJFSSJ_ASJFSKSSJ", begin);
+        }
+        if (!StringUtils.isEmpty(end)) {
+            wrapper.le("ASJFSSJ_ASJFSJSSJ", end);
+        }
+        //调用方法实现条件查询分页
+        tbStAsjService.page(pageAsj,wrapper);
+        long total = pageAsj.getTotal();//总记录数
+        List<TbStAsj> records = pageAsj.getRecords(); //数据list集合
+        return R.ok().data("total",total).data("rows",records);
+    }
+
+    @ApiOperation(value = "修改案件")
+    @PutMapping("updateAsj")
+    public R updateAsj(@RequestBody TbStAsj tbStAsj) {
+        boolean flag = tbStAsjService.updateById(tbStAsj);
+        if (flag) {
+            return R.ok();
+        } else {
+            return R.error();
+        }
+    }
+}
+

service/asj/src/main/java/com/founder/demo/entity/EduCourse.java → service/asj/src/main/java/com/founder/asj/entity/EduCourse.java

-package com.founder.demo.entity;
+package com.founder.asj.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;

service/asj/src/main/java/com/founder/demo/entity/EduTeacher.java → service/asj/src/main/java/com/founder/asj/entity/EduTeacher.java

-package com.founder.demo.entity;
+package com.founder.asj.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * <p>
  * 讲师

service/asj/src/main/java/com/founder/asj/entity/vo/AsjQuery.java

+package com.founder.asj.entity.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @author Godffy
+ * @create 2021-03-03 20:26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="AsjQuery对象", description="案事件基本传输信息")
+public class AsjQuery {
+
+    @ApiModelProperty(value = "案事件编号")
+    private String asjbh;
+
+    @ApiModelProperty(value = "案件名称")
+    private String ajmc;
+
+    @ApiModelProperty(value = "刑事警情类别代码")
+    private String xsjqlbdm;
+
+    @ApiModelProperty(value = "案发开始时间:2019-01-01 10:10:10")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date begin;//注意，这里使用的是String类型，前端传过来的数据无需进行类型转换
+
+    @ApiModelProperty(value = "案发结束时间:2019-12-01 10:10:10")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date end;
+
+
+}

service/asj/src/main/java/com/founder/demo/entity/vo/CourseFrontVo.java → service/asj/src/main/java/com/founder/asj/entity/vo/CourseFrontVo.java

-package com.founder.demo.entity.vo;
+package com.founder.asj.entity.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

service/asj/src/main/java/com/founder/demo/entity/vo/CourseInfoVo.java → service/asj/src/main/java/com/founder/asj/entity/vo/CourseInfoVo.java

-package com.founder.demo.entity.vo;
+package com.founder.asj.entity.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

service/asj/src/main/java/com/founder/demo/entity/vo/CoursePublishVo.java → service/asj/src/main/java/com/founder/asj/entity/vo/CoursePublishVo.java

-package com.founder.demo.entity.vo;
+package com.founder.asj.entity.vo;
 
 import lombok.Data;
 

service/asj/src/main/java/com/founder/demo/entity/vo/CourseWebVo.java → service/asj/src/main/java/com/founder/asj/entity/vo/CourseWebVo.java

-package com.founder.demo.entity.vo;
+package com.founder.asj.entity.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

service/asj/src/main/java/com/founder/demo/entity/vo/TeacherQuery.java → service/asj/src/main/java/com/founder/asj/entity/vo/TeacherQuery.java

-package com.founder.demo.entity.vo;
+package com.founder.asj.entity.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

service/asj/src/main/java/com/founder/demo/mapper/EduCourseMapper.java → service/asj/src/main/java/com/founder/asj/mapper/EduCourseMapper.java

-package com.founder.demo.mapper;
+package com.founder.asj.mapper;
+
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.founder.demo.entity.EduCourse;
-import com.founder.demo.entity.vo.CoursePublishVo;
-import com.founder.demo.entity.vo.CourseWebVo;
+import com.founder.asj.entity.EduCourse;
+import com.founder.asj.entity.vo.CoursePublishVo;
+import com.founder.asj.entity.vo.CourseWebVo;
 
 /**
  * <p>

service/asj/src/main/java/com/founder/demo/mapper/EduTeacherMapper.java → service/asj/src/main/java/com/founder/asj/mapper/EduTeacherMapper.java

-package com.founder.demo.mapper;
+package com.founder.asj.mapper;
+
 
-import com.founder.demo.entity.EduTeacher;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.founder.asj.entity.EduTeacher;
 
 /**
  * <p>

service/asj/src/main/java/com/founder/asj/mapper/TbStAsjMapper.java

+package com.founder.asj.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.founder.asj.entity.TbStAsj;
+
+/**
+ * <p>
+ * 案事件基本信息 Mapper 接口
+ * </p>
+ *
+ * @author Guojunfeng
+ * @since 2021-03-03
+ */
+public interface TbStAsjMapper extends BaseMapper<TbStAsj> {
+
+}

service/asj/src/main/java/com/founder/demo/mapper/xml/EduCourseMapper.xml → service/asj/src/main/java/com/founder/asj/mapper/xml/EduCourseMapper.xml

 <?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.founder.demo.mapper.EduCourseMapper">
+<mapper namespace="com.founder.asj.mapper.EduCourseMapper">
     <!--sql语句：根据课程id查询课程确认信息-->
-    <select id="getPublishCourseInfo" resultType="com.founder.demo.entity.vo.CoursePublishVo">
+    <select id="getPublishCourseInfo" resultType="com.founder.asj.entity.vo.CoursePublishVo">
         SELECT ec.id,ec.title,ec.price,ec.lesson_num AS lessonNum,ec.cover,
                et.name AS teacherName,
                es1.title AS subjectLevelOne,
@@ -15,7 +15,7 @@
     </select>
 
     <!--sql语句：根据课程id查询课程基本信息-->
-    <select id="getBaseCourseInfo" resultType="com.founder.demo.entity.vo.CourseWebVo">
+    <select id="getBaseCourseInfo" resultType="com.founder.asj.entity.vo.CourseWebVo">
         SELECT ec.id,ec.title,ec.price,ec.lesson_num AS lessonNum,ec.cover,
                ec.buy_count AS buyCount,ec.view_count AS viewCount,
                ecd.description,

service/asj/src/main/java/com/founder/demo/mapper/xml/EduTeacherMapper.xml → service/asj/src/main/java/com/founder/asj/mapper/xml/EduTeacherMapper.xml

 <?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.founder.demo.mapper.EduTeacherMapper">
+<mapper namespace="com.founder.asj.mapper.EduTeacherMapper">
 
 </mapper>

service/asj/src/main/java/com/founder/asj/mapper/xml/TbStAsjMapper.xml

+<?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.founder.asj.mapper.TbStAsjMapper">
+
+</mapper>

service/asj/src/main/java/com/founder/demo/service/EduCourseService.java → service/asj/src/main/java/com/founder/asj/service/EduCourseService.java

-package com.founder.demo.service;
+package com.founder.asj.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.founder.demo.entity.EduCourse;
-import com.founder.demo.entity.vo.CourseWebVo;
+import com.founder.asj.entity.EduCourse;
+import com.founder.asj.entity.vo.CourseWebVo;
 
 /**
  * <p>

service/asj/src/main/java/com/founder/demo/service/EduTeacherService.java → service/asj/src/main/java/com/founder/asj/service/EduTeacherService.java

-package com.founder.demo.service;
+package com.founder.asj.service;
+
 
-import com.founder.demo.entity.EduTeacher;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.founder.asj.entity.EduTeacher;
 
 /**
  * <p>

service/asj/src/main/java/com/founder/asj/service/TbStAsjService.java

+package com.founder.asj.service;
+
+import com.founder.asj.entity.TbStAsj;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 案事件基本信息 服务类
+ * </p>
+ *
+ * @author Guojunfeng
+ * @since 2021-03-03
+ */
+public interface TbStAsjService extends IService<TbStAsj> {
+
+}

service/asj/src/main/java/com/founder/demo/service/impl/EduCourseServiceImpl.java → service/asj/src/main/java/com/founder/asj/service/impl/EduCourseServiceImpl.java

-package com.founder.demo.service.impl;
+package com.founder.asj.service.impl;
+
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.founder.demo.entity.EduCourse;
-import com.founder.demo.entity.vo.CourseWebVo;
-import com.founder.demo.mapper.EduCourseMapper;
-import com.founder.demo.service.EduCourseService;
+import com.founder.asj.entity.EduCourse;
+import com.founder.asj.entity.vo.CourseWebVo;
+import com.founder.asj.mapper.EduCourseMapper;
+import com.founder.asj.service.EduCourseService;
 import org.springframework.stereotype.Service;
 
 /**

service/asj/src/main/java/com/founder/demo/service/impl/EduTeacherServiceImpl.java → service/asj/src/main/java/com/founder/asj/service/impl/EduTeacherServiceImpl.java

-package com.founder.demo.service.impl;
+package com.founder.asj.service.impl;
+
 
-import com.founder.demo.entity.EduTeacher;
-import com.founder.demo.mapper.EduTeacherMapper;
-import com.founder.demo.service.EduTeacherService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.founder.asj.entity.EduTeacher;
+import com.founder.asj.mapper.EduTeacherMapper;
+import com.founder.asj.service.EduTeacherService;
 import org.springframework.stereotype.Service;
 
 /**

service/asj/src/main/java/com/founder/asj/service/impl/TbStAsjServiceImpl.java

+package com.founder.asj.service.impl;
+
+import com.founder.asj.entity.TbStAsj;
+import com.founder.asj.mapper.TbStAsjMapper;
+import com.founder.asj.service.TbStAsjService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 案事件基本信息 服务实现类
+ * </p>
+ *
+ * @author Guojunfeng
+ * @since 2021-03-03
+ */
+@Service
+public class TbStAsjServiceImpl extends ServiceImpl<TbStAsjMapper, TbStAsj> implements TbStAsjService {
+
+}

service/asj/src/main/java/com/founder/demo/EduApplication.java

-package com.founder.demo;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.ComponentScan;
-
-@SpringBootApplication
-@ComponentScan(basePackages = {"com.founder"})
-public class EduApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(EduApplication.class, args);
-    }
-}

service/asj/src/main/java/com/founder/demo/config/EduConfig.java

-package com.founder.demo.config;
-
-import com.baomidou.mybatisplus.core.injector.ISqlInjector;
-import com.baomidou.mybatisplus.extension.injector.LogicSqlInjector;
-import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@MapperScan("com.founder.demo.mapper")
-public class EduConfig {
-
-    /**
-     * 逻辑删除插件
-     */
-    @Bean
-    public ISqlInjector sqlInjector() {
-        return new LogicSqlInjector();
-    }
-
-    /**
-     * 分页插件
-     */
-    @Bean
-    public PaginationInterceptor paginationInterceptor() {
-        return new PaginationInterceptor();
-    }
-}

service/asj/src/main/java/com/founder/demo/controller2/EduCourseController2.java

-package com.founder.demo.controller2;
-
-
-import com.founder.commonutils.R;
-import com.founder.demo.entity.EduCourse;
-import com.founder.demo.service.EduCourseService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * <p>
- * 课程 前端控制器
- * </p>
- *
- * @author testjava
- * @since 2020-03-02
- */
-@RestController
-@RequestMapping("/eduservice2/course2")
-@CrossOrigin
-public class EduCourseController2 {
-
-    @Autowired
-    private EduCourseService courseService;
-
-    //课程列表 基本实现
-    //TODO  完善条件查询带分页
-    @GetMapping
-    public R getCourseList() {
-        List<EduCourse> list = courseService.list(null);
-        return R.ok().data("list",list);
-    }
-    //课程最终发布
-    //修改课程状态
-    @PostMapping("publishCourse/{id}")
-    public R publishCourse(@PathVariable String id) {
-        EduCourse eduCourse = new EduCourse();
-        eduCourse.setId(id);
-        eduCourse.setStatus("Normal");//设置课程发布状态
-        courseService.updateById(eduCourse);
-        return R.ok();
-    }
-
-    //删除课程
-    @GetMapping("{courseId}")
-    public R getBaseCourse(@PathVariable String courseId) {
-        return R.ok().data("111",courseService.getBaseCourseInfo(courseId));
-    }
-
-}
-

service/asj/src/main/java/com/founder/demo/controller2/EduTeacherController2.java

-package com.founder.demo.controller2;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.founder.commonutils.R;
-import com.founder.demo.entity.EduTeacher;
-import com.founder.demo.entity.vo.TeacherQuery;
-import com.founder.demo.service.EduTeacherService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-//import com.baomidou.mybatisplus.extension.api.R;
-
-
-/**
- * <p>
- * 讲师 前端控制器
- * </p>
- *
- * @author testjava
- * @since 2020-02-24
- */
-@Api(description="讲师管理")
-@RestController
-@RequestMapping("/eduservice2/teacher2")
-public class EduTeacherController2 {
-
-    //访问地址： http://localhost:8001/eduservice/teacher/findAll
-    //把service注入
-    @Autowired
-    private EduTeacherService teacherService;
-
-    //1 查询讲师表所有数据
-    //rest风格
-    @ApiOperation(value = "所有讲师列表")
-    @GetMapping("findAll")
-    public R findAllTeacher() {
-        //调用service的方法实现查询所有的操作
-        List<EduTeacher> list = teacherService.list(null);
-        return R.ok().data("items",list);
-    }
-
-    //2 逻辑删除讲师的方法
-    @ApiOperation(value = "逻辑删除讲师")
-    @DeleteMapping("{id}")
-    public R removeTeacher(@ApiParam(name = "id", value = "讲师ID", required = true)
-                                     @PathVariable String id) {
-        boolean flag = teacherService.removeById(id);
-        if(flag) {
-            return R.ok();
-        } else {
-            return R.error();
-        }
-    }
-
-    //3 分页查询讲师的方法
-    //current 当前页
-    //limit 每页记录数
-    @GetMapping("pageTeacher/{current}/{limit}")
-    public R pageListTeacher(@PathVariable long current,
-                             @PathVariable long limit) {
-        //创建page对象
-        Page<EduTeacher> pageTeacher = new Page<>(current,limit);
-
-        int i = 10/0;
-
-        //调用方法实现分页
-        //调用方法时候，底层封装，把分页所有数据封装到pageTeacher对象里面
-        teacherService.page(pageTeacher,null);
-
-        long total = pageTeacher.getTotal();//总记录数
-        List<EduTeacher> records = pageTeacher.getRecords(); //数据list集合
-
-//        Map map = new HashMap();
-//        map.put("total",total);
-//        map.put("rows",records);
-//        return R.ok().data(map);
-
-        return R.ok().data("total",total).data("rows",records);
-    }
-
-    //4 条件查询带分页的方法
-    @PostMapping("pageTeacherCondition/{current}/{limit}")
-    public R pageTeacherCondition(@PathVariable long current,@PathVariable long limit,
-                                  @RequestBody(required = false) TeacherQuery teacherQuery) {
-        //创建page对象
-        Page<EduTeacher> pageTeacher = new Page<>(current,limit);
-
-        //构建条件
-        QueryWrapper<EduTeacher> wrapper = new QueryWrapper<>();
-       // 多条件组合查询
-        // mybatis学过 动态sql
-        String name = teacherQuery.getName();
-        Integer level = teacherQuery.getLevel();
-        String begin = teacherQuery.getBegin();
-        String end = teacherQuery.getEnd();
-        //判断条件值是否为空，如果不为空拼接条件
-        if(!StringUtils.isEmpty(name)) {
-            //构建条件
-            wrapper.like("name",name);
-        }
-        if(!StringUtils.isEmpty(level)) {
-            wrapper.eq("level",level);
-        }
-        if(!StringUtils.isEmpty(begin)) {
-            wrapper.ge("gmt_create",begin);
-        }
-        if(!StringUtils.isEmpty(end)) {
-            wrapper.le("gmt_create",end);
-        }
-
-        //调用方法实现条件查询分页
-        teacherService.page(pageTeacher,wrapper);
-
-        long total = pageTeacher.getTotal();//总记录数
-        List<EduTeacher> records = pageTeacher.getRecords(); //数据list集合
-        return R.ok().data("total",total).data("rows",records);
-    }
-
-    //添加讲师接口的方法
-    @PostMapping("addTeacher")
-    public R addTeacher(@RequestBody EduTeacher eduTeacher) {
-        boolean save = teacherService.save(eduTeacher);
-        if(save) {
-            return R.ok();
-        } else {
-            return R.error();
-        }
-    }
-
-    //根据讲师id进行查询
-    @GetMapping("getTeacher/{id}")
-    public R getTeacher(@PathVariable String id) {
-        EduTeacher eduTeacher = teacherService.getById(id);
-        return R.ok().data("teacher",eduTeacher);
-    }
-
-    //讲师修改功能
-    @PostMapping("updateTeacher")
-    public R updateTeacher(@RequestBody EduTeacher eduTeacher) {
-        boolean flag = teacherService.updateById(eduTeacher);
-        if(flag) {
-            return R.ok();
-        } else {
-            return R.error();
-        }
-    }
-}
-

service/asj/src/main/resources/application.properties

 # 服务端口
 server.port=8001
 # 服务名
-spring.application.name=demo
+spring.application.name=asj
 
 # 环境设置：dev、test、prod
 spring.profiles.active=dev
@@ -17,7 +17,7 @@ spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8
 
 #配置mapper xml文件的路径
-mybatis-plus.mapper-locations=classpath:com/founder/demo/mapper/xml/*.xml
+mybatis-plus.mapper-locations=classpath:com/founder/asj/mapper/xml/*.xml
 
 # 设置日志级别
 #logging.level.root=INFO

service/asj/src/main/resources/logback-spring.xml

@@ -7,7 +7,7 @@
 
     <contextName>logback</contextName>
     <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后，可以使“${}”来使用变量。 -->
-    <property name="log.path" value="D:/guli_1010/demo" />
+    <property name="log.path" value="C:/guli_1010/demo" />
 
     <!-- 彩色日志 -->
     <!-- 配置格式变量：CONSOLE_LOG_PATTERN 彩色日志格式 -->

service/asj/src/test/java/com/founder/demo/CodeGenerator.java

@@ -26,9 +26,9 @@ public class CodeGenerator {
         // 2、全局配置
         GlobalConfig gc = new GlobalConfig();
         String projectPath = System.getProperty("user.dir");
-        gc.setOutputDir("D:\\map-parent\\service\\asj" + "/src/main/java");
+        gc.setOutputDir("C:\\时空大数据\\map-parent-master\\service\\asj" + "/src/main/java");//生成路径
 
-        gc.setAuthor("testjava");
+        gc.setAuthor("Guojunfeng");//作者
         gc.setOpen(false); //生成后是否打开资源管理器
         gc.setFileOverride(false); //重新生成时文件是否覆盖
 
@@ -43,20 +43,25 @@ public class CodeGenerator {
 
         // 3、数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://47.92.225.109:3900/guli?serverTimezone=GMT%2B8");
-        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
-        dsc.setUsername("root");
-        dsc.setPassword("root");
-        dsc.setDbType(DbType.MYSQL);
+//        dsc.setUrl("jdbc:mysql://47.92.225.109:3900/guli?serverTimezone=GMT%2B8");
+//        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
+//        dsc.setUsername("root");
+//        dsc.setPassword("root");
+//        dsc.setDbType(DbType.MYSQL);
+        dsc.setUrl("jdbc:oracle:thin:@47.92.129.99:1600:orcl");
+        dsc.setDriverName("oracle.jdbc.driver.OracleDriver");
+        dsc.setUsername("XZXT");
+        dsc.setPassword("XZXT");
+        dsc.setDbType(DbType.ORACLE);
         mpg.setDataSource(dsc);
 
         // 4、包配置
         PackageConfig pc = new PackageConfig();
-        pc.setModuleName("demo"); //模块名
+        pc.setModuleName("asj"); //模块名
         //包  com.atguigu.eduservice
         pc.setParent("com.founder");
         //包  com.atguigu.eduservice.controller
-        pc.setController("controller2");
+        pc.setController("controller");
         pc.setEntity("entity");
         pc.setService("service");
         pc.setMapper("mapper");
@@ -65,7 +70,7 @@ public class CodeGenerator {
         // 5、策略配置
         StrategyConfig strategy = new StrategyConfig();
 
-        strategy.setInclude("edu_teacher");
+        strategy.setInclude("TB_ST_ASJ");//生成的表
 
         strategy.setNaming(NamingStrategy.underline_to_camel);//数据库表映射到实体的命名策略
         strategy.setTablePrefix(pc.getModuleName() + "_"); //生成实体时去掉表前缀

service/pom.xml

@@ -57,13 +57,21 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
+        <!-- 数据库驱动包 -->
 
         <!--mysql-->
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
-
+        <!--ojdbc-->
+        <dependency>
+            <groupId>org.oracle</groupId>
+            <artifactId>ojdbc-10</artifactId>
+            <version>10</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/../libs/ojdbc-10.jar</systemPath>
+        </dependency>
         <!-- velocity 模板引擎, Mybatis Plus 代码生成器需要 -->
         <dependency>
             <groupId>org.apache.velocity</groupId>