update...

panzhaov5
1 parent 932f1bde
Showing 6 changed files with 270 additions and 2 deletions
src/main/java/com/bsth/CXFConfig.java
src/main/java/com/bsth/server_rs/base_info/station/buffer/StationRefreshThread.java
src/main/java/com/bsth/server_rs/base_info/station/entity/StationRotue.java
src/main/java/com/bsth/server_rs/schedule/plan/SchedulePlanService.java
src/main/java/com/bsth/server_rs/schedule/real/StaffViewRealService.java
src/main/java/com/bsth/server_ws/util/WSDataConver.java
@@ -14,6 +14,7 @@ import com.bsth.server_rs.gps.GpsRestService;
 import com.bsth.server_rs.logs.RealLogRestService;
 import com.bsth.server_rs.schedule.plan.SchedulePlanService;
 import com.bsth.server_rs.schedule.real.ScheduleRealService;
+import com.bsth.server_rs.schedule.real.StaffViewRealService;
 import com.bsth.server_ws.attendance.AttendanceServiceSoap;
 import com.bsth.server_ws.electric_oil.OilServiceSoap;
 import com.bsth.server_ws.park_station.CompanyServiceSoap;
@@ -104,6 +105,8 @@ public class CXFConfig {
     LD_RoadSpeedRestService ld_roadSpeedRestService;
     @Autowired
     ElectricService electricService;
+    @Autowired
+    StaffViewRealService staffViewRealService;
     @Bean
     public Server rsServer() {
@@ -122,7 +125,8 @@ public class CXFConfig {
                 realLogRestService,
                 directiveRestService,
                 ld_roadSpeedRestService,
-                electricService));
+                electricService,
+                staffViewRealService));
         endpoint.setProviders(Arrays.asList(new JacksonJsonProvider(), new AesExceptionMapper()));
         //endpoint.setFeatures(Arrays.asList(new Swagger2Feature()));
         endpoint.getInInterceptors().add(new AuthorizeInterceptor_IN());
@@ -35,7 +35,7 @@ public class StationRefreshThread extends Thread{
             StationBufferData.replaceAll(stationList);
             //站点路由信息
-            List<StationRotue> routeList = jdbcTemplate.query("select id, line, station_route_code, line_code,station_code,station_mark,distances, to_time,directions from bsth_c_stationroute where destroy=0",
+            List<StationRotue> routeList = jdbcTemplate.query("select id, line, station_route_code, line_code,station_code,station_mark,distances, to_time,directions,station_name from bsth_c_stationroute where destroy=0",
                     BeanPropertyRowMapper.newInstance(StationRotue.class));
             for(StationRotue sr : routeList){
@@ -13,6 +13,8 @@ public class StationRotue {
     private String stationCode;
+    private String stationName;
+
     private Station station;
     /**
@@ -129,4 +131,12 @@ public class StationRotue {
     public void setStationCode(String stationCode) {
         this.stationCode = stationCode;
     }
+
+    public String getStationName() {
+        return stationName;
+    }
+
+    public void setStationName(String stationName) {
+        this.stationName = stationName;
+    }
 }
@@ -22,6 +22,7 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 /**
  * Created by panzhao on 2017/8/24.
@@ -65,4 +66,11 @@ public class SchedulePlanService {
         List<AttendancePlanDay> list = jdbcTemplate.query("SELECT j_gh,j_name,s_gh,s_name,DATE_FORMAT(schedule_date,'%Y-%m-%d') as schedule_date FROM bsth_c_s_sp_info WHERE gs_bm='"+company+"' and schedule_date LIKE '"+month+"-%' GROUP BY j_gh,j_name,s_gh,s_name,DATE_FORMAT(schedule_date,'%Y-%m-%d')", BeanPropertyRowMapper.newInstance(AttendancePlanDay.class));
         return AttendancePlanMonth.getMultiInstance(month, list);
     }
+
+    @GET
+    @Path("/plan_inout/{rq}/{lineCode}")
+    public List<Map<String, Object>> findInOutPlan(@PathParam("rq") String rq,@PathParam("lineCode") String lineCode){
+        List<Map<String, Object>> rs = jdbcTemplate.queryForList("select schedule_date,xl_bm,xl_name,lp_name,cl_zbh,fcsj,j_gh,j_name,s_gh,s_name,bc_type,(select user_name from bsth_c_sys_user where id=create_by) as c_user,(select user_name from bsth_c_sys_user where id=update_by) as u_user,create_date,update_date,fcno from bsth_c_s_sp_info where schedule_date=? and xl_bm=? and bc_type in ('in', 'out')",rq,lineCode);
+        return rs;
+    }
 }
+package com.bsth.server_rs.schedule.real;
+
+import com.bsth.common.BasicData;
+import com.bsth.entity.OilInfo;
+import com.bsth.entity.SchedulePlanInfo;
+import com.bsth.entity.ScheduleRealInfo;
+import com.bsth.redis.ScheduleRedisService;
+import com.bsth.repository.ScheduleRealInfoRepository;
+import com.bsth.server_rs.schedule.dto.ScheduleInOut;
+import com.bsth.server_ws.park_station.dto.LsLcPb;
+import com.bsth.server_ws.util.ControlHttpUtils;
+import com.bsth.server_ws.util.WSDataConver;
+import com.bsth.util.ConvertUtil;
+import com.google.common.collect.ArrayListMultimap;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+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 javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.*;
+
+/**
+ * 场站查询机，相关 rest 接口
+ */
+@Component
+@Path("/staff_view")
+@Produces({MediaType.APPLICATION_JSON})
+public class StaffViewRealService {
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    @Autowired
+    ScheduleRealInfoRepository scheduleRealInfoRepository;
+
+    @Autowired
+    ScheduleRedisService redisService;
+
+    private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd");
+
+    /**
+     * 根据工号查询当日进出场排班（打印出门证用 -直接连调度系统，快速响应实时数据）
+     *
+     * @param workId
+     * @return
+     */
+    @GET
+    @Path("currentDayPlan_out/{workId}")
+    public List<ScheduleInOut> currentDayPlan(@PathParam("workId") String workId) {
+
+        try {
+            String[] arr = workId.split("-");
+
+            List<ScheduleRealInfo> list = ControlHttpUtils.getCurrentDayPlan(arr[0], arr[1]);
+
+            //签到接口 -只给出场班次
+            List<ScheduleInOut> list2 = new ArrayList<>();
+
+            for (ScheduleRealInfo sch : list) {
+                if (sch.getStatus() != -1 && sch.getBcType().equals("out"))
+                    list2.add(new ScheduleInOut(sch));
+            }
+
+
+            return list2;
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+        return null;
+    }
+
+    /**
+     * 查询今日排班
+     *
+     * @param workId
+     * @return
+     */
+    @GET
+    @Path("querySchedule/{workId}")
+    public List<ScheduleRealInfo> querySchedule(@PathParam("workId") String workId) {
+        try {
+            String date = fmtyyyyMMdd.print(new Date().getTime() - (1000 * 60 * 60 * 24));
+            List<ScheduleRealInfo> list = jdbcTemplate.query("select * from bsth_c_s_sp_info_real where j_gh='" + workId + "' and schedule_date_str>='" + date + "'", BeanPropertyRowMapper.newInstance(ScheduleRealInfo.class));
+
+            if (null == list || list.size() == 0)
+                return null;
+
+            //计算真实执行日期 和 时间戳
+            String st = BasicData.lineStartTimeMap.get(list.get(0).getXlBm());
+            for (ScheduleRealInfo sch : list) {
+                redisService.calcRealDate(st, sch);
+            }
+            //按日期分组，取日期大的list 就是当日排班
+            ArrayListMultimap<String, ScheduleRealInfo> multimap =
+                    new ConvertUtil<ScheduleRealInfo>().groupMultiList(list, "_", ScheduleRealInfo.class.getDeclaredField("scheduleDateStr"));
+
+            Set<String> ks = multimap.keySet();
+
+            String fd = null;
+            for (String k : ks) {
+
+                if (null == fd || k.compareTo(fd) > 0)
+                    fd = k;
+            }
+
+
+            return multimap.get(fd);
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+        return null;
+    }
+
+    /**
+     * 综合查询
+     *
+     * @param company
+     * @param workId
+     * @param month
+     * @return
+     */
+    @GET
+    @Path("queryLSLC_PB/{company}/{workId}/{month}")
+    public List<LsLcPb> queryLSLC_PB(@PathParam("company") String company, @PathParam("workId") String workId, @PathParam("month") String month) {
+        List<LsLcPb> rs = new ArrayList<>();
+
+        try {
+            //实际排班
+            List<ScheduleRealInfo> schList =
+                    jdbcTemplate.query("select * from bsth_c_s_sp_info_real where gs_bm='" + company + "' and j_gh='" + workId + "' and schedule_date_str like '" + month + "-%'",
+                            BeanPropertyRowMapper.newInstance(ScheduleRealInfo.class));
+
+            //计划排班
+            List<SchedulePlanInfo> planList =
+                    jdbcTemplate.query("select * from bsth_c_s_sp_info where gs_bm='" + company + "' and j_gh='" + workId + "' and schedule_date>sysdate() and schedule_date like '" + month + "-%' order by bcs",
+                            BeanPropertyRowMapper.newInstance(SchedulePlanInfo.class));
+
+            //油耗
+            List<OilInfo> oilList =
+                    jdbcTemplate.query("select * from bsth_c_ylb where jsy='" + workId + "' and rq like '" + month + "-%'",
+                            BeanPropertyRowMapper.newInstance(OilInfo.class));
+
+            rs = WSDataConver.to_getLSLC_PB_list(month, schList, oilList, planList);
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+        return rs;
+    }
+}
@@ -728,6 +728,92 @@ public class WSDataConver {
     }
     /**
+     * 将排班和油耗转换成综合查询需要的数据
+     * @param schList
+     * @param oilList
+     * @return
+     */
+    public static List<LsLcPb> to_getLSLC_PB_list(String fdate, List<ScheduleRealInfo> schList, List<OilInfo> oilList, List<SchedulePlanInfo> planList) {
+        List<LsLcPb> rs = new ArrayList<>();
+        try {
+            //按日期分组数据
+            ArrayListMultimap<String, ScheduleRealInfo> schMultimap =
+                    new ConvertUtil().groupMultiList(schList, "_", ScheduleRealInfo.class.getDeclaredField("scheduleDateStr"));
+
+            ArrayListMultimap<String, OilInfo> oilMultimap =
+                    new ConvertUtil().groupMultiList(oilList, "_", OilInfo.class.getDeclaredField("rq"));
+
+            ArrayListMultimap<String, SchedulePlanInfo> planMultimap =
+                    new ConvertUtil().groupMultiList(planList, "_", SchedulePlanInfo.class.getDeclaredField("scheduleDate"));
+
+
+            //月份有多少天
+            int year = Integer.parseInt(fdate.substring(0, 4));
+            int month = Integer.parseInt(fdate.substring(5, 7));
+            Calendar cal = Calendar.getInstance();
+            cal.set(Calendar.YEAR,year);
+            cal.set(Calendar.MONTH,month - 1);//从0开始
+            int maxDate = cal.getActualMaximum(Calendar.DATE);
+
+            LsLcPb lcPb;
+            List<ScheduleRealInfo> pbList;
+            List<SchedulePlanInfo> jhList;
+            List<OilInfo> yhList;
+            String rq,rq2;
+            SchedulePlanInfo outPlan;
+            int currentDay = cal.get(Calendar.DAY_OF_MONTH);
+            for(int i = 1; i <= maxDate; i++){
+                lcPb = new LsLcPb();
+                lcPb.setDay(i);
+
+                rq = fdate + "-" + (i < 10?"0":"") + i;
+                rq2 = rq.replaceAll("-", "");
+
+                pbList = schMultimap.get(rq);
+                yhList = oilMultimap.get(rq2);
+                jhList = planMultimap.get(rq2);
+
+                if(i < currentDay){
+                    if(pbList == null || pbList.size() == 0)
+                        lcPb.setType(4);//休息
+                    else{
+                        lcPb.setType(1);
+                        lcPb.setLckq("");
+                        if(yhList != null && yhList.size() > 0){
+                            lcPb.setLcyh(yhList.get(0).getYh());
+                        }
+                        lcPb.setLcyylc(ScheduleCalculator.calcYYLC(pbList));
+                        lcPb.setLcfyylc(ScheduleCalculator.calcKSLC(pbList));
+                    }
+                }
+                else if (i == currentDay)
+                    lcPb.setType(3);//今天
+                else {
+                    if(jhList == null || jhList.size() == 0)
+                        lcPb.setType(4);//休息
+                    else{
+                        lcPb.setType(2);
+                        outPlan = getOutSch(jhList);
+                        if(null != outPlan){
+                            lcPb.setPbxl(outPlan.getXlName());
+                            lcPb.setPblp(outPlan.getLpName());
+                            lcPb.setPbbd(minusMinute(outPlan.getFcsj(), 15));
+                            lcPb.setPbyc(outPlan.getClZbh());
+                        }
+                        else
+                            lcPb.setType(4);//休息
+                    }
+                }
+
+                rs.add(lcPb);
+            }
+        } catch (NoSuchFieldException e) {
+            logger.error("", e);
+        }
+        return rs;
+    }
+
+    /**
      * HH:mm 格式时间减分钟
      * @param dfsj
      * @param i