请求类的建立

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

@@ -3,12 +3,17 @@ package com.bizmatics.mhfire.controller.web;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.common.core.bean.PageRequest;
+import com.bizmatics.common.core.util.BeanMapperUtils;
 import com.bizmatics.mhfire.service.AjhgzService;
+import com.bizmatics.mhfire.service.vo.UnitMessageRequest;
+import com.bizmatics.mhfire.service.vo.WaterDetailRequest;
 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 ma.glasnost.orika.metadata.Type;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -26,10 +31,10 @@ public class AjhgzControllerWeb {
 
     @GetMapping("ajhgzPage")
     public ApiResult<Page<Map<String,Object>>> ajhgzPage(){
+
         return ApiResult.success(ajhgzService.ajhgaPage(new PageRequest()));
     }
 
-
     @GetMapping("hzdcHzsgsmjlAllPage")
     public ApiResult<Page<Map<String,Object>>> hzdcHzsgsmjlAllPage(){
         return ApiResult.success(ajhgzService.hzdcHzsgsmjlAllPage(new PageRequest()));
@@ -103,4 +108,12 @@ public class AjhgzControllerWeb {
     public ApiResult<Page<Map<String,Object>>> xzxkXfajsbbPage(){
         return ApiResult.success(ajhgzService.xzxkXfajsbbPage(new PageRequest()));
     }
+
+    public static void main(String[] args) {
+        WaterDetailRequest waterDetailRequest = new WaterDetailRequest();
+        waterDetailRequest.setWaterAddress("!111");
+        Map<String,Object> map = new HashMap<>();
+        map.put("waterAddress","1111111111");
+
+    }
 }

mhfire-controller/src/main/resources/smart-doc.json

@@ -1,11 +1,11 @@
 {
   "outPath":"./src/main/resources/static/doc",
-  "serverUrl": "http://127.0.0.1:8082/test",
+  "serverUrl": "http://127.0.0.1:8082/ajhgz",
   "isStrict": false,
   "coverOld": true,
   "allInOne": true,
-  "packageFilters": "com.bizmatics.demo.controller.web",
+  "packageFilters": "com.bizmatics.mhfire.controller.web",
   "requestExample":"false",
   "responseExample":"true",
-  "projectName": "test"
+  "projectName": "mhfire"
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/AdministrativeEnforcementAllRequest.java

@@ -0,0 +1,23 @@
+package com.bizmatics.mhfire.service.vo;
+
+import com.bizmatics.common.core.bean.PageRequest;
+import lombok.Data;
+
+/**
+ * @author yq
+ * @date 2021/5/19 15:39
+ * 行政执法总表
+ */
+@Data
+public class AdministrativeEnforcementAllRequest {
+
+    /**
+     * 分页
+     */
+    private PageRequest pageRequest;
+
+    /**
+     * 单位id
+     */
+    private String unitId;
+}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/AdministrativePunishRequest.java

@@ -0,0 +1,19 @@
+package com.bizmatics.mhfire.service.vo;
+
+import com.bizmatics.common.core.bean.PageRequest;
+import lombok.Data;
+
+/**
+ * @author yq
+ * @date 2021/5/19 15:46
+ * 行政处罚记录
+ */
+@Data
+public class AdministrativePunishRequest {
+
+    /**
+     * 分页
+     */
+    private PageRequest pageRequest;
+
+}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/AuditAcceptDeclareRequest.java

@@ -0,0 +1,23 @@
+package com.bizmatics.mhfire.service.vo;
+
+import com.bizmatics.common.core.bean.PageRequest;
+import lombok.Data;
+
+/**
+ * @author yq
+ * @date 2021/5/19 15:59
+ * 审核验收申报总表
+ */
+@Data
+public class AuditAcceptDeclareRequest {
+
+    /**
+     * 分页
+     */
+    private PageRequest pageRequest;
+
+    /**
+     * 单位名称
+     */
+    private String unitName;
+}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/AuditAcceptIdeaRequest.java

@@ -0,0 +1,29 @@
+package com.bizmatics.mhfire.service.vo;
+
+import com.bizmatics.common.core.bean.PageRequest;
+import lombok.Data;
+
+/**
+ * @author yq
+ * @date 2021/5/19 16:11
+ * 审核验收意见书
+ */
+@Data
+public class AuditAcceptIdeaRequest {
+
+    /**
+     * 分页
+     */
+    private PageRequest pageRequest;
+
+    /**
+     * 单位名称
+     */
+    private String unitName;
+
+
+    /**
+     * 是否合格
+     */
+    private String qualifiedFlag;
+}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/AuditAcceptVoucherRequest.java

@@ -0,0 +1,23 @@
+package com.bizmatics.mhfire.service.vo;
+
+import com.bizmatics.common.core.bean.PageRequest;
+import lombok.Data;
+
+/**
+ * @author yq
+ * @date 2021/5/19 16:06
+ * 审核验收凭证
+ */
+@Data
+public class AuditAcceptVoucherRequest {
+
+    /**
+     * 分页
+     */
+    private PageRequest pageRequest;
+
+    /**
+     * 单位id
+     */
+    private String unitId;
+}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/DisagreeUseRequest.java

@@ -0,0 +1,23 @@
+package com.bizmatics.mhfire.service.vo;
+
+import com.bizmatics.common.core.bean.PageRequest;
+import lombok.Data;
+
+/**
+ * @author yq
+ * @date 2021/5/19 15:57
+ * 不同意使用
+ */
+@Data
+public class DisagreeUseRequest {
+
+    /**
+     * 分页
+     */
+    private PageRequest pageRequest;
+
+    /**
+     * 单位id
+     */
+    private String unitId;
+}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/FireCheckDeclareAllRequest.java

@@ -0,0 +1,29 @@
+package com.bizmatics.mhfire.service.vo;
+
+import com.bizmatics.common.core.bean.PageRequest;
+import lombok.Data;
+
+/**
+ * @author yq
+ * @date 2021/5/19 16:16
+ * 消防安检申报总表
+ */
+@Data
+public class FireCheckDeclareAllRequest {
+
+    /**
+     * 分页
+     */
+    private PageRequest pageRequest;
+
+
+    /**
+     * 单位地址
+     */
+    private String unitAddress;
+
+    /**
+     * 单位id
+     */
+    private String unitId;
+}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/FireGradeAllRequest.java

@@ -0,0 +1,27 @@
+package com.bizmatics.mhfire.service.vo;
+
+import com.bizmatics.common.core.bean.PageRequest;
+import lombok.Data;
+
+/**
+ * @author yq
+ * @date 2021/5/19 14:23
+ *火灾事故说明总记录 请求
+ */
+@Data
+public class FireGradeAllRequest {
+    /**
+     * 分页
+     */
+    private PageRequest pageRequest;
+
+    /**
+     * 起火地址
+     */
+    private String fireAddress;
+
+    /**
+     * 起火单位(个人)
+     */
+    private String fireUnit;
+}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/FireGradeFirmlyRequest.java

@@ -0,0 +1,29 @@
+package com.bizmatics.mhfire.service.vo;
+
+import com.bizmatics.common.core.bean.PageRequest;
+import lombok.Data;
+
+/**
+ * @author yq
+ * @date 2021/5/19 14:50
+ * 火灾事故认定书
+ */
+@Data
+public class FireGradeFirmlyRequest {
+
+    /**
+     * 分页
+     */
+    private PageRequest pageRequest;
+
+    /**
+     * 起火地址
+     */
+    private String fireAddress;
+
+    /**
+     * 起火单位
+     */
+    private String fireUint;
+
+}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/FireSimpleGradeFirmlyRequest.java

@@ -0,0 +1,29 @@
+package com.bizmatics.mhfire.service.vo;
+
+import com.bizmatics.common.core.bean.PageRequest;
+import lombok.Data;
+
+/**
+ * @author yq
+ * @date 2021/5/19 14:44
+ *  简易火灾事故认定书 请求
+ */
+@Data
+public class FireSimpleGradeFirmlyRequest {
+
+    /**
+     * 分页
+     */
+    private PageRequest pageRequest;
+
+    /**
+     * 起火地址
+     */
+    private String fireAddress;
+
+    /**
+     * 起火单位
+     */
+    private String fireUnit;
+
+}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/FireStatisticsRequest.java

@@ -0,0 +1,28 @@
+package com.bizmatics.mhfire.service.vo;
+
+import com.bizmatics.common.core.bean.PageRequest;
+import lombok.Data;
+
+/**
+ * @author yq
+ * @date 2021/5/19 14:38
+ * 火灾统计表 请求
+ */
+@Data
+public class FireStatisticsRequest {
+
+    /**
+     * 分页
+     */
+    private PageRequest pageRequest;
+
+    /**
+     * 起火时间
+     */
+    private String fireStartDate;
+
+    /**
+     * 起火地点
+     */
+    private String fireAddress;
+}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/FireSuperviseRequest.java

@@ -0,0 +1,39 @@
+package com.bizmatics.mhfire.service.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bizmatics.common.core.bean.PageRequest;
+import lombok.Data;
+
+/**
+ * @author yq
+ * @date 2021/5/19 15:35
+ * 消防监督检查记录
+ */
+@Data
+public class FireSuperviseRequest {
+
+    /**
+     * 分页
+     */
+    private PageRequest pageRequest;
+
+    /**
+     * 单位名称
+     */
+    private String unitName;
+
+    /**
+     * 单位地址
+     */
+    private String unitAddress;
+
+    /**
+     * 开始时间
+     */
+    private String startTime;
+
+    /**
+     * 结束时间
+     */
+    private String endTime;
+}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/OperatorRequest.java

@@ -0,0 +1,33 @@
+package com.bizmatics.mhfire.service.vo;
+
+import lombok.Data;
+
+/**
+ * @author yq
+ * @date 2021/5/19 15:21
+ * 值班人员
+ */
+@Data
+public class OperatorRequest {
+
+
+    /**
+     * 机构名称
+     */
+    private String organizationName;
+
+    /**
+     * 所属单位id
+     */
+    private String belongUnitId;
+
+    /**
+     * 值班人员id
+     */
+    private String operatorId;
+
+    /**
+     * 值班人员名称
+     */
+    private String operatorName;
+}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/SecurityCheckQualifiedRequest.java

@@ -0,0 +1,31 @@
+package com.bizmatics.mhfire.service.vo;
+
+import com.bizmatics.common.core.bean.PageRequest;
+import lombok.Data;
+
+/**
+ * @author yq
+ * @date 2021/5/19 15:50
+ * 安全检查合格证
+ */
+@Data
+public class SecurityCheckQualifiedRequest {
+
+    /**
+     * 分页
+     */
+    private PageRequest pageRequest;
+
+
+    /**
+     * 场所形成
+     */
+    private String siteName;
+
+    /**
+     * 场所地址
+     */
+    private String siteAddress;
+
+
+}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/SecurityCheckVoucherRequest.java

@@ -0,0 +1,28 @@
+package com.bizmatics.mhfire.service.vo;
+
+import com.bizmatics.common.core.bean.PageRequest;
+import lombok.Data;
+
+/**
+ * @author yq
+ * @date 2021/5/19 15:53
+ * 安全检查凭证
+ */
+@Data
+public class SecurityCheckVoucherRequest {
+
+    /**
+     * 分页
+     */
+    private PageRequest pageRequest;
+
+    /**
+     * 单位
+     */
+    private String unitId;
+
+    /**
+     * 单位名称
+     */
+    private String unitName;
+}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/SuperviseProjectAllRequest.java

@@ -0,0 +1,36 @@
+package com.bizmatics.mhfire.service.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bizmatics.common.core.bean.PageRequest;
+import lombok.Data;
+
+/**
+ * @author yq
+ * @date 2021/5/19 15:14
+ * 监督管理项目全表
+ */
+@Data
+public class SuperviseProjectAllRequest {
+
+    /**
+     * 分页
+     */
+    private PageRequest pageRequest;
+
+    /**
+     * 项目名称
+     */
+    private String projectName;
+
+    /**
+     * 项目单位地址
+     */
+    private String projectAddress;
+
+    /**
+     * 监管单位类别
+     */
+    private String superviseUnitType;
+
+
+}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/UnitMessageRequest.java

@@ -0,0 +1,35 @@
+package com.bizmatics.mhfire.service.vo;
+
+import com.bizmatics.common.core.bean.PageRequest;
+import lombok.Data;
+
+/**
+ * @author yq
+ * @date 2021/5/19 15:10
+ * 单位信息
+ */
+@Data
+public class UnitMessageRequest {
+
+    /**
+     * 分页
+     */
+    private PageRequest pageRequest;
+
+    /**
+     * 单位地址
+     */
+    private String unitAddress;
+
+    /**
+     * 单位名称
+     */
+    private String unitName;
+
+    /**
+     * 单位类型
+     */
+    private String unitType;
+
+
+}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/WaterDetailRequest.java

@@ -0,0 +1,33 @@
+package com.bizmatics.mhfire.service.vo;
+
+import com.bizmatics.common.core.bean.PageRequest;
+import lombok.Data;
+
+/**
+ * @author yq
+ * @date 2021/5/19 15:18
+ * 水源信息
+ */
+@Data
+public class WaterDetailRequest {
+
+    /**
+     * 分页信息
+     */
+    private PageRequest pageRequest;
+
+    /**
+     * 水源名称
+     */
+    private String waterName;
+
+    /**
+     * 水源类型
+     */
+    private String waterType;
+
+    /**
+     * 水源地址
+     */
+    private String waterAddress;
+}