diff --git a/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/WareHouse.java b/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/WareHouse.java index a2234bc..0fd80c9 100644 --- a/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/WareHouse.java +++ b/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; + } diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/callpolice/YCallPoliceMapper.xml b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/callpolice/YWareHouseMapper.xml similarity index 100% rename from yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/callpolice/YCallPoliceMapper.xml rename to yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/callpolice/YWareHouseMapper.xml diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/demobaseentity/YInfoMapper.xml b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/demobaseentity/YWareHouseMapper.xml similarity index 100% rename from yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/demobaseentity/YInfoMapper.xml rename to yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/demobaseentity/YWareHouseMapper.xml diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/demoidentity/YInfoMapper.xml b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/demoidentity/YWareHouseMapper.xml similarity index 100% rename from yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/demoidentity/YInfoMapper.xml rename to yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/demoidentity/YWareHouseMapper.xml diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceMapper.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceMapper.java index 538793b..5305c95 100644 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceMapper.java +++ b/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 { - IPage getDevicePage(); - List getWareHouseList(); } diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceMapper.xml b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceMapper.xml deleted file mode 100644 index 42ba9e7..0000000 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceMapper.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceService.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceService.java index fe63ad2..e333c44 100644 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceService.java +++ b/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 { @Resource YDeviceMapper yDeviceMapper; + @Resource + YWareHouseMapper yWareHouseMapper; + public IPage getDevicePage(Map searchVo, PageVo pageVo) { IPage page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(); page.setSize(pageVo.getSize()); @@ -119,30 +123,12 @@ public class YDeviceService extends ServiceImpl { public List getWareHouseList() { List athleteBOIPage = null; - String url = "http://jianguan.yyundong.com/api/portal/v1/flow/storeHouseListPage"; - String result = ""; - try { - Map 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; } diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/messageInfo/YMessageInfoMapper.xml b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/messageInfo/YWareHouseMapper.xml similarity index 100% rename from yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/messageInfo/YMessageInfoMapper.xml rename to yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/messageInfo/YWareHouseMapper.xml diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/scheduled/SyncService.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/scheduled/SyncService.java index ae76c20..b22b3f3 100644 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/scheduled/SyncService.java +++ b/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 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 athleteBOIPage = null; + try { + Map 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); + } } diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/wareHouse/YWareHouseMapper.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/wareHouse/YWareHouseMapper.java new file mode 100644 index 0000000..3f32e4e --- /dev/null +++ b/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 { + +} diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/wareHouse/YWareHouseMapper.xml b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/wareHouse/YWareHouseMapper.xml new file mode 100644 index 0000000..5197478 --- /dev/null +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/wareHouse/YWareHouseMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/wareHouse/YWareHouseService.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/wareHouse/YWareHouseService.java new file mode 100644 index 0000000..25ebce8 --- /dev/null +++ b/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 { + +}