Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/CarInfoDto.java

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2022/3/3
+ */
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author DELL
+ */
+@ApiModel(value = "车辆信息视图对象")
+@Data
+public class CarInfoDto implements Serializable {
+
+    @ApiModelProperty(value = "设备id")
+    private Long id;
+
+    @ApiModelProperty(value = "设备名称")
+    private String name;
+
+    @ApiModelProperty(value = "所属队伍")
+    private String teamId;
+
+    @ApiModelProperty(value = "所属队伍名称")
+    private String teamName;
+
+    @ApiModelProperty(value = "车牌号")
+    private String carNum;
+
+    @ApiModelProperty(value = "车辆类型")
+    private Long equipmentId;
+
+    @ApiModelProperty(value = "车辆类型名称")
+    private String equipmentName;
+
+    @ApiModelProperty(value = "分类id名称")
+    private String categoryName;
+
+    @ApiModelProperty(value = "分类id")
+    private Long categoryId;
+
+    @ApiModelProperty(value = "车辆状态")
+    private String carState;
+
+    @ApiModelProperty(value = "车辆状态描述")
+    private String carStateDesc;
+
+    @ApiModelProperty(value = "品牌")
+    private String brand;
+
+    @ApiModelProperty(value = "规格型号")
+    private String standard;
+
+    @ApiModelProperty(value = "底盘品牌")
+    private String chassisBrand;
+
+    @ApiModelProperty(value = "厂商id")
+    private Long manufacturerId;
+
+    @ApiModelProperty(value = "底盘国别")
+    private String chassisCountry;
+
+    @ApiModelProperty(value = "国别")
+    private String country;
+
+    @ApiModelProperty(value = "进口国产")
+    private Boolean isImport;
+
+    @ApiModelProperty(value = "二维码")
+    private String qrCode;
+
+    @ApiModelProperty(value = "保养周期")
+    private String maintenanceCycle;
+
+    @ApiModelProperty(value = "3c认证")
+    private Boolean cccAuth;
+
+    @ApiModelProperty(value = "物联编码")
+    private String iotCode;
+
+    @ApiModelProperty(value = "所属单位id(来源于平台)")
+    private String agencyId;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "车辆图片")
+    private List<String> image;
+
+    @ApiModelProperty(value = "车辆资源列表")
+    private List<Map<String, Object>> resourceList;
+
+    @ApiModelProperty(value = "绑定人姓名")
+    private String userName;
+}
+

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/EquipFeignClient.java

@@ -4,6 +4,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.yeejoin.amos.boot.module.common.api.dto.CarInfoDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -86,7 +87,7 @@ public interface EquipFeignClient {
      * @return
      */
     @RequestMapping(value = "/car/list-allpag", method = RequestMethod.GET)
-    ResponseModel<Object> equipmentCarList( @RequestParam("teamId") Long teamId,
+    ResponseModel<Page<CarInfoDto>> equipmentCarList(@RequestParam("teamId") Long teamId,
                                                      @RequestParam("name") String name,
                                                      @RequestParam("code") String code ,
                                                      @RequestParam("pageNum") String pageNum,

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/dto/CarInfoDto.java

@@ -93,4 +93,7 @@ public class CarInfoDto implements Serializable {
 
     @ApiModelProperty(value = "车辆资源列表")
     private List<Map<String, Object>> resourceList;
+
+    @ApiModelProperty(value = "绑定人姓名")
+    private String userName;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecificAlarmLog.java

@@ -189,6 +189,10 @@ public class EquipmentSpecificAlarmLog extends BaseEntity {
     @TableField(exist = false)
     private String cleanStatus;
 
+    @ApiModelProperty(value = "机场单位人员姓名")//只做筛选用
+    @TableField(exist = false)
+    private String jcsConfirmUserName;
+
     /**
      * 颜色
      */

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/UserCarMapper.java

@@ -13,5 +13,5 @@ import java.util.Map;
 *人员与车辆信息
 */
 public interface UserCarMapper extends BaseMapper<UserCar> {
-
+    String selectListid();
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IUserCarService.java

@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.jcs.api.service;
 
 import com.yeejoin.amos.boot.module.jcs.api.entity.UserCar;
 
+import java.util.List;
+
 /**
  *
  */
@@ -10,7 +12,8 @@ public interface IUserCarService {
 
 
     UserCar selectByAmosUserId(Long id);
-
+    List<UserCar> selectList();
+    String selectListid();
     void add(UserCar userCar);
 
     void delete(UserCar userCar);

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/UserCarMapper.xml

@@ -2,6 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.UserCarMapper">
 
-
+    <select id="selectListid" resultType="String">
+select  GROUP_CONCAT(car_id) id   from jc_user_car where is_delete=0
+    </select>
 
 </mapper>

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -20,6 +20,7 @@ import com.yeejoin.amos.boot.module.command.api.dto.SeismometeorologyDto;
 import com.yeejoin.amos.boot.module.command.biz.service.impl.RemoteSecurityService;
 import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
+import com.yeejoin.amos.boot.module.common.api.entity.Firefighters;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
 import com.yeejoin.amos.boot.module.common.api.feign.IotFeignClient;
 import com.yeejoin.amos.boot.module.common.api.feign.VideoFeignClient;
@@ -1351,12 +1352,14 @@ public class CommandController extends BaseController {
         //获取用户所属单位id
         AgencyUserModel agencyUserModel = getUserInfo();
         Long teamId = null;
-//        Firefighters orgUsr= firefightersService.selectByAmosOrgId(Long.valueOf(agencyUserModel.getUserId()));
-//        teamId=orgUsr!=null?Long.valueOf(orgUsr.getFireTeamId()):null;
+        Firefighters orgUsr= firefightersService.selectByAmosOrgId(Long.valueOf(agencyUserModel.getUserId()));
+        teamId=orgUsr!=null?Long.valueOf(orgUsr.getFireTeamId()):null;
         Long id = null;
         //获取用户已绑定车辆id、
         UserCar userCar = userCarService.selectByAmosUserId(Long.valueOf(agencyUserModel.getUserId()));
 
+        List<UserCar> listcar = userCarService.selectList();
+
         id = userCar != null ? userCar.getCarId() : null;
         if (id == null && isNo != null && isNo) {
             Map map = new HashMap();
@@ -1364,7 +1367,21 @@ public class CommandController extends BaseController {
             map.put("data", null);
             return ResponseHelper.buildResponse(null);
         }
-        ResponseModel<Object> data = equipFeignClient.equipmentCarList(teamId, name, code, pageNum, pageSize, id, isNo);
+        ResponseModel<Page<CarInfoDto>> data = equipFeignClient.equipmentCarList(teamId, name, code, pageNum, pageSize, id, isNo);
+        List<CarInfoDto> array=null;
+        if(data != null && data.getResult()!=null){
+            array = data.getResult().getRecords();
+            if(listcar!=null&&listcar.size()>0){
+                for (CarInfoDto carInfoDto : array) {
+                    for (UserCar car : listcar) {
+                        if(car.getCarId().longValue()==carInfoDto.getId().longValue()){
+                            carInfoDto.setUserName(car.getAmosUserName());
+                        }
+                    }
+                }
+            }
+        }
+        data.getResult().setRecords(array);
         Map map = new HashMap();
         map.put("select", userCar != null ? userCar.getCarId() : null);
         map.put("data", data != null ? data.getResult() : null);

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -774,6 +774,13 @@ public class OrgUsrController extends BaseController {
     }
 
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "根据平台Id查询人员", notes = "根据平台Id查询人员")
+    @GetMapping(value = "find/getByAmosId")
+    public ResponseModel<List<OrgUsr>> getByAmosId(@RequestParam List<String> amosIds) {
+        return ResponseHelper.buildResponse(iOrgUsrService.getByAmosId(amosIds));
+    }
+    
     
     
     

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -2368,4 +2368,17 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return null;
 	}
 
+
+	public List<OrgUsr>	getByAmosId(List<String> amosIds) {
+		if (ValidationUtil.isEmpty(amosIds)) {
+			return null;
+		}
+		LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
+		wrapper.in(OrgUsr::getAmosOrgId, amosIds);
+		wrapper.eq(OrgUsr::getBizOrgType, OrgPersonEnum.人员.getKey());
+		return this.baseMapper.selectList(wrapper).stream().collect(Collectors.toList());
+
+
+	}
+
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentSpecificAlarmController.java

 package com.yeejoin.equipmanage.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.equipmanage.common.dto.OrgUsrDto;
+import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarmLog;
 import com.yeejoin.equipmanage.common.entity.dto.AlarmDTO;
 import com.yeejoin.equipmanage.common.entity.dto.EquipSpecificAlarmDTO;
 import com.yeejoin.equipmanage.common.entity.vo.EquipmentAppVO;
@@ -147,6 +149,14 @@ public class EquipmentSpecificAlarmController extends AbstractBaseController {
         return CommonResponseUtil.success(pageBean);
     }
 
+    @RequestMapping(value = "/getConfirmUser", method = RequestMethod.GET)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "获取处理人", notes = "获取处理人")
+    public ResponseModel<List<EquipmentSpecificAlarmLog>> getConfirmUser() {
+
+        return  CommonResponseUtil.success(iEquipmentSpecificAlarmService.getConfirmUser());
+
+    }
     
     /**
      * 设备信息

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/fegin/JcsFeign.java

@@ -143,4 +143,13 @@ public interface JcsFeign {
     ResponseModel<OrgUsrDto> getCompanyByBizOrgCodeList(
             @RequestParam(required = false) String bizOrgCode);
 
+    /**
+     * 根据amosId查询人员
+     *
+     * @return
+     */
+    @RequestMapping(value = "/org-usr/find/getByAmosId", method = RequestMethod.GET, consumes = "application/json")
+    ResponseModel<List<OrgUsrDto>> getByAmosId(
+            @RequestParam(required = false) List<String> amosIds);
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentSpecificAlarmMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.equipmanage.common.datasync.entity.FireEquipmentFireAlarm;
 import com.yeejoin.equipmanage.common.entity.EquipmentIndex;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarm;
+import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarmLog;
 import com.yeejoin.equipmanage.common.entity.dto.AlarmDTO;
 import com.yeejoin.equipmanage.common.entity.dto.EquipSpecificAlarmDTO;
 import com.yeejoin.equipmanage.common.entity.vo.EquipmentIotAlarmVO;
@@ -164,6 +165,7 @@ public interface EquipmentSpecificAlarmMapper extends BaseMapper<EquipmentSpecif
     Page<EquipSpecificAlarmDTO> getAlarmPage(Page page, @Param("dto") AlarmDTO dto);
 
     Page<EquipSpecificAlarmDTO> getEqPage(Page page, @Param("dto") AlarmDTO dto);
+    List<EquipmentSpecificAlarmLog> getConfirmUser();
 
     EquipSpecificAlarmDTO getbyqrCode(@Param("code") String code);
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEquipmentSpecificAlarmService.java

@@ -3,7 +3,9 @@ package com.yeejoin.equipmanage.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.equipmanage.common.datasync.entity.FireEquipmentFireAlarm;
+import com.yeejoin.equipmanage.common.dto.OrgUsrDto;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarm;
+import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarmLog;
 import com.yeejoin.equipmanage.common.entity.dto.AlarmDTO;
 import com.yeejoin.equipmanage.common.entity.dto.EquipSpecificAlarmDTO;
 import com.yeejoin.equipmanage.common.utils.CommonPageInfoParam;
@@ -60,6 +62,10 @@ public interface IEquipmentSpecificAlarmService extends IService<EquipmentSpecif
 
     Page<EquipSpecificAlarmDTO> getEqPage(Page page, AlarmDTO dto);
 
+    List<EquipmentSpecificAlarmLog> getConfirmUser();
+
+
+
     //各种类型统计
     Integer getcountAlarmtype(String tyep);
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificAlarmServiceImpl.java

@@ -21,7 +21,10 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import javax.servlet.http.HttpServletResponse;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.equipmanage.common.dto.OrgUsrDto;
 import com.yeejoin.equipmanage.common.vo.*;
+import com.yeejoin.equipmanage.fegin.JcsFeign;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.PageImpl;
@@ -97,6 +100,9 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
     @Value("${window.vedioFormat}")
     String vedioFormat;
 
+    @Autowired
+    JcsFeign jcsFeign;
+
     @Override
     public void handleExport(HttpServletResponse response, List<Long> ids, String alarmType) {
         CommonPageInfoParam param = new CommonPageInfoParam();
@@ -607,6 +613,20 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
     }
 
     @Override
+    public  List<EquipmentSpecificAlarmLog> getConfirmUser() {
+        List<EquipmentSpecificAlarmLog> equipSpecificAlarmDTOList = equipmentSpecificAlarmMapper.getConfirmUser();
+        List<String> confirmUser = new ArrayList<>();
+        equipSpecificAlarmDTOList.forEach(e->confirmUser.add(e.getConfirmUser()));
+        List<OrgUsrDto> result = jcsFeign.getByAmosId(confirmUser).getResult();
+        equipSpecificAlarmDTOList.stream().forEach(e->result.forEach(a->{
+            if (a.getAmosOrgId().equals(e.getConfirmUser())){
+                e.setJcsConfirmUserName(a.getBizOrgName());
+            }
+                }));
+        return equipSpecificAlarmDTOList;
+    }
+
+    @Override
     public Integer getcountAlarmtype(String tyep) {
         return equipmentSpecificAlarmMapper.getcountAlarmtype(tyep);
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/UserCarServiceImpl.java

@@ -11,6 +11,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import java.util.List;
+
 
 /**
  * 航空器信息服务实现类
@@ -36,6 +38,16 @@ public class UserCarServiceImpl extends BaseService<AircraftDto, UserCar, UserCa
     }
 
     @Override
+    public List<UserCar> selectList() {
+        return this.list();
+    }
+
+    @Override
+    public String selectListid() {
+        return UserCarMapper.selectListid();
+    }
+
+    @Override
     public void add(UserCar userCar) {
 
         QueryWrapper<UserCar> queryWrapper = new QueryWrapper<>();

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml

@@ -1030,6 +1030,16 @@
         ORDER BY status DESC
     </select>
 
+    <select id="getConfirmUser" resultType="com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarmLog">
+        SELECT
+            distinct 	confirm_user,
+                        confirm_user_name
+        FROM
+            wl_equipment_specific_alarm_log
+        WHERE
+            confirm_user IS NOT NULL;
+    </select>
+
     <select id="getbyqrCode" resultType="com.yeejoin.equipmanage.common.entity.dto.EquipSpecificAlarmDTO">
 
        SELECT