iss提交10：

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

iss提交10：
1、添加使用路牌配置服务的controller，把原来的controller放入legacy包中 2、在dubbo消费者配置文件中配置路牌配置服务
徐烜
1 parent 7cceed4d
Showing 5 changed files with 238 additions and 18 deletions
src/main/java/com/bsth/controller/schedule/core/CarConfigInfoController_facade.java
src/main/java/com/bsth/controller/schedule/core/EmployeeConfigInfoController_facade.java
src/main/java/com/bsth/controller/schedule/core/GuideboardInfoController_facade.java
src/main/java/com/bsth/controller/schedule/core/GuideboardInfoController.java → src/main/java/com/bsth/controller/schedule/core/legacy/GuideboardInfoController.java
src/main/resources/dubbo/applicationContext_dubbo_consumer.xml
@@ -8,7 +8,6 @@ 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;
@@ -94,7 +93,7 @@ public class CarConfigInfoController_facade extends BController_facade&lt;Long, Veh
             vehicleConfigServiceFacade.validate_already_config(vehicleConfigDto);
             rtn.put("status", ResponseCode.SUCCESS);
-        } catch (PlanModuleException exp) {
+        } catch (Exception exp) {
             rtn.put("status", ResponseCode.ERROR);
             rtn.put("msg", exp.getMessage());
         }
@@ -117,7 +116,7 @@ public class CarConfigInfoController_facade extends BController_facade&lt;Long, Veh
             vehicleConfigServiceFacade.validate_already_config(vehicleConfigDto);
             rtn.put("status", ResponseCode.SUCCESS);
-        } catch (PlanModuleException exp) {
+        } catch (Exception exp) {
             rtn.put("status", ResponseCode.ERROR);
             rtn.put("msg", exp.getMessage());
         }
@@ -159,7 +158,7 @@ public class CarConfigInfoController_facade extends BController_facade&lt;Long, Veh
             vehicleConfigServiceFacade.validate_cars_gs(vehicleConfigDto, companyAuthorityDtoList);
             rtn.put("status", ResponseCode.SUCCESS);
-        } catch (PlanModuleException exp) {
+        } catch (Exception exp) {
             rtn.put("status", ResponseCode.ERROR);
             rtn.put("msg", exp.getMessage());
         }
@@ -201,7 +200,7 @@ public class CarConfigInfoController_facade extends BController_facade&lt;Long, Veh
             vehicleConfigServiceFacade.validate_cars_fgs(vehicleConfigDto, companyAuthorityDtoList);
             rtn.put("status", ResponseCode.SUCCESS);
-        } catch (PlanModuleException exp) {
+        } catch (Exception exp) {
             rtn.put("status", ResponseCode.ERROR);
             rtn.put("msg", exp.getMessage());
         }
@@ -228,7 +227,7 @@ public class CarConfigInfoController_facade extends BController_facade&lt;Long, Veh
                     .build();
             vehicleConfigServiceFacade.validate_config_exist(vehicleConfigDto);
             rtn.put("status", ResponseCode.SUCCESS);
-        } catch (PlanModuleException exp) {
+        } catch (Exception exp) {
             rtn.put("status", ResponseCode.ERROR);
             rtn.put("msg", exp.getMessage());
         }
@@ -8,7 +8,6 @@ import com.bsth.control_v2.plan_module.common.dto.baseinfo.PersonnelDto;
 import com.bsth.control_v2.plan_module.common.dto.schedule.config.EmployeeConfigDto;
 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.EmployeeConfigServiceFacade;
 import com.bsth.controller.schedule.BController_facade;
@@ -105,7 +104,7 @@ public class EmployeeConfigInfoController_facade extends BController_facade&lt;Long
                     .build();
             employeeConfigServiceFacade.validate_jsy_duplicate_without_current(employeeConfigDto);
             rtn.put("status", ResponseCode.SUCCESS);
-        } catch (PlanModuleException exp) {
+        } catch (Exception exp) {
             rtn.put("status", ResponseCode.ERROR);
             rtn.put("msg", exp.getMessage());
         }
@@ -132,7 +131,7 @@ public class EmployeeConfigInfoController_facade extends BController_facade&lt;Long
                     .build();
             employeeConfigServiceFacade.validate_jsy_exist(employeeConfigDto);
             rtn.put("status", ResponseCode.SUCCESS);
-        } catch (PlanModuleException exp) {
+        } catch (Exception exp) {
             rtn.put("status", ResponseCode.ERROR);
             rtn.put("msg", exp.getMessage());
         }
@@ -173,7 +172,7 @@ public class EmployeeConfigInfoController_facade extends BController_facade&lt;Long
                     .build();
             employeeConfigServiceFacade.validate_jsy_gs_authority(employeeConfigDto, companyAuthorityDtoList);
             rtn.put("status", ResponseCode.SUCCESS);
-        } catch (PlanModuleException exp) {
+        } catch (Exception exp) {
             rtn.put("status", ResponseCode.ERROR);
             rtn.put("msg", exp.getMessage());
         }
@@ -214,7 +213,7 @@ public class EmployeeConfigInfoController_facade extends BController_facade&lt;Long
                     .build();
             employeeConfigServiceFacade.validate_jsy_fgs_authority(employeeConfigDto, companyAuthorityDtoList);
             rtn.put("status", ResponseCode.SUCCESS);
-        } catch (PlanModuleException exp) {
+        } catch (Exception exp) {
             rtn.put("status", ResponseCode.ERROR);
             rtn.put("msg", exp.getMessage());
         }
@@ -242,7 +241,7 @@ public class EmployeeConfigInfoController_facade extends BController_facade&lt;Long
                     .build();
             employeeConfigServiceFacade.validate_spy_duplicate_without_current(employeeConfigDto);
             rtn.put("status", ResponseCode.SUCCESS);
-        } catch (PlanModuleException exp) {
+        } catch (Exception exp) {
             rtn.put("status", ResponseCode.ERROR);
             rtn.put("msg", exp.getMessage());
         }
@@ -268,7 +267,7 @@ public class EmployeeConfigInfoController_facade extends BController_facade&lt;Long
                     .build();
             employeeConfigServiceFacade.validate_spy_exist(employeeConfigDto);
             rtn.put("status", ResponseCode.SUCCESS);
-        } catch (PlanModuleException exp) {
+        } catch (Exception exp) {
             rtn.put("status", ResponseCode.ERROR);
             rtn.put("msg", exp.getMessage());
         }
@@ -308,7 +307,7 @@ public class EmployeeConfigInfoController_facade extends BController_facade&lt;Long
                     .build();
             employeeConfigServiceFacade.validate_spy_gs_authority(employeeConfigDto, companyAuthorityDtoList);
             rtn.put("status", ResponseCode.SUCCESS);
-        } catch (PlanModuleException exp) {
+        } catch (Exception exp) {
             rtn.put("status", ResponseCode.ERROR);
             rtn.put("msg", exp.getMessage());
         }
@@ -348,7 +347,7 @@ public class EmployeeConfigInfoController_facade extends BController_facade&lt;Long
                     .build();
             employeeConfigServiceFacade.validate_spy_fgs_authority(employeeConfigDto, companyAuthorityDtoList);
             rtn.put("status", ResponseCode.SUCCESS);
-        } catch (PlanModuleException exp) {
+        } catch (Exception exp) {
             rtn.put("status", ResponseCode.ERROR);
             rtn.put("msg", exp.getMessage());
         }
+package com.bsth.controller.schedule.core;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.control_v2.plan_module.common.dto.baseinfo.LineDto;
+import com.bsth.control_v2.plan_module.common.dto.schedule.config.LpConfigDto;
+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.LpConfigServiceFacade;
+import com.bsth.controller.schedule.BController_facade;
+import com.bsth.entity.schedule.GuideboardInfo;
+import com.bsth.service.schedule.GuideboardInfoService;
+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.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.util.*;
+
+/**
+ * 路牌管理控制器。
+ */
+@RestController
+@RequestMapping("gic")
+public class GuideboardInfoController_facade extends BController_facade<Long, LpConfigDto> {
+    @Override
+    public void setCreateUserInfo(LpConfigDto lpConfigDto, Integer userId, Date createDate) {
+        UserDto userDto = UserDto.getBuilder()
+                .setId(userId)
+                .build();
+        lpConfigDto.setCreateBy(userDto);
+        lpConfigDto.setCreateDate(createDate);
+    }
+
+    @Override
+    public void setUpdateUserInfo(LpConfigDto lpConfigDto, Integer userId, Date updateDate) {
+        UserDto userDto = UserDto.getBuilder()
+                .setId(userId)
+                .build();
+        lpConfigDto.setUpdateBy(userDto);
+        lpConfigDto.setUpdateDate(updateDate);
+    }
+
+    @Autowired
+    private LpConfigServiceFacade lpConfigServiceFacade;
+
+    @Override
+    protected BServiceFacade<Long, LpConfigDto> getBServiceFacade() {
+        return lpConfigServiceFacade;
+    }
+
+    @RequestMapping(value = "/ttlpnames", method = RequestMethod.GET)
+    public List<Map<String, Object>> findLpName(Long ttid) {
+        return lpConfigServiceFacade.findLpName_from_ttinfo(ttid);
+    }
+
+    @RequestMapping(value = "lpno/{xlid}", method = RequestMethod.GET)
+    public Map<String, Object> getLpNo(@PathVariable("xlid") Integer xl) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            rtn.put("data", lpConfigServiceFacade.getMaxLpno(xl));
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (Exception exp) {
+            exp.printStackTrace();
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
+    @RequestMapping(value = "/validate_lpno", method = RequestMethod.GET)
+    public Map<String, Object> validate_lpno(@RequestParam Map<String, Object> param) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            LpConfigDto lpConfigDto = LpConfigDto.getBuilder()
+                    .setId(param.get("id_eq") == null ? null : Long.valueOf(param.get("id_eq").toString()))
+                    .setXl(param.get("xl.id_eq") == null ? null : (
+                            LineDto.getBuilder()
+                                    .setId(Integer.valueOf(param.get("xl.id_eq").toString()))
+                                    .build()
+                            ))
+                    .setLpNo(param.get("lpNo_eq") == null ? null : Integer.valueOf(param.get("lpNo_eq").toString()))
+                    .build();
+            lpConfigServiceFacade.validate_lpno_duplicate(lpConfigDto);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (Exception exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+        return rtn;
+    }
+
+    @RequestMapping(value = "/validate_lpname", method = RequestMethod.GET)
+    public Map<String, Object> validate_lpname(@RequestParam Map<String, Object> param) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            LpConfigDto lpConfigDto = LpConfigDto.getBuilder()
+                    .setId(param.get("id_eq") == null ? null : Long.valueOf(param.get("id_eq").toString()))
+                    .setXl(param.get("xl.id_eq") == null ? null : (
+                            LineDto.getBuilder()
+                                    .setId(Integer.valueOf(param.get("xl.id_eq").toString()))
+                                    .build()
+                    ))
+                    .setLpName(param.get("lpName_eq") == null ? null : param.get("lpNo_eq").toString())
+                    .build();
+            lpConfigServiceFacade.validate_lpname_duplicate(lpConfigDto);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (Exception exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+        return rtn;
+    }
+
+    //------------------ TODO：导入导出逻辑，之后会服务化 -----------------//
+    @Autowired
+    private GuideboardInfoService guideboardInfoService;
+    // 上传excel文件
+    @RequestMapping(value = "/uploadFile", method = RequestMethod.POST)
+    public Map<String, Object> uploadFile(MultipartFile file) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            DataToolsFile dataToolsFile = guideboardInfoService.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("导入文件不存在！");
+            }
+            guideboardInfoService.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 = guideboardInfoService.uploadFile(file.getOriginalFilename(), file.getBytes());
+            Map<String, Object> params = new HashMap<>();
+            guideboardInfoService.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 = guideboardInfoService.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;
+package com.bsth.controller.schedule.core.legacy;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.schedule.BController;
@@ -16,8 +16,8 @@ import java.util.Map;
 /**
  * 路牌管理控制器。
  */
-@RestController
-@RequestMapping("gic")
+//@RestController
+//@RequestMapping("gic")
 public class GuideboardInfoController extends BController<GuideboardInfo, Long> {
     @Autowired
     private GuideboardInfoService guideboardInfoService;
@@ -23,6 +23,8 @@
     <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.config.EmployeeConfigServiceFacade" id="employeeConfigServiceFacadeImpl" check="false" />
+    <!-- 路牌配置信息服务 -->
+    <dubbo:reference interface="com.bsth.control_v2.plan_module.common.service.schedule.config.LpConfigServiceFacade" id="lpConfigServiceFacadeImpl" check="false" />
     <!-- 时刻表班型明细服务 -->
     <dubbo:reference interface="com.bsth.control_v2.plan_module.common.service.schedule.timetable.TTInfoBxDetailServiceFacade" id="tTInfoBxDetailServiceFacadeImpl" check="false" />