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/java/com/huaxu/controller/SceneController.java

@@ -6,8 +6,10 @@ import com.huaxu.common.FileUploadUtil;
 import com.huaxu.dto.DeviceDto;
 import com.huaxu.entity.SceneTypeEntity;
 import com.huaxu.model.AjaxMessage;
+import com.huaxu.model.LoginUser;
 import com.huaxu.model.Pagination;
 import com.huaxu.model.ResultStatus;
+import com.huaxu.util.UserUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -43,10 +45,12 @@ public class SceneController {
     @ApiOperation(value = "分页查询场景")
     @RequestMapping(value = "/selectPage", method = RequestMethod.GET)
     @ResponseBody
-    public AjaxMessage<Pagination<SceneEntity>> selectPage(@RequestParam Integer pageNum, @RequestParam Integer pageSize, @RequestParam(value = "sceneName", required = false) String sceneName) {
+    public AjaxMessage<Pagination<SceneEntity>> selectPage(@RequestParam Integer pageNum, @RequestParam Integer pageSize, @RequestParam(value = "sceneName", required = false) String sceneName,@RequestParam(required = false) Long companyOrgId,@RequestParam(required = false) Long deptOrgId) {
         IPage<SceneEntity> iPage = new Page<>(pageNum, pageSize);
         SceneEntity sceneEntity = new SceneEntity();
         sceneEntity.setSceneName(sceneName);
+        sceneEntity.setCompanyOrgId(companyOrgId);
+        sceneEntity.setDeptOrgId(deptOrgId);
         iPage = sceneService.findPage(iPage, sceneEntity);
         Pagination<SceneEntity> pages = new Pagination<>(iPage);
         return new AjaxMessage<>(ResultStatus.OK, pages);
@@ -101,7 +105,6 @@ public class SceneController {
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
     public AjaxMessage<Integer> addScene(@ApiParam(value = "场景", required = true) @RequestBody SceneEntity scene) {
-
         int result = sceneService.addScene(scene) ? 1 : 0;
         return new AjaxMessage<>(ResultStatus.OK, result);
     }

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

@@ -53,6 +53,18 @@ public class SceneTypeController {
         return new AjaxMessage<>(ResultStatus.OK, page);
     }
 
+    @ApiOperation(value = "查询场景类型树")
+    @RequestMapping(value = "/selectTreeList", method = RequestMethod.GET)
+    @ResponseBody
+    public AjaxMessage<List<SceneTypeEntity>> selectTreeList(@ApiParam(value = "父级ID", required = false) @RequestParam(required = false) Long id) {
+        SceneTypeEntity sceneType = new SceneTypeEntity();
+        if (id == null)
+            id = 0L;
+        sceneType.setParentScenetypeId(id);
+        List<SceneTypeEntity> page = sceneTypeService.findList(sceneType);
+        return new AjaxMessage<>(ResultStatus.OK, page);
+    }
+
     /**
      * 新增
      */

sms_water/src/main/java/com/huaxu/dto/DeviceCheckAlarmDto.java

@@ -56,10 +56,10 @@ public class DeviceCheckAlarmDto {
       return  new StringBuilder().append(this.deviceName)
                 .append(this.attributeName)
                 .append(receivedValue)
-                .append(this.unit)
+                .append(StringUtils.isNotBlank(this.unit)?this.unit:"")
                 .append(this.alarmCondition)
                 .append(this.attributeName)
                 .append(this.alarmValue)
-                .append(this.unit).toString();
+                .append(StringUtils.isNotBlank(this.unit)?this.unit:"").toString();
     }
 }

sms_water/src/main/java/com/huaxu/rabbitmq/ReceiveData.java

@@ -147,18 +147,18 @@ public class ReceiveData {
                                insert.add(alarmDetailsEntity);
                            }
                        }
-                       //处理完成后，剩下的标记为历史数据
-                       for(AlarmDetailsDto alarmDetailsDto:alarmDetailsDtoMap.values()){
-                           alarmDetailsDto.setState(0);
-                           alarmDetailsDto.setAlarmEndTime(receiveDateTime);
-                           alarmDetailsDto.setDateUpdate(new Date());
-                           alarmDetailMapper.update(alarmDetailsDto);
-                       }
-                       //批量插入新增报警
-                       if(insert.size()>0){
-                        alarmDetailMapper.batchInsert(insert);
-                       }
                     }
+                   //处理完成后，剩下的标记为历史数据
+                   for(AlarmDetailsDto alarmDetailsDto:alarmDetailsDtoMap.values()){
+                       alarmDetailsDto.setState(0);
+                       alarmDetailsDto.setAlarmEndTime(receiveDateTime);
+                       alarmDetailsDto.setDateUpdate(new Date());
+                       alarmDetailMapper.update(alarmDetailsDto);
+                   }
+                   //批量插入新增报警
+                   if(insert.size()>0){
+                    alarmDetailMapper.batchInsert(insert);
+                   }
                }
            }
         }

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

@@ -155,6 +155,14 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
         LoginUser currentUser = UserUtil.getCurrentUser();
         scene.setTenantId(currentUser.getTenantId());
         scene.setStatus(1);
+        if(currentUser!=null) {
+            scene.setCreateBy(currentUser.getName());
+            scene.setUpdateBy(currentUser.getName());
+            scene.setDateUpdate(new Date());
+            scene.setDateCreate(new Date());
+        }
+        if(scene.getDeptOrgId()!=null&&scene.getDeptOrgId()==0)
+            scene.setDeptOrgId(null);
 
         // 如果没有设置父节点，则代表为跟节点，有则获取父节点实体
         if (scene.getParentSceneId() == null || StringUtils.isBlank(scene.getParentSceneId().toString())) {
@@ -237,7 +245,8 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
     public boolean updateSceneById(SceneEntity scene) {
         LoginUser currentUser = UserUtil.getCurrentUser();
         scene.setUpdateBy(currentUser.getName());
-
+        if(scene.getDeptOrgId()!=null&&scene.getDeptOrgId()==0)
+            scene.setDeptOrgId(null);
         // 获取修改前的parentIds，用于更新子节点的parentIds
         SceneEntity cScene = sceneMapper.findSceneById(scene.getId());
         String oldParentIds = cScene.getParentSceneIds();
@@ -273,6 +282,8 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
             for (SceneEntity e : list) {
                 if (!e.getId().equals(scene.getId()) && e.getParentSceneId() != null && oldParentIds != null) {
                     e.setParentSceneIds(e.getParentSceneIds().replace(oldParentIds, scene.getParentSceneIds()));
+                    e.setDeptOrgId(scene.getDeptOrgId());
+                    e.setCompanyOrgId(scene.getCompanyOrgId());
                     sceneMapper.updateById(e);
                 }
             }

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

@@ -78,7 +78,11 @@
             ,ast.id as "alarmSettingId"
             ,concat(ifnull(ast.ALARM_CONDITION,''),ifnull(ast.ALARM_VALUE,''),ifnull(att.unit,'')) as "alermRule"
             ,a.ALARM_END_TIME as "alarmEndTime"
-            ,concat(timestampdiff(MINUTE,a.ALARM_START_TIME,ifnull(a.ALARM_END_TIME,now())),'分钟') 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>
 
@@ -530,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>
 
     <!--通过实体作为筛选条件查询-->
@@ -591,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>
 
 
@@ -620,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>

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

@@ -178,6 +178,13 @@
         <include refid="deviceJoins"/>
         <where>
             a.status=1 and a.parent_scene_id=0
+            <if test="scene.companyOrgId!=null">
+                 and a.COMPANY_ORG_ID = #{scene.companyOrgId}
+            </if>
+
+            <if test="scene.deptOrgId != null">
+                and a.DEPT_ORG_ID = #{scene.deptOrgId}
+            </if>
             <if test="scene.tenantId != null  and scene.tenantId != ''">and a.tenant_id = #{scene.tenantId}</if>
             <if test="scene.parentSceneId != null ">and a.parent_scene_id = #{scene.parentSceneId}</if>
             <if test="scene.sceneName != null  and scene.sceneName != ''">

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

@@ -52,6 +52,7 @@
         order  by a.date_create
     </select>
 
+
     <!--  根据获取实体 page   -->
     <select id="findPage" resultType="com.huaxu.entity.SceneTypeEntity">
         SELECT

user_center/src/main/java/com/huaxu/controller/UserController.java

@@ -168,6 +168,9 @@ public class UserController {
             user.setTenantId(currentUser.getTenantId());
         }
         user.setStatus(1);
+        if (user.getDeptOrgId() != null && user.getDeptOrgId() == 0) {
+            user.setDeptOrgId(null);
+        }
         int result = userService.addUser(user) ? 1 : 0;
         return new AjaxMessage<>(ResultStatus.OK, result);
     }