Merge remote-tracking branch 'origin/master'

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

@@ -38,6 +38,8 @@ public class AlarmSettingController {
     private AlarmSettingService alarmSettingService;
     @Autowired
     private SceneService sceneService;
+    @Autowired
+    private OrgInfoUtil orgInfoUtil;
     /**
      * 删除多条数据
      *
@@ -75,7 +77,7 @@ public class AlarmSettingController {
      */
     @RequestMapping(value = "insertBatch", method = RequestMethod.POST)
     @ApiOperation(value = "批量增加报警配置信息",notes = "alarmType 为参数报警或状态报警")
-    public AjaxMessage<Boolean> insertBatch(@ApiParam(value = "报警配置ids", required = true) @RequestBody List<AlarmSetting> listAlarmSetting) {
+    public AjaxMessage<Boolean> insertBatch(@ApiParam(value = "报警配置列表", required = true) @RequestBody List<AlarmSetting> listAlarmSetting) {
         LoginUser currentUser = UserUtil.getCurrentUser();
         for (AlarmSetting alarm:listAlarmSetting) {
             alarm.setCreateBy(currentUser.getUsername());
@@ -100,7 +102,7 @@ public class AlarmSettingController {
             @ApiParam(value = "页数", required = true)@RequestParam Integer pageNum,
             @ApiParam(value = "条数", required = true)@RequestParam Integer pageSize,
             @ApiParam(value = "报警设置id", required = false) @RequestParam(required = false) Integer id,
-            @ApiParam(value = "报警参数id", required = false) @RequestParam(required = false) String attributeName,
+            @ApiParam(value = "报警参数", required = false) @RequestParam(required = false) String attributeName,
             @ApiParam(value = "场景id", required = false) @RequestParam(required = false) Long sceneId) {
         AlarmSettingDto alarmSettingDto=new AlarmSettingDto();
         alarmSettingDto.setId(id);
@@ -110,7 +112,6 @@ public class AlarmSettingController {
         IPage<AlarmSettingDto> iPage = new Page<>(pageNum, pageSize);
         iPage = alarmSettingService.selectPage(iPage, alarmSettingDto);
         Pagination<AlarmSettingDto> pages = new Pagination<>(iPage);
-        OrgInfoUtil orgInfoUtil = new OrgInfoUtil();
         for(AlarmSettingDto alarm : pages.getList()){
             alarm.setCompanyOrgName(orgInfoUtil.getOrgName(alarm.getCompanyOrgId()));
             alarm.setDeptOrgName(orgInfoUtil.getOrgName(alarm.getDeptOrgId()));

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

@@ -31,10 +31,10 @@
 
     <!-- 外联表  -->
     <sql id="leftJoins">
-        left join sms_device t2 on t1.device_id=t2.id
-        left join sms_scene t3 on t2.scene_id=t3.id
-        left join sms_device_attribute t4 on t1.attribute_id=t4.id
-        left join sms_device_type t5 on t2.device_type_id=t5.id
+        left join sms_device t2 on t1.device_id=t2.id and t2.status =1
+        left join sms_scene t3 on t2.scene_id=t3.id and t3.status =1
+        left join sms_device_attribute t4 on t1.attribute_id=t4.id and t4.status =1
+        left join sms_device_type t5 on t2.device_type_id=t5.id and t5.status =1
      </sql>
 
     <select id="findPage" resultMap="alarmSettingMap">
@@ -59,16 +59,16 @@
                     #{item}
                 </foreach>
             </if>
-            and t1.STATUS =1
+            and t1.status =1
         </where>
     </select>
 
     <select id="selectAttributes" resultMap="alarmSettingMap">
         select t3.id attribute_id,t3.name attribute_name
         from  sms_device t1
-        inner join sms_device_type t2 on t1.device_type_id=t2.id
-        inner join sms_device_attribute t3 on t2.id=t3.device_type_id
-        where t1.id=#{deviceId} and t3.status=1
+        inner join sms_device_type t2 on t1.device_type_id=t2.id and t2.status =1
+        inner join sms_device_attribute t3 on t2.id=t3.device_type_id and t3.status =1
+        where t1.id=#{deviceId} and t1.status=1
     </select>
 
 </mapper>