1.

王通
1 parent 5ced9aa1
Showing 4 changed files with 0 additions and 80 deletions
src/main/java/com/bsth/CXFConfig.java
src/main/java/com/bsth/StartCommand.java
src/main/java/com/bsth/server_rs/man_hours/ManHoursRefreshScheduler.java
src/main/java/com/bsth/server_rs/man_hours/ManHoursRestService.java
@@ -22,7 +22,6 @@ import com.bsth.server_rs.exception.AesExceptionMapper;
 import com.bsth.server_rs.gps.GpsRestService;
 import com.bsth.server_rs.info_publish.XxfbRestService;
 import com.bsth.server_rs.logs.RealLogRestService;
-import com.bsth.server_rs.man_hours.ManHoursRestService;
 import com.bsth.server_rs.rate.RateService;
 import com.bsth.server_rs.schedule.plan.SchedulePlanService;
 import com.bsth.server_rs.schedule.real.ScheduleRealService;
@@ -138,8 +137,6 @@ public class CXFConfig {
     private DksRestService dksRestService;
     @Autowired
     private XxfbRestService xxfbRestService;
-    @Autowired
-    private ManHoursRestService manHoursRestService;
     @Autowired
     private BxRestService bxRestService;
@@ -175,7 +172,6 @@ public class CXFConfig {
                 departureRestService,
                 dksRestService,
                 xxfbRestService,
-                manHoursRestService,
                 bxRestService,
                 externalRestService));
         endpoint.setProviders(Arrays.asList(new JacksonJsonProvider(), new AesExceptionMapper()));
@@ -3,7 +3,6 @@ package com.bsth;
 import com.bsth.server_rs.gps.buffer.BasicDataRefreshThread;
 import com.bsth.server_rs.gps.buffer.GpsRefreshThread;
-import com.bsth.server_rs.man_hours.ManHoursRefreshScheduler;
 import com.bsth.server_rs.schedule.real.thread.ExecSchDataRefreshThread;
 import com.bsth.server_rs.schedule.real.thread.SchInOutDataRefreshThread;
 import com.bsth.server_rs.thread.RfidCardInfoPersistenceThread;
@@ -35,8 +34,6 @@ public class StartCommand implements CommandLineRunner{
 	GpsRefreshThread gpsRefreshThread;
 	@Autowired
 	BasicDataRefreshThread basicDataRefreshThread;
-	@Autowired
-	ManHoursRefreshScheduler manHoursRefreshScheduler;
 	@Autowired
 	SystemParamService systemParamService;
@@ -56,7 +53,6 @@ public class StartCommand implements CommandLineRunner{
 			Application.mainServices.scheduleWithFixedDelay(gpsRefreshThread, 10, 7, TimeUnit.SECONDS);
 			//定时刷新基础信息
 			Application.mainServices.scheduleWithFixedDelay(basicDataRefreshThread, 30, 30, TimeUnit.MINUTES);
-			manHoursRefreshScheduler.refresh();
 			systemParamService.refresh();
 		} catch (Exception e) {
 			e.printStackTrace();
-package com.bsth.server_rs.man_hours;
-
-import com.bsth.entity.ManHours;
-import org.joda.time.DateTime;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.BeanPropertyRowMapper;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Hill
- */
-@Component
-@EnableScheduling
-public class ManHoursRefreshScheduler {
-
-    @Autowired
-    private JdbcTemplate jdbcTemplate;
-
-    @Autowired
-    private ManHoursRestService manHoursRestService;
-
-    @Scheduled(cron = "0 0/25 3 * * ?")
-    public void refresh() {
-        Map<String, Float> linelp2mh = new HashMap<>();
-        DateTime dateTime = DateTime.now().withTime(0,0,0,0);
-        List<ManHours> manHoursList = jdbcTemplate.query("select d.xl xl_bm,d.lp,d.gs man_hours,e.lp_name from (SELECT DISTINCT c.xl,c.lp,c.gs FROM `bsth_c_s_sp_info` a join bsth_c_s_ttinfo b on a.tt_info = b.id join bsth_c_s_ttinfo_bx_detail c on b.id = c.ttinfo where a.schedule_date = FROM_UNIXTIME(?)) d join bsth_c_s_gbi e on d.lp = e.id",new Object[]{ dateTime.getMillis() / 1000 }, BeanPropertyRowMapper.newInstance(ManHours.class));
-        for (ManHours manHours : manHoursList) {
-            linelp2mh.put(String.format("%s_%s", manHours.getXlBm(), manHours.getLpName()), manHours.getManHours());
-        }
-        manHoursRestService.setLinelp2mh(linelp2mh);
-    }
-}
-package com.bsth.server_rs.man_hours;
-
-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.HashMap;
-import java.util.Map;
-
-/**
- * @author hill
- * @date
- */
-@Component
-@Path("/manHours")
-@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-public class ManHoursRestService {
-
-    private Map<String, Float> linelp2mh = new HashMap<>();
-
-    @GET
-    @Path("/{xlBm}/{lpName}")
-    public Float manHours(@PathParam("xlBm") String xlBm, @PathParam("lpName") String lpName) {
-        return linelp2mh.get(String.format("%s_%s", xlBm, lpName));
-    }
-
-    public void setLinelp2mh(Map<String, Float> linelp2mh) {
-        this.linelp2mh = linelp2mh;
-    }
-}