Merge remote-tracking branch 'origin/master'

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

@@ -172,7 +172,7 @@ public class AlarmDetailsController {
         if(iPage.orders().size() == 0){
             OrderItem orderItem =new OrderItem();
             orderItem.setAsc(false);
-            orderItem.setColumn("t.date_create");
+            orderItem.setColumn("a.ALARM_START_TIME");
             iPage.orders().add(orderItem);
         }
         if(sceneId != null) {
@@ -268,7 +268,7 @@ public class AlarmDetailsController {
         if(iPage.orders().size() == 0){
             OrderItem orderItem =new OrderItem();
             orderItem.setAsc(false);
-            orderItem.setColumn("t.date_create");
+            orderItem.setColumn("a.ALARM_START_TIME");
             iPage.orders().add(orderItem);
         }
         if(sceneId != null) {

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

@@ -51,7 +51,8 @@ public class DeviceController {
             @ApiParam(value = "设备编号/名称") @RequestParam(required = false)  String condition,
             @ApiParam(value = "所属公司") @RequestParam(required = false)  Integer companyOrgId,
             @ApiParam(value = "所属部门") @RequestParam(required = false)  Integer deptOrgId,
-            @ApiParam(value = "所属场景id") @RequestParam(required = false)  Integer sceneId,
+            @ApiParam(value = "所属场景id") @RequestParam(required = false)  Long sceneId,
+            @ApiParam(value = "场景查询范围：1 不查询子级；0 查询子级",  defaultValue = "0") @RequestParam(required = false,defaultValue = "0")  Integer searchType,
             @ApiParam(value = "设备状态") @RequestParam(required = false) Integer enableState,
             @ApiParam(value = "页数,非必传，默认第一页",  defaultValue = "1") @RequestParam(required = false, defaultValue = "1") Integer pageNum,
             @ApiParam(value = "条数，非必传，默认10条",  defaultValue = "10") @RequestParam(required = false, defaultValue = "10") Integer pageSize
@@ -60,7 +61,6 @@ public class DeviceController {
         deviceDto.setCondition(condition);
         deviceDto.setCompanyOrgId(companyOrgId);
         deviceDto.setDeptOrgId(deptOrgId);
-        deviceDto.setSceneId(sceneId);
 
         deviceDto.setEnableState(enableState);
 
@@ -72,7 +72,13 @@ public class DeviceController {
             iPage.orders().add(orderItem);
         }
         if(sceneId != null) {
-            deviceDto.setSceneIds(sceneService.findByParentIdsLike(sceneId.longValue()));
+            if(searchType != null && searchType ==1){
+                List<Long> list = new ArrayList<>();
+                list.add(sceneId);
+                deviceDto.setSceneIds(list);
+            }else{
+                deviceDto.setSceneIds(sceneService.findByParentIdsLike(sceneId.longValue()));
+            }
             if(deviceDto.getSceneIds() == null || deviceDto.getSceneIds().size() == 0){
                 return new AjaxMessage<>(ResultStatus.OK, new Pagination<>(iPage));
             }
@@ -93,17 +99,23 @@ public class DeviceController {
             @ApiParam(value = "设备编号/名称") @RequestParam(required = false)  String condition,
             @ApiParam(value = "所属公司") @RequestParam(required = false)  Integer companyOrgId,
             @ApiParam(value = "所属部门") @RequestParam(required = false)  Integer deptOrgId,
-            @ApiParam(value = "所属场景id") @RequestParam(required = false)  Integer sceneId,
+            @ApiParam(value = "所属场景id") @RequestParam(required = false)  Long sceneId,
+            @ApiParam(value = "场景查询范围：1 不查询子级；0 查询子级",  defaultValue = "0") @RequestParam(required = false,defaultValue = "0")  Integer searchType,
             @ApiParam(value = "设备状态") @RequestParam(required = false) Integer enableState
     ){
         DeviceDto deviceDto = new DeviceDto();
         deviceDto.setCondition(condition);
         deviceDto.setCompanyOrgId(companyOrgId);
         deviceDto.setDeptOrgId(deptOrgId);
-        deviceDto.setSceneId(sceneId);
         deviceDto.setEnableState(enableState);
         if(sceneId != null) {
-            deviceDto.setSceneIds(sceneService.findByParentIdsLike(sceneId.longValue()));
+            if(searchType != null && searchType ==1){
+                List<Long> list = new ArrayList<>();
+                list.add(sceneId);
+                deviceDto.setSceneIds(list);
+            }else{
+                deviceDto.setSceneIds(sceneService.findByParentIdsLike(sceneId.longValue()));
+            }
             if(deviceDto.getSceneIds() == null || deviceDto.getSceneIds().size() == 0){
                 return new AjaxMessage<>(ResultStatus.OK, new ArrayList<>());
             }

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

@@ -79,9 +79,9 @@
             ,concat(ifnull(ast.ALARM_CONDITION,''),ifnull(ast.ALARM_VALUE,''),ifnull(att.unit,'')) as "alermRule"
             ,a.ALARM_END_TIME as "alarmEndTime"
 
-            ,concat(concat(timestampdiff(MINUTE,a.ALARM_START_TIME,ifnull(a.ALARM_END_TIME,now()))   div 3600,'时'),
-						concat(timestampdiff(MINUTE,a.ALARM_START_TIME,ifnull(a.ALARM_END_TIME,now()))   mod 3600 div 60,'分'),
-						concat(timestampdiff(MINUTE,a.ALARM_START_TIME,ifnull(a.ALARM_END_TIME,now()))   mod 60,'秒')) as "duration"
+            ,concat(concat(timestampdiff(SECOND,a.ALARM_START_TIME,ifnull(a.ALARM_END_TIME,now()))   div 3600,'时'),
+						concat(timestampdiff(SECOND,a.ALARM_START_TIME,ifnull(a.ALARM_END_TIME,now()))   mod 3600 div 60,'分'),
+						concat(timestampdiff(SECOND,a.ALARM_START_TIME,ifnull(a.ALARM_END_TIME,now()))   mod 60,'秒')) as "duration"
 
 
     </sql>
@@ -534,7 +534,7 @@
                 and (a.DEPT_ORG_ID is null or a.DEPT_ORG_ID =0)
             </if>
         </if>
-
+        order by a.ALARM_START_TIME
     </select>
 
     <!--通过实体作为筛选条件查询-->
@@ -595,6 +595,7 @@
                 and (a.DEPT_ORG_ID is null or a.DEPT_ORG_ID =0)
             </if>
         </if>
+        order by a.ALARM_START_TIME
     </select>
 
 
@@ -624,7 +625,7 @@
         <if test="deviceCode != null">
             left join sms_device_attribute da on da.id=a.ATTRIBUTE_ID
         </if>
-        where  a.ALARM_VALUE is not null and a.ALARM_CONDITION is not null
+        where  a.ALARM_VALUE is not null and a.ALARM_CONDITION is not null and d.status = 1 and a.status = 1
         <if test="deviceCode != null">
             and d.DEVICE_CODE=#{deviceCode}
         </if>

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

@@ -137,9 +137,7 @@
         <if test="companyOrgId != null ">
             COMPANY_ORG_ID  = #{companyOrgId},
         </if>
-        <if test="deptOrgId != null ">
             DEPT_ORG_ID  = #{deptOrgId},
-        </if>
         <if test="sceneId != null ">
             SCENE_ID  = #{sceneId},
         </if>
@@ -155,12 +153,8 @@
         <if test="lastUpdateTime != null ">
             LAST_UPDATE_TIME  = #{lastUpdateTime},
         </if>
-        <if test="address != null and address != '' ">
             ADDRESS  = #{address},
-        </if>
-        <if test="remark != null and remark != '' ">
             REMARK  = #{remark},
-        </if>
         <if test="status != null ">
             STATUS  = #{status},
         </if>