潘钊 / bsth_control · Commits

Commit 21406aa6228f016ae31bf8d5758b1a69290246f7

Authored by 徐烜
2 parents 765f94fb c049ece8
build: skipped

Update

Inline Side-by-side
Showing 11 changed files with 304 additions and 303 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 11 of 26 files are displayed.

src/main/java/com/bsth/controller/realcontrol/FrequentPhrasesController.java
  View file @21406aa
1   -package com.bsth.controller.realcontrol;
2   -
3   -import com.bsth.controller.BaseController;
4   -import com.bsth.entity.realcontrol.FrequentPhrases;
5   -import org.springframework.web.bind.annotation.RequestMapping;
6   -import org.springframework.web.bind.annotation.RestController;
7   -
8   -/**
9   - * Created by panzhao on 2017/9/17.
10   - */
11   -@RestController
12   -@RequestMapping("frequent_phrases")
13   -public class FrequentPhrasesController extends BaseController<FrequentPhrases, Integer>{
14   -
15   -}
  1 +package com.bsth.controller.realcontrol;
  2 +
  3 +import com.bsth.controller.BaseController;
  4 +import com.bsth.entity.realcontrol.FrequentPhrases;
  5 +import org.springframework.web.bind.annotation.RequestMapping;
  6 +import org.springframework.web.bind.annotation.RestController;
  7 +
  8 +/**
  9 + * Created by panzhao on 2017/9/17.
  10 + */
  11 +@RestController
  12 +@RequestMapping("frequent_phrases")
  13 +public class FrequentPhrasesController extends BaseController<FrequentPhrases, Integer>{
  14 +
  15 +}
... ...
src/main/java/com/bsth/controller/traffic/VehicleInoutStopController.java
  View file @21406aa
1   -package com.bsth.controller.traffic;
2   -
3   -import com.bsth.controller.BaseController;
4   -import com.bsth.entity.traffic.VehicleInoutStop;
5   -import org.springframework.web.bind.annotation.RequestMapping;
6   -import org.springframework.web.bind.annotation.RestController;
7   -/**
8   - *
9   - * @author BSTH
10   - *
11   - */
12   -@RestController
13   -@RequestMapping("vehicle_stop")
14   -public class VehicleInoutStopController extends BaseController<VehicleInoutStop,Integer> {
15   -}
  1 +package com.bsth.controller.traffic;
  2 +
  3 +import com.bsth.controller.BaseController;
  4 +import com.bsth.entity.traffic.VehicleInoutStop;
  5 +import org.springframework.web.bind.annotation.RequestMapping;
  6 +import org.springframework.web.bind.annotation.RestController;
  7 +/**
  8 + *
  9 + * @author BSTH
  10 + *
  11 + */
  12 +@RestController
  13 +@RequestMapping("vehicle_stop")
  14 +public class VehicleInoutStopController extends BaseController<VehicleInoutStop,Integer> {
  15 +}
... ...
src/main/java/com/bsth/entity/realcontrol/FrequentPhrases.java
  View file @21406aa
1   -package com.bsth.entity.realcontrol;
2   -
3   -import javax.persistence.Entity;
4   -import javax.persistence.GeneratedValue;
5   -import javax.persistence.Id;
6   -import javax.persistence.Table;
7   -
8   -/**
9   - * 常用短语
10   - * Created by panzhao on 2017/9/17.
11   - */
12   -@Entity
13   -@Table(name = "bsth_c_s_frequent_phrases")
14   -public class FrequentPhrases {
15   -
16   - @Id
17   - @GeneratedValue
18   - private Integer id;
19   -
20   - /**
21   - * 用户名
22   - */
23   - private String userName;
24   -
25   - /**
26   - * 短语
27   - */
28   - private String text;
29   -
30   - public Integer getId() {
31   - return id;
32   - }
33   -
34   - public void setId(Integer id) {
35   - this.id = id;
36   - }
37   -
38   - public String getUserName() {
39   - return userName;
40   - }
41   -
42   - public void setUserName(String userName) {
43   - this.userName = userName;
44   - }
45   -
46   - public String getText() {
47   - return text;
48   - }
49   -
50   - public void setText(String text) {
51   - this.text = text;
52   - }
53   -}
  1 +package com.bsth.entity.realcontrol;
  2 +
  3 +import javax.persistence.Entity;
  4 +import javax.persistence.GeneratedValue;
  5 +import javax.persistence.Id;
  6 +import javax.persistence.Table;
  7 +
  8 +/**
  9 + * 常用短语
  10 + * Created by panzhao on 2017/9/17.
  11 + */
  12 +@Entity
  13 +@Table(name = "bsth_c_s_frequent_phrases")
  14 +public class FrequentPhrases {
  15 +
  16 + @Id
  17 + @GeneratedValue
  18 + private Integer id;
  19 +
  20 + /**
  21 + * 用户名
  22 + */
  23 + private String userName;
  24 +
  25 + /**
  26 + * 短语
  27 + */
  28 + private String text;
  29 +
  30 + public Integer getId() {
  31 + return id;
  32 + }
  33 +
  34 + public void setId(Integer id) {
  35 + this.id = id;
  36 + }
  37 +
  38 + public String getUserName() {
  39 + return userName;
  40 + }
  41 +
  42 + public void setUserName(String userName) {
  43 + this.userName = userName;
  44 + }
  45 +
  46 + public String getText() {
  47 + return text;
  48 + }
  49 +
  50 + public void setText(String text) {
  51 + this.text = text;
  52 + }
  53 +}
... ...
src/main/java/com/bsth/entity/traffic/VehicleInoutStop.java
  View file @21406aa
1   -package com.bsth.entity.traffic;
2   -
3   -import com.bsth.entity.Cars;
4   -import com.bsth.entity.Line;
5   -
6   -import javax.persistence.*;
7   -import java.util.Date;
8   -
9   -/**
10   - *
11   - * @ClassName: VehicleInoutStop(车载上报停靠站信息)
12   - *
13   - * @Description: TODO(线路标准信息)
14   - *
15   - * @Author bsth@zq
16   - *
17   - * @Date 2017-9-18 9:34:39
18   - *
19   - * @Version 公交调度系统BS版 0.1
20   - *
21   - */
22   -@Entity
23   -@Table(name = "bsth_c_shreal")
24   -public class VehicleInoutStop {
25   -
26   - @Id
27   - @GeneratedValue(strategy = GenerationType.IDENTITY)
28   - private Integer id;
29   -
30   - @ManyToOne
31   - private Line line;
32   -
33   - @ManyToOne
34   - private Cars cars;
35   -
36   - // 站点序号
37   - private Integer stop;
38   -
39   - // 营运状态
40   - private Integer serviceState;
41   -
42   - // 上下行
43   - private Integer upDown;
44   -
45   - // 进出站/站内外
46   - private Integer inOutStop;
47   -
48   - // 上报时间
49   - private long reportDate;
50   -
51   - public Integer getId() {
52   - return id;
53   - }
54   -
55   - public void setId(Integer id) {
56   - this.id = id;
57   - }
58   -
59   - public Line getLine() {
60   - return line;
61   - }
62   -
63   - public void setLine(Line line) {
64   - this.line = line;
65   - }
66   -
67   - public Cars getCars() {
68   - return cars;
69   - }
70   -
71   - public void setCars(Cars cars) {
72   - this.cars = cars;
73   - }
74   -
75   - public Integer getStop() {
76   - return stop;
77   - }
78   -
79   - public void setStop(Integer stop) {
80   - this.stop = stop;
81   - }
82   -
83   - public Integer getServiceState() {
84   - return serviceState;
85   - }
86   -
87   - public void setServiceState(Integer serviceState) {
88   - this.serviceState = serviceState;
89   - }
90   -
91   - public Integer getUpDown() {
92   - return upDown;
93   - }
94   -
95   - public void setUpDown(Integer upDown) {
96   - this.upDown = upDown;
97   - }
98   -
99   - public Integer getInOutStop() {
100   - return inOutStop;
101   - }
102   -
103   - public void setInOutStop(Integer inOutStop) {
104   - this.inOutStop = inOutStop;
105   - }
106   -
107   - public long getReportDate() { return reportDate; }
108   -
109   - public void setReportDate(long reportDate) { this.reportDate = reportDate; }
110   -}
  1 +package com.bsth.entity.traffic;
  2 +
  3 +import com.bsth.entity.Cars;
  4 +import com.bsth.entity.Line;
  5 +
  6 +import javax.persistence.*;
  7 +import java.util.Date;
  8 +
  9 +/**
  10 + *
  11 + * @ClassName: VehicleInoutStop(车载上报停靠站信息)
  12 + *
  13 + * @Description: TODO(线路标准信息)
  14 + *
  15 + * @Author bsth@zq
  16 + *
  17 + * @Date 2017-9-18 9:34:39
  18 + *
  19 + * @Version 公交调度系统BS版 0.1
  20 + *
  21 + */
  22 +@Entity
  23 +@Table(name = "bsth_c_shreal")
  24 +public class VehicleInoutStop {
  25 +
  26 + @Id
  27 + @GeneratedValue(strategy = GenerationType.IDENTITY)
  28 + private Integer id;
  29 +
  30 + @ManyToOne
  31 + private Line line;
  32 +
  33 + @ManyToOne
  34 + private Cars cars;
  35 +
  36 + // 站点序号
  37 + private Integer stop;
  38 +
  39 + // 营运状态
  40 + private Integer serviceState;
  41 +
  42 + // 上下行
  43 + private Integer upDown;
  44 +
  45 + // 进出站/站内外
  46 + private Integer inOutStop;
  47 +
  48 + // 上报时间
  49 + private long reportDate;
  50 +
  51 + public Integer getId() {
  52 + return id;
  53 + }
  54 +
  55 + public void setId(Integer id) {
  56 + this.id = id;
  57 + }
  58 +
  59 + public Line getLine() {
  60 + return line;
  61 + }
  62 +
  63 + public void setLine(Line line) {
  64 + this.line = line;
  65 + }
  66 +
  67 + public Cars getCars() {
  68 + return cars;
  69 + }
  70 +
  71 + public void setCars(Cars cars) {
  72 + this.cars = cars;
  73 + }
  74 +
  75 + public Integer getStop() {
  76 + return stop;
  77 + }
  78 +
  79 + public void setStop(Integer stop) {
  80 + this.stop = stop;
  81 + }
  82 +
  83 + public Integer getServiceState() {
  84 + return serviceState;
  85 + }
  86 +
  87 + public void setServiceState(Integer serviceState) {
  88 + this.serviceState = serviceState;
  89 + }
  90 +
  91 + public Integer getUpDown() {
  92 + return upDown;
  93 + }
  94 +
  95 + public void setUpDown(Integer upDown) {
  96 + this.upDown = upDown;
  97 + }
  98 +
  99 + public Integer getInOutStop() {
  100 + return inOutStop;
  101 + }
  102 +
  103 + public void setInOutStop(Integer inOutStop) {
  104 + this.inOutStop = inOutStop;
  105 + }
  106 +
  107 + public long getReportDate() { return reportDate; }
  108 +
  109 + public void setReportDate(long reportDate) { this.reportDate = reportDate; }
  110 +}
... ...
src/main/java/com/bsth/repository/realcontrol/FrequentPhrasesRepository.java
  View file @21406aa
1   -package com.bsth.repository.realcontrol;
2   -
3   -import com.bsth.entity.realcontrol.FrequentPhrases;
4   -import com.bsth.repository.BaseRepository;
5   -import org.springframework.stereotype.Repository;
6   -
7   -/**
8   - * Created by panzhao on 2017/9/17.
9   - */
10   -@Repository
11   -public interface FrequentPhrasesRepository extends BaseRepository<FrequentPhrases, Integer> {
12   -}
  1 +package com.bsth.repository.realcontrol;
  2 +
  3 +import com.bsth.entity.realcontrol.FrequentPhrases;
  4 +import com.bsth.repository.BaseRepository;
  5 +import org.springframework.stereotype.Repository;
  6 +
  7 +/**
  8 + * Created by panzhao on 2017/9/17.
  9 + */
  10 +@Repository
  11 +public interface FrequentPhrasesRepository extends BaseRepository<FrequentPhrases, Integer> {
  12 +}
... ...
src/main/java/com/bsth/repository/traffic/VehicleInoutStopRepository.java
  View file @21406aa
1   -package com.bsth.repository.traffic;
2   -
3   -import com.bsth.entity.traffic.VehicleInoutStop;
4   -import com.bsth.repository.BaseRepository;
5   -
6   -public interface VehicleInoutStopRepository extends BaseRepository<VehicleInoutStop, Integer> {
7   -}
  1 +package com.bsth.repository.traffic;
  2 +
  3 +import com.bsth.entity.traffic.VehicleInoutStop;
  4 +import com.bsth.repository.BaseRepository;
  5 +
  6 +public interface VehicleInoutStopRepository extends BaseRepository<VehicleInoutStop, Integer> {
  7 +}
... ...
src/main/java/com/bsth/service/realcontrol/FrequentPhrasesService.java
  View file @21406aa
1   -package com.bsth.service.realcontrol;
2   -
3   -import com.bsth.entity.realcontrol.FrequentPhrases;
4   -import com.bsth.service.BaseService;
5   -
6   -/**
7   - * Created by panzhao on 2017/9/17.
8   - */
9   -public interface FrequentPhrasesService extends BaseService<FrequentPhrases, Integer> {
10   -}
  1 +package com.bsth.service.realcontrol;
  2 +
  3 +import com.bsth.entity.realcontrol.FrequentPhrases;
  4 +import com.bsth.service.BaseService;
  5 +
  6 +/**
  7 + * Created by panzhao on 2017/9/17.
  8 + */
  9 +public interface FrequentPhrasesService extends BaseService<FrequentPhrases, Integer> {
  10 +}
... ...
src/main/java/com/bsth/service/realcontrol/impl/FrequentPhrasesServiceImpl.java
  View file @21406aa
1   -package com.bsth.service.realcontrol.impl;
2   -
3   -import com.bsth.entity.realcontrol.FrequentPhrases;
4   -import com.bsth.security.util.SecurityUtils;
5   -import com.bsth.service.impl.BaseServiceImpl;
6   -import com.bsth.service.realcontrol.FrequentPhrasesService;
7   -import org.springframework.stereotype.Service;
8   -
9   -import java.util.Map;
10   -
11   -/**
12   - * Created by panzhao on 2017/9/17.
13   - */
14   -@Service
15   -public class FrequentPhrasesServiceImpl extends BaseServiceImpl<FrequentPhrases, Integer> implements FrequentPhrasesService {
16   -
17   - @Override
18   - public Map<String, Object> save(FrequentPhrases fp) {
19   - fp.setUserName(SecurityUtils.getCurrentUser().getUserName());
20   - return super.save(fp);
21   - }
22   -
23   - @Override
24   - public Iterable<FrequentPhrases> list(Map<String, Object> map) {
25   - map.put("userName_eq", SecurityUtils.getCurrentUser().getUserName());
26   - return super.list(map);
27   - }
28   -}
  1 +package com.bsth.service.realcontrol.impl;
  2 +
  3 +import com.bsth.entity.realcontrol.FrequentPhrases;
  4 +import com.bsth.security.util.SecurityUtils;
  5 +import com.bsth.service.impl.BaseServiceImpl;
  6 +import com.bsth.service.realcontrol.FrequentPhrasesService;
  7 +import org.springframework.stereotype.Service;
  8 +
  9 +import java.util.Map;
  10 +
  11 +/**
  12 + * Created by panzhao on 2017/9/17.
  13 + */
  14 +@Service
  15 +public class FrequentPhrasesServiceImpl extends BaseServiceImpl<FrequentPhrases, Integer> implements FrequentPhrasesService {
  16 +
  17 + @Override
  18 + public Map<String, Object> save(FrequentPhrases fp) {
  19 + fp.setUserName(SecurityUtils.getCurrentUser().getUserName());
  20 + return super.save(fp);
  21 + }
  22 +
  23 + @Override
  24 + public Iterable<FrequentPhrases> list(Map<String, Object> map) {
  25 + map.put("userName_eq", SecurityUtils.getCurrentUser().getUserName());
  26 + return super.list(map);
  27 + }
  28 +}
... ...
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @21406aa
... ... @@ -2608,7 +2608,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2608 2608 path + "export/统计日报" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
2609 2609 } catch (Exception e) {
2610 2610 // TODO: handle exception
2611   - e.printStackTrace();
  2611 + //e.printStackTrace();
  2612 + logger.info("" , e);
2612 2613 }
2613 2614 }
2614 2615  
... ... @@ -3017,11 +3018,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3017 3018 Set<ScheduleRealInfo> set = new HashSet<>();
3018 3019  
3019 3020 ScheduleRealInfo sch;
3020   - StringBuilder sb = new StringBuilder();
  3021 + //StringBuilder sb = new StringBuilder();
3021 3022  
3022 3023 String jGh = null,jName,sGh,sName;
3023 3024 for (ChangePersonCar cpc : cpcs) {
3024   - sb = new StringBuilder();
  3025 + //sb = new StringBuilder();
3025 3026  
3026 3027 sch = dayOfSchedule.get(cpc.getSchId());
3027 3028 if (sch == null)
... ... @@ -3057,8 +3058,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3057 3058  
3058 3059 //换驾驶员
3059 3060 if (StringUtils.isNotEmpty(cpc.getJsy())) {
3060   - if(!jGh.equals(sch.getjGh()))
3061   - sb.append(sch.getjGh() + " 换 " + jGh + ";");
  3061 + /*if(!jGh.equals(sch.getjGh()))
  3062 + sb.append(sch.getjGh() + " 换 " + jGh + ";");*/
3062 3063 //换驾驶员
3063 3064 if(persoChange(sch, jGh))
3064 3065 set.add(sch);
... ... @@ -3074,8 +3075,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3074 3075 return rs;
3075 3076 }
3076 3077  
3077   - if(!sGh.equals(sch.getsGh()))
3078   - sb.append(sch.getsGh() + " 换 " + sGh + ";");
  3078 + /*if(!sGh.equals(sch.getsGh()))
  3079 + sb.append(sch.getsGh() + " 换 " + sGh + ";");*/
3079 3080 if(persoChangeSPY(sch, sGh))
3080 3081 set.add(sch);
3081 3082 }
... ... @@ -3086,13 +3087,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3086 3087  
3087 3088 //换车
3088 3089 if (StringUtils.isNotEmpty(cpc.getClZbh()) && !cpc.getClZbh().equals(sch.getClZbh())) {
3089   - sb.append(sch.getClZbh() + " 换 " + cpc.getClZbh() + ";");
  3090 + //sb.append(sch.getClZbh() + " 换 " + cpc.getClZbh() + ";");
3090 3091 set.add(sch);
3091 3092 set.addAll(dayOfSchedule.changeCar(sch, cpc.getClZbh()));
3092 3093 }
3093 3094  
3094   - if(sb.length() > 0)
3095   - sch.setRemarks(sb.toString());
  3095 + /*if(sb.length() > 0)
  3096 + sch.setRemarks(sb.toString());*/
3096 3097  
3097 3098 dayOfSchedule.save(sch);
3098 3099 set.add(sch);
... ...
src/main/java/com/bsth/service/traffic/VehicleInoutStopService.java
  View file @21406aa
1   -package com.bsth.service.traffic;
2   -
3   -import com.bsth.entity.traffic.VehicleInoutStop;
4   -import com.bsth.service.BaseService;
5   -
6   -
7   -/**
8   - * 时刻模板上传日志
9   - */
10   -public interface VehicleInoutStopService extends BaseService<VehicleInoutStop,Integer> {
11   -
12   -}
  1 +package com.bsth.service.traffic;
  2 +
  3 +import com.bsth.entity.traffic.VehicleInoutStop;
  4 +import com.bsth.service.BaseService;
  5 +
  6 +
  7 +/**
  8 + * 时刻模板上传日志
  9 + */
  10 +public interface VehicleInoutStopService extends BaseService<VehicleInoutStop,Integer> {
  11 +
  12 +}
... ...
src/main/java/com/bsth/service/traffic/impl/VehicleInoutStopServiceImpl.java
  View file @21406aa
1   -package com.bsth.service.traffic.impl;
2   -
3   -import com.bsth.entity.traffic.VehicleInoutStop;
4   -import com.bsth.service.impl.BaseServiceImpl;
5   -import com.bsth.service.traffic.VehicleInoutStopService;
6   -import org.slf4j.Logger;
7   -import org.slf4j.LoggerFactory;
8   -import org.springframework.stereotype.Service;
9   -
10   -/**
11   - *
12   - * @ClassName: TrafficManageServiceImpl(运管处接口service业务层实现类)
13   - *
14   - * @Extends : BaseService
15   - *
16   - * @Description:
17   - *
18   - * @Author bsth@zq
19   - *
20   - * @Date 2016年10月28日 上午9:21:17
21   - *
22   - * @Version 公交调度系统BS版 0.1
23   - *
24   - */
25   -
26   -@Service
27   -public class VehicleInoutStopServiceImpl extends BaseServiceImpl<VehicleInoutStop,Integer> implements VehicleInoutStopService {
28   -
29   - Logger logger = LoggerFactory.getLogger(this.getClass());
30   -
31   -}
  1 +package com.bsth.service.traffic.impl;
  2 +
  3 +import com.bsth.entity.traffic.VehicleInoutStop;
  4 +import com.bsth.service.impl.BaseServiceImpl;
  5 +import com.bsth.service.traffic.VehicleInoutStopService;
  6 +import org.slf4j.Logger;
  7 +import org.slf4j.LoggerFactory;
  8 +import org.springframework.stereotype.Service;
  9 +
  10 +/**
  11 + *
  12 + * @ClassName: TrafficManageServiceImpl(运管处接口service业务层实现类)
  13 + *
  14 + * @Extends : BaseService
  15 + *
  16 + * @Description:
  17 + *
  18 + * @Author bsth@zq
  19 + *
  20 + * @Date 2016年10月28日 上午9:21:17
  21 + *
  22 + * @Version 公交调度系统BS版 0.1
  23 + *
  24 + */
  25 +
  26 +@Service
  27 +public class VehicleInoutStopServiceImpl extends BaseServiceImpl<VehicleInoutStop,Integer> implements VehicleInoutStopService {
  28 +
  29 + Logger logger = LoggerFactory.getLogger(this.getClass());
  30 +
  31 +}
... ...