同步代码到59服务器

pom.xml

@@ -149,12 +149,6 @@
                 <artifactId>artemis-sdk</artifactId>
                 <version>${artemis.version}</version>
             </dependency>
-            <!-- pagehelper -->
-            <dependency>
-                <groupId>com.github.pagehelper</groupId>
-                <artifactId>pagehelper-spring-boot-starter</artifactId>
-                <version>${pagehelper.boot.version}</version>
-            </dependency>
             <!-- Gson -->
             <dependency>
                 <groupId>com.google.code.gson</groupId>

signal-control-service/src/main/java/net/wanji/web/common/enums/CrossTypeEnum.java

+package net.wanji.web.common.enums;
+
+/**
+ * 路口类型
+ * 1丁字口； 2十字口；3环岛；4畸形口；5立体交叉口；6铁路道口；7其他
+ *
+ * @author wuxiaokai
+ * @date 2022/12/26 11:35:57
+ */
+public enum CrossTypeEnum {
+
+    T_PORT(1, "丁字口"),
+    CROSSING(2, "十字口"),
+    ISLAND(3, "环岛"),
+    MALFORMED_MOUTH(4, "畸形口"),
+    THREE_DIMENSIONAL_INTERSECTION(5, "立体交叉口"),
+    RAILWAY_CROSSING(6, "铁路道口"),
+    OTHER(7, "其他");
+
+    private final int code;
+    private final String msg;
+
+    CrossTypeEnum(int code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+}

signal-control-service/src/main/java/net/wanji/web/service/TBaseCrossInfoService.java

 package net.wanji.web.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import net.wanji.web.common.Result;
+import net.wanji.web.common.enums.CrossTypeEnum;
 import net.wanji.web.entity.TBaseAreaInfo;
 import net.wanji.web.entity.TBaseCrossInfo;
 import net.wanji.web.mapper.TBaseAreaInfoMapper;
@@ -98,7 +100,7 @@ public class TBaseCrossInfoService extends ServiceImpl<TBaseCrossInfoMapper, TBa
         }
         if (crossInfoPO.getAreaCode() == null) {
             QueryWrapper<TBaseAreaInfo> queryWrapper = new QueryWrapper<>();
-            queryWrapper.lambda().eq(TBaseAreaInfo::getName, crossInfoPO.getAreaName());
+            queryWrapper.lambda().like(TBaseAreaInfo::getName, crossInfoPO.getAreaName());
             // 查询areaCode
             List<TBaseAreaInfo> tBaseAreaInfos = areaInfoMapper.selectList(queryWrapper);
             if (tBaseAreaInfos != null && tBaseAreaInfos.size() > 0) {
@@ -113,6 +115,12 @@ public class TBaseCrossInfoService extends ServiceImpl<TBaseCrossInfoMapper, TBa
                 crossInfoPO.setAreaName(tBaseAreaInfos.get(0).getName());
             }
         }
+        if (crossInfoPO.getType() == null) {
+            crossInfoPO.setType(CrossTypeEnum.OTHER.getCode());
+        }
+        if (crossInfoPO.getLevel() == null) {
+            crossInfoPO.setLevel(0);
+        }
         if (crossInfoPO.getIsSend() == null) {
             crossInfoPO.setIsSend(1);
         }
@@ -160,7 +168,7 @@ public class TBaseCrossInfoService extends ServiceImpl<TBaseCrossInfoMapper, TBa
                 }
             }
         }
-        infos = infos.stream().filter(po -> po.getParentCode() == null).collect(Collectors.toList());
+        infos = infos.stream().filter(po -> po.getParentCode() == null || po.getParentCode().equals(100000)).collect(Collectors.toList());
         return Result.success(infos);
     }
 }

signal-control-service/src/main/resources/mapper/TBaseAreaInfoMapper.xml

@@ -156,6 +156,6 @@
         where id = #{id,jdbcType=INTEGER}
     </update>
     <select id="selectAreaTree" resultType="net.wanji.web.po.AreaTreePO">
-        select id, code, name areaName, parent_code parentCode from t_base_area_info
+        select id, code areaCode, name areaName, parent_code parentCode from t_base_area_info
     </select>
 </mapper>

signal-utc-service/pom.xml

@@ -83,12 +83,6 @@
             <artifactId>fastjson</artifactId>
             <version>1.2.83</version>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
         <!-- Swagger -->
         <dependency>
             <groupId>io.springfox</groupId>