一件事统一办

common-lib/pom.xml

@@ -65,6 +65,12 @@
             <version>1.6.2</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>javase</artifactId>
+            <version>3.4.1</version>
+        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

common-lib/src/main/java/com/mortals/xhx/common/code/YesNoEnum.java

@@ -35,6 +35,8 @@ public enum YesNoEnum implements IBaseEnum{
         }
         return null;
     }
+
+
 	/**
 	 * 获取Map集合
 	 * @param eItem 不包含项

db/government-platform.sql

@@ -51,6 +51,8 @@ CREATE TABLE `mortals_xhx_menu`  (
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '菜单信息' ROW_FORMAT = Dynamic;
 
+
+
 -- ----------------------------
 -- Records of mortals_xhx_menu
 -- ----------------------------
@@ -108,6 +110,36 @@ CREATE TABLE `mortals_xhx_param`  (
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '参数信息' ROW_FORMAT = Dynamic;
 
+
+INSERT INTO `mortals_xhx_param` VALUES (100, '材料形式', 'materialType', NULL, '0', '纸质', 1, 4, 0, NULL, NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (101, '材料形式', 'materialType', NULL, '1', '电子', 1, 4, 0, NULL, NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (102, '材料形式', 'materialType', NULL, '2', '纸质/电子', 1, 4, 0, NULL, NULL, NULL, NULL);
+
+INSERT INTO `mortals_xhx_param` VALUES (110, '电子材料格式', 'electronicgs', NULL, '0', '不限', 1, 4, 0, NULL, NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (111, '电子材料格式', 'electronicgs', NULL, '1', 'jpg', 1, 4, 0, NULL, NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (112, '电子材料格式', 'electronicgs', NULL, '2', 'jpeg', 1, 4, 0, NULL, NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (113, '电子材料格式', 'electronicgs', NULL, '3', 'pdf', 1, 4, 0, NULL, NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (114, '电子材料格式', 'electronicgs', NULL, '4', 'word', 1, 4, 0, NULL, NULL, NULL, NULL);
+
+INSERT INTO `mortals_xhx_param` VALUES (120, '来源渠道说明', 'materialSourceSm', NULL, '0', '无', 1, 4, 0, NULL, NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (121, '来源渠道说明', 'materialSourceSm', NULL, '1', '申请人自备', 1, 4, 0, NULL, NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (122, '来源渠道说明', 'materialSourceSm', NULL, '2', '政府部门核发', 1, 4, 0, NULL, NULL, NULL, NULL);
+
+INSERT INTO `mortals_xhx_param` VALUES (130, '纸质材料规格', 'paperGg', NULL, '0', 'A0', 1, 4, 0, NULL, NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (131, '纸质材料规格', 'paperGg', NULL, '1', 'A1', 1, 4, 0, NULL, NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (132, '纸质材料规格', 'paperGg', NULL, '2', 'A2', 1, 4, 0, NULL, NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (133, '纸质材料规格', 'paperGg', NULL, '3', 'A3', 1, 4, 0, NULL, NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (134, '纸质材料规格', 'paperGg', NULL, '4', 'A4', 1, 4, 0, NULL, NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (135, '纸质材料规格', 'paperGg', NULL, '5', 'A5', 1, 4, 0, NULL, NULL, NULL, NULL);
+
+INSERT INTO `mortals_xhx_param` VALUES (140, '减免模式', 'jianmMs', NULL, '0', '无', 1, 4, 0, NULL, NULL, NULL, NULL);
+
+INSERT INTO `mortals_xhx_param` VALUES (150, '盖章方式', 'sealWay', NULL, '0', '无', 1, 4, 0, NULL, NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (151, '盖章方式', 'sealWay', NULL, '1', '无签字处盖章', 1, 4, 0, NULL, NULL, NULL, NULL);
+
+INSERT INTO `mortals_xhx_param` VALUES (160, '选项方式', 'typeOptions', NULL, '1', '单选', 1, 4, 0, NULL, NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (161, '选项方式', 'typeOptions', NULL, '2', '多选', 1, 4, 0, NULL, NULL, NULL, NULL);
+
 -- ----------------------------
 -- Table structure for mortals_xhx_resource
 -- ----------------------------

government-manage-ui/admin/package.json

@@ -15,6 +15,7 @@
     "clipboard": "2.0.6",
     "core-js": "3.8.1",
     "echarts": "^4.3.0",
+    "element-react": "^1.4.34",
     "element-ui": "^2.13.2",
     "file-saver": "2.0.4",
     "form-gen-parser": "^1.0.3",
@@ -24,6 +25,7 @@
     "js-cookie": "2.2.1",
     "jsencrypt": "3.0.0-rc.1",
     "json-bigint": "^0.3.0",
+    "muse-ui": "^3.0.2",
     "nprogress": "0.2.0",
     "quill": "1.3.7",
     "screenfull": "5.0.2",
@@ -37,6 +39,7 @@
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.5.5",
     "vue-router": "3.4.9",
+    "vue2-org-tree": "^1.3.5",
     "vuedraggable": "2.24.3",
     "vuex": "3.6.0",
     "workflow-bpmn-modeler": "^0.2.8"

government-manage-ui/admin/src/assets/mixins/form.js

@@ -82,6 +82,7 @@ export default {
     // 工具方法，把数字转化为字符串
     util_toString(data, array) {
       const dataCopy = Object.assign({}, data);
+    
       array.forEach(item=>{
         dataCopy[item] = dataCopy[item] === undefined ? '' : dataCopy[item]+'';
       })

government-manage-ui/admin/src/assets/mixins/table.js

@@ -217,6 +217,7 @@ export default {
     },
     // 新增
     toAdd() {
+      
       this.$router.push({
         path: this.pageInfo.add,
         query: this.tableConfig.addQuery,

government-manage-ui/admin/src/assets/utils/ajax.js

@@ -24,8 +24,19 @@ const instance = axios.create({
 
 
 instance.interceptors.request.use(config => {
-  // 也可以在这里给请求添加token之类的字段
-  config.data = Qs.stringify(config.data, {arrayFormat: 'repeat', allowDots: true});
+
+  //config.data = Qs.stringify(config.data, {arrayFormat: 'repeat', allowDots: true});
+
+  config.data = Qs.stringify(config.data, {arrayFormat: 'indices', allowDots: true});
+  //brackets
+ // 也可以在这里给请求添加token之类的字段
+  // config.headers['Content-Type'] = 'application/json;charset=UTF-8'
+  // config.headers.timestamp = Math.floor(new Date().getTime() / 1000)
+  // config.headers.token = sessionStorage.getItem('token') || ''
+
+  console.log("request config",config);
+
+
   return config;
 }, err => {
   return Promise.reject(err);

government-manage-ui/admin/src/assets/utils/globalComponents.js

@@ -9,8 +9,6 @@ import Confirm from '@/components/Confirm';
 import FormField from '@/components/FormField';
 import Upload from '@/components/Upload';
 
-import BomInfo from '@/components/BomInfo';
-
 const Prototype = function() {};
 
 Prototype.install = (Vue, options) => {
@@ -23,8 +21,6 @@ Prototype.install = (Vue, options) => {
   Vue.component('MySwitch', MySwitch) // 拨动开关
   Vue.component('Confirm', Confirm) // 局部确认窗口
   Vue.component('Upload', Upload) // 文件上传
-  Vue.component('BomInfo', BomInfo) // 文件上传
-
 }
 
 export default Prototype;

government-manage-ui/admin/src/main.js

@@ -2,15 +2,23 @@ import Vue from 'vue'
 import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 import './assets/less/base.less'
+import './assets/less/org-tree.less'
 import App from './App.vue'
 import router from './router'
 import store from './store'
 import Prototype from './assets/utils/prototype'
 import Filter from './assets/utils/filter.js'
 import GlobalComponents from './assets/utils/globalComponents.js'
+import MuseUI from 'muse-ui';
+import 'muse-ui/dist/muse-ui.css';
+
+
+import Vue2OrgTree from 'vue2-org-tree';
 
 Vue.config.productionTip = false
+Vue.use(Vue2OrgTree)
 Vue.use(ElementUI);
+Vue.use(MuseUI);
 Vue.use(Prototype);
 Vue.use(Filter);
 Vue.use(GlobalComponents); // 全局组件

government-manage-ui/admin/src/router.js

@@ -28,25 +28,28 @@ const router = new Router({
                 ...restBuilder('param', 'system/param'), // 系统管理--参数管理
                 ...restBuilder('task', 'system/task'), // 系统管理--任务管理
                 ...restBuilder('area', 'system/area'), // 系统管理-区域管理
-
+                 //工作流业务模块
                 ...restBuilder('flowable/definition', 'flowable/definition'), // 流程定义类
                 builder('flowable/definition/model', 'flowable/definition/model'),//流程设计器
-
                 ...restBuilder('form', 'flowable/task/form'),//表单列表
-
                 builder('tool/build/index', 'tool/build/index'),//表单设计器
-
                 builder('flowable/task/record/index', 'flowable/task/record/index'),//流程申请
                 ...restBuilder('task/process', 'flowable/task/process'), //我的流程
-
                 ...restBuilder('task/todo', 'flowable/task/todo'), //代办列表
-
-
                 ...restBuilder('task/finish', 'flowable/task/finished'), //已办列表
-
-                ...restBuilder('device', 'device'), // 设备管理-连接历史
-                //在此添加业务模块
-               
+                ...restBuilder('healthinfo/apply', 'healthinfo/apply'), //健康列表
+                ...restBuilder('information', 'information'), //办件列表
+
+      
+                //在此添加业务模块 
+                builder('/basics/index', 'basics/index'),//事项工作台
+                ...restBuilder('basics', 'basics'), // 一件事管理-一件事
+                ...restBuilder('basics/info', 'basics/info'), // 一件事管理-基本信息
+                ...restBuilder('accept', 'accept'), // 一件事管理-申请条件
+                ...restBuilder('flowlimit', 'flowlimit'), // 一件事管理-办理流程
+              
+
+                ...restBuilder('datum', 'datum'), // 一件事管理-材料库
                 //以下为基础路由配置
                 builder('', 'Home'),
                 builder('index', 'Home'),

government-manage-ui/admin/src/views/flowable/definition/list.vue

@@ -67,21 +67,6 @@
         </div>
       </el-upload>
 
-
-
-  <el-form-item
-            label="区域"
-            prop="parentId"
-          >
-            <el-cascader
-              @change='treeSelected'
-              :options="treeData"
-              change-on-select
-              v-model="selectedTreeID"
-            ></el-cascader>
-          </el-form-item>
-
-
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitFileForm">确 定</el-button>
         <el-button @click="upload.open = false">取 消</el-button>

government-manage-ui/admin/src/views/login/login.vue

@@ -4,7 +4,7 @@
   <div class="page page-login flex flex-v">
     <div class="form-wrap flex flex-1">
       <el-form @submit.prevent='onSubmit' ref="form" :model="form" label-width="80px" size="small">
-        <h1>哎欧梯智能-产品生产周期管理PLM</h1>
+        <h1>工作流管理平台</h1>
         <el-form-item label="用户名">
           <el-input v-model="form.loginName"></el-input>
         </el-form-item>
@@ -23,12 +23,14 @@
     </div>
 
     <div class="footer">
-      统一登陆 &copy; <a href="">哎欧梯网络科技有限公司</a> 出品
+      登陆 &copy; <a href="">信宏翔网络科技有限公司</a> 出品
     </div>
   </div>
 </template>
 
 <script>
+
+import { createSocket } from '@/assets/utils/websocket'
 const securityCodeUrl = '/m/securitycode/createCode?v=';
 
 export default {
@@ -41,9 +43,14 @@ export default {
     },
     loginSuccess({data}) {
       this.$store.commit('setUserData', data);
+
       this.$router.replace({
         path: this.redirect,
       });
+
+      //成功 创建websocket连接
+      createSocket('ws://127.0.0.1:17011/m/ws?accessToken='+data.id)
+
     },
     loginFail(error) {
       this.loading = false;

government-manage-ui/admin/src/views/system/param/list.vue

 <template>
   <div class="page">
     <LayoutTable :data='tableData' :config='tableConfig' />
+
   </div>
 </template>
 
@@ -31,12 +32,10 @@ export default {
           {
             prop: 'firstOrganize',
             label: '一级组织',
-            width: 70,
           },
           {
             prop: 'secondOrganize',
             label: '二级组织',
-            width: 70,
           },
           {
             prop: 'paramKey',
@@ -74,7 +73,7 @@ export default {
             width: 180,
             formatter: (row)=> {
               return (
-                <table-buttons row={row} onEdit={this.toEdit} onDel={this.toDel} />
+                 <table-buttons row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
               )
             },
           },

government-manage-ui/admin/src/views/system/param/show.vue

 <template>
   <layout-form>
     <el-form
-      :model="form"
-      :loading="loading"
-      :rules="rules"
-      size="small"
-      label-width="100px"
-      ref="form"
+      :model="form" 
+      :loading="loading" 
+      :rules="rules" 
+      size='small'
+      label-width='100px'
+      ref="form" 
     >
       <el-row>
-        <Field label="参数名称" prop="name" v-model="form.name" />
-        <Field
-          label="一级组织"
-          prop="firstOrganize"
-          v-model="form.firstOrganize"
-        />
-        <Field
-          label="二级组织"
-          prop="secondOrganize"
-          v-model="form.secondOrganize"
-        />
-        <Field
-          label="参数有效状态"
-          prop="validStatus"
-          v-model="form.validStatus"
-          :enumData="dict.validStatus"
-          type="select"
-        />
-        <Field
-          label="参数修改状态"
-          prop="modStatus"
-          v-model="form.modStatus"
-          :enumData="dict.modStatus"
-          type="select"
-        />
-        <Field
-          label="展现类型"
-          prop="displayType"
-          v-model="form.displayType"
-          :enumData="dict.displayType"
-          type="select"
-        />
-        <Field
-          label="参数键"
-          prop="paramKey"
-          v-model="form.paramKey"
-          :span="24"
-        />
-        <Field
-          label="参数值"
-          prop="paramValue"
-          v-model="form.paramValue"
-          :span="24"
-        />
-        <Field label="备注" prop="remark" v-model="form.remark" :span="24" />
-
-        <el-col :span="12">
-          <el-form-item label="区域" prop="parentId">
-            <el-cascader
-              @change="treeSelected"
-              @active-item-change="handleAreaChange"
-              :options="treeData"
-              change-on-select
-              v-model="selectedTreeID"
-            ></el-cascader>
-          </el-form-item>
-        </el-col>
+        <Field label="参数名称" prop="name" v-model="form.name"/>
+        <Field label="一级组织" prop="firstOrganize" v-model="form.firstOrganize"/>
+        <Field label="二级组织" prop="secondOrganize" v-model="form.secondOrganize"/>
+        <Field label="参数有效状态" prop="validStatus" v-model="form.validStatus" :enumData='dict.validStatus' type='select' />
+        <Field label="参数修改状态" prop="modStatus" v-model="form.modStatus" :enumData='dict.modStatus' type='select' />
+        <Field label="展现类型" prop="displayType" v-model="form.displayType" :enumData='dict.displayType' type='select' />
+        <Field label="参数键" prop="paramKey" v-model="form.paramKey" :span='24'/>
+        <Field label="参数值" prop="paramValue" v-model="form.paramValue" :span='24' type="textarea"/>
+        <Field label="备注" prop="remark" v-model="form.remark" :span='24'/>
+        
       </el-row>
-      <form-buttons @submit="submitForm" />
+      <form-buttons @submit='submitForm'/>
     </el-form>
   </layout-form>
 </template>
 
 <script>
-import form from "@/assets/mixins/form";
+import form from '@/assets/mixins/form';
 export default {
   mixins: [form],
-  async created() {
-    this.$post("/data/area/list", { "query.id": 1431 }, {})
-      .then((res) => {
-        const data = res.data.result.map((i) => {
-          console.log(i);
-          return {
-            value: i.id,
-            label: i.areaName,
-            level: i.areaLevel,
-            children: [],
-          };
-        });
-
-        console.log(data);
-        this.treeData = data;
-
-        // for (let area of this.areaData) {
-        //     if (val[0] === area.id) {
-        //         area.childList = res.data.area;
-        //         break;
-        //     }
-        // }
-      })
-      .catch((error) => {
-        this.$message.error(error.message);
-      });
-
-    //this.treeData = await treeCache.getTree();
-    //this.form.parentId = this.query.pid;
-  },
-  methods: {
-    afterRender() {},
-    beforeSubmit(form) {
-      form.parentId = this.selectedTreeID.slice().pop();
-      return form;
-    },
-    treeSelected(val) {
-      console.log(val);
-
-      let id=val.slice().pop();
-
-       console.log(id);
-
-       this.$post("/data/area/view", { "id": [val.slice().pop()] }, {}).then((res) => {
-            console.log(res);
-
-            let areaCode=res.entity.areaCode;
-
-            console.log("areaCode:"+areaCode);
-        
-          })
-          .catch((error) => {
-            this.$message.error(error.message);
-          });
-
-      this.form.parentId = val.slice().pop();
-    },
-    handleAreaChange(val) {
-      this.loading = true;
-      if (val.length <= 1) {
-        this.$post("/data/area/list", { "query.parentAreaId": val[0] }, {})
-          .then((res) => {
-            console.log(res);
-            for (let area of this.treeData) {
-              if (val[0] === area.value) {
-                const data = res.data.result.map((i) => {
-                  return {
-                    value: i.id,
-                    label: i.areaName,
-                    level: i.areaLevel,
-                    children: [],
-                  };
-                });
-
-                area.children = data;
-                break;
-              }
-            }
-          })
-          .catch((error) => {
-            this.$message.error(error.message);
-          });
-      } else if (val.length <= 2) {
-        this.$post("/data/area/list", { "query.parentAreaId": val[1] }, {})
-          .then((res) => {
-            for (let area of this.treeData) {
-              if (val[0] === area.value) {
-                for (let temp of area.children) {
-                  if (val[1] === temp.value) {
-                    const data = res.data.result.map((i) => {
-                      return {
-                        value: i.id,
-                        label: i.areaName,
-                        level: i.areaLevel,
-                        children: [],
-                      };
-                    });
-
-                    temp.children = data;
-                    break;
-                  }
-                }
-              }
-            }
-          })
-          .catch((error) => {
-            this.$message.error(error.message);
-          });
-      } else if (val.length <= 3) {
-        this.$post("/data/area/list", { "query.parentAreaId": val[2] }, {})
-          .then((res) => {
-            for (let area of this.treeData) {
-              if (val[0] === area.value) {
-                for (let temp of area.children) {
-                  if (val[1] === temp.value) {
-                    for (let temp1 of temp.children) {
-                      if (val[2] === temp1.value) {
-                        const data = res.data.result.map((i) => {
-                          return {
-                            value: i.id,
-                            label: i.areaName,
-                            level: i.areaLevel,
-                           
-                          };
-                        });
-
-                        temp1.children = data;
-                        break;
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          })
-          .catch((error) => {
-            this.$message.error(error.message);
-          });
-      }
-      this.loading = false;
-    },
-  },
   data() {
     return {
-      treeData: [],
-      selectedTreeID: [],
-
-      toString: ["validStatus", "modStatus", "displayType"],
+      toString: ['validStatus', 'modStatus', 'displayType'],
       rules: {
-        name: [{ required: true, message: "请输入参数名称", trigger: "blur" }],
-        paramKey: [
-          { required: true, message: "请输入参数键", trigger: "blur" },
-        ],
-        paramValue: [
-          { required: true, message: "请输入参数值", trigger: "blur" },
-        ],
+        name: [{ required: true, message: '请输入参数名称', trigger: 'blur' },],
+        paramKey: [{ required: true, message: '请输入参数键', trigger: 'blur' },],
+        paramValue: [{ required: true, message: '请输入参数值', trigger: 'blur' },],
       },
-    };
-  },
-};
+    }
+  }
+}
 </script>
 

government-manage-ui/admin/src/views/tool/build/RightPanel.vue

@@ -643,7 +643,7 @@
       </el-scrollbar>
     </div>
 
-    <treeNode-dialog :visible.sync="dialogVisible" title="添加选项" @commit="addNode" />
+    <classifyTreeNode-dialog :visible.sync="dialogVisible" title="添加选项" @commit="addNode" />
     <icons-dialog :visible.sync="iconsVisible" :current="activeData[currentIconModel]" @select="setIcon" />
   </div>
 </template>

government-manage-ui/admin/yarn.lock

@@ -864,6 +864,13 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
+"@babel/runtime@^7.1.2":
+  version "7.15.3"
+  resolved "https://registry.nlark.com/@babel/runtime/download/@babel/runtime-7.15.3.tgz#2e1c2880ca118e5b2f9988322bd8a7656a32502b"
+  integrity sha1-LhwogMoRjlsvmYgyK9inZWoyUCs=
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
 "@babel/runtime@^7.11.0", "@babel/runtime@^7.8.4":
   version "7.14.8"
   resolved "https://registry.nlark.com/@babel/runtime/download/@babel/runtime-7.14.8.tgz#7119a56f421018852694290b9f9148097391b446"
@@ -1749,6 +1756,11 @@ async-limiter@~1.0.0:
   resolved "https://registry.nlark.com/async-limiter/download/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
   integrity sha1-3TeelPDbgxCwgpH51kwyCXZmF/0=
 
+async-validator@^1.10.1:
+  version "1.12.2"
+  resolved "https://registry.nlark.com/async-validator/download/async-validator-1.12.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fasync-validator%2Fdownload%2Fasync-validator-1.12.2.tgz#beae671e7174d2938b7b4b69d2fb7e722b7fd72c"
+  integrity sha1-vq5nHnF00pOLe0tp0vt+cit/1yw=
+
 async-validator@~1.8.1:
   version "1.8.5"
   resolved "https://registry.nlark.com/async-validator/download/async-validator-1.8.5.tgz?cache=0&sync_timestamp=1619756447750&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fasync-validator%2Fdownload%2Fasync-validator-1.8.5.tgz#dc3e08ec1fd0dddb67e60842f02c0cd1cec6d7f0"
@@ -1978,6 +1990,11 @@ body-parser@1.19.0:
     raw-body "2.4.0"
     type-is "~1.6.17"
 
+body-scroll-lock@^2.6.1:
+  version "2.7.1"
+  resolved "https://registry.nlark.com/body-scroll-lock/download/body-scroll-lock-2.7.1.tgz#caf3f9c91773af1ffb684cd66ed9137b5b737014"
+  integrity sha1-yvP5yRdzrx/7aEzWbtkTe1tzcBQ=
+
 bonjour@^3.5.0:
   version "3.5.0"
   resolved "https://registry.nlark.com/bonjour/download/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"
@@ -2502,6 +2519,11 @@ class-utils@^0.3.5:
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
+classnames@^2.2.6:
+  version "2.3.1"
+  resolved "https://registry.nlark.com/classnames/download/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e"
+  integrity sha1-38+jiR4wbsHa0QXQ6I9EF7hTXo4=
+
 clean-css@4.2.x:
   version "4.2.3"
   resolved "https://registry.nlark.com/clean-css/download/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78"
@@ -3195,6 +3217,11 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
+dayjs@^1.8.2:
+  version "1.10.6"
+  resolved "https://registry.nlark.com/dayjs/download/dayjs-1.10.6.tgz?cache=0&sync_timestamp=1625558021596&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdayjs%2Fdownload%2Fdayjs-1.10.6.tgz#288b2aa82f2d8418a6c9d4df5898c0737ad02a63"
+  integrity sha1-KIsqqC8thBimydTfWJjAc3rQKmM=
+
 de-indent@^1.0.2:
   version "1.0.2"
   resolved "https://registry.nlark.com/de-indent/download/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
@@ -3455,6 +3482,13 @@ dom-converter@^0.2.0:
   dependencies:
     utila "~0.4"
 
+dom-helpers@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.nlark.com/dom-helpers/download/dom-helpers-3.4.0.tgz#e9b369700f959f62ecde5a6babde4bccd9169af8"
+  integrity sha1-6bNpcA+Vn2Ls3lprq95LzNkWmvg=
+  dependencies:
+    "@babel/runtime" "^7.1.2"
+
 dom-serializer@0:
   version "0.2.2"
   resolved "https://registry.nlark.com/dom-serializer/download/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
@@ -3620,6 +3654,20 @@ electron-to-chromium@^1.3.723:
   resolved "https://registry.nlark.com/electron-to-chromium/download/electron-to-chromium-1.3.792.tgz#791b0d8fcf7411885d086193fb49aaef0c1594ca"
   integrity sha1-eRsNj890EYhdCGGT+0mq7wwVlMo=
 
+element-react@^1.4.34:
+  version "1.4.34"
+  resolved "https://registry.nlark.com/element-react/download/element-react-1.4.34.tgz#e27cc0ca31f86fed46fe46fbc8fd330c156c383c"
+  integrity sha1-4nzAyjH4b+1G/kb7yP0zDBVsODw=
+  dependencies:
+    async-validator "^1.10.1"
+    classnames "^2.2.6"
+    popper.js "^1.14.7"
+    prop-types "^15.6.2"
+    raf "^3.4.1"
+    react-click-outside "^3.0.1"
+    react-transition-group "^2.5.3"
+    throttle-debounce "^2.1.0"
+
 element-ui@^2.12.0, element-ui@^2.13.2:
   version "2.15.3"
   resolved "https://registry.nlark.com/element-ui/download/element-ui-2.15.3.tgz#55108ab82a3bcc646e7b0570871c48ba96300652"
@@ -4829,6 +4877,11 @@ hmac-drbg@^1.0.1:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.1"
 
+hoist-non-react-statics@^2.1.1:
+  version "2.5.5"
+  resolved "https://registry.nlark.com/hoist-non-react-statics/download/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
+  integrity sha1-xZA89AnA39kI84jmGdhrnBF0y0c=
+
 hoopy@^0.1.4:
   version "0.1.4"
   resolved "https://registry.nlark.com/hoopy/download/hoopy-0.1.4.tgz#609207d661100033a9a9402ad3dea677381c1b1d"
@@ -5631,7 +5684,7 @@ js-queue@2.0.2:
   dependencies:
     easy-stack "^1.0.1"
 
-js-tokens@^4.0.0:
+"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.nlark.com/js-tokens/download/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha1-GSA/tZmR35jjoocFDUZHzerzJJk=
@@ -5742,6 +5795,11 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
+keycode@^2.1.9:
+  version "2.2.0"
+  resolved "https://registry.nlark.com/keycode/download/keycode-2.2.0.tgz#3d0af56dc7b8b8e5cba8d0a97f107204eec22b04"
+  integrity sha1-PQr1bce4uOXLqNCpfxByBO7CKwQ=
+
 killable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.nlark.com/killable/download/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
@@ -6020,6 +6078,13 @@ loglevel@^1.6.8:
   resolved "https://registry.nlark.com/loglevel/download/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197"
   integrity sha1-AF/eL15uRwaPk1/yhXPhJe9y8Zc=
 
+loose-envify@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.nlark.com/loose-envify/download/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
+  integrity sha1-ce5R+nvkyuwaY4OffmgtgTLTDK8=
+  dependencies:
+    js-tokens "^3.0.0 || ^4.0.0"
+
 loud-rejection@^1.0.0:
   version "1.6.0"
   resolved "https://registry.nlark.com/loud-rejection/download/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
@@ -6466,6 +6531,17 @@ multicast-dns@^6.0.1:
     dns-packet "^1.3.1"
     thunky "^1.0.2"
 
+muse-ui@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.nlark.com/muse-ui/download/muse-ui-3.0.2.tgz#f292e8a063d625d35b1dce1b1504bc0cccd78e65"
+  integrity sha1-8pLooGPWJdNbHc4bFQS8DMzXjmU=
+  dependencies:
+    body-scroll-lock "^2.6.1"
+    dayjs "^1.8.2"
+    keycode "^2.1.9"
+    normalize-wheel "^1.0.1"
+    resize-observer-polyfill "^1.5.0"
+
 mute-stream@0.0.8:
   version "0.0.8"
   resolved "https://registry.nlark.com/mute-stream/download/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
@@ -7273,6 +7349,11 @@ pnp-webpack-plugin@^1.6.4:
   dependencies:
     ts-pnp "^1.1.6"
 
+popper.js@^1.14.7:
+  version "1.16.1"
+  resolved "https://registry.nlark.com/popper.js/download/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b"
+  integrity sha1-KiI8s9x7YhPXQOQDcr5A3kPmWxs=
+
 portfinder@^1.0.26:
   version "1.0.28"
   resolved "https://registry.nlark.com/portfinder/download/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778"
@@ -7727,6 +7808,15 @@ promise-inflight@^1.0.1:
   resolved "https://registry.nlark.com/promise-inflight/download/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
   integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
 
+prop-types@^15.6.2:
+  version "15.7.2"
+  resolved "https://registry.nlark.com/prop-types/download/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
+  integrity sha1-UsQedbjIfnK52TYOAga5ncv/psU=
+  dependencies:
+    loose-envify "^1.4.0"
+    object-assign "^4.1.1"
+    react-is "^16.8.1"
+
 proto-list@~1.2.1:
   version "1.2.4"
   resolved "https://registry.nlark.com/proto-list/download/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
@@ -7879,6 +7969,13 @@ quill@1.3.7:
     parchment "^1.1.4"
     quill-delta "^3.6.2"
 
+raf@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.nlark.com/raf/download/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39"
+  integrity sha1-B0LpmkplUvRF1z4+4DKK8P8e3jk=
+  dependencies:
+    performance-now "^2.1.0"
+
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0:
   version "2.1.0"
   resolved "https://registry.nlark.com/randombytes/download/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
@@ -7909,6 +8006,33 @@ raw-body@2.4.0:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
+react-click-outside@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.nlark.com/react-click-outside/download/react-click-outside-3.0.1.tgz#6e77e84d2f17afaaac26dbad743cbbf909f5e24c"
+  integrity sha1-bnfoTS8Xr6qsJtutdDy7+Qn14kw=
+  dependencies:
+    hoist-non-react-statics "^2.1.1"
+
+react-is@^16.8.1:
+  version "16.13.1"
+  resolved "https://registry.nlark.com/react-is/download/react-is-16.13.1.tgz?cache=0&sync_timestamp=1629303544516&other_urls=https%3A%2F%2Fregistry.nlark.com%2Freact-is%2Fdownload%2Freact-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
+  integrity sha1-eJcppNw23imZ3BVt1sHZwYzqVqQ=
+
+react-lifecycles-compat@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.nlark.com/react-lifecycles-compat/download/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
+  integrity sha1-TxonOv38jzSIqMUWv9p4+HI1I2I=
+
+react-transition-group@^2.5.3:
+  version "2.9.0"
+  resolved "https://registry.nlark.com/react-transition-group/download/react-transition-group-2.9.0.tgz#df9cdb025796211151a436c69a8f3b97b5b07c8d"
+  integrity sha1-35zbAleWIRFRpDbGmo87l7WwfI0=
+  dependencies:
+    dom-helpers "^3.4.0"
+    loose-envify "^1.4.0"
+    prop-types "^15.6.2"
+    react-lifecycles-compat "^3.0.4"
+
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.nlark.com/read-pkg-up/download/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
@@ -9227,6 +9351,11 @@ throttle-debounce@^1.0.1:
   resolved "https://registry.nlark.com/throttle-debounce/download/throttle-debounce-1.1.0.tgz#51853da37be68a155cb6e827b3514a3c422e89cd"
   integrity sha1-UYU9o3vmihVctugns1FKPEIuic0=
 
+throttle-debounce@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.nlark.com/throttle-debounce/download/throttle-debounce-2.3.0.tgz#fd31865e66502071e411817e241465b3e9c372e2"
+  integrity sha1-/TGGXmZQIHHkEYF+JBRls+nDcuI=
+
 through2@^2.0.0:
   version "2.0.5"
   resolved "https://registry.nlark.com/through2/download/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
@@ -9800,6 +9929,11 @@ vue-template-es2015-compiler@^1.9.0:
   resolved "https://registry.nlark.com/vue-template-es2015-compiler/download/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
   integrity sha1-HuO8mhbsv1EYvjNLsV+cRvgvWCU=
 
+vue2-org-tree@^1.3.5:
+  version "1.3.5"
+  resolved "https://registry.npm.taobao.org/vue2-org-tree/download/vue2-org-tree-1.3.5.tgz#446a528c2313a39b5320a11b3083916db8b5dc62"
+  integrity sha1-RGpSjCMTo5tTIKEbMIORbbi13GI=
+
 vue@^2.6.10, vue@^2.6.11, vue@^2.6.14:
   version "2.6.14"
   resolved "https://registry.nlark.com/vue/download/vue-2.6.14.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fvue%2Fdownload%2Fvue-2.6.14.tgz#e51aa5250250d569a3fbad3a8a5a687d6036e235"

government-manager/src/main/java/com/mortals/xhx/base/framework/aspect/OperlogAspect.java

@@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
 import org.slf4j.Logger;
@@ -23,7 +24,7 @@ import com.mortals.xhx.base.system.oper.service.OperLogService;
  * 操作日志记录
  */
 @Component
-public class OperlogAspect extends FileLogServiceImpl implements ILogService {
+public class OperlogAspect extends FileLogServiceImpl   implements ILogService {
 
     private final static Logger logger = LoggerFactory.getLogger(OperlogAspect.class);
 

government-manager/src/main/java/com/mortals/xhx/base/framework/exception/ExceptionHandle.java

@@ -34,7 +34,7 @@ public class ExceptionHandle {
 			AppException ex = (AppException) e;
 			ret.put(KEY_RESULT_MSG, ex.getMessage());
 		} else {
-			log.error("[system error]{}", e);
+			log.error("[system error]", e);
 			ret.put(KEY_RESULT_MSG, "unknown exception!");
 		}
 		return ret.toJSONString();

government-manager/src/main/java/com/mortals/xhx/base/login/interceptor/AuthJsonInterceptor.java

@@ -11,11 +11,13 @@ import com.mortals.framework.util.StringUtils;
 import com.mortals.framework.web.interceptor.BaseInterceptor;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
-//@Component
+@Order(1)
+@Component
 public class AuthJsonInterceptor extends BaseInterceptor {
 
     @Autowired

government-manager/src/main/java/com/mortals/xhx/base/system/area/service/impl/AreaServiceImpl.java

@@ -8,6 +8,7 @@
 
 package com.mortals.xhx.base.system.area.service.impl;
 
+import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
 import org.springframework.stereotype.Service;
 
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
@@ -24,7 +25,9 @@ import com.mortals.xhx.base.system.area.service.AreaService;
  * @version 1.0.0
  */
 @Service("areaService")
-public class AreaServiceImpl extends AbstractCRUDServiceImpl<AreaDao,AreaEntity,Long> implements AreaService {
+public class AreaServiceImpl extends AbstractCRUDCacheServiceImpl<AreaDao,AreaEntity,Long> implements AreaService {
+
+
 
     /**
      * 格式化区域ID
@@ -33,6 +36,9 @@ public class AreaServiceImpl extends AbstractCRUDServiceImpl<AreaDao,AreaEntity,
      */
     @Override
     public Long formatAreaId(Long areaId) {
+
+
+
         Long id = areaId;
         if(id != null){
             String area = String.valueOf(id);

government-manager/src/main/java/com/mortals/xhx/base/system/area/web/AreaController.java

@@ -11,6 +11,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.mortals.framework.exception.AppException;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -61,25 +62,13 @@ public class AreaController extends BaseCRUDJsonMappingController<AreaService, A
         super.init(request, response, form, model, context);
     }
 
-    /**
-     * 查询区域信息
-     */
-    @PostMapping(value="list")
-    public String list(HttpServletRequest request, HttpServletResponse response, AreaForm form) {
-        try{
-            if (form.getQuery().getStatus() == null) {
-                form.getQuery().setStatus(YesNo.YES.getValue());
-            }
-            if(StringUtils.isEmpty(form.getQuery().getName())){
-                form.getQuery().setLevel(AreaLevelEnum.PROVINCE.getValue());
-            }
-            return super.list(request, response, form);
-        }catch(Exception e){
-            log.error("查询区域信息列表错误",e);
-            JSONObject ret = new JSONObject();
-            ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
-            ret.put(KEY_RESULT_MSG, super.convertException(e));
-            return ret.toJSONString();
+    @Override
+    protected void doListBefore(HttpServletRequest request, HttpServletResponse response, AreaForm form, Map<String, Object> model, Context context) throws AppException {
+        if (form.getQuery().getStatus() == null) {
+            form.getQuery().setStatus(YesNo.YES.getValue());
+        }
+        if(StringUtils.isEmpty(form.getQuery().getName())){
+            form.getQuery().setLevel(AreaLevelEnum.PROVINCE.getValue());
         }
     }
 
@@ -127,7 +116,7 @@ public class AreaController extends BaseCRUDJsonMappingController<AreaService, A
     @PostMapping(value = "getAllAreaList")
     public String getAllAreaList(HttpServletRequest request, HttpServletResponse response, AreaForm form) {
         try{
-            return super.list(request, response, form);
+            return super.list(form);
         }catch(Exception e){
             log.error("查询所有区域信息列表错误",e);
             JSONObject ret = new JSONObject();

government-manager/src/main/java/com/mortals/xhx/base/system/area/web/AreaForm.java

@@ -21,7 +21,7 @@ import com.mortals.xhx.base.system.area.model.AreaQuery;
  * @version 1.0.0
  */
 public class AreaForm extends BaseCRUDFormLong<AreaEntity> {
-	private AreaEntity area = new AreaEntity();
+	private AreaEntity entity = new AreaEntity();
 	private AreaQuery query = new AreaQuery(); 
 	public AreaForm(){
 		
@@ -29,16 +29,13 @@ public class AreaForm extends BaseCRUDFormLong<AreaEntity> {
 	
     @Override
 	public AreaEntity getEntity() {
-		return area;
-	}
-	public AreaEntity getArea() {
-		return area;
+		return entity;
 	}
 
-	public void setArea(AreaEntity area) {
-		this.area = area;
+	public void setEntity(AreaEntity entity) {
+		this.entity = entity;
 	}
-	
+
 	@Override
 	public AreaQuery getQuery() {
 		return query;

government-manager/src/main/java/com/mortals/xhx/base/system/idgenerator/service/impl/IdgeneratorServiceImpl.java

@@ -42,11 +42,6 @@ public class IdgeneratorServiceImpl implements IdgeneratorService {
 
     /**
      * <B>Description</B> 生成器key枚举 <br />
-     * <B>Copyright</B> Copyright (c) 2016 www.ulute.com All rights reserved.
-     * <br />
-     * 本软件源代码版权归哎媲媲网络,未经许可不得任意复制与传播.<br />
-     * <B>Company</B> 哎媲媲网络
-     *
      * @author
      * @createTime 2016年3月16日 上午10:07:19
      */

government-manager/src/main/java/com/mortals/xhx/base/system/menu/web/MenuController.java

@@ -51,84 +51,6 @@ public class MenuController extends BaseCRUDJsonMappingController<MenuService, M
 		super.setModuleDesc("菜单信息");
 	}
 
-	/**
-	 * 查询菜单信息
-	 */
-	@PostMapping(value = "list")
-	public String list(HttpServletRequest request, HttpServletResponse response, MenuForm form) {
-		try {
-			return super.list(request, response, form);
-		} catch (Exception e) {
-			JSONObject ret = new JSONObject();
-			ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
-			ret.put(KEY_RESULT_MSG, super.convertException(e));
-			return ret.toJSONString();
-		}
-	}
-
-	/**
-	 * 添加菜单信息
-	 */
-	@PostMapping(value = "add")
-	public String add(HttpServletRequest request, HttpServletResponse response, MenuForm form) {
-		try {
-			return super.add(request, response, form);
-		} catch (Exception e) {
-			JSONObject ret = new JSONObject();
-			ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
-			ret.put(KEY_RESULT_MSG, super.convertException(e));
-			return ret.toJSONString();
-		}
-	}
-
-	/**
-	 * 编辑菜单信息
-	 */
-	@PostMapping(value = "edit")
-	public String edit(HttpServletRequest request, HttpServletResponse response, MenuForm form) {
-		try {
-			return super.edit(request, response, form);
-		} catch (Exception e) {
-			JSONObject ret = new JSONObject();
-			ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
-			ret.put(KEY_RESULT_MSG, super.convertException(e));
-			return ret.toJSONString();
-		}
-	}
-
-	/**
-	 * 保存菜单信息
-	 */
-	@PostMapping(value = "save")
-	public String save(HttpServletRequest request, HttpServletResponse response, MenuForm form) {
-		if(form.getEntity().getGroupName() == null)
-			form.getEntity().setGroupName(0);
-		return super.save(request, response, form);
-	}
-
-	/**
-	 * 查看菜单信息
-	 */
-	@Override
-	@PostMapping(value = "view")
-	public String view(HttpServletRequest request, HttpServletResponse response, MenuForm form) {
-		try {
-			return super.view(request, response, form);
-		} catch (Exception e) {
-			JSONObject ret = new JSONObject();
-			ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
-			ret.put(KEY_RESULT_MSG, super.convertException(e));
-			return ret.toJSONString();
-		}
-	}
-
-	/**
-	 * 删除菜单信息
-	 */
-	@PostMapping(value = "delete")
-	public String delete(HttpServletRequest request, HttpServletResponse response, MenuForm form) {
-		return super.delete(request, response, form);
-	}
 
 	@Override
 	protected void doListBefore(HttpServletRequest request, HttpServletResponse response, MenuForm form, Map<String, Object> model, Context context) throws AppException {

government-manager/src/main/java/com/mortals/xhx/base/system/menu/web/MenuForm.java

@@ -21,7 +21,7 @@ import com.mortals.xhx.base.system.menu.model.MenuQuery;
  * @version 1.0.0
  */
 public class MenuForm extends BaseCRUDFormLong<MenuEntity> {
-	private MenuEntity menu = new MenuEntity();
+	private MenuEntity entity = new MenuEntity();
 	private MenuQuery query = new MenuQuery();
 	public MenuForm(){
 		
@@ -29,16 +29,13 @@ public class MenuForm extends BaseCRUDFormLong<MenuEntity> {
 	
     @Override
 	public MenuEntity getEntity() {
-		return menu;
-	}
-	public MenuEntity getMenu() {
-		return menu;
+		return entity;
 	}
 
-	public void setMenu(MenuEntity menu) {
-		this.menu = menu;
+	public void setEntity(MenuEntity entity) {
+		this.entity = entity;
 	}
-	
+
 	@Override
 	public MenuQuery getQuery() {
 		return query;

government-manager/src/main/java/com/mortals/xhx/base/system/oper/service/impl/OperLogServiceImpl.java

@@ -113,7 +113,7 @@ public class OperLogServiceImpl extends AbstractCRUDServiceImpl<OperLogDao,OperL
         operLogEntity.setUserName(userName);
         operLogEntity.setContent(content);
 
-        super.save(operLogEntity, null);
+        save(operLogEntity, null);
     }
     private void formatterLogContent(OperLogEntity operLogEntity, String content, String id, OperTypeEnum operType) {
         if (operType == OperTypeEnum.SAVE) {

government-manager/src/main/java/com/mortals/xhx/base/system/oper/web/OperLogController.java

@@ -9,6 +9,7 @@ package com.mortals.xhx.base.system.oper.web;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.xhx.base.system.oper.model.OperLogEntity;
@@ -56,25 +57,13 @@ public class OperLogController extends BaseCRUDJsonMappingController<OperLogServ
 		super.init(request, response, form, model, context);
 	}
 
-	/**
-	 * 查询产品基本信息
-	 */
 	@Override
-	@PostMapping(value = "list")
-	public String list(HttpServletRequest request, HttpServletResponse response, OperLogForm form) {
-		try {
-			form.getQuery().setOrderColList(new ArrayList<OrderCol>() {
-				{
-					add(new OrderCol("a.logDate", "desc"));
-				}
-			});
-			return super.list(request, response, form);
-		} catch (Exception e) {
-			JSONObject ret = new JSONObject();
-			ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
-			ret.put(KEY_RESULT_MSG, super.convertException(e));
-			return ret.toJSONString();
-		}
+	protected void doListBefore(HttpServletRequest request, HttpServletResponse response, OperLogForm form, Map<String, Object> model, Context context) throws AppException {
+		form.getQuery().setOrderColList(new ArrayList<OrderCol>() {
+			{
+				add(new OrderCol("a.logDate", "desc"));
+			}
+		});
 	}
-	
+
 }
\ No newline at end of file

government-manager/src/main/java/com/mortals/xhx/base/system/oper/web/OperLogForm.java

@@ -21,7 +21,7 @@ import com.mortals.xhx.base.system.oper.model.OperLogQuery;
  * @version 1.0.0
  */
 public class OperLogForm extends BaseCRUDFormLong<OperLogEntity> {
-	private OperLogEntity operLog = new OperLogEntity();
+	private OperLogEntity entity = new OperLogEntity();
 	private OperLogQuery query = new OperLogQuery();
 	public OperLogForm(){
 		
@@ -29,16 +29,13 @@ public class OperLogForm extends BaseCRUDFormLong<OperLogEntity> {
 	
     @Override
 	public OperLogEntity getEntity() {
-		return operLog;
-	}
-	public OperLogEntity getOperLog() {
-		return operLog;
+		return entity;
 	}
 
-	public void setOperLog(OperLogEntity operLog) {
-		this.operLog = operLog;
+	public void setEntity(OperLogEntity entity) {
+		this.entity = entity;
 	}
-	
+
 	@Override
 	public OperLogQuery getQuery() {
 		return query;

government-manager/src/main/java/com/mortals/xhx/base/system/param/service/ParamService.java

@@ -4,6 +4,8 @@ package com.mortals.xhx.base.system.param.service;
 import com.mortals.framework.service.ICRUDCacheService;
 import com.mortals.xhx.base.system.param.model.ParamEntity;
 
+import java.util.Map;
+
 /**
  * <p>Title: 参数信息</p>
  * <p>Description: ParamService service接口 </p>
@@ -22,4 +24,13 @@ public interface ParamService extends ICRUDCacheService<ParamEntity, Long> {
 	 */
     String getValueByKey(String key);
 
+	/**
+	 * 通过firstOrganize获取配置参数key-value
+	 *
+	 * @param firstOrganize
+	 * @param excludeParamKeys 需要过虑掉的paramKey
+	 * @return
+	 */
+	Map<String, String> getParamByFirstOrganize(String firstOrganize, String... excludeParamKeys);
+
 }
\ No newline at end of file

government-manager/src/main/java/com/mortals/xhx/base/system/param/service/impl/ParamServiceImpl.java

@@ -5,10 +5,16 @@ import com.mortals.framework.model.Context;
 import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
 import com.mortals.xhx.base.system.param.dao.ParamDao;
 import com.mortals.xhx.base.system.param.model.ParamEntity;
+import com.mortals.xhx.base.system.param.model.ParamQuery;
 import com.mortals.xhx.base.system.param.service.ParamService;
 
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 /**
  * <p>Title: 参数信息</p>
  * <p>Description: ParamServiceImpl service接口 </p>
@@ -58,4 +64,14 @@ public class ParamServiceImpl extends AbstractCRUDCacheServiceImpl<ParamDao, Par
     public String getValueByKey(String key) {
         return cacheService.get(key);
     }
+
+    @Override
+    public Map<String, String> getParamByFirstOrganize(String firstOrganize, String... excludeParamKeys) {
+        ParamQuery query = new ParamQuery();
+        query.setFirstOrganize(firstOrganize);
+        List<ParamEntity> list = this.getDao().getList(query);
+        return list.stream().filter(s -> {
+            return !Arrays.asList(excludeParamKeys).contains(s.getParamKey());
+        }).collect(Collectors.toMap(ParamEntity::getParamKey, ParamEntity::getParamValue));
+    }
 }
\ No newline at end of file

government-manager/src/main/java/com/mortals/xhx/base/system/param/web/ParamController.java

 /**
-* 文件：ParamController.java
-* 版本：1.0.0
-* 日期：
-* Copyright ® 
-* All right reserved.
-*/
+ * 文件：ParamController.java
+ * 版本：1.0.0
+ * 日期：
+ * Copyright ®
+ * All right reserved.
+ */
 package com.mortals.xhx.base.system.param.web;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.annotation.RepeatSubmit;
 import com.mortals.framework.common.code.PageDisplayType;
 import com.mortals.framework.model.Context;
 
+import com.mortals.framework.util.FileUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -32,120 +35,44 @@ import java.util.Map;
  * <p>Description: ParamController  </p>
  * <p>Copyright: Copyright &reg;  </p>
  * <p>Company: </p>
- * @author 
+ * @author
  * @version 1.0.0
  */
 @RestController
 @RequestMapping("param")
-public class ParamController extends BaseCRUDJsonMappingController<ParamService,ParamForm,ParamEntity,Long> {
-
-	public ParamController(){
-		super.setFormClass(ParamForm.class);
-		super.setModuleDesc("参数信息");
-	}
-
-	@Override
-	protected void init(HttpServletRequest request, HttpServletResponse response, ParamForm form,
-						Map<String, Object> model, Context context) {
-		Map<String, Object> status = new HashMap<String, Object>();
-		status.put("validStatus", DataSatusEnum.getEnumMap(DataSatusEnum.CLOSE.getValue(),
-				DataSatusEnum.DELETE.getValue(), DataSatusEnum.OVERDUE.getValue(), DataSatusEnum.USEOUT.getValue()));
-		status.put("modStatus", ModStatusEnum.getEnumMap());
-		status.put("displayType", getPageDisplayType());
-		model.put(KEY_RESULT_DICT, status);
-		super.init(request, response, form, model, context);
-	}
+public class ParamController extends BaseCRUDJsonMappingController<ParamService, ParamForm, ParamEntity, Long> {
 
-	/**
-	 * 查询参数信息
-	 */
-	@Override
-	@PostMapping(value = "list")
-	public String list(HttpServletRequest request, HttpServletResponse response, ParamForm form) {
-		try {
-			return super.list(request, response, form);
-		} catch (Exception e) {
-			JSONObject ret = new JSONObject();
-			ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
-			ret.put(KEY_RESULT_MSG, super.convertException(e));
-			return ret.toJSONString();
-		}
-	}
+    public ParamController() {
+        super.setFormClass(ParamForm.class);
+        super.setModuleDesc("参数信息");
+    }
 
-	/**
-	 * 添加参数信息
-	 */
-	@Override
-	@PostMapping(value = "add")
-	public String add(HttpServletRequest request, HttpServletResponse response, ParamForm form) {
-		try {
-			return super.add(request, response, form);
-		} catch (Exception e) {
-			JSONObject ret = new JSONObject();
-			ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
-			ret.put(KEY_RESULT_MSG, super.convertException(e));
-			return ret.toJSONString();
-		}
-	}
+    @Override
+    protected void init(HttpServletRequest request, HttpServletResponse response, ParamForm form,
+                        Map<String, Object> model, Context context) {
+        Map<String, Object> status = new HashMap<String, Object>();
+        status.put("validStatus", DataSatusEnum.getEnumMap(DataSatusEnum.CLOSE.getValue(),
+                DataSatusEnum.DELETE.getValue(), DataSatusEnum.OVERDUE.getValue(), DataSatusEnum.USEOUT.getValue()));
+        status.put("modStatus", ModStatusEnum.getEnumMap());
+        status.put("displayType", getPageDisplayType());
+        model.put(KEY_RESULT_DICT, status);
 
-	/**
-	 * 编辑参数信息
-	 */
-	@Override
-	@PostMapping(value = "edit")
-	public String edit(HttpServletRequest request, HttpServletResponse response, ParamForm form) {
-		try {
-			return super.edit(request, response, form);
-		} catch (Exception e) {
-			JSONObject ret = new JSONObject();
-			ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
-			ret.put(KEY_RESULT_MSG, super.convertException(e));
-			return ret.toJSONString();
-		}
-	}
+        super.init(request, response, form, model, context);
+    }
 
-	/**
-	 * 保存参数信息
-	 */
-	@Override
-	@PostMapping(value = "save")
-	public String save(HttpServletRequest request, HttpServletResponse response, ParamForm form) {
-		return super.save(request, response, form);
-	}
 
-	/**
-	 * 删除参数信息
-	 */
-	@Override
-	@PostMapping(value = "delete")
-	public String delete(HttpServletRequest request, HttpServletResponse response, ParamForm form) {
-		return super.delete(request, response, form);
-	}
+    private Map<String, Object> getPageDisplayType() {
+        PageDisplayType[] pageDisplayTypes = PageDisplayType.values();
+        Map<String, Object> result = new HashMap<>(pageDisplayTypes.length);
+        for (PageDisplayType pageDisplayType : pageDisplayTypes) {
+            result.put(pageDisplayType.getValue() + "", pageDisplayType.getDesc());
+        }
+        return result;
+    }
 
-	/**
-	 * 查看参数信息
-	 */
-	@Override
-	@PostMapping(value = "view")
-	public String view(HttpServletRequest request, HttpServletResponse response, ParamForm form) {
-		try {
-			return super.view(request, response, form);
-		} catch (Exception e) {
-			JSONObject ret = new JSONObject();
-			ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
-			ret.put(KEY_RESULT_MSG, super.convertException(e));
-			return ret.toJSONString();
-		}
-	}
 
+    public static void main(String[] args) {
+        FileUtil.delete("E:\\pic\\1.png");
+    }
 
-	private Map<String,Object> getPageDisplayType(){
-		PageDisplayType[] pageDisplayTypes = PageDisplayType.values();
-		Map<String,Object> result = new HashMap<>(pageDisplayTypes.length);
-		for (PageDisplayType pageDisplayType : pageDisplayTypes) {
-			result.put(pageDisplayType.getValue()+"",pageDisplayType.getDesc());
-		}
-		return result;
-	}
-	
 }
\ No newline at end of file

government-manager/src/main/java/com/mortals/xhx/base/system/param/web/ParamForm.java

@@ -8,6 +8,7 @@
 package com.mortals.xhx.base.system.param.web;
 
 
+import com.alibaba.fastjson.JSON;
 import com.mortals.framework.web.BaseCRUDFormLong;
 import com.mortals.xhx.base.system.param.model.ParamEntity;
 import com.mortals.xhx.base.system.param.model.ParamQuery;
@@ -21,7 +22,7 @@ import com.mortals.xhx.base.system.param.model.ParamQuery;
  * @version 1.0.0
  */
 public class ParamForm extends BaseCRUDFormLong<ParamEntity> {
-	private ParamEntity param = new ParamEntity();
+	private ParamEntity entity = new ParamEntity();
 	private ParamQuery query = new ParamQuery();
 	public ParamForm(){
 		
@@ -29,14 +30,11 @@ public class ParamForm extends BaseCRUDFormLong<ParamEntity> {
 	
     @Override
 	public ParamEntity getEntity() {
-		return param;
-	}
-	public ParamEntity getParam() {
-		return param;
+		return entity;
 	}
 
-	public void setParam(ParamEntity param) {
-		this.param = param;
+	public void setEntity(ParamEntity entity) {
+		this.entity = entity;
 	}
 	
 	@Override
@@ -47,4 +45,21 @@ public class ParamForm extends BaseCRUDFormLong<ParamEntity> {
 	public void setQuery(ParamQuery query) {
 		this.query = query;
 	}
+
+	public static void main(String[] args) {
+
+		ParamForm form = new ParamForm();
+
+		String entityName =form.getEntity().getClass().getSimpleName();
+		System.out.println(entityName);
+		if ((entityName = entityName.substring(0, 1).toLowerCase() + entityName.substring(1, entityName.length())).endsWith("Entity")) {
+			entityName = entityName.substring(0, entityName.length() - "Entity".length());
+		}
+
+		System.out.println(entityName);
+
+
+		System.out.println(JSON.toJSONString(form));
+
+	}
 }
\ No newline at end of file

government-manager/src/main/java/com/mortals/xhx/base/system/resource/web/ResourceController.java

@@ -60,72 +60,6 @@ public class ResourceController extends BaseCRUDJsonMappingController<ResourceSe
 		super.init(request, response, form, model, context);
 	}
 
-	/**
-	 * 查询资源列表
-	 */
-	@Override
-	@RequestMapping(value = "list")
-	public String list(HttpServletRequest request, HttpServletResponse response, ResourceForm form) {
-		try {
-			return super.list(request, response, form);
-		} catch (Exception e) {
-			JSONObject ret = new JSONObject();
-			ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
-			ret.put(KEY_RESULT_MSG, super.convertException(e));
-			return ret.toJSONString();
-		}
-	}
-
-	/**
-	 * 添加资源
-	 */
-	@Override
-	@RequestMapping(value = "add")
-	public String add(HttpServletRequest request, HttpServletResponse response, ResourceForm form) {
-		try {
-			return super.add(request, response, form);
-		} catch (Exception e) {
-			JSONObject ret = new JSONObject();
-			ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
-			ret.put(KEY_RESULT_MSG, super.convertException(e));
-			return ret.toJSONString();
-		}
-	}
-
-	/**
-	 * 编辑资源
-	 */
-	@Override
-	@RequestMapping(value = "edit")
-	public String edit(HttpServletRequest request, HttpServletResponse response, ResourceForm form) {
-		try {
-			return super.edit(request, response, form);
-		} catch (Exception e) {
-			JSONObject ret = new JSONObject();
-			ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
-			ret.put(KEY_RESULT_MSG, super.convertException(e));
-			return ret.toJSONString();
-		}
-	}
-
-	/**
-	 * 保存资源
-	 */
-	@Override
-	@RequestMapping(value = "save")
-	public String save(HttpServletRequest request, HttpServletResponse response, ResourceForm form) {
-		return super.save(request, response, form);
-	}
-
-	/**
-	 * 删除资源
-	 */
-	@Override
-	@RequestMapping(value = "delete")
-	public String delete(HttpServletRequest request, HttpServletResponse response, ResourceForm form) {
-		return super.delete(request, response, form);
-	}
-
 	/**
 	 * 获取所有资源
 	 *

government-manager/src/main/java/com/mortals/xhx/base/system/resource/web/ResourceForm.java

@@ -21,7 +21,7 @@ import com.mortals.xhx.base.system.resource.model.ResourceQuery;
  * @version 1.0.0
  */
 public class ResourceForm extends BaseCRUDFormLong<ResourceEntity> {
-	private ResourceEntity resource = new ResourceEntity();
+	private ResourceEntity entity = new ResourceEntity();
 	private ResourceQuery query = new ResourceQuery();
 	public ResourceForm(){
 		
@@ -29,16 +29,13 @@ public class ResourceForm extends BaseCRUDFormLong<ResourceEntity> {
 	
     @Override
 	public ResourceEntity getEntity() {
-		return resource;
-	}
-	public ResourceEntity getResource() {
-		return resource;
+		return entity;
 	}
 
-	public void setResource(ResourceEntity resource) {
-		this.resource = resource;
+	public void setEntity(ResourceEntity entity) {
+		this.entity = entity;
 	}
-	
+
 	@Override
 	public ResourceQuery getQuery() {
 		return query;

government-manager/src/main/java/com/mortals/xhx/base/system/role/web/RoleAuthForm.java

@@ -21,7 +21,7 @@ import com.mortals.xhx.base.system.role.model.RoleAuthQuery;
  * @version 1.0.0
  */
 public class RoleAuthForm extends BaseCRUDFormLong<RoleAuthEntity> {
-	private RoleAuthEntity roleAuth = new RoleAuthEntity();
+	private RoleAuthEntity entity = new RoleAuthEntity();
 	private RoleAuthQuery query = new RoleAuthQuery();
 	public RoleAuthForm(){
 		
@@ -29,16 +29,13 @@ public class RoleAuthForm extends BaseCRUDFormLong<RoleAuthEntity> {
 	
     @Override
 	public RoleAuthEntity getEntity() {
-		return roleAuth;
-	}
-	public RoleAuthEntity getRoleAuth() {
-		return roleAuth;
+		return entity;
 	}
 
-	public void setRoleAuth(RoleAuthEntity roleAuth) {
-		this.roleAuth = roleAuth;
+	public void setEntity(RoleAuthEntity entity) {
+		this.entity = entity;
 	}
-	
+
 	@Override
 	public RoleAuthQuery getQuery() {
 		return query;

government-manager/src/main/java/com/mortals/xhx/base/system/role/web/RoleForm.java

@@ -21,7 +21,7 @@ import com.mortals.xhx.base.system.role.model.RoleQuery;
  * @version 1.0.0
  */
 public class RoleForm extends BaseCRUDFormLong<RoleEntity> {
-	private RoleEntity role = new RoleEntity();
+	private RoleEntity entity = new RoleEntity();
 	private RoleQuery query = new RoleQuery();
 	/** 用户ID */
 	private Long userId;
@@ -31,16 +31,13 @@ public class RoleForm extends BaseCRUDFormLong<RoleEntity> {
 	
     @Override
 	public RoleEntity getEntity() {
-		return role;
-	}
-	public RoleEntity getRole() {
-		return role;
+		return entity;
 	}
 
-	public void setRole(RoleEntity role) {
-		this.role = role;
+	public void setEntity(RoleEntity entity) {
+		this.entity = entity;
 	}
-	
+
 	@Override
 	public RoleQuery getQuery() {
 		return query;

government-manager/src/main/java/com/mortals/xhx/base/system/role/web/RoleUserForm.java

@@ -21,7 +21,7 @@ import com.mortals.xhx.base.system.role.model.RoleUserQuery;
  * @version 1.0.0
  */
 public class RoleUserForm extends BaseCRUDFormLong<RoleUserEntity> {
-	private RoleUserEntity roleUser = new RoleUserEntity();
+	private RoleUserEntity entity = new RoleUserEntity();
 	private RoleUserQuery query = new RoleUserQuery();
 	public RoleUserForm(){
 		
@@ -29,16 +29,13 @@ public class RoleUserForm extends BaseCRUDFormLong<RoleUserEntity> {
 	
     @Override
 	public RoleUserEntity getEntity() {
-		return roleUser;
-	}
-	public RoleUserEntity getRoleUser() {
-		return roleUser;
+		return entity;
 	}
 
-	public void setRoleUser(RoleUserEntity roleUser) {
-		this.roleUser = roleUser;
+	public void setEntity(RoleUserEntity entity) {
+		this.entity = entity;
 	}
-	
+
 	@Override
 	public RoleUserQuery getQuery() {
 		return query;

government-manager/src/main/java/com/mortals/xhx/base/system/table/service/TableIndexService.java

@@ -9,9 +9,16 @@
 package com.mortals.xhx.base.system.table.service;
 
 
+import com.mortals.framework.dao.ICRUDSubmeterDao;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.TableParam;
 import com.mortals.framework.service.ICRUDService;
+import com.mortals.framework.service.IManagerService;
+import com.mortals.framework.service.ITaskExcuteService;
 import com.mortals.xhx.base.system.table.model.TableIndexEntity;
 
+import java.util.Set;
+
 /**
  * <p>Title: 分表索引信息</p>
  * <p>Description: TableIndexService service接口 </p>
@@ -21,6 +28,40 @@ import com.mortals.xhx.base.system.table.model.TableIndexEntity;
  * @version 1.0.0
  */
 
-public interface TableIndexService extends ICRUDService<TableIndexEntity,Long> {
-	
+public interface TableIndexService extends ICRUDService<TableIndexEntity,Long> , ITaskExcuteService, IManagerService {
+    /**
+     * 查询上个月创建的表集合
+     *
+     * @return
+     * @throws AppException
+     */
+    Set<String> findPrevMonthTables() throws AppException;
+
+    /**
+     * 查询最近3个月创建的表集合
+     *
+     * @return
+     * @throws AppException
+     */
+    Set<String> findThreeMonthTables() throws AppException;
+
+    /**
+     * 保存表信息
+     *
+     * @param tableName
+     * @param tableMark
+     * @return
+     * @throws AppException
+     */
+    int saveTableName(String tableName, String tableMark) throws AppException;
+
+    /**
+     * 创建表
+     *
+     * @param submeterDao
+     * @param param
+     * @return
+     * @throws AppException
+     */
+    boolean createTable(ICRUDSubmeterDao submeterDao, TableParam param) throws AppException;
 }
\ No newline at end of file

government-manager/src/main/java/com/mortals/xhx/base/system/table/service/impl/TableIndexServiceImpl.java

@@ -8,13 +8,24 @@
 
 package com.mortals.xhx.base.system.table.service.impl;
 
+import com.mortals.framework.ap.GlobalSysInfo;
+import com.mortals.framework.dao.ICRUDSubmeterDao;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.TableParam;
+import com.mortals.framework.service.ITask;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.framework.util.DateUtils;
+import com.mortals.framework.util.StringUtils;
 import com.mortals.xhx.base.system.table.dao.TableIndexDao;
 import com.mortals.xhx.base.system.table.model.TableIndexEntity;
+import com.mortals.xhx.base.system.table.model.TableIndexQuery;
 import com.mortals.xhx.base.system.table.service.TableIndexService;
 
 import org.springframework.stereotype.Service;
 
+import java.util.*;
+import java.util.stream.Collectors;
+
 /**
  * <p>Title: 分表索引信息</p>
  * <p>Description: TableIndexServiceImpl service接口 </p>
@@ -25,7 +36,159 @@ import org.springframework.stereotype.Service;
  */
 @Service("tableIndexService")
 public class TableIndexServiceImpl extends AbstractCRUDServiceImpl<TableIndexDao,TableIndexEntity,Long> implements TableIndexService {
-	
-	
+
+    /**
+     * 查询最近1个月创建的表集合
+     * @return
+     */
+    public Set<String> findLastMonthTables() {
+        Set<String> retList = new HashSet<String>();
+        try {
+            TableIndexQuery params = new TableIndexQuery();
+            params.setCreateTimeStart(DateUtils.addMonth(new Date(), -1, "yyyy-MM-dd"));
+            List<TableIndexEntity> list = dao.getList(params);
+            for (TableIndexEntity entity : list) {
+                if (StringUtils.isNotEmpty(entity.getTableName())) {
+                    retList.add(entity.getTableName());
+                }
+            }
+        } catch (Exception e) {
+            log.error("查询分表索引异常-->" + e.getMessage());
+        }
+        return retList;
+    }
+
+    @Override
+    public Set<String> findPrevMonthTables() throws AppException {
+        Set<String> retList = new HashSet<String>();
+        try {
+            Calendar cal = Calendar.getInstance();
+            cal.set(Calendar.DAY_OF_MONTH, 1);
+            cal.add(Calendar.MONTH, -1);
+            String startTime = DateUtils.getDateTime(cal.getTime(), "yyyy-MM-dd");
+            cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
+            String endTime = DateUtils.getDateTime(cal.getTime(), "yyyy-MM-dd");
+            TableIndexQuery params = new TableIndexQuery();
+            params.setCreateTimeStart(startTime);
+            params.setCreateTimeEnd(endTime);
+            List<TableIndexEntity> list = dao.getList(params);
+            for (TableIndexEntity entity : list) {
+                if (StringUtils.isNotEmpty(entity.getTableName())) {
+                    retList.add(entity.getTableName());
+                }
+            }
+        } catch (Exception e) {
+            log.error("查询分表索引异常-->" + e.getMessage());
+        }
+        return retList;
+    }
+
+    @Override
+    public Set<String> findThreeMonthTables() throws AppException {
+        Set<String> retList = new HashSet<String>();
+        try {
+            Calendar cal = Calendar.getInstance();
+            cal.set(Calendar.DAY_OF_MONTH, 1);
+            cal.add(Calendar.MONTH, -3);
+            String startTime = DateUtils.getDateTime(cal.getTime(), "yyyy-MM-dd");
+            TableIndexQuery params = new TableIndexQuery();
+            params.setCreateTimeStart(startTime);
+            List<TableIndexEntity> list = dao.getList(params);
+            for (TableIndexEntity entity : list) {
+                if (StringUtils.isNotEmpty(entity.getTableName())) {
+                    retList.add(entity.getTableName());
+                }
+            }
+        } catch (Exception e) {
+            log.error("查询分表索引异常-->" + e.getMessage());
+        }
+        return retList;
+    }
+
+    @Override
+    public int saveTableName(String tableName, String tableMark) throws AppException {
+        TableIndexEntity table = new TableIndexEntity();
+        table.setTableName(tableName);
+        table.setTableMark(tableMark);
+        table.setCreateTime(new Date());
+        return dao.insert(table);
+    }
+
+    @Override
+    public boolean createTable(ICRUDSubmeterDao submeterDao, TableParam param) {
+        boolean ret = false;
+        TableParam retParam = null;
+        try {
+            retParam = submeterDao.createTable(param);
+            if (retParam != null && retParam.tableMap != null && retParam.tableMap.size() > 0) {
+                log.info("创建表-->" + retParam.tableMap.keySet());
+            }
+        } catch (Exception e) {
+            log.error("执行创建表任务异常-->" + submeterDao, e);
+        }
+        if (retParam != null && retParam.tableMap != null && retParam.tableMap.size() > 0) {
+            TableIndexQuery condition = new TableIndexQuery();
+            condition.setTableNameList(Arrays.asList(retParam.tableMap.keySet().toArray(new String[]{})));
+            Set<String> tableRecords = this.find(condition, null).stream().map(t -> t.getTableName()).collect(Collectors.toSet());
+            Date currDate = new Date();
+            for (Map.Entry<String, String> ee : retParam.tableMap.entrySet()) {
+                String tableName = ee.getKey();
+                if(tableRecords.contains(tableName)) {
+                    continue;
+                }
+                String tableMark = ee.getValue();
+                try {
+                    TableIndexEntity table = new TableIndexEntity();
+                    table.setTableName(tableName);
+                    table.setTableMark(tableMark);
+                    table.setCreateTime(currDate);
+                    dao.insert(table);
+                    ret = true;
+                } catch (Exception e) {
+                    log.error("保存分表索引数据异常，原因：" + e.getMessage());
+                }
+            }
+        }
+        return ret;
+    }
+
+    @SuppressWarnings("rawtypes")
+    private void createTable() throws AppException {
+        log.info("执行表创建服务...");
+        Map<String, ICRUDSubmeterDao> map = GlobalSysInfo.getBeansByType(ICRUDSubmeterDao.class);
+        if (map == null || map.isEmpty()) {
+            return;
+        }
+        Date currDate = new Date();
+        Set<String> existsTables = this.findLastMonthTables();
+        TableParam param = new TableParam();
+        param.unionTime = currDate;
+        param.filterTables = existsTables;
+        param.isCreateTable = true;
+        for (Map.Entry<String, ICRUDSubmeterDao> entry : map.entrySet()) {
+            this.createTable(entry.getValue(), param);
+        }
+        log.info("表创建完成！");
+    }
+
+    @Override
+    public void excuteTask(ITask task) throws AppException {
+        this.createTable();
+    }
+
+    @Override
+    public void stopTask(ITask task) throws AppException {
+
+    }
+
+    @Override
+    public void startService() throws AppException {
+        this.createTable();
+    }
+
+    @Override
+    public void stopService() throws AppException {
+
+    }
 	
 }
\ No newline at end of file

government-manager/src/main/java/com/mortals/xhx/base/system/table/web/TableIndexForm.java

@@ -21,7 +21,7 @@ import com.mortals.xhx.base.system.table.model.TableIndexQuery;
  * @version 1.0.0
  */
 public class TableIndexForm extends BaseCRUDFormLong<TableIndexEntity> {
-	private TableIndexEntity tableIndex = new TableIndexEntity();
+	private TableIndexEntity entity = new TableIndexEntity();
 	private TableIndexQuery query = new TableIndexQuery();
 	public TableIndexForm(){
 		
@@ -29,16 +29,13 @@ public class TableIndexForm extends BaseCRUDFormLong<TableIndexEntity> {
 	
     @Override
 	public TableIndexEntity getEntity() {
-		return tableIndex;
-	}
-	public TableIndexEntity getTableIndex() {
-		return tableIndex;
+		return entity;
 	}
 
-	public void setTableIndex(TableIndexEntity tableIndex) {
-		this.tableIndex = tableIndex;
+	public void setEntity(TableIndexEntity entity) {
+		this.entity = entity;
 	}
-	
+
 	@Override
 	public TableIndexQuery getQuery() {
 		return query;

government-manager/src/main/java/com/mortals/xhx/base/system/task/service/impl/TaskServiceImpl.java

@@ -297,7 +297,7 @@ public class TaskServiceImpl extends AbstractCRUDServiceImpl<TaskDao, TaskEntity
             executorService.shutdown();
             log.info("任务执行线程退出!");
         });
-        thread.start();
+       // thread.start();
     }
 
     @Override

government-manager/src/main/java/com/mortals/xhx/base/system/task/web/TaskController.java

 /**
-* 文件：TaskController.java
-* 版本：1.0.0
-* 日期：
-* Copyright ® 
-* All right reserved.
-*/
+ * 文件：TaskController.java
+ * 版本：1.0.0
+ * 日期：
+ * Copyright ®
+ * All right reserved.
+ */
 package com.mortals.xhx.base.system.task.web;
 
 
@@ -36,141 +36,60 @@ import com.mortals.xhx.common.code.TaskInterimExcuteStatusEnum;
  * <p>Description: TaskController  </p>
  * <p>Copyright: Copyright &reg;  </p>
  * <p>Company: </p>
- * @author 
+ * @author
  * @version 1.0.0
  */
 @RestController
 @RequestMapping("task")
-public class TaskController extends BaseCRUDJsonMappingController<TaskService,TaskForm,TaskEntity,Long> {
-
-	public TaskController(){
-		super.setFormClass(TaskForm.class);
-		super.setModuleDesc("任务信息");
-	}
-
-	/**
-	 * 查询任务信息
-	 */
-	@Override
-	@PostMapping(value = "list")
-	public String list(HttpServletRequest request, HttpServletResponse response, TaskForm form) {
-		try {
-			return super.list(request, response, form);
-		} catch (Exception e) {
-			JSONObject ret = new JSONObject();
-			ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
-			ret.put(KEY_RESULT_MSG, super.convertException(e));
-			return ret.toJSONString();
-		}
-	}
-
-	/**
-	 * 添加任务信息
-	 */
-	@Override
-	@PostMapping(value = "add")
-	public String add(HttpServletRequest request, HttpServletResponse response, TaskForm form) {
-		try {
-			return super.add(request, response, form);
-		} catch (Exception e) {
-			JSONObject ret = new JSONObject();
-			ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
-			ret.put(KEY_RESULT_MSG, super.convertException(e));
-			return ret.toJSONString();
-		}
-	}
-
-	/**
-	 * 编辑任务信息
-	 */
-	@Override
-	@PostMapping(value = "edit")
-	public String edit(HttpServletRequest request, HttpServletResponse response, TaskForm form) {
-		try {
-			return super.edit(request, response, form);
-		} catch (Exception e) {
-			JSONObject ret = new JSONObject();
-			ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
-			ret.put(KEY_RESULT_MSG, super.convertException(e));
-			return ret.toJSONString();
-		}
-	}
-
-	/**
-	 * 保存任务信息
-	 */
-	@Override
-	@PostMapping(value = "save")
-	public String save(HttpServletRequest request, HttpServletResponse response, TaskForm form) {
-		return super.save(request, response, form);
-	}
-
-	/**
-	 * 删除任务信息
-	 */
-	@Override
-	@PostMapping(value = "delete")
-	public String delete(HttpServletRequest request, HttpServletResponse response, TaskForm form) {
-		return super.delete(request, response, form);
-	}
-
-	/**
-	 * 查看任务信息
-	 */
-	@Override
-	@PostMapping(value = "view")
-	public String view(HttpServletRequest request, HttpServletResponse response, TaskForm form) {
-		try {
-			return super.view(request, response, form);
-		} catch (Exception e) {
-			JSONObject ret = new JSONObject();
-			ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
-			ret.put(KEY_RESULT_MSG, super.convertException(e));
-			return ret.toJSONString();
-		}
-	}
-
-	@Override
-	protected void init(HttpServletRequest request, HttpServletResponse response, TaskForm form,
-						Map<String, Object> model, Context context) {
-		Map<String, Object> status = new HashMap<String, Object>();
-		status.put("status", TaskExcuteStatusEnum.getEnumMap());
-		status.put("excuteStrategy", TaskExcuteStrategyEnum.getEnumMap());
-		status.put("interimExcuteStatus", TaskInterimExcuteStatusEnum.getEnumMap());
-		Map<String, ITaskExcuteService> serviceMap = GlobalSysInfo.getBeansByType(ITaskExcuteService.class);
-		Map<String, Object> serviceList = new HashMap<String, Object>();
-		if (serviceMap != null) {
-			try {
-				serviceMap.forEach((k, v) -> {
-					if (null != v) {
-					    serviceList.put(k, k);
-					}
-				});
-			} catch (Exception ex) {
-			    log.error("", ex);
-			}
-		}
-		model.put("excuteService", serviceList);
-		model.put(KEY_RESULT_DICT, status);
-		super.init(request, response, form, model, context);
-	}
-
-	/**
-	 * @param request
-	 * @param response
-	 * @param form
-	 * @param model
-	 * @param context
-	 * @throws AppException
-	 * @Description: TODO
-	 */
-
-	@Override
-	protected void saveBefore(HttpServletRequest request, HttpServletResponse response, TaskForm form,
-							  Map<String, Object> model, Context context) throws AppException {
-		if (null == form.getEntity().getExcuteService()) {
-
-		}
+public class TaskController extends BaseCRUDJsonMappingController<TaskService, TaskForm, TaskEntity, Long> {
+
+    public TaskController() {
+        super.setFormClass(TaskForm.class);
+        super.setModuleDesc("任务信息");
+    }
+
+
+    @Override
+    protected void init(HttpServletRequest request, HttpServletResponse response, TaskForm form,
+                        Map<String, Object> model, Context context) {
+        Map<String, Object> status = new HashMap<String, Object>();
+        status.put("status", TaskExcuteStatusEnum.getEnumMap());
+        status.put("excuteStrategy", TaskExcuteStrategyEnum.getEnumMap());
+        status.put("interimExcuteStatus", TaskInterimExcuteStatusEnum.getEnumMap());
+        Map<String, ITaskExcuteService> serviceMap = GlobalSysInfo.getBeansByType(ITaskExcuteService.class);
+        Map<String, Object> serviceList = new HashMap<String, Object>();
+        if (serviceMap != null) {
+            try {
+                serviceMap.forEach((k, v) -> {
+                    if (null != v) {
+                        serviceList.put(k, k);
+                    }
+                });
+            } catch (Exception ex) {
+                log.error("", ex);
+            }
+        }
+        model.put("excuteService", serviceList);
+        model.put(KEY_RESULT_DICT, status);
+        super.init(request, response, form, model, context);
+    }
+
+    /**
+     * @param request
+     * @param response
+     * @param form
+     * @param model
+     * @param context
+     * @throws AppException
+     * @Description: TODO
+     */
+
+    @Override
+    protected void saveBefore(HttpServletRequest request, HttpServletResponse response, TaskForm form,
+                              Map<String, Object> model, Context context) throws AppException {
+        if (null == form.getEntity().getExcuteService()) {
+
+        }
 //		TaskEntity condition = new TaskEntity();
 //		condition.setExcuteService(form.getEntity().getExcuteService());
 //		List<TaskEntity> datas = this.service.find(condition, context);
@@ -181,41 +100,41 @@ public class TaskController extends BaseCRUDJsonMappingController<TaskService,Ta
 //				}
 //			}
 //		}
-		super.saveBefore(request, response, form, model, context);
-	}
-
-	/**
-	 * 改变状态
-	 */
-	@RequestMapping(value = "change/status")
-	public String changeStatus(HttpServletRequest request, HttpServletResponse response, TaskForm form) {
-		JSONObject ret = new JSONObject();
-		Context context = getContext();
-		try {
-			TaskEntity entity = this.service.get(form.getEntity().getId(), context);// .doSubmitAudit(form.getEntity(),
-			// context);
-			if (null == entity) {
-				throw new AppException("任务不存在!");
-			}
-			if (null == form.getEntity().getStatus()) {
-				throw new AppException("任务状态不能为空!");
-			}
-			if (form.getEntity().getStatus() != DataSatusEnum.ENABLE.getValue()
-					&& form.getEntity().getStatus() != DataSatusEnum.DISENABLE.getValue()) {
-				throw new AppException("非法任务状态!");
-			}
-			String busiDesc = DataSatusEnum.getByValue(form.getEntity().getStatus()).getDesc();
-			entity.setStatus(form.getEntity().getStatus());
-			this.service.update(entity, context);
-			ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
-			ret.put(KEY_RESULT_MSG, busiDesc + "成功");
-			recordSysLog(request, busiDesc + " 【成功】 [id:" + entity.getId() + "]");
+        super.saveBefore(request, response, form, model, context);
+    }
+
+    /**
+     * 改变状态
+     */
+    @RequestMapping(value = "change/status")
+    public String changeStatus(HttpServletRequest request, HttpServletResponse response, TaskForm form) {
+        JSONObject ret = new JSONObject();
+        Context context = getContext();
+        try {
+            TaskEntity entity = this.service.get(form.getEntity().getId(), context);// .doSubmitAudit(form.getEntity(),
+            // context);
+            if (null == entity) {
+                throw new AppException("任务不存在!");
+            }
+            if (null == form.getEntity().getStatus()) {
+                throw new AppException("任务状态不能为空!");
+            }
+            if (form.getEntity().getStatus() != DataSatusEnum.ENABLE.getValue()
+                    && form.getEntity().getStatus() != DataSatusEnum.DISENABLE.getValue()) {
+                throw new AppException("非法任务状态!");
+            }
+            String busiDesc = DataSatusEnum.getByValue(form.getEntity().getStatus()).getDesc();
+            entity.setStatus(form.getEntity().getStatus());
+            this.service.update(entity, context);
+            ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
+            ret.put(KEY_RESULT_MSG, busiDesc + "成功");
+            recordSysLog(request, busiDesc + " 【成功】 [id:" + entity.getId() + "]");
+
+        } catch (Exception e) {
+            ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
+            ret.put(KEY_RESULT_MSG, super.convertException(e));
+        }
+        return ret.toJSONString();
+    }
 
-		} catch (Exception e) {
-			ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
-			ret.put(KEY_RESULT_MSG, super.convertException(e));
-		}
-		return ret.toJSONString();
-	}
-	
 }
\ No newline at end of file

government-manager/src/main/java/com/mortals/xhx/base/system/task/web/TaskForm.java

@@ -21,7 +21,7 @@ import com.mortals.xhx.base.system.task.model.TaskQuery;
  * @version 1.0.0
  */
 public class TaskForm extends BaseCRUDFormLong<TaskEntity> {
-	private TaskEntity task = new TaskEntity();
+	private TaskEntity entity = new TaskEntity();
 	private TaskQuery query = new TaskQuery();
 	public TaskForm(){
 		
@@ -29,16 +29,13 @@ public class TaskForm extends BaseCRUDFormLong<TaskEntity> {
 	
     @Override
 	public TaskEntity getEntity() {
-		return task;
-	}
-	public TaskEntity getTask() {
-		return task;
+		return entity;
 	}
 
-	public void setTask(TaskEntity task) {
-		this.task = task;
+	public void setEntity(TaskEntity entity) {
+		this.entity = entity;
 	}
-	
+
 	@Override
 	public TaskQuery getQuery() {
 		return query;

government-manager/src/main/java/com/mortals/xhx/base/system/upload/service/impl/UploadServiceImpl.java

@@ -3,12 +3,16 @@ package com.mortals.xhx.base.system.upload.service.impl;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.service.IUser;
 import com.mortals.framework.util.StringUtils;
+import com.mortals.xhx.base.system.idgenerator.service.IdgeneratorService;
+import com.mortals.xhx.base.system.idgenerator.service.impl.IdgeneratorServiceImpl;
 import com.mortals.xhx.base.system.upload.service.UploadService;
 import com.mortals.xhx.common.code.UploadFileType;
 
+import com.mortals.xhx.tools.uid.ISeqGeneratorService;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -32,11 +36,16 @@ public class UploadServiceImpl implements UploadService {
     @Value("${upload.path}")
     private String filePath;
 
+    @Autowired
+    private ISeqGeneratorService seqGeneratorService;
+    
+
     @Override
     public String saveFileUpload(MultipartFile tempFile, String prePath, IUser user) {
         if (tempFile == null || tempFile.getSize() == 0) {
             throw new AppException("没有要上传的文件！");
         }
+
         String fileName = tempFile.getOriginalFilename();
         String extension = FilenameUtils.getExtension(fileName);
         UploadFileType type = UploadFileType.getFileType(extension);
@@ -54,7 +63,9 @@ public class UploadServiceImpl implements UploadService {
         if (!pathDir.exists()) {
             pathDir.mkdirs();
         }
-        String newName = System.currentTimeMillis() + "." + extension;
+
+
+        String newName = seqGeneratorService.nextOrderId(1024) + "." + extension;
         String filePathAll = filePath + newName;
 
         File uploadFile = new File(filePathAll);

government-manager/src/main/java/com/mortals/xhx/base/system/user/web/UserController.java

@@ -63,51 +63,14 @@ public class UserController extends BaseCRUDJsonMappingController<UserService, U
         super.init(request, response, form, model, context);
     }
 
-    /**
-     * 查询用户信息
-     */
     @Override
-    @RequestMapping(value = "list")
-    public String list(HttpServletRequest request, HttpServletResponse response, UserForm form) {
+    protected void doListBefore(HttpServletRequest request, HttpServletResponse response, UserForm form, Map<String, Object> model, Context context) throws AppException {
         if (!StringUtils.isEmpty(form.getQuery().getRealName())) {
             form.getQuery().setRealName("%".concat(form.getQuery().getRealName()).concat("%"));
         }
         if (!StringUtils.isEmpty(form.getQuery().getLoginName())) {
             form.getQuery().setLoginName("%".concat(form.getQuery().getLoginName()).concat("%"));
         }
-        return super.list(request, response, form);
-    }
-
-    /**
-     * 添加部门
-     */
-    @Override
-    @RequestMapping(value = "add")
-    public String add(HttpServletRequest request, HttpServletResponse response, UserForm form) {
-        try {
-            return super.add(request, response, form);
-        } catch (Exception e) {
-            JSONObject ret = new JSONObject();
-            ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
-            ret.put(KEY_RESULT_MSG, super.convertException(e));
-            return ret.toJSONString();
-        }
-    }
-
-    /**
-     * 编辑部门
-     */
-    @Override
-    @RequestMapping(value = "edit")
-    public String edit(HttpServletRequest request, HttpServletResponse response, UserForm form) {
-        try {
-            return super.edit(request, response, form);
-        } catch (Exception e) {
-            JSONObject ret = new JSONObject();
-            ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
-            ret.put(KEY_RESULT_MSG, super.convertException(e));
-            return ret.toJSONString();
-        }
     }
 
     @Override
@@ -128,26 +91,13 @@ public class UserController extends BaseCRUDJsonMappingController<UserService, U
         return super.editAfter(request, response, form, model, entity, context);
     }
 
-    /**
-     * 保存部门
-     */
     @Override
-    @RequestMapping(value = "save")
-    public String save(HttpServletRequest request, HttpServletResponse response, UserForm form) {
-        String result = super.save(request, response, form);
-        if (form.getUser().getId() == getCurUser().getId()) {
+    protected int saveAfter(HttpServletRequest request, HttpServletResponse response, UserForm form, Map<String, Object> model, Context context) throws AppException {
+
+        if (form.getEntity().getId() == getCurUser().getId()) {
             saveCurrUserForSession(request, response, userService.get(form.getEntity().getId(), false));
         }
-        return result;
-    }
-
-    /**
-     * 删除部门
-     */
-    @Override
-    @RequestMapping(value = "delete")
-    public String delete(HttpServletRequest request, HttpServletResponse response, UserForm form) {
-        return super.delete(request, response, form);
+        return VALUE_RESULT_SUCCESS;
     }
 
     @Override
@@ -161,7 +111,7 @@ public class UserController extends BaseCRUDJsonMappingController<UserService, U
 
     @RequestMapping(value = "change/password", method = RequestMethod.POST)
     @Operlog(msg = "密码修改成功!")
-    public String changePassword(HttpServletRequest request, @RequestParam String oldPwd, @RequestParam String newPwd) {
+    public String changePassword(@RequestParam String oldPwd, @RequestParam String newPwd) {
         JSONObject ret = new JSONObject();
         try {
             service.updateUserPwd(super.getCurUser().getLoginName(), oldPwd, newPwd);

government-manager/src/main/java/com/mortals/xhx/base/system/user/web/UserForm.java

@@ -20,7 +20,7 @@ import com.mortals.xhx.base.system.user.model.UserQuery;
  * @version 1.0.0
  */
 public class UserForm extends BaseCRUDFormLong<UserEntity> {
-	private UserEntity user = new UserEntity();
+	private UserEntity entity = new UserEntity();
 	private UserQuery query = new UserQuery();
 	public UserForm(){
 		
@@ -28,16 +28,13 @@ public class UserForm extends BaseCRUDFormLong<UserEntity> {
 	
     @Override
 	public UserEntity getEntity() {
-		return user;
-	}
-	public UserEntity getUser() {
-		return user;
+		return entity;
 	}
 
-	public void setUser(UserEntity user) {
-		this.user = user;
+	public void setEntity(UserEntity entity) {
+		this.entity = entity;
 	}
-	
+
 	@Override
 	public UserQuery getQuery() {
 		return query;

government-manager/src/main/java/com/mortals/xhx/base/system/valid/web/ValidCodeController.java

@@ -51,18 +51,4 @@ public class ValidCodeController extends BaseCRUDJsonMappingController<ValidCode
 		super.init(request, response, form, model, context);
 	}
 
-	@Override
-	@PostMapping(value="list")
-	public String list(HttpServletRequest request, HttpServletResponse response, ValidCodeForm form) {
-		try{
-			return super.list(request, response, form);
-		}catch(Exception e){
-			JSONObject ret = new JSONObject();
-			ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
-			ret.put(KEY_RESULT_MSG, super.convertException(e));
-			return ret.toJSONString();
-		}
-	}
-	
-	
 }
\ No newline at end of file

government-manager/src/main/java/com/mortals/xhx/base/system/valid/web/ValidCodeForm.java

 /**
-* 文件：ValidCodeForm.java
-* 版本：1.0.0
-* 日期：
-* Copyright ® 
-* All right reserved.
-*/
+ * 文件：ValidCodeForm.java
+ * 版本：1.0.0
+ * 日期：
+ * Copyright ®
+ * All right reserved.
+ */
 package com.mortals.xhx.base.system.valid.web;
 
 
@@ -17,34 +17,33 @@ import com.mortals.xhx.base.system.valid.model.ValidCodeQuery;
  * <p>Description: ValidCodeForm  </p>
  * <p>Copyright: Copyright &reg;  </p>
  * <p>Company: </p>
- * @author 
+ * @author
  * @version 1.0.0
  */
 public class ValidCodeForm extends BaseCRUDFormLong<ValidCodeEntity> {
-	private ValidCodeEntity validCode = new ValidCodeEntity();
-	private ValidCodeQuery query = new ValidCodeQuery();
-	public ValidCodeForm(){
-		
-	}
-	
+    private ValidCodeEntity entity = new ValidCodeEntity();
+    private ValidCodeQuery query = new ValidCodeQuery();
+
+    public ValidCodeForm() {
+
+    }
+
     @Override
-	public ValidCodeEntity getEntity() {
-		return validCode;
-	}
-	public ValidCodeEntity getValidCode() {
-		return validCode;
-	}
-
-	public void setValidCode(ValidCodeEntity validCode) {
-		this.validCode = validCode;
-	}
-	
-	@Override
-	public ValidCodeQuery getQuery() {
-		return query;
-	}
-
-	public void setQuery(ValidCodeQuery query) {
-		this.query = query;
-	}
+    public ValidCodeEntity getEntity() {
+        return entity;
+    }
+
+
+    public void setEntity(ValidCodeEntity entity) {
+        this.entity = entity;
+    }
+
+    @Override
+    public ValidCodeQuery getQuery() {
+        return query;
+    }
+
+    public void setQuery(ValidCodeQuery query) {
+        this.query = query;
+    }
 }
\ No newline at end of file

government-manager/src/main/java/com/mortals/xhx/common/code/DataSatusEnum.java

 package com.mortals.xhx.common.code;
 
+import com.mortals.framework.common.code.YesNo;
+
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -48,6 +50,7 @@ public enum DataSatusEnum {
 	 * @return
 	 */
 	public static Map<String,String> getEnumMap(int... eItem) {
+
 		Map<String,String> resultMap= new LinkedHashMap<String,String>();
 		for (DataSatusEnum item : DataSatusEnum.values()) {
 			try{

government-manager/src/main/java/com/mortals/xhx/common/key/Constant.java

@@ -5,23 +5,12 @@ public final class Constant {
 	/** 基础代码版本 Z-BASE.MANAGER-S1.0.0 */
 	public final static String BASEMANAGER_VERSION = "Z-BASE.MANAGER-S1.0.0";
 
-	public final static String Param_AssetFlowStatus = "AssetFlowStatus";
-	public final static String Param_MatriaUnitOfMeasure = "MatriaUnitOfMeasure";
-	public final static String Param_PartnerTags = "PartnerTags";
-	public final static String Param_SupplierTags = "SupplierTags";
-	public final static String Param_PartnerNature = "PartnerNature";
-	public final static String Param_PartnerSettlementType = "PartnerSettlementType";
-	public final static String Param_DeliveryPeriodUnit = "DeliveryPeriodUnit";
-	public final static String Param_MatriaSupplyType = "MatriaSupplyType";
-	public final static String Param_BomUseType = "BomUseType";
-	public final static String Param_BomStatus = "BomStatus";
-	public final static String Param_VerCompanyCode = "VerCompanyCode";
-	public final static String Param_VerRdCode = "VerRdCode";
-	public final static String Param_VerStageCode = "VerStageCode";
-	public final static String Param_MateriaAttachType = "MateriaAttachType";
-	public final static String Param_MateriaDefaultLens = "4";
-	public final static String PARAM_MORTALS_IOT_MATERIA = "mortals_iot_materia";
+	public final static String Param_materialType = "materialType";
+	public final static String Param_electronicgs = "electronicgs";
+	public final static String Param_materialSourceSm = "materialSourceSm";
+	public final static String Param_paperGg = "paperGg";
+	public final static String Param_jianmMs = "jianmMs";
+	public final static String Param_sealWay = "sealWay";
+	public final static String Param_typeOptions = "typeOptions";
 
-	public final static String PARAM_MORTALS_IOT_MATERIA_BOM = "mortals_iot_materia_bom";
-	public final static String PARAM_MORTALS_IOT_MATERIA_BOM_ITEM = "mortals_iot_materia_bom_item";
 }

government-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DemoStartedService.java

 package com.mortals.xhx.daemon.applicationservice;
 
+import com.mortals.framework.springcloud.config.web.BaseWebMvcConfigurer;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Component;
 
 import com.mortals.framework.springcloud.service.IApplicationStartedService;
@@ -16,6 +19,7 @@ import com.mortals.framework.springcloud.service.IApplicationStartedService;
  * @date	2020年7月15日
  */
 @Component
+//@ConditionalOnProperty(name="com.mortal",prefix = "",havingValue = "xxx")
 public class DemoStartedService implements IApplicationStartedService {
     
     private static Log logger = LogFactory.getLog(DemoStartedService.class);
@@ -23,6 +27,7 @@ public class DemoStartedService implements IApplicationStartedService {
     @Override
     public void start() {
         logger.info("开始服务..[配置已加载完成，并且所有框架都已经初始化]");
+
     }
 
     @Override

government-manager/src/main/java/com/mortals/xhx/daemon/demo/RequestDispatchController.http

@@ -50,6 +50,26 @@ Content-Type: application/json
 
 {"seq":"123456","transmission":{"dataKey":"mydata","deployId":"f177da63-f41b-11eb-9cf4-c25bd865180b","processInstanceId":"11111","userId":"admin"}}
 
+###form
+POST {{baseUrl}}/m/test/form
+Content-Type: application/json
+
+{
+  "entity":{
+    "formName":"test"
+  },
+  "id":[
+    1
+  ],
+  "pageInfo":{
+    "currPage":2,
+    "prePageResult":100
+  },
+  "query":{
+    "formName":"111"
+  }
+}
+
 
 ###readImage
 POST {{baseUrl}}/m/test/readImage

government-manager/src/main/java/com/mortals/xhx/daemon/demo/RequestDispatchController.java

@@ -4,6 +4,7 @@ import cn.hutool.core.codec.Base64;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IoUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
 import com.mortals.xhx.common.model.RequestTaskReq;
@@ -12,6 +13,7 @@ import com.mortals.xhx.common.pdu.api.ApiRespPdu;
 import com.mortals.xhx.common.pdu.flow.FlowProcDefPdu;
 import com.mortals.xhx.feign.flowable.IApiFlowDefinitionFeign;
 import com.mortals.xhx.feign.flowable.IApiFlowFeign;
+import com.mortals.xhx.module.flowable.web.FlowableDefinitionForm;
 import com.mortals.xhx.module.form.web.FormForm;
 import lombok.extern.apachecommons.CommonsLog;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +21,10 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.*;
+import java.util.stream.Stream;
 
 /**
  * @author karlhoo
@@ -41,7 +46,11 @@ public class RequestDispatchController {
         ApiRespPdu<String> respPdu = new ApiRespPdu<>();
         try {
             String xml = IoUtil.readUtf8(multipartFile.getInputStream());
-            respPdu = apiFlowDefinitionFeign.save("test", "请假", xml,"test");
+            log.info(xml);
+
+            respPdu.setData(xml);
+
+            //respPdu = apiFlowDefinitionFeign.save("test", "请假", xml,"test");
 
         } catch (Exception e) {
             log.error("error", e);
@@ -50,6 +59,19 @@ public class RequestDispatchController {
     }
 
 
+    @PostMapping("/form")
+    public ApiRespPdu form( @RequestBody FormForm form) {
+
+        ApiRespPdu<String> respPdu = new ApiRespPdu<>();
+        try {
+            respPdu.setData(JSON.toJSONString(form, SerializerFeature.DisableCircularReferenceDetect));
+        } catch (Exception e) {
+            log.error("error", e);
+        }
+        return respPdu;
+    }
+
+
     @PostMapping("/readXml")
     public ApiRespPdu readXml(@RequestBody ApiReqPdu<RequestTaskReq> req) {
 
@@ -307,6 +329,9 @@ public class RequestDispatchController {
         FormForm formForm = new FormForm();
         formForm.getQuery().setFormName("111");
         formForm.setId(new Long[]{1L});
+        formForm.getEntity().setFormName("test");
+
+        formForm.getQuery().setIdList(Arrays.asList(1L,2L));
 
         System.out.println(JSON.toJSONString(formForm));
 

government-manager/src/main/java/com/mortals/xhx/module/data/dao/DataAreaDao.java

-package com.mortals.xhx.module.data.dao;
-
-import com.mortals.framework.dao.ICRUDDao;
-import com.mortals.xhx.module.data.model.DataAreaEntity;
-
-/**
-* <p>Title: 地区表</p>
-* <p>Description:  DataAreaDao DAO接口 </p>
-* @author
-* @version 1.0.0
-*/
-
-public interface  DataAreaDao extends ICRUDDao<DataAreaEntity,Long>{
-
-}

government-manager/src/main/java/com/mortals/xhx/module/data/dao/ibatis/DataAreaDaoImpl.java

-package com.mortals.xhx.module.data.dao.ibatis;
-
-import org.springframework.stereotype.Repository;
-import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
-import com.mortals.xhx.module.data.dao.DataAreaDao;
-import com.mortals.xhx.module.data.model.DataAreaEntity;
-
-/**
-* <p>Title: 地区表</p>
-* <p>Description: DataAreaDaoImpl DAO接口 </p>
-* @author
-* @version 1.0.0
-*/
-@Repository("dataAreaDao")
-public class DataAreaDaoImpl extends BaseCRUDDaoMybatis<DataAreaEntity,Long> implements DataAreaDao {
-
-}

government-manager/src/main/java/com/mortals/xhx/module/data/model/DataAreaEntity.java

-package com.mortals.xhx.module.data.model;
-
-import com.mortals.framework.model.BaseEntityLong;
-/**
-*
-* Description:DataArea
-* date: 2021-8-10 13:57:03
-*/
-public class DataAreaEntity extends BaseEntityLong{
-    private static final long serialVersionUID = 1628575023251L;
-
-
-    /**
-    * 地区名称
-    */
-    private String areaName;
-
-    /**
-    * 地区简称
-    */
-    private String areaSimpleName;
-
-    /**
-    * 上级地区ID
-    */
-    private String parentAreaId;
-
-    /**
-    * 行政区域代码             行政区域代码             
-    */
-    private String areaCode;
-
-    /**
-    * 删除标识
-    */
-    private String deleteFlag;
-
-    /**
-    * 创建人
-    */
-    private String creatorId;
-
-    /**
-    * 创建人名称
-    */
-    private String creatorName;
-
-    /**
-    * 创建时间
-    */
-    private String createTimes;
-
-    /**
-    * 更新时间
-    */
-    private String updateTimes;
-
-    /**
-    * 1省级，2市级，3区县级，4乡镇级，5村
-    */
-    private String areaLevel;
-
-    /**
-    * 排序
-    */
-    private String sortKey;
-
-    /**
-    * 地区层级编码
-    */
-    private String areaLevelCode;
-
-    /**
-    * 临时使用确认地区层级
-    */
-    private String submitAreaLevel;
-
-    /**
-    * 是否特殊区域：0.否，1.是
-    */
-    private String isSpecial;
-
-    /**
-    * 行政区域描述
-    */
-    private String areaDesc;
-
-    public DataAreaEntity(){
-
-    }
-    /**
-    * 获取 地区名称
-    * @return areaName
-    */
-    public String getAreaName() {
-        return this.areaName;
-    }
-    /**
-    * 设置 地区名称
-    * @param areaName
-    */
-    public void setAreaName(String areaName) {
-        this.areaName = areaName;
-    }
-    /**
-    * 获取 地区简称
-    * @return areaSimpleName
-    */
-    public String getAreaSimpleName() {
-        return this.areaSimpleName;
-    }
-    /**
-    * 设置 地区简称
-    * @param areaSimpleName
-    */
-    public void setAreaSimpleName(String areaSimpleName) {
-        this.areaSimpleName = areaSimpleName;
-    }
-    /**
-    * 获取 上级地区ID
-    * @return parentAreaId
-    */
-    public String getParentAreaId() {
-        return this.parentAreaId;
-    }
-    /**
-    * 设置 上级地区ID
-    * @param parentAreaId
-    */
-    public void setParentAreaId(String parentAreaId) {
-        this.parentAreaId = parentAreaId;
-    }
-    /**
-    * 获取 行政区域代码             行政区域代码             
-    * @return areaCode
-    */
-    public String getAreaCode() {
-        return this.areaCode;
-    }
-    /**
-    * 设置 行政区域代码             行政区域代码             
-    * @param areaCode
-    */
-    public void setAreaCode(String areaCode) {
-        this.areaCode = areaCode;
-    }
-    /**
-    * 获取 删除标识
-    * @return deleteFlag
-    */
-    public String getDeleteFlag() {
-        return this.deleteFlag;
-    }
-    /**
-    * 设置 删除标识
-    * @param deleteFlag
-    */
-    public void setDeleteFlag(String deleteFlag) {
-        this.deleteFlag = deleteFlag;
-    }
-    /**
-    * 获取 创建人
-    * @return creatorId
-    */
-    public String getCreatorId() {
-        return this.creatorId;
-    }
-    /**
-    * 设置 创建人
-    * @param creatorId
-    */
-    public void setCreatorId(String creatorId) {
-        this.creatorId = creatorId;
-    }
-    /**
-    * 获取 创建人名称
-    * @return creatorName
-    */
-    public String getCreatorName() {
-        return this.creatorName;
-    }
-    /**
-    * 设置 创建人名称
-    * @param creatorName
-    */
-    public void setCreatorName(String creatorName) {
-        this.creatorName = creatorName;
-    }
-    /**
-    * 获取 创建时间
-    * @return createTimes
-    */
-    public String getCreateTimes() {
-        return this.createTimes;
-    }
-    /**
-    * 设置 创建时间
-    * @param createTimes
-    */
-    public void setCreateTimes(String createTimes) {
-        this.createTimes = createTimes;
-    }
-    /**
-    * 获取 更新时间
-    * @return updateTimes
-    */
-    public String getUpdateTimes() {
-        return this.updateTimes;
-    }
-    /**
-    * 设置 更新时间
-    * @param updateTimes
-    */
-    public void setUpdateTimes(String updateTimes) {
-        this.updateTimes = updateTimes;
-    }
-    /**
-    * 获取 1省级，2市级，3区县级，4乡镇级，5村
-    * @return areaLevel
-    */
-    public String getAreaLevel() {
-        return this.areaLevel;
-    }
-    /**
-    * 设置 1省级，2市级，3区县级，4乡镇级，5村
-    * @param areaLevel
-    */
-    public void setAreaLevel(String areaLevel) {
-        this.areaLevel = areaLevel;
-    }
-    /**
-    * 获取 排序
-    * @return sortKey
-    */
-    public String getSortKey() {
-        return this.sortKey;
-    }
-    /**
-    * 设置 排序
-    * @param sortKey
-    */
-    public void setSortKey(String sortKey) {
-        this.sortKey = sortKey;
-    }
-    /**
-    * 获取 地区层级编码
-    * @return areaLevelCode
-    */
-    public String getAreaLevelCode() {
-        return this.areaLevelCode;
-    }
-    /**
-    * 设置 地区层级编码
-    * @param areaLevelCode
-    */
-    public void setAreaLevelCode(String areaLevelCode) {
-        this.areaLevelCode = areaLevelCode;
-    }
-    /**
-    * 获取 临时使用确认地区层级
-    * @return submitAreaLevel
-    */
-    public String getSubmitAreaLevel() {
-        return this.submitAreaLevel;
-    }
-    /**
-    * 设置 临时使用确认地区层级
-    * @param submitAreaLevel
-    */
-    public void setSubmitAreaLevel(String submitAreaLevel) {
-        this.submitAreaLevel = submitAreaLevel;
-    }
-    /**
-    * 获取 是否特殊区域：0.否，1.是
-    * @return isSpecial
-    */
-    public String getIsSpecial() {
-        return this.isSpecial;
-    }
-    /**
-    * 设置 是否特殊区域：0.否，1.是
-    * @param isSpecial
-    */
-    public void setIsSpecial(String isSpecial) {
-        this.isSpecial = isSpecial;
-    }
-    /**
-    * 获取 行政区域描述
-    * @return areaDesc
-    */
-    public String getAreaDesc() {
-        return this.areaDesc;
-    }
-    /**
-    * 设置 行政区域描述
-    * @param areaDesc
-    */
-    public void setAreaDesc(String areaDesc) {
-        this.areaDesc = areaDesc;
-    }
-
-    @Override
-    public int hashCode() {
-        return this.getId().hashCode();
-    }
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null)
-            return false;
-        if (obj instanceof DataAreaEntity) {
-            DataAreaEntity tmp = (DataAreaEntity) obj;
-            if (this.getId().longValue() == tmp.getId().longValue()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public String toString(){
-        StringBuilder sb = new StringBuilder("");
-        sb
-        .append(",id:").append(getId())
-                .append(",areaName:").append(getAreaName())
-                .append(",areaSimpleName:").append(getAreaSimpleName())
-                .append(",parentAreaId:").append(getParentAreaId())
-                .append(",areaCode:").append(getAreaCode())
-                .append(",deleteFlag:").append(getDeleteFlag())
-                .append(",creatorId:").append(getCreatorId())
-                .append(",creatorName:").append(getCreatorName())
-                .append(",createTimes:").append(getCreateTimes())
-                .append(",updateTimes:").append(getUpdateTimes())
-                .append(",areaLevel:").append(getAreaLevel())
-                .append(",sortKey:").append(getSortKey())
-                .append(",areaLevelCode:").append(getAreaLevelCode())
-                .append(",submitAreaLevel:").append(getSubmitAreaLevel())
-                .append(",isSpecial:").append(getIsSpecial())
-                .append(",areaDesc:").append(getAreaDesc())
-        ;
-        return sb.toString();
-    }
-
-    public void initAttrValue(){
-         this.areaName = null;
-         this.areaSimpleName = null;
-         this.parentAreaId = null;
-         this.areaCode = null;
-         this.deleteFlag = null;
-         this.creatorId = null;
-         this.creatorName = null;
-         this.createTimes = null;
-         this.updateTimes = null;
-         this.areaLevel = null;
-         this.sortKey = null;
-         this.areaLevelCode = null;
-         this.submitAreaLevel = null;
-         this.isSpecial = null;
-         this.areaDesc = null;
-    }
-}
\ No newline at end of file

government-manager/src/main/java/com/mortals/xhx/module/data/model/DataAreaQuery.java

-package com.mortals.xhx.module.data.model;
-
-import java.util.List;
-
-/**
-*
-* Description:DataArea
-* date: 2021-8-10 13:57:03
-*/
-public class DataAreaQuery extends DataAreaEntity{
-    private static final long serialVersionUID = 1628575023258L;
-
-    /** 主键ID */
-    private List<String> idList;
-
-    /** 地区名称 */
-    private List<String> areaNameList;
-
-    /** 地区简称 */
-    private List<String> areaSimpleNameList;
-
-    /** 上级地区ID */
-    private List<String> parentAreaIdList;
-
-    /** 行政区域代码             行政区域代码              */
-    private List<String> areaCodeList;
-
-    /** 删除标识 */
-    private List<String> deleteFlagList;
-
-    /** 创建人 */
-    private List<String> creatorIdList;
-
-    /** 创建人名称 */
-    private List<String> creatorNameList;
-
-    /** 创建时间 */
-    private List<String> createTimesList;
-
-    /** 更新时间 */
-    private List<String> updateTimesList;
-
-    /** 1省级，2市级，3区县级，4乡镇级，5村 */
-    private List<String> areaLevelList;
-
-    /** 排序 */
-    private List<String> sortKeyList;
-
-    /** 地区层级编码 */
-    private List<String> areaLevelCodeList;
-
-    /** 临时使用确认地区层级 */
-    private List<String> submitAreaLevelList;
-
-    /** 是否特殊区域：0.否，1.是 */
-    private List<String> isSpecialList;
-
-    /** 行政区域描述 */
-    private List<String> areaDescList;
-
-    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
-    private List<DataAreaQuery> orConditionList;
-
-    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
-    private List<DataAreaQuery> andConditionList;
-
-
-    public DataAreaQuery(){
-    }
-
-    /**
-    * 获取 主键ID
-    * @return idList
-    */
-    public List<String> getIdList(){
-        return this.idList;
-    }
-
-    /**
-    * 设置 主键ID
-    * @param idList
-    */
-    public void setIdList(List<String> idList){
-        this.idList = idList;
-    }
-    /**
-    * 获取 地区名称
-    * @return areaNameList
-    */
-    public List<String> getAreaNameList(){
-        return this.areaNameList;
-    }
-
-    /**
-    * 设置 地区名称
-    * @param areaNameList
-    */
-    public void setAreaNameList(List<String> areaNameList){
-        this.areaNameList = areaNameList;
-    }
-    /**
-    * 获取 地区简称
-    * @return areaSimpleNameList
-    */
-    public List<String> getAreaSimpleNameList(){
-        return this.areaSimpleNameList;
-    }
-
-    /**
-    * 设置 地区简称
-    * @param areaSimpleNameList
-    */
-    public void setAreaSimpleNameList(List<String> areaSimpleNameList){
-        this.areaSimpleNameList = areaSimpleNameList;
-    }
-    /**
-    * 获取 上级地区ID
-    * @return parentAreaIdList
-    */
-    public List<String> getParentAreaIdList(){
-        return this.parentAreaIdList;
-    }
-
-    /**
-    * 设置 上级地区ID
-    * @param parentAreaIdList
-    */
-    public void setParentAreaIdList(List<String> parentAreaIdList){
-        this.parentAreaIdList = parentAreaIdList;
-    }
-    /**
-    * 获取 行政区域代码             行政区域代码             
-    * @return areaCodeList
-    */
-    public List<String> getAreaCodeList(){
-        return this.areaCodeList;
-    }
-
-    /**
-    * 设置 行政区域代码             行政区域代码             
-    * @param areaCodeList
-    */
-    public void setAreaCodeList(List<String> areaCodeList){
-        this.areaCodeList = areaCodeList;
-    }
-    /**
-    * 获取 删除标识
-    * @return deleteFlagList
-    */
-    public List<String> getDeleteFlagList(){
-        return this.deleteFlagList;
-    }
-
-    /**
-    * 设置 删除标识
-    * @param deleteFlagList
-    */
-    public void setDeleteFlagList(List<String> deleteFlagList){
-        this.deleteFlagList = deleteFlagList;
-    }
-    /**
-    * 获取 创建人
-    * @return creatorIdList
-    */
-    public List<String> getCreatorIdList(){
-        return this.creatorIdList;
-    }
-
-    /**
-    * 设置 创建人
-    * @param creatorIdList
-    */
-    public void setCreatorIdList(List<String> creatorIdList){
-        this.creatorIdList = creatorIdList;
-    }
-    /**
-    * 获取 创建人名称
-    * @return creatorNameList
-    */
-    public List<String> getCreatorNameList(){
-        return this.creatorNameList;
-    }
-
-    /**
-    * 设置 创建人名称
-    * @param creatorNameList
-    */
-    public void setCreatorNameList(List<String> creatorNameList){
-        this.creatorNameList = creatorNameList;
-    }
-    /**
-    * 获取 创建时间
-    * @return createTimesList
-    */
-    public List<String> getCreateTimesList(){
-        return this.createTimesList;
-    }
-
-    /**
-    * 设置 创建时间
-    * @param createTimesList
-    */
-    public void setCreateTimesList(List<String> createTimesList){
-        this.createTimesList = createTimesList;
-    }
-    /**
-    * 获取 更新时间
-    * @return updateTimesList
-    */
-    public List<String> getUpdateTimesList(){
-        return this.updateTimesList;
-    }
-
-    /**
-    * 设置 更新时间
-    * @param updateTimesList
-    */
-    public void setUpdateTimesList(List<String> updateTimesList){
-        this.updateTimesList = updateTimesList;
-    }
-    /**
-    * 获取 1省级，2市级，3区县级，4乡镇级，5村
-    * @return areaLevelList
-    */
-    public List<String> getAreaLevelList(){
-        return this.areaLevelList;
-    }
-
-    /**
-    * 设置 1省级，2市级，3区县级，4乡镇级，5村
-    * @param areaLevelList
-    */
-    public void setAreaLevelList(List<String> areaLevelList){
-        this.areaLevelList = areaLevelList;
-    }
-    /**
-    * 获取 排序
-    * @return sortKeyList
-    */
-    public List<String> getSortKeyList(){
-        return this.sortKeyList;
-    }
-
-    /**
-    * 设置 排序
-    * @param sortKeyList
-    */
-    public void setSortKeyList(List<String> sortKeyList){
-        this.sortKeyList = sortKeyList;
-    }
-    /**
-    * 获取 地区层级编码
-    * @return areaLevelCodeList
-    */
-    public List<String> getAreaLevelCodeList(){
-        return this.areaLevelCodeList;
-    }
-
-    /**
-    * 设置 地区层级编码
-    * @param areaLevelCodeList
-    */
-    public void setAreaLevelCodeList(List<String> areaLevelCodeList){
-        this.areaLevelCodeList = areaLevelCodeList;
-    }
-    /**
-    * 获取 临时使用确认地区层级
-    * @return submitAreaLevelList
-    */
-    public List<String> getSubmitAreaLevelList(){
-        return this.submitAreaLevelList;
-    }
-
-    /**
-    * 设置 临时使用确认地区层级
-    * @param submitAreaLevelList
-    */
-    public void setSubmitAreaLevelList(List<String> submitAreaLevelList){
-        this.submitAreaLevelList = submitAreaLevelList;
-    }
-    /**
-    * 获取 是否特殊区域：0.否，1.是
-    * @return isSpecialList
-    */
-    public List<String> getIsSpecialList(){
-        return this.isSpecialList;
-    }
-
-    /**
-    * 设置 是否特殊区域：0.否，1.是
-    * @param isSpecialList
-    */
-    public void setIsSpecialList(List<String> isSpecialList){
-        this.isSpecialList = isSpecialList;
-    }
-    /**
-    * 获取 行政区域描述
-    * @return areaDescList
-    */
-    public List<String> getAreaDescList(){
-        return this.areaDescList;
-    }
-
-    /**
-    * 设置 行政区域描述
-    * @param areaDescList
-    */
-    public void setAreaDescList(List<String> areaDescList){
-        this.areaDescList = areaDescList;
-    }
-
-    /**
-    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
-    * @return orConditionList
-    */
-    public List<DataAreaQuery> getOrConditionList(){
-    return this.orConditionList;
-    }
-
-    /**
-    * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
-    * @param orConditionList
-    */
-    public void setOrConditionList(List<DataAreaQuery> orConditionList){
-        this.orConditionList = orConditionList;
-    }
-
-    /**
-    * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
-    * @return andConditionList
-    */
-    public List<DataAreaQuery> getAndConditionList(){
-        return this.andConditionList;
-    }
-
-    /**
-    * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
-    * @param andConditionList
-    */
-    public void setAndConditionList(List<DataAreaQuery> andConditionList){
-        this.andConditionList = andConditionList;
-    }
-
-}
\ No newline at end of file

government-manager/src/main/java/com/mortals/xhx/module/data/service/DataAreaService.java

-package com.mortals.xhx.module.data.service;
-
-import com.mortals.framework.service.ICRUDService;
-import com.mortals.xhx.module.data.model.DataAreaEntity;
-
-/**
-* <p>Title: 地区表</p>
-* <p>Description: DataAreaService service接口 </p>
-* <p>Copyright: Copyright &reg;  </p>
-* @version 1.0.0
-*/
-
-public interface DataAreaService extends ICRUDService<DataAreaEntity,Long>{
-
-}
\ No newline at end of file

government-manager/src/main/java/com/mortals/xhx/module/data/service/impl/DataAreaServiceImpl.java

-package com.mortals.xhx.module.data.service.impl;
-
-import org.springframework.stereotype.Service;
-import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
-import com.mortals.xhx.module.data.dao.DataAreaDao;
-import com.mortals.xhx.module.data.model.DataAreaEntity;
-import com.mortals.xhx.module.data.service.DataAreaService;
-
-/**
-* <p>Title: 地区表</p>
-* <p>Description: DataAreaService service接口 </p>
-* <p>Copyright: Copyright &reg;  </p>
-* @version 1.0.0
-*/
-@Service("dataAreaService")
-public class DataAreaServiceImpl extends AbstractCRUDServiceImpl<DataAreaDao, DataAreaEntity, Long> implements DataAreaService {
-
-}
\ No newline at end of file

government-manager/src/main/java/com/mortals/xhx/module/data/web/DataAreaController.java

-package com.mortals.xhx.module.data.web;
-
-import com.alibaba.fastjson.JSON;
-import com.mortals.framework.exception.AppException;
-import com.mortals.framework.model.Context;
-import com.mortals.xhx.base.system.area.web.AreaForm;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.mortals.framework.web.BaseCRUDJsonMappingController;
-import com.mortals.xhx.module.data.model.DataAreaEntity;
-import com.mortals.xhx.module.data.service.DataAreaService;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-
-/**
-* <p>Title: 地区表</p>
-* <p>Description: DataAreaController  </p>
-* <p>Copyright: Copyright &reg;  </p>
-* <p>Company: </p>
-* @author zxfei
-* @version 1.0.0
-*/
-@RestController
-@RequestMapping("data/area")
-public class DataAreaController extends BaseCRUDJsonMappingController<DataAreaService,DataAreaForm,DataAreaEntity,Long> {
-
-
-
-
-    public DataAreaController(){
-        super.setFormClass(DataAreaForm.class);
-        super.setModuleDesc("地区表");
-    }
-
-//    @Override
-//    protected int doListAfter(HttpServletRequest request, HttpServletResponse response, DataAreaForm form, Map<String, Object> model, Context context) throws AppException {
-//
-//        List<DataAreaEntity> result = (List<DataAreaEntity>) model.get("result");
-//        List<HashMap<String, String>> collect = result.parallelStream().map(item -> {
-//            HashMap<String, String> map = new HashMap<>();
-//
-//            map.put("id", item.getId().toString());
-//            map.put("name", item.getAreaName());
-//            map.put("parentId", item.getParentAreaId());
-//            map.put("code", item.getAreaCode());
-//            map.put("level", item.getAreaLevel());
-//            return map;
-//
-//        }).collect(Collectors.toList());
-//        model.put("result",collect);
-//
-//        return super.doListAfter(request, response, form, model, context);
-//    }
-
-    public static void main(String[] args) {
-        AreaForm areaForm = new AreaForm();
-        areaForm.getEntity().setId(1L);
-        System.out.println(JSON.toJSONString(areaForm));
-    }
-}
\ No newline at end of file

government-manager/src/main/java/com/mortals/xhx/module/data/web/DataAreaForm.java

-package com.mortals.xhx.module.data.web;
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.data.model.DataAreaEntity;
-import com.mortals.xhx.module.data.model.DataAreaQuery;
-
-/**
-* <p>Title: 地区表</p>
-* <p>Description: DataAreaForm  </p>
-* @author
-* @version 1.0.0
-*/
-public class DataAreaForm extends BaseCRUDFormLong<DataAreaEntity> {
-    private DataAreaEntity dataarea = new DataAreaEntity();
-    private DataAreaQuery query = new DataAreaQuery();
-    public DataAreaForm(){
-
-    }
-
-    @Override
-    public DataAreaEntity getEntity() {
-    return dataarea;
-    }
-    public DataAreaEntity getDataArea() {
-    return dataarea;
-    }
-
-    public void setDataArea(DataAreaEntity dataarea) {
-    this.dataarea = dataarea;
-    }
-
-    @Override
-    public DataAreaQuery getQuery() {
-    return query;
-    }
-
-    public void setQuery(DataAreaQuery query) {
-    this.query = query;
-    }
-}
\ No newline at end of file

government-manager/src/main/java/com/mortals/xhx/module/deploy/web/DeployFormForm.java

@@ -5,36 +5,35 @@ import com.mortals.xhx.module.deploy.model.DeployFormEntity;
 import com.mortals.xhx.module.deploy.model.DeployFormQuery;
 
 /**
-* <p>Title: 流程实例关联表单表</p>
-* <p>Description: DeployFormForm  </p>
-* @author
-* @version 1.0.0
-*/
+ * <p>Title: 流程实例关联表单表</p>
+ * <p>Description: DeployFormForm  </p>
+ *
+ * @author
+ * @version 1.0.0
+ */
 public class DeployFormForm extends BaseCRUDFormLong<DeployFormEntity> {
-    private DeployFormEntity deployform = new DeployFormEntity();
+    private DeployFormEntity entity = new DeployFormEntity();
     private DeployFormQuery query = new DeployFormQuery();
-    public DeployFormForm(){
+
+    public DeployFormForm() {
 
     }
 
     @Override
     public DeployFormEntity getEntity() {
-    return deployform;
-    }
-    public DeployFormEntity getDeployForm() {
-    return deployform;
+        return entity;
     }
 
-    public void setDeployForm(DeployFormEntity deployform) {
-    this.deployform = deployform;
+    public void setEntity(DeployFormEntity entity) {
+        this.entity = entity;
     }
 
     @Override
     public DeployFormQuery getQuery() {
-    return query;
+        return query;
     }
 
     public void setQuery(DeployFormQuery query) {
-    this.query = query;
+        this.query = query;
     }
 }
\ No newline at end of file

government-manager/src/main/java/com/mortals/xhx/module/flowable/web/FlowableDefinitionController.java

@@ -60,7 +60,8 @@ public class FlowableDefinitionController extends BaseCRUDJsonMappingController<
      * 查询流程定义表
      */
     @PostMapping(value = "list")
-    public String list(HttpServletRequest request, HttpServletResponse response, FlowableDefinitionForm form) {
+    @Override
+    public String list(FlowableDefinitionForm form) {
         Map<String, Object> model = new HashMap();
         JSONObject ret = new JSONObject();
         int code = VALUE_RESULT_SUCCESS;

government-manager/src/main/java/com/mortals/xhx/module/flowable/web/FlowableDefinitionForm.java

@@ -11,7 +11,7 @@ import com.mortals.xhx.module.flowable.model.FlowableDefinitionQuery;
 * @version 1.0.0
 */
 public class FlowableDefinitionForm extends BaseCRUDFormLong<FlowableDefinitionEntity> {
-    private FlowableDefinitionEntity flowabledefinition = new FlowableDefinitionEntity();
+    private FlowableDefinitionEntity entity = new FlowableDefinitionEntity();
     private FlowableDefinitionQuery query = new FlowableDefinitionQuery();
     public FlowableDefinitionForm(){
 
@@ -19,14 +19,11 @@ public class FlowableDefinitionForm extends BaseCRUDFormLong<FlowableDefinitionE
 
     @Override
     public FlowableDefinitionEntity getEntity() {
-    return flowabledefinition;
-    }
-    public FlowableDefinitionEntity getFlowableDefinition() {
-    return flowabledefinition;
+    return entity;
     }
 
-    public void setFlowableDefinition(FlowableDefinitionEntity flowabledefinition) {
-    this.flowabledefinition = flowabledefinition;
+    public void setEntity(FlowableDefinitionEntity entity) {
+        this.entity = entity;
     }
 
     @Override

government-manager/src/main/java/com/mortals/xhx/module/form/web/FormForm.java

@@ -5,35 +5,34 @@ import com.mortals.xhx.module.form.model.FormEntity;
 import com.mortals.xhx.module.form.model.FormQuery;
 
 /**
-* <p>Title: 流程表单表</p>
-* <p>Description: FormForm  </p>
-* @author
-* @version 1.0.0
-*/
+ * <p>Title: 流程表单表</p>
+ * <p>Description: FormForm  </p>
+ *
+ * @author
+ * @version 1.0.0
+ */
 public class FormForm extends BaseCRUDFormLong<FormEntity> {
-    private FormEntity form = new FormEntity();
+    private FormEntity entity = new FormEntity();
     private FormQuery query = new FormQuery();
-    public FormForm(){
+
+    public FormForm() {
     }
 
     @Override
     public FormEntity getEntity() {
-    return form;
-    }
-    public FormEntity getForm() {
-    return form;
+        return entity;
     }
 
-    public void setForm(FormEntity form) {
-    this.form = form;
+    public void setEntity(FormEntity entity) {
+        this.entity = entity;
     }
 
     @Override
     public FormQuery getQuery() {
-    return query;
+        return query;
     }
 
     public void setQuery(FormQuery query) {
-    this.query = query;
+        this.query = query;
     }
 }
\ No newline at end of file

government-manager/src/main/java/com/mortals/xhx/module/task/service/impl/TaskFinishServiceImpl.java

@@ -11,7 +11,6 @@ import com.mortals.xhx.common.pdu.api.ApiRespPdu;
 import com.mortals.xhx.common.pdu.flow.FlowTaskPdu;
 import com.mortals.xhx.common.utils.BeanUtil;
 import com.mortals.xhx.feign.flowable.IApiFlowTaskFeign;
-import com.mortals.xhx.module.data.service.DataAreaService;
 import com.mortals.xhx.module.task.model.TaskFinishQuery;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

government-manager/src/main/java/com/mortals/xhx/module/task/web/TaskFinishController.java

@@ -37,7 +37,8 @@ public class TaskFinishController extends BaseCRUDJsonMappingController<TaskFini
      * 查询已办列表
      */
     @PostMapping(value = "list")
-    public String list(HttpServletRequest request, HttpServletResponse response, TaskFinishForm form) {
+    @Override
+    public String list(TaskFinishForm form) {
         Map<String, Object> model = new HashMap();
         JSONObject ret = new JSONObject();
         int code = VALUE_RESULT_SUCCESS;

government-manager/src/main/java/com/mortals/xhx/module/task/web/TaskFinishForm.java

@@ -11,7 +11,7 @@ import com.mortals.xhx.module.task.model.TaskFinishQuery;
 * @version 1.0.0
 */
 public class TaskFinishForm extends BaseCRUDFormLong<TaskFinishEntity> {
-    private TaskFinishEntity taskfinish = new TaskFinishEntity();
+    private TaskFinishEntity entity = new TaskFinishEntity();
     private TaskFinishQuery query = new TaskFinishQuery();
     public TaskFinishForm(){
 
@@ -19,14 +19,11 @@ public class TaskFinishForm extends BaseCRUDFormLong<TaskFinishEntity> {
 
     @Override
     public TaskFinishEntity getEntity() {
-    return taskfinish;
-    }
-    public TaskFinishEntity getTaskFinish() {
-    return taskfinish;
+    return entity;
     }
 
-    public void setTaskFinish(TaskFinishEntity taskfinish) {
-    this.taskfinish = taskfinish;
+    public void setEntity(TaskFinishEntity entity) {
+        this.entity = entity;
     }
 
     @Override

government-manager/src/main/java/com/mortals/xhx/module/task/web/TaskFormForm.java

@@ -11,7 +11,7 @@ import com.mortals.xhx.module.task.model.TaskFormQuery;
 * @version 1.0.0
 */
 public class TaskFormForm extends BaseCRUDFormLong<TaskFormEntity> {
-    private TaskFormEntity taskform = new TaskFormEntity();
+    private TaskFormEntity entity = new TaskFormEntity();
     private TaskFormQuery query = new TaskFormQuery();
     public TaskFormForm(){
 
@@ -19,14 +19,12 @@ public class TaskFormForm extends BaseCRUDFormLong<TaskFormEntity> {
 
     @Override
     public TaskFormEntity getEntity() {
-    return taskform;
-    }
-    public TaskFormEntity getTaskForm() {
-    return taskform;
+    return entity;
     }
 
-    public void setTaskForm(TaskFormEntity taskform) {
-    this.taskform = taskform;
+
+    public void setEntity(TaskFormEntity entity) {
+        this.entity = entity;
     }
 
     @Override

government-manager/src/main/java/com/mortals/xhx/module/task/web/TaskProcessController.java

@@ -63,7 +63,8 @@ public class TaskProcessController extends BaseCRUDJsonMappingController<TaskPro
      * 查询流程定义表
      */
     @PostMapping(value = "list")
-    public String list(HttpServletRequest request, HttpServletResponse response, TaskProcessForm form) {
+    @Override
+    public String list(TaskProcessForm form) {
         Map<String, Object> model = new HashMap();
         JSONObject ret = new JSONObject();
         int code = VALUE_RESULT_SUCCESS;
@@ -118,8 +119,7 @@ public class TaskProcessController extends BaseCRUDJsonMappingController<TaskPro
      * 查询任务流转记录
      */
     @PostMapping(value = "flowRecord")
-    public String flowRecord(HttpServletRequest request, HttpServletResponse response,
-                             @ApiParam(value = "流程实例id") @RequestParam(value = "procInsId", required = false) String procInsId,
+    public String flowRecord(@ApiParam(value = "流程实例id") @RequestParam(value = "procInsId", required = false) String procInsId,
                              @ApiParam(value = "流程定义id") @RequestParam(value = "deployId", required = false) String deployId) {
 
         log.info("receive flowRecord,procInsId:" + procInsId + "  deployId:" + deployId);

government-manager/src/main/java/com/mortals/xhx/module/task/web/TaskProcessForm.java

@@ -5,36 +5,35 @@ import com.mortals.xhx.module.task.model.TaskProcessEntity;
 import com.mortals.xhx.module.task.model.TaskProcessQuery;
 
 /**
-* <p>Title: 流程实例表</p>
-* <p>Description: TaskProcessForm  </p>
-* @author
-* @version 1.0.0
-*/
+ * <p>Title: 流程实例表</p>
+ * <p>Description: TaskProcessForm  </p>
+ *
+ * @author
+ * @version 1.0.0
+ */
 public class TaskProcessForm extends BaseCRUDFormLong<TaskProcessEntity> {
-    private TaskProcessEntity taskprocess = new TaskProcessEntity();
+    private TaskProcessEntity entity = new TaskProcessEntity();
     private TaskProcessQuery query = new TaskProcessQuery();
-    public TaskProcessForm(){
+
+    public TaskProcessForm() {
 
     }
 
     @Override
     public TaskProcessEntity getEntity() {
-    return taskprocess;
-    }
-    public TaskProcessEntity getTaskProcess() {
-    return taskprocess;
+        return entity;
     }
 
-    public void setTaskProcess(TaskProcessEntity taskprocess) {
-    this.taskprocess = taskprocess;
+    public void setEntity(TaskProcessEntity entity) {
+        this.entity = entity;
     }
 
     @Override
     public TaskProcessQuery getQuery() {
-    return query;
+        return query;
     }
 
     public void setQuery(TaskProcessQuery query) {
-    this.query = query;
+        this.query = query;
     }
 }
\ No newline at end of file

government-manager/src/main/java/com/mortals/xhx/module/task/web/TaskTodoController.java

@@ -53,7 +53,8 @@ public class TaskTodoController extends BaseCRUDJsonMappingController<TaskTodoSe
      * 查询代办列表
      */
     @PostMapping(value = "list")
-    public String list(HttpServletRequest request, HttpServletResponse response, TaskTodoForm form) {
+    @Override
+    public String list( TaskTodoForm form) {
         Map<String, Object> model = new HashMap();
         JSONObject ret = new JSONObject();
         int code = VALUE_RESULT_SUCCESS;

government-manager/src/main/java/com/mortals/xhx/module/task/web/TaskTodoForm.java

@@ -5,36 +5,35 @@ import com.mortals.xhx.module.task.model.TaskTodoEntity;
 import com.mortals.xhx.module.task.model.TaskTodoQuery;
 
 /**
-* <p>Title: 工作代办表</p>
-* <p>Description: TaskTodoForm  </p>
-* @author
-* @version 1.0.0
-*/
+ * <p>Title: 工作代办表</p>
+ * <p>Description: TaskTodoForm  </p>
+ *
+ * @author
+ * @version 1.0.0
+ */
 public class TaskTodoForm extends BaseCRUDFormLong<TaskTodoEntity> {
-    private TaskTodoEntity tasktodo = new TaskTodoEntity();
+    private TaskTodoEntity entity = new TaskTodoEntity();
     private TaskTodoQuery query = new TaskTodoQuery();
-    public TaskTodoForm(){
+
+    public TaskTodoForm() {
 
     }
 
     @Override
     public TaskTodoEntity getEntity() {
-    return tasktodo;
-    }
-    public TaskTodoEntity getTaskTodo() {
-    return tasktodo;
+        return entity;
     }
 
-    public void setTaskTodo(TaskTodoEntity tasktodo) {
-    this.tasktodo = tasktodo;
+    public void setEntity(TaskTodoEntity entity) {
+        this.entity = entity;
     }
 
     @Override
     public TaskTodoQuery getQuery() {
-    return query;
+        return query;
     }
 
     public void setQuery(TaskTodoQuery query) {
-    this.query = query;
+        this.query = query;
     }
 }
\ No newline at end of file

government-manager/src/main/java/com/mortals/xhx/stream/TaskProcessStreamListener.java

@@ -3,7 +3,10 @@ package com.mortals.xhx.stream;
 import com.alibaba.fastjson.JSON;
 
 import com.mortals.xhx.base.framework.config.InterceptorConfig;
+import com.mortals.xhx.base.framework.ws.message.SendToOneRequest;
+import com.mortals.xhx.base.framework.ws.util.WebSocketUtil;
 import com.mortals.xhx.common.pdu.flow.FlowTaskNotifyPdu;
+import com.mortals.xhx.tools.uid.ISeqGeneratorService;
 import com.mortals.xhx.utils.stream.messaging.ProcessTaskSink;
 import lombok.extern.apachecommons.CommonsLog;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,16 +22,27 @@ public class TaskProcessStreamListener {
 
     @Autowired
      private InterceptorConfig interceptorConfig;
+    @Autowired
+    private ISeqGeneratorService seqGeneratorService;
+
     /**
      * 接收流程管理器任务
      */
     @StreamListener(ProcessTaskSink.INPUT)
     public void receiveTask(FlowTaskNotifyPdu task) {
-        log.info("comsumer message processTask:"+ JSON.toJSONString(task));
+        log.debug("comsumer message processTask:"+ JSON.toJSONString(task));
 
         if(interceptorConfig.getTenantId().equals(task.getTenantId())){
-             log.info("本节点代办任务通知事件");
+             log.debug("本节点代办任务通知事件");
             // TODO 通过websocket刷新页面消息
+            task.getUserNameList().stream().peek(item->{
+                //针对所有在线的发送
+                SendToOneRequest sendToOneRequest = new SendToOneRequest();
+                sendToOneRequest.setToUser(item);
+                sendToOneRequest.setMsgId(seqGeneratorService.nextOrderId(1)+"");
+                sendToOneRequest.setContent("notify");
+                WebSocketUtil.send(item,SendToOneRequest.TYPE,sendToOneRequest);
+            }).count();
         }
     }
 

government-manager/src/main/resources/bootstrap.yml

@@ -6,10 +6,11 @@ spring:
     name: government-manager
   profiles:
     active: develop
-  http:
+  servlet:
     multipart:
-      maxFileSize: 100Mb
-      maxRequestSize: 1000Mb
+      max-file-size: 100MB
+      max-request-size: 1000MB
+
   cloud:
     nacos:
       # Nacos 作为注册中心的配置项，对应 NacosDiscoveryProperties 配置类
@@ -34,3 +35,5 @@ application:
     uncheckUrl: /refresh,/error,/login/login,/login/index,/login/logout,/securitycode/createCode,/test*,/api/asset/*,/api/*,/ws/*,/swagger-ui*
   workflow:
     tenantId: ${spring.application.name}
+token:
+  head: mortal

government-manager/src/main/resources/config/mybatis-sqlmap-config.xml

@@ -9,7 +9,7 @@
 		<setting name="useGeneratedKeys" value="false" />
 		<setting name="defaultExecutorType" value="REUSE" />
 		<!-- 是否开始sql日志控制台打印 -->
-       <!--  <setting name="logImpl" value="STDOUT_LOGGING" />-->
+        <setting name="logImpl" value="STDOUT_LOGGING" />
 	</settings>
 	<plugins>
 		<plugin interceptor="com.mortals.framework.thirty.mybatis.MortalsPagePlugin">

government-manager/src/main/resources/logback-spring.xml

@@ -33,9 +33,17 @@
             <fileNamePattern>${logFilePath}/${springApplicationName:-default}/${serverPort:-default}-error.log.%d{yyyyMMdd}</fileNamePattern>
         </rollingPolicy>
     </appender>
+
+    <logger name="com.mortals.xhx.module" level="DEBUG" additivity="false"/>
+
     <root level="${logLevel}">
         <appender-ref ref="console"/>
         <appender-ref ref="fileInfo"/>
         <appender-ref ref="fileError"/>
     </root>
+    <logger name="com.mortals.xhx.module" level="INFO" additivity="false">
+        <appender-ref ref="console"/>
+        <appender-ref ref="fileInfo"/>
+        <appender-ref ref="fileError"/>
+    </logger>
 </configuration>
\ No newline at end of file