Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

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

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import com.yeejoin.amos.component.rule.Label;
+import com.yeejoin.amos.component.rule.RuleFact;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 
+ * <pre>
+ * 警情报送规则触发对象
+ * </pre>
+ *
+ * @author gwb
+ * @version $Id: AlertCalledRo.java, v 0.1 2021年6月24日 下午3:31:14 gwb Exp $
+ */
+@Data
+@RuleFact(value = "警情信息",project = "西咸机场119调派规则")
+public class AlertCallePowerTransferRo implements Serializable{
+
+
+
+
+	/**
+	 * <pre>
+	 * 
+	 * </pre>
+	 */
+	private static final long serialVersionUID = 7091835997817930383L;
+
+	/**
+	 * 通用属性
+	 */
+	@Label("警情id")
+    private String sequenceNbr;
+	
+	@Label(value = "警情时间")
+    private String callTimeStr;
+   
+    @Label(value = "警情类型")
+    private String alertType;
+
+    @Label(value = "警情类型code")
+    private String alertTypeCode;
+    
+    @Label(value = "发送单位")
+    private String companyName;
+
+    @Label(value = "被困人数")
+    private String trappedNum;
+
+    @Label(value = "伤亡人数")
+    private String casualtiesNum;
+    
+    @Label(value = "地址")
+    private String address;
+
+    @Label(value = "警情报送id")
+    private String alertSubmittedId;
+    /**
+     * 一般火灾
+     */
+    @Label(value = "失火位置")
+    private String fireLocation;
+    
+    @Label(value = "燃烧物质")
+    private String burningMaterial;
+    
+    @Label(value = "火势情况")
+    private String fireSituation;
+    
+    @Label(value = "危险爆炸品")
+    private String dangerousExplosives;
+    /**
+     * 航空器救援
+     */
+    @ApiModelProperty(value = " 警情特有属性拼接")
+    private String content;
+    @ApiModelProperty(value = "联系人姓名")
+    private String contactUser;
+
+    @ApiModelProperty(value = "联系人电话")
+    private String contactPhone;
+
+
+    @ApiModelProperty(value = "调派单位资源列表")
+    private List<CompanyRo> company;
+
+    @ApiModelProperty(value = "调派单位资源列表")
+    private List<PowerTransferCompanyResourcesDto> powerTransferCompanyResourcesDtoList;
+
+    @ApiModelProperty(value = "调派类型队伍")
+    private String powerTransType;
+
+
+
+
+}

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

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2021/11/11
+ */
+@Data
+public class CompanyRo {
+    @ApiModelProperty(value = " 调派单位id")
+    private Long powerCompanyId;
+
+    @ApiModelProperty(value = "调派单位名称")
+    private String powerCompanyName;
+}

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

@@ -48,4 +48,8 @@ public class PowerTransferCompanyDto extends BaseDto {
     @ApiModelProperty(value = "调派单位资源列表")
     private List<PowerTransferCompanyResourcesDto> powerTransferCompanyResourcesDtoList;
 
+    @ApiModelProperty(value = "调派类型队伍")
+    private String powerTransType;
+
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/enums/FireBrigadeTypeEnum.java

@@ -12,7 +12,7 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum FireBrigadeTypeEnum {
     专职消防队("fullTime", "116", "专职消防队"),
-    医疗救援队("monitorTeam", "830", "医疗救援队"),
+    医疗救援队("medicalTeam", "830", "医疗救援队"),
     监控大队("monitorTeam", "118", "监控大队");
 
     private String key;

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/UnitInfoApproveDto.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 企业信息审批意见表
+ *
+ * @author system_generator
+ * @date 2021-11-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="UnitInfoApproveDto", description="企业信息审批意见表")
+public class UnitInfoApproveDto extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "unit_info_id")
+    private Long unitId;
+
+    @ApiModelProperty(value = "unit_info原表单id")
+    private Long sourceId;
+
+    @ApiModelProperty(value = "审批意见")
+    private String content;
+
+    @ApiModelProperty(value = "审批结果 0 通过 1 驳回")
+    private Integer approveStatus;
+
+    @ApiModelProperty(value = "0 注册审批 1 变更审批")
+    private Integer approveType;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/UnitInfoChangeDto.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 企业信息变更表
+ *
+ * @author system_generator
+ * @date 2021-11-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="UnitInfoChangeDto", description="企业信息变更表")
+public class UnitInfoChangeDto extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "单位名称")
+    private String orgName;
+
+    @ApiModelProperty(value = "证照类型")
+    private String licenseType;
+
+    @ApiModelProperty(value = "证照类型code")
+    private String licenseTypeCode;
+
+    @ApiModelProperty(value = "单位类型")
+    private String unitType;
+
+    @ApiModelProperty(value = "单位类型code")
+    private String unitTypeCode;
+
+    @ApiModelProperty(value = "主管部门")
+    private String comptentDept;
+
+    @ApiModelProperty(value = "主管部门编号")
+    private String comptentDeptCode;
+
+    @ApiModelProperty(value = "批准成立机关")
+    private String approveOrg;
+
+    @ApiModelProperty(value = "登记机构")
+    private String registrationAuthority;
+
+    @ApiModelProperty(value = "区域编码")
+    private String regionCode;
+
+    @ApiModelProperty(value = "国家")
+    private String country;
+
+    @ApiModelProperty(value = "省")
+    private String province;
+
+    @ApiModelProperty(value = "市")
+    private String city;
+
+    @ApiModelProperty(value = "县区")
+    private String district;
+
+    @ApiModelProperty(value = "街道")
+    private String stree;
+
+    @ApiModelProperty(value = "小区")
+    private String community;
+
+    @ApiModelProperty(value = "详细地址")
+    private String address;
+
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
+
+    @ApiModelProperty(value = "管辖单位")
+    private String managementUnit;
+
+    @ApiModelProperty(value = "管辖单位id")
+    private Long managementUnitId;
+
+    @ApiModelProperty(value = "资质等级")
+    private String qualificationLevel;
+
+    @ApiModelProperty(value = "资质等级编号")
+    private String qualificationLevelCode;
+
+    @ApiModelProperty(value = "成立日期")
+    private Date createTime;
+
+    @ApiModelProperty(value = "单位法人")
+    private String legelPerson;
+
+    @ApiModelProperty(value = "法人电话")
+    private String legelPersonTel;
+
+    @ApiModelProperty(value = "单位联系人")
+    private String contactPerson;
+
+    @ApiModelProperty(value = "联系人电话")
+    private String contactPersonTel;
+
+    @ApiModelProperty(value = "单位电话")
+    private String unitTel;
+
+    @ApiModelProperty(value = "原记录id（unit_info）")
+    private Long sourceId;
+
+    @ApiModelProperty(value = "审批状态 0 审批中 1 审批结束 2 驳回")
+    private Integer unitStatus;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/UnitInfoDto.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 企业信息表
+ *
+ * @author system_generator
+ * @date 2021-11-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="UnitInfoDto", description="企业信息表")
+public class UnitInfoDto extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "单位名称")
+    private String orgName;
+
+    @ApiModelProperty(value = "证照类型")
+    private String licenseType;
+
+    @ApiModelProperty(value = "证照类型code")
+    private String licenseTypeCode;
+
+    @ApiModelProperty(value = "单位类型")
+    private String unitType;
+
+    @ApiModelProperty(value = "单位类型code")
+    private String unitTypeCode;
+
+    @ApiModelProperty(value = "主管部门")
+    private String comptentDept;
+
+    @ApiModelProperty(value = "主管部门编号")
+    private String comptentDeptCode;
+
+    @ApiModelProperty(value = "批准成立机关")
+    private String approveOrg;
+
+    @ApiModelProperty(value = "登记机构")
+    private String registrationAuthority;
+
+    @ApiModelProperty(value = "区域编码")
+    private String regionCode;
+
+    @ApiModelProperty(value = "国家")
+    private String country;
+
+    @ApiModelProperty(value = "省")
+    private String province;
+
+    @ApiModelProperty(value = "市")
+    private String city;
+
+    @ApiModelProperty(value = "县区")
+    private String district;
+
+    @ApiModelProperty(value = "街道")
+    private String stree;
+
+    @ApiModelProperty(value = "小区")
+    private String community;
+
+    @ApiModelProperty(value = "详细地址")
+    private String address;
+
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
+
+    @ApiModelProperty(value = "管辖单位")
+    private String managementUnit;
+
+    @ApiModelProperty(value = "管辖单位id")
+    private Long managementUnitId;
+
+    @ApiModelProperty(value = "资质等级")
+    private String qualificationLevel;
+
+    @ApiModelProperty(value = "资质等级编号")
+    private String qualificationLevelCode;
+
+    @ApiModelProperty(value = "成立日期")
+    private Date createTime;
+
+    @ApiModelProperty(value = "单位法人")
+    private String legelPerson;
+
+    @ApiModelProperty(value = "法人电话")
+    private String legelPersonTel;
+
+    @ApiModelProperty(value = "单位联系人")
+    private String contactPerson;
+
+    @ApiModelProperty(value = "联系人电话")
+    private String contactPersonTel;
+
+    @ApiModelProperty(value = "单位电话")
+    private String unitTel;
+
+    @ApiModelProperty(value = "管理员姓名")
+    private String adminName;
+
+    @ApiModelProperty(value = "管理员用户名")
+    private String adminLoginName;
+
+    @ApiModelProperty(value = "管理员密码")
+    private String adminLoginPwd;
+
+    @ApiModelProperty(value = "管理员手机号")
+    private String adminTel;
+
+    @ApiModelProperty(value = "org_user_id")
+    private Long orgUserId;
+
+    @ApiModelProperty(value = "审批状态 0 审批中 1 审批结束 2 驳回")
+    private Integer unitStatus;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/UnitInfo.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 企业信息表
+ *
+ * @author system_generator
+ * @date 2021-11-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tz_flc_unit_info")
+public class UnitInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 单位名称
+     */
+	@TableField("org_name")
+    private String orgName;
+
+    /**
+     * 证照类型
+     */
+	@TableField("license_type")
+    private String licenseType;
+
+    /**
+     * 证照类型code
+     */
+	@TableField("license_type_code")
+    private String licenseTypeCode;
+
+    /**
+     * 单位类型
+     */
+	@TableField("unit_type")
+    private String unitType;
+
+    /**
+     * 单位类型code
+     */
+	@TableField("unit_type_code")
+    private String unitTypeCode;
+
+    /**
+     * 主管部门
+     */
+	@TableField("comptent_dept")
+    private String comptentDept;
+
+    /**
+     * 主管部门编号
+     */
+	@TableField("comptent_dept_code")
+    private String comptentDeptCode;
+
+    /**
+     * 批准成立机关
+     */
+	@TableField("approve_org")
+    private String approveOrg;
+
+    /**
+     * 登记机构
+     */
+	@TableField("registration_authority")
+    private String registrationAuthority;
+
+    /**
+     * 区域编码
+     */
+	@TableField("region_code")
+    private String regionCode;
+
+    /**
+     * 国家
+     */
+	@TableField("country")
+    private String country;
+
+    /**
+     * 省
+     */
+	@TableField("province")
+    private String province;
+
+    /**
+     * 市
+     */
+	@TableField("city")
+    private String city;
+
+    /**
+     * 县区
+     */
+	@TableField("district")
+    private String district;
+
+    /**
+     * 街道
+     */
+	@TableField("stree")
+    private String stree;
+
+    /**
+     * 小区
+     */
+	@TableField("community")
+    private String community;
+
+    /**
+     * 详细地址
+     */
+	@TableField("address")
+    private String address;
+
+    /**
+     * 经度
+     */
+	@TableField("longitude")
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+	@TableField("latitude")
+    private String latitude;
+
+    /**
+     * 管辖单位
+     */
+	@TableField("management_unit")
+    private String managementUnit;
+
+    /**
+     * 管辖单位id
+     */
+	@TableField("management_unit_id")
+    private Long managementUnitId;
+
+    /**
+     * 资质等级
+     */
+	@TableField("qualification_level")
+    private String qualificationLevel;
+
+    /**
+     * 资质等级编号
+     */
+	@TableField("qualification_level_code")
+    private String qualificationLevelCode;
+
+    /**
+     * 成立日期
+     */
+	@TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 单位法人
+     */
+	@TableField("legel_person")
+    private String legelPerson;
+
+    /**
+     * 法人电话
+     */
+	@TableField("legel_person_tel")
+    private String legelPersonTel;
+
+    /**
+     * 单位联系人
+     */
+	@TableField("contact_person")
+    private String contactPerson;
+
+    /**
+     * 联系人电话
+     */
+	@TableField("contact_person_tel")
+    private String contactPersonTel;
+
+    /**
+     * 单位电话
+     */
+	@TableField("unit_tel")
+    private String unitTel;
+
+    /**
+     * 管理员姓名
+     */
+	@TableField("admin_name")
+    private String adminName;
+
+    /**
+     * 管理员用户名
+     */
+	@TableField("admin_login_name")
+    private String adminLoginName;
+
+    /**
+     * 管理员密码
+     */
+	@TableField("admin_login_pwd")
+    private String adminLoginPwd;
+
+    /**
+     * 管理员手机号
+     */
+	@TableField("admin_tel")
+    private String adminTel;
+
+    /**
+     * org_user_id
+     */
+	@TableField("org_user_id")
+    private Long orgUserId;
+
+    /**
+     * 审批状态 0 审批中 1 审批结束 2 驳回
+     */
+	@TableField("unit_status")
+    private Integer unitStatus;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/UnitInfoApprove.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 企业信息审批意见表
+ *
+ * @author system_generator
+ * @date 2021-11-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tz_flc_unit_info_approve")
+public class UnitInfoApprove extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * unit_info_id
+     */
+	@TableField("unit_id")
+    private Long unitId;
+
+    /**
+     * unit_info原表单id
+     */
+	@TableField("source_id")
+    private Long sourceId;
+
+    /**
+     * 审批意见
+     */
+	@TableField("content")
+    private String content;
+
+    /**
+     * 审批结果 0 通过 1 驳回
+     */
+	@TableField("approve_status")
+    private Integer approveStatus;
+
+    /**
+     * 0 注册审批 1 变更审批
+     */
+	@TableField("approve_type")
+    private Integer approveType;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/UnitInfoChange.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 企业信息变更表
+ *
+ * @author system_generator
+ * @date 2021-11-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tz_flc_unit_info_change")
+public class UnitInfoChange extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 单位名称
+     */
+	@TableField("org_name")
+    private String orgName;
+
+    /**
+     * 证照类型
+     */
+	@TableField("license_type")
+    private String licenseType;
+
+    /**
+     * 证照类型code
+     */
+	@TableField("license_type_code")
+    private String licenseTypeCode;
+
+    /**
+     * 单位类型
+     */
+	@TableField("unit_type")
+    private String unitType;
+
+    /**
+     * 单位类型code
+     */
+	@TableField("unit_type_code")
+    private String unitTypeCode;
+
+    /**
+     * 主管部门
+     */
+	@TableField("comptent_dept")
+    private String comptentDept;
+
+    /**
+     * 主管部门编号
+     */
+	@TableField("comptent_dept_code")
+    private String comptentDeptCode;
+
+    /**
+     * 批准成立机关
+     */
+	@TableField("approve_org")
+    private String approveOrg;
+
+    /**
+     * 登记机构
+     */
+	@TableField("registration_authority")
+    private String registrationAuthority;
+
+    /**
+     * 区域编码
+     */
+	@TableField("region_code")
+    private String regionCode;
+
+    /**
+     * 国家
+     */
+	@TableField("country")
+    private String country;
+
+    /**
+     * 省
+     */
+	@TableField("province")
+    private String province;
+
+    /**
+     * 市
+     */
+	@TableField("city")
+    private String city;
+
+    /**
+     * 县区
+     */
+	@TableField("district")
+    private String district;
+
+    /**
+     * 街道
+     */
+	@TableField("stree")
+    private String stree;
+
+    /**
+     * 小区
+     */
+	@TableField("community")
+    private String community;
+
+    /**
+     * 详细地址
+     */
+	@TableField("address")
+    private String address;
+
+    /**
+     * 经度
+     */
+	@TableField("longitude")
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+	@TableField("latitude")
+    private String latitude;
+
+    /**
+     * 管辖单位
+     */
+	@TableField("management_unit")
+    private String managementUnit;
+
+    /**
+     * 管辖单位id
+     */
+	@TableField("management_unit_id")
+    private Long managementUnitId;
+
+    /**
+     * 资质等级
+     */
+	@TableField("qualification_level")
+    private String qualificationLevel;
+
+    /**
+     * 资质等级编号
+     */
+	@TableField("qualification_level_code")
+    private String qualificationLevelCode;
+
+    /**
+     * 成立日期
+     */
+	@TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 单位法人
+     */
+	@TableField("legel_person")
+    private String legelPerson;
+
+    /**
+     * 法人电话
+     */
+	@TableField("legel_person_tel")
+    private String legelPersonTel;
+
+    /**
+     * 单位联系人
+     */
+	@TableField("contact_person")
+    private String contactPerson;
+
+    /**
+     * 联系人电话
+     */
+	@TableField("contact_person_tel")
+    private String contactPersonTel;
+
+    /**
+     * 单位电话
+     */
+	@TableField("unit_tel")
+    private String unitTel;
+
+    /**
+     * 原记录id（unit_info）
+     */
+	@TableField("source_id")
+    private Long sourceId;
+
+    /**
+     * 审批状态 0 审批中 1 审批结束 2 驳回
+     */
+	@TableField("unit_status")
+    private Integer unitStatus;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/UnitInfoApproveMapper.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.UnitInfoApprove;
+
+/**
+ * 企业信息审批意见表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2021-11-11
+ */
+public interface UnitInfoApproveMapper extends BaseMapper<UnitInfoApprove> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/UnitInfoChangeMapper.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.UnitInfoChange;
+
+/**
+ * 企业信息变更表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2021-11-11
+ */
+public interface UnitInfoChangeMapper extends BaseMapper<UnitInfoChange> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/UnitInfoMapper.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.UnitInfo;
+
+/**
+ * 企业信息表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2021-11-11
+ */
+public interface UnitInfoMapper extends BaseMapper<UnitInfo> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/service/IUnitInfoApproveService.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.service;
+
+
+/**
+ * 企业信息审批意见表接口类
+ *
+ * @author system_generator
+ * @date 2021-11-11
+ */
+public interface IUnitInfoApproveService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/service/IUnitInfoChangeService.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.service;
+
+
+/**
+ * 企业信息变更表接口类
+ *
+ * @author system_generator
+ * @date 2021-11-11
+ */
+public interface IUnitInfoChangeService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/service/IUnitInfoService.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.service;
+
+
+/**
+ * 企业信息表接口类
+ *
+ * @author system_generator
+ * @date 2021-11-11
+ */
+public interface IUnitInfoService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/UnitInfoApproveMapper.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.tzs.flc.api.mapper.UnitInfoApproveMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/UnitInfoChangeMapper.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.tzs.flc.api.mapper.UnitInfoChangeMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/UnitInfoMapper.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.tzs.flc.api.mapper.UnitInfoMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -1336,7 +1336,12 @@ public class CommandController extends BaseController {
         UserCar userCar=userCarService.selectByAmosUserId(Long.valueOf(agencyUserModel.getUserId()));
 
          id =userCar!=null?userCar.getCarId():null;
-
+         if(id==null&&isNo!=null&&isNo){
+             Map map =new HashMap();
+             map.put("select",null);
+             map.put("data",null);
+             return ResponseHelper.buildResponse(null);
+         }
         ResponseModel<Object> data=  equipFeignClient.equipmentCarList(teamId,name,code , pageNum,pageSize,id,isNo);
         Map map =new HashMap();
         map.put("select",userCar!=null?userCar.getCarId():null);

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

@@ -10,7 +10,9 @@ import org.typroject.tyboot.core.rdbms.annotation.Condition;
 import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.Menu;
@@ -135,5 +137,32 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 
 		return firefightersMapper.queryById(teamId,gw);
 	}
-
+    /**
+     * 获取指定岗位名称下的队伍人员电话号码信息
+     * @param teamId
+     * @param jobTitleArray
+     * @return
+     */
+	public List<Map<String, Object>> getDetailByTeamIdAndJobTitle(Long teamId,List<String> jobTitleArray) {
+		LambdaQueryWrapper<Firefighters> wrapper = new LambdaQueryWrapper<Firefighters>();
+		wrapper.in(Firefighters::getJobTitle, jobTitleArray);
+		wrapper.eq(Firefighters::getIsDelete, false);
+		wrapper.eq(Firefighters::getFireTeamId, teamId);
+		wrapper.select(Firefighters::getMobilePhone);
+		return	this.baseMapper.selectMaps(wrapper);
+	}
+	 /**
+     * 获取指定用户ID下的队伍人员电话号码信息
+     * @param teamId
+     * @param jobTitleArray
+     * @return
+     */
+	public List<Map<String, Object>> getDetailByIds(List<Long> ids) {
+		LambdaQueryWrapper<Firefighters> wrapper = new LambdaQueryWrapper<Firefighters>();
+		wrapper.in(Firefighters::getSequenceNbr, ids);
+		wrapper.eq(Firefighters::getIsDelete, false);
+		wrapper.select(Firefighters::getMobilePhone);
+		return	this.baseMapper.selectMaps(wrapper);
+	}
+	
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/rule/action/PowerTransferAction.java

+package com.yeejoin.amos.boot.module.jcs.biz.rule.action;
+
+
+import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledRo;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertSubmittedServiceImpl;
+import com.yeejoin.amos.component.rule.RuleActionBean;
+import com.yeejoin.amos.component.rule.RuleMethod;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+
+import java.util.HashMap;
+import java.util.Set;
+
+/**
+ * <pre>
+ * 警情报送规则动作
+ * </pre>
+ *
+ * @author gwb
+ * @version $Id: AlertCalledAction.java, v 0.1 2021年6月24日 下午4:41:22 gwb Exp $
+ */
+@Component
+@RuleActionBean(beanLabel = "调派报送")
+public class PowerTransferAction {
+
+    public static final Logger log = LoggerFactory.getLogger(PowerTransferAction.class);
+
+    @Autowired
+    private AlertSubmittedServiceImpl alertSubmittedService;
+
+
+
+    /**
+     * 短信报送
+     *
+     * @param smsCode  短信模板code
+     * @param sendType 发送类型
+     * @param sendIds  人员id
+     * @param object   模板内容对象
+     * @throws Exception 异常
+     */
+    @RuleMethod(methodLabel = "短信报送", project = "西咸机场119接处警规则")
+    public void sendcmd(String smsCode, String sendType, String sendIds, Object object) throws Exception {
+
+        alertSubmittedService.ruleCallbackAction(smsCode, sendIds, object);
+
+    }
+
+
+
+}

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

@@ -227,7 +227,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                 alertSubmitted.setSchedulingType(alertSchedulingTypeEnum.get().getName());
                 alertSubmitted.setSubmissionContent(JSONObject.toJSONString(objectToMap(calledRo)));
 //                String token = RequestContext.getToken();
-//                ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(),token)).toString(),
+//                ReginParams reginParams = JSONObject.parseObject(.get(RedisredisUtilsKey.buildReginKey(RequestContext.getExeUserId(),token)).toString(),
 //                        ReginParams.class);
 //                alertSubmitted.setRecUserName(reginParams.getUserModel().getUserName());
 //                alertSubmitted.setSender(reginParams.getUserModel().getUserName());

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/VoiceRecordLogServiceImpl.java

@@ -8,11 +8,11 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledFormDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.VoiceRecordFileDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.VoiceRecordLogDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.VoiceRecordLog;
 import com.yeejoin.amos.boot.module.tzs.api.mapper.VoiceRecordLogMapper;
 import com.yeejoin.amos.boot.module.tzs.api.service.ICtiService;
 import com.yeejoin.amos.boot.module.tzs.api.service.IVoiceRecordLogService;
-import com.yeejoin.amos.boot.module.tzs.api.dto.VoiceRecordLogDto;
 import com.yeejoin.amos.component.feign.config.TokenOperation;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
@@ -24,11 +24,10 @@ import org.eclipse.paho.client.mqttv3.MqttException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
 import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import java.util.Date;
 import java.util.HashMap;
@@ -158,6 +157,12 @@ public class VoiceRecordLogServiceImpl extends BaseService<VoiceRecordLogDto,Voi
                 json.put("alertId",model.getAlertId());
                 try {
                     emqKeeper.getMqttClient().publish(ctiMessage, json.toJSONString().getBytes(), 2, false);
+                    try {
+                        redisUtils.del(RedisKey.TZS_ALERTCALLED_ID+model.getAlertId());
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                        logger.error("删除redis失败:" + e.getMessage());
+                    }
                 } catch (MqttException e) {
                     logger.error("推送失败");
                 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/UnitInfoApproveController.java

+package com.yeejoin.amos.boot.module.tzs.flc.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.tzs.flc.api.dto.UnitInfoApproveDto;
+import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.UnitInfoApproveServiceImpl;
+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 javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 企业信息审批意见表
+ *
+ * @author system_generator
+ * @date 2021-11-11
+ */
+@RestController
+@Api(tags = "企业信息审批意见表Api")
+@RequestMapping(value = "/flc-unit-info-approve")
+public class UnitInfoApproveController extends BaseController {
+
+    @Autowired
+    UnitInfoApproveServiceImpl unitInfoApproveServiceImpl;
+
+    /**
+     * 新增企业信息审批意见表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增企业信息审批意见表", notes = "新增企业信息审批意见表")
+    public ResponseModel<UnitInfoApproveDto> save(@RequestBody UnitInfoApproveDto model) {
+        model = unitInfoApproveServiceImpl.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<UnitInfoApproveDto> updateBySequenceNbrFlcUnitInfoApprove(@RequestBody UnitInfoApproveDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        model.setSequenceNbr(sequenceNbr);
+        return ResponseHelper.buildResponse(unitInfoApproveServiceImpl.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(unitInfoApproveServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个企业信息审批意见表", notes = "根据sequenceNbr查询单个企业信息审批意见表")
+    public ResponseModel<UnitInfoApproveDto> selectOne(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(unitInfoApproveServiceImpl.queryBySeq(sequenceNbr));
+    }
+
+    /**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/page")
+    @ApiOperation(httpMethod = "GET", value = "企业信息审批意见表分页查询", notes = "企业信息审批意见表分页查询")
+    public ResponseModel<Page<UnitInfoApproveDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
+            (value = "size") int size) {
+        Page<UnitInfoApproveDto> page = new Page<UnitInfoApproveDto>();
+        page.setCurrent(current);
+        page.setSize(size);
+        return ResponseHelper.buildResponse(unitInfoApproveServiceImpl.queryForFlcUnitInfoApprovePage(page));
+    }
+
+    /**
+     * 列表全部数据查询
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "企业信息审批意见表列表全部数据查询", notes = "企业信息审批意见表列表全部数据查询")
+    @GetMapping(value = "/list")
+    public ResponseModel<List<UnitInfoApproveDto>> selectForList() {
+        return ResponseHelper.buildResponse(unitInfoApproveServiceImpl.queryForFlcUnitInfoApproveList());
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/UnitInfoChangeController.java

+package com.yeejoin.amos.boot.module.tzs.flc.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.tzs.flc.biz.service.impl.UnitInfoChangeServiceImpl;
+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.tzs.flc.api.dto.UnitInfoChangeDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 企业信息变更表
+ *
+ * @author system_generator
+ * @date 2021-11-11
+ */
+@RestController
+@Api(tags = "企业信息变更表Api")
+@RequestMapping(value = "/flc-unit-info-change")
+public class UnitInfoChangeController extends BaseController {
+
+    @Autowired
+	UnitInfoChangeServiceImpl unitInfoChangeServiceImpl;
+
+    /**
+     * 新增企业信息变更表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增企业信息变更表", notes = "新增企业信息变更表")
+	public ResponseModel<UnitInfoChangeDto> save(@RequestBody UnitInfoChangeDto model) {
+	    model = unitInfoChangeServiceImpl.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<UnitInfoChangeDto> updateBySequenceNbrFlcUnitInfoChange(@RequestBody UnitInfoChangeDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(unitInfoChangeServiceImpl.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(unitInfoChangeServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个企业信息变更表",  notes = "根据sequenceNbr查询单个企业信息变更表")
+	public ResponseModel<UnitInfoChangeDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(unitInfoChangeServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "企业信息变更表分页查询",  notes = "企业信息变更表分页查询")
+	public ResponseModel<Page<UnitInfoChangeDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
+                    (value = "size") int size) {
+	    Page<UnitInfoChangeDto> page = new Page<UnitInfoChangeDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(unitInfoChangeServiceImpl.queryForFlcUnitInfoChangePage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "企业信息变更表列表全部数据查询",   notes = "企业信息变更表列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<UnitInfoChangeDto>> selectForList() {
+	    return ResponseHelper.buildResponse(unitInfoChangeServiceImpl.queryForFlcUnitInfoChangeList());
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/UnitInfoController.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.controller;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.UnitInfoDto;
+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.tzs.flc.biz.service.impl.UnitInfoServiceImpl;
+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 org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 企业信息表
+ *
+ * @author system_generator
+ * @date 2021-11-11
+ */
+@RestController
+@Api(tags = "企业信息表Api")
+@RequestMapping(value = "/flc-unit-info")
+public class UnitInfoController extends BaseController {
+
+    @Autowired
+	UnitInfoServiceImpl unitInfoServiceImpl;
+
+    /**
+     * 新增企业信息表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增企业信息表", notes = "新增企业信息表")
+	public ResponseModel<UnitInfoDto> save(@RequestBody UnitInfoDto model) {
+	    model = unitInfoServiceImpl.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<UnitInfoDto> updateBySequenceNbrFlcUnitInfo(@RequestBody UnitInfoDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(unitInfoServiceImpl.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(unitInfoServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个企业信息表",  notes = "根据sequenceNbr查询单个企业信息表")
+	public ResponseModel<UnitInfoDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(unitInfoServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "企业信息表分页查询",  notes = "企业信息表分页查询")
+	public ResponseModel<Page<UnitInfoDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
+                    (value = "size") int size) {
+	    Page<UnitInfoDto> page = new Page<UnitInfoDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(unitInfoServiceImpl.queryForFlcUnitInfoPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "企业信息表列表全部数据查询",   notes = "企业信息表列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<UnitInfoDto>> selectForList() {
+	    return ResponseHelper.buildResponse(unitInfoServiceImpl.queryForFlcUnitInfoList());
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/UnitInfoApproveServiceImpl.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.UnitInfoApproveDto;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.UnitInfoApprove;
+import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.UnitInfoApproveMapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.service.IUnitInfoApproveService;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 企业信息审批意见表服务实现类
+ *
+ * @author system_generator
+ * @date 2021-11-11
+ */
+@Service
+public class UnitInfoApproveServiceImpl extends BaseService<UnitInfoApproveDto, UnitInfoApprove, UnitInfoApproveMapper> implements IUnitInfoApproveService {
+    /**
+     * 分页查询
+     */
+    public Page<UnitInfoApproveDto> queryForFlcUnitInfoApprovePage(Page<UnitInfoApproveDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<UnitInfoApproveDto> queryForFlcUnitInfoApproveList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/UnitInfoChangeServiceImpl.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.UnitInfoChangeDto;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.UnitInfoChange;
+import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.UnitInfoChangeMapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.service.IUnitInfoChangeService;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 企业信息变更表服务实现类
+ *
+ * @author system_generator
+ * @date 2021-11-11
+ */
+@Service
+public class UnitInfoChangeServiceImpl extends BaseService<UnitInfoChangeDto, UnitInfoChange, UnitInfoChangeMapper> implements IUnitInfoChangeService {
+    /**
+     * 分页查询
+     */
+    public Page<UnitInfoChangeDto> queryForFlcUnitInfoChangePage(Page<UnitInfoChangeDto> page) {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<UnitInfoChangeDto> queryForFlcUnitInfoChangeList() {
+        return this.queryForList("", false);
+    }
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/UnitInfoServiceImpl.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.UnitInfoDto;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.UnitInfo;
+import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.UnitInfoMapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.service.IUnitInfoService;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 企业信息表服务实现类
+ *
+ * @author system_generator
+ * @date 2021-11-11
+ */
+@Service
+public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, UnitInfoMapper> implements IUnitInfoService {
+    /**
+     * 分页查询
+     */
+    public Page<UnitInfoDto> queryForFlcUnitInfoPage(Page<UnitInfoDto> page) {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<UnitInfoDto> queryForFlcUnitInfoList() {
+        return this.queryForList("", false);
+    }
+}
\ No newline at end of file

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -2130,5 +2130,19 @@
         </sql>
     </changeSet>
 
- </databaseChangeLog>
+
+    <changeSet author="tw" id="2021-11-11-1">
+        <comment>update data jc_powerr_transfer_log</comment>
+        <sql>
+            ALTER TABLE jc_powerr_transfer_log ADD power_transfer_company_id bigint(30)  NULL COMMENT '调派关联部门id';
+            ALTER TABLE jc_powerr_transfer_log ADD power_transfer_company_resources_id bigint(30)  NULL COMMENT '调派关联资源id';
+        </sql>
+    </changeSet>
+
+
+
+
+
+
+</databaseChangeLog>
 

amos-boot-system-tzs/src/main/java/com/yeejoin/amos/AmosTzsApplication.java

@@ -42,7 +42,7 @@ import java.net.UnknownHostException;
         "org.typroject.tyboot.face.*.orm.dao*",
         "org.typroject.tyboot.core.auth.face.orm.dao*",
         "org.typroject.tyboot.component.*.face.orm.dao*",
-        "com.yeejoin.amos.boot.module.*.api.mapper",
+        "com.yeejoin.amos.boot.module.**.api.mapper",
         "com.yeejoin.amos.boot.biz.common.dao.mapper"})
 @ComponentScan(basePackages = { "org.typroject", "com.yeejoin.amos" })
 public class AmosTzsApplication {