Browse Source

ajhgz视图查询

yq 3 years ago
parent
commit
03247b9bd6

+ 28 - 28
mhfire-controller/pom.xml

@@ -83,36 +83,36 @@
             <version>5.2.7.RELEASE</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter</artifactId>-->
+<!--        </dependency>-->
 
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>-->
+<!--        </dependency>-->
 
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>HdrHistogram</artifactId>
-                    <groupId>org.hdrhistogram</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>HdrHistogram</artifactId>
-                    <groupId>org.hdrhistogram</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>-->
+<!--            <exclusions>-->
+<!--                <exclusion>-->
+<!--                    <artifactId>HdrHistogram</artifactId>-->
+<!--                    <groupId>org.hdrhistogram</groupId>-->
+<!--                </exclusion>-->
+<!--            </exclusions>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>-->
+<!--            <exclusions>-->
+<!--                <exclusion>-->
+<!--                    <artifactId>HdrHistogram</artifactId>-->
+<!--                    <groupId>org.hdrhistogram</groupId>-->
+<!--                </exclusion>-->
+<!--            </exclusions>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>org.springframework.cloud</groupId>

+ 31 - 0
mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/AjhgzControllerWeb.java

@@ -0,0 +1,31 @@
+package com.bizmatics.mhfire.controller.web;
+
+import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.common.core.bean.PageRequest;
+import com.bizmatics.mhfire.service.AjhgzService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author yq
+ * @date 2021/5/14 15:29
+ */
+@RestController
+@RequestMapping("ajhgz")
+public class AjhgzControllerWeb {
+
+
+    @Autowired
+    private AjhgzService ajhgzService;
+
+
+    @GetMapping("page")
+    public ApiResult<List<Map<String, Object>>> page(){
+        return ApiResult.success(ajhgzService.page(new PageRequest()));
+    }
+}

+ 0 - 24
mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/TestControllerWeb.java

@@ -1,24 +0,0 @@
-package com.bizmatics.mhfire.controller.web;
-
-import com.bizmatics.common.core.bean.ApiResult;
-import com.bizmatics.common.core.bean.CommonPage;
-import com.bizmatics.mhfire.model.Test;
-import com.bizmatics.mhfire.service.TestService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-@RestController
-@RequestMapping("test")
-public class TestControllerWeb {
-
-    @Autowired
-    private TestService testService;
-
-
-    @RequestMapping("test1")
-    private ApiResult<CommonPage<Test>> page(){
-        return ApiResult.success(testService.get("11"));
-    }
-}

+ 11 - 11
mhfire-controller/src/main/resources/application-dev.properties

@@ -15,10 +15,10 @@ mybatis.refresh.delay-seconds=10
 mybatis.refresh.sleep-seconds=20
 # datasource
 spring.autoconfigure.exclude=com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
-spring.datasource.dynamic.primary=newtest
-spring.datasource.dynamic.datasource.newtest.url=jdbc:mysql://120.55.70.156:3306/newtest?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC
-spring.datasource.dynamic.datasource.newtest.username=root
-spring.datasource.dynamic.datasource.newtest.password=123456
+spring.datasource.dynamic.primary=mhfire
+spring.datasource.dynamic.datasource.mhfire.url=jdbc:mysql://120.55.70.156:3306/mhfire?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&characterEncoding=utf8
+spring.datasource.dynamic.datasource.mhfire.username=root
+spring.datasource.dynamic.datasource.mhfire.password=123456
 spring.datasource.dynamic.druid.initial-size=5                                                                       
 spring.datasource.dynamic.druid.min-idle=5
 spring.datasource.dynamic.druid.max-active=30
@@ -65,10 +65,10 @@ server.compression.mime-types=application/javascript,text/css,application/json,a
 
 # eureka
 #eureka.client.service-url.defaultZone=http://172.31.101.251:8099/eureka/,http://172.31.101.252:8099/eureka/
-eureka.client.service-url.defaultZone=http://localhost:8088/eureka/
-#eureka.client.healthcheck.enabled=true
-eureka.instance.prefer-ip-address=true
-eureka.instance.instance-id=${spring.application.name}:${spring.cloud.client.ip-address}:${server.port}
-eureka.instance.lease-renewal-interval-in-seconds=30
-eureka.instance.lease-expiration-duration-in-seconds=90
-eureka.client.registryFetchIntervalSeconds=30
+#eureka.client.service-url.defaultZone=http://localhost:8088/eureka/
+##eureka.client.healthcheck.enabled=true
+#eureka.instance.prefer-ip-address=true
+#eureka.instance.instance-id=${spring.application.name}:${spring.cloud.client.ip-address}:${server.port}
+#eureka.instance.lease-renewal-interval-in-seconds=30
+#eureka.instance.lease-expiration-duration-in-seconds=90
+#eureka.client.registryFetchIntervalSeconds=30

+ 29 - 0
mhfire-mapping/src/main/java/com/bizmatics/mhfire/persistence/mapper/AjhgzMapper.java

@@ -0,0 +1,29 @@
+package com.bizmatics.mhfire.persistence.mapper;
+
+import com.bizmatics.common.mvc.base.CrudMapper;
+import com.bizmatics.mhfire.model.Ajhgz;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author yq
+ * @date 2021/5/14 13:37
+ */
+@Repository
+public interface AjhgzMapper extends CrudMapper<Ajhgz> {
+
+
+    /**
+     * page
+     * @return
+     */
+    List<Ajhgz> page();
+
+
+    List<Map<String, Object>> selectView(@Param("current")Integer current,
+                                          @Param("size")Integer size,
+                                          @Param("xmName") String xmName);
+}

+ 0 - 12
mhfire-mapping/src/main/java/com/bizmatics/mhfire/persistence/mapper/TestMapper.java

@@ -1,12 +0,0 @@
-package com.bizmatics.mhfire.persistence.mapper;
-
-
-import com.bizmatics.common.mvc.base.CrudMapper;
-
-import com.bizmatics.mhfire.model.Test;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface TestMapper extends CrudMapper<Test> {
-
-}

+ 12 - 0
mhfire-mapping/src/main/resources/mapper/mysql/AjhgzMapper.xml

@@ -0,0 +1,12 @@
+<?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.bizmatics.mhfire.persistence.mapper.AjhgzMapper">
+
+
+    <select id="page" resultType="com.bizmatics.mhfire.model.Ajhgz">
+        select `法律文书ID` FROM ajhgz
+    </select>
+    <select id="selectView" resultType="java.util.Map">
+        SELECT * FROM `mhfire`.`ajhgzView` limit #{current},#{size}
+    </select>
+</mapper>

+ 0 - 5
mhfire-mapping/src/main/resources/mapper/mysql/TestMapper.xml

@@ -1,5 +0,0 @@
-<?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.bizmatics.mhfire.persistence.mapper.TestMapper">
-
-</mapper>

+ 99 - 0
mhfire-model/src/main/java/com/bizmatics/mhfire/model/Ajhgz.java

@@ -0,0 +1,99 @@
+package com.bizmatics.mhfire.model;
+
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@TableName(value = "ajhgz",autoResultMap = true)
+@Data
+public class Ajhgz {
+  @TableField(value = "\"法律文书ID\"",fill = FieldFill.INSERT_UPDATE)
+  private String lawWorkId;
+  @TableField(value = "\"项目编号\"")
+  private String projectId;
+  @TableField(value = "\"源法律文书Id\"")
+  private String sourceLavWorkId;
+  @TableField(value = "\"源法律文书类别\"")
+  private String sourceLavWorkType;
+  @TableField(value = "\"文号2\"")
+  private String work1;
+  @TableField(value = "\"文号2\"")
+  private String work2;
+  @TableField(value = "\"文号3\"")
+  private String work3;
+  @TableField(value = "\"文号4\"")
+  private String work4;
+  @TableField(value = "\"文号\"")
+  private String stationery;
+  @TableField(value = "\"文号抬头\"")
+  private String stationeryHead;
+  @TableField(value = "\"场所名称\"")
+  private String placeName;
+  @TableField(value = "\"场所地址\"")
+  private String placeAddress;
+  @TableField(value = "\"消防安全责任人\"")
+  private String fireSafePrincipal;
+  @TableField(value = "\"使用性质\"")
+  private String function;
+  @TableField(value = "\"场所所在建筑名称\"")
+  private String placeAreaName;
+  @TableField(value = "\"场所所在层数\"")
+  private String placeNumber;
+  @TableField(value = "\"场所建筑面积\"")
+  private String placeSize;
+  @TableField(value = "\"使用情况\"")
+  private String useCondition;
+  @TableField(value = "\"现有消防设施\"")
+  private String xyxfss;
+  @TableField(value = "\"填发日期\"")
+  private String tfDate;
+  @TableField(value = "\"审批人账号\"")
+  private String sprRoot;
+  @TableField(value = "\"审批人账号\"")
+  private String sprName;
+  @TableField(value = "\"审批时间\"")
+  private String spDate;
+  @TableField(value = "\"是否取件送达\"")
+  private String shifuqujian;
+  @TableField(value = "\"法律文书版本号\"")
+  private String flwsbbh;
+  @TableField(value = "\"主管单位Id\"")
+  private String zgdwid;
+  @TableField(value = "\"创建人账号\"")
+  private String cjrAccount;
+  @TableField(value = "\"创建人姓名\"")
+  private String cjrName;
+  @TableField(value = "\"创建时间\"")
+  private String cjDate;
+  @TableField(value = "\"创建人Ip\"")
+  private String cjrIp;
+  @TableField(value = "\"修改人账号\"")
+  private String updateAccount;
+  @TableField(value = "\"修改人姓名\"")
+  private String updateName;
+  @TableField(value = "\"修改时间\"")
+  private String updateTime;
+  @TableField(value = "\"修改时间\"")
+  private String updateIp;
+  @TableField(value = "\"修改时间\"")
+  private String deleteFlag;
+
+  private String rowVersion;
+
+  private String spbId;
+
+  private String isRead;
+
+  private String readTime;
+
+  private String bdpAudit;
+
+  private String unionKey;
+
+  private long userDesignId;
+
+
+
+}

+ 163 - 0
mhfire-model/src/main/java/com/bizmatics/mhfire/model/HzdcHztjb.java

@@ -0,0 +1,163 @@
+package com.bizmatics.mhfire.model;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@TableName(value = "hzdc-hztjb",autoResultMap = true)
+@Data
+public class HzdcHztjb {
+  @TableField(value = "\"火灾序号\"",fill = FieldFill.INSERT_UPDATE)
+  private String fireNumber;
+  @TableField(value = "\"填表时间\"",fill = FieldFill.INSERT_UPDATE)
+  private String tbDate;
+  @TableField(value = "\"用户名\"",fill = FieldFill.INSERT_UPDATE)
+  private String userName;
+  @TableField(value = "\"是否简项报告\"",fill = FieldFill.INSERT_UPDATE)
+  private String isJyBg;
+  @TableField(value = "\"对应的火灾案例路径\"",fill = FieldFill.INSERT_UPDATE)
+  private String fireAddress;
+  @TableField(value = "\"对应的灭火救援表\"",fill = FieldFill.INSERT_UPDATE)
+  private String fireJyTable;
+  @TableField(value = "\"出动情况\"",fill = FieldFill.INSERT_UPDATE)
+  private String cdqk;
+  @TableField(value = "\"起火时间\"",fill = FieldFill.INSERT_UPDATE)
+  private String fireDate;
+  @TableField(value = "\"起火时间日期型\"",fill = FieldFill.INSERT_UPDATE)
+  private String fireDateType;
+  @TableField(value = "\"起火地点\"",fill = FieldFill.INSERT_UPDATE)
+  private String fireArea;
+  @TableField(value = "\"单位代码\"",fill = FieldFill.INSERT_UPDATE)
+  private String dwdm;
+  @TableField(value = "\"户主名\"",fill = FieldFill.INSERT_UPDATE)
+  private String hzName;
+  @TableField(value = "\"火灾从失火建筑蔓延到临近建筑\"",fill = FieldFill.INSERT_UPDATE)
+  private String firecshjzmydljjz;
+  @TableField(value = "\"发生轰燃\"",fill = FieldFill.INSERT_UPDATE)
+  private String fshr;
+  @TableField(value = "\"失火建筑门窗在火灾过程中开启\"",fill = FieldFill.INSERT_UPDATE)
+  private String shjzmckq;
+  @TableField(value = "\"起火经过\"",fill = FieldFill.INSERT_UPDATE)
+  private String qhjg;
+  @TableField(value = "\"直接财产损失\"",fill = FieldFill.INSERT_UPDATE)
+  private String zjcjss;
+  @TableField(value = "\"过火面积\"",fill = FieldFill.INSERT_UPDATE)
+  private String ghmj;
+  @TableField(value = "\"受灾户数\"",fill = FieldFill.INSERT_UPDATE)
+  private String szhs;
+  @TableField(value = "\"受灾人数\"",fill = FieldFill.INSERT_UPDATE)
+  private String szrs;
+  @TableField(value = "\"死亡人数\"",fill = FieldFill.INSERT_UPDATE)
+  private String swrs;
+  @TableField(value = "\"受伤人数\"",fill = FieldFill.INSERT_UPDATE)
+  private String shrs;
+  @TableField(value = "\"是否重大火灾\"",fill = FieldFill.INSERT_UPDATE)
+  private String iszdhz;
+  @TableField(value = "\"是否立案\"",fill = FieldFill.INSERT_UPDATE)
+  private String isla;
+  @TableField(value = "\"追究人数\"",fill = FieldFill.INSERT_UPDATE)
+  private String zjrs;
+  @TableField(value = "\"建议处理人数\"",fill = FieldFill.INSERT_UPDATE)
+  private String jyclrs;
+  @TableField(value = "\"审核状态\"",fill = FieldFill.INSERT_UPDATE)
+  private String shStatus;
+  @TableField(value = "\"最后审核者\"",fill = FieldFill.INSERT_UPDATE)
+  private String endSh;
+  @TableField(value = "\"修改原因\"",fill = FieldFill.INSERT_UPDATE)
+  private String updateYy;
+  @TableField(value = "\"正在调查\"",fill = FieldFill.INSERT_UPDATE)
+  private String zzdc;
+  @TableField(value = "\"退回者\"",fill = FieldFill.INSERT_UPDATE)
+  private String returnZ;
+  @TableField(value = "\"火灾等级\"",fill = FieldFill.INSERT_UPDATE)
+  private String fireLevel;
+  @TableField(value = "\"轻伤人数\"",fill = FieldFill.INSERT_UPDATE)
+  private String qsrs;
+  @TableField(value = "\"重伤人数\"",fill = FieldFill.INSERT_UPDATE)
+  private String zsrs;
+  @TableField(value = "\"现场处置费用\"",fill = FieldFill.INSERT_UPDATE)
+  private String xcczfy;
+  @TableField(value = "\"人身伤亡\"",fill = FieldFill.INSERT_UPDATE)
+  private String rssw;
+  @TableField(value = "\"直接经济损失\"",fill = FieldFill.INSERT_UPDATE)
+  private String zjjjss;
+  @TableField(value = "\"所属消防队\"",fill = FieldFill.INSERT_UPDATE)
+  private String ssxfd;
+  @TableField(value = "\"所属大队\"",fill = FieldFill.INSERT_UPDATE)
+  private String ssdd;
+  @TableField(value = "\"所属支队\"",fill = FieldFill.INSERT_UPDATE)
+  private String sszd;
+  @TableField(value = "\"所属总队\"",fill = FieldFill.INSERT_UPDATE)
+  private String sszongd;
+  @TableField(value = "\"所属区县\"",fill = FieldFill.INSERT_UPDATE)
+  private String ssqx;
+  @TableField(value = "\"行政区域\"",fill = FieldFill.INSERT_UPDATE)
+  private String xzqy;
+  @TableField(value = "\"火灾原因分类_一级_\"",fill = FieldFill.INSERT_UPDATE)
+  private String hzyyflone;
+  @TableField(value = "\"火灾原因分类_二级_\"",fill = FieldFill.INSERT_UPDATE)
+  private String hzyyfltwo;
+  @TableField(value = "\"火灾原因分类_三级_\"",fill = FieldFill.INSERT_UPDATE)
+  private String hzyyflthree;
+  @TableField(value = "\"起火物_一级_\"",fill = FieldFill.INSERT_UPDATE)
+  private String qhwone;
+  @TableField(value = "\"起火物_二级_\"",fill = FieldFill.INSERT_UPDATE)
+  private String qhwtwo;
+  @TableField(value = "\"起火场所_一级_\"",fill = FieldFill.INSERT_UPDATE)
+  private String qhcsone;
+  @TableField(value = "\"起火场所_二级_\"",fill = FieldFill.INSERT_UPDATE)
+  private String qhcstwo;
+  @TableField(value = "\"保险情况\"",fill = FieldFill.INSERT_UPDATE)
+  private String bxqk;
+  @TableField(value = "\"与城市远程报警系统联网情况\"",fill = FieldFill.INSERT_UPDATE)
+  private String csycjbxtlwqk;
+  @TableField(value = "\"应急疏散照明情况\"",fill = FieldFill.INSERT_UPDATE)
+  private String yjshzm;
+  @TableField(value = "\"应急出口情况\"",fill = FieldFill.INSERT_UPDATE)
+  private String yjck;
+  @TableField(value = "\"疏散通道情况\"",fill = FieldFill.INSERT_UPDATE)
+  private String sstd;
+  @TableField(value = "\"室内消火栓系统启动情况\"",fill = FieldFill.INSERT_UPDATE)
+  private String snxhxxtqdqk;
+  @TableField(value = "\"室内消火栓系统安装情况\"",fill = FieldFill.INSERT_UPDATE)
+  private String snxhsxtazqk;
+  @TableField(value = "\"防排烟系统启动情况\"",fill = FieldFill.INSERT_UPDATE)
+  private String fpyxtqdqk;
+  @TableField(value = "\"防排烟系统安装情况\"",fill = FieldFill.INSERT_UPDATE)
+  private String fpyxtazqk;
+  @TableField(value = "\"自动灭火系统启动情况\"",fill = FieldFill.INSERT_UPDATE)
+  private String zdmhxtqdqk;
+  @TableField(value = "\"自动灭火系统安装情况\"",fill = FieldFill.INSERT_UPDATE)
+  private String zdmhxtazqk;
+  @TableField(value = "\"_自动报警系统启动情况\"",fill = FieldFill.INSERT_UPDATE)
+  private String jbxtqdqk;
+  @TableField(value = "\"自动报警系统安装情况\"",fill = FieldFill.INSERT_UPDATE)
+  private String zdbjxtazqk;
+  @TableField(value = "\"建筑结构名称\"",fill = FieldFill.INSERT_UPDATE)
+  private String jzwname;
+  @TableField(value = "\"建筑耐火等级名称\"",fill = FieldFill.INSERT_UPDATE)
+  private String jznhdjname;
+  @TableField(value = "\"建筑类别名称\"",fill = FieldFill.INSERT_UPDATE)
+  private String jztypename;
+  @TableField(value = "\"建筑使用性质名称\"",fill = FieldFill.INSERT_UPDATE)
+  private String jzshqk;
+  @TableField(value = "\"是否世界遗产情况\"",fill = FieldFill.INSERT_UPDATE)
+  private String sjycFlag;
+  @TableField(value = "\"经济类型名称\"",fill = FieldFill.INSERT_UPDATE)
+  private String jjtypeName;
+  @TableField(value = "\"行业类别名称\"",fill = FieldFill.INSERT_UPDATE)
+  private String hytypename;
+  @TableField(value = "\"分级管理类型\"",fill = FieldFill.INSERT_UPDATE)
+  private String fjgllx;
+  @TableField(value = "\"区域类型\"",fill = FieldFill.INSERT_UPDATE)
+  private String areatype;
+  @TableField(value = "\"填表人消防队名称\"",fill = FieldFill.INSERT_UPDATE)
+  private String tbrxfname;
+  @TableField(value = "\"出动情况名称\"",fill = FieldFill.INSERT_UPDATE)
+  private String cdqkname;
+  private String bdpAudit;
+  private String unionKey;
+  private long userDesignId;
+
+}

+ 107 - 0
mhfire-model/src/main/java/com/bizmatics/mhfire/model/HzdcJyhzsgrds.java

@@ -0,0 +1,107 @@
+package com.bizmatics.mhfire.model;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@TableName(value = "hzdc-jyhzsgrds",autoResultMap = true)
+@Data
+public class HzdcJyhzsgrds {
+
+
+  private String id;
+  @TableField(value = "\"项目编号\"",fill = FieldFill.INSERT_UPDATE)
+  private String xmbh;
+  @TableField(value = "\"文号1\"",fill = FieldFill.INSERT_UPDATE)
+  private String work1;
+  @TableField(value = "\"文号2\"",fill = FieldFill.INSERT_UPDATE)
+  private String work2;
+  @TableField(value = "\"文号3\"",fill = FieldFill.INSERT_UPDATE)
+  private String work3;
+  @TableField(value = "\"文号4\"",fill = FieldFill.INSERT_UPDATE)
+  private String work4;
+  @TableField(value = "\"文号\"",fill = FieldFill.INSERT_UPDATE)
+  private String work;
+  @TableField(value = "\"文书抬头\"",fill = FieldFill.INSERT_UPDATE)
+  private String worktt;
+  @TableField(value = "\"起火单位\"",fill = FieldFill.INSERT_UPDATE)
+  private String qhdw;
+  @TableField(value = "\"法定代表人\"",fill = FieldFill.INSERT_UPDATE)
+  private String fddbr;
+  @TableField(value = "\"起火地址\"",fill = FieldFill.INSERT_UPDATE)
+  private String fireAddress;
+  @TableField(value = "\"联系电话\"",fill = FieldFill.INSERT_UPDATE)
+  private String phone;
+  @TableField(value = "\"报警时间\"",fill = FieldFill.INSERT_UPDATE)
+  private String bjDate;
+  @TableField(value = "\"直接财产损失统计_元_\"",fill = FieldFill.INSERT_UPDATE)
+  private String zzccsstj;
+  @TableField(value = "\"身份证号\"",fill = FieldFill.INSERT_UPDATE)
+  private String idCard;
+  @TableField(value = "\"现场调查走访情况\"",fill = FieldFill.INSERT_UPDATE)
+  private String xcdczfqk;
+  @TableField(value = "\"火灾事故事实\"",fill = FieldFill.INSERT_UPDATE)
+  private String hzsgss;
+  @TableField(value = "\"当事人意见\"",fill = FieldFill.INSERT_UPDATE)
+  private String dsryj;
+  @TableField(value = "\"当事人签名\"",fill = FieldFill.INSERT_UPDATE)
+  private String asrqm;
+  @TableField(value = "\"当事人签名日期\"",fill = FieldFill.INSERT_UPDATE)
+  private String dsrqmdate;
+  @TableField(value = "\"调查人员签名\"",fill = FieldFill.INSERT_UPDATE)
+  private String dccqm;
+  @TableField(value = "\"调查人员日期\"",fill = FieldFill.INSERT_UPDATE)
+  private String dcrydate;
+  @TableField(value = "\"认定日期\"",fill = FieldFill.INSERT_UPDATE)
+  private String rddate;
+  @TableField(value = "\"备注\"",fill = FieldFill.INSERT_UPDATE)
+  private String bz;
+  @TableField(value = "\"状态\"",fill = FieldFill.INSERT_UPDATE)
+  private String status;
+  @TableField(value = "\"受理单位\"",fill = FieldFill.INSERT_UPDATE)
+  private String sldw;
+  @TableField(value = "\"审批人账号\"",fill = FieldFill.INSERT_UPDATE)
+  private String sprzh;
+  @TableField(value = "\"审批人姓名\"",fill = FieldFill.INSERT_UPDATE)
+  private String sprxm;
+  @TableField(value = "\"审批时间\"",fill = FieldFill.INSERT_UPDATE)
+  private String spdate;
+  @TableField(value = "\"主管单位\"",fill = FieldFill.INSERT_UPDATE)
+  private String zgdw;
+  @TableField(value = "\"版本号\"",fill = FieldFill.INSERT_UPDATE)
+  private String version;
+  @TableField(value = "\"创建人账号\"",fill = FieldFill.INSERT_UPDATE)
+  private String createAccount;
+  @TableField(value = "\"创建人姓名\"",fill = FieldFill.INSERT_UPDATE)
+  private String createUserName;
+  @TableField(value = "\"创建时间\"",fill = FieldFill.INSERT_UPDATE)
+  private String createTime;
+  @TableField(value = "\"创建Ip\"",fill = FieldFill.INSERT_UPDATE)
+  private String createIp;
+  @TableField(value = "\"修改人账号\"",fill = FieldFill.INSERT_UPDATE)
+  private String updateAccount;
+  @TableField(value = "\"修改人姓名\"",fill = FieldFill.INSERT_UPDATE)
+  private String updateName;
+  @TableField(value = "\"修改时间\"",fill = FieldFill.INSERT_UPDATE)
+  private String updateTime;
+  @TableField(value = "\"修改Ip\"",fill = FieldFill.INSERT_UPDATE)
+  private String updateIP;
+  @TableField(value = "\"删除标记\"",fill = FieldFill.INSERT_UPDATE)
+  private String deleteFlag;
+  @TableField(value = "\"备用字段1\"",fill = FieldFill.INSERT_UPDATE)
+  private String replaceOne;
+  @TableField(value = "\"备用字段2\"",fill = FieldFill.INSERT_UPDATE)
+  private String replaceTwo;
+  @TableField(value = "\"备用字段3\"",fill = FieldFill.INSERT_UPDATE)
+  private String replaceThree;
+  @TableField(value = "\"备用字段4\"",fill = FieldFill.INSERT_UPDATE)
+  private String replaceFour;
+  @TableField(value = "\"备用字段5\"",fill = FieldFill.INSERT_UPDATE)
+  private String replaceFive;
+  private String rowVersion;
+  private String bdpAudit;
+  private String unionKey;
+  private long userDesignId;
+
+}

+ 94 - 0
mhfire-model/src/main/java/com/bizmatics/mhfire/model/HzdcYbhzsgrds.java

@@ -0,0 +1,94 @@
+package com.sample;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@TableName(value = "hzdc-ybhzsgrds",autoResultMap = true)
+@Data
+public class HzdcYbhzsgrds {
+
+  private String id;
+  @TableField(value = "\"项目编号\"",fill = FieldFill.INSERT_UPDATE)
+  private String xmbh;
+  @TableField(value = "\"文号1\"",fill = FieldFill.INSERT_UPDATE)
+  private String work1;
+  @TableField(value = "\"文号2\"",fill = FieldFill.INSERT_UPDATE)
+  private String work2;
+  @TableField(value = "\"文号3\"",fill = FieldFill.INSERT_UPDATE)
+  private String work3;
+  @TableField(value = "\"文号4\"",fill = FieldFill.INSERT_UPDATE)
+  private String work4;
+  @TableField(value = "\"文号\"",fill = FieldFill.INSERT_UPDATE)
+  private String work;
+  @TableField(value = "\"标题名称\"",fill = FieldFill.INSERT_UPDATE)
+  private String title;
+  @TableField(value = "\"文号抬头\"",fill = FieldFill.INSERT_UPDATE)
+  private String workHead;
+  @TableField(value = "\"火灾事故基本情况\"",fill = FieldFill.INSERT_UPDATE)
+  private String hzsgjbqk;
+  @TableField(value = "\"起火原因认定事实及证据\"",fill = FieldFill.INSERT_UPDATE)
+  private String qhyyrdsszj;
+  @TableField(value = "\"灾害成因认定事实及证据\"",fill = FieldFill.INSERT_UPDATE)
+  private String zhcyrdsszj;
+  @TableField(value = "\"火灾原因证据\"",fill = FieldFill.INSERT_UPDATE)
+  private String hzyyzj;
+  @TableField(value = "\"灾害成因证据\"",fill = FieldFill.INSERT_UPDATE)
+  private String zhcyzj;
+  @TableField(value = "\"复核单位\"",fill = FieldFill.INSERT_UPDATE)
+  private String fhdw;
+  @TableField(value = "\"审批人账号\"",fill = FieldFill.INSERT_UPDATE)
+  private String spzh;
+  @TableField(value = "\"审批人姓名\"",fill = FieldFill.INSERT_UPDATE)
+  private String spname;
+  @TableField(value = "\"审批时间\"",fill = FieldFill.INSERT_UPDATE)
+  private String spdate;
+  @TableField(value = "\"审批意见\"",fill = FieldFill.INSERT_UPDATE)
+  private String spyj;
+  @TableField(value = "\"是否已送达\"",fill = FieldFill.INSERT_UPDATE)
+  private String sdFlag;
+  @TableField(value = "\"送达方式\"",fill = FieldFill.INSERT_UPDATE)
+  private String adfs;
+
+  private String isCx;
+  @TableField(value = "\"法律文书版本号\"",fill = FieldFill.INSERT_UPDATE)
+  private String flvsVersion;
+  @TableField(value = "\"主管单位\"",fill = FieldFill.INSERT_UPDATE)
+  private String zgdw;
+  @TableField(value = "\"创建人账号\"",fill = FieldFill.INSERT_UPDATE)
+  private String createAccount;
+  @TableField(value = "\"创建人姓名\"",fill = FieldFill.INSERT_UPDATE)
+  private String createName;
+  @TableField(value = "\"创建时间\"",fill = FieldFill.INSERT_UPDATE)
+  private String createTime;
+  @TableField(value = "\"创建Ip\"",fill = FieldFill.INSERT_UPDATE)
+  private String createIp;
+  @TableField(value = "\"修改人账号\"",fill = FieldFill.INSERT_UPDATE)
+  private String updateUserAccount;
+  @TableField(value = "\"修改人姓名\"",fill = FieldFill.INSERT_UPDATE)
+  private String updateUserName;
+  @TableField(value = "\"修改时间\"",fill = FieldFill.INSERT_UPDATE)
+  private String updateTime;
+  @TableField(value = "\"修改Ip\"",fill = FieldFill.INSERT_UPDATE)
+  private String updateIp;
+  @TableField(value = "\"删除标记\"",fill = FieldFill.INSERT_UPDATE)
+  private String deleteFlag;
+  @TableField(value = "\"备用字段1\"",fill = FieldFill.INSERT_UPDATE)
+  private String replaceOne;
+  @TableField(value = "\"备用字段2\"",fill = FieldFill.INSERT_UPDATE)
+  private String replaceTwo;
+  @TableField(value = "\"备用字段3\"",fill = FieldFill.INSERT_UPDATE)
+  private String replaceThree;
+  @TableField(value = "\"备用字段4\"",fill = FieldFill.INSERT_UPDATE)
+  private String replaceFour;
+  @TableField(value = "\"备用字段5\"",fill = FieldFill.INSERT_UPDATE)
+  private String replaceFive;
+  private String rowVersion;
+  @TableField(value = "\"审批表Id\"",fill = FieldFill.INSERT_UPDATE)
+  private String spId;
+  private String bdpAudit;
+  private String unionKey;
+  private long userDesignId;
+
+}

+ 0 - 14
mhfire-model/src/main/java/com/bizmatics/mhfire/model/Test.java

@@ -1,14 +0,0 @@
-package com.bizmatics.mhfire.model;
-
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-
-@TableName("new_test")
-@Data
-public class Test {
-    private Long id;
-
-    private String name;
-}

+ 22 - 0
mhfire-service/src/main/java/com/bizmatics/mhfire/service/AjhgzService.java

@@ -0,0 +1,22 @@
+package com.bizmatics.mhfire.service;
+
+import com.bizmatics.common.core.bean.PageRequest;
+import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.mhfire.model.Ajhgz;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author yq
+ * @date 2021/5/14 13:36
+ */
+public interface AjhgzService extends CrudService<Ajhgz> {
+
+    /**
+     * page
+     * @param pageRequest
+     * @return
+     */
+    List<Map<String, Object>> page(PageRequest pageRequest);
+}

+ 0 - 11
mhfire-service/src/main/java/com/bizmatics/mhfire/service/TestService.java

@@ -1,11 +0,0 @@
-package com.bizmatics.mhfire.service;
-
-import com.bizmatics.common.core.bean.CommonPage;
-import com.bizmatics.common.mvc.base.CrudService;
-import com.bizmatics.mhfire.model.Test;
-
-
-public interface TestService extends CrudService<Test> {
-
-    CommonPage<Test> get(String name);
-}

+ 35 - 0
mhfire-service/src/main/java/com/bizmatics/mhfire/service/impl/AjhgzServiceImpl.java

@@ -0,0 +1,35 @@
+package com.bizmatics.mhfire.service.impl;
+
+import com.bizmatics.common.core.bean.PageRequest;
+import com.bizmatics.common.mvc.base.AbstractCrudService;
+import com.bizmatics.mhfire.model.Ajhgz;
+import com.bizmatics.mhfire.persistence.mapper.AjhgzMapper;
+import com.bizmatics.mhfire.service.AjhgzService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+/**
+ * @author yq
+ * @date 2021/5/14 13:36
+ */
+@Service
+public class AjhgzServiceImpl extends AbstractCrudService<AjhgzMapper, Ajhgz> implements AjhgzService {
+    @Override
+    public List<Map<String, Object>> page(PageRequest pageRequest) {
+        pageRequest = Optional.ofNullable(pageRequest).map(page -> {
+             page.setCurrent(Optional.ofNullable(page.getCurrent()).filter(current ->
+                 0 != current
+             ).orElse(1));
+            page.setSize(Optional.ofNullable(page.getSize()).filter(size ->
+                0 != size
+            ).orElse(10));
+            return page;
+        }).orElse(new PageRequest(1,10));
+
+        List<Map<String, Object>> maps = baseMapper.selectView(1, 10, "C6AE805BB72C41E1A097B9C958180A53");
+        return maps;
+    }
+}

+ 0 - 28
mhfire-service/src/main/java/com/bizmatics/mhfire/service/impl/TestServiceImpl.java

@@ -1,28 +0,0 @@
-package com.bizmatics.mhfire.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.bizmatics.common.core.bean.CommonPage;
-import com.bizmatics.common.core.util.BeanMapperUtils;
-import com.bizmatics.common.mvc.base.AbstractCrudService;
-import com.bizmatics.mhfire.model.Test;
-import com.bizmatics.mhfire.persistence.mapper.TestMapper;
-import com.bizmatics.mhfire.service.TestService;
-
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class TestServiceImpl extends AbstractCrudService<TestMapper, Test> implements TestService {
-    @Override
-    public CommonPage<Test> get(String name) {
-        LambdaQueryWrapper<Test> query = Wrappers.lambdaQuery(Test.class)
-                .eq(Test::getId,1);
-        IPage<Test> page = new Page<>(1, 10);
-        IPage<Test> iPage = baseMapper.selectPage(page, query);
-        return this.ToCommonPage(iPage);
-    }
-}