迁移common 到jcs

amos-boot-jcs-system/pom.xml

@@ -17,11 +17,11 @@
 			<artifactId>amos-boot-module-jcs-biz</artifactId>
 			<version>${amos-biz-boot.version}</version>
 		</dependency>
-		<dependency>
+		<!-- <dependency>
 			<groupId>com.amosframework.boot</groupId>
 			<artifactId>amos-boot-module-common-biz</artifactId>
 			<version>${amos-biz-boot.version}</version>
-		</dependency>
+		</dependency> -->
   </dependencies>
 
     <build>

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/FireChemicalDto.java

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+* 危化品
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="FireChemicalDto", description="危化品")
+public class FireChemicalDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+
+    @ApiModelProperty(value = "casNo")
+    private String casNo;
+
+    @ApiModelProperty(value = "国际危险号")
+    private String dangerId;
+
+    @ApiModelProperty(value = "防护处理")
+    private String defendWay;
+
+    @ApiModelProperty(value = "处理措施")
+    private String dispose;
+
+    @ApiModelProperty(value = "英文名")
+    private String englishName;
+
+    @ApiModelProperty(value = "分子式")
+    private String formula;
+
+    @ApiModelProperty(value = "主要成分")
+    private String ingredient;
+
+    @ApiModelProperty(value = "泄漏处理")
+    private String leakWay;
+
+    @ApiModelProperty(value = "中文名")
+    private String name;
+
+    @ApiModelProperty(value = "性状")
+    private String property;
+
+    @ApiModelProperty(value = "贮藏方法")
+    private String store;
+
+    @ApiModelProperty(value = "症状")
+    private String symptom;
+
+    @ApiModelProperty(value = "禁忌物/禁忌")
+    private String tabu;
+
+    @ApiModelProperty(value = "类型code")
+    private String typeCode;
+
+    @ApiModelProperty(value = "类型名称")
+    private String type;
+
+    @ApiModelProperty(value = "国标号")
+    private String un;
+
+    @ApiModelProperty(value = "化学品图片")
+    private String image;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "操作人名称")
+    private String recUserName;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/FireExpertsDto.java

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * @author system_generator
+ * @date 2021-06-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "FireExpertsDto", description = "")
+public class FireExpertsDto extends BaseDto {
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "证件类型")
+    private String certificatesType;
+
+    @ApiModelProperty(value = "证件类型code")
+    private String certificatesTypeCode;
+
+    @ApiModelProperty(value = "证件号")
+    private Long certificatesNum;
+
+    @ApiModelProperty(value = "单位")
+    private String companyName;
+
+    @ApiModelProperty(value = "性别")
+    private String gender;
+
+    @ApiModelProperty(value = "名族")
+    private String nation;
+
+    @ApiModelProperty(value = "籍贯")
+    private String nativePlace;
+
+    @ApiModelProperty(value = "现居住地")
+    private String residence;
+
+    @ApiModelProperty(value = "现居住地")
+    private String residenceDetails;
+
+    @ApiModelProperty(value = "政治面貌")
+    private String politicalOutlook;
+
+    @ApiModelProperty(value = "办公用 电话")
+    private String officePhone;
+
+    @ApiModelProperty(value = "移动电话")
+    private String mobilePhone;
+
+    @ApiModelProperty(value = "最高学历")
+    private String highestEducation;
+
+    @ApiModelProperty(value = "岗位名称")
+    private String jobs;
+
+    @ApiModelProperty(value = "岗位名称code")
+    private String jobsCode;
+
+    @ApiModelProperty(value = "消防专家领域")
+    private String expert;
+
+    @ApiModelProperty(value = "消防专家领域code")
+    private String expertCode;
+
+    @ApiModelProperty(value = "人员照片")
+    private String personnelPhotos;
+
+    @ApiModelProperty(value = "资质证书")
+    private String qualificationCertificate;
+
+    @ApiModelProperty(value = "人员状态，在职/离职")
+    private String state;
+
+    @ApiModelProperty(value = "人员状态，在职/离职code")
+    private String stateCode;
+
+    @ApiModelProperty(value = "消防机构id")
+    private Long fireTeamId;
+
+    @ApiModelProperty(value = "消防机构name")
+    private Long fireTeamName;
+
+    @ApiModelProperty(value = "备注")
+    private String note;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "操作人名称")
+    private String recUserName;
+
+    @ApiModelProperty(value = "出生日期")
+    private Date birthdayTime;
+
+    @ApiModelProperty(value = "年龄")
+    private Integer age;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/FireStationDto.java

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+/**
+* 微型消防站
+*
+* @author system_generator
+* @date 2021-06-28
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="FireStationDto", description="微型消防站")
+public class FireStationDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+
+    @ApiModelProperty(value = "微型消防站名称")
+    private String name;
+
+    @ApiModelProperty(value = "所在建筑物id")
+    private String whereBuildingId;
+
+    @ApiModelProperty(value = "所在建筑物名称")
+    private String whereBuilding;
+
+    @ApiModelProperty(value = "装备简要情况")
+    private String equipmentBrief;
+
+    @ApiModelProperty(value = "地址")
+    private String address;
+
+    @ApiModelProperty(value = "经度")
+    private Double longitude;
+
+    @ApiModelProperty(value = "纬度")
+    private Double latitude;
+
+    @ApiModelProperty(value = "行政区区划名称")
+    private String administrativeDivisions;
+
+    @ApiModelProperty(value = "行政区区划编号")
+    private String administrativeDivisionsCode;
+
+    @ApiModelProperty(value = "值班室电话")
+    private String dutyRoomTelephone;
+
+    @ApiModelProperty(value = "负责人名称")
+    private String personChargeName;
+
+    @ApiModelProperty(value = "负责人电话")
+    private String personChargeTelephone;
+
+    @ApiModelProperty(value = "单位id")
+    private Long bizCompanyId;
+
+    @ApiModelProperty(value = "所属单位名称")
+    private String bizCompany;
+
+    @ApiModelProperty(value = "所属单位code")
+    private String bizCompanyCode;
+
+    @ApiModelProperty(value = "建造日期")
+    private Date buildTime;
+
+    @ApiModelProperty(value = "启用日期")
+    private Date enableTime;
+
+    @ApiModelProperty(value = "图片信息")
+    private String img;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "操作人名称")
+    private String recUserName;
+    
+    @ApiModelProperty(value = "战备装备数量")
+    private Integer eqNum;
+    
+    @ApiModelProperty(value = "战备人数量")
+    private Integer userNum;
+    
+    @ApiModelProperty(value = "战备车辆数量")
+    private Integer carNum;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/FireChemical.java

+package com.yeejoin.amos.boot.module.jcs.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+/**
+* 危化品
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("cb_fire_chemical")
+@ApiModel(value="FireChemical对象", description="危化品")
+public class FireChemical extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "casNo")
+    private String casNo;
+
+    @ApiModelProperty(value = "国际危险号")
+    private String dangerId;
+
+    @ApiModelProperty(value = "防护处理")
+    private String defendWay;
+
+    @ApiModelProperty(value = "处理措施")
+    private String dispose;
+
+    @ApiModelProperty(value = "英文名")
+    private String englishName;
+
+    @ApiModelProperty(value = "分子式")
+    private String formula;
+
+    @ApiModelProperty(value = "主要成分")
+    private String ingredient;
+
+    @ApiModelProperty(value = "泄漏处理")
+    private String leakWay;
+
+    @ApiModelProperty(value = "中文名")
+    private String name;
+
+    @ApiModelProperty(value = "性状")
+    private String property;
+
+    @ApiModelProperty(value = "贮藏方法")
+    private String store;
+
+    @ApiModelProperty(value = "症状")
+    private String symptom;
+
+    @ApiModelProperty(value = "禁忌物/禁忌")
+    private String tabu;
+
+    @ApiModelProperty(value = "类型code")
+    private String typeCode;
+
+    @ApiModelProperty(value = "类型名称")
+    private String type;
+
+    @ApiModelProperty(value = "国标号")
+    private String un;
+
+    @ApiModelProperty(value = "化学品图片")
+    private String image;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "操作人名称")
+    private String recUserName;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/FireExperts.java

+package com.yeejoin.amos.boot.module.jcs.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * @author system_generator
+ * @date 2021-06-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("cb_fire_experts")
+@ApiModel(value = "FireExperts对象", description = "")
+public class FireExperts extends BaseEntity {
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "证件类型")
+    private String certificatesType;
+
+    @ApiModelProperty(value = "证件类型code")
+    private String certificatesTypeCode;
+
+    @ApiModelProperty(value = "证件号")
+    private Long certificatesNum;
+
+    @ApiModelProperty(value = "单位")
+    private String companyName;
+
+    @ApiModelProperty(value = "性别")
+    private String gender;
+
+    @ApiModelProperty(value = "名族")
+    private String nation;
+
+    @ApiModelProperty(value = "籍贯")
+    private String nativePlace;
+
+    @ApiModelProperty(value = "现居住地")
+    private String residence;
+
+    @ApiModelProperty(value = "现居住地")
+    private String residenceDetails;
+
+    @ApiModelProperty(value = "政治面貌")
+    private String politicalOutlook;
+
+    @ApiModelProperty(value = "办公用 电话")
+    private String officePhone;
+
+    @ApiModelProperty(value = "移动电话")
+    private String mobilePhone;
+
+    @ApiModelProperty(value = "最高学历")
+    private String highestEducation;
+
+    @ApiModelProperty(value = "岗位名称")
+    private String jobs;
+
+    @ApiModelProperty(value = "岗位名称code")
+    private String jobsCode;
+
+    @ApiModelProperty(value = "消防专家领域")
+    private String expert;
+
+    @ApiModelProperty(value = "消防专家领域code")
+    private String expertCode;
+
+    @ApiModelProperty(value = "人员照片")
+    private String personnelPhotos;
+
+    @ApiModelProperty(value = "资质证书")
+    private String qualificationCertificate;
+
+    @ApiModelProperty(value = "人员状态，在职/离职")
+    private String state;
+
+    @ApiModelProperty(value = "人员状态，在职/离职code")
+    private String stateCode;
+
+    @ApiModelProperty(value = "消防机构id")
+    private Long fireTeamId;
+
+    @ApiModelProperty(value = "消防机构name")
+    private Long fireTeamName;
+
+    @ApiModelProperty(value = "备注")
+    private String note;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "操作人名称")
+    private String recUserName;
+
+    @ApiModelProperty(value = "出生日期")
+    private Date birthdayTime;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/FireStation.java

+package com.yeejoin.amos.boot.module.jcs.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+/**
+* 微型消防站
+*
+* @author system_generator
+* @date 2021-06-28
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("cb_fire_station")
+@ApiModel(value="FireStation对象", description="微型消防站")
+public class FireStation extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "微型消防站名称")
+    private String name;
+
+    @ApiModelProperty(value = "所在建筑物id")
+    private String whereBuildingId;
+
+    @ApiModelProperty(value = "所在建筑物名称")
+    private String whereBuilding;
+
+    @ApiModelProperty(value = "装备简要情况")
+    private String equipmentBrief;
+
+    @ApiModelProperty(value = "地址")
+    private String address;
+
+    @ApiModelProperty(value = "经度")
+    private Double longitude;
+
+    @ApiModelProperty(value = "纬度")
+    private Double latitude;
+
+    @ApiModelProperty(value = "行政区区划名称")
+    private String administrativeDivisions;
+
+    @ApiModelProperty(value = "行政区区划编号")
+    private String administrativeDivisionsCode;
+
+    @ApiModelProperty(value = "值班室电话")
+    private String dutyRoomTelephone;
+
+    @ApiModelProperty(value = "负责人名称")
+    private String personChargeName;
+
+    @ApiModelProperty(value = "负责人电话")
+    private String personChargeTelephone;
+
+    @ApiModelProperty(value = "单位id")
+    private Long bizCompanyId;
+
+    @ApiModelProperty(value = "所属单位名称")
+    private String bizCompany;
+
+    @ApiModelProperty(value = "所属单位code")
+    private String bizCompanyCode;
+
+    @ApiModelProperty(value = "建造日期")
+    private Date buildTime;
+
+    @ApiModelProperty(value = "启用日期")
+    private Date enableTime;
+
+    @ApiModelProperty(value = "图片信息")
+    private String img;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "操作人名称")
+    private String recUserName;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FireChemicalMapper.java

+package com.yeejoin.amos.boot.module.jcs.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FireChemical;
+
+/**
+* 危化品 Mapper 接口
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+public interface FireChemicalMapper extends BaseMapper<FireChemical> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FireExpertsMapper.java

+package com.yeejoin.amos.boot.module.jcs.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FireExperts;
+
+/**
+*  Mapper 接口
+*消防专家
+* @author system_generator
+* @date 2021-06-25
+*/
+public interface FireExpertsMapper extends BaseMapper<FireExperts> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FireStationMapper.java

+package com.yeejoin.amos.boot.module.jcs.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.dto.FireStationDto;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FireStation;
+
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* 微型消防站 Mapper 接口
+*
+* @author system_generator
+* @date 2021-06-28
+*/
+public interface FireStationMapper extends BaseMapper<FireStation> {
+	
+	
+	
+	@Select("<script>"
+			+ "select * from  cb_fire_station  where cb_fire_station.is_delete=0 "
+			+ "<if test='par.name!=null'> and cb_fire_station.name like  '%'#{par.name}'%' </if>"	
+			+ "<if test='par.bizCompanyId!=null'> and cb_fire_station.biz_company_id = #{par.bizCompanyId} </if>"	
+			+"limit  #{pageNum},#{pageSize}"
+			+ "</script>")	
+	List<FireStationDto>getFireStation(@Param("pageNum")int pageNum,@Param("pageSize")int pageSize,@Param("par")FireStationDto par);
+	@Select("<script>"
+			+ "select COUNT(cb_fire_station.sequence_nbr) num from  cb_fire_station  where cb_fire_station.is_delete=0 "
+			+ "<if test='par.name!=null'> and cb_fire_station.name like  '%'#{par.name}'%' </if>"	
+			+ "<if test='par.bizCompanyId!=null'> and cb_fire_station.biz_company_id = #{par.bizCompanyId} </if>"	
+			+ "</script>")	
+	 Map<String, Long> getFireStationCount(@Param("pageNum")int pageNum,@Param("pageSize")int pageSize,@Param("par")FireStationDto par);
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IFireChemicalService.java

+package com.yeejoin.amos.boot.module.jcs.api.service;
+
+
+/**
+* 危化品接口类
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+public interface IFireChemicalService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IFireExpertsService.java

+package com.yeejoin.amos.boot.module.jcs.api.service;
+
+
+/**
+* 接口类
+*消防专家
+* @author system_generator
+* @date 2021-06-25
+*/
+public interface IFireExpertsService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IFireStationService.java

+package com.yeejoin.amos.boot.module.jcs.api.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jcs.api.dto.FireStationDto;
+
+import org.apache.ibatis.annotations.Param;
+
+/**
+* 微型消防站接口类
+*
+* @author system_generator
+* @date 2021-06-28
+*/
+public interface IFireStationService {
+	Page<FireStationDto> getFirefighters(@Param("pageNum")int pageNum,@Param("pageSize")int pageSize,@Param("par")FireStationDto par);
+	
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/FireChemicalMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.common.api.mapper.FireChemicalMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/FireExpertsMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.common.api.mapper.FireExpertsMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/FireStationMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.common.api.mapper.FireStationMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FireStationServiceImpl.java

@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.module.common.api.mapper.FireStationMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IFireStationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import java.util.List;
@@ -23,15 +24,16 @@ public class FireStationServiceImpl extends BaseService<FireStationDto,FireStati
 	
 	 @Autowired
 	 FireStationMapper fireStationMapper;
+	 
         /**
-                            * 分页查询
+         * 分页查询
          */
         public Page<FireStationDto> queryForFireStationPage(Page<FireStationDto> page)   {
                 return this.queryForPage(page, null, false);
         }
 
         /**
-                            * 列表查询 示例
+         * 列表查询 示例
          */
         public List<FireStationDto> queryForFireStationList()   {
                 return this.queryForList("" , false);
@@ -42,7 +44,7 @@ public class FireStationServiceImpl extends BaseService<FireStationDto,FireStati
         public Boolean updateisDelete( Long sequenceNbr)   {
         	
         	return this.update(new UpdateWrapper<FireStation>().eq("sequence_nbr", sequenceNbr).set("is_delete", 1));         	
-    }
+       }
 
 		@Override
 		public Page<FireStationDto> getFirefighters(int pageNum, int pageSize, FireStationDto par) {			
@@ -52,7 +54,24 @@ public class FireStationServiceImpl extends BaseService<FireStationDto,FireStati
 		    return   pageBean.setRecords(list);
 		}
 
-		
-
-		
+		/**
+		 * 
+		 * 新增
+		 * 
+		 * ***/
+		 public FireStationDto add(FireStationDto model) {
+			    FireStation entity = this.prepareEntity(model);				    
+		        this.save(entity);
+		        return Bean.toModel(entity, model);
+		    }
+		/**
+		 * 
+		 * 修改
+		 * 
+		 * ***/
+		 public FireStationDto Update(FireStationDto model) {
+			    FireStation entity = this.prepareEntity(model);
+		        this.updateById(entity);
+		        return Bean.toModel(entity, model);
+		    }
 }

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

+package com.yeejoin.amos.boot.module.jcs.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.jcs.api.dto.FireChemicalDto;
+import com.yeejoin.amos.boot.module.jcs.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.*;
+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-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 = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除危化品", notes = "根据sequenceNbr删除危化品")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(fireChemicalServiceImpl.removeById(sequenceNbr));
+    }
+    /**
+             * 根据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)
+	{
+	    Page<FireChemicalDto> page=new Page<FireChemicalDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(fireChemicalServiceImpl.queryForFireChemicalPage(page));
+	}
+	/**
+	*列表全部数据查询
+	*@return
+	*/
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "危化品列表全部数据查询",   notes = "危化品列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<FireChemicalDto>>  selectForList()
+	{
+	    return ResponseHelper.buildResponse(fireChemicalServiceImpl.queryForFireChemicalList());
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FireExpertsController.java

+package com.yeejoin.amos.boot.module.jcs.biz.controller;
+
+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.Menu;
+import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
+import com.yeejoin.amos.boot.module.jcs.api.dto.FireExpertsDto;
+import com.yeejoin.amos.boot.module.jcs.api.entity.DataDictionary;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FireExperts;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.DataDictionaryServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FireExpertsServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.biz.utils.BeanDtoVoUtils;
+
+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.*;
+import java.util.stream.Collectors;
+
+
+/**
+ * 消防专家
+ *
+ * @author system_generator
+ * @date 2021-06-25
+ */
+@RestController
+@Api(tags = "消防专家Api")
+@RequestMapping(value = "/common/fire-experts")
+public class FireExpertsController extends BaseController {
+
+    @Autowired
+    FireExpertsServiceImpl fireExpertsServiceImpl;
+
+    @Autowired
+    RedisUtils redisUtils;
+
+    @Autowired
+    DataDictionaryServiceImpl dataDictionaryService;
+
+    /**
+     * 新增
+     *
+     * @return 返回结果
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+    public ResponseModel<FireExpertsDto> save(@RequestBody FireExpertsDto model) {
+        model = fireExpertsServiceImpl.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<FireExpertsDto> updateBySequenceNbrFireExperts(@RequestBody FireExpertsDto model,
+                                                                        @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        model.setSequenceNbr(sequenceNbr);
+        return ResponseHelper.buildResponse(fireExpertsServiceImpl.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) {
+        FireExperts fireExperts = fireExpertsServiceImpl.getById(sequenceNbr);
+        fireExperts.setIsDelete(true);
+        return ResponseHelper.buildResponse(fireExpertsServiceImpl.updateById(fireExperts));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr 主键
+     * @return 返回结果
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
+    public ResponseModel<FireExpertsDto> selectOne(@PathVariable Long sequenceNbr) throws Exception {
+        FireExpertsDto fireExpertsDto = fireExpertsServiceImpl.queryBySeq(sequenceNbr);
+        Date birthdayTime = fireExpertsDto.getBirthdayTime();
+        int age = BeanDtoVoUtils.getAge(birthdayTime);
+        fireExpertsDto.setAge(age);
+        return ResponseHelper.buildResponse(fireExpertsDto);
+    }
+
+    /**
+     * 列表分页查询
+     *
+     * @param current        当前页
+     * @param size           每页大小
+     * @param fireExpertsDto 查询参数
+     * @return 返回结果
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/page")
+    @ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
+    public ResponseModel<IPage<FireExpertsDto>> queryForPage(@RequestParam(value = "current") int current,
+                                                             @RequestParam(value = "size") int size,
+                                                             FireExpertsDto fireExpertsDto) {
+        FireExperts fireExperts = BeanDtoVoUtils.convert(fireExpertsDto, FireExperts.class);
+        Page<FireExperts> pageBean;
+        QueryWrapper<FireExperts> fireExpertsQueryWrapper = new QueryWrapper<>();
+        Class<? extends FireExperts> aClass = fireExperts.getClass();
+        Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
+            try {
+                field.setAccessible(true);
+                Class<?> type = field.getType();
+                Object o = field.get(fireExperts);
+                if (o != null) {
+                    String name = NameUtils.camel2Underline(field.getName());
+                    if ("name".equalsIgnoreCase(name)) {
+                        String fileValue = (String) o;
+                        fireExpertsQueryWrapper.like(name, fileValue);
+                    } else if ("expert_code".equalsIgnoreCase(name)) {
+                        String fileValue = (String) o;
+                        fireExpertsQueryWrapper.eq(name, fileValue);
+                    } else if (type.equals(Integer.class)) {
+                        Integer fileValue = (Integer) o;
+                        fireExpertsQueryWrapper.eq(name, fileValue);
+                    } else if (type.equals(Long.class)) {
+                        Long fileValue = (Long) o;
+                        fireExpertsQueryWrapper.eq(name, fileValue);
+                    } else {
+                        String fileValue = (String) o;
+                        fireExpertsQueryWrapper.like(name, fileValue);
+                    }
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+                throw new RuntimeException("系统异常");
+            }
+        });
+        IPage<FireExperts> page;
+        pageBean = new Page<>(current, size);
+        page = fireExpertsServiceImpl.page(pageBean, fireExpertsQueryWrapper);
+        IPage<FireExpertsDto> fireExpertsDtoIPage = BeanDtoVoUtils.iPageDtoStreamFireExperts(page);
+        return ResponseHelper.buildResponse(fireExpertsDtoIPage);
+    }
+
+    /**
+     * 列表全部数据查询
+     *
+     * @return 返回结果
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
+    @GetMapping(value = "/list")
+    public ResponseModel<List<FireExpertsDto>> selectForList() {
+        List<FireExpertsDto> fireExpertsDtoList = fireExpertsServiceImpl.queryForFireExpertsList();
+        fireExpertsDtoList.stream().map(item -> {
+            item.setAge(BeanDtoVoUtils.getAge(item.getBirthdayTime()));
+            return item;
+        }).collect(Collectors.toList());
+
+        return ResponseHelper.buildResponse(fireExpertsDtoList);
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/getExpertsTree", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "获取专家领域树", notes = "获取专家领域树")
+    public ResponseModel<Object> getExpertsTree() throws Exception {
+        String type = "ZJLY";
+        QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("type", type);
+        queryWrapper.orderByAsc("sort_num");
+
+        Collection<DataDictionary> list = dataDictionaryService.list(queryWrapper);
+        List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName"
+                , "getParent");
+        Menu menu = new Menu(-1L, "专家领域", -1L, menus);
+        List<Menu> menuList = new ArrayList<>();
+        menuList.add(menu);
+        // 创建挂在主节点
+        return ResponseHelper.buildResponse(menuList);
+    }
+
+
+}

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

+package com.yeejoin.amos.boot.module.jcs.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.jcs.api.dto.FireStationDto;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FireStationServiceImpl;
+
+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-06-28
+*/
+@RestController
+@Api(tags = "微型消防站Api")
+@RequestMapping(value = "/common/fire-station")
+public class FireStationController extends BaseController {
+
+    @Autowired
+    FireStationServiceImpl fireStationServiceImpl;
+
+    /**
+             * 新增微型消防站
+    * @return
+    */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增微型消防站", notes = "新增微型消防站")
+	public ResponseModel<FireStationDto> save(@RequestBody FireStationDto model)
+	{
+	    model=fireStationServiceImpl.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<FireStationDto> updateBySequenceNbrFireStation(@RequestBody FireStationDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(fireStationServiceImpl.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(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)
+	{
+	    Page<FireStationDto> page=new Page<FireStationDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(fireStationServiceImpl.queryForFireStationPage(page));
+	}
+	
+	/**
+	    * 新列表分页查询
+	    *@param current 当前页
+	    *@param current 每页大小
+	    * @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, FireStationDto fireStationDto)
+		{			
+			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()
+	{
+	    return ResponseHelper.buildResponse(fireStationServiceImpl.queryForFireStationList());
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FireChemicalServiceImpl.java

+package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jcs.api.dto.FireChemicalDto;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FireChemical;
+import com.yeejoin.amos.boot.module.jcs.api.mapper.FireChemicalMapper;
+import com.yeejoin.amos.boot.module.jcs.api.service.IFireChemicalService;
+
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+/**
+* 危化品服务实现类
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+@Service
+public class FireChemicalServiceImpl extends BaseService<FireChemicalDto,FireChemical,FireChemicalMapper> implements IFireChemicalService {
+        /**
+         * 分页查询
+         */
+        public Page<FireChemicalDto> queryForFireChemicalPage(Page<FireChemicalDto> page)   {
+                return this.queryForPage(page, null, false);
+        }
+
+        /**
+         * 列表查询 示例
+         */
+        public List<FireChemicalDto> queryForFireChemicalList()   {
+                return this.queryForList("" , false);
+        }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FireExpertsServiceImpl.java

+package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jcs.api.dto.FireExpertsDto;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FireExperts;
+import com.yeejoin.amos.boot.module.jcs.api.mapper.FireExpertsMapper;
+import com.yeejoin.amos.boot.module.jcs.api.service.IFireExpertsService;
+
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+/**
+* 服务实现类
+*消防专家
+* @author system_generator
+* @date 2021-06-25
+*/
+@Service
+public class FireExpertsServiceImpl extends BaseService<FireExpertsDto,FireExperts,FireExpertsMapper> implements IFireExpertsService {
+        /**
+        * 分页查询
+         */
+        public Page<FireExpertsDto> queryForFireExpertsPage(Page<FireExpertsDto> page)   {
+                return this.queryForPage(page, null, false);
+        }
+
+        /**
+        * 列表查询 示例
+         */
+        public List<FireExpertsDto> queryForFireExpertsList()   {
+                return this.queryForList("" , false);
+        }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FireStationServiceImpl.java

+package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jcs.api.dto.FireStationDto;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FireStation;
+import com.yeejoin.amos.boot.module.jcs.api.mapper.FireStationMapper;
+import com.yeejoin.amos.boot.module.jcs.api.service.IFireStationService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+import java.util.Map;
+/**
+* 微型消防站服务实现类
+*
+* @author system_generator
+* @date 2021-06-28
+*/
+@Service
+public class FireStationServiceImpl extends BaseService<FireStationDto,FireStation,FireStationMapper> implements IFireStationService {
+	
+	 @Autowired
+	 FireStationMapper fireStationMapper;
+	 
+        /**
+         * 分页查询
+         */
+        public Page<FireStationDto> queryForFireStationPage(Page<FireStationDto> page)   {
+                return this.queryForPage(page, null, false);
+        }
+
+        /**
+         * 列表查询 示例
+         */
+        public List<FireStationDto> queryForFireStationList()   {
+                return this.queryForList("" , false);
+        }
+        /**
+         * 删除
+         * */
+        public Boolean updateisDelete( Long sequenceNbr)   {
+        	
+        	return this.update(new UpdateWrapper<FireStation>().eq("sequence_nbr", sequenceNbr).set("is_delete", 1));         	
+       }
+
+		@Override
+		public Page<FireStationDto> getFirefighters(int pageNum, int pageSize, FireStationDto par) {			
+		    List<FireStationDto> list = fireStationMapper.getFireStation((pageNum - 1) * pageSize, pageSize, par);
+		    Map<String, Long> num = fireStationMapper.getFireStationCount((pageNum - 1) * pageSize, pageSize, par);
+		    Page<FireStationDto> pageBean = new Page<>(pageNum, pageSize, num.get("num"));
+		    return   pageBean.setRecords(list);
+		}
+
+		/**
+		 * 
+		 * 新增
+		 * 
+		 * ***/
+		 public FireStationDto add(FireStationDto model) {
+			    FireStation entity = this.prepareEntity(model);				    
+		        this.save(entity);
+		        return Bean.toModel(entity, model);
+		    }
+		/**
+		 * 
+		 * 修改
+		 * 
+		 * ***/
+		 public FireStationDto Update(FireStationDto model) {
+			    FireStation entity = this.prepareEntity(model);
+		        this.updateById(entity);
+		        return Bean.toModel(entity, model);
+		    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/utils/BeanDtoVoUtils.java

+package com.yeejoin.amos.boot.module.jcs.biz.utils;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.module.jcs.api.dto.FireExpertsDto;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FireExperts;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Component;
+
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * @title: 实体类 Dto，Vo，entity 转换工具类
+ * @Author fpy
+ * @Date: 2021/6/3 13:53
+ */
+@Component
+public class BeanDtoVoUtils {
+
+    /**
+     * Dot ,Vo ,Entity 相互转换
+     *
+     * @param source      原数据
+     * @param targetClass 目标类
+     * @param <T>         泛型类
+     * @return 转换返回值
+     */
+    public static <T> T convert(Object source, Class<T> targetClass) {
+        // 判断source是否为空
+        if (source == null) {
+            return null;
+        }
+        // 判断targetClass是否为空
+        if (targetClass == null) {
+            return null;
+        }
+        try {
+            // 创建新的对象实例
+            T target = targetClass.newInstance();
+            // 把原对象数据拷贝到新对象
+            BeanUtils.copyProperties(source, target);
+            // 返回新对象
+            return target;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * Dot ,Vo ,Entity 相互转换
+     *
+     * @param source 原数据
+     * @return 转换返回值
+     */
+    public static FireExpertsDto convertFireExperts(FireExperts source) {
+        // 判断source是否为空
+        if (source == null) {
+            return null;
+        }
+        try {
+            // 创建新的对象实例
+            FireExpertsDto target = FireExpertsDto.class.newInstance();
+            // 把原对象数据拷贝到新对象
+            BeanUtils.copyProperties(source, target);
+            // 计算年龄
+            int age = getAge(source.getBirthdayTime());
+            target.setAge(age);
+            // 返回新对象
+            return target;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * IPage<Entity> 分页对象转 Page<Dto>
+     *
+     * @param page 原分页对象
+     * @param v    目标vo类
+     * @param <E>  泛型类
+     * @param <V>  泛型类
+     * @return 转换后的分页对象
+     */
+    public static <E, V> IPage<V> iPageDtoStream(IPage<E> page, Class<V> v) {
+        return page.convert(item -> {
+            try {
+                return convert(item, v);
+            } catch (Exception e) {
+                return null;
+            }
+        });
+    }
+
+    /**
+     * IPage<Entity> 分页对象转 Page<Dto>
+     *
+     * @param page 原分页对象
+     * @return 转换后的分页对象
+     */
+    public static IPage<FireExpertsDto> iPageDtoStreamFireExperts(IPage<FireExperts> page) {
+        return page.convert(item -> {
+            try {
+                return convertFireExperts(item);
+            } catch (Exception e) {
+                return null;
+            }
+        });
+    }
+
+    //由出生日期获得年龄
+    public static int getAge(Date birthDay) {
+        Calendar cal = Calendar.getInstance();
+
+        if (cal.before(birthDay)) {
+            throw new IllegalArgumentException("出生日期小于当前时间，无效的日期!");
+        }
+        int yearNow = cal.get(Calendar.YEAR);
+        int monthNow = cal.get(Calendar.MONTH);
+        int dayOfMonthNow = cal.get(Calendar.DAY_OF_MONTH);
+        cal.setTime(birthDay);
+
+        int yearBirth = cal.get(Calendar.YEAR);
+        int monthBirth = cal.get(Calendar.MONTH);
+        int dayOfMonthBirth = cal.get(Calendar.DAY_OF_MONTH);
+
+        int age = yearNow - yearBirth;
+
+        if (monthNow <= monthBirth) {
+            if (monthNow == monthBirth) {
+                if (dayOfMonthNow < dayOfMonthBirth) age--;
+            } else {
+                age--;
+            }
+        }
+        return age;
+    }
+
+}
\ No newline at end of file