工时利用率 卡调整

card_base.h

@@ -96,6 +96,11 @@ struct card_location_base:card,std::enable_shared_from_this<card_location_base>
         return -1;
     }
 
+    virtual int get_workline()
+    {
+        return -1;
+    }
+
     void on_message(zloop<task*> * loop,const message_locinfo&loc,bool is_history);
     void on_location(const std::vector<point>&vp,const std::vector<loc_message> &lm );
     void do_status(int st);

card_person.h

@@ -6,32 +6,36 @@
 
 struct person:card_location_base, card_area
 {
-	std::weak_ptr<monkey_person> m_monkeyPerson;
-	int m_workLine=0;
-	time_t m_iris_recognition_timeval = 0;
-	std::string m_stafferName,m_deptName;
-	person(const std::string &type,uint32_t cardid,uint16_t needdisplay,int16_t t,int32_t deptid,int32_t level_id,uint32_t cid,int wl,const std::string &sname,const std::string &dname);
-	~person();
+    std::weak_ptr<monkey_person> m_monkeyPerson;
+    int m_workLine=0;
+    time_t m_iris_recognition_timeval = 0;
+    std::string m_stafferName,m_deptName;
+    person(const std::string &type,uint32_t cardid,uint16_t needdisplay,int16_t t,int32_t deptid,int32_t level_id,uint32_t cid,int wl,const std::string &sname,const std::string &dname);
+    ~person();
 
 
     void clear();
-	void reset(std::shared_ptr<monkey_person> mp);
-	void handle_three_rates(const point & pt);
-	void on_timer();
-	void IKSDK_DB(int);
-	point getSmoothPoint(uint64_t& t);
+    void reset(std::shared_ptr<monkey_person> mp);
+    void handle_three_rates(const point & pt);
+    void on_timer();
+    void IKSDK_DB(int);
+    point getSmoothPoint(uint64_t& t);
 
-	virtual void site_hover(int sid);
+    virtual void site_hover(int sid);
     virtual std::shared_ptr<area_hover> get_area_hover();
     virtual std::shared_ptr<mine_tool> get_mine_tool();
     virtual std::shared_ptr<site_area_hover> get_site_area();
-	virtual void do_business(const std::shared_ptr<site>&site,const point &pt,double acc);
+    virtual void do_business(const std::shared_ptr<site>&site,const point &pt,double acc);
     virtual std::tuple<time_t,time_t,int,int,int,int,double,double> getLandmark();
-	virtual int get_area();
+    virtual int get_area();
     virtual std::shared_ptr<area_tool> get_area_tool()
     {
         return m_area_tool;
     }
+    virtual int get_workline()
+    {
+        return m_workLine;
+    }
 };
 
 #endif

module_service/area_business_work_rate.cpp

@@ -29,8 +29,8 @@ void area_business_work_rate::on_enter(const std::shared_ptr<area_hover>&area_ho
     auto card = std::make_shared<card_pos>();
     card->id = card_ptr->m_id;
     card->type = card_ptr->m_type;
-    //card->work_line =
-    //card->identifier_id
+    card->work_line = card_ptr->get_workline();
+    card->identifier_id = card_ptr->m_cid;
 
     auto area = std::make_shared<area_data>();
     area->area_id = area_hover_ptr->id();