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

王通
1 parent 25f4b517
Showing 2 changed files with 60 additions and 47 deletions
src/main/java/com/bsth/server_rs/base_info/person/Personnel.java
src/main/java/com/bsth/server_rs/base_info/person/buffer/PersonRefreshThread.java
@@ -53,7 +53,6 @@ public class Personnel implements Serializable {
     /**
      * 身份证
      */
-    @JsonIgnore
     private String card;
     public String getCard() {
@@ -100,6 +99,11 @@ public class Personnel implements Serializable {
      */
     private String lineCode;
+    /**
+     * 金蝶工号
+     */
+    private String jdCodeori;
+
     public String getCompanyCode() {
         return companyCode;
     }
@@ -219,4 +223,12 @@ public class Personnel implements Serializable {
     public void setRemark(String remark) {
         this.remark = remark;
     }
+
+    public String getJdCodeori() {
+        return jdCodeori;
+    }
+
+    public void setJdCodeori(String jdCodeori) {
+        this.jdCodeori = jdCodeori;
+    }
 }
-package com.bsth.server_rs.base_info.person.buffer;
-
-import com.bsth.server_rs.base_info.person.Personnel;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.BeanPropertyRowMapper;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by panzhao on 2017/3/27.
- */
-@Component
-public class PersonRefreshThread extends Thread{
-
-    @Autowired
-    JdbcTemplate jdbcTemplate;
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Override
-    public void run() {
-
-        try {
-            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 "
-                    ,BeanPropertyRowMapper.newInstance(Personnel.class));
-
-            Map<String, Personnel> map = new HashMap<>();
-            //过滤数据，多条线路配人的保留一条
-            for(Personnel p : list){
-                map.put(p.getJobCode(), p);
-            }
-
-            if(list != null && list.size() > 0)
-                PersonBufferData.replaceAll(new ArrayList(map.values()));
-        }catch (Exception e){
-            logger.error("", e);
-        }
-    }
-}
+package com.bsth.server_rs.base_info.person.buffer;
+
+import com.bsth.server_rs.base_info.person.Personnel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2017/3/27.
+ */
+@Component
+public class PersonRefreshThread extends Thread{
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public void run() {
+
+        try {
+            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 "
+                    ,BeanPropertyRowMapper.newInstance(Personnel.class));
+
+            Map<String, Personnel> map = new HashMap<>();
+            //过滤数据，多条线路配人的保留一条
+            for(Personnel p : list){
+                p.setCard("");
+                map.put(p.getJobCode(), p);
+            }
+
+            if(list != null && list.size() > 0)
+                PersonBufferData.replaceAll(new ArrayList(map.values()));
+        }catch (Exception e){
+            logger.error("", e);
+        }
+    }
+}