update...

潘钊
1 parent d8faa0a6
Showing 12 changed files with 591 additions and 8 deletions
src/main/java/com/bsth/CXFConfig.java
src/main/java/com/bsth/common/BasicData.java
src/main/java/com/bsth/server_rs/base_info/car/Car.java
src/main/java/com/bsth/server_rs/base_info/car/CarRestService.java
src/main/java/com/bsth/server_rs/base_info/car/buffer/CarBufferData.java
src/main/java/com/bsth/server_rs/base_info/dto/BusCardDto.java
src/main/java/com/bsth/server_rs/base_info/dto/PersonCardDto.java
src/main/java/com/bsth/server_rs/base_info/person/PersonRestService.java
src/main/java/com/bsth/server_rs/base_info/person/Personnel.java
src/main/java/com/bsth/server_rs/base_info/person/buffer/PersonBufferData.java
src/main/java/com/bsth/server_rs/schedule/dto/ScheduleInOut.java
src/main/java/com/bsth/server_rs/schedule/real/ScheduleRealService.java
@@ -6,6 +6,7 @@ import com.bsth.server_rs.base_info.line.LineRestService;
 import com.bsth.server_rs.base_info.person.PersonRestService;
 import com.bsth.server_rs.exception.AesExceptionMapper;
 import com.bsth.server_rs.gps.GpsRestService;
+import com.bsth.server_rs.schedule.real.ScheduleRealService;
 import com.bsth.server_ws.attendance.AttendanceServiceSoap;
 import com.bsth.server_ws.park_station.CompanyServiceSoap;
 import com.bsth.server_ws.waybill.LD_ServiceSoap;
@@ -16,6 +17,7 @@ import org.apache.cxf.endpoint.Server;
 import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
 import org.apache.cxf.jaxws.EndpointImpl;
 import org.apache.cxf.transport.servlet.CXFServlet;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -68,12 +70,20 @@ public class CXFConfig {
         return endpoint;
     }*/
  
+    @Autowired
+    ScheduleRealService scheduleRealService;
+
     @Bean
     public Server rsServer() {
         JAXRSServerFactoryBean endpoint = new JAXRSServerFactoryBean();
         endpoint.setBus(springBus());
         endpoint.setAddress("/rest");
-        endpoint.setServiceBeans(Arrays.<Object>asList(new LineRestService(), new CarRestService(), new PersonRestService(), new GpsRestService()));
+        endpoint.setServiceBeans(Arrays.<Object>asList(
+                new LineRestService(),
+                new CarRestService(),
+                new PersonRestService(),
+                new GpsRestService(),
+                scheduleRealService));
         endpoint.setProviders(Arrays.asList(new JacksonJsonProvider(), new AesExceptionMapper()));
         //endpoint.setFeatures(Arrays.asList(new Swagger2Feature()));
         endpoint.getInInterceptors().add(new AuthorizeInterceptor_IN());
+package com.bsth.common;
+
+import com.bsth.Application;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 一些基础数据缓存
+ * Created by panzhao on 2017/8/24.
+ */
+@Component
+public class BasicData implements CommandLineRunner {
+
+    /**
+     * 线路编码和在执行的班次日期
+     * code ——> yyyy-MM-dd
+     */
+    public static Map<String, String> lineDateMap;
+
+    @Autowired
+    BasicDataLoader basicDataLoader;
+
+    @Override
+    public void run(String... strings) throws Exception {
+        Application.mainServices.scheduleWithFixedDelay(basicDataLoader, 10, 60 * 10, TimeUnit.SECONDS);
+    }
+
+
+    @Component
+    public static class BasicDataLoader extends Thread {
+
+        @Autowired
+        JdbcTemplate jdbcTemplate;
+
+        @Override
+        public void run() {
+            loadLineDateMap();
+        }
+
+        private void loadLineDateMap(){
+            Map<String, String> lineDateMapCopy = new HashMap<>();
+            String sql = "select START_OPT,t2.LINE_CODE from bsth_c_line_config t1 INNER JOIN bsth_c_line t2 on t1.line=t2.id where t2.line_code is not null";
+
+            List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
+            for(Map<String, Object> map : list){
+                lineDateMapCopy.put(map.get("LINE_CODE").toString(), calcScheduleDate(map.get("START_OPT")));
+            }
+
+            lineDateMap = lineDateMapCopy;
+        }
+
+        private String calcScheduleDate(Object startDate){
+            return "20170828";
+        }
+    }
+}
@@ -64,6 +64,7 @@ public class Car implements Serializable {
  
     private String lineName;
  
+    private String remark;
  
     public String getBrancheCompanyCode() {
         return brancheCompanyCode;
@@ -168,4 +169,12 @@ public class Car implements Serializable {
     public void setNbbm(String nbbm) {
         this.nbbm = nbbm;
     }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }
 package com.bsth.server_rs.base_info.car;
  
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
 import com.bsth.server_rs.base_info.car.buffer.CarBufferData;
+import com.bsth.server_rs.base_info.dto.BusCardDto;
+import org.apache.commons.lang3.StringEscapeUtils;
  
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
+import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 import java.util.List;
+import java.util.Map;
  
 /**
  * Created by panzhao on 2017/3/30.
@@ -33,4 +35,12 @@ public class CarRestService {
     public Car findOne(@PathParam("nbbm") String nbbm) {
         return CarBufferData.findOne(nbbm);
     }
+
+    @POST
+    @Path("/setCards")
+    public Map<String, Object> multiPostCards(String bodyStr){
+        bodyStr = StringEscapeUtils.unescapeHtml4(bodyStr);
+        List<BusCardDto> list = JSON.parseObject(bodyStr, new TypeReference<List<BusCardDto>>() {});
+        return CarBufferData.multiSaveCards(list);
+    }
 }
@@ -2,12 +2,14 @@ package com.bsth.server_rs.base_info.car.buffer;
  
 import com.bsth.Application;
 import com.bsth.server_rs.base_info.car.Car;
+import com.bsth.server_rs.base_info.dto.BusCardDto;
 import com.google.common.collect.ArrayListMultimap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
  
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -25,6 +27,11 @@ public class CarBufferData implements CommandLineRunner {
     private static Map<String, Car> idMap;
     private static ArrayListMultimap<String, Car> companyListMap;
  
+    /**
+     * 待入库的bus car
+     */
+    private static List<Car> pstList = new ArrayList<>();
+
     @Autowired
     CarRefreshThread carRefreshThread;
  
@@ -58,4 +65,32 @@ public class CarBufferData implements CommandLineRunner {
     public void run(String... strings) throws Exception {
         Application.mainServices.scheduleWithFixedDelay(carRefreshThread, 10, 60 * 60, TimeUnit.SECONDS);
     }
+
+    public static Map<String, Object> multiSaveCards(List<BusCardDto> list) {
+        int success=0,error=0;
+        //返回写入成功的卡数据
+        List<BusCardDto> rsList = new ArrayList<>();
+
+        Car c;
+        for(BusCardDto bcd : list){
+            c = idMap.get(bcd.getNbbm());
+            if(c == null)
+                error ++;
+            else{
+                c.setIdRfid(bcd.getIdCard());
+                c.setTagRfid(bcd.getTagCard());
+                c.setRemark(bcd.getRemark());
+                success ++;
+
+                pstList.add(c);
+                rsList.add(bcd);
+            }
+        }
+
+        Map<String, Object> rs = new HashMap<>();
+        rs.put("success", success);
+        rs.put("successList", rsList);
+        rs.put("error", error);
+        return rs;
+    }
 }
+package com.bsth.server_rs.base_info.dto;
+
+/**
+ * Created by panzhao on 2017/8/11.
+ */
+public class BusCardDto {
+
+    /**
+     * 16进制ID卡号
+     */
+    private String idCard;
+
+    /**
+     *  车辆自编号
+     */
+    private String nbbm;
+
+    /**
+     * 标签号
+     */
+    private String tagCard;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public String getIdCard() {
+        return idCard;
+    }
+
+    public void setIdCard(String idCard) {
+        this.idCard = idCard;
+    }
+
+    public String getTagCard() {
+        return tagCard;
+    }
+
+    public void setTagCard(String tagCard) {
+        this.tagCard = tagCard;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+}
@@ -25,6 +25,11 @@ public class PersonCardDto {
      */
     private String tagCard;
  
+    /**
+     * 备注
+     */
+    private String remark;
+
     public String getIdCard() {
         return idCard;
     }
@@ -56,4 +61,12 @@ public class PersonCardDto {
     public void setTagCard(String tagCard) {
         this.tagCard = tagCard;
     }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }
 package com.bsth.server_rs.base_info.person;
  
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
 import com.bsth.server_rs.base_info.dto.PersonCardDto;
 import com.bsth.server_rs.base_info.person.buffer.PersonBufferData;
+import org.apache.commons.lang3.StringEscapeUtils;
  
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
@@ -34,8 +37,10 @@ public class PersonRestService {
     }
  
     @POST
-    public Map<String, Object> multiPostCards(List<PersonCardDto> list){
-        System.out.println(list);
-        return null;
+    @Path("/setCards")
+    public Map<String, Object> multiPostCards(String bodyStr){
+        bodyStr = StringEscapeUtils.unescapeHtml4(bodyStr);
+        List<PersonCardDto> list = JSON.parseObject(bodyStr, new TypeReference<List<PersonCardDto>>() {});
+        return PersonBufferData.multiSaveCards(list);
     }
 }
@@ -83,6 +83,11 @@ public class Personnel implements Serializable {
     private String tagRfid;
  
     /**
+     * 备注
+     */
+    private String remark;
+
+    /**
      * 线路名称
      */
     private String lineName;
@@ -203,4 +208,12 @@ public class Personnel implements Serializable {
     public void setLineCode(String lineCode) {
         this.lineCode = lineCode;
     }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }
 package com.bsth.server_rs.base_info.person.buffer;
  
 import com.bsth.Application;
+import com.bsth.server_rs.base_info.dto.PersonCardDto;
 import com.bsth.server_rs.base_info.person.Personnel;
 import com.google.common.collect.ArrayListMultimap;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -8,6 +9,7 @@ import org.springframework.boot.CommandLineRunner;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
  
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -27,6 +29,10 @@ public class PersonBufferData implements CommandLineRunner {
     private static Map<String, Personnel> idMap;
     private static ArrayListMultimap<String, Personnel> companyListMap;
  
+    /**
+     * 待入库的personnel
+     */
+    private static List<Personnel> pstList = new ArrayList<>();
     public static List<Personnel> findAll() {
         return data;
     }
@@ -53,6 +59,35 @@ public class PersonBufferData implements CommandLineRunner {
         companyListMap = listMap;
     }
  
+    /**
+     * 批量设置人卡数据
+     * @param list
+     * @return
+     */
+    public static Map<String, Object> multiSaveCards(List<PersonCardDto> list){
+        int success=0,error=0;
+
+        Personnel p;
+        for(PersonCardDto pcd : list){
+            p = idMap.get(pcd.getCompany() + "-" + pcd.getJobCode());
+            if(p == null)
+                error ++;
+            else{
+                p.setIdRfid(pcd.getIdCard());
+                p.setTagRfid(pcd.getTagCard());
+                p.setRemark(pcd.getRemark());
+                success ++;
+
+                pstList.add(p);
+            }
+        }
+
+        Map<String, Object> rs = new HashMap<>();
+        rs.put("success", success);
+        rs.put("error", error);
+        return rs;
+    }
+
     @Override
     public void run(String... strings) throws Exception {
         Application.mainServices.scheduleWithFixedDelay(personRefreshThread, 10, 60 * 30, TimeUnit.SECONDS);
+package com.bsth.server_rs.schedule.dto;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.entity.ScheduleRealInfo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 进出场班次数据 ---给停车场用的
+ * Created by panzhao on 2017/8/24.
+ */
+public class ScheduleInOut {
+
+    public static List<ScheduleInOut> getMultiInstance(List<ScheduleRealInfo> list, String tccCode){
+        List<ScheduleInOut> rs = new ArrayList<>();
+
+        for(ScheduleRealInfo sch : list){
+            if(!sch.getBcType().equals("in") && !sch.getBcType().equals("out"))
+                continue;
+
+            if(!sch.getQdzCode().equals(tccCode) && !sch.getZdzCode().equals(tccCode))
+                continue;
+
+            rs.add(getInstance(sch));
+        }
+        return rs;
+    }
+
+    public static ScheduleInOut getInstance(ScheduleRealInfo sch){
+        return JSONObject.parseObject(JSON.toJSONString(sch), ScheduleInOut.class);
+    }
+
+    private Long id;
+    private String scheduleDateStr;
+    private String realExecDate;
+    private String xlName;
+    private String xlBm;
+    private String lpName;
+    private String clZbh;
+    private String jGh;
+    private String jName;
+    private String sGh;
+    private String sName;
+    private String xlDir;
+    private String qdzCode;
+    private String qdzName;
+    private String zdzCode;
+    private String zdzName;
+    private String dfsj;
+    private Long dfsjT;
+    private String zdsj;
+    private Long zdsjT;
+    private String fcsjActual;
+    private String zdsjActual;
+    private boolean sflj;
+    private String remarks;
+    private String gsName;
+    private String gsBm;
+    private String fgsName;
+    private String fgsBm;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getScheduleDateStr() {
+        return scheduleDateStr;
+    }
+
+    public void setScheduleDateStr(String scheduleDateStr) {
+        this.scheduleDateStr = scheduleDateStr;
+    }
+
+    public String getRealExecDate() {
+        return realExecDate;
+    }
+
+    public void setRealExecDate(String realExecDate) {
+        this.realExecDate = realExecDate;
+    }
+
+    public String getXlName() {
+        return xlName;
+    }
+
+    public void setXlName(String xlName) {
+        this.xlName = xlName;
+    }
+
+    public String getXlBm() {
+        return xlBm;
+    }
+
+    public void setXlBm(String xlBm) {
+        this.xlBm = xlBm;
+    }
+
+    public String getLpName() {
+        return lpName;
+    }
+
+    public void setLpName(String lpName) {
+        this.lpName = lpName;
+    }
+
+    public String getClZbh() {
+        return clZbh;
+    }
+
+    public void setClZbh(String clZbh) {
+        this.clZbh = clZbh;
+    }
+
+    public String getjGh() {
+        return jGh;
+    }
+
+    public void setjGh(String jGh) {
+        this.jGh = jGh;
+    }
+
+    public String getjName() {
+        return jName;
+    }
+
+    public void setjName(String jName) {
+        this.jName = jName;
+    }
+
+    public String getsGh() {
+        return sGh;
+    }
+
+    public void setsGh(String sGh) {
+        this.sGh = sGh;
+    }
+
+    public String getsName() {
+        return sName;
+    }
+
+    public void setsName(String sName) {
+        this.sName = sName;
+    }
+
+    public String getXlDir() {
+        return xlDir;
+    }
+
+    public void setXlDir(String xlDir) {
+        this.xlDir = xlDir;
+    }
+
+    public String getQdzCode() {
+        return qdzCode;
+    }
+
+    public void setQdzCode(String qdzCode) {
+        this.qdzCode = qdzCode;
+    }
+
+    public String getQdzName() {
+        return qdzName;
+    }
+
+    public void setQdzName(String qdzName) {
+        this.qdzName = qdzName;
+    }
+
+    public String getZdzCode() {
+        return zdzCode;
+    }
+
+    public void setZdzCode(String zdzCode) {
+        this.zdzCode = zdzCode;
+    }
+
+    public String getZdzName() {
+        return zdzName;
+    }
+
+    public void setZdzName(String zdzName) {
+        this.zdzName = zdzName;
+    }
+
+    public String getDfsj() {
+        return dfsj;
+    }
+
+    public void setDfsj(String dfsj) {
+        this.dfsj = dfsj;
+    }
+
+    public Long getDfsjT() {
+        return dfsjT;
+    }
+
+    public void setDfsjT(Long dfsjT) {
+        this.dfsjT = dfsjT;
+    }
+
+    public String getZdsj() {
+        return zdsj;
+    }
+
+    public void setZdsj(String zdsj) {
+        this.zdsj = zdsj;
+    }
+
+    public Long getZdsjT() {
+        return zdsjT;
+    }
+
+    public void setZdsjT(Long zdsjT) {
+        this.zdsjT = zdsjT;
+    }
+
+    public String getFcsjActual() {
+        return fcsjActual;
+    }
+
+    public void setFcsjActual(String fcsjActual) {
+        this.fcsjActual = fcsjActual;
+    }
+
+    public String getZdsjActual() {
+        return zdsjActual;
+    }
+
+    public void setZdsjActual(String zdsjActual) {
+        this.zdsjActual = zdsjActual;
+    }
+
+    public boolean isSflj() {
+        return sflj;
+    }
+
+    public void setSflj(boolean sflj) {
+        this.sflj = sflj;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public String getGsName() {
+        return gsName;
+    }
+
+    public void setGsName(String gsName) {
+        this.gsName = gsName;
+    }
+
+    public String getGsBm() {
+        return gsBm;
+    }
+
+    public void setGsBm(String gsBm) {
+        this.gsBm = gsBm;
+    }
+
+    public String getFgsName() {
+        return fgsName;
+    }
+
+    public void setFgsName(String fgsName) {
+        this.fgsName = fgsName;
+    }
+
+    public String getFgsBm() {
+        return fgsBm;
+    }
+
+    public void setFgsBm(String fgsBm) {
+        this.fgsBm = fgsBm;
+    }
+}
+package com.bsth.server_rs.schedule.real;
+
+import com.bsth.common.BasicData;
+import com.bsth.redis.ScheduleRedisService;
+import com.bsth.server_rs.schedule.dto.ScheduleInOut;
+import org.springframework.beans.factory.annotation.Autowired;
+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.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Created by panzhao on 2017/8/24.
+ */
+@Component
+@Path("/schedule_real")
+@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+public class ScheduleRealService {
+
+    @Autowired
+    ScheduleRedisService redisService;
+
+    /**
+     * 获取当天指定停车场的进出场排班数据
+     * @return
+     */
+    @GET
+    @Path("/in_out/{code}")
+    public List<ScheduleInOut> findInOut(@PathParam("code") String code){
+        Set<String> lineArray = BasicData.lineDateMap.keySet();
+
+        List<ScheduleInOut> all = new ArrayList<>();
+        for(String lineCode : lineArray){
+            all.addAll(ScheduleInOut.getMultiInstance(redisService.read(BasicData.lineDateMap.get(lineCode), lineCode), code));
+        }
+        return all;
+    }
+}