修改应用克隆

common-lib/src/main/java/com/mortals/xhx/common/pdu/DeviceReq.java

 package com.mortals.xhx.common.pdu;
 
 
+import cn.hutool.core.util.NumberUtil;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -145,4 +146,39 @@ public class DeviceReq implements Serializable {
      */
     private String resolutionValue;
 
+    /**
+     * 设备宽度
+     */
+    private Double width;
+
+
+    /**
+     * 设备高度
+     */
+    private Double height;
+
+
+    public static void main(String[] args) {
+        double div = NumberUtil.div(1920, 1080, 2);
+
+
+
+        if( div >= 1.7 && div <= 1.8){
+            System.out.println("1.7 < div < 1.8");
+        }else if( div >= 0.4 && div <= 0.7){
+            System.out.println("1.7 < div < 1.8");
+        }else if( div >= 0.9 && div <= 1.1){
+            System.out.println("div >= 0.9 && div <= 1.1");
+        }
+
+
+        //double radio=1920/1080;
+
+        System.out.println(NumberUtil.div(1920, 1080, 2));
+        System.out.println(NumberUtil.div(1080, 1920, 2));
+        System.out.println(NumberUtil.div(1280, 1280, 2));
+
+
+    }
+
 }

device-manager/pom.xml

@@ -177,6 +177,8 @@
 			<artifactId>spring-boot-starter-websocket</artifactId>
 			<version>2.5.2</version>
 		</dependency>
+
+
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>

device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java

@@ -6,6 +6,7 @@ import cn.hutool.core.lang.Validator;
 import cn.hutool.core.net.URLDecoder;
 import cn.hutool.core.net.url.UrlBuilder;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.URLUtil;
 import cn.hutool.extra.servlet.ServletUtil;
@@ -429,6 +430,9 @@ public class DeviceApiController {
         ApiResp<DeviceResp> rsp = new ApiResp<>();
         rsp.setCode(ApiRespCodeEnum.SUCCESS.getValue());
         DeviceResp deviceResp = new DeviceResp();
+        Double width = req.getWidth();
+        Double height = req.getHeight();
+
         try {
             if (ObjectUtils.isEmpty(req.getDeviceCode())) {
                 throw new AppException(DEVICE_CODE_IS_EMPTY, DEVICE_CODE_IS_EMPTY_CONTENT);
@@ -452,6 +456,22 @@ public class DeviceApiController {
 
             DeviceEntity deviceEntity = deviceService.getExtCache(req.getDeviceCode());
 
+
+            if (!ObjectUtils.isEmpty(width) && !ObjectUtils.isEmpty(height)) {
+                //根据分辨率 自适应设置分辨率
+                double div = NumberUtil.div(width, height, 2);
+                if (div >= 1.7 && div <= 1.8) {
+                    deviceEntity.setResolutionValue(ImageReEnum.RE_1920X1080.getDesc());
+                    System.out.println("1.7 < div < 1.8");
+                } else if (div >= 0.4 && div <= 0.7) {
+                    deviceEntity.setResolutionValue(ImageReEnum.RE_1080X1920.getDesc());
+                    System.out.println("1.7 < div < 1.8");
+                } else if (div >= 0.9 && div <= 1.1) {
+                    deviceEntity.setResolutionValue(ImageReEnum.RE_1280X1280.getDesc());
+                    System.out.println("div >= 0.9 && div <= 1.1");
+                }
+            }
+
             if (ObjectUtils.isEmpty(deviceEntity)) {
                 //初始化新增基础设备，后续在线完善信息后再行注册添加
                 deviceEntity = new DeviceEntity();
@@ -494,6 +514,9 @@ public class DeviceApiController {
             ServerInfo serverInfo = new ServerInfo();
             serverInfo.setScheme(scheme);
             // buildHomeUrl(deviceEntity, productEntity, serverInfo, serverName, serverPort);
+
+
+
             String resolution = deviceEntity.getResolution();
             if (!ObjectUtils.isEmpty(resolution)) {
                 DeviceModuleDistributeQuery query = new DeviceModuleDistributeQuery();
@@ -520,10 +543,30 @@ public class DeviceApiController {
                 } else {
                     buildHomeUrlBySite(deviceEntity, productEntity, serverInfo, serverName, serverPort);
                 }
+            } else if (!ObjectUtils.isEmpty(width) && !ObjectUtils.isEmpty(height)) {
+                //根据分辨率 自适应设置分辨率
+                double div = NumberUtil.div(width, height, 2);
+                if( div >= 1.7 && div <= 1.8){
+                    deviceEntity.setResolutionValue(ImageReEnum.RE_1920X1080.getDesc());
+                    System.out.println("1.7 < div < 1.8");
+                }else if( div >= 0.4 && div <= 0.7){
+                    deviceEntity.setResolutionValue(ImageReEnum.RE_1080X1920.getDesc());
+                    System.out.println("1.7 < div < 1.8");
+                }else if( div >= 0.9 && div <= 1.1){
+                    deviceEntity.setResolutionValue(ImageReEnum.RE_1280X1280.getDesc());
+                    System.out.println("div >= 0.9 && div <= 1.1");
+                }
+
+
+
+                // ImageReEnum.RE_1920X1080
+
+
             } else {
                 buildHomeUrlBySite(deviceEntity, productEntity, serverInfo, serverName, serverPort);
             }
 
+
             URI uri = new URI(platformEntity.getSendUrl());
             int port = uri.getPort();
             if (port != -1 && !ObjectUtils.isEmpty(serverName) && Validator.isIpv4(serverName)) {
@@ -655,7 +698,7 @@ public class DeviceApiController {
             BeanUtils.copyProperties(productVersionEntity, productVersionInfo, BeanUtil.getNullPropertyNames(productVersionEntity));
 
             buildDownloadUrl(productVersionEntity, productVersionInfo, serverName, serverPort);
-          //  String content = EncryptUtil.myEnscrt(JSON.toJSONString(productVersionInfo), 9, DES_STR, ENCRYPT_STR);
+            //  String content = EncryptUtil.myEnscrt(JSON.toJSONString(productVersionInfo), 9, DES_STR, ENCRYPT_STR);
             log.info("响应【设备版本检查】【响应体】-->  " + JSONObject.toJSONString(productVersionInfo));
             deviceResp.setContent(JSON.toJSONString(productVersionInfo));
             rsp.setData(deviceResp);
@@ -1005,7 +1048,7 @@ public class DeviceApiController {
 
 
         ProductEntity productEntity = productService.getCache(req.getProductCode());
-       // ProductEntity productEntity = productService.selectOne(new ProductQuery().productCode(req.getProductCode()));
+        // ProductEntity productEntity = productService.selectOne(new ProductQuery().productCode(req.getProductCode()));
         if (ObjectUtils.isEmpty(productEntity)) {
             throw new AppException(PRODUCT_IS_EMPTY, PRODUCT_IS_EMPTY_CONTENT);
         }
@@ -1023,7 +1066,7 @@ public class DeviceApiController {
         deviceEntity.setSiteName(req.getSiteName());
         deviceEntity.setPlatformId(platformEntity.getId());
         //deviceEntity.setPlatformName(platformEntity.getPlatformName());
-       // deviceEntity.setProductId(productEntity.getId());
+        // deviceEntity.setProductId(productEntity.getId());
         //deviceEntity.setProductCode(productEntity.getProductCode());
         //deviceEntity.setProductName(productEntity.getProductName());
         deviceEntity.setIp(req.getIp());
@@ -1351,7 +1394,7 @@ public class DeviceApiController {
 
             registerResp.setDeviceInfo(deviceInfo);
             log.info("resp:" + JSON.toJSONString(registerResp));
-           // String content = EncryptUtil.myEnscrt(JSON.toJSONString(registerResp), 9, DES_STR, ENCRYPT_STR);
+            // String content = EncryptUtil.myEnscrt(JSON.toJSONString(registerResp), 9, DES_STR, ENCRYPT_STR);
             deviceResp.setContent(JSON.toJSONString(registerResp));
             deviceEntity.setOnlineTime(new Date());
             deviceEntity.setDeviceStatus(DeviceStatusEnum.在线.getValue());

device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceModuleDistributeServiceImpl.java

@@ -230,6 +230,7 @@ public class DeviceModuleDistributeServiceImpl extends AbstractCRUDCacheServiceI
             query.setSiteId(targetSiteId);
             query.setProductId(moduleDistributeEntity.getProductId());
             query.setVersion(moduleDistributeEntity.getVersion());
+            query.setImageResolution(moduleDistributeEntity.getImageResolution());
             int count = this.count(query, context);
             if (count == 0) {
                 moduleDistributeEntity.setId(null);

device-manager/src/main/resources/sqlmap/base/system/user.xml

@@ -87,20 +87,20 @@
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
-    <insert id="insert" parameterType="UserEntity"  useGeneratedKeys="true" keyProperty="id">
+    <insert id="insert" parameterType="UserEntity" >
         insert into mortals_xhx_user
-        (loginName,loginPwd,loginLimitAddress,realName,mobile,phone,email,qq,userType,siteIds,areaCodes,status,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress)
+        (id,loginName,loginPwd,loginLimitAddress,realName,mobile,phone,email,qq,userType,siteIds,areaCodes,status,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress)
         VALUES
-        (#{loginName},#{loginPwd},#{loginLimitAddress},#{realName},#{mobile},#{phone},#{email},#{qq},#{userType},#{siteIds},#{areaCodes},#{status},#{createTime},#{createUserId},#{createUserName},#{lastLoginTime},#{lastLoginAddress})
+        (#{id},#{loginName},#{loginPwd},#{loginLimitAddress},#{realName},#{mobile},#{phone},#{email},#{qq},#{userType},#{siteIds},#{areaCodes},#{status},#{createTime},#{createUserId},#{createUserName},#{lastLoginTime},#{lastLoginAddress})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_user
-        (loginName,loginPwd,loginLimitAddress,realName,mobile,phone,email,qq,userType,siteIds,areaCodes,status,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress)
+        (id,loginName,loginPwd,loginLimitAddress,realName,mobile,phone,email,qq,userType,siteIds,areaCodes,status,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.loginName},#{item.loginPwd},#{item.loginLimitAddress},#{item.realName},#{item.mobile},#{item.phone},#{item.email},#{item.qq},#{item.userType},#{item.siteIds},#{item.areaCodes},#{item.status},#{item.createTime},#{item.createUserId},#{item.createUserName},#{item.lastLoginTime},#{item.lastLoginAddress})
+            (#{item.id},#{item.loginName},#{item.loginPwd},#{item.loginLimitAddress},#{item.realName},#{item.mobile},#{item.phone},#{item.email},#{item.qq},#{item.userType},#{item.siteIds},#{item.areaCodes},#{item.status},#{item.createTime},#{item.createUserId},#{item.createUserName},#{item.lastLoginTime},#{item.lastLoginAddress})
         </foreach>
     </insert>