提交装备

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>amos-boot-module-biz</artifactId>
+    <groupId>com.amosframework.boot</groupId>
+    <version>1.0.0</version>
+  </parent>
+
+  <artifactId>amos-boot-module-common-biz</artifactId>
+
+  <dependencies>
+		<dependency>
+			<groupId>com.amosframework.boot</groupId>
+			<artifactId>amos-boot-module-common-api</artifactId>
+			<version>${amos-biz-boot.version}</version>
+		</dependency>
+  </dependencies>
+</project>

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/constats/Constants.java

+package com.yeejoin.amos.boot.module.common.biz.constats;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Constants {
+
+    public static final Map<Integer,String> currentStatusNameMap = new HashMap<>();
+
+    static {
+        currentStatusNameMap.put(0,"待审核");
+        currentStatusNameMap.put(1,"待提交");
+        currentStatusNameMap.put(2,"待维修");
+        currentStatusNameMap.put(3,"待验收");
+        currentStatusNameMap.put(4,"已拒绝");
+        currentStatusNameMap.put(5,"已完结");
+        currentStatusNameMap.put(6,"维修中");
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/ContractController.java

+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+
+import java.util.Date;
+import java.util.List;
+
+import com.yeejoin.amos.boot.module.common.biz.service.impl.ContractServiceImpl;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.ContractDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+
+/**
+ * 维保合同
+ *
+ * @author system_generator
+ * @date 2021-07-16
+ */
+@RestController
+@Api(tags = "维保合同Api")
+@RequestMapping(value = "/common/contract")
+public class ContractController extends BaseController {
+
+    @Autowired
+    ContractServiceImpl contractServiceImpl;
+
+    /**
+     * 新增维保合同
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增维保合同", notes = "新增维保合同")
+    public ResponseModel<ContractDto> save(@RequestBody ContractDto model) {
+        model = contractServiceImpl.saveModel(model);
+        return ResponseHelper.buildResponse(model);
+    }
+
+    /**
+     * 更新合同信息及附件
+     *
+     * @param model
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PutMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "PUT", value = "更新合同信息及附件", notes = "更新合同信息及附件")
+    public ResponseModel<ContractDto> updateBySequenceNbrContract(@RequestBody ContractDto model,
+                                                                  @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        model.setSequenceNbr(sequenceNbr);
+        return ResponseHelper.buildResponse(contractServiceImpl.updateById(model));
+    }
+
+    /**
+     * 删除合同信息 (无约束)
+     *
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/batch")
+    @ApiOperation(httpMethod = "DELETE", value = "删除合同信息 (无约束)", notes = "删除合同信息 (无约束)")
+    public ResponseModel<List<Long>> deleteBySequenceNbr(@RequestParam(value = "ids") String ids) throws Exception {
+        return ResponseHelper.buildResponse(contractServiceImpl.multDeleteAircraft(RequestContext.getAgencyCode(),
+                ids));
+    }
+
+    /**
+     * 批量删除合同信息
+     *
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/delete_batch")
+    @ApiOperation(httpMethod = "DELETE", value = "批量删除合同信息", notes = "批量删除合同信息")
+    public ResponseModel<Boolean> batchDeleteBySequenceNbrList(@RequestParam(value = "sequenceNbrList") List<Long> sequenceNbrList) {
+        return ResponseHelper.buildResponse(contractServiceImpl.batchDelete(sequenceNbrList));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "查询单个维保合同", notes = "查询单个维保合同")
+    public ResponseModel<ContractDto> selectOne(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(contractServiceImpl.queryOne(sequenceNbr));
+    }
+
+    /**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/page")
+    @ApiOperation(httpMethod = "GET", value = "维保合同分页查询", notes = "维保合同分页查询")
+    public ResponseModel<Page<ContractDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
+            (value = "size") int size, Long companyId, Long signedCompanyId, String name, Long typeCode,
+                                                         String signedDate) {
+        Page<ContractDto> page = new Page<>();
+        page.setCurrent(current);
+        page.setSize(size);
+        AgencyUserModel amosUser = getUserInfo();
+        return ResponseHelper.buildResponse(contractServiceImpl.queryForContractPage(page, false, companyId,
+                signedCompanyId, name, typeCode, signedDate, amosUser.getUserId()));
+    }
+
+    /**
+     * 列表全部数据查询
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "维保合同列表全部数据查询", notes = "维保合同列表全部数据查询")
+    @GetMapping(value = "/list")
+    public ResponseModel<List<ContractDto>> selectForList() {
+        return ResponseHelper.buildResponse(contractServiceImpl.queryForContractList(false));
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/DutyCarController.java

+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import java.text.ParseException;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.dto.DutyCarDto;
+import com.yeejoin.amos.boot.module.common.api.service.IDutyCarService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+
+
+/**
+ * 值班班次
+ *
+ * @author system_generator
+ * @date 2021-07-06
+ */
+@RestController
+@Api(tags = "值班车辆接口Api")
+@RequestMapping(value = "/common/duty-car")
+public class DutyCarController extends BaseController {
+	
+    @Autowired
+    IDutyCarService iDutyCarService;
+
+    /**
+     * 值班列表视图--分页
+     *
+     * @return ResponseModel
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/page-list")
+    @ApiOperation(httpMethod = "GET", value = "值班列表视图-分页", notes = "值班列表视图-分页")
+    public ResponseModel<IPage<Map<String, Object>>> pageList(
+            @ApiParam(value = "开始日期", required = true) @RequestParam String beginDate,
+            @ApiParam(value = "结束日期", required = true) @RequestParam String endDate,
+            @ApiParam(value = "当前页", required = true) @RequestParam(value = "current") int current,
+            @ApiParam(value = "页面大小", required = true) @RequestParam(value = "size") int size) throws ParseException {
+        return ResponseHelper.buildResponse(iDutyCarService.pageList(current, size, beginDate, endDate));
+    }
+
+    /**
+     * 值班列表视图--不分页
+     *
+     * @return ResponseModel
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/list")
+    @ApiOperation(httpMethod = "GET", value = "值班列表视图-不分页", notes = "值班列表视图-不分页")
+    public ResponseModel list(
+            @ApiParam(value = "开始日期", required = true) @RequestParam String beginDate,
+            @ApiParam(value = "结束日期", required = true) @RequestParam String endDate) throws ParseException {
+        return ResponseHelper.buildResponse(iDutyCarService.list(null,beginDate, endDate));
+    }
+
+
+    /**
+     * 值班月视图
+     *
+     * @return ResponseModel
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping("/statistics-day")
+    @ApiOperation(httpMethod = "GET", value = "值班月视图", notes = "值班月视图")
+    public ResponseModel<List<Map<String, Object>>> dutyDetail(
+            @ApiParam(value = "开始日期", required = true) @RequestParam String beginDate,
+            @ApiParam(value = "结束日期", required = true) @RequestParam String endDate
+    ) throws ParseException {
+        return ResponseHelper.buildResponse(iDutyCarService.statisticsDay(beginDate, endDate));
+    }
+
+    /**
+     * 值班月视图
+     *
+     * @return ResponseModel
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping("/new-statistics-day")
+    @ApiOperation(httpMethod = "GET", value = "新值班月视图", notes = "新值班月视图")
+    public ResponseModel<List<Map<String, Object>>> newDutyDetail(
+            @ApiParam(value = "开始日期", required = true) @RequestParam String beginDate,
+            @ApiParam(value = "结束日期", required = true) @RequestParam String endDate,
+            @ApiParam(value = "属性编码") @RequestParam(required = false) String fieldCode
+    ) throws ParseException {
+        return ResponseHelper.buildResponse(iDutyCarService.newStatisticsDay(beginDate, endDate, fieldCode));
+    }
+    /**
+     * 调班
+     *
+     * @return ResponseModel
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping("/duty-adjust")
+    @ApiOperation(httpMethod = "POST", value = "调班保存", notes = "调班保存")
+    public ResponseModel dutyAdjustSave(@RequestBody DutyCarDto dutyCarDto) {
+        return ResponseHelper.buildResponse(iDutyCarService.save(dutyCarDto));
+    }
+
+    /**
+     * 调班
+     *
+     * @param instanceId 实例id
+     * @param dutyCarDto 业务对象
+     * @return DutyCarDto
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PutMapping("/duty-adjust")
+    @ApiOperation(httpMethod = "PUT", value = "调班更新", notes = "调班更新")
+    public ResponseModel dutyAdjustUpdate(
+            @RequestParam Long instanceId,
+            @RequestBody DutyCarDto dutyCarDto) {
+        return ResponseHelper.buildResponse(iDutyCarService.update(instanceId, dutyCarDto));
+    }
+
+    /**
+     * 车辆执勤导出
+     *
+     * @return ResponseModel
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping("/exportExcel")
+    @ApiOperation(httpMethod = "GET", value = "车辆执勤导出", notes = "车辆执勤导出")
+    public ResponseModel exportExcel(HttpServletResponse response, @ApiParam(value = "开始日期", required = true) @RequestParam String beginDate,
+                            @ApiParam(value = "结束日期", required = true) @RequestParam String endDate) throws ParseException {
+        return ResponseHelper.buildResponse(iDutyCarService.downloadList(beginDate, endDate));
+    }
+
+    /**
+     * 值班数据删除
+     *
+     * @param instanceId 实例id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return ResponseModel
+     * @throws Exception 
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping("/{instanceId}/{startTime}/{endTime}")
+    @ApiOperation(httpMethod = "DELETE", value = "值班数据删除", notes = "值班数据删除")
+    public ResponseModel deleteDutyData(@PathVariable Long instanceId,@PathVariable String startTime,@PathVariable String endTime) throws Exception {
+        if (ValidationUtil.isEmpty(instanceId)
+                || ValidationUtil.isEmpty(startTime)
+                || ValidationUtil.isEmpty(endTime)){
+            throw new BadRequest("参数校验失败.");
+        }
+        // BUG 2807 删除逻辑缺陷，现在前端后端传入 删除月份 2021-09-10 by kongfm
+        return ResponseHelper.buildResponse(iDutyCarService.deleteDutyData(instanceId, startTime, endTime));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation("查询指定日期值班人信息列表")
+    @GetMapping("/person/{dutyDay}/list")
+    public ResponseModel listDutyPerson(@ApiParam(value = "值班日期",required = true) @PathVariable String dutyDay,
+                                        @ApiParam(value = "班次id") @RequestParam(required = false) Long shiftId,
+                                        @ApiParam(value = "岗位") @RequestParam(required = false) String postType,
+                                        @ApiParam(value = "属性编码") @RequestParam(required = false) String fieldCode){
+        return ResponseHelper.buildResponse(iDutyCarService.getSchedulingDutyForSpecifyDate(dutyDay,shiftId,postType, fieldCode));
+    }
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation("查询指定車輛值班人信息列表")
+    @GetMapping("/theCar/personList")
+    public ResponseModel<List<Map<String, Object>>> theCarDutyPerson(@RequestParam Long carId){
+        return ResponseHelper.buildResponse(iDutyCarService.theCarDutyPerson(carId));
+    }
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/DutyFireFightingController.java

+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import java.text.ParseException;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.dto.DutyFireFightingDto;
+import com.yeejoin.amos.boot.module.common.api.service.IDutyFireFightingService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+
+
+@RestController
+@Api(tags = "微型消防站值班接口Api")
+@RequestMapping(value = "/common/duty-FireFighting")
+public class DutyFireFightingController extends BaseController{
+	
+	  @Autowired
+	  IDutyFireFightingService iDutyFireFightingService;
+
+
+	    /**
+	     * 值班列表视图--分页
+	     *
+	     * @return ResponseModel
+	     */
+	    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	    @GetMapping(value = "/page-list")
+	    @ApiOperation(httpMethod = "GET", value = "值班列表视图-分页", notes = "值班列表视图-分页")
+	    public ResponseModel<IPage<Map<String, Object>>> pageList(
+	            @ApiParam(value = "开始日期", required = true) @RequestParam String beginDate,
+	            @ApiParam(value = "结束日期", required = true) @RequestParam String endDate,
+	            @ApiParam(value = "当前页", required = true) @RequestParam(value = "current") int current,
+	            @ApiParam(value = "页面大小", required = true) @RequestParam(value = "size") int size) throws ParseException {
+	        return ResponseHelper.buildResponse(iDutyFireFightingService.pageList(current, size, beginDate, endDate));
+	    }
+
+	    /**
+	     * 值班列表视图--不分页
+	     *
+	     * @return ResponseModel
+	     */
+	    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	    @GetMapping(value = "/list")
+	    @ApiOperation(httpMethod = "GET", value = "值班列表视图-不分页", notes = "值班列表视图-不分页")
+	    public ResponseModel list(
+	            @ApiParam(value = "开始日期", required = true) @RequestParam String beginDate,
+	            @ApiParam(value = "结束日期", required = true) @RequestParam String endDate) throws ParseException {
+	        return ResponseHelper.buildResponse(iDutyFireFightingService.list(null,beginDate, endDate));
+	    }
+
+
+	    /**
+	     * 值班月视图
+	     *
+	     * @return ResponseModel
+	     */
+	    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	    @GetMapping("/statistics-day")
+	    @ApiOperation(httpMethod = "GET", value = "值班月视图", notes = "值班月视图")
+	    public ResponseModel<List<Map<String, Object>>> dutyDetail(
+	            @ApiParam(value = "开始日期", required = true) @RequestParam String beginDate,
+	            @ApiParam(value = "结束日期", required = true) @RequestParam String endDate
+	    ) throws ParseException {
+	        return ResponseHelper.buildResponse(iDutyFireFightingService.statisticsDay(beginDate, endDate));
+	    }
+	    /**
+	     * 新值班月视图
+	     *
+	     * @return ResponseModel
+	     */
+	    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	    @GetMapping("/new-statistics-day")
+	    @ApiOperation(httpMethod = "GET", value = "新值班月视图", notes = "新值班月视图")
+	    public ResponseModel<List<Map<String, Object>>> newDutyDetail(
+	            @ApiParam(value = "开始日期", required = true) @RequestParam String beginDate,
+	            @ApiParam(value = "结束日期", required = true) @RequestParam String endDate,
+				@ApiParam(value = "属性编码") @RequestParam(required = false) String fieldCode
+	    ) throws ParseException {
+	        return ResponseHelper.buildResponse(iDutyFireFightingService.newStatisticsDay(beginDate, endDate, fieldCode));
+	    }
+	    /**
+	     * 调班
+	     *
+	     * @return ResponseModel
+	     */
+	    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	    @PostMapping("/duty-adjust")
+	    @ApiOperation(httpMethod = "POST", value = "调班保存", notes = "调班保存")
+	    public ResponseModel dutyAdjustSave(@RequestBody DutyFireFightingDto dto) {
+	        return ResponseHelper.buildResponse(iDutyFireFightingService.save(dto));
+	    }
+
+	    /**
+	     * 调班
+	     *
+	     * @param instanceId 实例id
+	     * @param dutyCarDto 业务对象
+	     * @return DutyCarDto
+	     */
+	    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	    @PutMapping("/duty-adjust")
+	    @ApiOperation(httpMethod = "PUT", value = "调班更新", notes = "调班更新")
+	    public ResponseModel dutyAdjustUpdate(
+	            @RequestParam Long instanceId,
+	            @RequestBody DutyFireFightingDto dto) {
+	        return ResponseHelper.buildResponse(iDutyFireFightingService.update(instanceId, dto));
+	    }
+
+	    /**
+	     * 微型消防站导出
+	     *
+	     * @return ResponseModel
+	     */
+	    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	    @GetMapping("/exportExcel")
+	    @ApiOperation(httpMethod = "GET", value = "微型消防站导出", notes = "微型消防站导出")
+	    public ResponseModel exportExcel(HttpServletResponse response, @ApiParam(value = "开始日期", required = true) @RequestParam String beginDate,
+	                            @ApiParam(value = "结束日期", required = true) @RequestParam String endDate) throws ParseException {
+	        return ResponseHelper.buildResponse(iDutyFireFightingService.downloadList(beginDate, endDate));
+	    }
+
+	    /**
+	     * 值班数据删除
+	     *
+	     * @param instanceId 实例id
+	     * @param startTime 开始时间
+	     * @param endTime 结束时间
+	     * @return ResponseModel
+	     * @throws ParseException 
+	     */
+	    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	    @DeleteMapping("/{instanceId}/{startTime}/{endTime}")
+	    @ApiOperation(httpMethod = "DELETE", value = "值班数据删除", notes = "值班数据删除")
+	    public ResponseModel deleteDutyData(@PathVariable Long instanceId,@PathVariable String startTime,@PathVariable String endTime) throws Exception {
+	        if (ValidationUtil.isEmpty(instanceId)
+	                || ValidationUtil.isEmpty(startTime)
+	                || ValidationUtil.isEmpty(endTime)){
+	            throw new BadRequest("参数校验失败.");
+	        }
+	        return ResponseHelper.buildResponse(iDutyFireFightingService.deleteDutyData(instanceId, startTime, endTime));
+	    }
+
+	    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	    @ApiOperation("查询指定日期值班人信息列表")
+	    @GetMapping("/person/{dutyDay}/list")
+	    public ResponseModel listDutyPerson(@ApiParam(value = "值班日期",required = true) @PathVariable String dutyDay,
+	                                        @ApiParam(value = "班次id") @RequestParam(required = false) Long shiftId,
+	                                        @ApiParam(value = "岗位") @RequestParam(required = false) String postType,
+											@ApiParam(value = "属性编码") @RequestParam(required = false) String fieldCode){
+	        return ResponseHelper.buildResponse(iDutyFireFightingService.getSchedulingDutyForSpecifyDate(dutyDay,shiftId,postType, fieldCode));
+	    }
+	    
+	    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	    @ApiOperation("查询微型消防站排班值班的噶岗位信息列表")
+	    @GetMapping("/DutyPostTypeName/{userId}")
+	    public ResponseModel getlistDutyPostTypeName(@ApiParam(value = "当前用户id",required = true) @PathVariable Long userId) {
+	        return ResponseHelper.buildResponse(iDutyFireFightingService.getlistDutyPostTypeName(userId));
+	    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/DutyFirstAidController.java

+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import java.text.ParseException;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.dto.DutyFirstAidDto;
+import com.yeejoin.amos.boot.module.common.api.service.IDutyFirstAidService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+@RestController
+@Api(tags = "120急救站值班接口Api")
+@RequestMapping(value = "/common/duty-FirstAid")
+public class DutyFirstAidController  extends BaseController{
+	 @Autowired
+	 IDutyFirstAidService iDutyFirstAidService;
+
+
+	    /**
+	     * 值班列表视图--分页
+	     *
+	     * @return ResponseModel
+	     */
+	    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	    @GetMapping(value = "/page-list")
+	    @ApiOperation(httpMethod = "GET", value = "值班列表视图-分页", notes = "值班列表视图-分页")
+	    public ResponseModel<IPage<Map<String, Object>>> pageList(
+	            @ApiParam(value = "开始日期", required = true) @RequestParam String beginDate,
+	            @ApiParam(value = "结束日期", required = true) @RequestParam String endDate,
+	            @ApiParam(value = "当前页", required = true) @RequestParam(value = "current") int current,
+	            @ApiParam(value = "页面大小", required = true) @RequestParam(value = "size") int size) throws ParseException {
+	        return ResponseHelper.buildResponse(iDutyFirstAidService.pageList(current, size, beginDate, endDate));
+	    }
+
+	    /**
+	     * 值班列表视图--不分页
+	     *
+	     * @return ResponseModel
+	     */
+	    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	    @GetMapping(value = "/list")
+	    @ApiOperation(httpMethod = "GET", value = "值班列表视图-不分页", notes = "值班列表视图-不分页")
+	    public ResponseModel list(
+	            @ApiParam(value = "开始日期", required = true) @RequestParam String beginDate,
+	            @ApiParam(value = "结束日期", required = true) @RequestParam String endDate) throws ParseException {
+	        return ResponseHelper.buildResponse(iDutyFirstAidService.list(null,beginDate, endDate));
+	    }
+
+
+	    /**
+	     * 值班月视图
+	     *
+	     * @return ResponseModel
+	     */
+	    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	    @GetMapping("/statistics-day")
+	    @ApiOperation(httpMethod = "GET", value = "值班月视图", notes = "值班月视图")
+	    public ResponseModel<List<Map<String, Object>>> dutyDetail(
+	            @ApiParam(value = "开始日期", required = true) @RequestParam String beginDate,
+	            @ApiParam(value = "结束日期", required = true) @RequestParam String endDate
+	    ) throws ParseException {
+	        return ResponseHelper.buildResponse(iDutyFirstAidService.statisticsDay(beginDate, endDate));
+	    }
+	    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	    @GetMapping("/new-statistics-day")
+	    @ApiOperation(httpMethod = "GET", value = "新值班月视图", notes = "新值班月视图")
+	    public ResponseModel<List<Map<String, Object>>> newDutyDetail(
+	            @ApiParam(value = "开始日期", required = true) @RequestParam String beginDate,
+	            @ApiParam(value = "结束日期", required = true) @RequestParam String endDate,
+				@ApiParam(value = "属性编码") @RequestParam(required = false) String fieldCode
+	    ) throws ParseException {
+	        return ResponseHelper.buildResponse(iDutyFirstAidService.newStatisticsDay(beginDate, endDate, fieldCode));
+	    }
+	    /**
+	     * 调班
+	     *
+	     * @return ResponseModel
+	     */
+	    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	    @PostMapping("/duty-adjust")
+	    @ApiOperation(httpMethod = "POST", value = "调班保存", notes = "调班保存")
+	    public ResponseModel dutyAdjustSave(@RequestBody DutyFirstAidDto dto) {
+	        return ResponseHelper.buildResponse(iDutyFirstAidService.save(dto));
+	    }
+
+	    /**
+	     * 调班
+	     *
+	     * @param instanceId 实例id
+	     * @param dutyCarDto 业务对象
+	     * @return DutyCarDto
+	     */
+	    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	    @PutMapping("/duty-adjust")
+	    @ApiOperation(httpMethod = "PUT", value = "调班更新", notes = "调班更新")
+	    public ResponseModel dutyAdjustUpdate(
+	            @RequestParam Long instanceId,
+	            @RequestBody DutyFirstAidDto dto) {
+	        return ResponseHelper.buildResponse(iDutyFirstAidService.update(instanceId, dto));
+	    }
+
+	    /**
+	     * 微型消防站导出
+	     *
+	     * @return ResponseModel
+	     */
+	    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	    @GetMapping("/exportExcel")
+	    @ApiOperation(httpMethod = "GET", value = "120急救站导出", notes = "120急救站导出")
+	    public ResponseModel exportExcel(HttpServletResponse response, @ApiParam(value = "开始日期", required = true) @RequestParam String beginDate,
+	                            @ApiParam(value = "结束日期", required = true) @RequestParam String endDate) throws ParseException {
+	        return ResponseHelper.buildResponse(iDutyFirstAidService.downloadList(beginDate, endDate));
+	    }
+
+	    /**
+	     * 值班数据删除
+	     *
+	     * @param instanceId 实例id
+	     * @param startTime 开始时间
+	     * @param endTime 结束时间
+	     * @return ResponseModel
+	     * @throws Exception 
+	     */
+	    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	    @DeleteMapping("/{instanceId}/{startTime}/{endTime}")
+	    @ApiOperation(httpMethod = "DELETE", value = "值班数据删除", notes = "值班数据删除")
+	    public ResponseModel deleteDutyData(@PathVariable Long instanceId,@PathVariable String startTime,@PathVariable String endTime) throws Exception {
+	        if (ValidationUtil.isEmpty(instanceId)
+	                || ValidationUtil.isEmpty(startTime)
+	                || ValidationUtil.isEmpty(endTime)){
+	            throw new BadRequest("参数校验失败.");
+	        }
+	        return ResponseHelper.buildResponse(iDutyFirstAidService.deleteDutyData(instanceId, startTime, endTime));
+	    }
+
+	    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	    @ApiOperation("查询指定日期值班人信息列表")
+	    @GetMapping("/person/{dutyDay}/list")
+	    public ResponseModel listDutyPerson(@ApiParam(value = "值班日期",required = true) @PathVariable String dutyDay,
+	                                        @ApiParam(value = "班次id") @RequestParam(required = false) Long shiftId,
+	                                        @ApiParam(value = "岗位") @RequestParam(required = false) String postType,
+											@ApiParam(value = "属性编码") @RequestParam(required = false) String fieldCode){
+	        return ResponseHelper.buildResponse(iDutyFirstAidService.getSchedulingDutyForSpecifyDate(dutyDay,shiftId,postType, fieldCode));
+	    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/DutyShiftController.java

+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.dto.DutyShiftDto;
+import com.yeejoin.amos.boot.module.common.api.entity.DutyShift;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.DutyPersonShiftServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.DutyShiftServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+
+/**
+ * 值班班次
+ *
+ * @author system_generator
+ * @date 2021-07-06
+ */
+@RestController
+@Api(tags = "值班班次Api")
+@RequestMapping(value = "/common/duty-shift")
+public class DutyShiftController extends BaseController {
+
+    @Autowired
+    DutyShiftServiceImpl dutyShiftServiceImpl;
+   
+    @Autowired
+    DutyPersonShiftServiceImpl dutyPersonShiftServiceImpl;
+    /**
+     * 新增值班班次
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增值班班次", notes = "新增值班班次")
+    public ResponseModel<Boolean> save(HttpServletRequest request, @RequestBody DutyShiftDto model) {
+        QueryWrapper<DutyShift> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("name", model.getName());
+        List<DutyShift> list = dutyShiftServiceImpl.list(queryWrapper);
+        if(!list.isEmpty()) {
+            return ResponseHelper.buildResponse(false);
+        }
+        String appKey = request.getHeader("appKey");
+        model.setAppKey(appKey);
+        dutyShiftServiceImpl.createWithModel(model);
+        return ResponseHelper.buildResponse(true);
+    }
+
+    /**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PutMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新值班班次", notes = "根据sequenceNbr更新值班班次")
+    public ResponseModel<DutyShiftDto> updateBySequenceNbrDutyShift(HttpServletRequest request, @RequestBody DutyShiftDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        String appKey = request.getHeader("appKey");
+        model.setAppKey(appKey);
+        model.setSequenceNbr(sequenceNbr);
+        return ResponseHelper.buildResponse(dutyShiftServiceImpl.updateWithModel(model));
+    }
+
+    /**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除值班班次", notes = "根据sequenceNbr删除值班班次")
+    public ResponseModel<Boolean> deleteBySequenceNbr(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+    	
+    	if(dutyPersonShiftServiceImpl.checkCurrentDutyIsUser(sequenceNbr)) {
+    		return	ResponseHelper.buildResponse(false);
+    	}
+        DutyShift dutyShift = dutyShiftServiceImpl.getById(sequenceNbr);
+        if (null != dutyShift) {
+            dutyShift.setIsDelete(true);
+        }
+        return ResponseHelper.buildResponse(dutyShiftServiceImpl.updateById(dutyShift));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个值班班次", notes = "根据sequenceNbr查询单个值班班次")
+    public ResponseModel<DutyShiftDto> selectOne(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(dutyShiftServiceImpl.queryBySeq(sequenceNbr));
+    }
+
+    /**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/page")
+    @ApiOperation(httpMethod = "GET", value = "值班班次分页查询", notes = "值班班次分页查询")
+    public ResponseModel<Page<DutyShiftDto>> queryForPage(HttpServletRequest request, @RequestParam(value = "current") int current, @RequestParam(value = "size") int size) {
+        String appKey = request.getHeader("appKey");
+        Page<DutyShiftDto> page = new Page<>();
+        page.setCurrent(current);
+        page.setSize(size);
+        return ResponseHelper.buildResponse(dutyShiftServiceImpl.queryForDutyShiftPage(page, appKey,false));
+    }
+
+    /**
+     * 列表全部数据查询
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "值班班次列表全部数据查询", notes = "值班班次列表全部数据查询")
+    @GetMapping(value = "/list")
+    public ResponseModel<List<DutyShiftDto>> selectForList(HttpServletRequest request) {
+        String appKey = request.getHeader("appKey");
+        return ResponseHelper.buildResponse(dutyShiftServiceImpl.queryForDutyShiftList(appKey,false));
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/DynamicFormColumnController.java

+package com.yeejoin.amos.boot.module.common.biz.controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.DynamicFormColumnServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.DynamicFormColumnDto;
+import com.yeejoin.amos.boot.module.common.api.dto.DynamicFormInitDto;
+
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+
+/**
+* 动态表单树形分组字段表
+*
+* @author system_generator
+* @date 2021-07-06
+*/
+@RestController
+@Api(tags = "动态表单树形分组字段表Api")
+@RequestMapping(value = "/common/dynamic-form-column")
+public class DynamicFormColumnController extends BaseController {
+
+    @Autowired
+    DynamicFormColumnServiceImpl dynamicFormColumnServiceImpl;
+
+    /**
+             * 新增动态表单树形分组字段表
+    * @return
+    */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增动态表单树形分组字段表", notes = "新增动态表单树形分组字段表")
+	public ResponseModel<DynamicFormColumnDto> save(@RequestBody DynamicFormColumnDto model)
+	{
+	    model=dynamicFormColumnServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+	/**
+             * 根据sequenceNbr更新
+    * @param sequenceNbr 主键
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新动态表单树形分组字段表", notes = "根据sequenceNbr更新动态表单树形分组字段表")
+	public ResponseModel<DynamicFormColumnDto> updateBySequenceNbrDynamicFormColumn(@RequestBody DynamicFormColumnDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(dynamicFormColumnServiceImpl.updateWithModel(model));
+	}
+	/**
+             * 根据sequenceNbr删除
+    * @param sequenceNbr 主键
+    * @return
+    */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除动态表单树形分组字段表", notes = "根据sequenceNbr删除动态表单树形分组字段表")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(dynamicFormColumnServiceImpl.removeById(sequenceNbr));
+    }
+    /**
+             * 根据sequenceNbr查询
+    * @param sequenceNbr  主键
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个动态表单树形分组字段表",  notes = "根据sequenceNbr查询单个动态表单树形分组字段表")
+	public ResponseModel<DynamicFormColumnDto> seleteOne(@PathVariable Long sequenceNbr)
+	{
+	    return ResponseHelper.buildResponse(dynamicFormColumnServiceImpl.queryBySeq(sequenceNbr));
+	}
+	/**
+             * 列表分页查询
+    *@param current 当前页
+    *@param current 每页大小
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "动态表单树形分组字段表分页查询",  notes = "动态表单树形分组字段表分页查询")
+	public ResponseModel<Page<DynamicFormColumnDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
+	{
+	    Page<DynamicFormColumnDto> page=new Page<DynamicFormColumnDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(dynamicFormColumnServiceImpl.queryForDynamicFormColumnPage(page));
+	}
+	/**
+	*列表全部数据查询
+	*@return
+	*/
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "动态表单树形分组字段表列表全部数据查询",   notes = "动态表单树形分组字段表列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<DynamicFormColumnDto>>  selectForList()
+	{
+	    return ResponseHelper.buildResponse(dynamicFormColumnServiceImpl.queryForDynamicFormColumnList());
+	}
+	
+	/**
+	*列表全部数据查询
+	*@return
+	*/
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@ApiOperation(httpMethod = "GET",value = "动态表单树形分组字段表列表全部数据查询",   notes = "动态表单树形分组字段表列表全部数据查询")
+	@GetMapping(value = "/{groupCode}/list")
+	public ResponseModel<List<DynamicFormInitDto>>  selectForList(@PathVariable("groupCode") String groupCode)
+	{
+	    return ResponseHelper.buildResponse(dynamicFormColumnServiceImpl.getFormlist(groupCode));
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/DynamicFormGroupController.java

+package com.yeejoin.amos.boot.module.common.biz.controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.DynamicFormGroupServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.DynamicFormGroupDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+
+/**
+* 动态表单分组表(支持树形)
+*
+* @author system_generator
+* @date 2021-07-06
+*/
+@RestController
+@Api(tags = "动态表单分组表(支持树形)Api")
+@RequestMapping(value = "/common/dynamic-form-group")
+public class DynamicFormGroupController extends BaseController {
+
+    @Autowired
+    DynamicFormGroupServiceImpl dynamicFormGroupServiceImpl;
+
+    /**
+             * 新增动态表单分组表(支持树形)
+    * @return
+    */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增动态表单分组表(支持树形)", notes = "新增动态表单分组表(支持树形)")
+	public ResponseModel<DynamicFormGroupDto> save(@RequestBody DynamicFormGroupDto model)
+	{
+	    model=dynamicFormGroupServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+	/**
+             * 根据sequenceNbr更新
+    * @param sequenceNbr 主键
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新动态表单分组表(支持树形)", notes = "根据sequenceNbr更新动态表单分组表(支持树形)")
+	public ResponseModel<DynamicFormGroupDto> updateBySequenceNbrDynamicFormGroup(@RequestBody DynamicFormGroupDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(dynamicFormGroupServiceImpl.updateWithModel(model));
+	}
+	/**
+             * 根据sequenceNbr删除
+    * @param sequenceNbr 主键
+    * @return
+    */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除动态表单分组表(支持树形)", notes = "根据sequenceNbr删除动态表单分组表(支持树形)")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(dynamicFormGroupServiceImpl.removeById(sequenceNbr));
+    }
+    /**
+             * 根据sequenceNbr查询
+    * @param sequenceNbr  主键
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个动态表单分组表(支持树形)",  notes = "根据sequenceNbr查询单个动态表单分组表(支持树形)")
+	public ResponseModel<DynamicFormGroupDto> seleteOne(@PathVariable Long sequenceNbr)
+	{
+	    return ResponseHelper.buildResponse(dynamicFormGroupServiceImpl.queryBySeq(sequenceNbr));
+	}
+	/**
+             * 列表分页查询
+    *@param current 当前页
+    *@param current 每页大小
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "动态表单分组表(支持树形)分页查询",  notes = "动态表单分组表(支持树形)分页查询")
+	public ResponseModel<Page<DynamicFormGroupDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
+	{
+	    Page<DynamicFormGroupDto> page=new Page<DynamicFormGroupDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(dynamicFormGroupServiceImpl.queryForDynamicFormGroupPage(page));
+	}
+	/**
+	*列表全部数据查询
+	*@return
+	*/
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "动态表单分组表(支持树形)列表全部数据查询",   notes = "动态表单分组表(支持树形)列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<DynamicFormGroupDto>>  selectForList()
+	{
+	    return ResponseHelper.buildResponse(dynamicFormGroupServiceImpl.queryForDynamicFormGroupList());
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/DynamicFormInstanceController.java

+package com.yeejoin.amos.boot.module.common.biz.controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.DynamicFormInstanceServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.DynamicFormInstanceDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+
+/**
+* 动态表单实例表
+*
+* @author system_generator
+* @date 2021-07-06
+*/
+@RestController
+@Api(tags = "动态表单实例表Api")
+@RequestMapping(value = "/common/dynamic-form-instance")
+public class DynamicFormInstanceController extends BaseController {
+
+    @Autowired
+    DynamicFormInstanceServiceImpl dynamicFormInstanceServiceImpl;
+
+    /**
+             * 新增动态表单实例表
+    * @return
+    */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增动态表单实例表", notes = "新增动态表单实例表")
+	public ResponseModel<DynamicFormInstanceDto> save(@RequestBody DynamicFormInstanceDto model)
+	{
+	    model=dynamicFormInstanceServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+	/**
+             * 根据sequenceNbr更新
+    * @param sequenceNbr 主键
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新动态表单实例表", notes = "根据sequenceNbr更新动态表单实例表")
+	public ResponseModel<DynamicFormInstanceDto> updateBySequenceNbrDynamicFormInstance(@RequestBody DynamicFormInstanceDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(dynamicFormInstanceServiceImpl.updateWithModel(model));
+	}
+	/**
+             * 根据sequenceNbr删除
+    * @param sequenceNbr 主键
+    * @return
+    */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除动态表单实例表", notes = "根据sequenceNbr删除动态表单实例表")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(dynamicFormInstanceServiceImpl.removeById(sequenceNbr));
+    }
+    /**
+             * 根据sequenceNbr查询
+    * @param sequenceNbr  主键
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个动态表单实例表",  notes = "根据sequenceNbr查询单个动态表单实例表")
+	public ResponseModel<DynamicFormInstanceDto> seleteOne(@PathVariable Long sequenceNbr)
+	{
+	    return ResponseHelper.buildResponse(dynamicFormInstanceServiceImpl.queryBySeq(sequenceNbr));
+	}
+	/**
+             * 列表分页查询
+    *@param current 当前页
+    *@param current 每页大小
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "动态表单实例表分页查询",  notes = "动态表单实例表分页查询")
+	public ResponseModel<Page<DynamicFormInstanceDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
+	{
+	    Page<DynamicFormInstanceDto> page=new Page<DynamicFormInstanceDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(dynamicFormInstanceServiceImpl.queryForDynamicFormInstancePage(page));
+	}
+	/**
+	*列表全部数据查询
+	*@return
+	*/
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "动态表单实例表列表全部数据查询",   notes = "动态表单实例表列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<DynamicFormInstanceDto>>  selectForList()
+	{
+	    return ResponseHelper.buildResponse(dynamicFormInstanceServiceImpl.queryForDynamicFormInstanceList());
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FailureAuditController.java

+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.dto.FailureAuditDto;
+import com.yeejoin.amos.boot.module.common.api.entity.FailureAudit;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FailureAuditServiceImpl;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.List;
+
+/**
+ *
+ *
+ * @author system_generator
+ * @date 2021-08-04
+ */
+@RestController
+@Api(tags = "故障维修审核Api")
+@RequestMapping(value = "/common/failure-audit")
+public class FailureAuditController extends BaseController {
+
+	@Autowired
+	FailureAuditServiceImpl failureAuditServiceImpl;
+
+	/**
+	 * 新增
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<Object>  save(@RequestBody FailureAuditDto model) throws Exception {
+
+		return ResponseHelper.buildResponse(failureAuditServiceImpl.savemodel(model,getSelectedOrgInfo()));
+
+	}
+
+	/**
+	 * 根据sequenceNbr查询
+	 *
+	 * @param sequenceNbr  主键
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<FailureAuditDto> selectOne(@PathVariable Long sequenceNbr) {
+		return ResponseHelper.buildResponse(failureAuditServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+
+	/**
+	 * 审核列表记录查询
+	 *根据关联主表faultId查询
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "审核列表记录查询",   notes = "审核列表记录查询")
+	@GetMapping(value = "/list/{faultId}")
+	public ResponseModel<List<FailureAudit>> findByFaultIDFotList(@PathVariable long faultId) {
+		return ResponseHelper.buildResponse(failureAuditServiceImpl.findByfaultId(faultId));
+	}
+
+
+
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FailureMaintainController.java

+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import java.util.List;
+
+
+import com.yeejoin.amos.boot.module.common.api.entity.FailureMaintain;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.SourceFileServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.dto.FailureMaintainDto;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FailureMaintainServiceImpl;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ *
+ *
+ * @author system_generator
+ * @date 2021-08-04
+ */
+@RestController
+@Api(tags = "故障维修记录Api")
+@RequestMapping(value = "/common/failure-maintain")
+public class FailureMaintainController extends BaseController {
+
+	@Autowired
+	FailureMaintainServiceImpl failureMaintainServiceImpl;
+
+	/**
+	 * 新增
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<Object> save(@RequestBody FailureMaintainDto model) throws Exception {
+
+		return ResponseHelper.buildResponse(failureMaintainServiceImpl.savemodel(model,getSelectedOrgInfo()));
+
+	}
+
+	/**
+	 * 维修列表记录查询
+	 *根据关联主表faultId查询
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "维修列表记录查询",   notes = "维修列表记录查询")
+	@GetMapping(value = "/list/{faultId}")
+	public ResponseModel<List<FailureMaintainDto>> findByFaultIDFotList(@PathVariable long faultId) {
+		return ResponseHelper.buildResponse(failureMaintainServiceImpl.findByfaultId(faultId));
+	}
+
+
+
+
+	/**
+	 * 查询历史流程审核信息记录
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "设备故障报修单详情-报修日志",   notes = "设备故障报修单详情-报修日志")
+	@GetMapping(value = "/getProcessHistory/{sequenceNbr}")
+	public ResponseModel<List<Object>> getProcessHistory(@PathVariable Long sequenceNbr ) {
+		return ResponseHelper.buildResponse(failureMaintainServiceImpl.getProcessHistoryList(sequenceNbr));
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FailureRepairlogController.java

+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import com.yeejoin.amos.boot.module.common.api.entity.FailureRepairlog;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FailureRepairlogServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.FailureRepairlogDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 流程日志
+ *
+ * @author system_generator
+ * @date 2021-08-12
+ */
+@RestController
+@Api(tags = "流程日志Api")
+@RequestMapping(value = "/common/failure-repairlog")
+public class FailureRepairlogController extends BaseController {
+
+    @Autowired
+    FailureRepairlogServiceImpl failureRepairlogServiceImpl;
+
+    /**
+     * 新增流程日志
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增流程日志", notes = "新增流程日志")
+	public ResponseModel<FailureRepairlogDto> save(@RequestBody FailureRepairlogDto model) {
+	    model = failureRepairlogServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新流程日志", notes = "根据sequenceNbr更新流程日志")
+	public ResponseModel<FailureRepairlogDto> updateBySequenceNbrFailureRepairlog(@RequestBody FailureRepairlogDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(failureRepairlogServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除流程日志", notes = "根据sequenceNbr删除流程日志")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(failureRepairlogServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个流程日志",  notes = "根据sequenceNbr查询单个流程日志")
+	public ResponseModel<FailureRepairlogDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(failureRepairlogServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "流程日志分页查询",  notes = "流程日志分页查询")
+	public ResponseModel<Page<FailureRepairlogDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<FailureRepairlogDto> page = new Page<FailureRepairlogDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(failureRepairlogServiceImpl.queryForFailureRepairlogPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "流程日志列表全部数据查询",   notes = "流程日志列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<FailureRepairlogDto>> selectForList() {
+	    return ResponseHelper.buildResponse(failureRepairlogServiceImpl.queryForFailureRepairlogList());
+	}
+
+	/**
+	 * 查询报修日志
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "查询报修日志",   notes = "查询报修日志")
+	@GetMapping(value = "/list/{faultId}")
+	public ResponseModel<List<FailureRepairlog>> findByFaultIdLog(@PathVariable Long faultId) {
+		return ResponseHelper.buildResponse(failureRepairlogServiceImpl.findByfaultIdLog(faultId));
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FailureVerifyController.java

+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import com.yeejoin.amos.boot.module.common.api.dto.FailureAuditDto;
+import com.yeejoin.amos.boot.module.common.api.entity.FailureAudit;
+import com.yeejoin.amos.boot.module.common.api.entity.FailureVerify;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FailureVerifyServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.FailureVerifyDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 故障报修验收记录
+ *
+ * @author system_generator
+ * @date 2021-08-18
+ */
+@RestController
+@Api(tags = "故障报修验收记录Api")
+@RequestMapping(value = "/common/failure-verify")
+public class FailureVerifyController extends BaseController {
+
+    @Autowired
+    FailureVerifyServiceImpl failureVerifyServiceImpl;
+
+    /**
+     * 新增故障报修验收记录
+     *
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<Object>  save(@RequestBody FailureVerifyDto model)  {
+		try {
+			return ResponseHelper.buildResponse(failureVerifyServiceImpl.savemodel(model,getSelectedOrgInfo()));
+		} catch (Exception e) {
+			e.printStackTrace();
+			return ResponseHelper.buildResponse(false);
+		}
+	}
+
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新故障报修验收记录", notes = "根据sequenceNbr更新故障报修验收记录")
+	public ResponseModel<FailureVerifyDto> updateBySequenceNbrFailureVerify(@RequestBody FailureVerifyDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(failureVerifyServiceImpl.updateWithModel(model));
+	}
+
+
+
+/*
+    */
+/**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     *//*
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个故障报修验收记录",  notes = "根据sequenceNbr查询单个故障报修验收记录")
+	public ResponseModel<FailureVerifyDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(failureVerifyServiceImpl.queryBySeq(sequenceNbr));
+	}
+*/
+
+/*	*//**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     *//*
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "故障报修验收记录分页查询",  notes = "故障报修验收记录分页查询")
+	public ResponseModel<Page<FailureVerifyDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<FailureVerifyDto> page = new Page<FailureVerifyDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(failureVerifyServiceImpl.queryForFailureVerifyPage(page));
+	}*/
+
+/*
+	*/
+/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 *//*
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "故障报修验收记录列表全部数据查询",   notes = "故障报修验收记录列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<FailureVerifyDto>> selectForList() {
+	    return ResponseHelper.buildResponse(failureVerifyServiceImpl.queryForFailureVerifyList());
+	}
+*/
+
+
+	/**
+	 * 审核列表记录查询
+	 *根据关联主表faultId查询
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "审核列表记录查询",   notes = "审核列表记录查询")
+	@GetMapping(value = "/list/{faultId}")
+	public ResponseModel<List<FailureVerify>> findByFaultIDFotList(@PathVariable long faultId) {
+		return ResponseHelper.buildResponse(failureVerifyServiceImpl.findByfaultId(faultId));
+	}
+
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FireChemicalController.java

+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.dto.FireChemicalDto;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FireChemicalServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * 危化品
+ *
+ * @author system_generator
+ * @date 2021-06-29
+ */
+@RestController
+@Api(tags = "危化品Api")
+@RequestMapping(value = "/common/fire-chemical")
+public class FireChemicalController extends BaseController {
+
+    @Autowired
+    FireChemicalServiceImpl fireChemicalServiceImpl;
+
+    /**
+     * 新增危化品
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增危化品", notes = "新增危化品")
+    public ResponseModel<FireChemicalDto> save(@RequestBody FireChemicalDto model) {
+        model = fireChemicalServiceImpl.createWithModel(model);
+        return ResponseHelper.buildResponse(model);
+    }
+
+    /**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PutMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新危化品", notes = "根据sequenceNbr更新危化品")
+    public ResponseModel<FireChemicalDto> updateBySequenceNbrFireChemical(@RequestBody FireChemicalDto model,
+                                                                          @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        model.setSequenceNbr(sequenceNbr);
+        return ResponseHelper.buildResponse(fireChemicalServiceImpl.updateWithModel(model));
+    }
+
+    /**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/batch")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除危化品", notes = "根据sequenceNbr删除危化品")
+    public ResponseModel<Boolean> deleteBySequenceNbr(@RequestParam(value = "ids") String sequenceNbr) {
+
+        @SuppressWarnings("rawtypes")
+        List lt = Arrays.asList(sequenceNbr.split(","));
+        return ResponseHelper.buildResponse(fireChemicalServiceImpl.updateisDelete(lt));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个危化品", notes = "根据sequenceNbr查询单个危化品")
+    public ResponseModel<FireChemicalDto> seleteOne(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(fireChemicalServiceImpl.queryBySeq(sequenceNbr));
+    }
+
+    /**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/page")
+    @ApiOperation(httpMethod = "GET", value = "危化品分页查询", notes = "危化品分页查询")
+    public ResponseModel<Page<FireChemicalDto>> queryForPage(@RequestParam(value = "current") int current,
+                                                             @RequestParam(value = "size") int size, String casNo,
+                                                             String formula, String name, String typeCode) {
+        Page<FireChemicalDto> page = new Page<FireChemicalDto>();
+        page.setCurrent(current);
+        page.setSize(size);
+        boolean isDelete = false;
+        return ResponseHelper.buildResponse(fireChemicalServiceImpl.queryForFireChemicalPage(page, casNo, formula,
+                name, typeCode, isDelete));
+    }
+
+    /**
+     * 列表全部数据查询
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "危化品列表全部数据查询", notes = "危化品列表全部数据查询")
+    @GetMapping(value = "/list")
+    public ResponseModel<List<FireChemicalDto>> selectForList() {
+        return ResponseHelper.buildResponse(fireChemicalServiceImpl.queryForFireChemicalList(null,null,null,null,false));
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FireStationController.java

+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
+import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
+import com.yeejoin.amos.boot.module.common.api.core.framework.PersonIdentify;
+import com.yeejoin.amos.boot.module.common.api.dto.FireStationDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
+import com.yeejoin.amos.boot.module.common.api.enums.OrgPersonEnum;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FireStationServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 微型消防站
+ *
+ * @author system_generator
+ * @date 2021-06-28
+ */
+@RestController
+@Api(tags = "微型消防站Api")
+    @RequestMapping(value = "/common/fire-station")
+public class FireStationController extends BaseController {
+
+    @Autowired
+    FireStationServiceImpl fireStationServiceImpl;
+
+    @Autowired
+    OrgUsrServiceImpl iOrgUsrService;
+
+    @Value("${auth-key-fire-station:fire_station_info}")
+    private String authKey;
+
+    /**
+     * 新增微型消防站
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增微型消防站", notes = "新增微型消防站")
+    public ResponseModel<FireStationDto> save(@RequestBody FireStationDto model) {
+        model = fireStationServiceImpl.add(model);
+        return ResponseHelper.buildResponse(model);
+    }
+
+    /**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PutMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新微型消防站", notes = "根据sequenceNbr更新微型消防站")
+    public ResponseModel<FireStationDto> updateBySequenceNbrFireStation(@RequestBody FireStationDto model,
+                                                                        @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        model.setSequenceNbr(sequenceNbr);
+        return ResponseHelper.buildResponse(fireStationServiceImpl.Update(model));
+    }
+
+    /**
+     *  根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除微型消防站", notes = "根据sequenceNbr删除微型消防站")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request,
+                                                      @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(fireStationServiceImpl.updateisDelete(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个微型消防站", notes = "根据sequenceNbr查询单个微型消防站")
+    public ResponseModel<FireStationDto> seleteOne(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(fireStationServiceImpl.queryBySeq(sequenceNbr));
+    }
+
+    /**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/page")
+    @ApiOperation(httpMethod = "GET", value = "微型消防站分页查询", notes = "微型消防站分页查询")
+    public ResponseModel<Page<FireStationDto>> queryForPage(@RequestParam(value = "current") int current,
+                                                            @RequestParam(value = "size") int size,String bizOrgCode) {
+        Page<FireStationDto> page = new Page<FireStationDto>();
+        page.setCurrent(current);
+        page.setSize(size);
+        return ResponseHelper.buildResponse(fireStationServiceImpl.queryForFireStationPage(page,bizOrgCode));
+    }
+
+    /**
+     * 新列表分页查询
+     *
+     * @param pageNum 当前页
+     * @param pageSize 每页大小
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/list/page")
+    @ApiOperation(httpMethod = "GET", value = "新微型消防站分页查询", notes = "新微型消防站分页查询")
+    public ResponseModel<Page<FireStationDto>> getFireStation(@RequestParam(value = "pageNum") int pageNum,
+                                                              @RequestParam(value = "pageSize") int pageSize,@RequestParam(value = "company",required = false) Long company,
+                                                              FireStationDto fireStationDto) {
+        if (company != null && company != -1){
+            fireStationDto.setBizCompanyId(company);
+        }
+        return ResponseHelper.buildResponse(fireStationServiceImpl.getFirefighters(pageNum, pageSize, fireStationDto));
+    }
+
+
+    /**
+     * 列表全部数据查询
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "微型消防站列表全部数据查询", notes = "微型消防站列表全部数据查询")
+    @GetMapping(value = "/list")
+    public ResponseModel<List<FireStationDto>> selectForList(String bizOrgCode) {
+        return ResponseHelper.buildResponse(fireStationServiceImpl.queryForFireStationList(false,null,null,bizOrgCode));
+    }
+
+    /**
+     * 查询机场单位
+     *
+     * @return
+     * @throws Exception
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/company/listTree", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "查询机场单位树", notes = "查询机场单位树")
+    public ResponseModel<List<MenuFrom>> listCompanyTree() throws Exception {
+        List<MenuFrom> menus = fireStationServiceImpl.getCompanyTeamTree();
+        return ResponseHelper.buildResponse(menus);
+    }
+
+    /**
+     * 微型消防站单位部门树
+     *
+     * @param
+     * @return
+     */
+    @PersonIdentify
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/tree/companyTreeByUserAndType")
+    @ApiOperation(httpMethod = "GET", value = "微型消防站单位树", notes = "微型消防站单位树")
+    public ResponseModel<List<OrgMenuDto>> companyTreeByUserAndType() {
+        // 获取登陆人角色
+        ReginParams reginParams = getSelectedOrgInfo();
+        // 权限赋值
+        PermissionInterceptorContext.setDataAuthRule(authKey);
+        return ResponseHelper.buildResponse(iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey(),null));
+    }
+    @PersonIdentify
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/fireStationCountAndBuildingTree", method = RequestMethod.GET)
+	@ApiOperation(httpMethod = "GET", value = "根据登录人角色获取当前单位下的所在建筑的微型消防站统计值", notes = "根据登录人角色获取当前单位下的所在建筑的微型消防站统计值")
+	public ResponseModel<List<Map<String, Object>>> fireStationCountAndBuildingTree(
+			@RequestParam(required = false) String bizOrgCode) {
+		return ResponseHelper.buildResponse(fireStationServiceImpl.fireStationCountAndBuildingTree(bizOrgCode));
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FirefightersContactsController.java

+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import java.util.Arrays;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersContacts;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersContactsServiceImpl;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+
+/**
+* 联系人
+*
+* @author tb
+* @date 2021-06-07
+*/
+@RestController
+@Api(tags = "联系人Api")
+@RequestMapping(value = "/firefighters-contacts")
+public class FirefightersContactsController extends BaseController {
+
+    @Autowired
+    FirefightersContactsServiceImpl iFirefightersContactsService;
+
+    /**
+    * 新增l联系人
+    * @return
+    */
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    @ApiOperation(httpMethod = "POST", value = "新增l联系人", notes = "新增l联系人")
+    public boolean saveFirefightersContacts(HttpServletRequest request, @RequestBody FirefightersContacts firefightersContacts){
+        return iFirefightersContactsService.save(firefightersContacts);
+    }
+
+    /**
+    * 根据id删除
+    * @param id
+    * @return
+    */
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
+    @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
+    public boolean deleteById(HttpServletRequest request, @PathVariable Long id){
+        return iFirefightersContactsService.removeById(id);
+    }
+
+
+
+
+    /**
+    * 修改l联系人
+    * @return
+    */
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
+    @ApiOperation(httpMethod = "PUT", value = "修改l联系人", notes = "修改l联系人")
+    public boolean updateByIdFirefightersContacts(HttpServletRequest request, @RequestBody FirefightersContacts firefightersContacts){
+        return iFirefightersContactsService.updateById(firefightersContacts);
+    }
+
+
+
+    /**
+    * 根据id查询
+    * @param id
+    * @return
+    */
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
+    public FirefightersContacts selectById(HttpServletRequest request, @PathVariable Long id){
+        return iFirefightersContactsService.getById(id);
+    }
+
+
+
+    /**
+    * 列表分页查询
+    * @return
+    */
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
+    public IPage<FirefightersContacts> listPage(String pageNum,String pageSize, FirefightersContacts firefightersContacts){
+
+        Page<FirefightersContacts> pageBean;
+        QueryWrapper<FirefightersContacts> firefightersContactsQueryWrapper = new QueryWrapper<>();
+        Class<? extends FirefightersContacts> aClass = firefightersContacts.getClass();
+        Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
+            try {
+                field.setAccessible(true);
+                Object o = field.get(firefightersContacts);
+                if (o != null) {
+                    Class<?> type = field.getType();
+                    String name = NameUtils.camel2Underline(field.getName());
+                    if (type.equals(Integer.class)) {
+                        Integer fileValue = (Integer) field.get(firefightersContacts);
+                        firefightersContactsQueryWrapper.eq(name, fileValue);
+                    } else if (type.equals(Long.class)) {
+                        Long fileValue = (Long) field.get(firefightersContacts);
+                        firefightersContactsQueryWrapper.eq(name, fileValue);
+                    } else if (type.equals(String.class)) {
+                        String fileValue = (String) field.get(firefightersContacts);
+                        firefightersContactsQueryWrapper.eq(name, fileValue);
+                    } else {
+                    	if(!name.equals(NameUtils.camel2Underline("serialVersionUID"))) {
+                        String fileValue = (String) field.get(firefightersContacts);
+                        firefightersContactsQueryWrapper.eq(name, fileValue);
+                    	}
+                    }
+                }
+            } catch (Exception e) {
+                throw  new RuntimeException("系统异常");
+            }
+        });
+        IPage<FirefightersContacts> page;
+        if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
+            pageBean = new Page<>(0, Long.MAX_VALUE);
+        } else {
+            pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        }
+        page = iFirefightersContactsService.page(pageBean, firefightersContactsQueryWrapper);
+            return page;
+        }
+    }
+

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FirefightersContractController.java

+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.common.api.dto.FirefightersContractDto;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersContract;
+import com.yeejoin.amos.boot.module.common.api.service.IFirefightersContractService;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersContractServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.SourceFileServiceImpl;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+
+/**
+* 消防员合同
+*
+* @author tb
+* @date 2021-06-07
+*/
+@RestController
+@Api(tags = "消防员合同Api")
+@RequestMapping(value = "/firefighters-contract")
+public class FirefightersContractController extends BaseController {
+
+    @Autowired
+    FirefightersContractServiceImpl iFirefightersContractService;
+ 
+    @Autowired
+    IFirefightersContractService firefightersContractService;
+    
+    @Autowired
+  	SourceFileServiceImpl sourceFileService;
+    @Autowired
+    RedisUtils redisUtils;
+    @Value("${redis.cache.failure.time}")
+    private long time;
+    /**
+    * 新增消防员合同
+    * @return
+    */
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    @ApiOperation(httpMethod = "POST", value = "新增消防员合同", notes = "新增消防员合同")
+    public ResponseModel<FirefightersContractDto> saveFirefightersContract(HttpServletRequest request, @RequestBody FirefightersContractDto firefightersContract){
+       	 return ResponseHelper.buildResponse(firefightersContractService.save(firefightersContract));
+    }
+
+    /**
+    * 根据id删除
+    * @param id
+    * @return
+    */
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
+    @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
+    public ResponseModel<Object> deleteById(HttpServletRequest request, @PathVariable String id){
+    	String str[] = id.split(",");
+    	 List<String> ids= Arrays.asList(str);
+    	for (String sequenceNbr : ids) {
+    	iFirefightersContractService.update(new UpdateWrapper<FirefightersContract>().eq("sequence_nbr", Long.valueOf(sequenceNbr)).set("is_delete", 1));
+            //删除缓存
+            redisUtils.del(RedisKey.CONTRACT_ID+sequenceNbr);
+		}
+    	return ResponseHelper.buildResponse(null);
+    }
+
+
+
+
+    /**
+    * 修改消防员合同
+    * @return
+    */
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
+    @ApiOperation(httpMethod = "PUT", value = "修改消防员合同", notes = "修改消防员合同")
+    public ResponseModel<FirefightersContractDto> updateByIdFirefightersContract(HttpServletRequest request, @RequestBody FirefightersContractDto firefightersContract){
+    	firefightersContractService.updateById(firefightersContract, getUserInfo());    
+       //删除缓存
+       redisUtils.del(RedisKey.CONTRACT_ID+firefightersContract.getSequenceNbr());
+       return ResponseHelper.buildResponse(firefightersContract);  	          	      	
+    }
+
+
+
+    /**
+    * 根据id查询
+    * @param id
+    * @return
+    */
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
+    public ResponseModel<Object> selectById(HttpServletRequest request, @PathVariable Long id){
+     if(redisUtils.hasKey(RedisKey.CONTRACT_ID+id)){
+            Object obj= redisUtils.get(RedisKey.CONTRACT_ID+id);
+            return ResponseHelper.buildResponse(obj);
+        }else{
+            FirefightersContract firefightersContract= iFirefightersContractService.getById(id);
+            FirefightersContractDto dto = new  FirefightersContractDto();
+            Bean.copyExistPropertis(firefightersContract, dto);
+            dto.setAttachments(sourceFileService.getAttachments(id));
+           redisUtils.set(RedisKey.CONTRACT_ID+id, JSON.toJSON(dto),time);
+            return ResponseHelper.buildResponse(dto);
+       }
+    }
+
+
+
+    /**
+    * 列表分页查询
+    * @return
+    */
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
+    public ResponseModel<IPage<FirefightersContract>> listPage(String pageNum,String pageSize, FirefightersContract firefightersContract){
+
+        Page<FirefightersContract> pageBean;
+        QueryWrapper<FirefightersContract> firefightersContractQueryWrapper = new QueryWrapper<>();
+        firefightersContractQueryWrapper.eq("is_delete", 0);
+        Class<? extends FirefightersContract> aClass = firefightersContract.getClass();
+        Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
+            try {
+                field.setAccessible(true);
+                Object o = field.get(firefightersContract);
+                if (o != null) {
+                    Class<?> type = field.getType();
+                    String name = NameUtils.camel2Underline(field.getName());
+                    if (type.equals(Integer.class)) {
+                        Integer fileValue = (Integer) field.get(firefightersContract);
+                        firefightersContractQueryWrapper.eq(name, fileValue);
+                    } else if (type.equals(Long.class)) {
+                        Long fileValue = (Long) field.get(firefightersContract);
+                        firefightersContractQueryWrapper.eq(name, fileValue);
+                    } else if (type.equals(String.class)) {
+                        String fileValue = (String) field.get(firefightersContract);
+                        /* BUG 2193 合同名称模糊匹配 start*/
+                        if ("NAME".equals(name)) {
+                            firefightersContractQueryWrapper.like(name, fileValue);
+                        } else {
+                            firefightersContractQueryWrapper.eq(name, fileValue);
+                        }
+                        /* BUG 2193 合同名称模糊匹配 end*/
+                    }else if (type.equals(Date.class)) {
+                    	Date fileValue = (Date) field.get(firefightersContract);
+                        firefightersContractQueryWrapper.eq(name, fileValue);
+                    } else {
+                    	if(!name.equals(NameUtils.camel2Underline("serialVersionUID"))) {
+                        String fileValue = (String) field.get(firefightersContract);
+                        firefightersContractQueryWrapper.eq(name, fileValue);
+                    }
+                    	}
+                }
+            } catch (Exception e) {
+                throw  new RuntimeException("系统异常");
+            }
+        });
+        IPage<FirefightersContract> page;
+        if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
+            pageBean = new Page<FirefightersContract>(0, Long.MAX_VALUE);
+        } else {
+            pageBean = new Page<FirefightersContract>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        }
+        page = iFirefightersContractService.page(pageBean, firefightersContractQueryWrapper);
+         page.getRecords().forEach(i->{
+        	i.setAttachments(sourceFileService.getAttachments(i.getSequenceNbr()));
+        });
+        return ResponseHelper.buildResponse(page);  	 
+        }
+    }
+

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FirefightersEducationController.java

+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import java.util.Arrays;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersEducation;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersEducationServiceImpl;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+
+/**
+* 人员学历
+*
+* @author tb
+* @date 2021-06-07
+*/
+@RestController
+@Api(tags = "人员学历Api")
+@RequestMapping(value = "/firefighters-education")
+public class FirefightersEducationController extends BaseController {
+
+    @Autowired
+    FirefightersEducationServiceImpl iFirefightersEducationService;
+
+    /**
+    * 新增人员学历
+    * @return
+    */
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    @ApiOperation(httpMethod = "POST", value = "新增人员学历", notes = "新增人员学历")
+    public boolean saveFirefightersEducation(HttpServletRequest request, @RequestBody FirefightersEducation firefightersEducation){
+        return iFirefightersEducationService.save(firefightersEducation);
+    }
+
+    /**
+    * 根据id删除
+    * @param id
+    * @return
+    */
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
+    @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
+    public boolean deleteById(HttpServletRequest request, @PathVariable Long id){
+        return iFirefightersEducationService.removeById(id);
+    }
+
+
+
+
+    /**
+    * 修改人员学历
+    * @return
+    */
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
+    @ApiOperation(httpMethod = "PUT", value = "修改人员学历", notes = "修改人员学历")
+    public boolean updateByIdFirefightersEducation(HttpServletRequest request, @RequestBody FirefightersEducation firefightersEducation){
+        return iFirefightersEducationService.updateById(firefightersEducation);
+    }
+
+
+
+    /**
+    * 根据id查询
+    * @param id
+    * @return
+    */
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
+    public FirefightersEducation selectById(HttpServletRequest request, @PathVariable Long id){
+        return iFirefightersEducationService.getById(id);
+    }
+
+
+
+    /**
+    * 列表分页查询
+    * @return
+    */
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
+    public IPage<FirefightersEducation> listPage(String pageNum,String pageSize, FirefightersEducation firefightersEducation){
+
+        Page<FirefightersEducation> pageBean;
+        QueryWrapper<FirefightersEducation> firefightersEducationQueryWrapper = new QueryWrapper<>();
+        Class<? extends FirefightersEducation> aClass = firefightersEducation.getClass();
+        Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
+            try {
+                field.setAccessible(true);
+                Object o = field.get(firefightersEducation);
+                if (o != null) {
+                    Class<?> type = field.getType();
+                    String name = NameUtils.camel2Underline(field.getName());
+                    if (type.equals(Integer.class)) {
+                        Integer fileValue = (Integer) field.get(firefightersEducation);
+                        firefightersEducationQueryWrapper.eq(name, fileValue);
+                    } else if (type.equals(Long.class)) {
+                        Long fileValue = (Long) field.get(firefightersEducation);
+                        firefightersEducationQueryWrapper.eq(name, fileValue);
+                    } else if (type.equals(String.class)) {
+                        String fileValue = (String) field.get(firefightersEducation);
+                        firefightersEducationQueryWrapper.eq(name, fileValue);
+                    } else {
+                        String fileValue = (String) field.get(firefightersEducation);
+                        firefightersEducationQueryWrapper.eq(name, fileValue);
+                    }
+                }
+            } catch (Exception e) {
+                throw  new RuntimeException("系统异常");
+            }
+        });
+        IPage<FirefightersEducation> page;
+        if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
+            pageBean = new Page<>(0, Long.MAX_VALUE);
+        } else {
+            pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        }
+        page = iFirefightersEducationService.page(pageBean, firefightersEducationQueryWrapper);
+            return page;
+        }
+    }
+

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FirefightersThoughtController.java

+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import java.util.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.SourceFileServiceImpl;
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersThought;
+import com.yeejoin.amos.boot.module.common.api.service.IFailureAuditService;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersThoughtServiceImpl;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+
+/**
+* 消防员思想谈话记录
+*
+* @author tb
+* @date 2021-06-07
+*/
+@RestController
+@Api(tags = "消防员思想谈话记录Api")
+@RequestMapping(value = "/firefighters-thought")
+public class FirefightersThoughtController extends BaseController {
+
+    @Autowired
+    FirefightersThoughtServiceImpl iFirefightersThoughtService;
+    @Autowired
+    RedisUtils redisUtils;
+    @Autowired
+    SourceFileServiceImpl sourceFileService;
+    @Value("${redis.cache.failure.time}")
+    private long time;
+    /**
+    * 新增消防员思想谈话记录
+    * @return
+    */
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    @ApiOperation(httpMethod = "POST", value = "新增消防员思想谈话记录", notes = "新增消防员思想谈话记录")
+    public ResponseModel<FirefightersThought> saveFirefightersThought(HttpServletRequest request, @RequestBody FirefightersThought firefightersThought){
+    	iFirefightersThoughtService.save(firefightersThought);
+        /*bug 2883 消防人员，新增思想状态保存报错 2021-09-15 陈召 开始*/
+        if (firefightersThought.getAttachments() != null && !firefightersThought.getAttachments().isEmpty()){
+            /*bug 2883 消防人员，新增思想状态保存报错 2021-09-15 陈召 开始*/
+            sourceFileService.saveAttachments(firefightersThought.getSequenceNbr(),firefightersThought.getAttachments());
+        }
+    	return ResponseHelper.buildResponse(firefightersThought);
+    }
+
+
+    /**
+    * 根据id删除
+    * @param id
+    * @return
+    */
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
+    @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
+    public ResponseModel<Object> deleteById(HttpServletRequest request, @PathVariable String id){
+    	String str[] = id.split(",");
+   	    List<String> ids= Arrays.asList(str);
+     	for (String sequenceNbr : ids) {
+        iFirefightersThoughtService.update(new UpdateWrapper<FirefightersThought>().eq("sequence_nbr", Long.valueOf(sequenceNbr)).set("is_delete", 1));
+            //删除缓存
+            redisUtils.del(RedisKey.THOUGHT_ID+sequenceNbr);
+     	}
+    	return ResponseHelper.buildResponse(null);
+
+    }
+
+
+
+
+    /** 修改消防员思想谈话记录
+    * @return
+    */
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
+    @ApiOperation(httpMethod = "PUT", value = "修改消防员思想谈话记录", notes = "修改消防员思想谈话记录")
+    public ResponseModel<FirefightersThought>  updateByIdFirefightersThought(HttpServletRequest request, @RequestBody FirefightersThought firefightersThought){
+
+        if (firefightersThought.getAttachments() != null && !firefightersThought.getAttachments().isEmpty()){
+            sourceFileService.saveAttachments(firefightersThought.getSequenceNbr(),firefightersThought.getAttachments());
+        }
+    	iFirefightersThoughtService.updateById(firefightersThought);
+
+        //删除缓存
+        redisUtils.del(RedisKey.THOUGHT_ID+firefightersThought.getSequenceNbr());
+        return ResponseHelper.buildResponse(firefightersThought);
+
+    }
+
+
+
+    /**
+    * 根据id查询
+    * @param id
+    * @return
+    */
+	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "根据消防员id查询", notes = "根据消防员id查询")
+    public ResponseModel<Object> selectById(HttpServletRequest request, @PathVariable Long id){
+
+
+        if(redisUtils.hasKey(RedisKey.THOUGHT_ID+id)){
+            Object obj= redisUtils.get(RedisKey.THOUGHT_ID+id);
+            ((Map<String,Object>) obj).put("attachments", sourceFileService.getAttachments(id));
+            /*Map<String, Object> mainMap = Bean.BeantoMap(obj);
+            mainMap.put("attachments", sourceFileService.getAttachments(id));
+            return ResponseHelper.buildResponse(mainMap);*/
+            return ResponseHelper.buildResponse((Map<String,Object>) obj );
+        }else{ FirefightersThought firefightersThought= iFirefightersThoughtService.getById(id);
+            redisUtils.set(RedisKey.THOUGHT_ID+id, JSON.toJSON(firefightersThought),time);
+            Map<String, Object> mainMap = Bean.BeantoMap(firefightersThought);
+            mainMap.put("attachments", sourceFileService.getAttachments(id));
+            return ResponseHelper.buildResponse(mainMap);
+        }
+
+
+
+    }
+
+
+
+    /**
+    * 列表分页查询
+    * @return
+    */
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
+    public ResponseModel<IPage<FirefightersThought>> listPage(String pageNum,String pageSize, FirefightersThought firefightersThought){
+
+        Page<FirefightersThought> pageBean;
+        QueryWrapper<FirefightersThought> firefightersThoughtQueryWrapper = new QueryWrapper<>();
+        firefightersThoughtQueryWrapper.eq("is_delete", 0);
+        Class<? extends FirefightersThought> aClass = firefightersThought.getClass();
+        Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
+            try {
+                field.setAccessible(true);
+                Object o = field.get(firefightersThought);
+                if (o != null) {
+                    Class<?> type = field.getType();
+                    String name = NameUtils.camel2Underline(field.getName());
+                    if (type.equals(Integer.class)) {
+                        Integer fileValue = (Integer) field.get(firefightersThought);
+                        firefightersThoughtQueryWrapper.eq(name, fileValue);
+                    } else if (type.equals(Long.class)) {
+                        Long fileValue = (Long) field.get(firefightersThought);
+                        firefightersThoughtQueryWrapper.eq(name, fileValue);
+                    } else if (type.equals(String.class)) {
+                        String fileValue = (String) field.get(firefightersThought);
+                        if("SPEAKER".equals(name)) {
+                        	 firefightersThoughtQueryWrapper.like(name,fileValue);
+                        }else {
+                        	firefightersThoughtQueryWrapper.eq(name, fileValue);
+                        }
+                    }else if (type.equals(Date.class)) {
+                    	Date fileValue = (Date) field.get(firefightersThought);
+                    	firefightersThoughtQueryWrapper.likeRight(name,DateUtils.dateFormat(fileValue,null));
+                    } else {
+                    	if(!name.equals(NameUtils.camel2Underline("serialVersionUID"))) {
+                        String fileValue = (String) field.get(firefightersThought);
+                        firefightersThoughtQueryWrapper.eq(name, fileValue);
+                    }}
+                }
+            } catch (Exception e) {
+                throw  new RuntimeException("系统异常");
+            }
+        });
+        IPage<FirefightersThought> page;
+        if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
+            pageBean = new Page<>(0, Long.MAX_VALUE);
+        } else {
+            pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        }
+        page = iFirefightersThoughtService.page(pageBean, firefightersThoughtQueryWrapper);
+
+        return ResponseHelper.buildResponse(page); }
+    }
+

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FirefightersWorkexperienceController.java

+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import java.util.Arrays;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersWorkexperience;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersWorkexperienceServiceImpl;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+
+/**
+* 工作经历
+*
+* @author tb
+* @date 2021-06-07
+*/
+@RestController
+@Api(tags = "工作经历Api")
+@RequestMapping(value = "/firefighters-workexperience")
+public class FirefightersWorkexperienceController extends BaseController {
+
+    @Autowired
+    FirefightersWorkexperienceServiceImpl iFirefightersWorkexperienceService;
+
+    /**
+    * 新增工作经历
+    * @return
+    */
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    @ApiOperation(httpMethod = "POST", value = "新增工作经历", notes = "新增工作经历")
+    public boolean saveFirefightersWorkexperience(HttpServletRequest request, @RequestBody FirefightersWorkexperience firefightersWorkexperience){
+        return iFirefightersWorkexperienceService.save(firefightersWorkexperience);
+    }
+
+    /**
+    * 根据id删除
+    * @param id
+    * @return
+    */
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
+    @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
+    public boolean deleteById(HttpServletRequest request, @PathVariable Long id){
+        return iFirefightersWorkexperienceService.removeById(id);
+    }
+
+
+
+
+    /**
+    * 修改工作经历
+    * @return
+    */
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
+    @ApiOperation(httpMethod = "PUT", value = "修改工作经历", notes = "修改工作经历")
+    public boolean updateByIdFirefightersWorkexperience(HttpServletRequest request, @RequestBody FirefightersWorkexperience firefightersWorkexperience){
+        return iFirefightersWorkexperienceService.updateById(firefightersWorkexperience);
+    }
+
+
+
+    /**
+    * 根据id查询
+    * @param id
+    * @return
+    */
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
+    public FirefightersWorkexperience selectById(HttpServletRequest request, @PathVariable Long id){
+        return iFirefightersWorkexperienceService.getById(id);
+    }
+
+
+
+    /**
+    * 列表分页查询
+    * @return
+    */
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
+    public IPage<FirefightersWorkexperience> listPage(String pageNum,String pageSize, FirefightersWorkexperience firefightersWorkexperience){
+
+        Page<FirefightersWorkexperience> pageBean;
+        QueryWrapper<FirefightersWorkexperience> firefightersWorkexperienceQueryWrapper = new QueryWrapper<>();
+        Class<? extends FirefightersWorkexperience> aClass = firefightersWorkexperience.getClass();
+        Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
+            try {
+                field.setAccessible(true);
+                Object o = field.get(firefightersWorkexperience);
+                if (o != null) {
+                    Class<?> type = field.getType();
+                    String name = NameUtils.camel2Underline(field.getName());
+                    if (type.equals(Integer.class)) {
+                        Integer fileValue = (Integer) field.get(firefightersWorkexperience);
+                        firefightersWorkexperienceQueryWrapper.eq(name, fileValue);
+                    } else if (type.equals(Long.class)) {
+                        Long fileValue = (Long) field.get(firefightersWorkexperience);
+                        firefightersWorkexperienceQueryWrapper.eq(name, fileValue);
+                    } else if (type.equals(String.class)) {
+                        String fileValue = (String) field.get(firefightersWorkexperience);
+                        firefightersWorkexperienceQueryWrapper.eq(name, fileValue);
+                    } else {
+                        String fileValue = (String) field.get(firefightersWorkexperience);
+                        firefightersWorkexperienceQueryWrapper.eq(name, fileValue);
+                    }
+                }
+            } catch (Exception e) {
+                throw  new RuntimeException("系统异常");
+            }
+        });
+        IPage<FirefightersWorkexperience> page;
+        if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
+            pageBean = new Page<>(0, Long.MAX_VALUE);
+        } else {
+            pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        }
+        page = iFirefightersWorkexperienceService.page(pageBean, firefightersWorkexperienceQueryWrapper);
+            return page;
+        }
+    }
+

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/LinkageUnitController.java

+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import java.util.List;
+
+import com.alibaba.fastjson.JSON;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
+import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitDto;
+import com.yeejoin.amos.boot.module.common.api.service.ILinkageUnitService;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.LinkageUnitServiceImpl;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+
+/**
+ * 联动单位
+ *
+ * @author system_generator
+ * @date 2021-07-16
+ */
+@RestController
+@Api(tags = "联动单位Api")
+@RequestMapping(value = "/common/linkage-unit")
+public class LinkageUnitController extends BaseController {
+
+    @Autowired
+    LinkageUnitServiceImpl linkageUnitServiceImpl;
+    
+    @Autowired
+    ILinkageUnitService linkageUnitService;
+
+
+    @Autowired
+    private OrgUsrMapper orgUsrMapper;
+
+    @Autowired
+    RedisUtils redisUtils;
+
+    /**
+     * 新增联动单位
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增联动单位", notes = "新增联动单位")
+    public ResponseModel<LinkageUnitDto> save(@RequestBody LinkageUnitDto model) {
+        ReginParams reginParams = getSelectedOrgInfo();
+        String companyId = reginParams.getPersonIdentity().getCompanyId();
+        if (StringUtils.isNotEmpty(companyId)) {
+            OrgUsr orgUsr = orgUsrMapper.queryBySequenceNbr(companyId);
+            model.setBizOrgCode(orgUsr.getBizOrgCode());
+            model.setBizOrgName(orgUsr.getBizOrgName());
+        }
+        model = linkageUnitServiceImpl.saveModel(model);
+        return ResponseHelper.buildResponse(model);
+    }
+
+    /**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PutMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新联动单位", notes = "根据sequenceNbr更新联动单位")
+    public ResponseModel<LinkageUnitDto> updateBySequenceNbrLinkageUnit(@RequestBody LinkageUnitDto model,
+                                                                        @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        ReginParams reginParams = getSelectedOrgInfo();
+        String companyId = reginParams.getPersonIdentity().getCompanyId();
+        if (StringUtils.isNotEmpty(companyId)) {
+            OrgUsr orgUsr = orgUsrMapper.queryBySequenceNbr(companyId);
+            model.setBizOrgCode(orgUsr.getBizOrgCode());
+            model.setBizOrgName(orgUsr.getBizOrgName());
+        }
+        model.setSequenceNbr(sequenceNbr);
+        return ResponseHelper.buildResponse(linkageUnitServiceImpl.updateById(model));
+    }
+
+    /**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除联动单位", notes = "根据sequenceNbr删除联动单位")
+    public ResponseModel<Boolean> deleteBySequenceNbr(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(linkageUnitServiceImpl.deleteById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbrList 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/batch_delete")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除联动单位", notes = "根据sequenceNbr删除联动单位")
+    public ResponseModel<Boolean> batchDeleteBySequenceNbrList(@RequestParam(value = "sequenceNbrList") List<Long> sequenceNbrList) {
+        return ResponseHelper.buildResponse(linkageUnitServiceImpl.batchDelete(sequenceNbrList));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个联动单位", notes = "根据sequenceNbr查询单个联动单位")
+    public ResponseModel<LinkageUnitDto> selectOne(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(linkageUnitServiceImpl.queryOne(sequenceNbr));
+    }
+
+    /**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/page")
+    @ApiOperation(httpMethod = "GET", value = "联动单位分页查询", notes = "联动单位分页查询")
+    public ResponseModel<Page<LinkageUnitDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
+            (value = "size") int size, String unitName,String linkageUnitTypeCode, String linkageUnitType, String inAgreement, String emergencyLinkageUnitCode,
+                                                            @RequestParam(required = false) String bizOrgCode,
+                                                            @RequestParam(required = false) String companyCode) {
+        ReginParams reginParam = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        if ( null == reginParam || StringUtils.isEmpty(reginParam.getPersonIdentity().getBizOrgCode())) {
+            return ResponseHelper.buildResponse(null);
+        }
+        if (StringUtils.isNotEmpty(companyCode) && StringUtils.isEmpty(bizOrgCode)) {
+            OrgUsr orgUsr = orgUsrMapper.queryByCompanyCode(companyCode);
+            if (ObjectUtils.isNotEmpty(orgUsr)) {
+                bizOrgCode = orgUsr.getBizOrgCode();
+            }
+        }
+        if (StringUtils.isEmpty(bizOrgCode)) {
+            bizOrgCode = reginParam.getPersonIdentity().getBizOrgCode();
+        }
+    	Page<LinkageUnitDto> page = new Page<LinkageUnitDto>();
+        page.setCurrent(current);
+        page.setSize(size);
+    	Page<LinkageUnitDto> linkageUnitDtoPage = linkageUnitServiceImpl.queryForLinkageUnitPage(page, false,
+                unitName, linkageUnitTypeCode,linkageUnitType, emergencyLinkageUnitCode,inAgreement, bizOrgCode);
+        return ResponseHelper.buildResponse(linkageUnitDtoPage);
+    }
+
+    /**
+     * 列表全部数据查询
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "联动单位列表全部数据查询", notes = "联动单位列表全部数据查询")
+    @GetMapping(value = "/list")
+    public ResponseModel<List<LinkageUnitDto>> selectForList() {
+        return ResponseHelper.buildResponse(linkageUnitServiceImpl.queryForLinkageUnitList(false));
+    }
+    /**
+     * 列表全部数据查询
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "联动单位列表树及统计", notes = "联动单位列表树及统计")
+    @GetMapping(value = "/getLinkageUnitTree")
+    public ResponseModel<Object> getLinkageUnitTree(@RequestParam String type, @RequestParam String rootName, @RequestParam(required = false) String bizOrgCode) {
+        return ResponseHelper.buildResponse(linkageUnitService.getEmergencyLinkageUnitCodeGroupBy(type,rootName, bizOrgCode));
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgDepartmentController.java

+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import java.util.Arrays;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
+import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentFormDto;
+import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * @author fengwang
+ * @date 2021-06-21.
+ */
+@RestController
+@Api(tags = "部门Api")
+@RequestMapping(value = "/org-department")
+public class OrgDepartmentController {
+    @Autowired
+    OrgUsrServiceImpl iOrgUsrService;
+  
+
+    /**
+     * 新增部门信息
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    @ApiOperation(httpMethod = "POST", value = "新增部门信息", notes = "新增部门信息")
+    public ResponseModel<Object> saveOrgUsr(HttpServletRequest request, @RequestBody OrgDepartmentDto OrgDepartmentVo) throws Exception {
+    	OrgDepartmentVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_DEPARTMENT);
+
+        return ResponseHelper.buildResponse(iOrgUsrService.saveOrgDepartment(OrgDepartmentVo));
+    }
+
+    /**
+     * 根据id删除
+     *
+     * @param id
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
+    @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
+    public ResponseModel<Object> deleteById(HttpServletRequest request, @PathVariable Long id) {
+        // 删除时，只作逻辑删除
+        iOrgUsrService.update(new UpdateWrapper<OrgUsr>().eq("sequence_nbr", id).set("is_delete", CommonConstant.IS_DELETE_01));
+        return ResponseHelper.buildResponse(null);
+    }
+
+
+    /**
+     * 更新部门数据
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/{id}", method = RequestMethod.PUT)
+    @ApiOperation(httpMethod = "PUT", value = "更新部门数据", notes = "更新部门数据")
+    public ResponseModel<Object> updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgDepartmentDto OrgDepartmentVo, @PathVariable Long id) throws Exception {
+    	OrgDepartmentVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_DEPARTMENT);
+
+        return ResponseHelper.buildResponse(iOrgUsrService.updateByIdOrgDepartment(OrgDepartmentVo, id));
+    }
+
+
+    /**
+     * 根据id查询单位
+     *
+     * @param id
+     * @return
+     */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "获取部门详情", notes = "获取部门详情")
+    public ResponseModel<OrgDepartmentFormDto> selectById(HttpServletRequest request, @PathVariable Long id) throws Exception {
+        return ResponseHelper.buildResponse(iOrgUsrService.selectDepartmentById(id));
+    }
+
+
+    /**
+     * 列表分页查询
+     *
+     * @return
+     */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
+    public IPage<OrgUsr> listPage(String pageNum, String pageSize, OrgUsr orgUsr) {
+        Page<OrgUsr> pageBean;
+        QueryWrapper<OrgUsr> orgUsrQueryWrapper = new QueryWrapper<>();
+        Class<? extends OrgUsr> aClass = orgUsr.getClass();
+        Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
+            try {
+                field.setAccessible(true);
+                Object o = field.get(orgUsr);
+                if (o != null) {
+                    Class<?> type = field.getType();
+                    String name = NameUtils.camel2Underline(field.getName());
+                    if (type.equals(Integer.class)) {
+                        Integer fileValue = (Integer) field.get(orgUsr);
+                        orgUsrQueryWrapper.eq(name, fileValue);
+                    } else if (type.equals(Long.class)) {
+                        Long fileValue = (Long) field.get(orgUsr);
+                        orgUsrQueryWrapper.eq(name, fileValue);
+                    } else if (type.equals(String.class)) {
+                        String fileValue = (String) field.get(orgUsr);
+                        orgUsrQueryWrapper.eq(name, fileValue);
+                    } else {
+                        String fileValue = (String) field.get(orgUsr);
+                        orgUsrQueryWrapper.eq(name, fileValue);
+                    }
+                }
+            } catch (Exception e) {
+            }
+        });
+        IPage<OrgUsr> page;
+        if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
+            pageBean = new Page<>(0, Long.MAX_VALUE);
+        } else {
+            pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        }
+        page = iOrgUsrService.page(pageBean, orgUsrQueryWrapper);
+        return page;
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrAuthController.java

+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import java.util.Arrays;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
+import com.yeejoin.amos.boot.module.common.api.entity.OrgUsrAuth;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrAuthServiceImpl;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+
+/**
+* 
+*
+* @author tb
+* @date 2021-06-18
+*/
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/org-usr-auth")
+public class OrgUsrAuthController extends BaseController {
+
+    @Autowired
+    OrgUsrAuthServiceImpl iOrgUsrAuthService;
+
+    /**
+    * 新增
+    * @return
+    */
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+    public boolean saveOrgUsrAuth(HttpServletRequest request, @RequestBody OrgUsrAuth orgUsrAuth){
+        return iOrgUsrAuthService.save(orgUsrAuth);
+    }
+
+    /**
+    * 根据id删除
+    * @param id
+    * @return
+    */
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
+    @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
+    public boolean deleteById(HttpServletRequest request, @PathVariable Long id){
+        return iOrgUsrAuthService.removeById(id);
+    }
+
+
+
+
+    /**
+    * 修改
+    * @return
+    */
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
+    @ApiOperation(httpMethod = "PUT", value = "修改", notes = "修改")
+    public boolean updateByIdOrgUsrAuth(HttpServletRequest request, @RequestBody OrgUsrAuth orgUsrAuth){
+        return iOrgUsrAuthService.updateById(orgUsrAuth);
+    }
+
+
+
+    /**
+    * 根据id查询
+    * @param id
+    * @return
+    */
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
+    public OrgUsrAuth selectById(HttpServletRequest request, @PathVariable Long id){
+        return iOrgUsrAuthService.getById(id);
+    }
+
+
+
+    /**
+    * 列表分页查询
+    * @return
+    */
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
+    public IPage<OrgUsrAuth> listPage(String pageNum,String pageSize, OrgUsrAuth orgUsrAuth){
+
+        Page<OrgUsrAuth> pageBean;
+        QueryWrapper<OrgUsrAuth> orgUsrAuthQueryWrapper = new QueryWrapper<>();
+        Class<? extends OrgUsrAuth> aClass = orgUsrAuth.getClass();
+        Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
+            try {
+                field.setAccessible(true);
+                Object o = field.get(orgUsrAuth);
+                if (o != null) {
+                    Class<?> type = field.getType();
+                    String name = NameUtils.camel2Underline(field.getName());
+                    if (type.equals(Integer.class)) {
+                        Integer fileValue = (Integer) field.get(orgUsrAuth);
+                        orgUsrAuthQueryWrapper.eq(name, fileValue);
+                    } else if (type.equals(Long.class)) {
+                        Long fileValue = (Long) field.get(orgUsrAuth);
+                        orgUsrAuthQueryWrapper.eq(name, fileValue);
+                    } else if (type.equals(String.class)) {
+                        String fileValue = (String) field.get(orgUsrAuth);
+                        orgUsrAuthQueryWrapper.eq(name, fileValue);
+                    } else {
+                        String fileValue = (String) field.get(orgUsrAuth);
+                        orgUsrAuthQueryWrapper.eq(name, fileValue);
+                    }
+                }
+            } catch (Exception e) {
+            }
+        });
+        IPage<OrgUsrAuth> page;
+        if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
+            pageBean = new Page<>(0, Long.MAX_VALUE);
+        } else {
+            pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        }
+        page = iOrgUsrAuthService.page(pageBean, orgUsrAuthQueryWrapper);
+            return page;
+        }
+    }
+

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/RescueEquipmentController.java

+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+
+import java.util.HashMap;
+import java.util.List;
+
+import com.yeejoin.amos.boot.module.common.biz.service.impl.RescueEquipmentServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.RescueEquipmentDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 救援装备
+ *
+ * @author system_generator
+ * @date 2021-07-23
+ */
+@RestController
+@Api(tags = "救援装备Api")
+@RequestMapping(value = "/common/rescue-equipment")
+public class RescueEquipmentController extends BaseController {
+
+    @Autowired
+    RescueEquipmentServiceImpl rescueEquipmentServiceImpl;
+
+    /**
+     * 新增救援装备
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增救援装备", notes = "新增救援装备")
+    public ResponseModel<RescueEquipmentDto> save(@RequestBody RescueEquipmentDto model) {
+        model = rescueEquipmentServiceImpl.createWithModel(model);
+        return ResponseHelper.buildResponse(model);
+    }
+
+    /**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PutMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新救援装备", notes = "根据sequenceNbr更新救援装备")
+    public ResponseModel<RescueEquipmentDto> updateBySequenceNbrRescueEquipment(@RequestBody RescueEquipmentDto model
+            , @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        model.setSequenceNbr(sequenceNbr);
+        return ResponseHelper.buildResponse(rescueEquipmentServiceImpl.updateWithModel(model));
+    }
+
+    /**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除救援装备", notes = "根据sequenceNbr删除救援装备")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request,
+                                                      @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(rescueEquipmentServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个救援装备", notes = "根据sequenceNbr查询单个救援装备")
+    public ResponseModel<RescueEquipmentDto> selectOne(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(rescueEquipmentServiceImpl.queryBySeq(sequenceNbr));
+    }
+
+    /**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/page")
+    @ApiOperation(httpMethod = "GET", value = "救援装备分页查询", notes = "救援装备分页查询")
+    public ResponseModel<Page<RescueEquipmentDto>> queryForPage(@RequestParam(value = "current") int current,
+                                                                @RequestParam(value = "size") int size,
+                                                                Long companyId,
+                                                                String vehicleTypeCode) {
+        Page<RescueEquipmentDto> page = new Page<RescueEquipmentDto>();
+        page.setCurrent(current);
+        page.setSize(size);
+        return ResponseHelper.buildResponse(rescueEquipmentServiceImpl.queryForRescueEquipmentPage(page, false,
+                companyId, vehicleTypeCode));
+    }
+
+    /**
+     * 列表全部数据查询
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "救援装备列表全部数据查询", notes = "救援装备列表全部数据查询")
+    @GetMapping(value = "/list")
+    public ResponseModel<List<RescueEquipmentDto>> selectForList() {
+        return ResponseHelper.buildResponse(rescueEquipmentServiceImpl.queryForRescueEquipmentList());
+    }
+
+    /**
+     * 批量删除救援装备
+     *
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/delete_batch")
+    @ApiOperation(httpMethod = "DELETE", value = "批量删除合同信息", notes = "批量删除合同信息")
+    public ResponseModel<Boolean> batchDeleteBySequenceNbrList(@RequestParam(value = "sequenceNbrList") List<Long> sequenceNbrList) {
+        return ResponseHelper.buildResponse(rescueEquipmentServiceImpl.batchDelete(sequenceNbrList));
+    }
+
+    /**
+     * 查询没有数据的岗位类型
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "查询没有数据的岗位类型", notes = "查询没有数据的岗位类型")
+    @GetMapping(value = "/vehicle_list")
+    public ResponseModel<HashMap<Object, Object>> getRescueEquipmentList(Long companyId) throws Exception {
+        return ResponseHelper.buildResponse(rescueEquipmentServiceImpl.getRescueEquipmentList(companyId));
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/SourceFileController.java

+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.dto.SourceFileDto;
+import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.SourceFileServiceImpl;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 公共附件
+ *
+ * @author system_generator
+ * @date 2021-07-16
+ */
+@RestController
+@Api(tags = "公共附件Api")
+@RequestMapping(value = "/common/source-file")
+public class SourceFileController extends BaseController {
+
+    @Autowired
+    SourceFileServiceImpl sourceFileServiceImpl;
+
+    /**
+     * 新增公共附件
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增公共附件", notes = "新增公共附件")
+    public ResponseModel<SourceFileDto> save(@RequestBody SourceFileDto model) {
+        model = sourceFileServiceImpl.createWithModel(model);
+        return ResponseHelper.buildResponse(model);
+    }
+
+    /**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PutMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新公共附件", notes = "根据sequenceNbr更新公共附件")
+    public ResponseModel<SourceFileDto> updateBySequenceNbrSourceFile(@RequestBody SourceFileDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        model.setSequenceNbr(sequenceNbr);
+        return ResponseHelper.buildResponse(sourceFileServiceImpl.updateWithModel(model));
+    }
+
+    /**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除公共附件", notes = "根据sequenceNbr删除公共附件")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(sourceFileServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个公共附件", notes = "根据sequenceNbr查询单个公共附件")
+    public ResponseModel<SourceFileDto> selectOne(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(sourceFileServiceImpl.queryBySeq(sequenceNbr));
+    }
+
+    /**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/page")
+    @ApiOperation(httpMethod = "GET", value = "公共附件分页查询", notes = "公共附件分页查询")
+    public ResponseModel<Page<SourceFileDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
+            (value = "size") int size) {
+        Page<SourceFileDto> page = new Page<SourceFileDto>();
+        page.setCurrent(current);
+        page.setSize(size);
+        return ResponseHelper.buildResponse(sourceFileServiceImpl.queryForSourceFilePage(page));
+    }
+
+    /**
+     * 列表全部数据查询
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "公共附件列表全部数据查询", notes = "公共附件列表全部数据查询")
+    @GetMapping(value = "/list")
+    public ResponseModel<List<SourceFileDto>> selectForList() {
+        return ResponseHelper.buildResponse(sourceFileServiceImpl.queryForSourceFileList());
+    }
+
+    /**
+     * 附件批量保存
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "附件批量保存", notes = "附件批量保存")
+    @PostMapping(value = "/saveBatch")
+    public ResponseModel<List<SourceFile>> saveSourceFile(@RequestBody List<SourceFile> sourceFiles,
+                                                          @RequestParam Long sourceId) {
+        return ResponseHelper.buildResponse(sourceFileServiceImpl.saveSourceFile(sourceId, sourceFiles));
+    }
+
+    /**
+     * 根据sourceId查询
+     *
+     * @param sourceId 附件所属者id
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/{sourceId}/list")
+    @ApiOperation(httpMethod = "GET", value = "根据sourceId查询公共附件列表", notes = "根据sourceId查询公共附件列表")
+    public ResponseModel<List<SourceFile>> queryBySourceId(@PathVariable Long sourceId) {
+        return ResponseHelper.buildResponse(sourceFileServiceImpl.findBySourceId(sourceId));
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/SpecialPositionStaffController.java

+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+
+import java.util.HashMap;
+import java.util.List;
+
+import com.yeejoin.amos.boot.module.common.biz.service.impl.SpecialPositionStaffServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.SpecialPositionStaffDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 特岗人员
+ *
+ * @author system_generator
+ * @date 2021-07-23
+ */
+@RestController
+@Api(tags = "特岗人员Api")
+@RequestMapping(value = "/common/special-position-staff")
+public class SpecialPositionStaffController extends BaseController {
+
+    @Autowired
+    SpecialPositionStaffServiceImpl specialPositionStaffServiceImpl;
+
+    /**
+     * 新增特岗人员
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增特岗人员", notes = "新增特岗人员")
+    public ResponseModel<SpecialPositionStaffDto> save(@RequestBody SpecialPositionStaffDto model) {
+        model = specialPositionStaffServiceImpl.createWithModel(model);
+        return ResponseHelper.buildResponse(model);
+    }
+
+    /**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PutMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新特岗人员", notes = "根据sequenceNbr更新特岗人员")
+    public ResponseModel<SpecialPositionStaffDto> updateBySequenceNbrSpecialPositionStaff(@RequestBody SpecialPositionStaffDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        model.setSequenceNbr(sequenceNbr);
+        return ResponseHelper.buildResponse(specialPositionStaffServiceImpl.updateWithModel(model));
+    }
+
+    /**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除特岗人员", notes = "根据sequenceNbr删除特岗人员")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request,
+                                                      @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(specialPositionStaffServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个特岗人员", notes = "根据sequenceNbr查询单个特岗人员")
+    public ResponseModel<SpecialPositionStaffDto> selectOne(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(specialPositionStaffServiceImpl.queryBySeq(sequenceNbr));
+    }
+
+    /**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/page")
+    @ApiOperation(httpMethod = "GET", value = "特岗人员分页查询", notes = "特岗人员分页查询")
+    public ResponseModel<Page<SpecialPositionStaffDto>> queryForPage(@RequestParam(value = "current") int current,
+                                                                     @RequestParam(value = "size") int size,
+                                                                     Long companyId,
+                                                                     String positionNameCode) {
+        Page<SpecialPositionStaffDto> page = new Page<SpecialPositionStaffDto>();
+        page.setCurrent(current);
+        page.setSize(size);
+        return ResponseHelper.buildResponse(specialPositionStaffServiceImpl.queryForSpecialPositionStaffPage(page,
+                companyId,
+                false,
+                positionNameCode));
+    }
+
+    /**
+     * 列表全部数据查询
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "特岗人员列表全部数据查询", notes = "特岗人员列表全部数据查询")
+    @GetMapping(value = "/list")
+    public ResponseModel<List<SpecialPositionStaffDto>> selectForList() {
+        return ResponseHelper.buildResponse(specialPositionStaffServiceImpl.queryForSpecialPositionStaffList());
+    }
+
+    /**
+     * 批量删除特岗人员
+     *
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/delete_batch")
+    @ApiOperation(httpMethod = "DELETE", value = "批量删除合同信息", notes = "批量删除合同信息")
+    public ResponseModel<Boolean> batchDeleteBySequenceNbrList(@RequestParam(value = "sequenceNbrList") List<Long> sequenceNbrList) {
+        return ResponseHelper.buildResponse(specialPositionStaffServiceImpl.batchDelete(sequenceNbrList));
+    }
+
+    /**
+     * 查询没有数据的岗位类型
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "查询没有数据的岗位类型", notes = "查询没有数据的岗位类型")
+    @GetMapping(value = "/gwmc_list")
+    public ResponseModel<HashMap<Object, Object>> getSpecialPositionStaffList(Long companyId) throws Exception {
+        return ResponseHelper.buildResponse(specialPositionStaffServiceImpl.getSpecialPositionStaffList(companyId));
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/WaterResourceCraneController.java

+package com.yeejoin.amos.boot.module.common.biz.controller;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceCraneDto;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceCraneServiceImpl;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+
+/**
+* 
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/jcs/water-resource-crane")
+public class WaterResourceCraneController extends BaseController {
+
+    @Autowired
+    WaterResourceCraneServiceImpl waterResourceCraneServiceImpl;
+
+    /**
+             * 新增
+    * @return
+    */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<WaterResourceCraneDto> save(@RequestBody WaterResourceCraneDto model)
+	{
+	    model=waterResourceCraneServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+	/**
+             * 根据sequenceNbr更新
+    * @param sequenceNbr 主键
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<WaterResourceCraneDto> updateBySequenceNbrWaterResourceCrane(@RequestBody WaterResourceCraneDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(waterResourceCraneServiceImpl.updateWithModel(model));
+	}
+	/**
+             * 根据sequenceNbr删除
+    * @param sequenceNbr 主键
+    * @return
+    */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(waterResourceCraneServiceImpl.removeById(sequenceNbr));
+    }
+    /**
+             * 根据sequenceNbr查询
+    * @param sequenceNbr  主键
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<WaterResourceCraneDto> seleteOne(@PathVariable Long sequenceNbr)
+	{
+	    return ResponseHelper.buildResponse(waterResourceCraneServiceImpl.queryBySeq(sequenceNbr));
+	}
+	/**
+             * 列表分页查询
+    *@param current 当前页
+    *@param current 每页大小
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<WaterResourceCraneDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
+	{
+	    Page<WaterResourceCraneDto> page=new Page<WaterResourceCraneDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(waterResourceCraneServiceImpl.queryForWaterResourceCranePage(page));
+	}
+	/**
+	*列表全部数据查询
+	*@return
+	*/
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<WaterResourceCraneDto>>  selectForList()
+	{
+	    return ResponseHelper.buildResponse(waterResourceCraneServiceImpl.queryForWaterResourceCraneList());
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/WaterResourceHydrantController.java

+package com.yeejoin.amos.boot.module.common.biz.controller;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceHydrantDto;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceHydrantServiceImpl;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+
+/**
+* 
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/jcs/water-resource-hydrant")
+public class WaterResourceHydrantController extends BaseController {
+
+    @Autowired
+    WaterResourceHydrantServiceImpl waterResourceHydrantServiceImpl;
+
+    /**
+             * 新增
+    * @return
+    */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<WaterResourceHydrantDto> save(@RequestBody WaterResourceHydrantDto model)
+	{
+	    model=waterResourceHydrantServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+	/**
+             * 根据sequenceNbr更新
+    * @param sequenceNbr 主键
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<WaterResourceHydrantDto> updateBySequenceNbrWaterResourceHydrant(@RequestBody WaterResourceHydrantDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(waterResourceHydrantServiceImpl.updateWithModel(model));
+	}
+	/**
+             * 根据sequenceNbr删除
+    * @param sequenceNbr 主键
+    * @return
+    */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(waterResourceHydrantServiceImpl.removeById(sequenceNbr));
+    }
+    /**
+             * 根据sequenceNbr查询
+    * @param sequenceNbr  主键
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<WaterResourceHydrantDto> seleteOne(@PathVariable Long sequenceNbr)
+	{
+	    return ResponseHelper.buildResponse(waterResourceHydrantServiceImpl.queryBySeq(sequenceNbr));
+	}
+	/**
+             * 列表分页查询
+    *@param current 当前页
+    *@param current 每页大小
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<WaterResourceHydrantDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
+	{
+	    Page<WaterResourceHydrantDto> page=new Page<WaterResourceHydrantDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(waterResourceHydrantServiceImpl.queryForWaterResourceHydrantPage(page));
+	}
+	/**
+	*列表全部数据查询
+	*@return
+	*/
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<WaterResourceHydrantDto>>  selectForList()
+	{
+	    return ResponseHelper.buildResponse(waterResourceHydrantServiceImpl.queryForWaterResourceHydrantList());
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/WaterResourceIndexController.java

+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceIndexServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceIndexDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 消防水源物联参数
+ *
+ * @author litw
+ * @date 2021-11-02
+ */
+@RestController
+@Api(tags = "消防水源物联参数Api")
+@RequestMapping(value = "/water-resource-index")
+public class WaterResourceIndexController extends BaseController {
+
+    @Autowired
+    WaterResourceIndexServiceImpl waterResourceIndexServiceImpl;
+
+    /**
+     * 新增消防水源物联参数
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增消防水源物联参数", notes = "新增消防水源物联参数")
+	public ResponseModel<WaterResourceIndexDto> save(@RequestBody WaterResourceIndexDto model) {
+	    model = waterResourceIndexServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新消防水源物联参数", notes = "根据sequenceNbr更新消防水源物联参数")
+	public ResponseModel<WaterResourceIndexDto> updateBySequenceNbrWaterResourceIndex(@RequestBody WaterResourceIndexDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(waterResourceIndexServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除消防水源物联参数", notes = "根据sequenceNbr删除消防水源物联参数")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(waterResourceIndexServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个消防水源物联参数",  notes = "根据sequenceNbr查询单个消防水源物联参数")
+	public ResponseModel<WaterResourceIndexDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(waterResourceIndexServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "消防水源物联参数分页查询",  notes = "消防水源物联参数分页查询")
+	public ResponseModel<Page<WaterResourceIndexDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<WaterResourceIndexDto> page = new Page<WaterResourceIndexDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(waterResourceIndexServiceImpl.queryForWaterResourceIndexPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "消防水源物联参数列表全部数据查询",   notes = "消防水源物联参数列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<WaterResourceIndexDto>> selectForList() {
+	    return ResponseHelper.buildResponse(waterResourceIndexServiceImpl.queryForWaterResourceIndexList());
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/WaterResourceIotController.java

+package com.yeejoin.amos.boot.module.common.biz.controller;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceIotDto;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceIotServiceImpl;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+
+/**
+* 
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/jcs/water-resource-iot")
+public class WaterResourceIotController extends BaseController {
+
+    @Autowired
+    WaterResourceIotServiceImpl waterResourceIotServiceImpl;
+
+    /**
+             * 新增
+    * @return
+    */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<WaterResourceIotDto> save(@RequestBody WaterResourceIotDto model)
+	{
+	    model=waterResourceIotServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+	/**
+             * 根据sequenceNbr更新
+    * @param sequenceNbr 主键
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<WaterResourceIotDto> updateBySequenceNbrWaterResourceIot(@RequestBody WaterResourceIotDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(waterResourceIotServiceImpl.updateWithModel(model));
+	}
+	/**
+             * 根据sequenceNbr删除
+    * @param sequenceNbr 主键
+    * @return
+    */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(waterResourceIotServiceImpl.removeById(sequenceNbr));
+    }
+    /**
+             * 根据sequenceNbr查询
+    * @param sequenceNbr  主键
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<WaterResourceIotDto> seleteOne(@PathVariable Long sequenceNbr)
+	{
+	    return ResponseHelper.buildResponse(waterResourceIotServiceImpl.queryBySeq(sequenceNbr));
+	}
+	/**
+             * 列表分页查询
+    *@param current 当前页
+    *@param current 每页大小
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<WaterResourceIotDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
+	{
+	    Page<WaterResourceIotDto> page=new Page<WaterResourceIotDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(waterResourceIotServiceImpl.queryForWaterResourceIotPage(page));
+	}
+	/**
+	*列表全部数据查询
+	*@return
+	*/
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<WaterResourceIotDto>>  selectForList()
+	{
+	    return ResponseHelper.buildResponse(waterResourceIotServiceImpl.queryForWaterResourceIotList());
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/WaterResourceNaturalController.java

+package com.yeejoin.amos.boot.module.common.biz.controller;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceNaturalDto;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceNaturalServiceImpl;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+
+/**
+* 
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/jcs/water-resource-natural")
+public class WaterResourceNaturalController extends BaseController {
+
+    @Autowired
+    WaterResourceNaturalServiceImpl waterResourceNaturalServiceImpl;
+
+    /**
+             * 新增
+    * @return
+    */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<WaterResourceNaturalDto> save(@RequestBody WaterResourceNaturalDto model)
+	{
+	    model=waterResourceNaturalServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+	/**
+             * 根据sequenceNbr更新
+    * @param sequenceNbr 主键
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<WaterResourceNaturalDto> updateBySequenceNbrWaterResourceNatural(@RequestBody WaterResourceNaturalDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(waterResourceNaturalServiceImpl.updateWithModel(model));
+	}
+	/**
+             * 根据sequenceNbr删除
+    * @param sequenceNbr 主键
+    * @return
+    */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(waterResourceNaturalServiceImpl.removeById(sequenceNbr));
+    }
+    /**
+             * 根据sequenceNbr查询
+    * @param sequenceNbr  主键
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<WaterResourceNaturalDto> seleteOne(@PathVariable Long sequenceNbr)
+	{
+	    return ResponseHelper.buildResponse(waterResourceNaturalServiceImpl.queryBySeq(sequenceNbr));
+	}
+	/**
+             * 列表分页查询
+    *@param current 当前页
+    *@param current 每页大小
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<WaterResourceNaturalDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
+	{
+	    Page<WaterResourceNaturalDto> page=new Page<WaterResourceNaturalDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(waterResourceNaturalServiceImpl.queryForWaterResourceNaturalPage(page));
+	}
+	/**
+	*列表全部数据查询
+	*@return
+	*/
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<WaterResourceNaturalDto>>  selectForList()
+	{
+	    return ResponseHelper.buildResponse(waterResourceNaturalServiceImpl.queryForWaterResourceNaturalList());
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/WaterResourcePoolController.java

+package com.yeejoin.amos.boot.module.common.biz.controller;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourcePoolDto;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourcePoolServiceImpl;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+
+/**
+* 
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/jcs/water-resource-pool")
+public class WaterResourcePoolController extends BaseController {
+
+    @Autowired
+    WaterResourcePoolServiceImpl waterResourcePoolServiceImpl;
+
+    /**
+             * 新增
+    * @return
+    */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<WaterResourcePoolDto> save(@RequestBody WaterResourcePoolDto model)
+	{
+	    model=waterResourcePoolServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+	/**
+             * 根据sequenceNbr更新
+    * @param sequenceNbr 主键
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<WaterResourcePoolDto> updateBySequenceNbrWaterResourcePool(@RequestBody WaterResourcePoolDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(waterResourcePoolServiceImpl.updateWithModel(model));
+	}
+	/**
+             * 根据sequenceNbr删除
+    * @param sequenceNbr 主键
+    * @return
+    */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(waterResourcePoolServiceImpl.removeById(sequenceNbr));
+    }
+    /**
+             * 根据sequenceNbr查询
+    * @param sequenceNbr  主键
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<WaterResourcePoolDto> seleteOne(@PathVariable Long sequenceNbr)
+	{
+	    return ResponseHelper.buildResponse(waterResourcePoolServiceImpl.queryBySeq(sequenceNbr));
+	}
+	/**
+             * 列表分页查询
+    *@param current 当前页
+    *@param current 每页大小
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<WaterResourcePoolDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
+	{
+	    Page<WaterResourcePoolDto> page=new Page<WaterResourcePoolDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(waterResourcePoolServiceImpl.queryForWaterResourcePoolPage(page));
+	}
+	/**
+	*列表全部数据查询
+	*@return
+	*/
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<WaterResourcePoolDto>>  selectForList()
+	{
+	    return ResponseHelper.buildResponse(waterResourcePoolServiceImpl.queryForWaterResourcePoolList());
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/dao/ESOrgUsrDtoRepository.java

+package com.yeejoin.amos.boot.module.common.biz.dao;
+
+import com.yeejoin.amos.boot.module.common.api.dto.ESOrgUsrDto;
+import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 
+ * <pre>
+ * 单位ES数据查询
+ * </pre>
+ *
+ */
+@Repository
+public interface ESOrgUsrDtoRepository extends ElasticsearchRepository<ESOrgUsrDto, Long> {
+
+	
+   
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/enums/DataDictionaryTypeEnum.java

+package com.yeejoin.amos.boot.module.common.biz.enums;
+
+public enum DataDictionaryTypeEnum {
+
+    PERSON_TYPE("人员类型", "DLRYLX");
+
+    private String name;
+    private String code;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    DataDictionaryTypeEnum(String name, String code) {
+        this.name = name;
+        this.code = code;
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/enums/DynamicGroupCodeEnum.java

+package com.yeejoin.amos.boot.module.common.biz.enums;
+
+public enum DynamicGroupCodeEnum {
+
+    JCS_PERSON("机场人员", "246");
+
+    private String name;
+    private String code;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    DynamicGroupCodeEnum(String name, String code) {
+        this.name = name;
+        this.code = code;
+    }
+}