From a5b27c528bb73886ccc6b97ea1262b9d7f403cca Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Wed, 12 May 2021 17:50:11 +0800
Subject: [PATCH] 站点文件提交
---
screen-manage/src/main/java/com/moral/api/mapper/MonitorPointMapper.java | 16 ++
screen-manage/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java | 160 ++++++++++++++++++++++
screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java | 3
screen-manage/src/main/java/com/moral/api/service/MonitorPointService.java | 28 ++++
screen-manage/src/main/java/com/moral/api/controller/MonitorPointController.java | 82 +++++++++++
screen-manage/src/main/java/com/moral/api/entity/MonitorPoint.java | 100 ++++++++++++++
screen-manage/src/main/resources/mapper/MonitorPointMapper.xml | 22 +++
7 files changed, 410 insertions(+), 1 deletions(-)
diff --git a/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java b/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
index a78ed51..4b02195 100644
--- a/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
+++ b/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
@@ -49,7 +49,8 @@
SENSOR_KEY_IS_USED(-35, "������������������������"),
ORGANIZATION_USER_NOT_EXIST(-36,"���������������������"),
SENSOR_IS_NOT_EXIST(-37, "���������������"),
- UNIT_CONVERSION_EXIST(-38,"������������������������")
+ UNIT_CONVERSION_EXIST(-38,"������������������������"),
+ MONITOR_POINT_IS_EXIST(-39,"���������������")
;
private final Integer code;
private final String msg;
diff --git a/screen-manage/src/main/java/com/moral/api/controller/MonitorPointController.java b/screen-manage/src/main/java/com/moral/api/controller/MonitorPointController.java
new file mode 100644
index 0000000..9fbaa7f
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/controller/MonitorPointController.java
@@ -0,0 +1,82 @@
+package com.moral.api.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.moral.api.entity.MonitorPoint;
+import com.moral.api.entity.Sensor;
+import com.moral.api.service.MonitorPointService;
+import com.moral.api.service.SensorService;
+import com.moral.constant.ResponseCodeEnum;
+import com.moral.constant.ResultMessage;
+import com.moral.util.WebUtils;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+@Slf4j
+@Api(tags = {"������"})
+@RestController
+@RequestMapping("/monitorPoint")
+public class MonitorPointController {
+
+ @Autowired
+ private MonitorPointService monitorPointService;
+
+ @Autowired
+ private SensorService sensorService;
+
+ @RequestMapping(value = "insertOneMonitorPoint", method = RequestMethod.POST)
+ @ResponseBody
+ public ResultMessage insertOneMonitorPoint(@RequestBody Map<String, Object> parameters,HttpServletRequest request) {
+ MonitorPoint monitorPoint = JSON.parseObject(JSON.toJSONString(parameters), MonitorPoint.class);
+ Map<String,Object> resultMap = monitorPointService.insertMonitorPoint(monitorPoint);
+ String msg = resultMap.get("msg").toString();
+ int code = Integer.parseInt(resultMap.get("code").toString());
+ if (code == 0){
+ return ResultMessage.ok(msg);
+ }
+ return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString());
+ //return null;
+ }
+
+ @RequestMapping(value = "updateSensor", method = RequestMethod.POST)
+ @ResponseBody
+ public ResultMessage updateSensor(@RequestBody Map<String, Object> parameters,HttpServletRequest request) {
+ Map<String,Object> resultMap = sensorService.updateSensor(parameters);
+ String msg = resultMap.get("msg").toString();
+ int code = Integer.parseInt(resultMap.get("code").toString());
+ if (code == 0){
+ return ResultMessage.ok(msg);
+ }
+ return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString());
+ }
+
+ @RequestMapping(value = "getAllMonitorPoint", method = RequestMethod.GET)
+ @ResponseBody
+ public ResultMessage getAllMonitorPoint(HttpServletRequest request) {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ Map<String,Object> resultMap = monitorPointService.getAllMonitorPoint(parameters);
+ if (!resultMap.containsKey("code")){
+ return ResultMessage.ok(resultMap);
+ }
+ return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString());
+ }
+
+ @RequestMapping(value = "deleteSensor", method = RequestMethod.POST)
+ @ResponseBody
+ public ResultMessage deleteSensor(@RequestBody Map<String, Object> parameters,HttpServletRequest request) {
+ if (!parameters.containsKey("id")){
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ Map<String,Object> resultMap = sensorService.deleteSensor(parameters);
+ String msg = resultMap.get("msg").toString();
+ int code = Integer.parseInt(resultMap.get("code").toString());
+ if (code == 0){
+ return ResultMessage.ok(msg);
+ }
+ return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString());
+ }
+}
diff --git a/screen-manage/src/main/java/com/moral/api/entity/MonitorPoint.java b/screen-manage/src/main/java/com/moral/api/entity/MonitorPoint.java
new file mode 100644
index 0000000..559bdf6
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/entity/MonitorPoint.java
@@ -0,0 +1,100 @@
+package com.moral.api.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author moral
+ * @since 2021-05-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class MonitorPoint extends Model<MonitorPoint> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ������
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * ���������
+ */
+ private String name;
+
+ /**
+ * ������
+ */
+ private Double longitude;
+
+ /**
+ * ������
+ */
+ private Double latitude;
+
+ /**
+ * ���������
+ */
+ private Integer provinceCode;
+
+ /**
+ * ���������������
+ */
+ private Integer cityCode;
+
+ /**
+ * ���/���/���������
+ */
+ private Integer areaCode;
+
+ /**
+ * ������������
+ */
+ private String address;
+
+ /**
+ * ������id
+ */
+ private Integer organizationId;
+
+ /**
+ * ������������
+ */
+ private Date createTime;
+
+ /**
+ * ������������
+ */
+ private Date updateTime;
+
+ /**
+ * ���������������
+ */
+ private String isDelete;
+
+ /**
+ * ������
+ */
+ @TableField(value = "`desc`")
+ private String desc;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+}
diff --git a/screen-manage/src/main/java/com/moral/api/mapper/MonitorPointMapper.java b/screen-manage/src/main/java/com/moral/api/mapper/MonitorPointMapper.java
new file mode 100644
index 0000000..2b8d27e
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/mapper/MonitorPointMapper.java
@@ -0,0 +1,16 @@
+package com.moral.api.mapper;
+
+import com.moral.api.entity.MonitorPoint;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * Mapper ������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-05-12
+ */
+public interface MonitorPointMapper extends BaseMapper<MonitorPoint> {
+
+}
diff --git a/screen-manage/src/main/java/com/moral/api/service/MonitorPointService.java b/screen-manage/src/main/java/com/moral/api/service/MonitorPointService.java
new file mode 100644
index 0000000..3ebf0c0
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/service/MonitorPointService.java
@@ -0,0 +1,28 @@
+package com.moral.api.service;
+
+import com.moral.api.entity.MonitorPoint;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * ���������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-05-12
+ */
+@Transactional
+public interface MonitorPointService extends IService<MonitorPoint> {
+
+ @Transactional
+ Map<String,Object> insertMonitorPoint(MonitorPoint monitorPoint);
+
+ Map<String,Object> getAllMonitorPoint(Map map);
+
+ @Transactional
+ Map<String,Object> updateMonitorPoint(Map<String,Object> updateMap);
+
+}
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
new file mode 100644
index 0000000..eead367
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
@@ -0,0 +1,160 @@
+package com.moral.api.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.moral.api.entity.MonitorPoint;
+import com.moral.api.entity.Organization;
+import com.moral.api.mapper.MonitorPointMapper;
+import com.moral.api.mapper.OrganizationMapper;
+import com.moral.api.service.MonitorPointService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.util.LogUtils;
+import com.moral.constant.Constants;
+import com.moral.constant.ResponseCodeEnum;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * ���������������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-05-12
+ */
+@Service
+@Transactional
+public class MonitorPointServiceImpl extends ServiceImpl<MonitorPointMapper, MonitorPoint> implements MonitorPointService {
+
+ @Autowired(required = false)
+ private MonitorPointMapper monitorPointMapper;
+
+ @Autowired(required = false)
+ private OrganizationMapper organizationMapper;
+
+ @Autowired
+ LogUtils logUtils;
+
+ @Override
+ @Transactional
+ public Map<String, Object> insertMonitorPoint(MonitorPoint monitorPoint) {
+ Map resultMap = new HashMap();
+ if (monitorPoint.getName()==null){
+ resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
+ resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ return resultMap;
+ }
+ QueryWrapper<MonitorPoint> wapper_name = new QueryWrapper<>();
+ wapper_name.eq("name",monitorPoint.getName());
+ wapper_name.eq("is_delete",Constants.NOT_DELETE);
+ if(monitorPointMapper.selectOne(wapper_name)!=null){
+ resultMap.put("code",ResponseCodeEnum.MONITOR_POINT_IS_EXIST.getCode());
+ resultMap.put("msg",ResponseCodeEnum.MONITOR_POINT_IS_EXIST.getMsg());
+ return resultMap;
+ }
+ if (monitorPoint.getOrganizationId()!=null){
+ QueryWrapper<Organization> wapper_org = new QueryWrapper<>();
+ wapper_org.eq("id",monitorPoint.getOrganizationId());
+ wapper_org.eq("is_delete",Constants.NOT_DELETE);
+ if (organizationMapper.selectOne(wapper_org)==null){
+ resultMap.put("code",ResponseCodeEnum.ORGANIZATION_NOT_EXIST.getCode());
+ resultMap.put("msg",ResponseCodeEnum.ORGANIZATION_NOT_EXIST.getMsg());
+ return resultMap;
+ }
+ }
+ monitorPointMapper.insert(monitorPoint);
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ String content = "���������������:"+monitorPoint.getName()+";";
+ logUtils.saveOperationForManage(request,content,Constants.INSERT_OPERATE_TYPE);
+ resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
+ resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
+ return resultMap;
+ }
+
+ @Override
+ public Map<String, Object> getAllMonitorPoint(Map map) {
+ Map<String,Object> resultMap = new HashMap<>();
+ if (!map.containsKey("current")||!map.containsKey("size")||!map.containsKey("orderType")){
+ resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
+ resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ return resultMap;
+ }
+ int current = Integer.parseInt(map.get("current").toString());
+ int size = Integer.parseInt(map.get("size").toString());
+ Page<MonitorPoint> page = new Page(current,size);
+ QueryWrapper<MonitorPoint> wrapper = new QueryWrapper();
+ wrapper.eq("is_delete",0);
+ String orderType = map.get("orderType").toString();
+ if (orderType.equals(Constants.ORDER_ASC)){
+ wrapper.orderByAsc("create_time");
+ }else {
+ wrapper.orderByDesc("create_time");
+ }
+ Page resultPage = monitorPointMapper.selectPage(page,wrapper);
+ List<MonitorPoint> monitorPoints = resultPage.getRecords();
+ SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ List<Map<String,Object>> monitorPointtList = new ArrayList<>();
+ for (MonitorPoint monitorPoint:monitorPoints) {
+ Map monitorPointMap = JSON.parseObject(JSON.toJSONString(monitorPoint),Map.class);
+ String createTime = SDF.format(monitorPoint.getCreateTime());
+ String updateTime = SDF.format(monitorPoint.getUpdateTime());
+ monitorPointMap.put("createTime",createTime);
+ monitorPointMap.put("updateTime",updateTime);
+ monitorPointMap.put("key",monitorPoint.getId());
+ monitorPointtList.add(monitorPointMap);
+ }
+ resultMap.put("manageRoles",monitorPointtList);
+ int totalNumber = monitorPoints.size();
+ resultMap.put("totalNumber",totalNumber);
+ resultMap.put("current",current);
+ int totalPageNumber = totalNumber/size;
+ if(totalNumber%size != 0){
+ totalPageNumber += 1;
+ }
+ resultMap.put("totalPageNumber",totalPageNumber);
+ return resultMap;
+ }
+
+ @Override
+ public Map<String, Object> updateMonitorPoint(Map<String,Object> updateMap) {
+ Map resultMap = new HashMap();
+ if(!updateMap.containsKey("id")){
+ resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
+ resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ return resultMap;
+ }
+ if (updateMap.containsKey("name")){
+ if (updateMap.get("name")==null||updateMap.get("name")==""){
+ resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
+ resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ return resultMap;
+ }
+ QueryWrapper<MonitorPoint> wapper_name = new QueryWrapper<>();
+ wapper_name.eq("name",updateMap.get("name"));
+ wapper_name.eq("is_delete",Constants.NOT_DELETE);
+ MonitorPoint monitorPoint_name = monitorPointMapper.selectOne(wapper_name);
+ if(monitorPoint_name!=null&&!monitorPoint_name.getId().equals(updateMap.get("id"))){
+ resultMap.put("code",ResponseCodeEnum.MONITOR_POINT_IS_EXIST.getCode());
+ resultMap.put("msg",ResponseCodeEnum.MONITOR_POINT_IS_EXIST.getMsg());
+ return resultMap;
+ }
+ }
+ QueryWrapper<MonitorPoint> wapper_id = new QueryWrapper<>();
+ wapper_id.eq("id",updateMap.get("id"));
+ wapper_id.eq("is_delete",Constants.NOT_DELETE);
+ monitorPointMapper.selectOne(wapper_id);
+ return null;
+ }
+}
diff --git a/screen-manage/src/main/resources/mapper/MonitorPointMapper.xml b/screen-manage/src/main/resources/mapper/MonitorPointMapper.xml
new file mode 100644
index 0000000..5e9c800
--- /dev/null
+++ b/screen-manage/src/main/resources/mapper/MonitorPointMapper.xml
@@ -0,0 +1,22 @@
+<?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.moral.api.mapper.MonitorPointMapper">
+
+ <!-- ������������������������ -->
+ <resultMap id="BaseResultMap" type="com.moral.api.entity.MonitorPoint">
+ <id column="id" property="id" />
+ <result column="name" property="name" />
+ <result column="longitude" property="longitude" />
+ <result column="latitude" property="latitude" />
+ <result column="province_code" property="provinceCode" />
+ <result column="city_code" property="cityCode" />
+ <result column="area_code" property="areaCode" />
+ <result column="address" property="address" />
+ <result column="organization_id" property="organizationId" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ <result column="is_delete" property="isDelete" />
+ <result column="desc" property="desc" />
+ </resultMap>
+
+</mapper>
\ No newline at end of file
--
Gitblit v1.8.0