【feat】 添加对外服务 api

huimv-eartag2-platform/data-process/src/main/resources/application-goldpig.yml

@@ -11,7 +11,7 @@ spring:
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
-    show-sql: true
+    show-sql: false
     database: mysql
     hibernate:
       ddl-auto: update
@@ -90,7 +90,7 @@ spring:
 #    properties:
 #      hibernate:
 #        enable_lazy_load_no_trans: true
-#    show-sql: true
+#    show-sql: false
 #    database: mysql
 #    hibernate:
 #      ddl-auto: update

huimv-eartag2-platform/data-process2/src/main/resources/application-eartag.yml

@@ -11,7 +11,7 @@ spring:
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
-    show-sql: true
+    show-sql: false
     database: mysql
     hibernate:
       ddl-auto: update
@@ -90,7 +90,7 @@ spring:
 #    properties:
 #      hibernate:
 #        enable_lazy_load_no_trans: true
-#    show-sql: true
+#    show-sql: false
 #    database: mysql
 #    hibernate:
 #      ddl-auto: update

huimv-eartag2-platform/data-process2/src/main/resources/application-eartag2.yml

@@ -11,7 +11,7 @@ spring:
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
-    show-sql: true
+    show-sql: false
     database: mysql
     hibernate:
       ddl-auto: update
@@ -90,7 +90,7 @@ spring:
 #    properties:
 #      hibernate:
 #        enable_lazy_load_no_trans: true
-#    show-sql: true
+#    show-sql: false
 #    database: mysql
 #    hibernate:
 #      ddl-auto: update

huimv-eartag2-platform/huimv-eartag2-admin/src/main/java/com/huimv/eartag2/admin/HuimvEartag2AdminApplication.java

@@ -1,6 +1,7 @@
 package com.huimv.eartag2.admin;
 
 import com.huimv.eartag2.common.config.InterceptorConfig;
+import io.netty.channel.ChannelHandler;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

huimv-eartag2-platform/huimv-eartag2-admin/src/main/java/com/huimv/eartag2/admin/controller/AppEncryptedController.java

@@ -0,0 +1,20 @@
+package com.huimv.eartag2.admin.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-10-24
+ */
+@RestController
+@RequestMapping("/app-encrypted")
+public class AppEncryptedController {
+
+}

huimv-eartag2-platform/huimv-eartag2-admin/src/main/java/com/huimv/eartag2/admin/controller/EncryptionExample.java

@@ -0,0 +1,11 @@
+package com.huimv.eartag2.admin.controller;
+
+import javax.crypto.SecretKey;
+import java.util.Base64;
+
+public class EncryptionExample {
+    public static String encrypt(String input, SecretKey secretKey) throws Exception {
+        byte[] encryptedBytes = Base64.getEncoder().encode(input.getBytes());
+        return new String(encryptedBytes);
+    }
+}

huimv-eartag2-platform/huimv-eartag2-admin/src/main/java/com/huimv/eartag2/admin/controller/LoginController.java

@@ -1,14 +1,13 @@
 package com.huimv.eartag2.admin.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.eartag2.admin.entity.AppEncrypted;
 import com.huimv.eartag2.admin.entity.Sheet1;
 import com.huimv.eartag2.admin.entity.SysOrg;
 import com.huimv.eartag2.admin.entity.dto.SysAccountMultilevelDto;
 import com.huimv.eartag2.admin.mapper.SysAccountMultilevelMapper;
 import com.huimv.eartag2.admin.mapper.SysOrgMapper;
-import com.huimv.eartag2.admin.service.ISheet1Service;
-import com.huimv.eartag2.admin.service.ISysAccountMultilevelService;
-import com.huimv.eartag2.admin.service.SysOrgService;
+import com.huimv.eartag2.admin.service.*;
 import com.huimv.eartag2.common.common.exception.ExceptionEnum;
 import com.huimv.eartag2.common.common.exception.MiException;
 import com.huimv.eartag2.common.common.token.TokenSign;
@@ -16,7 +15,6 @@ import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.common.utils.ResultCode;
 import com.huimv.eartag2.common.common.utils.VerifyUtil;
 import com.huimv.eartag2.admin.entity.SysAccountMultilevel;
-import com.huimv.eartag2.admin.service.ILoginService;
 import com.huimv.eartag2.admin.session.AccessToken;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -121,6 +119,9 @@ public class LoginController {
     @Autowired
     private SysAccountMultilevelMapper accountMultilevelMapper;
 
+    @Autowired
+    private IAppEncryptedService appEncryptedService;
+
 
     //所有组织
     @GetMapping(value = "/getOrg")
@@ -193,6 +194,10 @@ public class LoginController {
         String token =  TokenSign.sign("superadmin",1,null,"0");
         return  token;
     }
+    @GetMapping(value = "/getMac")
+    public Result getMac()  {
+        return  new Result(ResultCode.SUCCESS,appEncryptedService.getById(1));
+    }
 
     @Autowired
     ISheet1Service sheet1Service;

huimv-eartag2-platform/huimv-eartag2-admin/src/main/java/com/huimv/eartag2/admin/controller/MacAddressExample.java

@@ -0,0 +1,121 @@
+package com.huimv.eartag2.admin.controller;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.util.ArrayList;
+import java.util.List;
+
+public class MacAddressExample {
+
+    public static String getMACAddress() {
+        List<String> commands = new ArrayList<>();
+        String os = System.getProperty("os.name").toLowerCase();
+
+        if (os.contains("win")) {
+            return getMacAddress();
+        }
+        try {
+            Process process = Runtime.getRuntime().exec("ifconfig -a");
+            try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
+                String line;
+                while ((line = reader.readLine()) != null) {
+                    if (line.contains("ether")) {
+                        int start = line.indexOf("ether") + 6;
+                        return line.substring(start, start + 17); // MAC地址的长度为17个字符
+                    }
+                }
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return "MAC Address not found or not accessible.";
+    }
+
+    public static String getMacAddress() {
+
+        try {
+            InetAddress localHost = InetAddress.getLocalHost();
+            NetworkInterface networkInterface = NetworkInterface.getByInetAddress(localHost);
+            byte[] macAddressBytes = networkInterface.getHardwareAddress();
+
+            if (macAddressBytes != null) {
+                StringBuilder macAddress = new StringBuilder();
+                for (byte b : macAddressBytes) {
+                    macAddress.append(String.format("%02X:", b));
+                }
+
+                if (macAddress.length() > 0) {
+                    macAddress.deleteCharAt(macAddress.length() - 1); // Remove the trailing ":"
+                }
+
+                return macAddress.toString();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public static String getDiskId() {
+        try {
+            List<String> commands = new ArrayList<>();
+            String os = System.getProperty("os.name").toLowerCase();
+
+            if (os.contains("win")) {
+                // For Windows
+                commands.add("wmic");
+                commands.add("diskdrive");
+                commands.add("get");
+                commands.add("SerialNumber");
+            } else if (os.contains("nix") || os.contains("nux") || os.contains("mac")) {
+                // For Linux and macOS
+                commands.add("lsblk");
+                commands.add("-no");
+                commands.add("serial");
+                commands.add("/dev/sda");  // Change to the appropriate device name
+            } else {
+                System.out.println("Unsupported operating system");
+                return null;
+            }
+
+            ProcessBuilder processBuilder = new ProcessBuilder(commands);
+            Process process = processBuilder.start();
+            BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
+
+            String line;
+            String dis="";
+            while ((line = reader.readLine()) != null) {
+                if(!"".equals(line)){
+                    dis = line;
+                }
+            }
+            return dis;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    public static String getMotherboardSerial() {
+        try {
+            Process process = Runtime.getRuntime().exec("sudo dmidecode -t 2");
+            try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
+                String line;
+                while ((line = reader.readLine()) != null) {
+                    if (line.contains("Serial Number")) {
+                        int start = line.indexOf("Serial Number") + 15;
+                        return line.substring(start).trim();
+                    }
+                }
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return "Motherboard Serial not available on this system.";
+    }
+
+
+}

huimv-eartag2-platform/huimv-eartag2-admin/src/main/java/com/huimv/eartag2/admin/controller/SendMacAddressToServer.java

@@ -0,0 +1,22 @@
+package com.huimv.eartag2.admin.controller;
+
+import org.springframework.web.client.RestTemplate;
+
+
+public class SendMacAddressToServer {
+
+    public static Integer  sendMacAddress(String combinedData,String encryptedDisk) {
+        //0成功  1验证失败  2服务器异常 3过期
+        try {
+            RestTemplate restTemplate = new RestTemplate();
+            String serverURL = "http://huimv.ifarmcloud.com/huimvAdmin/arrange-record/test";
+            serverURL +="?macAddress="+combinedData+"&"+"diskAddress="+encryptedDisk;
+           return restTemplate.getForObject(serverURL, Integer.class);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 2;
+
+        }
+    }
+}

huimv-eartag2-platform/huimv-eartag2-admin/src/main/java/com/huimv/eartag2/admin/controller/SysGroupController.java

@@ -50,10 +50,10 @@ public class SysGroupController {
 
     @PostMapping("/list")
     public IPage<Group> listGroup(@RequestBody Map map , HttpServletRequest request) {
-        String orgId = TokenSign.getOrgId(request);
+//        String orgId = TokenSign.getOrgId(request);
         Integer userId = TokenSign.getMemberIdByJwtToken(request);
 
-        List<Integer> allChildId = accountMultilevelService.getAllChildId(orgId);
+        List<Integer> allChildId = accountMultilevelService.getAllChildId(userId+"");
         allChildId.add(userId);
         return groupService.listGroup(map,allChildId);
     }

huimv-eartag2-platform/huimv-eartag2-admin/src/main/java/com/huimv/eartag2/admin/controller/YourApplication.java

@@ -0,0 +1,56 @@
+package com.huimv.eartag2.admin.controller;
+
+import com.huimv.eartag2.admin.entity.AppEncrypted;
+import com.huimv.eartag2.admin.service.IAppEncryptedService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+
+@Component
+public class YourApplication {
+    @Autowired
+    private IAppEncryptedService appEncryptedService;
+
+    @Scheduled(cron = "0 0 * * * ?")
+    private   void getMac() throws Exception {
+        String macAddress = MacAddressExample.getMACAddress();
+        String diskAddress = MacAddressExample.getDiskId();
+        System.out.println("macAddress= "+macAddress);
+        System.out.println("diskAddress= "+diskAddress);
+        if (macAddress != null) {
+            SecretKey secretKey = generateAESKey(); // 生成AES密钥
+            String encryptedMAC = EncryptionExample.encrypt(macAddress, secretKey);
+            String encryptedDisk = EncryptionExample.encrypt(diskAddress, secretKey);
+
+            // 将拼接并加密后的数据传输到服务器，可以使用HTTP POST等方法
+            Integer result =  SendMacAddressToServer.sendMacAddress(encryptedMAC+"@hm",encryptedDisk);
+            System.out.println(result);
+            if (1==result){
+//                System.exit(0);
+                System.out.println("验证失败");
+            }else {
+                AppEncrypted appEncrypted = new AppEncrypted();
+                appEncrypted.setId(1);
+                appEncrypted.setAppEncrypted(result);
+                appEncryptedService.updateById(appEncrypted);
+            }
+
+
+        } else {
+            System.out.println("Unable to obtain MAC address. Stopping application.");
+            //暂时不停止
+//            System.exit(0);
+        }
+
+        // Rest of your application logic here
+    }
+    public static SecretKey generateAESKey() throws Exception {
+        KeyGenerator keyGenerator = KeyGenerator.getInstance("AES");
+        keyGenerator.init(128); // 128-bit key size
+        return keyGenerator.generateKey();
+    }
+
+}

huimv-eartag2-platform/huimv-eartag2-admin/src/main/java/com/huimv/eartag2/admin/entity/AppEncrypted.java

@@ -0,0 +1,36 @@
+package com.huimv.eartag2.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2023-10-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("app_encrypted")
+public class AppEncrypted implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 0成功  1验证失败  2服务器异常 3过期
+     */
+    private Integer appEncrypted;
+
+
+}

huimv-eartag2-platform/huimv-eartag2-admin/src/main/java/com/huimv/eartag2/admin/mapper/AppEncryptedMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.eartag2.admin.mapper;
+
+import com.huimv.eartag2.admin.entity.AppEncrypted;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2023-10-24
+ */
+public interface AppEncryptedMapper extends BaseMapper<AppEncrypted> {
+
+}

huimv-eartag2-platform/huimv-eartag2-admin/src/main/java/com/huimv/eartag2/admin/service/IAppEncryptedService.java

@@ -0,0 +1,16 @@
+package com.huimv.eartag2.admin.service;
+
+import com.huimv.eartag2.admin.entity.AppEncrypted;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2023-10-24
+ */
+public interface IAppEncryptedService extends IService<AppEncrypted> {
+
+}

huimv-eartag2-platform/huimv-eartag2-admin/src/main/java/com/huimv/eartag2/admin/service/impl/AppEncryptedServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.eartag2.admin.service.impl;
+
+import com.huimv.eartag2.admin.entity.AppEncrypted;
+import com.huimv.eartag2.admin.mapper.AppEncryptedMapper;
+import com.huimv.eartag2.admin.service.IAppEncryptedService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-10-24
+ */
+@Service
+public class AppEncryptedServiceImpl extends ServiceImpl<AppEncryptedMapper, AppEncrypted> implements IAppEncryptedService {
+
+}

huimv-eartag2-platform/huimv-eartag2-admin/src/main/java/com/huimv/eartag2/admin/service/impl/GroupServiceImpl.java

@@ -11,6 +11,7 @@ import com.huimv.eartag2.admin.mapper.GroupMapper;
 import com.huimv.eartag2.admin.mapper.GroupMenuMapper;
 import com.huimv.eartag2.admin.service.IGroupService;
 import com.huimv.eartag2.common.utils.Result;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -69,11 +70,12 @@ public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements
     public  IPage<Group> listGroup(Map map, List<Integer> allChildId) {
         Integer pageNum = (Integer)map.get("pageNum");
         Integer pageSize = (Integer)map.get("pageSize");
+        String searchStr = (String)map.get("searchStr");
         if (ObjectUtil.isNotEmpty(allChildId)) {
 
-            return this.page(new Page<>(pageNum, pageSize),new QueryWrapper<Group>().in("account_id",allChildId).orderByDesc("id"));
+            return this.page(new Page<>(pageNum, pageSize),new QueryWrapper<Group>().in("account_id",allChildId).orderByDesc("id").like(StringUtils.isNotBlank(searchStr),"group_name",searchStr));
         }
-        return this.page(new Page<>(pageNum, pageSize),new QueryWrapper<Group>().eq("account_id",null).orderByDesc("id"));
+        return this.page(new Page<>(pageNum, pageSize),new QueryWrapper<Group>().eq("account_id",null).orderByDesc("id").like(StringUtils.isNotBlank(searchStr),"group_name",searchStr));
 
     }
 

huimv-eartag2-platform/huimv-eartag2-admin/src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@ spring:
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
-    show-sql: true
+    show-sql: false
     database: mysql
     hibernate:
       ddl-auto: update
@@ -97,7 +97,7 @@ spring:
 #    properties:
 #      hibernate:
 #        enable_lazy_load_no_trans: true
-#    show-sql: true
+#    show-sql: false
 #    database: mysql
 #    hibernate:
 #      ddl-auto: update

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

@@ -97,7 +97,7 @@ spring:
 #    properties:
 #      hibernate:
 #        enable_lazy_load_no_trans: true
-#    show-sql: true
+#    show-sql: false
 #    database: mysql
 #    hibernate:
 #      ddl-auto: update

huimv-eartag2-platform/huimv-eartag2-admin/src/main/resources/application-prod2.yml

@@ -10,7 +10,7 @@ spring:
     password: eartag@2022
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
-    show-sql: true
+    show-sql: false
     database: mysql
     hibernate:
       ddl-auto: update
@@ -99,7 +99,7 @@ spring:
 #    properties:
 #      hibernate:
 #        enable_lazy_load_no_trans: true
-#    show-sql: true
+#    show-sql: false
 #    database: mysql
 #    hibernate:
 #      ddl-auto: update

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

@@ -1,8 +1,8 @@
 #±¾µØÊý¾Ý¿â
 #spring.profiles.active=dev
 #Ô¶³ÌÊý¾Ý¿â
-#spring.profiles.active=prod2
-spring.profiles.active=prod
+spring.profiles.active=prod2
+#spring.profiles.active=prod
 
 device.register.prefix=device_register_
 redis.expire.eartag_online_set=25

huimv-eartag2-platform/huimv-eartag2-admin/src/main/resources/com/huimv/eartag2/admin/mapper/AppEncryptedMapper.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.eartag2.admin.mapper.AppEncryptedMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.admin.entity.AppEncrypted">
+        <id column="id" property="id" />
+        <result column="app_encrypted" property="appEncrypted" />
+    </resultMap>
+
+</mapper>

huimv-eartag2-platform/huimv-eartag2-api/src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@ spring:
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
-    show-sql: true
+    show-sql: false
     database: mysql
     hibernate:
       ddl-auto: update
@@ -74,7 +74,7 @@ spring:
 #    properties:
 #      hibernate:
 #        enable_lazy_load_no_trans: true
-#    show-sql: true
+#    show-sql: false
 #    database: mysql
 #    hibernate:
 #      ddl-auto: update

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

@@ -10,7 +10,7 @@ spring:
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
-    show-sql: true
+    show-sql: false
     database: mysql
     hibernate:
       ddl-auto: update

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

@@ -10,7 +10,7 @@ spring:
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
-    show-sql: true
+    show-sql: false
     database: mysql
     hibernate:
       ddl-auto: update
@@ -97,7 +97,7 @@ spring:
 #    properties:
 #      hibernate:
 #        enable_lazy_load_no_trans: true
-#    show-sql: true
+#    show-sql: false
 #    database: mysql
 #    hibernate:
 #      ddl-auto: update

huimv-eartag2-platform/huimv-eartag2-api/src/main/resources/application-prod2.yml

@@ -11,7 +11,7 @@ spring:
     password: eartag@2022
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
-    show-sql: true
+    show-sql: false
     database: mysql
     hibernate:
       ddl-auto: update

huimv-eartag2-platform/huimv-eartag2-device/src/main/java/com/huimv/eartag2/device/service/impl/EartagServiceImpl.java

@@ -107,7 +107,7 @@ public class EartagServiceImpl implements IEartagService {
             act1 = nowAct1;
         }
 
-        redisTemplate.opsForHash().put(deviceCode, "act", act1);
+        redisTemplate.opsForHash().put(deviceCode, "act", nowAct1);
         return act1;
     }
 

huimv-eartag2-platform/huimv-eartag2-device/src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@ spring:
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
-    show-sql: true
+    show-sql: false
     database: mysql
     hibernate:
       ddl-auto: update
@@ -97,7 +97,7 @@ spring:
 #    properties:
 #      hibernate:
 #        enable_lazy_load_no_trans: true
-#    show-sql: true
+#    show-sql: false
 #    database: mysql
 #    hibernate:
 #      ddl-auto: update

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

@@ -10,7 +10,7 @@ spring:
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
-    show-sql: true
+    show-sql: false
     database: mysql
     hibernate:
       ddl-auto: update
@@ -97,7 +97,7 @@ spring:
 #    properties:
 #      hibernate:
 #        enable_lazy_load_no_trans: true
-#    show-sql: true
+#    show-sql: false
 #    database: mysql
 #    hibernate:
 #      ddl-auto: update

huimv-eartag2-platform/huimv-eartag2-device/src/main/resources/application-prod2.yml

@@ -10,7 +10,7 @@ spring:
     password: eartag@2022
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
-    show-sql: true
+    show-sql: false
     database: mysql
     hibernate:
       ddl-auto: update
@@ -52,8 +52,12 @@ spring:
         max-wait: -1
         max-idle: 10
         min-idle: 0
+mybatis-plus:
+  configuration:
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
 
-  #redis
+#redis
 #  redis:
 #    database: 0
 #    host: 192.168.1.68
@@ -100,7 +104,7 @@ spring:
 #    properties:
 #      hibernate:
 #        enable_lazy_load_no_trans: true
-#    show-sql: true
+#    show-sql: false
 #    database: mysql
 #    hibernate:
 #      ddl-auto: update

huimv-eartag2-platform/huimv-eartag2-device/src/main/resources/application-test.yml

@@ -10,7 +10,7 @@ spring:
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
-    show-sql: true
+    show-sql: false
     database: mysql
     hibernate:
       ddl-auto: update
@@ -97,7 +97,7 @@ spring:
 #    properties:
 #      hibernate:
 #        enable_lazy_load_no_trans: true
-#    show-sql: true
+#    show-sql: false
 #    database: mysql
 #    hibernate:
 #      ddl-auto: update

huimv-eartag2-platform/huimv-eartag2-eartag/src/main/java/com/huimv/eartag2/eartag/service/impl/EartagServiceImpl.java

@@ -1378,14 +1378,14 @@ public class EartagServiceImpl implements IEartagService {
             eartagRegisterEntity.setEarTemp1(eartagJo.getFloat("earTemp1"));
 //            eartagRegisterEntity.setEnvTemp1(eartagJo.getFloat("envTemp1"));
             //相对运动量
-            eartagRegisterEntity.setAct( Long.parseLong(eartagJo.getString("act")));
+            eartagRegisterEntity.setAct( Long.parseLong(eartagJo.getString("act1")));
             eartagRegisterEntity.setSignal1(Integer.parseInt(eartagJo.getString("signal")));
             eartagRegisterEntity.setAskTime(getAskTime(eartagJo.getString("askTime")));
             eartagRegisterEntity.setOther(eartagJo.getString("other"));
             eartagRegisterEntity.setFarmId(farmId);
             eartagRegisterEntity.setLiveStatus(1);
             //绝对运动量
-            eartagRegisterEntity.setActRange(Integer.parseInt(eartagJo.getString("act")));
+            eartagRegisterEntity.setActRange(new Long(Long.parseLong(eartagJo.getString("act"))).intValue());
             System.out.println("开始更新--> " + eartagRegisterEntity);
             eartagEartagRegister2EntityRepo.saveAndFlush(eartagRegisterEntity);
             //更新耳标注册消息缓存
@@ -1593,7 +1593,7 @@ public class EartagServiceImpl implements IEartagService {
             } else {
                 act = Integer.parseInt(eartagJo.getString("act"));
                 long lastAct = Long.parseLong(countMap.get("act").toString());
-                if (act > lastAct) {
+                if (act >= lastAct) {
                     act1 = act - lastAct;
                 } else {
                     act1 = act;

huimv-eartag2-platform/huimv-eartag2-eartag/src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@ spring:
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
-    show-sql: true
+    show-sql: false
     database: mysql
     hibernate:
       ddl-auto: update
@@ -129,7 +129,7 @@ mybatis-plus:
 #    properties:
 #      hibernate:
 #        enable_lazy_load_no_trans: true
-#    show-sql: true
+#    show-sql: false
 #    database: mysql
 #    hibernate:
 #      ddl-auto: update

huimv-eartag2-platform/huimv-eartag2-eartag/src/main/resources/application-dev1.yml

@@ -10,7 +10,7 @@ spring:
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
-    show-sql: true
+    show-sql: false
     database: mysql
     hibernate:
       ddl-auto: update
@@ -122,7 +122,7 @@ spring:
 #    properties:
 #      hibernate:
 #        enable_lazy_load_no_trans: true
-#    show-sql: true
+#    show-sql: false
 #    database: mysql
 #    hibernate:
 #      ddl-auto: update

huimv-eartag2-platform/huimv-eartag2-eartag/src/main/resources/application-local.yml

@@ -10,7 +10,7 @@ spring:
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
-    show-sql: true
+    show-sql: false
     database: mysql
     hibernate:
       ddl-auto: update
@@ -97,7 +97,7 @@ spring:
 #    properties:
 #      hibernate:
 #        enable_lazy_load_no_trans: true
-#    show-sql: true
+#    show-sql: false
 #    database: mysql
 #    hibernate:
 #      ddl-auto: update

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

@@ -10,7 +10,7 @@ spring:
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
-    show-sql: true
+    show-sql: false
     database: mysql
     hibernate:
       ddl-auto: update
@@ -97,7 +97,7 @@ spring:
 #    properties:
 #      hibernate:
 #        enable_lazy_load_no_trans: true
-#    show-sql: true
+#    show-sql: false
 #    database: mysql
 #    hibernate:
 #      ddl-auto: update

huimv-eartag2-platform/huimv-eartag2-eartag/src/main/resources/application-prod2.yml

@@ -1,6 +1,6 @@
 server:
-#  port: 8094
-  port: 8103
+  port: 8094
+#  port: 8103
 spring:
   application:
     name: huimv-eartag2-eartag
@@ -12,7 +12,7 @@ spring:
     password: eartag@2022
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
-    show-sql: true
+    show-sql: false
     database: mysql
     hibernate:
       ddl-auto: update
@@ -134,7 +134,7 @@ mybatis-plus:
 #    properties:
 #      hibernate:
 #        enable_lazy_load_no_trans: true
-#    show-sql: true
+#    show-sql: false
 #    database: mysql
 #    hibernate:
 #      ddl-auto: update

huimv-eartag2-platform/huimv-eartag2-eartag/src/main/resources/application-test.yml

@@ -10,7 +10,7 @@ spring:
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
-    show-sql: true
+    show-sql: false
     database: mysql
     hibernate:
       ddl-auto: update
@@ -97,7 +97,7 @@ spring:
 #    properties:
 #      hibernate:
 #        enable_lazy_load_no_trans: true
-#    show-sql: true
+#    show-sql: false
 #    database: mysql
 #    hibernate:
 #      ddl-auto: update

huimv-eartag2-platform/huimv-eartag2-eartag/src/main/resources/application-test2.yml

@@ -10,7 +10,7 @@ spring:
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
-    show-sql: true
+    show-sql: false
     database: mysql
     hibernate:
       ddl-auto: update
@@ -122,7 +122,7 @@ spring:
 #    properties:
 #      hibernate:
 #        enable_lazy_load_no_trans: true
-#    show-sql: true
+#    show-sql: false
 #    database: mysql
 #    hibernate:
 #      ddl-auto: update

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

@@ -11,7 +11,7 @@ spring:
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
-    show-sql: true
+    show-sql: false
     database: mysql
     hibernate:
       ddl-auto: update
@@ -90,7 +90,7 @@ spring:
 #    properties:
 #      hibernate:
 #        enable_lazy_load_no_trans: true
-#    show-sql: true
+#    show-sql: false
 #    database: mysql
 #    hibernate:
 #      ddl-auto: update

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

@@ -10,7 +10,7 @@ spring:
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
-    show-sql: true
+    show-sql: false
     database: mysql
     hibernate:
       ddl-auto: update
@@ -97,7 +97,7 @@ spring:
 #    properties:
 #      hibernate:
 #        enable_lazy_load_no_trans: true
-#    show-sql: true
+#    show-sql: false
 #    database: mysql
 #    hibernate:
 #      ddl-auto: update

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

@@ -11,7 +11,7 @@ spring:
     password: eartag@2022
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
-    show-sql: true
+    show-sql: false
     database: mysql
     hibernate:
       ddl-auto: update
@@ -66,31 +66,6 @@ spring:
     redis:
       cache-null-values: false
 
-
-
-    #server:
-#  port: 9110
-#spring:
-#  application:
-#    name: huimv-hy-autoGetData
-#
-#  datasource:
-##    url: jdbc:mysql://47.98.175.112:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#    #    url: jdbc:mysql://36.22.189.214:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#        url: jdbc:mysql://115.238.57.190:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#    username: root
-#    password: hm123456
-#    driver-class-name: com.mysql.cj.jdbc.Driver
-#  jpa:
-#    properties:
-#      hibernate:
-#        enable_lazy_load_no_trans: true
-#    show-sql: true
-#    database: mysql
-#    hibernate:
-#      ddl-auto: update
-#    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
-#    open-in-view: true
 management:
   endpoints:
     web:

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

@@ -11,7 +11,7 @@ spring:
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
-    show-sql: true
+    show-sql: false
     database: mysql
     hibernate:
       ddl-auto: update
@@ -63,31 +63,6 @@ spring:
     redis:
       cache-null-values: false
 
-
-
-    #server:
-#  port: 9110
-#spring:
-#  application:
-#    name: huimv-hy-autoGetData
-#
-#  datasource:
-##    url: jdbc:mysql://47.98.175.112:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#    #    url: jdbc:mysql://36.22.189.214:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#        url: jdbc:mysql://115.238.57.190:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#    username: root
-#    password: hm123456
-#    driver-class-name: com.mysql.cj.jdbc.Driver
-#  jpa:
-#    properties:
-#      hibernate:
-#        enable_lazy_load_no_trans: true
-#    show-sql: true
-#    database: mysql
-#    hibernate:
-#      ddl-auto: update
-#    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
-#    open-in-view: true
 management:
   endpoints:
     web:

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

@@ -11,7 +11,7 @@ spring:
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
-    show-sql: true
+    show-sql: false
     database: mysql
     hibernate:
       ddl-auto: update
@@ -90,7 +90,7 @@ spring:
 #    properties:
 #      hibernate:
 #        enable_lazy_load_no_trans: true
-#    show-sql: true
+#    show-sql: false
 #    database: mysql
 #    hibernate:
 #      ddl-auto: update

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

@@ -10,7 +10,7 @@ spring:
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
-    show-sql: true
+    show-sql: false
     database: mysql
     hibernate:
       ddl-auto: update
@@ -74,7 +74,7 @@ spring:
 #    properties:
 #      hibernate:
 #        enable_lazy_load_no_trans: true
-#    show-sql: true
+#    show-sql: false
 #    database: mysql
 #    hibernate:
 #      ddl-auto: update

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

@@ -10,7 +10,7 @@ spring:
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
-    show-sql: true
+    show-sql: false
     database: mysql
     hibernate:
       ddl-auto: update

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

@@ -10,7 +10,7 @@ spring:
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
-    show-sql: true
+    show-sql: false
     database: mysql
     hibernate:
       ddl-auto: update
@@ -97,7 +97,7 @@ spring:
 #    properties:
 #      hibernate:
 #        enable_lazy_load_no_trans: true
-#    show-sql: true
+#    show-sql: false
 #    database: mysql
 #    hibernate:
 #      ddl-auto: update

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

@@ -10,7 +10,7 @@ spring:
     password: eartag@2022
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
-    show-sql: true
+    show-sql: false
     database: mysql
     hibernate:
       ddl-auto: update

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@ spring:
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
-    show-sql: true
+    show-sql: false
     database: mysql
     hibernate:
       ddl-auto: update
@@ -74,7 +74,7 @@ spring:
 #    properties:
 #      hibernate:
 #        enable_lazy_load_no_trans: true
-#    show-sql: true
+#    show-sql: false
 #    database: mysql
 #    hibernate:
 #      ddl-auto: update

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

@@ -10,7 +10,7 @@ spring:
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
-    show-sql: true
+    show-sql: false
     database: mysql
     hibernate:
       ddl-auto: update

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

@@ -10,7 +10,7 @@ spring:
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
-    show-sql: true
+    show-sql: false
     database: mysql
     hibernate:
       ddl-auto: update
@@ -97,7 +97,7 @@ spring:
 #    properties:
 #      hibernate:
 #        enable_lazy_load_no_trans: true
-#    show-sql: true
+#    show-sql: false
 #    database: mysql
 #    hibernate:
 #      ddl-auto: update

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/resources/application-prod2.yml

@@ -11,7 +11,7 @@ spring:
     password: eartag@2022
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
-    show-sql: true
+    show-sql: false
     database: mysql
     hibernate:
       ddl-auto: update
@@ -47,7 +47,7 @@ spring:
 
 mybatis-plus:
   configuration:
-    #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+#      log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
   # mapper.xml文件所存放的位置
   mapper-locations: classpath*:com/huimv/eartag2/manage2/mapper/xml/*.xml  # 不加这一行出错：“org.apache.ibatis.binding.BindingException:  Invalid bound statement (not found)”

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/resources/application-test.yml

@@ -10,7 +10,7 @@ spring:
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
-    show-sql: true
+    show-sql: false
     database: mysql
     hibernate:
       ddl-auto: update