Skip to content

A
amos-boot-biz
Commit f596cff7 authored by tangwei's avatar tangwei
Browse files
Options

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

parents 9ef834c8 d1d8e146
Hide whitespace changes
Inline Side-by-side
Showing with 1660 additions and 554 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FailureDetailsDto.java
View file @ f596cff7
package com.yeejoin.amos.boot.module.common.api.dto; package com.yeejoin.amos.boot.module.common.api.dto;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto; import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import com.yeejoin.amos.boot.module.common.api.entity.SourceFile; import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.Date;
import java.util.List;
/** /**
* @author system_generator * @author system_generator
* @date 2021-08-04 * @date 2021-08-04
...@@ -37,10 +38,9 @@ public class FailureDetailsDto extends BaseDto { ...@@ -37,10 +38,9 @@ public class FailureDetailsDto extends BaseDto {
@ApiModelProperty(value = "故障设备") @ApiModelProperty(value = "故障设备")
private String failureEquipment; private String failureEquipment;
@JsonFormat(locale = "zh",timezone = "GMT+8",pattern = "YYYY-MM-dd") @JsonFormat(locale = "zh",timezone = "GMT+8",pattern = "YYYY-MM-dd")
@ApiModelProperty(value = "故障时间") @ApiModelProperty(value = "故障时间")
private Date faultTime; private String faultTime;
@ApiModelProperty(value = "故障现象") @ApiModelProperty(value = "故障现象")
private String faultPhenomenon; private String faultPhenomenon;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/KeySiteDto.java
View file @ f596cff7
...@@ -85,6 +85,12 @@ public class KeySiteDto extends BaseDto implements Serializable{ ...@@ -85,6 +85,12 @@ public class KeySiteDto extends BaseDto implements Serializable{
@ApiModelProperty(value = "使用性质名称") @ApiModelProperty(value = "使用性质名称")
private String useNatureName; private String useNatureName;
@ApiModelProperty(value = "经度")
private Double longitude;
@ApiModelProperty(value = "纬度")
private Double latitude;
@ApiModelProperty(value = "备注") @ApiModelProperty(value = "备注")
private String remark; private String remark;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/UserDto.java 0 → 100644
View file @ f596cff7
package com.yeejoin.amos.boot.module.common.api.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 单位归属
*
* @author gaojianqiang
* @date 2021-08-19
*/
@Data
@ApiModel(value = "UserDto", description = "用户信息")
public class UserDto {
@ApiModelProperty(value = "人员类型1-维保公司；2-业主单位")
private String identityType;
@ApiModelProperty(value = "人员id")
private String personSeq;
@ApiModelProperty(value = "人员名称")
private String personName;
@ApiModelProperty(value = "公司id")
private String companyId;
@ApiModelProperty(value = "公司名称")
private String companyName;
@ApiModelProperty(value = "字段名")
private String fieldCode;
@ApiModelProperty(value = "字段值")
private String fieldValue;
@ApiModelProperty(value = "机构编码")
private String bizOrgCode;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourceDto.java
View file @ f596cff7
...@@ -318,8 +318,9 @@ public class WaterResourceDto extends BaseDto { ...@@ -318,8 +318,9 @@ public class WaterResourceDto extends BaseDto {
@ExcelIgnore @ExcelIgnore
@ApiModelProperty("设施分类id") @ApiModelProperty("设施分类id")
private Long equipCategoryId; private Long equipCategoryId;
// BUG 2935 优化项 分类从93060000 取得字典数据 by kongfm 2021-09-17
@ApiModelProperty("设施分类名称") @ApiModelProperty("设施分类名称")
@ExplicitConstraint(indexNum = 45, sourceClass = RoleNameExplicitConstraint.class, method = "getEquipCategory")
@ExcelProperty(value = "设施分类名称", index = 45) @ExcelProperty(value = "设施分类名称", index = 45)
private String equipCategoryName; private String equipCategoryName;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FailureDetails.java
View file @ f596cff7
...@@ -4,6 +4,7 @@ import java.util.Date; ...@@ -4,6 +4,7 @@ import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data; import lombok.Data;
...@@ -51,8 +52,9 @@ public class FailureDetails extends BaseEntity { ...@@ -51,8 +52,9 @@ public class FailureDetails extends BaseEntity {
/** /**
* 故障时间 * 故障时间
*/ */
@JsonFormat(locale = "zh",timezone = "GMT+8",pattern = "YYYY-MM-dd")
@TableField("fault_time") @TableField("fault_time")
private Date faultTime; private String faultTime;
/** /**
* 故障现象 * 故障现象
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/KeySite.java
View file @ f596cff7
package com.yeejoin.amos.boot.module.common.api.entity; package com.yeejoin.amos.boot.module.common.api.entity;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
......
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
View file @ f596cff7
...@@ -94,7 +94,20 @@ public interface EquipFeignClient { ...@@ -94,7 +94,20 @@ public interface EquipFeignClient {
*/ */
@RequestMapping(value = "/building/tree", method = RequestMethod.GET) @RequestMapping(value = "/building/tree", method = RequestMethod.GET)
ResponseModel<Object> getBuildingTree(); ResponseModel<Object> getBuildingTree();
/**
* 获取消防建筑详情
*
* @return
*/
@RequestMapping(value = "/building/getOne", method = RequestMethod.GET)
ResponseModel<Object> getOne(@RequestParam Long instanceId);
/**
* 获取指定建筑的经纬度信息
*
* @return
*/
@RequestMapping(value = "/building/getBuildingToLongitudeAndLatitude", method = RequestMethod.GET)
ResponseModel<Object> getBuildingToLongitudeAndLatitude(@RequestParam String instanceId);
/** /**
* 更新车辆状态 * 更新车辆状态
* *
...@@ -200,4 +213,11 @@ public interface EquipFeignClient { ...@@ -200,4 +213,11 @@ public interface EquipFeignClient {
@RequestMapping(value = "/building/getAllBuilding", method = RequestMethod.GET) @RequestMapping(value = "/building/getAllBuilding", method = RequestMethod.GET)
ResponseModel<List<LinkedHashMap<String, Object>>> getAllBuilding(); ResponseModel<List<LinkedHashMap<String, Object>>> getAllBuilding();
/**
* 查询所有建筑的数据字典// BUG 2935 优化项 分类从93060000 取得字典数据 by kongfm 2021-09-17
* @return
*/
@RequestMapping(value = "equipment-category/tree/{type}", method = RequestMethod.GET)
ResponseModel<List<LinkedHashMap<String, Object>>> getEquipmentCategory(@PathVariable String type);
} }
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FailureDetailsMapper.java
View file @ f596cff7
...@@ -22,124 +22,141 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> { ...@@ -22,124 +22,141 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> {
/** /**
* 查询全部 分页 * 查询全部 分页
*
* @param currentStatus 当前任务状态 * @param currentStatus 当前任务状态
* * @param startTime 起始时间 * * @param startTime 起始时间
* * @param endTime 结束时间 * * @param endTime 结束时间
* * @param submissionPid 报送人 * * @param submissionPid 报送人
* @param current 当前页 * @param current 当前页
* @return * @return
*/ */
List<FailureDetails> selectAllPage(Long current,Long size, Long currentStatus, List<FailureDetails> selectAllPage(Long current, Long size, Long currentStatus,
String startTime,String endTime, Integer submissionPid); String startTime, String endTime, Integer submissionPid);
List<FailureDetailsDto> selectWebPage(Long current, Long size,Long currentStatus,
String startTime, String endTime, String submissionName, Long submissionBranchId,
Long sequenceNbr);
/** /**
* 查询我发起的 分页 * 查询我发起的 分页
* current 当前页 * current 当前页
* size 条数 * size 条数
*
* @param currentStatus 当前任务状态 * @param currentStatus 当前任务状态
* * @param startTime 起始时间 * * @param startTime 起始时间
* * @param endTime 结束时间 * * @param endTime 结束时间
* * @param submissionPid 报送人 * * @param submissionPid 报送人
* @return * @return
*/ */
List<FailureDetails> selectISubPage(Long current,Long size, Long currentStatus, List<FailureDetails> selectISubPage(Long current, Long size, Long currentStatus,
String startTime,String endTime, Integer submissionPid); String startTime, String endTime, Integer submissionPid);
/** /**
* 查询待处理 分页 * 查询待处理 分页
*
* @param currentStatus 当前任务状态 * @param currentStatus 当前任务状态
* * @param startTime 起始时间 * * @param startTime 起始时间
* * @param endTime 结束时间 * * @param endTime 结束时间
* * @param submissionPid 报送人 * * @param submissionPid 报送人
* @param * @param
* @return * @return
*/ */
List<FailureDetails> selectInProcessing(Long current,Long size,Long currentStatus, List<FailureDetails> selectInProcessing(Long current, Long size, Long currentStatus,
String startTime,String endTime, Integer submissionPid); String startTime, String endTime, Integer submissionPid);
/** /**
* 查询待处理 应急指挥科人员分页 * 查询待处理 应急指挥科人员分页
* *
* @param * @param
* @return * @return
*/ */
List<FailureDetails> selectStatusWaitTj(Long current,Long size,Long currentStatus, List<FailureDetails> selectStatusWaitTj(Long current, Long size, Long currentStatus,
String startTime,String endTime, Integer submissionPid); String startTime, String endTime, Integer submissionPid);
/** /**
* 查询待处理 维修人员分页 * 查询待处理 维修人员分页
*
* @param currentStatus 当前任务状态 * @param currentStatus 当前任务状态
* * @param startTime 起始时间 * * @param startTime 起始时间
* * @param endTime 结束时间 * * @param endTime 结束时间
* * @param submissionPid 报送人 * * @param submissionPid 报送人
* @param * @param
* @return * @return
*/ */
List<FailureDetails> selectStatusWaitWx(Long current,Long size,Long currentStatus, List<FailureDetails> selectStatusWaitWx(Long current, Long size, Long currentStatus,
String startTime,String endTime, Integer submissionPid); String startTime, String endTime, Integer submissionPid);
/** /**
* 统计 全部 * 统计 全部
* *
* @param currentStatus 状态 * @param currentStatus 状态
* @param startTime 起始时间 * @param startTime 起始时间
* @param endTime 结束时间 * @param endTime 结束时间
* @param submissionPid 报送人 * @param submissionPid 报送人
*
* @return * @return
*/ */
List<StatusDto> selectStatusCount(Long currentStatus,String startTime,String endTime, Integer submissionPid); List<StatusDto> selectStatusCount(Long currentStatus, String startTime, String endTime, Integer submissionPid);
/** /**
* 统计 维修人员 * 统计 维修人员
* *
* @param currentStatus 状态 * @param currentStatus 状态
* @param startTime 起始时间 * @param startTime 起始时间
* @param endTime 结束时间 * @param endTime 结束时间
* @param submissionPid 报送人 * @param submissionPid 报送人
*
* @return * @return
*/ */
List<StatusDto> selectStatusWx(Long currentStatus,String startTime,String endTime, Integer submissionPid); List<StatusDto> selectStatusWx(Long currentStatus, String startTime, String endTime, Integer submissionPid);
/** /**
* 统计 应急指挥科人员 * 统计 应急指挥科人员
* *
* @param currentStatus 状态 * @param currentStatus 状态
* @param startTime 起始时间 * @param startTime 起始时间
* @param endTime 结束时间 * @param endTime 结束时间
* @param submissionPid 报送人 * @param submissionPid 报送人
*
* @return * @return
*/ */
List<StatusDto> selectStatusFq(Long currentStatus,String startTime,String endTime, Integer submissionPid); List<StatusDto> selectStatusFq(Long currentStatus, String startTime, String endTime, Integer submissionPid);
/** /**
* 统计 我发起 * 统计 我发起
* *
* @param currentStatus 状态 * @param currentStatus 状态
* @param startTime 起始时间 * @param startTime 起始时间
* @param endTime 结束时间 * @param endTime 结束时间
* @param submissionPid 报送人 * @param submissionPid 报送人
*
* @return * @return
*/ */
List<StatusDto> selectStatusFqp(Long currentStatus,String startTime,String endTime, Integer submissionPid); List<StatusDto> selectStatusFqp(Long currentStatus, String startTime, String endTime, Integer submissionPid);
/** /**
* 统计 领导 * 统计 领导
* *
* @param currentStatus 状态 * @param currentStatus 状态
* @param startTime 起始时间 * @param startTime 起始时间
* @param endTime 结束时间 * @param endTime 结束时间
* @param submissionPid 报送人 * @param submissionPid 报送人
*
* @return * @return
*/ */
List<StatusDto> selectStatusLeader(Long currentStatus,String startTime,String endTime, Integer submissionPid); List<StatusDto> selectStatusLeader(Long currentStatus, String startTime, String endTime, Integer submissionPid);
List<StatusDto> selectAudit(Long currentStatus, String startTime, String endTime, Integer submissionPid, String userId);
List<StatusDto> selectMaintain(Long currentStatus, String startTime, String endTime, Integer submissionPid, String userId);
List<StatusDto> selectUserId(Long currentStatus, String startTime, String endTime, String userId);
List<FailureDetails> selectYJ(Long currentStatus, String startTime, String endTime, String userId,Long current, Long size);
List<FailureDetails> selectForAudit(Long currentStatus, String startTime, String endTime,Integer submissionPid, String userId,Long current, Long size);
List<FailureDetails> selectForMaintain(Long currentStatus, String startTime, String endTime, Integer submissionPid, String userId,Long current, Long size);
} }
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/OrgUsrMapper.java
View file @ f596cff7
...@@ -74,6 +74,8 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> { ...@@ -74,6 +74,8 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
List<UserUnitDto> getUserUnit(String id, String type, String code); List<UserUnitDto> getUserUnit(String id, String type, String code);
List<UserDto> getUserInfo(String id, String type, String code, String fieldCode);
/** /**
* 导出机场单位带过滤 bug2657 by kongfm * 导出机场单位带过滤 bug2657 by kongfm
* @param parentId * @param parentId
......
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
View file @ f596cff7
package com.yeejoin.amos.boot.module.common.api.service; package com.yeejoin.amos.boot.module.common.api.service;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yeejoin.amos.boot.module.common.api.dto.CheckObjectDto; import com.yeejoin.amos.boot.module.common.api.dto.*;
import com.yeejoin.amos.boot.module.common.api.dto.CompanyDto;
import com.yeejoin.amos.boot.module.common.api.dto.ESOrgUsrDto;
import com.yeejoin.amos.boot.module.common.api.dto.FormValue;
import com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentFormDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonFormDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrExcelDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrFormDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrzhDto;
import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
import com.yeejoin.amos.boot.module.common.api.dto.UserUnitDto;
import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance; import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr; import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel; import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import java.util.Collection;
import java.util.List;
import java.util.Map;
/** /**
* 机构/部门/人员表 服务类 * 机构/部门/人员表 服务类
* *
...@@ -31,207 +17,203 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel; ...@@ -31,207 +17,203 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
* @date 2021-06-18 * @date 2021-06-18
*/ */
public interface IOrgUsrService { public interface IOrgUsrService {
/** /**
* 查询上级单位 * 查询上级单位
* *
* @param parent_id * @param parent_id
* @return * @return
*/ */
String selectUpUnitByParam(String parent_id); String selectUpUnitByParam(String parent_id);
/** /**
* 获取父级 * 获取父级
* *
* @param topId * @param topId
* @param entityList * @param entityList
* @param packageURL * @param packageURL
* @param IDMethodName * @param IDMethodName
* @param IDHierarchy * @param IDHierarchy
* @param NAMEMethodName * @param NAMEMethodName
* @param PARENTIDMethodName * @param PARENTIDMethodName
* @param OrgTypeMethodName * @param OrgTypeMethodName
* @return * @return
* @throws Exception * @throws Exception
*/ */
List<OrgMenuDto> getTree(Long topId, Collection entityList, String packageURL, String IDMethodName, int IDHierarchy, List<OrgMenuDto> getTree(Long topId, Collection entityList, String packageURL, String IDMethodName, int IDHierarchy,
String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName) throws Exception; String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName) throws Exception;
/** /**
* 获取子数据集合 * 获取子数据集合
* *
* @param topId * @param topId
* @param entityList * @param entityList
* @param packageURL * @param packageURL
* @param IDMethodName * @param IDMethodName
* @param IDHierarchy * @param IDHierarchy
* @param NAMEMethodName * @param NAMEMethodName
* @param PARENTIDMethodName * @param PARENTIDMethodName
* @param OrgTypeMethodName * @param OrgTypeMethodName
* @return * @return
* @throws Exception * @throws Exception
*/ */
List<OrgMenuDto> getSub(Long topId, Collection entityList, String packageURL, String IDMethodName, int IDHierarchy, List<OrgMenuDto> getSub(Long topId, Collection entityList, String packageURL, String IDMethodName, int IDHierarchy,
String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName) throws Exception; String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName) throws Exception;
/** /**
* 组装融合调度单位人员信息 * 组装融合调度单位人员信息
* *
* @param ids * @param ids
* @return * @return
* @throws Exception * @throws Exception
*/ */
List<Map<String, Object>> returnCompanyPersonMsg(List<Long> ids) throws Exception; List<Map<String, Object>> returnCompanyPersonMsg(List<Long> ids) throws Exception;
/** /**
* 获取动态表单数据 * 获取动态表单数据
* *
* @param id * @param id
* @return * @return
* @throws Exception * @throws Exception
*/ */
List<FormValue> getFormValue(Long id) throws Exception; List<FormValue> getFormValue(Long id) throws Exception;
/** /**
* 保存 机构/部门/人员基本信息 * 保存 机构/部门/人员基本信息
* *
* @param * @param
* @throws Exception * @throws Exception
*/ */
void saveOrgUsr(OrgUsr orgUsr, OrgUsr oriOrgUsr) throws Exception; void saveOrgUsr(OrgUsr orgUsr, OrgUsr oriOrgUsr) throws Exception;
/** /**
* 新增机构/部门/人员基本信息和动态表单数据 * 新增机构/部门/人员基本信息和动态表单数据
* *
* @param orgUsr * @param orgUsr
* @param alertFromValuelist * @param alertFromValuelist
*/ */
void saveOrgUsrDynamicFormInstance(OrgUsr orgUsr, List<DynamicFormInstance> alertFromValuelist) throws Exception; void saveOrgUsrDynamicFormInstance(OrgUsr orgUsr, List<DynamicFormInstance> alertFromValuelist) throws Exception;
/** /**
* 更新机构/部门/人员基本信息和动态表单数据 * 更新机构/部门/人员基本信息和动态表单数据
* *
* @param instanceId 实例id * @param instanceId 实例id
* @param fromValueList 动态表单数据列表 * @param fromValueList 动态表单数据列表
* @throws Exception * @throws Exception
*/ */
void updateDynamicFormInstance(Long instanceId, List<DynamicFormInstance> fromValueList) throws Exception; void updateDynamicFormInstance(Long instanceId, List<DynamicFormInstance> fromValueList) throws Exception;
/** /**
* @param id * @param id
* @throws Exception * @throws Exception
*/ */
Map<String, Object> selectForShowById(OrgUsr orgUsr, Long id) throws Exception; Map<String, Object> selectForShowById(OrgUsr orgUsr, Long id) throws Exception;
List<OrgUsr> selectCompanyDepartmentMsg(); List<OrgUsr> selectCompanyDepartmentMsg();
void saveOrgUsr(OrgUsrDto OrgUsrDto) throws Exception;
void saveOrgPerson(OrgPersonDto OrgPersonDto) throws Exception;
void updateByIdOrgUsr(OrgUsrDto OrgUsrDto, Long id) throws Exception;
void updateByIdOrgPerson(OrgPersonDto OrgPersonDto, Long id) throws Exception;
OrgUsrFormDto selectCompanyById(Long id) throws Exception;
IPage bizOrgTypeListPage(String pageNum, String pageSize, String bizOrgType) throws Exception;
void saveDepartment(List<OrgDepartmentDto> OrgDepartmentDto, Long id) throws Exception;
void saveCompany(List<OrgUsrDto> OrgUsrDto) throws Exception;
OrgPersonFormDto selectPersonById(Long id) throws Exception;
OrgPersonFormDto selectPersonByIdDetail(Long id) throws Exception;
List<OrgMenuDto> selectPersonTree() throws Exception;
void savePersonList(List<OrgPersonDto> OrgPersonDto) throws Exception;
void saveOrgDepartment(OrgDepartmentDto OrgDepartmentDto) throws Exception;
void updateByIdOrgDepartment(OrgDepartmentDto OrgDepartmentDto, Long id) throws Exception;
OrgDepartmentFormDto selectDepartmentById(Long id) throws Exception;
List<Map<String, Object>> selectForShowByListId(List<Long> ids) throws Exception;
/**
* * @param null
*
* @return
*
* <PRE>
* author tw
* date 2021/7/20
* </PRE>
*
* 列表
*/
List<CompanyDto> listContractDto(Integer pageNum, Integer pageSize, RequestData requestData);
/**
* * @param null
*
* @return
*
* <PRE>
* author tw
* date 2021/7/20
* </PRE>
*
* 统计
*/
Integer listContractDtoCount(RequestData par);
/** void saveOrgUsr(OrgUsrDto OrgUsrDto) throws Exception;
* * @param null
*
* @return
*
* <PRE>
* author tw
* date 2021/7/26
* </PRE>
*/
List<OrgUsrzhDto> getOrgUsrzhDto(String name); void saveOrgPerson(OrgPersonDto OrgPersonDto) throws Exception;
List<ESOrgUsrDto> selectByIddata(String name); void updateByIdOrgUsr(OrgUsrDto OrgUsrDto, Long id) throws Exception;
List<Map<String, Object>> getparent(); void updateByIdOrgPerson(OrgPersonDto OrgPersonDto, Long id) throws Exception;
List<OrgUsrExcelDto> exportToExcel(); OrgUsrFormDto selectCompanyById(Long id) throws Exception;
UserUnitDto getUserUnit(String userId); IPage bizOrgTypeListPage(String pageNum, String pageSize, String bizOrgType) throws Exception;
/** void saveDepartment(List<OrgDepartmentDto> OrgDepartmentDto, Long id) throws Exception;
* 根据登陆人获取公司部门人员树
*/
List<OrgMenuDto> companyUserTreeByUser(AgencyUserModel user);
/** void saveCompany(List<OrgUsrDto> OrgUsrDto) throws Exception;
* 根据登陆人获取公司部门树
*/
List<OrgMenuDto> companyTreeByUser(AgencyUserModel user);
/** OrgPersonFormDto selectPersonById(Long id) throws Exception;
* 根据登陆人获取公司列表(关联重点部位)
*/ OrgPersonFormDto selectPersonByIdDetail(Long id) throws Exception;
List<CheckObjectDto> companyListByUser(AgencyUserModel user);
List<OrgMenuDto> selectPersonTree() throws Exception;
void savePersonList(List<OrgPersonDto> OrgPersonDto) throws Exception;
void saveOrgDepartment(OrgDepartmentDto OrgDepartmentDto) throws Exception;
void updateByIdOrgDepartment(OrgDepartmentDto OrgDepartmentDto, Long id) throws Exception;
OrgDepartmentFormDto selectDepartmentById(Long id) throws Exception;
List<Map<String, Object>> selectForShowByListId(List<Long> ids) throws Exception;
/**
* * @param null
*
* @return <PRE>
* author tw
* date 2021/7/20
* </PRE>
* <p>
* 列表
*/
List<CompanyDto> listContractDto(Integer pageNum, Integer pageSize, RequestData requestData);
/**
* * @param null
*
* @return <PRE>
* author tw
* date 2021/7/20
* </PRE>
* <p>
* 统计
*/
Integer listContractDtoCount(RequestData par);
/**
* * @param null
*
* @return <PRE>
* author tw
* date 2021/7/26
* </PRE>
*/
List<OrgUsrzhDto> getOrgUsrzhDto(String name);
List<ESOrgUsrDto> selectByIddata(String name);
List<Map<String, Object>> getparent();
List<OrgUsrExcelDto> exportToExcel();
UserUnitDto getUserUnit(String userId);
List<UserDto> getUserInfo(String userId);
/**
* 根据登陆人获取公司部门人员树
*/
List<OrgMenuDto> companyUserTreeByUser(AgencyUserModel user);
/**
* 根据登陆人获取公司部门树
*/
List<OrgMenuDto> companyTreeByUser(AgencyUserModel user);
/**
* 根据登陆人获取公司列表(关联重点部位)
*/
List<CheckObjectDto> companyListByUser(AgencyUserModel user);
/** /**
* 获取登陆人关联机场单位人员信息，部门信息 * 获取登陆人关联机场单位人员信息，部门信息
*/ */
List<Map<String, Object>> getLoginUserDetails(String userId, AgencyUserModel user); List<Map<String, Object>> getLoginUserDetails(String userId, AgencyUserModel user);
List<OrgUsr> getPersonListByParentId(Long id); List<OrgUsr> getPersonListByParentId(Long id);
/**
* 根据parentId 导出机场单位人员 bug2657 by kongfm
* @param parentId
* @return
*/
List<OrgUsrExcelDto> exportPersonToExcelByParentId(Long parentId);
/**
* 根据parentId 导出机场单位人员 bug2657 by kongfm
*
* @param parentId
* @return
*/
List<OrgUsrExcelDto> exportPersonToExcelByParentId(Long parentId);
} }
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FailureDetailsMapper.xml
View file @ f596cff7
...@@ -31,6 +31,42 @@ ...@@ -31,6 +31,42 @@
order by submission_time DESC limit #{current},#{size} order by submission_time DESC limit #{current},#{size}
</select> </select>
<select id="selectWebPage" resultType="com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto">
SELECT
sequence_nbr,
current_status,
failure_equipment_id,
failure_equipment,
fault_time,
fault_phenomenon,
submission_name,
submission_pid,
biz_code,
submission_time,
submission_branch,
submission_branch_id
FROM
cb_failure_details
<where>
<if test="currentStatus!= null ">
and current_status = #{currentStatus}
</if>
<if test="startTime!= null and endTime != null">
and submission_time between #{startTime} and #{endTime}
</if>
<if test="submissionName != null ">
and submission_name = #{submissionName}
</if>
<if test="submissionBranchId!= null ">
and submission_branch_id = #{submissionBranchId}
</if>
<if test="sequenceNbr!= null ">
and sequence_nbr = #{ sequenceNbr}
</if>
</where>
order by submission_time DESC limit #{current},#{size}
</select>
...@@ -257,5 +293,188 @@ ...@@ -257,5 +293,188 @@
GROUP BY cb_failure_details.current_status GROUP BY cb_failure_details.current_status
</select> </select>
<select id="selectAudit" resultType="com.yeejoin.amos.boot.module.common.api.dto.StatusDto">
SELECT
current_status,
count(current_status)
AS currentStatusCount
FROM
cb_failure_details d
<where>
d.sequence_nbr in
(SELECT
fault_id
FROM
cb_failure_audit
where
rec_user_id = #{userId}
)
<if test="currentStatus!= null ">
and current_status = #{currentStatus}
</if>
<if test="startTime!= null and endTime != null">
and submission_time between #{startTime} and #{endTime}
</if>
<if test="submissionPid!= null ">
and submission_pid = #{submissionPid}
</if>
</where>
GROUP BY current_status;
</select>
<select id="selectMaintain" resultType="com.yeejoin.amos.boot.module.common.api.dto.StatusDto">
SELECT
current_status,
count(current_status)
AS currentStatusCount
FROM
cb_failure_details d
<where>
d.sequence_nbr in
(SELECT
fault_id
FROM
cb_failure_maintain
where
rec_user_id = #{userId}
)
<if test="currentStatus!= null ">
and current_status = #{currentStatus}
</if>
<if test="startTime!= null and endTime != null">
and submission_time between #{startTime} and #{endTime}
</if>
<if test="submissionPid!= null ">
and submission_pid = #{submissionPid}
</if>
</where>
GROUP BY current_status;
</select>
<select id="selectUserId" resultType="com.yeejoin.amos.boot.module.common.api.dto.StatusDto">
SELECT
current_status,
count(current_status)
AS currentStatusCount
FROM
cb_failure_details d
WHERE
<where>
d.sequence_nbr in
(SELECT
fault_id
FROM
cb_failure_audit
where
audit_result = 2
)
<if test="currentStatus!= null ">
and current_status = #{currentStatus}
</if>
<if test="startTime!= null and endTime != null">
and submission_time between #{startTime} and #{endTime}
</if>
<if test="userId != null ">
and submission_pid = #{userId}
</if>
</where>
GROUP BY current_status;
</select>
<select id="selectYJ" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
SELECT
*
FROM
cb_failure_details d
WHERE
d.sequence_nbr in
(SELECT
fault_id
FROM
cb_failure_audit
where
) and
submission_pid = #{userId}
<where>
d.sequence_nbr in
(SELECT
fault_id
FROM
cb_failure_audit
where
audit_result = 2
)
<if test="currentStatus != null ">
and current_status = #{currentStatus}
</if>
<if test="startTime!= null and endTime != null">
and submission_time between #{startTime} and #{endTime}
</if>
<if test="userId != null ">
and submission_pid = #{userId}
</if>
</where>
order by submission_time DESC
limit #{current},#{size};
</select>
<select id="selectForAudit" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
SELECT
*
FROM
cb_failure_details d
<where>
d.sequence_nbr in
(SELECT
fault_id
FROM
cb_failure_audit
where
rec_user_id = #{userId}
)
<if test="currentStatus != null ">
and current_status = #{currentStatus}
</if>
<if test="startTime!= null and endTime != null">
and submission_time between #{startTime} and #{endTime}
</if>
<if test="submissionPid!= null ">
and submission_pid = #{submissionPid}
</if>
</where>
order by submission_time DESC
limit #{current},#{size};
</select>
<select id="selectForMaintain" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
SELECT
*
FROM
cb_failure_details d
<where>
d.sequence_nbr in
(SELECT
fault_id
FROM
cb_failure_maintain
where
rec_user_id = #{userId}
)
<if test="currentStatus != null ">
and current_status = #{currentStatus}
</if>
<if test="startTime!= null and endTime != null">
and submission_time between #{startTime} and #{endTime}
</if>
<if test="submissionPid!= null ">
and submission_pid = #{submissionPid}
</if>
</where>
order by submission_time DESC
limit #{current},#{size};
</select>
</mapper> </mapper>
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml
View file @ f596cff7
...@@ -421,6 +421,34 @@ GROUP BY ...@@ -421,6 +421,34 @@ GROUP BY
ORDER BY ORDER BY
u.sequence_nbr DESC u.sequence_nbr DESC
</select> </select>
<select id="getUserInfo" resultType="com.yeejoin.amos.boot.module.common.api.dto.UserDto">
SELECT
u.sequence_nbr AS personSeq,
u.biz_org_name AS personName,
'2' AS identityType,
u.biz_org_code,
f.field_code,
f.field_value
FROM
`cb_org_usr` u
LEFT JOIN cb_dynamic_form_instance f ON f.instance_id = u.sequence_nbr
<where>
<if test="id != null and id != ''">
u.amos_org_id = #{id}
</if>
<if test="type != null and type != ''">
AND u.biz_org_type = #{type}
</if>
<if test="code != null and code != ''">
AND u.biz_org_code LIKE CONCAT(#{code}, '%')
</if>
<if test="fieldCode != null and fieldCode != ''">
AND f.field_code IN ( #{fieldCode})
</if>
</where>
ORDER BY
u.sequence_nbr DESC
</select>
<!--BUG2655 导出机场人员存在已删除数据 bykongfm--> <!--BUG2655 导出机场人员存在已删除数据 bykongfm-->
<select id="exportToExcel" resultType="com.yeejoin.amos.boot.module.common.api.dto.OrgUsrExcelDto"> <select id="exportToExcel" resultType="com.yeejoin.amos.boot.module.common.api.dto.OrgUsrExcelDto">
select select
......
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AirportStandDto.java 0 → 100644
View file @ f596cff7
package com.yeejoin.amos.boot.module.jcs.api.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 机场机位旋转角度
*
* @author litw
* @date 2021-09-17
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="AirportStandDto", description="机场机位旋转角度")
public class AirportStandDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "机位号")
private String standCode;
@ApiModelProperty(value = "坐标X")
private String coordinateX;
@ApiModelProperty(value = "坐标Y")
private String coordinateY;
@ApiModelProperty(value = "经度")
private String longitude;
@ApiModelProperty(value = "纬度")
private String latitude;
@ApiModelProperty(value = "更新时间")
private Date updateTime;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AirportStand.java 0 → 100644
View file @ f596cff7
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;
import java.util.Date;
/**
* 机场机位旋转角度
*
* @author litw
* @date 2021-09-17
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("jc_airport_stand")
public class AirportStand extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 机位号
*/
@TableField("stand_code")
private String standCode;
/**
* 坐标X
*/
@TableField("coordinate_x")
private String coordinateX;
/**
* 坐标Y
*/
@TableField("coordinate_y")
private String coordinateY;
/**
* 经度
*/
@TableField("longitude")
private String longitude;
/**
* 纬度
*/
@TableField("latitude")
private String latitude;
/**
* 更新时间
*/
@TableField("update_time")
private Date updateTime;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/AirportStandMapper.java 0 → 100644
View file @ f596cff7
package com.yeejoin.amos.boot.module.jcs.api.mapper;
import com.yeejoin.amos.boot.module.jcs.api.entity.AirportStand;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* 机场机位旋转角度 Mapper 接口
*
* @author litw
* @date 2021-09-17
*/
public interface AirportStandMapper extends BaseMapper<AirportStand> {
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IAirportStandService.java 0 → 100644
View file @ f596cff7
package com.yeejoin.amos.boot.module.jcs.api.service;
/**
* 机场机位旋转角度接口类
*
* @author litw
* @date 2021-09-17
*/
public interface IAirportStandService {
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AirportStandMapper.xml 0 → 100644
View file @ f596cff7
<?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.AirportStandMapper">
</mapper>
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FailureDetailsController.java
View file @ f596cff7
...@@ -241,12 +241,7 @@ public class FailureDetailsController extends BaseController { ...@@ -241,12 +241,7 @@ public class FailureDetailsController extends BaseController {
@RequestParam (required = false) Long submissionBranchId, @RequestParam (required = false) Long submissionBranchId,
@RequestParam (required = false) Long sequenceNbr ) { @RequestParam (required = false) Long sequenceNbr ) {
Page<FailureDetailsDto> page = new Page<>(); Page<FailureDetailsDto> page = new Page<>();
if (current > 0) { page.setCurrent(current * size);
page.setCurrent((current - 1) * size);
} else {
page.setCurrent(current);
}
page.setSize(size); page.setSize(size);
ReginParams userInfo = getSelectedOrgInfo(); ReginParams userInfo = getSelectedOrgInfo();
IPage<FailureDetailsDto> failureDetailDTOsIPage = new Page<>(); IPage<FailureDetailsDto> failureDetailDTOsIPage = new Page<>();
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/KeySiteController.java
View file @ f596cff7
package com.yeejoin.amos.boot.module.common.biz.controller; package com.yeejoin.amos.boot.module.common.biz.controller;
import com.alibaba.fastjson.JSONArray; import java.util.ArrayList;
import com.alibaba.fastjson.JSONObject; import java.util.List;
import com.baomidou.mybatisplus.core.metadata.IPage; import java.util.Map;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.controller.BaseController; import javax.servlet.http.HttpServletRequest;
import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDateDto; import org.apache.commons.lang3.StringUtils;
import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
import com.yeejoin.amos.boot.module.common.api.service.IKeySiteService;
import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
import com.yeejoin.amos.boot.module.common.biz.service.impl.KeySiteServiceImpl;
import com.yeejoin.amos.boot.module.common.biz.service.impl.SourceFileServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
...@@ -30,11 +22,23 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation; ...@@ -30,11 +22,23 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper; import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletRequest; import com.alibaba.fastjson.JSONArray;
import java.util.ArrayList; import com.alibaba.fastjson.JSONObject;
import java.util.Collections; import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.List; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.Map; import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDateDto;
import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
import com.yeejoin.amos.boot.module.common.api.service.IKeySiteService;
import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
import com.yeejoin.amos.boot.module.common.biz.service.impl.KeySiteServiceImpl;
import com.yeejoin.amos.boot.module.common.biz.service.impl.SourceFileServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
/** /**
* 重点部位 * 重点部位
...@@ -47,113 +51,147 @@ import java.util.Map; ...@@ -47,113 +51,147 @@ import java.util.Map;
@RequestMapping(value = "/common/key-site") @RequestMapping(value = "/common/key-site")
public class KeySiteController extends BaseController { public class KeySiteController extends BaseController {
@Autowired @Autowired
KeySiteServiceImpl keySiteServiceImpl; KeySiteServiceImpl keySiteServiceImpl;
@Autowired @Autowired
IKeySiteService keySiteService; IKeySiteService keySiteService;
@Autowired @Autowired
IOrgUsrService iOrgUsrService; IOrgUsrService iOrgUsrService;
@Autowired @Autowired
SourceFileServiceImpl sourceFileService; SourceFileServiceImpl sourceFileService;
/**
* 新增重点部位 @Autowired
* EquipFeignClient equipFeignClient;
* @return
*/ /**
@TycloudOperation(ApiLevel = UserType.AGENCY) * 新增重点部位
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save") @PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增重点部位", notes = "新增重点部位") @ApiOperation(httpMethod = "POST", value = "新增重点部位", notes = "新增重点部位")
public ResponseModel<KeySiteDto> save(@RequestBody KeySiteDto model) { public ResponseModel<KeySiteDto> save(@RequestBody KeySiteDto model) {
model.setIsDelete(false); JSONObject json = getBulid(model.getBuildingId());
KeySiteDto entity= keySiteService.save(model); if (json != null) {
return ResponseHelper.buildResponse(entity); model.setLatitude(Double.parseDouble(json.getString("latitude")));
model.setLongitude(Double.parseDouble(json.getString("longitude")));
}
model.setIsDelete(false);
KeySiteDto entity = keySiteService.save(model);
return ResponseHelper.buildResponse(entity);
}
public JSONObject getBulid(Long buildingId) {
ResponseModel<Object> equipObj = equipFeignClient.getOne(buildingId);
JSONObject equipjSONObject = JSONObject.parseObject(JSONObject.toJSONString(equipObj.getResult()));
if (!equipjSONObject.containsKey("parentId")) {
return null;
}
if (!"0".equals(equipjSONObject.getString("parentId"))) {
String parentId = equipjSONObject.getString("parentId");
if (StringUtils.isNotBlank(parentId)) {
getBulid(Long.parseLong(parentId));
}
} else {
return equipjSONObject;
}
return null;
} }
/** /**
* 根据sequenceNbr更新 * 根据sequenceNbr更新
* *
* @param sequenceNbr 主键 * @param sequenceNbr 主键
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "update/{sequenceNbr}") @PutMapping(value = "update/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新重点部位", notes = "根据sequenceNbr更新重点部位") @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新重点部位", notes = "根据sequenceNbr更新重点部位")
public ResponseModel<Boolean> updateBySequenceNbrKeySite(@RequestBody KeySiteDto model ) { public ResponseModel<Boolean> updateBySequenceNbrKeySite(@RequestBody KeySiteDto model) {
return ResponseHelper.buildResponse(keySiteService.update(model, getUserInfo())); JSONObject json = getBulid(model.getBuildingId());
if (json != null) {
model.setLatitude(Double.parseDouble(json.getString("latitude")));
model.setLongitude(Double.parseDouble(json.getString("longitude")));
}
return ResponseHelper.buildResponse(keySiteService.update(model, getUserInfo()));
} }
/** /**
* 根据sequenceNbr删除 * 根据sequenceNbr删除
* *
* @param sequenceNbr 主键 * @param sequenceNbr 主键
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "delete") @DeleteMapping(value = "delete")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除重点部位", notes = "根据sequenceNbr删除重点部位") @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除重点部位", notes = "根据sequenceNbr删除重点部位")
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request,@RequestParam(value = "ids") String ids){ public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request,
List<Long> sequenceNbrList = new ArrayList<>(); @RequestParam(value = "ids") String ids) {
/* BUG 2670 litw start*/ List<Long> sequenceNbrList = new ArrayList<>();
String [] idsArr = ids.split(",") ; /* BUG 2670 litw start */
for (String str:idsArr String[] idsArr = ids.split(",");
) { for (String str : idsArr) {
sequenceNbrList.add(Long.valueOf(str)); sequenceNbrList.add(Long.valueOf(str));
} }
/* BUG 2670 end*/ /* BUG 2670 end */
return ResponseHelper.buildResponse(keySiteService.deleteById(sequenceNbrList)); return ResponseHelper.buildResponse(keySiteService.deleteById(sequenceNbrList));
} }
/** /**
* 根据sequenceNbr查询 * 根据sequenceNbr查询
* *
* @param sequenceNbr 主键 * @param sequenceNbr 主键
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "find/{sequenceNbr}") @GetMapping(value = "find/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个重点部位", notes = "根据sequenceNbr查询单个重点部位") @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个重点部位", notes = "根据sequenceNbr查询单个重点部位")
public ResponseModel<KeySiteDto> selectOne(@PathVariable Long sequenceNbr) { public ResponseModel<KeySiteDto> selectOne(@PathVariable Long sequenceNbr) {
List<String> list = new ArrayList<String>(); List<String> list = new ArrayList<String>();
Map<String, List<AttachmentDto>> files = sourceFileService.getAttachments(sequenceNbr); Map<String, List<AttachmentDto>> files = sourceFileService.getAttachments(sequenceNbr);
KeySiteDto dto= keySiteService.getSequenceNbr(sequenceNbr); KeySiteDto dto = keySiteService.getSequenceNbr(sequenceNbr);
if(files!=null && dto!=null) { if (files != null && dto != null) {
dto.setAttachments(files); dto.setAttachments(files);
JSONArray array= JSONArray.parseArray(JSONArray.toJSONString(files.get("keySitePhoto"))); JSONArray array = JSONArray.parseArray(JSONArray.toJSONString(files.get("keySitePhoto")));
if(array!=null &&array.size()>0) { if (array != null && array.size() > 0) {
for(Object i :array) { for (Object i : array) {
JSONObject object = JSONObject.parseObject(JSONObject.toJSONString(i)); JSONObject object = JSONObject.parseObject(JSONObject.toJSONString(i));
list.add(object.getString("url")); list.add(object.getString("url"));
} }
} }
} }
dto.setAttachmentsList(list); dto.setAttachmentsList(list);
return ResponseHelper.buildResponse(dto); return ResponseHelper.buildResponse(dto);
} }
/** /**
* 列表分页查询 * 列表分页查询
* *
* @param current 当前页 * @param current 当前页
* @param current 每页大小 * @param current 每页大小
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page") @GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "重点部位分页查询", notes = "重点部位分页查询") @ApiOperation(httpMethod = "GET", value = "重点部位分页查询", notes = "重点部位分页查询")
public ResponseModel<IPage<KeySiteDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam public ResponseModel<IPage<KeySiteDto>> queryForPage(@RequestParam(value = "current") int current,
(value = "size") int size,@RequestParam(required = false) String name,@RequestParam(required = false) Long buildingId,@RequestParam(required = false) String fireEnduranceRate, @RequestParam(value = "size") int size, @RequestParam(required = false) String name,
@RequestParam(required = false) String useNature,@RequestParam(required = false) String fireFacilitiesInfo,@RequestParam(required = false) Long belongId) { @RequestParam(required = false) Long buildingId, @RequestParam(required = false) String fireEnduranceRate,
Page<KeySiteDto> page = new Page<KeySiteDto>(); @RequestParam(required = false) String useNature, @RequestParam(required = false) String fireFacilitiesInfo,
page.setCurrent(current); @RequestParam(required = false) Long belongId) {
page.setSize(size); Page<KeySiteDto> page = new Page<KeySiteDto>();
return ResponseHelper.buildResponse(keySiteServiceImpl.getPageList(page,name,buildingId,fireEnduranceRate,useNature,fireFacilitiesInfo,belongId)); page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(keySiteServiceImpl.getPageList(page, name, buildingId, fireEnduranceRate,
useNature, fireFacilitiesInfo, belongId));
} }
/** /**
* 列表全部数据查询 * 列表全部数据查询
* *
* @return * @return
*/ */
// @TycloudOperation(ApiLevel = UserType.AGENCY) // @TycloudOperation(ApiLevel = UserType.AGENCY)
...@@ -162,26 +200,26 @@ public class KeySiteController extends BaseController { ...@@ -162,26 +200,26 @@ public class KeySiteController extends BaseController {
// public ResponseModel<List<KeySite>> selectForList() { // public ResponseModel<List<KeySite>> selectForList() {
// return ResponseHelper.buildResponse(keySiteServiceImpl.queryForKeySiteList()); // return ResponseHelper.buildResponse(keySiteServiceImpl.queryForKeySiteList());
// } // }
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "机场单位部位树", notes = "机场单位部位树") @ApiOperation(httpMethod = "GET", value = "机场单位部位树", notes = "机场单位部位树")
@GetMapping(value = "/getOrguserTree") @GetMapping(value = "/getOrguserTree")
public ResponseModel<List<OrgMenuDto>> getOrguserTree() { public ResponseModel<List<OrgMenuDto>> getOrguserTree() {
List<OrgMenuDto> list = new ArrayList<OrgMenuDto>(); List<OrgMenuDto> list = new ArrayList<OrgMenuDto>();
OrgMenuDto orgMenuDto =new OrgMenuDto(); OrgMenuDto orgMenuDto = new OrgMenuDto();
orgMenuDto.setChildren(keySiteService.getOrguserTree()); orgMenuDto.setChildren(keySiteService.getOrguserTree());
orgMenuDto.setName("单位管理"); orgMenuDto.setName("单位管理");
orgMenuDto.setKey(-1L); orgMenuDto.setKey(-1L);
orgMenuDto.setTitle("单位管理"); orgMenuDto.setTitle("单位管理");
list.add(orgMenuDto); list.add(orgMenuDto);
return ResponseHelper.buildResponse(list); return ResponseHelper.buildResponse(list);
} }
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "建筑部位树", notes = "建筑部位树") @ApiOperation(httpMethod = "GET", value = "建筑部位树", notes = "建筑部位树")
@GetMapping(value = "/getBuildTree/{buildingId}") @GetMapping(value = "/getBuildTree/{buildingId}")
public ResponseModel<List<OrgMenuDto>> getBuildTree(@PathVariable Long buildingId) { public ResponseModel<List<OrgMenuDto>> getBuildTree(@PathVariable Long buildingId) {
return ResponseHelper.buildResponse(keySiteService.getBuildAndKeyTree(buildingId)); return ResponseHelper.buildResponse(keySiteService.getBuildAndKeyTree(buildingId));
} }
......
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
View file @ f596cff7
...@@ -399,6 +399,19 @@ public class OrgUsrController extends BaseController { ...@@ -399,6 +399,19 @@ public class OrgUsrController extends BaseController {
} }
/** /**
* 获取用户信息
*
* @param userId
* @return
*/
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{userId}/userInfo", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "获取用户信息", notes = "获取用户信息")
public ResponseModel<List<UserDto>> getUserInfo(@PathVariable String userId) {
return ResponseHelper.buildResponse(iOrgUsrService.getUserInfo(userId));
}
/**
* 获取登陆人绑定的人员关系 * 获取登陆人绑定的人员关系
* *
* @param * @param
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureAuditServiceImpl.java
View file @ f596cff7
...@@ -4,6 +4,7 @@ import java.util.Date; ...@@ -4,6 +4,7 @@ import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService; import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
...@@ -59,7 +60,9 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur ...@@ -59,7 +60,9 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
model.setAuditTime(new Date()); model.setAuditTime(new Date());
model.setAuditDepartmentId(userInfo.getDepartment().getSequenceNbr()); model.setAuditDepartmentId(userInfo.getDepartment().getSequenceNbr());
model.setAuditor(userInfo.getUserModel().getRealName()); model.setAuditor(userInfo.getUserModel().getRealName());
model.setAuditDepartment(userInfo.getDepartment().getDepartmentName()); String parentId = iOrgUsrService.getParentId(userInfo.getUserModel().getUserId());
OrgUsr orgUsr = iOrgUsrService.getById(parentId);
model.setAuditDepartment(orgUsr.getBizOrgName());
FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(model.getFaultId()); FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(model.getFaultId());
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureDetailsServiceImpl.java
View file @ f596cff7
...@@ -79,15 +79,16 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa ...@@ -79,15 +79,16 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
public static Integer SELECY_STATUS = 7; public static Integer SELECY_STATUS = 7;
public static Integer SELECY_ISUBMIT = 8; public static Integer SELECY_ISUBMIT = 8;
public static Integer SELECY_ACCEPT = 9; public static Integer SELECY_ACCEPT = 9;
public String[] roleName = {"maintenance_department_maintenance_personnel", "emergency_command_staff","emergency_command_leader","maintenance_department"}; public String[] roleName = {"maintenance_department_maintenance_personnel", "emergency_command_staff", "emergency_command_leader", "maintenance_department"};
/** /**
* 分页查询接口 * 分页查询接口
* @param type 查询类型 *
* @param currentStatus 状态 * @param type 查询类型
* @param startTime 起始时间 * @param currentStatus 状态
* @param startTime 结束时间 * @param startTime 起始时间
* @param userId 用户id * @param startTime 结束时间
* @param userId 用户id
*/ */
public IPage<FailureDetails> queryForFailureDetailsPage(Page<FailureDetails> page, ReginParams userInfo, Long currentStatus, public IPage<FailureDetails> queryForFailureDetailsPage(Page<FailureDetails> page, ReginParams userInfo, Long currentStatus,
String startTime, String endTime, Integer userId, Integer type) { String startTime, String endTime, Integer userId, Integer type) {
...@@ -110,50 +111,20 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa ...@@ -110,50 +111,20 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
if (type.equals(SELECY_ACCEPT)) { if (type.equals(SELECY_ACCEPT)) {
//当角色为维修人员时 //当角色为维修人员时
if (userInfo.getRole().getRoleName().equals(roleName[0])) { if (userInfo.getRole().getRoleName().equals(roleName[0])) {
LambdaQueryWrapper<FailureMaintain> Wrapper = new LambdaQueryWrapper<>(); List<FailureDetails> failureDetails = baseMapper.selectForMaintain(currentStatus, startTime, endTime, userId, userInfo.getUserModel().getUserId(), page.getCurrent(), page.getSize());
Wrapper.eq(FailureMaintain::getRecUserId,userInfo.getUserModel().getUserId());
Wrapper.orderByDesc(FailureMaintain::getMaintainTime);
List<FailureMaintain> failureMaintains = failureMaintainService.getBaseMapper().selectList(Wrapper);
List<FailureDetails> failureDetails = new ArrayList<FailureDetails>();
failureMaintains.forEach(e->{
FailureDetails result = getById(e.getFaultId());
failureDetails.add(result);
});
IPage<FailureDetails> iPage = new Page<>(); IPage<FailureDetails> iPage = new Page<>();
iPage.setRecords(failureDetails); iPage.setRecords(failureDetails);
return iPage; return iPage;
} else if (userInfo.getRole().getRoleName().equals(roleName[2]) && userInfo.getRole().getRoleName().equals(roleName[3])) { } else if (userInfo.getRole().getRoleName().equals(roleName[2]) || userInfo.getRole().getRoleName().equals(roleName[3])) {
List<FailureDetails> failureDetails = baseMapper.selectForAudit(currentStatus, startTime, endTime, userId, userInfo.getUserModel().getUserId(), page.getCurrent(), page.getSize());
LambdaQueryWrapper<FailureAudit> Wrapper = new LambdaQueryWrapper<>();
Wrapper.eq(FailureAudit::getRecUserId,userInfo.getUserModel().getUserId());
Wrapper.orderByDesc(FailureAudit::getAuditTime);
List<FailureAudit> failureAudit = ifailureAuditService.getBaseMapper().selectList(Wrapper);
List<FailureDetails> failureDetails = new ArrayList<FailureDetails>();
failureAudit.forEach(e->{ IPage<FailureDetails> iPage = new Page<>();
FailureDetails result = getById(e.getFaultId());
failureDetails.add(result);
}); IPage<FailureDetails> iPage = new Page<>();
iPage.setRecords(failureDetails); iPage.setRecords(failureDetails);
return iPage; return iPage;
}else { } else {
LambdaQueryWrapper<FailureAudit> Wrapper = new LambdaQueryWrapper<>(); List<FailureDetails> failureDetails = baseMapper.selectYJ(currentStatus, startTime, endTime, userInfo.getUserModel().getUserId(), page.getCurrent(), page.getSize());
Long parentId = Long.valueOf(iOrgUsrService.getParentId(userInfo.getUserModel().getUserId()));
Wrapper.eq(FailureAudit::getAuditDepartmentId,parentId);
Wrapper.eq(FailureAudit::getAuditResult, AuditResultEnum.REFUSE.getCode());
Wrapper.orderByDesc(FailureAudit::getAuditTime);
List<FailureAudit> failureAudit = ifailureAuditService.getBaseMapper().selectList(Wrapper);
List<FailureDetails> failureDetails = new ArrayList<FailureDetails>();
failureAudit.forEach(e->{
FailureDetails result = getById(e.getFaultId());
if (result.getSubmissionPid().equals(userInfo.getUserModel().getUserId())){
failureDetails.add(result);
}
});
IPage<FailureDetails> iPage = new Page<>(); IPage<FailureDetails> iPage = new Page<>();
iPage.setRecords(failureDetails); iPage.setRecords(failureDetails);
return iPage; return iPage;
...@@ -167,11 +138,13 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa ...@@ -167,11 +138,13 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
* web端列表查询 * web端列表查询
*/ */
public IPage<FailureDetailsDto> queryForPageList(Page<FailureDetailsDto> page, ReginParams userInfo, Long currentStatus, public IPage<FailureDetailsDto> queryForPageList(Page<FailureDetailsDto> page, ReginParams userInfo, Long currentStatus,
String startTime, String endTime, String submissionName, Long submissionBranchId, String startTime, String endTime, String submissionName, Long submissionBranchId,
Long sequenceNbr ) { Long sequenceNbr) {
List<FailureDetailsDto> list = baseMapper.selectWebPage(page.getCurrent(), page.getSize(), currentStatus, startTime, endTime, submissionName, submissionBranchId, sequenceNbr);
return queryForPage(page,"",false,currentStatus,startTime, endTime, submissionName,submissionBranchId,sequenceNbr);
IPage<FailureDetailsDto> iPage = new Page<>();
iPage.setRecords(list);
return iPage;
} }
/** /**
...@@ -182,7 +155,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa ...@@ -182,7 +155,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
if (userInfo.getRole().getRoleName().equals(roleName[0])) { if (userInfo.getRole().getRoleName().equals(roleName[0])) {
IPage<FailureDetails> wxIpage = new Page<FailureDetails>(); IPage<FailureDetails> wxIpage = new Page<FailureDetails>();
List<FailureDetails> list = baseMapper.selectStatusWaitWx(page.getCurrent(), page.getSize(),currentStatus, startTime, endTime, userId); List<FailureDetails> list = baseMapper.selectStatusWaitWx(page.getCurrent(), page.getSize(), currentStatus, startTime, endTime, userId);
wxIpage.setRecords(list); wxIpage.setRecords(list);
return wxIpage; return wxIpage;
} else if (userInfo.getRole().getRoleName().equals(roleName[1])) { } else if (userInfo.getRole().getRoleName().equals(roleName[1])) {
...@@ -247,6 +220,14 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa ...@@ -247,6 +220,14 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
statusDtos = baseMapper.selectStatusFqp(currentStatus, startTime, endTime, Integer.parseInt(userInfo.getUserModel().getUserId())); statusDtos = baseMapper.selectStatusFqp(currentStatus, startTime, endTime, Integer.parseInt(userInfo.getUserModel().getUserId()));
} else if (type.equals(SELECY_ALL)) { } else if (type.equals(SELECY_ALL)) {
statusDtos = baseMapper.selectStatusCount(currentStatus, startTime, endTime, userId); statusDtos = baseMapper.selectStatusCount(currentStatus, startTime, endTime, userId);
} else if (type.equals(SELECY_ACCEPT)) {
if (userInfo.getRole().getRoleName().equals(roleName[2]) || userInfo.getRole().getRoleName().equals(roleName[3])){
statusDtos = baseMapper.selectAudit(currentStatus, startTime, endTime, userId, userInfo.getUserModel().getUserId());
}else if (userInfo.getRole().getRoleName().equals(roleName[0])){
statusDtos = baseMapper.selectMaintain(currentStatus, startTime, endTime, userId, userInfo.getUserModel().getUserId());
}else {
statusDtos = baseMapper.selectUserId(currentStatus, startTime, endTime, userInfo.getUserModel().getUserId());
}
} else { } else {
statusDtos = baseMapper.selectStatusLeader(currentStatus, startTime, endTime, userId); statusDtos = baseMapper.selectStatusLeader(currentStatus, startTime, endTime, userId);
} }
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureMaintainServiceImpl.java
View file @ f596cff7
...@@ -6,6 +6,7 @@ import java.util.List; ...@@ -6,6 +6,7 @@ import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
...@@ -61,6 +62,10 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto, ...@@ -61,6 +62,10 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,
@Autowired @Autowired
WorkflowFeignService workflowFeignService; WorkflowFeignService workflowFeignService;
@Autowired
OrgUsrServiceImpl iOrgUsrService;
private static String RECORE_TYPE = "维修记录"; private static String RECORE_TYPE = "维修记录";
private static String[] MAINTENANCE_STATUS = {"维修完成", "维修中"}; private static String[] MAINTENANCE_STATUS = {"维修完成", "维修中"};
...@@ -88,7 +93,9 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto, ...@@ -88,7 +93,9 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,
} }
failureMaintainDto.setMaintainMan(userInfo.getUserModel().getRealName()); failureMaintainDto.setMaintainMan(userInfo.getUserModel().getRealName());
failureMaintainDto.setMaintainTime(new Date()); failureMaintainDto.setMaintainTime(new Date());
failureMaintainDto.setDepartment(userInfo.getDepartment().getDepartmentName()); String parentId = iOrgUsrService.getParentId(userInfo.getUserModel().getUserId());
OrgUsr orgUsr = iOrgUsrService.getById(parentId);
failureMaintainDto.setDepartment(orgUsr.getBizOrgName());
failureMaintainDto.setBizId(userInfo.getDepartment().getSequenceNbr()); failureMaintainDto.setBizId(userInfo.getDepartment().getSequenceNbr());
failureMaintainDto.setRecoreType(RECORE_TYPE); failureMaintainDto.setRecoreType(RECORE_TYPE);
this.createWithModel(failureMaintainDto); this.createWithModel(failureMaintainDto);
...@@ -135,7 +142,9 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto, ...@@ -135,7 +142,9 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,
} }
failureMaintainDto.setMaintainMan(userInfo.getUserModel().getUserName()); failureMaintainDto.setMaintainMan(userInfo.getUserModel().getUserName());
failureMaintainDto.setMaintainTime(new Date()); failureMaintainDto.setMaintainTime(new Date());
failureMaintainDto.setDepartment(userInfo.getDepartment().getDepartmentName()); String parentId = iOrgUsrService.getParentId(userInfo.getUserModel().getUserId());
OrgUsr orgUsr = iOrgUsrService.getById(parentId);
failureMaintainDto.setDepartment(orgUsr.getBizOrgName());
failureMaintainDto.setBizId(userInfo.getDepartment().getSequenceNbr()); failureMaintainDto.setBizId(userInfo.getDepartment().getSequenceNbr());
failureMaintainDto.setRecoreType(RECORE_TYPE); failureMaintainDto.setRecoreType(RECORE_TYPE);
this.createWithModel(failureMaintainDto); this.createWithModel(failureMaintainDto);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureVerifyServiceImpl.java
View file @ f596cff7
...@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.module.common.api.dto.FailureVerifyDto; ...@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.module.common.api.dto.FailureVerifyDto;
import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto; import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto;
import com.yeejoin.amos.boot.module.common.api.dto.FailureRepairlogDto; import com.yeejoin.amos.boot.module.common.api.dto.FailureRepairlogDto;
import com.yeejoin.amos.boot.module.common.api.entity.FailureVerify; import com.yeejoin.amos.boot.module.common.api.entity.FailureVerify;
import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
import com.yeejoin.amos.boot.module.common.api.enums.AuditResultEnum; import com.yeejoin.amos.boot.module.common.api.enums.AuditResultEnum;
import com.yeejoin.amos.boot.module.common.api.enums.FailureStatuEnum; import com.yeejoin.amos.boot.module.common.api.enums.FailureStatuEnum;
import com.yeejoin.amos.boot.module.common.api.mapper.FailureVerifyMapper; import com.yeejoin.amos.boot.module.common.api.mapper.FailureVerifyMapper;
...@@ -33,7 +34,8 @@ public class FailureVerifyServiceImpl extends BaseService<FailureVerifyDto, Fail ...@@ -33,7 +34,8 @@ public class FailureVerifyServiceImpl extends BaseService<FailureVerifyDto, Fail
FailureDetailsServiceImpl failureDetailsService; FailureDetailsServiceImpl failureDetailsService;
@Autowired @Autowired
FailureRepairlogServiceImpl failureRepairlogService; FailureRepairlogServiceImpl failureRepairlogService;
@Autowired
OrgUsrServiceImpl iOrgUsrService;
@Transactional @Transactional
public Object savemodel(FailureVerifyDto model, ReginParams userInfo) throws Exception { public Object savemodel(FailureVerifyDto model, ReginParams userInfo) throws Exception {
...@@ -42,7 +44,9 @@ public class FailureVerifyServiceImpl extends BaseService<FailureVerifyDto, Fail ...@@ -42,7 +44,9 @@ public class FailureVerifyServiceImpl extends BaseService<FailureVerifyDto, Fail
model.setVerifyTime(new Date()); model.setVerifyTime(new Date());
model.setVerifyDepartmentId(userInfo.getDepartment().getSequenceNbr()); model.setVerifyDepartmentId(userInfo.getDepartment().getSequenceNbr());
model.setAcceptor(userInfo.getUserModel().getRealName()); model.setAcceptor(userInfo.getUserModel().getRealName());
model.setVerifyDepartment(userInfo.getDepartment().getDepartmentName()); String parentId = iOrgUsrService.getParentId(userInfo.getUserModel().getUserId());
OrgUsr orgUsr = iOrgUsrService.getById(parentId);
model.setVerifyDepartment(orgUsr.getBizOrgName());
FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(model.getFaultId()); FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(model.getFaultId());
...@@ -79,8 +83,6 @@ public class FailureVerifyServiceImpl extends BaseService<FailureVerifyDto, Fail ...@@ -79,8 +83,6 @@ public class FailureVerifyServiceImpl extends BaseService<FailureVerifyDto, Fail
public Boolean updateStatus(FailureVerifyDto model, FailureStatuEnum status, ReginParams userInfo, int condition) throws Exception { public Boolean updateStatus(FailureVerifyDto model, FailureStatuEnum status, ReginParams userInfo, int condition) throws Exception {
FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(model.getFaultId()); FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(model.getFaultId());
//当前角色部门id为应急指挥科的时候 并且同意时 不修改主表状态 依然为待验收
//当前角色部门id为维修部门的时候 修改状态
List<FailureVerify> byfaultId = findByfaultId(failureDetailsDto.getSequenceNbr()); List<FailureVerify> byfaultId = findByfaultId(failureDetailsDto.getSequenceNbr());
if (byfaultId.size() != 0) { if (byfaultId.size() != 0) {
......
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
View file @ f596cff7
package com.yeejoin.amos.boot.module.common.biz.service.impl; package com.yeejoin.amos.boot.module.common.biz.service.impl;
import java.io.Serializable;
import java.lang.reflect.Method;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.DataValidationConstraint;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import org.typroject.tyboot.component.emq.EmqKeeper;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
...@@ -36,24 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -36,24 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.constants.CommonConstant; import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.biz.common.utils.TreeParser; import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
import com.yeejoin.amos.boot.module.common.api.dto.CheckObjectDto; import com.yeejoin.amos.boot.module.common.api.dto.*;
import com.yeejoin.amos.boot.module.common.api.dto.CompanyDto;
import com.yeejoin.amos.boot.module.common.api.dto.CompanyPerson;
import com.yeejoin.amos.boot.module.common.api.dto.DynamicFormInstanceDto;
import com.yeejoin.amos.boot.module.common.api.dto.ESOrgUsrDto;
import com.yeejoin.amos.boot.module.common.api.dto.FormValue;
import com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentFormDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonExcelDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonFormDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrExcelDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrFormDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrzhDto;
import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
import com.yeejoin.amos.boot.module.common.api.dto.UserUnitDto;
import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn; import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance; import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany; import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
...@@ -64,9 +19,27 @@ import com.yeejoin.amos.boot.module.common.api.enums.UserUnitTypeEnum; ...@@ -64,9 +19,27 @@ import com.yeejoin.amos.boot.module.common.api.enums.UserUnitTypeEnum;
import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper; import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper;
import com.yeejoin.amos.boot.module.common.api.service.IMaintenanceCompanyService; import com.yeejoin.amos.boot.module.common.api.service.IMaintenanceCompanyService;
import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService; import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.privilege.Privilege; import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel; import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.RoleModel; import com.yeejoin.amos.feign.privilege.model.RoleModel;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import org.typroject.tyboot.component.emq.EmqKeeper;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import javax.annotation.Resource;
import java.io.Serializable;
import java.lang.reflect.Method;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
/** /**
* 机构/部门/人员表 服务实现类 * 机构/部门/人员表 服务实现类
...@@ -82,6 +55,10 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -82,6 +55,10 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
private static final String CODE = "amosAccount"; private static final String CODE = "amosAccount";
private static final String FIELD_CODE = "telephone";
private static final String COMPANY_FIELD_CODE = "companyLocation,longitude,latitude";
@Autowired @Autowired
DynamicFormInstanceServiceImpl alertFormValueServiceImpl; DynamicFormInstanceServiceImpl alertFormValueServiceImpl;
@Autowired @Autowired
...@@ -264,7 +241,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -264,7 +241,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
return childList; return childList;
} }
@Override @Override
public List<Map<String, Object>> returnCompanyPersonMsg(List<Long> ids) throws Exception { public List<Map<String, Object>> returnCompanyPersonMsg(List<Long> ids) throws Exception {
List<Map<String, Object>> companyPersonMsg = new ArrayList<>(); List<Map<String, Object>> companyPersonMsg = new ArrayList<>();
...@@ -363,9 +340,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -363,9 +340,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
map.put("personNumber", req.get("personNumber")); map.put("personNumber", req.get("personNumber"));
} }
/*BUG2680 查询部门人员错误 传递参数类型不正确 修改为string 2021-09-14 陈召 开始*/ /*BUG2680 查询部门人员错误 传递参数类型不正确 修改为string 2021-09-14 陈召 开始*/
if (req.get("parentId") != null && req.get("parentId") != ""){ if (req.get("parentId") != null && req.get("parentId") != "") {
OrgUsr parent = this.getById(req.get("parentId").toString()); OrgUsr parent = this.getById(req.get("parentId").toString());
map.put("bizOrgCode", ObjectUtils.isEmpty(parent) ? null : parent.getBizOrgCode()); map.put("bizOrgCode", ObjectUtils.isEmpty(parent) ? null : parent.getBizOrgCode());
} }
/*BUG2680 查询部门人员错误 传递参数类型不正确 修改为string 2021-09-14 陈召 开始*/ /*BUG2680 查询部门人员错误 传递参数类型不正确 修改为string 2021-09-14 陈召 开始*/
...@@ -382,10 +359,10 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -382,10 +359,10 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
List<Map<String, Object>> list = this.baseMapper.selectPersonList(map); List<Map<String, Object>> list = this.baseMapper.selectPersonList(map);
list.stream().forEach(t -> { list.stream().forEach(t -> {
// BUG2886 因为前期沟通 人员code 可能会发生改变 所以 现在接口code 不再保存，查询数据时通过接口重新赋值 by kongfm 2021-09-16 // BUG2886 因为前期沟通 人员code 可能会发生改变 所以 现在接口code 不再保存，查询数据时通过接口重新赋值 by kongfm 2021-09-16
if(null != t.get("amosOrgId") && StringUtils.isNotEmpty(t.get("amosOrgId").toString())) { if (null != t.get("amosOrgId") && StringUtils.isNotEmpty(t.get("amosOrgId").toString())) {
FeignClientResult<AgencyUserModel> result1 = Privilege.agencyUserClient.queryByUserId(t.get("amosOrgId").toString()); FeignClientResult<AgencyUserModel> result1 = Privilege.agencyUserClient.queryByUserId(t.get("amosOrgId").toString());
if(null !=result1.getResult()) { if (null != result1.getResult()) {
t.put("amosOrgCode",result1.getResult().getRealName()); t.put("amosOrgCode", result1.getResult().getRealName());
} }
} }
...@@ -402,16 +379,16 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -402,16 +379,16 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
List<DynamicFormInstanceDto> list = alertFormValueServiceImpl.listByCalledId(id); List<DynamicFormInstanceDto> list = alertFormValueServiceImpl.listByCalledId(id);
List<FormValue> formValue = new ArrayList<>(); List<FormValue> formValue = new ArrayList<>();
for (DynamicFormInstanceDto alertFormValue : list) { for (DynamicFormInstanceDto alertFormValue : list) {
/*修改为动态表单返回的数据参数量 2021-09-08 陈浩 开始 */ /*修改为动态表单返回的数据参数量 2021-09-08 陈浩 开始 */
// if (alertFormValue.getFieldValueLabel() != null) { // if (alertFormValue.getFieldValueLabel() != null) {
// FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), // FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(),
// alertFormValue.getFieldType(), alertFormValue.getFieldValueLabel(), alertFormValue.getBlock()); // alertFormValue.getFieldType(), alertFormValue.getFieldValueLabel(), alertFormValue.getBlock());
// formValue.add(value); // formValue.add(value);
// } else { // } else {
FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(),
alertFormValue.getFieldType(), alertFormValue.getFieldValue(), alertFormValue.getBlock(),alertFormValue.getFieldValueLabel()); alertFormValue.getFieldType(), alertFormValue.getFieldValue(), alertFormValue.getBlock(), alertFormValue.getFieldValueLabel());
formValue.add(value); formValue.add(value);
/*修改为动态表单返回的数据参数量 2021-09-08 陈浩 结束 */ /*修改为动态表单返回的数据参数量 2021-09-08 陈浩 结束 */
// } // }
/*BUG2580 返回值为code值 修改为类型名称 2021-08-31 陈召 开始 */ /*BUG2580 返回值为code值 修改为类型名称 2021-08-31 陈召 开始 */
} }
...@@ -425,7 +402,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -425,7 +402,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
List<FormValue> formValue = new ArrayList<>(); List<FormValue> formValue = new ArrayList<>();
for (DynamicFormInstanceDto alertFormValue : list) { for (DynamicFormInstanceDto alertFormValue : list) {
FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(),
alertFormValue.getFieldType(), alertFormValue.getFieldValue(), alertFormValue.getBlock(),alertFormValue.getFieldValueLabel());//陈浩 添加getFieldValueLabel的属性值 2021-09-08 alertFormValue.getFieldType(), alertFormValue.getFieldValue(), alertFormValue.getBlock(), alertFormValue.getFieldValueLabel());//陈浩 添加getFieldValueLabel的属性值 2021-09-08
formValue.add(value); formValue.add(value);
} }
return formValue; return formValue;
...@@ -452,10 +429,10 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -452,10 +429,10 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
private void updateChildOrgCode(String oriOrgCode, String targetOrgCode) { private void updateChildOrgCode(String oriOrgCode, String targetOrgCode) {
List<OrgUsr> list = queryOrgUsrList(oriOrgCode); List<OrgUsr> list = queryOrgUsrList(oriOrgCode);
if (!ObjectUtils.isEmpty(list)) { if (!ObjectUtils.isEmpty(list)) {
list.forEach(action -> { list.forEach(action -> {
action.setBizOrgCode(action.getBizOrgCode().replace(oriOrgCode, targetOrgCode)); action.setBizOrgCode(action.getBizOrgCode().replace(oriOrgCode, targetOrgCode));
updateById(action); updateById(action);
}); });
} }
} }
...@@ -553,16 +530,16 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -553,16 +530,16 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
Map<String, Object> result = new HashMap<>(); Map<String, Object> result = new HashMap<>();
// 机场人员AMOS角色丢失修正, by litw start 2021年9月10日 // 机场人员AMOS角色丢失修正, by litw start 2021年9月10日
if(StringUtils.isNotEmpty(orgUsr.getAmosOrgId())) { if (StringUtils.isNotEmpty(orgUsr.getAmosOrgId())) {
FeignClientResult<AgencyUserModel> result1 = Privilege.agencyUserClient.queryByUserId(orgUsr.getAmosOrgId()); FeignClientResult<AgencyUserModel> result1 = Privilege.agencyUserClient.queryByUserId(orgUsr.getAmosOrgId());
if(null !=result1.getResult()) { if (null != result1.getResult()) {
orgUsr.setAmosOrgCode(result1.getResult().getRealName()); orgUsr.setAmosOrgCode(result1.getResult().getRealName());
} }
} }
// 机场人员AMOS角色丢失修正, by litw end 2021年9月10日 // 机场人员AMOS角色丢失修正, by litw end 2021年9月10日
result = Bean.BeantoMap(orgUsr); result = Bean.BeantoMap(orgUsr);
/*bug 2869 部门为空人员详情报空指针 2021-09-15 陈召 开始*/ /*bug 2869 部门为空人员详情报空指针 2021-09-15 陈召 开始*/
if (orgUsr.getParentId()!= null){ if (orgUsr.getParentId() != null) {
result.put("parenName", getById(orgUsr.getParentId()).getBizOrgName()); result.put("parenName", getById(orgUsr.getParentId()).getBizOrgName());
} }
/*bug 2869 部门为空人员详情报空指针 2021-09-15 陈召 结束*/ /*bug 2869 部门为空人员详情报空指针 2021-09-15 陈召 结束*/
...@@ -668,7 +645,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -668,7 +645,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
BeanUtils.copyProperties(OrgUsrVo, orgUsr); BeanUtils.copyProperties(OrgUsrVo, orgUsr);
/*单位编辑后 code值也应做出修改 2021-09-09 陈召 开始 */ /*单位编辑后 code值也应做出修改 2021-09-09 陈召 开始 */
OrgUsr parent = getById(OrgUsrVo.getParentId()); OrgUsr parent = getById(OrgUsrVo.getParentId());
if (parent != null){ if (parent != null) {
orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr()); orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
} }
orgUsr.setSequenceNbr(id); orgUsr.setSequenceNbr(id);
...@@ -676,9 +653,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -676,9 +653,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
String oriOrgCode = oriOrgUsr.getBizOrgCode(); String oriOrgCode = oriOrgUsr.getBizOrgCode();
Map<String, Object> columnMap = new HashMap<>(); Map<String, Object> columnMap = new HashMap<>();
columnMap.put("bizOrgCode", oriOrgCode); columnMap.put("bizOrgCode", oriOrgCode);
List<OrgUsr> list = orgUsrMapper.selectAllChildrenList(columnMap); List<OrgUsr> list = orgUsrMapper.selectAllChildrenList(columnMap);
list.stream().forEach(e->{ list.stream().forEach(e -> {
e.setBizOrgCode(e.getBizOrgCode().replace(oriOrgCode,orgUsr.getBizOrgCode())); e.setBizOrgCode(e.getBizOrgCode().replace(oriOrgCode, orgUsr.getBizOrgCode()));
}); });
this.updateBatchById(list); this.updateBatchById(list);
...@@ -698,16 +675,16 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -698,16 +675,16 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
OrgUsr orgUsr = new OrgUsr(); OrgUsr orgUsr = new OrgUsr();
OrgUsr oriOrgUsr = getById(id); OrgUsr oriOrgUsr = getById(id);
BeanUtils.copyProperties(OrgPersonVo, orgUsr); BeanUtils.copyProperties(OrgPersonVo, orgUsr);
/* Bug 2647 编辑用户所属单位后按单位筛选人员结果错误 增加了 638 639 两行代码 根据修改的部门调整部门code 2021-09-03 陈召 开始*/ /* Bug 2647 编辑用户所属单位后按单位筛选人员结果错误 增加了 638 639 两行代码 根据修改的部门调整部门code 2021-09-03 陈召 开始*/
OrgUsr parent = getById(OrgPersonVo.getParentId()); OrgUsr parent = getById(OrgPersonVo.getParentId());
if (parent != null){ if (parent != null) {
orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr()); orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
} }
/* Bug 2647 编辑用户所属单位后按单位筛选人员结果错误 增加了 638 639 两行代码 根据修改的部门调整部门code 2021-09-03 陈召 结束*/ /* Bug 2647 编辑用户所属单位后按单位筛选人员结果错误 增加了 638 639 两行代码 根据修改的部门调整部门code 2021-09-03 陈召 结束*/
orgUsr.setSequenceNbr(id); orgUsr.setSequenceNbr(id);
if (!ObjectUtils.isEmpty(OrgPersonVo.getAmosOrgId())) { if (!ObjectUtils.isEmpty(OrgPersonVo.getAmosOrgId())) {
AgencyUserModel user = Privilege.agencyUserClient.queryByUserId(OrgPersonVo.getAmosOrgId()).getResult(); AgencyUserModel user = Privilege.agencyUserClient.queryByUserId(OrgPersonVo.getAmosOrgId()).getResult();
// oriOrgUsr.setAmosOrgCode(user.getRealName()); 去掉AmosOrgCode by litw 2021年9月10日 // oriOrgUsr.setAmosOrgCode(user.getRealName()); 去掉AmosOrgCode by litw 2021年9月10日
oriOrgUsr.setAmosOrgId(user.getUserId()); oriOrgUsr.setAmosOrgId(user.getUserId());
//orgUsr.setAmosOrgCode(user.getRealName()); 去掉AmosOrgCode by litw 2021年9月10日 //orgUsr.setAmosOrgCode(user.getRealName()); 去掉AmosOrgCode by litw 2021年9月10日
orgUsr.setAmosOrgId(user.getUserId()); orgUsr.setAmosOrgId(user.getUserId());
...@@ -795,7 +772,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -795,7 +772,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
BeanUtils.copyProperties(orgUsr, orgPersonFormVo); BeanUtils.copyProperties(orgUsr, orgPersonFormVo);
/*bug 2869 部门为空人员详情报空指针 2021-09-15 陈召 开始*/ /*bug 2869 部门为空人员详情报空指针 2021-09-15 陈召 开始*/
if (orgUsr.getParentId() != null){ if (orgUsr.getParentId() != null) {
orgPersonFormVo.setParentName(getById(orgUsr.getParentId()).getBizOrgName()); orgPersonFormVo.setParentName(getById(orgUsr.getParentId()).getBizOrgName());
} }
/*bug 2869 部门为空人员详情报空指针 2021-09-15 陈召 结束*/ /*bug 2869 部门为空人员详情报空指针 2021-09-15 陈召 结束*/
...@@ -856,7 +833,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -856,7 +833,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
BeanUtils.copyProperties(OrgDepartmentVo, orgUsr); BeanUtils.copyProperties(OrgDepartmentVo, orgUsr);
/*部门编辑后 code值也应做出修改 2021-09-09 陈召 开始 */ /*部门编辑后 code值也应做出修改 2021-09-09 陈召 开始 */
OrgUsr parent = getById(OrgDepartmentVo.getParentId()); OrgUsr parent = getById(OrgDepartmentVo.getParentId());
if (parent != null){ if (parent != null) {
orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr()); orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
} }
orgUsr.setSequenceNbr(id); orgUsr.setSequenceNbr(id);
...@@ -1047,7 +1024,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -1047,7 +1024,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
return null; return null;
} }
List<CompanyPerson> tempList = new ArrayList<CompanyPerson>(); List<CompanyPerson> tempList = new ArrayList<CompanyPerson>();
for(Long tempId : ids) { for (Long tempId : ids) {
// BUG 2740 机场单位主键varchar 导致 通过主键搜索返回多条数据 2021 - 09 - 09by kongfm // BUG 2740 机场单位主键varchar 导致 通过主键搜索返回多条数据 2021 - 09 - 09by kongfm
OrgUsr org = getById(tempId.toString()); OrgUsr org = getById(tempId.toString());
if (ObjectUtils.isEmpty(org)) { if (ObjectUtils.isEmpty(org)) {
...@@ -1058,7 +1035,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -1058,7 +1035,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
company.setPersons(this.queryForListByParentIdAndOrgType(org.getSequenceNbr(), OrgPersonEnum.人员.getKey())); company.setPersons(this.queryForListByParentIdAndOrgType(org.getSequenceNbr(), OrgPersonEnum.人员.getKey()));
tempList.add(company); tempList.add(company);
} }
return tempList; return tempList;
} }
// BUG 2736 人员导出过滤已经删除的数据by kongfm // BUG 2736 人员导出过滤已经删除的数据by kongfm
...@@ -1066,19 +1043,19 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -1066,19 +1043,19 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
public List<OrgUsrDto> queryForListByParentIdAndOrgType(Long parentId, String bizOrgType, Boolean isDelete) { public List<OrgUsrDto> queryForListByParentIdAndOrgType(Long parentId, String bizOrgType, Boolean isDelete) {
return this.queryForList(null, false, parentId, bizOrgType, isDelete); return this.queryForList(null, false, parentId, bizOrgType, isDelete);
} }
public List<OrgUsrDto> queryForListByParentIdAndOrgType(Long parentId, String bizOrgType) { public List<OrgUsrDto> queryForListByParentIdAndOrgType(Long parentId, String bizOrgType) {
// BUG 2843 过滤没有绑定关联账户的user by kongfm 2021-09-16 // BUG 2843 过滤没有绑定关联账户的user by kongfm 2021-09-16
List<OrgUsr> tempUserList = this.list(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getIsDelete,false).eq(OrgUsr::getParentId,parentId).eq(OrgUsr::getBizOrgType,bizOrgType).isNotNull(OrgUsr::getAmosOrgId)); List<OrgUsr> tempUserList = this.list(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getIsDelete, false).eq(OrgUsr::getParentId, parentId).eq(OrgUsr::getBizOrgType, bizOrgType).isNotNull(OrgUsr::getAmosOrgId));
tempUserList.stream().forEach(m -> { tempUserList.stream().forEach(m -> {
if( StringUtils.isNotEmpty(m.getAmosOrgId())) { if (StringUtils.isNotEmpty(m.getAmosOrgId())) {
FeignClientResult<AgencyUserModel> result1 = Privilege.agencyUserClient.queryByUserId(m.getAmosOrgId()); FeignClientResult<AgencyUserModel> result1 = Privilege.agencyUserClient.queryByUserId(m.getAmosOrgId());
if(null !=result1.getResult()) { if (null != result1.getResult()) {
m.setAmosOrgCode(result1.getResult().getRealName()); m.setAmosOrgCode(result1.getResult().getRealName());
} }
} }
}); });
return Bean.toModels(tempUserList,this.getModelClass()); return Bean.toModels(tempUserList, this.getModelClass());
} }
public OrgUsrDto getOrg(String amosUserId) { public OrgUsrDto getOrg(String amosUserId) {
...@@ -1092,9 +1069,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -1092,9 +1069,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
public String getParentId(String amosOrgId) { public String getParentId(String amosOrgId) {
List<OrgUsrDto> orgUsrDtos = queryForList("", false, amosOrgId); List<OrgUsrDto> orgUsrDtos = queryForList("", false, amosOrgId);
String parentId = null; String parentId = null;
if (orgUsrDtos.size() >= 1){ if (orgUsrDtos.size() >= 1) {
parentId = orgUsrDtos.get(0).getParentId(); parentId = orgUsrDtos.get(0).getParentId();
}else { } else {
return null; return null;
} }
return parentId; return parentId;
...@@ -1207,6 +1184,39 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -1207,6 +1184,39 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
throw new RuntimeException("参数必传且不为空！"); throw new RuntimeException("参数必传且不为空！");
} }
@Override
public List<UserDto> getUserInfo(String userId) {
List<UserDto> userDtoList = new ArrayList<>();
if (StringUtils.isNotBlank(userId)) {
String[] typeArr = TYPE.split(",");
// 业主单位
List<UserDto> list = orgUsrMapper.getUserInfo(userId, typeArr[0], null, FIELD_CODE);
if (!CollectionUtils.isEmpty(list)) {
throw new RuntimeException("人员绑定单位重复！");
} else {
if (!CollectionUtils.isEmpty(list)) {
if (list.size() == 1) {
userDtoList.addAll(list);
UserDto userDto = list.get(0);
String codeVal = userDto.getCompanyId().substring(0, 5);
if (StringUtils.isNotBlank(codeVal)) {
List<UserDto> dtoList = orgUsrMapper.getUserInfo(null, typeArr[1], codeVal, COMPANY_FIELD_CODE);
if (!CollectionUtils.isEmpty(dtoList)) {
userDtoList.addAll(dtoList);
return userDtoList;
}
}
throw new RuntimeException("未获取人员业主单位！");
}
throw new RuntimeException("人员绑定业主单位不唯一！");
}
}
throw new RuntimeException("人员未绑定任何单位！");
}
throw new RuntimeException("参数必传且不为空！");
}
public List<OrgUsr> getCompanyDetailTree() { public List<OrgUsr> getCompanyDetailTree() {
LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<OrgUsr>(); LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<OrgUsr>();
wrapper.eq(OrgUsr::getBizOrgType, "COMPANY"); wrapper.eq(OrgUsr::getBizOrgType, "COMPANY");
...@@ -1441,16 +1451,17 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -1441,16 +1451,17 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
/** /**
* 查询组织机构下面的人员信息 * 查询组织机构下面的人员信息
*
* @param id * @param id
* @return * @return
*/ */
public List<OrgUsr> getPersonListByParentId(Long id) { public List<OrgUsr> getPersonListByParentId(Long id) {
LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<OrgUsr>(); LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<OrgUsr>();
wrapper.eq(OrgUsr::getIsDelete, false); wrapper.eq(OrgUsr::getIsDelete, false);
wrapper.eq(OrgUsr::getParentId,id); wrapper.eq(OrgUsr::getParentId, id);
wrapper.eq(OrgUsr::getBizOrgType, OrgPersonEnum.人员.getKey()); wrapper.eq(OrgUsr::getBizOrgType, OrgPersonEnum.人员.getKey());
return this.baseMapper.selectList(wrapper); return this.baseMapper.selectList(wrapper);
} }
@Override @Override
public List<OrgUsrExcelDto> exportPersonToExcelByParentId(Long parentId) { public List<OrgUsrExcelDto> exportPersonToExcelByParentId(Long parentId) {
...@@ -1459,28 +1470,28 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -1459,28 +1470,28 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
@Override @Override
public List<Map<String, Object>> getLoginUserDetails (String userId, AgencyUserModel user) { public List<Map<String, Object>> getLoginUserDetails(String userId, AgencyUserModel user) {
// 获取登陆人关联账号 // 获取登陆人关联账号
List<OrgUsr> orgUsrs = getUsrList(userId); List<OrgUsr> orgUsrs = getUsrList(userId);
List<Map<String, Object>> list = new ArrayList<>(); List<Map<String, Object>> list = new ArrayList<>();
if (!ObjectUtils.isEmpty(orgUsrs)) { if (!ObjectUtils.isEmpty(orgUsrs)) {
orgUsrs.forEach(orgUsr -> { orgUsrs.forEach(orgUsr -> {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put(OrgPersonEnum.人员.getKey(), orgUsr); map.put(OrgPersonEnum.人员.getKey(), orgUsr);
// 获取关联账号所在部门/公司 // 获取关联账号所在部门/公司
LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(OrgUsr::getIsDelete, false); wrapper.eq(OrgUsr::getIsDelete, false);
wrapper.eq(BaseEntity::getSequenceNbr, orgUsr.getParentId()); wrapper.eq(BaseEntity::getSequenceNbr, orgUsr.getParentId());
OrgUsr one = this.getOne(wrapper); OrgUsr one = this.getOne(wrapper);
map.put(OrgPersonEnum.部门.getKey(),one); map.put(OrgPersonEnum.部门.getKey(), one);
map.put("AMOSUSER",user); map.put("AMOSUSER", user);
list.add(map); list.add(map);
}); });
} }
return list; return list;
} }
/** /**
* 获取登陆人关联账号 * 获取登陆人关联账号
...@@ -1497,6 +1508,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -1497,6 +1508,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
/** /**
* 重写getByid 方法 因为前期沟通 人员code 可能会发生改变 所以 现在接口code 不再保存，查询数据时通过接口重新赋值 by kongfm 2021-09-16 * 重写getByid 方法 因为前期沟通 人员code 可能会发生改变 所以 现在接口code 不再保存，查询数据时通过接口重新赋值 by kongfm 2021-09-16
*
* @param id * @param id
* @return * @return
*/ */
...@@ -1504,9 +1516,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -1504,9 +1516,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
public OrgUsr getById(Serializable id) { public OrgUsr getById(Serializable id) {
OrgUsr orgUser = this.baseMapper.selectById(id); OrgUsr orgUser = this.baseMapper.selectById(id);
// BUG2886 因为前期沟通 人员code 可能会发生改变 所以 现在接口code 不再保存，查询数据时通过接口重新赋值 by kongfm 2021-09-16 // BUG2886 因为前期沟通 人员code 可能会发生改变 所以 现在接口code 不再保存，查询数据时通过接口重新赋值 by kongfm 2021-09-16
if(orgUser != null && StringUtils.isNotEmpty(orgUser.getAmosOrgId())) { if (orgUser != null && StringUtils.isNotEmpty(orgUser.getAmosOrgId())) {
FeignClientResult<AgencyUserModel> result1 = Privilege.agencyUserClient.queryByUserId(orgUser.getAmosOrgId()); FeignClientResult<AgencyUserModel> result1 = Privilege.agencyUserClient.queryByUserId(orgUser.getAmosOrgId());
if(null !=result1.getResult()) { if (null != result1.getResult()) {
orgUser.setAmosOrgCode(result1.getResult().getRealName()); orgUser.setAmosOrgCode(result1.getResult().getRealName());
} }
} }
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AirportStandController.java 0 → 100644
View file @ f596cff7
package com.yeejoin.amos.boot.module.jcs.biz.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.boot.module.jcs.api.entity.AirportStand;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import java.util.List;
import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AirportStandServiceImpl;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import org.springframework.beans.factory.annotation.Autowired;
import javax.servlet.http.HttpServletRequest;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.jcs.api.dto.AirportStandDto;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
/**
* 机场机位旋转角度
*
* @author litw
* @date 2021-09-17
*/
@RestController
@Api(tags = "机场机位旋转角度Api")
@RequestMapping(value = "/airport-stand")
public class AirportStandController extends BaseController {
@Autowired
AirportStandServiceImpl airportStandServiceImpl;
/**
* 根据sequenceNbr查询
*
* @param standCode 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{standCode}")
@ApiOperation(httpMethod = "GET",value = "根据standCode查询单个机场机位旋转角度", notes = "根据standCode查询单个机场机位旋转角度")
public ResponseModel<AirportStandDto> selectOne(@PathVariable String standCode) {
QueryWrapper<AirportStand> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("stand_code",standCode);
AirportStand airportStand = airportStandServiceImpl.getOne(queryWrapper);
AirportStandDto airportStandDto = new AirportStandDto();
BeanUtils.copyProperties(airportStand,airportStandDto);
return ResponseHelper.buildResponse(airportStandDto);
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/ExcelController.java
View file @ f596cff7
package com.yeejoin.amos.boot.module.jcs.biz.controller; package com.yeejoin.amos.boot.module.jcs.biz.controller;
import com.netflix.discovery.converters.Auto; import java.util.Map;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.common.api.dto.ExcelDto; import javax.servlet.http.HttpServletResponse;
import com.yeejoin.amos.boot.module.jcs.api.enums.ExcelEnums;
import com.yeejoin.amos.boot.module.jcs.biz.service.impl.DataSourcesImpl;
import com.yeejoin.amos.boot.module.jcs.biz.service.impl.ExcelServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
...@@ -17,8 +19,14 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest; ...@@ -17,8 +19,14 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseHelper; import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletResponse; import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import java.util.Map; import com.yeejoin.amos.boot.module.common.api.dto.ExcelDto;
import com.yeejoin.amos.boot.module.jcs.api.enums.ExcelEnums;
import com.yeejoin.amos.boot.module.jcs.biz.service.impl.DataSourcesImpl;
import com.yeejoin.amos.boot.module.jcs.biz.service.impl.ExcelServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
/** /**
* 导出导入 * 导出导入
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AirportStandServiceImpl.java 0 → 100644
View file @ f596cff7
package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import com.yeejoin.amos.boot.module.jcs.api.entity.AirportStand;
import com.yeejoin.amos.boot.module.jcs.api.mapper.AirportStandMapper;
import com.yeejoin.amos.boot.module.jcs.api.service.IAirportStandService;
import com.yeejoin.amos.boot.module.jcs.api.dto.AirportStandDto;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List;
/**
* 机场机位旋转角度服务实现类
*
* @author litw
* @date 2021-09-17
*/
@Service
public class AirportStandServiceImpl extends BaseService<AirportStandDto,AirportStand,AirportStandMapper> implements IAirportStandService {
/**
* 分页查询
*/
public Page<AirportStandDto> queryForAirportStandPage(Page<AirportStandDto> page) {
return this.queryForPage(page, null, false);
}
/**
* 列表查询 示例
*/
public List<AirportStandDto> queryForAirportStandList() {
return this.queryForList("" , false);
}
}
\ No newline at end of file
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/DataSourcesImpl.java
View file @ f596cff7
...@@ -156,6 +156,9 @@ public class DataSourcesImpl implements DataSources { ...@@ -156,6 +156,9 @@ public class DataSourcesImpl implements DataSources {
case "getDutyArea": case "getDutyArea":
str =getDutyArea(); str =getDutyArea();
break; break;
case "getEquipCategory":
str =getEquipCategory();
break;
} }
} }
return str; return str;
...@@ -377,4 +380,48 @@ public class DataSourcesImpl implements DataSources { ...@@ -377,4 +380,48 @@ public class DataSourcesImpl implements DataSources {
String[] str = areaList.toArray(new String[buildingList.size()]); String[] str = areaList.toArray(new String[buildingList.size()]);
return str; return str;
} }
/**
* 获取设施分类// BUG 2935 优化项 分类从93060000 取得字典数据 by kongfm 2021-09-17
* @return
*/
private String[] getEquipCategory() {
String type = "1";
ResponseModel<List<LinkedHashMap<String, Object>>> response = equipFeignClient.getEquipmentCategory(type);
// 筛选第一层
String categoryCode = "90000000";
List<LinkedHashMap<String, Object>> categoryList = response.getResult();
// 筛选第二层
String fireCode = "93000000";
List<LinkedHashMap<String, Object>> fireList = Lists.newArrayList();
// 筛选第三层
String waterCode = "93060000";
List<LinkedHashMap<String, Object>> waterList = Lists.newArrayList();
List<LinkedHashMap<String, Object>> category = Lists.newArrayList();
List<String> resultList = Lists.newArrayList();
for(LinkedHashMap<String, Object> t :categoryList) {
if(categoryCode.equals(t.get("code").toString())){
fireList = (List<LinkedHashMap<String, Object>>) t.get("children");
}
}
// 筛选第二层
for(LinkedHashMap<String, Object> t : fireList) {
if(fireCode.equals(t.get("code").toString())){
waterList = (List<LinkedHashMap<String, Object>>) t.get("children");
}
}
// 筛选第三层
for(LinkedHashMap<String, Object> t : waterList) {
if(waterCode.equals(t.get("code").toString())){
category = (List<LinkedHashMap<String, Object>>) t.get("children");
}
}
category.forEach(t -> {
resultList.add(t.get("name") + "@" + t.get("id"));
});
String[] str = resultList.toArray(new String[category.size()]);
return str;
}
} }
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java
View file @ f596cff7
...@@ -798,6 +798,12 @@ if (excelDtoList != null && excelDtoList.size() > 0) { ...@@ -798,6 +798,12 @@ if (excelDtoList != null && excelDtoList.size() > 0) {
item.setType(type[0]); item.setType(type[0]);
item.setTypeCode(type[1]); item.setTypeCode(type[1]);
} }
// BUG 2935 优化项 分类从93060000 取得字典数据 by kongfm 2021-09-17
if (item.getEquipCategoryName() != null) {
String[] equipCategory = item.getEquipCategoryName().split("@");
item.setEquipCategoryName(equipCategory[0]);
item.setEquipCategoryId(Long.parseLong(equipCategory[1]));
}
item = Bean.toPo(getCurrentInfo(), item); item = Bean.toPo(getCurrentInfo(), item);
waterResourceServiceImpl.importByExcel(item); waterResourceServiceImpl.importByExcel(item);
}); });
......
amos-boot-system-jcs/src/main/resources/application.properties
View file @ f596cff7
...@@ -74,7 +74,7 @@ jcs.company.topic.delete=jcs/company/topic/delete ...@@ -74,7 +74,7 @@ jcs.company.topic.delete=jcs/company/topic/delete
iot.fegin.name=AMOS-API-IOT iot.fegin.name=AMOS-API-IOT
equip.fegin.name=AMOS-EQUIPMANAGE-kfm equip.fegin.name=AMOS-EQUIPMANAGE
## 设备联动服务（车库门、广播、警铃） ## 设备联动服务（车库门、广播、警铃）
control.fegin.name=JCS-API-CONTROL control.fegin.name=JCS-API-CONTROL
......
amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml
View file @ f596cff7
...@@ -630,4 +630,458 @@ ...@@ -630,4 +630,458 @@
alter table `jc_alert_form_value` add column `hide` bit(1) NULL DEFAULT b'0' COMMENT '隐藏'; alter table `jc_alert_form_value` add column `hide` bit(1) NULL DEFAULT b'0' COMMENT '隐藏';
</sql> </sql>
</changeSet> </changeSet>
<changeSet author="ltw" id="2021-09-17-ltw-1">
<preConditions onFail="MARK_RAN">
<not>
<tableExists tableName="jc_airport_stand"/>
</not>
</preConditions>
<comment>create table jc_airport_stand</comment>
<sql>
CREATE TABLE `jc_airport_stand` (
`sequence_nbr` bigint(19) NOT NULL COMMENT 'id',
`stand_code` varchar(30) DEFAULT NULL COMMENT '机位号',
`coordinate_x` varchar(30) DEFAULT NULL COMMENT '坐标X',
`coordinate_y` varchar(30) NOT NULL COMMENT '坐标Y',
`longitude` varchar(50) DEFAULT NULL COMMENT '经度',
`latitude` varchar(30) DEFAULT NULL COMMENT '纬度',
`update_time` datetime DEFAULT NULL COMMENT '更新时间',
`rec_user_name` varchar(20) DEFAULT NULL COMMENT '操作人名称',
`rec_user_id` varchar(19) DEFAULT NULL COMMENT '操作人员',
`rec_date` datetime DEFAULT NULL COMMENT '创建时间',
`is_delete` bit(1) DEFAULT b'0' COMMENT '是否删除',
PRIMARY KEY (`sequence_nbr`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='机场机位旋转角度';
</sql>
</changeSet>
<changeSet author="ltw" id="2021-09-17-ltw-2">
<preConditions onFail="MARK_RAN">
<tableExists tableName="jc_airport_stand" />
<primaryKeyExists primaryKeyName="sequence_nbr" tableName="jc_airport_stand"/>
</preConditions>
<comment>add data jc_airport_stand</comment>
<sql>
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(1, '101', '40965.809267', '135142.201791', '108.759608', '34.445599', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(2, '102', '40986.744088', '135087.512154', '108.759009', '34.445417', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(3, '103', '40979.436181', '135035.658797', '108.758635', '34.44506', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(4, '104', '40979.812127', '134989.889541', '108.758257', '34.444791', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(5, '105', '40974.036546', '134944.985349', '108.75793', '34.444486', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(6, '106', '40974.747582', '134894.168919', '108.757508', '34.444189', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(7, '107', '40983.950663', '134823.469694', '108.756861', '34.443833', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(8, '108', '40988.208275', '134746.201368', '108.756197', '34.443404', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(9, '109', '40989.54867', '134679.183029', '108.755637', '34.443016', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(10, '110', '40995.932526', '134621.013262', '108.755114', '34.442714', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(11, '111', '40998.580672', '134562.433011', '108.754614', '34.442385', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(12, '112', '40995.142679', '134503.932135', '108.754158', '34.442015', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(13, '113', '40988.903636', '134447.343935', '108.753739', '34.441637', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(14, '114', '40985.635094', '134389.823007', '108.75329', '34.441274', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(15, '115', '40983.636221', '134324.653551', '108.752769', '34.440874', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(16, '116', '40983.291895', '134241.046615', '108.752086', '34.440377', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(17, '117', '40983.149667', '134166.112131', '108.751472', '34.439931', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(18, '118', '41153.26154', '134147.376075', '108.750099', '34.440976', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(19, '119', '41153.37107', '134205.325019', '108.750574', '34.44132', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(20, '120', '41153.48094', '134263.273861', '108.751049', '34.441664', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(21, '121', '41153.591241', '134321.222552', '108.751524', '34.442008', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(22, '122', '41153.703819', '134380.170267', '108.752007', '34.442359', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(23, '123', '41153.814907', '134438.118688', '108.752482', '34.442703', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(24, '124', '41153.926352', '134496.066996', '108.752957', '34.443047', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(25, '125', '41154.206285', '134640.715857', '108.754142', '34.443906', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(26, '126', '41154.321447', '134699.84864', '108.754626', '34.444257', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(27, '127', '41154.438585', '134759.789981', '108.755118', '34.444614', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(28, '128', '41154.558058', '134820.733179', '108.755617', '34.444976', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(29, '129', '41162.32458', '134958.96986', '108.756696', '34.445848', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(30, '130', '41162.404818', '134999.432935', '108.757028', '34.446088', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(31, '131', '41162.485269', '135039.895922', '108.757359', '34.446328', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(32, '132', '41162.565855', '135080.358817', '108.757691', '34.446569', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(33, '133', '41162.646664', '135120.821697', '108.758022', '34.446809', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(34, '134', '41162.922493', '135258.235589', '108.759148', '34.447625', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(35, '135', '41163.011164', '135302.194898', '108.759509', '34.447886', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(36, '136', '41163.100101', '135346.154167', '108.759869', '34.448148', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(37, '137', '41163.189263', '135390.113359', '108.760229', '34.448409', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(38, '138', '41163.392728', '135490.020302', '108.761048', '34.449002', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(39, '139', '41163.482625', '135533.979243', '108.761408', '34.449263', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(40, '140', '41163.572704', '135577.93807', '108.761768', '34.449524', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(41, '141', '41163.66305', '135621.896857', '108.762128', '34.449785', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(42, '142', '41163.75362', '135665.855567', '108.762489', '34.450047', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(43, '143', '41163.844407', '135709.814213', '108.762849', '34.450308', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(44, '144', '41148.647328', '135849.392984', '108.764104', '34.451032', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(45, '145', '41159.363136', '135957.014489', '108.76491', '34.451742', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(46, '147', '41156.025022', '136080.420466', '108.765947', '34.452451', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(47, '148', '41156.164499', '136146.357325', '108.766488', '34.452843', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(48, '201', '41157.588722', '136298.710039', '108.767728', '34.453755', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(49, '202', '41157.721273', '136360.650189', '108.768236', '34.454123', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(50, '203', '41157.854252', '136422.590158', '108.768744', '34.454491', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(51, '204', '41157.996236', '136488.482605', '108.769284', '34.454882', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(52, '205', '41158.125828', '136548.424249', '108.769775', '34.455239', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(53, '206', '41158.255829', '136608.365722', '108.770266', '34.455595', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(54, '207', '41157.871568', '136661.314837', '108.770703', '34.455906', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(55, '208', '41158.181798', '136803.174984', '108.771866', '34.456749', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(56, '209', '41158.275119', '136845.633105', '108.772214', '34.457001', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(57, '210', '41158.368633', '136888.091201', '108.772562', '34.457253', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(58, '211', '41158.462373', '136930.549179', '108.77291', '34.457505', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(59, '212', '41158.589519', '136987.991259', '108.773381', '34.457846', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(60, '213', '41158.68374', '137030.449056', '108.773728', '34.458099', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(61, '214', '41158.778125', '137072.906803', '108.774076', '34.458351', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(62, '215', '41158.872791', '137115.36448', '108.774424', '34.458603', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(63, '216', '41017.997561', '137115.312059', '108.775433', '34.457646', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(64, '217', '41017.902734', '137072.854123', '108.775085', '34.457394', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(65, '218', '41017.80816', '137030.396093', '108.774737', '34.457141', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(66, '219', '41017.71378', '136987.938038', '108.774389', '34.456889', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(67, '220', '41017.586397', '136930.495592', '108.773918', '34.456548', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(68, '221', '41017.492498', '136888.037297', '108.77357', '34.456296', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(69, '222', '41017.398778', '136845.578965', '108.773222', '34.456043', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(70, '223', '41017.30531', '136803.120597', '108.772874', '34.455791', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(71, '224', '41016.994524', '136661.25957', '108.771712', '34.454948', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(72, '225', '41016.901938', '136618.800867', '108.771364', '34.454696', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(73, '301', '40185.653053', '134601.800252', '108.760759', '34.437097', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(74, '302', '40127.698072', '134601.777949', '108.761174', '34.436703', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(75, '303', '40055.753806', '134601.750828', '108.761689', '34.436214', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(76, '304', '39997.798799', '134601.829054', '108.762104', '34.435821', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(77, '305', '39921.478341', '134588.528231', '108.762542', '34.435224', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(78, '306', '39922.269929', '134516.835039', '108.761947', '34.434804', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(79, '307', '39932.694222', '134445.938054', '108.761291', '34.434455', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(80, '308', '39993.465494', '134430.909005', '108.760732', '34.434779', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(81, '309', '40051.42105', '134430.930883', '108.760318', '34.435172', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(82, '310', '40123.365686', '134430.958528', '108.759803', '34.435661', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(83, '311', '40176.304903', '134425.580148', '108.759379', '34.435989', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(84, '312', '40177.022028', '134280.066605', '108.75818', '34.435131', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(85, '313', '40123.065953', '134276.05152', '108.758533', '34.434741', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(86, '314', '40055.117929', '134276.024907', '108.75902', '34.434279', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(87, '315', '39996.162894', '134276.002225', '108.759442', '34.433879', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(88, '316', '39929.037303', '134257.812715', '108.759773', '34.433315', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(89, '317', '39921.635974', '134191.106077', '108.759279', '34.43287', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(90, '318', '39932.062993', '134120.208299', '108.758622', '34.43252', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(91, '319', '39992.835498', '134105.180064', '108.758063', '34.432844', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(92, '320', '40050.791545', '134105.202749', '108.757649', '34.433238', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(93, '321', '40122.736856', '134105.231483', '108.757134', '34.433727', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(94, '322', '40184.689628', '134105.25665', '108.75669', '34.434147', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(95, '324', '39901.419234', '133934.265249', '108.757315', '34.43121', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(96, '325', '39901.338716', '133891.799784', '108.756967', '34.430958', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(97, '326', '39901.258419', '133849.334239', '108.756619', '34.430706', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(98, '327', '39901.077828', '133753.411869', '108.755834', '34.430136', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(99, '328', '39900.998235', '133710.946148', '108.755486', '34.429884', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(100, '329', '39900.918838', '133668.480285', '108.755138', '34.429631', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(101, '330', '39900.839622', '133626.014384', '108.75479', '34.429379', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(102, '331', '39898.991625', '133559.568134', '108.754258', '34.428973', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(103, '332', '39898.891733', '133505.611193', '108.753816', '34.428652', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(104, '333', '40017.304333', '133505.660033', '108.752968', '34.429457', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(105, '334', '40017.404025', '133559.616693', '108.75341', '34.429777', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(106, '335', '40017.482771', '133602.082448', '108.753758', '34.43003', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(107, '336', '40017.579369', '133654.040487', '108.754184', '34.430338', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(108, '337', '40017.658531', '133696.505938', '108.754532', '34.43059', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(109, '338', '40017.759427', '133750.462148', '108.754974', '34.430911', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(110, '339', '40017.945305', '133849.381802', '108.755784', '34.431498', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(111, '340', '40018.047154', '133903.337691', '108.756226', '34.431819', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(112, '341', '40018.127594', '133945.802897', '108.756574', '34.432071', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(113, '342L', '40153.517714', '133941.861206', '108.755572', '34.432967', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(114, '342R', '40153.598152', '133984.326097', '108.75592', '34.43322', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(115, '343', '40168.489445', '133888.139068', '108.755024', '34.432751', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(116, '344L', '40251.527252', '133853.725431', '108.754147', '34.433111', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(117, '344R', '40209.059431', '133853.70729', '108.754451', '34.432822', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(118, '345', '40161.077284', '133710.55438', '108.75362', '34.431648', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(119, '346', '40160.998201', '133668.089071', '108.753272', '34.431396', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(120, '347', '40160.91932', '133625.623683', '108.752924', '34.431143', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(121, '348', '40160.84069', '133583.158203', '108.752576', '34.430891', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(122, '401', '40186.197415', '134751.062661', '108.76198', '34.437985', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(123, '402', '40128.242655', '134751.040735', '108.762395', '34.437591', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(124, '403', '40057.79759', '134751.014673', '108.762899', '34.437113', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(125, '404', '39999.842592', '134750.9936', '108.763314', '34.436719', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(126, '405', '39945.868197', '134744.016938', '108.763643', '34.436311', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(127, '406', '39899.903727', '134744.000736', '108.763972', '34.435999', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(128, '425', '39919.89102', '134993.803259', '108.765879', '34.437615', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(129, '701', '40765.499568', '133906.8558', '108.750902', '34.436917', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(130, '702', '40838.441745', '133907.624599', '108.750386', '34.437416', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(131, '703', '40855.056475', '133977.148225', '108.750838', '34.437941', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(132, '704', '40843.528361', '134037.591691', '108.751417', '34.438221', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(133, '705', '40843.608408', '134080.055064', '108.751765', '34.438474', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(134, '706', '40843.688636', '134122.5184', '108.752113', '34.438726', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(135, '707', '40843.769116', '134164.981642', '108.75246', '34.438978', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(136, '708', '41009.847627', '134000.179085', '108.749918', '34.439129', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(137, '709', '41062.43108', '134000.205813', '108.749542', '34.439487', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(138, '710', '41104.897508', '134000.227578', '108.749238', '34.439775', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
INSERT INTO `jc_airport_stand`
(sequence_nbr, stand_code, coordinate_x, coordinate_y, longitude, latitude, update_time, rec_user_name, rec_user_id, rec_date, is_delete)
VALUES(139, '711', '41157.480923', '134000.254869', '108.748862', '34.440132', '2021-09-17 08:02:38', NULL, NULL, '2021-09-17 08:02:57', 0);
</sql>
</changeSet>
</databaseChangeLog> </databaseChangeLog>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment