Skip to content

Z
zhxf_java
Commit e9e67c03 authored by co_dengxiongwen's avatar co_dengxiongwen
Browse files
Options

接口调整

parent 333fc3dd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 413 additions and 2180 deletions
microservice-admin/src/main/java/com/devplatform/admin/config/ShiroConfig.java
View file @ e9e67c03
......@@ -2,10 +2,6 @@ package com.devplatform.admin.config;
import com.devplatform.admin.modules.sys.oauth2.Oauth2Filter;
import com.devplatform.admin.modules.sys.oauth2.Oauth2Realm;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import javax.servlet.Filter;
import org.apache.shiro.mgt.SecurityManager;
import org.apache.shiro.session.mgt.SessionManager;
import org.apache.shiro.spring.LifecycleBeanPostProcessor;
......@@ -17,6 +13,11 @@ import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreato
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import javax.servlet.Filter;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* Shiro配置
*
......@@ -82,6 +83,7 @@ public class ShiroConfig {
filterMap.put("/endpoint", "anon");
filterMap.put("/weChat/**", "anon");
filterMap.put("/alramsSend/sendAlramsInfo", "anon");
filterMap.put("/kanban/sendParamsInfo", "anon");
filterMap.put("/liStation/queryById", "anon");
filterMap.put("/sysStationTakeover/anyRouter", "anon");
filterMap.put("/**", "oauth2");
......
microservice-admin/src/main/java/com/devplatform/admin/config/WebSocket.java
View file @ e9e67c03
package com.devplatform.admin.config;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.devplatform.admin.common.utils.Constants;
import com.devplatform.admin.modules.sys.bean.SysStationTakeover;
import com.devplatform.admin.modules.sys.bean.SysSystem;
import com.devplatform.admin.modules.sys.service.SysStationTakeoverService;
import com.devplatform.admin.modules.sys.service.SysSystemService;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Component;
import javax.websocket.OnClose;
......@@ -17,7 +11,6 @@ import javax.websocket.Session;
import javax.websocket.server.PathParam;
import javax.websocket.server.ServerEndpoint;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.CopyOnWriteArraySet;
......@@ -29,7 +22,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
@ServerEndpoint("/websocket/{shopId}")
public class WebSocket {
public static SysStationTakeoverService sysStationTakeoverService;
public static SysSystemService sysSystemService;
private static CopyOnWriteArraySet<WebSocket> webSockets = new CopyOnWriteArraySet<>();
private static CopyOnWriteArraySet<WebSocket> webSocketPub = new CopyOnWriteArraySet<>();
......@@ -49,29 +41,6 @@ public class WebSocket {
webSocketPub.add(this);
sessionPool.put(shopId, session);
System.out.println("【websocket1002消息】有新的连接\n\tsessionId：" + session.getId() + "\n\t总数为:" + webSocketPub.size());
SysSystem sysSystem = sysSystemService.getById(Constants.STRING_1);
if (Constants.STRING_1.equals(sysSystem.getType())) {
//站点系统重新链接，查询是否被接管了
// 判断当前站点是否被接管了或者有接管申请
LambdaQueryWrapper<SysStationTakeover> queryWrapper =
new LambdaQueryWrapper<SysStationTakeover>()
.eq(SysStationTakeover::getStationId, sysSystem.getCode())
.eq(SysStationTakeover::getValids, 1)
.le(SysStationTakeover::getStatus, 2)
.orderByDesc(SysStationTakeover::getApplyTime);
SysStationTakeover one = sysStationTakeoverService.getOne(queryWrapper);
session.getAsyncRemote().sendText("one_" + JSON.toJSONString(one));
} else if (Constants.STRING_2.equals(sysSystem.getType()) || Constants.STRING_3.equals(sysSystem.getType())) {
//线路/路网查询接管了哪些站点
LambdaQueryWrapper<SysStationTakeover> queryWrapper =
new LambdaQueryWrapper<SysStationTakeover>()
.eq(SysStationTakeover::getValids, 1)
.eq(SysStationTakeover::getStatus, 2)
.orderByDesc(SysStationTakeover::getApplyTime);
List<SysStationTakeover> list = sysStationTakeoverService.list(queryWrapper);
session.getAsyncRemote().sendText("list_" + JSON.toJSONString(list));
}
}
}
......
microservice-admin/src/main/java/com/devplatform/admin/config/WebSocketConfig.java
View file @ e9e67c03
package com.devplatform.admin.config;
import com.devplatform.admin.modules.sys.service.SysStationTakeoverService;
import com.devplatform.admin.modules.sys.service.SysSystemService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
......@@ -21,9 +20,4 @@ public class WebSocketConfig {
WebSocket.sysSystemService = sysSystemService;
}
@Autowired
public void setSysStationTakeoverService(SysStationTakeoverService sysStationTakeoverService) {
WebSocket.sysStationTakeoverService = sysStationTakeoverService;
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/controller/KanBanController.java 0 → 100644
View file @ e9e67c03
package com.devplatform.admin.modules.eq.controller;
import com.alibaba.fastjson.JSONObject;
import com.devplatform.admin.common.utils.AbstractController;
import com.devplatform.admin.config.WebSocket;
import com.devplatform.admin.modules.eq.service.KanBanService;
import com.devplatform.common.util.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.Map;
/**
* 数据看板
* @author dxw
*/
@Api(tags={"数据看板接口"})
@RestController
@RequestMapping("/kanban")
public class KanBanController extends AbstractController {
@Autowired
private KanBanService kanBanService;
@Autowired
private WebSocket webSocket;
/**
* 获取每个设备最新的参数值
* @return
*/
@ApiOperation(value="获取每个设备最新的参数值", notes="获取每个设备最新的参数值")
@GetMapping("/getListParam")
public R getListParam() {
Map<String,Object> list = kanBanService.getList();
return R.ok().put("bean", list);
}
/**
* 发送每个设备最新的参数值
* @return
*/
@ApiOperation(value="发送每个设备最新的参数值", notes="发送每个设备最新的参数值")
@PostMapping("/sendParamsInfo")
public R sendParamsInfo() {
Map<String,Object> list = kanBanService.getList();
webSocket.sendPubAllMessage(JSONObject.toJSONString(list));
return R.ok();
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/FsyInfoDao.java
View file @ e9e67c03
......@@ -6,6 +6,7 @@ import com.devplatform.admin.modules.eq.bean.FsyInfo;
import com.devplatform.common.dao.MyBaseMapper;
import java.util.List;
import java.util.Map;
/**
* FsyInfo Mapper
......@@ -29,4 +30,6 @@ public interface FsyInfoDao extends MyBaseMapper<FsyInfo> {
* @return
*/
List<FsyInfo> queryPageList(FsyInfoModel model);
List<Map<String, Object>> getList();
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/FyyInfoDao.java
View file @ e9e67c03
......@@ -6,6 +6,7 @@ import com.devplatform.admin.modules.eq.bean.FyyInfo;
import com.devplatform.common.dao.MyBaseMapper;
import java.util.List;
import java.util.Map;
/**
* FyyInfo Mapper
......@@ -29,4 +30,6 @@ public interface FyyInfoDao extends MyBaseMapper<FyyInfo> {
* @return
*/
List<FyyInfo> queryPageList(FyyInfoModel model);
List<Map<String, Object>> getList();
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/HjtcqInfoDao.java
View file @ e9e67c03
......@@ -6,6 +6,7 @@ import com.devplatform.admin.modules.eq.bean.HjtcqInfo;
import com.devplatform.common.dao.MyBaseMapper;
import java.util.List;
import java.util.Map;
/**
* HjtcqInfo Mapper
......@@ -29,4 +30,6 @@ public interface HjtcqInfoDao extends MyBaseMapper<HjtcqInfo> {
* @return
*/
List<HjtcqInfo> queryPageList(HjtcqInfoModel model);
List<Map<String, Object>> getList();
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/LljInfoDao.java
View file @ e9e67c03
......@@ -6,6 +6,7 @@ import com.devplatform.admin.modules.eq.bean.LljInfo;
import com.devplatform.common.dao.MyBaseMapper;
import java.util.List;
import java.util.Map;
/**
* LljInfo Mapper
......@@ -29,4 +30,6 @@ public interface LljInfoDao extends MyBaseMapper<LljInfo> {
* @return
*/
List<LljInfo> queryPageList(LljInfoModel model);
List<Map<String, Object>> getList();
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/WxyljInfoDao.java
View file @ e9e67c03
......@@ -6,6 +6,7 @@ import com.devplatform.admin.modules.eq.bean.WxyljInfo;
import com.devplatform.common.dao.MyBaseMapper;
import java.util.List;
import java.util.Map;
/**
* WxyljInfo Mapper
......@@ -29,4 +30,6 @@ public interface WxyljInfoDao extends MyBaseMapper<WxyljInfo> {
* @return
*/
List<WxyljInfo> queryPageList(WxyljInfoModel model);
List<Map<String, Object>> getList();
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/dao/WxywyInfoDao.java
View file @ e9e67c03
......@@ -6,6 +6,7 @@ import com.devplatform.admin.modules.eq.bean.WxywyInfo;
import com.devplatform.common.dao.MyBaseMapper;
import java.util.List;
import java.util.Map;
/**
* WxywyInfo Mapper
......@@ -29,4 +30,6 @@ public interface WxywyInfoDao extends MyBaseMapper<WxywyInfo> {
* @return
*/
List<WxywyInfo> queryPageList(WxywyInfoModel model);
List<Map<String, Object>> getList();
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/FsyInfoService.java
View file @ e9e67c03
......@@ -6,6 +6,7 @@ import com.devplatform.admin.modules.eq.bean.FsyInfo;
import com.devplatform.admin.modules.eq.model.FsyInfoModel;
import java.util.List;
import java.util.Map;
/**
* 风速仪信息的service接口
......@@ -23,4 +24,5 @@ public interface FsyInfoService extends MyBaseService<FsyInfo> {
List<FsyInfo> queryPageList(FsyInfoModel model);
List<Map<String, Object>> getList();
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/FyyInfoService.java
View file @ e9e67c03
......@@ -6,6 +6,7 @@ import com.devplatform.admin.modules.eq.bean.FyyInfo;
import com.devplatform.admin.modules.eq.model.FyyInfoModel;
import java.util.List;
import java.util.Map;
/**
* 风压仪信息的service接口
......@@ -22,4 +23,5 @@ public interface FyyInfoService extends MyBaseService<FyyInfo> {
*/
List<FyyInfo> queryPageList(FyyInfoModel model);
List<Map<String, Object>> getList();
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/HjtcqInfoService.java
View file @ e9e67c03
......@@ -6,6 +6,7 @@ import com.devplatform.admin.modules.eq.bean.HjtcqInfo;
import com.devplatform.admin.modules.eq.model.HjtcqInfoModel;
import java.util.List;
import java.util.Map;
/**
* 4合1环境探测器信息的service接口
......@@ -22,4 +23,5 @@ public interface HjtcqInfoService extends MyBaseService<HjtcqInfo> {
*/
List<HjtcqInfo> queryPageList(HjtcqInfoModel model);
List<Map<String, Object>> getList();
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/KanBanService.java 0 → 100644
View file @ e9e67c03
package com.devplatform.admin.modules.eq.service;
import java.util.Map;
/**
* 数据看板的service接口
* @author dxw
*/
public interface KanBanService {
Map<String, Object> getList();
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/LljInfoService.java
View file @ e9e67c03
......@@ -6,6 +6,7 @@ import com.devplatform.admin.modules.eq.bean.LljInfo;
import com.devplatform.admin.modules.eq.model.LljInfoModel;
import java.util.List;
import java.util.Map;
/**
* 流量计信息的service接口
......@@ -22,5 +23,5 @@ public interface LljInfoService extends MyBaseService<LljInfo> {
*/
List<LljInfo> queryPageList(LljInfoModel model);
List<Map<String, Object>> getList();
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/WxyljInfoService.java
View file @ e9e67c03
......@@ -6,6 +6,7 @@ import com.devplatform.admin.modules.eq.bean.WxyljInfo;
import com.devplatform.admin.modules.eq.model.WxyljInfoModel;
import java.util.List;
import java.util.Map;
/**
* 无线压力计信息的service接口
......@@ -22,4 +23,5 @@ public interface WxyljInfoService extends MyBaseService<WxyljInfo> {
*/
List<WxyljInfo> queryPageList(WxyljInfoModel model);
List<Map<String, Object>> getList();
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/WxywyInfoService.java
View file @ e9e67c03
......@@ -6,6 +6,7 @@ import com.devplatform.admin.modules.eq.bean.WxywyInfo;
import com.devplatform.admin.modules.eq.model.WxywyInfoModel;
import java.util.List;
import java.util.Map;
/**
* 无线液位仪信息的service接口
......@@ -22,4 +23,5 @@ public interface WxywyInfoService extends MyBaseService<WxywyInfo> {
*/
List<WxywyInfo> queryPageList(WxywyInfoModel model);
List<Map<String, Object>> getList();
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/FsyInfoServiceImpl.java
View file @ e9e67c03
......@@ -8,6 +8,7 @@ import com.devplatform.common.service.impl.MyBaseServiceImpl;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
* 风速仪信息的service接口实现类
......@@ -25,4 +26,9 @@ public class FsyInfoServiceImpl extends MyBaseServiceImpl<FsyInfoDao, FsyInfo> i
return baseMapper.queryPageList(model);
}
@Override
public List<Map<String, Object>> getList() {
return baseMapper.getList();
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/FyyInfoServiceImpl.java
View file @ e9e67c03
......@@ -8,6 +8,7 @@ import com.devplatform.common.service.impl.MyBaseServiceImpl;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
* 风压仪信息的service接口实现类
......@@ -25,4 +26,9 @@ public class FyyInfoServiceImpl extends MyBaseServiceImpl<FyyInfoDao, FyyInfo> i
return baseMapper.queryPageList(model);
}
@Override
public List<Map<String, Object>> getList() {
return baseMapper.getList();
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/HjtcqInfoServiceImpl.java
View file @ e9e67c03
......@@ -8,6 +8,7 @@ import com.devplatform.common.service.impl.MyBaseServiceImpl;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
* 4合1环境探测器信息的service接口实现类
......@@ -25,4 +26,9 @@ public class HjtcqInfoServiceImpl extends MyBaseServiceImpl<HjtcqInfoDao, HjtcqI
return baseMapper.queryPageList(model);
}
@Override
public List<Map<String, Object>> getList() {
return baseMapper.getList();
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/KanBanServiceImpl.java 0 → 100644
View file @ e9e67c03
package com.devplatform.admin.modules.eq.service.impl;
import com.devplatform.admin.modules.eq.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 数据看板的service接口实现类
* @author dxw
*/
@Service("kanBanService")
public class KanBanServiceImpl implements KanBanService {
@Autowired
private FsyInfoService fsyInfoService;
@Autowired
private FyyInfoService fyyInfoService;
@Autowired
private HjtcqInfoService hjtcqInfoService;
@Autowired
private LljInfoService lljInfoService;
@Autowired
private WxyljInfoService wxyljInfoService;
@Autowired
private WxywyInfoService wxywyInfoService;
@Override
public Map<String, Object> getList() {
Map<String,Object> map = new HashMap<String,Object>(32);
//风速仪
List<Map<String,Object>> fsyList = fsyInfoService.getList();
//风压仪
List<Map<String,Object>> fyyList = fyyInfoService.getList();
//4合1环境探测器
List<Map<String,Object>> hjtcqList = hjtcqInfoService.getList();
//流量计
List<Map<String,Object>> lljList = lljInfoService.getList();
//无线压力计
List<Map<String,Object>> wxyljList = wxyljInfoService.getList();
//无线液位仪
List<Map<String,Object>> wxywyList = wxywyInfoService.getList();
//风速仪
map.put("fsyList",fsyList);
//风压仪
map.put("fyyList",fyyList);
//4合1环境探测器
map.put("hjtcqList",hjtcqList);
//流量计
map.put("lljList",lljList);
//无线压力计
map.put("wxyljList",wxyljList);
//无线液位仪
map.put("wxywyList",wxywyList);
return map;
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/LljInfoServiceImpl.java
View file @ e9e67c03
......@@ -8,6 +8,7 @@ import com.devplatform.common.service.impl.MyBaseServiceImpl;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
* 流量计信息的service接口实现类
......@@ -25,4 +26,9 @@ public class LljInfoServiceImpl extends MyBaseServiceImpl<LljInfoDao, LljInfo> i
return baseMapper.queryPageList(model);
}
@Override
public List<Map<String, Object>> getList() {
return baseMapper.getList();
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/WxyljInfoServiceImpl.java
View file @ e9e67c03
......@@ -8,6 +8,7 @@ import com.devplatform.common.service.impl.MyBaseServiceImpl;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
* 无线压力计信息的service接口实现类
......@@ -25,4 +26,9 @@ public class WxyljInfoServiceImpl extends MyBaseServiceImpl<WxyljInfoDao, WxyljI
return baseMapper.queryPageList(model);
}
@Override
public List<Map<String, Object>> getList() {
return baseMapper.getList();
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/WxywyInfoServiceImpl.java
View file @ e9e67c03
......@@ -8,6 +8,7 @@ import com.devplatform.common.service.impl.MyBaseServiceImpl;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
* 无线液位仪信息的service接口实现类
......@@ -24,4 +25,9 @@ public class WxywyInfoServiceImpl extends MyBaseServiceImpl<WxywyInfoDao, WxywyI
model.getPager().setRowCount(rowCount);
return baseMapper.queryPageList(model);
}
@Override
public List<Map<String, Object>> getList() {
return baseMapper.getList();
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/liresource/controller/LiResourceController.java
View file @ e9e67c03
......@@ -400,6 +400,49 @@ public class LiResourceController extends AbstractController {
return R.ok();
}
/**
* 根据场景id，按设备类型分组，查询资源点列表 - 数据看板
* @param model 承接对象
* @return
*/
@ApiOperation(value = "获取线路-站点-资源点树", notes = "获取线路-站点-资源点树")
@ApiImplicitParam(name = "model", value = "参数", required = true, dataType = "LiResourceModel")
@PostMapping("/getKanBanList")
public R getKanBanList(@RequestBody LiResourceModel model) {
// 查询设备类型字典项
List<SysDictionary> dicList = sysDictionaryService.queryByPid(Constants.RESOURCE_TYPE, null);
// 根据条件查询资源点
List<LiResource> resourceList = liResourceService.getTreeList(model);
List<Map<String, Object>> childrenStationMap = new ArrayList<>();
for (SysDictionary dic : dicList) {
Map<String, Object> mapDic = new HashMap<>(16);
mapDic.put("id", dic.getId());
mapDic.put("name", dic.getName());
List<Map<String, Object>> childrenDic = new ArrayList<>();
Iterator<LiResource> iterator = resourceList.iterator();
while (iterator.hasNext()) {
LiResource resource = iterator.next();
if (dic.getId().equals(resource.getType())) {
Map<String, Object> mapResource = new HashMap<>(16);
mapResource.put("id", resource.getId());
mapResource.put("resourceName", resource.getName());
childrenDic.add(mapResource);
iterator.remove();
}
}
mapDic.put("list", childrenDic);
/** 如果该子系统下无资源点，不展示*/
if (childrenDic != null && childrenDic.size() > 0) {
childrenStationMap.add(mapDic);
}
}
return R.ok().put("list", childrenStationMap);
}
/**
* 获取线路-站点-资源点树
*
......
microservice-admin/src/main/java/com/devplatform/admin/modules/liresource/controller/LiStationMapController.java
View file @ e9e67c03
package com.devplatform.admin.modules.liresource.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.devplatform.admin.common.annotation.SysLogMethod;
import com.devplatform.admin.common.utils.AbstractController;
import com.devplatform.admin.common.utils.Constants;
import com.devplatform.admin.modules.liresource.bean.LiStationMap;
import com.devplatform.admin.modules.liresource.model.LiStationMapModel;
import com.devplatform.admin.modules.liresource.service.LiResourceService;
......@@ -25,6 +23,7 @@ import org.springframework.web.multipart.MultipartFile;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* @author Administrator
......@@ -47,17 +46,15 @@ public class LiStationMapController extends AbstractController {
name = "model",
value = "参数",
required = true,
dataType = "LiRoomModel")
dataType = "LiStationMapModel")
@PostMapping("/list")
public R list(@RequestBody LiStationMapModel model) {
List<LiStationMap> list = liStationMapService.list(new LambdaQueryWrapper<LiStationMap>().eq(LiStationMap::getDeleted, Constants.INT_0)
.eq(LiStationMap::getStationId,model.getStationId()).orderByAsc(LiStationMap::getOrderNum));
List<Map<String,Object>> list = liStationMapService.queryListByParam(model);
return R.ok().put("list", list);
}
/**
* 添加
*
* @param bean 线路站点地图附件表对象
* @return
*/
......@@ -76,7 +73,6 @@ public class LiStationMapController extends AbstractController {
/**
* 修改
*
* @param bean 线路站点地图附件表对象
* @return
*/
......@@ -98,7 +94,6 @@ public class LiStationMapController extends AbstractController {
/**
* 根据ID获取线路站点地图附件表对象
*
* @param id 对象主键
* @return
*/
......@@ -112,7 +107,6 @@ public class LiStationMapController extends AbstractController {
/**
* 根据ID获取线路站点地图附件表对象
*
* @param ids 线路站点地图附件表对象主键数组
* @return
*/
......@@ -132,7 +126,6 @@ public class LiStationMapController extends AbstractController {
/**
* 上传站点地图
*
* @param file 文件
* @param stationId 站点id
* @return
......
microservice-admin/src/main/java/com/devplatform/admin/modules/liresource/dao/LiStationMapDao.java
View file @ e9e67c03
......@@ -3,11 +3,13 @@ package com.devplatform.admin.modules.liresource.dao;
import com.devplatform.admin.modules.liresource.bean.LiStationMap;
import com.devplatform.admin.modules.liresource.model.LiStationMapModel;
import com.devplatform.common.dao.MyBaseMapper;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
import java.util.Map;
/**
* LiStationMap Mapper 用于线路站点地图附件表的数据库操作
*
......@@ -39,4 +41,6 @@ public interface LiStationMapDao extends MyBaseMapper<LiStationMap> {
* @return
*/
List<LiStationMap> getListByStationId(String stationId);
List<Map<String, Object>> queryListByParam(LiStationMapModel model);
}
microservice-admin/src/main/java/com/devplatform/admin/modules/liresource/model/LiResourceModel.java
View file @ e9e67c03
......@@ -31,8 +31,6 @@ public class LiResourceModel extends BaseModel {
private java.lang.String stationName;
/** 站层id(li_station_map表id)*/
private java.lang.String tierId;
/** 场景id(li_room表id)*/
private java.lang.String roomId;
/** 子系统*/
private java.lang.String subSystem;
/** 子系统资源编码*/
......@@ -97,325 +95,4 @@ public class LiResourceModel extends BaseModel {
/** 预案关联 （1：新建/编辑;2:查看） */
private java.lang.String glType;
public String getGlType() {
return glType;
}
public void setGlType(String glType) {
this.glType = glType;
}
public String getQueryInfo() {
return queryInfo;
}
public void setQueryInfo(String queryInfo) {
this.queryInfo = queryInfo;
}
/** 主键id的getter方法 */
public java.lang.String getId() {
return id;
}
/** 主键id的setter方法 */
public void setId(java.lang.String id) {
this.id = id;
}
/** 资源点名称的getter方法 */
public java.lang.String getName() {
return name;
}
/** 资源点名称的setter方法 */
public void setName(java.lang.String name) {
this.name = name;
}
/** 资源点编码的getter方法 */
public java.lang.String getCode() {
return code;
}
/** 资源点编码的setter方法 */
public void setCode(java.lang.String code) {
this.code = code;
}
/** 资源点类型(1枪机，2球机)的getter方法 */
public java.lang.String getType() {
return type;
}
/** 资源点类型(1枪机，2球机)的setter方法 */
public void setType(java.lang.String type) {
this.type = type;
}
/** 线路id的getter方法 */
public java.lang.String getLineId() {
return lineId;
}
/** 线路id的setter方法 */
public void setLineId(java.lang.String lineId) {
this.lineId = lineId;
}
/** 线路名称的getter方法 */
public java.lang.String getLineName() {
return lineName;
}
/** 线路名称的setter方法 */
public void setLineName(java.lang.String lineName) {
this.lineName = lineName;
}
/** 站点ID的getter方法 */
public java.lang.String getStationId() {
return stationId;
}
/** 站点ID的setter方法 */
public void setStationId(java.lang.String stationId) {
this.stationId = stationId;
}
/** 站点名称的getter方法 */
public java.lang.String getStationName() {
return stationName;
}
/** 站点名称的setter方法 */
public void setStationName(java.lang.String stationName) {
this.stationName = stationName;
}
/** 站层id(li_station_map表id)的getter方法 */
public java.lang.String getTierId() {
return tierId;
}
/** 站层id(li_station_map表id)的setter方法 */
public void setTierId(java.lang.String tierId) {
this.tierId = tierId;
}
/** 子系统的getter方法 */
public java.lang.String getSubSystem() {
return subSystem;
}
/** 子系统的setter方法 */
public void setSubSystem(java.lang.String subSystem) {
this.subSystem = subSystem;
}
/** 子系统资源编码的getter方法 */
public java.lang.String getSubCode() {
return subCode;
}
/** 子系统资源编码的setter方法 */
public void setSubCode(java.lang.String subCode) {
this.subCode = subCode;
}
/** 地址码的getter方法 */
public java.lang.String getAddressCode() {
return addressCode;
}
/** 地址码的setter方法 */
public void setAddressCode(java.lang.String addressCode) {
this.addressCode = addressCode;
}
/** 端口号的getter方法 */
public java.lang.String getPort() {
return port;
}
/** 端口号的setter方法 */
public void setPort(java.lang.String port) {
this.port = port;
}
/** 用户名的getter方法 */
public java.lang.String getUsername() {
return username;
}
/** 用户名的setter方法 */
public void setUsername(java.lang.String username) {
this.username = username;
}
/** 密码的getter方法 */
public java.lang.String getPassword() {
return password;
}
/** 密码的setter方法 */
public void setPassword(java.lang.String password) {
this.password = password;
}
/** x轴坐标的getter方法 */
public java.lang.String getXpoint() {
return xpoint;
}
/** x轴坐标的setter方法 */
public void setXpoint(java.lang.String xpoint) {
this.xpoint = xpoint;
}
/** y轴坐标的getter方法 */
public java.lang.String getYpoint() {
return ypoint;
}
/** y轴坐标的setter方法 */
public void setYpoint(java.lang.String ypoint) {
this.ypoint = ypoint;
}
/** 部署位置的getter方法 */
public java.lang.String getDeployLocation() {
return deployLocation;
}
/** 部署位置的setter方法 */
public void setDeployLocation(java.lang.String deployLocation) {
this.deployLocation = deployLocation;
}
/** 当前操作员id的getter方法 */
public java.lang.String getOperatorId() {
return operatorId;
}
/** 当前操作员id的setter方法 */
public void setOperatorId(java.lang.String operatorId) {
this.operatorId = operatorId;
}
/** 当前操作员姓名的getter方法 */
public java.lang.String getOperatorName() {
return operatorName;
}
/** 当前操作员姓名的setter方法 */
public void setOperatorName(java.lang.String operatorName) {
this.operatorName = operatorName;
}
/** 附属信息的getter方法 */
public java.lang.String getAttachedInfo() {
return attachedInfo;
}
/** 附属信息的setter方法 */
public void setAttachedInfo(java.lang.String attachedInfo) {
this.attachedInfo = attachedInfo;
}
/** 资源点简介的getter方法 */
public java.lang.String getRemark() {
return remark;
}
/** 资源点简介的setter方法 */
public void setRemark(java.lang.String remark) {
this.remark = remark;
}
public String getIcon() {
return icon;
}
public void setIcon(String icon) {
this.icon = icon;
}
public String getParentName() {
return parentName;
}
public void setParentName(String parentName) {
this.parentName = parentName;
}
/** 系统标识的getter方法 */
public java.lang.String getSysSign() {
return sysSign;
}
/** 系统标识的setter方法 */
public void setSysSign(java.lang.String sysSign) {
this.sysSign = sysSign;
}
/** 资源点状态(1正常，0不可用)的getter方法 */
public Integer getStatus() {
return status;
}
/** 资源点状态(1正常，0不可用)的setter方法 */
public void setStatus(Integer status) {
this.status = status;
}
/** 是否已删除（0未删除，1已删除）的getter方法 */
public Integer getDeleted() {
return deleted;
}
/** 是否已删除（0未删除，1已删除）的setter方法 */
public void setDeleted(Integer deleted) {
this.deleted = deleted;
}
/** 创建人的getter方法 */
public java.lang.String getCreateUserId() {
return createUserId;
}
/** 创建人的setter方法 */
public void setCreateUserId(java.lang.String createUserId) {
this.createUserId = createUserId;
}
/** 创建时间的getter方法 */
public java.util.Date getCreateTime() {
return createTime;
}
/** 创建时间的setter方法 */
public void setCreateTime(java.util.Date createTime) {
this.createTime = createTime;
}
/** 修改人的getter方法 */
public java.lang.String getUpdateUserId() {
return updateUserId;
}
/** 修改人的setter方法 */
public void setUpdateUserId(java.lang.String updateUserId) {
this.updateUserId = updateUserId;
}
/** 修改时间的getter方法 */
public java.util.Date getUpdateTime() {
return updateTime;
}
/** 修改时间的setter方法 */
public void setUpdateTime(java.util.Date updateTime) {
this.updateTime = updateTime;
}
/** 备用项1的getter方法 */
public java.lang.String getByx1() {
return byx1;
}
/** 备用项1的setter方法 */
public void setByx1(java.lang.String byx1) {
this.byx1 = byx1;
}
/** 备用项2的getter方法 */
public java.lang.String getByx2() {
return byx2;
}
/** 备用项2的setter方法 */
public void setByx2(java.lang.String byx2) {
this.byx2 = byx2;
}
/** 备用项3的getter方法 */
public java.lang.String getByx3() {
return byx3;
}
/** 备用项3的setter方法 */
public void setByx3(java.lang.String byx3) {
this.byx3 = byx3;
}
public String getBrand() {
return brand;
}
public void setBrand(String brand) {
this.brand = brand;
}
public List<String> getList() {
return list;
}
public void setList(List<String> list) {
this.list = list;
}
public String getMyId() {
return myId;
}
public void setMyId(String myId) {
this.myId = myId;
}
public String getAjjPort() {
return ajjPort;
}
public void setAjjPort(String ajjPort) {
this.ajjPort = ajjPort;
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/liresource/service/LiStationMapService.java
View file @ e9e67c03
......@@ -4,6 +4,7 @@ import com.devplatform.admin.modules.liresource.bean.LiStationMap;
import com.devplatform.admin.modules.liresource.model.LiStationMapModel;
import com.devplatform.common.service.MyBaseService;
import java.util.List;
import java.util.Map;
/**
* 线路站点地图附件表的service接口 <br>
......@@ -51,4 +52,6 @@ public interface LiStationMapService extends MyBaseService<LiStationMap> {
* @param sysSign
*/
void saveOrUpdateBatch(String stationId, List<LiStationMap> list, String sysSign);
List<Map<String, Object>> queryListByParam(LiStationMapModel model);
}
microservice-admin/src/main/java/com/devplatform/admin/modules/liresource/service/impl/LiStationMapServiceImpl.java
View file @ e9e67c03
......@@ -7,10 +7,11 @@ import com.devplatform.admin.modules.liresource.model.LiStationMapModel;
import com.devplatform.admin.modules.liresource.service.LiStationMapService;
import com.devplatform.common.service.impl.MyBaseServiceImpl;
import com.devplatform.common.util.StringUtil;
import java.util.List;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
* 线路站点地图附件表的service接口实现类 <br>
* <b>功能：</b>LiStationMapServiceImpl<br>
......@@ -19,42 +20,47 @@ import org.springframework.stereotype.Service;
*/
@Service("liStationMapService")
public class LiStationMapServiceImpl extends MyBaseServiceImpl<LiStationMapDao, LiStationMap>
implements LiStationMapService {
@Override
public List<LiStationMap> getTreeList(LiStationMapModel model) {
return baseMapper.getTreeList(model);
}
@Override
public void deleteByIds(List<String> list, String sysSign) {
baseMapper.deleteByIds(list, sysSign);
}
@Override
public List<LiStationMap> getListByStationId(String stationId) {
return baseMapper.getListByStationId(stationId);
}
@Override
public LiStationMap getById(String id) {
return baseMapper.selectOne(new QueryWrapper<LiStationMap>().eq("id", id));
}
@Override
public void saveOrUpdateBatch(String stationId, List<LiStationMap> list, String sysSign) {
if (list != null && list.size() > 0) {
list.forEach(
(stationMap) -> {
stationMap.setStationId(stationId);
stationMap.setDeleted(0);
stationMap.setSysSign(sysSign);
if (StringUtil.checkNotNull(stationMap.getId())) {
baseMapper.updateById(stationMap);
} else {
baseMapper.insert(stationMap);
}
});
implements LiStationMapService {
@Override
public List<LiStationMap> getTreeList(LiStationMapModel model) {
return baseMapper.getTreeList(model);
}
@Override
public void deleteByIds(List<String> list, String sysSign) {
baseMapper.deleteByIds(list, sysSign);
}
@Override
public List<LiStationMap> getListByStationId(String stationId) {
return baseMapper.getListByStationId(stationId);
}
@Override
public LiStationMap getById(String id) {
return baseMapper.selectOne(new QueryWrapper<LiStationMap>().eq("id", id));
}
@Override
public void saveOrUpdateBatch(String stationId, List<LiStationMap> list, String sysSign) {
if (list != null && list.size() > 0) {
list.forEach(
(stationMap) -> {
stationMap.setStationId(stationId);
stationMap.setDeleted(0);
stationMap.setSysSign(sysSign);
if (StringUtil.checkNotNull(stationMap.getId())) {
baseMapper.updateById(stationMap);
} else {
baseMapper.insert(stationMap);
}
});
}
}
@Override
public List<Map<String, Object>> queryListByParam(LiStationMapModel model) {
return baseMapper.queryListByParam(model);
}
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/sys/bean/SysThreshold.java
View file @ e9e67c03
......@@ -22,6 +22,12 @@ public class SysThreshold implements Serializable {
@ApiModelProperty(value="主键ID",name="id")
@TableId
private java.lang.String id;
/** 编码 */
@ApiModelProperty(value="编码",name="code")
private java.lang.String code;
/** 单位 */
@ApiModelProperty(value="单位",name="unit")
private java.lang.Integer unit;
/** 资源点类型（数据字典表id） */
@ApiModelProperty(value="资源点类型（数据字典表id）",name="dicId")
private java.lang.String dicId;
......
microservice-admin/src/main/java/com/devplatform/admin/modules/sys/controller/HttpController.java deleted 100644 → 0
View file @ 333fc3dd
package com.devplatform.admin.modules.sys.controller;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.devplatform.admin.common.utils.Constants;
import com.devplatform.admin.config.WebSocket;
import com.devplatform.admin.modules.liresource.bean.LiResource;
import com.devplatform.admin.modules.liresource.service.LiResourceService;
import com.devplatform.admin.modules.sys.bean.SysStationTakeover;
import com.devplatform.admin.modules.sys.service.SysStationTakeoverService;
import com.devplatform.common.util.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
/**
* 服务配置接口，供远程接口调用
*
* @author Muceball
* @date 2020/10/26
*/
@Api(tags = {"服务配置接口，供远程接口调用"})
@RestController
@RequestMapping("/send/task")
public class HttpController {
@Autowired
private WebSocket webSocket;
@Autowired
private SysStationTakeoverService sysStationTakeoverService;
@Autowired
private LiResourceService liResourceService;
/**
* 给站点系统发送websocket消息，并储存数据
*
* @param response
* @return
* @throws Exception
*/
@PostMapping("/receiveToken")
public synchronized R receiveToken(@RequestBody SysStationTakeover bean, HttpServletResponse response) throws Exception {
// 保存数据
R r = sysStationTakeoverService.saveApply(bean);
String code = String.valueOf(r.get("code"));
if (!Constants.STRING_0.equals(code)) {
//如果错误添加报错直接返回
return r;
}
// 发送公共接管消息
webSocket.sendPubAllMessage(JSON.toJSONString(bean));
return r;
}
/**
* 给线路或路网发送消息通知同意或不同意被接管
*
* @param bean
* @return
*/
@PostMapping("/agree")
public synchronized R agree(
@RequestBody @ApiParam(value = "站点接管管理表实体对象", required = true) SysStationTakeover bean) {
if (StringUtils.isBlank(bean.getId())) {
return R.error("参数有误！");
}
SysStationTakeover takeover = sysStationTakeoverService.getById(bean.getId());
if (takeover == null) {
return R.error("参数有误！");
} else if (!Constants.STRING_1.equals(String.valueOf(takeover.getValids())) || !Constants.STRING_1.equals(String.valueOf(takeover.getStatus()))) {
//数据为无效或者是不是待审批状态即代表为已处理
return R.error("此接管请求已被处理！");
}
// 修改本地数据为同意或是不同意
sysStationTakeoverService.update(
bean, new QueryWrapper<SysStationTakeover>().eq("id", bean.getId()).eq("status", 1));
// 给前台发送消息，给出弹框（已接管***站点）
webSocket.sendPubAllMessage(JSON.toJSONString(bean));
return R.ok();
}
/**
* 站点中断被接管--站点给线路或路网发送消息
*
* @param bean
* @return
*/
@PostMapping("/interrupt")
public synchronized R interrupt(
@RequestBody @ApiParam(value = "站点接管管理表实体对象", required = true) SysStationTakeover bean) {
if (StringUtils.isBlank(bean.getId())) {
return R.error("参数有误！");
}
SysStationTakeover takeover = sysStationTakeoverService.getById(bean.getId());
if (takeover == null) {
return R.error("参数有误！");
} else if (!Constants.STRING_1.equals(String.valueOf(takeover.getValids())) || !Constants.STRING_2.equals(String.valueOf(takeover.getStatus()))) {
//数据不为有效或者是不等于2
return R.error("此接管已被中断！");
}
sysStationTakeoverService.update(
bean, new QueryWrapper<SysStationTakeover>().eq("id", bean.getId()).eq("status", 2));
// 给前台发送消息，给出弹框（对***站点的接管被强制中断了）
webSocket.sendPubAllMessage(JSON.toJSONString(bean));
return R.ok();
}
/**
* 给线路或路网发送消息通知同意或不同意被接管
*
* @param bean
* @return
*/
@PostMapping("/abandonTakeover")
public R abandonTakeover(
@RequestBody @ApiParam(value = "站点接管管理表实体对象", required = true) SysStationTakeover bean) {
if (StringUtils.isBlank(bean.getId())) {
return R.error("参数有误！");
}
// 修改本地数据为同意或是不同意
sysStationTakeoverService.update(
bean, new QueryWrapper<SysStationTakeover>().eq("id", bean.getId()));
// 给前台发送消息，给出弹框（已放弃接管***站点）
webSocket.sendPubAllMessage(JSON.toJSONString(bean));
return R.ok();
}
/**
* 给BIM模块提供查询接口，通过资源点编号查询资源点详情
*
* @param code 资源点编码
* @return 资源点对象
*/
@RequestMapping(value = "/queryByCode", method = RequestMethod.POST)
public R queryByCode(String code) {
System.out.println("---BIM模块提供查询接口---code:" + code);
if (StringUtils.isBlank(code)) {
return R.error("参数有误！");
}
LiResource liResource = liResourceService.queryByCode(code);
return R.ok().put("date", liResource);
}
/**
* 中断被动接管-----线路系统给站点系统写一条接管中断的日志
*
* @param bean
* @return
*/
@RequestMapping(value = "/interruptPassivity", method = RequestMethod.POST)
public R interruptPassivity(@RequestBody @ApiParam(value = "站点接管管理表实体对象", required = true) SysStationTakeover bean) {
if (StringUtils.isBlank(bean.getId())) {
return R.error("参数有误！");
}
sysStationTakeoverService.save(bean);
return R.ok();
}
/**
* 线路或路网申请接管前查询是否有接管申请或已呗接管
*/
@RequestMapping(value = "/takingOver", method = RequestMethod.POST)
public R takingOver(@RequestBody @ApiParam(value = "站点接管管理表实体对象", required = true) SysStationTakeover bean) {
LambdaQueryWrapper<SysStationTakeover> queryWrapper = new LambdaQueryWrapper<SysStationTakeover>()
.eq(SysStationTakeover::getStationId, bean.getStationId())
//有效
.eq(SysStationTakeover::getValids, 1)
//删除
.eq(SysStationTakeover::getDeleted, 0)
//小于2 有接管申请或已被接管
.le(SysStationTakeover::getStatus, 2);
int count = sysStationTakeoverService.count(queryWrapper);
if (count > 0) {
return R.error();
}
return R.ok();
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/sys/controller/SysLoginController.java
View file @ e9e67c03
package com.devplatform.admin.modules.sys.controller;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.devplatform.admin.common.annotation.SysLogMethod;
import com.devplatform.admin.common.utils.*;
import com.devplatform.admin.modules.sys.bean.*;
import com.devplatform.admin.modules.sys.bean.SysLogEntity;
import com.devplatform.admin.modules.sys.bean.SysSystem;
import com.devplatform.admin.modules.sys.bean.SysUserEntity;
import com.devplatform.admin.modules.sys.bean.SysUserRoleEntity;
import com.devplatform.admin.modules.sys.form.SysLoginForm;
import com.devplatform.admin.modules.sys.service.*;
import com.devplatform.common.base.exception.RRException;
......@@ -33,7 +35,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.*;
/**
......@@ -64,8 +65,6 @@ public class SysLoginController extends AbstractController {
private SysLogService sysLogService;
@Autowired
private SysSystemService sysSystemService;
@Autowired
private SysStationTakeoverService sysStationTakeoverService;
/**
* 验证码
......@@ -157,14 +156,6 @@ public class SysLoginController extends AbstractController {
} else if (userRoleList.isEmpty() || permissions.isEmpty()) {
return R.error("用户登录无权限，请联系管理员！");
}
// 判断此站点是否被接管了，或者是有申请接管信息
LambdaQueryWrapper<SysStationTakeover> queryWrapper =
new LambdaQueryWrapper<SysStationTakeover>()
.eq(SysStationTakeover::getStationId, sysSystem.getCode())
.eq(SysStationTakeover::getValids, 1)
.le(SysStationTakeover::getStatus, 2)
.orderByDesc(SysStationTakeover::getApplyTime);
SysStationTakeover one = sysStationTakeoverService.getOne(queryWrapper);
// 记录登录日志
saveLog("登录", "系统登录", "登录系统成功", "com.devplatform.admin.modules.sys.controller.SysLoginController.login()", form, user, startTime, sysSystem.getCode());
return R.ok()
......@@ -172,8 +163,7 @@ public class SysLoginController extends AbstractController {
.put("permissions", permissions)
.put("userId", user.getUserId())
.put("userName", user.getName())
.put("sysSystem", JSON.toJSONString(sysSystem))
.put("takeover", one);
.put("sysSystem", JSON.toJSONString(sysSystem));
}
private void saveLog(
......
microservice-admin/src/main/java/com/devplatform/admin/modules/sys/controller/SysThresholdController.java
View file @ e9e67c03
package com.devplatform.admin.modules.sys.controller;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.ModelAndView;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.devplatform.admin.common.utils.AbstractController;
import com.devplatform.admin.modules.sys.bean.SysThreshold;
import com.devplatform.admin.modules.sys.model.SysThresholdModel;
import com.devplatform.admin.modules.sys.service.SysThresholdService;
import com.devplatform.admin.modules.sys.bean.SysUserEntity;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.devplatform.common.base.annotation.SysLog;
import com.devplatform.common.base.validator.ValidatorUtils;
import com.devplatform.common.util.HtmlUtil;
import com.devplatform.admin.common.utils.AbstractController;
import com.devplatform.common.util.PageUtils;
import com.devplatform.common.util.R;
import com.devplatform.common.util.StringUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* <br>
......@@ -55,14 +39,12 @@ public class SysThresholdController extends AbstractController{
* @param params 承接对象
* @return
*/
@ApiOperation(value="根据条件获取系统阈值配置表分页数据列表", notes="根据条件获取系统阈值配置表分页数据列表")
@ApiOperation(value="根据条件获取系统阈值配置表数据列表", notes="根据条件获取系统阈值配置表数据列表")
@ApiImplicitParam(name = "params", value = "参数", required = true, dataType = "Map<String, Object>")
@PostMapping("/list")
public R list(@RequestParam Map<String, Object> params) {
//分页查询
PageUtils page = sysThresholdService.queryPage(params,null);
//返回分页结果
return R.ok().put("page", page);
List<SysThreshold> list = sysThresholdService.getList(params);
return R.ok().put("list", list);
}
/**
......
microservice-admin/src/main/java/com/devplatform/admin/modules/sys/dao/SysStationTakeoverDao.java deleted 100644 → 0
View file @ 333fc3dd
package com.devplatform.admin.modules.sys.dao;
import com.devplatform.admin.modules.sys.bean.SysStationTakeover;
import com.devplatform.admin.modules.sys.model.SysStationTakeoverModel;
import com.devplatform.common.dao.MyBaseMapper;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
/**
* SysStationTakeover Mapper 用于站点接管管理表的数据库操作
*
* @author Administrator
*/
@Mapper
@Repository
public interface SysStationTakeoverDao extends MyBaseMapper<SysStationTakeover> {
/**
* 查询站点接管管理分页数量
* @param model
* @return
*/
Integer queryPageByCount(SysStationTakeoverModel model);
/**
* 查询站点接管管理分页数据
* @param model
* @return
*/
List<SysStationTakeover> queryPageByList(SysStationTakeoverModel model);
/**
* 修改转发上行配置状态
* @param priority
* @param level
* @param sysSign
* @param stationId
*/
void updateWgStatus(@Param("priority")Integer priority, @Param("level")Integer level,@Param("sysSign") String sysSign,@Param("stationId") String stationId);
}
microservice-admin/src/main/java/com/devplatform/admin/modules/sys/dao/SysThresholdDao.java
View file @ e9e67c03
......@@ -6,6 +6,7 @@ import com.devplatform.admin.modules.sys.bean.SysThreshold;
import com.devplatform.common.dao.MyBaseMapper;
import java.util.List;
import java.util.Map;
/**
* SysThreshold Mapper
......@@ -29,4 +30,6 @@ public interface SysThresholdDao extends MyBaseMapper<SysThreshold> {
* @return
*/
List<SysThreshold> queryPageList(SysThresholdModel model);
List<SysThreshold> getList(Map<String, Object> params);
}
microservice-admin/src/main/java/com/devplatform/admin/modules/sys/model/SysStationTakeoverModel.java deleted 100644 → 0
View file @ 333fc3dd
package com.devplatform.admin.modules.sys.model;
import com.devplatform.admin.common.model.BaseModel;
/**
* 站点接管管理表的Model <br>
*
* @author 代码生成器产生
*/
public class SysStationTakeoverModel extends BaseModel {
/** 主键id*/
private java.lang.String id;
/** 申请接管站点单位*/
private java.lang.String takeoverOrgName;
/** 申请接管类型（1线路中心，2路网中心）*/
private Integer applyType;
/** 申请人姓名*/
private java.lang.String applyUserName;
/** 申请人id*/
private java.lang.String applyUserId;
/** 站点id*/
private java.lang.String stationId;
/** 站点名称*/
private java.lang.String stationName;
/** 申请时间*/
private java.util.Date applyTime;
/** 接管类型（1主动接管，2被动接管）*/
private Integer takeoverType;
/** 申请理由*/
private java.lang.String reason;
/** 审核时间*/
private java.util.Date approveTime;
/** 中断时间*/
private java.util.Date interruptTime;
/** 审批状态(1待审批，2审批通过，3审批不通过，4中断)*/
private Integer status;
/** 是否已删除（0未删除，1已删除）*/
private Integer deleted;
/** 系统标识*/
private java.lang.String sysSign;
/** 创建人*/
private java.lang.String createUserId;
/** 创建时间*/
private java.util.Date createTime;
/** 修改人*/
private java.lang.String updateUserId;
/** 修改时间*/
private java.util.Date updateTime;
/** 备用项1*/
private java.lang.String byx1;
/** 备用项2*/
private java.lang.String byx2;
/** 备用项3*/
private java.lang.String byx3;
/** 线路id*/
private java.lang.String lineId;
/** 线路名称*/
private java.lang.String lineName;
/** 是否有效(0无效，1有效)*/
private Integer valids;
private String startTime;
private String endTime;
public Integer getValids() {
return valids;
}
public void setValids(Integer valid) {
this.valids = valid;
}
public String getLineId() {
return lineId;
}
public void setLineId(String lineId) {
this.lineId = lineId;
}
public String getLineName() {
return lineName;
}
public void setLineName(String lineName) {
this.lineName = lineName;
}
public String getStartTime() {
return startTime;
}
public void setStartTime(String startTime) {
this.startTime = startTime;
}
public String getEndTime() {
return endTime;
}
public void setEndTime(String endTime) {
this.endTime = endTime;
}
/** 主键id的getter方法 */
public java.lang.String getId() {
return id;
}
/** 主键id的setter方法 */
public void setId(java.lang.String id) {
this.id = id;
}
/** 申请接管站点单位的getter方法 */
public java.lang.String getTakeoverOrgName() {
return takeoverOrgName;
}
/** 申请接管站点单位的setter方法 */
public void setTakeoverOrgName(java.lang.String takeoverOrgName) {
this.takeoverOrgName = takeoverOrgName;
}
/** 申请接管类型（1线路中心，2路网中心）的getter方法 */
public Integer getApplyType() {
return applyType;
}
/** 申请接管类型（1线路中心，2路网中心）的setter方法 */
public void setApplyType(Integer applyType) {
this.applyType = applyType;
}
/** 申请人姓名的getter方法 */
public java.lang.String getApplyUserName() {
return applyUserName;
}
/** 申请人姓名的setter方法 */
public void setApplyUserName(java.lang.String applyUserName) {
this.applyUserName = applyUserName;
}
/** 申请人id的getter方法 */
public java.lang.String getApplyUserId() {
return applyUserId;
}
/** 申请人id的setter方法 */
public void setApplyUserId(java.lang.String applyUserId) {
this.applyUserId = applyUserId;
}
/** 站点id的getter方法 */
public java.lang.String getStationId() {
return stationId;
}
/** 站点id的setter方法 */
public void setStationId(java.lang.String stationId) {
this.stationId = stationId;
}
/** 站点名称的getter方法 */
public java.lang.String getStationName() {
return stationName;
}
/** 站点名称的setter方法 */
public void setStationName(java.lang.String stationName) {
this.stationName = stationName;
}
/** 申请时间的getter方法 */
public java.util.Date getApplyTime() {
return applyTime;
}
/** 申请时间的setter方法 */
public void setApplyTime(java.util.Date applyTime) {
this.applyTime = applyTime;
}
/** 接管类型（1主动接管，2被动接管）的getter方法 */
public Integer getTakeoverType() {
return takeoverType;
}
/** 接管类型（1主动接管，2被动接管）的setter方法 */
public void setTakeoverType(Integer takeoverType) {
this.takeoverType = takeoverType;
}
/** 申请理由的getter方法 */
public java.lang.String getReason() {
return reason;
}
/** 申请理由的setter方法 */
public void setReason(java.lang.String reason) {
this.reason = reason;
}
/** 审核时间的getter方法 */
public java.util.Date getApproveTime() {
return approveTime;
}
/** 审核时间的setter方法 */
public void setApproveTime(java.util.Date approveTime) {
this.approveTime = approveTime;
}
/** 中断时间的getter方法 */
public java.util.Date getInterruptTime() {
return interruptTime;
}
/** 中断时间的setter方法 */
public void setInterruptTime(java.util.Date interruptTime) {
this.interruptTime = interruptTime;
}
/** 审批状态(1待审批，2审批通过，3审批不通过，4中断)的getter方法 */
public Integer getStatus() {
return status;
}
/** 审批状态(1待审批，2审批通过，3审批不通过，4中断)的setter方法 */
public void setStatus(Integer status) {
this.status = status;
}
/** 是否已删除（0未删除，1已删除）的getter方法 */
public Integer getDeleted() {
return deleted;
}
/** 是否已删除（0未删除，1已删除）的setter方法 */
public void setDeleted(Integer deleted) {
this.deleted = deleted;
}
/** 系统标识的getter方法 */
public java.lang.String getSysSign() {
return sysSign;
}
/** 系统标识的setter方法 */
public void setSysSign(java.lang.String sysSign) {
this.sysSign = sysSign;
}
/** 创建人的getter方法 */
public java.lang.String getCreateUserId() {
return createUserId;
}
/** 创建人的setter方法 */
public void setCreateUserId(java.lang.String createUserId) {
this.createUserId = createUserId;
}
/** 创建时间的getter方法 */
public java.util.Date getCreateTime() {
return createTime;
}
/** 创建时间的setter方法 */
public void setCreateTime(java.util.Date createTime) {
this.createTime = createTime;
}
/** 修改人的getter方法 */
public java.lang.String getUpdateUserId() {
return updateUserId;
}
/** 修改人的setter方法 */
public void setUpdateUserId(java.lang.String updateUserId) {
this.updateUserId = updateUserId;
}
/** 修改时间的getter方法 */
public java.util.Date getUpdateTime() {
return updateTime;
}
/** 修改时间的setter方法 */
public void setUpdateTime(java.util.Date updateTime) {
this.updateTime = updateTime;
}
/** 备用项1的getter方法 */
public java.lang.String getByx1() {
return byx1;
}
/** 备用项1的setter方法 */
public void setByx1(java.lang.String byx1) {
this.byx1 = byx1;
}
/** 备用项2的getter方法 */
public java.lang.String getByx2() {
return byx2;
}
/** 备用项2的setter方法 */
public void setByx2(java.lang.String byx2) {
this.byx2 = byx2;
}
/** 备用项3的getter方法 */
public java.lang.String getByx3() {
return byx3;
}
/** 备用项3的setter方法 */
public void setByx3(java.lang.String byx3) {
this.byx3 = byx3;
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/sys/model/SysThresholdModel.java
View file @ e9e67c03
......@@ -10,9 +10,12 @@ import lombok.Data;
*/
@Data
public class SysThresholdModel extends BaseModel {
/** 主键id */
private java.lang.String id;
/** 编码 */
private java.lang.String code;
/** 单位 */
private java.lang.Integer unit;
/** 资源点类型（数据字典表id） */
private java.lang.String dicId;
/** 阈值类型（数据字典表id） */
......
microservice-admin/src/main/java/com/devplatform/admin/modules/sys/service/SysStationTakeoverService.java deleted 100644 → 0
View file @ 333fc3dd
package com.devplatform.admin.modules.sys.service;
import com.devplatform.admin.modules.sys.bean.SysStationTakeover;
import com.devplatform.admin.modules.sys.model.SysStationTakeoverModel;
import com.devplatform.common.service.MyBaseService;
import com.devplatform.common.util.R;
import java.util.List;
/**
* 站点接管管理表的service接口 <br>
* <b>功能：</b>SysStationTakeoverService<br>
*
* @author 代码生成器产生
*/
public interface SysStationTakeoverService extends MyBaseService<SysStationTakeover> {
/**
* 查询站点接管管理分页数据
* @param model
* @return
*/
List<SysStationTakeover> queryPageByList(SysStationTakeoverModel model);
/**
* 保存申请记录
* @param bean
* @return
*/
R saveApply(SysStationTakeover bean);
/**
*修改转发上行配置状态
* @param level
* @param sysSign
* @param stationId
*/
void updateWgStatus(Integer level,String sysSign,String stationId);
}
microservice-admin/src/main/java/com/devplatform/admin/modules/sys/service/SysThresholdService.java
View file @ e9e67c03
......@@ -6,6 +6,7 @@ import com.devplatform.admin.modules.sys.bean.SysThreshold;
import com.devplatform.admin.modules.sys.model.SysThresholdModel;
import java.util.List;
import java.util.Map;
/**
* 系统阈值配置表的service接口
......@@ -30,4 +31,5 @@ public interface SysThresholdService extends MyBaseService<SysThreshold> {
*/
void deleteByFlagByIds(String[] ids, String userId);
List<SysThreshold> getList(Map<String, Object> params);
}
microservice-admin/src/main/java/com/devplatform/admin/modules/sys/service/impl/SysStationTakeoverServiceImpl.java deleted 100644 → 0
View file @ 333fc3dd
package com.devplatform.admin.modules.sys.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.devplatform.admin.modules.sys.bean.SysStationTakeover;
import com.devplatform.admin.modules.sys.dao.SysStationTakeoverDao;
import com.devplatform.admin.modules.sys.model.SysStationTakeoverModel;
import com.devplatform.admin.modules.sys.service.SysStationTakeoverService;
import com.devplatform.common.service.impl.MyBaseServiceImpl;
import com.devplatform.common.util.R;
import java.util.List;
import org.springframework.stereotype.Service;
/**
* 站点接管管理表的service接口实现类 <br>
* <b>功能：</b>SysStationTakeoverServiceImpl<br>
*
* @author 代码生成器产生
*/
@Service("sysStationTakeoverService")
public class SysStationTakeoverServiceImpl
extends MyBaseServiceImpl<SysStationTakeoverDao, SysStationTakeover>
implements SysStationTakeoverService {
@Override
public List<SysStationTakeover> queryPageByList(SysStationTakeoverModel model) {
Integer rowCount = baseMapper.queryPageByCount(model);
model.getPager().setRowCount(rowCount);
return baseMapper.queryPageByList(model);
}
@Override
public R saveApply(SysStationTakeover bean) {
// 查询是否有未过期、待审批记录
Integer count =
baseMapper.selectCount(
new QueryWrapper<SysStationTakeover>()
.eq("valids", 1)
.eq("station_id", bean.getStationId())
.le("status", 2)
.eq("deleted", 0));
if (count > 0) {
return R.error("已接管或已发起接管申请");
}
// 将之前的申请记录设置为无效
SysStationTakeover updateBean = new SysStationTakeover();
updateBean.setValids(0);
baseMapper.update(updateBean, new UpdateWrapper<SysStationTakeover>().eq("valids", 1).eq("station_id", bean.getStationId()));
// 保存新的申请记录
baseMapper.insert(bean);
return R.ok();
}
@Override
public void updateWgStatus(Integer level,String sysSign,String stationId) {
// 先把原有默认改成备用
baseMapper.updateWgStatus(2, null,sysSign,stationId);
baseMapper.updateWgStatus(1, level,sysSign,stationId);
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/sys/service/impl/SysThresholdServiceImpl.java
View file @ e9e67c03
......@@ -11,6 +11,7 @@ import com.devplatform.common.service.impl.MyBaseServiceImpl;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* 系统阈值配置表的service接口实现类
......@@ -46,4 +47,9 @@ public class SysThresholdServiceImpl extends MyBaseServiceImpl<SysThresholdDao,
//调用批量更新操作
updateBatchById(beans);
}
@Override
public List<SysThreshold> getList(Map<String, Object> params) {
return baseMapper.getList(params);
}
}
microservice-admin/src/main/resources/mapper/eq/FsyInfoMapper.xml
View file @ e9e67c03
......@@ -50,6 +50,15 @@
${pager.mysqlQueryCondition}
</if>
</select>
<select id="getList" resultType="java.util.Map">
SELECT t1.*,li.name as resourceName,li.remark as remark,li.deploy_location as deployLocation,li.status as status
FROM fsy_info AS t1
INNER JOIN
(SELECT t2.resource_id, MAX(t2.create_time) AS maxdate
FROM fsy_info AS t2
GROUP BY t2.resource_id) AS t3 ON t1.resource_id = t3.resource_id AND t1.create_time = t3.maxdate
left join li_resource li on li.id = t1.resource_id
</select>
</mapper>
......
microservice-admin/src/main/resources/mapper/eq/FyyInfoMapper.xml
View file @ e9e67c03
......@@ -50,6 +50,15 @@
${pager.mysqlQueryCondition}
</if>
</select>
<select id="getList" resultType="java.util.Map">
SELECT t1.*,li.name as resourceName,li.remark as remark,li.deploy_location as deployLocation,li.status as status
FROM fyy_info AS t1
INNER JOIN
(SELECT t2.resource_id, MAX(t2.create_time) AS maxdate
FROM fyy_info AS t2
GROUP BY t2.resource_id) AS t3 ON t1.resource_id = t3.resource_id AND t1.create_time = t3.maxdate
left join li_resource li on li.id = t1.resource_id
</select>
</mapper>
......
microservice-admin/src/main/resources/mapper/eq/HjtcqInfoMapper.xml
View file @ e9e67c03
......@@ -62,6 +62,15 @@
${pager.mysqlQueryCondition}
</if>
</select>
<select id="getList" resultType="java.util.Map">
SELECT t1.*,li.name as resourceName,li.remark as remark,li.deploy_location as deployLocation,li.status as status
FROM hjtcq_info AS t1
INNER JOIN
(SELECT t2.resource_id, MAX(t2.create_time) AS maxdate
FROM hjtcq_info AS t2
GROUP BY t2.resource_id) AS t3 ON t1.resource_id = t3.resource_id AND t1.create_time = t3.maxdate
left join li_resource li on li.id = t1.resource_id
</select>
</mapper>
......
microservice-admin/src/main/resources/mapper/eq/LljInfoMapper.xml
View file @ e9e67c03
......@@ -50,6 +50,15 @@
${pager.mysqlQueryCondition}
</if>
</select>
<select id="getList" resultType="java.util.Map">
SELECT t1.*,li.name as resourceName,li.remark as remark,li.deploy_location as deployLocation,li.status as status
FROM llj_info AS t1
INNER JOIN
(SELECT t2.resource_id, MAX(t2.create_time) AS maxdate
FROM llj_info AS t2
GROUP BY t2.resource_id) AS t3 ON t1.resource_id = t3.resource_id AND t1.create_time = t3.maxdate
left join li_resource li on li.id = t1.resource_id
</select>
</mapper>
......
microservice-admin/src/main/resources/mapper/eq/WxyljInfoMapper.xml
View file @ e9e67c03
......@@ -50,6 +50,15 @@
${pager.mysqlQueryCondition}
</if>
</select>
<select id="getList" resultType="java.util.Map">
SELECT t1.*,li.name as resourceName,li.remark as remark,li.deploy_location as deployLocation,li.status as status
FROM wxylj_info AS t1
INNER JOIN
(SELECT t2.resource_id, MAX(t2.create_time) AS maxdate
FROM wxylj_info AS t2
GROUP BY t2.resource_id) AS t3 ON t1.resource_id = t3.resource_id AND t1.create_time = t3.maxdate
left join li_resource li on li.id = t1.resource_id
</select>
</mapper>
......
microservice-admin/src/main/resources/mapper/eq/WxywyInfoMapper.xml
View file @ e9e67c03
......@@ -50,6 +50,15 @@
${pager.mysqlQueryCondition}
</if>
</select>
<select id="getList" resultType="java.util.Map">
SELECT t1.*,li.name as resourceName,li.remark as remark,li.deploy_location as deployLocation,li.status as status
FROM wxywy_info AS t1
INNER JOIN
(SELECT t2.resource_id, MAX(t2.create_time) AS maxdate
FROM wxywy_info AS t2
GROUP BY t2.resource_id) AS t3 ON t1.resource_id = t3.resource_id AND t1.create_time = t3.maxdate
left join li_resource li on li.id = t1.resource_id
</select>
</mapper>
......
microservice-admin/src/main/resources/mapper/liResource/LiResourceMapper.xml
View file @ e9e67c03
......@@ -114,7 +114,6 @@
<if test="stationId!=null and stationId!=''">and station_id = #{stationId}</if>
<if test="stationName!=null and stationName!=''">and station_name = #{stationName}</if>
<if test="tierId!=null and tierId!=''">and tier_id = #{tierId}</if>
<if test="roomId!=null and roomId!=''">and room_id = #{roomId}</if>
<if test="subSystem!=null and subSystem!=''">and sub_system = #{subSystem}</if>
<if test="subCode!=null and subCode!=''">and sub_code = #{subCode}</if>
<if test="addressCode!=null and addressCode!=''">and address_code = #{addressCode}</if>
......
microservice-admin/src/main/resources/mapper/liResource/LiStationMapMapper.xml
View file @ e9e67c03
......@@ -71,6 +71,12 @@
where station_id = #{stationId} and deleted=0
order by order_num
</select>
<select id="queryListByParam" resultType="java.util.Map">
select lsm.id,lsm.name,ls.station_name as stationName
from li_station_map lsm
left join li_station ls on ls.id = lsm.station_id
order by lsm.station_id,lsm.order_num
</select>
</mapper>
......
microservice-admin/src/main/resources/mapper/sys/SysMenuDao.xml
View file @ e9e67c03
......@@ -28,7 +28,7 @@
<if test="stationId != null and stationId != ''">
AND me.station_id = #{stationId}
</if>
AND me.type = 2
-- AND me.type = 2
</select>
<select id="getAllMenuListByUserId" resultType="java.util.Map">
SELECT DISTINCT sm.menu_id AS menuId, sm.parent_id AS parentId, sm.name,sm.name AS title,sm.url, sm.url AS path,
......@@ -38,7 +38,7 @@
LEFT JOIN sys_role_menu srm ON sm.menu_id = srm.menu_id
LEFT JOIN sys_user_role sur ON srm.role_id = sur.role_id
LEFT JOIN sys_user su ON sur.user_id = su.user_id
WHERE sm.status = 0
WHERE sm.status = 0 and sm.type != 2
<if test="userId != null and userId != ''">
AND su.user_id = #{userId}
</if>
......
microservice-admin/src/main/resources/mapper/sys/SysStationTakeoverMapper.xml deleted 100644 → 0
View file @ 333fc3dd
<?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.devplatform.admin.modules.sys.dao.SysStationTakeoverDao">
<!-- Result Map -->
<resultMap id="BaseResultMap" type="com.devplatform.admin.modules.sys.bean.SysStationTakeover">
<result column="id" property="id"/>
<result column="takeover_org_name" property="takeoverOrgName"/>
<result column="apply_type" property="applyType"/>
<result column="apply_user_name" property="applyUserName"/>
<result column="apply_user_id" property="applyUserId"/>
<result column="station_id" property="stationId"/>
<result column="station_name" property="stationName"/>
<result column="apply_time" property="applyTime"/>
<result column="takeover_type" property="takeoverType"/>
<result column="reason" property="reason"/>
<result column="approve_time" property="approveTime"/>
<result column="interrupt_time" property="interruptTime"/>
<result column="status" property="status"/>
<result column="deleted" property="deleted"/>
<result column="sys_sign" property="sysSign"/>
<result column="create_user_id" property="createUserId"/>
<result column="create_time" property="createTime"/>
<result column="update_user_id" property="updateUserId"/>
<result column="update_time" property="updateTime"/>
<result column="byx1" property="byx1"/>
<result column="byx2" property="byx2"/>
<result column="byx3" property="byx3"/>
<result column="line_id" property="lineId"/>
<result column="line_name" property="lineName"/>
<result column="valids" property="valids"/>
</resultMap>
<!-- sys_station_takeover table all fields -->
<sql id="Base_Column_List">
id,takeover_org_name,apply_type,apply_user_name,apply_user_id,station_id,station_name,apply_time,takeover_type,reason,approve_time,interrupt_time,status,deleted,sys_sign,create_user_id,create_time,update_user_id,update_time,byx1,byx2,byx3
,line_id,line_name,valids
</sql>
<!-- 公共查询条件 -->
<sql id="Example_Where_Clause">
where deleted=0
<if test="id!=null and id!=''">and id = #{id}</if>
<if test="takeoverOrgName!=null and takeoverOrgName!=''">and takeover_org_name = #{takeoverOrgName}</if>
<if test="applyType!=null ">and apply_type = #{applyType}</if>
<if test="applyUserName!=null and applyUserName!=''">and apply_user_name = #{applyUserName}</if>
<if test="applyUserId!=null and applyUserId!=''">and apply_user_id = #{applyUserId}</if>
<if test="stationId!=null and stationId!=''">and station_id = #{stationId}</if>
<if test="stationName!=null and stationName!=''">and station_name = #{stationName}</if>
<if test="applyTime!=null ">and apply_time = #{applyTime}</if>
<if test="takeoverType!=null ">and takeover_type = #{takeoverType}</if>
<if test="reason!=null and reason!=''">and reason = #{reason}</if>
<if test="approveTime!=null ">and approve_time = #{approveTime}</if>
<if test="interruptTime!=null ">and interrupt_time = #{interruptTime}</if>
<if test="status!=null ">and status = #{status}</if>
<if test="deleted!=null ">and deleted = #{deleted}</if>
<if test="sysSign!=null and sysSign!=''">and sys_sign = #{sysSign}</if>
<if test="createUserId!=null and createUserId!=''">and create_user_id = #{createUserId}</if>
<if test="createTime!=null ">and create_time = #{createTime}</if>
<if test="updateUserId!=null and updateUserId!=''">and update_user_id = #{updateUserId}</if>
<if test="updateTime!=null ">and update_time = #{updateTime}</if>
<if test="byx1!=null and byx1!=''">and byx1 = #{byx1}</if>
<if test="byx2!=null and byx2!=''">and byx2 = #{byx2}</if>
<if test="byx3!=null and byx3!=''">and byx3 = #{byx3}</if>
<if test="lineId!=null and lineId!=''">and line_id = #{lineId}</if>
<if test="lineName!=null and lineName!=''">and line_name = #{lineName}</if>
<if test="valids!=null">and valids = #{valids}</if>
</sql>
<update id="updateWgStatus">
update ar_up_config set priority = #{priority},sys_sign = #{sysSign}
where deleted = 0
<if test="level==null">
and priority = 1
</if>
<if test="level!=null">
and level = #{level}
</if>
<if test="stationId!=null and stationId!=''">and station_id = #{stationId}</if>
</update>
<!--查询总数-->
<select id="queryPageByCount" parameterType="Object" resultType="java.lang.Integer">
select count(1) from sys_station_takeover
<include refid="queryPageByListClause"></include>
</select>
<select id="queryPageByList" parameterType="Object" resultMap="BaseResultMap">
select * from sys_station_takeover
<include refid="queryPageByListClause"></include>
<if test="pager.orderCondition != null and pager.orderCondition != ''">
${pager.orderCondition}
</if>
<if test="pager.mysqlQueryCondition != null and pager.mysqlQueryCondition != ''">
${pager.mysqlQueryCondition}
</if>
</select>
<!-- 公共查询条件 -->
<sql id="queryPageByListClause">
where deleted=0
<if test="id!=null and id!=''">and id = #{id}</if>
<if test="takeoverOrgName!=null and takeoverOrgName!=''">and takeover_org_name = #{takeoverOrgName}</if>
<if test="applyType!=null ">and apply_type = #{applyType}</if>
<if test="applyUserName!=null and applyUserName!=''">and apply_user_name = #{applyUserName}</if>
<if test="applyUserId!=null and applyUserId!=''">and apply_user_id = #{applyUserId}</if>
<if test="stationId!=null and stationId!=''">and station_id = #{stationId}</if>
<if test="stationName!=null and stationName!=''">and station_name = #{stationName}</if>
<if test="applyTime!=null ">and apply_time = #{applyTime}</if>
<if test="takeoverType!=null ">and takeover_type = #{takeoverType}</if>
<if test="reason!=null and reason!=''">and reason = #{reason}</if>
<if test="approveTime!=null ">and approve_time = #{approveTime}</if>
<if test="interruptTime!=null ">and interrupt_time = #{interruptTime}</if>
<if test="status!=null ">and status = #{status}</if>
<if test="deleted!=null ">and deleted = #{deleted}</if>
<if test="sysSign!=null and sysSign!=''">and sys_sign = #{sysSign}</if>
<if test="createUserId!=null and createUserId!=''">and create_user_id = #{createUserId}</if>
<if test="createTime!=null ">and create_time = #{createTime}</if>
<if test="updateUserId!=null and updateUserId!=''">and update_user_id = #{updateUserId}</if>
<if test="updateTime!=null ">and update_time = #{updateTime}</if>
<if test="byx1!=null and byx1!=''">and byx1 = #{byx1}</if>
<if test="byx2!=null and byx2!=''">and byx2 = #{byx2}</if>
<if test="byx3!=null and byx3!=''">and byx3 = #{byx3}</if>
<if test="lineId!=null and lineId!=''">and line_id = #{lineId}</if>
<if test="lineName!=null and lineName!=''">and line_name = #{lineName}</if>
<if test="valids!=null">and valids = #{valids}</if>
<if test="startTime!=null and startTime!=''">and approve_time &gt;= #{startTime}</if>
<if test="endTime!=null and endTime!=''">and approve_time &lt;= #{endTime}</if>
</sql>
</mapper>
microservice-admin/src/main/resources/mapper/sys/SysThresholdMapper.xml
View file @ e9e67c03
......@@ -4,6 +4,8 @@
<!-- Result Map -->
<resultMap id="BaseResultMap" type="com.devplatform.admin.modules.sys.bean.SysThreshold">
<result column="id" property="id"/>
<result column="code" property="code"/>
<result column="unit" property="unit"/>
<result column="dic_id" property="dicId"/>
<result column="type" property="type"/>
<result column="remark" property="remark"/>
......@@ -25,13 +27,15 @@
<!-- sys_threshold table all fields -->
<sql id="Base_Column_List">
id,dic_id,type,remark,min_value,max_value,introduction,status,create_user_id,create_time,update_user_id,update_time,deleted,sys_sign,station_id,byx1,byx2,byx3
id,code,unit,dic_id,type,remark,min_value,max_value,introduction,status,create_user_id,create_time,update_user_id,update_time,deleted,sys_sign,station_id,byx1,byx2,byx3
</sql>
<!-- 公共查询条件 -->
<sql id="Example_Where_Clause">
where t.deleted=0
<if test="id!=null and id!=''">and t.id = #{id}</if>
<if test="code!=null and code!=''">and t.code = #{code}</if>
<if test="unit!=null ">and t.unit = #{unit}</if>
<if test="dicId!=null and dicId!=''">and t.dic_id = #{dicId}</if>
<if test="type!=null and type!=''">and t.type = #{type}</if>
<if test="remark!=null and remark!=''">and t.remark = #{remark}</if>
......@@ -67,6 +71,12 @@
${pager.mysqlQueryCondition}
</if>
</select>
<select id="getList" resultType="com.devplatform.admin.modules.sys.bean.SysThreshold">
select t.*,sd.name as typeName
from sys_threshold t
left join sys_dictionary sd on sd.id = t.type
where t.deleted=0
</select>
</mapper>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment