Skip to content

A
amos-boot-biz
Commit a50bcd0b authored by maoying's avatar maoying
Browse files
Options

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

parents 9bfead0a f2973ca2
Hide whitespace changes
Inline Side-by-side
Showing with 1115 additions and 76 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/DutyPersonShiftMapper.xml
View file @ a50bcd0b
......@@ -136,7 +136,7 @@
</select>
<select id='getEquipmentForSpecifyDate' resultType='map'>
select * from (
SELECT
MAX(
CASE
......@@ -173,8 +173,10 @@
where cd.group_code =#{groupCode} and cds.instance_id is not null and
cd.is_delete=0
group by cd.instance_id
) result
<if test="groupByName != null and groupByName!='' ">
group by ${groupByName}
</if>
</select>
<select id='getInstanceIdForSpecifyDateAndEquipment'
resultType='map'>
......
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml
View file @ a50bcd0b
......@@ -157,7 +157,7 @@
and a.alert_source_code = #{alertSourceCode}
</if>
<if test="systemSourceCode!= null ">
and a.system_source_code = #{systemSourceCode}
and a.system_source_code in (${systemSourceCode})
</if>
<if test="isFatherAlert != null and isFatherAlert == 'true' ">
and j.alert_called_id = a.sequence_nbr
......
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderInfoDto.java 0 → 100644
View file @ a50bcd0b
package com.yeejoin.amos.boot.module.tzs.flc.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 system_generator
* @date 2021-12-14
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="CylinderInfoDto", description="气瓶基本信息")
public class CylinderInfoDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "气瓶基本信息ID")
private String cylinderId;
@ApiModelProperty(value = "产权单位名称")
private String unitName;
@ApiModelProperty(value = "出厂编号")
private String factoryNum;
@ApiModelProperty(value = "气瓶状态")
private Integer cylinderStatus;
@ApiModelProperty(value = "气瓶品种")
private Integer cylinderVariety;
@ApiModelProperty(value = "二维码编号")
private String qrCode;
@ApiModelProperty(value = "电子标签编号")
private String electronicLabelCode;
@ApiModelProperty(value = "充装介质")
private String fillingMedium;
@ApiModelProperty(value = "公称压力(MPa）")
private Double pressure;
@ApiModelProperty(value = "容积（L）")
private Double volume;
@ApiModelProperty(value = "制造日期")
private Date manufacturingDate;
@ApiModelProperty(value = "制造单位")
private String manufacturingUnit;
@ApiModelProperty(value = "气瓶制造许可证")
private String license;
@ApiModelProperty(value = "气瓶重量（kg）")
private Double cylinderWeight;
@ApiModelProperty(value = "单位内部编号")
private String unitInnerCode;
@ApiModelProperty(value = "最近一次检验日期")
private Date inspectionDate;
@ApiModelProperty(value = "下次检验日期")
private Date nextInspectionDate;
@ApiModelProperty(value = "气瓶唯一标识码")
private String sequenceCode;
@ApiModelProperty(value = "同步时间 yyyy-MM-dd HH24:mi:ss")
private Date syncDate;
@ApiModelProperty(value = "1初次同步数据 2上层系统已同步数据 0已删除数据")
private Boolean syncState;
@ApiModelProperty(value = "对接公司编码")
private String apiCompanyCode;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderUnitDto.java 0 → 100644
View file @ a50bcd0b
package com.yeejoin.amos.boot.module.tzs.flc.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 system_generator
* @date 2021-12-14
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="CylinderUnitDto", description="气瓶企业信息")
public class CylinderUnitDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "单位ID")
private String unitId;
@ApiModelProperty(value = "所属区域")
private String regionCode;
@ApiModelProperty(value = "单位名称")
private String unitName;
@ApiModelProperty(value = "企业类型")
private Integer unitType;
@ApiModelProperty(value = "统一社会信用代码")
private String creditCode;
@ApiModelProperty(value = "详细地址")
private String address;
@ApiModelProperty(value = "企业负责人")
private String unitPerson;
@ApiModelProperty(value = "企业负责人手机")
private String personMobilePhone;
@ApiModelProperty(value = "企业负责人固定电话")
private String personTelephone;
@ApiModelProperty(value = "企业邮编")
private String postalCode;
@ApiModelProperty(value = "企业简称")
private String unitAbbreviation;
@ApiModelProperty(value = "充装许可证号")
private String fillingLicense;
@ApiModelProperty(value = "充装许可证有效期")
private Date fillingPermitDate;
@ApiModelProperty(value = "充装许可范围")
private String fillingPermScope;
@ApiModelProperty(value = "检验许可证号")
private String inspectionLicense;
@ApiModelProperty(value = "检验范围")
private String inspectionScope;
@ApiModelProperty(value = "检验许可证有效期")
private Date effectiveDate;
@ApiModelProperty(value = "制造许可证号")
private String manufacturingLicense;
@ApiModelProperty(value = "制造许可证有效期")
private Date manufacturingDate;
@ApiModelProperty(value = "制造许可范围")
private String manufacturingScope;
@ApiModelProperty(value = "制造单位代码")
private String manufacturingUnitCode;
@ApiModelProperty(value = "同步时间 yyyy-MM-dd HH24:mi:ss")
private Date syncDate;
@ApiModelProperty(value = "1初次同步数据 2上层系统已同步数据 0已删除数据")
private Boolean syncState;
@ApiModelProperty(value = "对接公司编码")
private String apiCompanyCode;
@ApiModelProperty(value = "气瓶数量")
private Long cylinderNumber;
@ApiModelProperty(value = "检验过期气瓶数量")
private Long cylinderOutOfDate;
@ApiModelProperty(value = "经度")
private String longitude;
@ApiModelProperty(value = "纬度")
private String latitude;
@ApiModelProperty(value = "是否过期")
private Boolean outOfDate;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/UnitPersonInfoDto.java
View file @ a50bcd0b
......@@ -98,6 +98,8 @@ public class UnitPersonInfoDto extends BaseDto {
private List<AttachmentDto> qrcode;
@ApiModelProperty(value = "所属单位 监管端使用")
private String organization;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderInfo.java 0 → 100644
View file @ a50bcd0b
package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
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 system_generator
* @date 2021-12-14
*/
@Data
@Accessors(chain = true)
@TableName("tz_cylinder_info")
public class CylinderInfo {
private static final long serialVersionUID = 1L;
@TableId(value = "sequence_nbr", type = IdType.ID_WORKER)
protected Long sequenceNbr;
/**
* 气瓶基本信息ID
*/
@TableField("cylinder_id")
private String cylinderId;
/**
* 产权单位名称
*/
@TableField("unit_name")
private String unitName;
/**
* 出厂编号
*/
@TableField("factory_num")
private String factoryNum;
/**
* 气瓶状态
*/
@TableField("cylinder_status")
private Integer cylinderStatus;
/**
* 气瓶品种
*/
@TableField("cylinder_variety")
private Integer cylinderVariety;
/**
* 二维码编号
*/
@TableField("qrCode")
private String qrCode;
/**
* 电子标签编号
*/
@TableField("electronic_label_code")
private String electronicLabelCode;
/**
* 充装介质
*/
@TableField("filling_medium")
private String fillingMedium;
/**
* 公称压力(MPa）
*/
@TableField("pressure")
private Double pressure;
/**
* 容积（L）
*/
@TableField("volume")
private Double volume;
/**
* 制造日期
*/
@TableField("manufacturing_date")
private Date manufacturingDate;
/**
* 制造单位
*/
@TableField("manufacturing_unit")
private String manufacturingUnit;
/**
* 气瓶制造许可证
*/
@TableField("license")
private String license;
/**
* 气瓶重量（kg）
*/
@TableField("cylinder_weight")
private Double cylinderWeight;
/**
* 单位内部编号
*/
@TableField("unit_inner_code")
private String unitInnerCode;
/**
* 最近一次检验日期
*/
@TableField("inspection_date")
private Date inspectionDate;
/**
* 下次检验日期
*/
@TableField("next_inspection_date")
private Date nextInspectionDate;
/**
* 气瓶唯一标识码
*/
@TableField("sequence_code")
private String sequenceCode;
/**
* 同步时间 yyyy-MM-dd HH24:mi:ss
*/
@TableField("sync_date")
private Date syncDate;
/**
* 1初次同步数据 2上层系统已同步数据 0已删除数据
*/
@TableField("sync_state")
private Boolean syncState;
/**
* 对接公司编码
*/
@TableField("api_company_code")
private String apiCompanyCode;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderUnit.java 0 → 100644
View file @ a50bcd0b
package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
/**
* 气瓶企业信息
*
* @author system_generator
* @date 2021-12-14
*/
@Data
@Accessors(chain = true)
@TableName("tz_cylinder_unit")
public class CylinderUnit {
private static final long serialVersionUID = 1L;
@TableId(value = "sequence_nbr", type = IdType.ID_WORKER)
protected Long sequenceNbr;
/**
* 单位ID
*/
@TableField("unit_id")
private String unitId;
/**
* 所属区域
*/
@TableField("region_code")
private String regionCode;
/**
* 单位名称
*/
@TableField("unit_name")
private String unitName;
/**
* 企业类型
*/
@TableField("unit_type")
private Integer unitType;
/**
* 统一社会信用代码
*/
@TableField("credit_code")
private String creditCode;
/**
* 详细地址
*/
@TableField("address")
private String address;
/**
* 企业负责人
*/
@TableField("unit_person")
private String unitPerson;
/**
* 企业负责人手机
*/
@TableField("person_mobile_phone")
private String personMobilePhone;
/**
* 企业负责人固定电话
*/
@TableField("person_telephone")
private String personTelephone;
/**
* 企业邮编
*/
@TableField("postal_code")
private String postalCode;
/**
* 企业简称
*/
@TableField("unit_abbreviation")
private String unitAbbreviation;
/**
* 充装许可证号
*/
@TableField("filling_license")
private String fillingLicense;
/**
* 充装许可证有效期
*/
@TableField("filling_permit_date")
private Date fillingPermitDate;
/**
* 充装许可范围
*/
@TableField("filling_perm_scope")
private String fillingPermScope;
/**
* 检验许可证号
*/
@TableField("inspection_license")
private String inspectionLicense;
/**
* 检验范围
*/
@TableField("inspection_scope")
private String inspectionScope;
/**
* 检验许可证有效期
*/
@TableField("effective_date")
private Date effectiveDate;
/**
* 制造许可证号
*/
@TableField("manufacturing_license")
private String manufacturingLicense;
/**
* 制造许可证有效期
*/
@TableField("manufacturing_date")
private Date manufacturingDate;
/**
* 制造许可范围
*/
@TableField("manufacturing_scope")
private String manufacturingScope;
/**
* 制造单位代码
*/
@TableField("manufacturing_unit_code")
private String manufacturingUnitCode;
/**
* 同步时间 yyyy-MM-dd HH24:mi:ss
*/
@TableField("sync_date")
private Date syncDate;
/**
* 1初次同步数据 2上层系统已同步数据 0已删除数据
*/
@TableField("sync_state")
private Boolean syncState;
/**
* 对接公司编码
*/
@TableField("api_company_code")
private String apiCompanyCode;
/**
* 经度
*/
@TableField("longitude")
private String longitude;
/**
* 纬度
*/
@TableField("latitude")
private String latitude;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/CylinderInfoMapper.java 0 → 100644
View file @ a50bcd0b
package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
* 气瓶基本信息 Mapper 接口
*
* @author system_generator
* @date 2021-12-14
*/
public interface CylinderInfoMapper extends BaseMapper<CylinderInfo> {
/**
* 查询根据公司查询气瓶数量以及过期气瓶数
* @param sequenceNbr
* @return
*/
Map<String, Long> queryNumAndOutOfDateNum(@Param("sequenceNbr") Long sequenceNbr);
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/CylinderUnitMapper.java 0 → 100644
View file @ a50bcd0b
package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderUnit;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* 气瓶企业信息 Mapper 接口
*
* @author system_generator
* @date 2021-12-14
*/
public interface CylinderUnitMapper extends BaseMapper<CylinderUnit> {
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/service/ICylinderInfoService.java 0 → 100644
View file @ a50bcd0b
package com.yeejoin.amos.boot.module.tzs.flc.api.service;
import java.util.Map;
/**
* 气瓶基本信息接口类
*
* @author system_generator
* @date 2021-12-14
*/
public interface ICylinderInfoService {
/**
* 根据企业id 获取气瓶数量及过期气瓶数量
* @param unitId
* @return
*/
Map<String, Long> queryNumAndOutOfDateNum(Long unitId);
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/service/ICylinderUnitService.java 0 → 100644
View file @ a50bcd0b
package com.yeejoin.amos.boot.module.tzs.flc.api.service;
/**
* 气瓶企业信息接口类
*
* @author system_generator
* @date 2021-12-14
*/
public interface ICylinderUnitService {
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/CylinderInfoMapper.xml 0 → 100644
View file @ a50bcd0b
<?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.tzs.flc.api.mapper.CylinderInfoMapper">
<select id="queryNumAndOutOfDateNum" resultType="java.util.Map">
SELECT
count( sequence_nbr ) AS cylinderNum,
count( CASE WHEN t.next_inspection_date <![CDATA[ < ]]> now() THEN 1 ELSE 0 END ) AS outOfDateNum
FROM
tz_cylinder_info t
WHERE
t.sequence_nbr IN ( SELECT max( tt.sequence_nbr ) FROM tz_cylinder_info tt GROUP BY tt.sequence_code )
AND t.api_company_code = (
SELECT
u.api_company_code
FROM
tz_cylinder_unit u
WHERE
u.sequence_nbr = #{sequenceNbr}
)
</select>
</mapper>
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/CylinderUnitMapper.xml 0 → 100644
View file @ a50bcd0b
<?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.tzs.flc.api.mapper.CylinderUnitMapper">
</mapper>
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyCarServiceImpl.java
View file @ a50bcd0b
......@@ -228,7 +228,7 @@ public class DutyCarServiceImpl extends DutyCommonServiceImpl implements IDutyCa
@Override
public int getDutyCarCount(Long carId) {
List<Map<String, Object>> equipmentList = dutyPersonShiftMapper.getEquipmentForSpecifyDate(DateUtils.getDateNowShortStr(),
this.getGroupCode(), "carId", "carName", "teamName","result.carId");
this.getGroupCode(), "carId", "carName", "teamName","");
int count =0;
for (Map<String, Object> map : equipmentList) {
if(map.containsKey("carId") && map.get("carId").equals(Long.toString(carId))) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/ESOrgUsrService.java
View file @ a50bcd0b
......@@ -9,6 +9,7 @@ import javax.annotation.PostConstruct;
import org.elasticsearch.index.query.BoolQueryBuilder;
import org.elasticsearch.index.query.FuzzyQueryBuilder;
import org.elasticsearch.index.query.MatchQueryBuilder;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -106,6 +107,29 @@ public class ESOrgUsrService {
return esOrgUsrDto;
}
public ESOrgUsrDto saveAlertCalledToESNew(OrgUsr orgUsr) throws Exception
{
ESOrgUsrDto esOrgUsrDto = new ESOrgUsrDto();
String seqStr = String.valueOf(orgUsr.getSequenceNbr());
try {
Long seq = Long.parseLong(seqStr);
esOrgUsrDto.setSequenceNbr(seq);
MatchQueryBuilder queryBuilder =null;
//设置模糊搜索
if(orgUsr.getBizOrgName()!=null) {
queryBuilder =QueryBuilders.matchQuery("bizOrgName", orgUsr.getBizOrgName());
}
Iterable<ESOrgUsrDto> search = esOrgUsrDtoRepository.search(queryBuilder);
if(!search.iterator().hasNext()) {
esOrgUsrDto.setBizOrgName(orgUsr.getBizOrgName());
esOrgUsrDtoRepository.save(esOrgUsrDto);
}
} catch (Exception e) {
e.printStackTrace();
}
return esOrgUsrDto;
}
/**
*
* <pre>
......
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 @ a50bcd0b
......@@ -704,6 +704,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
}
OrgUsrDto orgUsrDto = saveOrgUsrDynamicFormInstance(orgUsr, OrgUsrVo.getDynamicFormValue());
orgUsr.setSequenceNbr(orgUsrDto.getSequenceNbr());
/**
* 同步保存ES
*/
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/MonitorViewController.java
View file @ a50bcd0b
......@@ -94,7 +94,7 @@ public class MonitorViewController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "分页查询视图下的视频列表")
@RequestMapping(value = "/video/page", method = RequestMethod.GET)
public ResponseModel<Page<VideoListVo>> queryVideoPage(@RequestParam(value = "viewId") Long viewId,
public ResponseModel<Page<VideoListVo>> queryVideoPage(
@RequestParam(value = "nodeId") Long nodeId,
@RequestParam(value = "nodeType") String nodeType,
@RequestParam(value = "current") int current,
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/VideoController.java
View file @ a50bcd0b
......@@ -186,7 +186,7 @@ public class VideoController extends AbstractBaseController {
@RequestMapping(value = "/pageVideo", method = RequestMethod.GET)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "视频分页资源查询", notes = "视频分页资源查询")
public ResponseModel pageVideo(Integer pageNum, Integer pageSize, Double longitude, Double latitude, Double distance) {
public ResponseModel<Page<VideoListVo>> pageVideo(Integer pageNum, Integer pageSize, Double longitude, Double latitude, Double distance) {
if (null == pageNum || null == pageSize) {
pageNum = 1;
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java
View file @ a50bcd0b
......@@ -301,21 +301,22 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
BeanUtils.copyProperties(equipmentSpecificIndex, equipmentSpeIndex);
String value = iotDataVO.getValue().toString();
equipmentSpeIndex.setValue(value);
equipmentSpecificIndex.setValue(value);
String enumStr = equipmentSpecificIndex.getValueEnum();
if (!ObjectUtils.isEmpty(enumStr)) {
try {
JSONArray jsonArray = JSONArray.parseArray(enumStr);
for (int i = 0; i < jsonArray.size(); i++) {
JSONObject jsonObject = jsonArray.getJSONObject(i);
if (jsonObject.get("key").equals(equipmentSpecificIndex.getValue())) {
equipmentSpeIndex.setValueLabel(jsonObject.getString("label"));
}
}
} catch (Exception e) {
}
}
if (!ObjectUtils.isEmpty(enumStr)) {
try {
JSONArray jsonArray = JSONArray.parseArray(enumStr);
for (int i = 0; i < jsonArray.size(); i++) {
JSONObject jsonObject = jsonArray.getJSONObject(i);
if (jsonObject.get("key").equals(value)) {
equipmentSpeIndex.setValueLabel(jsonObject.getString("label"));
equipmentSpecificIndex.setValueLabel(jsonObject.getString("label"));
}
}
} catch (Exception e) {
}
}
equipmentSpecificIndexList.add(equipmentSpeIndex);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AircraftController.java
View file @ a50bcd0b
......@@ -140,12 +140,25 @@ public class AircraftController extends BaseController {
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@GetMapping(value = "findOne/{sequenceNbr}")
@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个航空器信息", notes = "根据sequenceNbr查询单个航空器信息")
public ResponseModel<AircraftDto> seleteOne(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(aircraftServiceImpl.queryByAircraftSeq(RequestContext.getAgencyCode(),
sequenceNbr));
}
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET", value = "查询航空器详情信息", notes = "查询航空器详情信息")
public ResponseModel<AircraftDto> queryBySeq(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(aircraftServiceImpl.queryBySeq(RequestContext.getAgencyCode(),
sequenceNbr));
}
/**
* 列表分页查询
......
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 @ a50bcd0b
......@@ -9,10 +9,12 @@ 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.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
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.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RequestPart;
......@@ -168,9 +170,12 @@ public class ExcelController extends BaseController {
@ApiOperation(value = "导出值班模板", notes = "导出值班模板")
@PostMapping (value = "/duty_template")
public void dutyCarTemplate(HttpServletResponse response, @RequestParam("beginDate") String beginDate,
@RequestParam("endDate") String endDate, ExcelDto excelDto, @RequestParam("ids") String ids) {
@RequestParam("endDate") String endDate, ExcelDto excelDto, @RequestBody String ids) {
try {
excelService.dutyTemplateExport(response, beginDate, endDate, excelDto, ids);
if(org.apache.commons.lang3.StringUtils.isNotEmpty(ids)) {
ids = ids.substring(1,ids.length()-1);
excelService.dutyTemplateExport(response, beginDate, endDate, excelDto, ids);
}
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("系统异常！");
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AircraftServiceImpl.java
View file @ a50bcd0b
......@@ -143,7 +143,22 @@ public class AircraftServiceImpl extends BaseService<AircraftDto, Aircraft, Airc
}
return aircraftDto;
}
public AircraftDto queryBySeq(String agencyCode, Long seq) {
AircraftDto aircraftDto = this.queryBySeq(seq);
FeignClientResult<List<FileInfoModel>> fileInfoModelResult = Systemctl.fileInfoClient.queryByEntity(
agencyCode, Aircraft.class.getSimpleName(), String.valueOf(seq));
List<FileInfoModel> fileInfoModels = fileInfoModelResult.getResult();
if (!ValidationUtil.isEmpty(fileInfoModels)) {
aircraftDto.setAppearanceImages(processToStr(fileInfoModels, AircraftFileTypeEnum.APPEARANCE.getCode()));
aircraftDto.setPlaneImages(processToStr(fileInfoModels, AircraftFileTypeEnum.PLANE.getCode()));
aircraftDto.setRescueImages(processToStr(fileInfoModels, AircraftFileTypeEnum.RESCUE.getCode()));
aircraftDto.setPositionImages(processToStr(fileInfoModels, AircraftFileTypeEnum.POSITION.getCode()));
aircraftDto.setModels(processToStr(fileInfoModels, AircraftFileTypeEnum.MODEL.getCode()));
}
return aircraftDto;
}
/**
* <pre>
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertCalledServiceImpl.java
View file @ a50bcd0b
......@@ -9,10 +9,6 @@ import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.yeejoin.amos.boot.module.common.api.dto.ESOrgUsrDto;
import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
import com.yeejoin.amos.boot.module.common.biz.service.impl.ESOrgUsrService;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
......@@ -31,6 +27,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
......@@ -46,8 +43,10 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.common.api.dto.FormValue;
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.entity.OrgUsr;
import com.yeejoin.amos.boot.module.common.api.feign.JcsControlServerClient;
import com.yeejoin.amos.boot.module.common.api.feign.KnowledgebaseFeignClient;
import com.yeejoin.amos.boot.module.common.biz.service.impl.ESOrgUsrService;
import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersServiceImpl;
import com.yeejoin.amos.boot.module.common.biz.service.impl.KeySiteServiceImpl;
import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
......@@ -437,7 +436,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
OrgUsr orgUsr = new OrgUsr();
orgUsr.setSequenceNbr(-1L);
orgUsr.setBizOrgName(alertCalled.getUnitInvolved());
eSOrgUsrService.saveAlertCalledToES(orgUsr);
eSOrgUsrService.saveAlertCalledToESNew(orgUsr);
}
......@@ -1023,6 +1022,9 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
AlertCalledFormDto dto = (AlertCalledFormDto) selectAlertCalledByIdNoRedis(id);
AlertCalled alertCalled = dto.getAlertCalled();
List<FormValue> list = dto.getDynamicFormAlert();
if(ObjectUtils.isEmpty(alertCalled) ) {
return null;
}
if (alertCalled.getAlertTypeCode().equals(AlertStageEnums.YBHZ.getCode())) {// 一般火灾
String condition1 = alertCalled.getAlertType();// 一般火灾
String condition2 = alertCalled.getUnitInvolved();// 事发单位
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertSubmittedServiceImpl.java
View file @ a50bcd0b
......@@ -485,7 +485,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
smsParams.put("feedback", calledRo.getFeedback());
}
// 短信报送对象
alertSubmittedObjectServiceImpl.saveBatch(alertSubmittedObjectList);
// alertSubmittedObjectServiceImpl.saveBatch(alertSubmittedObjectList);
// 发送任务消息
// 组织短信内容
// 调用短信发送接口
......@@ -1426,7 +1426,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
alertSubmittedObjectSub.setUserPhone(map.get("mobilePhone").toString());
}
alertSubmittedObjectListSub.add(alertSubmittedObjectSub);
alertSubmittedObjectServiceImpl.saveBatch(alertSubmittedObjectListSub);
// alertSubmittedObjectServiceImpl.saveBatch(alertSubmittedObjectListSub);
// 调用短信发送接口
alertCalledAction.sendAlertCalleCmd(sCode, mobile, smsParams);
Map<String, String> besidesMap = new HashMap<String, String>();
......@@ -1453,7 +1453,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
});
smsParams.put("resourcesNum", resourcesNumStr.substring(resourcesNumStr.length() - 2));
// 短信报送对象
alertSubmittedObjectServiceImpl.saveBatch(alertSubmittedObjectList);
// alertSubmittedObjectServiceImpl.saveBatch(alertSubmittedObjectList);
// 发送任务消息
// 组织短信内容
// 调用短信发送接口
......@@ -1566,7 +1566,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
});
smsParams.put("resourcesNum", companyName);
// 短信报送对象
alertSubmittedObjectServiceImpl.saveBatch(alertSubmittedObjectList);
// alertSubmittedObjectServiceImpl.saveBatch(alertSubmittedObjectList);
// 发送任务消息
// 组织短信内容
// 调用短信发送接口
......@@ -1686,7 +1686,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
});
smsParams.put("resourcesNum", companyName);
// 短信报送对象
alertSubmittedObjectServiceImpl.saveBatch(alertSubmittedObjectList);
// alertSubmittedObjectServiceImpl.saveBatch(alertSubmittedObjectList);
// 发送任务消息
// 组织短信内容
// 调用短信发送接口
......@@ -1724,7 +1724,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
pushMessageWebAndAppRo.setMsgType(this.msgType);
pushMessageWebAndAppRo.setTerminal(RuleConstant.APP_WEB);
Map<String,String> map= new HashMap<String,String>();
map.put("url", "disasterPage");
//map.put("url", "disasterPage");
map.put("sequenceNbr", besidesMap.get("alterId"));
if(AlertBusinessTypeEnum.警情结案.getCode().equals(type)) {
......@@ -1751,7 +1751,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
pushMessageWebAndAppRo.setRuleType("followReportAlert");
}
if(AlertBusinessTypeEnum.力量调派.getCode().equals(type)) {
map.put("url", "powerInformationPage");
//map.put("url", "powerInformationPage");
pushMessageWebAndAppRo.setName(AlertBusinessTypeEnum.力量调派.getName());
pushMessageWebAndAppRo.setCompanyName(smsParams.get("resourcesNum"));
pushMessageWebAndAppRo.setAddress(smsParams.get("address"));
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/CylinderInfoController.java 0 → 100644
View file @ a50bcd0b
package com.yeejoin.amos.boot.module.tzs.flc.biz.controller;
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.tzs.flc.biz.service.impl.CylinderInfoServiceImpl;
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.tzs.flc.api.dto.CylinderInfoDto;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
/**
* 气瓶基本信息
*
* @author system_generator
* @date 2021-12-14
*/
@RestController
@Api(tags = "气瓶基本信息Api")
@RequestMapping(value = "/cylinder-info")
public class CylinderInfoController extends BaseController {
@Autowired
CylinderInfoServiceImpl cylinderInfoServiceImpl;
/**
* 新增气瓶基本信息
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增气瓶基本信息", notes = "新增气瓶基本信息")
public ResponseModel<CylinderInfoDto> save(@RequestBody CylinderInfoDto model) {
model = cylinderInfoServiceImpl.createWithModel(model);
return ResponseHelper.buildResponse(model);
}
/**
* 根据sequenceNbr更新
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新气瓶基本信息", notes = "根据sequenceNbr更新气瓶基本信息")
public ResponseModel<CylinderInfoDto> updateBySequenceNbrCylinderInfo(@RequestBody CylinderInfoDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(cylinderInfoServiceImpl.updateWithModel(model));
}
/**
* 根据sequenceNbr删除
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除气瓶基本信息", notes = "根据sequenceNbr删除气瓶基本信息")
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
return ResponseHelper.buildResponse(cylinderInfoServiceImpl.removeById(sequenceNbr));
}
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个气瓶基本信息", notes = "根据sequenceNbr查询单个气瓶基本信息")
public ResponseModel<CylinderInfoDto> selectOne(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(cylinderInfoServiceImpl.queryBySeq(sequenceNbr));
}
/**
* 列表分页查询
*
* @param current 当前页
* @param current 每页大小
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "气瓶基本信息分页查询", notes = "气瓶基本信息分页查询")
public ResponseModel<Page<CylinderInfoDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
(value = "size") int size) {
Page<CylinderInfoDto> page = new Page<CylinderInfoDto>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(cylinderInfoServiceImpl.queryForCylinderInfoPage(page));
}
/**
* 列表全部数据查询
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "气瓶基本信息列表全部数据查询", notes = "气瓶基本信息列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<CylinderInfoDto>> selectForList() {
return ResponseHelper.buildResponse(cylinderInfoServiceImpl.queryForCylinderInfoList());
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/CylinderUnitController.java 0 → 100644
View file @ a50bcd0b
package com.yeejoin.amos.boot.module.tzs.flc.biz.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderUnitDto;
import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderUnit;
import com.yeejoin.amos.boot.module.tzs.flc.api.service.ICylinderInfoService;
import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.CylinderUnitServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* 气瓶企业信息
*
* @author system_generator
* @date 2021-12-14
*/
@RestController
@Api(tags = "气瓶企业信息Api")
@RequestMapping(value = "/cylinder-unit")
public class CylinderUnitController extends BaseController {
@Autowired
CylinderUnitServiceImpl cylinderUnitServiceImpl;
@Autowired
ICylinderInfoService iCylinderInfoService;
/**
* 通过regionCode查询气瓶企业
*
* @return 查询结果
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/queryCylinderUnitList", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "通过regionCode查询气瓶企业", notes = "通过regionCode查询气瓶企业")
public ResponseModel<List<CylinderUnitDto>> querySpecialEquipmentList(@RequestParam String regionCode){
List<CylinderUnit> unitList = cylinderUnitServiceImpl.list(new LambdaQueryWrapper<CylinderUnit>().like(CylinderUnit::getRegionCode,regionCode));
List<CylinderUnitDto> result = new ArrayList<>();
unitList.stream().forEach(t -> {
CylinderUnitDto temp = new CylinderUnitDto();
BeanUtils.copyProperties(t,temp);
if(t.getFillingPermitDate() != null && t.getFillingPermitDate().getTime() < System.currentTimeMillis()) {
temp.setOutOfDate(true);
} else {
temp.setOutOfDate(false);
}
result.add(temp);
});
return ResponseHelper.buildResponse(result);
}
/**
* 根据sequenceNbr查询
*
* @param id 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getUnitInfo")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个气瓶企业信息", notes = "根据sequenceNbr查询单个气瓶企业信息")
public ResponseModel<CylinderUnitDto> selectOne(@RequestParam Long id) {
CylinderUnitDto unit = cylinderUnitServiceImpl.queryBySeq(id);
// 查询气瓶数量以及过期数量
Map<String, Long> cylinderInfo = iCylinderInfoService.queryNumAndOutOfDateNum(unit.getSequenceNbr());
if(cylinderInfo != null) {
if(cylinderInfo.get("cylinderNum") != null) {
unit.setCylinderNumber(cylinderInfo.get("cylinderNum"));
}
if(cylinderInfo.get("outOfDateNum") != null) {
unit.setCylinderOutOfDate(cylinderInfo.get("outOfDateNum"));
}
}
return ResponseHelper.buildResponse(unit);
}
/**
* 列表分页查询
*
* @param current 当前页
* @param current 每页大小
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "气瓶企业信息分页查询", notes = "气瓶企业信息分页查询")
public ResponseModel<Page<CylinderUnitDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
(value = "size") int size) {
Page<CylinderUnitDto> page = new Page<CylinderUnitDto>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(cylinderUnitServiceImpl.queryForCylinderUnitPage(page));
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/CylinderInfoServiceImpl.java 0 → 100644
View file @ a50bcd0b
package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderInfo;
import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderInfoMapper;
import com.yeejoin.amos.boot.module.tzs.flc.api.service.ICylinderInfoService;
import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderInfoDto;
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;
import java.util.Map;
/**
* 气瓶基本信息服务实现类
*
* @author system_generator
* @date 2021-12-14
*/
@Service
public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto,CylinderInfo,CylinderInfoMapper> implements ICylinderInfoService {
/**
* 分页查询
*/
public Page<CylinderInfoDto> queryForCylinderInfoPage(Page<CylinderInfoDto> page) {
return this.queryForPage(page, null, false);
}
/**
* 列表查询 示例
*/
public List<CylinderInfoDto> queryForCylinderInfoList() {
return this.queryForList("" , false);
}
@Override
public Map<String, Long> queryNumAndOutOfDateNum(Long unitId) {
return baseMapper.queryNumAndOutOfDateNum(unitId);
}
}
\ No newline at end of file
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/CylinderUnitServiceImpl.java 0 → 100644
View file @ a50bcd0b
package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderUnit;
import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderUnitMapper;
import com.yeejoin.amos.boot.module.tzs.flc.api.service.ICylinderUnitService;
import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderUnitDto;
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 system_generator
* @date 2021-12-14
*/
@Service
public class CylinderUnitServiceImpl extends BaseService<CylinderUnitDto,CylinderUnit,CylinderUnitMapper> implements ICylinderUnitService {
/**
* 分页查询
*/
public Page<CylinderUnitDto> queryForCylinderUnitPage(Page<CylinderUnitDto> page) {
return this.queryForPage(page, null, false);
}
/**
* 列表查询 示例
*/
public List<CylinderUnitDto> queryForCylinderUnitList() {
return this.queryForList("" , false);
}
}
\ No newline at end of file
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/UnitPersonServiceImpl.java
View file @ a50bcd0b
......@@ -122,18 +122,20 @@ public class UnitPersonServiceImpl implements IUnitPersonService {
iSourceFileService.saveAttachments(result.getSequenceNbr(),userAttach);
if(personQualityDto != null) {
String[] licenceTypeCode = personQualityDto.getLicenceTypeCode().split(",");
List<DataDictionary> list = iDataDictionaryService.list(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getIsDelete,false).in(DataDictionary::getCode,licenceTypeCode));
String licenceType = "";
for(DataDictionary temp : list) {
licenceType += "," + temp.getName();
}
if(licenceType.length() > 0) {
licenceType = licenceType.substring(1);
personQualityDto.setLicenceType(licenceType);
if(StringUtils.isNotEmpty(personQualityDto.getLicenceTypeCode())) {
String[] licenceTypeCode = personQualityDto.getLicenceTypeCode().split(",");
List<DataDictionary> list = iDataDictionaryService.list(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getIsDelete,false).in(DataDictionary::getCode,licenceTypeCode));
String licenceType = "";
for(DataDictionary temp : list) {
licenceType += "," + temp.getName();
}
if(licenceType.length() > 0) {
licenceType = licenceType.substring(1);
personQualityDto.setLicenceType(licenceType);
}
}
// 创建人员资质信息
personQualityDto.setPsersonId(result.getSequenceNbr());
personQualityDto = flcPersonQualityServiceImpl.createWithModel(personQualityDto);
......@@ -269,6 +271,14 @@ public class UnitPersonServiceImpl implements IUnitPersonService {
} catch (Exception e) {
e.printStackTrace();
}
String organizationId = temp.getOrgExpandAttr3(); // 所属组织
if(StringUtils.isNotBlank(organizationId)) {
FeignClientResult<CompanyModel> company = Privilege.companyClient.seleteOne(Long.parseLong(organizationId));
if(company != null && company.getResult() != null) {
CompanyModel tempModel = company.getResult();
temp.setOrganization(tempModel.getCompanyName());
}
}
return temp;
}
......@@ -399,15 +409,17 @@ public class UnitPersonServiceImpl implements IUnitPersonService {
if(personQualityDto != null) {
String[] licenceTypeCode = personQualityDto.getLicenceTypeCode().split(",");
List<DataDictionary> list = iDataDictionaryService.list(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getIsDelete,false).in(DataDictionary::getCode,licenceTypeCode));
String licenceType = "";
for(DataDictionary temp : list) {
licenceType += "," + temp.getName();
}
if(licenceType.length() > 0) {
licenceType = licenceType.substring(1);
personQualityDto.setLicenceType(licenceType);
if(StringUtils.isNotEmpty(personQualityDto.getLicenceTypeCode())) {
String[] licenceTypeCode = personQualityDto.getLicenceTypeCode().split(",");
List<DataDictionary> list = iDataDictionaryService.list(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getIsDelete,false).in(DataDictionary::getCode,licenceTypeCode));
String licenceType = "";
for(DataDictionary temp : list) {
licenceType += "," + temp.getName();
}
if(licenceType.length() > 0) {
licenceType = licenceType.substring(1);
personQualityDto.setLicenceType(licenceType);
}
}
// 创建人员资质信息
......@@ -518,17 +530,20 @@ public class UnitPersonServiceImpl implements IUnitPersonService {
if(personQualityDto != null) {
String[] licenceTypeCode = personQualityDto.getLicenceTypeCode().split(",");
List<DataDictionary> list = iDataDictionaryService.list(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getIsDelete,false).in(DataDictionary::getCode,licenceTypeCode));
String licenceType = "";
for(DataDictionary temp : list) {
licenceType += "," + temp.getName();
}
if(licenceType.length() > 0) {
licenceType = licenceType.substring(1);
personQualityDto.setLicenceType(licenceType);
if(StringUtils.isNotEmpty(personQualityDto.getLicenceTypeCode())) {
String[] licenceTypeCode = personQualityDto.getLicenceTypeCode().split(",");
List<DataDictionary> list = iDataDictionaryService.list(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getIsDelete,false).in(DataDictionary::getCode,licenceTypeCode));
String licenceType = "";
for(DataDictionary temp : list) {
licenceType += "," + temp.getName();
}
if(licenceType.length() > 0) {
licenceType = licenceType.substring(1);
personQualityDto.setLicenceType(licenceType);
}
}
// 更新人员资质信息
personQualityDto.setPsersonId(unitPersonInfoDto.getSequenceNbr());
if(personQualityDto.getSequenceNbr() != null) {
......@@ -704,16 +719,17 @@ public class UnitPersonServiceImpl implements IUnitPersonService {
iSourceFileService.saveAttachments(unitPersonInfoDto.getSequenceNbr(),userAttach);
if(personQualityDto != null) {
String[] licenceTypeCode = personQualityDto.getLicenceTypeCode().split(",");
List<DataDictionary> list = iDataDictionaryService.list(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getIsDelete,false).in(DataDictionary::getCode,licenceTypeCode));
String licenceType = "";
for(DataDictionary temp : list) {
licenceType += "," + temp.getName();
}
if(licenceType.length() > 0) {
licenceType = licenceType.substring(1);
personQualityDto.setLicenceType(licenceType);
if(StringUtils.isNotEmpty(personQualityDto.getLicenceTypeCode())) {
String[] licenceTypeCode = personQualityDto.getLicenceTypeCode().split(",");
List<DataDictionary> list = iDataDictionaryService.list(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getIsDelete,false).in(DataDictionary::getCode,licenceTypeCode));
String licenceType = "";
for(DataDictionary temp : list) {
licenceType += "," + temp.getName();
}
if(licenceType.length() > 0) {
licenceType = licenceType.substring(1);
personQualityDto.setLicenceType(licenceType);
}
}
// 更新人员资质信息
......
amos-boot-system-equip/src/main/resources/mapper/VideoMapper.xml
View file @ a50bcd0b
......@@ -307,11 +307,13 @@
wle.address ,
wle.longitude,
<if test='longitude!=null and latitude!=null '>
Round(st_distance(point(wle.longitude,wle.latitude),point(#{longitude},#{latitude}))*111195,1) AS distance
Round(st_distance(point(wle.longitude,wle.latitude),point(#{longitude},#{latitude}))*111195,1) AS distance,
</if>
wle.latitude
FROM wl_video wle
where wle.longitude is not null and wle.latitude is not null
<if test='distance!=null'>
and Round(st_distance(point(wle.longitude,wle.latitude),point(#{longitude},#{latitude}))*111195,1) &lt;=
#{distance}
......@@ -333,7 +335,7 @@
count( wle.id ) num
FROM wl_video wle
where wle.longitude is not null and wle.latitude is not null
<if test='distance!=null'>
and Round(st_distance(point(wle.longitude,wle.latitude),point(#{longitude},#{latitude}))*111195,1) &lt;=
#{distance}
......
amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml
View file @ a50bcd0b
......@@ -2379,5 +2379,15 @@
</sql>
</changeSet>
<changeSet author="chenzhao" id="2021-12-15-1-1">
<preConditions onFail="MARK_RAN">
<tableExists tableName="cb_data_dictionary"/>
</preConditions>
<comment>update data cb_data_dictionary</comment>
<sql>
UPDATE `cb_data_dictionary` SET name = '电话接报' WHERE sequence_nbr = 1328
</sql>
</changeSet>
</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