定时器以及一些增删功能
This commit is contained in:
parent
0ebce622dd
commit
b97be72c54
@ -4,6 +4,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.ruoyi.project.hit.util.Util1;
|
||||
import com.ruoyi.project.hit.util.webSocket.WsServerEndpoint;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
import com.ruoyi.common.utils.StringUtils;
|
||||
|
||||
@ -19,6 +20,9 @@ import java.util.Map;
|
||||
@Component("ryTask")
|
||||
public class RyTask
|
||||
{
|
||||
@Autowired
|
||||
private WsServerEndpoint wsServerEndpoint;
|
||||
|
||||
public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i)
|
||||
{
|
||||
System.out.println(StringUtils.format("执行多参方法: 字符串类型{},布尔类型{},长整型{},浮点型{},整形{}", s, b, l, d, i));
|
||||
@ -35,39 +39,20 @@ public class RyTask
|
||||
}
|
||||
|
||||
public void reportCurrentTime1() {
|
||||
System.out.println("11");
|
||||
|
||||
WsServerEndpoint wsServerEndpoint=new WsServerEndpoint();
|
||||
try {
|
||||
// wsServerEndpoint.onOpen(wsServerEndpointMap.get("id"),wsServerEndpointMap.get("session"));
|
||||
wsServerEndpoint.sendMessage("jsonString");
|
||||
} catch (JsonProcessingException e) {
|
||||
e.printStackTrace();
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
|
||||
/*long l = System.currentTimeMillis();
|
||||
// System.out.println("11");
|
||||
long l = System.currentTimeMillis();
|
||||
Map<Integer, Long> upsMap = Util1.upsMap;
|
||||
for (Map.Entry<Integer, Long> entry : upsMap.entrySet()) {
|
||||
if(l-entry.getValue()>=30000){
|
||||
System.out.println(entry.getKey());
|
||||
WsServerEndpoint wsServerEndpoint=new WsServerEndpoint();
|
||||
Map<String,Object> map=new HashMap<>();
|
||||
map.put("id",1);
|
||||
map.put("msg","111");
|
||||
ObjectMapper objectMapper = new ObjectMapper();
|
||||
try {
|
||||
String jsonString = objectMapper.writeValueAsString(map);
|
||||
wsServerEndpoint.sendMessage(jsonString);
|
||||
} catch (JsonProcessingException e) {
|
||||
e.printStackTrace();
|
||||
wsServerEndpoint.sendAllUser("id"+entry.getKey()+"设备异常");
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
}
|
||||
}*/
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -0,0 +1,19 @@
|
||||
package com.ruoyi.project.hit.controller;
|
||||
|
||||
import com.ruoyi.framework.web.domain.AjaxResult;
|
||||
import com.ruoyi.project.hit.service.PupuEquipmentService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/hit/equipment")
|
||||
public class PupuEquipmentController {
|
||||
@Autowired
|
||||
private PupuEquipmentService pupuEquipmentService;
|
||||
|
||||
// @PutMapping("/add")
|
||||
// public AjaxResult add(@RequestBody )
|
||||
}
|
@ -0,0 +1,38 @@
|
||||
package com.ruoyi.project.hit.controller;
|
||||
|
||||
import com.ruoyi.framework.web.controller.BaseController;
|
||||
import com.ruoyi.framework.web.domain.AjaxResult;
|
||||
import com.ruoyi.project.hit.domain.PupuStore;
|
||||
import com.ruoyi.project.hit.service.PupuStoreService;
|
||||
import com.ruoyi.project.hit.service.PupuUserService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/hit/store")
|
||||
public class PupuStoreController extends BaseController {
|
||||
@Autowired
|
||||
private PupuStoreService pupuStoreService;
|
||||
|
||||
/**
|
||||
* 新增门店
|
||||
* @param pupuStore
|
||||
* @return
|
||||
*/
|
||||
@PutMapping("/add")
|
||||
public AjaxResult add(@Validated @RequestBody PupuStore pupuStore){
|
||||
return toAjax(pupuStoreService.add(pupuStore));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除门店
|
||||
* @param storeId
|
||||
* @return
|
||||
*/
|
||||
@DeleteMapping("/del/{storeId}")
|
||||
public AjaxResult del(@PathVariable(value = "storeId")Integer storeId){
|
||||
return toAjax(pupuStoreService.del(storeId));
|
||||
}
|
||||
|
||||
}
|
@ -4,18 +4,19 @@ import com.alibaba.fastjson.JSONArray;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.ruoyi.framework.web.controller.BaseController;
|
||||
import com.ruoyi.framework.web.domain.AjaxResult;
|
||||
import com.ruoyi.framework.web.page.TableDataInfo;
|
||||
import com.ruoyi.project.hit.domain.PupuUpsHistory;
|
||||
import com.ruoyi.project.hit.domain.vo.UpsHistoryVO;
|
||||
import com.ruoyi.project.hit.service.PupuUpsHistoryService;
|
||||
import com.ruoyi.project.hit.util.Util1;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.data.redis.core.RedisTemplate;
|
||||
import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
@ -38,7 +39,7 @@ public class PupuUpsHistoryController extends BaseController {
|
||||
Map<String, Object> map=new HashMap<>();
|
||||
try {
|
||||
map = mapper.readValue(data, Map.class);
|
||||
// System.out.println(map);
|
||||
System.out.println(map);
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
@ -58,5 +59,17 @@ public class PupuUpsHistoryController extends BaseController {
|
||||
return AjaxResult.success(b);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查看设备历史记录
|
||||
* @param upsHistoryVO(upsId,startTime,endTime,pageNum,pageSize)
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/select")
|
||||
public TableDataInfo select(@RequestBody UpsHistoryVO upsHistoryVO){
|
||||
startPage();
|
||||
List<HashMap> select = pupuUpsHistoryService.select(upsHistoryVO);
|
||||
return getDataTable(select);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
@ -0,0 +1,26 @@
|
||||
package com.ruoyi.project.hit.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @TableName pupu_equipment
|
||||
*/
|
||||
@TableName(value ="pupu_equipment")
|
||||
@Data
|
||||
public class PupuEquipment implements Serializable {
|
||||
private Integer equipmentId;
|
||||
|
||||
private String serialNumber;
|
||||
|
||||
private Date createTime;
|
||||
|
||||
private Integer status;
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
}
|
33
src/main/java/com/ruoyi/project/hit/domain/PupuStore.java
Normal file
33
src/main/java/com/ruoyi/project/hit/domain/PupuStore.java
Normal file
@ -0,0 +1,33 @@
|
||||
package com.ruoyi.project.hit.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import java.io.Serializable;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
|
||||
/**
|
||||
* @TableName pupu_store
|
||||
*/
|
||||
@TableName(value ="pupu_store")
|
||||
@Data
|
||||
public class PupuStore implements Serializable {
|
||||
@TableId(type = IdType.AUTO)
|
||||
private Integer storeId;
|
||||
|
||||
@NotBlank(message = "店名不能为空")
|
||||
private String storeName;
|
||||
|
||||
@NotBlank(message = "经度不能为空")
|
||||
private String longitude;
|
||||
|
||||
@NotBlank(message = "纬度不能为空")
|
||||
private String latitude;
|
||||
|
||||
private Integer status;
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
}
|
@ -0,0 +1,23 @@
|
||||
package com.ruoyi.project.hit.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import java.io.Serializable;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @TableName pupu_store_equipment
|
||||
*/
|
||||
@TableName(value ="pupu_store_equipment")
|
||||
@Data
|
||||
public class PupuStoreEquipment implements Serializable {
|
||||
private Integer id;
|
||||
|
||||
private Integer storeId;
|
||||
|
||||
private Integer equipmentId;
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
}
|
@ -0,0 +1,7 @@
|
||||
package com.ruoyi.project.hit.domain.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class AddEquipmentVO {
|
||||
}
|
@ -0,0 +1,13 @@
|
||||
package com.ruoyi.project.hit.domain.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
@Data
|
||||
public class UpsHistoryVO {
|
||||
private Integer upsId;
|
||||
|
||||
private Date startTime;
|
||||
|
||||
private Date endTime;
|
||||
}
|
@ -0,0 +1,18 @@
|
||||
package com.ruoyi.project.hit.mapper;
|
||||
|
||||
import com.ruoyi.project.hit.domain.PupuEquipment;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* @author HP
|
||||
* @description 针对表【pupu_equipment】的数据库操作Mapper
|
||||
* @createDate 2024-09-05 16:50:18
|
||||
* @Entity com.ruoyi.project.hit.domain.PupuEquipment
|
||||
*/
|
||||
public interface PupuEquipmentMapper extends BaseMapper<PupuEquipment> {
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
@ -0,0 +1,18 @@
|
||||
package com.ruoyi.project.hit.mapper;
|
||||
|
||||
import com.ruoyi.project.hit.domain.PupuStoreEquipment;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* @author HP
|
||||
* @description 针对表【pupu_store_equipment】的数据库操作Mapper
|
||||
* @createDate 2024-09-05 16:50:00
|
||||
* @Entity com.ruoyi.project.hit.domain.PupuStoreEquipment
|
||||
*/
|
||||
public interface PupuStoreEquipmentMapper extends BaseMapper<PupuStoreEquipment> {
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
@ -0,0 +1,18 @@
|
||||
package com.ruoyi.project.hit.mapper;
|
||||
|
||||
import com.ruoyi.project.hit.domain.PupuStore;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* @author HP
|
||||
* @description 针对表【pupu_store】的数据库操作Mapper
|
||||
* @createDate 2024-09-05 16:23:38
|
||||
* @Entity com.ruoyi.project.hit.domain.PupuStore
|
||||
*/
|
||||
public interface PupuStoreMapper extends BaseMapper<PupuStore> {
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
@ -2,6 +2,10 @@ package com.ruoyi.project.hit.mapper;
|
||||
|
||||
import com.ruoyi.project.hit.domain.PupuUpsHistory;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.ruoyi.project.hit.domain.vo.UpsHistoryVO;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author HP
|
||||
@ -11,6 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
*/
|
||||
public interface PupuUpsHistoryMapper extends BaseMapper<PupuUpsHistory> {
|
||||
|
||||
List<HashMap> select(UpsHistoryVO upsHistoryVO);
|
||||
}
|
||||
|
||||
|
||||
|
@ -0,0 +1,13 @@
|
||||
package com.ruoyi.project.hit.service;
|
||||
|
||||
import com.ruoyi.project.hit.domain.PupuEquipment;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
/**
|
||||
* @author HP
|
||||
* @description 针对表【pupu_equipment】的数据库操作Service
|
||||
* @createDate 2024-09-05 16:50:18
|
||||
*/
|
||||
public interface PupuEquipmentService extends IService<PupuEquipment> {
|
||||
|
||||
}
|
@ -0,0 +1,13 @@
|
||||
package com.ruoyi.project.hit.service;
|
||||
|
||||
import com.ruoyi.project.hit.domain.PupuStoreEquipment;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
/**
|
||||
* @author HP
|
||||
* @description 针对表【pupu_store_equipment】的数据库操作Service
|
||||
* @createDate 2024-09-05 16:50:00
|
||||
*/
|
||||
public interface PupuStoreEquipmentService extends IService<PupuStoreEquipment> {
|
||||
|
||||
}
|
@ -0,0 +1,16 @@
|
||||
package com.ruoyi.project.hit.service;
|
||||
|
||||
import com.ruoyi.project.hit.domain.PupuStore;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
/**
|
||||
* @author HP
|
||||
* @description 针对表【pupu_store】的数据库操作Service
|
||||
* @createDate 2024-09-05 16:23:38
|
||||
*/
|
||||
public interface PupuStoreService extends IService<PupuStore> {
|
||||
|
||||
int add(PupuStore pupuStore);
|
||||
|
||||
int del(Integer storeId);
|
||||
}
|
@ -2,6 +2,10 @@ package com.ruoyi.project.hit.service;
|
||||
|
||||
import com.ruoyi.project.hit.domain.PupuUpsHistory;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.ruoyi.project.hit.domain.vo.UpsHistoryVO;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author HP
|
||||
@ -10,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
||||
*/
|
||||
public interface PupuUpsHistoryService extends IService<PupuUpsHistory> {
|
||||
|
||||
List<HashMap> select(UpsHistoryVO upsHistoryVO);
|
||||
}
|
||||
|
@ -1,5 +1,6 @@
|
||||
package com.ruoyi.project.hit.service;
|
||||
|
||||
import com.ruoyi.project.hit.domain.PupuStore;
|
||||
import com.ruoyi.project.hit.domain.PupuUser;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.ruoyi.project.hit.domain.vo.UserLoginVO;
|
||||
@ -14,4 +15,6 @@ public interface PupuUserService extends IService<PupuUser> {
|
||||
PupuUser login(UserLoginVO userLoginVO);
|
||||
|
||||
int register(PupuUser pupuUser);
|
||||
|
||||
|
||||
}
|
||||
|
@ -0,0 +1,22 @@
|
||||
package com.ruoyi.project.hit.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.ruoyi.project.hit.domain.PupuEquipment;
|
||||
import com.ruoyi.project.hit.service.PupuEquipmentService;
|
||||
import com.ruoyi.project.hit.mapper.PupuEquipmentMapper;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
* @author HP
|
||||
* @description 针对表【pupu_equipment】的数据库操作Service实现
|
||||
* @createDate 2024-09-05 16:50:18
|
||||
*/
|
||||
@Service
|
||||
public class PupuEquipmentServiceImpl extends ServiceImpl<PupuEquipmentMapper, PupuEquipment>
|
||||
implements PupuEquipmentService{
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
@ -0,0 +1,22 @@
|
||||
package com.ruoyi.project.hit.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.ruoyi.project.hit.domain.PupuStoreEquipment;
|
||||
import com.ruoyi.project.hit.service.PupuStoreEquipmentService;
|
||||
import com.ruoyi.project.hit.mapper.PupuStoreEquipmentMapper;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
* @author HP
|
||||
* @description 针对表【pupu_store_equipment】的数据库操作Service实现
|
||||
* @createDate 2024-09-05 16:50:00
|
||||
*/
|
||||
@Service
|
||||
public class PupuStoreEquipmentServiceImpl extends ServiceImpl<PupuStoreEquipmentMapper, PupuStoreEquipment>
|
||||
implements PupuStoreEquipmentService{
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
@ -0,0 +1,35 @@
|
||||
package com.ruoyi.project.hit.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.ruoyi.project.hit.domain.PupuStore;
|
||||
import com.ruoyi.project.hit.service.PupuStoreService;
|
||||
import com.ruoyi.project.hit.mapper.PupuStoreMapper;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
/**
|
||||
* @author HP
|
||||
* @description 针对表【pupu_store】的数据库操作Service实现
|
||||
* @createDate 2024-09-05 16:23:38
|
||||
*/
|
||||
@Service
|
||||
public class PupuStoreServiceImpl extends ServiceImpl<PupuStoreMapper, PupuStore>
|
||||
implements PupuStoreService{
|
||||
|
||||
@Resource
|
||||
private PupuStoreMapper pupuStoreMapper;
|
||||
@Override
|
||||
public int add(PupuStore pupuStore) {
|
||||
return pupuStoreMapper.insert(pupuStore);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int del(Integer storeId) {
|
||||
return pupuStoreMapper.deleteById(storeId);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
@ -2,10 +2,15 @@ package com.ruoyi.project.hit.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.ruoyi.project.hit.domain.PupuUpsHistory;
|
||||
import com.ruoyi.project.hit.domain.vo.UpsHistoryVO;
|
||||
import com.ruoyi.project.hit.service.PupuUpsHistoryService;
|
||||
import com.ruoyi.project.hit.mapper.PupuUpsHistoryMapper;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author HP
|
||||
* @description 针对表【pupu_ups_history】的数据库操作Service实现
|
||||
@ -14,7 +19,12 @@ import org.springframework.stereotype.Service;
|
||||
@Service
|
||||
public class PupuUpsHistoryServiceImpl extends ServiceImpl<PupuUpsHistoryMapper, PupuUpsHistory>
|
||||
implements PupuUpsHistoryService{
|
||||
|
||||
@Resource
|
||||
PupuUpsHistoryMapper pupuUpsHistoryMapper;
|
||||
@Override
|
||||
public List<HashMap> select(UpsHistoryVO upsHistoryVO) {
|
||||
return pupuUpsHistoryMapper.select(upsHistoryVO);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@ -3,6 +3,7 @@ package com.ruoyi.project.hit.service.impl;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.ruoyi.common.exception.CustomException;
|
||||
import com.ruoyi.project.hit.domain.PupuStore;
|
||||
import com.ruoyi.project.hit.domain.PupuUser;
|
||||
import com.ruoyi.project.hit.domain.vo.UserLoginVO;
|
||||
import com.ruoyi.project.hit.service.PupuUserService;
|
||||
@ -43,6 +44,8 @@ public class PupuUserServiceImpl extends ServiceImpl<PupuUserMapper, PupuUser>
|
||||
}
|
||||
return i;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
@ -7,10 +7,12 @@ import okhttp3.Response;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public class Util1 {
|
||||
public static Map<Integer, Long> upsMap;
|
||||
public static Map<Integer, Long> upsMap=new HashMap<>();
|
||||
|
||||
public static String getdetail() throws IOException {
|
||||
OkHttpClient client = new OkHttpClient().newBuilder()
|
||||
.build();
|
||||
@ -49,9 +51,10 @@ public class Util1 {
|
||||
public static PupuUpsHistory getHistoryFromMap(Map<String, Object> map) {
|
||||
PupuUpsHistory history=null;
|
||||
|
||||
history = new PupuUpsHistory(null,(String) map.get("identifier"),new Date((Long) map.get("time")) ,
|
||||
history = new PupuUpsHistory(1,(String) map.get("identifier"),new Date((Long) map.get("time")) ,
|
||||
(String) map.get("value"),(String) map.get("data_type"),(String) map.get("name"),(String) map.get("access_mode"));
|
||||
upsMap.put(history.getUpsId(),(Long) map.get("time"));
|
||||
|
||||
upsMap.put(1, (Long) map.get("time"));
|
||||
return history;
|
||||
}
|
||||
|
||||
|
@ -87,13 +87,5 @@ public class WsServerEndpoint {
|
||||
}
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
System.out.println(wsServerEndpointMap.toString());
|
||||
try {
|
||||
wsServerEndpointMap.get("1").sendMessage("000");
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
18
src/main/resources/mybatis/hit/PupuEquipmentMapper.xml
Normal file
18
src/main/resources/mybatis/hit/PupuEquipmentMapper.xml
Normal file
@ -0,0 +1,18 @@
|
||||
<?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.ruoyi.project.hit.mapper.PupuEquipmentMapper">
|
||||
|
||||
<resultMap id="BaseResultMap" type="com.ruoyi.project.hit.domain.PupuEquipment">
|
||||
<id property="equipmentId" column="equipment_id" jdbcType="INTEGER"/>
|
||||
<result property="serialNumber" column="serial_number" jdbcType="VARCHAR"/>
|
||||
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
|
||||
<result property="status" column="status" jdbcType="INTEGER"/>
|
||||
</resultMap>
|
||||
|
||||
<sql id="Base_Column_List">
|
||||
equipment_id,serial_number,create_time,
|
||||
status
|
||||
</sql>
|
||||
</mapper>
|
16
src/main/resources/mybatis/hit/PupuStoreEquipmentMapper.xml
Normal file
16
src/main/resources/mybatis/hit/PupuStoreEquipmentMapper.xml
Normal file
@ -0,0 +1,16 @@
|
||||
<?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.ruoyi.project.hit.mapper.PupuStoreEquipmentMapper">
|
||||
|
||||
<resultMap id="BaseResultMap" type="com.ruoyi.project.hit.domain.PupuStoreEquipment">
|
||||
<id property="id" column="id" jdbcType="INTEGER"/>
|
||||
<result property="storeId" column="store_id" jdbcType="INTEGER"/>
|
||||
<result property="equipmentId" column="equipment_id" jdbcType="INTEGER"/>
|
||||
</resultMap>
|
||||
|
||||
<sql id="Base_Column_List">
|
||||
id,store_id,equipment_id
|
||||
</sql>
|
||||
</mapper>
|
19
src/main/resources/mybatis/hit/PupuStoreMapper.xml
Normal file
19
src/main/resources/mybatis/hit/PupuStoreMapper.xml
Normal file
@ -0,0 +1,19 @@
|
||||
<?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.ruoyi.project.hit.mapper.PupuStoreMapper">
|
||||
|
||||
<resultMap id="BaseResultMap" type="com.ruoyi.project.hit.domain.PupuStore">
|
||||
<id property="storeId" column="store_id" jdbcType="INTEGER"/>
|
||||
<result property="storeName" column="store_name" jdbcType="VARCHAR"/>
|
||||
<result property="longitude" column="longitude" jdbcType="VARCHAR"/>
|
||||
<result property="dimensionality" column="dimensionality" jdbcType="VARCHAR"/>
|
||||
<result property="status" column="status" jdbcType="INTEGER"/>
|
||||
</resultMap>
|
||||
|
||||
<sql id="Base_Column_List">
|
||||
store_id,store_name,longitude,
|
||||
dimensionality,status
|
||||
</sql>
|
||||
</mapper>
|
@ -20,4 +20,38 @@
|
||||
time,value,data_type,
|
||||
name,access_mode
|
||||
</sql>
|
||||
|
||||
<select id="select" resultType="java.util.HashMap">
|
||||
SELECT
|
||||
pupu_ups_history.ups_id AS upsId,
|
||||
pupu_ups_history.identifier,
|
||||
pupu_ups_history.time,
|
||||
pupu_ups_history.`value`,
|
||||
pupu_ups_history.data_type AS dateType,
|
||||
pupu_ups_history.`name`,
|
||||
pupu_ups_history.access_mode AS accessMode,
|
||||
pupu_store.store_id AS storeId,
|
||||
pupu_store.store_name AS storeName
|
||||
FROM
|
||||
pupu_store_equipment
|
||||
INNER JOIN
|
||||
pupu_ups_history
|
||||
ON
|
||||
pupu_store_equipment.equipment_id = pupu_ups_history.ups_id
|
||||
INNER JOIN
|
||||
pupu_store
|
||||
ON
|
||||
pupu_store.store_id = pupu_store_equipment.store_id
|
||||
<where>
|
||||
<if test="upsId!=null">
|
||||
pupu_ups_history.ups_id = #{upsId}
|
||||
</if>
|
||||
<if test="startTime !=null" >
|
||||
and pupu_ups_history.time > #{startTime}
|
||||
</if>
|
||||
<if test="endTime !=null" >
|
||||
and pupu_ups_history.time < #{endTime}
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
</mapper>
|
||||
|
Loading…
Reference in New Issue
Block a user