diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlaceAttachmentDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlaceAttachmentDTO.java new file mode 100644 index 0000000000..efd121476e --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlaceAttachmentDTO.java @@ -0,0 +1,105 @@ +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; + +/** + * @author yan Lu + * @description 描述 + * @create 2023/5/29 17:06 + */ +public class IcPlaceAttachmentDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 事件Id + */ + private String icEventId; + + /** + * 附件名 + */ + private String attachmentName; + + /** + * 文件格式(JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS) + */ + private String attachmentFormat; + + /** + * 附件类型((图片 - image、 视频 - video、 语音 - voice、 文档 - doc)) + */ + private String attachmentType; + + /** + * 附件地址 + */ + private String attachmentUrl; + + /** + * 排序字段 + */ + private Integer sort; + + /** + * 附件状态(审核中:auditing; + * auto_passed: 自动通过; + * review:结果不确定,需要人工审核; + * block: 结果违规; + * rejected:人工审核驳回; + * approved:人工审核通过) + * 现在图片是同步审核的,所以图片只有auto_passed一种状态 + */ + private String status; + + /** + * 失败原因 + */ + private String reason; + + /** + * 语音或视频时长,秒 + */ + private Integer duration; + + /** + * 删除标记 0:未删除,1:已删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddPlaceOrgFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddPlaceOrgFormDTO.java index a3d56416c0..164fd8dd53 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddPlaceOrgFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddPlaceOrgFormDTO.java @@ -90,6 +90,48 @@ public class AddPlaceOrgFormDTO implements Serializable { //token中userId private String staffId; - public interface Add { } + /** + * 灵山:是否重点安全企业;1是;0不是;必填 + */ + private Boolean securityFlag; + + /** + * 灵山:安全负责人姓名 + */ + private String securityPrincipalName; + + /** + * 灵山:手机号 + */ + private String securityPrincipalMobile; + + /** + * 灵山:包企领导 + */ + private String bqLd; + + /** + * 灵山:包企干部 + */ + private String bqGb; + + /** + * 灵山:企业介绍 + */ + private String companyProfile; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + + + public interface Add { + } -} \ No newline at end of file +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddPlacePatrolRecordFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddPlacePatrolRecordFormDTO.java index 4a861062c2..88aea27216 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddPlacePatrolRecordFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddPlacePatrolRecordFormDTO.java @@ -23,6 +23,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.util.Date; +import java.util.List; /** @@ -118,13 +119,31 @@ public class AddPlacePatrolRecordFormDTO implements Serializable { */ private String remarks; + /** + * 图片集合 + */ + private List imageList; + + + /** + * 安全隐患类型 + */ + @NotBlank(message = "安全隐患类型不能为空", groups = {Add.class}) + private String dangerType; + + /** + * 安全隐患名称 + */ + @NotBlank(message = "安全隐患名称不能为空", groups = {Add.class}) + private String dangerName; //token中userId private String staffId; + private String userId; @NotBlank(message = "placePatrolRecordId不能为空", groups = {Update.class}) private String placePatrolRecordId; public interface Add {} public interface Update {} -} \ No newline at end of file +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddPlacePatrolReviewRecordFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddPlacePatrolReviewRecordFormDTO.java index fefc67e2ea..964a4f3884 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddPlacePatrolReviewRecordFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddPlacePatrolReviewRecordFormDTO.java @@ -79,6 +79,19 @@ public class AddPlacePatrolReviewRecordFormDTO implements Serializable { */ private String remarks; - public interface Add { } + /** + * 安全隐患类型 + */ + @NotBlank(message = "安全隐患类型不能为空", groups = {AddPlacePatrolReviewRecordFormDTO.Add.class}) + private String dangerType; + + /** + * 安全隐患名称 + */ + @NotBlank(message = "安全隐患名称不能为空", groups = {AddPlacePatrolReviewRecordFormDTO.Add.class}) + private String dangerName; + + public interface Add { + } -} \ No newline at end of file +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditPlaceOrgFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditPlaceOrgFormDTO.java index 070fc13dc5..e14872673c 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditPlaceOrgFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditPlaceOrgFormDTO.java @@ -74,6 +74,46 @@ public class EditPlaceOrgFormDTO implements Serializable { */ private String remarks; + /** + * 灵山:是否重点安全企业;1是;0不是;必填 + */ + private Boolean securityFlag; + + /** + * 灵山:安全负责人姓名 + */ + private String securityPrincipalName; + + /** + * 灵山:手机号 + */ + private String securityPrincipalMobile; + + /** + * 灵山:包企领导 + */ + private String bqLd; + + /** + * 灵山:包企干部 + */ + private String bqGb; + + /** + * 灵山:企业介绍 + */ + private String companyProfile; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + public interface Edit { } public interface Del { } @@ -82,4 +122,4 @@ public class EditPlaceOrgFormDTO implements Serializable { private String currentStaffId; private String customerId; -} \ No newline at end of file +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditPlacePatrolReviewRecordFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditPlacePatrolReviewRecordFormDTO.java index e55df29063..4ac48b29a6 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditPlacePatrolReviewRecordFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditPlacePatrolReviewRecordFormDTO.java @@ -70,6 +70,18 @@ public class EditPlacePatrolReviewRecordFormDTO implements Serializable { */ private String remarks; + /** + * 安全隐患类型 + */ + @NotBlank(message = "安全隐患类型不能为空", groups = {EditPlacePatrolReviewRecordFormDTO.Edit.class}) + private String dangerType; + + /** + * 安全隐患名称 + */ + @NotBlank(message = "安全隐患名称不能为空", groups = {EditPlacePatrolReviewRecordFormDTO.Edit.class}) + private String dangerName; + public interface Edit { } public interface Del { } public interface Detail { } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetListPlacePatrolRecordFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetListPlacePatrolRecordFormDTO.java index f176bca7ba..a8515f191a 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetListPlacePatrolRecordFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetListPlacePatrolRecordFormDTO.java @@ -41,6 +41,18 @@ public class GetListPlacePatrolRecordFormDTO implements Serializable { private String ninePlaceVal; //最终检查结果【0:合格 1:不合格】 private String finalResult; + + /** + * 安全隐患类型 + */ + + private String dangerType; + + /** + * 安全隐患名称 + */ + + private String dangerName; //页码 @Min(1) private Integer pageNo = 1; @@ -55,4 +67,4 @@ public class GetListPlacePatrolRecordFormDTO implements Serializable { //token中userId所属组织的pid private String pids; -} \ No newline at end of file +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/PlaceOrgDetailResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/PlaceOrgDetailResultDTO.java index 91ccedcc73..80537f3233 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/PlaceOrgDetailResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/PlaceOrgDetailResultDTO.java @@ -35,4 +35,44 @@ public class PlaceOrgDetailResultDTO implements Serializable { //联系电话 private String mobile; + /** + * 灵山:是否重点安全企业;1是;0不是;必填 + */ + private Boolean securityFlag; + + /** + * 灵山:安全负责人姓名 + */ + private String securityPrincipalName; + + /** + * 灵山:手机号 + */ + private String securityPrincipalMobile; + + /** + * 灵山:包企领导 + */ + private String bqLd; + + /** + * 灵山:包企干部 + */ + private String bqGb; + + /** + * 灵山:企业介绍 + */ + private String companyProfile; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/PlacePatrolRecordDetailResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/PlacePatrolRecordDetailResultDTO.java index 93450c6cfa..f1cf833632 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/PlacePatrolRecordDetailResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/PlacePatrolRecordDetailResultDTO.java @@ -47,4 +47,7 @@ public class PlacePatrolRecordDetailResultDTO implements Serializable { //最新检查时间 private String finalTime; + private String dangerType; + private String dangerName; + } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/PlacePatrolReviewRecordDetailResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/PlacePatrolReviewRecordDetailResultDTO.java index 47da9065f7..766709cf57 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/PlacePatrolReviewRecordDetailResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/PlacePatrolReviewRecordDetailResultDTO.java @@ -29,4 +29,7 @@ public class PlacePatrolReviewRecordDetailResultDTO implements Serializable { //复查检查结果【0:合格 1:不合格】 private String reviewResult; + private String dangerType; + private String dangerName; + } diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 18b7d897f0..ce9c4fecc9 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -230,6 +230,7 @@ callerRunsPolicy false + https://epmet-open.elinkservice.cn/api/epmetscan/api https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4 @@ -284,6 +285,7 @@ callerRunsPolicy false + https://epmet-open.elinkservice.cn/api/epmetscan/api https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4 @@ -389,7 +391,7 @@ callerRunsPolicy true - + https://epmet-open.elinkservice.cn/api/epmetscan/api https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlaceAttachmentDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlaceAttachmentDao.java new file mode 100644 index 0000000000..2c45b93774 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlaceAttachmentDao.java @@ -0,0 +1,19 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.IcPlaceAttachmentDTO; +import com.epmet.entity.IcPlaceAttachmentEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author yan Lu + * @description 描述 + * @create 2023/5/29 17:09 + */ +@Mapper +public interface IcPlaceAttachmentDao extends BaseDao { + List selectByIcPlaceId(@Param("icPlaceId") String icEventId); +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlaceAttachmentEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlaceAttachmentEntity.java new file mode 100644 index 0000000000..28a80becba --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlaceAttachmentEntity.java @@ -0,0 +1,75 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * @author yan Lu + * @description 描述 + * @create 2023/5/29 16:57 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("ic_place_org_attachment") +public class IcPlaceAttachmentEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 事件Id + */ + private String icEventId; + + /** + * 附件名 + */ + private String attachmentName; + + /** + * 文件格式(JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS) + */ + private String attachmentFormat; + + /** + * 附件类型((图片 - image、 视频 - video、 语音 - voice、 文档 - doc)) + */ + private String attachmentType; + + /** + * 附件地址 + */ + private String attachmentUrl; + + /** + * 排序字段 + */ + private Integer sort; + + /** + * 附件状态(审核中:auditing; + * auto_passed: 自动通过; + * review:结果不确定,需要人工审核; + * block: 结果违规; + * rejected:人工审核驳回; + * approved:人工审核通过) + * 现在图片是同步审核的,所以图片只有auto_passed一种状态 + */ + private String status; + + /** + * 失败原因 + */ + private String reason; + + /** + * 语音或视频时长,秒 + */ + private Integer duration; +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlaceOrgEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlaceOrgEntity.java index 2d2038360e..695f9a8917 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlaceOrgEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlaceOrgEntity.java @@ -29,70 +29,110 @@ import lombok.EqualsAndHashCode; * @since v1.0.0 2021-11-18 */ @Data -@EqualsAndHashCode(callSuper=false) +@EqualsAndHashCode(callSuper = false) @TableName("ic_place_org") public class IcPlaceOrgEntity extends BaseEpmetEntity { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; /** * 客户Id */ - private String customerId; + private String customerId; /** * 组织Id */ - private String agencyId; + private String agencyId; /** * agency_id的所有上级 */ - private String pids; + private String pids; /** * 网格Id【场所区域】 */ - private String gridId; + private String gridId; /** * 场所类型【admin库sys_dict_data表九小场所value值】 */ - private String ninePlaceVal; + private String ninePlaceVal; /** * 场所名称 */ - private String placeOrgName; + private String placeOrgName; /** * 场所地址 */ - private String address; + private String address; /** * 字典value,场所规模【 -0:10人以下 -1:10-20人 -2:21-40人 -3:41-100人 -4:100人以上】 + * 0:10人以下 + * 1:10-20人 + * 2:21-40人 + * 3:41-100人 + * 4:100人以上】 */ - private String scale; + private String scale; /** * 场所负责人 */ - private String personInCharge; + private String personInCharge; /** * 负责人电话 */ - private String mobile; + private String mobile; /** * 备注 */ - private String remarks; + private String remarks; + + /** + * 灵山:是否重点安全企业;1是;0不是;必填 + */ + private Boolean securityFlag; + + /** + * 灵山:安全负责人姓名 + */ + private String securityPrincipalName; + + /** + * 灵山:手机号 + */ + private String securityPrincipalMobile; + + /** + * 灵山:包企领导 + */ + private String bqLd; + + /** + * 灵山:包企干部 + */ + private String bqGb; + + /** + * 灵山:企业介绍 + */ + private String companyProfile; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolRecordEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolRecordEntity.java index abb8346af2..eb600d3420 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolRecordEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolRecordEntity.java @@ -112,4 +112,16 @@ public class IcPlacePatrolRecordEntity extends BaseEpmetEntity { */ private String remarks; + /** + * 安全隐患类型 + */ + + private String dangerType; + + /** + * 安全隐患名称 + */ + + private String dangerName; + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolReviewRecordEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolReviewRecordEntity.java index b4c317fd94..b000338495 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolReviewRecordEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolReviewRecordEntity.java @@ -77,4 +77,7 @@ public class IcPlacePatrolReviewRecordEntity extends BaseEpmetEntity { */ private String remarks; + private String dangerType; + private String dangerName; + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlaceAttachmentService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlaceAttachmentService.java new file mode 100644 index 0000000000..c40eb2a240 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlaceAttachmentService.java @@ -0,0 +1,77 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.IcPlaceAttachmentDTO; +import com.epmet.entity.IcPlaceAttachmentEntity; + +import java.util.List; +import java.util.Map; + +/** + * @author yan Lu + * @description 描述 + * @create 2023/5/29 17:03 + */ +public interface IcPlaceAttachmentService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-05-17 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-05-17 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IcEventAttachmentDTO + * @author generator + * @date 2022-05-17 + */ + IcPlaceAttachmentDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-05-17 + */ + void save(IcPlaceAttachmentDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-05-17 + */ + void update(IcPlaceAttachmentDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-05-17 + */ + void delete(String[] ids); +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolRecordService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolRecordService.java index 464059ac3d..c5a63ac227 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolRecordService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolRecordService.java @@ -38,6 +38,7 @@ public interface IcPlacePatrolRecordService extends BaseService implements IcPlaceAttachmentService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcPlaceAttachmentDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IcPlaceAttachmentDTO.class); + } + + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public IcPlaceAttachmentDTO get(String id) { + IcPlaceAttachmentEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcPlaceAttachmentDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcPlaceAttachmentDTO dto) { + IcPlaceAttachmentEntity entity = ConvertUtils.sourceToTarget(dto, IcPlaceAttachmentEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcPlaceAttachmentDTO dto) { + IcPlaceAttachmentEntity entity = ConvertUtils.sourceToTarget(dto, IcPlaceAttachmentEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除(@TableLogic 注解) + baseDao.deleteBatchIds(Arrays.asList(ids)); + } +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlaceOrgServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlaceOrgServiceImpl.java index 4e3f22f0d4..0fd4ebcb75 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlaceOrgServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlaceOrgServiceImpl.java @@ -42,8 +42,6 @@ import com.epmet.feign.EpmetAdminOpenFeignClient; import com.epmet.service.IcPlaceOrgService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -60,7 +58,6 @@ import java.util.Map; */ @Service public class IcPlaceOrgServiceImpl extends BaseServiceImpl implements IcPlaceOrgService { - private static final Logger log = LoggerFactory.getLogger(IcPlaceOrgServiceImpl.class); @Autowired private EpmetAdminOpenFeignClient epmetAdminOpenFeignClient; @@ -85,7 +82,7 @@ public class IcPlaceOrgServiceImpl extends BaseServiceImpl%s", formDTO.getPlaceOrgId())); @@ -179,4 +176,4 @@ public class IcPlaceOrgServiceImpl extends BaseServiceImpl implements IcPlacePatrolRecordService { - private static final Logger log = LoggerFactory.getLogger(IcPlaceOrgServiceImpl.class); + @Autowired private IcPlacePatrolReviewRecordService icPlacePatrolReviewRecordService; @Autowired @@ -65,6 +73,15 @@ public class IcPlacePatrolRecordServiceImpl extends BaseServiceImpl { + ImgTaskDTO task = new ImgTaskDTO(); + task.setDataId(UUID.randomUUID().toString().replace("-", "")); + task.setUrl(imgUrl); + imgScanParamDTO.getTasks().add(task); + }); + Result imgScanResult = ScanContentUtils.imgSyncScan(scanApiUrl.concat(imgSyncScanMethod), imgScanParamDTO); + if (!imgScanResult.success()) { + throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); + } else { + if (!imgScanResult.getData().isAllPass()) { + throw new RenException(EpmetErrorCode.IMG_SCAN_FAILED.getCode(), EpmetErrorCode.IMG_SCAN_FAILED.getMsg()); + } + } + } + //图片入库 + List imageEntityList = new ArrayList<>(); + if (!CollectionUtils.isEmpty(formDTO.getImageList())) { + int sort = 0; + for (String url : formDTO.getImageList()) { + IcPlaceAttachmentEntity attachment = new IcPlaceAttachmentEntity(); + attachment.setCustomerId(formDTO.getCustomerId()); + attachment.setAttachmentUrl(url); + attachment.setIcEventId(entity.getId()); + attachment.setCreatedBy(formDTO.getUserId()); + attachment.setAttachmentFormat(url.substring(url.lastIndexOf(".") + NumConstant.ONE).toLowerCase()); + attachment.setSort(sort++); + attachment.setAttachmentType("image"); + attachment.setStatus(TopicConstant.AUTO_PASSED); + imageEntityList.add(attachment); + } + icPlaceAttachmentService.insertBatch(imageEntityList); + } insert(entity); } @@ -142,8 +195,8 @@ public class IcPlacePatrolRecordServiceImpl extends BaseServiceImpl teamDTOList = icPlacePatrolTeamStaffDao.selectByTeamIds(teamIds); //4.封装九小场所、分队成员数据 - for (OptionResultDTO n : nineList.getData()){ - if(resultDTO.getNinePlaceVal().equals(n.getValue())){ + for (OptionResultDTO n : nineList.getData()) { + if (resultDTO.getNinePlaceVal().equals(n.getValue())) { resultDTO.setNinePlaceName(n.getLabel()); } } @@ -189,10 +242,10 @@ public class IcPlacePatrolRecordServiceImpl extends BaseServiceImpl teamDTOList = icPlacePatrolTeamStaffDao.selectByTeamIds(teamIds); //4.封装九小场所、分队人员数据 - for (PlacePatrolRecordDetailResultDTO dto : result.getList()){ + for (PlacePatrolRecordDetailResultDTO dto : result.getList()) { //九小场所 - nineList.getData().forEach(n->{ - if(dto.getNinePlaceVal().equals(n.getValue())){ + nineList.getData().forEach(n -> { + if (dto.getNinePlaceVal().equals(n.getValue())) { dto.setNinePlaceName(n.getLabel()); } }); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolReviewRecordServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolReviewRecordServiceImpl.java index a67d4980b8..c3b6e7c4bf 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolReviewRecordServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolReviewRecordServiceImpl.java @@ -36,8 +36,6 @@ import com.epmet.service.IcPlacePatrolReviewRecordService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -54,7 +52,7 @@ import java.util.stream.Collectors; */ @Service public class IcPlacePatrolReviewRecordServiceImpl extends BaseServiceImpl implements IcPlacePatrolReviewRecordService { - private static final Logger log = LoggerFactory.getLogger(IcPlaceOrgServiceImpl.class); + @Autowired private IcPlacePatrolRecordService icPlacePatrolRecordService; @Autowired diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml index 5a6a066a1b..c988cefde0 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml @@ -145,6 +145,16 @@ ribbon: ReadTimeout: 300000 ConnectTimeout: 300000 +openapi: + scan: + server: + url: @openapi.scan.server.url@ + method: + imgSyncScan: /imgSyncScan + textSyncScan: /textSyncScan + voiceAsyncScan: /voiceAsyncScan + voiceResults: /voiceResults + #pageHelper分页插件 pagehelper: helper-dialect: mysql diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlaceAttachmentDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlaceAttachmentDao.xml new file mode 100644 index 0000000000..633fc366be --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlaceAttachmentDao.xml @@ -0,0 +1,17 @@ + + + + + + + + diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlaceOrgDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlaceOrgDao.xml index 19a113d102..d655c10a89 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlaceOrgDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlaceOrgDao.xml @@ -14,7 +14,15 @@ a.scale scale, a.person_in_charge personInCharge, a.mobile mobile, - a.AGENCY_ID as agencyId + a.AGENCY_ID as agencyId, + a.SECURITY_FLAG securityFlag, + a.SECURITY_PRINCIPAL_NAME securityPrincipalName, + a.SECURITY_PRINCIPAL_MOBILE securityPrincipalMobile, + a.BQ_LD bqLd, + a.BQ_GB bqGb, + a.LONGITUDE longitude, + a.LATITUDE latitude, + a.COMPANY_PROFILE companyProfile FROM ic_place_org a LEFT JOIN customer_grid b ON a.GRID_ID = b.ID @@ -47,4 +55,4 @@ ORDER BY a.created_time DESC - \ No newline at end of file + diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolRecordDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolRecordDao.xml index 58fab01358..65d329baed 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolRecordDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolRecordDao.xml @@ -20,7 +20,9 @@ a.detailed detailed, a.review_time reviewTime, a.final_time finalTime, - a.final_result finalResult + a.final_result finalResult, + a.DANGER_TYPE dangerType, + a.DANGER_NAME dangerName FROM ic_place_patrol_record a LEFT JOIN customer_grid b ON a.grid_id = b.id @@ -56,4 +58,4 @@ a.created_time DESC - \ No newline at end of file + diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolReviewRecordDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolReviewRecordDao.xml index 8b54d868e9..775870876f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolReviewRecordDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolReviewRecordDao.xml @@ -23,6 +23,8 @@ a.inspectors inspectors, a.review_time reviewTime, a.detailed detailed, + a.DANGER_TYPE dangerType, + a.DANGER_NAME dangerName, a.review_result reviewResult FROM ic_place_patrol_review_record a @@ -42,4 +44,4 @@ a.created_time ASC - \ No newline at end of file +