Merge remote-tracking branch 'origin/master'

sms_water/src/main/java/com/huaxu/controller/AlarmSettingController.java

@@ -0,0 +1,99 @@
+package com.huaxu.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huaxu.entity.AlarmSetting;
+import com.huaxu.model.AjaxMessage;
+import com.huaxu.model.LoginUser;
+import com.huaxu.model.Pagination;
+import com.huaxu.model.ResultStatus;
+import com.huaxu.service.AlarmSettingService;
+import com.huaxu.util.UserUtil;
+import io.swagger.annotations.Api;
+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.List;
+
+/**
+ * 报警设置控制层
+ *
+ * @author yjy
+ * @since 2020-11-17
+ */
+@RestController
+@RequestMapping("/alarmSetting")
+@Api(tags = "报警管理")
+public class AlarmSettingController {
+    /**
+     * 服务对象
+     */
+    @Autowired
+    private AlarmSettingService alarmSettingService;
+
+    /**
+     * 删除多条数据
+     *
+     * @param ids
+     * @return Response对象
+     */
+    @RequestMapping(value = "deleteByAlarmIds", method = RequestMethod.POST)
+    @ApiOperation(value = "删除报警配置信息")
+    public AjaxMessage<Boolean> deleteByAlarmIds(@ApiParam(value = "报警配置ids", required = true) @RequestBody Long[] ids) {
+        boolean result = alarmSettingService.deleteByAlarmIds(ids);
+        return new AjaxMessage<>(ResultStatus.OK, result);
+    }
+    /**
+     * 修改数据
+     *
+     * @param
+     * @return Response对象
+     */
+    @RequestMapping(value = "updateByAlarmId", method = RequestMethod.POST)
+    @ApiOperation(value = "修改报警配置信息")
+    public AjaxMessage<Boolean> updateByAlarmId(@ApiParam(value = "报警配置信息", required = true) @RequestBody AlarmSetting alarmSetting) {
+        if(alarmSetting.getId()==null) {
+            return new AjaxMessage<>(ResultStatus.PARAM_ERROR);
+        }
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        alarmSetting.setUpdateBy(currentUser.getUsername());
+        boolean result = alarmSettingService.updateByAlarmId(alarmSetting);
+        return new AjaxMessage<>(ResultStatus.OK, result);
+    }
+    /**
+     * 增加数据
+     *
+     * @param
+     * @return Response对象
+     */
+    @RequestMapping(value = "insertBatch", method = RequestMethod.POST)
+    @ApiOperation(value = "批量增加报警配置信息")
+    public AjaxMessage<Boolean> insertBatch(@ApiParam(value = "报警配置ids", required = true) @RequestBody List<AlarmSetting> listAlarmSetting) {
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        for (AlarmSetting alarm:listAlarmSetting) {
+            alarm.setCreateBy(currentUser.getUsername());
+            alarm.setTenantId(currentUser.getTenantId());
+            alarm.setStatus(1);
+        }
+
+        boolean result = alarmSettingService.insertBatch(listAlarmSetting);
+        return new AjaxMessage<>(ResultStatus.OK, result);
+    }
+    /**
+     * 根据机构查询Gis设置数据
+     *
+     * @param id
+     * @return
+     */
+    @RequestMapping(value = "selectById", method = RequestMethod.GET)
+    @ApiOperation(value = "根据id查询报警配置数据")
+    public AjaxMessage<AlarmSetting> selectById(@RequestParam Integer id) {
+        if(id==null) {
+            return new AjaxMessage<>(ResultStatus.PARAM_ERROR);
+        }
+        AlarmSetting result = alarmSettingService.selectById(id);
+        return new AjaxMessage<>(ResultStatus.OK, result);
+    }
+}

sms_water/src/main/java/com/huaxu/controller/SystemSettingController.java

@@ -63,9 +63,11 @@ public class SystemSettingController {
     public AjaxMessage<Boolean> saveSystem(
             @ApiParam(value = "系统设置信息", required = true) @RequestBody SystemSetting systemSetting) {
         LoginUser currentUser = UserUtil.getCurrentUser();
-        if(systemSetting.getId()==null){
+        Integer id = systemSetting.getId() != null?systemSetting.getId():systemSettingService.getId(systemSetting.getCompanyOrgId(),systemSetting.getDeptOrgId());
+        if(id==null){//没有查询到数据则新增
             systemSetting.setCreateBy(currentUser.getUsername());
-        }else {
+        }else {//修改
+            systemSetting.setId(id);
             systemSetting.setUpdateBy(currentUser.getUsername());
         }
         systemSetting.setTenantId(currentUser.getTenantId());
@@ -131,8 +133,7 @@ public class SystemSettingController {
         LoginUser currentUser = UserUtil.getCurrentUser();
         for (GisSetting gis:listGisSetting) {
             Integer id = gis.getId() != null?gis.getId():gisSettingService.getId(gis.getCompanyOrgId(),gis.getDeptOrgId(),gis.getServiceType());
-            //没有查询到数据则新增
-            if(id==null){
+            if(id==null){//没有查询到数据则新增
                 gis.setCreateBy(currentUser.getUsername());
             }else{//修改
                 gis.setId(id);
@@ -146,7 +147,7 @@ public class SystemSettingController {
         return new AjaxMessage<>(ResultStatus.OK, result);
     }
     /**
-     * 删除一条数据
+     * 删除多条数据
      *
      * @param ids
      * @return Response对象

sms_water/src/main/java/com/huaxu/dao/AlarmSettingMapper.java

@@ -0,0 +1,18 @@
+package com.huaxu.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huaxu.entity.AlarmSetting;
+import org.apache.ibatis.annotations.Mapper;
+
+
+/**
+ *
+ * 报警设置Dao接口
+ *
+ * @author yjy
+ * @since 2020-11-17
+ */
+@Mapper
+public interface AlarmSettingMapper extends BaseMapper<AlarmSetting> {
+
+}

sms_water/src/main/java/com/huaxu/entity/AlarmSetting.java

@@ -0,0 +1,96 @@
+package com.huaxu.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 报警设置(sms_alarm_setting)实体类
+ *
+ * @author yjy
+ * @since 2020-11-17
+ */
+@Data
+@ApiModel
+@TableName("sms_alarm_setting")
+public class AlarmSetting implements Serializable {
+    private static final long serialVersionUID = 460807634914426955L;
+    /**
+     * 主键
+     */
+    @ApiModelProperty(value = "主键")
+    @TableId(type= IdType.AUTO)
+    private Integer id;
+    /**
+     * 租户标识
+     */
+    @ApiModelProperty(value = "租户标识")
+    private String tenantId;
+    /**
+     * 设备编号
+     */
+    @ApiModelProperty(value = "设备编号")
+    private Integer deviceId;
+    /**
+     * 设备属性编号
+     */
+    @ApiModelProperty(value = "设备属性编号")
+    private Integer attributeId;
+    /**
+     * 报警类型
+     */
+    @ApiModelProperty(value = "报警类型",notes = "参数报警、状态报警")
+    private String alarmType;
+    /**
+     * 报警条件
+     */
+    @ApiModelProperty(value = "报警条件")
+    private String alarmCondition;
+    /**
+     * 报警值
+     */
+    @ApiModelProperty(value = "报警值")
+    private Double alarmValue;
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 数据删除标识
+     */
+    @ApiModelProperty(value = "数据删除标识")
+    @TableLogic
+    private Integer status;
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
+    @ApiModelProperty(value = "创建时间")
+    private Date dateCreate;
+    /**
+     * 更新人
+     */
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
+    @ApiModelProperty(value = "更新时间")
+    private Date dateUpdate;
+}

sms_water/src/main/java/com/huaxu/entity/GisSetting.java

@@ -27,7 +27,7 @@ public class GisSetting implements Serializable {
      * 主键
      */
     @ApiModelProperty(value = "主键")
-    @TableId(value = "id", type= IdType.AUTO)
+    @TableId(type= IdType.AUTO)
     private Integer id;
     /**
      * 租户标识

sms_water/src/main/java/com/huaxu/entity/SystemSetting.java

@@ -27,7 +27,7 @@ public class SystemSetting implements Serializable {
      * 主键
      */
     @ApiModelProperty(value = "主键")
-    @TableId(value = "id", type= IdType.AUTO)
+    @TableId(type= IdType.AUTO)
     private Integer id;
     /**
      * 租户标识

sms_water/src/main/java/com/huaxu/service/AlarmSettingService.java

@@ -0,0 +1,60 @@
+package com.huaxu.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huaxu.dao.AlarmSettingMapper;
+import com.huaxu.entity.AlarmSetting;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 报警设置服务接口
+ *
+ * @author yjy
+ * @since 2020-11-17
+ */
+@Service
+public class AlarmSettingService extends ServiceImpl<AlarmSettingMapper, AlarmSetting> {
+    /**
+     * 删除数据
+     *
+     * @param ids
+     * @return
+     */
+    public boolean deleteByAlarmIds(Long[] ids) {
+        return this.removeByIds(Arrays.asList(ids));
+    }
+    /**
+     * 修改数据
+     *
+     * @param
+     * @return
+     */
+    public boolean updateByAlarmId(AlarmSetting alarmSetting) {
+        return this.updateById(alarmSetting);
+    }
+    /**
+     * 批量增加数据
+     *
+     * @param
+     * @return
+     */
+    public boolean insertBatch(List<AlarmSetting> listAlarmSetting) {
+        return this.saveBatch(listAlarmSetting);
+    }
+    /**
+     * 根据机构查询Gis设置数据
+     *
+     * @param id 所属公司
+     * @return 单条数据
+     */
+    public AlarmSetting selectById(Integer id){
+        return this.getById(id);
+    }
+}

sms_water/src/main/java/com/huaxu/service/GisSettingService.java

@@ -1,12 +1,12 @@
 package com.huaxu.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaxu.dao.GisSettingMapper;
 import com.huaxu.entity.GisSetting;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -60,13 +60,13 @@ public class GisSettingService extends ServiceImpl<GisSettingMapper, GisSetting>
     public IPage<GisSetting> selectPageGis(IPage<GisSetting> page,Integer companyOrgId,Integer deptOrgId,String serviceType){
         IPage<GisSetting> res=new Page<GisSetting>();
         if(deptOrgId != null) {
-            if(serviceType == null){
+            if(StringUtils.isEmpty(serviceType)){
                 res = this.page(page,new QueryWrapper<GisSetting>().eq("DEPT_ORG_ID",deptOrgId));
             }else{
                 res = this.page(page,new QueryWrapper<GisSetting>().eq("DEPT_ORG_ID",deptOrgId).eq("SERVICE_TYPE",serviceType));
             }
         } else if(companyOrgId != null){
-            if(serviceType == null){
+            if(StringUtils.isEmpty(serviceType)){
                 res = this.page(page,new QueryWrapper<GisSetting>().eq("COMPANY_ORG_ID",companyOrgId));
             }else {
                 res = this.page(page,new QueryWrapper<GisSetting>().eq("COMPANY_ORG_ID",companyOrgId).eq("SERVICE_TYPE",serviceType));

sms_water/src/main/java/com/huaxu/service/SystemSettingService.java

@@ -1,7 +1,6 @@
 package com.huaxu.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaxu.dao.SystemSettingMapper;
 import com.huaxu.entity.SystemSetting;
@@ -42,6 +41,27 @@ public class SystemSettingService  extends ServiceImpl<SystemSettingMapper,Syste
         return this.saveOrUpdate(systemSetting);
     }
 
+    /**
+     * 根据条件获取id
+     *
+     * @param companyOrgId 所属公司
+     * @param deptOrgId 所属部门
+     * @return
+     */
+    public Integer getId(Integer companyOrgId,Integer deptOrgId) {
+        Integer id = null;
+        SystemSetting res=new SystemSetting();
+        if(deptOrgId != null) {
+            res= this.getOne(new QueryWrapper<SystemSetting>().eq("DEPT_ORG_ID",deptOrgId));
+        }else if(companyOrgId != null){
+            res= this.getOne(new QueryWrapper<SystemSetting>().eq("COMPANY_ORG_ID",companyOrgId));
+        }
+        if(res != null) {
+            id=res.getId();
+        }
+        return id;
+    }
+
 
 
 }