整理代码

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/TbStAsj.java

+package com.founder.asj.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.sql.Clob;
+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 Guojunfeng
+ * @since 2021-03-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("TB_ST_ASJ")
+@ApiModel(value="TbStAsj对象", description="案事件基本信息")
+public class TbStAsj implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "案事件编号")
+    @TableId(value = "ASJBH", type = IdType.ID_WORKER_STR)
+    private String asjbh;
+
+    @ApiModelProperty(value = "接警编号")
+    @TableField("JJBH")
+    private String jjbh;
+
+    @ApiModelProperty(value = "现场勘验编号")
+    @TableField("XCKYBH")
+    private String xckybh;
+
+    @ApiModelProperty(value = "案事件来源代码")
+    @TableField("ASJLYDM")
+    private String asjlydm;
+
+    @ApiModelProperty(value = "刑事警情类别代码")
+    @TableField("XSJQLBDM")
+    private String xsjqlbdm;
+
+    @ApiModelProperty(value = "侦查阶段代码")
+    @TableField("ZCJDDM")
+    private String zcjddm;
+
+    @ApiModelProperty(value = "刑事案件立案审查结果代码")
+    @TableField("XSAJLASCJGDM")
+    private String xsajlascjgdm;
+
+    @ApiModelProperty(value = "案件类别代码")
+    @TableField("AJLBDM")
+    private String ajlbdm;
+
+    @ApiModelProperty(value = "作案特征_简要情况")
+    @TableField("ZATZ_JYQK")
+    private String zatzJyqk;
+
+    @ApiModelProperty(value = "特殊手段代码")
+    @TableField("TSSDDM")
+    private String tssddm;
+
+    @ApiModelProperty(value = "作案特征自动分类_简要情况 ")
+    @TableField("ZATZZDFL_JYQK")
+    private String zatzzdflJyqk;
+
+    @ApiModelProperty(value = "作案特征补充描述_简要情况")
+    @TableField("ZATZBCMS_JYQK")
+    private String zatzbcmsJyqk;
+
+    @ApiModelProperty(value = "作案特征_案件作案特征集合表达")
+    @TableField("ZATZ_AJZATZJHBD")
+    private String zatzAjzatzjhbd;
+
+    @ApiModelProperty(value = "案件名称")
+    @TableField("AJMC")
+    private String ajmc;
+
+    @ApiModelProperty(value = "发现案事件时间")
+    @TableField("FXASJSJ")
+    private Date fxasjsj;
+
+    @ApiModelProperty(value = "发现案事件地点_行政区划代码")
+    @TableField("FXASJDD_XZQHDM")
+    private String fxasjddXzqhdm;
+
+    @ApiModelProperty(value = "发现案事件地点_地址名称")
+    @TableField("FXASJDD_DZMC")
+    private String fxasjddDzmc;
+
+    @ApiModelProperty(value = "案事件发生时间_案事件发生开始时间")
+    @TableField("ASJFSSJ_ASJFSKSSJ")
+    private Date asjfssjAsjfskssj;
+
+    @ApiModelProperty(value = "案事件发生时间_案事件发生结束时间")
+    @TableField("ASJFSSJ_ASJFSJSSJ")
+    private Date asjfssjAsjfsjssj;
+
+    @ApiModelProperty(value = "案事件发生时间_日时段代码")
+    @TableField("ASJFSSJ_RSDDM")
+    private String asjfssjRsddm;
+
+    @ApiModelProperty(value = "案事件发生时间_作案时机_作案时机类别代码")
+    @TableField("ASJFSSJ_ZASJ_ZASJLBDM")
+    private String asjfssjZasjZasjlbdm;
+
+    @ApiModelProperty(value = "案事件发生时间_作案时机_代码补充描述")
+    @TableField("ASJFSSJ_ZASJ_DMBCMS")
+    private String asjfssjZasjDmbcms;
+
+    @ApiModelProperty(value = "案事件发生地点_行政区划代码")
+    @TableField("ASJFSDD_XZQHDM")
+    private String asjfsddXzqhdm;
+
+    @ApiModelProperty(value = "案事件发生地点_地址名称")
+    @TableField("ASJFSDD_DZMC")
+    private String asjfsddDzmc;
+
+    @ApiModelProperty(value = "案事件发生地点_经度")
+    @TableField("ASJFSDD_DQJD")
+    private Double asjfsddDqjd;
+
+    @ApiModelProperty(value = "案事件发生地点_纬度")
+    @TableField("ASJFSDD_DQWD")
+    private Double asjfsddDqwd;
+
+    @ApiModelProperty(value = "案事件发生地点_地域类别代码")
+    @TableField("ASJFSDD_DYLBDM")
+    private String asjfsddDylbdm;
+
+    @ApiModelProperty(value = "案事件发生地点_涉案场所_涉案场所类别代码")
+    @TableField("ASJFSDD_SACS_SACSLBDM")
+    private String asjfsddSacsSacslbdm;
+
+    @ApiModelProperty(value = "案事件发生地点_涉案场所_代码补充描述")
+    @TableField("ASJFSDD_SACS_DMBCMS")
+    private String asjfsddSacsDmbcms;
+
+    @ApiModelProperty(value = "案事件发生地点_空间部位_空间部位类别代码")
+    @TableField("ASJFSDD_KJBW_KJBWLBDM")
+    private String asjfsddKjbwKjbwlbdm;
+
+    @ApiModelProperty(value = "案事件发生地点_空间部位_代码补充描述")
+    @TableField("ASJFSDD_KJBW_DMBCMS")
+    private String asjfsddKjbwDmbcms;
+
+    @ApiModelProperty(value = "案事件发生地点_是否建筑物内_判断标识")
+    @TableField("ASJFSDD_SFJZWN_PDBZ")
+    private String asjfsddSfjzwnPdbz;
+
+    @ApiModelProperty(value = "案事件发生地点_建筑物层数")
+    @TableField("ASJFSDD_JZWCS")
+    private Integer asjfsddJzwcs;
+
+    @ApiModelProperty(value = "案事件发生地点_案事件发生楼层")
+    @TableField("ASJFSDD_ASJFSLC")
+    private Integer asjfsddAsjfslc;
+
+    @ApiModelProperty(value = "案事件发生地点_是否租赁住宅_判断标识")
+    @TableField("ASJFSDD_SFZLZZ_PDBZ")
+    private String asjfsddSfzlzzPdbz;
+
+    @ApiModelProperty(value = "是否涉枪_判断标识")
+    @TableField("SFSQ_PDBZ")
+    private String sfsqPdbz;
+
+    @ApiModelProperty(value = "是否涉爆_判断标识")
+    @TableField("SFSB_PDBZ")
+    private String sfsbPdbz;
+
+    @ApiModelProperty(value = "是否命案_判断标识")
+    @TableField("SFMA_PDBZ")
+    private String sfmaPdbz;
+
+    @ApiModelProperty(value = "是否涉黑_判断标识")
+    @TableField("SFSH_PDBZ")
+    private String sfshPdbz;
+
+    @ApiModelProperty(value = "是否涉及盗抢骗车辆_判断标识")
+    @TableField("SFSJDQPCL_PDBZ")
+    private String sfsjdqpclPdbz;
+
+    @ApiModelProperty(value = "是否涉外_判断标识")
+    @TableField("SFSW_PDBZ")
+    private String sfswPdbz;
+
+    @ApiModelProperty(value = "是否拐卖_判断标识")
+    @TableField("SFGM_PDBZ")
+    private String sfgmPdbz;
+
+    @ApiModelProperty(value = "涉外案事件涉外情况")
+    @TableField("SWASJSWQK")
+    private String swasjswqk;
+
+    @ApiModelProperty(value = "案事件督办级别代码")
+    @TableField("ASJDBJBDM")
+    private String asjdbjbdm;
+
+    @ApiModelProperty(value = "联络方式_联络方式代码")
+    @TableField("LLFS_LLFSDM")
+    private String llfsLlfsdm;
+
+    @ApiModelProperty(value = "联络方式_代码补充描述")
+    @TableField("LLFS_DMBCMS")
+    private String llfsDmbcms;
+
+    @ApiModelProperty(value = "联络时间")
+    @TableField("LLSJ")
+    private Date llsj;
+
+    @ApiModelProperty(value = "事由_简要情况")
+    @TableField("SY_JYQK")
+    private String syJyqk;
+
+    @ApiModelProperty(value = "犯罪嫌疑人特殊行为_犯罪嫌疑人特殊行为代码")
+    @TableField("FZXYRTSXW_FZXYRTSXWDM")
+    private String fzxyrtsxwFzxyrtsxwdm;
+
+    @ApiModelProperty(value = "犯罪嫌疑人特殊行为_代码补充描述")
+    @TableField("FZXYRTSXW_DMBCMS")
+    private String fzxyrtsxwDmbcms;
+
+    @ApiModelProperty(value = "犯罪嫌疑人熟悉作案环境情况")
+    @TableField("FZXYRSXZAHJQK")
+    private String fzxyrsxzahjqk;
+
+    @ApiModelProperty(value = "其他手段特点_简要情况")
+    @TableField("QTSDTD_JYQK")
+    private String qtsdtdJyqk;
+
+    @ApiModelProperty(value = "案事件发生时间分析_案事件发生开始时间")
+    @TableField("ASJFSSJFX_ASJFSKSSJ")
+    private Date asjfssjfxAsjfskssj;
+
+    @ApiModelProperty(value = "案事件发生时间分析_案事件发生结束时间")
+    @TableField("ASJFSSJFX_ASJFSJSSJ")
+    private Date asjfssjfxAsjfsjssj;
+
+    @ApiModelProperty(value = "作案人分析_人数下限")
+    @TableField("ZARFX_RSXX")
+    private Integer zarfxRsxx;
+
+    @ApiModelProperty(value = "作案人分析_人数上限")
+    @TableField("ZARFX_RSSX")
+    private Integer zarfxRssx;
+
+    @ApiModelProperty(value = "犯罪嫌疑人特征_简要情况")
+    @TableField("FZXYRTZ_JYQK")
+    private String fzxyrtzJyqk;
+
+    @ApiModelProperty(value = "犯罪嫌疑人特殊专长_犯罪嫌疑人特殊专长代码")
+    @TableField("FZXYRTSZC_FZXYRTSZCDM")
+    private String fzxyrtszcFzxyrtszcdm;
+
+    @ApiModelProperty(value = "犯罪嫌疑人特殊专长_代码补充描述")
+    @TableField("FZXYRTSZC_DMBCMS")
+    private String fzxyrtszcDmbcms;
+
+    @ApiModelProperty(value = "作案工具_涉案物品代码")
+    @TableField("ZAGJ_SAWPDM")
+    private String zagjSawpdm;
+
+    @ApiModelProperty(value = "作案工具_简要情况")
+    @TableField("ZAGJ_JYQK")
+    private String zagjJyqk;
+
+    @ApiModelProperty(value = "作案动机描述")
+    @TableField("ZADJMS")
+    private String zadjms;
+
+    @ApiModelProperty(value = "作案目的描述")
+    @TableField("ZAMDMS")
+    private String zamdms;
+
+    @ApiModelProperty(value = "跨界范围代码")
+    @TableField("KJFWDM")
+    private String kjfwdm;
+
+    @ApiModelProperty(value = "流窜作案_简要情况")
+    @TableField("LCZA_JYQK")
+    private String lczaJyqk;
+
+    @ApiModelProperty(value = "结伙作案_简要情况")
+    @TableField("JHZA_JYQK")
+    private String jhzaJyqk;
+
+    @ApiModelProperty(value = "共同犯罪犯罪嫌疑人组合形式代码")
+    @TableField("GTFZFZXYRZHXSDM")
+    private String gtfzfzxyrzhxsdm;
+
+    @ApiModelProperty(value = "共同犯罪犯罪嫌疑人构成_共同犯罪犯罪嫌疑人构成代码")
+    @TableField("GTFZFZXYRGC_GTFZFZXYRGCDM")
+    private String gtfzfzxyrgcGtfzfzxyrgcdm;
+
+    @ApiModelProperty(value = "共同犯罪犯罪嫌疑人构成_代码补充描述")
+    @TableField("GTFZFZXYRGC_DMBCMS")
+    private String gtfzfzxyrgcDmbcms;
+
+    @ApiModelProperty(value = "选择物品分析_涉案物品_涉案物品代码")
+    @TableField("XZWPFX_SAWP_SAWPDM")
+    private String xzwpfxSawpSawpdm;
+
+    @ApiModelProperty(value = "选择物品分析_涉案物品_代码补充描述")
+    @TableField("XZWPFX_SAWP_DMBCMS")
+    private String xzwpfxSawpDmbcms;
+
+    @ApiModelProperty(value = "损失物品去向_简要情况")
+    @TableField("SSWPQX_JYQK")
+    private String sswpqxJyqk;
+
+    @ApiModelProperty(value = "犯罪嫌疑人遗留物品_简要情况")
+    @TableField("FZXYRYLWP_JYQK")
+    private String fzxyrylwpJyqk;
+
+    @ApiModelProperty(value = "现场可疑物品_简要情况")
+    @TableField("XCKYWP_JYQK")
+    private String xckywpJyqk;
+
+    @ApiModelProperty(value = "发现线索_简要情况")
+    @TableField("FXXS_JYQK")
+    private String fxxsJyqk;
+
+    @ApiModelProperty(value = "案事件死亡人员_人数")
+    @TableField("ASJSWRY_RS")
+    private Long asjswryRs;
+
+    @ApiModelProperty(value = "案事件受伤人员_人数")
+    @TableField("ASJSSRY_RS")
+    private Long asjssryRs;
+
+    @ApiModelProperty(value = "案事件损失财物_简要情况")
+    @TableField("ASJSSCW_JYQK")
+    private String asjsscwJyqk;
+
+    @ApiModelProperty(value = "损失价值（人民币元）")
+    @TableField("SSJZRMBY")
+    private Double ssjzrmby;
+
+    @ApiModelProperty(value = "扣押制式枪支_物品数量")
+    @TableField("KYZSQZ_WPSL")
+    private Integer kyzsqzWpsl;
+
+    @ApiModelProperty(value = "扣押民用枪支_物品数量")
+    @TableField("KYMYQZ_WPSL")
+    private Integer kymyqzWpsl;
+
+    @ApiModelProperty(value = "扣押自制枪支_物品数量")
+    @TableField("KYZZQZ_WPSL")
+    private Integer kyzzqzWpsl;
+
+    @ApiModelProperty(value = "扣押仿制枪支_物品数量")
+    @TableField("KYFZQZ_WPSL")
+    private Integer kyfzqzWpsl;
+
+    @ApiModelProperty(value = "扣押其他枪支_物品数量")
+    @TableField("KYQTQZ_WPSL")
+    private Integer kyqtqzWpsl;
+
+    @ApiModelProperty(value = "受理时间")
+    @TableField("SLSJ")
+    private Date slsj;
+
+    @ApiModelProperty(value = "受理单位_公安机关机构代码")
+    @TableField("SLDW_GAJGJGDM")
+    private String sldwGajgjgdm;
+
+    @ApiModelProperty(value = "受理单位_公安机关名称")
+    @TableField("SLDW_GAJGMC")
+    private String sldwGajgmc;
+
+    @ApiModelProperty(value = "立案日期")
+    @TableField("LARQ")
+    private Date larq;
+
+    @ApiModelProperty(value = "立案单位_公安机关机构代码")
+    @TableField("LADW_GAJGJGDM")
+    private String ladwGajgjgdm;
+
+    @ApiModelProperty(value = "立案单位_公安机关名称")
+    @TableField("LADW_GAJGMC")
+    private String ladwGajgmc;
+
+    @ApiModelProperty(value = "作案人员_人数")
+    @TableField("ZARY_RS")
+    private Long zaryRs;
+
+    @ApiModelProperty(value = "收缴财物价值（人民币元）")
+    @TableField("SJCWJZRMBY")
+    private Double sjcwjzrmby;
+
+    @ApiModelProperty(value = "侦查终结_侦查行为依据描述")
+    @TableField("ZCZJ_ZCXWYJMS")
+    private String zczjZcxwyjms;
+
+    @ApiModelProperty(value = "侦查终结_执行时间")
+    @TableField("ZCZJ_ZXSJ01")
+    private Date zczjZxsj01;
+
+    @ApiModelProperty(value = "侦查终结单位_公安机关机构代码")
+    @TableField("ZCZJDW_GAJGJGDM")
+    private String zczjdwGajgjgdm;
+
+    @ApiModelProperty(value = "侦查终结单位_公安机关名称")
+    @TableField("ZCZJDW_GAJGMC")
+    private String zczjdwGajgmc;
+
+    @ApiModelProperty(value = "移送审查起诉日期")
+    @TableField("YSSCQSRQ")
+    private Date ysscqsrq;
+
+    @ApiModelProperty(value = "移送审查起诉案件审查返回决定代码")
+    @TableField("YSSCQSAJSCFHJDDM")
+    private String ysscqsajscfhjddm;
+
+    @ApiModelProperty(value = "是否撤销案件_判断标识 1是 2否")
+    @TableField("SFCXAJ_PDBZ")
+    private String sfcxajPdbz;
+
+    @ApiModelProperty(value = "撤销案件原因代码")
+    @TableField("CXAJYYDM")
+    private String cxajyydm;
+
+    @ApiModelProperty(value = "撤销案件单位_公安机关机构代码")
+    @TableField("CXAJDW_GAJGJGDM")
+    private String cxajdwGajgjgdm;
+
+    @ApiModelProperty(value = "撤销案件单位_公安机关名称")
+    @TableField("CXAJDW_GAJGMC")
+    private String cxajdwGajgmc;
+
+    @ApiModelProperty(value = "撤销案件日期")
+    @TableField("CXAJRQ")
+    private Date cxajrq;
+
+    @ApiModelProperty(value = "刑事案件线索工作结果代码")
+    @TableField("XSAJXSGZJGDM")
+    private String xsajxsgzjgdm;
+
+    @ApiModelProperty(value = "协办人_姓名")
+    @TableField("XBR_XM")
+    private String xbrXm;
+
+    @ApiModelProperty(value = "协办人_公民身份号码")
+    @TableField("XBR_GMSFHM")
+    private String xbrGmsfhm;
+
+    @ApiModelProperty(value = "协办人_联系电话")
+    @TableField("XBR_LXDH")
+    private String xbrLxdh;
+
+    @ApiModelProperty(value = "刑事技术负责人_姓名")
+    @TableField("XSJSFZR_XM")
+    private String xsjsfzrXm;
+
+    @ApiModelProperty(value = "刑事技术负责人_公民身份号码")
+    @TableField("XSJSFZR_GMSFHM")
+    private String xsjsfzrGmsfhm;
+
+    @ApiModelProperty(value = "刑事技术负责人_联系电话")
+    @TableField("XSJSFZR_LXDH")
+    private String xsjsfzrLxdh;
+
+    @ApiModelProperty(value = "公安机关负责人_姓名")
+    @TableField("GAJGFZR_XM")
+    private String gajgfzrXm;
+
+    @ApiModelProperty(value = "公安机关负责人_公民身份号码")
+    @TableField("GAJGFZR_GMSFHM")
+    private String gajgfzrGmsfhm;
+
+    @ApiModelProperty(value = "公安机关负责人_联系电话")
+    @TableField("GAJGFZR_LXDH")
+    private String gajgfzrLxdh;
+
+    @ApiModelProperty(value = "信息登记人员_姓名")
+    @TableField("XXDJRY_XM")
+    private String xxdjryXm;
+
+    @ApiModelProperty(value = "信息操作人员_公民身份号码")
+    @TableField("XXCZRY_GMSFHM")
+    private String xxczryGmsfhm;
+
+    @ApiModelProperty(value = "信息登记人员_公民身份号码")
+    @TableField("XXDJRY_GMSFHM")
+    private String xxdjryGmsfhm;
+
+    @ApiModelProperty(value = "信息操作人员_姓名")
+    @TableField("XXCZRY_XM")
+    private String xxczryXm;
+
+    @ApiModelProperty(value = "信息操作单位_公安机关机构代码")
+    @TableField("XXCZDW_GAJGJGDM")
+    private String xxczdwGajgjgdm;
+
+    @ApiModelProperty(value = "信息操作单位_公安机关名称")
+    @TableField("XXCZDW_GAJGMC")
+    private String xxczdwGajgmc;
+
+    @ApiModelProperty(value = "信息登记人员_联系电话")
+    @TableField("XXDJRY_LXDH")
+    private String xxdjryLxdh;
+
+    @ApiModelProperty(value = "信息登记单位_公安机关名称")
+    @TableField("XXDJDW_GAJGMC")
+    private String xxdjdwGajgmc;
+
+    @ApiModelProperty(value = "信息来源描述")
+    @TableField("XXLYMS")
+    private String xxlyms;
+
+    @ApiModelProperty(value = "信息删除_判断标识")
+    @TableField("XXSC_PDBZ")
+    private String xxscPdbz;
+
+    @ApiModelProperty(value = "信息登记单位_公安机关机构代码")
+    @TableField("XXDJDW_GAJGJGDM")
+    private String xxdjdwGajgjgdm;
+
+    @ApiModelProperty(value = "登记时间")
+    @TableField("DJSJ")
+    private Date djsj;
+
+    @ApiModelProperty(value = "接近手段_接近手段代码")
+    @TableField("JJSD_JJSDDM")
+    private String jjsdJjsddm;
+
+    @ApiModelProperty(value = "胁迫手段_代码补充描述")
+    @TableField("XPSD_DMBCMS")
+    private String xpsdDmbcms;
+
+    @ApiModelProperty(value = "窃取手段_窃取手段代码")
+    @TableField("QQSD_QQSDDM")
+    private String qqsdQqsddm;
+
+    @ApiModelProperty(value = "解锁手段_代码补充描述")
+    @TableField("JSSD_DMBCMS")
+    private String jssdDmbcms;
+
+    @ApiModelProperty(value = "引爆手段代码")
+    @TableField("YBSDDM")
+    private String ybsddm;
+
+    @ApiModelProperty(value = "施暴手段_施暴手段代码")
+    @TableField("SBSD_SBSDDM")
+    private String sbsdSbsddm;
+
+    @ApiModelProperty(value = "箱体空间突破手段_解锁手段_解锁手段代码")
+    @TableField("XTKJTPSD_JSSD_JSSDDM")
+    private String xtkjtpsdJssdJssddm;
+
+    @ApiModelProperty(value = "诈骗手段_诈骗手段代码")
+    @TableField("ZPSD_ZPSDDM")
+    private String zpsdZpsddm;
+
+    @ApiModelProperty(value = "网络作案手段_网络作案手段代码")
+    @TableField("WLZASD_WLZASDDM")
+    private String wlzasdWlzasddm;
+
+    @ApiModelProperty(value = "箱体空间突破手段_解锁手段_代码补充描述")
+    @TableField("XTKJTPSD_JSSD_DMBCMS")
+    private String xtkjtpsdJssdDmbcms;
+
+    @ApiModelProperty(value = "离开建筑空间方式_代码补充描述")
+    @TableField("LKJZKJFS_DMBCMS")
+    private String lkjzkjfsDmbcms;
+
+    @ApiModelProperty(value = "进入建筑空间方式及手段_代码补充描述")
+    @TableField("JRJZKJFSJSD_DMBCMS")
+    private String jrjzkjfsjsdDmbcms;
+
+    @ApiModelProperty(value = "箱体空间突破手段_箱体空间突破手段代码")
+    @TableField("XTKJTPSD_XTKJTPSDDM")
+    private String xtkjtpsdXtkjtpsddm;
+
+    @ApiModelProperty(value = "网络作案手段_代码补充描述")
+    @TableField("WLZASD_DMBCMS")
+    private String wlzasdDmbcms;
+
+    @ApiModelProperty(value = "施暴手段_代码补充描述")
+    @TableField("SBSD_DMBCMS")
+    private String sbsdDmbcms;
+
+    @ApiModelProperty(value = "干扰侦查手段_干扰侦查手段代码")
+    @TableField("GRZCSD_GRZCSDDM")
+    private String grzcsdGrzcsddm;
+
+    @ApiModelProperty(value = "冒充身份_代码补充描述")
+    @TableField("MCSF_DMBCMS")
+    private String mcsfDmbcms;
+
+    @ApiModelProperty(value = "胁迫使用物品_涉案物品代码")
+    @TableField("XPSYWP_SAWPDM")
+    private String xpsywpSawpdm;
+
+    @ApiModelProperty(value = "胁迫手段_胁迫手段代码")
+    @TableField("XPSD_XPSDDM")
+    private String xpsdXpsddm;
+
+    @ApiModelProperty(value = "冒用单位名义_冒用单位名义代码")
+    @TableField("MYDWMY_MCDWMYDM")
+    private String mydwmyMcdwmydm;
+
+    @ApiModelProperty(value = "冒充身份_冒充身份代码")
+    @TableField("MCSF_MCSFDM")
+    private String mcsfMcsfdm;
+
+    @ApiModelProperty(value = "冒充关系人_代码补充描述")
+    @TableField("MCGXR_DMBCMS")
+    private String mcgxrDmbcms;
+
+    @ApiModelProperty(value = "接近手段_代码补充描述")
+    @TableField("JJSD_DMBCMS")
+    private String jjsdDmbcms;
+
+    @ApiModelProperty(value = "窃取手段_代码补充描述")
+    @TableField("QQSD_DMBCMS")
+    private String qqsdDmbcms;
+
+    @ApiModelProperty(value = "离开建筑空间方式_离开建筑空间方式代码")
+    @TableField("LKJZKJFS_LKJZKJFSDM")
+    private String lkjzkjfsLkjzkjfsdm;
+
+    @ApiModelProperty(value = "冒充冒用手段_冒充冒用手段代码")
+    @TableField("MCMYSD_MCMYSDDM")
+    private String mcmysdMcmysddm;
+
+    @ApiModelProperty(value = "作案准备手段_作案准备手段代码")
+    @TableField("ZAZBSD_ZAZBSDDM")
+    private String zazbsdZazbsddm;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField("GXSJ")
+    private Date gxsj;
+
+    @ApiModelProperty(value = "冒用单位名义_代码补充描述")
+    @TableField("MYDWMY_DMBCMS")
+    private String mydwmyDmbcms;
+
+    @ApiModelProperty(value = "现场物品翻动程度_现场物品翻动程度代码")
+    @TableField("XCWPFDCD_XCWPFDCDDM")
+    private String xcwpfdcdXcwpfdcddm;
+
+    @ApiModelProperty(value = "干扰侦查手段_代码补充描述")
+    @TableField("GRZCSD_DMBCMS")
+    private String grzcsdDmbcms;
+
+    @ApiModelProperty(value = "现场物品翻动程度_代码补充描述")
+    @TableField("XCWPFDCD_DMBCMS")
+    private String xcwpfdcdDmbcms;
+
+    @ApiModelProperty(value = "冒充冒用手段_代码补充描述")
+    @TableField("MCMYSD_DMBCMS")
+    private String mcmysdDmbcms;
+
+    @ApiModelProperty(value = "进入建筑空间方式及手段_进入建筑空间方式及手段代码")
+    @TableField("JRJZKJFSJSD_JRJZKJFSJSDDM")
+    private String jrjzkjfsjsdJrjzkjfsjsddm;
+
+    @ApiModelProperty(value = "箱体空间突破手段_代码补充描述")
+    @TableField("XTKJTPSD_DMBCMS")
+    private String xtkjtpsdDmbcms;
+
+    @ApiModelProperty(value = "胁迫使用物品_代码补充描述")
+    @TableField("XPSYWP_DMBCMS")
+    private String xpsywpDmbcms;
+
+    @ApiModelProperty(value = "诈骗手段_代码补充描述")
+    @TableField("ZPSD_DMBCMS")
+    private String zpsdDmbcms;
+
+    @ApiModelProperty(value = "冒充关系人_冒充关系人代码")
+    @TableField("MCGXR_MCGXRDM")
+    private String mcgxrMcgxrdm;
+
+    @ApiModelProperty(value = "作案准备手段_代码补充描述")
+    @TableField("ZAZBSD_DMBCMS")
+    private String zazbsdDmbcms;
+
+    @ApiModelProperty(value = "解锁手段_解锁手段代码")
+    @TableField("JSSD_JSSDDM")
+    private String jssdJssddm;
+
+    @ApiModelProperty(value = "主侦单位_公安机关机构代码")
+    @TableField("ZUZDW_GAJGJGDM")
+    private String zuzdwGajgjgdm;
+
+    @ApiModelProperty(value = "主侦单位_公安机关名称")
+    @TableField("ZUZDW_GAJGMC")
+    private String zuzdwGajgmc;
+
+    @ApiModelProperty(value = "主侦单位负责人_姓名")
+    @TableField("ZZDWFZR_XM")
+    private String zzdwfzrXm;
+
+    @ApiModelProperty(value = "主侦单位负责人_公民身份号码")
+    @TableField("ZZDWFZR_GMSFHM")
+    private String zzdwfzrGmsfhm;
+
+    @ApiModelProperty(value = "主侦单位负责人_联系电话")
+    @TableField("ZZDWFZR_LXDH")
+    private String zzdwfzrLxdh;
+
+    @ApiModelProperty(value = "主侦单位_主办人_姓名")
+    @TableField("ZUZDW_ZBR_XM")
+    private String zuzdwZbrXm;
+
+    @ApiModelProperty(value = "主侦单位_主办人_联系电话")
+    @TableField("ZUZDW_ZBR_LXDH")
+    private String zuzdwZbrLxdh;
+
+    @ApiModelProperty(value = "主侦单位_主办人_公民身份号码")
+    @TableField("ZUZDW_ZBR_GMSFHM")
+    private String zuzdwZbrGmsfhm;
+
+    @ApiModelProperty(value = "主侦单位_协办人_姓名1")
+    @TableField("ZUZDW_XBR_XM1")
+    private String zuzdwXbrXm1;
+
+    @ApiModelProperty(value = "主侦单位_协办人_公民身份号码1")
+    @TableField("ZUZDW_XBR_GMSFHM1")
+    private String zuzdwXbrGmsfhm1;
+
+    @ApiModelProperty(value = "主侦单位_协办人_联系电话1")
+    @TableField("ZUZDW_XBR_LXDH1")
+    private String zuzdwXbrLxdh1;
+
+    @ApiModelProperty(value = "主侦单位_协办人_姓名2")
+    @TableField("ZUZDW_XBR_XM2")
+    private String zuzdwXbrXm2;
+
+    @ApiModelProperty(value = "主侦单位_协办人_公民身份号码2")
+    @TableField("ZUZDW_XBR_GMSFHM2")
+    private String zuzdwXbrGmsfhm2;
+
+    @ApiModelProperty(value = "主侦单位_协办人_联系电话2")
+    @TableField("ZUZDW_XBR_LXDH2")
+    private String zuzdwXbrLxdh2;
+
+    @ApiModelProperty(value = "主办人_姓名")
+    @TableField("ZBR_XM")
+    private String zbrXm;
+
+    @ApiModelProperty(value = "主办人_联系电话")
+    @TableField("ZBR_LXDH")
+    private String zbrLxdh;
+
+    @ApiModelProperty(value = "主办人_公民身份号码")
+    @TableField("ZBR_GMSFHM")
+    private String zbrGmsfhm;
+
+    @ApiModelProperty(value = "警综案件编号")
+    @TableField("JZAJBH")
+    private String jzajbh;
+
+    @ApiModelProperty(value = "简要案情")
+    @TableField("JYAQ")
+    private Clob jyaq;
+
+    @ApiModelProperty(value = "部省业务联动服务公安部下发  0:否   1:是")
+    @TableField("GABXF")
+    private String gabxf;
+
+    @ApiModelProperty(value = "信息入部库_判断标识/1-是，0-否/CODE_IF")
+    @TableField("XXRBK_PDBZ")
+    private String xxrbkPdbz;
+
+    @ApiModelProperty(value = "信息入省库_判断标识/1-是，0-否/CODE_IF")
+    @TableField("XXRSK_PDBZ")
+    private String xxrskPdbz;
+
+    @ApiModelProperty(value = "信息入部库时间")
+    @TableField("XXRBKSJ")
+    private Date xxrbksj;
+
+    @ApiModelProperty(value = "信息入省库时间")
+    @TableField("XXRSKSJ")
+    private Date xxrsksj;
+
+    @ApiModelProperty(value = "作案动机代码")
+    @TableField("ZADJDM")
+    private String zadjdm;
+
+    @ApiModelProperty(value = "案件是否现场勘验_判断标识")
+    @TableField("AJSFXCKY_PDBZ")
+    private String ajsfxckyPdbz;
+
+    @ApiModelProperty(value = "案件_现场_确认人_公民身份号码")
+    @TableField("ASJ_XC_QRR_GMSFHM")
+    private String asjXcQrrGmsfhm;
+
+    @ApiModelProperty(value = "案件_现场_确认人_姓名")
+    @TableField("ASJ_XC_QRR_XM")
+    private String asjXcQrrXm;
+
+    @ApiModelProperty(value = "案件_现场_确认时间")
+    @TableField("ASJ_XC_QRSJ")
+    private Date asjXcQrsj;
+
+    @ApiModelProperty(value = "东莞专用-案件类型")
+    @TableField("AJLX_DG")
+    private String ajlxDg;
+
+    @ApiModelProperty(value = "东莞专用-案别")
+    @TableField("AB_DG")
+    private String abDg;
+
+    @ApiModelProperty(value = "东莞专用 是否图侦- 0未图侦 1-已图侦")
+    @TableField("TZ_PDBZ_DG")
+    private String tzPdbzDg;
+
+    @ApiModelProperty(value = "案件状态-警综")
+    @TableField("AJSTATE")
+    private String ajstate;
+
+    @TableField("SFLSJA_PDBZ")
+    private String sflsjaPdbz;
+
+    @TableField("SFWWFZ_PDBZ")
+    private String sfwwfzPdbz;
+
+    @ApiModelProperty(value = "专项标志，0表示专项，1表示非专项")
+    @TableField("PART")
+    private String part;
+
+    @ApiModelProperty(value = "案件业务状态代码，1表示初始，4表示已撤销，6表示立案审批通过，10表示侦查终结审批通过")
+    @TableField("AJYWZTDM")
+    private String ajywztdm;
+
+    @ApiModelProperty(value = "案事件发生地点_管辖派出所")
+    @TableField("ASJFSDD_GXPCS")
+    private String asjfsddGxpcs;
+
+
+}

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>