From 7ef5817eb490f83cc37ee4a41e5822ddab35f31e Mon Sep 17 00:00:00 2001
From: liujiangyong <liu.jiangyong@free-sun.com.cn>
Date: Thu, 2 Mar 2023 09:43:02 +0800
Subject: [PATCH] =?UTF-8?q?(+)=20=E5=85=8Dtoken=E5=B7=A1=E6=A3=80=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controllers/patrolManage/patrolRecord.js  | 26 ++++++++++++++++++-
 api/app/lib/middlewares/authenticator.js      |  1 +
 .../lib/routes/patrolManage/patrolRecord.js   |  4 +++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/api/app/lib/controllers/patrolManage/patrolRecord.js b/api/app/lib/controllers/patrolManage/patrolRecord.js
index 6112c66..cf5a36a 100644
--- a/api/app/lib/controllers/patrolManage/patrolRecord.js
+++ b/api/app/lib/controllers/patrolManage/patrolRecord.js
@@ -136,6 +136,30 @@ async function findPatrolRecord (ctx, next) {
     }
 }
 
+async function findPatrolRecordUnlicensed(ctx, next) {
+    let rslt = [];
+    let error = { name: 'FindError', message: '获取巡检记录失败' };
+    try {
+        const models = ctx.fs.dc.models;
+        const { startTime, endTime } = ctx.query;
+        const options = {
+            where: {}
+        }
+        if (startTime && endTime) {
+            options.where.inspectionTime = { $between: [startTime, endTime] };
+        }
+        rslt = await models.PatrolRecord.findAll(options);
+        ctx.status = 200;
+        ctx.body = rslt;
+    } catch (error) {
+        ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
+        ctx.status = 400;
+        ctx.body = {
+            "message": "获取巡检记录失败"
+        }
+    }
+}
+
 async function addPatrolRecord (ctx, next) {
     let error = { name: 'addError', message: '新增巡检记录失败' };
     const transaction = await ctx.fs.dc.orm.transaction();
@@ -307,10 +331,10 @@ function editPatrolRecordIssueHandle (opts) {
 
 module.exports = {
     findPatrolRecord,
+    findPatrolRecordUnlicensed,
     addPatrolRecord,
     getPatrolRecordIssueHandle,
     getPatrolRecordIssueHandleById,
     addPatrolRecordIssueHandle,
     editPatrolRecordIssueHandle
-
 }
\ No newline at end of file
diff --git a/api/app/lib/middlewares/authenticator.js b/api/app/lib/middlewares/authenticator.js
index 447690d..b1c283e 100644
--- a/api/app/lib/middlewares/authenticator.js
+++ b/api/app/lib/middlewares/authenticator.js
@@ -59,6 +59,7 @@ let isPathExcluded = function (opts, path, method) {
         let excludeOpts = opts.exclude || [];
         excludeOpts.push({ p: '/login', o: 'POST' });
         excludeOpts.push({ p: '/logout', o: 'PUT' });
+        excludeOpts.push({ p: '/patrolRecord/unlicensed', o: 'GET' });
         excludes = new ExcludesUrls(excludeOpts);
     }
     let excluded = excludeAll || excludes.isExcluded(path, method);
diff --git a/api/app/lib/routes/patrolManage/patrolRecord.js b/api/app/lib/routes/patrolManage/patrolRecord.js
index 2c21e7a..1535b07 100644
--- a/api/app/lib/routes/patrolManage/patrolRecord.js
+++ b/api/app/lib/routes/patrolManage/patrolRecord.js
@@ -7,6 +7,10 @@ module.exports = function (app, router, opts) {
     // 小程序端查点位最新一条数据：startTime、endTime、alarm不传
     router.get('/patrolRecord/:patrolPlanId/:startTime/:endTime/:alarm/:pointId', patrolRecord.findPatrolRecord);
 
+    app.fs.api.logAttr['GET/patrolRecord/unlicensed'] = { content: '获取巡检记录', visible: true };
+    // 获取巡检记录，免token，用与生成巡检报告
+    router.get('/patrolRecord/unlicensed', patrolRecord.findPatrolRecordUnlicensed);
+
     app.fs.api.logAttr['POST/patrolRecord/add'] = { content: '新增巡检记录', visible: true }
     router.post('/patrolRecord/add', patrolRecord.addPatrolRecord);