Merge branch '20210223' of http://114.135.61.188:53000/UIMS/Code into 20210223

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

@@ -153,7 +153,7 @@ public class MonitorDataReportController {
 
 
     @RequestMapping(value = "getDeviceWaterSupplie",method = RequestMethod.GET)
-    @ApiOperation(value = "概览首页——近30天水量")
+    @ApiOperation(value = "概览首页——近15天水量")
     public AjaxMessage<List<DeviceWaterSupply>> getDeviceWaterSupplie(){
         return new AjaxMessage<>(ResultStatus.OK,monitorDataReportService.deviceWaterSupplie());
     }

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

@@ -33,7 +33,7 @@ public class SecSupplyController {
     private MonitorDataReportService monitorDataReportService;
 
 
-    @ApiOperation(value = "二供概览首页——近30天供水量",notes = "sceneType 1为水源2水厂3泵站")
+    @ApiOperation(value = "二供概览首页——近15天供水量",notes = "sceneType 1为水源2水厂3泵站")
     @RequestMapping(value = "/selectAmountByTypeName", method = RequestMethod.GET)
     @ResponseBody
     public AjaxMessage<List<AmountDayThirtyDto>> findAmountDayThirty(@ApiParam(value = "一级场景类型", required = true) @RequestParam Integer sceneType) {

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

@@ -1,9 +1,6 @@
 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.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -117,10 +114,12 @@ public class AlarmSetting implements Serializable {
      * 报警设置开始时间
      */
     @ApiModelProperty(value = "报警设置开始时间")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String startTime;
     /**
      * 报警设置结束时间
      */
     @ApiModelProperty(value = "报警设置结束时间")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String endTime;
 }

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

@@ -50,7 +50,7 @@ public class SecSupplyService {
         Calendar begin = Calendar.getInstance();// 得到一个Calendar的实例
         begin.setTime(new Date()); // 设置时间为当前时间
         List<AmountDayThirtyDto> listC = new ArrayList<>();
-        for (int i = 1; i <= 30; i++) {
+        for (int i = 1; i <= 15; i++) {
             begin.add(Calendar.DATE, -1);// 日期加1
             Date d = new Date(begin.getTimeInMillis());
             DateFormat df = new SimpleDateFormat("yyyy-MM-dd");

sms_water/src/main/java/com/huaxu/service/impl/MonitorDataReportServiceImpl.java

@@ -736,7 +736,7 @@ public class MonitorDataReportServiceImpl implements MonitorDataReportService {
         deviceWaterSupplies.add(0, deviceWaterSupplyDay);
 
 
-        for (int i = 0; i < 30; i++) {
+        for (int i = 0; i < 15; i++) {
             LocalDate newLocalDate = localDate.plusDays(-i);
             if (i == deviceWaterSupplies.size()
                     || !newLocalDate.isEqual(LocalDate.of(deviceWaterSupplies.get(i).getYear(),

sms_water/src/main/resources/mapper/MonitorDataReportMapper.xml

@@ -925,7 +925,7 @@
 
         where  dp.`STATUS`=1 and st.SCENE_TYPE_NAME = '水厂' and s.ENABLE_STATE = 1
         and dp.PARM_TYPE = 3   and dp.TENANT_ID=#{tenantId}
-        and r.COLLECT_DATE >= DATE_SUB(CURDATE(),INTERVAL 29 day)
+        and r.COLLECT_DATE >= DATE_SUB(CURDATE(),INTERVAL 14 day)
         <if test="userType!=null and userType!=-999 and userType!=-9999 and  programItems != null and programItems.size() > 0">
             <if test="permissonType == 5 or permissonType == 2">
                 and ( s.DEPT_ORG_ID in

sms_water/src/main/resources/mapper/MonthReportMapper.xml

@@ -353,7 +353,7 @@
         sum(a.SUM_VALUE) as "sumValue"
         FROM  sms_month_report a
         INNER JOIN sms_device_parm b on a.DEVICE_ID=b.DEVICE_ID and a.ATTRIBUTE_ID=b.ATTRIBUTE_ID and b.`STATUS`=1
-        where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(a.COLLECT_DATE)
+        where DATE_SUB(CURDATE(), INTERVAL 15 DAY) <= date(a.COLLECT_DATE)
         and b.PARM_TYPE=3 and b.PARENT_SCENE_ID in
         <foreach collection="monthReport.parentSceneLists" item="dramaId" open="(" close=")" separator=",">
             #{dramaId.id}