潘钊 / control_service_data_Interface · Commits

Commit 077258eea2c482728c41d2843f1254f349be160c

Authored by 王通
1 parent 5ced9aa1
build: skipped

1.

Inline Side-by-side
Showing 4 changed files with 0 additions and 80 deletions
src/main/java/com/bsth/CXFConfig.java
  View file @077258e
... ... @@ -22,7 +22,6 @@ import com.bsth.server_rs.exception.AesExceptionMapper;
22 22 import com.bsth.server_rs.gps.GpsRestService;
23 23 import com.bsth.server_rs.info_publish.XxfbRestService;
24 24 import com.bsth.server_rs.logs.RealLogRestService;
25   -import com.bsth.server_rs.man_hours.ManHoursRestService;
26 25 import com.bsth.server_rs.rate.RateService;
27 26 import com.bsth.server_rs.schedule.plan.SchedulePlanService;
28 27 import com.bsth.server_rs.schedule.real.ScheduleRealService;
... ... @@ -138,8 +137,6 @@ public class CXFConfig {
138 137 private DksRestService dksRestService;
139 138 @Autowired
140 139 private XxfbRestService xxfbRestService;
141   - @Autowired
142   - private ManHoursRestService manHoursRestService;
143 140  
144 141 @Autowired
145 142 private BxRestService bxRestService;
... ... @@ -175,7 +172,6 @@ public class CXFConfig {
175 172 departureRestService,
176 173 dksRestService,
177 174 xxfbRestService,
178   - manHoursRestService,
179 175 bxRestService,
180 176 externalRestService));
181 177 endpoint.setProviders(Arrays.asList(new JacksonJsonProvider(), new AesExceptionMapper()));
... ...
src/main/java/com/bsth/StartCommand.java
  View file @077258e
... ... @@ -3,7 +3,6 @@ package com.bsth;
3 3  
4 4 import com.bsth.server_rs.gps.buffer.BasicDataRefreshThread;
5 5 import com.bsth.server_rs.gps.buffer.GpsRefreshThread;
6   -import com.bsth.server_rs.man_hours.ManHoursRefreshScheduler;
7 6 import com.bsth.server_rs.schedule.real.thread.ExecSchDataRefreshThread;
8 7 import com.bsth.server_rs.schedule.real.thread.SchInOutDataRefreshThread;
9 8 import com.bsth.server_rs.thread.RfidCardInfoPersistenceThread;
... ... @@ -35,8 +34,6 @@ public class StartCommand implements CommandLineRunner{
35 34 GpsRefreshThread gpsRefreshThread;
36 35 @Autowired
37 36 BasicDataRefreshThread basicDataRefreshThread;
38   - @Autowired
39   - ManHoursRefreshScheduler manHoursRefreshScheduler;
40 37  
41 38 @Autowired
42 39 SystemParamService systemParamService;
... ... @@ -56,7 +53,6 @@ public class StartCommand implements CommandLineRunner{
56 53 Application.mainServices.scheduleWithFixedDelay(gpsRefreshThread, 10, 7, TimeUnit.SECONDS);
57 54 //定时刷新基础信息
58 55 Application.mainServices.scheduleWithFixedDelay(basicDataRefreshThread, 30, 30, TimeUnit.MINUTES);
59   - manHoursRefreshScheduler.refresh();
60 56 systemParamService.refresh();
61 57 } catch (Exception e) {
62 58 e.printStackTrace();
... ...
src/main/java/com/bsth/server_rs/man_hours/ManHoursRefreshScheduler.java deleted 100644 → 0
  View file @5ced9aa
1   -package com.bsth.server_rs.man_hours;
2   -
3   -import com.bsth.entity.ManHours;
4   -import org.joda.time.DateTime;
5   -import org.springframework.beans.factory.annotation.Autowired;
6   -import org.springframework.jdbc.core.BeanPropertyRowMapper;
7   -import org.springframework.jdbc.core.JdbcTemplate;
8   -import org.springframework.scheduling.annotation.EnableScheduling;
9   -import org.springframework.scheduling.annotation.Scheduled;
10   -import org.springframework.stereotype.Component;
11   -
12   -import java.util.HashMap;
13   -import java.util.List;
14   -import java.util.Map;
15   -
16   -/**
17   - * @author Hill
18   - */
19   -@Component
20   -@EnableScheduling
21   -public class ManHoursRefreshScheduler {
22   -
23   - @Autowired
24   - private JdbcTemplate jdbcTemplate;
25   -
26   - @Autowired
27   - private ManHoursRestService manHoursRestService;
28   -
29   - @Scheduled(cron = "0 0/25 3 * * ?")
30   - public void refresh() {
31   - Map<String, Float> linelp2mh = new HashMap<>();
32   - DateTime dateTime = DateTime.now().withTime(0,0,0,0);
33   - 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));
34   - for (ManHours manHours : manHoursList) {
35   - linelp2mh.put(String.format("%s_%s", manHours.getXlBm(), manHours.getLpName()), manHours.getManHours());
36   - }
37   - manHoursRestService.setLinelp2mh(linelp2mh);
38   - }
39   -}
src/main/java/com/bsth/server_rs/man_hours/ManHoursRestService.java deleted 100644 → 0
  View file @5ced9aa
1   -package com.bsth.server_rs.man_hours;
2   -
3   -import org.springframework.stereotype.Component;
4   -
5   -import javax.ws.rs.GET;
6   -import javax.ws.rs.Path;
7   -import javax.ws.rs.PathParam;
8   -import javax.ws.rs.Produces;
9   -import javax.ws.rs.core.MediaType;
10   -import java.util.HashMap;
11   -import java.util.Map;
12   -
13   -/**
14   - * @author hill
15   - * @date
16   - */
17   -@Component
18   -@Path("/manHours")
19   -@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
20   -public class ManHoursRestService {
21   -
22   - private Map<String, Float> linelp2mh = new HashMap<>();
23   -
24   - @GET
25   - @Path("/{xlBm}/{lpName}")
26   - public Float manHours(@PathParam("xlBm") String xlBm, @PathParam("lpName") String lpName) {
27   - return linelp2mh.get(String.format("%s_%s", xlBm, lpName));
28   - }
29   -
30   - public void setLinelp2mh(Map<String, Float> linelp2mh) {
31   - this.linelp2mh = linelp2mh;
32   - }
33   -}