对接仓库接口

yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/WareHouse.java

@@ -12,6 +12,7 @@ import java.util.Date;
 
 @Data
 @ApiModel(value = "有ID的实体", description = "有ID的实体")
+@TableName("y_warehouse")
 public class WareHouse {
 
     @ApiModelProperty("ID，唯一编号")
@@ -83,4 +84,7 @@ public class WareHouse {
 
     private String projectSid;
 
+    @ApiModelProperty("是否隐藏")
+    private boolean showStatus;
+
 }

yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceMapper.java

@@ -10,7 +10,5 @@ import java.util.List;
 
 @Mapper
 public interface YDeviceMapper extends BaseMapper<Device> {
-    IPage<Device> getDevicePage();
 
-    List<WareHouse> getWareHouseList();
 }

yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceMapper.xml

@@ -1,8 +0,0 @@
-<?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.yxt.supervise.monitor.biz.device.YDeviceMapper">
-    <select id="getWareHouseList" resultType="com.yxt.supervise.monitor.api.entity.WareHouse">
-        select id,name
-        from y_warehouse
-    </select>
-</mapper>

yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceService.java

@@ -14,6 +14,7 @@ import com.yxt.supervise.monitor.api.entity.WareHouse;
 import com.yxt.supervise.monitor.api.vo.PageVo;
 import com.yxt.supervise.monitor.biz.scheduled.SyncService;
 import com.yxt.supervise.monitor.biz.util.HttpUtils;
+import com.yxt.supervise.monitor.biz.wareHouse.YWareHouseMapper;
 import org.springframework.stereotype.Service;
 import springfox.documentation.spring.web.json.Json;
 
@@ -34,6 +35,9 @@ public class YDeviceService extends ServiceImpl<YDeviceMapper, Device> {
     @Resource
     YDeviceMapper yDeviceMapper;
 
+    @Resource
+    YWareHouseMapper yWareHouseMapper;
+
     public IPage<Device> getDevicePage(Map<String, String> searchVo, PageVo pageVo) {
         IPage<Device> page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>();
         page.setSize(pageVo.getSize());
@@ -119,30 +123,12 @@ public class YDeviceService extends ServiceImpl<YDeviceMapper, Device> {
     public List<WareHouse> getWareHouseList() {
 
         List<WareHouse> athleteBOIPage = null;
-        String url = "http://jianguan.yyundong.com/api/portal/v1/flow/storeHouseListPage";
-        String result = "";
-
         try {
-            Map<String, Object> paramMap = new HashMap<>();
-            paramMap.put("current", "1");
-            paramMap.put("size", "1000");
-            paramMap.put("params", new Object());
-            String jsonParam = JSONObject.toJSONString(paramMap);
-            result = HttpUtils.sendPostJson(url, jsonParam, "");
-            JSONObject jsonObject = JSONObject.parseObject(result);
-            JSONObject jsonData = (JSONObject) jsonObject.get("data");
-            String jsonRecords = jsonData.getString("records");
-            athleteBOIPage = JSONArray.parseArray(jsonRecords, WareHouse.class);
+            athleteBOIPage = yWareHouseMapper.selectList(new QueryWrapper<>());
         } catch (Exception e) {
             System.out.println(e);
             athleteBOIPage = null;
         }
-//        try {
-//            athleteBOIPage = yDeviceMapper.getWareHouseList();
-//        } catch (Exception e) {
-//            System.out.println(e);
-//            athleteBOIPage = null;
-//        }
         return athleteBOIPage;
     }
 

yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/scheduled/SyncService.java

@@ -1,9 +1,13 @@
 package com.yxt.supervise.monitor.biz.scheduled;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yxt.supervise.monitor.api.entity.WareHouse;
 import com.yxt.supervise.monitor.biz.messageInfo.YMessageInfoService;
 import com.yxt.supervise.monitor.biz.task.YTaskService;
 import com.yxt.supervise.monitor.biz.util.HttpUtils;
+import com.yxt.supervise.monitor.biz.wareHouse.YWareHouseService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -14,6 +18,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.PostConstruct;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Service
@@ -23,6 +28,9 @@ public class SyncService {
     @Autowired
     YMessageInfoService yMessageInfoService;
 
+    @Autowired
+    YWareHouseService yWareHouseService;
+
     @Autowired
     YTaskService yTaskService;
 
@@ -36,7 +44,7 @@ public class SyncService {
     public static String haiKangMessageConsumer = "";
 
     @PostConstruct
-    public void getMessageConsumer() {
+    public void initMain() {
         // 先登录
         String loginUrl = "https://api2.hik-cloud.com/oauth/token";
         Map<String, Object> tokenParam = new HashMap<>();
@@ -63,6 +71,32 @@ public class SyncService {
             System.out.println(message);
             log.error(message);
         }
+
+
+        // 更新仓库列表数据
+        String url = "http://jianguan.yyundong.com/api/portal/v1/flow/storeHouseListPage";
+        String result = "";
+        List<WareHouse> athleteBOIPage = null;
+        try {
+            Map<String, Object> paramMap = new HashMap<>();
+            paramMap.put("current", "1");
+            paramMap.put("size", "1000");
+            paramMap.put("params", new Object());
+            String jsonParam = JSONObject.toJSONString(paramMap);
+            result = HttpUtils.sendPostJson(url, jsonParam, "");
+            JSONObject jsonObject = JSONObject.parseObject(result);
+            JSONObject jsonData = (JSONObject) jsonObject.get("data");
+            String jsonRecords = jsonData.getString("records");
+            athleteBOIPage = JSONArray.parseArray(jsonRecords, WareHouse.class);
+        } catch (Exception e) {
+            System.out.println(e);
+            athleteBOIPage = null;
+        }
+        yWareHouseService.remove(new QueryWrapper<>());
+        for (WareHouse wareHouse : athleteBOIPage) {
+            wareHouse.setShowStatus(true);
+            yWareHouseService.save(wareHouse);
+        }
     }
 
 

yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/wareHouse/YWareHouseMapper.java

@@ -0,0 +1,14 @@
+package com.yxt.supervise.monitor.biz.wareHouse;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.supervise.monitor.api.entity.Device;
+import com.yxt.supervise.monitor.api.entity.WareHouse;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface YWareHouseMapper extends BaseMapper<WareHouse> {
+
+}

yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/wareHouse/YWareHouseMapper.xml

@@ -0,0 +1,5 @@
+<?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.yxt.supervise.monitor.biz.wareHouse.YWareHouseMapper">
+
+</mapper>

yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/wareHouse/YWareHouseService.java

@@ -0,0 +1,28 @@
+package com.yxt.supervise.monitor.biz.wareHouse;
+
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.supervise.monitor.api.entity.Device;
+import com.yxt.supervise.monitor.api.entity.WareHouse;
+import com.yxt.supervise.monitor.api.vo.PageVo;
+import com.yxt.supervise.monitor.biz.scheduled.SyncService;
+import com.yxt.supervise.monitor.biz.util.HttpUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class YWareHouseService extends ServiceImpl<YWareHouseMapper, WareHouse> {
+
+}