Merge remote-tracking branch 'origin/master'

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

@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @description
@@ -272,7 +273,11 @@ public class AlarmDetailsController {
         String filePath = EasyExcelUtil.excelWrite(baseDir, AlarmDetailsRealTimeDto.class, "实时报警",alarmDetailsService.selectRealTimeList(alarmDetailsDto) );
         return new AjaxMessage<>(ResultStatus.OK, filePath);
     }
-
+    @RequestMapping(value="batchDelete" , method = RequestMethod.DELETE)
+    @ApiOperation(value = "批量删除")
+    public AjaxMessage<Integer> batchDelete( @ApiParam(value = "报警信息ids") @RequestParam List<Integer> ids){
+        return new AjaxMessage<>(ResultStatus.OK, alarmDetailsService.batchDelete(ids));
+    }
 
 
 }

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

@@ -114,4 +114,10 @@ public class DeviceController {
         return new AjaxMessage<>(ResultStatus.OK, deviceService.delete(id));
     }
 
+    @RequestMapping(value="batchDelete" , method = RequestMethod.DELETE)
+    @ApiOperation(value = "批量删除设备信息")
+    @LogAnnotation(module = "【设备管理】批量删除")
+    public AjaxMessage<Integer> batchDelete( @ApiParam(value = "设备信息id") @RequestParam List<Integer> ids){
+        return new AjaxMessage<>(ResultStatus.OK, deviceService.batchDelete(ids));
+    }
 }

sms_water/src/main/java/com/huaxu/dao/AlarmDetailMapper.java

@@ -43,8 +43,14 @@ public interface AlarmDetailMapper {
      * @return
      */
     Integer deleteById(Integer id);
+
     /**
-     * 单条删除设备报警
+     * 设备报警
+     * @return
+     */
+    Integer batchDelete(@Param("ids") List<Integer> ids);
+    /**
+     * 挂起、恢复设备报警
      * @return
      */
     Integer suspendedById(@Param("id") Integer id, @Param("opState") Integer opState,@Param("dateUpdate")  Date dateUpdate ,@Param("updateBy") String updateBy);

sms_water/src/main/java/com/huaxu/dao/DeviceMapper.java

@@ -40,6 +40,11 @@ public interface DeviceMapper {
      * @return
      */
     Integer deleteById(Integer id);
+    /**
+     * 删除设备
+     * @return
+     */
+    Integer batchDelete(@Param("ids") List<Integer> ids);
 
     /**
      * 修改设备信息

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

@@ -26,7 +26,7 @@ public class AlarmDetailsDto extends AlarmDetailsEntity {
     @ApiModelProperty("设备名称")
     private String deviceName;
     @ApiModelProperty("设备类型")
-    private Integer deviceType;
+    private String deviceType;
     @ApiModelProperty("地址")
     private String address;
     @ApiModelProperty("经度")

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

@@ -32,7 +32,7 @@ public class DeviceEntity implements Serializable {
 
     @ApiModelProperty(value = "设备编号")
     private Integer deviceCode;
-    @ApiModelProperty(value = "设备型号")
+    @ApiModelProperty(value = "设备类型")
     private Integer deviceTypeId;
     @ApiModelProperty(value = "所属公司")
     private Integer companyOrgId;

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

@@ -30,17 +30,17 @@ public class DeviceParmEntity implements Serializable {
     @ApiModelProperty("设备属性名称")
     private String attributeName;
     @ApiModelProperty("是否地图悬浮显示")
-    private Integer isSuspension;
+    private Boolean isSuspension;
     @ApiModelProperty("是否统计报表参数")
-    private Integer isReport;
+    private Boolean isReport;
     @ApiModelProperty("是否统计图表参数")
-    private Integer isChart;
+    private Boolean isChart;
     @ApiModelProperty("是否地图参数")
-    private Integer isMap;
+    private Boolean isMap;
     @ApiModelProperty("是否报警参数")
-    private Integer isAlarm;
+    private Boolean isAlarm;
     @ApiModelProperty("是否工艺图参数")
-    private Integer isArtwork;
+    private Boolean isArtwork;
 
 
     @ApiModelProperty(value = "备注")

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

@@ -68,6 +68,11 @@ public class SceneEntity implements Serializable {
     @ApiModelProperty(value = "场景类型")
     private Long sceneTypeId;
 
+    /** 场景类型 */
+    @ApiModelProperty(value = "场景类型")
+    @TableField(exist = false)
+    private String sceneTypeName;
+
     /** 状态 */
     @ApiModelProperty(value = "状态")
     private Long enableState;

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

@@ -39,6 +39,13 @@ public interface AlarmDetailsService {
      * @return
      */
     Integer deleteById(Integer id);
+
+    /**
+     * 批量删除
+     * @return
+     */
+    Integer batchDelete(List<Integer> ids);
+
     /**
      * 挂起/恢复
      * @return

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

@@ -30,6 +30,12 @@ public interface DeviceService {
      */
     Integer delete(Integer id);
 
+    /**
+     * 批量删除设备
+     * @return
+     */
+    Integer batchDelete(List<Integer> ids);
+
     /**
      * 修改设备信息
      * @return

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

@@ -299,7 +299,12 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
      * 根居ID获取对象
      */
     public SceneEntity findSceneById(Long id) {
-        return sceneMapper.findSceneById(id);
+        SceneEntity sceneEntity = sceneMapper.findSceneById(id);
+        SceneImageEntity sceneImageEntity = new SceneImageEntity();
+        sceneImageEntity.setSceneId(id);
+        List<SceneImageEntity> sceneImageEntities = sceneImageService.findList(sceneImageEntity);
+        sceneEntity.setSceneImages(sceneImageEntities);
+        return sceneEntity;
     }
 
     public List<SceneEntity> findBySceneTypeIds(Long[] Ids) {

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

@@ -52,6 +52,12 @@ public class AlarmDetailsServiceImpl implements AlarmDetailsService {
         return alarmDetailMapper.deleteById(id);
     }
 
+    @Override
+    public Integer batchDelete(List<Integer> ids) {
+
+        return alarmDetailMapper.batchDelete(ids);
+    }
+
     @Override
     public Integer suspendedById(Integer id , Integer opState) {
         LoginUser loginUser = UserUtil.getCurrentUser();

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

@@ -32,7 +32,11 @@ public class DeviceParmServiceImpl  implements DeviceParmService  {
 
     @Override
     public List<DeviceParmEntity> selectByDeviceId(Integer id) {
-        return deviceParmMapper.selectByDeviceId(id);
+        List<DeviceParmEntity> deviceParmEntities = deviceParmMapper.selectByDeviceId(id);
+        for (DeviceParmEntity item : deviceParmEntities) {
+            item.setDeviceId(id);
+        }
+        return deviceParmEntities;
     }
 
     @Override

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

@@ -47,6 +47,11 @@ public class DeviceServiceImpl implements DeviceService {
         return deviceMapper.deleteById(id);
     }
 
+    @Override
+    public Integer batchDelete(List<Integer> ids) {
+
+        return deviceMapper.batchDelete(ids);
+    }
     @Override
     public Integer update(DeviceEntity deviceEntity) {
         LoginUser loginUser = UserUtil.getCurrentUser();

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

@@ -25,7 +25,7 @@
             ,a.MIN_VALUE as "minValue"
             ,a.MAX_VALUE as "maxValue"
             ,timestampdiff(MINUTE,ifnull(a.ALARM_END_TIME,now()),a.ALARM_START_TIME) as "duration"
-            ,(case when ALARM_END_TIME is not null then timestampdiff(MINUTE,a.ALARM_END_TIME,a.ALARM_START_TIME) else null end ) as "duration"
+            /*,(case when ALARM_END_TIME is not null then timestampdiff(MINUTE,a.ALARM_END_TIME,a.ALARM_START_TIME) else null end ) as "duration"*/
             ,att.`NAME` as "attributeName"
             ,s.SCENE_NAME as "sceneName"
             ,d.DEVICE_NAME as "deviceName"
@@ -231,6 +231,15 @@
          UPDATE  sms_alarm_details set STATUS  = 0 where id = #{id}
     </delete>
 
+    <!--删除-->
+    <delete id="batchDelete">
+        UPDATE  sms_alarm_details set STATUS  = 0
+        where id  in
+        <foreach collection="ids" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </delete>
+
     <!-- 报警挂起、恢复 -->
     <delete id="suspendedById">
          UPDATE  sms_alarm_details set op_state  = #{opState} , DATE_UPDATE  = #{dateUpdate}, UPDATE_BY  = #{updateBy} where id = #{id}

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

@@ -180,6 +180,14 @@
          UPDATE  sms_device set STATUS  = 0 where id = #{id}
     </delete>
 
+    <!--通过主键删除-->
+    <delete id="batchDelete">
+         UPDATE  sms_device set STATUS  = 0
+         where id  in
+        <foreach collection="ids" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </delete>
 
     <!-- 分页查询 -->
     <select id="selectPage" resultType="com.huaxu.dto.DeviceDto">

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

@@ -45,6 +45,7 @@
         <include refid="sceneImageColumns"/>
         FROM sms_scene_image a
         <where>
+             a.status=1
             <if test="imageType != null ">and a.image_type = #{imageType}</if>
             <if test="imagePath != null  and imagePath != ''">and a.image_path = #{imagePath}</if>
             <if test="sceneId != null ">and a.scene_id = #{sceneId}</if>
@@ -58,6 +59,7 @@
         <include refid="sceneImageColumns"/>
         FROM sms_scene_image a
         <where>
+            a.status=1
             <if test="sceneImage.imageType != null ">and a.image_type = #{sceneImage.imageType}</if>
             <if test="sceneImage.imagePath != null  and sceneImage.imagePath != ''">and a.image_path =
                 #{sceneImage.imagePath}

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

@@ -45,14 +45,18 @@
          a.date_create as "dateCreate" ,
          a.create_by as "createBy" ,
          a.date_update as "dateUpdate" ,
-         a.update_by as "updateBy" 
+         a.update_by as "updateBy",
+         s.scene_type_name as "sceneTypeName"
      </sql>
-
+    <sql id="deviceJoins">
+        left join sms_scene_type s on s.id =a.scene_type_id
+    </sql>
     <!--  根据主键获取实体   -->
     <select id="findSceneById" resultType="com.huaxu.entity.SceneEntity">
         SELECT
         <include refid="sceneColumns"/>
         FROM sms_scene a
+        <include refid="deviceJoins"/>
         WHERE a.id = #{id} and a.status=1
     </select>
 
@@ -61,6 +65,7 @@
         SELECT
         <include refid="sceneColumns"/>
         FROM sms_scene a
+        <include refid="deviceJoins"/>
         <where>
             a.status=1
             <if test="scene.tenantId != null  and scene.tenantId != ''">and a.tenant_id = #{scene.tenantId}</if>
@@ -103,6 +108,7 @@
     <select id="findBySceneTypeIds" resultType="com.huaxu.entity.SceneEntity">
         select a.id
         FROM sms_scene a
+        <include refid="deviceJoins"/>
         WHERE a.scene_type_id in
         <foreach collection = "Ids" item = "dramaId" open = "(" close = ")" separator = "," >
             #{dramaId}
@@ -112,6 +118,7 @@
     <select id="findByParentSceneIds" resultType="com.huaxu.entity.SceneEntity">
         select a.id
         FROM sms_scene a
+        <include refid="deviceJoins"/>
         WHERE a.parent_scene_id in
         <foreach collection = "Ids" item = "dramaId" open = "(" close = ")" separator = "," >
             #{dramaId}
@@ -121,6 +128,7 @@
         SELECT
         <include refid="sceneColumns"/>
         FROM sms_scene a
+        <include refid="deviceJoins"/>
         <where>
             a.status=1
             <if test="scene.tenantId != null  and scene.tenantId != ''">and a.tenant_id = #{scene.tenantId}</if>
@@ -159,6 +167,7 @@
         SELECT
         <include refid="sceneColumns"/>
         FROM sms_scene a
+        <include refid="deviceJoins"/>
         <where>
             a.status=1 and a.parent_scene_id=0
             <if test="scene.tenantId != null  and scene.tenantId != ''">and a.tenant_id = #{scene.tenantId}</if>