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-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/MyBatisPlusCodeGeneratorTzs.java

+package com.yeejoin.amos.boot.biz.common.utils;
+
+
+import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.generator.AutoGenerator;
+import com.baomidou.mybatisplus.generator.InjectionConfig;
+import com.baomidou.mybatisplus.generator.config.*;
+import com.baomidou.mybatisplus.generator.config.converts.MySqlTypeConvert;
+import com.baomidou.mybatisplus.generator.config.po.TableInfo;
+import com.baomidou.mybatisplus.generator.config.rules.DbColumnType;
+import com.baomidou.mybatisplus.generator.config.rules.IColumnType;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
+import org.apache.commons.lang.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Scanner;
+
+/**
+ * @author DELL
+ */
+public class MyBatisPlusCodeGeneratorTzs {
+
+    /**
+     * 项目名称缩写
+     */
+    static String projectShortName = "tzs";
+
+    /**
+     * 项目api目录
+     */
+    static String apiAddress = "/amos-boot-system-" + projectShortName + "/" +
+            "amos-boot-module-" + projectShortName + "-api/";
+
+    /**
+     * 项目biz目录
+     */
+    static String bizAddress = "/amos-boot-system-" + projectShortName + "/" +
+            "amos-boot-module-" + projectShortName + "-biz/";
+
+    /**
+     * 项目api路径
+     */
+    static String apiPath = apiAddress + "src/main/java/com/yeejoin/amos/boot/module/" + projectShortName + "/api";
+
+    /**
+     * 项目biz路径
+     */
+    static String bizPath = bizAddress + "src/main/java/com/yeejoin/amos/boot/module/" + projectShortName + "/biz";
+
+    /**
+     * 接口及实体等代码生成路径
+     */
+    static String interfaceCodeOutPath = System.getProperty("user.dir").replace("\\amos-boot-biz-common", "\\") + apiPath;
+
+
+    /**
+     * 控制器及接口实现等代码生成路径
+     */
+    static String controllerCodeOutPath = System.getProperty("user.dir").replace("\\amos-boot-biz-common", "\\") + bizPath;
+
+
+    /**
+     * 读取控制台内容
+     */
+    public static String scanner(String tip) {
+        Scanner scanner = new Scanner(System.in);
+        StringBuilder help = new StringBuilder();
+        help.append("请输入" + tip + "：");
+        System.out.println(help.toString());
+        if (scanner.hasNext()) {
+            String ipt = scanner.next();
+            if (StringUtils.isNotEmpty(ipt)) {
+                return ipt;
+            }
+        }
+        throw new MybatisPlusException("请输入正确的" + tip + "！");
+    }
+
+    public static void main(String[] args) {
+        // 代码生成器
+        AutoGenerator autoGenerator = new AutoGenerator();
+
+        // 全局配置
+        GlobalConfig gc = new GlobalConfig();
+        // 工程路径-最外层
+        final String projectPath = System.getProperty("user.dir").replace("\\amos-boot-biz-common", "\\");
+        System.out.println("projectPath:"+projectPath);
+        // 代码输出目录
+        //gc.setOutputDir(codeOutPath);
+        // 作者
+        gc.setAuthor("system_generator");
+        // 是否自动打开文件夹 建议开启
+        gc.setOpen(false);
+        // 开启Swagger2 注解支持
+        gc.setSwagger2(true);
+        // 注入autoGenerator
+        autoGenerator.setGlobalConfig(gc);
+
+        gc.setActiveRecord(false);
+        // 数据源配置
+        DataSourceConfig dsc = new DataSourceConfig();
+        dsc.setUrl("jdbc:mysql://172.16.10.90:53306/tzs_amos_tzs_biz?serverTimezone=GMT%2B8");
+        // dsc.setSchemaName("public");
+//        dsc.setDriverName("com.mysql.jdbc.Driver");
+        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
+        dsc.setUsername("root");
+        dsc.setPassword("Yeejoin@2020");
+
+        dsc.setTypeConvert(new ITypeConvert() {
+            @Override
+            public IColumnType processTypeConvert(GlobalConfig globalConfig, String fieldType) {
+                String t = fieldType.toLowerCase();
+                if (t.contains("datetime")) {
+                    return DbColumnType.DATE;
+                }
+                if (t.contains("date")) {
+                    return DbColumnType.DATE;
+                }
+                //其它字段采用默认转换（非mysql数据库可以使用其它默认的数据库转换器）
+                return new MySqlTypeConvert().processTypeConvert(globalConfig, fieldType);
+            }
+        });
+
+        autoGenerator.setDataSource(dsc);
+
+        // 包配置
+        final PackageConfig pc = new PackageConfig();
+        // 填写对应模块
+        pc.setModuleName(projectShortName);
+        // 实体路径
+        pc.setParent("com.yeejoin.amos.boot.module");
+        pc.setEntity("api.entity");
+        pc.setMapper("api.mapper");
+        pc.setService("api.service");
+        pc.setServiceImpl("biz.service.impl");
+        pc.setController("biz.controller");
+        pc.setXml("api.dto");
+        autoGenerator.setPackageInfo(pc);
+
+        // 自定义配置
+        InjectionConfig cfg = new InjectionConfig() {
+            @Override
+            public void initMap() {
+                // to do nothing
+            }
+        };
+        // 如果模板引擎是 freemarker
+        String controller = "/template/controller.java.ftl";
+        String entity = "/template/bean.java.ftl";
+        String mapper = "/template/mapper.java.ftl";
+        String service = "/template/service.java.ftl";
+        String serviceImpl = "/template/serviceImpl.java.ftl";
+        String mapperXml = "/template/mapper.xml.ftl";
+        String dto = "/template/dto.java.ftl";
+        String vo = "/template/vo.java.ftl";
+
+
+        // 自定义配置会被优先输出
+        List<FileOutConfig> focList = new ArrayList<>();
+        focList.add(new FileOutConfig(controller) {
+            @Override
+            public String outputFile(TableInfo tableInfo) {
+                String filePath = controllerCodeOutPath
+                        + "/controller/" + tableInfo.getControllerName() + StringPool.DOT_JAVA;
+                System.out.println("controller:"+filePath);
+                return filePath;
+            }
+        });
+
+        focList.add(new FileOutConfig(entity) {
+            @Override
+            public String outputFile(TableInfo tableInfo) {
+                String filePath = interfaceCodeOutPath
+                        + "/entity/" + tableInfo.getEntityName() + StringPool.DOT_JAVA;
+                System.out.println("entity:"+filePath);
+                return filePath;
+            }
+        });
+
+
+        focList.add(new FileOutConfig(dto) {
+            @Override
+            public String outputFile(TableInfo tableInfo) {
+                String filePath = interfaceCodeOutPath
+                        + "/dto/" + tableInfo.getEntityName() + "Dto" + StringPool.DOT_JAVA;
+                System.out.println("dto:"+filePath);
+                return filePath;
+            }
+        });
+
+//        focList.add(new FileOutConfig(vo) {
+//            @Override
+//            public String outputFile(TableInfo tableInfo) {
+//                String filePath = interfaceCodeOutPath
+//                        + "/vo/" + tableInfo.getEntityName() + "Vo" + StringPool.DOT_JAVA;
+//                System.out.println("vo:"+filePath);
+//                return filePath;
+//            }
+//        });
+
+        focList.add(new FileOutConfig(mapper) {
+            @Override
+            public String outputFile(TableInfo tableInfo) {
+            	String filePath = interfaceCodeOutPath
+                        + "/mapper/" + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_JAVA;
+                System.out.println("mapper:"+filePath);
+                return filePath;
+            }
+        });
+
+        focList.add(new FileOutConfig(service) {
+            @Override
+            public String outputFile(TableInfo tableInfo) {
+            	String filePath = interfaceCodeOutPath
+                        + "/service/" + tableInfo.getServiceName() + StringPool.DOT_JAVA;
+            	System.out.println("service:"+filePath);
+            	return filePath;
+            }
+        });
+
+        focList.add(new FileOutConfig(serviceImpl) {
+            @Override
+            public String outputFile(TableInfo tableInfo) {
+            	String filePath = controllerCodeOutPath
+                        + "/service/impl/" + tableInfo.getServiceImplName() + StringPool.DOT_JAVA;
+                System.out.println("service/impl:"+filePath);
+                return filePath;
+            }
+        });
+
+
+//        focList.add(new FileOutConfig(mapperXml) {
+//            @Override
+//            public String outputFile(TableInfo tableInfo) {
+//                // 自定义输出文件名 ， 如果你 Entity 设置了前后缀、此处注意 xml 的名称会跟着发生变化！！
+//                return projectPath + projectName + "src/main/resources/mapper/" + pc.getModuleName()
+//                        + "/" + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
+//            }
+//        });
+        focList.add(new FileOutConfig(mapperXml) {
+            @Override
+            public String outputFile(TableInfo tableInfo) {
+                // 自定义输出文件名 ， 如果你 Entity 设置了前后缀、此处注意 xml 的名称会跟着发生变化！！
+                String filePath =  projectPath + apiAddress + "src/main/resources/mapper/" + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
+                System.out.println("mapper:"+filePath);
+                return filePath;
+            }
+        });
+
+        /*
+        cfg.setFileCreate(new IFileCreate() {
+            @Override
+            public boolean isCreate(ConfigBuilder configBuilder, FileType fileType, String filePath) {
+                // 判断自定义文件夹是否需要创建
+                checkDir("调用默认方法创建的目录");
+                return false;
+            }
+        });
+        */
+        cfg.setFileOutConfigList(focList);
+        autoGenerator.setCfg(cfg);
+
+        // 配置模板
+        TemplateConfig templateConfig = new TemplateConfig();
+
+        // 配置自定义输出模板
+        //指定自定义模板路径，注意不要带上.ftl/.vm, 会根据使用的模板引擎自动识别
+        // templateConfig.setEntity("templates/entity2.java");
+        // templateConfig.setService();
+        // templateConfig.setController();
+
+        templateConfig.setXml(null);
+        autoGenerator.setTemplate(templateConfig);
+
+        // 策略配置
+        StrategyConfig strategy = new StrategyConfig();
+        strategy.setNaming(NamingStrategy.underline_to_camel);
+        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
+        strategy.setSuperEntityClass("com.yeejoin.amos.boot.biz.common.entity.BaseEntity");
+        strategy.setEntityLombokModel(true);
+        strategy.setRestControllerStyle(true);
+        // 公共父类-开启将导致swagger无效化
+        //strategy.setSuperControllerClass("com.test.base.BaseController");
+        // 写于父类中的公共字段
+        strategy.setSuperEntityColumns("sequence_nbr", "rec_date", "rec_user_id", "rec_user_name",
+                "is_delete");
+        // 建议以后开启
+        strategy.setInclude(scanner("表名，多个英文逗号分割").split(","));
+        strategy.setControllerMappingHyphenStyle(true);
+        strategy.setTablePrefix();
+        //去除表名前缀
+        //去除表名前缀
+        strategy.setTablePrefix("t_", "tb_", "sys_","other_", "rpm_", "s_", "tcb_", "cb_", "tz_", "jc_", "jcb_");
+        // 设置父级Controller
+        strategy.setSuperControllerClass("com.yeejoin.amos.boot.biz.common.controller.BaseController");
+        autoGenerator.setStrategy(strategy);
+        autoGenerator.setTemplateEngine(new FreemarkerTemplateEngine());
+        autoGenerator.execute();
+    }
+
+}
\ No newline at end of file

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/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/RegUnitInfoServiceImpl.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
+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.TreeParser;
+import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
+import com.yeejoin.amos.boot.module.tzs.api.dto.BaseUnitLicenceDto;
+import com.yeejoin.amos.boot.module.tzs.api.entity.BaseUnitLicence;
+import com.yeejoin.amos.boot.module.tzs.api.entity.RegUnitInfo;
+import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo;
+import com.yeejoin.amos.boot.module.tzs.api.service.IRegUnitInfoService;
+import com.yeejoin.amos.boot.module.tzs.biz.service.impl.BaseUnitLicenceServiceImpl;
+import com.yeejoin.amos.boot.module.tzs.biz.service.impl.TzBaseEnterpriseInfoServiceImpl;
+import com.yeejoin.amos.boot.module.tzs.biz.service.impl.TzsAuthServiceImpl;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.RegUnitIcDto;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.RegUnitInfoDto;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.RegUnitIc;
+import com.yeejoin.amos.boot.module.tzs.flc.api.enums.UnitReviewStateEnum;
+import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.RegUnitInfoMapper;
+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.privilege.model.RoleModel;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.client.RestTemplate;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 单位注册信息表服务实现类
+ *
+ * @author system_generator
+ * @date 2022-08-09
+ */
+@Service
+public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitInfo, RegUnitInfoMapper> implements IRegUnitInfoService {
+
+    @Autowired
+    BaseUnitLicenceServiceImpl baseUnitLicenceService;
+
+    @Autowired
+    DataDictionaryServiceImpl iDataDictionaryService;
+
+    @Autowired
+    OrgUsrServiceImpl iOrgUsrService;
+
+    @Autowired
+    RegUnitIcServiceImpl regUnitIcService;
+
+    @Autowired
+    private TzsAuthServiceImpl tzsAuthServiceImpl;
+
+    @Autowired
+    TzBaseEnterpriseInfoServiceImpl tzBaseEnterpriseInfoService;
+
+    @Autowired
+    RestTemplate restTemplate;
+
+    /**
+     * 使用单位的类型，数据来源：cb_data_dictionary code = 1232
+     */
+    private static String USE_UNIT_TYPE_CODE = "1232";
+
+    /**
+     * 单位类型，数据来源：cb_data_dictionary type = UNIT_TYPE
+     */
+    private static String DICT_TYPE_UNIT_TYPE = "UNIT_TYPE_NEW";
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public RegUnitInfoDto registerUnit(RegUnitInfoDto model) {
+        RegUnitInfo regUnitInfo = new RegUnitInfo();
+        try {
+            tzsAuthServiceImpl.setRequestContext();
+            // 注册用统一信用码注册，默认证件类型为营业执照，数据来源：cb_data_dictionary code = 1060
+            model.setUnitCodeType("1060");
+            Bean.copyExistPropertis(model, regUnitInfo);
+            // 1.插入单位注册许可信息表：tz_base_unit_licence
+            List<BaseUnitLicenceDto> unitLicenceDtos = model.getUnitLicences();
+            List<BaseUnitLicence> baseUnitLicences = unitLicenceDtos.stream().map(s -> {
+                s.setUnitCode(model.getUnitCode());
+                s.setUnitName(model.getName());
+                BaseUnitLicence target = new BaseUnitLicence();
+                Bean.copyExistPropertis(s, target);
+                return target;
+            }).collect(Collectors.toList());
+            baseUnitLicenceService.saveOrUpdateBatch(baseUnitLicences);
+            // 2.插入工商单位信息表：tz_flc_reg_unit_ic
+            RegUnitIc regUnitIc = new RegUnitIc();
+            model.getRegUnitIc().setUnitCode(model.getUnitCode());
+            model.getRegUnitIc().setUnitName(model.getName());
+            Bean.copyExistPropertis(model.getRegUnitIc(), regUnitIc);
+            regUnitIcService.save(regUnitIc);
+            // 3.调用平台进行创建单位、用户信息,同步用户信息
+            if (UnitReviewStateEnum.NO_NEED_REVIEW.getCode().equals(model.getState())) {
+                // 3.1 创建企业信息
+                this.createBaseEnterpriseInfo(model);
+                // 3.2 自动创建：调用平台进行创建单位、用户信息
+                this.createCompanyAndUser(regUnitInfo);
+            }
+            // 4.插入注册单位基本信息表：tz_flc_reg_unit_info
+            this.save(regUnitInfo);
+            // 5.组织返回数据
+            // 5.1企业基本信息
+            Bean.copyExistPropertis(regUnitInfo, model);
+            // 5.2行政许可数据
+            model.setUnitLicences(Bean.toModels(baseUnitLicences, BaseUnitLicenceDto.class));
+            // 5.3工商信息
+            model.setRegUnitIc(Bean.toModel(regUnitIc, new RegUnitIcDto()));
+        } catch (Exception e) {
+            // 失败后回滚：删除已经创建的企业信息
+            if (StringUtils.isNotEmpty(regUnitInfo.getAmosCompanySeq())) {
+                FeignClientResult<CompanyModel> feignClientResult = Privilege.companyClient.seleteOne(Long.parseLong(regUnitInfo.getAmosCompanySeq()));
+                if (feignClientResult != null) {
+                    Privilege.companyClient.deleteCompany(regUnitInfo.getAmosCompanySeq());
+                }
+            }
+            // 失败后回滚：删除已经创建的管理员账号
+            if (StringUtils.isNotEmpty(regUnitInfo.getAdminUserId())) {
+                FeignClientResult<AgencyUserModel> feignClientResult = Privilege.agencyUserClient.queryByUserId(regUnitInfo.getAdminUserId());
+                if (feignClientResult != null) {
+                    Privilege.agencyUserClient.multDeleteUser(regUnitInfo.getAdminUserId());
+                }
+            }
+            throw new RuntimeException(e.getMessage());
+        }
+        return model;
+    }
+
+    public void createBaseEnterpriseInfo(RegUnitInfoDto regUnitInfo) {
+        TzBaseEnterpriseInfo baseEnterpriseInfo = new TzBaseEnterpriseInfo();
+        baseEnterpriseInfo.setUnitType(regUnitInfo.getUnitType());
+        baseEnterpriseInfo.setUseCode(regUnitInfo.getUnitCode());
+        baseEnterpriseInfo.setUseUnit(regUnitInfo.getName());
+        baseEnterpriseInfo.setProvince(regUnitInfo.getProvince());
+        baseEnterpriseInfo.setCity(regUnitInfo.getCity());
+        baseEnterpriseInfo.setDistrict(regUnitInfo.getDistrict());
+        baseEnterpriseInfo.setStreet(regUnitInfo.getStree());
+        baseEnterpriseInfo.setCommunity(regUnitInfo.getCommunity());
+        baseEnterpriseInfo.setAddress(regUnitInfo.getAddress());
+        baseEnterpriseInfo.setLegalPerson(regUnitInfo.getLegalPerson());
+        baseEnterpriseInfo.setLegalPhone(regUnitInfo.getLegalPersonTel());
+        baseEnterpriseInfo.setUseContact(regUnitInfo.getContactPerson());
+        baseEnterpriseInfo.setContactPhone(regUnitInfo.getContactPersonTel());
+        baseEnterpriseInfo.setLongitude(regUnitInfo.getLongitude());
+        baseEnterpriseInfo.setLatitude(regUnitInfo.getLatitude());
+        baseEnterpriseInfo.setGoverningBody(regUnitInfo.getManagementUnit());
+        baseEnterpriseInfo.setDataSources("企业注册");
+        baseEnterpriseInfo.setIndustry(regUnitInfo.getRegUnitIc().getIndustryName());
+        baseEnterpriseInfo.setRegistrationAuthority(regUnitInfo.getRegUnitIc().getRegisteredOrgan());
+        baseEnterpriseInfo.setApprovalTime(regUnitInfo.getRegUnitIc().getApprovedDate());
+        baseEnterpriseInfo.setOperatingStatus(regUnitInfo.getRegUnitIc().getBusinessState());
+        baseEnterpriseInfo.setSyncDate(new Date());
+        baseEnterpriseInfo.setSyncState(0);
+        tzBaseEnterpriseInfoService.save(baseEnterpriseInfo);
+    }
+
+    @Override
+    public RegUnitInfoDto unitCheck(String unitCode, String unitType) {
+        // 1.校验重复性
+        RegUnitInfo regUnitInfo = this.getOne(new LambdaQueryWrapper<RegUnitInfo>().eq(RegUnitInfo::getUnitCode, unitCode));
+        if (regUnitInfo != null) {
+            throw new RuntimeException("该单位已注册，请联系企业管理员！");
+        }
+        // 2.组织返回数据
+        RegUnitInfoDto regUnitInfoDto = new RegUnitInfoDto();
+        if (USE_UNIT_TYPE_CODE.equals(unitType)) {
+            // 2.1 使用单位调用行政许可系统接口进行查询工商信息
+//            MultiValueMap<String, String> headers = new HttpHeaders();
+//            headers.add("header-1","v1");
+//            headers.add("header-2","v2");
+//            RequestEntity requestEntity = new RequestEntity(
+//                    null, //body部分数据
+//                    headers, //头
+//                    HttpMethod.GET,//请求方法
+//                    URI.create("url"));
+//            ResponseEntity<JSONObject> responseEntity = restTemplate.exchange(requestEntity,JSONObject.class);
+//            JSONObject result = responseEntity.getBody();
+            // 2.2 工商信息组装
+//            regUnitInfoDto.setRegUnitIc();
+        } else {
+            RegUnitIc regUnitIc = regUnitIcService.getOne(new LambdaQueryWrapper<RegUnitIc>().eq(RegUnitIc::getUnitCode, unitCode));
+            regUnitInfoDto.setRegUnitIc(Bean.toModel(regUnitIc, new RegUnitIcDto()));
+        }
+        // 2.3 许可信息组装
+        List<BaseUnitLicence> unitLicences = baseUnitLicenceService.list(new LambdaQueryWrapper<BaseUnitLicence>().eq(BaseUnitLicence::getUnitCode, unitCode));
+        regUnitInfoDto.setUnitLicences(Bean.toModels(unitLicences, BaseUnitLicenceDto.class));
+        return regUnitInfoDto;
+    }
+
+    @Override
+    public List<DataDictionary> getUnitTypeList() {
+        return iDataDictionaryService.getByType(DICT_TYPE_UNIT_TYPE);
+    }
+
+    @Override
+    public Collection getManagementUnitTree() {
+        tzsAuthServiceImpl.setRequestContext();
+        // 组织架构中单位级别为：省级、地市级、区县级的单位
+        List<CompanyModel> companyModels = (List<CompanyModel>) Privilege.companyClient.queryAgencyTree(null).getResult();
+        return companyModels.stream().filter(c -> "headquarter".equals(c.getLevel()) || "prefecture-level".equals(c.getLevel()) || "county".equals(c.getLevel())).map(this::dealChildCompany).collect(Collectors.toList());
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean unitLogOut(String unitCode) {
+        RegUnitInfo regUnitInfo = this.getOne(new LambdaQueryWrapper<RegUnitInfo>().eq(RegUnitInfo::getUnitCode, unitCode));
+        if (regUnitInfo == null) {
+            return Boolean.FALSE;
+        }
+        try {
+            tzsAuthServiceImpl.setRequestContext();
+            // 1.删除已经创建的企业信息
+            if (StringUtils.isNotEmpty(regUnitInfo.getAmosCompanySeq())) {
+                CompanyModel companyModel = Privilege.companyClient.seleteOne(Long.parseLong(regUnitInfo.getAmosCompanySeq())).getResult();
+                if (companyModel != null) {
+                    Privilege.companyClient.deleteCompany(regUnitInfo.getAmosCompanySeq());
+                }
+            }
+            // 2.删除已经创建的管理员账号
+            FeignClientResult<AgencyUserModel> feignClientResult = Privilege.agencyUserClient.queryByUserId(regUnitInfo.getAdminUserId());
+            if (feignClientResult != null) {
+                Privilege.agencyUserClient.multDeleteUser(regUnitInfo.getAdminUserId());
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+        // 3.企业注册表删除
+        this.remove(new LambdaQueryWrapper<RegUnitInfo>().eq(RegUnitInfo::getUnitCode, unitCode));
+        // 4.工商信息表删除
+        regUnitIcService.remove(new LambdaQueryWrapper<RegUnitIc>().eq(RegUnitIc::getUnitCode, unitCode));
+        // 5.许可信息删除
+        baseUnitLicenceService.remove(new LambdaQueryWrapper<BaseUnitLicence>().eq(BaseUnitLicence::getUnitCode, unitCode));
+        // 6.企业数据信息删除
+        tzBaseEnterpriseInfoService.remove(new LambdaQueryWrapper<TzBaseEnterpriseInfo>().eq(TzBaseEnterpriseInfo::getUseCode, unitCode));
+        // 7.机场单位表信息删除
+        iOrgUsrService.remove(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getAmosOrgId, regUnitInfo.getAmosCompanySeq()));
+        return Boolean.TRUE;
+    }
+
+    private CompanyModel dealChildCompany(CompanyModel cm) {
+        cm.setChildren(this.getFilterChild(cm.getChildren() != null ? cm.getChildren() : new ArrayList()));
+        cm.getChildren().stream().filter(n -> {
+            CompanyModel c = JSONObject.parseObject(JSON.toJSONString(n), CompanyModel.class);
+            return "headquarter".equals(c.getLevel()) || "prefecture-level".equals(c.getLevel()) || "county".equals(c.getLevel());
+        }).map(n -> {
+            CompanyModel c = JSONObject.parseObject(JSON.toJSONString(n), CompanyModel.class);
+            return dealChildCompany(c);
+        }).collect(Collectors.toList());
+        return cm;
+    }
+
+    private List getFilterChild(Collection children) {
+        return (List) children.stream().filter(n -> {
+            CompanyModel c = JSONObject.parseObject(JSON.toJSONString(n), CompanyModel.class);
+            return "headquarter".equals(c.getLevel()) || "prefecture-level".equals(c.getLevel()) || "county".equals(c.getLevel());
+        }).map(s -> {
+            CompanyModel c = JSONObject.parseObject(JSON.toJSONString(s), CompanyModel.class);
+            c.setChildren(this.getFilterChild(c.getChildren() != null ? c.getChildren() : new ArrayList()));
+            return c;
+        }).collect(Collectors.toList());
+    }
+
+    private void createCompanyAndUser(RegUnitInfo regUnitInfo) {
+        CompanyModel companyInfo = new CompanyModel();
+        FeignClientResult<AgencyUserModel> userResult = null;
+        try {
+            FeignClientResult<List<RoleModel>> roleListResult = Privilege.roleClient.queryRoleList(null, null);
+            List<RoleModel> allRoleList = roleListResult.getResult();
+            List<RoleModel> userRoleList;
+            List<Long> roleIds = new ArrayList<>();
+            Set<String> roleNameSet = new HashSet<>();
+            // 3.1创建公司
+            companyInfo.setAddress(regUnitInfo.getProvince() + regUnitInfo.getCity() + regUnitInfo.getDistrict() + regUnitInfo.getStree() + regUnitInfo.getCommunity() + regUnitInfo.getAddress());
+            companyInfo.setAgencyCode("tzs");
+            companyInfo.setParentId(Long.parseLong(regUnitInfo.getManagementUnitId()));
+            companyInfo.setLevel("company");
+            companyInfo.setCompanyName(regUnitInfo.getName());
+            companyInfo.setCompanyCode(regUnitInfo.getUnitCode());
+            companyInfo.setContact(regUnitInfo.getLegalPerson());
+            companyInfo.setLandlinePhone(regUnitInfo.getLegalPersonTel());
+            FeignClientResult<CompanyModel> companyResult = Privilege.companyClient.create(companyInfo);
+            if (companyResult == null || companyResult.getResult() == null) {
+                throw new BadRequest("单位注册失败");
+            }
+            String adminUserName = regUnitInfo.getAdminName();
+            String loginName = regUnitInfo.getAdminLoginName();
+            String pwd = regUnitInfo.getAdminLoginPwd();
+            String adminTel = regUnitInfo.getAdminTel();
+            // 3.2 创建平台用户
+            companyInfo = companyResult.getResult();
+            AgencyUserModel agencyUserModel = new AgencyUserModel();
+            agencyUserModel.setUserName(loginName);
+            agencyUserModel.setRealName(adminUserName);
+            agencyUserModel.setLockStatus("UNLOCK");
+            agencyUserModel.setPassword(pwd);
+            agencyUserModel.setRePassword(pwd);
+            agencyUserModel.setAgencyCode("tzs");
+            agencyUserModel.setMobile(adminTel);
+            String unitTypeCode = regUnitInfo.getUnitTypeCode();
+            // 根据unitTypeCode 获取应用和角色 数据字典配置
+            DataDictionary unitType = iDataDictionaryService.getOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getCode, unitTypeCode));
+            String appCode = unitType.getTypeDesc() != null ? unitType.getTypeDesc() : "";
+            String[] appCodes = appCode.split(",");
+            Set<String> appCodesSet = new HashSet<>();
+            Collections.addAll(appCodesSet, appCodes);
+            Map<Long, List<Long>> roleSeqMap = new HashMap<>();
+            roleNameSet.add(unitType.getName());
+            userRoleList = allRoleList.stream().filter(r -> r.getRoleName().equals(unitType.getName())).collect(Collectors.toList());
+            userRoleList.forEach(r -> roleIds.add(r.getSequenceNbr()));
+            roleSeqMap.put(companyInfo.getSequenceNbr(), roleIds);
+            Map<Long, List<RoleModel>> orgRoles = new HashMap<>();
+            orgRoles.put(companyInfo.getSequenceNbr(), userRoleList);
+            agencyUserModel.setAppCodes(new ArrayList<>(appCodesSet));
+            agencyUserModel.setOrgRoles(orgRoles);
+            agencyUserModel.setOrgRoleSeqs(roleSeqMap);
+            userResult = Privilege.agencyUserClient.create(agencyUserModel);
+            if (userResult == null || userResult.getResult() == null) {
+                throw new BadRequest("单位注册失败");
+            }
+            regUnitInfo.setAdminUserId(userResult.getResult().getUserId());
+            regUnitInfo.setAmosCompanySeq(companyInfo.getSequenceNbr().toString());
+            // 3.3 org_user 创建组织机构
+            OrgUsr org = new OrgUsr();
+            org.setBizOrgCode(TreeParser.genTreeCode());
+            org.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_COMPANY);
+            org.setBizOrgName(regUnitInfo.getName());
+            org.setRecDate(new Date());
+            org.setRecUserId(userResult.getResult().getUserId());
+            org.setRecUserName(userResult.getResult().getUserName());
+            org.setAmosOrgId(companyInfo.getSequenceNbr() + "");
+            org.setAmosOrgCode(companyInfo.getOrgCode());
+            iOrgUsrService.save(org);
+        } catch (Exception e) {
+            // 删除已经创建的 企业信息
+            if (companyInfo != null && companyInfo.getSequenceNbr() != null) {
+                Privilege.companyClient.deleteCompany(companyInfo.getSequenceNbr() + "");
+            }
+            if (userResult != null && userResult.getResult() != null && StringUtils.isNotEmpty(userResult.getResult().getUserId())) {
+                Privilege.agencyUserClient.multDeleteUser(userResult.getResult().getUserId());
+            }
+            log.error(e.getMessage(), e);
+            throw new RuntimeException(e.getMessage());
+        }
+    }
+}
\ 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/amos-boot-module-tzs-biz/src/main/resources/db/changelog/tzs-1.0.0.1.xml

+<?xml version="1.0" encoding="utf-8"?>
+
+<databaseChangeLog
+        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+        http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd">
+
+
+	<changeSet author="suhuiguang" id="1660201816131-01">
+		<preConditions onFail="MARK_RAN">
+			<not>
+				<tableExists tableName="tz_flc_reg_unit_ic"/>
+			</not>
+		</preConditions>
+		<comment>create table tz_flc_reg_unit_ic 注册单位工商信息表</comment>
+		<sql>
+			CREATE TABLE `tz_flc_reg_unit_ic` (
+			`sequence_nbr` bigint NOT NULL COMMENT '自增主键',
+			`unit_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '单位名称',
+			`unit_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '证件code',
+			`industry_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '所属行业',
+			`registered_organ_code` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '登记机关编码',
+			`registered_organ` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '登记机关',
+			`approved_date` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '核准时间',
+			`business_state` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '经验状态：在业、吊销、注销、迁入、迁出、停业、清算',
+			`business_state_code` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '经验状态code',
+			`rec_user_id` bigint DEFAULT NULL COMMENT '更新人id',
+			`rec_user_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '更新人名称',
+			`rec_date` datetime DEFAULT NULL COMMENT '更新时间',
+			`is_delete` bit(1) DEFAULT b'0' COMMENT '是否删除（0：未删除，1：已删除）',
+			PRIMARY KEY (`sequence_nbr`) USING BTREE,
+			UNIQUE KEY `uk_unit_code` (`unit_code`) USING BTREE
+			) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='注册单位工商信息表';
+		</sql>
+	</changeSet>
+	<changeSet author="suhuiguang" id="1660201816131-02">
+		<preConditions onFail="MARK_RAN">
+			<not>
+				<tableExists tableName="tz_flc_reg_unit_info"/>
+			</not>
+		</preConditions>
+		<comment>create table tz_flc_reg_unit_info 单位注册信息表</comment>
+		<sql>
+			CREATE TABLE `tz_flc_reg_unit_info` (
+			`sequence_nbr` bigint NOT NULL COMMENT '自增主键',
+			`name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '单位名称',
+			`unit_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单位编码',
+			`unit_code_type` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '证件类型',
+			`unit_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '单位类型',
+			`unit_type_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '单位类型code',
+			`management_unit` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '管辖机构',
+			`management_unit_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '管辖单位id',
+			`region_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '区域编码',
+			`country` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '国家',
+			`province` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '省',
+			`city` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '市',
+			`district` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '县区',
+			`stree` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '街道',
+			`community` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '小区',
+			`address` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '详细地址',
+			`longitude` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '经度',
+			`latitude` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '纬度',
+			`industry_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '所属行业',
+			`legal_person` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '单位法人',
+			`legal_person_tel` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '法人电话',
+			`contact_person` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '单位联系人',
+			`contact_person_tel` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '联系人电话',
+			`admin_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '管理员姓名',
+			`admin_login_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '管理员用户名',
+			`admin_login_pwd` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '管理员密码',
+			`admin_tel` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '管理员手机号',
+			`admin_id_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '管理元身份证号',
+			`state` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '1' COMMENT '审核状态：1-无需审核；2-待审核；3-已审核',
+			`admin_user_id` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '平台用户id',
+			`amos_company_seq` varchar(30) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '平台公司id',
+			`rec_user_id` bigint DEFAULT NULL COMMENT '更新人id',
+			`rec_user_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '更新人名称',
+			`rec_date` datetime DEFAULT NULL COMMENT '更新时间',
+			`is_delete` bit(1) DEFAULT b'0' COMMENT '是否删除（0：未删除，1：已删除）',
+			PRIMARY KEY (`sequence_nbr`) USING BTREE,
+			UNIQUE KEY `uk_unit_code` (`unit_code`) USING BTREE
+			) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='单位注册信息表';
+		</sql>
+	</changeSet>
+	<changeSet author="suhuiguang" id="1660201816131-03">
+		<preConditions onFail="MARK_RAN">
+			<not>
+				<tableExists tableName="tz_base_unit_licence"/>
+			</not>
+		</preConditions>
+		<comment>create table tz_base_unit_licence 单位许可信息表</comment>
+		<sql>
+			CREATE TABLE `tz_base_unit_licence` (
+			`sequence_nbr` bigint NOT NULL COMMENT '自增主键',
+			`unit_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '单位编码',
+			`unit_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '单位名称',
+			`lic_address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '许可地址',
+			`cert_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '证书类型',
+			`cert_type_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '证书类型code',
+			`cert_no` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '证书编号',
+			`expiry_date` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '有效期至',
+			`issue_date` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '发证日期',
+			`approved_organ` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '发证机关',
+			`approved_organ_code` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '发证机关code',
+			`change_date` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '变更日期',
+			`apply_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '许可方式/许可状态code',
+			`apply_type_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '许可方式/许可状态code',
+			`appraisal_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '许可评审方式',
+			`appraisal_type_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '许可评审方式code',
+			`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '备注',
+			`item_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '许可项目/检验类型/设备品种编码',
+			`item_code_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '许可项目/检验类型/设备品种',
+			`sub_item_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '许可子项目/检验项目/充装介质类别code',
+			`sub_item_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '许可子项目/检验项目/充装介质类别',
+			`parameter` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '许可参数/充装介质名称',
+			`parameter_code` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '参数code',
+			`item_address` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '固定检验地址',
+			`rec_user_id` bigint DEFAULT NULL COMMENT '更新人id',
+			`rec_user_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '更新人名称',
+			`rec_date` datetime DEFAULT NULL COMMENT '更新时间',
+			`is_delete` bit(1) DEFAULT b'0' COMMENT '是否删除（0：未删除，1：已删除）',
+			PRIMARY KEY (`sequence_nbr`) USING BTREE
+			) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='单位许可信息表';
+		</sql>
+	</changeSet>
+	<changeSet author="suhuiguang" id="1660201816131-04">
+		<comment>单位注册使用到的字典</comment>
+		<sql>
+			REPLACE INTO `cb_data_dictionary` (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1201', '1201', '生产单位', 'zslx', NULL, NULL, NULL, NULL, NULL, b'0', '1');
+			REPLACE INTO `cb_data_dictionary` (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1202', '1202', '重装单位', 'zslx', NULL, NULL, NULL, NULL, NULL, b'0', '1');
+			REPLACE INTO `cb_data_dictionary` (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1210', '1210', '在业', 'jyzt', NULL, NULL, NULL, NULL, NULL, b'0', '1');
+			REPLACE INTO `cb_data_dictionary` (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1211', '1211', '吊销', 'jyzt', NULL, NULL, NULL, NULL, NULL, b'0', '1');
+			REPLACE INTO `cb_data_dictionary` (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1212', '1212', '注销', 'jyzt', NULL, NULL, NULL, NULL, NULL, b'0', '1');
+			REPLACE INTO `cb_data_dictionary` (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1213', '1213', '迁入', 'jyzt', NULL, NULL, NULL, NULL, NULL, b'0', '1');
+			REPLACE INTO `cb_data_dictionary` (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1214', '1214', '迁出', 'jyzt', NULL, NULL, NULL, NULL, NULL, b'0', '1');
+			REPLACE INTO `cb_data_dictionary` (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1215', '1215', '停业', 'jyzt', NULL, NULL, NULL, NULL, NULL, b'0', '1');
+			REPLACE INTO `cb_data_dictionary` (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1216', '1216', '清算', 'jyzt', NULL, NULL, NULL, NULL, NULL, b'0', '1');
+			REPLACE INTO `cb_data_dictionary` (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1217', '1217', '首次', 'xkfszt', NULL, NULL, NULL, NULL, NULL, b'0', '1');
+			REPLACE INTO `cb_data_dictionary` (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1218', '1218', '换证', 'xkfszt', NULL, NULL, NULL, NULL, NULL, b'0', '1');
+			REPLACE INTO `cb_data_dictionary` (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1219', '1219', '增项', 'xkfszt', NULL, NULL, NULL, NULL, NULL, b'0', '1');
+			REPLACE INTO `cb_data_dictionary` (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1220', '1220', '省级', 'xkfszt', NULL, NULL, NULL, NULL, NULL, b'0', '1');
+			REPLACE INTO `cb_data_dictionary` (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1221', '1221', '换证及增项', 'xkfszt', NULL, NULL, NULL, NULL, NULL, b'0', '1');
+			REPLACE INTO `cb_data_dictionary` (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1222', '1222', '换证及升级', 'xkfszt', NULL, NULL, NULL, NULL, NULL, b'0', '1');
+			REPLACE INTO `cb_data_dictionary` (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1223', '1223', '变更', 'xkfszt', NULL, NULL, NULL, NULL, NULL, b'0', '1');
+			REPLACE INTO `cb_data_dictionary` (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1224', '1224', '注销', 'xkfszt', NULL, NULL, NULL, NULL, NULL, b'0', '1');
+			REPLACE INTO `cb_data_dictionary` (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1225', '1225', '撤销', 'xkfszt', NULL, NULL, NULL, NULL, NULL, b'0', '1');
+			REPLACE INTO `cb_data_dictionary` (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1226', '1226', '换证及增项', 'xkfszt', NULL, NULL, NULL, NULL, NULL, b'0', '1');
+			REPLACE INTO `cb_data_dictionary` (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1227', '1227', '鉴定评审', 'xkpsfs', NULL, NULL, NULL, NULL, NULL, b'0', '1');
+			REPLACE INTO `cb_data_dictionary` (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1228', '1228', '免鉴定评审', 'xkpsfs', NULL, NULL, NULL, NULL, NULL, b'0', '1');
+			REPLACE INTO `cb_data_dictionary` (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1229', '1229', '设计制造单位', 'UNIT_TYPE_NEW', 'studio_normalapp_3663181,studio_normalapp_3654033,studio_normalapp_3404492,studio_normalapp_3404491', NULL, NULL, NULL, NULL, b'0', '1');
+			REPLACE INTO `cb_data_dictionary` (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1230', '1230', '安装改造维修单位', 'UNIT_TYPE_NEW', 'studio_normalapp_3663181,studio_normalapp_3654033,studio_normalapp_3404492,studio_normalapp_3404491', NULL, NULL, NULL, NULL, b'0', '1');
+			REPLACE INTO `cb_data_dictionary` (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1231', '1231', '气瓶充装单位', 'UNIT_TYPE_NEW', 'studio_normalapp_3663181,studio_normalapp_3654033,studio_normalapp_3404492,studio_normalapp_3404491', NULL, NULL, NULL, NULL, b'0', '1');
+			REPLACE INTO `cb_data_dictionary` (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1232', '1232', '使用单位', 'UNIT_TYPE_NEW', 'studio_normalapp_3663181,studio_normalapp_3654033,studio_normalapp_3404492,studio_normalapp_3404491', NULL, NULL, NULL, NULL, b'0', '1');
+		</sql>
+	</changeSet>
+	<changeSet author="suhuiguang" id="1660201816131-05">
+		<comment>单位注册使用到的字典 登记机关</comment>
+		<sql>
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1300, "1300","榆林市行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1301, "1301","延安市行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1302, "1302","铜川市行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1303, "1303","商洛市行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1304, "1304","韩城市行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1305, "1305","杨凌市市场监管局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1306, "1306","安康市汉滨区行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1307, "1307","安康市汉阴县行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1308, "1308","安康市白河县行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1309, "1309","延安市行政审批服务批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1310, "1310","西安市碑林区行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1311, "1311","西安市雁塔区行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1312, "1312","西安市临潼区行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1313, "1313","西安市高陵区行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1314, "1314","西安市鄠邑区行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1315, "1315","渭南市临渭区行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1316, "1316","渭南市华州区行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1317, "1317","渭南市高新区行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1318, "1318","渭南市潼关县行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1319, "1319","渭南市大荔县行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1320, "1320","渭南市蒲城县行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1321, "1321","渭南市合阳县行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1322, "1322","渭南市富平县行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1323, "1323","渭南市华阴市行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1324, "1324","宝鸡市金台区行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1325, "1325","宝鸡市渭滨区行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1326, "1326","宝鸡市陈仓区行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1327, "1327","宝鸡市凤翔区行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1328, "1328","宝鸡市岐山县行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1329, "1329","宝鸡市扶风县行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1330, "1330","宝鸡市眉县行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1331, "1331","宝鸡市陇县行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1332, "1332","宝鸡市千阳县行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1333, "1333","宝鸡市麟游县行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1334, "1334","宝鸡市凤县行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1335, "1335","宝鸡市太白县行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1336, "1336","榆林市神木行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1337, "1337","咸阳市秦都区行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1338, "1338","咸阳市渭城区行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1339, "1339","咸阳市兴平市行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1340, "1340","咸阳市彬州市行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1341, "1341","咸阳市三原县行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1342, "1342","咸阳市泾阳县行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1343, "1343","咸阳市乾县行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1344, "1344","咸阳市礼泉县行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1345, "1345","咸阳市永寿县行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1346, "1346","咸阳市长武县行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1347, "1347","咸阳市旬邑县行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1348, "1348","咸阳市淳化县行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1349, "1349","咸阳市武功县行政审批局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1350, "1350","西安市新城区市场监督管理局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1351, "1351","西安市莲湖区市场监督管理局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1352, "1352","西安市灞桥区市场监督管理局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1353, "1353","西安市未央区市场监督管理局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1354, "1354","西安市阎良区市场监督管理局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1355, "1355","西安市长安区市场监督管理局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1356, "1356","西安市蓝田县市场监督管理局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1357, "1357","西安市周至县市场监督管理局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1358, "1358","西安市市场监督管理局高新区分局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1359, "1359","西安市市场监督管理局经开区分局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1360, "1360","西安市市场监督管理局港务浐灞分局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1361, "1361","西安市市场监督管理局曲江新区分局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1362, "1362","西咸新区市场监督管理局沣东新城分局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1363, "1363","西咸新区市场监督管理局沣西新城分局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1364, "1364","西咸新区市场监督管理局秦汉新城分局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1365, "1365","西咸新区市场监督管理局空港新城分局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1366, "1366","西咸新区市场监督管理局泾河新城分局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1367, "1367","汉中市汉台区市场监督管理局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1368, "1368","汉中市南郑区市场监督管理局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1369, "1369","汉中市城固县市场监督管理局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1370, "1370","汉中市洋县市场监督管理局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1371, "1371","汉中市西乡县市场监督管理局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1372, "1372","汉中市勉县市场监督管理局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1373, "1373","汉中市宁强县市场监督管理局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1374, "1374","汉中市略阳县市场监督管理局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1375, "1375","汉中市镇巴县市场监督管理局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1376, "1376","汉中市留坝县市场监督管理局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1377, "1377","汉中市佛坪县市场监督管理局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1378, "1378","汉中市府谷市场监管局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1379, "1379","安康市汉滨区市场监管局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1380, "1380","安康市高新区市场监管局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1381, "1381","安康市石泉县市场监管局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1382, "1382","安康市宁陕县市场监管局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1383, "1383","安康市岚皋县市场监管局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1384, "1384","安康市紫阳县市场监管局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1385, "1385","安康市旬阳县市场监管局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1386, "1386","安康市平利县市场监管局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1387, "1387","安康市镇坪县市场监管局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1388, "1388","安康市恒口示范区应急管理和市场监督管理局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1389, "1389","渭南市经开区市场监管局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1390, "1390","渭南市白水县市场监管局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1391, "1391","渭南市澄城县市场监管局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1392, "1392","榆林府谷县市场监管局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1393, "1393","咸阳市秦都区市场监管局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1394, "1394","咸阳市渭城区市场监管局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1395, "1395","咸阳市兴平市市场监管局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1396, "1396","咸阳市彬州市市场监管局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1397, "1397","咸阳市三原县市场监管局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1398, "1398","咸阳市泾阳县市场监管局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1399, "1399","咸阳市乾县市场监管局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1400, "1400","咸阳市礼泉县市场监管局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1401, "1401","咸阳市永寿县市场监管局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1402, "1402","咸阳市长武县市场监管局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1403, "1403","咸阳市旬邑县市场监管局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1404, "1404","咸阳市淳化县市场监管局","DJJG",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1405, "1405","咸阳市武功县市场监管局","DJJG",b'0',1);
+		</sql>
+	</changeSet>
+	<changeSet author="suhuiguang" id="1660201816131-06">
+		<comment>单位注册使用到的字典 充装介质名称</comment>
+		<sql>
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1500, "01","工业用氧","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1501, "02","医用氧","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1502, "03","高纯氧","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1503, "04","电子工业用气体：氧","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1504, "05","工业氮","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1505, "06","纯氮","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1506, "07","高纯氮","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1507, "08","电子工业用气体：氮","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1508, "09","纯氩","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1509, "10","高纯氩","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1510, "11","电子工业用气体：氩","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1511, "12","灯泡用氩气（Ar+N2）","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1512, "13","工业氢","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1513, "14","纯氢、高纯氢、超纯氢","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1514, "15","电子工业用气体：氢","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1515, "16","食品添加剂：液体二氧化碳","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1516, "17","工业液体二氧化碳","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1517, "18","焊接用二氧化碳","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1518, "19","工业氦气","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1519, "20","纯氦","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1520, "21","高纯氦","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1521, "22","电子工业用气体：氦","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1522, "23","氙气","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1523, "24","氪气","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1524, "25","氖气","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1525, "26","电子工业用气体：氧化亚氮","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1526, "27","医用氧化亚氮","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1527, "28","电子工业用气体：氯化氢","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1528, "29","电子工业用气体：三氟化碳","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1529, "30","电子工业用气体：磷化氢","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1530, "31","电子工业用气体：硅烷","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1531, "32","纯甲烷","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1532, "33","焊接切割用燃气：丙烷","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1533, "34","焊接切割用燃气：丙稀","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1534, "35","氨","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1535, "36","氯","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1536, "37","工业用液化石油气","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1537, "38","民用液化石油气","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1538, "39","一氧化碳","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1539, "40","乙炔","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1540, "41","液氧（焊接绝热气瓶）","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1541, "42","液氩（焊接绝热气瓶）","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1542, "43","液氮（焊接绝热气瓶）","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1543, "44","低温液体二氧化碳（焊接绝热气瓶）","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1544, "45","液化天然气（焊接绝热气瓶）","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1545, "46","液化天然气（车用气瓶）","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1546, "47","压缩天然气（车用气瓶）","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1547, "48","压缩天然气","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1548, "49","工业用乙烯","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1549, "50","毒性混合气体","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1550, "51","氧化性混合气体","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1551, "52","燃烧性混合气体","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1552, "53","腐蚀性混合气体","CZJZMC",b'0',1);
+			REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `is_delete`, `sort_num`) VALUES (1553, "54","混合气体","CZJZMC",b'0',1);
+		</sql>
+	</changeSet>
+</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>