update...

潘钊
1 parent 1be31d53
Showing 3 changed files with 44 additions and 17 deletions
src/main/java/com/bsth/server_rs/base_info/person/Personnel.java
src/main/java/com/bsth/server_rs/base_info/person/buffer/PersonBufferData.java
src/main/java/com/bsth/server_rs/base_info/person/buffer/PersonRefreshThread.java
@@ -70,17 +70,27 @@ public class Personnel implements Serializable {
     /**
      * RFID 人卡IC号
      */
-    private String icRFID;
+    private String icRfid;
     /**
      * RFID 人卡ID号
      */
-    private String idRFID;
+    private String idRfid;
     /**
      * RFID 标签号
      */
-    private String tagRFID;
+    private String tagRfid;
+
+    /**
+     * 线路名称
+     */
+    private String lineName;
+
+    /**
+     * 线路编码
+     */
+    private String lineCode;
     public String getCompanyCode() {
         return companyCode;
@@ -154,27 +164,43 @@ public class Personnel implements Serializable {
         this.telphone = telphone;
     }
-    public String getIcRFID() {
-        return icRFID;
+    public String getIcRfid() {
+        return icRfid;
+    }
+
+    public void setIcRfid(String icRfid) {
+        this.icRfid = icRfid;
+    }
+
+    public String getIdRfid() {
+        return idRfid;
+    }
+
+    public void setIdRfid(String idRfid) {
+        this.idRfid = idRfid;
+    }
+
+    public String getTagRfid() {
+        return tagRfid;
     }
-    public void setIcRFID(String icRFID) {
-        this.icRFID = icRFID;
+    public void setTagRfid(String tagRfid) {
+        this.tagRfid = tagRfid;
     }
-    public String getIdRFID() {
-        return idRFID;
+    public String getLineName() {
+        return lineName;
     }
-    public void setIdRFID(String idRFID) {
-        this.idRFID = idRFID;
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
     }
-    public String getTagRFID() {
-        return tagRFID;
+    public String getLineCode() {
+        return lineCode;
     }
-    public void setTagRFID(String tagRFID) {
-        this.tagRFID = tagRFID;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
 }
@@ -55,6 +55,6 @@ public class PersonBufferData implements CommandLineRunner {
     @Override
     public void run(String... strings) throws Exception {
-        Application.mainServices.scheduleWithFixedDelay(personRefreshThread, 10, 60 * 60, TimeUnit.SECONDS);
+        Application.mainServices.scheduleWithFixedDelay(personRefreshThread, 10, 60 * 30, TimeUnit.SECONDS);
     }
 }
@@ -25,7 +25,8 @@ public class PersonRefreshThread extends Thread{
     public void run() {
         try {
-            List<Personnel> list = jdbcTemplate.query("select * from bsth_c_personnel",BeanPropertyRowMapper.newInstance(Personnel.class));
+            List<Personnel> list = jdbcTemplate.query("select 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));
             if(list != null && list.size() > 0)
                 PersonBufferData.replaceAll(list);
         }catch (Exception e){