Merge remote-tracking branch 'origin/master'

docs/databases/table_create_rms.sql

@@ -5,134 +5,122 @@ CREATE TABLE `risk_alarm` (
 	`createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
 	`remarks` varchar(255) DEFAULT NULL COMMENT '备注信息',
 	
+	`customerSid` varchar(64) DEFAULT NULL COMMENT '客户Sid',
+	`customerName` varchar(100) DEFAULT NULL COMMENT '客户名称',
+	
+	`positionCode` int(11) DEFAULT NULL COMMENT '风险处于位置1.主体2.供应商3.仓库4.门店',
+	`positionSid` varchar(64) DEFAULT NULL COMMENT '风险处于位置Sid',
+	`positionName` varchar(100) DEFAULT NULL COMMENT '风险处于位置名称',
+	
+	`triggerTime` DATETIME NULL DEFAULT NULL COMMENT '风险触发时间',
+	
 	`treatmentStatus` INT(11) NOT NULL DEFAULT '0' COMMENT '风险处理状态：0=待处理，1=处理中，2=已办结',
+	`treatmentTime` DATETIME NULL DEFAULT NULL COMMENT '风险处理时间',
+	`treatmentContent` varchar(500) DEFAULT NULL COMMENT '风险处理内容',
+	
+  `eliminationStatus` int(11) DEFAULT NULL '0' COMMENT '风险消除程度0.未消除1.已消除',
+	`eliminationTime` DATETIME NULL DEFAULT NULL COMMENT '风险消除时间',
+	`eliminationContent` varchar(500) DEFAULT NULL COMMENT '风险消除内容',
 	
 	`indicatorSid` varchar(64) DEFAULT NULL COMMENT '风险指标Sid',
 	`indicatorCode` varchar(100) DEFAULT NULL COMMENT '风险指标代码',
 	`indicatorName` varchar(100) DEFAULT NULL COMMENT '风险指标名称',
 	
-	`risk` int(11) DEFAULT NULL COMMENT '风险处理状态0.待处理1.处理中2.完成',
-	`riskTriggerTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '风险触发时间',
-	`riskEliminationDegree` int(11) DEFAULT NULL COMMENT '风险消除程度0.未消除1.已消除',
-	`customerSid` varchar(64) DEFAULT NULL COMMENT '客户Sid',
-	`riskInPositionNum` int(11) DEFAULT NULL COMMENT '风险处于位置1.主体2.供应商3.仓库4.门店',
-	`riskInPositionSid` varchar(64) DEFAULT NULL COMMENT '风险处于位置Sid',
-		
-	`riskDegreeName` varchar(100) DEFAULT NULL COMMENT '风险程度名称',
-	`riskDegreeCode` varchar(100) DEFAULT NULL COMMENT '风险程度代码',
-	
-	
-	
-	
-	`isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用，1:可用，0:不可用',
-	`isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除，0:未删除，1:已经删除',
-	`remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
-                                       `sid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'sid',
-                                       `lockVersion` int(0) NULL DEFAULT 0 COMMENT '版本锁',
-                                       `createTime` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '创建时间',
-                                       `modifyTime` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '修改时间',
-                                       `isEnable` int(0) NULL DEFAULT 1 COMMENT '是否可用：1可用，0不可用',
-                                       `state` int(0) NULL DEFAULT 1 COMMENT '状态',
-                                       `isDelete` int(0) NULL DEFAULT 0 COMMENT '是否删除：0未删除，1已删除',
-                                       `remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
-                                       `createBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人sid',
-                                       `updateBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人sid',
-                                       `address` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '位置',
-                                       `squareMeasure` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '面积',
-                                       `floorHeight` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '层高',
-                                       `properties` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '性质',
-                                       `contacts` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '联系人',
-                                       `price` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '价格',
-                                       `housingResources` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '房源',
-                                       `telephone` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '电话',
-                                       `province` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '省',
-                                       `city` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '市',
-                                       `county` varchar(100) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '区',
-                                       PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_croatian_ci COMMENT = '仓库位置信息' ROW_FORMAT = Dynamic;
-
-SET FOREIGN_KEY_CHECKS = 1;
-
-
-
-DROP TABLE IF EXISTS `loan_bank_information`;
-CREATE TABLE `loan_bank_information`  (
-                                          `id` int(0) NOT NULL AUTO_INCREMENT,
-                                          `sid` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NOT NULL COMMENT 'ids',
-                                          `bankName` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '银行名称',
-                                          `bankAbbreviation` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '银行简称',
-                                          `address` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '地址',
-                                          `province` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '省',
-                                          `city` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '市',
-                                          `county` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '区',
-                                          `contacts` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '联系人',
-                                          `telephone` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '电话',
-                                          `psid` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT '0' COMMENT '上级sid',
-                                          `lockVersion` int(0) NULL DEFAULT 0 COMMENT '版本锁',
-                                          `createTime` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '创建时间',
-                                          `modifyTime` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '修改时间',
-                                          `isEnable` int(0) NULL DEFAULT 1 COMMENT '是否可用：1可用，0不可用',
-                                          `state` int(0) NULL DEFAULT 1 COMMENT '状态',
-                                          `isDelete` int(0) NULL DEFAULT 0 COMMENT '是否删除：0未删除，1已删除',
-                                          `remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
-                                          `createBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人sid',
-                                          `updateBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人sid',
-                                          PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 22 CHARACTER SET = utf8 COLLATE = utf8_croatian_ci COMMENT = '贷款银行信息' ROW_FORMAT = Dynamic;
-
-SET FOREIGN_KEY_CHECKS = 1;
-
+	`levelSid` varchar(64) DEFAULT NULL COMMENT '风险等级(程度)Sid',
+	`levelCode` varchar(100) DEFAULT NULL COMMENT '风险等级(程度)代码',
+	`levelName` varchar(100) DEFAULT NULL COMMENT '风险等级(程度)名称',
+	
+	`typeSid` varchar(64) DEFAULT NULL COMMENT '风险类别Sid',
+	`typeCode` varchar(100) DEFAULT NULL COMMENT '风险类别代码',
+	`typeName` varchar(100) DEFAULT NULL COMMENT '风险类别名称',
+	PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='风险警报记录' ;
 
-DROP TABLE IF EXISTS `enterprise_information`;
-CREATE TABLE `enterprise_information`  (
-                                           `id` int(0) NOT NULL AUTO_INCREMENT,
-                                           `sid` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NOT NULL COMMENT 'ids',
-                                           `enterpriseName` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '企业名称',
-                                           `enterpriseAbbreviation` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '企业简称',
-                                           `bankAccount` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '银行账户',
-                                           `accountNumber` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '账号',
-                                           `openingBankName` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '开户行',
-                                           `juridicalPerson` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '法人',
-                                           `businessLicenseNumber` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '营业执照号',
-                                           `address` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '地址',
-                                           `province` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '省',
-                                           `city` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '市',
-                                           `county` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '区',
-                                           `contacts` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '联系人',
-                                           `telephone` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '电话',
-                                           `lockVersion` int(0) NULL DEFAULT 0 COMMENT '版本锁',
-                                           `createTime` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '创建时间',
-                                           `modifyTime` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '修改时间',
-                                           `isEnable` int(0) NULL DEFAULT 1 COMMENT '是否可用：1可用，0不可用',
-                                           `state` int(0) NULL DEFAULT 1 COMMENT '状态',
-                                           `isDelete` int(0) NULL DEFAULT 0 COMMENT '是否删除：0未删除，1已删除',
-                                           `remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
-                                           `createBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人sid',
-                                           `updateBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人sid',
-                                           PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 14 CHARACTER SET = utf8 COLLATE = utf8_croatian_ci COMMENT = '企业信息' ROW_FORMAT = Dynamic;
+DROP TABLE IF EXISTS `risk_alarm_treatment`;
+CREATE TABLE `risk_alarm_treatment` (
+	`id` BIGINT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号',
+	`createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+	`remarks` VARCHAR(100) DEFAULT NULL COMMENT '备注说明',
+	
+	`riskAlarmSid` VARCHAR(100) DEFAULT NULL COMMENT '风险警报记录SID',
+	
+	`treatmentStatus` INT(11) NOT NULL DEFAULT '0' COMMENT '风险处理状态：0=待处理，1=处理中，2=已办结',
+	`treatmentTime` DATETIME NULL DEFAULT NULL COMMENT '风险处理时间',
+	`treatmentContent` varchar(500) DEFAULT NULL COMMENT '风险处理内容',
+	
+	`userSid` VARCHAR(100) DEFAULT NULL COMMENT '处理人Sid',
+	`userName` VARCHAR(100) DEFAULT NULL COMMENT '处理人姓名',
+	`userPhone` VARCHAR(100) DEFAULT NULL COMMENT '处理人电话',
+	
+	PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB  COMMENT='风险警报-处理记录';
 
-SET FOREIGN_KEY_CHECKS = 1;
+DROP TABLE IF EXISTS `risk_indicators`;
+CREATE TABLE `risk_indicators` (
+	`id` BIGINT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号',
+	`sid` VARCHAR(64) NOT NULL COMMENT 'sid',
+	`createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+	`remarks` varchar(255) DEFAULT NULL COMMENT '备注信息',
+	
+	`reportTarget` int(11) DEFAULT NULL COMMENT '报送单位：1.监管公司2.贷款支行3.总行',
+	
+	`code` varchar(100) DEFAULT NULL COMMENT '代码',
+	`name` varchar(100) DEFAULT NULL COMMENT '名称',
+	`content` varchar(500) DEFAULT NULL COMMENT '指标说明',
+	
+	`levelSid` varchar(64) DEFAULT NULL COMMENT '风险等级(程度)Sid',
+	`levelCode` varchar(100) DEFAULT NULL COMMENT '风险等级(程度)代码',
+	`levelName` varchar(100) DEFAULT NULL COMMENT '风险等级(程度)名称',
+	
+	`typeSid` varchar(64) DEFAULT NULL COMMENT '风险类别Sid',
+	`typeCode` varchar(100) DEFAULT NULL COMMENT '风险类别代码',
+	`typeName` varchar(100) DEFAULT NULL COMMENT '风险类别名称',
+	
+	PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='风险指标' ;
 
+DROP TABLE IF EXISTS `risk_level`;
+CREATE TABLE `risk_level` (
+	`id` BIGINT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号',
+	`sid` VARCHAR(64) NOT NULL COMMENT 'sid',
+	`createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+	`remarks` varchar(255) DEFAULT NULL COMMENT '备注信息',
+	
+	`reportTarget` int(11) DEFAULT NULL COMMENT '报送单位：1.监管公司2.贷款支行3.总行',
+	
+	`code` varchar(100) DEFAULT NULL COMMENT '代码',
+	`name` varchar(100) DEFAULT NULL COMMENT '名称',
+	`handlingMethod` varchar(500) DEFAULT NULL COMMENT '处理方式',
+	
+	PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='风险等级' ;
 
-DROP TABLE IF EXISTS `bank_manager`;
-CREATE TABLE `bank_manager`  (
-                                 `id` int(0) NOT NULL AUTO_INCREMENT,
-                                 `sid` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL,
-                                 `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '姓名',
-                                 `telephone` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '电话',
-                                 `post` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '职务',
-                                 `bankSid` varchar(255) CHARACTER SET utf8 COLLATE utf8_croatian_ci NULL DEFAULT NULL COMMENT '银行sid',
-                                 `lockVersion` int(0) NULL DEFAULT 0 COMMENT '版本锁',
-                                 `createTime` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '创建时间',
-                                 `modifyTime` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '修改时间',
-                                 `isEnable` int(0) NULL DEFAULT 1 COMMENT '是否可用：1可用，0不可用',
-                                 `state` int(0) NULL DEFAULT 1 COMMENT '状态',
-                                 `isDelete` int(0) NULL DEFAULT 0 COMMENT '是否删除：0未删除，1已删除',
-                                 `remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
-                                 `createBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人sid',
-                                 `updateBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人sid',
-                                 PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8 COLLATE = utf8_croatian_ci COMMENT = '银行负责人信息' ROW_FORMAT = Dynamic;
+DROP TABLE IF EXISTS `risk_type`;
+CREATE TABLE `risk_type` (
+	`id` BIGINT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号',
+	`sid` VARCHAR(64) NOT NULL COMMENT 'sid',
+	`createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+	`remarks` varchar(255) DEFAULT NULL COMMENT '备注信息',
+	
+	`code` varchar(100) DEFAULT NULL COMMENT '代码',
+	`name` varchar(100) DEFAULT NULL COMMENT '名称',
+	`content` varchar(500) DEFAULT NULL COMMENT '分类说明',
+	
+	`hierarchy` int(11) DEFAULT '1' COMMENT '层级',
+	`parentSid` varchar(64) DEFAULT NULL COMMENT '父类Sid',
+	`parentName` varchar(64) DEFAULT NULL COMMENT '父类Sid',
+	
+	PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='风险类别';
 
-SET FOREIGN_KEY_CHECKS = 1;
+DROP TABLE IF EXISTS `risk_blacklist`;
+CREATE TABLE `risk_blacklist` (
+	`id` BIGINT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号',
+	`sid` VARCHAR(64) NOT NULL COMMENT 'sid',
+	`createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+	`remarks` varchar(255) DEFAULT NULL COMMENT '备注信息',
+	
+	`objectSid` varchar(64) DEFAULT NULL COMMENT '风险对象Sid',
+	`objectType` int(11) DEFAULT NULL COMMENT '风险对象类型1.供应商2.仓库3.门店',
+	PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='风险黑名单';

supervise-organizational-ui/src/views/brank/brankAdd.vue

@@ -23,7 +23,6 @@
           <el-input v-model="formobj.bankAbbreviation" placeholder="" class="item_input" style="width: 520px;"
             clearable />
         </div>
-
         <div class="item">
           <span class="item_text">省-市-县：</span>
           <div class="item_input">

warehousing-system/project_web/src/components/ButtonBar/index.vue

@@ -0,0 +1,122 @@
+<template>
+  <!--标题按钮部分开始-->
+  <div class="tab-header webtop">
+    <!--标题-->
+    <div>{{ viewTitle }}</div>
+    <!--start 按钮部分开始 :icon="item.icon"-->
+    <div>
+      <el-button v-for="item in btnList" :key="item.btnKey" :type="item.type" :size="item.size" :disabled="btndisabled" @click="btnHandle(item.btnKey)">
+        <svg-icon v-if="item.icon" :iconClass="item.icon"/>{{ item.btnLabel }}
+      </el-button>
+    </div>
+    <!--end 按钮部分结束-->
+  </div>
+  <!--标题按钮部分结束-->
+</template>
+
+<script>
+export default {
+  name: 'ButtonBar',
+  props: {
+    viewTitle: String,
+    btndisabled: { type: Boolean, default: false }
+  },
+  data() {
+    return {
+      currentPath: this.$route.path,
+      userSid: this.$store.getters.userInfo ? this.$store.getters.userInfo.userSid : '',
+      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'plus',
+          btnKey: 'toAdd',
+          btnLabel: '新增'
+        },
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'edit',
+          btnKey: 'toEdit',
+          btnLabel: '编辑'
+        },
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'submit',
+          btnKey: 'doSubmit',
+          btnLabel: '提交'
+        },
+        {
+          type: 'danger',
+          size: 'small',
+          icon: 'del',
+          btnKey: 'doDel',
+          btnLabel: '删除'
+        },
+        {
+          type: 'success',
+          size: 'small',
+          icon: 'Import',
+          btnKey: 'doImport',
+          btnLabel: '导入'
+        },
+        {
+          type: 'success',
+          size: 'small',
+          icon: 'export',
+          btnKey: 'build',
+          btnLabel: '导出'
+        },
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ]
+    }
+  },
+  created: function() {
+    this.initPermission()
+  },
+  methods: {
+    initPermission() {
+      console.log('*******************当前路径    ' + this.currentPath)
+      console.log('*******************当前用户    ' + this.userSid)
+      const params = {
+        currentPath: this.currentPath,
+        userSid: this.userSid
+      }
+      // req
+      //   .buttonPermission(params)
+      //   .then(resp => {
+      //     if (resp.success) {
+      //       this.btnList = resp.data
+      //     }
+      //   })
+      //   .catch(e => {
+      //     console.log('请求权限按钮组出错：' + e)
+      //   })
+    },
+    btnHandle(btnKey) {
+      this.$emit('btnhandle', btnKey)
+    },
+    setButtonList(value) {
+      this.btnList = value
+    }
+  }
+}
+</script>
+
+<style scoped>
+.svg-icon {
+  width: 1em;
+  height: 1em;
+  vertical-align: -0.16em;
+  fill: currentColor;
+  overflow: hidden;
+  margin-right: 3px;
+}
+</style>

warehousing-system/project_web/src/components/initial_value/storehouse.vue

@@ -58,21 +58,121 @@
         </el-pagination>
       </el-card>
 
-      <el-dialog :title="title" :visible.sync="storehouseDialogVisible" width="65%" @close="closeStorehouseDialog">
-
-        <el-form :model="storehouseForm" :rules="rules" ref="storehouseRuleForm" label-width="100px" class="demo-ruleForm">
-          <el-form-item label="仓库名称" prop="name">
-            <el-input v-model="storehouseForm.name" ></el-input>
-          </el-form-item>
-          <el-form-item label="仓库别名" prop="simpleName">
-            <el-input v-model="storehouseForm.simpleName" ></el-input>
-          </el-form-item>
-          <el-form-item label="仓库地址" prop="addr">
-            <el-input v-model="storehouseForm.addr" ></el-input>
-          </el-form-item>
-          <el-form-item label="备    注" prop="remarks">
-            <el-input v-model="storehouseForm.remarks" ></el-input>
-          </el-form-item>
+      <el-dialog :title="title" :visible.sync="storehouseDialogVisible" width="65%" >
+
+        <el-form :model="form" :rules="rules" ref="form" label-position="right" class="demo-form-inline">
+          <el-row >
+            <el-col :span="3.2" class="tleftb">
+				  	 <span><span class="icon">*</span>仓库名称：</span>
+				   </el-col>
+          <el-col :span="4" class="trightb">
+				  	<el-form-item prop="name"><el-input size="small" v-model="form.name" placeholder="仓库名称"    class="addinputw" clearable /></el-form-item>
+				   </el-col>
+
+            <el-col :span="3" class="tleftb">
+				  	 <span><span class="icon">*</span>仓库简称：</span>
+				   </el-col>
+          <el-col :span="4" class="trightb">
+				  	<el-form-item prop="name"><el-input size="small" v-model="form.name" placeholder="仓库简称"    class="addinputw" clearable /></el-form-item>
+				   </el-col>
+
+            <el-col :span="3" class="tleftb">
+				  	 <span><span class="icon">*</span>仓库编码：</span>
+				   </el-col>
+          <el-col :span="4" class="trightb">
+				  	<el-form-item prop="name"><el-input size="small" v-model="form.name" placeholder="仓库编码"    class="addinputw" clearable /></el-form-item>
+				   </el-col>
+          </el-row>
+
+
+          <el-row>
+            <el-col :span="3.2" class="tleftb">
+				  	 <span><span class="icon">*</span>所属地：&nbsp;&nbsp;&nbsp; </span>
+				   </el-col>
+            <el-form-item  prop="simpleName">
+              <el-select size="small" class = "arriveClass" v-model="form.region1" placeholder="请选择省" @change = "provinceChange($event)">
+               <el-option v-for="(item,index) in form.provinceList" :key="index" :label="item.name" :value="item.name">
+              </el-option>
+             </el-select>
+
+              <el-select size="small" class = "arriveClass" v-model="form.region2" placeholder="请选择市" @change = "cityChange($event)">
+               <el-option v-for="(item,index) in form.cityList" :key="index" :label="item.name" :value="item.name">
+              </el-option>
+             </el-select>
+
+              <el-select size="small" class = "arriveClass" v-model="form.region3" placeholder="请选择区县">
+               <el-option v-for="(item,index) in form.countyList" :key="index" :label="item.name" :value="item.name">
+              </el-option>
+             </el-select>
+            </el-form-item>
+          </el-row>
+
+          <el-row >
+            <el-col :span="3.2" class="tleftb">
+				  	 <span><span class="icon">*</span>库房面积：</span>
+				   </el-col>
+          <el-col :span="4" class="trightb">
+				  	<el-form-item prop="name"><el-input size="small" v-model="form.name" placeholder="库房面积"    class="addinputw" clearable /></el-form-item>
+				   </el-col>
+
+            <el-col :span="3" class="tleftb">
+				  	 <span><span class="icon">*</span>库房高度：</span>
+				   </el-col>
+          <el-col :span="3" class="trightb">
+				  	<el-form-item prop="name"><el-input size="small" v-model="form.name" placeholder="库房高度"    class="addinputw" clearable /></el-form-item>
+				   </el-col>
+
+            <el-col :span="3" class="tleftb">
+				  	 <span><span class="icon">*</span>月租金：</span>
+				   </el-col>
+          <el-col :span="3" class="trightb">
+				  	<el-form-item prop="name"><el-input size="small" v-model="form.name" placeholder="月租金"    class="addinputw" clearable /></el-form-item>
+				   </el-col>
+          </el-row>
+
+          <el-row >
+            <el-col :span="3.2" class="tleftb">
+				  	 <span><span class="icon">*</span>库房性质编码：</span>
+				   </el-col>
+          <el-col :span="6" class="trightb">
+				  	<el-form-item prop="name">
+              <el-select size="small" class = "arriveClass" v-model="form.region1" placeholder="库房性质编码" @change = "provinceChange($event)">
+               <el-option v-for="(item,index) in form.provinceList" :key="index" :label="item.name" :value="item.name">
+              </el-option>
+             </el-select>
+            </el-form-item>
+				   </el-col>
+
+            <el-col :span="3" class="tleftb">
+				  	 <span><span class="icon">*</span>房源：</span>
+				   </el-col>
+          <el-col :span="4" class="trightb">
+				  	<el-form-item prop="name"><el-input size="small" v-model="form.name" placeholder="房源"    class="addinputw" clearable /></el-form-item>
+				   </el-col>
+          </el-row>
+
+          <el-row >
+            <el-col :span="3.2" class="tleftb">
+				  	 <span><span class="icon">*</span>联系人姓名：</span>
+				   </el-col>
+          <el-col :span="4" class="trightb">
+				  	<el-form-item prop="name"><el-input size="small" v-model="form.name" placeholder="联系人姓名"    class="addinputw" clearable /></el-form-item>
+				   </el-col>
+
+            <el-col :span="3" class="tleftb">
+				  	 <span><span class="icon">*</span>联系人电话：</span>
+				   </el-col>
+          <el-col :span="3" class="trightb">
+				  	<el-form-item prop="name"><el-input size="small" v-model="form.name" placeholder="联系人电话"    class="addinputw" clearable /></el-form-item>
+				   </el-col>
+
+            <el-col :span="3" class="tleftb">
+				  	 <span><span class="icon">*</span>附件：</span>
+				   </el-col>
+          <el-col :span="3" class="trightb">
+				  	<el-form-item prop="name"><el-input size="small" v-model="form.name" placeholder="附件"    class="addinputw" clearable /></el-form-item>
+				   </el-col>
+          </el-row>
         </el-form>
 
         <div slot="footer" class="dialog-footer">
@@ -113,7 +213,24 @@ export default {
         addr: [
           { required: true, message: '请输入仓库地址', trigger: 'blur' }
         ]
-      }
+      },
+      tableData:[],
+      totalPrice:0,
+      form:{
+         name:"",
+         region1:'',
+         region2:'',
+         region3:'',
+         xxarrive:'',
+         tel:'',
+         provinceList:[],
+         cityList:[],
+         countyList:[]
+     },
+      CITY:[],
+      XIAN:[],
+      mapApiKey: 'map',
+      shouhuoArrive:{}
     }
   },
   methods: {
@@ -132,9 +249,6 @@ export default {
       this.total = result.data.total
       this.storehouseList = result.data.rows
     },
-    closeStorehouseDialog () {
-      this.$refs.storehouseRuleForm.resetFields()
-    },
     addStorehouseDialog () {
       this.title = '新增仓库'
       this.storehouseDialogVisible = true
@@ -180,13 +294,95 @@ export default {
       if (resultDB.status !== 200) return this.$message.error('删除出库失败')
       this.getStorehouseList()
       this.$message.success('仓库删除成功')
-    }
+    },
+    getMap(){
+      this.$http({
+         method:"get",
+         url:"https://restapi.amap.com/v3/config/district?parameters", // apii请求地址
+         params:{  // 携带的参数
+             key:"3a708a4ef5e3af28694b1c861985a5ce", // 在高德开放平台申请的个人key密钥
+             keyWords:"中国",
+             subdistrict:3    // 要获取的行政区划的级别：省、市、县三级
+         }
+     }).then((res)=>{
+        this.form.provinceList = res.data.districts[0].districts  /* 省*/
+          /* 进行遍历赋值*/
+          /* 市区和县区*/
+        let newProvince = this.form.provinceList
+        for(let i = 0; i < newProvince.length; i++){              /* 省级*/
+            for(let j = 0; j < newProvince[i].districts.length; j++){       /* 市级*/
+                let city = newProvince[i].districts[j].name
+                this.CITY.push({id:j+1,name:city,code:i+1})
+                for(let k = 0;k<newProvince[i].districts[j].districts.length; k++){/* 县级*/
+                    let xian = newProvince[i].districts[j].districts[k].name
+                     this.XIAN.push({id:k+1,name:xian,code:j+1,cityCountyName:city})
+                }
+            }
+        }
+        for(let m = 0; m < newProvince.length;m++){
+            newProvince[m] = {...newProvince[m],...{code:m+1}}
+        }
+        this.form.provinceList = newProvince
+      })
+    },
+    provinceChange(that){
+     // 根据选中省，匹配市
+     this.form.region2=''
+     this.form.region3=''
+     let cityCode = 0
+     let newCityArry = []
+     this.form.provinceList.forEach((item,index)=>{
+         if(item.name == that){
+             cityCode = item.code
+         }
+     })
+        // console.log(cityCode)
+     if(cityCode){
+         this.form.cityList = []
+         this.CITY.forEach((item,index)=>{
+             if(item.code == cityCode){
+                 this.form.cityList.push(item)
+            }
+        })  /* 市匹配成功*/
+      }
+    },
+    cityChange(that){
+      this.form.region3=''
+      let countyCode = 0
+      let cityname = ''
+      let newCountyArry = []
+      this.form.cityList.forEach((item,index)=>{
+          if(item.name == that){
+              countyCode = item.id
+              cityname = item.name
+          }
+      })
+      if(countyCode){
+          this.form.countyList = []
+          this.XIAN.forEach((item,index)=>{
+              if(item.code == countyCode && item.cityCountyName == cityname){
+                  this.form.countyList.push(item)
+              }
+          })
+      }
+    },
   },
   mounted () {
     this.getStorehouseList()
-  }
+    this.getMap()
+  },
 }
 </script>
 
 <style>
+.tleftb {
+  text-align: right;
+  font-size: 14px;
+  color: #606266;
+  line-height: 40px !important;
+}
+.trightb{ text-align: right;font-weight: bold;color: #606266;  } 
+.tleft{ text-align: left;  }
+.arriveClass{margin-right: 30px;}
+.icon{color:rgba(255, 0, 0, 0.553);margin-right: 3px;}
 </style>

warehousing-system/project_web/src/plugins/element.js

@@ -39,8 +39,8 @@ import {
   Checkbox,
   Upload,
   Divider,
-  InputNumber
-
+  InputNumber,
+  footer
 } from 'element-ui'
 
 Vue.use(Button)
@@ -81,6 +81,7 @@ Vue.use(Checkbox)
 Vue.use(Upload)
 Vue.use(Divider)
 Vue.use(InputNumber)
+Vue.use(footer)
 
 // 将弹框组件挂载到Vue对象中 用户可以使用this关键字调用
 Vue.prototype.$message = Message

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/dictcommon/DictCommon.java

@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.cyf.api.dictcommon;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: DictCommon.java <br/>
+ * Class: com.supervise.api.dictcommon.DictCommon <br/>
+ * Description: 数据字典——数据项. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-11 11:40:28 <br/>
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据字典——数据项", description = "数据字典——数据项")
+@TableName("dict_common")
+public class DictCommon extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("类型code")
+    private String dictType; // 类型code
+	@ApiModelProperty("key值")
+    private String dictKey; // key值
+	@ApiModelProperty("value值")
+    private String dictValue; // value值
+	@ApiModelProperty("路径")
+    private String sidPath; // 路径
+	@ApiModelProperty("父级sid")
+    private String parentSid; // 父级sid
+	@ApiModelProperty("分组名称")
+    private String groupName; // 分组名称
+
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/dictcommon/DictCommonDetailsVo.java

@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.cyf.api.dictcommon;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: DictCommonVo.java <br/>
+ * Class: com.supervise.api.dictcommon.DictCommonVo <br/>
+ * Description: 数据字典——数据项 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-11 11:40:29 <br/>
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据字典——数据项 视图数据详情", description = "数据字典——数据项 视图数据详情")
+public class DictCommonDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("类型code")
+    private String dictType; // 类型code
+	@ApiModelProperty("key值")
+    private String dictKey; // key值
+	@ApiModelProperty("value值")
+    private String dictValue; // value值
+	@ApiModelProperty("路径")
+    private String sidPath; // 路径
+	@ApiModelProperty("父级sid")
+    private String parentSid; // 父级sid
+	@ApiModelProperty("分组名称")
+    private String groupName; // 分组名称
+
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/dictcommon/DictCommonDto.java

@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.cyf.api.dictcommon;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: DictCommonDto.java <br/>
+ * Class: com.supervise.api.dictcommon.DictCommonDto <br/>
+ * Description: 数据字典——数据项 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-11 11:40:28 <br/>
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据字典——数据项 数据传输对象", description = "数据字典——数据项 数据传输对象")
+public class DictCommonDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("类型code")
+    private String dictType; // 类型code
+	@ApiModelProperty("key值")
+    private String dictKey; // key值
+	@ApiModelProperty("value值")
+    private String dictValue; // value值
+	@ApiModelProperty("路径")
+    private String sidPath; // 路径
+	@ApiModelProperty("父级sid")
+    private String parentSid; // 父级sid
+	@ApiModelProperty("分组名称")
+    private String groupName; // 分组名称
+
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/dictcommon/DictCommonQuery.java

@@ -0,0 +1,64 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.cyf.api.dictcommon;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: DictCommonQuery.java <br/>
+ * Class: com.supervise.api.dictcommon.DictCommonQuery <br/>
+ * Description: 数据字典——数据项 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-11 11:40:28 <br/>
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据字典——数据项 查询条件", description = "数据字典——数据项 查询条件")
+public class DictCommonQuery implements Query {
+
+	@ApiModelProperty("类型code")
+    private String dictType; // 类型code
+	@ApiModelProperty("key值")
+    private String dictKey; // key值
+	@ApiModelProperty("value值")
+    private String dictValue; // value值
+	@ApiModelProperty("路径")
+    private String sidPath; // 路径
+	@ApiModelProperty("父级sid")
+    private String parentSid; // 父级sid
+	@ApiModelProperty("分组名称")
+    private String groupName; // 分组名称
+
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/dictcommon/DictCommonVo.java

@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.cyf.api.dictcommon;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: DictCommonVo.java <br/>
+ * Class: com.supervise.api.dictcommon.DictCommonVo <br/>
+ * Description: 数据字典——数据项 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-11 11:40:28 <br/>
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据字典——数据项 视图数据对象", description = "数据字典——数据项 视图数据对象")
+public class DictCommonVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("类型code")
+    private String dictType; // 类型code
+	@ApiModelProperty("key值")
+    private String dictKey; // key值
+	@ApiModelProperty("value值")
+    private String dictValue; // value值
+	@ApiModelProperty("路径")
+    private String sidPath; // 路径
+	@ApiModelProperty("父级sid")
+    private String parentSid; // 父级sid
+	@ApiModelProperty("分组名称")
+    private String groupName; // 分组名称
+
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysfunction/SysFunction.java

@@ -0,0 +1,49 @@
+package com.yxt.supervise.cyf.api.sysfunction;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysFunction.java <br/>
+ * Class: SysFunction <br/>
+ * Description: 功能. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "功能", description = "功能")
+@TableName("sys_function")
+@Data
+public class SysFunction extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    
+	@ApiModelProperty("功能名称")
+    private String name;
+    
+	@ApiModelProperty("层级")
+    private Integer level;
+    
+	@ApiModelProperty("父级sid")
+    private String parentSid;
+    
+	@ApiModelProperty("接口地址")
+    private String actionUrl;
+    
+	@ApiModelProperty("模块名称")
+    private String controllerName;
+    
+	@ApiModelProperty("移动端按钮id")
+    private String funId;
+    
+	@ApiModelProperty("是否手机端权限0否，1是")
+    private String phoneFunction;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysfunction/SysFunctionDto.java

@@ -0,0 +1,51 @@
+package com.yxt.supervise.cyf.api.sysfunction;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysFunctionDto.java <br/>
+ * Class: SysFunctionDto <br/>
+ * Description: 功能 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "功能 数据传输对象", description = "功能 数据传输对象")
+@Data
+public class SysFunctionDto implements Dto {
+
+    
+	@ApiModelProperty("功能名称")
+    private String name;
+    
+	@ApiModelProperty("层级")
+    private Integer level;
+    
+	@ApiModelProperty("父级sid")
+    private String parentSid;
+    
+	@ApiModelProperty("接口地址")
+    private String actionUrl;
+    
+	@ApiModelProperty("模块名称")
+    private String controllerName;
+	@ApiModelProperty("模块sid")
+    private String sourceSid;
+
+	@ApiModelProperty("移动端按钮id")
+    private String funId;
+    
+	@ApiModelProperty("是否手机端权限0否，1是")
+    private String phoneFunction;
+	@ApiModelProperty("备注")
+    private String remarks ;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysfunction/SysFunctionQuery.java

@@ -0,0 +1,50 @@
+package com.yxt.supervise.cyf.api.sysfunction;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysFunctionQuery.java <br/>
+ * Class: SysFunctionQuery <br/>
+ * Description: 功能 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "功能 查询条件", description = "功能 查询条件")
+@Data
+public class SysFunctionQuery implements Query {
+
+    
+	@ApiModelProperty("功能名称")
+    private String name;
+    
+	@ApiModelProperty("层级")
+    private Integer level;
+    
+	@ApiModelProperty("父级sid")
+    private String parentSid;
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+
+	@ApiModelProperty("接口地址")
+    private String actionUrl;
+    
+	@ApiModelProperty("模块名称")
+    private String controllerName;
+    
+	@ApiModelProperty("移动端按钮id")
+    private String funId;
+
+
+	@ApiModelProperty("是否手机端权限0否，1是")
+    private String phoneFunction;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysfunction/SysFunctionTreeVo.java

@@ -0,0 +1,50 @@
+package com.yxt.supervise.cyf.api.sysfunction;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysFunctionTreeVo.java <br/>
+ * Description: 功能表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "功能表 视图数据对象", description = "功能表 视图数据对象")
+@Data
+public class SysFunctionTreeVo implements Vo {
+	@ApiModelProperty("功能名称")
+    private String name;
+	@ApiModelProperty("资源sid")
+    private String sourceSid;
+	@ApiModelProperty("上级sid")
+    private String parentSid;
+	@ApiModelProperty("sid")
+    private String sid;
+    @ApiModelProperty("资源名称")
+    private String sourceName;
+    @ApiModelProperty("url地址")
+    private String actionUrl;
+    @ApiModelProperty("功能根路径sid")
+    private String functionRootSid;
+    @ApiModelProperty("子功能")
+    private List<SysFunctionTreeVo> children;
+    @ApiModelProperty("是否可用")
+    private String isEnable;
+    @ApiModelProperty("功能列表用，是否是资源层级1是，0不是")
+    private String isSource = "0";
+    @ApiModelProperty("父级名称")
+    private String parentName;
+    @ApiModelProperty("说明")
+    private String remarks;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysfunction/SysFunctionVo.java

@@ -0,0 +1,51 @@
+package com.yxt.supervise.cyf.api.sysfunction;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysFunctionVo.java <br/>
+ * Class: SysFunctionVo <br/>
+ * Description: 功能 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "功能 视图数据对象", description = "功能 视图数据对象")
+@Data
+public class SysFunctionVo implements Vo {
+	@ApiModelProperty("功能名称")
+    private String name;
+	@ApiModelProperty("父级sid")
+    private String parentSid;
+	@ApiModelProperty("父级名称")
+    private String parentName;
+	@ApiModelProperty("接口地址")
+    private String actionUrl;
+	@ApiModelProperty("模块名称")
+    private String controllerName;
+	@ApiModelProperty("是否手机端权限0否，1是")
+    private String phoneFunction;
+    @ApiModelProperty("sid")
+    private String sid;
+    @ApiModelProperty("子集数据")
+    private List<SysFunctionVo> children;
+    @ApiModelProperty("是否选中 1未选中，0选中")
+    private String checked;
+    @ApiModelProperty("资源名称")
+    private String sourceName;
+    @ApiModelProperty("资源SId")
+    private String sourceSid;
+    @ApiModelProperty("是否可用")
+    private Integer isEnable;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysmenu/SysMenu.java

@@ -0,0 +1,64 @@
+package com.yxt.supervise.cyf.api.sysmenu;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenu.java <br/>
+ * Class: SysMenu <br/>
+ * Description: 菜单表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单表", description = "菜单表")
+@TableName("sys_menu")
+@Data
+public class SysMenu extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    
+	@ApiModelProperty("菜单名称")
+    private String name;
+    
+	@ApiModelProperty("菜单路由路径(VUE)")
+    private String menuUrl;
+    
+	@ApiModelProperty("菜单对应的前端页面路径")
+    private String pageUrl;
+    
+	@ApiModelProperty("菜单图标地址")
+    private String iconUrl;
+    
+	@ApiModelProperty("资源sid")
+    private String sourceSid;
+    
+	@ApiModelProperty("是否显示,默认为1显示，0为不显示")
+    private String isShow;
+    
+	@ApiModelProperty("排序号")
+    private Integer sortNo;
+    
+	@ApiModelProperty("上级sid")
+    private String pSid;
+    
+	@ApiModelProperty("前端页面路径重定向")
+    private Integer pageUrlRedirect;
+    
+	@ApiModelProperty("前端页面名称（vue组件名）")
+    private String pageName;
+    
+	@ApiModelProperty("前端页面别名")
+    private String pageAliasName;
+    
+	@ApiModelProperty("菜单类型（0左侧当行菜单，1页面中功能）")
+    private String menuType;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysmenu/SysMenuDto.java

@@ -0,0 +1,72 @@
+package com.yxt.supervise.cyf.api.sysmenu;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuDto.java <br/>
+ * Class: SysMenuDto <br/>
+ * Description: 菜单表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单表 数据传输对象", description = "菜单表 数据传输对象")
+@Data
+public class SysMenuDto implements Dto {
+
+
+    private static final long serialVersionUID = -8143707488992909267L;
+    @ApiModelProperty(value = "菜单名称", required = true)
+    @NotBlank(message = "菜单名称不能为空")
+    private String name;
+
+    @ApiModelProperty("菜单路由路径(VUE)")
+    private String menuUrl;
+
+    @ApiModelProperty("菜单对应的前端页面路径")
+    private String pageUrl;
+
+    @ApiModelProperty("菜单图标地址")
+    private String iconUrl;
+
+    @ApiModelProperty(value = "资源sid", required = true)
+    @NotBlank(message = "资源不能为空")
+    private String sourceSid;
+
+    @ApiModelProperty(value = "是否显示,默认为1显示，0为不显示", required = true)
+    @NotBlank(message = "是否显示不能为空")
+    private String isShow;
+
+    @ApiModelProperty("排序号")
+    private Integer sortNo;
+
+    @ApiModelProperty(value = "上级sid", example = "0", required = true)
+    @NotBlank(message = "上级菜单不能为空")
+    private String pSid;
+
+    @ApiModelProperty(value = "前端页面路径重定向", required = false)
+    private Integer pageUrlRedirect;
+
+    @ApiModelProperty("前端页面名称（vue组件名）")
+    private String pageName;
+
+    @ApiModelProperty(value = "前端页面别名", required = false)
+    private String pageAliasName;
+
+    @ApiModelProperty("菜单类型（0左侧当行菜单，1页面中功能）")
+    private String menuType;
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysmenu/SysMenuQuery.java

@@ -0,0 +1,66 @@
+package com.yxt.supervise.cyf.api.sysmenu;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuQuery.java <br/>
+ * Class: SysMenuQuery <br/>
+ * Description: 菜单表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单表 查询条件", description = "菜单表 查询条件")
+@Data
+public class SysMenuQuery implements Query {
+
+    
+	@ApiModelProperty("菜单名称")
+    private String name;
+
+	@ApiModelProperty("菜单路由路径(VUE)")
+    private String menuUrl;
+    
+	@ApiModelProperty("菜单对应的前端页面路径")
+    private String pageUrl;
+    
+	@ApiModelProperty("菜单图标地址")
+    private String iconUrl;
+    
+	@ApiModelProperty("资源sid")
+    private String sourceSid;
+	@ApiModelProperty("用户sid")
+    private String userSid;
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+
+	@ApiModelProperty("是否显示,默认为1显示，0为不显示")
+    private String isShow;
+    
+	@ApiModelProperty("排序号")
+    private Integer sortNo;
+    
+	@ApiModelProperty("上级sid")
+    private String pSid;
+    
+	@ApiModelProperty("前端页面路径重定向")
+    private Integer pageUrlRedirect;
+    
+	@ApiModelProperty("前端页面名称（vue组件名）")
+    private String pageName;
+    
+	@ApiModelProperty("前端页面别名")
+    private String pageAliasName;
+    
+	@ApiModelProperty("菜单类型（0左侧当行菜单，1页面中功能）")
+    private String menuType;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysmenu/SysMenuTreeVo.java

@@ -0,0 +1,59 @@
+package com.yxt.supervise.cyf.api.sysmenu;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuVo.java <br/>
+ * Class: SysMenuVo <br/>
+ * Description: 菜单表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单表 视图数据对象", description = "菜单表 视图数据对象")
+@Data
+public class SysMenuTreeVo implements Vo {
+	@ApiModelProperty("菜单名称")
+    private String name;
+	@ApiModelProperty("资源sid")
+    private String sourceSid;
+	@ApiModelProperty("排序号")
+    private Integer sortNo;
+	@ApiModelProperty("上级sid")
+    private String pSid;
+	@ApiModelProperty("上级菜单名称")
+    private String pName;
+	@ApiModelProperty("sid")
+    private String sid;
+    @ApiModelProperty("资源名称")
+    private String sourceName;
+    @ApiModelProperty("菜单根路径sid")
+    private String menuRootSid;
+    @ApiModelProperty("pageUrl")
+    private String pageUrl;
+    @ApiModelProperty("menuUrl")
+    private String menuUrl;
+    @ApiModelProperty("menuUrl")
+    private String pageName;
+    @ApiModelProperty("iconUrl")
+    private String iconUrl;
+    @ApiModelProperty("菜单列表用，是否是资源层级1是，0不是")
+    private String isSource = "0";
+    @ApiModelProperty("是否可用")
+    private String isEnable;
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+    @ApiModelProperty("子菜单")
+    private List<SysMenuTreeVo> children;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysmenu/SysMenuVo.java

@@ -0,0 +1,74 @@
+package com.yxt.supervise.cyf.api.sysmenu;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuVo.java <br/>
+ * Class: SysMenuVo <br/>
+ * Description: 菜单表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单表 视图数据对象", description = "菜单表 视图数据对象")
+@Data
+public class SysMenuVo implements Vo {
+
+    
+	@ApiModelProperty("菜单名称")
+    private String name;
+    
+	@ApiModelProperty("菜单路由路径(VUE)")
+    private String menuUrl;
+    
+	@ApiModelProperty("菜单对应的前端页面路径")
+    private String pageUrl;
+    
+	@ApiModelProperty("菜单图标地址")
+    private String iconUrl;
+    
+	@ApiModelProperty("资源sid")
+    private String sourceSid;
+    
+	@ApiModelProperty("是否显示,默认为1显示，0为不显示")
+    private String isShow;
+    
+	@ApiModelProperty("排序号")
+    private Integer sortNo;
+    
+	@ApiModelProperty("上级sid")
+    private String pSid;
+	@ApiModelProperty("上级名称")
+    private String pName;
+	@ApiModelProperty("sid")
+    private String sid;
+
+	@ApiModelProperty("前端页面路径重定向")
+    private Integer pageUrlRedirect;
+    
+	@ApiModelProperty("前端页面名称（vue组件名）")
+    private String pageName;
+    
+	@ApiModelProperty("前端页面别名")
+    private String pageAliasName;
+    
+	@ApiModelProperty("菜单类型（0左侧当行菜单，1页面中功能）")
+    private String menuType;
+    @ApiModelProperty("子菜单")
+	private List<SysMenuVo> children;
+    @ApiModelProperty("是否选中，1：未选中,0：选中")
+    private String checked;
+    @ApiModelProperty("资源名称")
+    private String sourceName;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysmenurole/SysMenuRole.java

@@ -0,0 +1,34 @@
+package com.yxt.supervise.cyf.api.sysmenurole;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuRole.java <br/>
+ * Class: SysMenuRole <br/>
+ * Description: 菜单与角色关联表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单与角色关联表", description = "菜单与角色关联表")
+@TableName("sys_menu_role")
+@Data
+public class SysMenuRole extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    
+	@ApiModelProperty("菜单sid")
+    private String menuSid;
+    
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysmenurole/SysMenuRoleDto.java

@@ -0,0 +1,32 @@
+package com.yxt.supervise.cyf.api.sysmenurole;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuRoleDto.java <br/>
+ * Class: SysMenuRoleDto <br/>
+ * Description: 菜单与角色关联表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单与角色关联表 数据传输对象", description = "菜单与角色关联表 数据传输对象")
+@Data
+public class SysMenuRoleDto implements Dto {
+
+    
+	@ApiModelProperty("菜单sid")
+    private String menuSid;
+    
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysmenurole/SysMenuRoleQuery.java

@@ -0,0 +1,40 @@
+package com.yxt.supervise.cyf.api.sysmenurole;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuRoleQuery.java <br/>
+ * Class: SysMenuRoleQuery <br/>
+ * Description: 菜单与角色关联表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单与角色关联表 查询条件", description = "菜单与角色关联表 查询条件")
+@Data
+public class SysMenuRoleQuery implements Query {
+
+    
+	@ApiModelProperty("菜单sid")
+    private String menuSid;
+    
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+	@ApiModelProperty("多个角色sid计集合")
+    private List<String> roleSids;
+	@ApiModelProperty("资源sid")
+    private String sourceSid;
+    @ApiModelProperty("是否是系统管理员")
+    private String isAdmin;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysmenurole/SysMenuRoleVo.java

@@ -0,0 +1,56 @@
+package com.yxt.supervise.cyf.api.sysmenurole;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuRoleVo.java <br/>
+ * Class: SysMenuRoleVo <br/>
+ * Description: 菜单与角色关联表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单与角色关联表 视图数据对象", description = "菜单与角色关联表 视图数据对象")
+@Data
+public class SysMenuRoleVo implements Vo {
+
+    
+	@ApiModelProperty("菜单sid")
+    private String menuSid;
+    
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+	@ApiModelProperty("菜单父级sid")
+    private String pSid;
+	@ApiModelProperty("menusid")
+    private String sid;
+	@ApiModelProperty("menuUrl")
+    private String menuUrl;
+    @ApiModelProperty("menuName")
+    private String menuName;
+    @ApiModelProperty("pageUrl")
+    private String pageUrl;
+    @ApiModelProperty("iconUrl")
+    private String iconUrl;
+    @ApiModelProperty("isShow")
+    private String isShow;
+    @ApiModelProperty("alwaysShow")
+    private Integer alwaysShow;
+    @ApiModelProperty("pageUrlRedirect")
+    private String pageUrlRedirect;
+    @ApiModelProperty("pageAliasName")
+    private String pageAliasName;
+    @ApiModelProperty("pageName")
+    private String pageName;
+    @ApiModelProperty("remarks")
+    private String remarks;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysorganization/AppContactSysOrganizationVo.java

@@ -0,0 +1,40 @@
+package com.yxt.supervise.cyf.api.sysorganization;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author liuguohui
+ * @Date 2021/9/24
+ */
+@ApiModel(value = "App通讯录组织架构")
+@Data
+public class AppContactSysOrganizationVo implements Vo {
+
+    @ApiModelProperty("部门/组织sid")
+    private String sid;
+
+    @ApiModelProperty("部门/组织名称|员工姓名")
+    private String name;
+
+    @ApiModelProperty("员工数量")
+    private int staffNum;
+
+    @ApiModelProperty("跳转类型：1、部门2、员工列表")
+    private Integer type;
+
+    @ApiModelProperty("员工电话")
+    private String mobile;
+
+    @ApiModelProperty("员工头像")
+    private String headImage;
+
+    @ApiModelProperty("员工所在部门名称（路径）")
+    private String orgNamePath;
+
+    @ApiModelProperty("员工职位")
+    private String position;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysorganization/QrCodeVo.java

@@ -0,0 +1,23 @@
+package com.yxt.supervise.cyf.api.sysorganization;
+
+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;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysorganization/SysOrgListVo.java

@@ -0,0 +1,29 @@
+package com.yxt.supervise.cyf.api.sysorganization;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/2/14 11:45
+ * @Description 员工所在部门下拉列表
+ */
+@Data
+public class SysOrgListVo implements Vo {
+    private static final long serialVersionUID = -3558876605554852892L;
+
+    @ApiModelProperty(value = "组织名称")
+    private String name;
+    @ApiModelProperty(value = "部门编码")
+    private String orgCode;
+    @ApiModelProperty(value = "sid")
+    private String sid;
+    @ApiModelProperty(value = "上级sid")
+    private String psid;
+    @ApiModelProperty(value = "orgSidPath")
+    private String orgSidPath;
+    private List<SysOrgVo> children;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysorganization/SysOrgStaffVo.java

@@ -0,0 +1,17 @@
+package com.yxt.supervise.cyf.api.sysorganization;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/26 11:48
+ * @Description
+ */
+@Data
+public class SysOrgStaffVo implements Vo {
+    private static final long serialVersionUID = -4311553944345419092L;
+
+    private String staffName;
+    private String staffSid;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysorganization/SysOrgVo.java

@@ -0,0 +1,31 @@
+package com.yxt.supervise.cyf.api.sysorganization;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2021/10/12 20:55
+ * @description
+ */
+@Data
+public class SysOrgVo implements Vo {
+    private static final long serialVersionUID = 2983637708030419942L;
+    @ApiModelProperty(value = "组织名称")
+    private String name;
+    @ApiModelProperty(value = "sid")
+    private String sid;
+    @ApiModelProperty(value = "psid")
+    private String psid;
+    @ApiModelProperty(value = "id")
+    private String id;
+    @ApiModelProperty(value = "orgSidPath")
+    private String orgSidPath;
+    @ApiModelProperty(value = "部门编码")
+    private String orgCode;
+
+    private List<SysOrgVo> children;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysorganization/SysOrganization.java

@@ -0,0 +1,87 @@
+package com.yxt.supervise.cyf.api.sysorganization;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysOrganization.java <br/>
+ * Class: SysOrganization <br/>
+ * Description: 组织机构表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "组织机构表", description = "组织机构表")
+@TableName("sys_organization")
+@Data
+public class SysOrganization extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+
+	@ApiModelProperty("部门/组织名称")
+    private String name;
+
+	@ApiModelProperty("父(部门/组织) sid")
+    private String psid;
+
+	@ApiModelProperty("联系电话")
+    private String linkPhone;
+	@ApiModelProperty("联系人")
+    private String linkPerson;
+
+	@ApiModelProperty("部门sid全路径")
+    private String orgSidPath;
+
+	@ApiModelProperty("排序")
+    private Integer sort;
+
+	@ApiModelProperty("地址")
+    private String addrs;
+
+	@ApiModelProperty("地理位置经纬度")
+    private String jwd;
+
+	@ApiModelProperty("二维码")
+    private String qrText;
+
+	@ApiModelProperty("限制本部门成员查看通讯录:限制开启后，本部门成员只能看到限定范围内的通讯录不能看到所有通讯录，仅可见自己")
+    private Integer limitOrgMember;
+
+	@ApiModelProperty("部门编码")
+    private String orgCode;
+
+    @ApiModelProperty("部门简称（地区简称+门店名称首字母（遇到首字母重复时用2个字母））")
+    private String orgShortName;
+
+    @ApiModelProperty("销售区域划分(本店终端销售：0,门店对应业务区域划分销售：1至9,具体编号划分各门店报备确定)")
+    private String regionDivision;
+
+    @ApiModelProperty("是否是部门(0否，1是)")
+    private Integer isDept;
+
+    @ApiModelProperty("组织简称")
+    private String orgAbbre;
+
+    @ApiModelProperty("组织属性key")
+    private String orgAttributeKey;
+
+    @ApiModelProperty("组织属性value")
+    private String orgAttributeValue;
+
+    @ApiModelProperty("管理层级key")
+    private String orgLevelKey;
+
+    @ApiModelProperty("管理层级value")
+    private String orgLevelValue;
+
+    @ApiModelProperty("其他编码")
+    private String otherCode;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysorganization/SysOrganizationDto.java

@@ -0,0 +1,92 @@
+package com.yxt.supervise.cyf.api.sysorganization;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysOrganizationDto.java <br/>
+ * Class: SysOrganizationDto <br/>
+ * Description: 组织机构表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "组织机构表 数据传输对象", description = "组织机构表 数据传输对象")
+@Data
+public class SysOrganizationDto implements Dto {
+
+    private String sid;
+    private String id;
+	@ApiModelProperty("部门/组织名称")
+    private String name;
+    
+	@ApiModelProperty("父(部门/组织) sid")
+    private String psid;
+    
+	@ApiModelProperty("联系电话")
+    private String linkPhone;
+	@ApiModelProperty("联系人")
+    private String linkPerson;
+
+	@ApiModelProperty("部门sid全路径")
+    private String orgSidPath;
+    
+	@ApiModelProperty("排序")
+    private Integer sort;
+    
+	@ApiModelProperty("地址")
+    private String addrs;
+    
+	@ApiModelProperty("地理位置经纬度")
+    private String jwd;
+    
+	@ApiModelProperty("二维码")
+    private String qrText;
+    
+	@ApiModelProperty("限制本部门成员查看通讯录:限制开启后，本部门成员只能看到限定范围内的通讯录不能看到所有通讯录，仅可见自己")
+    private Integer limitOrgMember;
+    
+	@ApiModelProperty("部门编码")
+    private String orgCode;
+
+    @ApiModelProperty("部门简称（地区简称+门店名称首字母（遇到首字母重复时用2个字母））")
+    private String orgShortName;
+
+    @ApiModelProperty("销售区域划分(本店终端销售：0,门店对应业务区域划分销售：1至9,具体编号划分各门店报备确定)")
+    private String regionDivision;
+
+	@ApiModelProperty("主管人员sid")
+    private String zgStaffSid;
+
+	@ApiModelProperty("分管人员sid")
+    private String fgStaffSid;
+
+    @ApiModelProperty("组织简称")
+    private String orgAbbre;
+
+    @ApiModelProperty("是否是部门(0否，1是)")
+    private Integer isDept;
+
+    @ApiModelProperty("组织属性key")
+    private String orgAttributeKey;
+
+    @ApiModelProperty("组织属性value")
+    private String orgAttributeValue;
+
+    @ApiModelProperty("管理层级key")
+    private String orgLevelKey;
+
+    @ApiModelProperty("管理层级value")
+    private String orgLevelValue;
+
+    @ApiModelProperty("其他编码")
+    private String otherCode;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysorganization/SysOrganizationListQuery.java

@@ -0,0 +1,16 @@
+package com.yxt.supervise.cyf.api.sysorganization;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/26 11:49
+ * @Description
+ */
+@Data
+public class SysOrganizationListQuery implements Query {
+    private static final long serialVersionUID = 8657016527420117948L;
+
+    private String userSid;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysorganization/SysOrganizationListVo.java

@@ -0,0 +1,23 @@
+package com.yxt.supervise.cyf.api.sysorganization;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/26 11:42
+ * @Description
+ */
+@Data
+public class SysOrganizationListVo implements Vo {
+    private static final long serialVersionUID = -3709239161608411765L;
+
+    private String orgDeptSid;
+    private String orgDeptName;
+
+    private List<SysOrgStaffVo> staffinfoVoList;
+
+
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysorganization/SysOrganizationListsVo.java

@@ -0,0 +1,17 @@
+package com.yxt.supervise.cyf.api.sysorganization;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/30 11:28
+ * @Description
+ */
+@Data
+public class SysOrganizationListsVo implements Vo {
+    private static final long serialVersionUID = -7021974833444298712L;
+
+    private String orgDeptSid;
+    private String orgDeptName;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysorganization/SysOrganizationQuery.java

@@ -0,0 +1,58 @@
+package com.yxt.supervise.cyf.api.sysorganization;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysOrganizationQuery.java <br/>
+ * Class: SysOrganizationQuery <br/>
+ * Description: 组织机构表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "组织机构表 查询条件", description = "组织机构表 查询条件")
+@Data
+public class SysOrganizationQuery implements Query {
+
+    
+	@ApiModelProperty("部门/组织名称")
+    private String name;
+    
+	@ApiModelProperty("父(部门/组织) sid")
+    private String psid;
+    
+	@ApiModelProperty("联系电话")
+    private String linkPhone;
+	@ApiModelProperty("联系人")
+    private String linkPerson;
+
+	@ApiModelProperty("部门sid全路径")
+    private String orgSidPath;
+    
+	@ApiModelProperty("排序")
+    private Integer sort;
+    
+	@ApiModelProperty("地址")
+    private String addrs;
+    
+	@ApiModelProperty("地理位置经纬度")
+    private String jwd;
+    
+	@ApiModelProperty("二维码")
+    private String qrText;
+    
+	@ApiModelProperty("限制本部门成员查看通讯录:限制开启后，本部门成员只能看到限定范围内的通讯录不能看到所有通讯录，仅可见自己")
+    private Integer limitOrgMember;
+    
+	@ApiModelProperty("部门编码")
+    private String orgCode;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysorganization/SysOrganizationVo.java

@@ -0,0 +1,86 @@
+package com.yxt.supervise.cyf.api.sysorganization;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysOrganizationVo.java <br/>
+ * Class: SysOrganizationVo <br/>
+ * Description: 组织机构表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "组织机构表 视图数据对象", description = "组织机构表 视图数据对象")
+@Data
+public class SysOrganizationVo implements Vo {
+    @ApiModelProperty("部门/组织名称")
+    private String name;
+    
+	@ApiModelProperty("父(部门/组织) sid")
+    private String psid;
+    
+	@ApiModelProperty("联系电话")
+    private String linkPhone;
+
+	@ApiModelProperty("联系人")
+    private String linkPerson;
+
+	@ApiModelProperty("部门sid全路径")
+    private String orgSidPath;
+    
+	@ApiModelProperty("排序")
+    private Integer sort;
+    
+	@ApiModelProperty("地址")
+    private String addrs;
+    
+	@ApiModelProperty("地理位置经纬度")
+    private String jwd;
+    
+	@ApiModelProperty("二维码")
+    private String qrText;
+    
+	@ApiModelProperty("限制本部门成员查看通讯录:限制开启后，本部门成员只能看到限定范围内的通讯录不能看到所有通讯录，仅可见自己")
+    private Integer limitOrgMember;
+    
+	@ApiModelProperty("部门编码")
+    private String orgCode;
+	@ApiModelProperty("sid")
+    private String sid;
+    @ApiModelProperty("子集")
+	private List<SysOrganizationVo> children = new ArrayList<>();
+    @ApiModelProperty("主管人员名称")
+    private String zgNames;
+    @ApiModelProperty("分管人员名称")
+    private String fgNames;
+    @ApiModelProperty("主管人员sid")
+    private String zgStaffSid;
+    @ApiModelProperty("分管人员sid")
+    private String fgStaffSid;
+    @ApiModelProperty("组织简称")
+    private String orgAbbre;
+    @ApiModelProperty("是否是部门(0否，1是)")
+    private Integer isDept;
+    @ApiModelProperty("组织属性key")
+    private String orgAttributeKey;
+    @ApiModelProperty("组织属性value")
+    private String orgAttributeValue;
+    @ApiModelProperty("管理层级key")
+    private String orgLevelKey;
+    @ApiModelProperty("管理层级value")
+    private String orgLevelValue;
+    @ApiModelProperty("其他编码")
+    private String otherCode;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/syspost/SysPost.java

@@ -0,0 +1,46 @@
+package com.yxt.supervise.cyf.api.syspost;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysPost.java <br/>
+ * Class: SysPost <br/>
+ * Description: 岗位. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "岗位", description = "岗位")
+@TableName("sys_post")
+@Data
+public class SysPost extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty("岗位名称")
+    private String name;
+
+    @ApiModelProperty("职级key")
+    private String postLevelKey;
+
+    @ApiModelProperty("职级")
+    private String postLevel;
+
+    @ApiModelProperty("岗位编码")
+    private String postCode;
+
+    @ApiModelProperty("所属部门sid")
+    private String orgSid;
+
+    @ApiModelProperty(value = "父级sid")
+    private String parentSid;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/syspost/SysPostDto.java

@@ -0,0 +1,44 @@
+package com.yxt.supervise.cyf.api.syspost;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysPostDto.java <br/>
+ * Class: SysPostDto <br/>
+ * Description: 岗位 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "岗位 数据传输对象", description = "岗位 数据传输对象")
+@Data
+public class SysPostDto implements Dto {
+
+    private static final long serialVersionUID = 863876947510030464L;
+    @ApiModelProperty("岗位名称")
+    private String name;
+
+    @ApiModelProperty("职级key")
+    private String postLevelKey;
+
+    @ApiModelProperty("职级")
+    private String postLevel;
+
+    @ApiModelProperty("岗位编码")
+    private String postCode;
+
+    @ApiModelProperty("所属部门sid")
+    private String orgSid;
+
+    @ApiModelProperty(value = "父级sid", example = "0")
+    private String parentSid;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/syspost/SysPostListVo.java

@@ -0,0 +1,22 @@
+package com.yxt.supervise.cyf.api.syspost;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/2/14 13:49
+ * @Description 部门下的岗位信息
+ */
+@Data
+public class SysPostListVo implements Vo {
+    private static final long serialVersionUID = -8060032905868283959L;
+
+    @ApiModelProperty("岗位名称")
+    private String name;
+    @ApiModelProperty("岗位编码")
+    private String postCode;
+    @ApiModelProperty("岗位sid")
+    private String sid;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/syspost/SysPostQuery.java

@@ -0,0 +1,41 @@
+package com.yxt.supervise.cyf.api.syspost;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysPostQuery.java <br/>
+ * Class: SysPostQuery <br/>
+ * Description: 岗位 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "岗位 查询条件", description = "岗位 查询条件")
+@Data
+public class SysPostQuery implements Query {
+
+    
+	@ApiModelProperty("岗位名称")
+    private String name;
+
+    @ApiModelProperty("职级key")
+    private String postLevelKey;
+
+    @ApiModelProperty("职级")
+    private String postLevel;
+
+    @ApiModelProperty("岗位编码")
+    private String postCode;
+    
+	@ApiModelProperty("所属部门sid")
+    private String orgSid;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/syspost/SysPostVo.java

@@ -0,0 +1,52 @@
+package com.yxt.supervise.cyf.api.syspost;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysPostVo.java <br/>
+ * Class: SysPostVo <br/>
+ * Description: 岗位 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "岗位 视图数据对象", description = "岗位 视图数据对象")
+@Data
+public class SysPostVo implements Vo {
+
+    
+	@ApiModelProperty("岗位名称")
+    private String name;
+
+    @ApiModelProperty("职级key")
+    private String postLevelKey;
+
+    @ApiModelProperty("职级")
+    private String postLevel;
+
+    @ApiModelProperty("岗位编码")
+    private String postCode;
+    
+	@ApiModelProperty("所属部门sid")
+    private String orgSid;
+
+	@ApiModelProperty("所属部门名称")
+    private String orgName;
+
+    @ApiModelProperty("岗位sid")
+    private String sid;
+
+    @ApiModelProperty(value = "上级岗位名称")
+    private String parentName;
+    @ApiModelProperty(value = "上级岗位sid")
+    private String parentSid;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysrole/SysRole.java

@@ -0,0 +1,39 @@
+package com.yxt.supervise.cyf.api.sysrole;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/8 14:06
+ */
+@ApiModel(value = "角色表", description = "角色表")
+@TableName("sys_role")
+@Data
+public class SysRole extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty("角色名称")
+    private String name;
+
+    @ApiModelProperty("排序")
+    private Integer sort;
+
+    @ApiModelProperty("编码")
+    private String code;
+
+    @ApiModelProperty("1、系统管理员、2、普通角色")
+    private Integer type;
+
+    @ApiModelProperty("岗位sid")
+    private String postSid;
+
+    @ApiModelProperty(value = "角色组织层级key")
+    private String roleType;
+    @ApiModelProperty(value = "角色组织层级value")
+    private String roleTypeValue;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysrole/SysRoleDto.java

@@ -0,0 +1,39 @@
+package com.yxt.supervise.cyf.api.sysrole;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/8 14:07
+ */
+@ApiModel(value = "角色表 数据传输对象", description = "角色表 数据传输对象")
+@Data
+public class SysRoleDto implements Dto {
+    @ApiModelProperty("角色名称")
+    private String name;
+
+    @ApiModelProperty("排序")
+    private Integer sort;
+
+    @ApiModelProperty("编码")
+    private String code;
+    @ApiModelProperty("备注")
+    private String remarks;
+
+    @ApiModelProperty("1、系统管理员、2、普通角色")
+    private Integer type;
+
+    @ApiModelProperty("岗位sid")
+    private String postSid;
+
+    @ApiModelProperty("岗位名称")
+    private String postName;
+
+    @ApiModelProperty(value = "角色组织层级key")
+    private String roleType;
+    @ApiModelProperty(value = "角色组织层级value")
+    private String roleTypeValue;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysrole/SysRoleQuery.java

@@ -0,0 +1,39 @@
+package com.yxt.supervise.cyf.api.sysrole;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/8 14:12
+ */
+@ApiModel(value = "角色表 查询条件", description = "角色表 查询条件")
+@Data
+public class SysRoleQuery implements Query {
+    @ApiModelProperty("角色名称")
+    private String name;
+
+    @ApiModelProperty("排序")
+    private Integer sort;
+
+    @ApiModelProperty("编码")
+    private String code;
+    @ApiModelProperty("备注")
+    private String remarks;
+
+    @ApiModelProperty("1、系统管理员、2、普通角色")
+    private Integer type;
+
+    @ApiModelProperty("岗位sid")
+    private String postSid;
+
+    @ApiModelProperty("岗位名称")
+    private String postName;
+
+    @ApiModelProperty(value = "角色组织层级key")
+    private String roleType;
+    @ApiModelProperty(value = "角色组织层级value")
+    private String roleTypeValue;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysrole/SysRoleVo.java

@@ -0,0 +1,37 @@
+package com.yxt.supervise.cyf.api.sysrole;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/8 14:07
+ */
+@ApiModel(value = "角色表 视图数据对象", description = "角色表 视图数据对象")
+@Data
+public class SysRoleVo implements Vo {
+    @ApiModelProperty("角色名称")
+    private String name;
+    @ApiModelProperty("排序")
+    private Integer sort;
+    @ApiModelProperty("编码")
+    private String code;
+    @ApiModelProperty("1、系统管理员、2、普通角色")
+    private Integer type;
+    @ApiModelProperty("角色sid")
+    private String sid;
+    @ApiModelProperty("说明")
+    private String remarks;
+    @ApiModelProperty("是否选中，1：未选中,0：选中")
+    private String checked;
+    @ApiModelProperty("是否可用")
+    private String isEnable;
+    @ApiModelProperty("岗位sid")
+    private String postSid;
+    @ApiModelProperty("岗位名称")
+    private String postName;
+    @ApiModelProperty(value = "组织层级")
+    private String roleTypeValue;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysrolefunction/SysRoleFunction.java

@@ -0,0 +1,34 @@
+package com.yxt.supervise.cyf.api.sysrolefunction;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysRoleFunction.java <br/>
+ * Class: SysRoleFunction <br/>
+ * Description: 角色与功能关联表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "角色与功能关联表", description = "角色与功能关联表")
+@TableName("sys_role_function")
+@Data
+public class SysRoleFunction extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+    
+	@ApiModelProperty("功能sid")
+    private String functionSid;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysrolefunction/SysRoleFunctionDto.java

@@ -0,0 +1,32 @@
+package com.yxt.supervise.cyf.api.sysrolefunction;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysRoleFunctionDto.java <br/>
+ * Class: SysRoleFunctionDto <br/>
+ * Description: 角色与功能关联表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "角色与功能关联表 数据传输对象", description = "角色与功能关联表 数据传输对象")
+@Data
+public class SysRoleFunctionDto implements Dto {
+
+    
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+    
+	@ApiModelProperty("功能sid")
+    private String functionSid;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysrolefunction/SysRoleFunctionQuery.java

@@ -0,0 +1,32 @@
+package com.yxt.supervise.cyf.api.sysrolefunction;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysRoleFunctionQuery.java <br/>
+ * Class: SysRoleFunctionQuery <br/>
+ * Description: 角色与功能关联表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "角色与功能关联表 查询条件", description = "角色与功能关联表 查询条件")
+@Data
+public class SysRoleFunctionQuery implements Query {
+
+    
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+    
+	@ApiModelProperty("功能sid")
+    private String functionSid;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysrolefunction/SysRoleFunctionVo.java

@@ -0,0 +1,32 @@
+package com.yxt.supervise.cyf.api.sysrolefunction;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysRoleFunctionVo.java <br/>
+ * Class: SysRoleFunctionVo <br/>
+ * Description: 角色与功能关联表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "角色与功能关联表 视图数据对象", description = "角色与功能关联表 视图数据对象")
+@Data
+public class SysRoleFunctionVo implements Vo {
+
+    
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+    
+	@ApiModelProperty("功能sid")
+    private String functionSid;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/syssource/SysSource.java

@@ -0,0 +1,76 @@
+package com.yxt.supervise.cyf.api.syssource;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysSource.java <br/>
+ * Class: SysSource <br/>
+ * Description: 资源表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "资源表", description = "资源表")
+@TableName("sys_source")
+@Data
+public class SysSource extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    
+	@ApiModelProperty("父资源sid")
+    private String pSid;
+    
+	@ApiModelProperty("资源ID（对应微服务的名称）")
+    private String sourceId;
+    
+	@ApiModelProperty("资源名称（业务模块名称）")
+    private String sourceName;
+    
+	@ApiModelProperty("web页面的url（平台中业务模块跳转地址）")
+    private String pageUrl;
+    
+	@ApiModelProperty("菜单图标地址")
+    private String iconUrl;
+    
+	@ApiModelProperty("资源图标背景颜色")
+    private String iconBgColor;
+    
+	@ApiModelProperty("资源url标识")
+    private String urlSign;
+    
+	@ApiModelProperty("排序号")
+    private Integer sortNo;
+    
+	@ApiModelProperty("资源类别（0.内置Activity  1.内置WebView  2.RePlugin插件  3.原生apk 4.We页面）")
+    private Integer sourceType;
+    
+	@ApiModelProperty("模块的版本（type = 2，3有），移动端专用")
+    private String ver;
+    
+	@ApiModelProperty("apk下载地址（type = 2，3有），移动端专用")
+    private String sourceUrl;
+    
+	@ApiModelProperty("模块的包名，移动端专用")
+    private String sourcePackage;
+    
+	@ApiModelProperty("启动模块的动作(0.启动Activity的包名+类名 1.html地址 2.启动Activity的包名+类名 3.intent-action )，移动端专用")
+    private String sourceAction;
+    
+	@ApiModelProperty("需要用到的json拼接(由目标模块 自行解析)，其他参数")
+    private String sourceExtra;
+    
+	@ApiModelProperty("提示数量(没有返回0即可)")
+    private String noticeNum;
+    
+	@ApiModelProperty("RePlugin插件名称(type = 2有)，移动端专用")
+    private String modulePluginName;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/syssource/SysSourceDto.java

@@ -0,0 +1,76 @@
+package com.yxt.supervise.cyf.api.syssource;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysSourceDto.java <br/>
+ * Class: SysSourceDto <br/>
+ * Description: 资源表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "资源表 数据传输对象", description = "资源表 数据传输对象")
+@Data
+public class SysSourceDto implements Dto {
+
+    
+	@ApiModelProperty("父资源sid")
+    private String pSid;
+    
+	@ApiModelProperty("资源ID（对应微服务的名称）")
+    private String sourceId;
+    
+	@ApiModelProperty("资源名称（业务模块名称）")
+    private String sourceName;
+    
+	@ApiModelProperty("web页面的url（平台中业务模块跳转地址）")
+    private String pageUrl;
+    
+	@ApiModelProperty("菜单图标地址")
+    private String iconUrl;
+    
+	@ApiModelProperty("资源图标背景颜色")
+    private String iconBgColor;
+    
+	@ApiModelProperty("资源url标识")
+    private String urlSign;
+    
+	@ApiModelProperty("排序号")
+    private Integer sortNo;
+    
+	@ApiModelProperty("资源类别（0.内置Activity  1.内置WebView  2.RePlugin插件  3.原生apk 4.We页面）")
+    private Integer sourceType;
+    
+	@ApiModelProperty("模块的版本（type = 2，3有），移动端专用")
+    private String ver;
+    
+	@ApiModelProperty("apk下载地址（type = 2，3有），移动端专用")
+    private String sourceUrl;
+    
+	@ApiModelProperty("模块的包名，移动端专用")
+    private String sourcePackage;
+    
+	@ApiModelProperty("启动模块的动作(0.启动Activity的包名+类名 1.html地址 2.启动Activity的包名+类名 3.intent-action )，移动端专用")
+    private String sourceAction;
+    
+	@ApiModelProperty("需要用到的json拼接(由目标模块 自行解析)，其他参数")
+    private String sourceExtra;
+    
+	@ApiModelProperty("提示数量(没有返回0即可)")
+    private String noticeNum;
+	@ApiModelProperty("RePlugin插件名称(type = 2有)，移动端专用")
+    private String modulePluginName;
+	@ApiModelProperty("描述")
+    private String remarks;
+
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/syssource/SysSourceQuery.java

@@ -0,0 +1,78 @@
+package com.yxt.supervise.cyf.api.syssource;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysSourceQuery.java <br/>
+ * Class: SysSourceQuery <br/>
+ * Description: 资源表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "资源表 查询条件", description = "资源表 查询条件")
+@Data
+public class SysSourceQuery implements Query {
+
+    
+	@ApiModelProperty("父资源sid")
+    private String pSid;
+    
+	@ApiModelProperty("资源ID（对应微服务的名称）")
+    private String sourceId;
+    
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+
+	@ApiModelProperty("资源名称（业务模块名称）")
+    private String sourceName;
+    
+	@ApiModelProperty("web页面的url（平台中业务模块跳转地址）")
+    private String pageUrl;
+    
+	@ApiModelProperty("菜单图标地址")
+    private String iconUrl;
+    
+	@ApiModelProperty("资源图标背景颜色")
+    private String iconBgColor;
+    
+	@ApiModelProperty("资源url标识")
+    private String urlSign;
+    
+	@ApiModelProperty("排序号")
+    private Integer sortNo;
+    
+	@ApiModelProperty("资源类别（0.内置Activity  1.内置WebView  2.RePlugin插件  3.原生apk 4.We页面）")
+    private Integer sourceType;
+    
+	@ApiModelProperty("模块的版本（type = 2，3有），移动端专用")
+    private String ver;
+    
+	@ApiModelProperty("apk下载地址（type = 2，3有），移动端专用")
+    private String sourceUrl;
+    
+	@ApiModelProperty("模块的包名，移动端专用")
+    private String sourcePackage;
+    
+	@ApiModelProperty("启动模块的动作(0.启动Activity的包名+类名 1.html地址 2.启动Activity的包名+类名 3.intent-action )，移动端专用")
+    private String sourceAction;
+    
+	@ApiModelProperty("需要用到的json拼接(由目标模块 自行解析)，其他参数")
+    private String sourceExtra;
+    
+	@ApiModelProperty("提示数量(没有返回0即可)")
+    private String noticeNum;
+    
+	@ApiModelProperty("RePlugin插件名称(type = 2有)，移动端专用")
+    private String modulePluginName;
+
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/syssource/SysSourceVo.java

@@ -0,0 +1,85 @@
+package com.yxt.supervise.cyf.api.syssource;
+
+
+import com.yxt.common.core.vo.Vo;
+import com.yxt.supervise.cyf.api.sysmenu.SysMenuVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysSourceVo.java <br/>
+ * Class: SysSourceVo <br/>
+ * Description: 资源表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "资源表 视图数据对象", description = "资源表 视图数据对象")
+@Data
+public class SysSourceVo implements Vo {
+
+    
+	@ApiModelProperty("父资源sid")
+    private String pSid;
+    
+	@ApiModelProperty("资源ID（对应微服务的名称）")
+    private String sourceId;
+    
+	@ApiModelProperty("资源名称（业务模块名称）")
+    private String sourceName;
+    
+	@ApiModelProperty("web页面的url（平台中业务模块跳转地址）")
+    private String pageUrl;
+    
+	@ApiModelProperty("菜单图标地址")
+    private String iconUrl;
+    
+	@ApiModelProperty("资源图标背景颜色")
+    private String iconBgColor;
+    
+	@ApiModelProperty("资源url标识")
+    private String urlSign;
+    
+	@ApiModelProperty("排序号")
+    private Integer sortNo;
+    
+	@ApiModelProperty("资源类别（0.内置Activity  1.内置WebView  2.RePlugin插件  3.原生apk 4.We页面）")
+    private Integer sourceType;
+    
+	@ApiModelProperty("模块的版本（type = 2，3有），移动端专用")
+    private String ver;
+    
+	@ApiModelProperty("apk下载地址（type = 2，3有），移动端专用")
+    private String sourceUrl;
+    
+	@ApiModelProperty("模块的包名，移动端专用")
+    private String sourcePackage;
+    
+	@ApiModelProperty("启动模块的动作(0.启动Activity的包名+类名 1.html地址 2.启动Activity的包名+类名 3.intent-action )，移动端专用")
+    private String sourceAction;
+    
+	@ApiModelProperty("需要用到的json拼接(由目标模块 自行解析)，其他参数")
+    private String sourceExtra;
+    
+	@ApiModelProperty("提示数量(没有返回0即可)")
+    private String noticeNum;
+    
+	@ApiModelProperty("RePlugin插件名称(type = 2有)，移动端专用")
+    private String modulePluginName;
+	@ApiModelProperty("sid")
+    private String sid;
+    @ApiModelProperty("是否选中 1没有选中，0选中")
+    private String checked;
+    @ApiModelProperty("描述")
+    private String remarks;
+    @ApiModelProperty("菜单集合")
+    private List<SysMenuVo> children;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/syssourcefunction/SysSourceFunction.java

@@ -0,0 +1,34 @@
+package com.yxt.supervise.cyf.api.syssourcefunction;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysSourceFunction.java <br/>
+ * Class: SysSourceFunction <br/>
+ * Description: 资源与功能关联表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "资源与功能关联表", description = "资源与功能关联表")
+@TableName("sys_source_function")
+@Data
+public class SysSourceFunction extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+	@ApiModelProperty("功能sid")
+    private String functionSid;
+	@ApiModelProperty("资源sid")
+    private String sourceSid;
+    @ApiModelProperty("功能根目录sid")
+    private String functionRootSid;
+}
+

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/syssourcefunction/SysSourceFunctionDto.java

@@ -0,0 +1,32 @@
+package com.yxt.supervise.cyf.api.syssourcefunction;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysSourceFunctionDto.java <br/>
+ * Class: SysSourceFunctionDto <br/>
+ * Description: 资源与功能关联表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "资源与功能关联表 数据传输对象", description = "资源与功能关联表 数据传输对象")
+@Data
+public class SysSourceFunctionDto implements Dto {
+
+    
+	@ApiModelProperty("功能sid")
+    private String functionSid;
+    
+	@ApiModelProperty("资源sid")
+    private String sourceSid;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/syssourcefunction/SysSourceFunctionQuery.java

@@ -0,0 +1,32 @@
+package com.yxt.supervise.cyf.api.syssourcefunction;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysSourceFunctionQuery.java <br/>
+ * Class: SysSourceFunctionQuery <br/>
+ * Description: 资源与功能关联表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "资源与功能关联表 查询条件", description = "资源与功能关联表 查询条件")
+@Data
+public class SysSourceFunctionQuery implements Query {
+
+    
+	@ApiModelProperty("功能sid")
+    private String functionSid;
+    
+	@ApiModelProperty("资源sid")
+    private String sourceSid;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/syssourcefunction/SysSourceFunctionVo.java

@@ -0,0 +1,32 @@
+package com.yxt.supervise.cyf.api.syssourcefunction;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysSourceFunctionVo.java <br/>
+ * Class: SysSourceFunctionVo <br/>
+ * Description: 资源与功能关联表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "资源与功能关联表 视图数据对象", description = "资源与功能关联表 视图数据对象")
+@Data
+public class SysSourceFunctionVo implements Vo {
+
+    
+	@ApiModelProperty("功能sid")
+    private String functionSid;
+    
+	@ApiModelProperty("资源sid")
+    private String sourceSid;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/syssourcemenu/SysSourceMenu.java

@@ -0,0 +1,33 @@
+package com.yxt.supervise.cyf.api.syssourcemenu;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuRole.java <br/>
+ * Class: SysMenuRole <br/>
+ * Description: 菜单与资源关联表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单与资源关联表", description = "菜单与资源关联表")
+@TableName("sys_source_menu")
+@Data
+public class SysSourceMenu extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+	@ApiModelProperty("菜单sid")
+    private String menuSid;
+	@ApiModelProperty("资源sid")
+    private String sourceSid;
+	@ApiModelProperty("菜单根目录sid")
+    private String menuRootSid;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/syssourcemenu/SysSourceMenuDto.java

@@ -0,0 +1,32 @@
+package com.yxt.supervise.cyf.api.syssourcemenu;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuRoleDto.java <br/>
+ * Class: SysMenuRoleDto <br/>
+ * Description: 菜单与资源关联表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单与资源关联表 数据传输对象", description = "菜单与资源关联表 数据传输对象")
+@Data
+public class SysSourceMenuDto implements Dto {
+
+    
+	@ApiModelProperty("菜单sid")
+    private String menuSid;
+    
+	@ApiModelProperty("资源sid")
+    private String sourceSid;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/syssourcemenu/SysSourceMenuQuery.java

@@ -0,0 +1,32 @@
+package com.yxt.supervise.cyf.api.syssourcemenu;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuRoleQuery.java <br/>
+ * Class: SysMenuRoleQuery <br/>
+ * Description: 菜单与资源关联表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单与资源关联表 查询条件", description = "菜单与资源关联表 查询条件")
+@Data
+public class SysSourceMenuQuery implements Query {
+
+    
+	@ApiModelProperty("菜单sid")
+    private String menuSid;
+    
+	@ApiModelProperty("资源sid")
+    private String sourceSid;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/syssourcemenu/SysSourceMenuVo.java

@@ -0,0 +1,36 @@
+package com.yxt.supervise.cyf.api.syssourcemenu;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuRoleVo.java <br/>
+ * Class: SysMenuRoleVo <br/>
+ * Description: 菜单与资源关联表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单与资源关联表 视图数据对象", description = "菜单与资源关联表 视图数据对象")
+@Data
+public class SysSourceMenuVo implements Vo {
+
+    
+	@ApiModelProperty("菜单sid")
+    private String menuSid;
+    
+	@ApiModelProperty("资源sid")
+    private String sourceSid;
+
+
+    @ApiModelProperty("菜单根目录sid")
+    private String menuRootSid;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/syssourcerole/SysSourceRole.java

@@ -0,0 +1,34 @@
+package com.yxt.supervise.cyf.api.syssourcerole;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysSourceRole.java <br/>
+ * Class: SysSourceRole <br/>
+ * Description: 资源与角色的关联表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "资源与角色的关联表", description = "资源与角色的关联表")
+@TableName("sys_source_role")
+@Data
+public class SysSourceRole extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    
+	@ApiModelProperty("资源sid")
+    private String sorceSid;
+    
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/syssourcerole/SysSourceRoleDto.java

@@ -0,0 +1,32 @@
+package com.yxt.supervise.cyf.api.syssourcerole;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysSourceRoleDto.java <br/>
+ * Class: SysSourceRoleDto <br/>
+ * Description: 资源与角色的关联表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "资源与角色的关联表 数据传输对象", description = "资源与角色的关联表 数据传输对象")
+@Data
+public class SysSourceRoleDto implements Dto {
+
+    
+	@ApiModelProperty("资源sid")
+    private String sorceSid;
+    
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/syssourcerole/SysSourceRoleQuery.java

@@ -0,0 +1,32 @@
+package com.yxt.supervise.cyf.api.syssourcerole;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysSourceRoleQuery.java <br/>
+ * Class: SysSourceRoleQuery <br/>
+ * Description: 资源与角色的关联表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "资源与角色的关联表 查询条件", description = "资源与角色的关联表 查询条件")
+@Data
+public class SysSourceRoleQuery implements Query {
+
+    
+	@ApiModelProperty("资源sid")
+    private String sorceSid;
+    
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/syssourcerole/SysSourceRoleVo.java

@@ -0,0 +1,32 @@
+package com.yxt.supervise.cyf.api.syssourcerole;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysSourceRoleVo.java <br/>
+ * Class: SysSourceRoleVo <br/>
+ * Description: 资源与角色的关联表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "资源与角色的关联表 视图数据对象", description = "资源与角色的关联表 视图数据对象")
+@Data
+public class SysSourceRoleVo implements Vo {
+
+    
+	@ApiModelProperty("资源sid")
+    private String sorceSid;
+    
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysstaffinfo/AppContactsDetailsVo.java

@@ -0,0 +1,34 @@
+package com.yxt.supervise.cyf.api.sysstaffinfo;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author liuguohui
+ * @Date 2021/9/17
+ */
+@ApiModel(value = "App通讯录查看详情")
+@Data
+public class AppContactsDetailsVo implements Vo {
+
+//    @ApiModelProperty("人员sid")
+//    private String sid;
+
+    @ApiModelProperty("姓名")
+    private String name;
+
+    @ApiModelProperty("手机号")
+    private String mobile;
+
+    @ApiModelProperty("头像")
+    private String headImage;
+
+    @ApiModelProperty("部门名称（路径）")
+    private String orgNamePath;
+
+    @ApiModelProperty("职位")
+    private String position;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysstaffinfo/PcSysStaffQuery.java

@@ -0,0 +1,18 @@
+package com.yxt.supervise.cyf.api.sysstaffinfo;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/20 15:47
+ * @Description
+ */
+@Data
+public class PcSysStaffQuery implements Query {
+    private static final long serialVersionUID = 1858291601540877140L;
+    @ApiModelProperty(value = "业务员sid")
+    private String staffSid;
+
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysstaffinfo/PcSysStaffVo.java

@@ -0,0 +1,17 @@
+package com.yxt.supervise.cyf.api.sysstaffinfo;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/20 15:44
+ * @Description
+ */
+@Data
+public class PcSysStaffVo implements Vo {
+    private static final long serialVersionUID = -9042032921079833819L;
+
+    private String staffSid;
+    private String staffName;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysstaffinfo/SysStaffQuery.java

@@ -0,0 +1,30 @@
+package com.yxt.supervise.cyf.api.sysstaffinfo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/2/15 15:22
+ * @Description
+ */
+@Data
+public class SysStaffQuery implements Query {
+    private static final long serialVersionUID = -7345786610678948794L;
+
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty(value = "离职日期")
+    @NotNull(message = "离职日期不能为空")
+    private Date quitDate;
+    @ApiModelProperty(value = "离职原因")
+    @NotBlank(message = "离职原因不能为空")
+    private String quitReason;
+    @ApiModelProperty(value = "员工sid")
+    private String sid;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysstaffinfo/SysStaffinfo.java

@@ -0,0 +1,175 @@
+package com.yxt.supervise.cyf.api.sysstaffinfo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysStaffinfo.java <br/>
+ * Class: SysStaffinfo <br/>
+ * Description: 人员基础信息表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "人员基础信息表", description = "人员基础信息表")
+@TableName("sys_staffinfo")
+@Data
+public class SysStaffinfo extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("工号")
+    private String jobNumber;
+    @ApiModelProperty("姓名")
+    private String name;
+    @ApiModelProperty("性别key:1男，2女")
+    private Integer genderKey;
+    @ApiModelProperty(value = "性别")
+    private String gender;
+    @ApiModelProperty("身份证号")
+    private String idNo;
+    @ApiModelProperty("证件有效期")
+    private String idTerm;
+    @ApiModelProperty("生日")
+    private Date birthday;
+    @ApiModelProperty("民族")
+    private String national;
+    @ApiModelProperty(value = "民族key")
+    private String nationalKey;
+    @ApiModelProperty("籍贯")
+    private String nativePlace;
+    @ApiModelProperty(value = "省")
+    private String province;
+    @ApiModelProperty(value = "市")
+    private String city;
+    @ApiModelProperty(value = "县区")
+    private String county;
+    @ApiModelProperty(value = "省code")
+    private String provinceCode;
+    @ApiModelProperty(value = "市code")
+    private String cityCode;
+    @ApiModelProperty(value = "县区code")
+    private String countyCode;
+    @ApiModelProperty("住址")
+    private String address;
+    @ApiModelProperty("手机号")
+    private String mobile;
+    @ApiModelProperty("邮箱")
+    private String email;
+    @ApiModelProperty(value = "紧急联系人")
+    private String emergencyContact;
+    @ApiModelProperty(value = "紧急联系电话")
+    private String emergencyMobile;
+    @ApiModelProperty("政治面貌")
+    private String poliCode;
+    @ApiModelProperty(value = "政治面貌key")
+    private String poliCodeKey;
+    @ApiModelProperty("婚姻状况")
+    private String maritalStatus;
+    @ApiModelProperty("婚姻状况key")
+    private String maritalStatusKey;
+    @ApiModelProperty("员工类型（无类型、全职、兼职、实习、劳务派遣、退休返聘、劳务外包）")
+    private String personType;
+    @ApiModelProperty("员工类型key")
+    private String personTypeKey;
+    @ApiModelProperty("入职时间")
+    private Date joinCompnyDate;
+    @ApiModelProperty("试用期（无试用期、1个月、2个月、3个月、其他）")
+    private String probPeriod;
+    @ApiModelProperty("试用期key")
+    private String probPeriodKey;
+    @ApiModelProperty("计划转正日期")
+    private Date plannedConfirmDate;
+    @ApiModelProperty("实际转正日期")
+    private Date confirmationDate;
+    @ApiModelProperty("银行卡号")
+    private String bankCardNo;
+    @ApiModelProperty("开户行")
+    private String openBank;
+    @ApiModelProperty("身份证(人像面)")
+    private String idCardA;
+    @ApiModelProperty("身份证(国徽面)")
+    private String idCardB;
+    @ApiModelProperty("学历证书")
+    private String diploma;
+    @ApiModelProperty("学位证书")
+    private String degreeCertificate;
+    @ApiModelProperty("前公司离职证明")
+    private String leaveCertificate;
+    @ApiModelProperty("员工照片")
+    private String photo;
+    @ApiModelProperty("姓名的拼音（全）")
+    private String pinYinName;
+    @ApiModelProperty("姓名拼音的首字母（特殊的#表示）")
+    private String firstPinYinLabel;
+    @ApiModelProperty(value = "毕业院校")
+    private String graduate;
+    @ApiModelProperty(value = "学历/专业")
+    private String education;
+    private String educationKey;
+    @ApiModelProperty(value = "职称")
+    private String title;
+    @ApiModelProperty(value = "资格认证")
+    private String qualification;
+    @ApiModelProperty(value = "驾照类型")
+    private String licenseType;
+    @ApiModelProperty(value = "驾照类型key")
+    private String licenseTypeKey;
+    @ApiModelProperty(value = "意外险参保：1是，0否")
+    private Integer isHaveInsurance;
+    @ApiModelProperty(value = "意外险参保时间")
+    private Date insuranceStartDate;
+    @ApiModelProperty(value = "意外险参保终止日期")
+    private Date insuranceEndDate;
+    @ApiModelProperty(value = "意外险参保地")
+    private String insuranceAddr;
+
+    @ApiModelProperty(value = "养老:1是，0否")
+    private Integer isHaveAged;
+    @ApiModelProperty(value = "医疗:1是，0否")
+    private Integer isHaveMedical;
+    @ApiModelProperty(value = "工伤：1是，0否")
+    private Integer isHaveInjury;
+    @ApiModelProperty(value = "失业：1是，0否")
+    private Integer isHaveUnemploy;
+    @ApiModelProperty(value = "社保参保地")
+    private String insuredPlace;
+    @ApiModelProperty(value = "纸质档案保管地")
+    private String paperPlace;
+
+    @ApiModelProperty(value = "合同起止日期")
+    private Date contractStartDate;
+    @ApiModelProperty(value = "合同结束日期")
+    private Date contractEndDate;
+    @ApiModelProperty(value = "离职日期")
+    private Date quitDate;
+    @ApiModelProperty(value = "离职原因")
+    private String quitReason;
+
+    //=====================================================================//
+    @ApiModelProperty("首次参加工作时间")
+    private Date jobDateStart;
+    @ApiModelProperty("户籍类型")
+    private String residenceType;
+    @ApiModelProperty("个人社保账号")
+    private String socialAccount;
+    @ApiModelProperty("个人公积金账号")
+    private String fundAccount;
+    @ApiModelProperty("职位")
+    private String position;
+    @ApiModelProperty("岗位职级")
+    private String postRank;
+    @ApiModelProperty("身份证地址")
+    private String idAddrs;
+    @ApiModelProperty("微信")
+    private String openId;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysstaffinfo/SysStaffinfoAppContactsSearchVo.java

@@ -0,0 +1,34 @@
+package com.yxt.supervise.cyf.api.sysstaffinfo;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author liuguohui
+ * @Date 2021/9/24
+ */
+@ApiModel(value = "App通讯录（搜索）")
+@Data
+public class SysStaffinfoAppContactsSearchVo implements Vo {
+
+    @ApiModelProperty("人员sid")
+    private String sid;
+
+    @ApiModelProperty("用户头像")
+    private String headImage;
+
+    @ApiModelProperty("姓名")
+    private String name;
+
+    @ApiModelProperty("手机号")
+    private String mobile;
+
+    @ApiModelProperty("职位")
+    private String position;
+
+    @ApiModelProperty("部门名称")
+    private String orgName;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysstaffinfo/SysStaffinfoAppContactsVo.java

@@ -0,0 +1,34 @@
+package com.yxt.supervise.cyf.api.sysstaffinfo;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author liuguohui
+ * @Date 2021/9/16
+ */
+@ApiModel(value = "App通讯录")
+@Data
+public class SysStaffinfoAppContactsVo implements Vo {
+
+    @ApiModelProperty("人员sid")
+    private String sid;
+
+    @ApiModelProperty("姓名")
+    private String name;
+
+    @ApiModelProperty("手机号")
+    private String mobile;
+
+    @ApiModelProperty("用户头像")
+    private String headImage;
+
+    @ApiModelProperty("姓名的拼音（全）")
+    private String pinYinName;
+
+    @ApiModelProperty("姓名拼音的首字母（特殊的#表示）")
+    private String firstPinYinLabel;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysstaffinfo/SysStaffinfoDetailsVo.java

@@ -0,0 +1,155 @@
+package com.yxt.supervise.cyf.api.sysstaffinfo;
+
+import com.yxt.common.core.vo.Vo;
+import com.yxt.supervise.cyf.api.sysstafforg.SysStaffOrgDetailsVo;
+import com.yxt.supervise.cyf.api.sysstaffpost.SysStaffPostDetailsVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/2/11 16:12
+ * @Description 员工信息的编辑初始化和详情返回数据
+ */
+@Data
+public class SysStaffinfoDetailsVo implements Vo {
+    private static final long serialVersionUID = 1232171677690215067L;
+
+    @ApiModelProperty(value = "工号")
+    private String jobNumber;
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+    @ApiModelProperty(value = "性别key")
+    private Integer genderKey;
+    @ApiModelProperty(value = "性别")
+    private String gender;
+    @ApiModelProperty(value = "身份证号")
+    private String idNo;
+    @ApiModelProperty(value = "证件有效期")
+    private String idTerm;
+    @ApiModelProperty("生日")
+    private String birthday;
+    @ApiModelProperty(value = "民族")
+    private String national;
+    @ApiModelProperty(value = "民族key")
+    private String nationalKey;
+    @ApiModelProperty("籍贯")
+    private String nativePlace;
+    @ApiModelProperty(value = "省")
+    private String province;
+    @ApiModelProperty(value = "市")
+    private String city;
+    @ApiModelProperty(value = "县区")
+    private String county;
+    @ApiModelProperty(value = "省code")
+    private String provinceCode;
+    @ApiModelProperty(value = "市code")
+    private String cityCode;
+    @ApiModelProperty(value = "县区code")
+    private String countyCode;
+    @ApiModelProperty("住址")
+    private String address;
+    @ApiModelProperty(value = "手机号")
+    private String mobile;
+    @ApiModelProperty("邮箱")
+    private String email;
+    @ApiModelProperty(value = "紧急联系人")
+    private String emergencyContact;
+    @ApiModelProperty(value = "紧急联系电话")
+    private String emergencyMobile;
+    @ApiModelProperty("政治面貌")
+    private String poliCode;
+    @ApiModelProperty(value = "政治面貌key")
+    private String poliCodeKey;
+    @ApiModelProperty("婚姻状况")
+    private String maritalStatus;
+    @ApiModelProperty("婚姻状况key")
+    private String maritalStatusKey;
+    @ApiModelProperty("员工类型（无类型、全职、兼职、实习、劳务派遣、退休返聘、劳务外包）")
+    private String personType;
+    @ApiModelProperty("员工类型key")
+    private String personTypeKey;
+    @ApiModelProperty("入职时间")
+    private String joinCompnyDate;
+    @ApiModelProperty("试用期（无试用期、1个月、2个月、3个月、其他）")
+    private String probPeriod;
+    @ApiModelProperty("试用期key")
+    private String probPeriodKey;
+    @ApiModelProperty("计划转正日期")
+    private String plannedConfirmDate;
+    @ApiModelProperty("实际转正日期")
+    private String confirmationDate;
+    @ApiModelProperty("银行卡号")
+    private String bankCardNo;
+    @ApiModelProperty("开户行")
+    private String openBank;
+    @ApiModelProperty("身份证(人像面)")
+    private String idCardA;
+    @ApiModelProperty("身份证(国徽面)")
+    private String idCardB;
+    @ApiModelProperty("学历证书")
+    private String diploma;
+    @ApiModelProperty("学位证书")
+    private String degreeCertificate;
+    @ApiModelProperty("前公司离职证明")
+    private String leaveCertificate;
+    @ApiModelProperty("员工照片")
+    private String photo;
+    @ApiModelProperty(value = "员工部门信息")
+    private SysStaffOrgDetailsVo sysStaffOrg;
+    @ApiModelProperty(value = "员工岗位信息")
+    private SysStaffPostDetailsVo sysStaffPost;
+
+    //===========================================//
+    @ApiModelProperty(value = "毕业院校")
+    private String graduate;
+    @ApiModelProperty(value = "学历/专业")
+    private String education;
+    @ApiModelProperty(value = "职称")
+    private String title;
+    @ApiModelProperty(value = "资格认证")
+    private String qualification;
+    @ApiModelProperty(value = "驾照类型")
+    private String licenseType;
+    @ApiModelProperty(value = "驾照类型key")
+    private String licenseTypeKey;
+    @ApiModelProperty(value = "意外险参保：1是，0否")
+    private Integer isHaveInsurance;
+    @ApiModelProperty(value = "意外险参保：1是，0否")
+    private String isHaveInsuranceValue;
+    @ApiModelProperty(value = "意外险参保时间")
+    private String insuranceStartDate;
+    @ApiModelProperty(value = "意外险参保终止日期")
+    private String insuranceEndDate;
+    @ApiModelProperty(value = "意外险参保地")
+    private String insuranceAddr;
+    @ApiModelProperty(value = "养老:1是，0否")
+    private Integer isHaveAged;
+    @ApiModelProperty(value = "养老:1是，0否")
+    private String isHaveAgedValue;
+    @ApiModelProperty(value = "医疗:1是，0否")
+    private Integer isHaveMedical;
+    @ApiModelProperty(value = "医疗:1是，0否")
+    private String isHaveMedicalValue;
+    @ApiModelProperty(value = "工伤：1是，0否")
+    private Integer isHaveInjury;
+    @ApiModelProperty(value = "工伤：1是，0否")
+    private String isHaveInjuryValue;
+    @ApiModelProperty(value = "失业：1是，0否")
+    private Integer isHaveUnemploy;
+    @ApiModelProperty(value = "失业：1是，0否")
+    private String isHaveUnemployValue;
+    @ApiModelProperty(value = "社保参保地")
+    private String insuredPlace;
+    @ApiModelProperty(value = "纸质档案保管地")
+    private String paperPlace;
+    @ApiModelProperty(value = "合同起止日期")
+    private String contractStartDate;
+    @ApiModelProperty(value = "合同结束日期")
+    private String contractEndDate;
+    @ApiModelProperty(value = "离职日期")
+    private String quitDate;
+    @ApiModelProperty(value = "离职原因")
+    private String quitReason;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysstaffinfo/SysStaffinfoDto.java

@@ -0,0 +1,184 @@
+package com.yxt.supervise.cyf.api.sysstaffinfo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.dto.Dto;
+import com.yxt.supervise.cyf.api.sysstafforg.SysStaffOrgDto;
+import com.yxt.supervise.cyf.api.sysstaffpost.SysStaffPostDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysStaffinfoDto.java <br/>
+ * Class: SysStaffinfoDto <br/>
+ * Description: 人员基础信息表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "人员基础信息表 数据传输对象", description = "人员基础信息表 数据传输对象")
+@Data
+public class SysStaffinfoDto implements Dto {
+
+    private static final long serialVersionUID = 8637516813924395044L;
+    @ApiModelProperty(value = "姓名", required = true)
+    //@NotBlank(message = "姓名不能为空")
+    private String name;
+    @ApiModelProperty(value = "性别key", required = true)
+    //@NotBlank(message = "性别不能为空")
+    private String genderKey;
+    @ApiModelProperty(value = "性别", required = true)
+    //@NotBlank(message = "性别不能为空")
+    private String gender;
+    @ApiModelProperty(value = "员工编号")
+    private String jobNumber;
+    @ApiModelProperty(value = "身份证号", required = true)
+    //@Pattern(regexp = "/(^\\d{15}$)|(^\\d{18}$)|(^\\d{17}(\\d|X|x)$)/", message = "请输入正确的身份证号")
+    //@NotBlank(message = "身份证号不能为空")
+    private String idNo;
+    @ApiModelProperty(value = "证件有效期", required = true)
+    //@NotBlank(message = "证件有效期不能为空")
+    private String idTerm;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    //@ApiModelProperty("生日")
+    private Date birthday;
+    @ApiModelProperty(value = "民族", required = true)
+    //@NotBlank(message = "民族不能为空")
+    private String national;
+    @ApiModelProperty(value = "民族key", required = true)
+    //@NotBlank(message = "民族不能为空")
+    private String nationalKey;
+    @ApiModelProperty(value = "籍贯", required = false)
+    private String nativePlace;
+    @ApiModelProperty(value = "省", required = false)
+    private String province;
+    @ApiModelProperty(value = "市", required = false)
+    private String city;
+    @ApiModelProperty(value = "县区", required = false)
+    private String county;
+    @ApiModelProperty(value = "省code", required = false)
+    private String provinceCode;
+    @ApiModelProperty(value = "市code", required = false)
+    private String cityCode;
+    @ApiModelProperty(value = "县区code", required = false)
+    private String countyCode;
+    @ApiModelProperty(value = "住址", required = false)
+    private String address;
+    @ApiModelProperty(value = "手机号", required = true)
+    //@Pattern(regexp = "^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|(19[1,3,5-9])|166|(147))\\d{8}$", message = "手机号码格式不正确")
+    //@NotBlank(message = "手机号不能为空")
+    private String mobile;
+    @ApiModelProperty(value = "邮箱", required = false)
+    //@Pattern(regexp = "[a-zA-Z0-9]+@[a-zA-Z0-9]+\\.[a-zA-Z0-9]+", message = "邮箱格式不正确")
+    private String email;
+    @ApiModelProperty(value = "紧急联系人", required = false)
+    private String emergencyContact;
+    @ApiModelProperty(value = "紧急联系电话", required = false)
+    private String emergencyMobile;
+    @ApiModelProperty(value = "政治面貌", required = false)
+    private String poliCode;
+    @ApiModelProperty(value = "政治面貌key", required = false)
+    private String poliCodeKey;
+    @ApiModelProperty(value = "婚姻状况", required = false)
+    private String maritalStatus;
+    @ApiModelProperty(value = "婚姻状况key", required = false)
+    private String maritalStatusKey;
+    @ApiModelProperty(value = "员工类型", required = true)
+    //@NotBlank(message = "员工类型不能为空")
+    private String personType;
+    @ApiModelProperty(value = "员工类型key", required = true)
+    //@NotBlank(message = "员工类型不能为空")
+    private String personTypeKey;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty("入职时间")
+    private Date joinCompnyDate;
+    @ApiModelProperty("试用期（无试用期、1个月、2个月、3个月、其他）")
+    private String probPeriod;
+    @ApiModelProperty("试用期key")
+    private String probPeriodKey;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty("计划转正日期")
+    private Date plannedConfirmDate;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty("实际转正日期")
+    private Date confirmationDate;
+    @ApiModelProperty("银行卡号")
+    private String bankCardNo;
+    @ApiModelProperty("开户行")
+    private String openBank;
+    @ApiModelProperty("身份证(人像面)")
+    private String idCardA;
+    @ApiModelProperty("身份证(国徽面)")
+    private String idCardB;
+    @ApiModelProperty("学历证书")
+    private String diploma;
+    @ApiModelProperty("学位证书")
+    private String degreeCertificate;
+    @ApiModelProperty("前公司离职证明")
+    private String leaveCertificate;
+    @ApiModelProperty("员工照片")
+    private String photo;
+    @ApiModelProperty(value = "员工部门信息")
+    private SysStaffOrgDto sysStaffOrg;
+    @ApiModelProperty(value = "员工岗位信息")
+    private SysStaffPostDto sysStaffPost;
+
+    //========================================//
+    @ApiModelProperty(value = "毕业院校")
+    private String graduate;
+    @ApiModelProperty(value = "学历/专业")
+    private String education;
+    private String educationKey;
+    @ApiModelProperty(value = "职称")
+    private String title;
+    @ApiModelProperty(value = "资格认证")
+    private String qualification;
+    @ApiModelProperty(value = "驾照类型")
+    private String licenseType;
+    @ApiModelProperty(value = "驾照类型key")
+    private String licenseTypeKey;
+    @ApiModelProperty(value = "意外险参保：1是，0否")
+    private Integer isHaveInsurance;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty(value = "意外险参保时间")
+    private Date insuranceStartDate;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty(value = "意外险参保终止日期")
+    private Date insuranceEndDate;
+    @ApiModelProperty(value = "意外险参保地")
+    private String insuranceAddr;
+
+    @ApiModelProperty(value = "养老:1是，0否")
+    private Integer isHaveAged;
+    @ApiModelProperty(value = "医疗:1是，0否")
+    private Integer isHaveMedical;
+    @ApiModelProperty(value = "工伤：1是，0否")
+    private Integer isHaveInjury;
+    @ApiModelProperty(value = "失业：1是，0否")
+    private Integer isHaveUnemploy;
+    @ApiModelProperty(value = "社保参保地")
+    private String insuredPlace;
+    @ApiModelProperty(value = "纸质档案保管地")
+    private String paperPlace;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty(value = "合同起止日期")
+    private Date contractStartDate;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty(value = "合同结束日期")
+    private Date contractEndDate;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty(value = "离职日期")
+    private Date quitDate;
+    @ApiModelProperty(value = "离职原因")
+    private String quitReason;
+    @ApiModelProperty(value = "微信")
+    private String openId;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysstaffinfo/SysStaffinfoQuery.java

@@ -0,0 +1,50 @@
+package com.yxt.supervise.cyf.api.sysstaffinfo;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysStaffinfoQuery.java <br/>
+ * Class: SysStaffinfoQuery <br/>
+ * Description: 人员基础信息表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "人员基础信息表 查询条件", description = "人员基础信息表 查询条件")
+@Data
+public class SysStaffinfoQuery implements Query {
+
+
+    private static final long serialVersionUID = 7101232842735165406L;
+    @ApiModelProperty("姓名")
+    private String name;
+    @ApiModelProperty("员工类型key")
+    private String personTypeKey;
+    @ApiModelProperty("手机号")
+    private String mobile;
+    @ApiModelProperty("入职开始日期")
+    private String joinCompnyDateStart;
+    @ApiModelProperty("入职结束日期")
+    private String joinCompnyDateEnd;
+    @ApiModelProperty(value = "所在部门sid")
+    private String orgSid;
+    @ApiModelProperty(value = "所在部门sid")
+    private String orgName;
+    @ApiModelProperty(value = "所在岗位sid")
+    private String postSid;
+    @ApiModelProperty(value = "角色sid")
+    private String roleSid;
+    @ApiModelProperty(value = "角色sid")
+    private String roleName;
+    @ApiModelProperty(value = "用户名")
+    private String userName;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysstaffinfo/SysStaffinfoVo.java

@@ -0,0 +1,69 @@
+package com.yxt.supervise.cyf.api.sysstaffinfo;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysStaffinfoVo.java <br/>
+ * Class: SysStaffinfoVo <br/>
+ * Description: 人员基础信息表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "人员基础信息表 视图数据对象", description = "人员基础信息表 视图数据对象")
+@Data
+public class SysStaffinfoVo implements Vo {
+
+    private static final long serialVersionUID = -1250862291306247261L;
+    @ApiModelProperty(value = "员工sid")
+    private String sid;
+    @ApiModelProperty(value = "员工编号")
+    private String jobNumber;
+    @ApiModelProperty("姓名")
+    private String name;
+    @ApiModelProperty("员工类型")
+    private String personType;
+    @ApiModelProperty("手机号")
+    private String mobile;
+    @ApiModelProperty(value = "入职日期")
+    private String joinCompnyDate;
+    @ApiModelProperty(value = "部门")
+    private String orgName;
+    @ApiModelProperty(value = "岗位")
+    private String postName;
+    @ApiModelProperty(value = "部门sid")
+    private String orgSid;
+    @ApiModelProperty(value = "记录是否可用，1:可用，0:不可用")
+    private String isEnable;
+    @ApiModelProperty(value = "部门名")
+    private String departmentName;
+    @ApiModelProperty(value = "部门sid")
+    private String departmentSid;
+    @ApiModelProperty(value = "岗位sid")
+    private String postSid;
+    @ApiModelProperty(value = "岗位名称")
+    private String userName;
+    @ApiModelProperty(value = "用户sid")
+    private String userSid;
+    @ApiModelProperty(value = "角色")
+    private String roleName;
+    @ApiModelProperty(value = "类型code")
+    private String userType;
+    @ApiModelProperty(value = "用户类型:1监管、2客户、3银行")
+    private String userTypeKey;
+    @ApiModelProperty(value = "微信")
+    private String openId;
+    @ApiModelProperty(value = "职位")
+    private String position;
+
+
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysstaffinfo/WxBase64Query.java

@@ -0,0 +1,20 @@
+package com.yxt.supervise.cyf.api.sysstaffinfo;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/10/6 16:58
+ * @description
+ */
+@Data
+public class WxBase64Query implements Query {
+    private static final long serialVersionUID = 4307651151043379231L;
+//    @ApiModelProperty(value = "base64")
+//    private String base64File;
+
+    @ApiModelProperty(value = "图片全路径")
+    private String imageUrl;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysstaffinfo/WxSysInfoQuery.java

@@ -0,0 +1,37 @@
+package com.yxt.supervise.cyf.api.sysstaffinfo;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author dimengzhe
+ * @date 2021/10/6 12:08
+ * @description 客户端上传身份证
+ */
+@Data
+public class WxSysInfoQuery implements Query {
+    private static final long serialVersionUID = 7273642052588903116L;
+    @ApiModelProperty(value = "用户sid", required = true)
+    @NotBlank(message = "用户sid不能为空")
+    private String userSid;
+    @ApiModelProperty(value = "身份证(人像面)", required = true)
+    @NotBlank(message = "身份证(人像面)不能为空")
+    private String idCardA;
+    @ApiModelProperty(value = "身份证(国徽面)", required = true)
+    @NotBlank(message = "身份证(国徽面)不能为空")
+    private String idCardB;
+
+    @ApiModelProperty(value = "身份证地址", required = true)
+    @NotBlank(message = "身份证地址不能为空")
+    private String idAddrs;
+    @ApiModelProperty(value = "证件有效期", required = true)
+    @NotBlank(message = "证件有效期不能为空")
+    private String idTerm;
+    @ApiModelProperty(value = "生日")
+    private String birth;
+    @ApiModelProperty(value = "民族")
+    private String national;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysstaffinfo/app/AppSysStaffQuery.java

@@ -0,0 +1,27 @@
+package com.yxt.supervise.cyf.api.sysstaffinfo.app;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/11 9:44
+ * @Description
+ */
+@Data
+public class AppSysStaffQuery implements Query {
+    private static final long serialVersionUID = 4724669786231817593L;
+    @ApiModelProperty(value = "用户名称")
+    private String name;
+    @ApiModelProperty(value = "用户sid")
+    private String userSid;
+
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
+
+    @ApiModelProperty("已选人员sid")
+    private List<String> selectSid;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysstaffinfo/app/AppSysStaffVo.java

@@ -0,0 +1,30 @@
+package com.yxt.supervise.cyf.api.sysstaffinfo.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/11 9:29
+ * @Description
+ */
+@Data
+public class AppSysStaffVo implements Vo {
+    private static final long serialVersionUID = -4051562700421770402L;
+    @ApiModelProperty(value = "用户sid")
+    private String userSid;
+    @ApiModelProperty(value = "用户名称")
+    private String userName;
+    @ApiModelProperty(value = "头像")
+    private String userImage;
+    @ApiModelProperty(value = "电话")
+    private String userMobile;
+    @ApiModelProperty(value = "部门")
+    private String department;
+    @ApiModelProperty(value = "岗位")
+    private String position;
+
+    @ApiModelProperty(value = "头像：后端内部使用")
+    private String headImage;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysstafforg/SysStaffOrg.java

@@ -0,0 +1,46 @@
+package com.yxt.supervise.cyf.api.sysstafforg;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysStaffOrg.java <br/>
+ * Class: SysStaffOrg <br/>
+ * Description: 员工部门关联表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "员工部门关联表", description = "员工部门关联表")
+@TableName("sys_staff_org")
+@Data
+public class SysStaffOrg extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    
+	@ApiModelProperty("部门sid")
+    private String orgSid;
+    
+	@ApiModelProperty("部门名称")
+    private String orgName;
+    
+	@ApiModelProperty("人员sid")
+    private String staffSid;
+    
+	@ApiModelProperty("部门路径")
+    private String orgSidPath;
+    
+	@ApiModelProperty("部门名称路径")
+    private String orgNamePath;
+    
+	@ApiModelProperty("管理类型：1、主管。2、分管。3、员工")
+    private String manageType;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysstafforg/SysStaffOrgDetailsVo.java

@@ -0,0 +1,28 @@
+package com.yxt.supervise.cyf.api.sysstafforg;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/2/11 16:15
+ * @Description 员工部门详情信息
+ */
+@Data
+public class SysStaffOrgDetailsVo implements Vo {
+    private static final long serialVersionUID = 5354841525724609428L;
+
+    @ApiModelProperty("部门sid")
+    private String orgSid;
+    @ApiModelProperty("部门名称")
+    private String orgName;
+    @ApiModelProperty("部门路径")
+    private String orgSidPath;
+    @ApiModelProperty("部门名称路径")
+    private String orgNamePath;
+    @ApiModelProperty(value = "部门编码")
+    private String orgCode;
+    @ApiModelProperty("管理类型：1、主管。2、分管。3、员工")
+    private String manageType;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysstafforg/SysStaffOrgDto.java

@@ -0,0 +1,42 @@
+package com.yxt.supervise.cyf.api.sysstafforg;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysStaffOrgDto.java <br/>
+ * Class: SysStaffOrgDto <br/>
+ * Description: 员工部门关联表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "员工部门关联表 数据传输对象", description = "员工部门关联表 数据传输对象")
+@Data
+public class SysStaffOrgDto implements Dto {
+
+    private static final long serialVersionUID = 1403491378761015027L;
+    @ApiModelProperty("部门sid")
+    private String orgSid;
+    @ApiModelProperty("部门名称")
+    @NotBlank(message = "部门名称不能为空")
+    private String orgName;
+    @ApiModelProperty("部门路径")
+    private String orgSidPath;
+    @ApiModelProperty("部门名称路径")
+    private String orgNamePath;
+    @ApiModelProperty(value = "部门编码")
+    private String orgCode;
+    @ApiModelProperty(value = "管理类型：1、主管。2、分管。3、员工", example = "3")
+    private String manageType;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysstafforg/SysStaffOrgQuery.java

@@ -0,0 +1,44 @@
+package com.yxt.supervise.cyf.api.sysstafforg;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysStaffOrgQuery.java <br/>
+ * Class: SysStaffOrgQuery <br/>
+ * Description: 员工部门关联表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "员工部门关联表 查询条件", description = "员工部门关联表 查询条件")
+@Data
+public class SysStaffOrgQuery implements Query {
+
+    
+	@ApiModelProperty("部门sid")
+    private String orgSid;
+    
+	@ApiModelProperty("部门名称")
+    private String orgName;
+    
+	@ApiModelProperty("人员sid")
+    private String staffSid;
+    
+	@ApiModelProperty("部门路径")
+    private String orgSidPath;
+    
+	@ApiModelProperty("部门名称路径")
+    private Integer orgNamePath;
+    
+	@ApiModelProperty("管理类型：1、主管。2、分管。3、员工")
+    private String manageType;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysstafforg/SysStaffOrgVo.java

@@ -0,0 +1,48 @@
+package com.yxt.supervise.cyf.api.sysstafforg;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysStaffOrgVo.java <br/>
+ * Class: SysStaffOrgVo <br/>
+ * Description: 员工部门关联表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "员工部门关联表 视图数据对象", description = "员工部门关联表 视图数据对象")
+@Data
+public class SysStaffOrgVo implements Vo {
+
+    
+	@ApiModelProperty("部门sid")
+    private String orgSid;
+    
+	@ApiModelProperty("部门名称")
+    private String orgName;
+    
+	@ApiModelProperty("人员sid")
+    private String staffSid;
+    
+	@ApiModelProperty("部门路径")
+    private String orgSidPath;
+    
+	@ApiModelProperty("部门名称路径")
+    private String orgNamePath;
+    
+	@ApiModelProperty("管理类型：1、主管。2、分管。3、员工")
+    private String manageType;
+	@ApiModelProperty("员工姓名")
+    private String staffName;
+	@ApiModelProperty("员工手机号")
+    private String mobile;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysstaffpost/SysStaffPost.java

@@ -0,0 +1,47 @@
+package com.yxt.supervise.cyf.api.sysstaffpost;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysStaffPost.java <br/>
+ * Class: SysStaffPost <br/>
+ * Description: 员工岗位关联表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "员工岗位关联表", description = "员工岗位关联表")
+@TableName("sys_staff_post")
+@Data
+public class SysStaffPost extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    
+	@ApiModelProperty("员工sid")
+    private String staffSid;
+    
+	@ApiModelProperty("所属部门sid")
+    private String orgSid;
+    
+	@ApiModelProperty("就任岗位")
+    private String postSid;
+    
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("任岗开始日期")
+    private Date startDate;
+    
+	@ApiModelProperty("是否主任岗：1是、0否")
+    private Integer isDepetHead;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysstaffpost/SysStaffPostDetailsVo.java

@@ -0,0 +1,24 @@
+package com.yxt.supervise.cyf.api.sysstaffpost;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/2/11 16:16
+ * @Description 员工岗位详情
+ */
+@Data
+public class SysStaffPostDetailsVo implements Vo {
+    private static final long serialVersionUID = 715449809179360019L;
+
+    @ApiModelProperty("就任岗位")
+    private String postSid;
+    @ApiModelProperty("是否主任岗：1是、0否")
+    private Integer isDepetHead;
+    @ApiModelProperty(value = "岗位编码")
+    private String postCode;
+    @ApiModelProperty(value = "岗位名称")
+    private String name;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysstaffpost/SysStaffPostDto.java

@@ -0,0 +1,36 @@
+package com.yxt.supervise.cyf.api.sysstaffpost;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysStaffPostDto.java <br/>
+ * Class: SysStaffPostDto <br/>
+ * Description: 员工岗位关联表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "员工岗位关联表 数据传输对象", description = "员工岗位关联表 数据传输对象")
+@Data
+public class SysStaffPostDto implements Dto {
+
+    private static final long serialVersionUID = -243797759737403877L;
+    @ApiModelProperty("就任岗位")
+    private String postSid;
+    @ApiModelProperty(value = "岗位编码", required = true)
+    @NotBlank(message = "岗位编码不能为空")
+    private String postCode;
+    @ApiModelProperty("是否主任岗：1是、0否")
+    private Integer isDepetHead;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysstaffpost/SysStaffPostQuery.java

@@ -0,0 +1,46 @@
+package com.yxt.supervise.cyf.api.sysstaffpost;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysStaffPostQuery.java <br/>
+ * Class: SysStaffPostQuery <br/>
+ * Description: 员工岗位关联表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "员工岗位关联表 查询条件", description = "员工岗位关联表 查询条件")
+@Data
+public class SysStaffPostQuery implements Query {
+
+    
+	@ApiModelProperty("员工sid")
+    private String staffSid;
+    
+	@ApiModelProperty("所属部门sid")
+    private String orgSid;
+    
+	@ApiModelProperty("就任岗位")
+    private String postSid;
+    
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("任岗开始日期")
+    private Date startDateStart;
+    private Date startDateEnd;
+    
+	@ApiModelProperty("是否主任岗：1是、0否")
+    private Integer isDepetHead;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysstaffpost/SysStaffPostVo.java

@@ -0,0 +1,46 @@
+package com.yxt.supervise.cyf.api.sysstaffpost;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysStaffPostVo.java <br/>
+ * Class: SysStaffPostVo <br/>
+ * Description: 员工岗位关联表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "员工岗位关联表 视图数据对象", description = "员工岗位关联表 视图数据对象")
+@Data
+public class SysStaffPostVo implements Vo {
+
+    
+	@ApiModelProperty("员工sid")
+    private String staffSid;
+    
+	@ApiModelProperty("所属部门sid")
+    private String orgSid;
+    
+	@ApiModelProperty("就任岗位")
+    private String postSid;
+    
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("任岗开始日期")
+    private Date startDateStart;
+    private Date startDateEnd;
+    
+	@ApiModelProperty("是否主任岗：1是、0否")
+    private Integer isDepetHead;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysuser/SysUserInfoVo.java

@@ -0,0 +1,30 @@
+package com.yxt.supervise.cyf.api.sysuser;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/2/9 9:12
+ * @Description 用户组织信息
+ */
+@Data
+public class SysUserInfoVo implements Vo {
+
+    private static final long serialVersionUID = 7931121025686046432L;
+    @ApiModelProperty("关联的员工sid")
+    private String staffSid;
+
+    @ApiModelProperty("关联的员工名称")
+    private String staffName;
+
+    @ApiModelProperty("员工的组织sid（多个时为第一个）")
+    private String orgSid;
+
+    @ApiModelProperty("员工的组织名称（多个时为第一个）")
+    private String orgName;
+
+    @ApiModelProperty("员工的组织部门编码")
+    private String orgCode;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysuser/SysUserListVo.java

@@ -0,0 +1,19 @@
+package com.yxt.supervise.cyf.api.sysuser;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/14 15:36
+ * @Description
+ */
+@Data
+public class SysUserListVo implements Vo {
+    private static final long serialVersionUID = -3047907553025391436L;
+
+    private String name;
+
+    private String sid;
+
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysuser/SysUserVo.java

@@ -3,6 +3,7 @@ package com.yxt.supervise.cyf.api.sysuser;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
+import com.yxt.supervise.cyf.api.sysrole.SysRoleVo;
 import com.yxt.supervise.cyf.api.sysuser.app.OrgList;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -58,7 +59,7 @@ public class SysUserVo implements Vo {
     private String isAdmin;
     @ApiModelProperty("角色名称")
     private String roleName;
-
+    private List<SysRoleVo> roleList;
     @ApiModelProperty("关联的人员sid")
     private String staffSid;
 

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysuser/UserQuery.java

@@ -0,0 +1,21 @@
+package com.yxt.supervise.cyf.api.sysuser;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/21 8:47
+ * @Description
+ */
+@Data
+public class UserQuery implements Query {
+
+    private static final long serialVersionUID = -3979717077029562761L;
+    @ApiModelProperty(value = "角色sid必传项")
+    private String roleSid;
+    @ApiModelProperty(value = "用户部门sid路径是必传项")
+    private String orgSidPath;
+
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysuser/UserRoleQuery.java

@@ -0,0 +1,19 @@
+package com.yxt.supervise.cyf.api.sysuser;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/8/25 8:38
+ * @Description
+ */
+@Data
+public class UserRoleQuery implements Query {
+    private static final long serialVersionUID = 1913450300189800653L;
+
+    @ApiModelProperty("角色sid")
+    private String roleSid;
+    private String orgSid;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysuser/app/AppMySysUserInfo.java

@@ -0,0 +1,28 @@
+package com.yxt.supervise.cyf.api.sysuser.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author liuguohui
+ * @Date 2021/9/14
+ */
+@ApiOperation(value = "App我的信息")
+@Data
+public class AppMySysUserInfo implements Vo {
+
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("用户姓名")
+    private String name;
+    @ApiModelProperty("用户头像")
+    private String headImage;
+
+    @ApiModelProperty("职位")
+    private String position;
+    @ApiModelProperty("部门")
+    private String department;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysuser/app/AppUserOrgInfoVo.java

@@ -0,0 +1,34 @@
+package com.yxt.supervise.cyf.api.sysuser.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author liuguohui
+ * @Date 2021/12/17
+ */
+@ApiOperation("用户组织信息")
+@Data
+public class AppUserOrgInfoVo implements Vo {
+
+    @ApiModelProperty("关联的员工sid")
+    private String staffSid;
+
+    @ApiModelProperty("关联的员工名称")
+    private String staffName;
+
+    @ApiModelProperty("员工的组织sid（多个时为第一个）")
+    private String orgSid;
+
+    @ApiModelProperty("员工的组织名称（多个时为第一个）")
+    private String orgName;
+
+    @ApiModelProperty("员工的组织部门编码")
+    private String orgCode;
+
+    @ApiModelProperty("部门路径")
+    private String orgSidPath;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysuser/app/MyInfoQuery.java

@@ -0,0 +1,19 @@
+package com.yxt.supervise.cyf.api.sysuser.app;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/10/22 15:24
+ * @Description
+ */
+@Data
+public class MyInfoQuery implements Query {
+    private static final long serialVersionUID = -4771501933318214145L;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysuser/app/OrgList.java

@@ -0,0 +1,17 @@
+package com.yxt.supervise.cyf.api.sysuser.app;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/21 9:26
+ * @Description
+ */
+@Data
+public class OrgList implements Vo {
+    private static final long serialVersionUID = -2867882982421321776L;
+
+    private String orgName;
+    private String orgPath;
+}

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/sysuser/wx/WxHomePageVo.java

@@ -0,0 +1,27 @@
+package com.yxt.supervise.cyf.api.sysuser.wx;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/10/12 10:53
+ * @description
+ */
+@Data
+public class WxHomePageVo implements Vo {
+    private static final long serialVersionUID = 2116719971434282451L;
+    @ApiModelProperty(value = "头像")
+    private String headImage;
+
+    @ApiModelProperty(value = "提醒")
+    private String message;
+
+    @ApiModelProperty(value = "身份证有效期")
+    private String idTerm;
+    @ApiModelProperty(value = "是否有提示")
+    private Boolean isHave;
+    @ApiModelProperty(value = "客户sid")
+    private String staffSid;
+}