添加报警推送人设置。

common/src/main/java/com/jpsoft/smart/modules/base/dao/WarningPusherDAO.java

@@ -0,0 +1,18 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.smart.modules.base.entity.WarningPusher;
+import java.util.Map;
+import com.jpsoft.smart.modules.common.dto.Sort;
+
+@Repository
+public interface WarningPusherDAO {
+	int insert(WarningPusher entity);
+	int update(WarningPusher entity);
+	int exist(String id);
+	WarningPusher get(String id);
+	int delete(String id);
+	List<WarningPusher> list();
+	List<WarningPusher> search(Map<String,Object> searchParams,List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/smart/modules/base/entity/WarningPusher.java

@@ -0,0 +1,88 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:base_warning_pusher的实体类
+ */
+@Data
+@ApiModel(value = "base_warning_pusher的实体类")
+public class WarningPusher {
+	/**
+	 *编号
+	 */
+        @ApiModelProperty(value = "编号")
+	private String id;
+	/**
+	 *所属公司编号
+	 */
+        @ApiModelProperty(value = "所属公司编号")
+	private String companyId;
+	/**
+	 *最大测温次数
+	 */
+        @ApiModelProperty(value = "最大测温次数")
+	private Integer times;
+	/**
+	 *预警温度
+	 */
+        @ApiModelProperty(value = "预警温度")
+	private BigDecimal temperature;
+	/**
+	 *姓名
+	 */
+        @ApiModelProperty(value = "姓名")
+	private String name;
+	/**
+	 *手机号
+	 */
+        @ApiModelProperty(value = "手机号")
+	private String phone;
+	/**
+	 *微信openId
+	 */
+        @ApiModelProperty(value = "微信openId")
+	private String openId;
+	/**
+	 *备注
+	 */
+        @ApiModelProperty(value = "备注")
+	private String remark;
+	/**
+	 *是否删除
+	 */
+        @ApiModelProperty(value = "是否删除")
+	private Boolean delFlag;
+	/**
+	 *创建人
+	 */
+        @ApiModelProperty(value = "创建人")
+	private String createBy;
+	/**
+	 *创建时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**
+	 *更新人
+	 */
+        @ApiModelProperty(value = "更新人")
+	private String updateBy;
+	/**
+	 *更新时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "更新时间")
+	private Date updateTime;
+}

common/src/main/java/com/jpsoft/smart/modules/base/service/WarningPusherService.java

@@ -0,0 +1,17 @@
+package com.jpsoft.smart.modules.base.service;
+
+import java.util.List;
+import java.util.Map;
+import com.jpsoft.smart.modules.base.entity.WarningPusher;
+import com.github.pagehelper.Page;
+import com.jpsoft.smart.modules.common.dto.Sort;
+
+public interface WarningPusherService {
+	WarningPusher get(String id);
+	boolean exist(String id);
+	int insert(WarningPusher model);
+	int update(WarningPusher model);
+	int delete(String id);
+	List<WarningPusher> list();
+	Page<WarningPusher> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/smart/modules/base/service/impl/WarningPusherServiceImpl.java

@@ -0,0 +1,70 @@
+package com.jpsoft.smart.modules.base.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.jpsoft.smart.modules.base.dao.WarningPusherDAO;
+import com.jpsoft.smart.modules.base.entity.WarningPusher;
+import com.jpsoft.smart.modules.base.service.WarningPusherService;
+import com.github.pagehelper.Page;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="warningPusherService")
+public class WarningPusherServiceImpl implements WarningPusherService {
+	@Resource(name="warningPusherDAO")
+	private WarningPusherDAO warningPusherDAO;
+
+	@Override
+	public WarningPusher get(String id) {
+		// TODO Auto-generated method stub
+		return warningPusherDAO.get(id);
+	}
+
+	@Override
+	public int insert(WarningPusher model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return warningPusherDAO.insert(model);
+	}
+
+	@Override
+	public int update(WarningPusher model) {
+		// TODO Auto-generated method stub
+		return warningPusherDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return warningPusherDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = warningPusherDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<WarningPusher> list() {
+		// TODO Auto-generated method stub
+		return warningPusherDAO.list();
+	}
+		
+	@Override
+	public Page<WarningPusher> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<WarningPusher> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            warningPusherDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

common/src/main/resources/mapper/base/WarningPusher.xml

@@ -0,0 +1,117 @@
+<?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">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.smart.modules.base.dao.WarningPusherDAO">
+    <resultMap id="WarningPusherMap" type="com.jpsoft.smart.modules.base.entity.WarningPusher">
+        <id property="id" column="id_"/>
+        <result property="companyId" column="company_id"/>
+        <result property="times" column="times_"/>
+        <result property="temperature" column="temperature_"/>
+        <result property="name" column="name_"/>
+        <result property="phone" column="phone_"/>
+        <result property="openId" column="open_id"/>
+        <result property="remark" column="remark_"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+    <insert id="insert" parameterType="com.jpsoft.smart.modules.base.entity.WarningPusher">
+        <!--
+        <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+            select sys_guid() from dual
+        </selectKey>
+        -->
+        <![CDATA[
+		insert into base_warning_pusher
+	    (id_,company_id,times_,temperature_,name_,phone_,open_id,remark_,del_flag,create_by,create_time,update_by,update_time)
+		values
+		(
+            #{id,jdbcType=VARCHAR}
+            ,#{companyId,jdbcType=VARCHAR}
+            ,#{times,jdbcType= NUMERIC }
+            ,#{temperature,jdbcType= NUMERIC }
+            ,#{name,jdbcType=VARCHAR}
+            ,#{phone,jdbcType=VARCHAR}
+            ,#{openId,jdbcType=VARCHAR}
+            ,#{remark,jdbcType=VARCHAR}
+            ,#{delFlag,jdbcType= NUMERIC }
+            ,#{createBy,jdbcType=VARCHAR}
+            ,#{createTime,jdbcType= TIMESTAMP }
+            ,#{updateBy,jdbcType=VARCHAR}
+            ,#{updateTime,jdbcType= TIMESTAMP }
+		)
+	]]>
+    </insert>
+    <delete id="delete" parameterType="string">
+        delete from base_warning_pusher where id_=#{id,jdbcType=VARCHAR}
+    </delete>
+    <update id="update" parameterType="com.jpsoft.smart.modules.base.entity.WarningPusher">
+        update base_warning_pusher
+        <set>
+            <if test="companyId!=null">
+                company_id=#{companyId,jdbcType=VARCHAR},
+            </if>
+            <if test="times!=null">
+                times_=#{times,jdbcType= NUMERIC },
+            </if>
+            <if test="temperature!=null">
+                temperature_=#{temperature,jdbcType= NUMERIC },
+            </if>
+            <if test="name!=null">
+                name_=#{name,jdbcType=VARCHAR},
+            </if>
+            <if test="phone!=null">
+                phone_=#{phone,jdbcType=VARCHAR},
+            </if>
+            <if test="openId!=null">
+                open_id=#{openId,jdbcType=VARCHAR},
+            </if>
+            <if test="remark!=null">
+                remark_=#{remark,jdbcType=VARCHAR},
+            </if>
+            <if test="delFlag!=null">
+                del_flag=#{delFlag,jdbcType= NUMERIC },
+            </if>
+            <if test="createBy!=null">
+                create_by=#{createBy,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime!=null">
+                create_time=#{createTime,jdbcType= TIMESTAMP },
+            </if>
+            <if test="updateBy!=null">
+                update_by=#{updateBy,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime!=null">
+                update_time=#{updateTime,jdbcType= TIMESTAMP },
+            </if>
+        </set>
+        where id_=#{id}
+    </update>
+    <select id="get" parameterType="string" resultMap="WarningPusherMap">
+        select
+        id_,company_id,times_,temperature_,name_,phone_,open_id,remark_,del_flag,create_by,create_time,update_by,update_time
+        from base_warning_pusher where id_=#{0}
+    </select>
+    <select id="exist" parameterType="string" resultType="int">
+        select count(*) from base_warning_pusher where id_=#{0}
+    </select>
+    <select id="list" resultMap="WarningPusherMap">
+        select * from base_warning_pusher
+    </select>
+    <select id="search" parameterType="hashmap" resultMap="WarningPusherMap">
+        <![CDATA[
+			select * from base_warning_pusher
+		]]>
+        <where>
+            <if test="searchParams.id != null">
+                and ID_ like #{searchParams.id}
+            </if>
+        </where>
+        <foreach item="sort" collection="sortList" open="order by" separator=",">
+            ${sort.name} ${sort.order}
+        </foreach>
+    </select>
+</mapper>

web/src/main/java/com/jpsoft/smart/modules/base/controller/WarningPusherController.java

@@ -0,0 +1,225 @@
+package com.jpsoft.smart.modules.base.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.smart.modules.common.utils.PojoUtils;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.common.dto.MessageResult;
+import com.jpsoft.smart.modules.base.entity.WarningPusher;
+import com.jpsoft.smart.modules.base.service.WarningPusherService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/warningPusher")
+@Api(description = "warningPusher")
+public class WarningPusherController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private WarningPusherService warningPusherService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<WarningPusher> create(){
+        MessageResult<WarningPusher> msgResult = new MessageResult<>();
+
+        WarningPusher warningPusher = new WarningPusher();
+
+        msgResult.setData(warningPusher);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<WarningPusher> add(@RequestBody WarningPusher warningPusher,@RequestAttribute String subject){
+        MessageResult<WarningPusher> msgResult = new MessageResult<>();
+
+        try {
+            warningPusher.setId(UUID.randomUUID().toString());
+            warningPusher.setDelFlag(false);
+            warningPusher.setCreateBy(subject);
+            warningPusher.setCreateTime(new Date());
+            
+            int affectCount = warningPusherService.insert(warningPusher);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(warningPusher);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<WarningPusher> edit(@PathVariable("id") String id){
+        MessageResult<WarningPusher> msgResult = new MessageResult<>();
+
+        try {
+            WarningPusher warningPusher = warningPusherService.get(id);
+
+            if (warningPusher != null) {
+                msgResult.setResult(true);
+                msgResult.setData(warningPusher);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<WarningPusher> update(@RequestBody WarningPusher warningPusher,@RequestAttribute String subject){
+        MessageResult<WarningPusher> msgResult = new MessageResult<>();
+
+        try {
+            warningPusher.setUpdateBy(subject);
+            warningPusher.setUpdateTime(new Date());
+            
+            int affectCount = warningPusherService.update(warningPusher);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(warningPusher);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+	@ApiOperation(value="删除")
+    @PostMapping("delete/{id}")
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            WarningPusher warningPusher = warningPusherService.get(id);
+            warningPusher.setDelFlag(true);
+            warningPusher.setUpdateBy(subject);
+            warningPusher.setUpdateTime(new Date());
+
+            int affectCount = warningPusherService.update(warningPusher);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                WarningPusher warningPusher = warningPusherService.get(id);
+                warningPusher.setDelFlag(true);
+                warningPusher.setUpdateBy(subject);
+                warningPusher.setUpdateTime(new Date());
+
+                affectCount += warningPusherService.update(warningPusher);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String id,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        if (StringUtils.isNotEmpty(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+        Page<WarningPusher> page = warningPusherService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}