修改input等bug

huimv-eartag2-platform/huimv-eartag2-common/pom.xml

@@ -9,7 +9,9 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 <!--    <packaging>pom</packaging>-->
+    <packaging>jar</packaging>
 
+    <groupId>com.huimv</groupId>
     <artifactId>huimv-eartag2-common</artifactId>
     <version>0.0.1-SNAPSHOT</version>
 

huimv-eartag2-platform/huimv-eartag2-input/src/main/resources/application-prod.yml

@@ -1,8 +1,8 @@
 server:
-  port: 8092
+  port: 8094
 spring:
   application:
-    name: huimv-eartag2-process
+    name: huimv-eartag2-eartag
 
   datasource:
     url: jdbc:mysql://192.168.1.7:3306/huimv-eartag2-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai

huimv-eartag2-platform/huimv-eartag2-eartag/src/main/resources/application.properties

@@ -1,4 +1,4 @@
 #spring.profiles.active=dev
-spring.profiles.active=prod2
+spring.profiles.active=local
 device.register.prefix=device_register_
 redis.expire.eartag_online_set=25

huimv-eartag2-platform/huimv-eartag2-input/src/main/java/com/huimv/eartag2/service/ICacheService.java

@@ -4,6 +4,8 @@ public interface ICacheService {
     //{}
     Object getDeviceCodeByChipId(String chipId);
 
+    void setDeviceCodeByChipId(String chipId, String deviceCode);
+
     //
     boolean checkEffectiveDeviceSet(String idCode);
 }

huimv-eartag2-platform/huimv-eartag2-input/src/main/java/com/huimv/eartag2/service/impl/CacheServiceImpl.java

@@ -28,6 +28,12 @@ public class CacheServiceImpl implements ICacheService {
     }
 
     @Override
+    public void setDeviceCodeByChipId(String chipId,String deviceCode) {
+        String  hashKey = BizConst.CHIP_DEVICE_PREFIX;
+        redisTemplate.opsForHash().put(hashKey,chipId,deviceCode);
+    }
+
+    @Override
     public boolean checkEffectiveDeviceSet(String idCode) {
         String setKey = BizConst.SET_ALL_DEVICE_PREFIX;
         return redisTemplate.opsForSet().isMember(setKey,idCode);

huimv-eartag2-platform/huimv-eartag2-input/src/main/java/com/huimv/eartag2/service/impl/DeviceServiceImpl.java

@@ -64,9 +64,9 @@ public class DeviceServiceImpl implements IDeviceService {
         if(deviceCodeObj != null){
             return (String)deviceCodeObj;
         }else{
-            return null;
+//            return null;
             //{从数据库读取设备编码返回}
-//            return getDeviceCodeByChipIdFromMySQL(chipId);
+            return getDeviceCodeByChipIdFromMySQL(chipId);
         }
     }
 
@@ -78,7 +78,9 @@ public class DeviceServiceImpl implements IDeviceService {
             log.error("该芯片id不存在.");
             return null;
         }else{
-            return deviceRegisterEntity.getDeviceCode();
+            String deviceCode = deviceRegisterEntity.getDeviceCode();
+            cacheService.setDeviceCodeByChipId(chipId,deviceCode);
+            return deviceCode;
         }
     }
 

huimv-eartag2-platform/huimv-eartag2-manage/src/main/resources/application-dev2.yml

@@ -18,8 +18,8 @@ spring:
     open-in-view: true
 
   rabbitmq:
-    #    host: 192.168.1.170
-    host: 192.168.1.75
+    host: 192.168.1.170
+#    host: 192.168.1.75
     port: 5672
     username: admin
     password: admin

huimv-eartag2-platform/huimv-eartag2-manage/src/main/resources/application.properties

@@ -1,5 +1,5 @@
-#spring.profiles.active=dev
-spring.profiles.active=prod2
+spring.profiles.active=dev2
+#spring.profiles.active=prod2
 
 # mysql:/cache:
 device.online.access_mode=mysql

huimv-eartag2-platform/pom.xml

@@ -4,11 +4,9 @@
     <modelVersion>4.0.0</modelVersion>
     <modules>
         <module>huimv-eartag2-input</module>
-        <module>huimv-eartag2-process</module>
         <module>huimv-eartag2-manage</module>
         <module>gateway</module>
         <module>huimv-eartag2-common</module>
-        <module>huimv-eartag2-process2</module>
         <module>huimv-eartag2-device</module>
         <module>huimv-eartag2-eartag</module>
         <module>huimv-eartag2-admin</module>
@@ -150,9 +148,9 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <classifier>execute</classifier>
-                </configuration>
+<!--                <configuration>-->
+<!--                    <classifier>execute</classifier>-->
+<!--                </configuration>-->
             </plugin>
         </plugins>
         <resources>