tax 城市配置接口更新

app/controller/task.js

@@ -185,10 +185,12 @@ class TaskController extends Controller {
         const {ctx, service} = this;
         // ctx.validate(this.cityConfigRule);
         // await service.signature.signatureCheck(ctx.request.body);
+        const result = await service.task.getCityList();
+        console.log('Type'+JSON.stringify(ctx.app.cityTypeLists[0]))
         ctx.success({
             code: 0,
-            data: ctx.app.cityLists
-        })
+            data: result
+        });
     }
 }
 

app/schedule/notifyUrl.js

@@ -2,7 +2,7 @@
 
 module.exports = {
     schedule: {
-        interval: '24*60m', // 5分钟间隔
+        interval: '1440m', // 5分钟间隔
         type: 'all', // 所有woker
         immediate: true,
     },
@@ -32,4 +32,4 @@ module.exports = {
             ctx.logger.error('【schedule/notifyUrlTask】catch error:', JSON.stringify(e));
         }
     }
-}
+};
\ No newline at end of file

app/service/task.js

@@ -5,20 +5,21 @@ const Service = require('egg').Service;
 class TaskService extends Service {
     constructor(ctx) {
         super(ctx);
-    const { config } = this;
-    const { taskAPI, LOCK_KEY } = config;
+        const {config} = this;
+        const {taskAPI, LOCK_KEY} = config;
         this.baseURL = taskAPI.host;
         this.newbaseURL = taskAPI.newhost;
         this.createTaskUrl = taskAPI.createTaskUrl;
         this.submitTaskUrl = taskAPI.submitTaskUrl;
         this.fetchCodeUrl = taskAPI.fetchCodeUrl;
         this.fetchTaskUrl = taskAPI.fetchTaskUrl;
+        this.cityConfigUrl = taskAPI.cityConfigUrl;
         this.LOCK_KEY = LOCK_KEY;
     }
 
 
     _request(url, type, opts) {
-    const { ctx, baseURL, newbaseURL } = this;
+        const {ctx, baseURL, newbaseURL} = this;
         url = (type === 'gsgj') ? `${newbaseURL}${url}` : `${baseURL}${url}`;
         opts = {
             charset: 'utf-8',
@@ -27,7 +28,7 @@ class TaskService extends Service {
             contentType: 'json',
             ...opts,
         };
-    ctx.logger.info('_request', type, JSON.stringify(opts));
+        // ctx.logger.info('_request', type, JSON.stringify(opts));
         return ctx.curl(url, opts);
     }
 
@@ -37,15 +38,15 @@ class TaskService extends Service {
             this.ctx.throw(result.status, errorMsg);
         }
         if (result.data.code !== 0) {
-      this.ctx.throw(400, { message: result.data.msg, code: result.data.code });
+            this.ctx.throw(400, {message: result.data.msg, code: result.data.code});
         }
     }
 
     async create(data) {
-    const { createTaskUrl, ctx } = this;
+        const {createTaskUrl, ctx} = this;
         const result = await this._request(createTaskUrl, ctx.app.channelType, {
             method: 'post',
-      data: { cityId: data },
+            data: {cityId: data},
         });
         ctx.logger.info(`【Task】create ${createTaskUrl} cityId: ${data} result:`, JSON.stringify(result.data));
         ctx.logger.info('channelType', ctx.app.channelType);
@@ -53,8 +54,8 @@ class TaskService extends Service {
         return result.data.data.taskId;
     }
 
-  async fetchCapture({ taskId, type }) {
-    const { fetchCodeUrl, ctx } = this;
+    async fetchCapture({taskId, type}) {
+        const {fetchCodeUrl, ctx} = this;
         let channelType = taskId.length > 20 ? 'gsgj' : '51gs';
         const result = await this._request(fetchCodeUrl, channelType, {
             method: 'post',
@@ -72,7 +73,7 @@ class TaskService extends Service {
     }
 
     async submit(data) {
-    const { submitTaskUrl, ctx } = this;
+        const {submitTaskUrl, ctx} = this;
         let channelType = data.taskId.length > 20 ? 'gsgj' : '51gs';
         const result = await this._request(submitTaskUrl, channelType, {
             method: 'post',
@@ -84,7 +85,7 @@ class TaskService extends Service {
     }
 
     async fetchTask(data) {
-    const { fetchTaskUrl, ctx } = this;
+        const {fetchTaskUrl, ctx} = this;
         let channelType = data.taskId.length > 20 ? 'gsgj' : '51gs';
         const result = await this._request(fetchTaskUrl, channelType, {
             method: 'post',
@@ -93,6 +94,57 @@ class TaskService extends Service {
         ctx.logger.info(`【Task】fetchTask ${fetchTaskUrl} params`, JSON.stringify(data), JSON.stringify(result.data));
         return result.data;
     }
+
+    async getCityList() {
+        const {cityConfigUrl, ctx} = this;
+        let cityLists = [];//对外城市列表
+        let cityTypeLists = [];//不对外城市列表，含渠道（51/管家）
+        let newCityMap = new Map();
+
+        const newret = await this._request(cityConfigUrl, 'gsgj', {method: 'get'});
+        ctx.logger.info(`【Task】getCityList ${cityConfigUrl} params gsgj`, JSON.stringify(newret.data.code));
+        this._checkSuccess(newret);
+        newret.data.data.map(Prov => {
+            Prov.citys.map(city => {
+                newCityMap.set(String(city.id), city)
+            })
+        });
+
+        const ret = await this._request(cityConfigUrl, '51gs', {method: 'get'});
+        ctx.logger.info(`【Task】getCityList ${cityConfigUrl} params 51gs`, JSON.stringify(newret.data.code));
+        this._checkSuccess(ret);
+        ret.data.data.map(Prov => {
+            let newProv = {provinceName: Prov.provinceName, citys: []};
+            Prov.citys.map(city => {
+                city.type = "51gs";
+                if (city.state === -1 && newCityMap.get(String(city.id)) && newCityMap.get(String(city.id)).state === 1) {
+                    city = newCityMap.get(String(city.id));
+                    city.type = "gsgj";
+                    ctx.logger.info('city', city)
+                }
+                if (city.state != 1) {
+                    city.state = -1;
+                }
+                newProv.citys.push({
+                    province: city.province,
+                    name: city.name,
+                    id: city.id,
+                    state: city.state,
+                    queryParam: city.queryParam
+                });
+                cityTypeLists.push({
+                    province: city.province,
+                    name: city.name,
+                    id: city.id,
+                    state: city.state,
+                    type: city.type,
+                });
+            });
+            cityLists.push(newProv);
+        });
+        ctx.app.cityTypeLists = cityTypeLists;
+        return cityLists;
+    }
 }
 
 module.exports = TaskService;