Merge branch 'develop_unit_register' into 'developer'

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

@@ -202,7 +202,7 @@ public class DataDictionaryController extends BaseController {
 		}
 	}
 
-	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/dataDictionary", method = RequestMethod.GET)
 	@ApiOperation(httpMethod = "GET", value = "根据字典类型查询字典2", notes = "根据字典类型查询字典2")
 	public ResponseModel<Object> getDictionary(@RequestParam String type) throws Exception {

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/entity/DataDictionary.java

@@ -40,7 +40,6 @@ public class DataDictionary extends BaseEntity {
     @ApiModelProperty(value = "类型说明")
     private String typeDesc;
 
-    //新加排序字段
     @ApiModelProperty(value = "排序字段")
     private int sortNum;
     

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/BaseUnitLicenceDto.java

+package com.yeejoin.amos.boot.module.tzs.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 2022-08-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="BaseUnitLicenceDto", description="单位注册许可信息表")
+public class BaseUnitLicenceDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "单位编码")
+    private String unitCode;
+
+    @ApiModelProperty(value = "单位名称")
+    private String unitName;
+
+    @ApiModelProperty(value = "许可地址")
+    private String licAddress;
+
+    @ApiModelProperty(value = "证书类型")
+    private String certType;
+
+    @ApiModelProperty(value = "证书类型code")
+    private String certTypeCode;
+
+    @ApiModelProperty(value = "证书编号")
+    private String certNo;
+
+    @ApiModelProperty(value = "有效期至")
+    private Date expiryDate;
+
+    @ApiModelProperty(value = "发证日期")
+    private Date issueDate;
+
+    @ApiModelProperty(value = "变更日期")
+    private Date changeDate;
+
+    @ApiModelProperty(value = "许可方式/许可状态")
+    private String applyType;
+
+    @ApiModelProperty(value = "许可方式/许可状态code")
+    private String applyTypeCode;
+
+    @ApiModelProperty(value = "许可评审方式")
+    private String appraisalType;
+
+    @ApiModelProperty(value = "许可评审方式code")
+    private String appraisalTypeCode;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "许可项目/检验类型/设备品种编码")
+    private String itemCode;
+
+    @ApiModelProperty(value = "许可项目/检验类型/设备品种")
+    private String itemCodeName;
+
+    @ApiModelProperty(value = "许可子项目/检验项目/充装介质类别code")
+    private String subItemCode;
+
+    @ApiModelProperty(value = "许可子项目/检验项目/充装介质类别")
+    private String subItemName;
+
+    @ApiModelProperty(value = "许可参数/充装介质名称")
+    private String parameter;
+
+    @ApiModelProperty(value = "许可参数/充装介质code")
+    private String parameterCode;
+
+    @ApiModelProperty(value = "固定检验地址")
+    private String itemAddress;
+
+    @ApiModelProperty(value = "发证机关")
+    private String approvedOrgan;
+
+    @ApiModelProperty(value = "发证机关code")
+    private String approvedOrganCode;
+
+}

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/BaseUnitLicence.java

+package com.yeejoin.amos.boot.module.tzs.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 2022-08-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tz_base_unit_licence")
+public class BaseUnitLicence extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 单位编码
+     */
+	@TableField("unit_code")
+    private String unitCode;
+
+    /**
+     * 单位名称
+     */
+	@TableField("unit_name")
+    private String unitName;
+
+    /**
+     * 许可地址
+     */
+	@TableField("lic_address")
+    private String licAddress;
+
+    /**
+     * 证书类型
+     */
+	@TableField("cert_type")
+    private String certType;
+
+
+    /**
+     * 证书类型code
+     */
+    @TableField("cert_type_code")
+    private String certTypeCode;
+
+    /**
+     * 证书编号
+     */
+	@TableField("cert_no")
+    private String certNo;
+
+    /**
+     * 有效期至
+     */
+	@TableField("expiry_date")
+    private Date expiryDate;
+
+    /**
+     * 发证日期
+     */
+	@TableField("issue_date")
+    private Date issueDate;
+
+    /**
+     * 变更日期
+     */
+	@TableField("change_date")
+    private Date changeDate;
+
+    /**
+     * 许可评审方式
+     */
+	@TableField("apply_type")
+    private String applyType;
+
+    /**
+     * 备注
+     */
+	@TableField("remark")
+    private String remark;
+
+    /**
+     * 许可项目/检验类型/设备品种编码
+     */
+	@TableField("item_code")
+    private String itemCode;
+
+    /**
+     * 许可项目/检验类型/设备品种
+     */
+	@TableField("item_code_name")
+    private String itemCodeName;
+
+    /**
+     * 许可子项目/检验项目/充装介质类别code
+     */
+	@TableField("sub_item_code")
+    private String subItemCode;
+
+    /**
+     * 许可子项目/检验项目/充装介质类别
+     */
+	@TableField("sub_item_name")
+    private String subItemName;
+
+    /**
+     * 许可参数/充装介质名称
+     */
+	@TableField("parameter")
+    private String parameter;
+
+
+    /**
+     * 许可参数/充装介质code
+     */
+    @TableField("parameter_code")
+    private String parameterCode;
+
+    /**
+     * 固定检验地址
+     */
+	@TableField("item_address")
+    private String itemAddress;
+
+    /**
+     * 发证机关
+     */
+	private String approvedOrgan;
+
+    /**
+     * 发证机关code
+     */
+	private String approvedOrganCode;
+
+}

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/TzBaseEnterpriseInfo.java

@@ -6,8 +6,12 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+
+import java.util.Date;
+
+
 
 /**
  * 企业数据信息
@@ -15,7 +19,9 @@ import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
  * @author duanwei
  * @date 2022-08-10
  */
+
 @Data
+@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("tz_base_enterprise_info")
 @ApiModel(value="TzBaseEnterpriseInfo对象", description="企业数据信息")
@@ -24,7 +30,6 @@ public class TzBaseEnterpriseInfo extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
 
-
     @ApiModelProperty(value = "使用单位唯一标识")
     private String useUnitCode;
 
@@ -119,8 +124,6 @@ public class TzBaseEnterpriseInfo extends BaseEntity {
     private String appId;
 
 
-
-
     @ApiModelProperty(value = "管辖机构")
     private String governingBody;
 

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/BaseUnitLicenceMapper.java

+package com.yeejoin.amos.boot.module.tzs.api.mapper;
+
+import com.yeejoin.amos.boot.module.tzs.api.entity.BaseUnitLicence;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 单位注册许可信息表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2022-08-09
+ */
+public interface BaseUnitLicenceMapper extends BaseMapper<BaseUnitLicence> {
+
+}

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/IBaseUnitLicenceService.java

+package com.yeejoin.amos.boot.module.tzs.api.service;
+
+
+/**
+ * 单位注册许可信息表接口类
+ *
+ * @author system_generator
+ * @date 2022-08-09
+ */
+public interface IBaseUnitLicenceService  {
+
+}

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/RegUnitIcDto.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 2022-08-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="RegUnitIcDto", description="注册单位工商信息表")
+public class RegUnitIcDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "单位名称")
+    private String unitName;
+
+    @ApiModelProperty(value = "证件code")
+    private String unitCode;
+
+    @ApiModelProperty(value = "所属行业")
+    private String industryName;
+
+    @ApiModelProperty(value = "登记机关")
+    private String registeredOrgan;
+
+    @ApiModelProperty(value = "登记机关编码")
+    private String registeredOrganCode;
+
+    @ApiModelProperty(value = "核准时间")
+    private Date approvedDate;
+
+    @ApiModelProperty(value = "经营状态：在业、吊销、注销、迁入、迁出、停业、清算")
+    private String businessState;
+
+   @ApiModelProperty(value = "经营状态code")
+   private String businessStateCode;
+
+}

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

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.yeejoin.amos.boot.module.tzs.api.dto.BaseUnitLicenceDto;
+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;
+import java.util.List;
+
+/**
+ * 单位注册信息表
+ *
+ * @author system_generator
+ * @date 2022-08-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="RegUnitInfoDto", description="单位注册信息表")
+public class RegUnitInfoDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "单位名称")
+    private String name;
+
+    @ApiModelProperty(value = "证件code")
+    private String unitCode;
+
+    @ApiModelProperty(value = "证件类型")
+    private String unitCodeType;
+
+    @ApiModelProperty(value = "单位类型")
+    private String unitType;
+
+    @ApiModelProperty(value = "单位类型code")
+    private String unitTypeCode;
+
+    @ApiModelProperty(value = "管辖机构")
+    private String managementUnit;
+
+    @ApiModelProperty(value = "管辖单位id")
+    private String managementUnitId;
+
+    @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 legalPerson;
+
+    @ApiModelProperty(value = "法人电话")
+    private String legalPersonTel;
+
+    @ApiModelProperty(value = "单位联系人")
+    private String contactPerson;
+
+    @ApiModelProperty(value = "联系人电话")
+    private String contactPersonTel;
+
+    @ApiModelProperty(value = "管理员姓名")
+    private String adminName;
+
+    @ApiModelProperty(value = "管理员用户名")
+    private String adminLoginName;
+
+    @ApiModelProperty(value = "管理员密码")
+    private String adminLoginPwd;
+
+    @ApiModelProperty(value = "管理员手机号")
+    private String adminTel;
+
+    @ApiModelProperty(value = "管理员身份证号")
+    private String adminIdNumber;
+
+    @ApiModelProperty(value = "审核状态：1-无需审核；2-待审核；3-已审核")
+    private String state;
+
+    @ApiModelProperty(value = "工商信息")
+    private RegUnitIcDto regUnitIc;
+
+    @ApiModelProperty(value = "行政许可")
+    private List<BaseUnitLicenceDto> unitLicences;
+
+    @ApiModelProperty(value = "平台公司id,平台创建公司后更新")
+    private String amosCompanySeq;
+
+
+    @ApiModelProperty(value = "平台用户id,平台创建用户后更新")
+    private String adminUserId;
+}

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/RegUnitIc.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 2022-08-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tz_flc_reg_unit_ic")
+public class RegUnitIc extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 单位名称
+     */
+    @TableField("unit_name")
+    private String unitName;
+
+    /**
+     * 证件code
+     */
+    @TableField("unit_code")
+    private String unitCode;
+
+    /**
+     * 所属行业
+     */
+    @TableField("industry_name")
+    private String industryName;
+
+    /**
+     * 登记机关名称
+     */
+    @TableField("registered_organ")
+    private String registeredOrgan;
+
+    /**
+     * 登记机关code
+     */
+    @TableField("registered_organ_code")
+    private String registeredOrganCode;
+
+    /**
+     * 核准时间
+     */
+    @TableField("approved_date")
+    private Date approvedDate;
+
+    /**
+     * 经营状态名称：在业、吊销、注销、迁入、迁出、停业、清算
+     */
+    @TableField("business_state")
+    private String businessState;
+
+
+    /**
+     * 经营状态code
+     */
+    @TableField("business_state_code")
+    private String businessStateCode;
+
+}

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

+package com.yeejoin.amos.boot.module.tzs.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;
+
+/**
+ * 单位注册信息表
+ *
+ * @author system_generator
+ * @date 2022-08-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tz_flc_reg_unit_info")
+public class RegUnitInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 单位名称
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 证件code
+     */
+    @TableField("unit_code")
+    private String unitCode;
+
+    /**
+     * 证件类型
+     */
+    @TableField("unit_code_type")
+    private String unitCodeType;
+
+    /**
+     * 单位类型
+     */
+    @TableField("unit_type")
+    private String unitType;
+
+    /**
+     * 单位类型code
+     */
+    @TableField("unit_type_code")
+    private String unitTypeCode;
+
+    /**
+     * 管辖机构
+     */
+    @TableField("management_unit")
+    private String managementUnit;
+
+    /**
+     * 管辖单位id
+     */
+    @TableField("management_unit_id")
+    private String managementUnitId;
+
+    /**
+     * 区域编码
+     */
+    @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("legal_person")
+    private String legalPerson;
+
+    /**
+     * 法人电话
+     */
+    @TableField("legal_person_tel")
+    private String legalPersonTel;
+
+    /**
+     * 单位联系人
+     */
+    @TableField("contact_person")
+    private String contactPerson;
+
+    /**
+     * 联系人电话
+     */
+    @TableField("contact_person_tel")
+    private String contactPersonTel;
+
+    /**
+     * 管理员姓名
+     */
+    @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;
+
+    /**
+     * 管理元身份证号
+     */
+    @TableField("admin_id_number")
+    private String adminIdNumber;
+
+    /**
+     * 审核状态：1-无需审核；2-待审核；3-已审核
+     */
+    @TableField("state")
+    private String state;
+
+    /**
+     * 平台公司id，平台创建公司后更新
+     */
+    @TableField("amos_company_seq")
+    private String amosCompanySeq;
+
+    /**
+     *  平台用户id，平台创建用户后更新
+     */
+    private String adminUserId;
+
+}

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/enums/UnitReviewStateEnum.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.enums;
+
+import lombok.Getter;
+
+/**
+ * @author Administrator
+ */
+
+@Getter
+public enum UnitReviewStateEnum {
+
+    /**
+     * 单位审核状态
+     */
+    NO_NEED_REVIEW("无需审核","1"),
+    WAIT_REVIEW("待审核","2"),
+    HAVING_REVIEW("已审核","3");
+
+
+    private String name;
+
+    private String code;
+
+    UnitReviewStateEnum(String name,String code){
+        this.name = name;
+        this.code = code;
+    }
+
+}

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/RegUnitIcMapper.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.RegUnitIc;
+
+/**
+ * 注册单位工商信息表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2022-08-10
+ */
+public interface RegUnitIcMapper extends BaseMapper<RegUnitIc> {
+
+}

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

+package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
+
+import com.yeejoin.amos.boot.module.tzs.api.entity.RegUnitInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 单位注册信息表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2022-08-09
+ */
+public interface RegUnitInfoMapper extends BaseMapper<RegUnitInfo> {
+
+}

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

+package com.yeejoin.amos.boot.module.tzs.api.service;
+
+
+/**
+ * 注册单位工商信息表接口类
+ *
+ * @author system_generator
+ * @date 2022-08-10
+ */
+public interface IRegUnitIcService {
+
+}

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

+package com.yeejoin.amos.boot.module.tzs.api.service;
+
+
+import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.RegUnitInfoDto;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 单位注册信息表接口类
+ *
+ * @author system_generator
+ * @date 2022-08-09
+ */
+public interface IRegUnitInfoService {
+
+    /**
+     * 单位注册
+     * @param model RegUnitInfoDto
+     * @return RegUnitInfoDto
+     */
+    RegUnitInfoDto registerUnit(RegUnitInfoDto model);
+
+
+    /**
+     * 单位校验
+     * @param unitCode 单位唯一编号
+     * @param unitType 单位类型
+     * @return RegUnitInfoDto
+     */
+    RegUnitInfoDto unitCheck(String unitCode, String unitType);
+
+    /**
+     * 单位类型列表字典
+     * @return List<DataDictionary>
+     */
+    List<DataDictionary> getUnitTypeList();
+
+    /**
+     * 获取管辖机构树
+     * @return 组织架构中单位级别为：省级、地市级、区县级的单位
+     */
+    Collection getManagementUnitTree();
+
+    /**
+     * 单位注销
+     * @param unitCode 单位唯一标识
+     * @return 是否成功
+     */
+    Boolean unitLogOut(String unitCode);
+}

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

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

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

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/BaseUnitLicenceController.java

+package com.yeejoin.amos.boot.module.tzs.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.biz.service.impl.BaseUnitLicenceServiceImpl;
+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.api.dto.BaseUnitLicenceDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 单位注册许可信息表
+ *
+ * @author system_generator
+ * @date 2022-08-09
+ */
+@RestController
+@Api(tags = "单位注册许可信息表Api")
+@RequestMapping(value = "/base-unit-licence")
+public class BaseUnitLicenceController extends BaseController {
+
+    @Autowired
+    BaseUnitLicenceServiceImpl baseUnitLicenceServiceImpl;
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "单位注册许可信息表列表全部数据查询",   notes = "单位注册许可信息表列表全部数据查询")
+	@GetMapping(value = "/{unitCode}/list")
+	public ResponseModel<List<BaseUnitLicenceDto>> selectForList(@PathVariable String unitCode) {
+	    return ResponseHelper.buildResponse(baseUnitLicenceServiceImpl.queryForBaseUnitLicenceList(unitCode));
+	}
+}

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

+package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.tzs.api.entity.BaseUnitLicence;
+import com.yeejoin.amos.boot.module.tzs.api.mapper.BaseUnitLicenceMapper;
+import com.yeejoin.amos.boot.module.tzs.api.service.IBaseUnitLicenceService;
+import com.yeejoin.amos.boot.module.tzs.api.dto.BaseUnitLicenceDto;
+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 2022-08-09
+ */
+@Service
+public class BaseUnitLicenceServiceImpl extends BaseService<BaseUnitLicenceDto,BaseUnitLicence,BaseUnitLicenceMapper> implements IBaseUnitLicenceService {
+    /**
+     * 分页查询
+     */
+    public Page<BaseUnitLicenceDto> queryForBaseUnitLicencePage(Page<BaseUnitLicenceDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询
+     * @param unitCode 单位编号
+     */
+    public List<BaseUnitLicenceDto> queryForBaseUnitLicenceList(String unitCode)   {
+        return this.queryForList("" , false, unitCode);
+    }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/RegUnitIcController.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.RegUnitIcDto;
+import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.RegUnitIcServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+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 2022-08-10
+ */
+@RestController
+@Api(tags = "注册单位工商信息表Api")
+@RequestMapping(value = "/reg-unit-ic")
+public class RegUnitIcController extends BaseController {
+
+    @Autowired
+    RegUnitIcServiceImpl regUnitIcServiceImpl;
+
+    /**
+     * 新增注册单位工商信息表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增注册单位工商信息表", notes = "新增注册单位工商信息表")
+    public ResponseModel<RegUnitIcDto> save(@RequestBody RegUnitIcDto model) {
+        model = regUnitIcServiceImpl.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<RegUnitIcDto> updateBySequenceNbrRegUnitIc(@RequestBody RegUnitIcDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        model.setSequenceNbr(sequenceNbr);
+        return ResponseHelper.buildResponse(regUnitIcServiceImpl.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(regUnitIcServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个注册单位工商信息表", notes = "根据sequenceNbr查询单个注册单位工商信息表")
+    public ResponseModel<RegUnitIcDto> selectOne(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(regUnitIcServiceImpl.queryBySeq(sequenceNbr));
+    }
+
+    /**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/page")
+    @ApiOperation(httpMethod = "GET", value = "注册单位工商信息表分页查询", notes = "注册单位工商信息表分页查询")
+    public ResponseModel<Page<RegUnitIcDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
+            (value = "size") int size) {
+        Page<RegUnitIcDto> page = new Page<RegUnitIcDto>();
+        page.setCurrent(current);
+        page.setSize(size);
+        return ResponseHelper.buildResponse(regUnitIcServiceImpl.queryForRegUnitIcPage(page));
+    }
+
+    /**
+     * 列表全部数据查询
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "注册单位工商信息表列表全部数据查询", notes = "注册单位工商信息表列表全部数据查询")
+    @GetMapping(value = "/list")
+    public ResponseModel<List<RegUnitIcDto>> selectForList() {
+        return ResponseHelper.buildResponse(regUnitIcServiceImpl.queryForRegUnitIcList());
+    }
+}

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

+package com.yeejoin.amos.boot.module.tzs.flc.biz.controller;
+
+import com.baomidou.mybatisplus.extension.api.R;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
+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.service.IRegUnitInfoService;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.RegUnitInfoDto;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.ws.rs.DELETE;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Random;
+
+/**
+ * 单位注册信息表
+ *
+ * @author system_generator
+ * @date 2022-08-09
+ */
+@RestController
+@Api(tags = "单位注册信息表Api")
+@RequestMapping(value = "/reg-unit-info")
+public class RegUnitInfoController extends BaseController {
+
+    @Autowired
+    IRegUnitInfoService iRegUnitInfoService;
+
+    @Autowired
+    RedisUtils redisUtils;
+
+    @Value("${flc.sms.tempCode}")
+    private String smsTempCode;
+
+    @Value("${flc.sms.timeout:600}")
+    private int timeout;
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "单位注册", notes = "单位注册")
+    public ResponseModel<RegUnitInfoDto> save(@RequestBody RegUnitInfoDto model) {
+        model = iRegUnitInfoService.registerUnit(model);
+        return ResponseHelper.buildResponse(model);
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @GetMapping(value = "/{unitCode}/check")
+    @ApiOperation(httpMethod = "GET", value = "单位注册校验", notes = "单位注册校验")
+    public ResponseModel<RegUnitInfoDto> unitCheck(@PathVariable String unitCode,
+                                                   @RequestParam String unitType) {
+        if(ValidationUtil.isEmpty(unitCode)){
+            throw new BadRequest("单位编码不能为空");
+        }
+        RegUnitInfoDto regUnitInfoDto = iRegUnitInfoService.unitCheck(unitCode, unitType);
+        return ResponseHelper.buildResponse(regUnitInfoDto);
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @GetMapping(value = "/unit-type/list")
+    @ApiOperation(httpMethod = "GET", value = "单位类型列表", notes = "单位类型列表")
+    public ResponseModel<List<DataDictionary>> unitTypeList() {
+        List<DataDictionary> result = iRegUnitInfoService.getUnitTypeList();
+        return ResponseHelper.buildResponse(result);
+    }
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @GetMapping(value = "/management-unit/tree")
+    @ApiOperation(httpMethod = "GET", value = "管辖机构树", notes = "管辖机构树")
+    public ResponseModel<Collection> managementUnitTree() {
+        Collection result = iRegUnitInfoService.getManagementUnitTree();
+        return ResponseHelper.buildResponse(result);
+    }
+
+
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/{tel}/sendTelCode")
+    @ApiOperation(httpMethod = "GET", value = "发送手机号验证码", notes = "发送手机号验证码")
+    public ResponseModel<Boolean> sendTelCode(@PathVariable(value = "tel") String tel) {
+        if (ValidationUtil.isEmpty(tel)) {
+            throw new BadRequest("手机号不能为空");
+        }
+        try {
+            Privilege.authClient.mobileVerify(tel);
+        } catch (Exception e) {
+            throw new RuntimeException("该手机号已注册!");
+        }
+        Boolean flag;
+        HashMap<String, String> params = new HashMap<>();
+        String code = this.getRandomCode();
+        params.put("code", code);
+        params.put("mobile", tel);
+        params.put("smsCode", smsTempCode);
+        try {
+            Systemctl.smsClient.sendCommonSms(params).getResult();
+            flag = true;
+        } catch (Exception e) {
+            throw new BadRequest("发送短信失败：" + e.getMessage());
+        }
+        // code 保存到缓存中
+        redisUtils.set(RedisKey.FLC_USER_TEL + tel, code, timeout);
+        return ResponseHelper.buildResponse(flag);
+    }
+
+    private String getRandomCode() {
+        StringBuilder code = new StringBuilder();
+        Random random = new Random();
+        for (int i = 0; i < 6; i++) {
+            //每次随机出一个数字（0-9）
+            int r = random.nextInt(10);
+            //把每次随机出的数字拼在一起
+            code.append(r);
+        }
+        return code.toString();
+
+    }
+
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/{tel}/{code}/verifyTelCode")
+    @ApiOperation(httpMethod = "GET", value = "验证手机号验证码是否成功", notes = "验证手机号验证码是否成功")
+    public ResponseModel<Boolean> verifyTelCode(@PathVariable(value = "tel") String tel, @PathVariable(value = "code") String code) {
+        Boolean flag = false;
+        if (ValidationUtil.isEmpty(tel) || ValidationUtil.isEmpty(code)) {
+            throw new BadRequest("参数校验失败.");
+        }
+        if (redisUtils.hasKey(RedisKey.FLC_USER_TEL + tel)) {
+            String redisCode = redisUtils.get(RedisKey.FLC_USER_TEL + tel).toString();
+            if (code.equals(redisCode)) {
+                flag = true;
+                redisUtils.del(RedisKey.FLC_USER_TEL + tel);
+            }
+        }
+        return ResponseHelper.buildResponse(flag);
+    }
+
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/{userName}/hasExistUser")
+    @ApiOperation(httpMethod = "GET", value = "判断用户是否存在", notes = "判断用户是否存在")
+    public ResponseModel<Boolean> hasExistUser(@PathVariable(value = "userName") String userName) {
+        boolean flag = false;
+        AgencyUserModel user = Privilege.agencyUserClient.queryByUserName(userName).getResult();
+            if (user != null) {
+            flag = true;
+        }
+        return ResponseHelper.buildResponse(flag);
+    }
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @DeleteMapping(value = "/{unitCode}/logOut")
+    @ApiOperation(httpMethod = "DELETE", value = "企业注销", notes = "企业注销")
+    public ResponseModel unitLogOut(@PathVariable String unitCode){
+        return ResponseHelper.buildResponse(iRegUnitInfoService.unitLogOut(unitCode));
+    }
+
+
+}

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/RegUnitIcServiceImpl.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.api.service.IRegUnitIcService;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.RegUnitIcDto;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.RegUnitIc;
+import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.RegUnitIcMapper;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 注册单位工商信息表服务实现类
+ *
+ * @author system_generator
+ * @date 2022-08-10
+ */
+@Service
+public class RegUnitIcServiceImpl extends BaseService<RegUnitIcDto, RegUnitIc, RegUnitIcMapper> implements IRegUnitIcService {
+    /**
+     * 分页查询
+     */
+    public Page<RegUnitIcDto> queryForRegUnitIcPage(Page<RegUnitIcDto> page) {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<RegUnitIcDto> queryForRegUnitIcList() {
+        return this.queryForList("", false);
+    }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/application-dev.properties

 #DB properties:
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://172.16.6.60:3306/amos_tzs_new?allowMultiQueries=true&serverTimezone=GMT%2B8\
+spring.datasource.url=jdbc:mysql://172.16.10.90:53306/tzs_amos_tzs_biz?allowMultiQueries=true&serverTimezone=GMT%2B8\
   &characterEncoding=utf8
 spring.datasource.username=root
-spring.datasource.password=root_123
+spring.datasource.password=Yeejoin@2020
 
 ##eureka properties:
-eureka.client.service-url.defaultZone =http://39.100.239.237:10001/eureka/
+eureka.client.service-url.defaultZone =http://172.16.3.99:10001/eureka/
 eureka.instance.prefer-ip-address=true
 management.endpoint.health.show-details=always
 management.endpoints.web.exposure.include=*
-eureka.instance.health-check-url=http://39.100.239.237:${server.port}${server.servlet.context-path}/actuator/health
+eureka.instance.health-check-url=http://172.16.3.99:${server.port}${server.servlet.context-path}/actuator/health
 eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
-eureka.instance.status-page-url=http://39.100.239.237:${server.port}${server.servlet.context-path}/actuator/info
-eureka.instance.metadata-map.management.api-docs=http://39.100.239.237:${server.port}${server.servlet.context-path}/swagger-ui.html   
+eureka.instance.status-page-url=http://172.16.3.99:${server.port}${server.servlet.context-path}/actuator/info
+eureka.instance.metadata-map.management.api-docs=http://172.16.3.99:${server.port}${server.servlet.context-path}/swagger-ui.html   
 
 ## ES properties:
-biz.elasticsearch.address=39.100.239.237
+biz.elasticsearch.address=172.16.10.90
 spring.data.elasticsearch.cluster-name=elasticsearch
 spring.data.elasticsearch.cluster-nodes=${biz.elasticsearch.address}:9300
 spring.elasticsearch.rest.uris=http://${biz.elasticsearch.address}:9200
 
 elasticsearch.username= elastic
-elasticsearch.password= 123456
+elasticsearch.password= Yeejoin@2020
 
 ## unit(h)
 alertcall.es.synchrony.time=48
@@ -30,9 +30,9 @@ alertcall.es.synchrony.time=48
 fileserver.domain=https://rpm.yeeamos.com:8888/
 #redis properties:
 spring.redis.database=1
-spring.redis.host=39.100.239.237
+spring.redis.host=172.16.10.90
 spring.redis.port=6379
-spring.redis.password=amos2019Redis
+spring.redis.password=yeejoin@2020
 spring.redis.lettuce.pool.max-active=200
 spring.redis.lettuce.pool.max-wait=-1
 spring.redis.lettuce.pool.max-idle=10
@@ -42,11 +42,11 @@ spring.redis.expire.time=300
 ## emqx properties:
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
-emqx.broker=tcp://39.100.239.237:1883
-emqx.user-name=admin
-emqx.password=public
+emqx.broker=tcp://172.16.10.90:1883
+emqx.user-name=super
+emqx.password=123456
 
-tzs.cti.url=http://113.134.211.174:8000
+tzs.cti.url=http://172.16.10.90:8000
 
 rule.definition.load=false
 rule.definition.model-package=com.yeejoin.amos.boot.module.tzs.api.dto

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/db/changelog/changelog-master.xml

@@ -7,4 +7,5 @@
         http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd">
         
     <include file="tzs-1.0.0.0.xml" relativeToChangelogFile="true"/>
+    <include file="tzs-1.0.0.1.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>

amos-boot-system-tzs/pom.xml

@@ -29,5 +29,10 @@
             <artifactId>commons-text</artifactId>
             <version>1.9</version>
         </dependency>
+        <dependency>
+            <groupId>com.yeejoin</groupId>
+            <artifactId>amos-feign-privilege</artifactId>
+            <version>1.7.11-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 </project>