机车 终端表 和关联表 互换名称

base_vehicle_terminal    关联表
base_terminal     终端表

business-service/src/main/java/com/ozs/service/impl/BaseVehicleServiceImpl.java

@@ -69,15 +69,15 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
                 .doSelectPage(() -> baseVehicleMapper.selectList(wrapper));
         if (!StringUtils.isEmptySunhh(page) && page.getResult().size() > 0) {
             List<BaseVehicle> dto1 = page.getResult().stream().map(o -> {
-                BaseVehicleTerminal baseTerminal = baseVehicleTerminalMapper.selectTerminal(o.getVehicleCode());
-                if (!StringUtils.isEmptySunhh(baseTerminal) && !StringUtils.isEmptySunhh(baseTerminal.getVehicleCode())) {
-                    LambdaQueryWrapper<BaseTerminal> wrapperBaseVehicleTerminal = new LambdaQueryWrapper<>();
-                    if (!StringUtils.isEmptySunhh(baseTerminal) && !StringUtils.isEmptySunhh(baseTerminal.getTerminalCode())) {
-                        wrapperBaseVehicleTerminal.eq(BaseTerminal::getTerminalCode, baseTerminal.getTerminalCode());
+                BaseVehicleTerminal baseVehicleTerminal = baseVehicleTerminalMapper.selectTerminal(o.getVehicleCode());
+                if (!StringUtils.isEmptySunhh(baseVehicleTerminal) && !StringUtils.isEmptySunhh(baseVehicleTerminal.getVehicleCode())) {
+                    LambdaQueryWrapper<BaseTerminal> wrapperBaseTerminal = new LambdaQueryWrapper<>();
+                    if (!StringUtils.isEmptySunhh(baseVehicleTerminal) && !StringUtils.isEmptySunhh(baseVehicleTerminal.getTerminalCode())) {
+                        wrapperBaseTerminal.eq(BaseTerminal::getTerminalCode, baseVehicleTerminal.getTerminalCode());
                     }
-                    BaseTerminal baseVehicleTerminal = baseTerminalMapper.selectOne(wrapperBaseVehicleTerminal);
-                    if (!StringUtils.isEmptySunhh(baseVehicleTerminal) && !StringUtils.isEmptySunhh(baseVehicleTerminal.getTerminalName())) {
-                        o.setTerminalName(baseVehicleTerminal.getTerminalName());
+                    BaseTerminal baseTerminal1 = baseTerminalMapper.selectOne(wrapperBaseTerminal);
+                    if (!StringUtils.isEmptySunhh(baseTerminal1) && !StringUtils.isEmptySunhh(baseTerminal1.getTerminalName())) {
+                        o.setTerminalName(baseTerminal1.getTerminalName());
                     }
                 }
                 return o;
@@ -346,17 +346,17 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
             List<String> terminalCodeList = new ArrayList<>();
             baseVehicles = baseVehicles.stream().map(o -> {
                 //查到已保存的关联信息
-                BaseVehicleTerminal baseTerminal = baseVehicleTerminalMapper.selectTerminal(o.getVehicleCode());
-                if (!StringUtils.isEmptySunhh(baseTerminal) && !StringUtils.isEmptySunhh(baseTerminal.getVehicleCode())) {
-                    terminalCodeList.add(baseTerminal.getVehicleCode());
+                BaseVehicleTerminal baseVehicleTerminal = baseVehicleTerminalMapper.selectTerminal(o.getVehicleCode());
+                if (!StringUtils.isEmptySunhh(baseVehicleTerminal) && !StringUtils.isEmptySunhh(baseVehicleTerminal.getVehicleCode())) {
+                    terminalCodeList.add(baseVehicleTerminal.getVehicleCode());
                     LambdaQueryWrapper<BaseTerminal> wrapperBaseVehicleTerminal = new LambdaQueryWrapper<>();
-                    if (!StringUtils.isEmptySunhh(baseTerminal) && !StringUtils.isEmptySunhh(baseTerminal.getTerminalCode())) {
-                        wrapperBaseVehicleTerminal.eq(BaseTerminal::getTerminalCode, baseTerminal.getTerminalCode());
+                    if (!StringUtils.isEmptySunhh(baseVehicleTerminal) && !StringUtils.isEmptySunhh(baseVehicleTerminal.getTerminalCode())) {
+                        wrapperBaseVehicleTerminal.eq(BaseTerminal::getTerminalCode, baseVehicleTerminal.getTerminalCode());
                     }
                     //根据编码获取终端名称
-                    BaseTerminal baseVehicleTerminal = baseTerminalMapper.selectOne(wrapperBaseVehicleTerminal);
-                    if (!StringUtils.isEmptySunhh(baseVehicleTerminal) && !StringUtils.isEmptySunhh(baseVehicleTerminal.getTerminalName())) {
-                        o.setTerminalName(baseVehicleTerminal.getTerminalName());
+                    BaseTerminal baseTerminal = baseTerminalMapper.selectOne(wrapperBaseVehicleTerminal);
+                    if (!StringUtils.isEmptySunhh(baseTerminal) && !StringUtils.isEmptySunhh(baseTerminal.getTerminalName())) {
+                        o.setTerminalName(baseTerminal.getTerminalName());
                     }
                 }
                 return o;

business-service/src/main/resources/mapper/BaseVehicleTerminalMapper.xml

@@ -3,10 +3,10 @@
 <mapper namespace="com.ozs.mapper.BaseVehicleTerminalMapper">
 
     <select id="selectMountCode" parameterType="java.lang.String" resultType="java.lang.String">
-        select terminal_code terminalCode from base_terminal where vehicle_code != #{vehicleCode}
+        select terminal_code terminalCode from base_vehicle_terminal where vehicle_code != #{vehicleCode}
     </select>
 
     <select id="selectTerminal" parameterType="java.lang.String" resultType="com.ozs.entity.BaseVehicleTerminal">
-        select * from base_terminal where vehicle_code = #{vehicleCode} limit 1
+        select * from base_vehicle_terminal where vehicle_code = #{vehicleCode} limit 1
     </select>
 </mapper>