设备添加查询id去0

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

@@ -95,7 +95,7 @@ public class AlarmDetailsController {
             orderItem.setColumn("t.date_create");
             iPage.orders().add(orderItem);
         }
-        if(sceneId != null) {
+        if(sceneId != null && sceneId != 0) {
             alarmDetailsDto.setSceneIds(sceneService.findByParentIdsLike(sceneId.longValue()));
             if(alarmDetailsDto.getSceneIds() == null || alarmDetailsDto.getSceneIds().size() == 0){
                 return new AjaxMessage<>(ResultStatus.OK, new Pagination<>(iPage));
@@ -175,7 +175,7 @@ public class AlarmDetailsController {
             orderItem.setColumn("a.ALARM_START_TIME");
             iPage.orders().add(orderItem);
         }
-        if(sceneId != null) {
+        if(sceneId != null && sceneId != 0) {
             alarmDetailsDto.setSceneIds(sceneService.findByParentIdsLike(sceneId.longValue()));
             if(alarmDetailsDto.getSceneIds() == null || alarmDetailsDto.getSceneIds().size() == 0){
                 return new AjaxMessage<>(ResultStatus.OK, new Pagination<>(iPage));
@@ -219,7 +219,7 @@ public class AlarmDetailsController {
             alarmDetailsDto.setStartTime(new Date());
             alarmDetailsDto.setEndTime(new Date());
         }
-        if(sceneId != null) {
+        if(sceneId != null && sceneId != 0) {
             alarmDetailsDto.setSceneIds(sceneService.findByParentIdsLike(sceneId.longValue()));
             if(alarmDetailsDto.getSceneIds() == null || alarmDetailsDto.getSceneIds().size() == 0){
                 String filePath = EasyExcelUtil.excelWrite(baseDir, AlarmDetailsHistoryDto.class, "历史报警记录", new ArrayList<>());
@@ -271,7 +271,7 @@ public class AlarmDetailsController {
             orderItem.setColumn("a.ALARM_START_TIME");
             iPage.orders().add(orderItem);
         }
-        if(sceneId != null) {
+        if(sceneId != null && sceneId != 0) {
             alarmDetailsDto.setSceneIds(sceneService.findByParentIdsLike(sceneId.longValue()));
             if(alarmDetailsDto.getSceneIds() == null || alarmDetailsDto.getSceneIds().size() == 0){
                 return new AjaxMessage<>(ResultStatus.OK, new Pagination<>(iPage));
@@ -315,7 +315,7 @@ public class AlarmDetailsController {
             alarmDetailsDto.setStartTime(new Date());
             alarmDetailsDto.setEndTime(new Date());
         }
-        if(sceneId != null) {
+        if(sceneId != null && sceneId != 0) {
             alarmDetailsDto.setSceneIds(sceneService.findByParentIdsLike(sceneId.longValue()));
             if(alarmDetailsDto.getSceneIds() == null || alarmDetailsDto.getSceneIds().size() == 0){
                 String filePath = EasyExcelUtil.excelWrite(baseDir, AlarmDetailsHistoryDto.class, "历史报警记录", new ArrayList<>());

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

@@ -71,7 +71,7 @@ public class DeviceController {
             orderItem.setColumn("d.date_create");
             iPage.orders().add(orderItem);
         }
-        if(sceneId != null) {
+        if(sceneId != null && sceneId != 0) {
             if(searchType != null && searchType ==1){
                 List<Long> list = new ArrayList<>();
                 list.add(sceneId);
@@ -108,7 +108,7 @@ public class DeviceController {
         deviceDto.setCompanyOrgId(companyOrgId);
         deviceDto.setDeptOrgId(deptOrgId);
         deviceDto.setEnableState(enableState);
-        if(sceneId != null) {
+        if(sceneId != null && sceneId != 0) {
             if(searchType != null && searchType ==1){
                 List<Long> list = new ArrayList<>();
                 list.add(sceneId);

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

@@ -209,19 +209,19 @@
             <if test="tenantId != null and tenantId != '' ">
                 TENANT_ID  = #{tenantId},
             </if>
-            <if test="deviceId != null ">
+            <if test="deviceId != null and deviceId != 0">
                 DEVICE_ID  = #{deviceId},
             </if>
-            <if test="companyOrgId != null ">
+            <if test="companyOrgId != null and companyOrgId != 0 ">
                 COMPANY_ORG_ID  = #{companyOrgId},
             </if>
-            <if test="deptOrgId != null ">
+            <if test="deptOrgId != null and deptOrgId != 0">
                 DEPT_ORG_ID  = #{deptOrgId},
             </if>
             <if test="alarmType != null and alarmType != ''">
                 ALARM_TYPE  = #{alarmType},
             </if>
-            <if test="attributeId != null ">
+            <if test="attributeId != null and attributeId != 0 ">
                 ATTRIBUTE_ID  = #{attributeId},
             </if>
             <if test="alarmValue != null ">
@@ -264,7 +264,7 @@
             <if test="maxValue != null">
                 MAX_VALUE  = #{maxValue},
             </if>
-            <if test="alarmSettingId != null">
+            <if test="alarmSettingId != null  and alarmSettingId != 0 ">
                 ALARM_SETTING_ID  = #{alarmSettingId}
             </if>
         </set>

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

@@ -57,10 +57,10 @@
         <if test="deviceDto.condition != null and deviceDto.condition != ''">
             and (device_code like concat('%', #{deviceDto.condition},'%') or device_name like concat('%', #{deviceDto.condition},'%'))
         </if>
-        <if test="deviceDto.companyOrgId != null ">
+        <if test="deviceDto.companyOrgId != null and deviceDto.companyOrgId != 0 ">
             and d.COMPANY_ORG_ID=#{deviceDto.companyOrgId}
         </if>
-        <if test="deviceDto.deptOrgId != null ">
+        <if test="deviceDto.deptOrgId != null and deviceDto.deptOrgId != 0 ">
             and d.DEPT_ORG_ID =#{deviceDto.deptOrgId}
         </if>
         <if test="deviceDto.sceneIds != null and deviceDto.sceneIds.size() > 0">
@@ -105,8 +105,16 @@
 
     <!-- 新增所有列 -->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        INSERT INTO  sms_device ( TENANT_ID ,  DEVICE_CODE ,  DEVICE_NAME ,  DEVICE_TYPE_ID ,  COMPANY_ORG_ID ,  DEPT_ORG_ID ,  SCENE_ID ,  POINT_X ,  POINT_Y ,  ENABLE_STATE ,  LAST_UPDATE_TIME ,  ADDRESS ,  REMARK ,  STATUS ,  DATE_CREATE ,  CREATE_BY ,  DATE_UPDATE ,  UPDATE_BY )
-        VALUES ( #{tenantId} ,#{deviceCode} ,#{deviceName}  ,#{deviceTypeId} ,#{companyOrgId} ,#{deptOrgId} ,#{sceneId} ,#{pointX} ,#{pointY} ,#{enableState} ,#{lastUpdateTime} ,#{address} ,#{remark} ,#{status} ,#{dateCreate} ,#{createBy} ,#{dateUpdate} ,#{updateBy})
+        INSERT INTO  sms_device ( TENANT_ID ,  DEVICE_CODE ,  DEVICE_NAME ,  DEVICE_TYPE_ID ,
+        <if test="companyOrgId != null and companyOrgId != 0">COMPANY_ORG_ID , </if>
+        <if test="companyOrgId != null and companyOrgId != 0">DEPT_ORG_ID ,</if>
+        <if test="companyOrgId != null and companyOrgId != 0">SCENE_ID ,</if>
+        POINT_X ,  POINT_Y ,  ENABLE_STATE ,  LAST_UPDATE_TIME ,  ADDRESS ,  REMARK ,  STATUS ,  DATE_CREATE ,  CREATE_BY ,  DATE_UPDATE ,  UPDATE_BY )
+        VALUES ( #{tenantId} ,#{deviceCode} ,#{deviceName}  ,#{deviceTypeId} ,
+        <if test="companyOrgId != null and companyOrgId != 0">#{companyOrgId}  , </if>
+        <if test="deptOrgId != null and deptOrgId != 0"> #{deptOrgId} , </if>
+        <if test="sceneId != null and sceneId != 0">#{sceneId} , </if>
+        #{pointX} ,#{pointY} ,#{enableState} ,#{lastUpdateTime} ,#{address} ,#{remark} ,#{status} ,#{dateCreate} ,#{createBy} ,#{dateUpdate} ,#{updateBy})
    </insert>
 
     <!-- 批量新增 -->
@@ -131,14 +139,14 @@
         <if test="deviceName != null and deviceName != '' ">
             DEVICE_NAME  = #{deviceName},
         </if>
-        <if test="deviceTypeId != null ">
+        <if test="deviceTypeId != null and deviceTypeId != 0">
             DEVICE_TYPE_ID  = #{deviceTypeId},
         </if>
-        <if test="companyOrgId != null ">
+        <if test="companyOrgId != null and companyOrgId != 0">
             COMPANY_ORG_ID  = #{companyOrgId},
         </if>
             DEPT_ORG_ID  = #{deptOrgId},
-        <if test="sceneId != null ">
+        <if test="sceneId != null  and sceneId != 0">
             SCENE_ID  = #{sceneId},
         </if>
         <if test="pointX != null ">
@@ -196,10 +204,10 @@
         <if test="deviceDto.condition != null and deviceDto.condition != ''">
             and (device_code like concat('%', #{deviceDto.condition},'%') or device_name like concat('%', #{deviceDto.condition},'%'))
         </if>
-        <if test="deviceDto.companyOrgId != null ">
+        <if test="deviceDto.companyOrgId != null and deviceDto.companyOrgId != 0">
             and d.COMPANY_ORG_ID=#{deviceDto.companyOrgId}
         </if>
-        <if test="deviceDto.deptOrgId != null ">
+        <if test="deviceDto.deptOrgId != null and deviceDto.deptOrgId != 0">
             and d.DEPT_ORG_ID =#{deviceDto.deptOrgId}
         </if>
         <if test="deviceDto.sceneIds != null and deviceDto.sceneIds.size() > 0">