计量中心项目

jlzx-single/jlzx-single-system/jlzx-single-system-api/pom.xml

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.yxt</groupId>
+        <artifactId>yxt-parent</artifactId>
+        <version>0.0.1</version>
+        <relativePath/>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>jlzx-single-system-api</artifactId>
+    <groupId>com.yxt.jlzx</groupId>
+    <version>0.0.1</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.yxt</groupId>
+            <artifactId>yxt-common-core</artifactId>
+            <version>0.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.yxt</groupId>
+            <artifactId>yxt-common-base</artifactId>
+            <version>0.0.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-annotation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>4.0.1</version>
+            <scope>compile</scope>
+        </dependency>
+       <!-- <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-annotations</artifactId>
+            <version>2.0.4</version>
+            <scope>compile</scope>
+        </dependency>-->
+
+
+    </dependencies>
+
+
+</project>

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/app/AppVersion.java

@@ -0,0 +1,32 @@
+package com.yxt.jlzx.system.api.app;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2020/12/30 10:06
+ * @description
+ */
+@Data
+public class AppVersion extends BaseEntity {
+    private static final long serialVersionUID = -7423239006046096714L;
+
+    @ApiModelProperty(value = "应用名称")
+    private String appName;
+    @ApiModelProperty(value = "版本编码")
+    private Integer versionCode;
+    @ApiModelProperty(value = "版本号")
+    private String versionName;
+    @ApiModelProperty(value = "apk下载地址")
+    private String updateUrl;
+    @ApiModelProperty(value = "版本的更新描述")
+    private String upgradeInfo;
+    @ApiModelProperty(value = "图标地址")
+    private String iconUrl;
+    @ApiModelProperty(value = "身份sid")
+    private String appSid;
+
+
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/app/AppVersionApi.java

@@ -0,0 +1,47 @@
+package com.yxt.jlzx.system.api.app;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.jlzx.system.api.user.UserApiFallback;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.Map;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * @author dimengzhe
+ * @date 2020/12/30 9:17
+ * @description
+ */
+@FeignClient(
+        contextId = "yxt-jlzx-system-AppVersion",
+        name = "yxt-jlzx-system",
+        path = "v1/appVersion",
+        fallback = AppVersionApiFallback.class)
+public interface AppVersionApi {
+
+    @PostMapping("/selectNewVersion")
+    @ResponseBody
+    @ApiOperation(value = "app最新版本获取")
+    public ResultBean<AppVersionVo> update();
+
+    @PostMapping("/save")
+    @ResponseBody
+    @ApiOperation(value = "更新主框架")
+    public ResultBean save(@RequestParam("file") MultipartFile multipartFile,
+                           @RequestParam("upgradeInfo") String upgradeInfo,
+                           @RequestParam("iconUrl") String iconUrl
+    );
+    
+    @PostMapping("/selectNewAppVersion")
+    @ResponseBody
+    @ApiOperation(value = "获取最新版本")
+    public ResultBean  selectNewAppVersion();
+
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/app/AppVersionApiFallback.java

@@ -0,0 +1,13 @@
+package com.yxt.jlzx.system.api.app;
+
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Controller;
+
+/**
+ * @author dimengzhe
+ * @date 2021/1/4 15:43
+ * @description
+ */
+@Component
+public class AppVersionApiFallback {
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/app/AppVersionDto.java

@@ -0,0 +1,31 @@
+package com.yxt.jlzx.system.api.app;
+
+import com.yxt.common.core.dto.Dto;
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/1/5 9:42
+ * @description
+ */
+@Data
+public class AppVersionDto implements Dto {
+    private static final long serialVersionUID = -7589388361645372835L;
+
+    @ApiModelProperty(value = "应用名称")
+    private String appName;
+    @ApiModelProperty(value = "版本编码")
+    private Integer versionCode;
+    @ApiModelProperty(value = "版本号")
+    private String versionName;
+    @ApiModelProperty(value = "apk下载地址")
+    private String updateUrl;
+    @ApiModelProperty(value = "版本的更新描述")
+    private String upgradeInfo;
+    @ApiModelProperty(value = "图标地址")
+    private String iconUrl;
+    @ApiModelProperty(value = "身份sid", example = "147694bb-c765-4426-8f67-d19a66585f30")
+    private String appSid;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/app/AppVersionVo.java

@@ -0,0 +1,30 @@
+package com.yxt.jlzx.system.api.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2020/12/31 9:23
+ * @description
+ */
+@Data
+public class AppVersionVo implements Vo {
+    private static final long serialVersionUID = -5530063010871448711L;
+
+    @ApiModelProperty(value = "应用名称")
+    private String appName;
+    @ApiModelProperty(value = "版本编码")
+    private Integer versionCode;
+    @ApiModelProperty(value = "版本号")
+    private String versionName;
+    @ApiModelProperty(value = "apk下载地址")
+    private String updateUrl;
+    @ApiModelProperty(value = "版本的更新描述")
+    private String upgradeInfo;
+    @ApiModelProperty(value = "图标地址")
+    private String iconUrl;
+
+
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/app/VersionVo.java

@@ -0,0 +1,24 @@
+package com.yxt.jlzx.system.api.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/1/5 14:44
+ * @description
+ */
+@Data
+public class VersionVo implements Vo {
+
+    private static final long serialVersionUID = -6919968560902116931L;
+    @ApiModelProperty(value = "应用名称")
+    private String appName;
+    @ApiModelProperty(value = "版本编码")
+    private Integer versionCode;
+    @ApiModelProperty(value = "版本号")
+    private String versionName;
+    @ApiModelProperty(value = "apk下载地址")
+    private String updateUrl;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/applydateset/ApplyDateSet.java

@@ -0,0 +1,25 @@
+package com.yxt.jlzx.system.api.applydateset;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+
+import lombok.Data;
+
+/**
+ * @author yxt_mtl
+ * @date 2020/9/28 18:42
+ * @description 角色
+ */
+@Data
+@TableName("apply_date_set")
+public class ApplyDateSet extends BaseEntity {
+    private static final long serialVersionUID = -2343540085171389879L;
+    /**
+     * 开始时间
+     */
+    private String startDate;
+    /**
+     * 结束时间
+     */
+    private String endDate;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/applydateset/ApplyDateSetApi.java

@@ -0,0 +1,41 @@
+package com.yxt.jlzx.system.api.applydateset;
+
+import com.yxt.common.core.api.BaseApi;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.jlzx.system.api.orguserrole.OrgUserRoleVo;
+
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+
+import java.util.List;
+
+import javax.validation.Valid;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+
+/**
+ * @author yxt_hanweijia
+ * @date 2020/9/28 18:41
+ * @description 申报时期设置
+ */
+@FeignClient(
+        contextId = "yxt-jlzx-system-ApplyDateSet",
+        name = "yxt-jlzx-system",
+        path = "v1/applyDateSets",
+        fallback = ApplyDateSetApiFallBack.class)
+public interface ApplyDateSetApi extends BaseApi<ApplyDateSetVo, ApplyDateSetDto, ApplyDateSetQuery> {
+
+	@GetMapping("/lists")
+    @ResponseBody
+    @ApiOperation(value = "不分页列表")
+	public List<ApplyDateSetVo> lists();
+
+
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/applydateset/ApplyDateSetApiFallBack.java

@@ -0,0 +1,66 @@
+package com.yxt.jlzx.system.api.applydateset;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import javax.validation.Valid;
+import java.util.List;
+
+
+/**
+ * @author yxt_mtl
+ * @date 2020/9/28 8:42
+ * @description 角色信息容错处理
+ */
+@Component
+public class ApplyDateSetApiFallBack implements ApplyDateSetApi {
+
+	@Override
+	public ResultBean<List<ApplyDateSetVo>> list(@Valid ApplyDateSetQuery query) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public ResultBean<PagerVo<ApplyDateSetVo>> pageList(@Valid PagerQuery<ApplyDateSetQuery> pagerQuery) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public ResultBean save(@Valid ApplyDateSetDto dto) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public ResultBean update(@Valid ApplyDateSetDto dto, String sid) throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public ResultBean delete(String sid) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public ResultBean<ApplyDateSetVo> getVo(String sid) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public List<ApplyDateSetVo> lists() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+   
+
+
+
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/applydateset/ApplyDateSetDto.java

@@ -0,0 +1,30 @@
+package com.yxt.jlzx.system.api.applydateset;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotBlank;
+
+import com.yxt.common.core.dto.Dto;
+
+import lombok.Data;
+
+/**
+ * @author yxt_mtl
+ * @date 2020/9/29 10:33
+ * @description 角色信息
+ */
+@Data
+public class ApplyDateSetDto implements Dto {
+    private static final long serialVersionUID = 6661570004528986911L;
+    
+    @ApiModelProperty(value = "开始日期", required = true)
+    @NotBlank(message = "开始日期不能为空")
+    private String startDate;
+
+
+    @ApiModelProperty(value = "结束日期", required = true)
+    @NotBlank(message = "结束日期不能为空")
+    private String endDate;
+    
+
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/applydateset/ApplyDateSetQuery.java

@@ -0,0 +1,23 @@
+package com.yxt.jlzx.system.api.applydateset;
+
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+
+import com.yxt.common.core.query.Query;
+
+/**
+ * @author yxt_mtl
+ * @date 2020/09/29 10:17
+ * @description 角色列表查询
+ */
+@Data
+public class ApplyDateSetQuery implements Query {
+
+    private static final long serialVersionUID = -6256204643003327901L;
+
+
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/applydateset/ApplyDateSetVo.java

@@ -0,0 +1,28 @@
+package com.yxt.jlzx.system.api.applydateset;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author yxt_mtl
+ * @date 2020/9/29 10:00
+ * @description 角色列表返回数据
+ */
+@Data
+public class ApplyDateSetVo implements Vo {
+
+ 
+    @ApiModelProperty(value = "sid")
+    private String sid;
+
+    @ApiModelProperty(value = "开始日期")
+    private String startDate;
+
+
+    @ApiModelProperty(value = "结束日期")
+    private String endDate;
+ 
+    
+
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/appsubset/AppSubsetVersion.java

@@ -0,0 +1,44 @@
+package com.yxt.jlzx.system.api.appsubset;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/1/4 15:32
+ * @description
+ */
+@Data
+public class AppSubsetVersion extends BaseEntity {
+    private static final long serialVersionUID = 5479948258974523793L;
+
+    @ApiModelProperty(value = "应用名称")
+    private String appName;
+    @ApiModelProperty(value = "版本编码")
+    private Integer versionCode;
+    @ApiModelProperty(value = "版本号")
+    private String versionName;
+    @ApiModelProperty(value = "apk下载地址")
+    private String updateUrl;
+    @ApiModelProperty(value = "版本的更新描述")
+    private String upgradeInfo;
+    @ApiModelProperty(value = "图标地址")
+    private String iconUrl;
+    @ApiModelProperty(value = "关联sid")
+    private String linkSid;
+    @ApiModelProperty(value = "身份sid")
+    private String appSid;
+    @ApiModelProperty(value = "资源sid")
+    private String sourceSid;
+
+    private String type;
+    @ApiModelProperty(value = "插件名称 ")
+    private String modulePluginName;
+    @ApiModelProperty(value = "包名")
+    private String sourcePackage;
+    @ApiModelProperty(value = "启动模块的动作(0.启动Activity的包名+类名 1.html地址 2.启动Activity的包名+类名 3.intent-action ) ")
+    private String sourceAction;
+
+    private Integer sortNo;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/appsubset/AppSubsetVersionApi.java

@@ -0,0 +1,42 @@
+package com.yxt.jlzx.system.api.appsubset;
+
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2021/1/4 15:42
+ * @description
+ */
+@FeignClient(
+        contextId = "yxt-jlzx-system-AppSubsetVersion",
+        name = "yxt-jlzx-system",
+        path = "v1/appSubsetVersion",
+        fallback = AppSubsetVersionApiFallback.class)
+public interface AppSubsetVersionApi {
+
+    @PostMapping("/selectVersionList")
+    @ResponseBody
+    @ApiOperation(value = "获取主框架下的app")
+    public ResultBean<List<AppSubsetVersionVo>> selectVersionList();
+
+    @PostMapping("/save")
+    @ResponseBody
+    @ApiOperation(value = "新增主框架的子应用")
+    public ResultBean save(AppSubsetVersionDto appSubsetVersionDto
+    );
+
+    @PostMapping("/update")
+    @ResponseBody
+    @ApiOperation(value = "更新主框架的子应用")
+    public ResultBean update(AppSubsetVersionDto appSubsetVersionDto);
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/appsubset/AppSubsetVersionApiFallback.java

@@ -0,0 +1,10 @@
+package com.yxt.jlzx.system.api.appsubset;
+
+/**
+ * @author dimengzhe
+ * @date 2021/1/4 15:44
+ * @description
+ */
+
+public class AppSubsetVersionApiFallback {
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/appsubset/AppSubsetVersionDto.java

@@ -0,0 +1,46 @@
+package com.yxt.jlzx.system.api.appsubset;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author dimengzhe
+ * @date 2021/1/7 15:12
+ * @description
+ */
+@Data
+public class AppSubsetVersionDto implements Dto {
+
+    @ApiModelProperty(value = "版本的更新描述", required = true)
+    @NotBlank(message = "版本的更新描述不能为空")
+    private String upgradeInfo;
+    @ApiModelProperty(value = "图标地址", required = true)
+    @NotBlank(message = "图标地址不能为空")
+    private String iconUrl;
+    @ApiModelProperty(value = "type", required = true)
+    @NotBlank(message = "type不能为空")
+    private String type;
+    @ApiModelProperty(value = "插件名称 ")
+    private String modulePluginName;
+    @ApiModelProperty(value = "包名", required = true)
+    @NotBlank(message = "包名不能为空")
+    private String sourcePackage;
+    @ApiModelProperty(value = "启动模块的动作(0.启动Activity的包名+类名 1.html地址 2.启动Activity的包名+类名 3.intent-action ) ", required = true)
+    @NotBlank(message = "启动模块的动作不能为空")
+    private String sourceAction;
+    @ApiModelProperty(value = "appSid")
+    private String appSid;
+    @ApiModelProperty(value = "appName", required = true)
+    @NotBlank(message = "appName不能为空")
+    private String appName;
+    private MultipartFile multipartFile;
+    @ApiModelProperty(value = "linkSid", required = true)
+    @NotBlank(message = "linkSid不能为空")
+    private String linkSid;
+    @ApiModelProperty(value = "sortNo", example = "999")
+    private Integer sortNo;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/appsubset/AppSubsetVersionOneDto.java

@@ -0,0 +1,43 @@
+package com.yxt.jlzx.system.api.appsubset;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/1/7 16:04
+ * @description
+ */
+@Data
+public class AppSubsetVersionOneDto implements Dto {
+
+    private static final long serialVersionUID = -2430652212679921734L;
+    @ApiModelProperty(value = "应用名称")
+    private String appName;
+    @ApiModelProperty(value = "版本编码")
+    private Integer versionCode;
+    @ApiModelProperty(value = "版本号")
+    private String versionName;
+    @ApiModelProperty(value = "apk下载地址")
+    private String updateUrl;
+    @ApiModelProperty(value = "版本的更新描述")
+    private String upgradeInfo;
+    @ApiModelProperty(value = "图标地址")
+    private String iconUrl;
+    @ApiModelProperty(value = "关联sid")
+    private String linkSid;
+    @ApiModelProperty(value = "身份sid")
+    private String appSid;
+    @ApiModelProperty(value = "资源sid")
+    private String sourceSid;
+    private String type;
+    @ApiModelProperty(value = "插件名称 ")
+    private String modulePluginName;
+    @ApiModelProperty(value = "包名")
+    private String sourcePackage;
+    @ApiModelProperty(value = "启动模块的动作(0.启动Activity的包名+类名 1.html地址 2.启动Activity的包名+类名 3.intent-action ) ")
+    private String sourceAction;
+
+    private Integer sortNo;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/appsubset/AppSubsetVersionVo.java

@@ -0,0 +1,37 @@
+package com.yxt.jlzx.system.api.appsubset;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/1/4 15:36
+ * @description
+ */
+@Data
+public class AppSubsetVersionVo implements Vo {
+    private static final long serialVersionUID = -901262325698212153L;
+
+    @ApiModelProperty(value = "应用名称")
+    private String appName;
+    @ApiModelProperty(value = "版本编码")
+    private Integer versionCode;
+    @ApiModelProperty(value = "版本号")
+    private String versionName;
+    @ApiModelProperty(value = "apk下载地址")
+    private String updateUrl;
+    @ApiModelProperty(value = "版本的更新描述")
+    private String upgradeInfo;
+    @ApiModelProperty(value = "图标地址")
+    private String iconUrl;
+
+    private String type;
+    @ApiModelProperty(value = "插件名称 ")
+    private String modulePluginName;
+    @ApiModelProperty(value = "包名")
+    private String sourcePackage;
+    @ApiModelProperty(value = "启动模块的动作(0.启动Activity的包名+类名 1.html地址 2.启动Activity的包名+类名 3.intent-action ) ")
+    private String sourceAction;
+}
+ 

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/appsubset2/AppSubset.java

@@ -0,0 +1,42 @@
+package com.yxt.jlzx.system.api.appsubset2;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/1/9 13:34
+ * @description
+ */
+@Data
+public class AppSubset extends BaseEntity {
+    private static final long serialVersionUID = -6734419887081842613L;
+
+    @ApiModelProperty(value = "应用名称")
+    private String appName;
+    @ApiModelProperty(value = "版本编码")
+    private Integer versionCode;
+    @ApiModelProperty(value = "版本号")
+    private String versionName;
+    @ApiModelProperty(value = "apk下载地址")
+    private String updateUrl;
+    @ApiModelProperty(value = "版本的更新描述")
+    private String upgradeInfo;
+    @ApiModelProperty(value = "图标地址")
+    private String iconUrl;
+    @ApiModelProperty(value = "关联sid")
+    private String linkSid;
+    @ApiModelProperty(value = "身份sid")
+    private String appSid;
+
+    private String type;
+    @ApiModelProperty(value = "插件名称 ")
+    private String modulePluginName;
+    @ApiModelProperty(value = "包名")
+    private String sourcePackage;
+    @ApiModelProperty(value = "启动模块的动作(0.启动Activity的包名+类名 1.html地址 2.启动Activity的包名+类名 3.intent-action ) ")
+    private String sourceAction;
+
+    private Integer sortNo;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/appsubset2/AppSubsetApi.java

@@ -0,0 +1,42 @@
+package com.yxt.jlzx.system.api.appsubset2;
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.jlzx.system.api.appsubset.AppSubsetVersionApiFallback;
+import com.yxt.jlzx.system.api.appsubset.AppSubsetVersionDto;
+import com.yxt.jlzx.system.api.appsubset.AppSubsetVersionVo;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2021/1/9 13:46
+ * @description
+ */
+@FeignClient(
+        contextId = "yxt-jlzx-system-AppSubset",
+        name = "yxt-jlzx-system",
+        path = "v1/appSubsets",
+        fallback = AppSubsetApiFallback.class)
+public interface AppSubsetApi {
+
+    @PostMapping("/selectVersionList")
+    @ResponseBody
+    @ApiOperation(value = "获取的app列表")
+    public ResultBean<List<AppSubsetVo>> selectVersionList(@RequestParam("linkSid") String linkSid);
+
+    @PostMapping("/save")
+    @ResponseBody
+    @ApiOperation(value = "新增子应用")
+    public ResultBean save(AppSubsetDto appSubsetDto
+    );
+
+    @PostMapping("/update")
+    @ResponseBody
+    @ApiOperation(value = "更新子应用")
+    public ResultBean update(AppSubsetDto appSubsetDto);
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/appsubset2/AppSubsetApiFallback.java

@@ -0,0 +1,12 @@
+package com.yxt.jlzx.system.api.appsubset2;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @author dimengzhe
+ * @date 2021/1/9 13:57
+ * @description
+ */
+@Component
+public class AppSubsetApiFallback {
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/appsubset2/AppSubsetDto.java

@@ -0,0 +1,47 @@
+package com.yxt.jlzx.system.api.appsubset2;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author dimengzhe
+ * @date 2021/1/9 14:50
+ * @description
+ */
+@Data
+public class AppSubsetDto implements Dto {
+    private static final long serialVersionUID = 8623097725897724407L;
+
+    @ApiModelProperty(value = "版本的更新描述", required = true)
+    @NotBlank(message = "版本的更新描述不能为空")
+    private String upgradeInfo;
+    @ApiModelProperty(value = "图标地址", required = true)
+    @NotBlank(message = "图标地址不能为空")
+    private String iconUrl;
+    @ApiModelProperty(value = "type", required = true)
+    @NotBlank(message = "type不能为空")
+    private String type;
+    @ApiModelProperty(value = "插件名称 ")
+    private String modulePluginName;
+    @ApiModelProperty(value = "包名", required = true)
+    @NotBlank(message = "包名不能为空")
+    private String sourcePackage;
+    @ApiModelProperty(value = "启动模块的动作(0.启动Activity的包名+类名 1.html地址 2.启动Activity的包名+类名 3.intent-action ) ", required = true)
+    @NotBlank(message = "启动模块的动作不能为空")
+    private String sourceAction;
+    @ApiModelProperty(value = "appSid")
+    private String appSid;
+    @ApiModelProperty(value = "appName", required = true)
+    @NotBlank(message = "appName不能为空")
+    private String appName;
+    private MultipartFile multipartFile;
+    @ApiModelProperty(value = "linkSid", required = true)
+    @NotBlank(message = "linkSid不能为空")
+    private String linkSid;
+    @ApiModelProperty(value = "sortNo", example = "999")
+    private Integer sortNo;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/appsubset2/AppSubsetOneDto.java

@@ -0,0 +1,41 @@
+package com.yxt.jlzx.system.api.appsubset2;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/1/9 15:18
+ * @description
+ */
+@Data
+public class AppSubsetOneDto implements Dto {
+    private static final long serialVersionUID = -1663689739255925782L;
+
+    @ApiModelProperty(value = "应用名称")
+    private String appName;
+    @ApiModelProperty(value = "版本编码")
+    private Integer versionCode;
+    @ApiModelProperty(value = "版本号")
+    private String versionName;
+    @ApiModelProperty(value = "apk下载地址")
+    private String updateUrl;
+    @ApiModelProperty(value = "版本的更新描述")
+    private String upgradeInfo;
+    @ApiModelProperty(value = "图标地址")
+    private String iconUrl;
+    @ApiModelProperty(value = "关联sid")
+    private String linkSid;
+    @ApiModelProperty(value = "身份sid")
+    private String appSid;
+    private String type;
+    @ApiModelProperty(value = "插件名称 ")
+    private String modulePluginName;
+    @ApiModelProperty(value = "包名")
+    private String sourcePackage;
+    @ApiModelProperty(value = "启动模块的动作(0.启动Activity的包名+类名 1.html地址 2.启动Activity的包名+类名 3.intent-action ) ")
+    private String sourceAction;
+
+    private Integer sortNo;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/appsubset2/AppSubsetVo.java

@@ -0,0 +1,38 @@
+package com.yxt.jlzx.system.api.appsubset2;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/1/9 14:24
+ * @description
+ */
+@Data
+public class AppSubsetVo implements Vo {
+    private static final long serialVersionUID = 1949874231127116859L;
+
+    @ApiModelProperty(value = "应用名称")
+    private String appName;
+    @ApiModelProperty(value = "版本编码")
+    private Integer versionCode;
+    @ApiModelProperty(value = "版本号")
+    private String versionName;
+    @ApiModelProperty(value = "apk下载地址")
+    private String updateUrl;
+    @ApiModelProperty(value = "版本的更新描述")
+    private String upgradeInfo;
+    @ApiModelProperty(value = "图标地址")
+    private String iconUrl;
+    @ApiModelProperty(value = "appSid")
+    private String appSid;
+
+    private String type;
+    @ApiModelProperty(value = "插件名称 ")
+    private String modulePluginName;
+    @ApiModelProperty(value = "包名")
+    private String sourcePackage;
+    @ApiModelProperty(value = "启动模块的动作(0.启动Activity的包名+类名 1.html地址 2.启动Activity的包名+类名 3.intent-action ) ")
+    private String sourceAction;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/banner/Banner.java

@@ -0,0 +1,29 @@
+package com.yxt.jlzx.system.api.banner;
+
+import lombok.Data;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+
+/**
+ * @author yxt_mtl
+ * @date 2020/10/16 12:52
+ * @description banner
+ */
+@Data
+@TableName("banner")
+public class Banner  extends BaseEntity{
+	 private static final long serialVersionUID = -2343540085171389879L;
+	/*
+	 * 标题
+	 */
+	private String title;
+	/*
+	 * 图片地址
+	 */
+	private String picUrl;
+	/*
+	 * url地址
+	 */
+	private String url;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/banner/BannerApi.java

@@ -0,0 +1,24 @@
+package com.yxt.jlzx.system.api.banner;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+@FeignClient(
+        contextId = "yxt-jlzx-system-Banner",
+        name = "yxt-jlzx-system",
+        path = "v1/banners",
+        fallback = BannerApiFallBack.class)
+public interface BannerApi {
+
+    @PostMapping("/selectBannerList")
+    @ResponseBody
+    @ApiOperation(value = "轮播图")
+    public ResultBean<List<BannerVo>> selectBannerList();
+
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/banner/BannerApiFallBack.java

@@ -0,0 +1,15 @@
+package com.yxt.jlzx.system.api.banner;
+
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class BannerApiFallBack implements BannerApi {
+
+    @Override
+    public ResultBean<List<BannerVo>> selectBannerList() {
+        return new ResultBean<List<BannerVo>>().success().setMsg("网站维护，请稍后再试");
+    }
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/banner/BannerDto.java

@@ -0,0 +1,5 @@
+package com.yxt.jlzx.system.api.banner;
+
+public class BannerDto {
+
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/banner/BannerQuery.java

@@ -0,0 +1,5 @@
+package com.yxt.jlzx.system.api.banner;
+
+public class BannerQuery {
+
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/banner/BannerVo.java

@@ -0,0 +1,33 @@
+package com.yxt.jlzx.system.api.banner;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+import lombok.Data;
+
+import com.yxt.common.core.vo.Vo;
+
+/**
+ * @author yxt_mtl
+ * @date 2020/10/16 12：49
+ * @description 列表返回数据
+ */
+@Data
+public class BannerVo implements Vo {
+	/*
+	 * sid
+	 */
+	@ApiModelProperty(value = "sid")
+	private String sid;
+	/*
+	 * pic
+	 */
+	@ApiModelProperty(value = "pic")
+	private String pic;
+	/*
+	 * url
+	 */
+	@ApiModelProperty(value = "url")
+	private String url;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/cahtmlsignature/Cahtmlsignature.java

@@ -0,0 +1,37 @@
+package com.yxt.jlzx.system.api.cahtmlsignature;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+
+import lombok.Data;
+
+/**
+ * @author yxt_mtl
+ * @date 2020/9/28 18:42
+ * @description 角色
+ */
+@Data
+@TableName("cahtmlsignature")
+public class Cahtmlsignature extends BaseEntity {
+
+
+    private static final long serialVersionUID = -3110079851222648668L;
+    private String documentSid;//文档sid
+    private String signature;//签章信息
+    private String signatureSid;//签章sid
+
+    //印章高度
+    private int sealHeight;
+    //印章宽度
+    private int sealWidth;
+    //印章图片格式
+    private String sealPicType;
+    //印章图片base64
+    private String sealPic;
+    //原文
+    private String originalText;
+    //签章结果base64
+    private String signResultB64;
+
+
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/cahtmlsignature/CahtmlsignatureApi.java

@@ -0,0 +1,32 @@
+package com.yxt.jlzx.system.api.cahtmlsignature;
+
+import com.yxt.common.core.api.BaseApi;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.sql.ResultSet;
+
+
+/**
+ * @author yxt_mtl
+ * @date 2020/9/28 18:41
+ * @description 角色接口
+ */
+@FeignClient(
+        contextId = "yxt-jlzx-system-Cahtmlsignature",
+        name = "yxt-jlzx-system",
+        path = "v1/cahtmlsignatures",
+        fallback = CahtmlsignatureApiFallBack.class)
+public interface CahtmlsignatureApi extends BaseApi<CahtmlsignatureVo, CahtmlsignatureDto, CahtmlsignatureQuery> {
+
+    @PostMapping("/selectBySignSid/{signatureSid}")
+    @ResponseBody
+    @ApiOperation(value = "根据记录sid获取签名信息")
+    public ResultBean<Cahtmlsignature> selectBySignSid(@ApiParam(value = "记录sid", required = true) @PathVariable("signatureSid") String signatureSid);
+
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/cahtmlsignature/CahtmlsignatureApiFallBack.java

@@ -0,0 +1,56 @@
+package com.yxt.jlzx.system.api.cahtmlsignature;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import javax.validation.Valid;
+import java.util.List;
+
+
+/**
+ * @author yxt_mtl
+ * @date 2020/9/28 8:42
+ * @description 角色信息容错处理
+ */
+@Component
+public class CahtmlsignatureApiFallBack implements CahtmlsignatureApi {
+
+    @Override
+    public ResultBean<PagerVo<CahtmlsignatureVo>> pageList(PagerQuery<CahtmlsignatureQuery> pagerQuery) {
+        return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean save(@Valid CahtmlsignatureDto cahtmlsignatureDto) {
+        return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+
+
+    @Override
+    public ResultBean update(@Valid CahtmlsignatureDto cahtmlsignatureDto, String sid) throws Exception {
+        return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean delete(String sid) {
+        return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+
+
+    @Override
+    public ResultBean<CahtmlsignatureVo> getVo(String sid) {
+        return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean<List<CahtmlsignatureVo>> list(@Valid CahtmlsignatureQuery query) {
+        return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean<Cahtmlsignature> selectBySignSid(String signatureSid) {
+        return null;
+    }
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/cahtmlsignature/CahtmlsignatureDto.java

@@ -0,0 +1,44 @@
+package com.yxt.jlzx.system.api.cahtmlsignature;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotBlank;
+
+import com.yxt.common.core.dto.Dto;
+
+import lombok.Data;
+
+/**
+ * @author yxt_mtl
+ * @date 2020/9/29 10:33
+ * @description 角色信息
+ */
+@Data
+public class CahtmlsignatureDto implements Dto {
+
+
+    private static final long serialVersionUID = 3031384673082593109L;
+
+    @ApiModelProperty(value = "文档sid", required = true)
+    private String documentSid;//文档sid
+
+    @ApiModelProperty(value = "签章信息", required = true)
+    private String signature;//签章信息
+
+    @ApiModelProperty(value = "签章sid", required = true)
+    private String signatureSid;//签章sid
+
+    //印章高度
+    private int sealHeight;
+    //印章宽度
+    private int sealWidth;
+    //印章图片格式
+    private String sealPicType;
+    //印章图片base64
+    private String sealPic;
+    //原文
+    private String originalText;
+    //签章结果base64
+    private String signResultB64;
+
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/cahtmlsignature/CahtmlsignatureQuery.java

@@ -0,0 +1,22 @@
+package com.yxt.jlzx.system.api.cahtmlsignature;
+
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+
+import com.yxt.common.core.query.Query;
+
+/**
+ * @author yxt_mtl
+ * @date 2020/09/29 10:17
+ * @description 角色列表查询
+ */
+@Data
+public class CahtmlsignatureQuery implements Query {
+
+	@ApiModelProperty(value = "文档sid")
+	 private String documentSid;//文档sid
+	
+   @ApiModelProperty(value = "签章sid")
+	 private String signatureSid;//签章sid
+ 
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/cahtmlsignature/CahtmlsignatureVo.java

@@ -0,0 +1,27 @@
+package com.yxt.jlzx.system.api.cahtmlsignature;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author yxt_mtl
+ * @date 2020/9/29 10:00
+ * @description 角色列表返回数据
+ */
+@Data
+public class CahtmlsignatureVo implements Vo {
+
+    @ApiModelProperty(value = "文档sid")
+    private String documentSid;//文档sid
+
+    @ApiModelProperty(value = "签章信息")
+    private String signature;//签章信息
+
+    @ApiModelProperty(value = "签章sid")
+    private String signatureSid;//签章sid
+
+    private String sid;//签章sid
+
+    private String sealPic;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/captcha/BlendCodeApi.java

@@ -0,0 +1,43 @@
+package com.yxt.jlzx.system.api.captcha;
+
+import com.yxt.common.base.utils.AjaxResult;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @author dimengzhe
+ * @date 2020/9/11 16:52
+ * @description
+ */
+public interface BlendCodeApi {
+
+    /**
+     * 获取字母验证码
+     *
+     * @param httpServletResponse 服务器响应
+     * @return
+     * @throws Exception
+     */
+    @GetMapping("/defaultBlendCode")
+    @ResponseBody
+    @ApiOperation(value = "获取字母验证码")
+    public AjaxResult getCaptcha(HttpServletResponse httpServletResponse) throws Exception;
+
+    @GetMapping("/defaultBlendCode1")
+    @ResponseBody
+    @ApiOperation(value = "测试（可以看到图片验证码）")
+    public void defaultBlendCode(HttpServletResponse httpServletResponse) throws Exception;
+
+    @GetMapping("/blockPuzzle")
+    @ResponseBody
+    @ApiOperation(value = "测试点选图片")
+    public AjaxResult blockPuzzle(HttpServletResponse httpServletResponse) throws Exception;
+
+    @GetMapping("/clickWord")
+    @ResponseBody
+    @ApiOperation(value = "测试点选汉字")
+    public AjaxResult clickWord(HttpServletResponse httpServletResponse) throws Exception;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/department/Department.java

@@ -0,0 +1,43 @@
+package com.yxt.jlzx.system.api.department;
+
+import com.yxt.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2020/10/11 11:02
+ * @description 内部机构部门
+ */
+@Data
+public class Department extends BaseEntity {
+    private static final long serialVersionUID = 1382754914210772227L;
+    /**
+     * 部门名称
+     */
+    private String name;
+    /**
+     * 联系人
+     */
+    private String contactMan;
+    /**
+     * 手机号码
+     */
+    private String mobile;
+    /**
+     * 地址
+     */
+    private String address;
+    /**
+     * 机构sid
+     */
+    private String organizationSid;
+    /**
+     * 父级sid
+     */
+    private String psid;
+
+    private String qrFilePath;
+
+    private String dlxx;
+    private int sortNo;//排序号
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/department/DepartmentApi.java

@@ -0,0 +1,68 @@
+package com.yxt.jlzx.system.api.department;
+
+import com.yxt.common.core.api.BaseApi;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2020/10/11 11:49
+ * @description 内部机构
+ */
+@FeignClient(
+        contextId = "yxt-jlzx-system-Department",
+        name = "yxt-jlzx-system",
+        path = "v1/departments",
+        fallback = DepartmentApiFallback.class)
+public interface DepartmentApi extends BaseApi<DepartmentListVo, DepartmentDto, DepartmentQuery> {
+
+    /**
+     * 内部机构树形列表
+     *
+     * @param organizationSid 机构sid
+     * @return 内部机构的树形列表
+     */
+    @GetMapping("/departmentTreeList/{organizationSid}")
+    @ResponseBody
+    @ApiOperation("内部机构tree树")
+    public ResultBean<List<DepartmentVo>> departmentTreeList(@ApiParam(value = "organizationSid", required = true) @PathVariable("organizationSid") String organizationSid);
+
+    /**
+     * 内部机构tree树修改
+     *
+     * @param sid  部门sid
+     * @param name 部门名称
+     * @return 修改是否成功
+     */
+    @PostMapping("/departmentTreeUpdate")
+    @ResponseBody
+    @ApiOperation("内部机构tree树修改")
+    public ResultBean departmentTreeUpdate(@RequestParam("sid") String sid,
+                                           @RequestParam("name") String name,@RequestParam("sortNo") int sortNo);
+
+    @PostMapping("/getQrCode/{sid}")
+    @ResponseBody
+    @ApiOperation("查看二维码")
+    public ResultBean<QrCodeVo> getQrCode(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid);
+
+    @GetMapping("/departmentOrgList/{organizationSid}")
+    @ResponseBody
+    @ApiOperation("单位的部门列表")
+    public ResultBean<List<DepartmentOrgListVo>> departmentOrgList(@ApiParam(value = "organizationSid", required = true) @PathVariable("organizationSid") String organizationSid);
+
+    @GetMapping("/queryByStaffSid")
+    @ResponseBody
+    @ApiOperation("根据人员sid获取所在部门")
+    public ResultBean<QrCodeVo> queryByStaffSid(@RequestParam("staffSid") String staffSid);
+
+    @PostMapping("/selectId/{id}")
+    @ResponseBody
+    @ApiOperation("根据id查询部门")
+    public ResultBean<Department> selectId(@ApiParam(value = "id", required = true) @PathVariable("id") Integer id);
+
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/department/DepartmentApiFallback.java

@@ -0,0 +1,94 @@
+package com.yxt.jlzx.system.api.department;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2020/10/11 11:50
+ * @description 内部机构容错处理
+ */
+@Component
+public class DepartmentApiFallback implements DepartmentApi {
+
+
+    @Override
+    public ResultBean<List<DepartmentListVo>> list(@Valid DepartmentQuery departmentQuery) {
+        return new ResultBean<List<DepartmentListVo>>().fail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean<PagerVo<DepartmentListVo>> pageList(PagerQuery<DepartmentQuery> pagerQuery) {
+        return new ResultBean<PagerVo<DepartmentListVo>>().fail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean save(@Valid DepartmentDto departmentDto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean update(@Valid DepartmentDto departmentDto, String s) throws Exception {
+        return null;
+    }
+
+    @Override
+    public ResultBean delete(String s) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<DepartmentListVo> getVo(String s) {
+        return null;
+    }
+
+    /**
+     * 内部机构树形列表
+     *
+     * @param organizationSid 机构sid
+     * @return 内部机构的树形列表
+     */
+    @Override
+    public ResultBean<List<DepartmentVo>> departmentTreeList(String organizationSid) {
+        return new ResultBean<List<DepartmentVo>>().fail().setMsg("网站维护，请稍后再试");
+    }
+
+    /**
+     * 内部机构tree树修改
+     *
+     * @param sid  部门sid
+     * @param name 部门名称
+     * @return 修改是否成功
+     */
+    @Override
+    public ResultBean departmentTreeUpdate(String sid, String name,int sortNo) {
+        return ResultBean.fireFail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean<QrCodeVo> getQrCode(String sid) {
+        return new ResultBean<QrCodeVo>().fail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean<List<DepartmentOrgListVo>> departmentOrgList(String organizationSid) {
+        return new ResultBean<List<DepartmentOrgListVo>>().fail().setMsg("网站维护，请稍后再试");
+    }
+
+	@Override
+	public ResultBean<QrCodeVo> queryByStaffSid(String sid) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+    @Override
+    public ResultBean<Department> selectId(Integer id) {
+        return new ResultBean<Department>().fail().setMsg("网站维护，请稍后再试");
+    }
+
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/department/DepartmentDto.java

@@ -0,0 +1,43 @@
+package com.yxt.jlzx.system.api.department;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author dimengzhe
+ * @date 2020/10/11 12:04
+ * @description 内部机构部门表
+ */
+@Data
+public class DepartmentDto implements Dto {
+
+    private static final long serialVersionUID = 2727639043633848121L;
+    @ApiModelProperty(value = "psid", required = true, example = "0")
+    private String psid = "0";
+    @ApiModelProperty(value = "部门名称", required = true)
+    @NotBlank(message = "部门名称不能为空")
+    private String name;
+    @ApiModelProperty(value = "机构sid", required = true)
+    @NotBlank(message = "机构sid不能为空")
+    private String organizationSid;
+    @ApiModelProperty(value = "联系人", required = true)
+    @NotBlank(message = "联系人不能为空")
+    private String contactMan;
+    @ApiModelProperty(value = "联系人手机号码", required = true)
+    @NotBlank(message = "联系人手机号码不能为空")
+    private String mobile;
+    @ApiModelProperty(value = "地址", required = true)
+    @NotBlank(message = "地址不能为空")
+    private String address;
+    @ApiModelProperty(value = "地理位置经纬度",required = true)
+    @NotBlank(message = "地理位置经纬度不能为空")
+    private String dlxx;
+    
+    @ApiModelProperty(value = "部门排序号",required = true)
+    @NotNull(message = "部门排序号不能为空")
+    private int sortNo;//排序号
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/department/DepartmentFourVo.java

@@ -0,0 +1,18 @@
+package com.yxt.jlzx.system.api.department;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2020/11/16 9:21
+ * @description
+ */
+@Data
+public class DepartmentFourVo {
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+    @ApiModelProperty(value = "用户sid")
+    private String userSid;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/department/DepartmentListVo.java

@@ -0,0 +1,40 @@
+package com.yxt.jlzx.system.api.department;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author dimengzhe
+ * @date 2020/10/11 20:20
+ * @description
+ */
+@Data
+public class DepartmentListVo implements Vo {
+    private static final long serialVersionUID = 6752523450858746415L;
+    @ApiModelProperty(value = "sid")
+    private String sid;
+    @ApiModelProperty(value = "psid")
+    private String psid;
+    @ApiModelProperty(value = "部门名称")
+    @NotBlank(message = "部门名称不能为空")
+    private String name;
+    @ApiModelProperty(value = "机构sid")
+    @NotBlank(message = "机构sid不能为空")
+    private String organizationSid;
+    @ApiModelProperty(value = "联系人")
+    @NotBlank(message = "联系人不能为空")
+    private String contactMan;
+    @ApiModelProperty(value = "联系人手机号码")
+    @NotBlank(message = "联系人手机号码不能为空")
+    private String mobile;
+    @ApiModelProperty(value = "地址")
+    @NotBlank(message = "地址不能为空")
+    private String address;
+    @ApiModelProperty(value = "经纬度")
+    private String dlxx;
+    @ApiModelProperty(value = "排序号")
+    private int sortNo;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/department/DepartmentOneVo.java

@@ -0,0 +1,22 @@
+package com.yxt.jlzx.system.api.department;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2020/11/16 9:17
+ * @description
+ */
+@Data
+public class DepartmentOneVo {
+
+    @ApiModelProperty(value = "单位sid")
+    private String organizationSid;
+    @ApiModelProperty(value = "单位名称")
+    private String organizationName;
+    @ApiModelProperty(value = "部门列表")
+    private List<DepartmentTwoVo> departmentTwoVoList;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/department/DepartmentOrgListVo.java

@@ -0,0 +1,19 @@
+package com.yxt.jlzx.system.api.department;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * @author dimengzhe
+ * @date 2020/11/12 18:19
+ * @description
+ */
+@Data
+public class DepartmentOrgListVo {
+
+    @ApiModelProperty("departmentName")
+    private String departmentName;
+    @ApiModelProperty("departmentSid")
+    private String departmentSid;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/department/DepartmentQuery.java

@@ -0,0 +1,25 @@
+package com.yxt.jlzx.system.api.department;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author dimengzhe
+ * @date 2020/10/11 12:05
+ * @description
+ */
+@Data
+public class DepartmentQuery implements Query {
+    private static final long serialVersionUID = 1118196052682190695L;
+    @ApiModelProperty(value = "部门名称", required = false)
+    private String name;
+    @ApiModelProperty(value = "机构sid", required = true)
+    @NotBlank(message = "机构sid不能为空")
+    private String organizationSid;
+    @ApiModelProperty(value = "父级sid", required = true)
+    @NotBlank(message = "父级sid不能为空")
+    private String psid;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/department/DepartmentThreeVo.java

@@ -0,0 +1,27 @@
+package com.yxt.jlzx.system.api.department;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2020/11/16 9:19
+ * @description
+ */
+@Data
+public class DepartmentThreeVo {
+
+    private static final long serialVersionUID = -7330713423033220310L;
+    @ApiModelProperty(value = "sid")
+    private String sid;
+    @ApiModelProperty(value = "psid")
+    private String psid;
+    @ApiModelProperty(value = "部门名称")
+    private String name;
+    @ApiModelProperty(value = "部门人员列表")
+    private List<DepartmentFourVo> departmentFourVoList;
+    @ApiModelProperty(value = "下级部门列表")
+    private List<DepartmentThreeVo> departmentThreeVoList;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/department/DepartmentTwoVo.java

@@ -0,0 +1,27 @@
+package com.yxt.jlzx.system.api.department;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2020/11/16 9:18
+ * @description
+ */
+@Data
+public class DepartmentTwoVo {
+
+    @ApiModelProperty(value = "部门sid")
+    private String sid;
+    @ApiModelProperty(value = "id")
+    private Integer id;
+    @ApiModelProperty(value = "部门名称")
+    private String name;
+    @ApiModelProperty(value = "下级部门列表")
+    private List<DepartmentThreeVo> departmentThreeVoList;
+    @ApiModelProperty(value = "部门人员列表")
+    private List<DepartmentFourVo> departmentFourVoList;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/department/DepartmentVo.java

@@ -0,0 +1,26 @@
+package com.yxt.jlzx.system.api.department;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2020/10/11 11:52
+ * @description
+ */
+@Data
+public class DepartmentVo {
+    @ApiModelProperty(value = "单位sid")
+    private String organizationSid;
+    @ApiModelProperty(value = "单位名称")
+    private String organizationName;
+    @ApiModelProperty(value = "地理信息(经度,纬度)")
+    private String gisInfo;
+    @ApiModelProperty(value = "单位地址")
+    private String orgAddress;
+    private List<DepartmentVoList> orgDepartmentVoList = new ArrayList<>();
+
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/department/DepartmentVoList.java

@@ -0,0 +1,29 @@
+package com.yxt.jlzx.system.api.department;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2020/10/21 23:09
+ * @description
+ */
+@Data
+public class DepartmentVoList {
+    @ApiModelProperty(value = "部门sid")
+    private String sid;
+    @ApiModelProperty(value = "部门名称")
+    private String name;
+    @ApiModelProperty(value = "部门排序号")
+    private int sortNo;
+    @ApiModelProperty(value = "地理位置")
+    private String dlxx;
+    @ApiModelProperty(value = "地址")
+    private String address;
+    private List<OrgDepartmentVo> orgDepartmentVoList = new ArrayList<>();
+
+
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/department/OrgDepartmentUserVo.java

@@ -0,0 +1,27 @@
+package com.yxt.jlzx.system.api.department;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2020/10/11 11:55
+ * @description
+ */
+@Data
+public class OrgDepartmentUserVo implements Vo {
+
+    private static final long serialVersionUID = -7330713423033220310L;
+    @ApiModelProperty(value = "sid")
+    private String sid;
+    @ApiModelProperty(value = "psid")
+    private String psid;
+    @ApiModelProperty(value = "部门名称")
+    private String name;
+    @ApiModelProperty(value = "部门排序号")
+    private int sortNo;
+    private List<OrgDepartmentUserVo> orgDepartmentVoList;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/department/OrgDepartmentVo.java

@@ -0,0 +1,31 @@
+package com.yxt.jlzx.system.api.department;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2020/10/11 11:55
+ * @description
+ */
+@Data
+public class OrgDepartmentVo implements Vo {
+
+    private static final long serialVersionUID = -7330713423033220310L;
+    @ApiModelProperty(value = "sid")
+    private String sid;
+    @ApiModelProperty(value = "psid")
+    private String psid;
+    @ApiModelProperty(value = "部门名称")
+    private String name;
+    @ApiModelProperty(value = "部门排序号")
+    private int sortNo;
+
+    private String dlxx;
+    private String address;
+    private List<OrgDepartmentVo> orgDepartmentVoList = new ArrayList<>();
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/department/QrCodeVo.java

@@ -0,0 +1,23 @@
+package com.yxt.jlzx.system.api.department;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2020/11/3 16:19
+ * @description
+ */
+@Data
+public class QrCodeVo {
+    @ApiModelProperty("部门名称")
+    private String departmentName;
+    @ApiModelProperty("单位名称")
+    private String organizationName;
+    @ApiModelProperty("部门地址")
+    private String address;
+    @ApiModelProperty("二维码图片地址")
+    private String qrFilePath;
+    @ApiModelProperty(value = "部门sid")
+    private String sid;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/departmentstaff/DepartmentStaff.java

@@ -0,0 +1,18 @@
+package com.yxt.jlzx.system.api.departmentstaff;
+
+import com.yxt.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2020/10/15 22:16
+ * @description
+ */
+@Data
+public class DepartmentStaff extends BaseEntity {
+    private static final long serialVersionUID = -8020502934304311754L;
+
+    private String staffSid;
+    private String departmentSid;
+    private Integer sortNo;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/departmentstaff/DepartmentStaffApi.java

@@ -0,0 +1,99 @@
+package com.yxt.jlzx.system.api.departmentstaff;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.jlzx.system.api.department.DepartmentOneVo;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2020/10/15 22:25
+ * @description
+ */
+@FeignClient(
+        contextId = "yxt-jlzx-system-DepartmentStaff",
+        name = "yxt-jlzx-system",
+        path = "v1/departmentStaffs",
+        fallback = DepartmentStaffApiFallback.class)
+public interface DepartmentStaffApi {
+    @PostMapping("/setUpDepartment")
+    @ResponseBody
+    @ApiOperation("设置部门")
+    public ResultBean setUpDepartment(@RequestBody DepartmentStaffDto departmentStaffDto);
+
+    /**
+     * 分页列表
+     *
+     * @param pagerQuery
+     * @return
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    @ApiOperation(value = "通讯录右侧部门列表")
+    public ResultBean<PagerVo<DepartmentStaffVo>> pagerVoList(@RequestBody PagerQuery<DepartmentStaffQuery> pagerQuery);
+
+
+    @PostMapping("/departmentStaffListOne/{organizationSid}")
+    @ResponseBody
+    @ApiOperation(value = "pc端单位机构部门人员列表")
+    public ResultBean<List<DepartmentOneVo>> departmentStaffListOne(@ApiParam(value = "organizationSid", required = true) @PathVariable("organizationSid") String organizationSid);
+
+    @PostMapping("/departmentStaffListTwo/{organizationSid}")
+    @ResponseBody
+    @ApiOperation(value = "app单位机构部门人员列表")
+    public ResultBean<List<DepartmentStaffOneVo>> departmentStaffListTwo(@ApiParam(value = "organizationSid", required = true) @PathVariable("organizationSid") String organizationSid);
+    
+    @PostMapping("/departmentStaffListTwo/")
+    @ResponseBody
+    @ApiOperation(value = "app单位机构部门人员列表")
+    public ResultBean<List<DepartmentStaffOneVo>> departmentStaffListTwo();
+
+    @PostMapping("/selectByStaffSid/{staffSid}")
+    @ResponseBody
+    @ApiOperation(value = "根据人员sid查询部门和人员信息")
+    public ResultBean<DepartmentStaff> selectByStaffSid(@ApiParam(value = "人员sid", required = true) @PathVariable("staffSid") String staffSid);
+
+    @PostMapping("/deleteByStaffSid/{staffSid}")
+    @ResponseBody
+    @ApiOperation(value = "根据人员sid删除部门和人员信息")
+    public ResultBean deleteByStaffSid(@ApiParam(value = "人员sid", required = true) @PathVariable("staffSid") String staffSid);
+
+    @PostMapping("/updateSortBySid/{sid}/{sortNo}")
+    @ResponseBody
+    @ApiOperation(value = "根据sid修改排序号")
+    public ResultBean updateSortBySid(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid,
+                                      @ApiParam(value = "sortNo", required = true) @PathVariable("sortNo") String sortNo);
+
+    
+    @PostMapping("/appList")
+    @ResponseBody
+    @ApiOperation(value = "app通讯录单位人员列表条件查询")
+	public ResultBean<List<DepartmentStaffVo>> appList(@RequestBody DepartmentStaffQuery  departmentStaffQuery);
+
+
+	//2021.10.30根据部门的Sid，查询这个部门下都有哪些人员
+    @GetMapping("/selectBydep")
+    @ResponseBody
+    @ApiOperation(value = "根据部门查询该部门下的人员")
+    public ResultBean<List<DepartmentStaffQuery>> selectBydep(@ApiParam(value = "depSid",required = true) @RequestParam("depSid") String depSid);
+
+    //2021.11.06根据当前的登录人来获取部门
+    @GetMapping(value = "selectOrgDept")
+    @ResponseBody
+    @ApiOperation(value = "查询当前登录用户所有部门")
+    public ResultBean<DeptOrgVo> selectOrgDept();
+
+    //2021.11.11查询部门和人员信息
+    @GetMapping(value = "/selectDeptStaff/{functionfunid}/{organizationSid}")
+    @ResponseBody
+    @ApiOperation(value="查询部门和人员信息")
+    public ResultBean<List<DeptStaffInfoVo>> selectDeptStaff(@ApiParam(value="functionfunid",required = true)@PathVariable("functionfunid")String functionfunid,@PathVariable("organizationSid")String organizationSid);
+
+}
+

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/departmentstaff/DepartmentStaffApiFallback.java

@@ -0,0 +1,12 @@
+package com.yxt.jlzx.system.api.departmentstaff;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @author dimengzhe
+ * @date 2020/10/15 22:25
+ * @description
+ */
+@Component
+public class DepartmentStaffApiFallback {
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/departmentstaff/DepartmentStaffDto.java

@@ -0,0 +1,18 @@
+package com.yxt.jlzx.system.api.departmentstaff;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2020/10/15 22:29
+ * @description
+ */
+@Data
+public class DepartmentStaffDto implements Dto {
+
+    private static final long serialVersionUID = 70326562957068326L;
+    private String staffSid;
+    private String departmentSid;
+    private Integer sortNo;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/departmentstaff/DepartmentStaffOneVo.java

@@ -0,0 +1,22 @@
+package com.yxt.jlzx.system.api.departmentstaff;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2020/11/16 10:32
+ * @description
+ */
+@Data
+public class DepartmentStaffOneVo {
+
+    @ApiModelProperty("部门名称")
+    private String departmentName;
+    @ApiModelProperty("部门sid")
+    private String departmentSid;
+    @ApiModelProperty("部门人员列表")
+    private List<DepartmentStaffTwoVo> departmentStaffTwoVoList;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/departmentstaff/DepartmentStaffQuery.java

@@ -0,0 +1,27 @@
+package com.yxt.jlzx.system.api.departmentstaff;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2020/10/28 14:35
+ * @description
+ */
+@Data
+public class DepartmentStaffQuery implements Query {
+    private static final long serialVersionUID = 1089703452924125324L;
+    
+    @ApiModelProperty(value = "部门名称")
+    private String departmentName;
+    @ApiModelProperty(value = "姓名")
+    private String name;
+    @ApiModelProperty("部门sid")
+    private String sid;
+    @ApiModelProperty(value = "单位sid")
+    private String organizationSid;
+    
+    @ApiModelProperty(value = "姓名")
+    private String mobile;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/departmentstaff/DepartmentStaffTwoVo.java

@@ -0,0 +1,19 @@
+package com.yxt.jlzx.system.api.departmentstaff;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2020/11/16 10:33
+ * @description
+ */
+@Data
+public class DepartmentStaffTwoVo {
+    @ApiModelProperty("人员姓名")
+    private String name;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("手机号")
+    private String mobile;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/departmentstaff/DepartmentStaffVo.java

@@ -0,0 +1,29 @@
+package com.yxt.jlzx.system.api.departmentstaff;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2020/10/28 14:19
+ * @description
+ */
+@Data
+public class DepartmentStaffVo {
+    @ApiModelProperty(value = "姓名")
+    private String name;
+    @ApiModelProperty(value = "部门")
+    private String departmentName;
+    @ApiModelProperty(value = "职务")
+    private String nowTechtitle;
+    @ApiModelProperty(value = "座机号码")
+    private String telephone;
+    @ApiModelProperty(value = "手机号码")
+    private String mobile;
+    @ApiModelProperty(value = "排序")
+    private Integer sortNo;
+
+    private String sid;
+
+    private String departmentStaffSid;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/departmentstaff/DeptOrgVo.java

@@ -0,0 +1,23 @@
+package com.yxt.jlzx.system.api.departmentstaff;
+
+
+import com.yxt.common.core.vo.Vo;
+import com.yxt.jlzx.system.api.department.Department;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DeptOrgVo implements Vo {
+    @ApiModelProperty(value = "单位名称")
+    private String orgName;
+
+    @ApiModelProperty(value = "单位Sid")
+    private String orgSid;
+
+    @ApiModelProperty(value = "部门信息")
+    private List<Department> departmentList;
+
+
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/departmentstaff/DeptStaffInfoVo.java

@@ -0,0 +1,20 @@
+package com.yxt.jlzx.system.api.departmentstaff;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 部门和所属人员信息
+ */
+@Data
+public class DeptStaffInfoVo implements Vo {
+    @ApiModelProperty(value = "部门名称")
+    private String deptName;
+    @ApiModelProperty(value = "部门Sid")
+    private String deptSid;
+    @ApiModelProperty(value = "人员信息")
+    private List<StaffInfoVo> staffInfoVoList;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/departmentstaff/StaffInfoVo.java

@@ -0,0 +1,20 @@
+package com.yxt.jlzx.system.api.departmentstaff;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 人员信息
+ */
+@Data
+public class StaffInfoVo implements Vo {
+    @ApiModelProperty(value= "人员姓名")
+    private String statffname;
+    @ApiModelProperty(value= "人员Sid")
+    private String statffSid;
+    @ApiModelProperty(value = "部门sid")
+    private String departmentId;
+    @ApiModelProperty(value = "id")
+    private String id;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/dictcommon/DictCommon.java

@@ -0,0 +1,42 @@
+package com.yxt.jlzx.system.api.dictcommon;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+
+import lombok.Data;
+ 
+/**
+* @ClassName: DictCommon
+* @Description: 数据字典
+* @author dongjianzhao
+* @date 2020年10月3日
+*
+*/
+@Data
+@TableName("dict_common")
+public class DictCommon extends BaseEntity {
+ /**
+	* @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
+	*/
+	private static final long serialVersionUID = -2662162694779715141L;
+/**
+	* @Fields dict_key : 数据字典条目key 如：男（1）、女（2）
+	*/
+	private String dictKey;
+	/**
+	* @Fields dict_type : 数据字典分类 如：民族（nation）
+	*/
+	private String dictType; 
+	/**
+	* @Fields dict_value : 数据字典文本 如：男、女
+	*/
+	private String dictValue;
+	/**
+	* @Fields sid_path : 数据字典的sid全路径  如sid1/sid2
+	*/
+	private String sidPath;
+	/**
+	* @Fields pid : 数据字典的父级sid 如sid 无父级写0
+	*/
+	private String parentSid;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/dictcommon/DictCommonApi.java

@@ -0,0 +1,408 @@
+package com.yxt.jlzx.system.api.dictcommon;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.jlzx.system.api.department.Department;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * @author dongjianzhao
+ * @ClassName: DictCommonApi
+ * @Description: 数据字典接口
+ * @date 2020年10月3日
+ */
+@FeignClient(
+        contextId = "yxt-jlzx-system-DictCommon",
+        name = "yxt-jlzx-system",
+        path = "dictCommon",
+        fallback = DictCommonApiFallBack.class)
+public interface DictCommonApi {
+    /**
+     * 数据字典列表
+     *
+     * @param pagerQuery 查询条件
+     * @return 数据字典分页列表
+     */
+    @PostMapping("/pageList")
+    @ResponseBody
+    @ApiOperation(value = "数据字典分页列表")
+    @ApiOperationSupport(order = 10)
+    public ResultBean<PagerVo<DictCommonVo>> pageList(@RequestBody PagerQuery<DictCommonQuery> pagerQuery);
+
+
+    @GetMapping("/dicts/{typeCode}")
+    @ResponseBody
+    @ApiOperation("根据Type值获取数据对象")
+    @ApiOperationSupport(order = 12)
+    public ResultBean<List<DictCommonListVo>> getDictsByTypeCode(@ApiParam(value = "数据字典type值", required = true) @PathVariable("typeCode") String typeCode);
+
+
+    /**
+     * 保存
+     *
+     * @param dictCommonDto 数据字典dto对象
+     * @return ResultBean
+     */
+    @PostMapping(value = "/save")
+    @ResponseBody
+    @ApiOperation(value = "数据字典保存")
+    @ApiOperationSupport(order = 20)
+    public ResultBean<String> save(@Valid @RequestBody DictCommonDto dictCommonDto);
+
+
+    /**
+     * 修改(@PathVariable是spring3.0的一个新功能：接收请求路径中占位符的值.
+     * 通过 @PathVariable 可以将URL中占位符参数{xxx}绑定到处理器类的方法形参中@PathVariable(“xxx“) )
+     *
+     * @param
+     * @return ResultBean
+     */
+    @PostMapping("/update/{sid}")
+    @ResponseBody
+    @ApiOperation(value = "数据字典修改后保存")
+    @ApiOperationSupport(order = 30)
+    public ResultBean<DictCommonVo> update(@Valid DictCommonDto dictCommonDto, @ApiParam(value = "数据字典sid", required = true) @PathVariable("sid") String sid) throws Exception;
+
+    /**
+     * 删除
+     *
+     * @param sid 数据字典sid
+     * @return ResultBean
+     */
+    @ResponseBody
+    @DeleteMapping("/delete/{sid}")
+    @ApiOperation(value = "删除")
+    @ApiOperationSupport(order = 40)
+    public ResultBean<DictCommonVo> delete(@ApiParam(value = "数据字典sid", required = true) @PathVariable("sid") String sid);
+
+
+    /**
+     * 修改页面初始化数据
+     *
+     * @param sid 数据字典sid
+     * @return ResultBean
+     */
+    @ResponseBody
+    @GetMapping("/initUpdate/{sid}")
+    @ApiOperation(value = "数据字典信息修改时的初始化信息")
+    @ApiOperationSupport(order = 50)
+    public ResultBean<DictCommonVo> initUpdate(@ApiParam(value = "数据字典sid", required = true) @PathVariable("sid") String sid);
+
+    /**
+     * 查询机构的单位类别
+     *
+     * @return
+     */
+    @GetMapping("/getDwType")
+    @ResponseBody
+    @ApiOperation("机构的单位类别")
+    @ApiOperationSupport(order = 60)
+    public ResultBean getDwType();
+
+    /**
+     * 查询机构的人员类别
+     *
+     * @return
+     */
+    @GetMapping("/getRylb")
+    @ResponseBody
+    @ApiOperation("机构的人员类别")
+    @ApiOperationSupport(order = 70)
+    public ResultBean getRylb();
+
+    /**
+     * 查询用车事由
+     *
+     * @return
+     */
+    @GetMapping("/getYcsy")
+    @ResponseBody
+    @ApiOperation("获取用车事由下拉框")
+    public ResultBean getYcsy();
+
+    /**
+     * 获取单位级别
+     *
+     * @return
+     */
+    @GetMapping("/getDwJb")
+    @ResponseBody
+    @ApiOperation("获取单位级别")
+    @ApiOperationSupport(order = 80)
+    public ResultBean getDwJb();
+
+    @GetMapping("/getZblb")
+    @ResponseBody
+    @ApiOperation("获取值班类别")
+    public ResultBean getZblb();
+
+    @GetMapping("/getHylb")
+    @ResponseBody
+    @ApiOperation("获取行业类别")
+    public ResultBean getHylb();
+
+    @GetMapping("/getZzylb")
+    @ResponseBody
+    @ApiOperation("获取资源类别")
+    @ApiOperationSupport(order = 90)
+    public ResultBean getZzylb();
+
+    @GetMapping("/getJglb")
+    @ResponseBody
+    @ApiOperation("获取监管类别")
+    public ResultBean getJglb();
+
+    @GetMapping("/getJgsx")
+    @ResponseBody
+    @ApiOperation("获取监管事项")
+    public ResultBean getJgsx();
+
+    @GetMapping("/getJgcclx")
+    @ResponseBody
+    @ApiOperation("获取监管抽查类型")
+    public ResultBean getJgcclx();
+
+
+    @GetMapping("/getTsjbly")
+    @ResponseBody
+    @ApiOperation("获取投诉举报来源")
+    public ResultBean getTsjbly();
+
+    @GetMapping("/getXzcfwflx")
+    @ResponseBody
+    @ApiOperation("获取违法类型")
+    public ResultBean getXzcfwflx();
+
+    @GetMapping("/getXzcfrdyj")
+    @ResponseBody
+    @ApiOperation("获取认定依据")
+    public ResultBean getXzcfrdyj();
+
+    @GetMapping("/getXzcfyj")
+    @ResponseBody
+    @ApiOperation("获取行政处罚依据")
+    public ResultBean getXzcfyj();
+
+    @GetMapping("/getTsjbcljg")
+    @ResponseBody
+    @ApiOperation("获取投诉举报结果")
+    public ResultBean getTsjbcljg();
+
+    @GetMapping("/getCndwsqzt")
+    @ResponseBody
+    @ApiOperation("获取承诺单位申请状态")
+    public ResultBean getCndwsqzt();
+
+    @GetMapping("/getTsjblb")
+    @ResponseBody
+    @ApiOperation("获取投诉举报类别")
+    public ResultBean getTsjblb();
+
+
+    /**
+     * 人员项目初始化下拉框字段（编辑人员信息初始化以及查询下拉框）
+     *
+     * @return
+     */
+    @ResponseBody
+    @GetMapping("/dictCommonInit")
+    @ApiOperation(value = "初始化")
+    public ResultBean<DictCommonInitVo> dictCommonInit();
+
+    /**
+     * oa项目——获取印章类型
+     *
+     * @return
+     */
+    @ResponseBody
+    @GetMapping("/dictCommonOaSeal")
+    @ApiOperation(value = "oa项目——获取印章类型")
+    public ResultBean<List<Map<String, Object>>> dictCommonOaSeal();
+
+    /**
+     * oa项目项目管理新建项目初始化
+     *
+     * @return
+     */
+    @ResponseBody
+    @GetMapping("/dictCommonProjectInit")
+    @ApiOperation(value = "oa项目项目管理新建项目初始化")
+    public ResultBean<DictCommonProjectVo> dictCommonProjectInit();
+
+    //下拉框值根据父级sid获取
+    @GetMapping("/selectByParentSid")
+    @ResponseBody
+    @ApiOperation(value = "下拉框值根据父级sid获取")
+    ResultBean<List<DictCommonListVo>> selectByParentSid(String sid);
+
+
+    //人员教育经历下拉框初始化值
+    @ResponseBody
+    @GetMapping("/dictCommonEducation")
+    @ApiOperation(value = "人员教育经历下拉框初始化值")
+    public ResultBean<Map<String, Object>> dictCommonEducation();
+
+    //计量从事工作经历
+    @ResponseBody
+    @GetMapping("/dictCommonWorkExperienceJl")
+    @ApiOperation(value = "计量从事工作经历下拉框初始化")
+    public ResultBean<Map<String, Object>> dictCommonWorkExperienceJl();
+
+    //人员从业资格情况
+    @ResponseBody
+    @GetMapping("/dictCommonCertificate")
+    @ApiOperation(value = "人员从业资格情况下拉框初始化")
+    public ResultBean<Map<String, Object>> dictCommonCertificate();
+
+    //培训经历
+    @ResponseBody
+    @GetMapping("/dictCommonTrain")
+    @ApiOperation(value = "培训经历下拉框初始化")
+    public ResultBean<Map<String, Object>> dictCommonTrain();
+
+    //专业技术资格情况
+    @ResponseBody
+    @GetMapping("/dictCommonProfessionalQualification")
+    @ApiOperation(value = "专业技术资格情况下拉框初始化")
+    public ResultBean<Map<String, Object>> dictCommonProfessionalQualification();
+
+    //专家任职情况
+    @ResponseBody
+    @GetMapping("/dictCommonExpertPostInfo")
+    @ApiOperation(value = "专家任职情况下拉框初始化")
+    public ResultBean<Map<String, Object>> dictCommonExpertPostInfo();
+
+
+    //专业技术工作经历
+    @ResponseBody
+    @GetMapping("/dictCommonProfessionalwork")
+    @ApiOperation(value = "业技术工作经历下拉框初始化")
+    public ResultBean<Map<String, Object>> dictCommonProfessionalwork();
+
+    //专业技术工作业绩
+    @ResponseBody
+    @GetMapping("/dictCommonProfessionalAchievement")
+    @ApiOperation(value = "专业技术工作业绩下拉框初始化")
+    public ResultBean<Map<String, Object>> dictCommonProfessionalAchievement();
+
+    //著作、论文及重要技术报告
+    @ResponseBody
+    @GetMapping("/dictCommonScience")
+    @ApiOperation(value = "著作、论文及重要技术报告下拉框初始化")
+    public ResultBean<Map<String, Object>> dictCommonScience();
+
+    //著作、论文及重要技术报告
+    @ResponseBody
+    @GetMapping("/dictCommonReport")
+    @ApiOperation(value = "计量专业技术报告下拉框初始化")
+    public ResultBean<Map<String, Object>> dictCommonReport();
+
+    //人奖励情况
+    @ResponseBody
+    @GetMapping("/dictCommonRewardInfo")
+    @ApiOperation(value = "奖励情况下拉框初始化")
+    public ResultBean<Map<String, Object>> dictCommonRewardInfo();
+
+    //所学专业 模糊查询
+    @ResponseBody
+    @GetMapping("/likeDict")
+    @ApiOperation(value = "模糊查询")
+    public ResultBean<List<DictCommonListVo>> likeDict(String value);
+
+    /**
+     * 查询学历
+     *
+     * @return
+     */
+    @GetMapping("/getXl")
+    @ResponseBody
+    @ApiOperation("学历下拉框")
+    @ApiOperationSupport(order = 100)
+    public ResultBean getXl();
+
+    /**
+     * 查询政治面貌
+     *
+     * @return
+     */
+    @GetMapping("/getZzmm")
+    @ResponseBody
+    @ApiOperation("政治面貌下拉框")
+    @ApiOperationSupport(order = 110)
+    public ResultBean getZzmm();
+
+
+    @ResponseBody
+    @GetMapping("/dictCommonProject")
+    @ApiOperation(value = "OA项目管理下拉框初始化值")
+    @ApiOperationSupport(order = 120)
+    public ResultBean<Map<String, Object>> dictCommonProject();
+
+    @ResponseBody
+    @GetMapping("/dictCommonContract")
+    @ApiOperation(value = "OA合同管理下拉框初始化值")
+    @ApiOperationSupport(order = 120)
+    public ResultBean<Map<String, Object>> dictCommonContract();
+
+    @ResponseBody
+    @GetMapping("/selectBykey/{key}/{type}")
+    @ApiOperation(value = "数据字典信息修改时的初始化信息")
+    @ApiOperationSupport(order = 130)
+    public ResultBean<DictCommonVo> selectBykey(@ApiParam(value = "数据字典key", required = true) @PathVariable("key") String key, @ApiParam(value = "数据字典type", required = true) @PathVariable("type") String type);
+
+
+    @ResponseBody
+    @GetMapping("/dictCommonSeal")
+    @ApiOperation(value = "OA用印管理下拉框初始化值")
+    @ApiOperationSupport(order = 140)
+    public ResultBean<Map<String, Object>> dictCommonSeal();
+
+    @ResponseBody
+    @GetMapping("/getCodeByName/{name}")
+    @ApiOperation(value = "根据名字查询值")
+    public ResultBean<List<DictCommon>> getCodeByName(@ApiParam(value = "name", required = true) @PathVariable("name") String name);
+
+    @ResponseBody
+    @GetMapping("/dictCommonGoodsform")
+    @ApiOperation(value = "OA物品申请下拉框初始化值")
+    @ApiOperationSupport(order = 150)
+    public ResultBean<Map<String, Object>> dictCommonGoodsform();
+
+
+    @ResponseBody
+    @GetMapping("/likeZymc/{likeStr}")
+    @ApiOperation(value = "模糊查询教育信息专业名称")
+    @ApiOperationSupport(order = 120)
+    public ResultBean<List<DictCommonListVo>> likeZymc(@ApiParam(value = "likeStr", required = true) @PathVariable("likeStr") String likeStr);
+
+
+    @PostMapping(value = "/saveIndustry")
+    @ResponseBody
+    @ApiOperation(value = "诚信计量行业类别的添加")
+    public ResultBean<String> saveIndustry(@Valid @RequestBody DictCommonHylbDto dto);
+
+    @PostMapping(value = "/hylbList")
+    @ResponseBody
+    @ApiOperation(value = "诚信计量行业类别的列表")
+    ResultBean<List<DictCommonHylbVo>> hylbList();
+
+    @DeleteMapping(value = "/deleteHylb/{sid}")
+    @ResponseBody
+    @ApiOperation(value = "诚信计量行业类别的删除")
+    ResultBean deleteHylb(@PathVariable(value = "sid") String sid);
+
+    @GetMapping(value = "/initHylb/{sid}")
+    @ResponseBody
+    @ApiOperation(value = "行业类别的编辑回显")
+    ResultBean<String> initHylb(@PathVariable(value = "sid") String sid);
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/dictcommon/DictCommonApiFallBack.java

@@ -0,0 +1,366 @@
+package com.yxt.jlzx.system.api.dictcommon;
+
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.ApiParam;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * @author dongjianzhao
+ * @ClassName: DictCommonApiFallBack
+ * @Description: 数据字典容错处理
+ * @date 2020年10月3日
+ */
+@Component
+public class DictCommonApiFallBack implements DictCommonApi {
+    /**
+     * 数据字典分页列表
+     *
+     * @param pagerQuery 查询条件
+     * @return 数据字典分页列表
+     */
+    @Override
+    public ResultBean<PagerVo<DictCommonVo>> pageList(PagerQuery<DictCommonQuery> pagerQuery) {
+        return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+
+    /**
+     * 保存
+     *
+     * @param menuDto 数据字典dto对象
+     * @return ResultBean
+     */
+    @Override
+    public ResultBean save(@Valid @RequestBody DictCommonDto menuDto) {
+        return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+
+
+    /**
+     * 修改(@PathVariable是spring3.0的一个新功能：接收请求路径中占位符的值.
+     * 通过 @PathVariable 可以将URL中占位符参数{xxx}绑定到处理器类的方法形参中@PathVariable(“xxx“) )
+     *
+     * @param
+     * @return ResultBean
+     */
+    @Override
+    public ResultBean update(@Valid DictCommonDto menuDto, @ApiParam(value = "数据字典sid", required = true) @PathVariable("sid") String sid) throws Exception {
+        return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+
+
+    /**
+     * 删除
+     *
+     * @param sid 数据字典sid
+     * @return ResultBean
+     */
+    @Override
+    public ResultBean delete(@ApiParam(value = "数据字典sid", required = true) @PathVariable("sid") String sid) {
+        return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+
+
+    /**
+     * 修改页面初始化数据
+     *
+     * @param sid 数据字典sid
+     * @return ResultBean
+     */
+    @Override
+    public ResultBean<DictCommonVo> initUpdate(@ApiParam(value = "数据字典sid", required = true) @PathVariable("sid") String sid) {
+        return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+
+    /**
+     * 查询机构的单位类别
+     *
+     * @return
+     */
+    @Override
+    public ResultBean getDwType() {
+        return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+
+    /**
+     * 查询机构的人员类别
+     *
+     * @return
+     */
+    @Override
+    public ResultBean getRylb() {
+        return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean getYcsy() {
+        return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+
+    /**
+     * 获取单位级别
+     *
+     * @return
+     */
+    @Override
+    public ResultBean getDwJb() {
+        return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean getZblb() {
+        return null;
+    }
+
+    @Override
+    public ResultBean getHylb() {
+        return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean getZzylb() {
+        return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean getJglb() {
+        return ResultBean.fireFail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean getJgsx() {
+        return ResultBean.fireFail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean getJgcclx() {
+        return ResultBean.fireFail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean getTsjbly() {
+        return ResultBean.fireFail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean getXzcfwflx() {
+        return ResultBean.fireFail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean getXzcfrdyj() {
+        return ResultBean.fireFail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean getXzcfyj() {
+        return ResultBean.fireFail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean getTsjbcljg() {
+        return ResultBean.fireFail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean getCndwsqzt() {
+        return ResultBean.fireFail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean getTsjblb() {
+        return ResultBean.fireFail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean<DictCommonInitVo> dictCommonInit() {
+        return new ResultBean<DictCommonInitVo>().fail().setMsg("网站维护，请稍后再试");
+    }
+
+    /**
+     * 获取印章类型
+     *
+     * @return
+     */
+    @Override
+    public ResultBean<List<Map<String, Object>>> dictCommonOaSeal() {
+        return new ResultBean<List<Map<String, Object>>>().fail().setMsg("网站维护，请稍后再试");
+    }
+
+    /**
+     * oa项目项目管理新建项目初始化
+     *
+     * @return
+     */
+    @Override
+    public ResultBean<DictCommonProjectVo> dictCommonProjectInit() {
+        return new ResultBean<DictCommonProjectVo>().fail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean<Map<String, Object>> dictCommonEducation() {
+        return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean<Map<String, Object>> dictCommonWorkExperienceJl() {
+        return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean<Map<String, Object>> dictCommonCertificate() {
+        return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean<Map<String, Object>> dictCommonTrain() {
+        // TODO Auto-generated method stub
+        return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean<Map<String, Object>> dictCommonProfessionalQualification() {
+        // TODO Auto-generated method stub
+        return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean<Map<String, Object>> dictCommonExpertPostInfo() {
+        // TODO Auto-generated method stub
+        return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean<Map<String, Object>> dictCommonProfessionalwork() {
+        // TODO Auto-generated method stub
+        return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean<Map<String, Object>> dictCommonProfessionalAchievement() {
+        // TODO Auto-generated method stub
+        return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean<Map<String, Object>> dictCommonScience() {
+        // TODO Auto-generated method stub
+        return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean<Map<String, Object>> dictCommonRewardInfo() {
+        // TODO Auto-generated method stub
+        return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean<List<DictCommonListVo>> selectByParentSid(String sid) {
+        return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean<List<DictCommonListVo>> likeDict(String value) {
+        return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+
+    /**
+     * 查询学历
+     *
+     * @return
+     */
+    @Override
+    public ResultBean getXl() {
+        return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+
+    /**
+     * 查询政治面貌
+     *
+     * @return
+     */
+    @Override
+    public ResultBean getZzmm() {
+        return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean<Map<String, Object>> dictCommonProject() {
+        return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean<Map<String, Object>> dictCommonContract() {
+        return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean<DictCommonVo> selectBykey(String key, String type) {
+        return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+
+    @Override
+    public ResultBean<Map<String, Object>> dictCommonSeal() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<DictCommon>> getCodeByName(String name) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<Map<String, Object>> dictCommonGoodsform() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<DictCommonListVo>> getDictsByTypeCode(String typeCode) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<DictCommonListVo>> likeZymc(String likeStr) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public ResultBean<String> saveIndustry(DictCommonHylbDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<DictCommonHylbVo>> hylbList() {
+        return null;
+    }
+
+    @Override
+    public ResultBean<Map<String, Object>> dictCommonReport() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public ResultBean deleteHylb(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<String> initHylb(String sid) {
+        return null;
+    }
+
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/dictcommon/DictCommonDto.java

@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.jlzx.system.api.dictcommon;
+
+import java.io.Serializable;
+import java.util.Map;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+
+import org.springframework.beans.BeanUtils;
+
+import com.alibaba.fastjson.JSON;
+import com.yxt.jlzx.system.api.menu.Menu;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClassName: DictCommonDto
+ * @Description: 数据字典信息
+ * @author dongjianzhao
+ * @date 2020年10月3日
+ *
+ */
+@Data
+public class DictCommonDto implements Serializable {
+
+	/**
+	 * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
+	 */
+	private static final long serialVersionUID = -4786442886371578638L;
+	/**
+	 * @Fields dictKey : 数据字典条目key 如：男（1）、女（2）
+	 */
+	@ApiModelProperty(value = "数据字典条目key", required = true)
+	@NotBlank(message = "数据字典key不能为空")
+	private String dictKey;
+	/**
+	 * @Fields dictType : 数据字典分类 如：民族（nation）
+	 */
+	@ApiModelProperty(value = "数据字典分类", required = true)
+	@NotBlank(message = "数据字典分类不能为空")
+	private String dictType;
+	/**
+	 * @Fields dictValue : 数据字典文本 如：男、女
+	 */
+	@ApiModelProperty(value = "数据字典文本", required = true)
+	@NotBlank(message = "数据字典文本不能为空")
+	private String dictValue;
+	/**
+	 * @Fields sidPath : 数据字典的sid全路径 如sid1/sid2
+	 */
+	@ApiModelProperty(value = "数据字典的sid全路径", required = false)
+	//@NotBlank(message = "数据字典的sid全路径不能为空")
+	private String sidPath;
+	/**
+	 * @Fields parentSid : 数据字典的父级sid 如sid 无父级写0
+	 */
+	@ApiModelProperty(value = "数据字典的父级", required = false)
+//	@NotBlank(message = "数据字典的父级不能为空")
+	private String parentSid;
+
+	@Valid
+	public DictCommon toEntity() {
+		DictCommon dictCommon = new DictCommon();
+		BeanUtils.copyProperties(this, dictCommon);
+		return dictCommon;
+	}
+
+	@Valid
+	public Map toMap(DictCommon dictCommon) {
+		BeanUtils.copyProperties(this, dictCommon);
+		Map map = JSON.parseObject(JSON.toJSONString(dictCommon), Map.class);
+		return map;
+	}
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/dictcommon/DictCommonHylbDto.java

@@ -0,0 +1,27 @@
+package com.yxt.jlzx.system.api.dictcommon;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author dongjianzhao
+ * @ClassName: DictCommonDto
+ * @Description: 数据字典信息
+ * @date 2020年10月3日
+ */
+@Data
+public class DictCommonHylbDto implements Dto {
+
+
+    private static final long serialVersionUID = -4786442886371578638L;
+
+    @ApiModelProperty(value = "数据字典文本", required = true)
+    @NotBlank(message = "数据字典文本不能为空")
+    private String dictValue;
+
+    @ApiModelProperty(value = "sid")
+    private String sid;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/dictcommon/DictCommonHylbVo.java

@@ -0,0 +1,23 @@
+package com.yxt.jlzx.system.api.dictcommon;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/4/11 10:17
+ * @Description
+ */
+@Data
+public class DictCommonHylbVo implements Vo {
+    private static final long serialVersionUID = 4513062793283281395L;
+    @ApiModelProperty(value = "sid")
+    private String sid;
+    @ApiModelProperty(value = "数据字典条目key")
+    private String dictKey;
+    @ApiModelProperty(value = "数据字典分类 ")
+    private String dictType;
+    @ApiModelProperty(value = "数据字典文本")
+    private String dictValue;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/dictcommon/DictCommonInitVo.java

@@ -0,0 +1,42 @@
+package com.yxt.jlzx.system.api.dictcommon;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2020/10/13 15:34
+ * @description 编辑人员信息初始化下拉框以及下拉框选择的初始化
+ */
+@Data
+public class DictCommonInitVo implements Vo {
+    private static final long serialVersionUID = 1121497697498329368L;
+    @ApiModelProperty(value = "民族list")
+    private List<DictCommonListVo> nationalList;
+    @ApiModelProperty(value = "政治面貌")
+    private List<DictCommonListVo> poliCodeList;
+    @ApiModelProperty(value = "性别")
+    private List<DictCommonListVo> sexList;
+    @ApiModelProperty(value = "人员身份")
+    private List<DictCommonListVo> staffIdentityList;
+    @ApiModelProperty(value = "奖励情况")
+    private List<DictCommonListVo> awardsList;
+    @ApiModelProperty(value = "现从事工作")
+    private List<DictCommonListVo> workList;
+    @ApiModelProperty(value = "学历")
+    private List<DictCommonListVo> educationList;
+    @ApiModelProperty(value = "学位")
+    private List<DictCommonListVo> degreeList;
+    @ApiModelProperty(value = "进入单位形式")
+    private List<DictCommonListVo> jrdwxsList;
+//    @ApiModelProperty(value = "现任职务资格")
+//    private List<DictCommonListVo> xrzwzgList;
+//    @ApiModelProperty(value = "现聘职级岗位")
+//    private List<DictCommonListVo> xpzjgwList;
+    //2021.10.19
+    @ApiModelProperty(value = "现技术职称资格")
+    private List<DictCommonListVo> xjshuzczgList;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/dictcommon/DictCommonListVo.java

@@ -0,0 +1,21 @@
+package com.yxt.jlzx.system.api.dictcommon;
+
+import java.io.Serializable;
+
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2020/10/7 17:18
+ * @description
+ */
+@Data
+public class DictCommonListVo implements Serializable {
+    
+    private static final long serialVersionUID = -3753636845682370405L;
+    private String dictKey;
+    private String dictType;
+    private String dictValue;
+    private String sid;
+    private String sidPath;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/dictcommon/DictCommonProjectVo.java

@@ -0,0 +1,24 @@
+package com.yxt.jlzx.system.api.dictcommon;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2020/10/14 11:23
+ * @description 新建项目下拉框返回数据
+ */
+@Data
+public class DictCommonProjectVo implements Vo {
+    private static final long serialVersionUID = 5202101017214960039L;
+
+    @ApiModelProperty(value = "项目类别list")
+    private List<DictCommonListVo> projectTypeList;
+    @ApiModelProperty(value = "专业类别")
+    private List<DictCommonListVo> professionalTypeList;
+    @ApiModelProperty(value = "参与方式")
+    private List<DictCommonListVo> participateWayList;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/dictcommon/DictCommonQuery.java

@@ -0,0 +1,71 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.jlzx.system.api.dictcommon;
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dongjianzhao
+ * @ClassName: DictCommonQuery
+ * @Description: 数据字典列表查询
+ * @date 2020年10月3日
+ */
+@Data
+public class DictCommonQuery implements Query {
+
+    /**
+     * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
+     */
+    private static final long serialVersionUID = 4061629486429152153L;
+    /**
+     * @Fields dict_key : 数据字典条目key 如：男（1）、女（2）
+     */
+    @ApiModelProperty(value = "数据字典条目key", required = false)
+    private String dictKey;
+    /**
+     * @Fields dict_type : 数据字典分类 如：民族（nation）
+     */
+    @ApiModelProperty(value = "数据字典分类", required = false)
+    private String dictType;
+    /**
+     * @Fields dict_value : 数据字典文本 如：男、女
+     */
+    @ApiModelProperty(value = "数据字典文本", required = false)
+    private String dictValue;
+    /**
+     * @Fields sid_path : 数据字典的sid全路径  如sid1/sid2
+     */
+    @ApiModelProperty(value = "数据字典的sid全路径", required = false)
+    private String sidPath;
+    /**
+     * @Fields pid : 数据字典的父级sid 如sid 无父级写0
+     */
+    @ApiModelProperty(value = "数据字典的父级sid", required = false)
+    private String parentSid;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/dictcommon/DictCommonVo.java

@@ -0,0 +1,73 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.jlzx.system.api.dictcommon;
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClassName: DictCommonVo
+ * @Description: 数据字典列表返回数据
+ * @author dongjianzhao
+ * @date 2020年10月3日
+ *
+ */
+@Data
+public class DictCommonVo implements Vo {
+	/**
+	 * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
+	 */
+	private static final long serialVersionUID = -4305648764451878243L;
+
+	private String sid;
+	/**
+	 * @Fields dict_key : 数据字典条目key 如：男（1）、女（2）
+	 */
+	@ApiModelProperty(value = "数据字典条目key")
+	private String dictKey;
+	/**
+	 * @Fields dict_type : 数据字典分类 如：民族（nation）
+	 */
+	@ApiModelProperty(value = "数据字典分类 ")
+	private String dictType;
+	/**
+	 * @Fields dict_value : 数据字典文本 如：男、女
+	 */
+	@ApiModelProperty(value = "数据字典文本")
+	private String dictValue;
+	/**
+	 * @Fields sid_path : 数据字典的sid全路径 如sid1/sid2
+	 */
+	@ApiModelProperty(value = "数据字典的sid全路径")
+	private String sidPath;
+	/**
+	 * @Fields parentSid : 数据字典的父级sid 如sid 无父级写0
+	 */
+	@ApiModelProperty(value = "数据字典的父级sid")
+	private String parentSid;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/dictcommon/DictSelectVo.java

@@ -0,0 +1,99 @@
+package com.yxt.jlzx.system.api.dictcommon;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author hanweijia
+ * @date 2020/10/13 15:34
+ * @description   下拉框初始化
+ */
+@Data
+public class DictSelectVo implements Vo {
+    private static final long serialVersionUID = 1121497697498329368L;
+    /* 人员教育信息下拉框*/
+    @ApiModelProperty(value = "学习形式")
+    private List<DictCommonListVo> xxxsList;
+    @ApiModelProperty(value = "学习类型")
+    private List<DictCommonListVo> xxlxList;
+    @ApiModelProperty(value = "学历标识")
+    private List<DictCommonListVo> xlbsList;
+    @ApiModelProperty(value = "学制")
+    private List<DictCommonListVo> xzList;
+    @ApiModelProperty(value = "学历")
+    private List<DictCommonListVo> educationList;
+    @ApiModelProperty(value = "学位")
+    private List<DictCommonListVo> degreeList;
+    
+    /* 从事计量技术工作经历下拉框*/
+    @ApiModelProperty(value = "从事专业")
+    private List<DictCommonListVo> cszyList;
+    @ApiModelProperty(value = "职务")
+    private List<DictCommonListVo> zwList;
+     
+    /* 人员从业资格情况下拉框*/
+    @ApiModelProperty(value = "证书类别")
+    private List<DictCommonListVo> zslbList;
+    @ApiModelProperty(value = "等级")
+    private List<DictCommonListVo> zcjlszgList;
+    @ApiModelProperty(value = "专业项目")
+    private List<DictCommonListVo> zyxmList;
+    
+    /* 参加业务培训经历*/
+    @ApiModelProperty(value = "培训类型")
+    private List<DictCommonListVo> pxlxList;
+    @ApiModelProperty(value = "培训形式")
+    private List<DictCommonListVo> pxxsList;
+    @ApiModelProperty(value = "考核等次")
+    private List<DictCommonListVo> khdcList;
+    
+    
+    /* 专业技术资格情况*/
+	/*
+	 * @ApiModelProperty(value = "专业技术系列") private List<DictCommonListVo>
+	 * zyjsxlList;
+	 * 
+	 * @ApiModelProperty(value = "专业名称") private List<DictCommonListVo> zymcList;
+	 */
+    @ApiModelProperty(value = "资格名称")
+    private List<DictCommonListVo> zgmcList;
+    
+    
+    /* 专家任职情况*/
+    @ApiModelProperty(value = "任职机构")
+    private List<DictCommonListVo> rzjgList;
+    @ApiModelProperty(value = "专业类别")
+    private List<DictCommonListVo> zylbList;
+    @ApiModelProperty(value = "职务")
+    private List<DictCommonListVo> zjzwList;
+    
+    /* 专业技术工作经历*/
+    @ApiModelProperty(value = "项目级别")
+    private List<DictCommonListVo> xmjbList;
+    @ApiModelProperty(value = "工作项目")
+    private List<DictCommonListVo> gzxmList;
+    @ApiModelProperty(value = "参与形式")
+    private List<DictCommonListVo> cyxsList;
+    
+    /* 专业技术工作业绩*/
+    //@ApiModelProperty(value = "参与形式")
+    //private List<DictCommonListVo> cyxsList;
+    @ApiModelProperty(value = "成果类型")
+    private List<DictCommonListVo> cglxList;
+    @ApiModelProperty(value = "成果等级")
+    private List<DictCommonListVo> cgdjList;
+    
+    /* 著作、论文及重要技术报告*/
+    @ApiModelProperty(value = "著译方式")
+    private List<DictCommonListVo> zyfsList;
+    
+    /* 奖励情况*/
+    @ApiModelProperty(value = "奖励名称")
+    private List<DictCommonListVo> jlmcList;
+    @ApiModelProperty(value = "授予级别")
+    private List<DictCommonListVo> syjbList;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/dictcommon/DictType.java

@@ -0,0 +1,32 @@
+package com.yxt.jlzx.system.api.dictcommon;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+
+import lombok.Data;
+ 
+/**
+* @ClassName: DictType
+* @Description:  数据字典类型
+* @author dongjianzhao
+* @date 2020年10月3日
+*
+*/
+@Data
+@TableName("dict_type")
+public class DictType extends BaseEntity {
+ 
+	 /**
+	* @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
+	*/
+	private static final long serialVersionUID = 213950752856090886L;
+	 
+	/**
+	* @Fields typeCode : 数据字典code 如：民族（nation）
+	*/
+	private String dictTypeCode;
+	/**
+	* @Fields typeName : 数据分类名称 如：民族
+	*/
+	private String dictTypeName;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/dictcommon/DictTypeApi.java

@@ -0,0 +1,85 @@
+package com.yxt.jlzx.system.api.dictcommon;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+ 
+/**
+* @ClassName: DictTypeApi
+* @Description: 数据字典类型类型接口
+* @author dongjianzhao
+* @date 2020年10月3日
+*
+*/
+@FeignClient(
+        contextId = "yxt-jlzx-system-DictType",
+        name = "yxt-jlzx-system",
+        path = "dicttype",
+        fallback = DictTypeApiFallBack.class)
+public interface DictTypeApi {
+	/**
+     * 数据字典类型列表
+     *
+     * @param pagerQuery 查询条件
+     * @return 数据字典类型分页列表
+     */
+    @PostMapping("/pageList")
+    @ResponseBody
+    @ApiOperation(value = "数据字典类型分页列表")
+    public ResultBean<PagerVo<DictTypeVo>> pageList(@RequestBody PagerQuery<DictTypeQuery> pagerQuery);
+    
+    /**
+     * 保存
+     *
+     * @param dictTypeDto 数据字典类型dto对象
+     * @return ResultBean
+     */
+    @PostMapping(value = "/save")
+    @ResponseBody
+    @ApiOperation(value = "数据字典类型保存")
+    public ResultBean save(@Valid DictTypeDto dictTypeDto);
+    
+    
+    /**
+     * 修改(@PathVariable是spring3.0的一个新功能：接收请求路径中占位符的值.
+     * 通过 @PathVariable 可以将URL中占位符参数{xxx}绑定到处理器类的方法形参中@PathVariable(“xxx“) )
+     *
+     * @param
+     * @return ResultBean
+     */
+    @PostMapping("/update/{sid}")
+    @ResponseBody
+    @ApiOperation(value = "数据字典类型修改后保存")
+    public ResultBean update(@Valid DictTypeDto dictTypeDto, @ApiParam(value = "数据字典类型sid", required = true) @PathVariable("sid") String sid) throws Exception;
+
+    /**
+     * 删除
+     *
+     * @param sid 数据字典类型sid
+     * @return ResultBean
+     */
+    @ResponseBody
+    @DeleteMapping("/delete/{sid}")
+    @ApiOperation(value = "删除")
+    public ResultBean delete(@ApiParam(value = "数据字典类型sid", required = true) @PathVariable("sid") String sid);
+    
+    
+    /**
+     * 修改页面初始化数据
+     *
+     * @param sid 数据字典类型sid
+     * @return ResultBean
+     */
+    @ResponseBody
+    @GetMapping("/initUpdate/{sid}")
+    @ApiOperation(value = "数据字典类型信息修改时的初始化信息")
+    public ResultBean<DictTypeVo> initUpdate(@ApiParam(value = "数据字典类型sid", required = true) @PathVariable("sid") String sid);
+
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/dictcommon/DictTypeApiFallBack.java

@@ -0,0 +1,93 @@
+package com.yxt.jlzx.system.api.dictcommon;
+
+
+import java.util.List;
+import java.util.Map;
+
+import javax.validation.Valid;
+
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.jlzx.system.api.menu.MenuVo;
+
+import io.swagger.annotations.ApiParam;
+
+ 
+/**
+* @ClassName: DictTypeApiFallBack
+* @Description: 数据字典类型类型容错处理
+* @author dongjianzhao
+* @date 2020年10月3日
+*
+*/
+@Component
+public class DictTypeApiFallBack implements DictTypeApi {
+	/**
+     * 数据字典类型类型分页列表
+     *
+     * @param pagerQuery 查询条件
+     * @return 数据字典类型分页列表
+     */
+	 @Override
+    public ResultBean<PagerVo<DictTypeVo>> pageList(PagerQuery<DictTypeQuery> pagerQuery)
+    {
+		 return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+	
+    /**
+     * 保存
+     *
+     * @param menuDto 数据字典类型dto对象
+     * @return ResultBean
+     */
+	 @Override
+    public ResultBean save(@Valid @RequestBody DictTypeDto menuDto)
+    {
+		 return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+    
+    
+    /**
+     * 修改(@PathVariable是spring3.0的一个新功能：接收请求路径中占位符的值.
+     * 通过 @PathVariable 可以将URL中占位符参数{xxx}绑定到处理器类的方法形参中@PathVariable(“xxx“) )
+     *
+     * @param
+     * @return ResultBean
+     */
+	 @Override
+    public ResultBean update(@Valid DictTypeDto menuDto, @ApiParam(value = "数据字典类型sid", required = true) @PathVariable("sid") String sid) throws Exception
+    {
+		 return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+	 
+
+    /**
+     * 删除
+     *
+     * @param sid 数据字典类型sid
+     * @return ResultBean
+     */
+	 @Override
+    public ResultBean delete(@ApiParam(value = "数据字典类型sid", required = true) @PathVariable("sid") String sid)
+    {
+		 return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+    
+    
+    /**
+     * 修改页面初始化数据
+     *
+     * @param sid 数据字典类型sid
+     * @return ResultBean
+     */
+	 @Override
+    public ResultBean<DictTypeVo> initUpdate(@ApiParam(value = "数据字典类型sid", required = true) @PathVariable("sid") String sid)
+    {
+		 return new ResultBean().fail().setMsg("网站维护，请稍后再试");
+    }
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/dictcommon/DictTypeDto.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.jlzx.system.api.dictcommon;
+
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.beans.BeanUtils;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Map;
+
+/**
+ * @ClassName: DictTypeDto
+ * @Description: 数据字典类型信息
+ * @author dongjianzhao
+ * @date 2020年10月3日
+ *
+ */
+@Data
+public class DictTypeDto implements Serializable {
+	/**
+	 * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
+	 */
+	private static final long serialVersionUID = -5515621164836818267L;
+	/**
+	* @Fields typeCode : 数据字典code 如：民族（nation）
+	*/
+	@ApiModelProperty(value = "数据字典code", required = true)
+	@NotBlank(message = "数据字典code不能为空")
+	private String dictTypeCode;
+	/**
+	* @Fields typeName : 数据分类名称 如：民族
+	*/
+	@ApiModelProperty(value = "数据分类名称", required = true)
+	@NotBlank(message = "数据分类名称不能为空")
+	private String dictTypeName;
+	@ApiModelProperty(value = "说明", required = false)
+	private String remarks;
+	@Valid
+	public DictType toEntity() {
+		DictType dictType = new DictType();
+		BeanUtils.copyProperties(this, dictType);
+		return dictType;
+	}
+
+	@Valid
+	public Map toMap(DictType dictType) {
+		BeanUtils.copyProperties(this, dictType);
+		Map map = JSON.parseObject(JSON.toJSONString(dictType), Map.class);
+		return map;
+	}
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/dictcommon/DictTypeQuery.java

@@ -0,0 +1,56 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.jlzx.system.api.dictcommon;
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dongjianzhao
+ * @ClassName: DictTypeQuery
+ * @Description: 数据字典类型列表查询
+ * @date 2020年10月3日
+ */
+@Data
+public class DictTypeQuery implements Query {
+
+    /**
+     * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
+     */
+    private static final long serialVersionUID = -1236257592265814081L;
+    /**
+     * @Fields typeCode : 数据字典code 如：民族（nation）
+     */
+    @ApiModelProperty(value = "数据字典code", required = false)
+    private String dictTypeCode;
+    /**
+     * @Fields typeName : 数据分类名称 如：民族
+     */
+    @ApiModelProperty(value = "数据分类名称", required = false)
+    private String dictTypeName;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/dictcommon/DictTypeVo.java

@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.jlzx.system.api.dictcommon;
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClassName: DictTypeVo
+ * @Description: 数据字典类型列表返回数据
+ * @author dongjianzhao
+ * @date 2020年10月3日
+ *
+ */
+@Data
+public class DictTypeVo implements Vo {
+	/**
+	 * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
+	 */
+	private static final long serialVersionUID = 1736467092760061990L;
+	private String sid;
+	/**
+	 * @Fields typeCode : 数据字典code 如：民族（nation）
+	 */
+	@ApiModelProperty(value = "数据字典code")
+	private String dictTypeCode;
+	/**
+	 * @Fields typeName : 数据分类名称 如：民族
+	 */
+	@ApiModelProperty(value = "数据分类名称")
+	private String dictTypeName;
+	@ApiModelProperty(value = "说明")
+	private String remarks;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/filenumrule/Filenumrule.java

@@ -0,0 +1,30 @@
+package com.yxt.jlzx.system.api.filenumrule;
+
+import lombok.Data;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+
+/**
+ * @author yxt_mtl
+ * @date 2020/10/16 12:52
+ * @description banner
+ */
+@Data
+@TableName("filenumrule")
+public class Filenumrule  extends BaseEntity{
+	 private static final long serialVersionUID = -2343540085171389879L;
+
+
+	private String ruleName;//规则名称
+
+
+	private String ruleType;//规则类型
+
+
+	private String fromDetpt;//来文单位
+	
+	private String orgSid;//创建单位
+	
+    private String startNumber;//初始值
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/filenumrule/FilenumruleApi.java

@@ -0,0 +1,42 @@
+package com.yxt.jlzx.system.api.filenumrule;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.yxt.common.core.api.BaseApi;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+import javax.validation.Valid;
+
+@FeignClient(
+        contextId = "yxt-jlzx-system-Filenumrule",
+        name = "yxt-jlzx-system",
+        path = "v1/filenumrules",
+        fallback = FilenumruleApiFallBack.class)
+public interface FilenumruleApi extends BaseApi<FilenumruleVo, FilenumruleDto, FilenumruleQuery>{
+
+	/**
+	 * 根据processSid获取编号规则
+	 * @param sid
+	 * @return
+	 */
+	@GetMapping("/getVoByProcessSid/{processSid}")
+	@ResponseBody
+	@ApiOperation(value = "根据processSid获取编号规则")
+	public ResultBean<List<FilenumruleOneVo>> getVoByProcessSid(@ApiParam(value = "processSid", required = true) @PathVariable("processSid") String processSid);
+
+	@PostMapping("/isRepeat")
+	@ResponseBody
+	@ApiOperation(value = "检测规则名称是否存在")
+	public ResultBean  isRepeat(@Valid @RequestBody FilenumruleDto2 dto);
+
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/filenumrule/FilenumruleApiFallBack.java

@@ -0,0 +1,64 @@
+package com.yxt.jlzx.system.api.filenumrule;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+import javax.validation.Valid;
+
+@Component
+public class FilenumruleApiFallBack implements FilenumruleApi {
+
+	@Override
+	public ResultBean<List<FilenumruleVo>> list(@Valid FilenumruleQuery query) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public ResultBean<PagerVo<FilenumruleVo>> pageList(@Valid PagerQuery<FilenumruleQuery> pagerQuery) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public ResultBean save(@Valid FilenumruleDto dto) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public ResultBean update(@Valid FilenumruleDto dto, String sid) throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public ResultBean delete(String sid) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public ResultBean<FilenumruleVo> getVo(String sid) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<FilenumruleOneVo>> getVoByProcessSid(String processSid) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public ResultBean isRepeat(@Valid FilenumruleDto2 dto) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+	
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/filenumrule/FilenumruleDto.java

@@ -0,0 +1,41 @@
+package com.yxt.jlzx.system.api.filenumrule;
+
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+
+import com.yxt.common.core.dto.Dto;
+import com.yxt.jlzx.system.api.filenumruleauthorize.Filenumruleauthorize1Vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class FilenumruleDto implements Dto{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -2967239680527466514L;
+
+	@ApiModelProperty(value = "规则名称",required = true)
+	@NotBlank(message = "规则名称不能为空")
+	private String ruleName;//规则名称
+
+	@ApiModelProperty(value = "规则类型",required = false)
+	private String ruleType;//规则类型
+
+	@ApiModelProperty(value = "来文单位",required = false)
+	private String fromDetpt;//来文单位
+	
+	@ApiModelProperty(value = "流程环节Sid",required = true)
+	@NotEmpty(message = "流程环节Sid不能为空")
+	private List<String> processSids;
+	
+	
+	@ApiModelProperty(value = "初始编号",required = false)
+    private String startNumber;//初始值
+ 
+	
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/filenumrule/FilenumruleDto2.java

@@ -0,0 +1,31 @@
+package com.yxt.jlzx.system.api.filenumrule;
+
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+
+import com.yxt.common.core.dto.Dto;
+import com.yxt.jlzx.system.api.filenumruleauthorize.Filenumruleauthorize1Vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class FilenumruleDto2 implements Dto{
+
+	private static final long serialVersionUID = -2967239680527466514L;
+
+	@ApiModelProperty(value = "规则名称",required = true)
+	@NotBlank(message = "规则名称不能为空")
+	private String ruleName;//规则名称
+
+	@ApiModelProperty(value = "规则名称sid")
+	private String sid;//规则sid
+	
+
+	@ApiModelProperty(value = "创建单位sid")
+	private String orgSid;//规则sid
+ 
+	
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/filenumrule/FilenumruleOneVo.java

@@ -0,0 +1,37 @@
+package com.yxt.jlzx.system.api.filenumrule;
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author yxt_hwj
+ * @date 2020/10/16 12：49
+ * @description 列表返回数据
+ */
+@Data
+public class FilenumruleOneVo implements Vo {
+ 
+ 
+ 
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 7614313426568670179L;
+
+	@ApiModelProperty(value = "规则名称")
+	private String ruleName;
+ 
+	@ApiModelProperty(value = "规则类型")
+	private String ruleType;
+ 
+	@ApiModelProperty(value = "来文单位")
+	private String fromDetpt;
+	
+	private String sid;
+	
+	@ApiModelProperty(value = "初始编号")
+    private String startNumber;//初始值
+	
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/filenumrule/FilenumruleQuery.java

@@ -0,0 +1,25 @@
+package com.yxt.jlzx.system.api.filenumrule;
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+public class FilenumruleQuery implements Query{
+	
+	@ApiModelProperty(value = "编号规则名称")
+	private String ruleName;
+	
+	@ApiModelProperty(value = "编号规则类型")
+	private String ruleType;
+	
+	@ApiModelProperty(value = "创建单位sid")
+	private String orgSid;
+	/*
+	 * 流程sid
+	 */
+	@ApiModelProperty(value = "流程sid")
+	private String processSid;
+	
+ 
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/filenumrule/FilenumruleVo.java

@@ -0,0 +1,43 @@
+package com.yxt.jlzx.system.api.filenumrule;
+
+import java.util.List;
+
+import com.yxt.common.core.vo.Vo;
+import com.yxt.jlzx.system.api.filenumruleauthorize.FilenumruleauthorizeVo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author yxt_hwj
+ * @date 2020/10/16 12：49
+ * @description 列表返回数据
+ */
+@Data
+public class FilenumruleVo implements Vo {
+ 
+ 
+ 
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 7614313426568670179L;
+
+	@ApiModelProperty(value = "规则名称")
+	private String ruleName;
+ 
+	@ApiModelProperty(value = "规则类型")
+	private String ruleType;
+ 
+	@ApiModelProperty(value = "来文单位")
+	private String fromDetpt;
+	
+	@ApiModelProperty(value = "流程环节Sid")
+	private List<String> processSids;
+	
+	@ApiModelProperty(value = "初始编号",required = false)
+    private String startNumber;//初始值
+	
+	private String sid;
+	
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/filenumruleauthorize/Filenumruleauthorize.java

@@ -0,0 +1,25 @@
+package com.yxt.jlzx.system.api.filenumruleauthorize;
+
+import lombok.Data;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+
+/**
+ * @author yxt_hwj
+ * @date 2020/10/16 12:52
+ * @description banner
+ */
+@Data
+@TableName("filenumruleauthorize")
+public class Filenumruleauthorize  extends BaseEntity{
+	private static final long serialVersionUID = -2746067136558768458L;
+	/*
+	 * 规则名称
+	 */
+	private String ruleSid;
+	/*
+	 * 流程sid
+	 */
+	private String processSid;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/filenumruleauthorize/Filenumruleauthorize1Vo.java

@@ -0,0 +1,22 @@
+package com.yxt.jlzx.system.api.filenumruleauthorize;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+import lombok.Data;
+
+import com.yxt.common.core.vo.Vo;
+
+/**
+ * @author yxt_mtl
+ * @date 2020/10/16 12：49
+ * @description 列表返回数据
+ */
+@Data
+public class Filenumruleauthorize1Vo implements Vo {
+ 
+ 
+	@ApiModelProperty(value = "流程sid")
+	private String processSid;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/filenumruleauthorize/FilenumruleauthorizeApi.java

@@ -0,0 +1,20 @@
+package com.yxt.jlzx.system.api.filenumruleauthorize;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+@FeignClient(
+        contextId = "yxt-jlzx-system-FilenumruleauthorizeApi",
+        name = "yxt-jlzx-system",
+        path = "v1/filenumruleauthorizeApis",
+        fallback = FilenumruleauthorizeApiFallBack.class)
+public interface FilenumruleauthorizeApi {
+
+
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/filenumruleauthorize/FilenumruleauthorizeApiFallBack.java

@@ -0,0 +1,11 @@
+package com.yxt.jlzx.system.api.filenumruleauthorize;
+
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class FilenumruleauthorizeApiFallBack implements FilenumruleauthorizeApi {
+
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/filenumruleauthorize/FilenumruleauthorizeDto.java

@@ -0,0 +1,20 @@
+package com.yxt.jlzx.system.api.filenumruleauthorize;
+
+import javax.validation.constraints.NotBlank;
+
+import io.swagger.annotations.ApiModelProperty;
+
+public class FilenumruleauthorizeDto {
+	/*
+	 * 规则名称
+	 */
+	@ApiModelProperty(value = "规则名称",required = true)
+	@NotBlank(message = "=规则名称不能为空")
+	private String ruleSid;
+	/*
+	 * 流程sid
+	 */
+	@ApiModelProperty(value = "流程sid",required = true)
+	@NotBlank(message = "=流程sid不能为空")
+	private String processSid;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/filenumruleauthorize/FilenumruleauthorizeQuery.java

@@ -0,0 +1,10 @@
+package com.yxt.jlzx.system.api.filenumruleauthorize;
+
+import javax.validation.constraints.NotBlank;
+
+import io.swagger.annotations.ApiModelProperty;
+
+public class FilenumruleauthorizeQuery {
+
+ 
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/filenumruleauthorize/FilenumruleauthorizeVo.java

@@ -0,0 +1,25 @@
+package com.yxt.jlzx.system.api.filenumruleauthorize;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+import lombok.Data;
+
+import com.yxt.common.core.vo.Vo;
+
+/**
+ * @author yxt_mtl
+ * @date 2020/10/16 12：49
+ * @description 列表返回数据
+ */
+@Data
+public class FilenumruleauthorizeVo implements Vo {
+	@ApiModelProperty(value = "规则名称")
+	private String ruleSid;
+	/*
+	 * 流程sid
+	 */
+	@ApiModelProperty(value = "流程sid")
+	private String processSid;
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/holiday/Holiday.java

@@ -0,0 +1,18 @@
+package com.yxt.jlzx.system.api.holiday;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+
+import lombok.Data;
+/**
+ * @author yxt_HWJ
+ * @date 2020/9/28 18:42
+ * @description 角色
+ */
+@Data
+@TableName("holiday")
+public class Holiday extends BaseEntity{
+	 private static final long serialVersionUID = -2343540085171389879L;
+	 private String holiday;//节假日
+	 private String  workday;//周六日上班
+}

jlzx-single/jlzx-single-system/jlzx-single-system-api/src/main/java/com/yxt/jlzx/system/api/holiday/HolidayApi.java

@@ -0,0 +1,28 @@
+package com.yxt.jlzx.system.api.holiday;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.yxt.common.core.api.BaseApi;
+import com.yxt.common.core.result.ResultBean;
+
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+
+
+/**
+ * @author yxt_mtl
+ * @date 2020/9/28 18:41
+ * @description 角色接口
+ */
+@FeignClient(
+        contextId = "yxt-jlzx-system-Holiday",
+        name = "yxt-jlzx-system",
+        path = "v1/holidays",
+        fallback = HolidayApiFallBack.class)
+public interface HolidayApi extends BaseApi<HolidayVo, HolidayDto, HolidayQuery> {
+
+
+}