From 826cd5b51d5106cfea07e397eda184fb15ec7a30 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 02 八月 2024 14:33:59 +0800
Subject: [PATCH] 修改

---
 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java |  389 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 377 insertions(+), 12 deletions(-)

diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
index 911c047..2154a48 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
@@ -3,14 +3,29 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.zt.common.constant.Constant;
 import com.zt.common.service.BaseService;
+import com.zt.common.utils.CacheUtils;
+import com.zt.common.utils.CommonUtils;
 import com.zt.common.utils.TreeUtils;
+import com.zt.common.utils.UUIDUtil;
+import com.zt.core.shiro.ImportUtil;
 import com.zt.life.modules.mainPart.basicInfo.dao.XhProductModelDao;
+import com.zt.life.modules.mainPart.basicInfo.model.ParamData;
 import com.zt.life.modules.mainPart.basicInfo.model.ProductImg;
 import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
+import com.zt.life.modules.mainPart.sysPictureBase.service.SysPictureBaseService;
+import com.zt.modules.sys.dto.DictTypeDto;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zt.common.db.query.QueryFilter;
+import org.springframework.web.multipart.MultipartFile;
 
-import java.util.List;
+import java.util.*;
 
 
 /**
@@ -21,6 +36,10 @@
  */
 @Service
 public class XhProductModelService extends BaseService<XhProductModelDao, XhProductModel> {
+    @Autowired
+    ParamDataService paramDataService;
+    @Autowired
+    SysPictureBaseService sysPictureBaseService;
 
     /**
      * 鍒嗛〉鏌ヨ
@@ -42,24 +61,52 @@
         super.deleteLogic(ids);
     }
 
-    public List<XhProductModel> getAllTree(Boolean showXdy) {
-        List<XhProductModel> productList;
+    public List<XhProductModel> getAllTree(Boolean showXdy, Integer ztShow, Long productId) {
+        List<XhProductModel> productList = null;
         if (showXdy) {
-            productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
-                    Constant.Bool.NO).gt("product_type", 1).orderByAsc(Constant.TableColumn.SORT));
+            if (productId != null) {
+                productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
+                        Constant.Bool.NO).ne("product_type", 5).and(wrapper -> wrapper.eq("ship_id", productId).or().eq("id", productId)).orderByAsc(Constant.TableColumn.SORT));
+            } else {
+                productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
+                        Constant.Bool.NO).ne("product_type", 5).orderByAsc(Constant.TableColumn.SORT));
+            }
         } else {
-            productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
-                    Constant.Bool.NO).gt("product_type", 1).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
-
+            if (productId == null) {
+                if (ztShow == 1) {
+                    productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
+                            Constant.Bool.NO).lt("product_type", 5).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
+                } else if (ztShow == 2) {
+                    productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
+                            Constant.Bool.NO).lt("product_type", 4).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
+                } else if (ztShow == 3) {
+                    productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
+                            Constant.Bool.NO).lt("product_type", 3).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
+                } else if (ztShow == 4) {
+                    productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
+                            Constant.Bool.NO).lt("product_type", 5).ne("product_type", 1).orderByAsc(Constant.TableColumn.SORT));
+                } else if (ztShow == 5) {
+                    productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
+                            Constant.Bool.NO).gt("product_type", 1).orderByAsc(Constant.TableColumn.SORT));
+                }
+            } else {
+                if (ztShow == 4) {
+                    productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
+                            Constant.Bool.NO).lt("product_type", 5).ne("product_type", 1).and(wrapper -> wrapper.eq("ship_id", productId).or().eq("id", productId)).orderByAsc(Constant.TableColumn.SORT));
+                } else if (ztShow == 5) {
+                    productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
+                            Constant.Bool.NO).gt("product_type", 1).and(wrapper -> wrapper.eq("ship_id", productId).or().eq("id", productId)).orderByAsc(Constant.TableColumn.SORT));
+                }
+            }
         }
         return TreeUtils.build(productList);
     }
 
-    public Integer getNo(Long pid) {
-        if (baseDao.getNo(pid) == null) {
+    public Integer getNo(Long pid, String productType) {
+        if (baseDao.getNo(pid, productType) == null) {
             return 0;
         }
-        return baseDao.getNo(pid);
+        return baseDao.getNo(pid, productType);
     }
 
     public List<XhProductModel> getProductList() {
@@ -68,10 +115,328 @@
     }
 
     public List<ProductImg> getProduct(Long productId) {
-        return baseDao.getProduct(productId);
+        XhProductModel model = this.get(productId);
+        Long parentId = model.getPid();
+        return baseDao.getProduct(productId, parentId);
     }
 
     public List<XhProductModel> getTaskProductList() {
         return baseDao.getTaskProductList();
     }
+
+    public List<Map<String, Object>> importProductExcel(MultipartFile mutFile, String progressId, Long shipId) {
+        int count = 0;
+        Date beginDate = new Date();
+        List<Map<String, Object>> list = new ArrayList<>();//瀛樺偍鎵�鏈夌殑瀵煎叆鐘舵��
+        Map<String, Object> map;//瀛樺偍姣忎竴琛岀殑鐘舵��
+        Integer sum = 0; // 鎬诲叡鐨勬潯鏁�
+        Integer suc = 0; // 鎴愬姛鐨勬潯鏁�
+        Integer err = 0; // 澶辫触鐨勬潯鏁�
+        int row1 = 0;
+        Map<String, Object> errMap = new HashMap<>();
+        Map<String, Integer> reliabType = new HashMap<>();
+        reliabType.put("鎸囨暟鍒嗗竷", 1);
+        reliabType.put("浜岄」鍒嗗竷", 3);
+        reliabType.put("濞佸竷灏斿垎甯�", 2);
+        Map<String, Integer> repairType = new HashMap<>();
+        repairType.put("鎸囨暟鍒嗗竷", 1);
+        repairType.put("濞佸竷灏斿垎甯�", 2);
+        Map<String, Integer> isOrNot = new HashMap<>();
+        isOrNot.put("鏄�", 1);
+        isOrNot.put("鍚�", 0);
+
+        //鑾峰彇鏄惁鏈夋暟鎹紝濡傛灉鏈夊垯鍒犻櫎鏁版嵁
+     /*   List<XhProductModel> productList = this.getByShipId(shipId);
+        List<ParamData> dataList = paramDataService.getByShipId(shipId);
+        if (productList.size() > 0) {
+            this.deleteByShipId(shipId);
+        }
+        if (dataList.size() > 0) {
+            paramDataService.deleteByShipId(shipId);
+        }*/
+
+        try {
+            // 鑾峰彇瀵煎叆鏂囦欢鐨勫悗缂�鍚�
+            String fileName = mutFile.getOriginalFilename();
+            Workbook workbook = null;
+            //瑙e喅excel鐗堟湰闂
+            if (fileName != null && fileName.endsWith(".xls")) {
+                workbook = new HSSFWorkbook(mutFile.getInputStream());
+            } else if (fileName != null && fileName.endsWith(".xlsx")) {
+                workbook = new XSSFWorkbook(mutFile.getInputStream());
+            }
+            assert workbook != null; //鏂█濡傛灉[boolean琛ㄨ揪寮廬涓簍rue锛屽垯绋嬪簭缁х画鎵ц銆� 濡傛灉涓篺alse锛屽垯绋嬪簭鎶涘嚭AssertionError锛屽苟缁堟鎵ц銆�
+            int sheets = workbook.getNumberOfSheets();
+
+            //List<LifeManagement> lifeManagementList = new ArrayList<LifeManagement>();
+            Long curXtId = null;
+            Long curFxtId = null;
+            Long curSbId = null;
+            String curXtName = "";
+            String curFxtName = "";
+
+
+            Map<String, XhProductModel> modelMap = new HashMap<>();
+            List<XhProductModel> prductList =baseDao.getProductPath(shipId);
+
+            for (XhProductModel product :prductList){
+                if(StringUtils.isNotBlank(product.getNamePath())){
+                    modelMap.put(product.getNamePath(),product);
+                }
+            }
+
+            boolean insertXt;
+            boolean insertFxt;
+            Boolean insertSb;
+            for (int i = 0; i < sheets; i++) {
+                Sheet sheet = workbook.getSheetAt(i);
+                int num = sheet.getLastRowNum(); // 涓�鍏辨湁澶氬皯琛�
+                String sheetName = sheet.getSheetName(); //鑾峰彇褰撳墠sheet鍚嶇О
+                for (int j = 1; j <= num; j++) {
+                    insertXt = false;
+                    insertFxt = false;
+                    insertSb = false;
+                    CacheUtils.put(progressId, "speed", CommonUtils.getPercent(j, num));
+                    CacheUtils.put(progressId, "msg", "鍏�" + num + "琛岋紝宸插畬鎴愮" + j + "琛�");
+                  /*  boolean isToggleXt = false;
+                    boolean isToggleFxt = false;*/
+                    row1 = j + 1;
+                    String pattern = "yyyy-MM-dd";
+                    Row row = sheet.getRow(row1);
+                    String sort = com.zt.core.shiro.ImportUtil.getCellValue(row, 0, pattern); //搴忓彿
+/*                    if (StringUtils.isNotBlank(com.zt.core.shiro.ImportUtil.getCellValue(row, 1, pattern))) {
+                        if (!com.zt.core.shiro.ImportUtil.getCellValue(row, 1, pattern).equals(xt)) {
+                            isToggleXt = true;
+                            xtId = UUIDUtil.generateId();
+                        }
+                        xt = com.zt.core.shiro.ImportUtil.getCellValue(row, 1, pattern); //绯荤粺
+                    }
+
+                    if (StringUtils.isNotBlank(com.zt.core.shiro.ImportUtil.getCellValue(row, 2, pattern)) && !isToggleXt) {
+                        fxt = com.zt.core.shiro.ImportUtil.getCellValue(row, 2, pattern); //鍒嗙郴缁�
+                        fxtId = UUIDUtil.generateId();
+                        isToggleFxt = true;
+                    } else if (isToggleXt) {
+                        if (StringUtils.isNotBlank(com.zt.core.shiro.ImportUtil.getCellValue(row, 2, pattern))) {
+                            fxt = com.zt.core.shiro.ImportUtil.getCellValue(row, 2, pattern); //鍒嗙郴缁�
+                            fxtId = UUIDUtil.generateId();
+                            isToggleFxt = true;
+                        } else {
+                            fxt = null;
+                            isToggleFxt = true;
+                        }
+                    }*/
+
+                    String xt = com.zt.core.shiro.ImportUtil.getCellValue(row, 1, pattern); //绯荤粺
+                    String fxt = com.zt.core.shiro.ImportUtil.getCellValue(row, 2, pattern);
+                    String sb = com.zt.core.shiro.ImportUtil.getCellValue(row, 3, pattern); //璁惧
+                    String equipType = com.zt.core.shiro.ImportUtil.getCellValue(row, 4, pattern); //璁惧绫诲瀷
+                    String reliabDistribType = com.zt.core.shiro.ImportUtil.getCellValue(row, 5, pattern); //鍙潬鎬у垎甯冪被鍨�
+                    String basicJoinCompute = com.zt.core.shiro.ImportUtil.getCellValue(row, 6, pattern); //鍙傚姞璁$畻
+                    String basicMtbfRegulate = com.zt.core.shiro.ImportUtil.getCellValue(row, 7, pattern); //mtbf
+                    String basicMtbfRegulSuccRate = com.zt.core.shiro.ImportUtil.getCellValue(row, 8, pattern); //鎴愬姛鐜�
+                    String basicMtbfOperatingRatio = com.zt.core.shiro.ImportUtil.getCellValue(row, 9, pattern); //杩愯姣�
+                    String taskMtbcfRegulate = com.zt.core.shiro.ImportUtil.getCellValue(row, 10, pattern); //mtbcf
+                    String taskMtbcfOtherParams2 = com.zt.core.shiro.ImportUtil.getCellValue(row, 11, pattern); //mtbcf鍏朵粬鍙傛暟2
+                    String taskMtbcfOtherParams3 = com.zt.core.shiro.ImportUtil.getCellValue(row, 12, pattern); //mtbcf鍏朵粬鍙傛暟3
+                    String taskMtbcfRegulSuccRate = com.zt.core.shiro.ImportUtil.getCellValue(row, 13, pattern); //mtbcf鎴愬姛鐜�
+                    String taskMtbcfOperatingRatio = com.zt.core.shiro.ImportUtil.getCellValue(row, 14, pattern); //mtbcf杩愯姣�
+                    String repairable = com.zt.core.shiro.ImportUtil.getCellValue(row, 15, pattern); //鏄惁鍙淮淇�
+                    String repairDistribType = com.zt.core.shiro.ImportUtil.getCellValue(row, 16, pattern); //缁翠慨鍙戝竷绫诲瀷
+                    String repairMttcr = com.zt.core.shiro.ImportUtil.getCellValue(row, 17, pattern); //mttcr
+                    String repairMttcrOtherParams2 = com.zt.core.shiro.ImportUtil.getCellValue(row, 18, pattern); //mttcr鍏朵粬鍙傛暟2
+                    String repairMttcrOtherParams3 = com.zt.core.shiro.ImportUtil.getCellValue(row, 19, pattern); //mttcr鍏朵粬鍙傛暟3
+
+                    if (StringUtils.isBlank(sb))
+                        continue;
+
+                    if (StringUtils.isBlank(xt)) {
+                        if (StringUtils.isBlank(curXtName))
+                            continue;
+                        else
+                            xt = curXtName;
+                    } else {
+                        if (StringUtils.isBlank(curXtName) || !xt.equals(curXtName)) {
+                            curXtName = xt;
+                            if (modelMap.get(curXtName) == null) {
+                                curXtId = UUIDUtil.generateId();
+                                insertXt = true;
+                            } else {
+                                curXtId = modelMap.get(curXtName).getId();
+                            }
+                            curFxtId = null;
+                            curFxtName = "";
+                        }
+                    }
+                    String fxtPath = "";
+                    if (StringUtils.isNotBlank(fxt) && !fxt.equals(curFxtName)) {
+                        curFxtName = fxt;
+                        fxtPath = curXtName + "," + curFxtName;
+                        if (modelMap.get(fxtPath) == null) {
+                            curFxtId = UUIDUtil.generateId();
+                            insertFxt = true;
+                        } else {
+                            curFxtId = modelMap.get(fxtPath).getId();
+                        }
+                    }
+
+                    String sbPath = curXtName + "," + (StringUtils.isBlank(curFxtName) ? "" : curFxtName + ",") + sb;
+                    if (modelMap.get(sbPath) == null) {
+                        curSbId = UUIDUtil.generateId();
+                        insertSb = true;
+                    } else {
+                        curSbId = modelMap.get(sbPath).getId();
+                    }
+
+
+                    if (StringUtils.isEmpty(sb)) {
+                        com.zt.life.util.ImportUtil.updateErrMap(errMap, "娌℃湁濉啓璁惧鍚嶇О", sheetName, row1);
+                        continue;
+                    }
+                    //瀵煎叆鍨嬪彿浜у搧缁撴灉搴�
+                    XhProductModel xhProductModel = new XhProductModel();
+
+                    Long defultImg = null;
+                    xhProductModel.setShipId(shipId);
+
+                    //娣诲姞绯荤粺
+                    if (insertXt) {
+                        xhProductModel.setPid(shipId);
+                        xhProductModel.setId(curXtId);
+                        xhProductModel.setName(xt);
+                        xhProductModel.setProductType("3");
+                        xhProductModel.setSort(Integer.valueOf(sort));
+                        defultImg = sysPictureBaseService.getDefaultImg(3).getId();
+                        xhProductModel.setOperatImg(defultImg);
+                        xhProductModel.setNamePath(curXtName);
+                        this.insert(xhProductModel);
+
+                        //瀵煎叆棰勮鍙傛暟
+                        ParamData itemEntity = new ParamData();
+                        itemEntity.setShipId(shipId);
+                        itemEntity.setProductId(curXtId);
+                        itemEntity.setPageCode("expect");
+                        paramDataService.insert(itemEntity);
+                    }
+
+
+                    if (insertFxt) {
+                        xhProductModel.setPid(curXtId);
+                        xhProductModel.setId(curFxtId);
+                        xhProductModel.setName(fxt);
+                        xhProductModel.setProductType("4");
+                        xhProductModel.setSort(Integer.valueOf(sort));
+                        defultImg = sysPictureBaseService.getDefaultImg(4).getId();
+                        xhProductModel.setOperatImg(defultImg);
+                        xhProductModel.setNamePath(fxtPath);
+                        this.insert(xhProductModel);
+
+                        //瀵煎叆棰勮鍙傛暟
+                        ParamData itemEntity = new ParamData();
+                        itemEntity.setShipId(shipId);
+                        itemEntity.setProductId(curFxtId);
+                        itemEntity.setPageCode("expect");
+                        paramDataService.insert(itemEntity);
+                    }
+
+                    if (insertSb) {
+                        xhProductModel.setPid(curFxtId == null ? curXtId : curFxtId);
+                        xhProductModel.setId(curSbId);
+                        xhProductModel.setName(sb);
+                        xhProductModel.setEquipType(equipType);
+                        xhProductModel.setProductType("5");
+                        xhProductModel.setSort(Integer.valueOf(sort));
+                        defultImg = sysPictureBaseService.getDefaultImg(5).getId();
+                        xhProductModel.setOperatImg(defultImg);
+                        xhProductModel.setNamePath(sbPath);
+                        this.insert(xhProductModel);
+                    }
+
+
+                    //瀵煎叆棰勮鍙傛暟
+                    ParamData itemEntity = new ParamData();
+                    //缁戝畾璁惧ID
+                    itemEntity.setShipId(shipId);
+                    itemEntity.setProductId(curSbId);
+                    itemEntity.setPageCode("expect");
+                    itemEntity.setReliabDistribType(reliabType.get(reliabDistribType));
+                    itemEntity.setBasicJoinCompute(isOrNot.get(basicJoinCompute));
+                    if (StringUtils.isNotBlank(basicMtbfRegulate)) {
+                        itemEntity.setBasicMtbfRegulate(Double.valueOf(basicMtbfRegulate));
+                    }
+                    if (StringUtils.isNotBlank(basicMtbfRegulSuccRate)) {
+                        itemEntity.setBasicMtbfRegulSuccRate(Double.valueOf(basicMtbfRegulSuccRate));
+                    }
+                    if (StringUtils.isNotBlank(basicMtbfOperatingRatio)) {
+                        itemEntity.setBasicMtbfOperatingRatio(Double.valueOf(basicMtbfOperatingRatio));
+                    } else {
+                        itemEntity.setBasicMtbfOperatingRatio(1.0);
+                    }
+                    if (StringUtils.isNotBlank(taskMtbcfRegulate)) {
+                        itemEntity.setTaskMtbcfRegulate(Double.valueOf(taskMtbcfRegulate));
+                    }
+                    if (StringUtils.isNotBlank(taskMtbcfOtherParams2)) {
+                        itemEntity.setTaskMtbcfOtherParams2(Double.valueOf(taskMtbcfOtherParams2));
+                    }
+                    if (StringUtils.isNotBlank(taskMtbcfOtherParams3)) {
+                        itemEntity.setTaskMtbcfOtherParams3(Double.valueOf(taskMtbcfOtherParams3));
+                    }
+                    if (StringUtils.isNotBlank(taskMtbcfRegulSuccRate)) {
+                        itemEntity.setTaskMtbcfRegulSuccRate(Double.valueOf(taskMtbcfRegulSuccRate));
+                    }
+                    if (StringUtils.isNotBlank(taskMtbcfOperatingRatio)) {
+                        itemEntity.setTaskMtbcfOperatingRatio(Double.valueOf(taskMtbcfOperatingRatio));
+                    } else {
+                        itemEntity.setTaskMtbcfOperatingRatio(1.0);
+                    }
+                    itemEntity.setRepairable(isOrNot.get(repairable));
+                    itemEntity.setRepairDistribType(repairType.get(repairDistribType));
+                    if (StringUtils.isNotBlank(repairMttcr)) {
+                        itemEntity.setRepairMttcr(Double.valueOf(repairMttcr));
+                    }
+                    if (StringUtils.isNotBlank(repairMttcrOtherParams2)) {
+                        itemEntity.setRepairMttcrOtherParams2(Double.valueOf(repairMttcrOtherParams2));
+                    }
+                    if (StringUtils.isNotBlank(repairMttcrOtherParams3)) {
+                        itemEntity.setRepairMttcrOtherParams3(Double.valueOf(repairMttcrOtherParams3));
+                    }
+                    if (modelMap.get(sbPath) == null)
+                        paramDataService.insert(itemEntity);
+                    else
+                        paramDataService.update(itemEntity);
+                }
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            ImportUtil.updateErrMap(errMap, "瀵煎叆寮傚父" + e.getMessage(), "", row1);
+            //err++;
+        }
+      /*  if (batchList.size() > 0 && err == 0) {
+            super.insertBatch(batchList, 100);
+            baseDao.updateOldId();
+        }
+        if (batchUpdateList.size() > 0) {
+            super.updateBatch(batchUpdateList, 100);
+        }*/
+        Date nowDate = new Date();
+        String msg = "浜у搧妯″瀷瀵煎叆鏃堕棿锛�" + CommonUtils.getDatePoor(nowDate, beginDate) + "\r\n";
+        System.out.println(msg);
+        suc = sum - err;
+        map = new HashMap<>();
+        map.put("sum", sum + ""); // 鎵�鏈夊鍏ョ殑鏉℃暟
+        map.put("suc", suc + ""); // 鎴愬姛鐨勬潯鏁�
+        map.put("err", err + ""); // 澶辫触鐨勬潯鏁�
+        list.add(map);
+        list.add(errMap);
+        return list;
+    }
+
+    private void deleteByShipId(Long shipId) {
+        baseDao.deleteByShipId(shipId);
+    }
+
+    private List<XhProductModel> getByShipId(Long shipId) {
+        return baseDao.getByShipId(shipId);
+    }
 }

--
Gitblit v1.9.1