潘钊 / control_service_data_Interface · Commits

Commit 2565ec3db48de4a92738adab184279c40953da0b

Authored by 王通
1 parent 25f4b517
build: skipped

1.人员信息接口去除身份证号，加入金蝶工号

Inline Side-by-side
Showing 2 changed files with 60 additions and 47 deletions
src/main/java/com/bsth/server_rs/base_info/person/Personnel.java
  View file @2565ec3
... ... @@ -53,7 +53,6 @@ public class Personnel implements Serializable {
53 53 /**
54 54 * 身份证
55 55 */
56   - @JsonIgnore
57 56 private String card;
58 57  
59 58 public String getCard() {
... ... @@ -100,6 +99,11 @@ public class Personnel implements Serializable {
100 99 */
101 100 private String lineCode;
102 101  
  102 + /**
  103 + * 金蝶工号
  104 + */
  105 + private String jdCodeori;
  106 +
103 107 public String getCompanyCode() {
104 108 return companyCode;
105 109 }
... ... @@ -219,4 +223,12 @@ public class Personnel implements Serializable {
219 223 public void setRemark(String remark) {
220 224 this.remark = remark;
221 225 }
  226 +
  227 + public String getJdCodeori() {
  228 + return jdCodeori;
  229 + }
  230 +
  231 + public void setJdCodeori(String jdCodeori) {
  232 + this.jdCodeori = jdCodeori;
  233 + }
222 234 }
... ...
src/main/java/com/bsth/server_rs/base_info/person/buffer/PersonRefreshThread.java
  View file @2565ec3
1   -package com.bsth.server_rs.base_info.person.buffer;
2   -
3   -import com.bsth.server_rs.base_info.person.Personnel;
4   -import org.slf4j.Logger;
5   -import org.slf4j.LoggerFactory;
6   -import org.springframework.beans.factory.annotation.Autowired;
7   -import org.springframework.jdbc.core.BeanPropertyRowMapper;
8   -import org.springframework.jdbc.core.JdbcTemplate;
9   -import org.springframework.stereotype.Component;
10   -
11   -import java.util.ArrayList;
12   -import java.util.HashMap;
13   -import java.util.List;
14   -import java.util.Map;
15   -
16   -/**
17   - * Created by panzhao on 2017/3/27.
18   - */
19   -@Component
20   -public class PersonRefreshThread extends Thread{
21   -
22   - @Autowired
23   - JdbcTemplate jdbcTemplate;
24   -
25   - Logger logger = LoggerFactory.getLogger(this.getClass());
26   -
27   - @Override
28   - public void run() {
29   -
30   - try {
31   - List<Personnel> list = jdbcTemplate.query("select DISTINCT t1.*,t2.name as line_name,t2.line_code from (SELECT company_code,branche_company_code,job_code,personnel_name,papers_code,ic_card_code,personnel_type,posts,card,telphone,ic_rfid,id_rfid,tag_rfid,e.xl FROM bsth_c_personnel p left JOIN bsth_c_s_ecinfo e on p.id=e.jsy) t1 LEFT JOIN bsth_c_line t2 on t1.xl=t2.id "
32   - ,BeanPropertyRowMapper.newInstance(Personnel.class));
33   -
34   - Map<String, Personnel> map = new HashMap<>();
35   - //过滤数据，多条线路配人的保留一条
36   - for(Personnel p : list){
37   - map.put(p.getJobCode(), p);
38   - }
39   -
40   - if(list != null && list.size() > 0)
41   - PersonBufferData.replaceAll(new ArrayList(map.values()));
42   - }catch (Exception e){
43   - logger.error("", e);
44   - }
45   - }
46   -}
  1 +package com.bsth.server_rs.base_info.person.buffer;
  2 +
  3 +import com.bsth.server_rs.base_info.person.Personnel;
  4 +import org.slf4j.Logger;
  5 +import org.slf4j.LoggerFactory;
  6 +import org.springframework.beans.factory.annotation.Autowired;
  7 +import org.springframework.jdbc.core.BeanPropertyRowMapper;
  8 +import org.springframework.jdbc.core.JdbcTemplate;
  9 +import org.springframework.stereotype.Component;
  10 +
  11 +import java.util.ArrayList;
  12 +import java.util.HashMap;
  13 +import java.util.List;
  14 +import java.util.Map;
  15 +
  16 +/**
  17 + * Created by panzhao on 2017/3/27.
  18 + */
  19 +@Component
  20 +public class PersonRefreshThread extends Thread{
  21 +
  22 + @Autowired
  23 + JdbcTemplate jdbcTemplate;
  24 +
  25 + Logger logger = LoggerFactory.getLogger(this.getClass());
  26 +
  27 + @Override
  28 + public void run() {
  29 +
  30 + try {
  31 + List<Personnel> list = jdbcTemplate.query("select DISTINCT t1.*,t2.name as line_name,t2.line_code from (SELECT company_code,branche_company_code,job_code,personnel_name,papers_code,ic_card_code,personnel_type,posts,card,telphone,ic_rfid,id_rfid,tag_rfid,jd_codeori,e.xl FROM bsth_c_personnel p left JOIN bsth_c_s_ecinfo e on p.id=e.jsy) t1 LEFT JOIN bsth_c_line t2 on t1.xl=t2.id "
  32 + ,BeanPropertyRowMapper.newInstance(Personnel.class));
  33 +
  34 + Map<String, Personnel> map = new HashMap<>();
  35 + //过滤数据，多条线路配人的保留一条
  36 + for(Personnel p : list){
  37 + p.setCard("");
  38 + map.put(p.getJobCode(), p);
  39 + }
  40 +
  41 + if(list != null && list.size() > 0)
  42 + PersonBufferData.replaceAll(new ArrayList(map.values()));
  43 + }catch (Exception e){
  44 + logger.error("", e);
  45 + }
  46 + }
  47 +}
... ...