潘钊 / bsth_control · Commits

Commit 7f6f961eaab43156c4114d8ff64e2d78b9e553fe

Authored by 徐烜
1 parent 31f2d0f4

1、修正main.js中获取人员拼音数据方式，具体查看代码 

2、修改人员配置导入etl逻辑
3、修改规则中人员范围选取逻辑，过滤已经停用的人员
4、可以动态刷新人员配置，车辆配置，规则相关etl的修改
Inline Side-by-side
Showing 9 changed files with 320 additions and 108 deletions
src/main/java/com/bsth/controller/schedule/basicinfo/legacy/EmployeeController.java
  View file @7f6f961
@@ -3,6 +3,7 @@ package com.bsth.controller.schedule.basicinfo.legacy; @@ -3,6 +3,7 @@ package com.bsth.controller.schedule.basicinfo.legacy;
3 import com.bsth.common.ResponseCode; 3 import com.bsth.common.ResponseCode;
4 import com.bsth.controller.schedule.BController; 4 import com.bsth.controller.schedule.BController;
5 import com.bsth.controller.schedule.basicinfo.EmployeeController_facade; 5 import com.bsth.controller.schedule.basicinfo.EmployeeController_facade;
  6 +import com.bsth.data.pinyin.PersionPinYin;
6 import com.bsth.entity.Personnel; 7 import com.bsth.entity.Personnel;
7 import com.bsth.service.schedule.EmployeeService; 8 import com.bsth.service.schedule.EmployeeService;
8 import com.bsth.service.schedule.exception.ScheduleException; 9 import com.bsth.service.schedule.exception.ScheduleException;
@@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestParam; @@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestParam;
14 import org.springframework.web.bind.annotation.RestController; 15 import org.springframework.web.bind.annotation.RestController;
15 16
16 import java.util.HashMap; 17 import java.util.HashMap;
  18 +import java.util.List;
17 import java.util.Map; 19 import java.util.Map;
18 20
19 /** 21 /**
@@ -45,4 +47,9 @@ public class EmployeeController extends BController<Personnel, Integer> { @@ -45,4 +47,9 @@ public class EmployeeController extends BController<Personnel, Integer> {
45 47
46 return rtn; 48 return rtn;
47 } 49 }
  50 +
  51 + @RequestMapping(value = "/all_py", method = RequestMethod.GET)
  52 + public List<PersionPinYin> findAll_PY(){
  53 + return this.employeeService.findAll_PY();
  54 + }
48 } 55 }
src/main/java/com/bsth/controller/schedule/datasync/VehicleDataSyncController.java
  View file @7f6f961
@@ -63,14 +63,16 @@ public class VehicleDataSyncController extends BController&lt;VehicleDataSyncTask, @@ -63,14 +63,16 @@ public class VehicleDataSyncController extends BController&lt;VehicleDataSyncTask,
63 public ApiResult refreshBuffer() { 63 public ApiResult refreshBuffer() {
64 try { 64 try {
65 // 1、刷新车辆同步ETL文件 65 // 1、刷新车辆同步ETL文件
66 - // 注意：使用Kettle内部的相关类清除指定ktr的缓存  
67 - File ktrFile = new File(this.getClass().getResource(  
68 - dataToolsProperties.getVehicleDatasyncktr()).toURI());  
69 - FileObject fileObject = KettleVFS.getFileObject(ktrFile.getAbsolutePath());  
70 - FileSystem fileSystem = fileObject.getFileSystem();  
71 - FilesCache filesCache = KettleVFS.getInstance().getFileSystemManager().getFilesCache();  
72 -// System.out.println(filesCache.getFile(fileSystem, fileObject.getName()));  
73 - filesCache.removeFile(fileSystem, fileObject.getName()); 66 + etlCacheRefresh(dataToolsProperties.getVehicleDatasyncktr());
  67 + // 2、刷新人员配置导入导出ETL文件
  68 + etlCacheRefresh(dataToolsProperties.getEmployeesconfigDatainputktr());
  69 + etlCacheRefresh(dataToolsProperties.getEmployeesconfigDataoutputktr());
  70 + // 3、刷新车辆配置导入导出ETL文件
  71 + etlCacheRefresh(dataToolsProperties.getCarsconfigDatainputktr());
  72 + etlCacheRefresh(dataToolsProperties.getCarsconfigDataoutputktr());
  73 + // 4、刷新规则导入导出ETL文件
  74 + etlCacheRefresh(dataToolsProperties.getScheduleruleDatainputktr());
  75 + etlCacheRefresh(dataToolsProperties.getScheduleruleOutput());
74 76
75 return ApiResult.success( 77 return ApiResult.success(
76 "200", 78 "200",
@@ -84,6 +86,16 @@ public class VehicleDataSyncController extends BController&lt;VehicleDataSyncTask, @@ -84,6 +86,16 @@ public class VehicleDataSyncController extends BController&lt;VehicleDataSyncTask,
84 } 86 }
85 } 87 }
86 88
  89 + private void etlCacheRefresh(String ktrPath) throws Exception {
  90 + // 注意：使用Kettle内部的相关类清除指定ktr的缓存
  91 + File ktrFile = new File(this.getClass().getResource(ktrPath).toURI());
  92 + FileObject fileObject = KettleVFS.getFileObject(ktrFile.getAbsolutePath());
  93 + FileSystem fileSystem = fileObject.getFileSystem();
  94 + FilesCache filesCache = KettleVFS.getInstance().getFileSystemManager().getFilesCache();
  95 +// System.out.println(filesCache.getFile(fileSystem, fileObject.getName()));
  96 + filesCache.removeFile(fileSystem, fileObject.getName());
  97 + }
  98 +
87 /** 99 /**
88 * 手动添加同步任务。 100 * 手动添加同步任务。
89 * @param vehicleDataSyncTaskRequest 101 * @param vehicleDataSyncTaskRequest
src/main/java/com/bsth/service/schedule/EmployeeService.java
  View file @7f6f961
1 package com.bsth.service.schedule; 1 package com.bsth.service.schedule;
2 2
  3 +import com.bsth.data.pinyin.PersionPinYin;
3 import com.bsth.entity.Personnel; 4 import com.bsth.entity.Personnel;
4 import com.bsth.service.schedule.exception.ScheduleException; 5 import com.bsth.service.schedule.exception.ScheduleException;
5 6
  7 +import java.util.List;
  8 +
6 /** 9 /**
7 * Created by xu on 16/12/15. 10 * Created by xu on 16/12/15.
8 */ 11 */
9 public interface EmployeeService extends BService<Personnel, Integer> { 12 public interface EmployeeService extends BService<Personnel, Integer> {
10 public void validate_gh(Personnel personnel) throws ScheduleException; 13 public void validate_gh(Personnel personnel) throws ScheduleException;
  14 + public List<PersionPinYin> findAll_PY();
11 } 15 }
src/main/java/com/bsth/service/schedule/impl/EmployeeServiceImpl.java
  View file @7f6f961
1 package com.bsth.service.schedule.impl; 1 package com.bsth.service.schedule.impl;
2 2
  3 +import com.bsth.data.pinyin.PersionPinYin;
3 import com.bsth.entity.Personnel; 4 import com.bsth.entity.Personnel;
4 import com.bsth.service.schedule.EmployeeService; 5 import com.bsth.service.schedule.EmployeeService;
5 import com.bsth.service.schedule.exception.ScheduleException; 6 import com.bsth.service.schedule.exception.ScheduleException;
6 import com.bsth.service.schedule.utils.DataToolsFile; 7 import com.bsth.service.schedule.utils.DataToolsFile;
7 import com.bsth.service.schedule.utils.DataToolsService; 8 import com.bsth.service.schedule.utils.DataToolsService;
  9 +import com.github.stuxuhai.jpinyin.PinyinException;
  10 +import com.github.stuxuhai.jpinyin.PinyinFormat;
  11 +import com.github.stuxuhai.jpinyin.PinyinHelper;
8 import org.springframework.beans.factory.annotation.Autowired; 12 import org.springframework.beans.factory.annotation.Autowired;
9 import org.springframework.beans.factory.annotation.Qualifier; 13 import org.springframework.beans.factory.annotation.Qualifier;
10 import org.springframework.stereotype.Service; 14 import org.springframework.stereotype.Service;
@@ -12,7 +16,9 @@ import org.springframework.transaction.annotation.Transactional; @@ -12,7 +16,9 @@ import org.springframework.transaction.annotation.Transactional;
12 import org.springframework.util.CollectionUtils; 16 import org.springframework.util.CollectionUtils;
13 17
14 import java.io.File; 18 import java.io.File;
  19 +import java.util.ArrayList;
15 import java.util.HashMap; 20 import java.util.HashMap;
  21 +import java.util.List;
16 import java.util.Map; 22 import java.util.Map;
17 23
18 /** 24 /**
@@ -53,4 +59,34 @@ public class EmployeeServiceImpl extends BServiceImpl&lt;Personnel, Integer&gt; implem @@ -53,4 +59,34 @@ public class EmployeeServiceImpl extends BServiceImpl&lt;Personnel, Integer&gt; implem
53 throw new ScheduleException("相同公司工号重复"); 59 throw new ScheduleException("相同公司工号重复");
54 } 60 }
55 } 61 }
  62 +
  63 + @Override
  64 + public List<PersionPinYin> findAll_PY() {
  65 + // 1、查找未作废的人员基础信息
  66 + Map<String, Object> param = new HashMap<>();
  67 + param.put("destroy_eq", 0);
  68 + List<Personnel> personnelList = this.list(param);
  69 +
  70 + List<PersionPinYin> persionPinYinList = new ArrayList<>();
  71 + for (Personnel p : personnelList) {
  72 + PersionPinYin ppy = new PersionPinYin();
  73 + ppy.setId(p.getId());
  74 + ppy.setCompanyId(p.getCompanyCode());
  75 + ppy.setFgsCompanyId(p.getBrancheCompanyCode());
  76 + ppy.setName(p.getPersonnelName());
  77 + ppy.setWorkId(p.getJobCode());
  78 + try {
  79 + ppy.setFullChars(PinyinHelper.convertToPinyinString(ppy.getName(), "" , PinyinFormat.WITHOUT_TONE));
  80 + ppy.setCamelChars(PinyinHelper.getShortPinyin(ppy.getName()));
  81 + }catch (PinyinException pye) {
  82 + System.out.println("拼音转换出现异常，" + ppy.getName());
  83 + pye.printStackTrace();
  84 + continue;
  85 + }
  86 + persionPinYinList.add(ppy);
  87 +
  88 + }
  89 +
  90 + return persionPinYinList;
  91 + }
56 } 92 }
src/main/resources/datatools/config-test.properties
  View file @7f6f961
@@ -15,13 +15,13 @@ datatools.kvars_dbdname=control @@ -15,13 +15,13 @@ datatools.kvars_dbdname=control
15 15
16 # 3、上传数据配置信息 16 # 3、上传数据配置信息
17 # 上传文件目录配置（根据不同的环境需要修正） 17 # 上传文件目录配置（根据不同的环境需要修正）
18 -datatools.fileupload_dir=/home/bsth_control_u_d_files 18 +datatools.fileupload_dir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files
19 # ktr转换文件，中配置的错误输出目录（根据不同的环境需要修正） 19 # ktr转换文件，中配置的错误输出目录（根据不同的环境需要修正）
20 -datatools.trans_errordir=/home/bsth_control_u_d_files/erroroutput 20 +datatools.trans_errordir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files/erroroutput
21 # 临时输出文件目录 21 # 临时输出文件目录
22 -datatools.trans_tempdir=/home/bsth_control_u_d_files/temp 22 +datatools.trans_tempdir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files/temp
23 # 模版文件目录 23 # 模版文件目录
24 -datatools.trans_templatedir=/home/bsth_control_u_d_files/template 24 +datatools.trans_templatedir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files/template
25 25
26 ##---------------------------- 导入数据ktr ----------------------------## 26 ##---------------------------- 导入数据ktr ----------------------------##
27 # 车辆信息导入ktr转换 27 # 车辆信息导入ktr转换
@@ -57,7 +57,7 @@ datatools.schedulerule_datainputktr=/datatools/ktrs/scheduleRuleDataInput.ktr @@ -57,7 +57,7 @@ datatools.schedulerule_datainputktr=/datatools/ktrs/scheduleRuleDataInput.ktr
57 57
58 # 4、数据导出配置信息 58 # 4、数据导出配置信息
59 # 导出数据文件目录配置（根据不同的环境需要修正） 59 # 导出数据文件目录配置（根据不同的环境需要修正）
60 -datatools.fileoutput_dir=/home/bsth_control_u_d_files 60 +datatools.fileoutput_dir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files
61 61
62 ##---------------------------- 导出数据ktr -----------------------------## 62 ##---------------------------- 导出数据ktr -----------------------------##
63 # 车辆信息导出ktr转换 63 # 车辆信息导出ktr转换
src/main/resources/datatools/ktrs/employeesConfigDataInput.ktr
  View file @7f6f961
@@ -412,6 +412,33 @@ @@ -412,6 +412,33 @@
412 </attributes> 412 </attributes>
413 </connection> 413 </connection>
414 <connection> 414 <connection>
  415 + <name>test_control_local</name>
  416 + <server>localhost</server>
  417 + <type>MYSQL</type>
  418 + <access>Native</access>
  419 + <database>test_control</database>
  420 + <port>3306</port>
  421 + <username>root</username>
  422 + <password>Encrypted </password>
  423 + <servername/>
  424 + <data_tablespace/>
  425 + <index_tablespace/>
  426 + <attributes>
  427 + <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
  428 + <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
  429 + <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
  430 + <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
  431 + <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
  432 + <attribute><code>PORT_NUMBER</code><attribute>3306</attribute></attribute>
  433 + <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
  434 + <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
  435 + <attribute><code>STREAM_RESULTS</code><attribute>Y</attribute></attribute>
  436 + <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
  437 + <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
  438 + <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
  439 + </attributes>
  440 + </connection>
  441 + <connection>
415 <name>test_control&#xff08;&#x672c;&#x673a;&#xff09;</name> 442 <name>test_control&#xff08;&#x672c;&#x673a;&#xff09;</name>
416 <server>127.0.0.1</server> 443 <server>127.0.0.1</server>
417 <type>MYSQL</type> 444 <type>MYSQL</type>
@@ -424,6 +451,62 @@ @@ -424,6 +451,62 @@
424 <data_tablespace/> 451 <data_tablespace/>
425 <index_tablespace/> 452 <index_tablespace/>
426 <attributes> 453 <attributes>
  454 + <attribute><code>EXTRA_OPTION_MYSQL.characterEncoding</code><attribute>utf8</attribute></attribute>
  455 + <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
  456 + <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
  457 + <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
  458 + <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
  459 + <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
  460 + <attribute><code>PORT_NUMBER</code><attribute>3306</attribute></attribute>
  461 + <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
  462 + <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
  463 + <attribute><code>STREAM_RESULTS</code><attribute>Y</attribute></attribute>
  464 + <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
  465 + <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
  466 + <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
  467 + </attributes>
  468 + </connection>
  469 + <connection>
  470 + <name>wzk_mysql_jndi</name>
  471 + <server/>
  472 + <type>MYSQL</type>
  473 + <access>JNDI</access>
  474 + <database>wzk_mysql</database>
  475 + <port>1521</port>
  476 + <username/>
  477 + <password>Encrypted </password>
  478 + <servername/>
  479 + <data_tablespace/>
  480 + <index_tablespace/>
  481 + <attributes>
  482 + <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
  483 + <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
  484 + <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
  485 + <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
  486 + <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
  487 + <attribute><code>PORT_NUMBER</code><attribute>1521</attribute></attribute>
  488 + <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
  489 + <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
  490 + <attribute><code>STREAM_RESULTS</code><attribute>Y</attribute></attribute>
  491 + <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
  492 + <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
  493 + <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
  494 + </attributes>
  495 + </connection>
  496 + <connection>
  497 + <name>wzk&#xff08;&#x672c;&#x673a;&#xff09;</name>
  498 + <server>localhost</server>
  499 + <type>MYSQL</type>
  500 + <access>Native</access>
  501 + <database>pdgj_wzk_sys</database>
  502 + <port>3306</port>
  503 + <username>root</username>
  504 + <password>Encrypted </password>
  505 + <servername/>
  506 + <data_tablespace/>
  507 + <index_tablespace/>
  508 + <attributes>
  509 + <attribute><code>EXTRA_OPTION_MYSQL.characterEncoding</code><attribute>utf8</attribute></attribute>
427 <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute> 510 <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
428 <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute> 511 <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
429 <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute> 512 <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
@@ -591,7 +674,7 @@ @@ -591,7 +674,7 @@
591 </connection> 674 </connection>
592 <connection> 675 <connection>
593 <name>&#x516c;&#x53f8;ygjw</name> 676 <name>&#x516c;&#x53f8;ygjw</name>
594 - <server>192.168.168.1</server> 677 + <server>192.168.168.178</server>
595 <type>ORACLE</type> 678 <type>ORACLE</type>
596 <access>Native</access> 679 <access>Native</access>
597 <database>orcl</database> 680 <database>orcl</database>
@@ -613,16 +696,134 @@ @@ -613,16 +696,134 @@
613 <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute> 696 <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
614 </attributes> 697 </attributes>
615 </connection> 698 </connection>
  699 + <connection>
  700 + <name>&#x516c;&#x53f8;&#x673a;&#x52a1;_pdgj</name>
  701 + <server>192.168.168.178</server>
  702 + <type>ORACLE</type>
  703 + <access>Native</access>
  704 + <database>orcl</database>
  705 + <port>1521</port>
  706 + <username>pdgj</username>
  707 + <password>Encrypted 2be98afc86aa7f2e4cb79ce10ce96a8d0</password>
  708 + <servername/>
  709 + <data_tablespace/>
  710 + <index_tablespace/>
  711 + <attributes>
  712 + <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
  713 + <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
  714 + <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
  715 + <attribute><code>PORT_NUMBER</code><attribute>1521</attribute></attribute>
  716 + <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
  717 + <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
  718 + <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
  719 + <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
  720 + <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
  721 + </attributes>
  722 + </connection>
  723 + <connection>
  724 + <name>&#x5916;&#x7f51;vpn&#x4e34;&#x6e2f;&#x673a;&#x52a1;oracle</name>
  725 + <server>10.10.150.114</server>
  726 + <type>ORACLE</type>
  727 + <access>Native</access>
  728 + <database>helowin</database>
  729 + <port>1521</port>
  730 + <username>lgjw</username>
  731 + <password>Encrypted 2be98afc86aa7f2e4cb79ce10d295a5cd</password>
  732 + <servername/>
  733 + <data_tablespace/>
  734 + <index_tablespace/>
  735 + <attributes>
  736 + <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
  737 + <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
  738 + <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
  739 + <attribute><code>PORT_NUMBER</code><attribute>1521</attribute></attribute>
  740 + <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
  741 + <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
  742 + <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
  743 + <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
  744 + <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
  745 + </attributes>
  746 + </connection>
  747 + <connection>
  748 + <name>&#x5916;&#x7f51;&#x5357;&#x6c47;&#x673a;&#x52a1;oracle</name>
  749 + <server>58.247.254.118</server>
  750 + <type>ORACLE</type>
  751 + <access>Native</access>
  752 + <database>orcl</database>
  753 + <port>15211</port>
  754 + <username>nhjw</username>
  755 + <password>Encrypted 2be98afc86aa7f2e4cb79ce10d09aa5cd</password>
  756 + <servername/>
  757 + <data_tablespace/>
  758 + <index_tablespace/>
  759 + <attributes>
  760 + <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
  761 + <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
  762 + <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
  763 + <attribute><code>PORT_NUMBER</code><attribute>15211</attribute></attribute>
  764 + <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
  765 + <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
  766 + <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
  767 + <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
  768 + <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
  769 + </attributes>
  770 + </connection>
  771 + <connection>
  772 + <name>&#x5916;&#x7f51;&#x6768;&#x9ad8;&#x673a;&#x52a1;oracle</name>
  773 + <server>58.247.254.118</server>
  774 + <type>ORACLE</type>
  775 + <access>Native</access>
  776 + <database>orcl</database>
  777 + <port>15211</port>
  778 + <username>ygjw</username>
  779 + <password>Encrypted 2be98afc86aa7f2e4cb79ce10c795a5cd</password>
  780 + <servername/>
  781 + <data_tablespace/>
  782 + <index_tablespace/>
  783 + <attributes>
  784 + <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
  785 + <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
  786 + <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
  787 + <attribute><code>PORT_NUMBER</code><attribute>15211</attribute></attribute>
  788 + <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
  789 + <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
  790 + <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
  791 + <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
  792 + <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
  793 + </attributes>
  794 + </connection>
  795 + <connection>
  796 + <name>&#x5916;&#x7f51;&#x91d1;&#x9ad8;&#x673a;&#x52a1;oracle</name>
  797 + <server>58.247.254.118</server>
  798 + <type>ORACLE</type>
  799 + <access>Native</access>
  800 + <database>orcl</database>
  801 + <port>15211</port>
  802 + <username>jwgl</username>
  803 + <password>Encrypted 2be98afc86aa7f2e4cb79ce10d485a8d6</password>
  804 + <servername/>
  805 + <data_tablespace/>
  806 + <index_tablespace/>
  807 + <attributes>
  808 + <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
  809 + <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
  810 + <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
  811 + <attribute><code>PORT_NUMBER</code><attribute>15211</attribute></attribute>
  812 + <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
  813 + <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
  814 + <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
  815 + <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
  816 + <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
  817 + </attributes>
  818 + </connection>
616 <order> 819 <order>
617 <hop> <from>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_s_ecinfo</from><to>&#x9519;&#x8bef;&#x8f93;&#x51fa;</to><enabled>Y</enabled> </hop> 820 <hop> <from>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_s_ecinfo</from><to>&#x9519;&#x8bef;&#x8f93;&#x51fa;</to><enabled>Y</enabled> </hop>
618 <hop> <from>&#x83b7;&#x53d6;&#x53d8;&#x91cf;</from><to>&#x539f;&#x59cb;&#x7cfb;&#x7edf;&#x5bfc;&#x51fa;&#x7684;Excel&#x8f93;&#x5165;</to><enabled>Y</enabled> </hop> 821 <hop> <from>&#x83b7;&#x53d6;&#x53d8;&#x91cf;</from><to>&#x539f;&#x59cb;&#x7cfb;&#x7edf;&#x5bfc;&#x51fa;&#x7684;Excel&#x8f93;&#x5165;</to><enabled>Y</enabled> </hop>
619 <hop> <from>&#x539f;&#x59cb;&#x7cfb;&#x7edf;&#x5bfc;&#x51fa;&#x7684;Excel&#x8f93;&#x5165;</from><to>&#x542f;&#x7528;&#x88ab;&#x6570;&#x636e;flag</to><enabled>Y</enabled> </hop> 822 <hop> <from>&#x539f;&#x59cb;&#x7cfb;&#x7edf;&#x5bfc;&#x51fa;&#x7684;Excel&#x8f93;&#x5165;</from><to>&#x542f;&#x7528;&#x88ab;&#x6570;&#x636e;flag</to><enabled>Y</enabled> </hop>
620 <hop> <from>&#x542f;&#x7528;&#x88ab;&#x6570;&#x636e;flag</from><to>&#x7ebf;&#x8def;id&#x67e5;&#x8be2;</to><enabled>Y</enabled> </hop> 823 <hop> <from>&#x542f;&#x7528;&#x88ab;&#x6570;&#x636e;flag</from><to>&#x7ebf;&#x8def;id&#x67e5;&#x8be2;</to><enabled>Y</enabled> </hop>
621 - <hop> <from>&#x7ebf;&#x8def;id&#x67e5;&#x8be2;</from><to>&#x8fc7;&#x6ee4;&#x7ebf;&#x8def;id&#x4e3a;&#x7a7a;&#x8bb0;&#x5f55;</to><enabled>Y</enabled> </hop>  
622 - <hop> <from>&#x9a7e;&#x9a76;&#x5458;id&#x67e5;&#x627e;</from><to>&#x8fc7;&#x6ee4;&#x9a7e;&#x9a76;&#x5458;id&#x4e3a;&#x7a7a;&#x8bb0;&#x5f55;</to><enabled>Y</enabled> </hop>  
623 - <hop> <from>&#x8fc7;&#x6ee4;&#x9a7e;&#x9a76;&#x5458;id&#x4e3a;&#x7a7a;&#x8bb0;&#x5f55;</from><to>&#x552e;&#x7968;&#x5458;id&#x67e5;&#x627e;</to><enabled>Y</enabled> </hop> 824 + <hop> <from>&#x7ebf;&#x8def;id&#x67e5;&#x8be2;</from><to>&#x9a7e;&#x9a76;&#x5458;id&#x67e5;&#x627e;</to><enabled>Y</enabled> </hop>
  825 + <hop> <from>&#x9a7e;&#x9a76;&#x5458;id&#x67e5;&#x627e;</from><to>&#x552e;&#x7968;&#x5458;id&#x67e5;&#x627e;</to><enabled>Y</enabled> </hop>
624 <hop> <from>&#x552e;&#x7968;&#x5458;id&#x67e5;&#x627e;</from><to>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_s_ecinfo</to><enabled>Y</enabled> </hop> 826 <hop> <from>&#x552e;&#x7968;&#x5458;id&#x67e5;&#x627e;</from><to>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_s_ecinfo</to><enabled>Y</enabled> </hop>
625 - <hop> <from>&#x8fc7;&#x6ee4;&#x7ebf;&#x8def;id&#x4e3a;&#x7a7a;&#x8bb0;&#x5f55;</from><to>&#x9a7e;&#x9a76;&#x5458;id&#x67e5;&#x627e;</to><enabled>Y</enabled> </hop>  
626 </order> 827 </order>
627 <step> 828 <step>
628 <name>&#x539f;&#x59cb;&#x7cfb;&#x7edf;&#x5bfc;&#x51fa;&#x7684;Excel&#x8f93;&#x5165;</name> 829 <name>&#x539f;&#x59cb;&#x7cfb;&#x7edf;&#x5bfc;&#x51fa;&#x7684;Excel&#x8f93;&#x5165;</name>
@@ -810,11 +1011,15 @@ @@ -810,11 +1011,15 @@
810 </partitioning> 1011 </partitioning>
811 <connection>control_jndi</connection> 1012 <connection>control_jndi</connection>
812 <rowlimit>1</rowlimit> 1013 <rowlimit>1</rowlimit>
813 - <sql>select id as sid from bsth_c_personnel&#xa;where job_codeori &#x3d; &#x3f; and personnel_name &#x3d; &#x3f;</sql> 1014 + <sql>select id as sid from bsth_c_personnel&#xa;where job_code &#x3d; concat&#x28;&#x3f;, &#x27;-&#x27;, &#x3f;&#x29; and personnel_name &#x3d; &#x3f; and destroy &#x3d; 0</sql>
814 <outer_join>Y</outer_join> 1015 <outer_join>Y</outer_join>
815 <replace_vars>N</replace_vars> 1016 <replace_vars>N</replace_vars>
816 <parameter> 1017 <parameter>
817 <field> 1018 <field>
  1019 + <name>company_code</name>
  1020 + <type>String</type>
  1021 + </field>
  1022 + <field>
818 <name>&#x552e;&#x7968;&#x5458;&#x5de5;&#x53f7;</name> 1023 <name>&#x552e;&#x7968;&#x5458;&#x5de5;&#x53f7;</name>
819 <type>String</type> 1024 <type>String</type>
820 </field> 1025 </field>
@@ -825,8 +1030,8 @@ @@ -825,8 +1030,8 @@
825 </parameter> 1030 </parameter>
826 <cluster_schema/> 1031 <cluster_schema/>
827 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> 1032 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
828 - <xloc>830</xloc>  
829 - <yloc>45</yloc> 1033 + <xloc>595</xloc>
  1034 + <yloc>55</yloc>
830 <draw>Y</draw> 1035 <draw>Y</draw>
831 </GUI> 1036 </GUI>
832 </step> 1037 </step>
@@ -894,8 +1099,8 @@ @@ -894,8 +1099,8 @@
894 </lookup> 1099 </lookup>
895 <cluster_schema/> 1100 <cluster_schema/>
896 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> 1101 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
897 - <xloc>833</xloc>  
898 - <yloc>198</yloc> 1102 + <xloc>597</xloc>
  1103 + <yloc>162</yloc>
899 <draw>Y</draw> 1104 <draw>Y</draw>
900 </GUI> 1105 </GUI>
901 </step> 1106 </step>
@@ -939,11 +1144,17 @@ @@ -939,11 +1144,17 @@
939 <default/> 1144 <default/>
940 <type>Integer</type> 1145 <type>Integer</type>
941 </value> 1146 </value>
  1147 + <value>
  1148 + <name>company</name>
  1149 + <rename>company_code</rename>
  1150 + <default/>
  1151 + <type>String</type>
  1152 + </value>
942 </lookup> 1153 </lookup>
943 <cluster_schema/> 1154 <cluster_schema/>
944 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> 1155 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
945 - <xloc>397</xloc>  
946 - <yloc>144</yloc> 1156 + <xloc>373</xloc>
  1157 + <yloc>53</yloc>
947 <draw>Y</draw> 1158 <draw>Y</draw>
948 </GUI> 1159 </GUI>
949 </step> 1160 </step>
@@ -994,64 +1205,6 @@ @@ -994,64 +1205,6 @@
994 </step> 1205 </step>
995 1206
996 <step> 1207 <step>
997 - <name>&#x8fc7;&#x6ee4;&#x7ebf;&#x8def;id&#x4e3a;&#x7a7a;&#x8bb0;&#x5f55;</name>  
998 - <type>FilterRows</type>  
999 - <description/>  
1000 - <distribute>Y</distribute>  
1001 - <custom_distribution/>  
1002 - <copies>1</copies>  
1003 - <partitioning>  
1004 - <method>none</method>  
1005 - <schema_name/>  
1006 - </partitioning>  
1007 -<send_true_to/>  
1008 -<send_false_to/>  
1009 - <compare>  
1010 -<condition>  
1011 - <negated>N</negated>  
1012 - <leftvalue>xlid</leftvalue>  
1013 - <function>IS NOT NULL</function>  
1014 - <rightvalue/>  
1015 - </condition>  
1016 - </compare>  
1017 - <cluster_schema/>  
1018 - <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>  
1019 - <xloc>395</xloc>  
1020 - <yloc>49</yloc>  
1021 - <draw>Y</draw>  
1022 - </GUI>  
1023 - </step>  
1024 -  
1025 - <step>  
1026 - <name>&#x8fc7;&#x6ee4;&#x9a7e;&#x9a76;&#x5458;id&#x4e3a;&#x7a7a;&#x8bb0;&#x5f55;</name>  
1027 - <type>FilterRows</type>  
1028 - <description/>  
1029 - <distribute>Y</distribute>  
1030 - <custom_distribution/>  
1031 - <copies>1</copies>  
1032 - <partitioning>  
1033 - <method>none</method>  
1034 - <schema_name/>  
1035 - </partitioning>  
1036 -<send_true_to>&#x552e;&#x7968;&#x5458;id&#x67e5;&#x627e;</send_true_to>  
1037 -<send_false_to/>  
1038 - <compare>  
1039 -<condition>  
1040 - <negated>N</negated>  
1041 - <leftvalue>jid</leftvalue>  
1042 - <function>IS NOT NULL</function>  
1043 - <rightvalue/>  
1044 - </condition>  
1045 - </compare>  
1046 - <cluster_schema/>  
1047 - <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>  
1048 - <xloc>604</xloc>  
1049 - <yloc>46</yloc>  
1050 - <draw>Y</draw>  
1051 - </GUI>  
1052 - </step>  
1053 -  
1054 - <step>  
1055 <name>&#x9519;&#x8bef;&#x8f93;&#x51fa;</name> 1208 <name>&#x9519;&#x8bef;&#x8f93;&#x51fa;</name>
1056 <type>ExcelOutput</type> 1209 <type>ExcelOutput</type>
1057 <description/> 1210 <description/>
@@ -1182,8 +1335,8 @@ @@ -1182,8 +1335,8 @@
1182 </custom> 1335 </custom>
1183 <cluster_schema/> 1336 <cluster_schema/>
1184 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> 1337 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
1185 - <xloc>833</xloc>  
1186 - <yloc>321</yloc> 1338 + <xloc>597</xloc>
  1339 + <yloc>285</yloc>
1187 <draw>Y</draw> 1340 <draw>Y</draw>
1188 </GUI> 1341 </GUI>
1189 </step> 1342 </step>
@@ -1201,11 +1354,15 @@ @@ -1201,11 +1354,15 @@
1201 </partitioning> 1354 </partitioning>
1202 <connection>control_jndi</connection> 1355 <connection>control_jndi</connection>
1203 <rowlimit>1</rowlimit> 1356 <rowlimit>1</rowlimit>
1204 - <sql>select id as jid from bsth_c_personnel&#xa;where job_codeori &#x3d; &#x3f; and personnel_name &#x3d; &#x3f;</sql> 1357 + <sql>select id as jid from bsth_c_personnel&#xa;where job_code &#x3d; concat&#x28;&#x3f;, &#x27;-&#x27;, &#x3f;&#x29; and personnel_name &#x3d; &#x3f; and destroy &#x3d; 0</sql>
1205 <outer_join>Y</outer_join> 1358 <outer_join>Y</outer_join>
1206 <replace_vars>N</replace_vars> 1359 <replace_vars>N</replace_vars>
1207 <parameter> 1360 <parameter>
1208 <field> 1361 <field>
  1362 + <name>company_code</name>
  1363 + <type>String</type>
  1364 + </field>
  1365 + <field>
1209 <name>&#x9a7e;&#x9a76;&#x5458;&#x5de5;&#x53f7;</name> 1366 <name>&#x9a7e;&#x9a76;&#x5458;&#x5de5;&#x53f7;</name>
1210 <type>String</type> 1367 <type>String</type>
1211 </field> 1368 </field>
@@ -1216,8 +1373,8 @@ @@ -1216,8 +1373,8 @@
1216 </parameter> 1373 </parameter>
1217 <cluster_schema/> 1374 <cluster_schema/>
1218 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> 1375 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
1219 - <xloc>603</xloc>  
1220 - <yloc>142</yloc> 1376 + <xloc>488</xloc>
  1377 + <yloc>54</yloc>
1221 <draw>Y</draw> 1378 <draw>Y</draw>
1222 </GUI> 1379 </GUI>
1223 </step> 1380 </step>
src/main/resources/static/pages/scheduleApp/module/common/dts2/employeeGroup/saEmployeegroup.js
  View file @7f6f961
@@ -646,7 +646,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saEmployeegroup&#39;, [ @@ -646,7 +646,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saEmployeegroup&#39;, [
646 console.log("xlidvalue=" + value); 646 console.log("xlidvalue=" + value);
647 647
648 employeeConfigService_g.rest.list( 648 employeeConfigService_g.rest.list(
649 - {"xl.id_eq": value, "isCancel_eq" : false, size: 200}, 649 + {"xl.id_eq": value, "isCancel_eq" : false, "ryDestroyStatus_eq" : 0, size: 200},
650 function(result) { 650 function(result) {
651 // 获取值了 651 // 获取值了
652 console.log("人员配置获取了"); 652 console.log("人员配置获取了");
src/main/resources/static/pages/scheduleApp/module/common/main.js
  View file @7f6f961
@@ -116,26 +116,22 @@ ScheduleApp.factory(&#39;DataStore&#39;, [ @@ -116,26 +116,22 @@ ScheduleApp.factory(&#39;DataStore&#39;, [
116 var deferred = $q.defer(); 116 var deferred = $q.defer();
117 117
118 $http({ 118 $http({
119 - method: 'POST',  
120 - url: '/basic/refresh_person_data'  
121 - }).then(function() {  
122 - $http({  
123 - method: 'GET',  
124 - url: '/personnel/all_py'  
125 - }).then(function(result) {  
126 - // 简拼数据  
127 - var dd = result.data;  
128 - angular.forEach(result.data, function(obj) {  
129 - // 全拼  
130 - obj["$fullChars"] = obj.fullChars;  
131 - // 简拼  
132 - obj["$camelChars"] = obj.camelChars;  
133 - // 原值  
134 - obj["$calcu_str"] = obj.name + "-" + obj.workId;  
135 - });  
136 - deferred.resolve(dd); 119 + method: 'GET',
  120 + url: '/ee/all_py'
  121 + }).then(function(result) {
  122 + // 简拼数据
  123 + var dd = result.data;
  124 + angular.forEach(result.data, function(obj) {
  125 + // 全拼
  126 + obj["$fullChars"] = obj.fullChars;
  127 + // 简拼
  128 + obj["$camelChars"] = obj.camelChars;
  129 + // 原值
  130 + obj["$calcu_str"] = obj.name + "-" + obj.workId;
137 }); 131 });
  132 + deferred.resolve(dd);
138 }); 133 });
  134 +
139 return deferred.promise; 135 return deferred.promise;
140 }; 136 };
141 137
src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.js
  View file @7f6f961
@@ -3669,7 +3669,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saEmployeegroup&#39;, [ @@ -3669,7 +3669,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saEmployeegroup&#39;, [
3669 console.log("xlidvalue=" + value); 3669 console.log("xlidvalue=" + value);
3670 3670
3671 employeeConfigService_g.rest.list( 3671 employeeConfigService_g.rest.list(
3672 - {"xl.id_eq": value, "isCancel_eq" : false, size: 200}, 3672 + {"xl.id_eq": value, "isCancel_eq" : false, "ryDestroyStatus_eq" : 0, size: 200},
3673 function(result) { 3673 function(result) {
3674 // 获取值了 3674 // 获取值了
3675 console.log("人员配置获取了"); 3675 console.log("人员配置获取了");