[update] 灯组配置-特殊路口灯组位置定义

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

@@ -18,11 +18,11 @@ public enum LightsAddressEnum {
     SEVEN(7, "7", "西"),
     EIGHT(8, "8", "西北"),
     ONE_ONE(11, "11", "北一次过街"),
-    ONE_TWO_ONE(121, "122", "北出口二次过街"),
+    ONE_TWO_ONE(121, "121", "北出口二次过街"),
     ONE_TWO_TWO(122, "122", "北进口二次过街"),
     TWO_ONE(21, "21", "东北一次过街"),
     TWO_TWO_ONE(221, "221", "东北出口二次过街"),
-    TWO_TWO_TWO(222, "", "东北进口二次过街"),
+    TWO_TWO_TWO(222, "222", "东北进口二次过街"),
     THREE_ONE(31, "31", "东一次过街"),
     THREE_TWO_ONE(321, "321", "东出口二次过街"),
     THREE_TWO_TWO(322, "322", "东进口二次过街"),

signal-control-service/src/main/java/net/wanji/web/common/util/RedisUtils.java

@@ -133,7 +133,7 @@ public class RedisUtils {
      * @param hashmap 存入的Map集合
      */
     public void setHashMap(String key, Map<String, Object> hashmap){
-        redisTemplate.opsForHash().putAll(key, hashmap);;
+        redisTemplate.opsForHash().putAll(key, hashmap);
     }
     
     /**

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

@@ -255,10 +255,10 @@ public class PlanSendServiceImpl implements PlanSendService {
             List<CrossSchemePO> crossSchemeList = schemePhaseLightsVO.getCrossSchemeList();
             crossSchemeMapper.deleteByCrossId(crossId);
             // 保存旧方案ID
-            List<Integer> oldSchemeIds = crossSchemeList.stream().map(CrossSchemePO::getId).collect(Collectors.toList());;
+            List<Integer> oldSchemeIds = crossSchemeList.stream().map(CrossSchemePO::getId).collect(Collectors.toList());
             // 保存新方案ID
             crossSchemeMapper.insertBatch(crossSchemeList);
-            List<Integer> newSchemeIds = crossSchemeList.stream().map(CrossSchemePO::getId).collect(Collectors.toList());;
+            List<Integer> newSchemeIds = crossSchemeList.stream().map(CrossSchemePO::getId).collect(Collectors.toList());
             // 生成新旧方案ID映射
             Map<Integer, Integer> oldNewSchemeId = new HashMap<>();
             for (int i = 0; i < oldSchemeIds.size(); i++) {

signal-control-service/src/main/java/net/wanji/web/service/scheme/impl/CrossConfigServiceImpl.java

@@ -43,31 +43,6 @@ public class CrossConfigServiceImpl implements CrossConfigService {
     private final CrossLaneLightsMapper crossLaneLightsMapper;
     private final LaneSegmentMapper laneSegmentMapper;
     private final CrossLightsMapper crossLightsMapper;
-    // 灯组位置与放行方向对应关系
-    private static final Map<Integer, Integer> ADDRESS_DIR_MAP = new HashMap<>(8);
-    static {
-        ADDRESS_DIR_MAP.put(1, 5);
-        ADDRESS_DIR_MAP.put(2, 6);
-        ADDRESS_DIR_MAP.put(3, 7);
-        ADDRESS_DIR_MAP.put(4, 8);
-        ADDRESS_DIR_MAP.put(5, 1);
-        ADDRESS_DIR_MAP.put(6, 2);
-        ADDRESS_DIR_MAP.put(7, 3);
-        ADDRESS_DIR_MAP.put(8, 4);
-    }
-
-    // 放行方向与灯组位置对应关系
-    private static final Map<Integer, Integer> DIR_ADDRESS_MAP = new HashMap<>(8);
-    static {
-        DIR_ADDRESS_MAP.put(5, 1);
-        DIR_ADDRESS_MAP.put(6, 2);
-        DIR_ADDRESS_MAP.put(7, 3);
-        DIR_ADDRESS_MAP.put(8, 4);
-        DIR_ADDRESS_MAP.put(1, 5);
-        DIR_ADDRESS_MAP.put(2, 6);
-        DIR_ADDRESS_MAP.put(3, 7);
-        DIR_ADDRESS_MAP.put(4, 8);
-    }
 
     // 机动车灯数据库类型与前端类型对应关系
     private static final Map<Integer, Integer> MOTOR_VEH_MAP = new HashMap<>(5);
@@ -178,8 +153,7 @@ public class CrossConfigServiceImpl implements CrossConfigService {
             String address = ledConfigListElement.getAddress();
             Integer addressCode = LightsAddressEnum.getCodeByMsg(address);
             if (addressCode < 10) { // 非行人灯
-                Integer dir = ADDRESS_DIR_MAP.get(addressCode);
-                crossLightsPO.setDir(dir);
+                crossLightsPO.setDir(addressCode);
             } else { // 行人灯
                 String firstDigit = address.toString().substring(0, 1);
                 crossLightsPO.setDir(Integer.parseInt(firstDigit));
@@ -360,11 +334,10 @@ public class CrossConfigServiceImpl implements CrossConfigService {
                 ledConfigListElement.setType(3);
                 ledConfigListElement.setSignalType(7);
             }
-            // 灯组放行方向转换为灯组位置
+            // 灯组放行方向
             Integer dir = crossLightsPO.getDir();
-            Integer addressCode = DIR_ADDRESS_MAP.get(dir);
             if (type < 20 || type >= 30) { // 非行人灯
-                String address = LightsAddressEnum.getMsgByCode(addressCode);
+                String address = LightsAddressEnum.getMsgByCode(dir);
                 ledConfigListElement.setAddress(address);
             } else if (type == 20) { // 一次过街
                 String s = "" + dir + 1;

signal-optimize-service/src/main/java/net/wanji/opt/dao/cache/RedisDao.java

@@ -122,7 +122,7 @@ public class RedisDao {
      * @param hashmap 存入的Map集合
      */
     public void setHashMap(String key, Map<String, Object> hashmap){
-        redisTemplate.opsForHash().putAll(key, hashmap);;
+        redisTemplate.opsForHash().putAll(key, hashmap);
     }
 
     /**

signal-optimize-service/src/main/resources/application.yml

@@ -18,7 +18,7 @@ mybatis:
   type-aliases-package: net.wanji.*.model
   mapper-locations: classpath*:mapper/*.xml,classpath*:mapper/*/*.xml
   configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
 
 mapper:
   mappers:
@@ -48,5 +48,5 @@ mybatis-plus:
     jdbc-type-for-null: 'null'
     #MyBatis 自动映射时未知列或未知属性处理策略 NONE：不做任何处理 (默认值), WARNING：以日志的形式打印相关警告信息, FAILING：当作映射失败处理，并抛出异常和详细信息
     auto-mapping-unknown-column-behavior: warning
-    #开启SQL打印
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    #SQL打印
+    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl

signal-utc-service/src/main/java/net/wanji/utc/util/RedisUtil.java

@@ -127,7 +127,7 @@ public class RedisUtil {
      * @param hashmap 存入的Map集合
      */
     public void setHashMap(String key, Map<String, Object> hashmap){
-        redisTemplate.opsForHash().putAll(key, hashmap);;
+        redisTemplate.opsForHash().putAll(key, hashmap);
     }
     
     /**

wj-common/src/main/java/net/wanji/common/utils/licenseUtils/DateUtils.java

@@ -42,6 +42,6 @@ public class DateUtils {
     }
 
     public static void main(String[] args) {
-        System.out.println(authorize_date("20200807"));;
+        System.out.println(authorize_date("20200807"));
     }
 }

wj-databus/src/main/java/net/wanji/databus/provider/identity/identity/UserProvider.java

@@ -37,7 +37,7 @@ public interface UserProvider extends BaseDubboInterface<User> {
 
     String getUserById(Map<String,Object> params) throws DubboProviderException;
 
-    User getUserByBusinessAccountId(String businessAccountId)  throws DubboProviderException;;
+    User getUserByBusinessAccountId(String businessAccountId)  throws DubboProviderException;
 
     User findUserByUsername(String username) throws DubboProviderException;