Skip to content

A
amos-boot-biz
Commit d0d167d7 authored by srx's avatar srx
Browse files
Options

Merge remote-tracking branch 'origin/developer' into developer

parents f9a56447 5a41ad49
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 833 additions and 182 deletions
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java
View file @ d0d167d7
......@@ -95,9 +95,9 @@ public class ControllerAop {
// 不需要校验token的接口直接返回
if (joinPoint.getSignature() instanceof MethodSignature) {
if (!((MethodSignature) joinPoint.getSignature()).getMethod().getAnnotation(TycloudOperation.class).needAuth() && !request.getParameterMap().containsKey("token") && ValidationUtil.isEmpty(token)) {
// if (!((MethodSignature) joinPoint.getSignature()).getMethod().getAnnotation(TycloudOperation.class).needAuth() && !request.getParameterMap().containsKey("token") && ValidationUtil.isEmpty(token)) {
return;
}
// }
}
// 平台studio配置的下载接口token从url里取
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/OrgPersonEnum.java
View file @ d0d167d7
......@@ -10,33 +10,13 @@ import java.util.Map;
@AllArgsConstructor
public enum OrgPersonEnum {
公司("COMPANY", "244", "公司",1),
部门("DEPARTMENT", "245", "部门",2),
人员("PERSON", "246", "人员",3),
焊工("WELDER","247","焊工",3),
建设单位负责人("CHARGE","254","建设单位负责人",3),
企业管理员("ADMIN","248","企业管理员",3),
建设单位("CONSTRUCTION","249","建设单位",1),
安装单位("INSTALL","250","安装单位",1),
设计单位("DESIGN","251","设计单位",1),
监察单位("SUPERVISION","252","监察单位",1),
监检机构("MONITORING","253","监检机构",1);
公司("COMPANY", "244", "公司"),
部门("DEPARTMENT", "245", "部门"),
人员("PERSON", "246", "人员");
private String key;
private String code;
private String name;
/**
* 1 公司 2 部门 3 人员
*/
private Integer type;
public static Map map = new HashMap();
static {
for(OrgPersonEnum orgPersonEnum:OrgPersonEnum.values()){
map.put(orgPersonEnum.getName(),orgPersonEnum.getKey());
}
}
}
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/OrgEnum.java 0 → 100644
View file @ d0d167d7
package com.yeejoin.amos.boot.module.ugp.api.Enum;
import com.yeejoin.amos.boot.module.common.api.enums.OrgPersonEnum;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.HashMap;
@Getter
@AllArgsConstructor
public enum OrgEnum {
公司("COMPANY", "244", "公司",1),
部门("DEPARTMENT", "245", "部门",2),
人员("PERSON", "246", "人员",3),
焊工("WELDER","247","焊工",3),
建设单位负责人("CHARGE","254","建设单位负责人",3),
企业管理员("ADMIN","248","企业管理员",3),
建设单位("CONSTRUCTION","249","建设单位",1),
安装单位("INSTALL","250","安装单位",1),
设计单位("DESIGN","251","设计单位",1),
监察单位("SUPERVISION","252","监察单位",1),
监检机构("MONITORING","253","监检机构",1);
private String key;
private String code;
private String name;
/**
* 1 公司 2 部门 3 人员
*/
private Integer type;
public static HashMap<String,String> map= new HashMap();
static {
for(OrgPersonEnum orgPersonEnum:OrgPersonEnum.values()){
map.put(orgPersonEnum.getName(),orgPersonEnum.getKey());
}
}
}
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/noticeStatusEnum.java 0 → 100644
View file @ d0d167d7
package com.yeejoin.amos.boot.module.ugp.api.Enum;
public enum noticeStatusEnum {
已提交("已提交","0"),
已接收("已接收","1"),
已退回("已退回","2");
String name;
String statusId;
noticeStatusEnum(String name, String statusId) {
this.name = name;
this.statusId = statusId;
}
}
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/InstallNoticeMsgPageDto.java 0 → 100644
View file @ d0d167d7
package com.yeejoin.amos.boot.module.ugp.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 2022-10-7
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="InstallNoticeMsgPageDto", description="项目安装告知短信通知记录表")
public class InstallNoticeMsgPageDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "项目名称")
private String name;
@ApiModelProperty(value = "项目安装区域")
private String installRegion;
@ApiModelProperty(value = "项目开工日期")
private Date startDate;
@ApiModelProperty(value = "建设单位")
private String constructionUnit;
@ApiModelProperty(value = "安装单位")
private String installationUnit;
@ApiModelProperty(value = "项目告知处理进度")
private String progressStatus;
@ApiModelProperty(value = "短信通知单位")
private Long targetUnitId;
@ApiModelProperty(value = "短信接收人")
private Long targetPersonId;
@ApiModelProperty(value = "短信通知内容")
private String content;
@ApiModelProperty(value = "短信发送日期")
private Date sendTime;
}
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/SuperviseRuleDto.java
View file @ d0d167d7
package com.yeejoin.amos.boot.module.ugp.api.dto;
import com.sun.corba.se.spi.presentation.rmi.IDLNameTranslator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
......@@ -39,4 +40,5 @@ public class SuperviseRuleDto extends BaseDto {
@ApiModelProperty(value = "创建时间")
private Date createDate;
}
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/WelderEquipmentDto.java 0 → 100644
View file @ d0d167d7
package com.yeejoin.amos.boot.module.ugp.api.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
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 org.aspectj.weaver.ast.Test;
import org.springframework.web.multipart.MultipartFile;
import java.util.Date;
/**
* 焊机设备表
*
* @author system_generator
* @date 2022-10-8
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="WelderEquipmentDto", description="焊机设备表")
public class WelderEquipmentDto extends BaseDto{
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "设备名称")
private String name;
@ApiModelProperty(value = "设备编号")
private String code;
@ApiModelProperty(value = "设备类型")
private String type;
@ApiModelProperty(value = "项目ID")
private Long projectId;
@ApiModelProperty(value = "项目名称")
private String projectName;
@ApiModelProperty(value = "生产厂家")
private String manufacturer;
@ApiModelProperty(value = "出厂日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date manufactureDate;
@ApiModelProperty(value = "使用年限")
private String serviceLife;
@ApiModelProperty(value = "校验日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date inspectionDate;
@ApiModelProperty(value = "使用状态")
private String useStatus;
@ApiModelProperty(value = "检定状态")
private String verifyStatus;
@ApiModelProperty(value = "附件信息")
private String info;
@ApiModelProperty(value = "资源id")
private String projectResourceId;
@ApiModelProperty(value = "附件")
private MultipartFile[] files;
}
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/entity/Project.java
View file @ d0d167d7
......@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
/**
......@@ -25,109 +26,109 @@ public class Project extends BaseEntity {
/**
* 项目名称
*/
@TableField("name")
@TableField("name")
private String name;
/**
* 项目编号
*/
@TableField("code")
@TableField("code")
private String code;
/**
* 项目进度
*/
@TableField("progress_status")
@TableField("progress_status")
private String progressStatus;
/**
* 项目地点
*/
@TableField("address")
@TableField("address")
private String address;
/**
* 项目开工日期
*/
@TableField("start_date")
@TableField("start_date")
private Date startDate;
/**
* 项目安装区域代码
*/
@TableField("install_region_code")
@TableField("install_region_code")
private String installRegionCode;
/**
* 项目安装区域
*/
@TableField("install_region")
@TableField("install_region")
private String installRegion;
/**
* 建设单位id
*/
@TableField("construction_unit_id")
@TableField("construction_unit_id")
private Long constructionUnitId;
/**
* 建设单位名称
*/
@TableField("construction_unit")
@TableField("construction_unit")
private String constructionUnit;
/**
* 项目设计单位
*/
@TableField("design_unit")
@TableField("design_unit")
private String designUnit;
/**
* 项目设计单位id
*/
@TableField("design_unit_id")
@TableField("design_unit_id")
private Long designUnitId;
/**
* 安装单位id
*/
@TableField("installation_unit_id")
@TableField("installation_unit_id")
private Long installationUnitId;
/**
* 安装单位名称
*/
@TableField("installation_unit")
@TableField("installation_unit")
private String installationUnit;
/**
* 企业id
*/
@TableField("company_id")
@TableField("company_id")
private Long companyId;
/**
* 建设单位负责人id
*/
@TableField("charge_person_id")
@TableField("charge_person_id")
private Long chargePersonId;
/**
* 建设单位负责人名称
*/
@TableField("charge_person")
@TableField("charge_person")
private String chargePerson;
/**
* 组织机构代码
*/
@TableField("org_code")
@TableField("org_code")
private String orgCode;
/**
* 项目提交日期
*/
@TableField("submit_date")
@TableField("submit_date")
private Date submitDate;
/**
......@@ -145,7 +146,7 @@ public class Project extends BaseEntity {
/**
* 备注
*/
@TableField("remark")
@TableField("remark")
private String remark;
}
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/mapper/EquipmentMapper.java
View file @ d0d167d7
......@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.ugp.api.mapper;
import com.yeejoin.amos.boot.module.ugp.api.entity.Equipment;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
/**
* 设备信息表 Mapper 接口
......@@ -9,6 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @author system_generator
* @date 2022-09-22
*/
@Mapper
public interface EquipmentMapper extends BaseMapper<Equipment> {
}
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/mapper/InstallNoticeMsgMapper.java
View file @ d0d167d7
package com.yeejoin.amos.boot.module.ugp.api.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.ugp.api.dto.InstallNoticeMsgPageDto;
import com.yeejoin.amos.boot.module.ugp.api.entity.InstallNoticeMsg;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* 项目安装告知短信记录表 Mapper 接口
*
* @author system_generator
* @date 2022-09-22
* @date 2022-10-8
*/
@Mapper
public interface InstallNoticeMsgMapper extends BaseMapper<InstallNoticeMsg> {
//安装告知申请页面分页列表
Page<InstallNoticeMsgPageDto> InstallNoticeMsgPage(IPage<InstallNoticeMsgPageDto> page, @Param("name") String name, @Param("installationUnit") String installationUnit );
Page<InstallNoticeMsgPageDto> selectByName(Page<InstallNoticeMsgPageDto> page, @Param("name") String name, @Param("unit") String unit);
InstallNoticeMsgPageDto customSelectById(@Param("sequenceNbr") Long sequenceNbr);
}
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/mapper/ProjectResourceMapper.java
View file @ d0d167d7
package com.yeejoin.amos.boot.module.ugp.api.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.ugp.api.dto.InstallNoticeMsgPageDto;
import com.yeejoin.amos.boot.module.ugp.api.dto.WelderEquipmentDto;
import com.yeejoin.amos.boot.module.ugp.api.entity.ProjectResource;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.aspectj.weaver.ast.Test;
/**
* 项目资源表（包括焊工、管材、设备） Mapper 接口
......@@ -9,6 +16,16 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @author system_generator
* @date 2022-09-22
*/
@Mapper
public interface ProjectResourceMapper extends BaseMapper<ProjectResource> {
//焊机设备表
Page<WelderEquipmentDto> WelderEquipment(IPage<WelderEquipmentDto> page, @Param("name") String name, @Param("type") String type);
Page<WelderEquipmentDto> selectByName(Page<WelderEquipmentDto> page, @Param("name") String name, @Param("unit") String unit);
Page<WelderEquipmentDto> selectByInfo(Page<WelderEquipmentDto> page, @Param("info") Test info, @Param("unit") String unit);
WelderEquipmentDto customSelectById(@Param("sequenceNbr") Long sequenceNbr);
}
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/service/IInstallNoticeMsgService.java
View file @ d0d167d7
package com.yeejoin.amos.boot.module.ugp.api.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.ugp.api.dto.InstallNoticeMsgPageDto;
/**
* 项目安装告知短信记录表接口类
*
* @author system_generator
* @date 2022-09-22
* @date 2022-10-8
*/
public interface IInstallNoticeMsgService {
//安装告知页面列表
Page<InstallNoticeMsgPageDto> installNoticeMsgList(Page<InstallNoticeMsgPageDto> page, String name, String installationUnit);
//安装告知页面分页查询
Page<InstallNoticeMsgPageDto> selectByName(Page<InstallNoticeMsgPageDto> page, String name ,String unit);
//根据sequenceNbr查询列表数据
InstallNoticeMsgPageDto customSelectById(Long sequenceNbr);
}
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/service/IProjectResourceService.java
View file @ d0d167d7
package com.yeejoin.amos.boot.module.ugp.api.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.ugp.api.dto.WelderEquipmentDto;
import org.aspectj.weaver.ast.Test;
/**
* 项目资源表（包括焊工、管材、设备）接口类
*
......@@ -9,4 +13,13 @@ package com.yeejoin.amos.boot.module.ugp.api.service;
*/
public interface IProjectResourceService {
//焊机设备表
Page<WelderEquipmentDto> installNoticeMsgList(Page<WelderEquipmentDto> page, String name, String type);
//焊机设备页面分页查询
Page<WelderEquipmentDto> selectByName(Page<WelderEquipmentDto> page, String name ,String unit);
Page<WelderEquipmentDto> selectByInfo(Page<WelderEquipmentDto> page, Test info , String unit);
//根据sequenceNbr查询列表数据
WelderEquipmentDto customSelectById(Long sequenceNbr);
}
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/InstallNoticeMsgMapper.xml
View file @ d0d167d7
......@@ -2,4 +2,69 @@
<!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.ugp.api.mapper.InstallNoticeMsgMapper">
<select id="InstallNoticeMsgPage" resultType="com.yeejoin.amos.boot.module.ugp.api.dto.InstallNoticeMsgPageDto">
SELECT name,
install_region,
start_date,
construction_unit,
installation_unit,
progress_status,
target_unit_id,
target_person_id,
content,
send_time
FROM tz_ugp_project,
tz_ugp_install_notice_msg,
tz_ugp_install_notice
where tz_ugp_project.sequence_nbr = tz_ugp_install_notice.project_id
and tz_ugp_install_notice_msg.install_notice_id = tz_ugp_install_notice.sequence_nbr
<if test="name != null and name != ''">
and tz_ugp_project.name = #{name}
</if>
<if test="installationUnit != null and installationUnit != ''">
and tz_ugp_project.installationUnit = #{installationUnit}
</if>
</select>
<select id="selectByName" resultType="com.yeejoin.amos.boot.module.ugp.api.dto.InstallNoticeMsgPageDto">
SELECT name,
install_region,
start_date,
construction_unit,
installation_unit,
progress_status,
target_unit_id,
target_person_id,
content,
send_time
FROM tz_ugp_project,
tz_ugp_install_notice_msg,
tz_ugp_install_notice
where tz_ugp_project.sequence_nbr = tz_ugp_install_notice.project_id
and tz_ugp_install_notice_msg.install_notice_id = tz_ugp_install_notice.sequence_nbr
<if test="name != null and name != ''">
and tz_ugp_project.name = #{name}
</if>
<if test="unit != null and unit != ''">
and tz_ugp_project.construction_unit_id = #{unit}
</if>
</select>
<select id="customSelectById"
resultType="com.yeejoin.amos.boot.module.ugp.api.dto.InstallNoticeMsgPageDto">
SELECT name,
install_region,
start_date,
construction_unit,
installation_unit,
progress_status,
target_unit_id,
target_person_id,
content,
send_time
FROM tz_ugp_project,
tz_ugp_install_notice_msg,
tz_ugp_install_notice
where tz_ugp_project.sequence_nbr = tz_ugp_install_notice.project_id
and tz_ugp_install_notice_msg.install_notice_id = tz_ugp_install_notice.sequence_nbr
and tz_ugp_project.sequence_nbr = #{sequenceNbr}
</select>
</mapper>
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/ProjectResourceMapper.xml
View file @ d0d167d7
......@@ -2,4 +2,101 @@
<!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.ugp.api.mapper.ProjectResourceMapper">
<select id="WelderEquipment" resultType="com.yeejoin.amos.boot.module.ugp.api.dto.WelderEquipmentDto">
SELECT tz_ugp_equipment.name,
tz_ugp_equipment.code,
tz_ugp_equipment.type,
tz_ugp_project.name AS projectName,
tz_ugp_project.sequence_nbr AS projectId,
tz_ugp_equipment.manufacturer,
tz_ugp_equipment.manufacture_date,
tz_ugp_equipment.service_life,
tz_ugp_equipment.verify_status,
info,
tz_ugp_project_resource.sequence_nbr as project_resource_id
FROM tz_ugp_project
inner join tz_ugp_project_resource on tz_ugp_project.sequence_nbr = tz_ugp_project_resource.project_id
and tz_ugp_project_resource.type = 'equipment'
inner join tz_ugp_equipment on tz_ugp_project_resource.resource_id = tz_ugp_equipment.sequence_nbr
left join tz_ugp_attachment on tz_ugp_equipment.sequence_nbr = tz_ugp_attachment.source_id and
tz_ugp_attachment.type = 'enuipment'
<where>
<if test="name != null and name != ''">
and tz_ugp_equipment.name = #{name}
</if>
<if test="type != null and type != ''">
and tz_ugp_equipment.type = #{type}
</if>
</where>
</select>
<select id="selectByName" resultType="com.yeejoin.amos.boot.module.ugp.api.dto.WelderEquipmentDto">
SELECT tz_ugp_equipment.name,
tz_ugp_equipment.code,
tz_ugp_equipment.type,
tz_ugp_project.name as project_Name,
tz_ugp_equipment.manufacturer,
tz_ugp_equipment.manufacture_date,
tz_ugp_equipment.service_life,
tz_ugp_equipment.verify_status,
info
FROM tz_ugp_project
inner join tz_ugp_project_resource on tz_ugp_project.sequence_nbr = tz_ugp_project_resource.project_id
and tz_ugp_project_resource.type = 'equipment'
inner join tz_ugp_equipment on tz_ugp_project_resource.resource_id = tz_ugp_equipment.sequence_nbr
left join tz_ugp_attachment on tz_ugp_equipment.sequence_nbr = tz_ugp_attachment.source_id and
tz_ugp_attachment.type = 'enuipment'
<where>
<if test="name != null and name != ''">
and tz_ugp_project.name = #{name}
</if>
<if test="unit != null and unit != ''">
and tz_ugp_project.construction_unit_id = #{unit}
</if>
</where>
</select>
<select id="selectByInfo" resultType="com.yeejoin.amos.boot.module.ugp.api.dto.WelderEquipmentDto">
SELECT tz_ugp_equipment.name,
tz_ugp_equipment.code,
tz_ugp_equipment.type,
tz_ugp_project.name AS project_Name,
tz_ugp_equipment.manufacturer,
tz_ugp_equipment.manufacture_date,
tz_ugp_equipment.service_life,
tz_ugp_equipment.verify_status,
info
FROM tz_ugp_project
inner join tz_ugp_project_resource on tz_ugp_project.sequence_nbr = tz_ugp_project_resource.project_id
and tz_ugp_project_resource.type = 'equipment'
inner join tz_ugp_equipment on tz_ugp_project_resource.resource_id = tz_ugp_equipment.sequence_nbr
left join tz_ugp_attachment on tz_ugp_equipment.sequence_nbr = tz_ugp_attachment.source_id and
tz_ugp_attachment.type = 'enuipment'
<where>
<if test="info != null and info != ''">
and tz_ugp_attachment.info = #{info}
</if>
<if test="unit != null and unit != ''">
and tz_ugp_attachment.company_id = #{unit}
</if>
</where>
</select>
<select id="customSelectById"
resultType="com.yeejoin.amos.boot.module.ugp.api.dto.WelderEquipmentDto">
SELECT tz_ugp_equipment.name,
tz_ugp_equipment.code,
tz_ugp_equipment.type,
tz_ugp_project.name AS project_Name,
tz_ugp_equipment.manufacturer,
tz_ugp_equipment.manufacture_date,
tz_ugp_equipment.service_life,
tz_ugp_equipment.verify_status,
info
FROM tz_ugp_project
inner join tz_ugp_project_resource on tz_ugp_project.sequence_nbr = tz_ugp_project_resource.project_id
and tz_ugp_project_resource.type = 'equipment'
inner join tz_ugp_equipment on tz_ugp_project_resource.resource_id = tz_ugp_equipment.sequence_nbr
left join tz_ugp_attachment on tz_ugp_equipment.sequence_nbr = tz_ugp_attachment.source_id and
tz_ugp_attachment.type = 'enuipment'
where tz_ugp_equipment.sequence_nbr = #{sequenceNbr}
</select>
</mapper>
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/CompanyController.java
View file @ d0d167d7
......@@ -4,11 +4,13 @@ package com.yeejoin.amos.boot.module.ugp.biz.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
import com.yeejoin.amos.boot.module.common.api.enums.OrgPersonEnum;
import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
import com.yeejoin.amos.boot.module.ugp.api.mapper.CompanyMapper;
import com.yeejoin.amos.boot.module.ugp.biz.service.impl.OrgServiceImpl;
......@@ -125,11 +127,9 @@ public class CompanyController extends BaseController {
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "企业信息表分页查询", notes = "企业信息表分页查询")
public ResponseModel<Page<CompanyDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
(value = "size") int size) {
Page<CompanyDto> page = new Page<CompanyDto>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(companyServiceImpl.queryForCompanyPage(page));
(value = "size") int size,String name) {
return ResponseHelper.buildResponse(companyServiceImpl.queryCompanyPage(current,size,name));
}
/**
......@@ -137,7 +137,7 @@ public class CompanyController extends BaseController {
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth=false)
@ApiOperation(httpMethod = "GET",value = "企业信息表列表全部数据查询", notes = "企业信息表列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<CompanyDto>> selectForList() {
......@@ -151,14 +151,9 @@ public class CompanyController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@ApiOperation(httpMethod = "Post",value = "修改企业信息", notes = "修改企业信息")
@PostMapping(value = "/modifyCompanyInfo")
public ResponseModel<String> modifyCompanyInfo(@RequestBody CompanyDto company) throws Exception {
companyServiceImpl.updateById(company.getCompany());
return ResponseHelper.buildResponse("ok");
public ResponseModel<Boolean> modifyCompanyInfo(@RequestBody CompanyDto company) {
return ResponseHelper.buildResponse(companyServiceImpl.updateById(company.getCompany()));
}
/**
......@@ -170,15 +165,9 @@ public class CompanyController extends BaseController {
@ApiOperation(httpMethod = "GET",value = "查看企业信息详情", notes = "查看企业信息详情")
@GetMapping(value = "/getCompanyInfo")
public ResponseModel<Company> getCompanyInfo(Company companyList) {
// Company company;
// QueryWrapper<Company> lambdaQueryWrapper=new QueryWrapper<>();
// lambdaQueryWrapper.eq("name",companyList.getName());
// company= companyMapper.selectOne(lambdaQueryWrapper);
return ResponseHelper.buildResponse(companyMapper.selectById(companyList));
}
/**
* 企业审核
......@@ -231,7 +220,7 @@ public class CompanyController extends BaseController {
jsonObject = null;
jsonObject.put("name",admin);
jsonObject.put("phone",adminPhone);
orgServiceImpl.dataHandling(jsonObject, OrgPersonEnum.企业管理员.getKey(),null);
orgServiceImpl.dataHandling(jsonObject, OrgEnum.企业管理员.getKey(),null);
}
return ResponseHelper.buildResponse(companyServiceImpl.updateById(company));
}
......
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/InstallNoticeMsgController.java
View file @ d0d167d7
package com.yeejoin.amos.boot.module.ugp.biz.controller;
import com.yeejoin.amos.boot.module.ugp.api.dto.InstallNoticeMsgPageDto;
import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Api;
......@@ -36,7 +37,7 @@ public class InstallNoticeMsgController extends BaseController {
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增项目安装告知短信记录表", notes = "新增项目安装告知短信记录表")
public ResponseModel<InstallNoticeMsgDto> save(@RequestBody InstallNoticeMsgDto model) {
......@@ -50,7 +51,7 @@ public class InstallNoticeMsgController extends BaseController {
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新项目安装告知短信记录表", notes = "根据sequenceNbr更新项目安装告知短信记录表")
public ResponseModel<InstallNoticeMsgDto> updateBySequenceNbrInstallNoticeMsg(@RequestBody InstallNoticeMsgDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
......@@ -64,7 +65,7 @@ public class InstallNoticeMsgController extends BaseController {
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除项目安装告知短信记录表", notes = "根据sequenceNbr删除项目安装告知短信记录表")
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
......@@ -77,7 +78,7 @@ public class InstallNoticeMsgController extends BaseController {
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个项目安装告知短信记录表", notes = "根据sequenceNbr查询单个项目安装告知短信记录表")
public ResponseModel<InstallNoticeMsgDto> selectOne(@PathVariable Long sequenceNbr) {
......@@ -91,7 +92,7 @@ public class InstallNoticeMsgController extends BaseController {
* @param current 每页大小
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "项目安装告知短信记录表分页查询", notes = "项目安装告知短信记录表分页查询")
public ResponseModel<Page<InstallNoticeMsgDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
......@@ -107,10 +108,32 @@ public class InstallNoticeMsgController extends BaseController {
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@ApiOperation(httpMethod = "GET",value = "项目安装告知短信记录表列表全部数据查询", notes = "项目安装告知短信记录表列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<InstallNoticeMsgDto>> selectForList() {
return ResponseHelper.buildResponse(installNoticeMsgServiceImpl.queryForInstallNoticeMsgList());
}
/**
* 安装告知短信通知记录列表分页查询
*
* @param current 当前页
* @param current 每页大小
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@GetMapping(value = "/msgpage")
@ApiOperation(httpMethod = "GET",value = "安装告知短信记录表分页查询", notes = "项目安装告知短信记录表分页查询")
public ResponseModel<Page<InstallNoticeMsgPageDto>> queryForMsgPage(
@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size,
@RequestParam(value = "name", required = false) String name,
@RequestParam(value = "installationUnit", required = false) String installationUnit
){
Page<InstallNoticeMsgPageDto> page = new Page<InstallNoticeMsgPageDto>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(installNoticeMsgServiceImpl.installNoticeMsgList(page, name, installationUnit));
}
}
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/ProjectController.java
View file @ d0d167d7
......@@ -146,7 +146,7 @@ public class ProjectController extends BaseController {
/**
* 获取下拉选择值
* @param type CHARGE("建设单位负责人")、INSTALL("安装单位")、DESIGN("设计单位")
* @param type INSTALL("安装单位")、DESIGN("设计单位")、SUPERVISION（”监察单位“）、MONITORING（”监检机构“）
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
......@@ -155,4 +155,15 @@ public class ProjectController extends BaseController {
public ResponseModel<List<OrgUsr>> getSelectInfo(String type){
return ResponseHelper.buildResponse(orgServiceImpl.getSelectInfo(type));
}
/**
* 查询当前登录单位下的人员列表
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(httpMethod = "GET", value = "查询下拉选择框的值", notes = "查询下拉选择框的值")
@GetMapping(value = "/getCharge")
public ResponseModel<List<OrgUsr>> getCharge(){
return ResponseHelper.buildResponse(orgServiceImpl.getCharge());
}
}
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/SuperviseRuleController.java
View file @ d0d167d7
package com.yeejoin.amos.boot.module.ugp.biz.controller;
import org.springframework.http.HttpStatus;
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.sql.SQLIntegrityConstraintViolationException;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.TreeSet;
import java.util.stream.Collectors;
import com.yeejoin.amos.boot.module.ugp.biz.service.impl.SuperviseRuleServiceImpl;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -36,10 +47,11 @@ public class SuperviseRuleController extends BaseController {
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增监管区域规则表", notes = "新增监管区域规则表")
public ResponseModel<SuperviseRuleDto> save(@RequestBody SuperviseRuleDto model) {
model.setCreateDate(new Date());
model = superviseRuleServiceImpl.createWithModel(model);
return ResponseHelper.buildResponse(model);
}
......@@ -50,10 +62,11 @@ public class SuperviseRuleController extends BaseController {
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}")
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@PutMapping(value = "")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新监管区域规则表", notes = "根据sequenceNbr更新监管区域规则表")
public ResponseModel<SuperviseRuleDto> updateBySequenceNbrSuperviseRule(@RequestBody SuperviseRuleDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
public ResponseModel<SuperviseRuleDto> updateBySequenceNbrSuperviseRule(@RequestBody SuperviseRuleDto model,@RequestParam(value = "sequenceNbr") Long sequenceNbr) {
model.setRecDate(new Date());
model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(superviseRuleServiceImpl.updateWithModel(model));
}
......@@ -64,11 +77,16 @@ public class SuperviseRuleController extends BaseController {
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}")
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@DeleteMapping(value = "")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除监管区域规则表", notes = "根据sequenceNbr删除监管区域规则表")
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
return ResponseHelper.buildResponse(superviseRuleServiceImpl.removeById(sequenceNbr));
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @RequestParam(value = "sequenceNbr") String sequenceNbr){
List<Long> ids = Arrays.stream(sequenceNbr.split(",")).map(Long::valueOf).collect(Collectors.toList());
try{
return ResponseHelper.buildResponse(superviseRuleServiceImpl.removeByIds(ids));
} catch (Exception e){
return ResponseHelper.buildResponse(false);
}
}
/**
......@@ -77,10 +95,10 @@ public class SuperviseRuleController extends BaseController {
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@GetMapping(value = "")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个监管区域规则表", notes = "根据sequenceNbr查询单个监管区域规则表")
public ResponseModel<SuperviseRuleDto> selectOne(@PathVariable Long sequenceNbr) {
public ResponseModel<SuperviseRuleDto> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(superviseRuleServiceImpl.queryBySeq(sequenceNbr));
}
......@@ -91,15 +109,20 @@ public class SuperviseRuleController extends BaseController {
* @param current 每页大小
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "监管区域规则表分页查询", notes = "监管区域规则表分页查询")
public ResponseModel<Page<SuperviseRuleDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
(value = "size") int size) {
public ResponseModel<Page<SuperviseRuleDto>> queryForPage(
@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size,
int adminRegionCode,
@RequestParam(value = "superviseDeptId", required = false) Long superviseDeptId,
@RequestParam(value = "inspectionUnitId", required = false) Long inspectionUnitId
) {
Page<SuperviseRuleDto> page = new Page<SuperviseRuleDto>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(superviseRuleServiceImpl.queryForSuperviseRulePage(page));
return ResponseHelper.buildResponse(superviseRuleServiceImpl.queryForSuperviseRulePage(page, superviseDeptId, inspectionUnitId));
}
/**
......
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/WelderController.java
View file @ d0d167d7
package com.yeejoin.amos.boot.module.ugp.biz.controller;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.ugp.api.dto.WelderDto;
import com.yeejoin.amos.boot.module.ugp.biz.service.impl.OrgServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
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;
import java.util.stream.Collectors;
@RestController
@Api(tags = "焊工信息")
@RequestMapping(value = "/welder")
public class WelderController extends BaseController {
@Autowired
OrgServiceImpl orgService;
/**
* 新增焊工信息
......@@ -27,4 +38,19 @@ public class WelderController extends BaseController {
return ResponseHelper.buildResponse(null);
}
/**
* 获取焊工信息
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@GetMapping(value = "/selectWelder")
@ApiOperation(httpMethod = "GET", value = "新增焊工信息", notes = "新增焊工信息")
public ResponseModel<List<Map>> selectWelder(@RequestParam("unitId") String companyId) {
List<Map> info = orgService.getInfo(companyId);
return ResponseHelper.buildResponse(info);
}
}
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/WorkHistoryController.java
View file @ d0d167d7
package com.yeejoin.amos.boot.module.ugp.biz.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
import com.yeejoin.amos.boot.module.ugp.api.entity.WorkHistory;
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 org.apache.commons.lang3.StringUtils;
import java.util.Arrays;
import java.util.List;
import com.yeejoin.amos.boot.module.ugp.biz.service.impl.WorkHistoryServiceImpl;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
......@@ -85,21 +91,50 @@ public class WorkHistoryController extends BaseController {
}
/**
* 列表分页查询
*
* @param current 当前页
* @param current 每页大小
* @return
*/
* 列表分页查询
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "焊工工作履历表分页查询", notes = "焊工工作履历表分页查询")
public ResponseModel<Page<WorkHistoryDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
(value = "size") int size) {
Page<WorkHistoryDto> page = new Page<WorkHistoryDto>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(workHistoryServiceImpl.queryForWorkHistoryPage(page));
@RequestMapping(value = "/page", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
public ResponseModel<IPage<WorkHistory>> listPage(String pageNum, String pageSize,
WorkHistory tzUgpWorkHistory){
Page<WorkHistory> pageBean;
QueryWrapper<WorkHistory> tzUgpWorkHistoryQueryWrapper = new QueryWrapper<>();
Class<? extends WorkHistory> aClass = tzUgpWorkHistory.getClass();
Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
try {
field.setAccessible(true);
Object o = field.get(tzUgpWorkHistory);
if (o != null) {
Class<?> type = field.getType();
String name = NameUtils.camel2Underline(field.getName());
if (type.equals(Integer.class)) {
Integer fileValue = (Integer) field.get(tzUgpWorkHistory);
tzUgpWorkHistoryQueryWrapper.eq(name, fileValue);
} else if (type.equals(Long.class)) {
Long fileValue = (Long) field.get(tzUgpWorkHistory);
tzUgpWorkHistoryQueryWrapper.eq(name, fileValue);
} else if (type.equals(String.class)) {
String fileValue = (String) field.get(tzUgpWorkHistory);
tzUgpWorkHistoryQueryWrapper.eq(name, fileValue);
} else {
String fileValue = (String) field.get(tzUgpWorkHistory);
tzUgpWorkHistoryQueryWrapper.eq(name, fileValue);
}
}
}catch (Exception e) {
}
});
IPage<WorkHistory> page;
if (StringUtils.isBlank(pageNum) ||StringUtils.isBlank(pageSize)) {
pageBean = new Page<>(0, Long.MAX_VALUE);
}else{
pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
}
page = workHistoryServiceImpl.page(pageBean, tzUgpWorkHistoryQueryWrapper);
return ResponseHelper.buildResponse(page);
}
/**
......
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/CompanyServiceImpl.java
View file @ d0d167d7
......@@ -9,7 +9,9 @@ import com.yeejoin.amos.boot.module.ugp.api.mapper.CompanyMapper;
import com.yeejoin.amos.boot.module.ugp.api.service.ICompanyService;
import com.yeejoin.amos.boot.module.ugp.api.dto.CompanyDto;
import org.apache.lucene.queryparser.flexible.messages.Message;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestParam;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
......@@ -18,6 +20,7 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Locale;
import java.util.stream.Collectors;
/**
* 企业信息表服务实现类
......@@ -29,12 +32,6 @@ import java.util.Locale;
public class CompanyServiceImpl extends BaseService<CompanyDto, Company, CompanyMapper> implements ICompanyService {
@Autowired
CompanyMapper companyMapper;
/**
* 分页查询
*/
public Page<CompanyDto> queryForCompanyPage(Page<CompanyDto> page) {
return this.queryForPage(page, null, false);
}
/**
* 列表查询 示例
......@@ -44,10 +41,20 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
}
@Override
public void modifyCompanyInfo(Company companyList)throws Exception {
/**
* 分页查询+筛选
*/
public Page<CompanyDto> queryCompanyPage(int current, int size, String name) {
Page<CompanyDto> page = new Page<>();
page.setSize(size);
page.setCurrent(current);
Page<CompanyDto> page1 = queryForPage(page, null, false);
if (name != null) {
List<CompanyDto> collect = page1.getRecords().stream().filter(a -> a.getName().equals(name)).collect(Collectors.toList());
page1.setRecords(collect);
}
return page1;
}
}
\ No newline at end of file
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/EquipmentServiceImpl.java
View file @ d0d167d7
......@@ -56,7 +56,7 @@ public class EquipmentServiceImpl extends BaseService<EquipmentDto, Equipment, E
for (Equipment i : equipment) {
JSONObject name = new JSONObject();
name.put("name", i.getName());
name.put("company_id", i.getCompanyId());
name.put("SequenceNbr", i.getSequenceNbr());
names.add(name);
}
......
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/InstallNoticeMsgServiceImpl.java
View file @ d0d167d7
package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
import com.yeejoin.amos.boot.module.ugp.api.dto.InstallNoticeMsgPageDto;
import com.yeejoin.amos.boot.module.ugp.api.entity.InstallNoticeMsg;
import com.yeejoin.amos.boot.module.ugp.api.mapper.InstallNoticeMsgMapper;
import com.yeejoin.amos.boot.module.ugp.api.service.IInstallNoticeMsgService;
import com.yeejoin.amos.boot.module.ugp.api.dto.InstallNoticeMsgDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
......@@ -17,6 +19,9 @@ import java.util.List;
*/
@Service
public class InstallNoticeMsgServiceImpl extends BaseService<InstallNoticeMsgDto,InstallNoticeMsg,InstallNoticeMsgMapper> implements IInstallNoticeMsgService {
@Autowired
InstallNoticeMsgMapper installNoticeMsgMapper;
/**
* 分页查询
*/
......@@ -30,4 +35,22 @@ public class InstallNoticeMsgServiceImpl extends BaseService<InstallNoticeMsgDto
public List<InstallNoticeMsgDto> queryForInstallNoticeMsgList() {
return this.queryForList("" , false);
}
/**
* 项目安装告知短信通知记录分页查询
*/
@Override
public Page<InstallNoticeMsgPageDto> installNoticeMsgList(Page<InstallNoticeMsgPageDto> page, String name, String installationUnit){
return this.getBaseMapper().InstallNoticeMsgPage(page, name, installationUnit);
}
@Override
public Page<InstallNoticeMsgPageDto> selectByName(Page<InstallNoticeMsgPageDto> page, String name, String unit) {
return this.getBaseMapper().selectByName(page, name, unit);
}
@Override
public InstallNoticeMsgPageDto customSelectById(Long sequenceNbr) {
return this.getBaseMapper().customSelectById(sequenceNbr);
}
}
\ No newline at end of file
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/MaterialServiceImpl.java
View file @ d0d167d7
......@@ -51,7 +51,7 @@ public class MaterialServiceImpl extends BaseService<MaterialDto, Material, Mate
for (Material i : materials) {
JSONObject name = new JSONObject();
name.put("name", i.getName());
name.put("company_id", i.getCompanyId());
name.put("SequenceNbr", i.getSequenceNbr());
names.add(name);
}
......
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/OrgServiceImpl.java
View file @ d0d167d7
......@@ -12,10 +12,10 @@ import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
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.OrgUsr;
import com.yeejoin.amos.boot.module.common.api.enums.OrgPersonEnum;
import com.yeejoin.amos.boot.module.common.biz.service.impl.DynamicFormColumnServiceImpl;
import com.yeejoin.amos.boot.module.common.biz.service.impl.DynamicFormInstanceServiceImpl;
import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import org.springframework.beans.BeanUtils;
......@@ -121,23 +121,21 @@ public class OrgServiceImpl {
orgUsr.setSequenceNbr(jsonObject.getLong("sequenceNbr"));
orgUsr.setBizOrgType(bizOrgType);
if (OrgPersonEnum.公司.getKey().equals(bizOrgType)){
if (OrgEnum.公司.getKey().equals(bizOrgType)){
orgUsr.setOrgExpandAttr1(jsonObject.getString("type"));
orgUsr.setBizOrgCode(jsonObject.getString("creditCode"));
orgUsr.setAmosOrgId(jsonObject.getString("amosOrgId"));
orgUsr.setAmosOrgCode(jsonObject.getString("amosOrgCode"));
}
if (OrgPersonEnum.人员.getKey().equals(bizOrgType)){
if (OrgEnum.人员.getKey().equals(bizOrgType)){
if (1==jsonObject.getInteger("isWelder")) {
orgUsr.setOrgExpandAttr1(OrgPersonEnum.焊工.getKey());
}else{
orgUsr.setOrgExpandAttr1(OrgPersonEnum.企业管理员.getKey());
orgUsr.setOrgExpandAttr1(OrgEnum.焊工.getKey());
}
LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(reginParams.getCompany().getSequenceNbr()));
orgUsr.setParentId(String.valueOf(orgUsrServiceImpl.getOne(wrapper).getSequenceNbr()));
}
if (OrgPersonEnum.部门.getKey().equals(bizOrgType)) {
if (OrgEnum.部门.getKey().equals(bizOrgType)) {
}
//设置bizOrgCode
......@@ -172,7 +170,7 @@ public class OrgServiceImpl {
OrgUsr orgUsrCompany = orgUsrServiceImpl.getOne(wrapper);
LambdaQueryWrapper<OrgUsr> welderWrapper = new LambdaQueryWrapper<>();
welderWrapper.likeRight(OrgUsr :: getBizOrgCode,orgUsrCompany.getBizOrgCode()).eq(OrgUsr :: getOrgExpandAttr1, OrgPersonEnum.焊工.getKey());
welderWrapper.likeRight(OrgUsr :: getBizOrgCode,orgUsrCompany.getBizOrgCode()).eq(OrgUsr :: getOrgExpandAttr1, OrgEnum.焊工.getKey());
List<OrgUsr> orgUsrList = orgUsrServiceImpl.list(welderWrapper);
List<Map> mapList = new ArrayList<>();
......@@ -193,6 +191,7 @@ public class OrgServiceImpl {
LambdaQueryWrapper<DynamicFormInstance> instanceWrapper = new LambdaQueryWrapper<>();
instanceWrapper.eq(DynamicFormInstance :: getInstanceId,sequenceNbr);
List<DynamicFormInstance> dynamicFormInstanceList = alertFormValueServiceImpl.list(instanceWrapper);
map.put("sequenceNbr",sequenceNbr);
for (DynamicFormInstance dynamicFormInstance : dynamicFormInstanceList) {
map.put(dynamicFormInstance.getFieldCode(),dynamicFormInstance.getFieldValue());
}
......@@ -211,7 +210,7 @@ public class OrgServiceImpl {
/**
* 获取下拉选择值
* @param type CHARGE("建设单位负责人")、INSTALL("安装单位")、DESIGN("设计单位")
* @param type INSTALL("安装单位")、DESIGN("设计单位")
* @return
*/
public List<OrgUsr> getSelectInfo(String type){
......@@ -219,4 +218,17 @@ public class OrgServiceImpl {
wrapper.eq(OrgUsr :: getOrgExpandAttr1,type);
return orgUsrServiceImpl.list(wrapper);
}
/**
* 查询当前登录单位下的人员列表
* @return
*/
public List<OrgUsr> getCharge(){
LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(getReginParams().getCompany().getSequenceNbr()));
LambdaQueryWrapper<OrgUsr> personWrapper = new LambdaQueryWrapper<>();
personWrapper.eq(OrgUsr::getParentId,orgUsrServiceImpl.getOne(wrapper).getSequenceNbr())
.eq(OrgUsr :: getBizOrgType,OrgEnum.人员.getKey());
return orgUsrServiceImpl.list(personWrapper);
}
}
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProjectResourceServiceImpl.java
View file @ d0d167d7
package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.boot.module.ugp.api.dto.WelderEquipmentDto;
import com.yeejoin.amos.boot.module.ugp.api.entity.Equipment;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
......@@ -9,13 +12,22 @@ import com.yeejoin.amos.boot.module.ugp.api.mapper.EquipmentMapper;
import com.yeejoin.amos.boot.module.ugp.api.mapper.ProjectResourceMapper;
import com.yeejoin.amos.boot.module.ugp.api.service.IProjectResourceService;
import com.yeejoin.amos.boot.module.ugp.api.dto.ProjectResourceDto;
import org.aspectj.weaver.ast.Test;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.beans.factory.annotation.Autowired;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
import java.util.Map;
import static com.yeejoin.amos.boot.module.ugp.api.Enum.ProjectResourceEnum.*;
......@@ -27,12 +39,13 @@ import static com.yeejoin.amos.boot.module.ugp.api.Enum.ProjectResourceEnum.*;
* @date 2022-09-22
*/
@Service
public class ProjectResourceServiceImpl extends BaseService<ProjectResourceDto, ProjectResource, ProjectResourceMapper> implements IProjectResourceService {
@Autowired
EquipmentMapper equipmentMapper;
public class ProjectResourceServiceImpl extends BaseService<ProjectResourceDto,ProjectResource,ProjectResourceMapper> implements IProjectResourceService {
@Autowired
ProjectResourceMapper projectResourceMapper;
@Autowired
EquipmentMapper equipmentMapper;
/**
* 分页查询
......@@ -48,6 +61,63 @@ public class ProjectResourceServiceImpl extends BaseService<ProjectResourceDto,
return this.queryForList("", false);
}
@Override
public Page<WelderEquipmentDto> installNoticeMsgList(Page<WelderEquipmentDto> page, String name, String type) {
return this.projectResourceMapper.WelderEquipment(page, name, type);
}
@Override
public Page<WelderEquipmentDto> selectByName(Page<WelderEquipmentDto> page, String name, String unit) {
return null;
}
@Override
public Page<WelderEquipmentDto> selectByInfo(Page<WelderEquipmentDto> page, Test info, String unit) {
return null;
}
@Override
public WelderEquipmentDto customSelectById(Long sequenceNbr) {
return null;
}
/**
* 项目设备新增
*/
@Transactional()
public void welderSave(WelderEquipmentDto welderEquipmentDto) {
// 保存设备
Equipment equipment = new Equipment();
BeanUtils.copyProperties(welderEquipmentDto, equipment);
equipmentMapper.insert(equipment);
// 处理附件
MultipartFile[] files = welderEquipmentDto.getFiles();
// 保存项目与设备对应关系
ProjectResource projectResource = new ProjectResource();
projectResource.setProjectId(welderEquipmentDto.getProjectId());
projectResource.setName(equipment.getName());
projectResource.setType("equipment");
projectResource.setResourceId(equipment.getSequenceNbr());
projectResourceMapper.insert(projectResource);
}
/**
* 项目设备删除
* @param ids
*/
@Transactional
public void welderDelete(String ids) {
this.list(new QueryWrapper<ProjectResource>().lambda().in(
ProjectResource::getSequenceNbr,
Arrays.stream(ids.split(",")).map(Long::valueOf).collect(Collectors.toList()))
).forEach(item -> {
this.equipmentMapper.deleteById(item.getResourceId());
this.projectResourceMapper.deleteById(item.getSequenceNbr());
});
}
/**
* 存储项目设备关系
*/
......@@ -57,8 +127,10 @@ public class ProjectResourceServiceImpl extends BaseService<ProjectResourceDto,
for (Object json2 : subForm) {
String select = JSON.parseObject(JSON.toJSONString(json2)).getString("select");
String companyId = jsonObject.getString("company_id");
// if (!jsonObject.getString("sequenceNbr").isEmpty()){
// jsonObject.getString("sequenceNbr");
// }
String SequenceNbr = jsonObject.getString("SequenceNbr");
String type = jsonObject.getString("type");
if (type.equals(设备资源.getStatus())) {
projectResource.setType(设备资源.getState());
......@@ -69,7 +141,7 @@ public class ProjectResourceServiceImpl extends BaseService<ProjectResourceDto,
if (type.equals(管材资源.getStatus())) {
projectResource.setType(管材资源.getState());
}
projectResource.setProjectId(Long.valueOf(companyId));
projectResource.setProjectId(Long.valueOf(SequenceNbr));
projectResource.setResourceId(Long.valueOf(select));
this.save(projectResource);
......
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProjectServiceImpl.java
View file @ d0d167d7
......@@ -48,7 +48,7 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
for (Project i : projects) {
JSONObject name = new JSONObject();
name.put("name", i.getName());
name.put("company_id", i.getCompanyId());
name.put("sequenceNbr", i.getSequenceNbr());
names.add(name);
}
......
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/SuperviseRuleServiceImpl.java
View file @ d0d167d7
......@@ -20,8 +20,8 @@ public class SuperviseRuleServiceImpl extends BaseService<SuperviseRuleDto,Super
/**
* 分页查询
*/
public Page<SuperviseRuleDto> queryForSuperviseRulePage(Page<SuperviseRuleDto> page) {
return this.queryForPage(page, null, false);
public Page<SuperviseRuleDto> queryForSuperviseRulePage(Page<SuperviseRuleDto> page, Long superviseDeptId, Long inspectionUnitId) {
return this.queryForPage(page, null, false, superviseDeptId, inspectionUnitId );
}
/**
......
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/resources/application.properties
View file @ d0d167d7
......@@ -23,11 +23,13 @@ redis.cache.failure.time=10800
## emqx properties:
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.90:1883
emqx.broker=tcp://39.98.45.134:1883
emqx.user-name=super
emqx.password=123456
fire-rescue=123
params.work.flow.processDefinitionKey=xiangmulixiangliucheng
amos.secret.key=ugp
\ No newline at end of file
amos.secret.key=ugp
#logging.level.com.yeejoin.amos=error
\ 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