修改根据时间查询仓库数据的返回值；修改预警返回值格式；修改报警记录的添加格式；增加每月仓库报表

src/main/java/com/example/tdl/common/WarehouseExcel.java

@@ -36,6 +36,9 @@ public class WarehouseExcel {
 //    private List<DownloadWarehouseVo> downloadWarehouseVos;
 
 
+    public WarehouseExcel() {
+    }
+
     public WarehouseExcel(String fileName, String userName, ResultWarehouseNoAndTDLSNAndTimeVo resultWarehouseNoAndTDLSNAndTimeVo, HttpServletRequest request, I18nController i18n) {
         this.fileName = fileName;
         this.userName = userName;

src/main/java/com/example/tdl/domain/vo/AddAlarmVo.java

@@ -14,7 +14,7 @@ public class AddAlarmVo {
 
     private Float tilt;//倾斜度
 
-    private String shock;//震度
+    private Float shock;//震度
 
     private String remark;
 
@@ -68,11 +68,11 @@ public class AddAlarmVo {
         this.tilt = tilt;
     }
 
-    public String getShock() {
+    public Float getShock() {
         return shock;
     }
 
-    public void setShock(String shock) {
+    public void setShock(Float shock) {
         this.shock = shock;
     }
 

src/main/java/com/example/tdl/domain/vo/AddBoschAlarmVo.java

@@ -24,9 +24,9 @@ public class AddBoschAlarmVo {
 
     private Float tilt;//倾斜度
 
-    private Integer shockUpper;//震度
+    private Float shockUpper;//震度
 
-    private Integer shock;//震度
+    private Float shock;//震度
 
     private String remark;
 
@@ -120,19 +120,19 @@ public class AddBoschAlarmVo {
         this.tilt = tilt;
     }
 
-    public Integer getShockUpper() {
+    public Float getShockUpper() {
         return shockUpper;
     }
 
-    public void setShockUpper(Integer shockUpper) {
+    public void setShockUpper(Float shockUpper) {
         this.shockUpper = shockUpper;
     }
 
-    public Integer getShock() {
+    public Float getShock() {
         return shock;
     }
 
-    public void setShock(Integer shock) {
+    public void setShock(Float shock) {
         this.shock = shock;
     }
 

src/main/java/com/example/tdl/domain/vo/AlarmNoVo.java

+package com.example.tdl.domain.vo;
+
+public class AlarmNoVo {
+
+    private Integer  mode;
+
+    private String transportationNo;
+
+    private String warehouseNo;
+
+    private String warehouseName;
+
+    public Integer getMode() {
+        return mode;
+    }
+
+    public void setMode(Integer mode) {
+        this.mode = mode;
+    }
+
+    public String getTransportationNo() {
+        return transportationNo;
+    }
+
+    public void setTransportationNo(String transportationNo) {
+        this.transportationNo = transportationNo;
+    }
+
+    public String getWarehouseNo() {
+        return warehouseNo;
+    }
+
+    public void setWarehouseNo(String warehouseNo) {
+        this.warehouseNo = warehouseNo;
+    }
+
+    public String getWarehouseName() {
+        return warehouseName;
+    }
+
+    public void setWarehouseName(String warehouseName) {
+        this.warehouseName = warehouseName;
+    }
+}

src/main/java/com/example/tdl/domain/vo/ResultAlarmVo.java

@@ -14,7 +14,7 @@ public class ResultAlarmVo{
 
     private Float tilt;//倾斜度
 
-    private String shock;//震度
+    private Float shock;//震度
 
     private String remark;
 
@@ -66,11 +66,11 @@ public class ResultAlarmVo{
         this.tilt = tilt;
     }
 
-    public String getShock() {
+    public Float getShock() {
         return shock;
     }
 
-    public void setShock(String shock) {
+    public void setShock(Float shock) {
         this.shock = shock;
     }
 

src/main/java/com/example/tdl/domain/vo/ResultBoschAlarmVo.java

@@ -24,9 +24,9 @@ public class ResultBoschAlarmVo {
 
     private Double tilt;//倾斜度
 
-    private Integer shockUpper;//震度
+    private Double shockUpper;//震度
 
-    private Integer shock;//震度
+    private Double shock;//震度
 
     private String remark;
 
@@ -118,19 +118,19 @@ public class ResultBoschAlarmVo {
         this.tilt = tilt;
     }
 
-    public Integer getShockUpper() {
+    public Double getShockUpper() {
         return shockUpper;
     }
 
-    public void setShockUpper(Integer shockUpper) {
+    public void setShockUpper(Double shockUpper) {
         this.shockUpper = shockUpper;
     }
 
-    public Integer getShock() {
+    public Double getShock() {
         return shock;
     }
 
-    public void setShock(Integer shock) {
+    public void setShock(Double shock) {
         this.shock = shock;
     }
 

src/main/java/com/example/tdl/domain/vo/UpdateAlarmVo.java

@@ -14,7 +14,7 @@ public class UpdateAlarmVo {
 
     private Float tilt;//倾斜度
 
-    private String shock;//震度
+    private Float shock;//震度
 
     private String remark;
 
@@ -78,11 +78,11 @@ public class UpdateAlarmVo {
         this.tilt = tilt;
     }
 
-    public String getShock() {
+    public Float getShock() {
         return shock;
     }
 
-    public void setShock(String shock) {
+    public void setShock(Float shock) {
         this.shock = shock;
     }
 

src/main/java/com/example/tdl/domain/vo/UpdateBoschAlarmVo.java

@@ -24,9 +24,9 @@ public class UpdateBoschAlarmVo {
 
     private Float tilt;//倾斜度
 
-    private Integer shockUpper;//震度
+    private Float shockUpper;//震度
 
-    private Integer shock;//震度
+    private Float shock;//震度
 
     private String remark;
 
@@ -122,19 +122,19 @@ public class UpdateBoschAlarmVo {
         this.tilt = tilt;
     }
 
-    public Integer getShockUpper() {
+    public Float getShockUpper() {
         return shockUpper;
     }
 
-    public void setShockUpper(Integer shockUpper) {
+    public void setShockUpper(Float shockUpper) {
         this.shockUpper = shockUpper;
     }
 
-    public Integer getShock() {
+    public Float getShock() {
         return shock;
     }
 
-    public void setShock(Integer shock) {
+    public void setShock(Float shock) {
         this.shock = shock;
     }
 

src/main/java/com/example/tdl/domain/vo/WarehouseAlarmLog.java

@@ -22,10 +22,12 @@ public class WarehouseAlarmLog {
 
     private String  classify;
 
+    private Integer delState;
+
     public WarehouseAlarmLog() {
     }
 
-    public WarehouseAlarmLog(String warehouseNo, String gSN, String gType, String TDLSN, String description, Float data, Long alarmTime, String desp, Integer alarmNo,String classify) {
+    public WarehouseAlarmLog(String warehouseNo, String gSN, String gType, String TDLSN, String description, Float data, Long alarmTime, String desp, Integer alarmNo,String classify,Integer delState) {
         this.warehouseNo = warehouseNo;
         this.gSN = gSN;
         this.gType = gType;
@@ -36,6 +38,7 @@ public class WarehouseAlarmLog {
         this.desp = desp;
         this.alarmNo = alarmNo;
         this.classify = classify;
+        this.delState = delState;
     }
 
     public String getWarehouseNo() {
@@ -117,4 +120,12 @@ public class WarehouseAlarmLog {
     public void setClassify(String classify) {
         this.classify = classify;
     }
+
+    public Integer getDelState() {
+        return delState;
+    }
+
+    public void setDelState(Integer delState) {
+        this.delState = delState;
+    }
 }

src/main/java/com/example/tdl/mapper/GatewayMapper.java

@@ -41,4 +41,6 @@ public interface GatewayMapper {
 
      Integer  getModeByGateway(@Param("SN") String SN,@Param("type") String type);
 
+     AlarmNoVo  getByGateway(@Param("SN") String SN,@Param("type") String type);
+
 }

src/main/java/com/example/tdl/mapper/TDLLogMapper.java

@@ -31,4 +31,6 @@ public interface TDLLogMapper {
 
     List<ResultWarehouseNoAndTDLSNAndTimeVo> getByWarehouseNoAndTime(DownloadForWarehouseVo downloadForWarehouseVo);
 
+    List<ResultWarehouseNoAndTDLSNAndTimeVo> getByWarehouseNo(String warehouseNo);
+
 }

src/main/java/com/example/tdl/mapper/WarehouseAlarmLogMapper.java

@@ -22,5 +22,5 @@ public interface WarehouseAlarmLogMapper {
 
     Integer  getAlarmCount(@Param("time")String  time, @Param("companyNo")String  companyNo);
 
-
+    Long  getLastProcessedAlarm(String warehouseNo);
 }

src/main/java/com/example/tdl/mapper/WarehouseMapper.java

@@ -59,6 +59,6 @@ public interface WarehouseMapper {
 
     ResultWarehouseDetailsVo getDetailsBywarehouseNo(String warehouseNo);
 
-
+    List<ResultUserVo> getUserByWarehouse(String warehouseNo);
 
 }

src/main/java/com/example/tdl/service/GatewayService.java

@@ -80,4 +80,7 @@ public class GatewayService {
     public Integer  getModeByGateway(String SN,String type){
          return  gatewayMapper.getModeByGateway(SN,type);
     }
+    public AlarmNoVo  getByGateway(String SN,String type){
+         return  gatewayMapper.getByGateway(SN,type);
+    }
 }

src/main/java/com/example/tdl/service/TDLLogService.java

@@ -57,4 +57,8 @@ public class TDLLogService {
     public List<ResultWarehouseNoAndTDLSNAndTimeVo> getByWarehouseNoAndTime(DownloadForWarehouseVo downloadForWarehouseVo){
         return tdlLogMapper.getByWarehouseNoAndTime(downloadForWarehouseVo);
     }
+
+    public List<ResultWarehouseNoAndTDLSNAndTimeVo> getByWarehouseNo(String warehouseNo){
+        return tdlLogMapper.getByWarehouseNo(warehouseNo);
+    }
 }

src/main/java/com/example/tdl/service/WarehouseAlarmLogService.java

@@ -36,4 +36,8 @@ public class WarehouseAlarmLogService {
     public Integer getAlarmCount(String  time,String  companyNo){
         return  warehouseAlarmLogMapper.getAlarmCount(time,companyNo);
     }
+
+    public Long  getLastProcessedAlarm(String warehouseNo){
+        return  warehouseAlarmLogMapper.getLastProcessedAlarm(warehouseNo);
+    }
 }

src/main/java/com/example/tdl/service/WarehouseService.java

@@ -109,4 +109,8 @@ public class WarehouseService {
     public   ResultWarehouseDetailsVo getDetailsBywarehouseNo(String warehouseNo){
         return  warehouseMapper.getDetailsBywarehouseNo(warehouseNo);
     }
+
+    public List<ResultUserVo> getUserByWarehouse(String warehouseNo){
+         return  warehouseMapper.getUserByWarehouse(warehouseNo);
+    }
 }

src/main/java/com/example/tdl/util/HttpRequester.java

@@ -79,7 +79,7 @@ public class HttpRequester {
             logger.info(url+"url");
             URLConnection connection = realUrl.openConnection();
 
-            connection.setRequestProperty("accept", "*/*");
+            connection.setRequestProperty("Accept", "*/*");
             connection.setRequestProperty("connection", "Keep-Alive");
             connection.setRequestProperty("Content-Type", "application/json; charset=utf-8");
             connection.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
@@ -156,5 +156,8 @@ public class HttpRequester {
         return result.toString();
     }
 
+
+
+
 }
 

src/main/java/com/example/tdl/util/MailUtil.java

 package com.example.tdl.util;
 
 
+import javax.activation.DataHandler;
+import javax.activation.FileDataSource;
+import javax.mail.Message;
+import javax.mail.MessagingException;
 import javax.mail.Session;
 import javax.mail.Transport;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
+import javax.mail.internet.*;
 import javax.mail.internet.MimeMessage.RecipientType;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Properties;
 
 public class MailUtil {
 
+	//发件人地址
+	public static String senderAddress = "postmaster@witium.com";
+	//发件人账户名
+	public static String senderAccount = "postmaster@witium.com";
+	//发件人账户密码
+	public static String senderPassword = "dJZU4LXZtpRc1Ybz";
+
 	public static void sendMail(List<String> toAddressStr, String subject, String text) throws Exception{
 
 		//设置发送邮件需要的属性
@@ -31,7 +42,7 @@ public class MailUtil {
 		//创建一封邮件
 		MimeMessage mimeMessage = new MimeMessage(session);
 		//设置发送地址
-		InternetAddress fromAddress = new InternetAddress("postmaster@witium.com");
+		InternetAddress fromAddress = new InternetAddress(senderAddress);
 		mimeMessage.setFrom(fromAddress);
 		//设置接收地址(多个)
 		InternetAddress[] address = new InternetAddress[toAddressStr.size()];
@@ -49,7 +60,7 @@ public class MailUtil {
 		//发送:坐火箭
 		Transport transport = session.getTransport("smtp");
 
-		transport.connect("postmaster@witium.com", "dJZU4LXZtpRc1Ybz");
+		transport.connect(senderAccount, senderPassword);
 		//第一个参数：邮件
 		//第二个参数：接收地址
 		transport.sendMessage(mimeMessage, mimeMessage.getAllRecipients());
@@ -60,4 +71,93 @@ public class MailUtil {
 	}
 
 
+	public static void sendAttachment(List<String> toAddressStr, String subject, String text,String  html) throws Exception {
+		Properties props = new Properties();
+		//设置用户的认证方式
+		props.setProperty("mail.smtp.auth", "true");
+		//设置传输协议
+		props.setProperty("mail.transport.protocol", "smtp");
+		//设置发件人的SMTP服务器地址
+		props.setProperty("mail.smtp.host", "smtp.163.com");
+		//2、创建定义整个应用程序所需的环境信息的 Session 对象
+		Session session = Session.getInstance(props);
+		//设置调试信息在控制台打印出来
+		session.setDebug(true);
+		//3、创建邮件的实例对象
+		Message msg = getMimeMessage(session,toAddressStr,subject,text,html);
+		//4、根据session对象获取邮件传输对象Transport
+		Transport transport = session.getTransport();
+		//设置发件人的账户名和密码
+		transport.connect(senderAccount, senderPassword);
+		//发送邮件，并发送到所有收件人地址，message.getAllRecipients() 获取到的是在创建邮件对象时添加的所有收件人, 抄送人, 密送人
+		transport.sendMessage(msg,msg.getAllRecipients());
+
+		//5、关闭邮件连接
+		transport.close();
+	}
+
+	public static MimeMessage getMimeMessage(Session session,List<String> toAddressStr, String subject, String addr,String html) throws Exception{
+		//1.创建一封邮件的实例对象
+		MimeMessage msg = new MimeMessage(session);
+		//2.设置发件人地址
+		msg.setFrom(new InternetAddress(senderAddress));
+		/**
+		 * 3.设置收件人地址（可以增加多个收件人、抄送、密送），即下面这一行代码书写多行
+		 * MimeMessage.RecipientType.TO:发送
+		 * MimeMessage.RecipientType.CC：抄送
+		 * MimeMessage.RecipientType.BCC：密送
+		 */
+		InternetAddress[] address = new InternetAddress[toAddressStr.size()];
+		for(int i = 0;i<toAddressStr.size();i++){
+			address[i] = new InternetAddress(toAddressStr.get(i)) ;
+		}
+		msg.setRecipients(RecipientType.TO, address);
+		msg.setSubject(subject,"UTF-8");
+
+		//下面是设置邮件正文
+		//msg.setContent("简单的纯文本邮件！", "text/html;charset=UTF-8");
+
+		// 5. 创建图片"节点"
+		MimeBodyPart image = new MimeBodyPart();
+		// 读取本地文件
+		DataHandler dh = new DataHandler(new FileDataSource("src\\mailTestPic.png"));
+		// 将图片数据添加到"节点"
+		image.setDataHandler(dh);
+		// 为"节点"设置一个唯一编号（在文本"节点"将引用该ID）
+		image.setContentID("mailTestPic");
+
+		// 6. 创建文本"节点"
+		MimeBodyPart text = new MimeBodyPart();
+		// 这里添加图片的方式是将整个图片包含到邮件内容中, 实际上也可以以 http 链接的形式添加网络图片
+
+
+		text.setContent(html, "text/html;charset=UTF-8");
+
+
+		// 9. 创建附件"节点"
+		MimeBodyPart attachment = new MimeBodyPart();
+		// 读取本地文件
+		DataHandler dh2 = new DataHandler(new FileDataSource(addr));
+		// 将附件数据添加到"节点"
+		attachment.setDataHandler(dh2);
+		// 设置附件的文件名（需要编码）
+		attachment.setFileName(MimeUtility.encodeText(dh2.getName()));
+
+		// 10. 设置（文本+图片）和 附件 的关系（合成一个大的混合"节点" / Multipart ）
+		MimeMultipart mm = new MimeMultipart();
+		mm.addBodyPart(text);
+		mm.addBodyPart(attachment); // 如果有多个附件，可以创建多个多次添加
+		mm.setSubType("related");  // 混合关系
+
+		// 11. 设置整个邮件的关系（将最终的混合"节点"作为邮件的内容添加到邮件对象）
+		msg.setContent(mm);
+		//设置邮件的发送时间,默认立即发送
+		msg.setSentDate(new Date());
+
+		return msg;
+	}
+
+
+
+
 }

src/main/java/com/example/tdl/util/MapUtils.java

 package com.example.tdl.util;
 
+import java.net.URLDecoder;
 import java.text.DecimalFormat;
 
 public class MapUtils {
@@ -79,7 +80,7 @@ public class MapUtils {
            double  d =  (double)37/44300;
            System.out.println("d:" + df.format(d));
             double p=1013.25* Math.pow((1 - Double.valueOf(df.format(d))),5.256);
-             System.out.println("pressure: "+ p);
+             System.out.println(URLDecoder.decode("%5C"));
 
 
         }

src/main/java/com/example/tdl/web/WarehouseController.java

@@ -1187,7 +1187,7 @@ public class WarehouseController {
             @ApiImplicitParam(paramType="header", name = "AccountLanguage", value = "language", required = true, dataType = "String"),
     })
     @RequestMapping(value = "/getDataByTime",method = RequestMethod.POST)
-    public String getDataByTime( HttpServletRequest request, @RequestBody DownloadForWarehouseVo downloadForWarehouseVo) {
+    public Object getDataByTime( HttpServletRequest request, @RequestBody DownloadForWarehouseVo downloadForWarehouseVo) {
         String token = request.getHeader("Account_token");
         String datum = tokenRedisService.get("TOKEN_" +token);
         UserRedisVo user = gson.fromJson(datum,UserRedisVo.class);
@@ -1286,7 +1286,7 @@ public class WarehouseController {
             warehouseGatewayDateVo.setWarehouseDataVos(warehouseDataVos);
             warehouseGatewayDateVoList.add(warehouseGatewayDateVo);
         }
-        return gson.toJson(warehouseGatewayDateVoList);
+        return warehouseGatewayDateVoList;
     }
 
     //生成仓库编号

src/main/resources/application.properties

@@ -27,7 +27,7 @@ spring.messages.cache-seconds= 3600
 spring.messages.encoding=UTF-8
 
 
-tdl.redis.host=172.16.1.24
+tdl.redis.host=172.16.1.14
 tdl.redis.index=0
 tdl.redis.port=6379
 tdl.redis.password=
@@ -76,6 +76,8 @@ tdl.core.delete =http://172.16.24:8079/witium/delMount
 mqtt.userName = ugen
 mqtt.password = ugen
 
+alarm.interval.time = 14400000
+
 
 
 

src/main/resources/mapper/BoschAlarmMapper.xml

@@ -31,8 +31,8 @@
         #{humidityLower,jdbcType=FLOAT},
         #{tiltUpper,jdbcType=FLOAT},
         #{tilt,jdbcType=FLOAT},
-        #{shockUpper,jdbcType=INTEGER},
-        #{shock,jdbcType=INTEGER},
+        #{shockUpper,jdbcType=FLOAT},
+        #{shock,jdbcType=FLOAT},
         (SELECT id from company where companyNo=#{companyNo,jdbcType=VARCHAR}),
         #{remark,jdbcType=VARCHAR}
         )
@@ -52,8 +52,8 @@
         humidityLower =#{humidityLower,jdbcType=FLOAT},
         tiltUpper = #{tiltUpper,jdbcType=FLOAT},
         tilt = #{tilt,jdbcType=FLOAT},
-        shockUpper = #{shockUpper,jdbcType=INTEGER},
-        shock = #{shock,jdbcType=INTEGER},
+        shockUpper = #{shockUpper,jdbcType=FLOAT},
+        shock = #{shock,jdbcType=FLOAT},
         remark=#{remark,jdbcType=VARCHAR}
         WHERE alarmType=#{oldAlarmType,jdbcType=VARCHAR}
         AND company_id=(SELECT id from company where companyNo=#{companyNo,jdbcType=VARCHAR})

src/main/resources/mapper/GatewayMapper.xml

@@ -138,6 +138,13 @@
            SELECT useScene  from gateway where SN=#{SN,jdbcType=VARCHAR} and  type=#{type,jdbcType=VARCHAR}
         </select>
 
+    <select id="getByGateway" resultType="com.example.tdl.domain.vo.AlarmNoVo"  parameterType="String">
+            select DISTINCT  g.useScene  mode, transportationNo, warehouseNo from gateway g INNER JOIN tdldevice t on  t.gateway_id = g.id
+            LEFT JOIN circuit c on  c.id = t.circuit_id
+            LEFT JOIN warehouse w on w.id = t.warehouse_id
+            where g.SN=#{SN,jdbcType=VARCHAR} and  g.type=#{type,jdbcType=VARCHAR}
+        </select>
+
 
     <!--    <insert id="addGateway" parameterType="com.example.tdl.domain.vo.AddGatewayVo">
         INSERT into gateway VALUES (

src/main/resources/mapper/TDLLogMapper.xml

@@ -86,4 +86,12 @@
         AND TDLSN IS NOT NULL
         AND endTime is NULL
     </select>
+
+    <select id="getByWarehouseNo" parameterType="String" resultType="com.example.tdl.domain.vo.ResultWarehouseNoAndTDLSNAndTimeVo">
+        SELECT TDLSN,gatewaySN,gatewayType,warehouseNo,alarmType,temMax,temMin,humidityMax,humidityMin,t.createTime,t.endTime
+        from tdl_gateway_log t INNER JOIN alarm a ON t.alarm_id=a.id
+        where warehouseNo=#{warehouseNo,jdbcType=VARCHAR}
+        AND TDLSN IS NOT NULL
+        AND endTime is NULL
+    </select>
 </mapper>
\ No newline at end of file

src/main/resources/mapper/WarehouseAlarmLogMapper.xml

@@ -13,7 +13,8 @@
         #{alarmTime,jdbcType=BIGINT},
         #{desp,jdbcType=VARCHAR},
         #{alarmNo,jdbcType=VARCHAR},
-        0
+        #{classify,jdbcType=VARCHAR},
+        #{delState,jdbcType=INTEGER}
         )
     </insert>
 
@@ -61,4 +62,9 @@
         and DATE_SUB(CURDATE(), INTERVAL #{time,jdbcType=VARCHAR} DAY) &lt;= date(FROM_UNIXTIME(alarmTime/1000,'%Y-%m-%d %H:%i:%s'))
     </select>
 
+    <select id="getLastProcessedAlarm" parameterType="String" resultType="java.lang.Long">
+        select alarmTime from  warehouse_alarmlog where warehouseNo =#{warehouseNo,jdbcType=VARCHAR} and delState =1 order by alarmTime desc  limit 1
+    </select>
+
+
 </mapper>
\ No newline at end of file

src/main/resources/mapper/WarehouseMapper.xml

@@ -301,4 +301,12 @@
         and ct.id = w.city_id
         and w.warehouseNo=#{warehouseNo,jdbcType=VARCHAR}
     </select>
+    
+    <select id="getUserByWarehouse" resultType="com.example.tdl.domain.vo.ResultUserVo" parameterType="String">
+       select  userNumber,userName,u.email,u.phone
+        from  warehouse w,warehouse_and_user wu,`user` u
+        where w.id = wu.warehouse_id
+        and u.id = wu.user_id
+        and w.warehouseNo=#{warehouseNo,jdbcType=VARCHAR}
+    </select>
 </mapper>
\ No newline at end of file