Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shipping/controller/TAddressController.java

@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.shipping.controller;
 import java.util.List;
 import java.util.Map;
 
+import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.utils.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -191,34 +192,14 @@ public class TAddressController extends BaseController
         if (StringUtils.isEmpty(tAddress.getfName())){
             return AjaxResult.error("地点名称不能为空");
         }
-        TAddress address = new TAddress();
-        address.setfTypes(tAddress.getfTypes());
-        address.setfName(tAddress.getfName());
-        address.setfNo(tAddress.getfNo());
+        if (UserConstants.NOT_UNIQUE.equals(tAddressService.selectAddressFno(tAddress))) {
+            return AjaxResult.error(tAddress.getfNo() + "编号已存在");
+        } else if (UserConstants.NOT_UNIQUE.equals(tAddressService.selectAddressFName(tAddress))){
+            return AjaxResult.error(tAddress.getfName() + "名称已存在");
+        }
         if (tAddress.getfId()==null){
-            String name = tAddressService.selectAddressFName(address);
-            if (StringUtils.isNotEmpty(name)){
-                return AjaxResult.error("名称已存在");
-            }
-            String addressFno = tAddressService.selectAddressFno(address);
-            if (StringUtils.isNotEmpty(addressFno)){
-               return AjaxResult.error("编号已存在");
-            }
             return toAjax(tAddressService.insertTAddress(tAddress));
         }else {
-            TAddress tAddressById = tAddressService.selectTAddressById(tAddress.getfId());
-            if (!tAddressById.getfNo().equals(tAddress.getfNo())){
-                String addressFno = tAddressService.selectAddressFno(address);
-                if (StringUtils.isNotEmpty(addressFno)){
-                    return AjaxResult.error("编号已存在");
-                }
-            }
-            if (!tAddressById.getfName().equals(tAddress.getfName())){
-                String name = tAddressService.selectAddressFName(address);
-                if (StringUtils.isNotEmpty(name)){
-                    return AjaxResult.error("名称已存在");
-                }
-            }
             if (tAddress.getfStatus().equals("T") ||tAddress.getfStatus().equals("正常")){
                 tAddress.setfStatus("T");
             }else {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shipping/controller/TCntrController.java

@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.shipping.controller;
 import java.util.List;
 import java.util.Map;
 
+import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.utils.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -88,29 +89,14 @@ public class TCntrController extends BaseController
         }else if (StringUtils.isEmpty(tCntr.getfName())){
             return AjaxResult.error("集装箱英文名不能为空");
         }
+        if (UserConstants.NOT_UNIQUE.equals(tCntrService.selectTcnrFno(tCntr))) {
+            return AjaxResult.error(tCntr.getfNo() + "编号已存在");
+        } else if (UserConstants.NOT_UNIQUE.equals(tCntrService.selectTcnrFName(tCntr))){
+            return AjaxResult.error(tCntr.getfName() + "名称已存在");
+        }
         if (tCntr.getfId() == null){
-            String name = tCntrService.selectTcnrFName(tCntr.getfName());
-            String fno = tCntrService.selectTcnrFno(tCntr.getfNo());
-            if (StringUtils.isNotEmpty(name)){
-                return AjaxResult.error("名称已存在");
-            }else if (StringUtils.isNotEmpty(fno)){
-                return AjaxResult.error("编号已存在");
-            }
             return toAjax(tCntrService.insertTCntr(tCntr));
         }else {
-            TCntr cntr = tCntrService.selectTCntrById(tCntr.getfId());
-            if (!cntr.getfName().equals(tCntr.getfName())){
-                String name = tCntrService.selectTcnrFName(tCntr.getfName());
-                if (StringUtils.isNotEmpty(name)){
-                    return AjaxResult.error("名称已存在");
-                }
-            }
-            if (!cntr.getfNo().equals(tCntr.getfNo())){
-                String fno = tCntrService.selectTcnrFno(tCntr.getfNo());
-                if (StringUtils.isNotEmpty(fno)){
-                    return AjaxResult.error("编号已存在");
-                }
-            }
             if (tCntr.getfStatus().equals("T") ||tCntr.getfStatus().equals("正常")){
                 tCntr.setfStatus("T");
             }else {
@@ -153,33 +139,4 @@ public class TCntrController extends BaseController
         List<Map<String,Object>> list = tCntrService.selectRcntrName(tCntr);
         return getDataTable(list);
     }
-    /**
-     * 获取集装箱编号
-     */
-    //@PreAuthorize("@ss.hasPermi('shipping:cntr:selectTcnrFno')")
-    @GetMapping(value = "/selectTcnrFno/{fNo}")
-    public AjaxResult selectTcnrFno(@PathVariable("fNo") String fNo)
-    {
-        String fno = tCntrService.selectTcnrFno(fNo);
-        if (StringUtils.isNotEmpty(fno)){
-            return AjaxResult.error("编号已存在");
-        }else {
-            return AjaxResult.success();
-        }
-
-    }
-    /**
-     * 获取集装箱名称
-     */
-    //@PreAuthorize("@ss.hasPermi('shipping:cntr:selectTcnrFName')")
-    @GetMapping(value = "/selectTcnrFName/{fName}")
-    public AjaxResult selectTcnrFName(@PathVariable("fName") String fName)
-    {
-        String name = tCntrService.selectTcnrFName(fName);
-        if (StringUtils.isNotEmpty(name)){
-            return AjaxResult.error("名称已存在");
-        }else {
-            return AjaxResult.success();
-        }
-    }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shipping/controller/TCntrnoController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.utils.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -109,6 +110,9 @@ public class TCntrnoController extends BaseController
         if (StringUtils.isEmpty(tCntrno.getfCntrstatus())){
             return AjaxResult.error("箱状态不能为空");
         }
+        if (UserConstants.NOT_UNIQUE.equals(tCntrnoService.selectTCntrnoFNo(tCntrno))) {
+            return AjaxResult.error(tCntrno.getfNo() + "编号已存在");
+        }
         if (tCntrno.getfId() == null){
             return toAjax(tCntrnoService.insertTCntrno(tCntrno));
         }else {

ruoyi-shipping/src/main/java/com/ruoyi/shipping/domain/TAddress.java

@@ -280,6 +280,7 @@ public class TAddress extends BaseEntity
         return fStatus;
     }
 
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-shipping/src/main/java/com/ruoyi/shipping/domain/TCntr.java

@@ -167,6 +167,7 @@ public class TCntr extends BaseEntity
         this.typeName = typeName;
     }
 
+
     //查询时间区间
     private List<String> cLoadDate;
     //箱柜类型

ruoyi-shipping/src/main/java/com/ruoyi/shipping/domain/TCntrno.java

@@ -169,6 +169,7 @@ public class TCntrno extends BaseEntity
         this.fUpdateaddress = fUpdateaddress;
     }
 
+
     public String getfUpdateaddress() 
     {
         return fUpdateaddress;
@@ -337,6 +338,14 @@ public class TCntrno extends BaseEntity
         this.tCntrno = tCntrno;
     }
 
+    public String getAddressName() {
+        return addressName;
+    }
+
+    public void setAddressName(String addressName) {
+        this.addressName = addressName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-shipping/src/main/java/com/ruoyi/shipping/domain/TCntrtracking.java

@@ -80,8 +80,18 @@ public class TCntrtracking extends BaseEntity
     private Long cntrsize;
     //集装箱尺码中文
     private String cntrsizeName;
+    //地点中文名称
+    private String addressName;
 
-    public void setfId(Long fId) 
+    public String getAddressName() {
+        return addressName;
+    }
+
+    public void setAddressName(String addressName) {
+        this.addressName = addressName;
+    }
+
+    public void setfId(Long fId)
     {
         this.fId = fId;
     }

ruoyi-shipping/src/main/java/com/ruoyi/shipping/mapper/TAddressMapper.java

@@ -134,13 +134,13 @@ public interface TAddressMapper
      * @param tAddress
      * @return
      */
-    public String selectAddressFno(TAddress tAddress);
+    public TAddress selectAddressFno(TAddress tAddress);
     /**
      * 查询地址表里的名称
      * @param tAddress
      * @return
      */
-    public String selectAddressFName(TAddress tAddress);
+    public TAddress selectAddressFName(TAddress tAddress);
     /**
      * 查询地点
      * @param

ruoyi-shipping/src/main/java/com/ruoyi/shipping/mapper/TCntrMapper.java

@@ -86,11 +86,11 @@ public interface TCntrMapper
      * @param fType
      * @return
      */
-    public String selectTcnrFno(@Param("fNo") String fType);
+    public TCntr selectTcnrFno(@Param("fNo") String fType);
     /**
      * 查询集装箱表里的名称
      * @param fType
      * @return
      */
-    public String selectTcnrFName(@Param("fName") String fType);
+    public TCntr selectTcnrFName(@Param("fName") String fType);
 }

ruoyi-shipping/src/main/java/com/ruoyi/shipping/mapper/TCntrnoMapper.java

@@ -90,4 +90,11 @@ public interface TCntrnoMapper
      */
     public List<Map<String, Object>> getTCntrnoMessage(@Param("sql") String sql,
                                                        @Param("tCntrno") TCntrno tCntrno);
+
+    /**
+     * 查询编号唯一性
+     * @param tCntrno
+     * @return
+     */
+    public TCntrno selectTCntrnoFNo(TCntrno tCntrno);
 }

ruoyi-shipping/src/main/java/com/ruoyi/shipping/service/ITCntrService.java

@@ -70,14 +70,14 @@ public interface ITCntrService
     public List<Map<String, Object>>selectRcntrName(TCntr tCntr);
     /**
      * 查询集装箱表里的编号
-     * @param fNo
+     * @param tCntr
      * @return
      */
-    public String selectTcnrFno(String fNo);
+    public String selectTcnrFno(TCntr tCntr);
     /**
      * 查询集装箱表里的名称
-     * @param fName
+     * @param tCntr
      * @return
      */
-    public String selectTcnrFName(String fName);
+    public String selectTcnrFName(TCntr tCntr);
 }

ruoyi-shipping/src/main/java/com/ruoyi/shipping/service/ITCntrnoService.java

@@ -99,4 +99,10 @@ public interface ITCntrnoService
      * @return
      */
     public List<String> getTCntrnoChange(TCntrno tCntrno);
+    /**
+     * 查询编号唯一性
+     * @param tCntrno
+     * @return
+     */
+    public String selectTCntrnoFNo(TCntrno tCntrno);
 }

ruoyi-shipping/src/main/java/com/ruoyi/shipping/service/impl/TAddressServiceImpl.java

@@ -3,9 +3,11 @@ package com.ruoyi.shipping.service.impl;
 import java.util.List;
 import java.util.Map;
 
+import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.shipping.domain.TAddress;
 import com.ruoyi.shipping.mapper.TAddressMapper;
 import com.ruoyi.shipping.service.ITAddressService;
@@ -161,12 +163,20 @@ public class TAddressServiceImpl implements ITAddressService
 
     @Override
     public String selectAddressFno(TAddress tAddress) {
-        return tAddressMapper.selectAddressFno(tAddress);
+        TAddress address = tAddressMapper.selectAddressFno(tAddress);
+        if (StringUtils.isNotNull(address) && !address.getfId().equals(tAddress.getfId())) {
+            return UserConstants.NOT_UNIQUE;
+        }
+        return UserConstants.UNIQUE;
     }
 
     @Override
     public String selectAddressFName(TAddress tAddress) {
-        return tAddressMapper.selectAddressFName(tAddress);
+        TAddress address = tAddressMapper.selectAddressFName(tAddress);
+        if (StringUtils.isNotNull(address) && !address.getfId().equals(tAddress.getfId())) {
+            return UserConstants.NOT_UNIQUE;
+        }
+        return UserConstants.UNIQUE;
     }
 
     @Override

ruoyi-shipping/src/main/java/com/ruoyi/shipping/service/impl/TCntrServiceImpl.java

@@ -3,8 +3,10 @@ package com.ruoyi.shipping.service.impl;
 import java.util.List;
 import java.util.Map;
 
+import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.shipping.mapper.TCntrMapper;
@@ -105,12 +107,21 @@ public class TCntrServiceImpl implements ITCntrService
     }
 
     @Override
-    public String selectTcnrFno(String fNo) {
-        return tCntrMapper.selectTcnrFno(fNo);
+    public String selectTcnrFno(TCntr tCntr) {
+        TCntr cntr = tCntrMapper.selectTcnrFno(tCntr.getfNo());
+        if (StringUtils.isNotNull(cntr) && !cntr.getfId().equals(tCntr.getfId())) {
+            return UserConstants.NOT_UNIQUE;
+        }
+        return UserConstants.UNIQUE;
     }
 
     @Override
-    public String selectTcnrFName(String fName) {
-        return tCntrMapper.selectTcnrFName(fName);
+    public String selectTcnrFName(TCntr tCntr) {
+        TCntr cntr = tCntrMapper.selectTcnrFName(tCntr.getfName());
+        if (StringUtils.isNotNull(cntr) && !cntr.getfId().equals(tCntr.getfId())) {
+            return UserConstants.NOT_UNIQUE;
+        }
+        return UserConstants.UNIQUE;
+
     }
 }

ruoyi-shipping/src/main/java/com/ruoyi/shipping/service/impl/TCntrnoServiceImpl.java

@@ -3,6 +3,7 @@ package com.ruoyi.shipping.service.impl;
 import java.util.*;
 
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -212,24 +213,17 @@ public class TCntrnoServiceImpl implements ITCntrnoService
         String cntrstatusName = null;//箱状态
         String updateEFName = null;//空重
         if (StringUtils.isNotEmpty(tCntrno.getAddressName())){
-            /*Long aLong = tAddressMapper.selectTAddressByfName(tCntrno.getfUpdateaddress());*/
             address = tCntrno.getAddressName();
         }
         if (StringUtils.isNotEmpty(tCntrno.getTypeidName())){
-            /*Long fId = tCntrMapper.selectRcntrFId(tCntrno.getTypeidName());
-            tCntrno.setfTypeid(fId);*/
             typeidName = tCntrno.getTypeidName();
         }
         //箱状态不为空查箱状态
         if (StringUtils.isNotEmpty(tCntrno.getCntrstatusName())){
-            /*String cntrstatus = sysDictDataMapper.selectDictValue("f_cntrstatus", tCntrno.getCntrstatusName());
-            tCntrno.setfCntrstatus(cntrstatus);*/
             cntrstatusName = tCntrno.getCntrstatusName();
         }
         //箱空重部位空查空重
         if (StringUtils.isNotEmpty(tCntrno.getUpdateEFName())){
-            /*String cntrstatus = sysDictDataMapper.selectDictValue("f_updateEF", tCntrno.getUpdateEFName());
-            tCntrno.setfUpdateef(cntrstatus);*/
             updateEFName = tCntrno.getUpdateEFName();
         }
         return tCntrnoMapper.selectTcntrnoMessage(tCntrno,address,typeidName,cntrstatusName,updateEFName);
@@ -248,6 +242,15 @@ public class TCntrnoServiceImpl implements ITCntrnoService
         return key;
     }
 
+    @Override
+    public String selectTCntrnoFNo(TCntrno tCntrno) {
+        TCntrno cntrno = tCntrnoMapper.selectTCntrnoFNo(tCntrno);
+        if (StringUtils.isNotNull(cntrno) && !cntrno.getfId().equals(tCntrno.getfId())) {
+            return UserConstants.NOT_UNIQUE;
+        }
+        return UserConstants.UNIQUE;
+    }
+
     /**
      * set字段
      * @param tCntrno

ruoyi-shipping/src/main/resources/mapper/shipping/TAddressMapper.xml

@@ -496,8 +496,9 @@
         </where>
         ORDER BY CONVERT(t.f_name USING gbk) asc
     </select>
-    <select id="selectAddressFno" parameterType="TAddress" resultType="string">
+    <select id="selectAddressFno" parameterType="TAddress" resultMap="TAddressResult">
         SELECT
+            f_id,
             f_no
         FROM
         t_address
@@ -506,8 +507,9 @@
         and f_no = #{fNo}
         ORDER BY  CONVERT(f_name USING gbk) asc
     </select>
-    <select id="selectAddressFName" parameterType="TAddress" resultType="string">
+    <select id="selectAddressFName" parameterType="TAddress" resultMap="TAddressResult">
         SELECT
+            f_id,
             f_no
         FROM
         t_address
@@ -525,7 +527,7 @@
             t_address t
         LEFT JOIN
             sys_dict_data pro ON pro.dict_value = t.f_types and pro.dict_type = 'f_types'
-        where t.f_status = 'T'
+        where t.f_status = 'T' AND pro.dict_label &lt;&gt; '航线'
         ORDER BY  CONVERT(t.f_name USING gbk) asc
     </select>
 

ruoyi-shipping/src/main/resources/mapper/shipping/TCntrMapper.xml

@@ -182,23 +182,23 @@
         and f_status = 'T'
         ORDER BY  CONVERT(f_name USING gbk) asc
     </select>
-    <select id="selectTcnrFno" parameterType="object" resultType="string">
+    <select id="selectTcnrFno" parameterType="object" resultMap="TCntrResult">
         SELECT
+            f_id,
             f_no
         FROM
         t_cntr
         WHERE
         f_no = #{fNo}
-        ORDER BY  CONVERT(f_name USING gbk) asc
     </select>
-    <select id="selectTcnrFName" parameterType="object" resultType="string">
+    <select id="selectTcnrFName" parameterType="object" resultMap="TCntrResult">
         SELECT
+            f_id,
             f_no
         FROM
         t_cntr
         WHERE
         f_name = #{fName}
-        ORDER BY  CONVERT(f_name USING gbk) asc
     </select>
 
 </mapper>

ruoyi-shipping/src/main/resources/mapper/shipping/TCntrnoMapper.xml

@@ -357,6 +357,15 @@
         container.地点   like concat('%', #{tCntrno.fUpdateaddress}, '%')</if>
     </where>
    </select>
+    <select id="selectTCntrnoFNo" parameterType="TCntrno" resultMap="TCntrnoResult">
+        SELECT
+            f_id,
+            f_no
+        FROM
+        t_cntrno
+        WHERE
+        f_no = #{fNo}
+    </select>
 
 
 </mapper>

ruoyi-shipping/src/main/resources/mapper/shipping/TCntrtrackingMapper.xml

@@ -43,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         tc.f_voy,
         tc.f_updatetime,
         tc.f_updateaddress,
+        address.f_name addressName,
         tc.f_updateEF,
         sdda.dict_label updateEFName,
         tc.f_cntrstatus,
@@ -64,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN t_cntr t ON tc.f_typeid = t.f_id
         LEFT JOIN sys_dict_data prs ON prs.dict_value = t.f_cntrsize
         AND prs.dict_type = 'f_cntrsize'
+        LEFT JOIN t_address address ON address.f_id = tc.f_updateaddress
         <where>  
             <if test="fNo != null  and fNo != ''"> and tc.f_no = #{fNo}</if>
             <if test="fMblno != null  and fMblno != ''"> and tc.f_mblno = #{fMblno}</if>