Skip to content

A
amos-boot-biz
Commit f3807ca9 authored by 吴江's avatar 吴江
Browse files
Options

Merge branch 'developer' into 'develop_unit_register'

Developer See merge request !10
parents d8cbac02 feea2f1d
Hide whitespace changes
Inline Side-by-side
Showing with 601 additions and 355 deletions
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/EquEnterDto.java 0 → 100644
View file @ f3807ca9
package com.yeejoin.amos.boot.module.tzs.api.dto;
import lombok.Data;
@Data
public class EquEnterDto {
/**
* 设备id
*/
private String sequenceNbr;
/**
* 使用登记代码
*/
private String useOrgCode;
/**
* 设备类别
*/
private String equCategory;
/**
* 设备名称
*/
private String productName;
/**
* 设备位置
*/
private String address;
}
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/TzBaseEnterpriseInfoDto.java
View file @ f3807ca9
...@@ -16,236 +16,243 @@ import lombok.Data; ...@@ -16,236 +16,243 @@ import lombok.Data;
@Data @Data
public class TzBaseEnterpriseInfoDto extends BaseDto { public class TzBaseEnterpriseInfoDto extends BaseDto {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id") @ApiModelProperty(value = "id")
/** /**
* id * id
*/ */
private Long sequenceNbr; private Long sequenceNbr;
@ApiModelProperty(value = "使用单位唯一标识") @ApiModelProperty(value = "使用单位唯一标识")
/** /**
* 使用单位唯一标识 * 使用单位唯一标识
*/ */
private String useUnitCode; private String useUnitCode;
@ApiModelProperty(value = "监管系统唯一编码") @ApiModelProperty(value = "监管系统唯一编码")
/** /**
* 监管系统唯一编码 * 监管系统唯一编码
*/ */
private String superviseCode; private String superviseCode;
@ApiModelProperty(value = "使用单位证件类型") @ApiModelProperty(value = "使用单位证件类型")
/** /**
* 使用单位证件类型 * 使用单位证件类型
*/ */
private String useUnitCertificate; private String useUnitCertificate;
@ApiModelProperty(value = "单位类型") @ApiModelProperty(value = "单位类型")
/** /**
* 单位类型 * 单位类型
*/ */
private String unitType; private String unitType;
@ApiModelProperty(value = "使用单位统一信用代码") @ApiModelProperty(value = "使用单位统一信用代码")
/** /**
* 使用单位统一信用代码 * 使用单位统一信用代码
*/ */
private String useCode; private String useCode;
@ApiModelProperty(value = "使用单位名称") @ApiModelProperty(value = "使用单位名称")
/** /**
* 使用单位名称 * 使用单位名称
*/ */
private String useUnit; private String useUnit;
@ApiModelProperty(value = "监管机构组织机构代码") @ApiModelProperty(value = "监管机构组织机构代码")
/** /**
* 监管机构组织机构代码 * 监管机构组织机构代码
*/ */
private String superviseOrgCode; private String superviseOrgCode;
@ApiModelProperty(value = "监管机构名称") @ApiModelProperty(value = "监管机构名称")
/** /**
* 监管机构名称 * 监管机构名称
*/ */
private String superviseOrgName; private String superviseOrgName;
@ApiModelProperty(value = "是否重点监控单位") @ApiModelProperty(value = "是否重点监控单位")
/** /**
* 是否重点监控单位 * 是否重点监控单位
*/ */
private String keyUnit; private String keyUnit;
@ApiModelProperty(value = "重点场所分类") @ApiModelProperty(value = "重点场所分类")
/** /**
* 重点场所分类 * 重点场所分类
*/ */
private String classPlaces; private String classPlaces;
@ApiModelProperty(value = "单位所在省份名称") @ApiModelProperty(value = "单位所在省份名称")
/** /**
* 单位所在省份名称 * 单位所在省份名称
*/ */
private String province; private String province;
@ApiModelProperty(value = "单位所在城市名称") @ApiModelProperty(value = "单位所在城市名称")
/** /**
* 单位所在城市名称 * 单位所在城市名称
*/ */
private String city; private String city;
@ApiModelProperty(value = "单位所在区县名称") @ApiModelProperty(value = "单位所在区县名称")
/** /**
* 单位所在区县名称 * 单位所在区县名称
*/ */
private String district; private String district;
@ApiModelProperty(value = "单位所在街道名称") @ApiModelProperty(value = "单位所在街道名称")
/** /**
* 单位所在街道名称 * 单位所在街道名称
*/ */
private String street; private String street;
@ApiModelProperty(value = "单位所在社区名称") @ApiModelProperty(value = "单位所在社区名称")
/** /**
* 单位所在社区名称 * 单位所在社区名称
*/ */
private String community; private String community;
@ApiModelProperty(value = "单位详细地址") @ApiModelProperty(value = "单位详细地址")
/** /**
* 单位详细地址 * 单位详细地址
*/ */
private String address; private String address;
@ApiModelProperty(value = "使用单位法人") @ApiModelProperty(value = "使用单位法人")
/** /**
* 使用单位法人 * 使用单位法人
*/ */
private String legalPerson; private String legalPerson;
@ApiModelProperty(value = "法人联系电话") @ApiModelProperty(value = "法人联系电话")
/** /**
* 法人联系电话 * 法人联系电话
*/ */
private String legalPhone; private String legalPhone;
@ApiModelProperty(value = "使用单位联系人") @ApiModelProperty(value = "使用单位联系人")
/** /**
* 使用单位联系人 * 使用单位联系人
*/ */
private String useContact; private String useContact;
@ApiModelProperty(value = "联系人联系电话") @ApiModelProperty(value = "联系人联系电话")
/** /**
* 联系人联系电话 * 联系人联系电话
*/ */
private String contactPhone; private String contactPhone;
@ApiModelProperty(value = "安全管理人员1姓名") @ApiModelProperty(value = "安全管理人员1姓名")
/** /**
* 安全管理人员1姓名 * 安全管理人员1姓名
*/ */
private String safetyOne; private String safetyOne;
@ApiModelProperty(value = "安全管理人员1身份证") @ApiModelProperty(value = "安全管理人员1身份证")
/** /**
* 安全管理人员1身份证 * 安全管理人员1身份证
*/ */
private String safetyOneId; private String safetyOneId;
@ApiModelProperty(value = "安全管理人员1联系电话") @ApiModelProperty(value = "安全管理人员1联系电话")
/** /**
* 安全管理人员1联系电话 * 安全管理人员1联系电话
*/ */
private String safetyOnePhone; private String safetyOnePhone;
@ApiModelProperty(value = "安全管理人员2") @ApiModelProperty(value = "安全管理人员2")
/** /**
* 安全管理人员2 * 安全管理人员2
*/ */
private String safetyTwo; private String safetyTwo;
@ApiModelProperty(value = "安全管理人员2身份证") @ApiModelProperty(value = "安全管理人员2身份证")
/** /**
* 安全管理人员2身份证 * 安全管理人员2身份证
*/ */
private String safetyTwoId; private String safetyTwoId;
@ApiModelProperty(value = "安全管理人员2联系电话") @ApiModelProperty(value = "安全管理人员2联系电话")
/** /**
* 安全管理人员2联系电话 * 安全管理人员2联系电话
*/ */
private String safetyTwoPhone; private String safetyTwoPhone;
@ApiModelProperty(value = "单位地理坐标经度") @ApiModelProperty(value = "单位地理坐标经度")
/** /**
* 单位地理坐标经度 * 单位地理坐标经度
*/ */
private String longitude; private String longitude;
@ApiModelProperty(value = "单位地理坐标纬度") @ApiModelProperty(value = "单位地理坐标纬度")
/** /**
* 单位地理坐标纬度 * 单位地理坐标纬度
*/ */
private String latitude; private String latitude;
@ApiModelProperty(value = "同步时间") @ApiModelProperty(value = "同步时间")
/** /**
* 同步时间 * 同步时间
*/ */
private Date syncDate; private Date syncDate;
@ApiModelProperty(value = "同步状态（0-新增 1-更新 2-删除）") @ApiModelProperty(value = "同步状态（0-新增 1-更新 2-删除）")
/** /**
* 同步状态（0-新增 1-更新 2-删除） * 同步状态（0-新增 1-更新 2-删除）
*/ */
private Integer syncState; private Integer syncState;
@ApiModelProperty(value = "对接公司编码") @ApiModelProperty(value = "对接公司编码")
/** /**
* 对接公司编码 * 对接公司编码
*/ */
private String appId; private String appId;
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
/** /**
* 创建时间 * 创建时间
*/ */
private Date recDate; private Date recDate;
@ApiModelProperty(value = "操作人员") @ApiModelProperty(value = "操作人员")
/** /**
* 操作人员 * 操作人员
*/ */
private String recUserId; private String recUserId;
@ApiModelProperty(value = "管辖机构") @ApiModelProperty(value = "管辖机构")
/** /**
* 管辖机构 * 管辖机构
*/ */
private String governingBody; private String governingBody;
@ApiModelProperty(value = "数据来源") @ApiModelProperty(value = "数据来源")
/** /**
* 数据来源 * 数据来源
*/ */
private String dataSources; private String dataSources;
@ApiModelProperty(value = "所属行业") @ApiModelProperty(value = "所属行业")
/** /**
* 所属行业 * 所属行业
*/ */
private String industry; private String industry;
@ApiModelProperty(value = "登记机关") @ApiModelProperty(value = "登记机关")
/** /**
* 登记机关 * 登记机关
*/ */
private String registrationAuthority; private String registrationAuthority;
@ApiModelProperty(value = "核准时间") @ApiModelProperty(value = "核准时间")
/** /**
* 核准时间 * 核准时间
*/ */
private Date approvalTime; private Date approvalTime;
@ApiModelProperty(value = "经营状态") @ApiModelProperty(value = "经营状态")
/** /**
* 经营状态 * 经营状态
*/ */
private String operatingStatus; private String operatingStatus;
@ApiModelProperty(value = "维保负责人") @ApiModelProperty(value = "维保负责人")
/** /**
* 维保负责人 * 维保负责人
*/ */
private String maintenPerson; private String maintenPerson;
@ApiModelProperty(value = "维保负责人联系电话") @ApiModelProperty(value = "维保负责人联系电话")
/** /**
* 维保负责人联系电话 * 维保负责人联系电话
*/ */
private String maintenTelephone; private String maintenTelephone;
@ApiModelProperty(value = "质量保证工程师") @ApiModelProperty(value = "质量保证工程师")
/** /**
* 质量保证工程师 * 质量保证工程师
*/ */
private String sqa; private String sqa;
@ApiModelProperty(value = "质量负责人") @ApiModelProperty(value = "质量负责人")
/** /**
* 质量负责人 * 质量负责人
*/ */
private String qualityPerson; private String qualityPerson;
@ApiModelProperty(value = "质量负责人电话") @ApiModelProperty(value = "质量负责人电话")
/** /**
* 质量负责人电话 * 质量负责人电话
*/ */
private String qualityTelephone; private String qualityTelephone;
@ApiModelProperty(value = "技术负责人") @ApiModelProperty(value = "技术负责人")
/** /**
* 技术负责人 * 技术负责人
*/ */
private String technicalPerson; private String technicalPerson;
private String region;
private String fullAddress;
private String superviseKey;
} }
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/TzBaseEnterpriseInfo.java
View file @ f3807ca9
package com.yeejoin.amos.boot.module.tzs.api.entity; package com.yeejoin.amos.boot.module.tzs.api.entity;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableName;
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;
...@@ -21,7 +23,8 @@ import java.util.Date; ...@@ -21,7 +23,8 @@ import java.util.Date;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "TzBaseEnterpriseInfo对象", description = "企业数据信息") @TableName("tz_base_enterprise_info")
@ApiModel(value="TzBaseEnterpriseInfo对象", description="企业数据信息")
public class TzBaseEnterpriseInfo extends BaseEntity { public class TzBaseEnterpriseInfo extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/TzBaseEnterpriseInfoMapper.java
View file @ f3807ca9
package com.yeejoin.amos.boot.module.tzs.api.mapper; package com.yeejoin.amos.boot.module.tzs.api.mapper;
import com.yeejoin.amos.boot.module.tzs.api.dto.EquEnterDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.TzBaseEnterpriseInfoDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.TzsJgBasicInfoDto;
import com.yeejoin.amos.boot.module.tzs.api.entity.PageParam;
import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo; import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List;
/** /**
* 企业数据信息 Mapper 接口 * 企业数据信息 Mapper 接口
...@@ -11,4 +19,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -11,4 +19,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/ */
public interface TzBaseEnterpriseInfoMapper extends BaseMapper<TzBaseEnterpriseInfo> { public interface TzBaseEnterpriseInfoMapper extends BaseMapper<TzBaseEnterpriseInfo> {
/**
* 查找企业关联设备详情列表
*
* @param sequenceNbr 企业id
* @return EquEnterDto 使用登记证代码、设备名称、设备类别、设备位置
*/
List<EquEnterDto> getInfo(String sequenceNbr);
IPage<TzBaseEnterpriseInfoDto> page(Page<TzBaseEnterpriseInfoDto> page, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto);
} }
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/ITzBaseEnterpriseInfoService.java
View file @ f3807ca9
package com.yeejoin.amos.boot.module.tzs.api.service; package com.yeejoin.amos.boot.module.tzs.api.service;
import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo; import java.util.List;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.yeejoin.amos.boot.module.tzs.api.dto.EquEnterDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.TzBaseEnterpriseInfoDto;
import com.yeejoin.amos.boot.module.tzs.api.entity.PageParam;
import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo;
/** /**
* 企业数据信息 服务类 * 企业数据信息 服务类
...@@ -11,4 +17,15 @@ import com.baomidou.mybatisplus.extension.service.IService; ...@@ -11,4 +17,15 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/ */
public interface ITzBaseEnterpriseInfoService extends IService<TzBaseEnterpriseInfo> { public interface ITzBaseEnterpriseInfoService extends IService<TzBaseEnterpriseInfo> {
/**
* 查找企业关联设备详情列表
*
* @param sequenceNbr 企业id
* @return EquEnterDto 使用登记证代码、设备名称、设备类别、设备位置
*/
List<EquEnterDto> getInfo(String sequenceNbr);
IPage<TzBaseEnterpriseInfoDto> page(PageParam pageParam, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto);
TzBaseEnterpriseInfoDto detail(Long id);
} }
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/IdxUjerDto.java
View file @ f3807ca9
...@@ -5,6 +5,8 @@ import lombok.Data; ...@@ -5,6 +5,8 @@ import lombok.Data;
@Data @Data
public class IdxUjerDto { public class IdxUjerDto {
private String businessName; private String businessName;
private String creditCode;
private String businessType;
private byte[] businessAddress; private byte[] businessAddress;
private String businessAddressStr; private String businessAddressStr;
private String contacts; private String contacts;
......
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/TzCarcylRegDto.java
View file @ f3807ca9
...@@ -27,7 +27,7 @@ public class TzCarcylRegDto { ...@@ -27,7 +27,7 @@ public class TzCarcylRegDto {
/** /**
* id * id
*/ */
private Long sequenceNbr; private String sequenceNbr;
@ApiModelProperty(value = "使用单位名称") @ApiModelProperty(value = "使用单位名称")
/** /**
* 使用单位名称 * 使用单位名称
......
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/resources/mapper/TzBaseEnterpriseInfoMapper.xml
View file @ f3807ca9
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yeejoin.precontrol.common.mapper.TzBaseEnterpriseInfoMapper"> <mapper
namespace="com.yeejoin.amos.boot.module.tzs.api.mapper.TzBaseEnterpriseInfoMapper">
<select id="getInfo"
resultType="com.yeejoin.amos.boot.module.tzs.api.dto.EquEnterDto">
SELECT
RI.sequence_nbr,
RI.use_org_code,
RI.equ_category,
RI.product_name,
UI.address
FROM
tz_jg_registration_info AS RI
LEFT JOIN tz_jg_use_info UI ON RI.sequence_code = UI.sequence_code
LEFT JOIN tz_base_enterprise_info EI ON EI.sequence_nbr = #{sequenceNbr}
WHERE
EI.use_code = RI.organization_code
</select>
<select id="page"
resultType="com.yeejoin.amos.boot.module.tzs.api.dto.TzBaseEnterpriseInfoDto">
SELECT
*,
CONCAT(province,"/",city,"/",district) AS region,
CONCAT(street,"/",address) AS full_address
FROM
tz_base_enterprise_info
<where>
<if
test="tzBaseEnterpriseInfoDto.unitType!=null and tzBaseEnterpriseInfoDto.unitType!='' ">
AND unit_type = #{tzBaseEnterpriseInfoDto.unitType}
</if>
<if
test="tzBaseEnterpriseInfoDto.useUnit!=null and tzBaseEnterpriseInfoDto.useUnit!='' ">
AND use_unit LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.useUnit},'%')
</if>
<if
test="tzBaseEnterpriseInfoDto.useUnitCertificate!=null and tzBaseEnterpriseInfoDto.useUnitCertificate!='' ">
AND use_unit_certificate = #{tzBaseEnterpriseInfoDto.useUnitCertificate}
</if>
<if
test="tzBaseEnterpriseInfoDto.useCode!=null and tzBaseEnterpriseInfoDto.useCode!='' ">
AND use_code LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.useCode},'%')
</if>
<if
test="tzBaseEnterpriseInfoDto.superviseOrgCode!=null and tzBaseEnterpriseInfoDto.superviseOrgCode!='' ">
AND supervise_org_code LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.superviseOrgCode},'%')
</if>
<if
test="tzBaseEnterpriseInfoDto.region!=null and tzBaseEnterpriseInfoDto.region!='' ">
AND CONCAT(province,"/",city,"/",district) LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.region},'%')
</if>
<if
test="tzBaseEnterpriseInfoDto.legalPerson!=null and tzBaseEnterpriseInfoDto.legalPerson!='' ">
AND legal_person LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.legalPerson},'%')
</if>
<if
test="tzBaseEnterpriseInfoDto.legalPhone!=null and tzBaseEnterpriseInfoDto.legalPhone!='' ">
AND legal_phone LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.legalPhone},'%')
</if>
AND is_delete = 0
</where>
</select>
</mapper> </mapper>
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/TzBaseEnterpriseInfoController.java
View file @ f3807ca9
package com.yeejoin.amos.boot.module.tzs.biz.controller; package com.yeejoin.amos.boot.module.tzs.biz.controller;
import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo; import java.util.Arrays;
import com.yeejoin.amos.boot.module.tzs.api.service.ITzBaseEnterpriseInfoService; import java.util.List;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.RequestMethod;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.springframework.web.bind.annotation.RestController; 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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import javax.servlet.http.HttpServletRequest;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.typroject.tyboot.core.foundation.enumeration.UserType; import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
import org.typroject.tyboot.core.restful.doc.TycloudOperation; import com.yeejoin.amos.boot.module.tzs.api.dto.EquEnterDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.TzBaseEnterpriseInfoDto;
import java.util.Arrays; import com.yeejoin.amos.boot.module.tzs.api.entity.PageParam;
import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo;
import com.yeejoin.amos.boot.module.tzs.api.service.ITzBaseEnterpriseInfoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
/** /**
* 企业数据信息 * 企业数据信息
...@@ -33,106 +42,119 @@ import java.util.Arrays; ...@@ -33,106 +42,119 @@ import java.util.Arrays;
@RequestMapping(value = "/baseEnterprise", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "/baseEnterprise", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public class TzBaseEnterpriseInfoController { public class TzBaseEnterpriseInfoController {
@Autowired @Autowired
ITzBaseEnterpriseInfoService iTzBaseEnterpriseInfoService; ITzBaseEnterpriseInfoService iTzBaseEnterpriseInfoService;
/**
/** * 新增企业数据信息
* 新增企业数据信息 *
* @return * @return
*/ */
@RequestMapping(value = "/save", method = RequestMethod.POST) @RequestMapping(value = "/save", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "新增企业数据信息", notes = "新增企业数据信息") @ApiOperation(httpMethod = "POST", value = "新增企业数据信息", notes = "新增企业数据信息")
public boolean saveTzBaseEnterpriseInfo(HttpServletRequest request, @RequestBody TzBaseEnterpriseInfo tzBaseEnterpriseInfo){ public boolean saveTzBaseEnterpriseInfo(HttpServletRequest request,
return iTzBaseEnterpriseInfoService.save(tzBaseEnterpriseInfo); @RequestBody TzBaseEnterpriseInfo tzBaseEnterpriseInfo) {
} return iTzBaseEnterpriseInfoService.save(tzBaseEnterpriseInfo);
}
/**
* 根据id删除 /**
* @param id * 根据id删除
* @return *
*/ * @param id
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE) * @return
@ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除") */
public boolean deleteById(HttpServletRequest request, @PathVariable Long id){ @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
return iTzBaseEnterpriseInfoService.removeById(id); @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
} public boolean deleteById(HttpServletRequest request, @PathVariable Long id) {
return iTzBaseEnterpriseInfoService.removeById(id);
}
/**
/** * 修改企业数据信息
* 修改企业数据信息 *
* @return * @return
*/ */
@RequestMapping(value = "/updateById", method = RequestMethod.PUT) @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
@ApiOperation(httpMethod = "PUT", value = "修改企业数据信息", notes = "修改企业数据信息") @ApiOperation(httpMethod = "PUT", value = "修改企业数据信息", notes = "修改企业数据信息")
public boolean updateByIdTzBaseEnterpriseInfo(HttpServletRequest request, @RequestBody TzBaseEnterpriseInfo tzBaseEnterpriseInfo){ public boolean updateByIdTzBaseEnterpriseInfo(HttpServletRequest request,
return iTzBaseEnterpriseInfoService.updateById(tzBaseEnterpriseInfo); @RequestBody TzBaseEnterpriseInfo tzBaseEnterpriseInfo) {
} return iTzBaseEnterpriseInfoService.updateById(tzBaseEnterpriseInfo);
}
/**
/** * 根据id查询
* 根据id查询 *
* @param id * @param id
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/{id}", method = RequestMethod.GET) @RequestMapping(value = "/{id}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询") @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
public TzBaseEnterpriseInfo selectById(HttpServletRequest request, @PathVariable Long id){ public ResponseModel<TzBaseEnterpriseInfo> selectById(HttpServletRequest request, @PathVariable Long id) {
return iTzBaseEnterpriseInfoService.getById(id); return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.getById(id));
} }
/**
* 列表分页查询
/** *
* 列表分页查询 * @return
* @return */
*/ @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @RequestMapping(value = "/list", method = RequestMethod.GET)
@RequestMapping(value = "/list", method = RequestMethod.GET) @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
@ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询") public ResponseModel<IPage<TzBaseEnterpriseInfo>> listPage(String pageNum, String pageSize,
public IPage<TzBaseEnterpriseInfo> listPage(String pageNum,String pageSize, TzBaseEnterpriseInfo tzBaseEnterpriseInfo) {
TzBaseEnterpriseInfo tzBaseEnterpriseInfo){
Page<TzBaseEnterpriseInfo> pageBean;
Page<TzBaseEnterpriseInfo> pageBean; QueryWrapper<TzBaseEnterpriseInfo> tzBaseEnterpriseInfoQueryWrapper = new QueryWrapper<>();
QueryWrapper<TzBaseEnterpriseInfo> tzBaseEnterpriseInfoQueryWrapper = new QueryWrapper<>(); Class<? extends TzBaseEnterpriseInfo> aClass = tzBaseEnterpriseInfo.getClass();
Class<? extends TzBaseEnterpriseInfo> aClass = tzBaseEnterpriseInfo.getClass(); Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
Arrays.stream(aClass.getDeclaredFields()).forEach(field -> { try {
try { field.setAccessible(true);
field.setAccessible(true); Object o = field.get(tzBaseEnterpriseInfo);
Object o = field.get(tzBaseEnterpriseInfo); if (o != null) {
if (o != null) { Class<?> type = field.getType();
Class<?> type = field.getType(); String name = NameUtils.camel2Underline(field.getName());
String name = NameUtils.camel2Underline(field.getName()); if (type.equals(Integer.class)) {
if (type.equals(Integer.class)) { Integer fileValue = (Integer) field.get(tzBaseEnterpriseInfo);
Integer fileValue = (Integer) field.get(tzBaseEnterpriseInfo); tzBaseEnterpriseInfoQueryWrapper.eq(name, fileValue);
tzBaseEnterpriseInfoQueryWrapper.eq(name, fileValue); } else if (type.equals(Long.class)) {
} else if (type.equals(Long.class)) { Long fileValue = (Long) field.get(tzBaseEnterpriseInfo);
Long fileValue = (Long) field.get(tzBaseEnterpriseInfo); tzBaseEnterpriseInfoQueryWrapper.eq(name, fileValue);
tzBaseEnterpriseInfoQueryWrapper.eq(name, fileValue); } else if (type.equals(String.class)) {
} else if (type.equals(String.class)) { String fileValue = (String) field.get(tzBaseEnterpriseInfo);
String fileValue = (String) field.get(tzBaseEnterpriseInfo); tzBaseEnterpriseInfoQueryWrapper.eq(name, fileValue);
tzBaseEnterpriseInfoQueryWrapper.eq(name, fileValue); } else {
} else { String fileValue = (String) field.get(tzBaseEnterpriseInfo);
String fileValue = (String) field.get(tzBaseEnterpriseInfo); tzBaseEnterpriseInfoQueryWrapper.eq(name, fileValue);
tzBaseEnterpriseInfoQueryWrapper.eq(name, fileValue); }
} }
} } catch (Exception e) {
}catch (Exception e) { }
} });
}); IPage<TzBaseEnterpriseInfo> page;
IPage<TzBaseEnterpriseInfo> page; if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
if (StringUtils.isBlank(pageNum) ||StringUtils.isBlank(pageSize)) { pageBean = new Page<>(0, Long.MAX_VALUE);
pageBean = new Page<>(0, Long.MAX_VALUE); } else {
}else{ pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize)); }
} page = iTzBaseEnterpriseInfoService.page(pageBean, tzBaseEnterpriseInfoQueryWrapper);
page = iTzBaseEnterpriseInfoService.page(pageBean, tzBaseEnterpriseInfoQueryWrapper); return ResponseHelper.buildResponse(page);
return page; }
}
} @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/getEquInfo/{sequenceNbr}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "通过企业id查询设备", notes = "通过企业id查询设备")
public ResponseModel<List<EquEnterDto>> getInfo(@PathVariable(value = "sequenceNbr") String sequenceNbr) {
return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.getInfo(sequenceNbr));
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/page", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
public ResponseModel<IPage<TzBaseEnterpriseInfoDto>> page(PageParam pageParam,
TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto) {
return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.page(pageParam, tzBaseEnterpriseInfoDto));
}
}
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/InspectionServiceImpl.java
View file @ f3807ca9
...@@ -19,19 +19,22 @@ import com.yeejoin.amos.feign.privilege.model.CompanyModel; ...@@ -19,19 +19,22 @@ import com.yeejoin.amos.feign.privilege.model.CompanyModel;
import com.yeejoin.amos.feign.systemctl.Systemctl; import com.yeejoin.amos.feign.systemctl.Systemctl;
import com.yeejoin.amos.feign.systemctl.model.RegionModel; import com.yeejoin.amos.feign.systemctl.model.RegionModel;
import org.apache.commons.lang.text.StrSubstitutor; import org.apache.commons.lang.text.StrSubstitutor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil; import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.*; import java.util.*;
@Service @Service
public class InspectionServiceImpl implements InspectionService { public class InspectionServiceImpl implements InspectionService {
private final Logger log = LoggerFactory.getLogger(InspectionServiceImpl.class);
@Autowired @Autowired
JdbcTemplate jdbcTemplate; JdbcTemplate jdbcTemplate;
...@@ -116,8 +119,9 @@ public class InspectionServiceImpl implements InspectionService { ...@@ -116,8 +119,9 @@ public class InspectionServiceImpl implements InspectionService {
selectSql = selectSql + (selectSql.contains("WHERE") ? " AND" : " WHERE") + " ${fieldKey}='${fieldValue}'"; selectSql = selectSql + (selectSql.contains("WHERE") ? " AND" : " WHERE") + " ${fieldKey}='${fieldValue}'";
} }
selectSql = ss.replace(selectSql); selectSql = ss.replace(selectSql);
Map<String, Object> queryResult = bizJdbcTemplate.queryForMap(selectSql);
Map<String, Object> queryResult = bizJdbcTemplate.queryForMap(selectSql);
log.info("查询sql：" + selectSql);
HashMap<String, Object> item = new HashMap<>(); HashMap<String, Object> item = new HashMap<>();
item.put("key", bizRecordCount.getTitle()); item.put("key", bizRecordCount.getTitle());
item.put("value", queryResult.get("count")); item.put("value", queryResult.get("count"));
...@@ -209,7 +213,7 @@ public class InspectionServiceImpl implements InspectionService { ...@@ -209,7 +213,7 @@ public class InspectionServiceImpl implements InspectionService {
for (int i = 1; i <= item.getColumnIndex(); i++) { for (int i = 1; i <= item.getColumnIndex(); i++) {
whereSql.add(String.format("%s%s='%s'", item.getColumnPrefix(), i, item.getColumnValue())); whereSql.add(String.format("%s%s='%s'", item.getColumnPrefix(), i, item.getColumnValue()));
} }
sql = ValidationUtil.isEmpty(sql) ? "" : "+" + String.format("(SELECT count(*) FROM %s WHERE %s)", item.getTableName(), whereSql); sql = sql + ((ValidationUtil.isEmpty(sql) ? "" : "+") + String.format("(SELECT count(*) FROM %s WHERE %s)", item.getTableName(), whereSql));
} }
return sql; return sql;
} }
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java
View file @ f3807ca9
package com.yeejoin.amos.boot.module.tzs.biz.service.impl; package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
import com.yeejoin.amos.boot.module.tzs.api.dto.EquEnterDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.TzBaseEnterpriseInfoDto; import com.yeejoin.amos.boot.module.tzs.api.dto.TzBaseEnterpriseInfoDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.TzsJgBasicInfoDto;
import com.yeejoin.amos.boot.module.tzs.api.entity.PageParam;
import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo; import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo;
import com.yeejoin.amos.boot.module.tzs.api.mapper.TzBaseEnterpriseInfoMapper; import com.yeejoin.amos.boot.module.tzs.api.mapper.TzBaseEnterpriseInfoMapper;
import com.yeejoin.amos.boot.module.tzs.api.service.ITzBaseEnterpriseInfoService; import com.yeejoin.amos.boot.module.tzs.api.service.ITzBaseEnterpriseInfoService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import liquibase.pro.packaged.L;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService; import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.List;
/** /**
* 企业数据信息 服务实现类 * 企业数据信息 服务实现类
* *
...@@ -17,4 +26,23 @@ import org.typroject.tyboot.core.rdbms.service.BaseService; ...@@ -17,4 +26,23 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
@Service @Service
public class TzBaseEnterpriseInfoServiceImpl extends BaseService<TzBaseEnterpriseInfoDto, TzBaseEnterpriseInfo, TzBaseEnterpriseInfoMapper> implements ITzBaseEnterpriseInfoService { public class TzBaseEnterpriseInfoServiceImpl extends BaseService<TzBaseEnterpriseInfoDto, TzBaseEnterpriseInfo, TzBaseEnterpriseInfoMapper> implements ITzBaseEnterpriseInfoService {
@Autowired
private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
@Override
public List<EquEnterDto> getInfo(String sequenceNbr) {
return tzBaseEnterpriseInfoMapper.getInfo(sequenceNbr);
}
@Override
public IPage<TzBaseEnterpriseInfoDto> page(PageParam pageParam, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto) {
Page<TzBaseEnterpriseInfoDto> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
return this.baseMapper.page(page, tzBaseEnterpriseInfoDto);
}
@Override
public TzBaseEnterpriseInfoDto detail(Long id) {
// TODO Auto-generated method stub
return null;
}
} }
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/logback-dev2.xml 0 → 100644
View file @ f3807ca9
<?xml version="1.0" encoding="UTF-8"?>
<configuration debug="false">
<!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
<property name="LOG_HOME" value="log" />
<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
<property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %-50.50logger{50} - %msg [%file:%line] %n" />
<!-- 按照每天生成日志文件 -->
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!--日志文件输出的文件名-->
<FileNamePattern>${LOG_HOME}/tzs.log.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
<!--日志文件保留天数-->
<MaxHistory>30</MaxHistory>
<!--日志文件大小-->
<MaxFileSize>30mb</MaxFileSize>
</rollingPolicy>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>${LOG_PATTERN}</pattern>
</encoder>
</appender>
<!-- 控制台输出 -->
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>${LOG_PATTERN}</pattern>
</encoder>
</appender>
<!-- show parameters for hibernate sql 专为 Hibernate 定制
<logger name="org.hibernate.type.descriptor.sql.BasicBinder" level="TRACE" />
<logger name="org.hibernate.type.descriptor.sql.BasicExtractor" level="DEBUG" />
<logger name="org.hibernate.SQL" level="DEBUG" />
<logger name="org.hibernate.engine.QueryParameters" level="DEBUG" />
<logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
-->
<!--myibatis log configure-->
<logger name="com.apache.ibatis" level="INFO"/>
<logger name="org.mybatis" level="INFO" />
<logger name="java.sql.Connection" level="INFO"/>
<logger name="java.sql.Statement" level="INFO"/>
<logger name="java.sql.PreparedStatement" level="INFO"/>
<logger name="org.springframework" level="INFO"/>
<logger name="com.baomidou.mybatisplus" level="INFO"/>
<logger name="org.apache.activemq" level="INFO"/>
<logger name="org.typroject" level="INFO"/>
<logger name="com.yeejoin" level="INFO"/>
<!-- 日志输出级别 -->
<root level="DEBUG">
<!-- <appender-ref ref="FILE" /> -->
<appender-ref ref="STDOUT" />
</root>
</configuration>
\ No newline at end of file
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