Merge branch 'han' of uskycloud/usky-modules into server-165

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/controller/web/BaseAlarmNoticeResultController.java

@@ -33,6 +33,7 @@ public class BaseAlarmNoticeResultController {
     /**
      * 推送记录查看分页
      * @param receiver  接收人
+     * @param alarmId  告警ID
      * @param current      当前页
      * @param size     每页条数
      * @return
@@ -40,10 +41,11 @@ public class BaseAlarmNoticeResultController {
     @Log(title = "关联设备查看分页", businessType = BusinessType.OTHER)
     @GetMapping("/resultInfo")
     public ApiResult<CommonPage<BaseAlarmNoticeResult>> resultInfo(@RequestParam(value = "receiver", required = false) String receiver,
+                                                                   @RequestParam(value = "alarmId") Integer alarmId,
                                                                    @RequestParam(value = "current", required = false, defaultValue = "1") Integer current,
                                                                    @RequestParam(value = "size", required = false, defaultValue = "10") Integer size)
     {
-        return ApiResult.success(baseAlarmNoticeResultService.resultInfo(receiver, current, size));
+        return ApiResult.success(baseAlarmNoticeResultService.resultInfo(receiver, alarmId, current, size));
     }
 }
 

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/domain/BaseAlarmNoticeResult.java

@@ -55,6 +55,11 @@ public class BaseAlarmNoticeResult implements Serializable {
      */
     private Integer noticeType;
 
+    /**
+     * 推送内容
+     */
+    private String noticeContent;
+
     /**
      * 是否已读
      */

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/BaseAlarmNoticeResultService.java

@@ -13,5 +13,5 @@ import com.usky.common.mybatis.core.CrudService;
  * @since 2023-09-25
  */
 public interface BaseAlarmNoticeResultService extends CrudService<BaseAlarmNoticeResult> {
-    CommonPage<BaseAlarmNoticeResult> resultInfo(String receiver, Integer current, Integer size);
+    CommonPage<BaseAlarmNoticeResult> resultInfo(String receiver, Integer alarmId, Integer current, Integer size);
 }

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/impl/BaseAlarmNoticeResultServiceImpl.java

@@ -24,10 +24,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class BaseAlarmNoticeResultServiceImpl extends AbstractCrudService<BaseAlarmNoticeResultMapper, BaseAlarmNoticeResult> implements BaseAlarmNoticeResultService {
     @Override
-    public CommonPage<BaseAlarmNoticeResult> resultInfo(String receiver, Integer current, Integer size) {
+    public CommonPage<BaseAlarmNoticeResult> resultInfo(String receiver, Integer alarmId, Integer current, Integer size) {
         IPage<BaseAlarmNoticeResult> page = new Page<>(current, size);
         LambdaQueryWrapper<BaseAlarmNoticeResult> queryWrapper1 = Wrappers.lambdaQuery();
-        queryWrapper1.like(StringUtils.isNotBlank(receiver),BaseAlarmNoticeResult::getReceiver, receiver);
+        queryWrapper1.like(StringUtils.isNotBlank(receiver),BaseAlarmNoticeResult::getReceiver, receiver)
+                .eq(BaseAlarmNoticeResult::getAlarmId, alarmId);
 //                .eq(BaseAlarmNoticeResult::getTenantId, SecurityUtils.getTenantId());
         page = this.page(page,queryWrapper1);
         return new CommonPage<>(page.getRecords(),page.getTotal(),page.getCurrent(),page.getSize());

service-alarm/service-alarm-biz/src/main/resources/mapper/alarm/BaseAlarmNoticeResultMapper.xml

@@ -10,6 +10,7 @@
         <result column="alarm_id" property="alarmId" />
         <result column="notice_time" property="noticeTime" />
         <result column="notice_type" property="noticeType" />
+        <result column="notice_content" property="noticeContent" />
         <result column="is_read" property="isRead" />
         <result column="dept_id" property="deptId" />
         <result column="tenant_id" property="tenantId" />

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/BaseCompanyPersonServiceImpl.java

@@ -47,6 +47,7 @@ public class BaseCompanyPersonServiceImpl extends AbstractCrudService<BaseCompan
         LambdaQueryWrapper<BaseCompany> queryWrapper1 = Wrappers.lambdaQuery();
         queryWrapper1.select(BaseCompany::getCompanyId)
                 .eq(BaseCompany::getEnable,0)
+                .eq(BaseCompany::getCompanyType,"1")
                 .like(StringUtils.isNotBlank(companyCode), BaseCompany::getCompanyCode, companyCode)
                 .like(StringUtils.isNotBlank(companyName), BaseCompany::getCompanyName, companyName)
                 .orderByDesc(BaseCompany::getId);