update

ecosystem.config.js

@@ -0,0 +1,20 @@
+'use strict';
+// 开发服务设置
+const app = 'service';
+module.exports = {
+  apps: [
+    {
+      name: app, // 应用名称
+      script: './bootstrap.js', // 实际启动脚本
+      out: `./logs/${app}.log`,
+      error: `./logs/${app}.err`,
+      watch: [
+        // 监控变化的目录，一旦变化，自动重启
+        'dist',
+      ],
+      env: {
+        NODE_ENV: 'production', // 环境参数，当前指定为生产环境
+      },
+    },
+  ],
+};

src/config/config.local.ts

@@ -4,6 +4,8 @@ import { MidwayConfig } from '@midwayjs/core';
 const ip = '192.168.1.153';
 /**原数据库名称 */
 const dbName = 'water_service';
+/**新数据库 */
+const v2DbName = 'water_service_v2'
 /**数据库用户名 */
 const dbUsername = 'root';
 /**数据库密码 */
@@ -29,6 +31,17 @@ export default {
         synchronize: false, // 如果第一次使用，不存在表，有同步的需求可以写 true，注意会丢数据
         logging: true,
       },
+      v2: {
+        type: 'mysql',
+        host: ip,
+        port: 3306,
+        database: v2DbName,
+        username: dbUsername,
+        password: dbPwd,
+        entities: ['./entityV2'],
+        synchronize: true, // 如果第一次使用，不存在表，有同步的需求可以写 true，注意会丢数据
+        logging: true,
+      }
     },
   },
 } as MidwayConfig;

src/config/config.prod.ts

@@ -0,0 +1,47 @@
+import { MidwayConfig } from '@midwayjs/core';
+
+/**数据库ip */
+const ip = 'host.docker.internal';
+/**原数据库名称 */
+const dbName = 'water_service';
+/**新数据库 */
+const v2DbName = 'water_service_v2'
+/**数据库用户名 */
+const dbUsername = 'root';
+/**数据库密码 */
+const dbPwd = 'free1977';
+
+export default {
+  keys: '1697684406848_4978',
+  koa: {
+    port: 9000,
+    globalPrefix: '/warter/front/v2/api',
+    queryParseMode: 'extended',
+  },
+  typeorm: {
+    dataSource: {
+      default: {
+        type: 'mysql',
+        host: ip,
+        port: 3306,
+        database: dbName,
+        username: dbUsername,
+        password: dbPwd,
+        entities: ['./entity'],
+        synchronize: true, // 如果第一次使用，不存在表，有同步的需求可以写 true，注意会丢数据
+        logging: true,
+      },
+      v2: {
+        type: 'mysql',
+        host: ip,
+        port: 3306,
+        database: v2DbName,
+        username: dbUsername,
+        password: dbPwd,
+        entities: ['./entityV2'],
+        synchronize: true, // 如果第一次使用，不存在表，有同步的需求可以写 true，注意会丢数据
+        logging: true,
+      }
+    },
+  },
+} as MidwayConfig;

src/controller/common.controller.ts

@@ -1,42 +1,29 @@
 import { Controller, Get, Inject, Param } from '@midwayjs/core';
-import { Page, Query } from '../decorator/page.decorator';
 import { RF } from '../response/CustomerResponse';
-import { CommonService } from '../service/frame/common.service';
+import { PartsService } from '../service/parts.service';
 
 @Controller('/common')
 export class CommonController {
   @Inject()
-  service: CommonService
+  service: PartsService
 
   /**
-   * 通用查询列表
-   * @param table 表名
-   * @param query 查询条件
-   * @param page 分页设置
-   * @returns RF
+   * 查询channel
+   * @param channel_id 
    */
-  @Get('/list/:table')
-  async list(
-    @Param('table') table: string,
-    @Query() query: object,
-    @Page() page: object
-  ) {
-    const model = this.service.getModel(table);
-    const res = await this.service.search(model, query, page);
-    return RF.success(res);
+  @Get('/channel/:channel_id')
+  async channelDetail(@Param('channel_id') channel_id: string) {
+    const data = await this.service.channelDetail(channel_id)
+    return RF.success(data)
   }
+
   /**
-   * 通用单查询
-   * @param table 表名
-   * @param column 查询列名
-   * @param value 对应值
-   * @returns RF
+   * 查询content
+   * @param content_id 
    */
-  @Get('/detail/:table/:column/:value')
-  async detail(@Param('table') table: string, @Param('column') column: string, @Param('value') value: string) {
-    const query = { [column]: value }
-    const model = this.service.getModel(table)
-    const data = await this.service.getOne(model, query)
+  @Get('/content/:content_id')
+  async contentDetail(@Param('content_id') content_id: string) {
+    const data = await this.service.contentDetail(content_id)
     return RF.success(data)
   }
 }

src/controller/index.controller.ts

@@ -1,6 +1,7 @@
 import { Controller, Get, Inject } from "@midwayjs/core";
 import { RF } from "../response/CustomerResponse";
 import { PartsService } from "../service/parts.service";
+import { get } from "lodash";
 
 
 @Controller('/home', { tagName: '首页' })
@@ -32,7 +33,19 @@ export class HomeController {
     for (const config of configList) {
       const { channel_id, part } = config;
       const { data: list } = await this.service.contentList(channel_id, {}, { skip, limit })
-      returnData[part] = list;
+      // 重整理列表
+      const newList = []
+      for (const i of list) {
+        const obj = {
+          content_id: get(i, 'content_id'),
+          title: get(i, 'ext.title'),
+          date: get(i, 'ext.release_date'),
+          brief: get(i, 'txt.txt'),
+          url: get(i, 'title_img')
+        }
+        newList.push(obj)
+      }
+      returnData[part] = newList;
     }
     return RF.success(returnData)
   }

src/controller/jtjs.controller.ts

@@ -1,6 +1,7 @@
 import { Controller, Get, Inject, Param } from "@midwayjs/core";
 import { RF } from "../response/CustomerResponse";
 import { PartsService } from "../service/parts.service";
+import { get } from "lodash";
 
 
 @Controller('/jtjs', { tagName: '集团介绍' })
@@ -10,8 +11,13 @@ export class JtjsController {
 
   @Get('/jtjs', { routerName: '集团介绍' })
   async jtjs() {
-    const data = await this.service.jtjs();
-    return RF.success(data);
+    const channel_id = 175;
+    const data = await this.service.channelDetail(channel_id);
+    const newData = {
+      title: get(data, 'channel_name'),
+      txt: get(data, 'txt.txt')
+    }
+    return RF.success(newData);
   }
 
   @Get('/jgsz', { routerName: '机构设置' })
@@ -32,11 +38,18 @@ export class JtjsController {
       // 长春市二次供水有限责任公司
       { channel_id: 180, part: 'ccsecgsyxzrgs' },
     ]
-    const returnData = {}
+    const returnData = []
     for (const config of configList) {
-      const { channel_id, part } = config;
+      const { channel_id } = config;
       const data = await this.service.channelDetail(channel_id)
-      if (data) returnData[part] = data;
+      if (data) {
+        const newData = {
+          channel_id,
+          title: get(data, 'title'), 
+          txt: get(data, 'txt.txt')
+        }
+        returnData.push(newData);
+      }
     }
     return RF.success(returnData)
   }

src/controller/myzj.controller.ts

@@ -1,12 +1,45 @@
-import { Controller, Inject, Get, Param } from "@midwayjs/core";
+import { Controller, Inject, Get, Param, Body, Post } from "@midwayjs/core";
 import { Page, Query } from "../decorator/page.decorator";
 import { PartsService } from "../service/parts.service";
 import { RF } from "../response/CustomerResponse";
+import { QuestionService } from "../service/v2/question.service";
 
 @Controller('/myzj', { tagName: '民意征集' })
 export class MyzjController {
   @Inject()
   service: PartsService;
+  @Inject()
+  questionService: QuestionService;
+  @Get('/question', { routerName: '投诉与建议-查询' })
+  async queryQuestion(@Query() query: object, @Page() page: object) {
+    let where = {}
+    if (Object.keys(query).length > 0) {
+      where = { where: query }
+    }
+    const result = await this.questionService.query(where, { ...page })
+    return RF.success(result)
+  }
+
+  @Get('/question/:id', { routerName: '投诉与建议-单查询' })
+  async fetchQuestion(@Param('id') id: number) {
+    let where = { id }
+    const result = await this.questionService.fetch(where)
+    return RF.success(result)
+  }
+
+  @Post('/question', { routerName: '投诉与建议-创建' })
+  async createQuestion(@Body() body: object) {
+    const result = await this.questionService.create(body)
+    return RF.success(result)
+  }
+
+  @Post('/question/:id', { routerName: '投诉与建议-修改' })
+  async updateQuestion(@Param('id') id: number, @Body() body: object) {
+    const result = await this.questionService.update({ where: { id } }, body)
+    return RF.success(result)
+  }
+
+
 
   @Get('/list/rdhy', { routerName: '热点回应列表' })
   async list(@Query() query: object, @Page() page: object) {

src/entityV2/question.entity.ts

@@ -0,0 +1,46 @@
+
+import dayjs = require('dayjs');
+import { Column, CreateDateColumn, Entity, PrimaryGeneratedColumn, UpdateDateColumn, VersionColumn } from 'typeorm';
+
+@Entity('question', { comment: '投诉与建议' })
+export class Question {
+  /**数据id */
+  @PrimaryGeneratedColumn({ type: 'integer' })
+  question_id: number;
+  /**数据创建时间 */
+  @CreateDateColumn({ type: 'timestamp', transformer: { from: value => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : value), to: value => value } })
+  created_time?: Date;
+  /**数据最后更新时间 */
+  @UpdateDateColumn({ type: 'timestamp', transformer: { from: value => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : value), to: value => value } })
+  update_time?: Date;
+  /**数据版本 */
+  @VersionColumn({ type: 'integer', default: 1 })
+  __v?: number;
+
+  @Column({ comment: '问题类型: 1-投诉反馈; 2-意见建议; 3-咨询反馈' })
+  type: string;
+  @Column({ comment: '姓名' })
+  name: string;
+  @Column({ comment: '电话' })
+  phone: string;
+  @Column({ comment: '邮箱' })
+  email: string;
+  @Column({ comment: '街/路' })
+  street: string;
+  @Column({ comment: '小区' })
+  community: string;
+  @Column({ comment: '楼栋' })
+  building: string;
+  @Column({ comment: '单元' })
+  unit: string;
+  @Column({ comment: '室' })
+  room: string;
+  @Column({ comment: '地址' })
+  address: string;
+  @Column({ comment: '反馈详情' })
+  description: string;
+  @Column({ comment: '处理状态: 0-未处理;1-已处理', default: '0' })
+  deal_status: string
+  @Column({ type: 'timestamp', nullable: true, transformer: { from: value => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : value), to: value => value }, comment: '处理时间' })
+  deal_time: Date;
+}

src/service/parts.service.ts

@@ -46,7 +46,7 @@ export class PartsService {
   async channelList(channel_id, query = {}, page = {}, others = {}) {
     const extModel = this.service.getModel("jc_channel_ext")
     const txtModel = this.service.getModel("jc_channel_txt")
-    let { data, total } = await this.service.search(extModel, { channel_id, ...query }, page, others)
+    let { data, total } = await this.service.search(extModel, { channel_id, status: '2', ...query }, page, others)
     for (const ext of data) {
       const channel_id = get(ext, 'channel_id')
       const txt = await this.service.getOne(txtModel, { channel_id })
@@ -67,13 +67,16 @@ export class PartsService {
 
   /**content列表查询 */
   async contentList(channel_id, query = {}, page = {}, others = {}) {
+    const contentModel = this.service.getModel('jc_content')
     const extModel = this.service.getModel("jc_content_ext")
     const txtModel = this.service.getModel("jc_content_txt")
-    let { data, total } = await this.service.search(extModel, { channel_id, ...query }, page, others)
-    for (const ext of data) {
-      const content_id = get(ext, 'content_id')
+    let { data, total } = await this.service.search(contentModel, { channel_id, ...query }, page, others)
+    for (const i of data) {
+      const content_id = get(i, 'content_id')
+      const ext = await this.service.getOne(extModel, { content_id })
+      if (ext) i.ext = ext;
       const txt = await this.service.getOne(txtModel, { content_id })
-      if (txt) ext.txt = txt;
+      if (txt) i.txt = txt;
     }
     return { data, total }
   }

src/service/v2/question.service.ts

@@ -0,0 +1,83 @@
+import { Provide } from "@midwayjs/core";
+import { InjectEntityModel } from "@midwayjs/typeorm";
+import { Repository } from "typeorm";
+import { Question } from "../../entityV2/question.entity";
+import { get, isNull, isString, isUndefined } from "lodash";
+
+@Provide()
+export class QuestionService {
+  @InjectEntityModel(Question, 'v2')
+  model: Repository<Question>;
+
+  async query(query: object = {}, meta: any = {}) {
+    let skip = get(meta, 'skip', 0);
+    let limit = get(meta, 'limit', 0);
+    const order = get(meta, 'order', {});
+    const selects = get(meta, 'selects', []);
+    const builder = await this.model.createQueryBuilder();
+    if (query) builder.where(query);
+    if (selects.length > 0) {
+      // 字段是直接传来的,正常限制,需要加上model的name.否则会导致什么字段都没有
+      const modelName = this.model.metadata.name;
+      builder.select(selects.map(i => `${modelName}.${i}`));
+    }
+    // 组织查询顺序
+    let orderObject: any = {};
+    // 如果有自定义顺序,则按照自定义顺序来, 没有自定义顺序,默认按创建时间的desc查询
+    if (Object.keys(order).length > 0) {
+      for (const column in order) orderObject[column] = order[column];
+    } else orderObject = { question_id: 'DESC' };
+    // 分页
+    if (isString(skip)) {
+      skip = parseInt(skip);
+      if (isFinite(skip)) builder.skip(skip);
+    } else if (isFinite(skip)) builder.skip(skip);
+    if (isString(limit)) {
+      limit = parseInt(limit);
+      if (isFinite(limit)) builder.take(limit);
+    } else if (isFinite(limit)) builder.take(limit);
+    // 排序
+    builder.orderBy(orderObject);
+    const data = await builder.getMany();
+    const total = await builder.getCount();
+    return { data, total };
+  }
+
+  async create(data: object) {
+    const result = await this.model.insert(data);
+    const id = get(result, 'identifiers.0.id');
+    // 没有id估计是出错了
+    if (!id) return;
+    const createData = await this.fetch({ id });
+    return createData;
+  }
+
+  async fetch(query: object) {
+    const builder = this.model.createQueryBuilder();
+    builder.where(query)
+    const result = await builder.getOne();
+    return result;
+  }
+
+  /**修改，单修改/多修改是统一修改为 */
+  async update(query: object = {}, data: object) {
+    // 没有范围的修改不允许执行
+    if (Object.keys(query).length <= 0) return;
+    // 处理数据, 只将是本表的字段拿出来保存
+    const columns = this.model.metadata.columns;
+    /**将array的列设置 转换为object,以便query使用*/
+    const columnsObject = {};
+    // 整理成object
+    for (const c of columns) columnsObject[c.propertyName] = c.type.toString();
+    const updateData = {};
+    const notDealColumn = ['created_time', 'update_time', 'data_owner', '__v'];
+    for (const column in columnsObject) {
+      if (notDealColumn.includes(column)) continue;
+      const val = data[column];
+      if (isNull(val) || isUndefined(val)) continue;
+      updateData[column] = val;
+    }
+    await this.model.update(query, updateData);
+  }
+
+}