回退版本检测信息

device-manager-ui/admin/src/views/product/version/drawershow.vue

@@ -8,7 +8,7 @@
         <el-form ref="form" :model="form" :rules="rules" label-width="120px">
             <el-row>
                             <Field label="产品类型" :span="20" prop="productId" type="select" :enumData="dict.productId" v-model="form.productId" placeholder="请选择产品"/>
-                            <Field label="文件地址" :span="20" prop="filePath"><fileUpload ref="fileUpload" v-model="form.filePath"  prePath="/file/uploadfile"/></Field>
+                            <Field label="文件地址" :span="20" prop="filePath"><fileUpload ref="fileUpload" v-model="form.filePath"  :prePath="'/file/uploadfile/'+siteid"/></Field>
                             <Field label="版本号" :span="20" prop="version" type="num" v-model="form.version" placeholder="请输入版本号"/>
                             <Field label="备注信息" :span="20" prop="remark" v-model="form.remark" type="textarea" placeholder="请输入备注信息"/>
 
@@ -22,6 +22,7 @@
 
 <script>
     import form from "@/assets/mixins/formdialog";
+    import session from "@/assets/utils/session";
     export default {
         name: "ProductVersionDetail",
         mixins: [form],
@@ -30,9 +31,11 @@
         },
         created() {
             this.changePath("product/version")
+          this.siteid= session.getSession("siteid")
         },
         data() {
             return {
+                 siteid:"",
                 // 遮罩层
                 loading: true,
                 // 弹出层标题

device-manager/db/add.sql

@@ -59,7 +59,7 @@ ALTER TABLE mortals_xhx_device_module_distribute ADD COLUMN   `siteId` bigint(20
 ALTER TABLE mortals_xhx_device_module_distribute ADD COLUMN   `siteCode` varchar(256)  default ''    COMMENT '站点编号，来源基础服务平台';
 ALTER TABLE mortals_xhx_device_module_distribute ADD COLUMN   `siteName` varchar(256)  default ''    COMMENT '站点名称';
 
-ALTER TABLE mortals_xhx_product_version ADD COLUMN   `siteId` bigint(20)      COMMENT '站点Id，来源基础服务平台';
+ALTER TABLE mortals_xhx_product_version ADD COLUMN   `siteId` bigint(20) default '1'      COMMENT '站点Id，来源基础服务平台';
 ALTER TABLE mortals_xhx_product_version ADD COLUMN   `siteCode` varchar(256)  default ''    COMMENT '站点编号，来源基础服务平台';
 ALTER TABLE mortals_xhx_product_version ADD COLUMN   `siteName` varchar(256)  default ''    COMMENT '站点名称';
 

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

@@ -516,7 +516,7 @@ public class DeviceApiController {
      * @param req
      * @return
      */
-    @PostMapping("checkVersion")
+   /* @PostMapping("checkVersion")
     public String checkVersion(HttpServletRequest request, @RequestBody DeviceReq req) {
         String serverName = request.getHeader("server-name");
         Integer serverPort = DataUtil.converStr2Int(request.getHeader("server-port"), 0);
@@ -558,6 +558,56 @@ public class DeviceApiController {
             return JSON.toJSONString(rsp);
         }
         return JSON.toJSONString(rsp);
+    }*/
+
+
+    /**
+     * 检查设备最新版本信息
+     *
+     * @param req
+     * @return
+     */
+    @PostMapping("checkVersion")
+    public String checkVersion(HttpServletRequest request, @RequestBody DeviceReq req) {
+        String serverName = request.getHeader("server-name");
+        Integer serverPort = DataUtil.converStr2Int(request.getHeader("server-port"), 0);
+//        String serverName = request.getServerName();
+//        int serverPort = request.getServerPort();
+        log.info("【检查设备最新版本信息】【请求体】-->  " + JSONObject.toJSONString(req));
+        ApiResp<DeviceResp> rsp = new ApiResp<>();
+        rsp.setCode(ApiRespCodeEnum.SUCCESS.getValue());
+        DeviceResp deviceResp = new DeviceResp();
+        try {
+            DeviceEntity deviceEntity = checkDeviceExist(req);
+            //查找版本号最大的.
+            ProductVersionQuery productVersionQuery = new ProductVersionQuery();
+            productVersionQuery.setProductId(deviceEntity.getProductId());
+            productVersionQuery.setOrderColList(Arrays.asList(new OrderCol("version", OrderCol.DESCENDING)));
+            //productVersionQuery.setOrderKind(OrderCol.DESCENDING);
+
+            ProductVersionEntity productVersionEntity = productVersionService.selectOne(productVersionQuery);
+            if (ObjectUtils.isEmpty(productVersionEntity)) {
+                throw new AppException(DEVICE_VERSION_UNEXIST, DEVICE_VERSION_UNEXIST_CONTENT);
+            }
+            ProductVersionInfo productVersionInfo = new ProductVersionInfo();
+            BeanUtils.copyProperties(productVersionEntity, productVersionInfo, BeanUtil.getNullPropertyNames(productVersionEntity));
+
+            buildDownloadUrl(productVersionEntity, productVersionInfo, serverName, serverPort);
+            String content = EncryptUtil.myEnscrt(JSON.toJSONString(productVersionInfo), 9, DES_STR, ENCRYPT_STR);
+            log.info("响应【设备版本检查】【响应体】-->  " + JSONObject.toJSONString(productVersionInfo));
+            deviceResp.setContent(content);
+            rsp.setData(deviceResp);
+        } catch (AppException e) {
+            rsp.setCode(e.getCode());
+            rsp.setMsg(e.getMessage());
+            return JSON.toJSONString(rsp);
+        } catch (Exception e) {
+            log.error("接收数据失败", e);
+            rsp.setCode(ApiRespCodeEnum.FAILED.getValue());
+            rsp.setMsg(e.getMessage());
+            return JSON.toJSONString(rsp);
+        }
+        return JSON.toJSONString(rsp);
     }
 
     private void saveDevice(DeviceReq req, PlatformEntity platformEntity, ProductEntity productEntity, DeviceEntity deviceEntity) {