iss提交8：

1、添加使用车辆配置服务的controller，把原来的controller放入legacy包中 2、在dubbo消费者配置文件中配置车辆配置服务

iss提交8：
1、添加使用车辆配置服务的controller，把原来的controller放入legacy包中 2、在dubbo消费者配置文件中配置车辆配置服务
徐烜
1 parent 770bf53b
Showing 3 changed files with 391 additions and 49 deletions
src/main/java/com/bsth/controller/schedule/core/CarConfigInfoController.java
src/main/java/com/bsth/controller/schedule/core/legacy/CarConfigInfoController.java
src/main/resources/dubbo/applicationContext_dubbo_consumer.xml
 package com.bsth.controller.schedule.core;
  
+import com.alibaba.dubbo.config.annotation.Reference;
 import com.bsth.common.Constants;
 import com.bsth.common.ResponseCode;
-import com.bsth.controller.schedule.BController;
-import com.bsth.entity.schedule.CarConfigInfo;
+import com.bsth.control_v2.plan_module.common.dto.baseinfo.CarDto;
+import com.bsth.control_v2.plan_module.common.dto.baseinfo.LineDto;
+import com.bsth.control_v2.plan_module.common.dto.schedule.config.VehicleConfigDto;
+import com.bsth.control_v2.plan_module.common.dto.sys.CompanyAuthorityDto;
+import com.bsth.control_v2.plan_module.common.dto.sys.UserDto;
+import com.bsth.control_v2.plan_module.common.exception.PlanModuleException;
+import com.bsth.control_v2.plan_module.common.service.BServiceFacade;
+import com.bsth.control_v2.plan_module.common.service.schedule.config.VehicleConfigServiceFacade;
+import com.bsth.controller.schedule.BController_facade;
 import com.bsth.entity.sys.CompanyAuthority;
-import com.bsth.repository.schedule.CarConfigInfoRepository;
 import com.bsth.service.schedule.CarConfigInfoService;
-import com.bsth.service.schedule.exception.ScheduleException;
+import com.bsth.service.schedule.utils.DataToolsFile;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
  
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.io.*;
+import java.util.*;
  
 /**
  * Created by xu on 16/5/9.
  */
 @RestController
 @RequestMapping("cci")
-public class CarConfigInfoController extends BController<CarConfigInfo, Long> {
-    @Autowired
-    private CarConfigInfoRepository carConfigInfoRepository;
-    @Autowired
-    private CarConfigInfoService carConfigInfoService;
+public class CarConfigInfoController extends BController_facade<Long, VehicleConfigDto> {
+
+    @Override
+    public void setCreateUserInfo(VehicleConfigDto vehicleConfigDto, Integer userId, Date createDate) {
+        UserDto userDto = UserDto.getBuilder()
+                .setId(userId)
+                .build();
+        vehicleConfigDto.setCreateBy(userDto);
+        vehicleConfigDto.setCreateDate(createDate);
+    }
+
+    @Override
+    public void setUpdateUserInfo(VehicleConfigDto vehicleConfigDto, Integer userId, Date updateDate) {
+        UserDto userDto = UserDto.getBuilder()
+                .setId(userId)
+                .build();
+        vehicleConfigDto.setUpdateBy(userDto);
+        vehicleConfigDto.setUpdateDate(updateDate);
+    }
  
+    @Reference
+    private VehicleConfigServiceFacade vehicleConfigServiceFacade;
+
+    @Override
+    protected BServiceFacade<Long, VehicleConfigDto> getBServiceFacade() {
+        return vehicleConfigServiceFacade;
+    }
  
     @RequestMapping(value = "/cars", method = RequestMethod.GET)
     public List<Map<String, Object>> findCarConfigCars() {
-        return carConfigInfoRepository.findCarConfigCars();
+        return vehicleConfigServiceFacade.findCarsFromConfig_nbbm();
     }
  
     @RequestMapping(value = "/cars2", method = RequestMethod.GET)
     public List<Map<String, Object>> findCarsFromConfig() {
-        return carConfigInfoRepository.findCarsFromConfig();
+        return vehicleConfigServiceFacade.findCarsFromConfig_insideCode();
     }
  
     @RequestMapping(value = "/validate_cars", method = RequestMethod.GET)
     public Map<String, Object> validate_cars(@RequestParam Map<String, Object> param) {
         Map<String, Object> rtn = new HashMap<>();
         try {
-            // 车辆重复配置验证
-            CarConfigInfo carConfigInfo = new CarConfigInfo(
-                    param.get("id_eq"),
-                    param.get("xl.id_eq"),
-                    param.get("xl.name_eq"),
-                    param.get("cl.id_eq")
-            );
-            carConfigInfoService.validate_cars(carConfigInfo);
+            VehicleConfigDto vehicleConfigDto = VehicleConfigDto.getBuilder()
+                    .setId(param.get("id_eq") == null ? null : Long.parseLong(param.get("id_eq").toString()))
+                    .setXl(param.get("xl.id_eq") == null ? null : (
+                            LineDto.getBuilder()
+                                    .setId(Integer.valueOf(param.get("xl.id_eq").toString()))
+                                    .setName(param.get("xl.name_eq").toString())
+                                    .build()
+                    ))
+                    .setCl(param.get("cl.id_eq") == null ? null : (
+                            CarDto.getBuilder()
+                                    .setId(Integer.valueOf(param.get("cl.id_eq").toString()))
+                                    .build()
+                    ))
+                    .build();
+
+            vehicleConfigServiceFacade.validate_already_config(vehicleConfigDto);
             rtn.put("status", ResponseCode.SUCCESS);
-        } catch (ScheduleException exp) {
+        } catch (PlanModuleException exp) {
             rtn.put("status", ResponseCode.ERROR);
             rtn.put("msg", exp.getMessage());
         }
@@ -67,9 +106,18 @@ public class CarConfigInfoController extends BController&lt;CarConfigInfo, Long&gt; {
     public Map<String, Object> validate_cars(@RequestParam Integer xlId, @RequestParam Integer clId) {
         Map<String, Object> rtn = new HashMap<>();
         try {
-            carConfigInfoService.validate_cars(xlId, clId);
+            VehicleConfigDto vehicleConfigDto = VehicleConfigDto.getBuilder()
+                    .setXl(xlId == null ? null : (LineDto.getBuilder()
+                            .setId(xlId)
+                            .build()))
+                    .setCl(clId == null ? null : (CarDto.getBuilder()
+                            .setId(clId)
+                            .build()))
+                    .build();
+
+            vehicleConfigServiceFacade.validate_already_config(vehicleConfigDto);
             rtn.put("status", ResponseCode.SUCCESS);
-        } catch (ScheduleException exp) {
+        } catch (PlanModuleException exp) {
             rtn.put("status", ResponseCode.ERROR);
             rtn.put("msg", exp.getMessage());
         }
@@ -81,18 +129,37 @@ public class CarConfigInfoController extends BController&lt;CarConfigInfo, Long&gt; {
     public Map<String, Object> validate_cars_gs(HttpServletRequest request, @RequestParam Map<String, Object> param) {
         HttpSession session = request.getSession();
         List<CompanyAuthority> cmyAuths = (List<CompanyAuthority>) session.getAttribute(Constants.COMPANY_AUTHORITYS);
+        List<CompanyAuthorityDto> companyAuthorityDtoList = new ArrayList<>();
+        for (CompanyAuthority companyAuthority : cmyAuths) {
+            CompanyAuthorityDto companyAuthorityDto = CompanyAuthorityDto.getBuilder()
+                    .setId(companyAuthority.getId())
+                    .setCompanyCode(companyAuthority.getCompanyCode())
+                    .setCompanyName(companyAuthority.getCompanyName())
+                    .setSubCompanyCode(companyAuthority.getSubCompanyCode())
+                    .setSubCompanyName(companyAuthority.getSubCompanyName())
+                    .build();
+            companyAuthorityDtoList.add(companyAuthorityDto);
+        }
  
         Map<String, Object> rtn = new HashMap<>();
         try {
-            CarConfigInfo carConfigInfo = new CarConfigInfo(
-                    null,
-                    param.get("xl.id_eq"),
-                    param.get("xl.name_eq"),
-                    param.get("cl.id_eq")
-            );
-            carConfigInfoService.validate_cars_gs(carConfigInfo, cmyAuths);
+            VehicleConfigDto vehicleConfigDto = VehicleConfigDto.getBuilder()
+                    .setXl(param.get("xl.id_eq") == null ? null : (
+                            LineDto.getBuilder()
+                                    .setId(Integer.valueOf(param.get("xl.id_eq").toString()))
+                                    .setName(param.get("xl.name_eq").toString())
+                                    .build()
+                            ))
+                    .setCl(param.get("cl.id_eq") == null ? null : (
+                            CarDto.getBuilder()
+                                    .setId(Integer.valueOf(param.get("cl.id_eq").toString()))
+                                    .build()
+                            ))
+                    .build();
+
+            vehicleConfigServiceFacade.validate_cars_gs(vehicleConfigDto, companyAuthorityDtoList);
             rtn.put("status", ResponseCode.SUCCESS);
-        } catch (ScheduleException exp) {
+        } catch (PlanModuleException exp) {
             rtn.put("status", ResponseCode.ERROR);
             rtn.put("msg", exp.getMessage());
         }
@@ -104,18 +171,37 @@ public class CarConfigInfoController extends BController&lt;CarConfigInfo, Long&gt; {
     public Map<String, Object> validate_cars_fgs(HttpServletRequest request, @RequestParam Map<String, Object> param) {
         HttpSession session = request.getSession();
         List<CompanyAuthority> cmyAuths = (List<CompanyAuthority>) session.getAttribute(Constants.COMPANY_AUTHORITYS);
+        List<CompanyAuthorityDto> companyAuthorityDtoList = new ArrayList<>();
+        for (CompanyAuthority companyAuthority : cmyAuths) {
+            CompanyAuthorityDto companyAuthorityDto = CompanyAuthorityDto.getBuilder()
+                    .setId(companyAuthority.getId())
+                    .setCompanyCode(companyAuthority.getCompanyCode())
+                    .setCompanyName(companyAuthority.getCompanyName())
+                    .setSubCompanyCode(companyAuthority.getSubCompanyCode())
+                    .setSubCompanyName(companyAuthority.getSubCompanyName())
+                    .build();
+            companyAuthorityDtoList.add(companyAuthorityDto);
+        }
  
         Map<String, Object> rtn = new HashMap<>();
         try {
-            CarConfigInfo carConfigInfo = new CarConfigInfo(
-                    null,
-                    param.get("xl.id_eq"),
-                    param.get("xl.name_eq"),
-                    param.get("cl.id_eq")
-            );
-            carConfigInfoService.validate_cars_fgs(carConfigInfo, cmyAuths);
+            VehicleConfigDto vehicleConfigDto = VehicleConfigDto.getBuilder()
+                    .setXl(param.get("xl.id_eq") == null ? null : (
+                            LineDto.getBuilder()
+                                    .setId(Integer.valueOf(param.get("xl.id_eq").toString()))
+                                    .setName(param.get("xl.name_eq").toString())
+                                    .build()
+                    ))
+                    .setCl(param.get("cl.id_eq") == null ? null : (
+                            CarDto.getBuilder()
+                                    .setId(Integer.valueOf(param.get("cl.id_eq").toString()))
+                                    .build()
+                    ))
+                    .build();
+
+            vehicleConfigServiceFacade.validate_cars_fgs(vehicleConfigDto, companyAuthorityDtoList);
             rtn.put("status", ResponseCode.SUCCESS);
-        } catch (ScheduleException exp) {
+        } catch (PlanModuleException exp) {
             rtn.put("status", ResponseCode.ERROR);
             rtn.put("msg", exp.getMessage());
         }
@@ -127,19 +213,128 @@ public class CarConfigInfoController extends BController&lt;CarConfigInfo, Long&gt; {
     public Map<String, Object> validate_cars_config(@RequestParam Map<String, Object> param) {
         Map<String, Object> rtn = new HashMap<>();
         try {
-            CarConfigInfo carConfigInfo = new CarConfigInfo(
-                    null,
-                    param.get("xl.id_eq"),
-                    param.get("xl.name_eq"),
-                    param.get("cl.id_eq")
-            );
-            carConfigInfoService.validate_cars_config(carConfigInfo);
+            VehicleConfigDto vehicleConfigDto = VehicleConfigDto.getBuilder()
+                    .setXl(param.get("xl.id_eq") == null ? null : (
+                            LineDto.getBuilder()
+                                    .setId(Integer.valueOf(param.get("xl.id_eq").toString()))
+                                    .setName(param.get("xl.name_eq").toString())
+                                    .build()
+                    ))
+                    .setCl(param.get("cl.id_eq") == null ? null : (
+                            CarDto.getBuilder()
+                                    .setId(Integer.valueOf(param.get("cl.id_eq").toString()))
+                                    .build()
+                    ))
+                    .build();
+            vehicleConfigServiceFacade.validate_config_exist(vehicleConfigDto);
             rtn.put("status", ResponseCode.SUCCESS);
-        } catch (ScheduleException exp) {
+        } catch (PlanModuleException exp) {
             rtn.put("status", ResponseCode.ERROR);
             rtn.put("msg", exp.getMessage());
         }
  
         return rtn;
     }
+
+    //------------------ TODO：导入导出逻辑，之后会服务化 -----------------//
+    @Autowired
+    private CarConfigInfoService carConfigInfoService;
+    // 上传excel文件
+    @RequestMapping(value = "/uploadFile", method = RequestMethod.POST)
+    public Map<String, Object> uploadFile(MultipartFile file) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            DataToolsFile dataToolsFile = carConfigInfoService.uploadFile(file.getOriginalFilename(), file.getBytes());
+            // excel文件名
+            String fileName = dataToolsFile.getFile().getAbsolutePath();
+            Workbook wb = dataToolsFile.getFileType().getWorkBook(dataToolsFile.getFile());
+
+            // excel文件sheet
+            List<String> sheetnames = new ArrayList<>();
+            for (int i = 0; i < wb.getNumberOfSheets(); i ++) {
+                sheetnames.add(wb.getSheetAt(i).getSheetName());
+            }
+
+            wb.close();
+
+            rtn.put("status", ResponseCode.SUCCESS);
+            rtn.put("filename", fileName);
+            rtn.put("sheetnames", StringUtils.join(sheetnames, ","));
+        } catch (Exception exp) {
+            exp.printStackTrace();
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+        return rtn;
+    }
+    // 导入excel文件
+    @RequestMapping(value = "/importFile", method = RequestMethod.POST)
+    public Map<String, Object> importFile(@RequestParam Map<String, Object> params) {
+        Map<String, Object> rtn = new HashMap<>();
+
+        try {
+            File file = new File(String.valueOf(params.get("filename")));
+            if (!file.exists()) {
+                throw new Exception("导入文件不存在！");
+            }
+            carConfigInfoService.importData(file, params);
+
+            rtn.put("status", ResponseCode.SUCCESS);
+            rtn.put("msg", "导入文件成功");
+        } catch (Exception exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+    // 上传并导入excel文件
+    @RequestMapping(value = "/uploadAndImportFile", method = RequestMethod.POST)
+    public Map<String, Object> uploadAndImportFile(MultipartFile file) {
+        Map<String, Object> rtn = new HashMap<>();
+
+        try {
+            DataToolsFile dataToolsFile = carConfigInfoService.uploadFile(file.getOriginalFilename(), file.getBytes());
+            Map<String, Object> params = new HashMap<>();
+            carConfigInfoService.importData(dataToolsFile.getFile(), params);
+
+            rtn.put("status", ResponseCode.SUCCESS);
+            rtn.put("msg", "上传&导入文件成功");
+        } catch (Exception exp) {
+            exp.printStackTrace();
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
+    // 导出数据到xls文件
+    @RequestMapping(value = "/exportFile", method = RequestMethod.GET)
+    public void exportFile(HttpServletResponse response,
+                           @RequestParam Map<String, Object> params) throws Exception {
+        DataToolsFile dataToolsFile = carConfigInfoService.exportData(params);
+        // 流输出导出文件
+        response.setHeader("content-type", "application/octet-stream");
+        response.setHeader("Content-Disposition", "attachment; filename=" + dataToolsFile.getFile().getName());
+        response.setContentType("application/octet-stream");
+
+        OutputStream os = response.getOutputStream();
+        BufferedOutputStream bos = new BufferedOutputStream(os);
+
+        InputStream is = new FileInputStream(dataToolsFile.getFile());
+        BufferedInputStream bis = new BufferedInputStream(is);
+
+        int length = 0;
+        byte[] temp = new byte[1 * 1024 * 10];
+        while ((length = bis.read(temp)) != -1) {
+            bos.write(temp, 0, length);
+        }
+        bos.flush();
+        bis.close();
+        bos.close();
+        is.close();
+    }
+
+
 }
+package com.bsth.controller.schedule.core.legacy;
+
+import com.bsth.common.Constants;
+import com.bsth.common.ResponseCode;
+import com.bsth.controller.schedule.BController;
+import com.bsth.entity.schedule.CarConfigInfo;
+import com.bsth.entity.sys.CompanyAuthority;
+import com.bsth.repository.schedule.CarConfigInfoRepository;
+import com.bsth.service.schedule.CarConfigInfoService;
+import com.bsth.service.schedule.exception.ScheduleException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by xu on 16/5/9.
+ */
+//@RestController
+//@RequestMapping("cci")
+public class CarConfigInfoController extends BController<CarConfigInfo, Long> {
+    @Autowired
+    private CarConfigInfoRepository carConfigInfoRepository;
+    @Autowired
+    private CarConfigInfoService carConfigInfoService;
+
+
+    @RequestMapping(value = "/cars", method = RequestMethod.GET)
+    public List<Map<String, Object>> findCarConfigCars() {
+        return carConfigInfoRepository.findCarConfigCars();
+    }
+
+    @RequestMapping(value = "/cars2", method = RequestMethod.GET)
+    public List<Map<String, Object>> findCarsFromConfig() {
+        return carConfigInfoRepository.findCarsFromConfig();
+    }
+
+    @RequestMapping(value = "/validate_cars", method = RequestMethod.GET)
+    public Map<String, Object> validate_cars(@RequestParam Map<String, Object> param) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            // 车辆重复配置验证
+            CarConfigInfo carConfigInfo = new CarConfigInfo(
+                    param.get("id_eq"),
+                    param.get("xl.id_eq"),
+                    param.get("xl.name_eq"),
+                    param.get("cl.id_eq")
+            );
+            carConfigInfoService.validate_cars(carConfigInfo);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
+    @RequestMapping(value = "/validate_cars_2", method = RequestMethod.GET)
+    public Map<String, Object> validate_cars(@RequestParam Integer xlId, @RequestParam Integer clId) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            carConfigInfoService.validate_cars(xlId, clId);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
+    @RequestMapping(value = "/validate_cars_gs", method = RequestMethod.GET)
+    public Map<String, Object> validate_cars_gs(HttpServletRequest request, @RequestParam Map<String, Object> param) {
+        HttpSession session = request.getSession();
+        List<CompanyAuthority> cmyAuths = (List<CompanyAuthority>) session.getAttribute(Constants.COMPANY_AUTHORITYS);
+
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            CarConfigInfo carConfigInfo = new CarConfigInfo(
+                    null,
+                    param.get("xl.id_eq"),
+                    param.get("xl.name_eq"),
+                    param.get("cl.id_eq")
+            );
+            carConfigInfoService.validate_cars_gs(carConfigInfo, cmyAuths);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
+    @RequestMapping(value = "/validate_cars_fgs", method = RequestMethod.GET)
+    public Map<String, Object> validate_cars_fgs(HttpServletRequest request, @RequestParam Map<String, Object> param) {
+        HttpSession session = request.getSession();
+        List<CompanyAuthority> cmyAuths = (List<CompanyAuthority>) session.getAttribute(Constants.COMPANY_AUTHORITYS);
+
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            CarConfigInfo carConfigInfo = new CarConfigInfo(
+                    null,
+                    param.get("xl.id_eq"),
+                    param.get("xl.name_eq"),
+                    param.get("cl.id_eq")
+            );
+            carConfigInfoService.validate_cars_fgs(carConfigInfo, cmyAuths);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
+    @RequestMapping(value = "/validate_cars_config", method = RequestMethod.GET)
+    public Map<String, Object> validate_cars_config(@RequestParam Map<String, Object> param) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            CarConfigInfo carConfigInfo = new CarConfigInfo(
+                    null,
+                    param.get("xl.id_eq"),
+                    param.get("xl.name_eq"),
+                    param.get("cl.id_eq")
+            );
+            carConfigInfoService.validate_cars_config(carConfigInfo);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+}
@@ -19,6 +19,9 @@
     <!-- 车辆设备信息服务 -->
     <dubbo:reference interface="com.bsth.control_v2.plan_module.common.service.baseinfo.CarDeviceServiceFacade" id="carDeviceServiceFacadeImpl" check="false" />
  
+    <!-- 车辆配置信息服务 -->
+    <dubbo:reference interface="com.bsth.control_v2.plan_module.common.service.schedule.config.VehicleConfigServiceFacade" id="vehicleConfigServiceFacadeImpl" check="false" />
+
     <!-- 时刻表班型明细服务 -->
     <dubbo:reference interface="com.bsth.control_v2.plan_module.common.service.schedule.timetable.TTInfoBxDetailServiceFacade" id="tTInfoBxDetailServiceFacadeImpl" check="false" />
     <!-- 时刻表明细服务 -->