灵山项目：使用九小场所代替企业档案，并修改巡查功能，增加安全隐患类型；

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;
+}

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 {
+    }
 
-}
+}

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<String> 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 {}
-}
+}

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 {
+    }
 
-}
+}

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;
 
-}
+}

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 { }

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;
 
-}
+}

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;
+
 }

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;
+
 }

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;
+
 }

epmet-module/gov-org/gov-org-server/pom.xml

@@ -230,6 +230,7 @@
                 <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
+                <openapi.scan.server.url>https://epmet-open.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
                 <!--钉钉 机器人地址-->
                 <dingTalk.robot.webHook>
                     https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
@@ -284,6 +285,7 @@
                 <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
+                <openapi.scan.server.url>https://epmet-open.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
                 <!--钉钉 机器人地址-->
                 <dingTalk.robot.webHook>
                     https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
@@ -389,7 +391,7 @@
                 <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
-
+                <openapi.scan.server.url>https://epmet-open.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
                 <!--生产钉钉 机器人地址-->
                 <dingTalk.robot.webHook>
                     https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c

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<IcPlaceAttachmentEntity> {
+    List<IcPlaceAttachmentDTO> selectByIcPlaceId(@Param("icPlaceId") String icEventId);
+}

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;
+}

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;
 
 }

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;
+
 }

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;
+
 }

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<IcPlaceAttachmentEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IcEventAttachmentDTO>
+     * @author generator
+     * @date 2022-05-17
+     */
+    PageData<IcPlaceAttachmentDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IcEventAttachmentDTO>
+     * @author generator
+     * @date 2022-05-17
+     */
+    List<IcPlaceAttachmentDTO> list(Map<String, Object> 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);
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolRecordService.java

@@ -38,6 +38,7 @@ public interface IcPlacePatrolRecordService extends BaseService<IcPlacePatrolRec
      **/
     void add(AddPlacePatrolRecordFormDTO formDTO);
 
+
     void update(AddPlacePatrolRecordFormDTO formDTO);
 
     /**
@@ -57,4 +58,4 @@ public interface IcPlacePatrolRecordService extends BaseService<IcPlacePatrolRec
      * @Description 场所巡查记录列表查询
      **/
     GetListPlacePatrolRecordResultDTO getList(GetListPlacePatrolRecordFormDTO formDTO);
-}
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlaceAttachmentServiceImpl.java

@@ -0,0 +1,80 @@
+package com.epmet.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.dao.IcPlaceAttachmentDao;
+import com.epmet.dto.IcPlaceAttachmentDTO;
+import com.epmet.entity.IcPlaceAttachmentEntity;
+import com.epmet.service.IcPlaceAttachmentService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author yan Lu
+ * @description 描述
+ * @create 2023/5/29 17:07
+ */
+@Service
+public class IcPlaceAttachmentServiceImpl extends BaseServiceImpl<IcPlaceAttachmentDao, IcPlaceAttachmentEntity> implements IcPlaceAttachmentService {
+
+    @Override
+    public PageData<IcPlaceAttachmentDTO> page(Map<String, Object> params) {
+        IPage<IcPlaceAttachmentEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IcPlaceAttachmentDTO.class);
+    }
+
+    @Override
+    public List<IcPlaceAttachmentDTO> list(Map<String, Object> params) {
+        List<IcPlaceAttachmentEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IcPlaceAttachmentDTO.class);
+    }
+
+    private QueryWrapper<IcPlaceAttachmentEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IcPlaceAttachmentEntity> 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));
+    }
+}

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<IcPlaceOrgDao, IcPlaceOrgEntity> implements IcPlaceOrgService {
-    private static final Logger log = LoggerFactory.getLogger(IcPlaceOrgServiceImpl.class);
     @Autowired
     private EpmetAdminOpenFeignClient epmetAdminOpenFeignClient;
 
@@ -85,7 +82,7 @@ public class IcPlaceOrgServiceImpl extends BaseServiceImpl<IcPlaceOrgDao, IcPlac
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void edit(EditPlaceOrgFormDTO formDTO) {
-        CustomerStaffInfoCacheResult staffInfo=CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(),formDTO.getCurrentStaffId());
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getCurrentStaffId());
         IcPlaceOrgEntity entity = baseDao.selectById(formDTO.getPlaceOrgId());
         if (null == entity) {
             throw new RenException(String.format("修改九小场所下场所信息失败，场所不存在，场所Id->%s", formDTO.getPlaceOrgId()));
@@ -179,4 +176,4 @@ public class IcPlaceOrgServiceImpl extends BaseServiceImpl<IcPlaceOrgDao, IcPlac
         resultDTO.setList(result.getList());
         return resultDTO;
     }
-}
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolRecordServiceImpl.java

@@ -21,10 +21,15 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.scan.param.ImgScanParamDTO;
+import com.epmet.commons.tools.scan.param.ImgTaskDTO;
+import com.epmet.commons.tools.scan.result.SyncScanResult;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.dao.IcPlacePatrolRecordDao;
 import com.epmet.dao.IcPlacePatrolTeamStaffDao;
 import com.epmet.dto.IcPlacePatrolTeamStaffDTO;
@@ -32,21 +37,24 @@ import com.epmet.dto.form.AddPlacePatrolRecordFormDTO;
 import com.epmet.dto.form.GetListPlacePatrolRecordFormDTO;
 import com.epmet.dto.result.GetListPlacePatrolRecordResultDTO;
 import com.epmet.dto.result.PlacePatrolRecordDetailResultDTO;
+import com.epmet.entity.IcPlaceAttachmentEntity;
 import com.epmet.entity.IcPlacePatrolRecordEntity;
 import com.epmet.feign.EpmetAdminOpenFeignClient;
+import com.epmet.resi.group.constant.TopicConstant;
+import com.epmet.service.IcPlaceAttachmentService;
 import com.epmet.service.IcPlacePatrolRecordService;
 import com.epmet.service.IcPlacePatrolReviewRecordService;
 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.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 /**
@@ -57,7 +65,7 @@ import java.util.stream.Collectors;
  */
 @Service
 public class IcPlacePatrolRecordServiceImpl extends BaseServiceImpl<IcPlacePatrolRecordDao, IcPlacePatrolRecordEntity> 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<IcPlacePatro
     @Autowired
     private IcPlacePatrolTeamStaffDao icPlacePatrolTeamStaffDao;
 
+    @Autowired
+    private IcPlaceAttachmentService icPlaceAttachmentService;
+
+    @Value("${openapi.scan.server.url}")
+    private String scanApiUrl;
+
+    @Value("${openapi.scan.method.imgSyncScan}")
+    private String imgSyncScanMethod;
+
 
     /**
      * @Author sun
@@ -79,6 +96,42 @@ public class IcPlacePatrolRecordServiceImpl extends BaseServiceImpl<IcPlacePatro
         entity.setPids(staffInfoCache.getAgencyPIds());
         entity.setFinalResult(entity.getFirstResult());
         entity.setFinalTime(entity.getFirstTime());
+        //图片校验
+        if (!CollectionUtils.isEmpty(formDTO.getImageList())) {
+            ImgScanParamDTO imgScanParamDTO = new ImgScanParamDTO();
+            formDTO.getImageList().forEach(imgUrl -> {
+                ImgTaskDTO task = new ImgTaskDTO();
+                task.setDataId(UUID.randomUUID().toString().replace("-", ""));
+                task.setUrl(imgUrl);
+                imgScanParamDTO.getTasks().add(task);
+            });
+            Result<SyncScanResult> 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<IcPlaceAttachmentEntity> 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<IcPlacePatro
         List<IcPlacePatrolTeamStaffDTO> 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<IcPlacePatro
         teamIds = teamIds.stream().distinct().collect(Collectors.toList());
         List<IcPlacePatrolTeamStaffDTO> 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());
                 }
             });

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<IcPlacePatrolReviewRecordDao, IcPlacePatrolReviewRecordEntity> implements IcPlacePatrolReviewRecordService {
-    private static final Logger log = LoggerFactory.getLogger(IcPlaceOrgServiceImpl.class);
+
     @Autowired
     private IcPlacePatrolRecordService icPlacePatrolRecordService;
     @Autowired

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

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlaceAttachmentDao.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.IcPlaceAttachmentDao">
+
+    <select id="selectByIcPlaceId" parameterType="map" resultType="com.epmet.dto.IcPlaceAttachmentDTO">
+            SELECT
+            rea.attachment_url,
+            rea.attachment_type,
+            rea.duration
+         from ic_place_org_attachment rea
+         where rea.del_flag = '0'
+         and rea.ic_place_id = #{icPlaceId}
+         order by rea.attachment_type asc, rea.sort asc
+    </select>
+
+</mapper>

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
     </select>
 
-</mapper>
+</mapper>

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
     </select>
 
-</mapper>
+</mapper>

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
     </select>
 
-</mapper>
+</mapper>