增加app接口

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

@@ -71,6 +71,35 @@ public interface EquipFeignClient {
     @RequestMapping(value = "/car/list-all", method = RequestMethod.GET)
     ResponseModel<Object> getFireCarListAll();
 
+
+
+
+    /**
+     * 获取本单位下车辆列表
+     *
+     * @return
+     */
+    @RequestMapping(value = "/car/list-allpag", method = RequestMethod.GET)
+    ResponseModel<Object> equipmentCarList( @RequestParam Long teamId,
+                                                               @RequestParam String name,
+                                                               @RequestParam String code ,
+                                                               @RequestParam String pageNum,
+                                                               @RequestParam String pageSize,
+                                                               @RequestParam Long id);
+
+
+
+
+    /**
+     * 车辆树
+     **/
+    @RequestMapping(value = "/equipment-category/tree/2", method = RequestMethod.GET)
+    ResponseModel<Object> gettree();
+
+
+
+
+
     /**
      * 获取个队伍下车辆统计
      *

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IFirefightersService.java

@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.biz.common.utils.Menu;
 import com.yeejoin.amos.boot.module.common.api.dto.FirefightersDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FirefightersInfoDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FirefightersZhDto;
+import com.yeejoin.amos.boot.module.common.api.entity.Firefighters;
 
 
 /**
@@ -27,9 +28,9 @@ public interface IFirefightersService {
     List<Menu> getFirefightersJobTitleCount() throws Exception;
 
     void saveFirefighters(FirefightersInfoDto firefighters);
-    
-    
-    
+
+
+    Firefighters selectByAmosOrgId(Long id);
     
     
     

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IOrgUsrService.java

@@ -235,4 +235,8 @@ public interface IOrgUsrService {
 
 
     List<OrgUsr> selectCompanyUsers(Long orgUnitId);
+
+
+    OrgUsr selectByAmosOrgId(Long id);
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/UserCarDto.java

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
+import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ **/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "UserCarDto", description = "人与车")
+public class UserCarDto extends BaseDto {
+
+    @TableField("amos_user_name")
+    private String amosUserName;
+    @TableField("amos_user_id")
+    private Long amosUserId;
+    @TableField("car_num")
+    private String carNum;
+    @TableField("car_id")
+    private Long carId;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/UserCar.java

+package com.yeejoin.amos.boot.module.jcs.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+* 人员与车辆关系
+*
+*
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("jc_user_car")
+public class UserCar extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+	@TableField("amos_user_name")
+    private String amosUserName;
+	@TableField("amos_user_id")
+    private Long amosUserId;
+	@TableField("car_num")
+    private String carNum;
+	@TableField("car_id")
+    private Long carId;
+    }

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

+package com.yeejoin.amos.boot.module.jcs.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftListTreeDto;
+import com.yeejoin.amos.boot.module.jcs.api.entity.Aircraft;
+import com.yeejoin.amos.boot.module.jcs.api.entity.UserCar;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+*
+*人员与车辆信息
+*/
+public interface UserCarMapper extends BaseMapper<UserCar> {
+
+}

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

+package com.yeejoin.amos.boot.module.jcs.api.service;
+
+
+import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftListTreeDto;
+import com.yeejoin.amos.boot.module.jcs.api.entity.Aircraft;
+import com.yeejoin.amos.boot.module.jcs.api.entity.UserCar;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+*
+*/
+public interface IUserCarService {
+
+
+    UserCar selectByAmosUserId(Long id);
+
+    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

+<?xml version="1.0" encoding="UTF-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">
+
+
+
+</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

@@ -18,6 +18,8 @@ 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.entity.OrgUsr;
 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.service.IDutyCarService;
@@ -40,13 +42,10 @@ import com.yeejoin.amos.boot.module.jcs.api.dto.KeyValueLabel;
 import com.yeejoin.amos.boot.module.jcs.api.dto.StateDot;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.module.jcs.api.entity.UserCar;
 import com.yeejoin.amos.boot.module.jcs.api.enums.AlertStageEnums;
-import com.yeejoin.amos.boot.module.jcs.api.service.IAircraftService;
-import com.yeejoin.amos.boot.module.jcs.api.service.IAlertCalledService;
-import com.yeejoin.amos.boot.module.jcs.api.service.IAlertFormValueService;
-import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedService;
-import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferCompanyService;
-import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferService;
+import com.yeejoin.amos.boot.module.jcs.api.service.*;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.PermissionModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -149,6 +148,11 @@ public class CommandController extends BaseController {
     IDutyCarService iDutyCarService;
     @Autowired
     IotFeignClient iotFeignClient;
+
+    @Autowired
+    IUserCarService userCarService;
+
+
     /**
      * 警情列表
      *
@@ -1178,10 +1182,62 @@ public class CommandController extends BaseController {
 
 
 
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "equipmentCarList")
+    @ApiOperation(httpMethod = "GET", value = "车辆列表", notes = "车辆列表")
+    public ResponseModel<Object> equipmentCarList(   String name,
+                                                     String code ,
+                                                     String pageNum,
+                                                     String pageSize,
+                                                     Boolean isNo ) {
+        //获取用户所属单位id
+        AgencyUserModel agencyUserModel= getUserInfo();
+        Long  teamId=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()));
+        if(isNo!=null&&isNo){
+            id =userCar!=null?userCar.getAmosUserId():null;
+        }
+        ResponseModel<Object> data=  equipFeignClient.equipmentCarList(teamId,name,code , pageNum,pageSize,id);
+        Map map =new HashMap();
+        map.put("select",userCar!=null?userCar.getAmosUserId():null);
+        map.put("data",data!=null?data.getResult():null);
+        return ResponseHelper.buildResponse(map);
+    }
+
+
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "gettree")
+    @ApiOperation(httpMethod = "GET", value = "车辆分类", notes = "车辆分类")
+    public ResponseModel<Object> gettree(  ) {
+
+        ResponseModel<Object> data=  equipFeignClient.gettree();
+        return ResponseHelper.buildResponse(data!=null?data.getResult():null);
+    }
+
+
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "adduserCar/{type}", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
+    @ApiOperation(httpMethod = "POST", value = "增加绑定", notes = "增加绑定")
+    public ResponseModel<Object> adduserCar(@PathVariable String type,UserCar userCar  ) {
+        AgencyUserModel agencyUserModel= getUserInfo();
+        userCar.setAmosUserId(Long.valueOf(agencyUserModel.getUserId()));
+        userCar.setAmosUserName(agencyUserModel.getUserName());
+
+        if("1".equals(type)){
 
+            userCarService.add(userCar);
+        }else{
 
+            userCarService.delete(userCar);
+        }
 
 
+        return ResponseHelper.buildResponse(null);
+    }
 
 
 }
\ No newline at end of file

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

@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.module.common.api.dto.FirefightersExcelDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FirefightersInfoDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FirefightersZhDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FirefightersContacts;
+import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
@@ -82,6 +83,16 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
         firefighters.setFirefighters(firefighter);
     }
 
+    @Override
+    public Firefighters selectByAmosOrgId(Long id) {
+
+        QueryWrapper<Firefighters> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("amos_user_id",id);
+        Firefighters firefighters = firefightersMapper.selectOne(queryWrapper);
+
+        return firefighters;
+    }
+
     /**
      * 导出列表
      */

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

@@ -1674,6 +1674,16 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	}
 
 	@Override
+	public OrgUsr selectByAmosOrgId(Long id) {
+
+		QueryWrapper<OrgUsr> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("amos_org_id",id);
+		OrgUsr orgUsr = orgUsrMapper.selectOne(queryWrapper);
+
+		return orgUsr;
+	}
+
+	@Override
     public AgencyUserModel getAmosIdByOrgUserId(String orgUserId) throws Exception {
         OrgUsr orgUsr = this.baseMapper.selectOne(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getSequenceNbr,
                 orgUserId));

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

+package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.feign.IotFeignClient;
+import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftListTreeDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.KeyValueLabel;
+import com.yeejoin.amos.boot.module.jcs.api.entity.Aircraft;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.module.jcs.api.entity.UserCar;
+import com.yeejoin.amos.boot.module.jcs.api.enums.AircraftFileTypeEnum;
+import com.yeejoin.amos.boot.module.jcs.api.mapper.AircraftMapper;
+import com.yeejoin.amos.boot.module.jcs.api.mapper.UserCarMapper;
+import com.yeejoin.amos.boot.module.jcs.api.service.IAircraftService;
+import com.yeejoin.amos.boot.module.jcs.api.service.IUserCarService;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.FileInfoModel;
+import org.apache.commons.collections.map.HashedMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.core.foundation.exception.BaseException;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.foundation.utils.StringUtil;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.rdbms.annotation.Condition;
+import org.typroject.tyboot.core.rdbms.annotation.Operator;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.exception.instance.DataNotFound;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+
+/**
+ * 航空器信息服务实现类
+ *
+ * @author system_generator
+ * @date 2021-06-29
+ */
+@Service
+public class UserCarServiceImpl extends BaseService<AircraftDto, UserCar, UserCarMapper> implements IUserCarService {
+
+    @Autowired
+    UserCarMapper UserCarMapper;
+    @Override
+    public UserCar selectByAmosUserId(Long id) {
+        QueryWrapper<UserCar> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("amos_user_id", id);
+        return UserCarMapper.selectOne(queryWrapper);
+    }
+
+    @Override
+    public void add(UserCar userCar) {
+
+        QueryWrapper<UserCar> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("amos_user_id", userCar.getAmosUserId());
+        UserCar uer= UserCarMapper.selectOne(queryWrapper);
+        if(uer!=null){
+            userCar.setSequenceNbr(uer.getSequenceNbr());
+            UserCarMapper.updateById(userCar);
+        }else{
+              UserCarMapper.insert(userCar);
+        }
+    }
+
+    @Override
+    public void delete(UserCar userCar) {
+        QueryWrapper<UserCar> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("amos_user_id", userCar.getAmosUserId());
+        UserCarMapper.delete(queryWrapper);
+    }
+}

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -1683,4 +1683,38 @@
     </changeSet>
 
 
+    <changeSet author="tw" id="2021-10-13-tw-01">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <tableExists tableName="jc_user_car"/>
+            </not>
+        </preConditions>
+        <comment>create table jc_user_car</comment>
+        <sql>
+            CREATE TABLE `jc_user_car`  (
+            `sequence_nbr` bigint(20) NOT NULL COMMENT '物理主键',
+            `amos_user_name` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '平台账号',
+            `amos_user_id` bigint(20) NULL DEFAULT NULL COMMENT '平台账号id',
+            `car_num` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '车牌号',
+            `car_id` bigint(20) NULL DEFAULT NULL COMMENT '车辆id',
+            `rec_user_name` varchar(15) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '操作人名称',
+            `rec_user_id` varchar(19) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '操作人员',
+            `rec_date` datetime(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '创建时间',
+            `is_delete` bit(1) NULL DEFAULT b'0' COMMENT '是否删除',
+            PRIMARY KEY (`sequence_nbr`) USING BTREE
+            ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+        </sql>
+    </changeSet>
+
+
+
+
+
+
+
+
+
+
+
+
         </databaseChangeLog>