Skip to content

G
government-platform
Commit 5dd836e0 authored by 赵啸非's avatar 赵啸非
Browse files
Options

app-ui

parent c1446d69
Pipeline #2994 failed with stages
      Expand all Hide whitespace changes
      Inline Side-by-side
      Showing with 3198 additions and 5416 deletions
      app-ui/src/assets/icons/index.js
      View file @ 5dd836e0
      import Vue from 'vue' import Vue from 'vue'
      import SvgIcon from '@/components/SvgIcon'// svg component
      // register globally
      Vue.component('svg-icon', SvgIcon)
      const req = require.context('./svg', false, /\.svg$/)
      const requireAll = requireContext => requireContext.keys().map(requireContext) const requireAll = requireContext => requireContext.keys().map(requireContext)
      requireAll(req) requireAll(req)
      app-ui/src/assets/utils/globalComponents.js
      View file @ 5dd836e0
      ...@@ -10,7 +10,8 @@ import FormField from '@/components/FormField'; ...@@ -10,7 +10,8 @@ import FormField from '@/components/FormField';
      import Upload from '@/components/Upload'; import Upload from '@/components/Upload';
      import TreeTable from '@/components/TreeTable.vue'; import TreeTable from '@/components/TreeTable.vue';
      import TopicInfo from '@/components/TopicInfo.vue'; import TopicInfo from '@/components/TopicInfo.vue';
      import LimitIndex from '@/components/LimitIndex.vue';
      const Prototype = function() {}; const Prototype = function() {};
      ...@@ -26,8 +27,7 @@ Prototype.install = (Vue, options) => { ...@@ -26,8 +27,7 @@ Prototype.install = (Vue, options) => {
      Vue.component('Upload', Upload) // 文件上传 Vue.component('Upload', Upload) // 文件上传
      Vue.component('TreeTable', TreeTable) // 文件上传 Vue.component('TreeTable', TreeTable) // 文件上传
      Vue.component('TopicInfo', TopicInfo) // 文件上传 Vue.component('TopicInfo', TopicInfo) // 文件上传
      Vue.component('LimitIndex', LimitIndex) // 文件上传
      } }
      export default Prototype; export default Prototype;
      app-ui/src/components/LimitEnd.vue
      View file @ 5dd836e0
      ...@@ -16,6 +16,9 @@ export default { ...@@ -16,6 +16,9 @@ export default {
      data() { data() {
      return {} return {}
      }, },
      created() {
      console.log(33333)
      },
      props: { props: {
      rule: { rule: {
      type: Object, type: Object,
      ......
      app-ui/src/components/LimitIndex.vue
      View file @ 5dd836e0
      <template>
      <el-form inline :form="data" :label-width="'150px'" label-position="right">
      <LimitLevel
      :rule="data"
      :moIndex="mo_index"
      ></LimitLevel>
      </el-form>
      </template>
      <script>
      import LimitLevel from "./LimitLevel";
      export default {
      components: {
      LimitLevel,
      },
      created() {
      //self = this;
      console.log("111")
      this.data=this.rule
      console.log(this.data)
      },
      methods: {
      submitAns(data, label, all_data, index) {
      let ans = null;
      if (data) {
      ans = deepClone(data);
      }
      this.$emit('submitAns', data, label, all_data, this.moIndex);
      }
      },
      data() {
      return {
      mo_index: 0,
      data:[],
      rule: [
      {
      type: "select",
      name: "wr1",
      label: "问题块根-问题1",
      ans: null,
      child: null,
      content: [
      {
      value: "wr11",
      label: "问题块根-问题1-答案1",
      children: [
      {
      type: "select",
      name: "w11",
      label: "问题块1-问题1",
      ans: null,
      child: null,
      content: [
      {
      value: "w11",
      label: "问题块1-问题1-答案1",
      children: [
      {
      type: "end",
      },
      ],
      },
      {
      value: "w11",
      label: "问题块1-问题1-答案2",
      children: [
      {
      type: "select",
      name: "wa1",
      label: "问题块a-问题1",
      ans: null,
      child: null,
      content: [
      {
      value: "wa11",
      label: "问题块a-问题1-答案1",
      children: null,
      },
      {
      value: "wa11",
      label: "问题块a-问题1-答案2",
      children: null,
      },
      ],
      },
      {
      type: "select",
      name: "wa2",
      label: "问题块a-问题2",
      ans: null,
      child: null,
      content: [
      {
      value: "问题块a-问题2-答案1",
      label: "wa21",
      children: null,
      },
      {
      value: "问题块a-问题2-答案1",
      label: "wa22",
      children: null,
      },
      ],
      },
      {
      type: "end",
      },
      ],
      },
      ],
      },
      ],
      },
      {
      value: "wr12",
      label: "问题块根-问题1-答案2",
      children: [
      {
      type: "select",
      name: "wb1",
      label: "问题块b-问题1",
      ans: null,
      child: null,
      content: [
      {
      value: "wb11",
      label: "问题块b-问题1-答案1",
      children: [
      {
      type: "textarea",
      name: "wb111",
      label: "问题块b1-问题1",
      ans: null,
      child: null,
      },
      {
      type: "end",
      },
      ],
      },
      {
      value: "wb12",
      label: "问题块b-问题1-答案2",
      children: [
      {
      type: "daterange",
      label: "问题块b2-问题1",
      name: "wb121",
      ans: null,
      child: null,
      },
      ],
      },
      {
      value: "wb13",
      label: "问题块b-问题1-答案3",
      children: [
      {
      type: "end",
      },
      ],
      },
      ],
      },
      ],
      },
      ],
      },
      ],
      text: "11",
      form: "22",
      table: "",
      };
      },
      };
      </script>
      <style lang="less">
      </style>
      \ No newline at end of file
      app-ui/src/components/LimitLevel.vue
      View file @ 5dd836e0
      // level组件：
      <template> <template>
      {{data}} <div v-if="data">
      <div v-if="data"> <template v-for="(item, index) in data">
      <template v-for="(item, index) in data"> <div v-if="item.type == 'end'" :key="item.label">
      // 通过type不同选择不同的代码。。。不全部展示 <limitEnd :rule="item" @submitAns="submitAns"></limitEnd>
      <div v-if="item.type == 'end'" :key="item.label"> </div>
      <limitEnd :rule="item" @submitAns="submitAns"></limitEnd> <div v-if="item.type == 'select'" :key="item.label">
      </div> <el-form-item
      <div v-if="item.type == 'select'" :key="item.label"> :label="item.label ? item.label : ''"
      <el-form-item :rules="[{ required: true, message: '请选择', trigger: 'change' }]"
      :label="item.label ? item.label: ''" >
      :rules="[ <el-select
      { required: true, message: '请选择', trigger: 'change' } v-model="item.ans"
      ]"> placeholder="请选择"
      <el-select v-model="item.ans" placeholder="请选择" @change="changeSelect(index)"> @change="changeSelect(index)"
      <el-option v-for="(option, option_index) in item.content" :key="option.label" :label="option.label" :value="option_index"></el-option> >
      </el-select> <el-option
      </el-form-item> v-for="(option, option_index) in item.content"
      <template v-if="item.child"> :key="option.label"
      <limitLevel :rule="item.child" :moIndex="item.index" @submitAns="submitAns"></limitLevel> :label="option.label"
      </template> :value="option_index"
      </div> ></el-option>
      </el-select>
      </el-form-item>
      <template v-if="item.child">
      <limitLevel
      :rule="item.child"
      :moIndex="item.index"
      @submitAns="submitAns"
      ></limitLevel>
      </template> </template>
      </div> </div>
      </template>
      </div>
      </template> </template>
      <script> <script>
      import limitEnd from './LimitEnd' import limitEnd from "./LimitEnd";
      export default { export default {
      name: 'limitLevel', name: "LimitLevel",
      components: { components: {
      limitEnd limitEnd,
      },
      data() {
      return {
      data: null,
      value_index: null,
      value: null,
      child: null,
      };
      },
      props: {
      data: {
      type: Array,
      required: true,
      default: null,
      }, },
      data() { moIndex: {
      return { type: Number,
      data: null, required: true,
      value_index: null, default: null,
      value: null,
      child: null,
      }
      }, },
      props: { },
      rule: { created() {
      type: Array, console.log(222)
      required: true, this.fileList = this.list;
      default: null },
      }, watch: {
      moIndex: { $route() {
      type: Number, console.log(2222)
      required: true, }
      default: null },
      }, methods: {
      changeSelect(index) {
      this.$set(this.data[index], "child", null);
      this.$nextTick(() => {
      let ans = this.data[index].ans;
      let option = this.data[index].content[ans];
      this.$set(this.data[index], "child", option.children);
      this.$set(this.data[index], "index", index);
      });
      }, },
      created() { judgeAnsIsNull(item, label) {
      this.data = deepClone(this.rule); if (!item && item != 0) {
      this.$message({
      type: "error",
      message: "请填写" + label,
      });
      return false;
      }
      return true;
      }, },
      methods: { submitAns(data, des, all_data, mo_index) {
      changeSelect(index) { let ans = null;
      this.$set(this.data[index], 'child', null); let label = "";
      this.$nextTick(() => { if (mo_index || mo_index == 0) {
      let ans = this.data[index].ans; this.$set(this.data[mo_index], "child", all_data);
      let option = this.data[index].content[ans]; }
      this.$set(this.data[index], 'child', option.children);
      this.$set(this.data[index], 'index', index);
      })
      },
      judgeAnsIsNull(item, label) {
      if (!item && item != 0) {
      this.$message({
      type: 'error',
      message: '请填写' + label
      })
      return false; if (data) {
      } ans = deepClone(data);
      return true; } else {
      }, ans = {};
      submitAns(data, des, all_data, mo_index) { }
      let ans = null;
      let label = '';
      if (mo_index || mo_index == 0) {
      this.$set(this.data[mo_index], 'child', all_data);
      }
      if (data) {
      ans = deepClone(data);
      } else {
      ans = {};
      }
      for(let i = 0; i < this.data.length; i++) { for (let i = 0; i < this.data.length; i++) {
      // 没有答案，提醒填写 // 没有答案，提醒填写
      if (this.data[i].type == 'end') { if (this.data[i].type == "end") {
      continue; continue;
      } }
      switch(this.data[i].type) { switch (this.data[i].type) {
      case 'end': case "end":
      break; break;
      case 'select':
      this.judgeAnsIsNull(this.data[i].ans, this.data[i].label);
      let index = this.data[i].ans;
      let option = this.data[i].content[index];
      ans[this.data[i].name] = option.value;
      label += ' ' + option.label;
      break;
      default:
      break;
      }
      } case "select":
      this.judgeAnsIsNull(this.data[i].ans, this.data[i].label);
      let index = this.data[i].ans;
      let option = this.data[i].content[index];
      ans[this.data[i].name] = option.value;
      label += " " + option.label;
      break;
      this.$emit('submitAns', ans, label + ' ' +des, this.data, this.moIndex); default:
      break;
      } }
      } }
      }
      \ No newline at end of file this.$emit("submitAns", ans, label + " " + des, this.data, this.moIndex);
      },
      },
      };
      app-ui/src/router.js
      View file @ 5dd836e0
      ...@@ -12,6 +12,8 @@ const router = new Router({ ...@@ -12,6 +12,8 @@ const router = new Router({
      builder('/go', 'codeGen/index'), builder('/go', 'codeGen/index'),
      builder('/index', 'home/index'), builder('/index', 'home/index'),
      builder1('/test', 'components/LimitIndex'),
      builder('/question', 'home/question'), builder('/question', 'home/question'),
      ] ]
      ...@@ -52,6 +54,26 @@ function builder(path, component = path, requiresAuth = false) { ...@@ -52,6 +54,26 @@ function builder(path, component = path, requiresAuth = false) {
      } }
      } }
      function builder1(path, component = path, requiresAuth = false) {
      return {
      path: path,
      name: path || 'homepage',
      component: getComponent1(component),
      meta: {
      requiresAuth: requiresAuth
      }
      }
      }
      function getComponent1(fileName) {
      try {
      return require('./' + fileName).default
      } catch (error) {
      return fileNotFound;
      }
      }
      function getComponent(fileName) { function getComponent(fileName) {
      try { try {
      return require('./views/' + fileName).default return require('./views/' + fileName).default
      ......
      app-ui/src/views/home/index.vue
      View file @ 5dd836e0
      ...@@ -59,10 +59,8 @@ ...@@ -59,10 +59,8 @@
      <script> <script>
      import LimitIndex from "@/components/LimitIndex.vue";
      export default { export default {
      components: { components: {
      LimitIndex,
      }, },
      created() { created() {
      this.$post("/zwfw/proced/thing/oneTopiclist", { this.$post("/zwfw/proced/thing/oneTopiclist", {
      ......
      app-ui/src/views/home/question.vue
      View file @ 5dd836e0
      <template> <template>
      <mu-container class="demo-container is-stripe">
      <el-form :label-width="'150px'" label-position="right">
      <template v-for="(item, index) in rule">
      <el-form-item
      :key="index"
      :label="item.label ? item.label : ''"
      style="width: 100%"
      >
      <el-select v-model="item.ans" placeholder="请选择">
      <el-option
      v-for="(option, option_index) in item.content"
      :key="option.label"
      :label="option.label"
      :value="option_index"
      ></el-option>
      </el-select>
      </el-form-item>
      </template> <el-form inline :form="data" :label-width="'150px'" label-position="right">
      <el-form-item> <limitLevel
      <div style="text-align: center; width: 500px"> :rule="data"
      <el-button :moIndex="mo_index"
      size="small" ></limitLevel>
      type="primary"
      style="margin-right: 50px"
      @click="submitAns"
      >确定</el-button
      >
      <el-button size="small">取消</el-button>
      </div>
      </el-form-item>
      </el-form> </el-form>
      </mu-container>
      </template> </template>
      <script> <script>
      let self = null;
      export default { export default {
      components: {}, components: {
      limitLevel
      },
      created() { created() {
      console.log(1111);
      self = this; self = this;
      this.data=this.rule
      console.log(this.rule)
      }, },
      methods: { methods: {
      submitAns() { submitAns(data, label, all_data, index) {
      console.log(this.rule) let ans = null;
      let ans = {}; if (data) {
      for (let i = 0; i < this.rule.length; i++) { ans = deepClone(data);
      let item = this.rule[i]; }
      if ((!item.fa && item.fa != 0) || this.rule[item.fa].ans == item.faV) { console.log(this.rule);
      if (!item.ans && item.ans != 0) { this.$emit('submitAns', data, label, all_data, this.moIndex);
      this.$message({
      type: "warning",
      message: "请检查您的" + item.label + "是否填写",
      });
      return false;
      }
      ans[item.name] = item.ans;
      } }
      }
      console.log(ans);
      },
      }, },
      data() { data() {
      return { return {
      mo_index: 0,
      data:[],
      rule: [ rule: [
      { {
      type: "select", type: "select",
      name: "w1", name: "wr1",
      label: "问题1", label: "问题块根-问题1",
      ans: null,
      fa: null,
      content: [
      {
      value: "w11",
      label: "问题1-答案1",
      },
      {
      value: "w12",
      label: "问题1-答案2",
      },
      ],
      },
      {
      type: "select",
      name: "w2",
      label: "问题2",
      ans: null, ans: null,
      fa: 0, child: null,
      faV: 0,
      content: [ content: [
      { {
      value: "w21", value: "wr11",
      label: "问题2-答案1", label: "问题块根-问题1-答案1",
      children: [
      {
      type: "select",
      name: "w11",
      label: "问题块1-问题1",
      ans: null,
      child: null,
      content: [
      {
      value: "w11",
      label: "问题块1-问题1-答案1",
      children: [
      {
      type: "end",
      },
      ],
      },
      {
      value: "w11",
      label: "问题块1-问题1-答案2",
      children: [
      {
      type: "select",
      name: "wa1",
      label: "问题块a-问题1",
      ans: null,
      child: null,
      content: [
      {
      value: "wa11",
      label: "问题块a-问题1-答案1",
      children: null,
      },
      {
      value: "wa11",
      label: "问题块a-问题1-答案2",
      children: null,
      },
      ],
      },
      {
      type: "select",
      name: "wa2",
      label: "问题块a-问题2",
      ans: null,
      child: null,
      content: [
      {
      value: "问题块a-问题2-答案1",
      label: "wa21",
      children: null,
      },
      {
      value: "问题块a-问题2-答案1",
      label: "wa22",
      children: null,
      },
      ],
      },
      {
      type: "end",
      },
      ],
      },
      ],
      },
      ],
      }, },
      { {
      value: "w22", value: "wr12",
      label: "问题2-答案2", label: "问题块根-问题1-答案2",
      children: [
      {
      type: "select",
      name: "wb1",
      label: "问题块b-问题1",
      ans: null,
      child: null,
      content: [
      {
      value: "wb11",
      label: "问题块b-问题1-答案1",
      children: [
      {
      type: "textarea",
      name: "wb111",
      label: "问题块b1-问题1",
      ans: null,
      child: null,
      },
      {
      type: "end",
      },
      ],
      },
      {
      value: "wb12",
      label: "问题块b-问题1-答案2",
      children: [
      {
      type: "daterange",
      label: "问题块b2-问题1",
      name: "wb121",
      ans: null,
      child: null,
      },
      ],
      },
      {
      value: "wb13",
      label: "问题块b-问题1-答案3",
      children: [
      {
      type: "end",
      },
      ],
      },
      ],
      },
      ],
      }, },
      ], ],
      }, },
      ......
      app-ui/src/webRouter.ftl deleted 100644 → 0
      View file @ c1446d69
      import Vue from 'vue'
      import Router from 'vue-router'
      import Store from './store'
      import Layout from './views/Layout.vue'
      import fileNotFound from './views/errors/fileNotFound.vue'
      Vue.use(Router);
      const router = new Router({
      routes: [
      builder('/authentication', 'login/authentication'),
      builder('/login', 'login/login'),
      builder('/go', 'codeGen/index'),
      {
      path: '/',
      name: 'layout',
      component: Layout,
      meta: {
      requiresAuth: true
      },
      children: [
      ...restBuilder('oper/log', 'system/log'), // 系统管理-操作日志
      ...restBuilder('validcode', 'system/validcode'), // 接入管理-接入信息
      ...restBuilder('menu', 'system/menu'), // 系统管理--菜单管理
      ...restBuilder('resource', 'system/resource'), // 系统管理--资源管理
      ...restBuilder('role', 'system/role'), // 系统管理--角色管理
      ...restBuilder('user', 'system/user'), // 用户管理 -- 管理用户
      ...restBuilder('param', 'system/param'), // 系统管理--参数管理
      ...restBuilder('task', 'system/task'), // 系统管理--任务管理
      ...restBuilder('area', 'system/area'), // 系统管理-区域管理
      ...restBuilder('device/connhistory', 'device/connhistory'), // 设备管理-连接历史
      ...restBuilder('device', 'device'), // 系统管理-区域管理
      //在此添加业务模块
      //以下为基础路由配置
      builder('', 'Home'),
      builder('index', 'Home'),
      builder('login/updatePwd', 'login/updatePwd'),
      builder('403', 'errors/403'),
      builder('*', 'errors/404'),
      ]
      },
      ]
      })
      /**
      * rest路由生成器
      *
      * @param {string} path 路径
      * @param {string} [component=path] 文件地址
      * @returns {array} [] reset路由数组，包含list/edit/add/view
      */
      function restBuilder(path, component = path) {
      let arr = [];
      arr.push(builder(`${path}/list`, `${component}/list`));
      arr.push(builder(`${path}/edit`, `${component}/show`));
      arr.push(builder(`${path}/add`, `${component}/show`));
      arr.push(builder(`${path}/view`, `${component}/show`));
      return arr;
      }
      /**
      * 路由生成器
      *
      * @param {string} path 路径
      * @param {string} [component=path] 文件地址
      * @param {boolean} [requiresAuth=false] 是否登录后才能访问
      * @returns {any} {} 路由对象
      */
      function builder(path, component = path, requiresAuth = false) {
      return {
      path: path,
      name: path || 'homepage',
      component: getComponent(component),
      meta: {
      requiresAuth: requiresAuth
      }
      }
      }
      function getComponent(fileName) {
      try {
      return require('./views/' + fileName).default
      } catch (error) {
      return fileNotFound;
      }
      }
      //检查是否跳转到sso地址
      function ssoCheck (to, from, next) {
      let redirect = (to.path === '/login/updatePwd') ? '/#/updatePwd' : ''
      redirect = (redirect === '' && to.path === '/login') ? (location.protocol + '//' + location.host + '/#' + from.fullPath) : redirect
      if (redirect != '') {
      next(false)
      window.location.href = '//' + location.host + '/m/login/logout?redirect=' + encodeURIComponent(redirect)
      return true;
      }
      return false;
      }
      router.afterEach(() => {
      document.body.scrollTop = 0
      document.documentElement.scrollTop = 0
      })
      // 路由鉴权
      router.beforeEach((to, from, next) => {
      // if (ssoCheck(to, from, next)) { //sso鉴权检查
      // return
      // }
      if (to.matched.some(record => record.meta.requiresAuth)) {
      if (Store.state.isLogin) {
      next();
      } else {
      next({
      path: '/authentication',
      query: {
      redirect: to.fullPath
      }
      })
      }
      } else {
      next();
      }
      })
      export default router;
      \ No newline at end of file
      common-lib/src/main/java/com/mortals/xhx/feign/rsp/ApiResp.java
      View file @ 5dd836e0
      ...@@ -20,10 +20,4 @@ public class ApiResp<T> { ...@@ -20,10 +20,4 @@ public class ApiResp<T> {
      */ */
      private T data; private T data;
      // public boolean isSuccess() {
      // if (YesNoEnum.YES.getValue() == code) {
      // return true;
      // }
      // return false;
      // }
      } }
      government-manage-ui/admin/src/components/FormField.vue
      View file @ 5dd836e0
      ...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
      >{{$label}}</el-checkbox> >{{$label}}</el-checkbox>
      </el-checkbox-group> </el-checkbox-group>
      <el-date-picker :disabled='disabled' type="date" value-format="yyyy-MM-dd HH:mm:ss" v-model="field" @change="emit" @input="emit" placeholder="选择日期" v-if='type === "date"'></el-date-picker> <el-date-picker :disabled='disabled' type="date" value-format="yyyy-MM-dd" v-model="field" @change="emit" @input="emit" placeholder="选择日期" v-if='type === "date"'></el-date-picker>
      <el-date-picker :disabled='disabled' type="datetime" value-format="yyyy-MM-dd HH:mm:ss" v-model="field" @change="emit" @input="emit" placeholder="选择日期" v-if='type === "datetime"'></el-date-picker> <el-date-picker :disabled='disabled' type="datetime" value-format="yyyy-MM-dd HH:mm:ss" v-model="field" @change="emit" @input="emit" placeholder="选择日期" v-if='type === "datetime"'></el-date-picker>
      </slot> </slot>
      ......
      government-manage-ui/admin/src/views/demo/list.vue
      View file @ 5dd836e0
      ...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
      {label: "字段3", prop: "fieldThree"}, {label: "字段3", prop: "fieldThree"},
      {label: "测试详细", {label: "测试详细",
      width: 120, width: 120,
      prop: "subColumns", prop: "demoDetailList",
      formatter: (row) => { formatter: (row) => {
      let widthsize = this.columnSet.reduce((pre, cur) => { let widthsize = this.columnSet.reduce((pre, cur) => {
      return pre + Number(cur.width); return pre + Number(cur.width);
      ......
      government-manage-ui/admin/src/views/login/login.vue
      View file @ 5dd836e0
      ...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
      <div class="page page-login flex flex-v"> <div class="page page-login flex flex-v">
      <div class="form-wrap flex flex-1"> <div class="form-wrap flex flex-1">
      <el-form @submit.prevent='onSubmit' ref="form" :model="form" label-width="80px" size="small"> <el-form @submit.prevent='onSubmit' ref="form" :model="form" label-width="80px" size="small">
      <h1>工作流管理平台</h1> <h1>设备管理平台</h1>
      <el-form-item label="用户名"> <el-form-item label="用户名">
      <el-input v-model="form.loginName"></el-input> <el-input v-model="form.loginName"></el-input>
      </el-form-item> </el-form-item>
      ......
      government-manage-ui/admin/src/views/one/classify/list.vue
      View file @ 5dd836e0
      ...@@ -17,6 +17,12 @@ ...@@ -17,6 +17,12 @@
      <el-input v-model="topicform.topicalName"></el-input> <el-input v-model="topicform.topicalName"></el-input>
      </el-form-item> </el-form-item>
      </el-row> </el-row>
      <el-row>
      <el-form-item label="描述信息">
      <el-input v-model="topicform.remark"></el-input>
      </el-form-item>
      </el-row>
      </el-form> </el-form>
      <span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
      ...@@ -40,82 +46,41 @@ ...@@ -40,82 +46,41 @@
      :rules="topicPacksRules" :rules="topicPacksRules"
      ref="topicPacksform" ref="topicPacksform"
      > >
      <el-row>
      <el-col :span="12"> <el-col :span="12">
      <el-form-item prop="classifyName" label="主题包名称"> <el-form-item prop="classifyName" label="主题事项名称">
      <el-input v-model="classifyform.classifyName"></el-input> <el-input v-model="classifyform.classifyName"></el-input>
      </el-form-item> </el-form-item>
      </el-col> </el-col>
      <el-col :span="12"> <el-col :span="12">
      <el-form-item prop="sortRemarks" label="主题包说明"> <el-form-item prop="sortRemarks" label="主题事项说明">
      <el-input v-model="classifyform.sortRemarks"></el-input> <el-input v-model="classifyform.sortRemarks"></el-input>
      </el-form-item> </el-form-item>
      </el-col> </el-col>
      </el-row>
      <!-- <el-row>
      <el-col :span="12">
      <el-form-item prop="mainPicUrl" label="终端主题包图标">
      <el-upload
      class="avatar-uploader"
      action="/m/file/upload"
      :show-file-list="false"
      :on-success="handleSuccess"
      name="uploadFile"
      :data="{ prePath: '/image/plm/materia' }"
      :before-upload="beforeUpload"
      >
      </el-upload>
      </el-form-item>
      </el-col>
      <el-col :span="12">
      <el-form-item prop="mainPicUrl" label="移动主题包图标">
      <el-upload
      class="avatar-uploader"
      action="/m/file/upload"
      :show-file-list="false"
      :on-success="handleSuccess"
      name="uploadFile"
      :data="{ prePath: '/image/plm/materia' }"
      :before-upload="beforeUpload"
      >
      </el-upload>
      </el-form-item>
      </el-col>
      </el-row> -->
      <el-row>
      <el-col :span="12">
      <el-form-item prop="deliveryPeriod" label="承诺办结时限">
      <el-input
      placeholder="请输入内容"
      :disabled="topicPacksform.overWay == '1'"
      v-model="topicPacksform.overTime"
      class="input-with-select"
      >
      <el-select
      v-model="topicPacksform.overWay"
      slot="prepend"
      placeholder="请选择"
      >
      <el-option label="即刻" value="1"></el-option>
      <el-option label="工作日" value="2"></el-option>
      </el-select>
      </el-input>
      </el-form-item>
      </el-col>
      <el-col :span="12"> <el-col :span="12">
      <el-form-item prop="deliveryPeriod" label="到现场次数"> <el-form-item prop="deliveryPeriod" label="到现场次数">
      <el-input v-model="topicPacksform.presenceNum"></el-input> <el-input v-model="topicPacksform.presenceNum"></el-input>
      </el-form-item> </el-form-item>
      </el-col> </el-col>
      </el-row>
      <Field label="办理机构" prop="jointInfoShow" v-model="topicPacksform.jointInfoShow" placeholder="请输入办理机构"/>
      <Field label="法定时限" prop="legalTimeLimitShow" v-model="topicPacksform.legalTimeLimitShow" placeholder="请输入法定时限"/>
      <Field label="承诺时限" prop="promiseTimeLimitShow" v-model="topicPacksform.promiseTimeLimitShow" placeholder="请输入承诺时限"/>
      <Field label="收费标准" prop="isChargesShow" v-model="topicPacksform.isChargesShow" placeholder="请输入收费标准"/>
      <Field label="收费金额" prop="charges" v-model="topicPacksform.charges" placeholder="请输入收费金额"/>
      <Field label="办理时间" prop="handleTimeShow" v-model="topicPacksform.handleTimeShow" placeholder="请输入办理时间"/>
      <Field label="办理地点" prop="handlePlaceShow" v-model="topicPacksform.handlePlaceShow" placeholder="请输入办理地点"/>
      <Field label="咨询方式" prop="cousultingTelephoneShow" v-model="topicPacksform.cousultingTelephoneShow" placeholder="请输入咨询方式"/>
      <Field label="结果信息" prop="resultInfo" v-model="topicPacksform.resultInfo" placeholder="请输入结果信息"/>
      <Field label="投诉电话" prop="supervisoryTelephoneShow" v-model="topicPacksform.supervisoryTelephoneShow" placeholder="请输入投诉电话"/>
      </el-form> </el-form>
      </el-row> </el-row>
      <el-divider></el-divider> <el-divider></el-divider>
      <el-row> <el-row>
      <!--搜索--> <!--搜索-->
      <div> <div>
      <el-form :inline="true" size="mini"> <el-form :inline="true" size="mini">
      <el-form-item> <el-form-item>
      ...@@ -177,7 +142,6 @@ ...@@ -177,7 +142,6 @@
      </el-table-column> </el-table-column>
      </el-table> </el-table>
      <!-- 分页器 --> <!-- 分页器 -->
      <el-row type="flex" justify="end"> <el-row type="flex" justify="end">
      <el-pagination <el-pagination
      @current-change="handleCurrentChange" @current-change="handleCurrentChange"
      ...@@ -481,11 +445,14 @@ ...@@ -481,11 +445,14 @@
      <script> <script>
      import Pagination from "@/components/Pagination.vue"; import Pagination from "@/components/Pagination.vue";
      import table from "@/assets/mixins/table"; import table from "@/assets/mixins/table";
      import Form from "../../../components/Form.vue"; //import Form from "../../../components/Form.vue";
      //import topicClassify from "./topicClassify.vue";
      export default { export default {
      components: { components: {
      Pagination, Pagination,
      // topicClassify
      }, },
      name: "topic", name: "topic",
      mixins: [table], mixins: [table],
      ......
      government-manage-ui/admin/src/views/one/classify/topicClassify.vue 0 → 100644
      View file @ 5dd836e0
      <template>
      <!-- 新增主题包 -->
      <el-dialog
      :title="topicPacksDialog.title"
      :visible.sync="topicPacksDialog.visible"
      width="95%"
      >
      <el-row>
      <el-row>
      <el-form
      :model="topicPacksform"
      :label-width="formLabelWidth"
      :rules="topicPacksRules"
      ref="topicPacksform"
      >
      <el-row>
      <el-col :span="12">
      <el-form-item prop="classifyName" label="主题事项名称">
      <el-input v-model="classifyform.classifyName"></el-input>
      </el-form-item>
      </el-col>
      <el-col :span="12">
      <el-form-item prop="sortRemarks" label="主题事项说明">
      <el-input v-model="classifyform.sortRemarks"></el-input>
      </el-form-item>
      </el-col>
      </el-row>
      <el-row>
      <el-col :span="12">
      <el-form-item prop="deliveryPeriod" label="承诺办结时限">
      <el-input
      placeholder="请输入内容"
      :disabled="topicPacksform.overWay == '1'"
      v-model="topicPacksform.overTime"
      class="input-with-select"
      >
      <el-select
      v-model="topicPacksform.overWay"
      slot="prepend"
      placeholder="请选择"
      >
      <el-option label="即刻" value="1"></el-option>
      <el-option label="工作日" value="2"></el-option>
      </el-select>
      </el-input>
      </el-form-item>
      </el-col>
      <el-col :span="12">
      <el-form-item prop="deliveryPeriod" label="到现场次数">
      <el-input v-model="topicPacksform.presenceNum"></el-input>
      </el-form-item>
      </el-col>
      </el-row>
      </el-form>
      </el-row>
      <el-divider></el-divider>
      <el-row>
      <!--搜索-->
      <div>
      <el-form :inline="true" size="mini">
      <el-form-item>
      <el-button plain @click="matterBatchAdd">批量添加</el-button>
      </el-form-item>
      <el-form-item style="float: right">
      <el-button plain @click="matterSearchConfirm">查询</el-button>
      </el-form-item>
      <el-form-item label="事项名称" style="float: right">
      <el-input
      v-model="searchform.matterName"
      placeholder="事项名称"
      ></el-input>
      </el-form-item>
      </el-form>
      </div>
      <!--事项列表-->
      <el-table
      size="mini"
      ref="multipleTable"
      :data="matterPageInfoData"
      tooltip-effect="dark"
      border
      v-loading="loading"
      highlight-current-row
      @selection-change="handleSelectionChange"
      >
      <!-- <el-table-column type="selection" width="55"> </el-table-column> -->
      <el-table-column prop="matterName" label="事项名称" :show-overflow-tooltip="true" />
      <el-table-column width="400" prop="datumn" label="关联材料">
      <template slot-scope="scope">
      <el-row
      v-for="(item, index) in scope.row.datumList"
      :key="index"
      >
      <el-tag
      style="
      font-size: 12px;
      white-space: pre-wrap;
      margin-bottom: 5px;
      "
      >
      {{ item.materialName | ellipsis2 }}
      </el-tag>
      </el-row>
      </template>
      </el-table-column>
      <el-table-column width="100" label="操作">
      <template slot-scope="scope">
      <el-button
      size="mini"
      @click="handleAdd(scope.$index, scope.row)"
      >加入</el-button
      >
      </template>
      </el-table-column>
      </el-table>
      <!-- 分页器 -->
      <el-row type="flex" justify="end">
      <el-pagination
      @current-change="handleCurrentChange"
      @size-change="handleSizeChange"
      :current-page="matterPageInfo.currPage"
      :page-size="matterPageInfo.prePageResult"
      :page-sizes="[10, 20, 50, 100, 200]"
      layout="sizes, total, prev, pager, next, jumper"
      :total="matterPageInfo.totalResult"
      >
      </el-pagination>
      </el-row>
      <el-row
      style="margin-bottom: 10px"
      v-for="item in matterTags"
      :key="item.id"
      >
      <el-tag closable @close="handleClose(item.id)">
      {{ item.matterName | ellipsis }}
      </el-tag>
      </el-row>
      <el-row type="flex" justify="end">
      <el-button @click="topicPacksDialog.visible = false"
      >取 消</el-button
      >
      <el-button type="primary" @click="selectMatterConfirm"
      >确 定</el-button
      >
      </el-row>
      </el-row>
      </el-row>
      </el-dialog>
      </template>
      <script>
      export default {
      name: "basicInfoForm",
      props: {
      info: {
      type: Object,
      default: null
      }
      },
      created() {
      },
      data() {
      return {
      };
      }
      };
      </script>
      government-manager/src/main/java/com/mortals/xhx/ManagerApplication.java
      View file @ 5dd836e0
      ...@@ -15,6 +15,9 @@ import org.springframework.context.annotation.ImportResource; ...@@ -15,6 +15,9 @@ import org.springframework.context.annotation.ImportResource;
      //@EnableBinding({ProcessTaskSink.class}) //@EnableBinding({ProcessTaskSink.class})
      public class ManagerApplication extends BaseWebApplication { public class ManagerApplication extends BaseWebApplication {
      public static void main(String[] args) { public static void main(String[] args) {
      SpringApplication.run(ManagerApplication.class, args); SpringApplication.run(ManagerApplication.class, args);
      } }
      ......
      government-manager/src/main/java/com/mortals/xhx/base/framework/aspect/RequestLogAspect.java
      View file @ 5dd836e0
      ...@@ -50,7 +50,7 @@ import java.util.concurrent.atomic.AtomicBoolean; ...@@ -50,7 +50,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
      @Slf4j @Slf4j
      @Aspect @Aspect
      @Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
      @Profile({"develop1", "test"}) @Profile({"develop", "test"})
      public class RequestLogAspect { public class RequestLogAspect {
      private static final ParameterNameDiscoverer PARAMETER_NAME_DISCOVERER = new DefaultParameterNameDiscoverer(); private static final ParameterNameDiscoverer PARAMETER_NAME_DISCOVERER = new DefaultParameterNameDiscoverer();
      ......
      government-manager/src/main/java/com/mortals/xhx/base/framework/ws/handler/AuthMessageHandler.java
      View file @ 5dd836e0
      ...@@ -31,6 +31,9 @@ public class AuthMessageHandler implements MessageHandler<AuthRequest> { ...@@ -31,6 +31,9 @@ public class AuthMessageHandler implements MessageHandler<AuthRequest> {
      // 判断是否认证成功。这里，假装直接成功 // 判断是否认证成功。这里，假装直接成功
      WebSocketUtil.send(session, AuthResponse.TYPE, new AuthResponse().setCode(0)); WebSocketUtil.send(session, AuthResponse.TYPE, new AuthResponse().setCode(0));
      //WebSocketUtil.broadcast();
      // 通知所有人，某个人加入了。这个是可选逻辑，仅仅是为了演示 // 通知所有人，某个人加入了。这个是可选逻辑，仅仅是为了演示
      // WebSocketUtil.broadcast(UserJoinNoticeRequest.TYPE, // WebSocketUtil.broadcast(UserJoinNoticeRequest.TYPE,
      // new UserJoinNoticeRequest().setNickname(message.getAccessToken())); // 考虑到代码简化，我们先直接使用 accessToken 作为 User // new UserJoinNoticeRequest().setNickname(message.getAccessToken())); // 考虑到代码简化，我们先直接使用 accessToken 作为 User
      ......
      government-manager/src/main/java/com/mortals/xhx/base/framework/ws/websocket/WebSocketHandler.java
      View file @ 5dd836e0
      ...@@ -131,6 +131,7 @@ public class WebSocketHandler extends TextWebSocketHandler implements Initializi ...@@ -131,6 +131,7 @@ public class WebSocketHandler extends TextWebSocketHandler implements Initializi
      public static void main(String[] args) { public static void main(String[] args) {
      WebSocketHandler webSocketHandler = new WebSocketHandler(); WebSocketHandler webSocketHandler = new WebSocketHandler();
      } }
      } }
      government-manager/src/main/java/com/mortals/xhx/base/system/gentable/web/GentableController.java
      View file @ 5dd836e0
      ...@@ -3,6 +3,7 @@ package com.mortals.xhx.base.system.gentable.web; ...@@ -3,6 +3,7 @@ package com.mortals.xhx.base.system.gentable.web;
      import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
      import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
      import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
      import com.mortals.framework.web.BaseCRUDJsonController;
      import com.mortals.framework.web.BaseCRUDJsonMappingController; import com.mortals.framework.web.BaseCRUDJsonMappingController;
      import com.mortals.xhx.base.system.gentable.model.GentableColumnEntity; import com.mortals.xhx.base.system.gentable.model.GentableColumnEntity;
      import com.mortals.xhx.base.system.gentable.model.GentableColumnQuery; import com.mortals.xhx.base.system.gentable.model.GentableColumnQuery;
      ...@@ -43,7 +44,7 @@ import static com.mortals.framework.ap.SysConstains.MESSAGE_INFO; ...@@ -43,7 +44,7 @@ import static com.mortals.framework.ap.SysConstains.MESSAGE_INFO;
      */ */
      @RestController @RestController
      @RequestMapping("gentable") @RequestMapping("gentable")
      public class GentableController extends BaseCRUDJsonMappingController<GentableService, GentableForm, GentableEntity, Long> { public class GentableController extends BaseCRUDJsonController<GentableService, GentableForm, GentableEntity, Long> {
      @Autowired @Autowired
      private GentableColumnService gentableColumnService; private GentableColumnService gentableColumnService;
      ......
      government-manager/src/main/java/com/mortals/xhx/base/system/upload/service/impl/UploadServiceImpl.java
      View file @ 5dd836e0
      ...@@ -61,6 +61,10 @@ public class UploadServiceImpl implements UploadService { ...@@ -61,6 +61,10 @@ public class UploadServiceImpl implements UploadService {
      log.error("文件上传大小超过限制，当前文件---" + tempFile.getSize() + "，允许大小----------" + type.getMaxSize()); log.error("文件上传大小超过限制，当前文件---" + tempFile.getSize() + "，允许大小----------" + type.getMaxSize());
      throw new AppException("文件上传大小超过限制！"); throw new AppException("文件上传大小超过限制！");
      } }
      if(tempFile.getSize()==0){
      throw new AppException("当前文件为空！");
      }
      if (null != fileName && fileName.length() > 50) { if (null != fileName && fileName.length() > 50) {
      throw new AppException("文件名称过长，无法上传！"); throw new AppException("文件名称过长，无法上传！");
      } }
      ......
      government-manager/src/main/java/com/mortals/xhx/busiz/WxOneThingController.http
      View file @ 5dd836e0
      ###一件事查询列表
      POST {{baseUrl}}/m/zwfw/proced/thing/getList
      Content-Type: application/x-www-form-urlencoded
      name=退休&openId=3&limit=10&page=0
      ###一件事查询列表
      POST {{baseUrl}}/m/zwfw/proced/thing/getList
      Content-Type: application/x-www-form-urlencoded
      #topicId=13&name=退休&openId=3&limit=10&page=0
      topicId=13&openId=3
      ###主题包列表
      POST {{baseUrl}}/m/zwfw/proced/thing/getTopicList
      Content-Type: application/x-www-form-urlencoded
      type=1&openId=3
      ###主题包列表 ###主题包列表
      POST {{baseUrl}}/m/zwfw/proced/thing/oneTopiclist POST {{baseUrl}}/m/zwfw/proced/thing/oneTopiclist
      Content-Type: application/x-www-form-urlencoded Content-Type: application/x-www-form-urlencoded
      ...@@ -12,11 +32,13 @@ Content-Type: application/x-www-form-urlencoded ...@@ -12,11 +32,13 @@ Content-Type: application/x-www-form-urlencoded
      id=1 id=1
      ###事项详细数据
      POST {{baseUrl}}/m/zwfw/proced/thing/oneBasicsInfo ###回答基础数据
      POST {{baseUrl}}/m/zwfw/proced/thing/ansResults
      Content-Type: application/x-www-form-urlencoded Content-Type: application/x-www-form-urlencoded
      id=1 optionIds[0]=17&optionIds[1]=20
      ###根据openid 查询用户 ###根据openid 查询用户
      POST {{baseUrl}}/m/zwfw/proced/thing/searchMember POST {{baseUrl}}/m/zwfw/proced/thing/searchMember
      ...@@ -24,11 +46,7 @@ Content-Type: application/x-www-form-urlencoded ...@@ -24,11 +46,7 @@ Content-Type: application/x-www-form-urlencoded
      openId=abc openId=abc
      ###问答基础数据
      POST {{baseUrl}}/m/zwfw/proced/thing/ansResults
      Content-Type: application/x-www-form-urlencoded
      optionIds[0]=17&optionIds[1]=20
      ###微信用户校验创建更新 ###微信用户校验创建更新
      POST {{baseUrl}}/m/zwfw/wechatinter/base/checkCard POST {{baseUrl}}/m/zwfw/wechatinter/base/checkCard
      ...@@ -42,10 +60,10 @@ POST {{baseUrl}}/m/zwfw/proced/thing/uploadFile ...@@ -42,10 +60,10 @@ POST {{baseUrl}}/m/zwfw/proced/thing/uploadFile
      Content-Type: multipart/form-data; boundary=WebAppBoundary Content-Type: multipart/form-data; boundary=WebAppBoundary
      --WebAppBoundary --WebAppBoundary
      Content-Disposition: form-data; name="file"; filename="test.xlsx" Content-Disposition: form-data; name="file"; filename="1.png"
      Content-Type: multipart/form-data Content-Type: multipart/form-data
      < ./test.xlsx < ./1.png
      --WebAppBoundary-- --WebAppBoundary--
      ###删除文件 ###删除文件
      ......
      government-manager/src/main/java/com/mortals/xhx/busiz/WxWechatApiController.java
      View file @ 5dd836e0
      ...@@ -62,8 +62,6 @@ public class WxWechatApiController { ...@@ -62,8 +62,6 @@ public class WxWechatApiController {
      } }
      memberService.checkMember(req); memberService.checkMember(req);
      } catch (Exception e) { } catch (Exception e) {
      log.error("微信注册认证失败", e); log.error("微信注册认证失败", e);
      rsp.setCode(ApiRespCodeEnum.FAILED.getValue()); rsp.setCode(ApiRespCodeEnum.FAILED.getValue());
      ......
      government-manager/src/main/java/com/mortals/xhx/busiz/oneProblemlist/OneProblemInfo.java
      View file @ 5dd836e0
      ...@@ -15,23 +15,41 @@ import java.util.Map; ...@@ -15,23 +15,41 @@ import java.util.Map;
      @Data @Data
      public class OneProblemInfo { public class OneProblemInfo {
      /**
      * 问题与答案id,唯一
      */
      private Long id; private Long id;
      /**
      * 问题答案名称
      */
      private String name; private String name;
      /**
      * 是否为叶子节点（0：否，1：是）
      */
      private Integer isLeaf; private Integer isLeaf;
      /**
      * 是问题还是选项答案（0：问题，1：选项答案）
      */
      private Integer isAns; private Integer isAns;
      /**
      * 父节点id
      */
      private Long parentId; private Long parentId;
      /**
      * 事项id “,”号分割
      */
      private String matterIds; private String matterIds;
      /**
      * 树的层级
      */
      private Integer level; private Integer level;
      /**
      * 备注信息
      */
      private String remark; private String remark;
      /**
      * 当前节点的子集
      */
      private List<OneProblemInfo> children; private List<OneProblemInfo> children;
      } }
      government-manager/src/main/java/com/mortals/xhx/busiz/oneProblemlist/mapper/ProblemMapper.java
      View file @ 5dd836e0
      package com.mortals.xhx.busiz.oneProblemlist.mapper; package com.mortals.xhx.busiz.oneProblemlist.mapper;
      import com.mortals.xhx.busiz.oneProblemlist.OneProblemInfo;
      import org.mapstruct.Mapper; import org.mapstruct.Mapper;
      import org.mapstruct.Mapping; import org.mapstruct.Mapping;
      import org.mapstruct.factory.Mappers; import org.mapstruct.factory.Mappers;
      ...@@ -14,25 +15,25 @@ import org.mapstruct.factory.Mappers; ...@@ -14,25 +15,25 @@ import org.mapstruct.factory.Mappers;
      @Mapper @Mapper
      public interface ProblemMapper { public interface ProblemMapper {
      ProblemMapper INSTANCE = Mappers.getMapper( ProblemMapper.class ); // ProblemMapper INSTANCE = Mappers.getMapper( ProblemMapper.class );
      //
      /* //
      //
      @Mapping(source = "basicsId", target = "basics_id") // @Mapping(source = "basicsId", target = "basics_id")
      OneProblemInfo classifyEntity2Info(ClassifyEntity entity); // OneProblemInfo classifyEntity2Info(ClassifyEntity entity);
      //
      //
      @Mapping(source = "classifyId", target = "classify_id") // @Mapping(source = "classifyId", target = "classify_id")
      @Mapping(source = "classifyNextId", target = "classify_next_id") // @Mapping(source = "classifyNextId", target = "classify_next_id")
      @Mapping(source = "basicsinfoId", target = "basicsinfo_id") // @Mapping(source = "basicsinfoId", target = "basicsinfo_id")
      @Mapping(source = "acceptId", target = "accept_id") // @Mapping(source = "acceptId", target = "accept_id")
      @Mapping(source = "flowlimitId", target = "flowlimit_id") // @Mapping(source = "flowlimitId", target = "flowlimit_id")
      @Mapping(source = "matterId", target = "matter_id") // @Mapping(source = "matterId", target = "matter_id")
      @Mapping(source = "datumId", target = "datum_id") // @Mapping(source = "datumId", target = "datum_id")
      @Mapping(source = "summaryType", target = "summary_type") // @Mapping(source = "summaryType", target = "summary_type")
      OptionDetailInfo classifyOptionEntity2DetailInfo(ClassifyOptionEntity entity); // OptionDetailInfo classifyOptionEntity2DetailInfo(ClassifyOptionEntity entity);
      //
      */ //
      ......
      government-manager/src/main/java/com/mortals/xhx/busiz/onethinglist/OneThineInfo.java
      View file @ 5dd836e0
      package com.mortals.xhx.busiz.onethinglist; package com.mortals.xhx.busiz.onethinglist;
      import com.fasterxml.jackson.annotation.JsonFormat;
      import io.swagger.annotations.ApiModelProperty;
      import lombok.Data; import lombok.Data;
      import java.util.Date;
      /** /**
      * @author: zxfei * @author: zxfei
      * @date: 2021/9/6 9:32 * @date: 2021/9/6 9:32
      ...@@ -18,21 +22,23 @@ public class OneThineInfo { ...@@ -18,21 +22,23 @@ public class OneThineInfo {
      /** /**
      * 名称 * 名称
      */ */
      private String tname; private String name;
      /** /**
      * 事项关联id * 归属主题类型（1,个人服务，2 企业服务）
      */ */
      private String matter_ids; private Integer topicalType;
      /** /**
      * 是否删除（ 0正常 1删除） * 归属主题名称
      */ */
      private Integer valid; private String topicalName;
      /** /**
      * 创建时间 * 创建时间
      */ */
      private Long create_time; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
      private Date createTime;
      } }
      government-manager/src/main/java/com/mortals/xhx/busiz/onethinglist/OneThingReq.java
      View file @ 5dd836e0
      ...@@ -24,6 +24,12 @@ public class OneThingReq extends BaseReq implements Serializable { ...@@ -24,6 +24,12 @@ public class OneThingReq extends BaseReq implements Serializable {
      @ApiModelProperty(value = "主题包类型") @ApiModelProperty(value = "主题包类型")
      private int type; private int type;
      /**
      * 主题包Id
      */
      @ApiModelProperty(value = "主题包Id")
      private Long topicId;
      /** /**
      * 当前请求页数 * 当前请求页数
      */ */
      ...@@ -36,11 +42,12 @@ public class OneThingReq extends BaseReq implements Serializable { ...@@ -36,11 +42,12 @@ public class OneThingReq extends BaseReq implements Serializable {
      @ApiModelProperty(value = "每页记录数") @ApiModelProperty(value = "每页记录数")
      private int limit; private int limit;
      /** /**
      * 搜索关键词 * 一件事名称
      */ */
      @ApiModelProperty(value = "搜索关键词") @ApiModelProperty(value = "搜索")
      private String keywords; private String name;
      } }
      government-manager/src/main/java/com/mortals/xhx/busiz/question/AnswerReq.java
      View file @ 5dd836e0
      ...@@ -24,10 +24,8 @@ public class AnswerReq extends BaseReq implements Serializable { ...@@ -24,10 +24,8 @@ public class AnswerReq extends BaseReq implements Serializable {
      private List<Long> optionIds; private List<Long> optionIds;
      /** /**
      * 问题路线id? * 主题事项Id
      */ */
      @ApiModelProperty(value = "问题路线id") private Long classifyId;
      private String key;
      } }
      government-manager/src/main/java/com/mortals/xhx/busiz/question/BasicsInfo.java
      View file @ 5dd836e0
      ...@@ -11,74 +11,54 @@ import lombok.Data; ...@@ -11,74 +11,54 @@ import lombok.Data;
      @Data @Data
      public class BasicsInfo { public class BasicsInfo {
      private Long id;
      /** /**
      * 模板标题 * 移动主题包图标
      */ */
      private String title; private String moveIcon;
      /** /**
      * 一件事基础表id * 到现场次数
      */ */
      private Long basics_id; private Integer presenceNum;
      /** /**
      * 办理机构 * 办理机构
      */ */
      private String jointInfoShow; private String jointInfoShow;
      /** /**
      * 法定时限 * 法定时限
      */ */
      private String legalTimeLimitShow; private String legalTimeLimitShow;
      /** /**
      * 承诺时限 * 承诺时限
      */ */
      private String promiseTimeLimitShow; private String promiseTimeLimitShow;
      /** /**
      * 是否收费,0,否，1是 默认0 * 收费标准
      */ */
      private Integer isChargesShow; private String isChargesShow;
      /** /**
      * 收费金额 * 收费金额
      */ */
      private String Charges; private String charges;
      /** /**
      * 办公时间 * 办理时间
      */ */
      private String handleTimeShow; private String handleTimeShow;
      /** /**
      * 办公地址 * 办理地点
      */ */
      private String handlePlaceShow; private String handlePlaceShow;
      /** /**
      * 咨询电话 * 咨询方式
      */ */
      private String cousultingTelephoneShow; private String cousultingTelephoneShow;
      /**
      * 投诉电话
      */
      private String supervisoryTelephoneShow;
      /** /**
      * 结果信息 * 结果信息
      */ */
      private String resultInfo; private String resultInfo;
      /** /**
      * 常见问题 * 投诉电话
      */ */
      private String qa; private String supervisoryTelephoneShow;
      private Long create_time;
      } }
      government-manager/src/main/java/com/mortals/xhx/busiz/question/QuestionInfo.java
      View file @ 5dd836e0
      ...@@ -13,6 +13,11 @@ import java.util.List; ...@@ -13,6 +13,11 @@ import java.util.List;
      @Data @Data
      public class QuestionInfo { public class QuestionInfo {
      /**
      * 基本信息
      */
      private BasicsInfo basicsInfo;
      /** /**
      * 事项列表列表 * 事项列表列表
      */ */
      ......
      government-manager/src/main/java/com/mortals/xhx/busiz/uploadfile/SubmitDatumReq.java
      View file @ 5dd836e0
      ...@@ -18,19 +18,17 @@ import java.util.List; ...@@ -18,19 +18,17 @@ import java.util.List;
      @ApiModel(value = "SubmitDatumReq", description = "请求参数") @ApiModel(value = "SubmitDatumReq", description = "请求参数")
      public class SubmitDatumReq extends BaseReq implements Serializable { public class SubmitDatumReq extends BaseReq implements Serializable {
      /** /**
      * 申请主题包id * 申请主题id
      */ */
      @ApiModelProperty(value = "申请主题包id") @ApiModelProperty(value = "申请主题id")
      private Long classifyTopicId; private Long classifyTopicId;
      /** /**
      * 站点ID * 站点ID
      */ */
      @ApiModelProperty(value = "村数据下的站点id") @ApiModelProperty(value = "数据下的站点id")
      private Long siteId; private Long siteId;
      ......
      government-manager/src/main/java/com/mortals/xhx/common/code/SiteSatusEnum.java → government-manager/src/main/java/com/mortals/xhx/common/code/SatusEnum.java
      View file @ 5dd836e0
      ...@@ -8,14 +8,14 @@ import java.util.Map; ...@@ -8,14 +8,14 @@ import java.util.Map;
      * @author * @author
      * *
      */ */
      public enum SiteSatusEnum { public enum SatusEnum {
      DISENABLE(0, "禁用"), DISENABLE(0, "禁用"),
      ENABLE(1, "启用"); ENABLE(1, "启用");
      private int value; private int value;
      private String desc; private String desc;
      SiteSatusEnum(int value, String desc) { SatusEnum(int value, String desc) {
      this.value = value; this.value = value;
      this.desc = desc; this.desc = desc;
      ...@@ -30,8 +30,8 @@ public enum SiteSatusEnum { ...@@ -30,8 +30,8 @@ public enum SiteSatusEnum {
      return desc; return desc;
      } }
      public static SiteSatusEnum getByValue(int value) { public static SatusEnum getByValue(int value) {
      for (SiteSatusEnum examStatus : SiteSatusEnum.values()) { for (SatusEnum examStatus : SatusEnum.values()) {
      if (examStatus.getValue() == value) { if (examStatus.getValue() == value) {
      return examStatus; return examStatus;
      } }
      ...@@ -46,7 +46,7 @@ public enum SiteSatusEnum { ...@@ -46,7 +46,7 @@ public enum SiteSatusEnum {
      public static Map<String,String> getEnumMap(int... eItem) { public static Map<String,String> getEnumMap(int... eItem) {
      Map<String,String> resultMap= new LinkedHashMap<String,String>(); Map<String,String> resultMap= new LinkedHashMap<String,String>();
      for (SiteSatusEnum item : SiteSatusEnum.values()) { for (SatusEnum item : SatusEnum.values()) {
      try{ try{
      boolean hasE = false; boolean hasE = false;
      for (int e : eItem){ for (int e : eItem){
      ......
      government-manager/src/main/java/com/mortals/xhx/daemon/demo/RequestDispatchController.http
      View file @ 5dd836e0
      ...@@ -97,3 +97,11 @@ POST {{baseUrl}}/m/member/test ...@@ -97,3 +97,11 @@ POST {{baseUrl}}/m/member/test
      Content-Type: application/json Content-Type: application/json
      {"affairCode":"510184-20200624-000003","name":"11111","systemCode":"dadfasdf"} {"affairCode":"510184-20200624-000003","name":"11111","systemCode":"dadfasdf"}
      ###测试截取topic
      POST {{baseUrl}}/m/topic/sys/a1GFjLP****/device123/_thing/service/post
      Content-Type: application/json
      {"affairCode":"510184-20200624-000003","name":"11111","systemCode":"dadfasdf"}
      government-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterService.java
      View file @ 5dd836e0
      package com.mortals.xhx.module.matter.service; package com.mortals.xhx.module.matter.service;
      import com.mortals.framework.service.ICRUDCacheService;
      import com.mortals.framework.service.ICRUDService; import com.mortals.framework.service.ICRUDService;
      import com.mortals.xhx.module.matter.model.MatterEntity; import com.mortals.xhx.module.matter.model.MatterEntity;
      ......
      government-manager/src/main/java/com/mortals/xhx/module/one/model/OneClassifyEntityExt.java deleted 100644 → 0
      View file @ c1446d69
      package com.mortals.xhx.module.one.model;
      import com.mortals.framework.model.BaseEntityLong;
      import lombok.Getter;
      import lombok.Setter;
      import java.util.Date;
      import java.util.List;
      /**
      *
      * Description:OneClassify
      * date: 2021-9-13 16:21:34
      */
      @Setter
      @Getter
      public class OneClassifyEntityExt extends BaseEntityLong{
      private List<OneClassifyEntity> children;
      private boolean hasChildren;
      private String matterNames;
      private List<String> matterNameList;
      }
      \ No newline at end of file
      government-manager/src/main/java/com/mortals/xhx/module/one/model/OneTopicalEntity.java
      View file @ 5dd836e0
      package com.mortals.xhx.module.one.model; package com.mortals.xhx.module.one.model;
      import java.util.List;
      import java.util.Date; import java.util.ArrayList;
      import com.mortals.framework.annotation.Excel;
      import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
      import com.mortals.xhx.module.one.model.vo.OneTopicalVo;
      /** /**
      * 主题实体对象
      * *
      * Description:OneTopical * @author zxfei
      * date: 2021-9-13 16:21:34 * @date 2021-11-16
      */ */
      public class OneTopicalEntity extends BaseEntityLong{
      private static final long serialVersionUID = 1631521294937L;
      public class OneTopicalEntity extends OneTopicalVo {
      private static final long serialVersionUID = 1L;
      /** /**
      * 主题名称 * 主题名称
      */ */
      private String topicalName; private String topicalName;
      /** /**
      * 主题排序 * 主题排序
      */ */
      private Integer topicalRank; private Integer topicalRank;
      /** /**
      * 站点id * 站点id
      */ */
      private Long siteId; private Long siteId;
      /** /**
      * 主题类型（1 个人服务，2 企业服务） * 主题类型（1 个人服务，2 企业服务）
      */ */
      private Integer topicalType; private Integer topicalType;
      /** /**
      * * 描述信息
      */ */
      private Integer deleted; private String remark;
      /** /**
      * 创建人id *
      */ */
      private Long createUserId; private Integer deleted;
      /** /**
      * 创建人名称 * 创建人名称
      */ */
      private String createUserName; private String createUserName;
      /**
      * 创建时间
      */
      private Date createTime;
      /**
      * 修改人
      */
      private Long updateUserId;
      /** /**
      * 修改人名称 * 修改人名称
      */ */
      private String updateUserName; private String updateUserName;
      /**
      * 更新时间
      */
      private Date updateTime;
      public OneTopicalEntity(){
      } public OneTopicalEntity(){}
      /** /**
      * 获取 主题名称 * 获取 主题名称
      * @return topicalName * @return String
      */ */
      public String getTopicalName() { public String getTopicalName(){
      return this.topicalName; return topicalName;
      } }
      /** /**
      * 设置 主题名称 * 设置 主题名称
      * @param topicalName * @param topicalName
      */ */
      public void setTopicalName(String topicalName) { public void setTopicalName(String topicalName){
      this.topicalName = topicalName; this.topicalName = topicalName;
      } }
      /** /**
      * 获取 主题排序 * 获取 主题排序
      * @return topicalRank * @return Integer
      */ */
      public Integer getTopicalRank() { public Integer getTopicalRank(){
      return this.topicalRank; return topicalRank;
      } }
      /** /**
      * 设置 主题排序 * 设置 主题排序
      * @param topicalRank * @param topicalRank
      */ */
      public void setTopicalRank(Integer topicalRank) { public void setTopicalRank(Integer topicalRank){
      this.topicalRank = topicalRank; this.topicalRank = topicalRank;
      } }
      /** /**
      * 获取 站点id * 获取 站点id
      * @return siteId * @return Long
      */ */
      public Long getSiteId() { public Long getSiteId(){
      return this.siteId; return siteId;
      } }
      /** /**
      * 设置 站点id * 设置 站点id
      * @param siteId * @param siteId
      */ */
      public void setSiteId(Long siteId) { public void setSiteId(Long siteId){
      this.siteId = siteId; this.siteId = siteId;
      } }
      /** /**
      * 获取 主题类型（1 个人服务，2 企业服务） * 获取 主题类型（1 个人服务，2 企业服务）
      * @return topicalType * @return Integer
      */ */
      public Integer getTopicalType() { public Integer getTopicalType(){
      return this.topicalType; return topicalType;
      } }
      /** /**
      * 设置 主题类型（1 个人服务，2 企业服务） * 设置 主题类型（1 个人服务，2 企业服务）
      * @param topicalType * @param topicalType
      */ */
      public void setTopicalType(Integer topicalType) { public void setTopicalType(Integer topicalType){
      this.topicalType = topicalType; this.topicalType = topicalType;
      } }
      /** /**
      * 获取 * 获取 描述信息
      * @return deleted * @return String
      */ */
      public Integer getDeleted() { public String getRemark(){
      return this.deleted; return remark;
      } }
      /** /**
      * 设置 * 设置 描述信息
      * @param deleted * @param remark
      */ */
      public void setDeleted(Integer deleted) { public void setRemark(String remark){
      this.deleted = deleted; this.remark = remark;
      } }
      /** /**
      * 获取 创建人id * 获取
      * @return createUserId * @return Integer
      */ */
      public Long getCreateUserId() { public Integer getDeleted(){
      return this.createUserId; return deleted;
      } }
      /** /**
      * 设置 创建人id * 设置
      * @param createUserId * @param deleted
      */ */
      public void setCreateUserId(Long createUserId) { public void setDeleted(Integer deleted){
      this.createUserId = createUserId; this.deleted = deleted;
      } }
      /** /**
      * 获取 创建人名称 * 获取 创建人名称
      * @return createUserName * @return String
      */ */
      public String getCreateUserName() { public String getCreateUserName(){
      return this.createUserName; return createUserName;
      } }
      /** /**
      * 设置 创建人名称 * 设置 创建人名称
      * @param createUserName * @param createUserName
      */ */
      public void setCreateUserName(String createUserName) { public void setCreateUserName(String createUserName){
      this.createUserName = createUserName; this.createUserName = createUserName;
      } }
      /** /**
      * 获取 创建时间
      * @return createTime
      */
      public Date getCreateTime() {
      return this.createTime;
      }
      /**
      * 设置 创建时间
      * @param createTime
      */
      public void setCreateTime(Date createTime) {
      this.createTime = createTime;
      }
      /**
      * 获取 修改人
      * @return updateUserId
      */
      public Long getUpdateUserId() {
      return this.updateUserId;
      }
      /**
      * 设置 修改人
      * @param updateUserId
      */
      public void setUpdateUserId(Long updateUserId) {
      this.updateUserId = updateUserId;
      }
      /**
      * 获取 修改人名称 * 获取 修改人名称
      * @return updateUserName * @return String
      */ */
      public String getUpdateUserName() { public String getUpdateUserName(){
      return this.updateUserName; return updateUserName;
      } }
      /** /**
      * 设置 修改人名称 * 设置 修改人名称
      * @param updateUserName * @param updateUserName
      */ */
      public void setUpdateUserName(String updateUserName) { public void setUpdateUserName(String updateUserName){
      this.updateUserName = updateUserName; this.updateUserName = updateUserName;
      } }
      /**
      * 获取 更新时间
      * @return updateTime
      */
      public Date getUpdateTime() {
      return this.updateTime;
      }
      /**
      * 设置 更新时间
      * @param updateTime
      */
      public void setUpdateTime(Date updateTime) {
      this.updateTime = updateTime;
      }
      @Override @Override
      public int hashCode() { public int hashCode() {
      return this.getId().hashCode(); return this.getId().hashCode();
      } }
      @Override @Override
      public boolean equals(Object obj) { public boolean equals(Object obj) {
      if (obj == null) if (obj == null) return false;
      return false;
      if (obj instanceof OneTopicalEntity) { if (obj instanceof OneTopicalEntity) {
      OneTopicalEntity tmp = (OneTopicalEntity) obj; OneTopicalEntity tmp = (OneTopicalEntity) obj;
      if (this.getId().longValue() == tmp.getId().longValue()) { if (this.getId() == tmp.getId()) {
      return true; return true;
      } }
      } }
      return false; return false;
      ...@@ -243,34 +184,25 @@ public class OneTopicalEntity extends BaseEntityLong{ ...@@ -243,34 +184,25 @@ public class OneTopicalEntity extends BaseEntityLong{
      public String toString(){ public String toString(){
      StringBuilder sb = new StringBuilder(""); StringBuilder sb = new StringBuilder("");
      sb sb.append(",topicalName:").append(getTopicalName());
      .append(",id:").append(getId()) sb.append(",topicalRank:").append(getTopicalRank());
      .append(",topicalName:").append(getTopicalName()) sb.append(",siteId:").append(getSiteId());
      .append(",topicalRank:").append(getTopicalRank()) sb.append(",topicalType:").append(getTopicalType());
      .append(",siteId:").append(getSiteId()) sb.append(",remark:").append(getRemark());
      .append(",topicalType:").append(getTopicalType()) sb.append(",deleted:").append(getDeleted());
      .append(",deleted:").append(getDeleted()) sb.append(",createUserName:").append(getCreateUserName());
      .append(",createUserId:").append(getCreateUserId()) sb.append(",updateUserName:").append(getUpdateUserName());
      .append(",createUserName:").append(getCreateUserName())
      .append(",createTime:").append(getCreateTime())
      .append(",updateUserId:").append(getUpdateUserId())
      .append(",updateUserName:").append(getUpdateUserName())
      .append(",updateTime:").append(getUpdateTime())
      ;
      return sb.toString(); return sb.toString();
      } }
      public void initAttrValue(){ public void initAttrValue(){
      this.topicalName = null; this.topicalName = null;
      this.topicalRank = null; this.topicalRank = null;
      this.siteId = null; this.siteId = null;
      this.topicalType = null; this.topicalType = null;
      this.deleted = null; this.remark = null;
      this.createUserId = null; this.deleted = 0;
      this.createUserName = null; this.createUserName = null;
      this.createTime = null; this.updateUserName = null;
      this.updateUserId = null;
      this.updateUserName = null;
      this.updateTime = null;
      } }
      } }
      \ No newline at end of file
      government-manager/src/main/java/com/mortals/xhx/module/one/service/OneTopicalService.java
      View file @ 5dd836e0
      package com.mortals.xhx.module.one.service; package com.mortals.xhx.module.one.service;
      import com.mortals.framework.model.Result;
      import com.mortals.framework.service.ICRUDService; import com.mortals.framework.service.ICRUDService;
      import com.mortals.xhx.busiz.onethinglist.OneThingReq;
      import com.mortals.xhx.module.one.model.OneClassifyEntity;
      import com.mortals.xhx.module.one.model.OneTopicalEntity; import com.mortals.xhx.module.one.model.OneTopicalEntity;
      import java.util.List; import java.util.List;
      ...@@ -19,5 +22,8 @@ public interface OneTopicalService extends ICRUDService<OneTopicalEntity, Long> ...@@ -19,5 +22,8 @@ public interface OneTopicalService extends ICRUDService<OneTopicalEntity, Long>
      List<Map<String, Object>> getTreeList(Integer type); List<Map<String, Object>> getTreeList(Integer type);
      Result<OneClassifyEntity> getList(OneThingReq req);
      void upOrDownTopicList(Long id, Integer type); void upOrDownTopicList(Long id, Integer type);
      } }
      \ No newline at end of file
      government-manager/src/main/java/com/mortals/xhx/module/one/service/impl/OneClassifyServiceImpl.java
      View file @ 5dd836e0
      ...@@ -53,12 +53,16 @@ public class OneClassifyServiceImpl extends AbstractCRUDCacheServiceImpl<OneClas ...@@ -53,12 +53,16 @@ public class OneClassifyServiceImpl extends AbstractCRUDCacheServiceImpl<OneClas
      if(oneClassifyEntity.getClassifyLevel()>1){ if(oneClassifyEntity.getClassifyLevel()>1){
      if(oneClassifyEntity.getIsAns()==YesNoEnum.NO.getValue()){ if(oneClassifyEntity.getIsAns()==YesNoEnum.NO.getValue()){
      entity.setIsAns(YesNoEnum.YES.getValue()); entity.setIsAns(YesNoEnum.YES.getValue());
      }else if(oneClassifyEntity.getIsAns()==YesNoEnum.YES.getValue()){
      //判断当前节点是否是问题 且父节点是否已经存在问题
      List<OneClassifyEntity> list = this.find(new OneClassifyQuery().parentId(entity.getParentId()).deleted(YesNoEnum.NO.getValue()));
      if(list.size()>0){
      throw new AppException("当前选项已经存在关联问题！");
      }
      } }
      } }
      } }
      super.saveBefore(entity, context); super.saveBefore(entity, context);
      } }
      ...@@ -80,7 +84,6 @@ public class OneClassifyServiceImpl extends AbstractCRUDCacheServiceImpl<OneClas ...@@ -80,7 +84,6 @@ public class OneClassifyServiceImpl extends AbstractCRUDCacheServiceImpl<OneClas
      @Override @Override
      protected void updateAfter(OneClassifyEntity entity, Context context) throws AppException { protected void updateAfter(OneClassifyEntity entity, Context context) throws AppException {
      //更新事项数据 //更新事项数据
      List<Long> matterIds = Arrays.asList(entity.getMatterIds().split(",")).stream().filter(e->!ObjectUtils.isEmpty(e)).map(Long::valueOf).collect(Collectors.toList()); List<Long> matterIds = Arrays.asList(entity.getMatterIds().split(",")).stream().filter(e->!ObjectUtils.isEmpty(e)).map(Long::valueOf).collect(Collectors.toList());
      if(!ObjectUtils.isEmpty(matterIds)){ if(!ObjectUtils.isEmpty(matterIds)){
      ......
      government-manager/src/main/java/com/mortals/xhx/module/one/service/impl/OneClassifyTopicalServiceImpl.java
      View file @ 5dd836e0
      ...@@ -39,6 +39,8 @@ public class OneClassifyTopicalServiceImpl extends AbstractCRUDServiceImpl<OneCl ...@@ -39,6 +39,8 @@ public class OneClassifyTopicalServiceImpl extends AbstractCRUDServiceImpl<OneCl
      @Autowired @Autowired
      private OneClassifyService oneClassifyService; private OneClassifyService oneClassifyService;
      @Autowired @Autowired
      private OneClassifyTopicalService oneClassifyTopicalService;
      @Autowired
      private MatterService matterService; private MatterService matterService;
      @Autowired @Autowired
      private MatterDatumService matterDatumService; private MatterDatumService matterDatumService;
      ...@@ -117,15 +119,13 @@ public class OneClassifyTopicalServiceImpl extends AbstractCRUDServiceImpl<OneCl ...@@ -117,15 +119,13 @@ public class OneClassifyTopicalServiceImpl extends AbstractCRUDServiceImpl<OneCl
      @Override @Override
      public OneProblemInfo findAllQuestion(Long id) { public OneProblemInfo findAllQuestion(Long id) {
      //获取根节点，递归获取所有树节点 //获取根节点，递归获取所有树节点
      OneProblemInfo info = new OneProblemInfo(); OneProblemInfo info = new OneProblemInfo();
      OneClassifyEntity rootClassify = oneClassifyService.get(id); OneClassifyEntity rootClassify = oneClassifyService.get(id);
      if (!ObjectUtils.isEmpty(rootClassify)) { if (!ObjectUtils.isEmpty(rootClassify)) {
      info.setId(rootClassify.getId()); info.setId(rootClassify.getId());
      info.setIsLeaf(rootClassify.getIsLeaf()); info.setIsLeaf(rootClassify.getIsLeaf());
      info.setLevel(rootClassify.getClassifyLevel()); info.setLevel(rootClassify.getClassifyLevel().intValue());
      info.setMatterIds(rootClassify.getMatterIds()); info.setMatterIds(rootClassify.getMatterIds());
      info.setName(rootClassify.getClassifyName()); info.setName(rootClassify.getClassifyName());
      info.setParentId(rootClassify.getParentId()); info.setParentId(rootClassify.getParentId());
      ...@@ -146,7 +146,7 @@ public class OneClassifyTopicalServiceImpl extends AbstractCRUDServiceImpl<OneCl ...@@ -146,7 +146,7 @@ public class OneClassifyTopicalServiceImpl extends AbstractCRUDServiceImpl<OneCl
      OneProblemInfo info = new OneProblemInfo(); OneProblemInfo info = new OneProblemInfo();
      info.setId(item.getId()); info.setId(item.getId());
      info.setIsLeaf(item.getIsLeaf()); info.setIsLeaf(item.getIsLeaf());
      info.setLevel(item.getClassifyLevel()); info.setLevel(item.getClassifyLevel().intValue());
      info.setMatterIds(item.getMatterIds()); info.setMatterIds(item.getMatterIds());
      info.setName(item.getClassifyName()); info.setName(item.getClassifyName());
      info.setParentId(item.getParentId()); info.setParentId(item.getParentId());
      ...@@ -178,9 +178,18 @@ public class OneClassifyTopicalServiceImpl extends AbstractCRUDServiceImpl<OneCl ...@@ -178,9 +178,18 @@ public class OneClassifyTopicalServiceImpl extends AbstractCRUDServiceImpl<OneCl
      Map<String, String> isMustMap = paramService.getParamByFirstOrganize(Constant.Param_isMust); Map<String, String> isMustMap = paramService.getParamByFirstOrganize(Constant.Param_isMust);
      //基本信息
      OneClassifyTopicalEntity classifyTopicalEntity = oneClassifyTopicalService.selectOne(new OneClassifyTopicalQuery().classifyId(req.getClassifyId()));
      if(!ObjectUtils.isEmpty(classifyTopicalEntity)){
      BasicsInfo basicsInfo = new BasicsInfo();
      BeanUtils.copyProperties(classifyTopicalEntity,basicsInfo);
      questionInfo.setBasicsInfo(basicsInfo);
      }
      //获取关联的所有事项 //获取关联的所有事项
      List<Long> matterIdsList = oneClassifyService.find(new OneClassifyQuery().idList(req.getOptionIds())) List<Long> matterIdsList = oneClassifyService.find(new OneClassifyQuery().idList(req.getOptionIds()))
      .stream().flatMap(item -> .stream().filter(f->!"".equals(f.getMatterIds())).flatMap(item ->
      Arrays.asList(item.getMatterIds().split(",")).stream() Arrays.asList(item.getMatterIds().split(",")).stream()
      ).map(Long::valueOf).distinct().collect(Collectors.toList()); ).map(Long::valueOf).distinct().collect(Collectors.toList());
      //根据事项获取所有材料 //根据事项获取所有材料
      ...@@ -252,6 +261,10 @@ public class OneClassifyTopicalServiceImpl extends AbstractCRUDServiceImpl<OneCl ...@@ -252,6 +261,10 @@ public class OneClassifyTopicalServiceImpl extends AbstractCRUDServiceImpl<OneCl
      }).collect(Collectors.toList()); }).collect(Collectors.toList());
      questionInfo.setQAndAInfoList(qAndAInfoList); questionInfo.setQAndAInfoList(qAndAInfoList);
      return questionInfo; return questionInfo;
      } }
      } }
      \ No newline at end of file
      government-manager/src/main/java/com/mortals/xhx/module/one/service/impl/OneTopicalServiceImpl.java
      View file @ 5dd836e0
      ...@@ -3,6 +3,9 @@ package com.mortals.xhx.module.one.service.impl; ...@@ -3,6 +3,9 @@ package com.mortals.xhx.module.one.service.impl;
      import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
      import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
      import com.mortals.framework.model.OrderCol; import com.mortals.framework.model.OrderCol;
      import com.mortals.framework.model.PageInfo;
      import com.mortals.framework.model.Result;
      import com.mortals.xhx.busiz.onethinglist.OneThingReq;
      import com.mortals.xhx.common.code.TreeTypeEnum; import com.mortals.xhx.common.code.TreeTypeEnum;
      import com.mortals.xhx.common.code.YesNoEnum; import com.mortals.xhx.common.code.YesNoEnum;
      import com.mortals.xhx.module.one.model.*; import com.mortals.xhx.module.one.model.*;
      ...@@ -38,12 +41,12 @@ public class OneTopicalServiceImpl extends AbstractCRUDServiceImpl<OneTopicalDao ...@@ -38,12 +41,12 @@ public class OneTopicalServiceImpl extends AbstractCRUDServiceImpl<OneTopicalDao
      OneClassifyTopicalQuery oneClassifyTopicalQuery = new OneClassifyTopicalQuery().deleted(YesNoEnum.NO.getValue()); OneClassifyTopicalQuery oneClassifyTopicalQuery = new OneClassifyTopicalQuery().deleted(YesNoEnum.NO.getValue());
      oneClassifyTopicalQuery.setOrderColList(Arrays.asList(new OrderCol("classify_rank", OrderCol.ASCENDING))); oneClassifyTopicalQuery.setOrderColList(Arrays.asList(new OrderCol("classifyRank", OrderCol.ASCENDING)));
      List<OneClassifyTopicalEntity> classifyTopicalEntityList = oneClassifyTopicalService.find(oneClassifyTopicalQuery); List<OneClassifyTopicalEntity> classifyTopicalEntityList = oneClassifyTopicalService.find(oneClassifyTopicalQuery);
      OneTopicalQuery oneTopicalQuery = new OneTopicalQuery().deleted(YesNoEnum.NO.getValue()).topicalType(type); OneTopicalQuery oneTopicalQuery = new OneTopicalQuery().deleted(YesNoEnum.NO.getValue()).topicalType(type);
      oneTopicalQuery.setOrderColList(Arrays.asList(new OrderCol("topical_rank", OrderCol.ASCENDING))); oneTopicalQuery.setOrderColList(Arrays.asList(new OrderCol("topicalRank", OrderCol.ASCENDING)));
      List<Map<String, Object>> collect = this.find(oneTopicalQuery).stream().map(item -> { List<Map<String, Object>> collect = this.find(oneTopicalQuery).stream().map(item -> {
      Map<String, Object> data = new HashMap<>(); Map<String, Object> data = new HashMap<>();
      ...@@ -55,7 +58,7 @@ public class OneTopicalServiceImpl extends AbstractCRUDServiceImpl<OneTopicalDao ...@@ -55,7 +58,7 @@ public class OneTopicalServiceImpl extends AbstractCRUDServiceImpl<OneTopicalDao
      data.put("isLeaf", true); data.put("isLeaf", true);
      List<Map<String, Object>> children = classifyTopicalEntityList List<Map<String, Object>> children = classifyTopicalEntityList
      .stream().filter(f->f.getTopicalId()==item.getId()).map(classifyTopic -> { .stream().filter(f -> f.getTopicalId() == item.getId()).map(classifyTopic -> {
      OneClassifyEntity oneClassifyEntity = oneClassifyService.getCache(classifyTopic.getClassifyId().toString()); OneClassifyEntity oneClassifyEntity = oneClassifyService.getCache(classifyTopic.getClassifyId().toString());
      Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
      map.put("id", classifyTopic.getId()); map.put("id", classifyTopic.getId());
      ...@@ -78,6 +81,17 @@ public class OneTopicalServiceImpl extends AbstractCRUDServiceImpl<OneTopicalDao ...@@ -78,6 +81,17 @@ public class OneTopicalServiceImpl extends AbstractCRUDServiceImpl<OneTopicalDao
      return collect; return collect;
      } }
      @Override
      public Result<OneClassifyEntity> getList(OneThingReq req) {
      //分页查询
      PageInfo pageInfo = new PageInfo();
      pageInfo.setPrePageResult(req.getLimit());
      pageInfo.setCurrPage(req.getPage());
      return oneClassifyService.find(new OneClassifyQuery().classifyLevel(1L).classifyName("%"+req.getName()+"%").deleted(YesNoEnum.NO.getValue()), pageInfo, null);
      }
      @Override @Override
      public void upOrDownTopicList(Long id, Integer type) { public void upOrDownTopicList(Long id, Integer type) {
      OneTopicalQuery query = new OneTopicalQuery().deleted(YesNoEnum.NO.getValue()); OneTopicalQuery query = new OneTopicalQuery().deleted(YesNoEnum.NO.getValue());
      ......
      government-manager/src/main/java/com/mortals/xhx/module/site/dao/SiteDao.java
      View file @ 5dd836e0
      ...@@ -3,6 +3,9 @@ package com.mortals.xhx.module.site.dao; ...@@ -3,6 +3,9 @@ package com.mortals.xhx.module.site.dao;
      import com.mortals.framework.dao.ICRUDDao; import com.mortals.framework.dao.ICRUDDao;
      import com.mortals.xhx.module.site.model.SiteEntity; import com.mortals.xhx.module.site.model.SiteEntity;
      import java.util.List;
      import java.util.Map;
      /** /**
      * <p>Title: 站点信息表</p> * <p>Title: 站点信息表</p>
      * <p>Description: SiteDao DAO接口 </p> * <p>Description: SiteDao DAO接口 </p>
      ...@@ -12,4 +15,12 @@ import com.mortals.xhx.module.site.model.SiteEntity; ...@@ -12,4 +15,12 @@ import com.mortals.xhx.module.site.model.SiteEntity;
      public interface SiteDao extends ICRUDDao<SiteEntity,Long>{ public interface SiteDao extends ICRUDDao<SiteEntity,Long>{
      /**
      * 查询子站点
      *
      * @param
      * @return
      */
      List<SiteEntity> selectChildrenSiteById(String siteId);
      } }
      government-manager/src/main/java/com/mortals/xhx/module/site/service/SiteService.java
      View file @ 5dd836e0
      ...@@ -49,5 +49,5 @@ public interface SiteService extends ICRUDService<SiteEntity, Long> { ...@@ -49,5 +49,5 @@ public interface SiteService extends ICRUDService<SiteEntity, Long> {
      * @param sites 站点列表 * @param sites 站点列表
      * @return 下拉树结构列表 * @return 下拉树结构列表
      */ */
      public List<TreeSelect> buildSiteTreeSelect(List<SiteEntity> sites); List<TreeSelect> buildSiteTreeSelect(List<SiteEntity> sites);
      } }
      \ No newline at end of file
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment