校验

ship-test/control/source-control.js

@@ -3,27 +3,47 @@ import ApiResult from "../config/api.js";
 const SourceControl = {
   list: async (req, res) => {
     try {
-      const data = await SourceService.list(req.body)
-      res.send(new ApiResult().success(data))
+      SourceService.list(req.body).then(data => {
+        res.send(new ApiResult().success(data))
+      }).catch((e) => {
+        res.send(new ApiResult().error(null, e))
+      })
     } catch (e) {
       res.send(new ApiResult().error(e))
     }
   },
   page: async (req, res) => {
     try {
-      const data = await SourceService.page(req.body)
-      res.send(new ApiResult().success(data))
+      SourceService.page(req.body).then(data => {
+        res.send(new ApiResult().success(data))
+      }).catch((e) => {
+        res.send(new ApiResult().error(null, e))
+      })
+    } catch (e) {
+      res.send(new ApiResult().error(e))
+    }
+  },
+  info: async (req, res) => {
+    try {
+      SourceService.info(req.params.id).then(data => {
+        res.send(new ApiResult().success(data))
+      }).catch((e) => {
+        res.send(new ApiResult().error(null, e))
+      })
     } catch (e) {
       res.send(new ApiResult().error(e))
     }
   },
   add: async (req, res) => {
     try {
-      const data = await SourceService.add(req.body)
-      res.send(new ApiResult().success(data))
+      SourceService.add(req.body).then(data => {
+        res.send(new ApiResult().success(data))
+      }).catch((e) => {
+        res.send(new ApiResult().error(null, e))
+      })
     } catch (e) {
       res.send(new ApiResult().error(e))
     }
-  }
+  },
 }
 export default SourceControl

ship-test/entity/source-entity.js

@@ -1,8 +1,9 @@
-import {convertToCamelCase, isValue, YMDHms} from "../../util/index.js";
+import {objToCamel, isValue, YMDHms} from "../../util/index.js";
 
 export default class SourceEntity {
   constructor(obj) {
-    convertToCamelCase(obj)
+    objToCamel(obj)
+    this.id = isValue(obj?.id) ? obj.id : null
     this.name = isValue(obj?.name) ? obj.name : null
     this.sort = isValue(obj?.sort) ? obj.sort : 0
     this.remark = isValue(obj?.remark) ? obj.remark : null

ship-test/routers/index.js

@@ -3,5 +3,6 @@ import SourceControl from "../control/source-control.js";
 const shipTestRouter = express.Router()
 shipTestRouter.post('/source/list', SourceControl.list)
 shipTestRouter.post('/source/page', SourceControl.page)
+shipTestRouter.get('/source/info/:id', SourceControl.info)
 shipTestRouter.post('/source/add', SourceControl.add)
 export default shipTestRouter

ship-test/service/source-service.js

@@ -1,42 +1,94 @@
 import {sqlHandle} from "../config/db.js";
-import {isValue} from "../../util/index.js";
+import {isValue, paramToUnder} from "../../util/index.js";
 import PageResult from "../config/page.js";
 import SourceEntity from "../entity/source-entity.js";
 const SourceService = {
-  list: async ({name}) => {
-    let sql = 'SELECT * FROM ship_test_source'
-    let where = ['del_flag = 0']
-    if (isValue(name)) {
-      where.push(`name LIKE "%${name}%"`)
-    }
-    if (where.length > 0) {
-      sql += ' ' + `WHERE ${where.join(' AND ')}`
-    }
-    const result = await sqlHandle(sql)
-    return result.map(v => new SourceEntity(v))
+  list: ({name, orderByColumn, isAsc}) => {
+    return new Promise(async (resolve, reject) => {
+      let sql = 'SELECT * FROM ship_test_source'
+      let where = ['del_flag = 0']
+      if (isValue(name)) {
+        where.push(`name LIKE "%${name}%"`)
+      }
+      if (where.length > 0) {
+        sql += ' ' + `WHERE ${where.join(' AND ')}`
+      }
+      if (isValue(orderByColumn)) {
+        sql += ' ' + `ORDER BY ${paramToUnder(orderByColumn)} ${isAsc ? 'ASC' : 'DESC'}`
+      } else {
+        sql += ' ' + `ORDER BY update_time DESC`
+      }
+      const result = await sqlHandle(sql)
+      resolve(result.map(v => new SourceEntity(v)))
+    })
   },
-  page: async ({pageNum, pageSize, name}) => {
-    let sql = 'SELECT * FROM ship_test_source'
-    let where = ['del_flag = 0']
-    if (isValue(name)) {
-      where.push(`name LIKE "%${name}%"`)
-    }
-    if (where.length > 0) {
-      sql += ' ' + `WHERE ${where.join(' AND ')}`
-    }
-    const result = await PageResult(sql, pageNum, pageSize, SourceEntity)
-    return result
+  page: ({pageNum, pageSize, name, orderByColumn, isAsc}) => {
+    return new Promise(async (resolve, reject) => {
+      let sql = 'SELECT * FROM ship_test_source'
+      let where = ['del_flag = 0']
+      if (isValue(name)) {
+        where.push(`name LIKE "%${name}%"`)
+      }
+      if (where.length > 0) {
+        sql += ' ' + `WHERE ${where.join(' AND ')}`
+      }
+      if (isValue(orderByColumn)) {
+        sql += ' ' + `ORDER BY ${paramToUnder(orderByColumn)} ${isAsc ? 'ASC' : 'DESC'}`
+      } else {
+        sql += ' ' + `ORDER BY update_time DESC`
+      }
+      const result = await PageResult(sql, pageNum, pageSize, SourceEntity)
+      resolve(result)
+    })
   },
-  add: async (form) => {
-    const sql = 'INSERT INTO ship_test_source (name, remark, sort) VALUES (?, ?, ?)'
-    const sourceEntity = new SourceEntity(form)
-    const values = [
-      sourceEntity.name,
-      sourceEntity.remark,
-      sourceEntity.sort,
-    ]
-    const result = await sqlHandle(sql, values)
-    return result
+  info: (id) => {
+    return new Promise(async (resolve, reject) => {
+      let sql = 'SELECT * FROM ship_test_source'
+      let where = ['del_flag = 0']
+      if (!isValue(id)) {
+        reject('id不可为空')
+        return
+      } else {
+        where.push(`id = ${id}`)
+      }
+      if (where.length > 0) {
+        sql += ' ' + `WHERE ${where.join(' AND ')}`
+      }
+      const result = await sqlHandle(sql)
+      resolve(result.map(v => new SourceEntity(v))?.[0])
+    })
   },
+  add: (form) => {
+    return new Promise(async (resolve, reject) => {
+      const sql = 'INSERT INTO ship_test_source (name, remark, sort) VALUES (?, ?, ?)'
+      const sourceEntity = new SourceEntity(form)
+      const sameValid = await SourceService.queryBy({name: sourceEntity.name})
+      if (sameValid.length > 0) {
+        reject('已存在相同名称!')
+        return
+      }
+      const values = [
+        sourceEntity.name,
+        sourceEntity.remark,
+        sourceEntity.sort,
+      ]
+      const result = await sqlHandle(sql, values)
+      resolve(result)
+    })
+  },
+  queryBy: ({name}) => {
+    return new Promise(async (resolve, reject) => {
+      let sql = 'SELECT * FROM ship_test_source'
+      let where = ['del_flag = 0']
+      if (isValue(name)) {
+        where.push(`name = "${name}"`)
+      }
+      if (where.length > 0) {
+        sql += ' ' + `WHERE ${where.join(' AND ')}`
+      }
+      const result = await sqlHandle(sql)
+      resolve(result.map(v => new SourceEntity(v)))
+    })
+  }
 }
 export default SourceService

util/index.js

@@ -5,7 +5,8 @@ export const isValue = (val) => {
   return true
 }
 
-export const convertToCamelCase = (obj) => {
+// 对象转驼峰命名
+export const objToCamel = (obj) => {
   for (let key in obj) {
     let newKey = key.replace(/_([a-z])/g, function($0, $1){ return $1.toUpperCase(); });
     if (newKey !== key) {
@@ -14,6 +15,24 @@ export const convertToCamelCase = (obj) => {
     }
   }
 }
+// 对象转下划线命名
+export const objToUnder = (obj) => {
+  for (let key in obj) {
+    let newKey = key.replace(/([A-Z])/g, '_$1').toLowerCase();
+    if (newKey !== key) {
+      obj[newKey] = obj[key];
+      delete obj[key];
+    }
+  }
+}
+// 参数转驼峰命名
+export const paramToCamel = (param) => {
+  return  param.replace(/_([a-z])/g, function($0, $1){ return $1.toUpperCase(); });
+}
+// 参数转下划线命名
+export const paramToUnder = (param) => {
+  return param.replace(/([A-Z])/g, '_$1').toLowerCase();
+}
 
 export const YMDHms = (date) => {
   const _date = new Date(date)