定时任务

in-cloud-ui/src/api/colorfulIcon.js

@@ -1,9 +0,0 @@
-import request from '@/utils/request'
-
-export function getIconList(data) {
-  return request({
-    url: '/colorfulIcon/getList',
-    method: 'post',
-    data,
-  })
-}

in-cloud-ui/src/api/github.js

@@ -1,19 +0,0 @@
-import request from 'axios'
-
-export function getRepos(params) {
-  return request({
-    url: 'https://api.github.com/repos/chuzhixin/vue-admin-beautiful',
-    method: 'get',
-    params,
-    timeout: 10000,
-  })
-}
-
-export function getStargazers(params) {
-  return request({
-    url: 'https://api.github.com/repos/chuzhixin/vue-admin-beautiful/stargazers',
-    method: 'get',
-    params,
-    timeout: 10000,
-  })
-}

in-cloud-ui/src/api/goodsList.js

@@ -1,9 +0,0 @@
-import request from '@/utils/request'
-
-export function getList(data) {
-  return request({
-    url: '/goodsList/getList',
-    method: 'post',
-    data,
-  })
-}

in-cloud-ui/src/api/icon.js

@@ -1,9 +0,0 @@
-import request from '@/utils/request'
-
-export function getIconList(data) {
-  return request({
-    url: '/icon/getList',
-    method: 'post',
-    data,
-  })
-}

in-cloud-ui/src/api/markdown.js

@@ -1,8 +0,0 @@
-import request from 'axios'
-
-export function getList() {
-  return request({
-    url: 'https://fastly.jsdelivr.net/gh/prettier/prettier@master/docs/options.md',
-    method: 'get',
-  })
-}

in-cloud-ui/src/api/menuManagement.js

@@ -1,25 +0,0 @@
-import request from '@/utils/request'
-
-export function getTree(data) {
-  return request({
-    url: '/menuManagement/getTree',
-    method: 'post',
-    data,
-  })
-}
-
-export function doEdit(data) {
-  return request({
-    url: '/menuManagement/doEdit',
-    method: 'post',
-    data,
-  })
-}
-
-export function doDelete(data) {
-  return request({
-    url: '/menuManagement/doDelete',
-    method: 'post',
-    data,
-  })
-}

in-cloud-ui/src/api/personalCenter.js

@@ -1,25 +0,0 @@
-import request from '@/utils/request'
-
-export function getList(data) {
-  return request({
-    url: '/personalCenter/getList',
-    method: 'post',
-    data,
-  })
-}
-
-export function doEdit(data) {
-  return request({
-    url: '/personalCenter/doEdit',
-    method: 'post',
-    data,
-  })
-}
-
-export function doDelete(data) {
-  return request({
-    url: '/personalCenter/doDelete',
-    method: 'post',
-    data,
-  })
-}

in-cloud-ui/src/api/remixIcon.js

@@ -1,9 +0,0 @@
-import request from '@/utils/request'
-
-export function getIconList(data) {
-  return request({
-    url: '/remixIcon/getList',
-    method: 'post',
-    data,
-  })
-}

in-cloud-ui/src/api/roleManagement.js

@@ -1,25 +0,0 @@
-import request from '@/utils/request'
-
-export function getList(data) {
-  return request({
-    url: '/roleManagement/getList',
-    method: 'post',
-    data,
-  })
-}
-
-export function doEdit(data) {
-  return request({
-    url: '/roleManagement/doEdit',
-    method: 'post',
-    data,
-  })
-}
-
-export function doDelete(data) {
-  return request({
-    url: '/roleManagement/doDelete',
-    method: 'post',
-    data,
-  })
-}

in-cloud-ui/src/api/test.js

@@ -1,8 +0,0 @@
-import request from '@/utils/request'
-
-export function test() {
-  return request({
-    url: '/test',
-    method: 'get',
-  })
-}

in-cloud-ui/src/api/tree.js

@@ -1,9 +0,0 @@
-import request from '@/utils/request'
-
-export function getTreeList(data) {
-  return request({
-    url: '/tree/list',
-    method: 'post',
-    data,
-  })
-}

in-cloud-ui/src/api/userManagement.js

@@ -1,25 +0,0 @@
-import request from '@/utils/request'
-
-export function getList(data) {
-  return request({
-    url: '/userManagement/getList',
-    method: 'post',
-    data,
-  })
-}
-
-export function doEdit(data) {
-  return request({
-    url: '/userManagement/doEdit',
-    method: 'post',
-    data,
-  })
-}
-
-export function doDelete(data) {
-  return request({
-    url: '/userManagement/doDelete',
-    method: 'post',
-    data,
-  })
-}

in-cloud-ui/src/views/index/index.vue

@@ -215,7 +215,6 @@
   import { dependencies, devDependencies } from '../../../package.json'
   import { getList } from '@/api/changeLog'
   import { getNoticeList } from '@/api/notice'
-  import { getRepos, getStargazers } from '@/api/github'
   import Plan from './components/Plan'
   import VersionInformation from './components/VersionInformation'
 

in-cloud-ui/src/views/quartz/quartzInfo/index.vue

@@ -422,6 +422,7 @@
         this.isEdit = true
         //var newObj = JSON.parse(JSON.stringify(row))
         this.form = row
+        this.form.operate = 'restart'
         this.title = '修改'
         this.dialogType = 'edit'
         this.dialogFormVisible = true

in-cloud-ui/src/views/vab/inCompany/index.vue

@@ -9,8 +9,14 @@
           @submit.native.prevent
         >
           <el-form-item>
-            <el-input v-model="searchForm.code" placeholder="场站标识" />
+            <el-input v-model="searchForm.name" placeholder="公司名称" />
           </el-form-item>
+
+          <el-form-item>
+            <el-input v-model="searchForm.code" placeholder="公司编码" />
+          </el-form-item>
+
+
           <el-form-item>
             <el-button
               icon="el-icon-search"

in-cloud-ui/src/views/vab/station/index.vue

@@ -9,8 +9,26 @@
           @submit.native.prevent
         >
           <el-form-item>
-            <el-input v-model="searchForm.stationCode" placeholder="场站标识" />
+            <el-input v-model="searchForm.name" placeholder="场站名称" />
           </el-form-item>
+
+          <el-form-item>
+            <el-input v-model="searchForm.stationCode" placeholder="场站编码" />
+          </el-form-item>
+
+
+          <el-form-item>
+            <el-select v-model.trim="searchForm.inCode" clearable placeholder="公司">
+              <el-option
+                v-for="item in companys"
+                :key="item.code"
+                :label="item.name"
+                :value="item.code"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+
+
           <el-form-item>
             <el-button
               icon="el-icon-search"
@@ -136,6 +154,18 @@
           </el-select>
         </el-form-item>
 
+        <el-form-item label="公司" prop="inCode">
+          <el-select v-model.trim="form.inCode" clearable placeholder="请选择">
+            <el-option
+              v-for="item in companys"
+              :key="item.code"
+              :label="item.name"
+              :value="item.code"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+
         <el-form-item label="用户名" prop="username">
           <el-input v-model.trim="form.username" autocomplete="off"></el-input>
         </el-form-item>

in-cloud/src/main/java/com/jiayue/insu/incloud/compermisson/QNHLComPermisson.java

@@ -84,7 +84,7 @@ public class QNHLComPermisson implements GeneratePermisson{
                             lambdaUpdateWrapper.eq(Station::getId, station.getId())
                                     .set(Station::getComKey, token)
                                     .set(Station::getKeyTime,LocalDateTime.now().plusDays(1));*/
-                            stationService.saveOrUpdate(station);
+                            stationService.updateById(station);
                             record.setState(QNHLEnum.REQUEST_SUCCESS.getSign());
                             result = true;
 

in-cloud/src/main/java/com/jiayue/insu/incloud/config/MyMetaObjectHandler.java

@@ -15,8 +15,16 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
 
     @Override
     public void insertFill(MetaObject metaObject) {
-        SaTokenInfo tokenInfo = StpUtil.getTokenInfo();
-        log.info("start insert fill ....");
+
+        SaTokenInfo tokenInfo;
+        try {
+            //当执行定时任务时，无登录信息抛出异常
+            tokenInfo = StpUtil.getTokenInfo();
+
+        }catch (Exception e){
+            tokenInfo = new SaTokenInfo();
+            tokenInfo.setLoginId("quartz");
+        }
 
         this.strictInsertFill(metaObject, "creator", String.class,  (String)tokenInfo.getLoginId()); // 起始版本 3.3.0(推荐使用)
 
@@ -26,11 +34,17 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
 
     @Override
     public void updateFill(MetaObject metaObject) {
-        log.info("start update fill ....");
-        SaTokenInfo tokenInfo = StpUtil.getTokenInfo();
-
-        this.strictInsertFill(metaObject, "lastModifier", String.class, (String)tokenInfo.getLoginId()); // 起始版本 3.3.0(推荐使用)
-
-        this.strictInsertFill(metaObject, "lastModifyTime", LocalDateTime.class, LocalDateTime.now()); // 起始版本 3.3.0(推荐使用)
+        SaTokenInfo tokenInfo;
+        try {
+            //当执行定时任务时，无登录信息抛出异常
+            tokenInfo = StpUtil.getTokenInfo();
+
+        }catch (Exception e){
+            tokenInfo = new SaTokenInfo();
+            tokenInfo.setLoginId("quartz");
+        }
+
+        this.setFieldValByName("lastModifier", tokenInfo.getLoginId(),metaObject);
+        this.setFieldValByName("lastModifyTime",LocalDateTime.now(), metaObject);
     }
 }

in-cloud/src/main/java/com/jiayue/insu/incloud/controller/IntegrationCompanyController.java

@@ -1,5 +1,6 @@
 package com.jiayue.insu.incloud.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jiayue.insu.common.core.util.R;
@@ -32,7 +33,16 @@ public class IntegrationCompanyController {
 
     @GetMapping("/page")
     public R getStationPage(Page page, IntegrationCompany integrationCompany) {
-        return R.ok(integrationCompanyService.page(page, Wrappers.query(integrationCompany)));
+
+        LambdaQueryWrapper<IntegrationCompany> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+
+        if(integrationCompany.getCode() !=null){
+            lambdaQueryWrapper.eq(IntegrationCompany::getCode,integrationCompany.getCode());
+        }
+        if(integrationCompany.getName() !=null){
+            lambdaQueryWrapper.like(IntegrationCompany::getName,integrationCompany.getName());
+        }
+        return R.ok(integrationCompanyService.page(page, lambdaQueryWrapper));
     }
 
     @GetMapping("/all")

in-cloud/src/main/java/com/jiayue/insu/incloud/controller/StationController.java

@@ -1,5 +1,6 @@
 package com.jiayue.insu.incloud.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jiayue.insu.common.core.util.R;
@@ -32,7 +33,19 @@ public class StationController {
 
     @GetMapping("/page")
     public R getStationPage(Page page, Station station) {
-        return R.ok(stationService.page(page, Wrappers.query(station)));
+        LambdaQueryWrapper<Station> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        if(station.getInCode()!=null){
+            lambdaQueryWrapper.eq(Station::getInCode,station.getInCode());
+        }
+        if(station.getStationCode()!=null){
+            lambdaQueryWrapper.eq(Station::getStationCode,station.getStationCode());
+        }
+
+        if(station.getName()!=null){
+            lambdaQueryWrapper.like(Station::getName,station.getName());
+        }
+
+        return R.ok(stationService.page(page, lambdaQueryWrapper));
     }
 
     @GetMapping("/all")

in-cloud/src/main/java/com/jiayue/insu/incloud/job/data/pull/PullInitDataJob.java

@@ -18,13 +18,15 @@ public class PullInitDataJob implements Job {
      private StationService stationService;
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        String stationCode  = jobExecutionContext.getTrigger().getJobKey().getName();
-
-        Station one = stationService.findByStationCode(stationCode);
-        if (one != null) {
-            pullInitData.pullDQAndNWPData(one);
+        String code = jobExecutionContext.getTrigger().getJobKey().getName();
+        String[] split = code.split("-");
+        if(split!=null && split.length>0) {
+            String stationCode = split[0];
+            Station one = stationService.findByStationCode(stationCode);
+            if (one != null) {
+                pullInitData.pullDQAndNWPData(one);
+            }
         }
 
-
     }
 }

in-cloud/src/main/java/com/jiayue/insu/incloud/job/data/pull/QNHLPullCorrectDataJob.java

@@ -18,10 +18,14 @@ public class QNHLPullCorrectDataJob implements Job {
      private StationService stationService;
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        String stationCode  = jobExecutionContext.getTrigger().getJobKey().getName();
-        Station one = stationService.findByStationCode(stationCode);
-        if (one != null) {
-            pullCorrectDataForQNHL.pullDQAndNWPData(one);
+        String code = jobExecutionContext.getTrigger().getJobKey().getName();
+        String[] split = code.split("-");
+        if(split!=null && split.length>0){
+            String stationCode = split[0];
+            Station one = stationService.findByStationCode(stationCode);
+            if (one != null) {
+                pullCorrectDataForQNHL.pullDQAndNWPData(one);
+            }
         }
 
 

in-cloud/src/main/java/com/jiayue/insu/incloud/job/data/push/QNHLPushInitDqData.java

@@ -22,8 +22,15 @@ public class QNHLPushInitDqData implements Job {
     private StationService stationService;
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        String stationCode  = jobExecutionContext.getTrigger().getJobKey().getName();
-        Station one = stationService.findByStationCode(stationCode);
-        pushDataForQNHL.pushDQAndNWPData(one);
+        String code = jobExecutionContext.getTrigger().getJobKey().getName();
+        String[] split = code.split("-");
+        if(split!=null && split.length>0){
+            String stationCode = split[0];
+            Station one = stationService.findByStationCode(stationCode);
+            if (one != null) {
+                pushDataForQNHL.pushDQAndNWPData(one);
+            }
+        }
+
     }
 }

in-cloud/src/main/java/com/jiayue/insu/incloud/job/permission/QNHLPermissonJob.java

@@ -1,8 +1,6 @@
 package com.jiayue.insu.incloud.job.permission;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jiayue.insu.incloud.compermisson.QNHLComPermisson;
-import com.jiayue.insu.incloud.constants.CompanyConstant;
 import com.jiayue.insu.incloud.entity.Station;
 import com.jiayue.insu.incloud.service.StationService;
 import org.quartz.Job;
@@ -10,8 +8,6 @@ import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import java.util.List;
-
 /**
  * 清能互联 通讯token Job
  *
@@ -24,13 +20,17 @@ public class QNHLPermissonJob implements Job {
     private QNHLComPermisson qNHLComPermisson;
     @Autowired
     private StationService stationService;
+
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        LambdaQueryWrapper<Station> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(Station::getInCode, CompanyConstant.COMPANY_QNHL);
-        List<Station> list = stationService.list(lambdaQueryWrapper);
-        for (Station station:list) {
+        String code = jobExecutionContext.getTrigger().getJobKey().getName();
+        String[] split = code.split("-");
+        if(split!=null && split.length>0){
+            String stationCode = split[0];
+            Station station = stationService.findByStationCode(stationCode);
             qNHLComPermisson.generateKey(station);
         }
+
+
     }
 }