规则管理，通知管理

ruoyi-admin/src/main/java/com/ruoyi/web/controller/iot/domain/AlarmLogging.java

@@ -0,0 +1,6 @@
+package com.ruoyi.web.controller.iot.domain;
+
+public class AlarmLogging {
+
+    private Long id;
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/GroupingController.java

@@ -0,0 +1,96 @@
+package com.ruoyi.web.controller.system;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.system.domain.Rule;
+import com.ruoyi.system.service.GroupingService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.Grouping;
+
+/**
+ * 参数配置 信息操作处理
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/grouping")
+public class GroupingController extends BaseController {
+    @Autowired
+    private GroupingService groupingService;
+
+    /**
+     * 获取参数配置列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(Grouping grouping) {
+        startPage();
+        List<Grouping> list = groupingService.selectGroupingList(grouping);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 根据参数编号获取详细信息
+     */
+    @GetMapping(value = "/{groupingId}")
+    public AjaxResult getInfo(@PathVariable Long groupingId) {
+        return success(groupingService.selectGroupingById(groupingId));
+    }
+
+    /**
+     * 新增参数配置
+     */
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody Grouping grouping) {
+        grouping.setCreateBy(getUsername());
+        return toAjax(groupingService.insertGrouping(grouping));
+    }
+
+    /**
+     * 修改参数配置
+     */
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody Grouping grouping) {
+        grouping.setUpdateBy(getUsername());
+        return toAjax(groupingService.updateGrouping(grouping));
+    }
+
+    /**
+     * 删除参数配置
+     */
+    @DeleteMapping("/{groupingIds}")
+    public AjaxResult remove(@PathVariable Long[] groupingIds) {
+        groupingService.deleteGroupingByIds(groupingIds);
+        return success();
+    }
+
+
+    @GetMapping("/listRuleConfiguration")
+    public List<Rule> listRuleConfiguration(Rule grouping) {
+        List<Rule> list = groupingService.listRuleConfiguration(grouping);
+        return list;
+    }
+
+    @PutMapping("/ruleConfiguration")
+    public AjaxResult editRuleConfiguration(@Validated @RequestBody Rule grouping) {
+        return toAjax(groupingService.updateRuleConfiguration(grouping));
+    }
+    @PostMapping("/ruleConfiguration")
+    public AjaxResult addRuleConfiguration(@Validated @RequestBody Rule rule) {
+        return toAjax(groupingService.insertRuleConfiguration(rule));
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/Grouping.java

@@ -0,0 +1,91 @@
+package com.ruoyi.system.domain;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import javax.xml.crypto.Data;
+import java.util.Date;
+
+public class Grouping extends BaseEntity {
+    private Long id;
+    /**
+     * 名字
+     */
+    private String userName;
+    /**
+     * 分组名字
+     */
+    private String name;
+    /**
+     * 手机号
+     */
+    private String cellphone;
+    /**
+     * 是否通知 0否 1是
+     */
+    private Integer isInform;
+    /**
+     * 创建时间
+     */
+    private Date creationTime;
+    /**
+     * 是否停用
+     */
+    private Integer isForbidden;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCellphone() {
+        return cellphone;
+    }
+
+    public void setCellphone(String cellphone) {
+        this.cellphone = cellphone;
+    }
+
+    public Integer getIsInform() {
+        return isInform;
+    }
+
+    public void setIsInform(Integer isInform) {
+        this.isInform = isInform;
+    }
+
+    public Date getCreationTime() {
+        return creationTime;
+    }
+
+    public void setCreationTime(Date creationTime) {
+        this.creationTime = creationTime;
+    }
+
+    public Integer getIsForbidden() {
+        return isForbidden;
+    }
+
+    public void setIsForbidden(Integer isForbidden) {
+        this.isForbidden = isForbidden;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/Rule.java

@@ -0,0 +1,60 @@
+package com.ruoyi.system.domain;
+
+public class Rule {
+
+    private Long id;
+    private Integer day;
+    private Double ratio;
+    private Long groupingId;
+    private String name;
+
+    private String groupingName;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Integer getDay() {
+        return day;
+    }
+
+    public void setDay(Integer day) {
+        this.day = day;
+    }
+
+    public Double getRatio() {
+        return ratio;
+    }
+
+    public void setRatio(Double ratio) {
+        this.ratio = ratio;
+    }
+
+    public Long getGroupingId() {
+        return groupingId;
+    }
+
+    public void setGroupingId(Long groupingId) {
+        this.groupingId = groupingId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getGroupingName() {
+        return groupingName;
+    }
+
+    public void setGroupingName(String groupingName) {
+        this.groupingName = groupingName;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/GroupingMapper.java

@@ -0,0 +1,28 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.Grouping;
+import com.ruoyi.system.domain.Rule;
+
+import java.util.List;
+
+/**
+ * 参数配置 数据层
+ *
+ * @author ruoyi
+ */
+public interface GroupingMapper {
+
+    List<Grouping> selectGroupingList(Grouping config);
+
+    Grouping selectGroupingById(Long id);
+
+    int insertGrouping(Grouping config);
+
+    int updateGrouping(Grouping config);
+
+    List<Rule> listRuleConfiguration();
+
+    int updateRuleConfiguration(Rule rule);
+
+    int insertRuleConfiguration(Rule rule);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/GroupingService.java

@@ -0,0 +1,55 @@
+package com.ruoyi.system.service;
+
+import com.ruoyi.system.domain.Grouping;
+import com.ruoyi.system.domain.Rule;
+
+import java.util.List;
+
+public interface GroupingService {
+
+    /**
+     * 查询参数配置信息
+     *
+     * @param configId 参数配置ID
+     * @return 参数配置信息
+     */
+    public Grouping selectGroupingById(Long configId);
+
+
+    /**
+     * 查询参数配置列表
+     *
+     * @param config 参数配置信息
+     * @return 参数配置集合
+     */
+    public List<Grouping> selectGroupingList(Grouping config);
+
+    /**
+     * 新增参数配置
+     *
+     * @param config 参数配置信息
+     * @return 结果
+     */
+    public int insertGrouping(Grouping config);
+
+    /**
+     * 修改参数配置
+     *
+     * @param config 参数配置信息
+     * @return 结果
+     */
+    public int updateGrouping(Grouping config);
+
+    /**
+     * 批量删除参数信息
+     *
+     * @param configIds 需要删除的参数ID
+     */
+    public void deleteGroupingByIds(Long[] configIds);
+
+    List<Rule> listRuleConfiguration(Rule grouping);
+
+    int updateRuleConfiguration(Rule grouping);
+
+    int insertRuleConfiguration(Rule rule);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GroupingServiceImpl.java

@@ -0,0 +1,104 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.common.annotation.DataSource;
+import com.ruoyi.common.enums.DataSourceType;
+import com.ruoyi.system.domain.Grouping;
+import com.ruoyi.system.domain.Rule;
+import com.ruoyi.system.mapper.GroupingMapper;
+import com.ruoyi.system.service.GroupingService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class GroupingServiceImpl implements GroupingService {
+
+    @Autowired
+    private GroupingMapper groupingMapper;
+
+
+    /**
+     * 查询参数配置信息
+     *
+     * @param configId 参数配置ID
+     * @return 参数配置信息
+     */
+    @Override
+    @DataSource(DataSourceType.MASTER)
+    public Grouping selectGroupingById(Long configId)
+    {
+        return groupingMapper.selectGroupingById(configId);
+    }
+
+
+    /**
+     * 查询参数配置列表
+     *
+     * @param config 参数配置信息
+     * @return 参数配置集合
+     */
+    @Override
+    public List<Grouping> selectGroupingList(Grouping config)
+    {
+        return groupingMapper.selectGroupingList(config);
+    }
+
+    /**
+     * 新增参数配置
+     *
+     * @param config 参数配置信息
+     * @return 结果
+     */
+    @Override
+    public int insertGrouping(Grouping config)
+    {
+        int row = groupingMapper.insertGrouping(config);
+        return row;
+    }
+
+    /**
+     * 修改参数配置
+     *
+     * @param config 参数配置信息
+     * @return 结果
+     */
+    @Override
+    public int updateGrouping(Grouping config)
+    {
+
+        int row = groupingMapper.updateGrouping(config);
+        return row;
+    }
+
+    /**
+     * 批量删除参数信息
+     *
+     * @param configIds 需要删除的参数ID
+     */
+    @Override
+    public void deleteGroupingByIds(Long[] configIds)
+    {
+        for (Long configId : configIds)
+        {
+//            groupingMapper.deleteGroupingById(configId);
+        }
+    }
+
+    @Override
+    public List<Rule> listRuleConfiguration(Rule grouping) {
+        return groupingMapper.listRuleConfiguration();
+    }
+
+    @Override
+    public int updateRuleConfiguration(Rule rule) {
+        int row = groupingMapper.updateRuleConfiguration(rule);
+        return row;
+    }
+
+    @Override
+    public int insertRuleConfiguration(Rule rule) {
+        int row = groupingMapper.insertRuleConfiguration(rule);
+        return row;
+    }
+}

ruoyi-system/src/main/resources/mapper/system/GroupingMapper.xml

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.GroupingMapper">
+    <insert id="insertGrouping" parameterType="Grouping" useGeneratedKeys="true" keyProperty="id">
+        insert into grouping (
+        <if test="userName != null and userName != '' ">user_name,</if>
+        <if test="name != null and name != '' ">name,</if>
+        <if test="cellphone != null and cellphone != '' ">cellphone,</if>
+        <if test="isInform != null and isInform != '' or isInform == 0 ">is_inform,</if>
+        <if test="isForbidden != null and isForbidden != '' or isForbidden == 0 ">is_forbidden,</if>
+        creation_time
+        )values(
+        <if test="userName != null and userName != ''">#{userName},</if>
+        <if test="name != null and name != ''">#{name},</if>
+        <if test="cellphone != null and cellphone != ''">#{cellphone},</if>
+        <if test="isInform != null and isInform != ''">#{isInform},</if>
+        <if test="isForbidden != null and isForbidden != ''">#{isForbidden},</if>
+        sysdate()
+        )
+    </insert>
+    <insert id="insertRuleConfiguration">
+        insert into rule (
+        <if test="day != null and day != '' ">day,</if>
+        <if test="ratio != null and ratio != '' ">ratio,</if>
+        <if test="groupingId != null and groupingId != '' or groupingId == 0 ">grouping_id,</if>
+        <if test="name != null and name != '' ">name,</if>
+        creation_time
+        )values(
+        <if test="day != null and day != ''">#{day},</if>
+        <if test="ratio != null and ratio != ''">#{ratio},</if>
+        <if test="groupingId != null and groupingId != '' or groupingId == 0 ">#{groupingId},</if>
+        <if test="name != null and name != ''">#{name},</if>
+        sysdate()
+        )
+    </insert>
+    <update id="updateGrouping">
+        update grouping
+        <set>
+            <if test="userName != null and userName != ''">user_name = #{userName},</if>
+            <if test="name != null and name != ''">name = #{name},</if>
+            <if test="cellphone != null and cellphone != ''">cellphone = #{cellphone},</if>
+            <if test="isInform != null and isInform != '' or isInform == 0">is_inform = #{isInform},</if>
+            <if test="isForbidden != null and isForbidden != '' or isForbidden == 0">is_forbidden = #{isForbidden},</if>
+        </set>
+        where id = #{id}
+    </update>
+    <update id="updateRuleConfiguration">
+        update rule
+        <set>
+            <if test="day != null and day != ''">day = #{day},</if>
+            <if test="ratio != null and ratio != ''">ratio = #{ratio},</if>
+            <if test="groupingId != null and groupingId != ''">grouping_id = #{groupingId},</if>
+            <if test="name != null and name != ''">name = #{name},</if>
+        </set>
+        where id = #{id}
+    </update>
+
+
+    <select id="selectGroupingList" resultType="com.ruoyi.system.domain.Grouping">
+        select *,
+               user_name     as userName,
+               is_inform     as isInform,
+               creation_time as creationTime,
+               is_forbidden  as isForbidden
+        from grouping
+        <where>
+            <if test="userName != null and userName != ''">
+                AND user_name like concat('%', #{userName}, '%')
+            </if>
+        </where>
+    </select>
+    <select id="selectGroupingById" resultType="com.ruoyi.system.domain.Grouping">
+        select *,
+               user_name     as userName,
+               is_inform     as isInform,
+               creation_time as creationTime,
+               is_forbidden  as isForbidden
+        from grouping
+        where id = #{id}
+    </select>
+    <select id="listRuleConfiguration" resultType="com.ruoyi.system.domain.Rule">
+        select r.*, r.grouping_id as groupingId, g.name as groupingName from rule r left join grouping g on r.grouping_id = g.id
+    </select>
+</mapper>