Merge remote-tracking branch 'origin/master'

src/main/java/com/sooka/sponest/event/eventLog/service/impl/EventLogServiceImpl.java

@@ -29,7 +29,7 @@ public class EventLogServiceImpl implements EventLogService {
         sysUser.setNickName("测试用户");
 
         //构建日志对象
-        return insertEventLog(eventLog.getEventId(), sysUser.getDeptNames()+sysUser.getNickName()+eventLog.getContent(), EVENT_LOG_TYPE_100, null == eventLog.getOperationSource()? EVENT_LOG_SOURCE_2 : eventLog.getOperationSource(), String.valueOf(sysUser.getUserId()), new Date());
+        return insertEventLog(eventLog.getEventId(), sysUser.getDeptNames()+sysUser.getNickName()+eventLog.getContent(), EVENT_LOG_TYPE_100, null == eventLog.getOperationSource()? EVENT_LOG_SOURCE_99 : eventLog.getOperationSource(), String.valueOf(sysUser.getUserId()), new Date());
     }
 
     @Override

src/main/java/com/sooka/sponest/event/eventProcess/controller/EventProcessController.java

@@ -214,7 +214,7 @@ public class EventProcessController extends BaseController {
         String logId = eventLogService.insertEventLog(eventLog);
 
         if (!eventLog.getAttachList().isEmpty()) {
-            eventAttachService.batchInsertEventAttachProcess(logId, eventLog.getEventId(), eventLog.getAttachList(), null == eventLog.getOperationSource() ? EVENT_LOG_FILE_SOURCE_2 : EVENT_LOG_FILE_SOURCE_3, FILE_URL);
+            eventAttachService.batchInsertEventAttachProcess(logId, eventLog.getEventId(), eventLog.getAttachList(), EVENT_LOG_FILE_SOURCE_99, FILE_URL);
         }
 
         return AjaxResult.success("事件日志新增成功");

src/main/java/com/sooka/sponest/event/eventProcess/service/impl/EventProcessServiceImpl.java

@@ -574,18 +574,24 @@ public class EventProcessServiceImpl extends BaseServiceImpl implements EventPro
         boolean flag = true;
 
         for (EventAttach attach : attachList) {
-            MultipartFile multipartFile = FilePrefixUtils.urlToMultipartFile(attach.getPath(), System.currentTimeMillis() + ".jpg");
-            if (null != multipartFile) {
-                R<SysFile> upload = fileService.upload(multipartFile);
-                if (HttpStatus.SUCCESS == upload.getCode()) {
-                    newPathList.add(upload.getData().getUrl());
-                    ids.add(attach.getId());
-                } else {
-                    logger.error("获取图片失败,{}{}", attach.getId(), attach.getPath());
-                    flag = false;
-                    break;
+            if(FILE_URL.equals(attach.getSourceType())){
+                newPathList.add(attach.getPath());
+                ids.add(attach.getId());
+            }else{
+                MultipartFile multipartFile = FilePrefixUtils.urlToMultipartFile(attach.getPath(), System.currentTimeMillis() + ".jpg");
+                if (null != multipartFile) {
+                    R<SysFile> upload = fileService.upload(multipartFile);
+                    if (HttpStatus.SUCCESS == upload.getCode()) {
+                        newPathList.add(upload.getData().getUrl());
+                        ids.add(attach.getId());
+                    } else {
+                        logger.error("获取图片失败,{}{}", attach.getId(), attach.getPath());
+                        flag = false;
+                        break;
+                    }
                 }
             }
+
         }
 
         //存储附件信息

src/main/java/com/sooka/sponest/event/utils/AddAttachPrefix.java

@@ -24,7 +24,7 @@ public class AddAttachPrefix {
         if (attachList.isEmpty()) {
             attachList = eventAttachService.selectEventAttachListUnconfirmed(eventId, null);
         }
-        Map<String, String> keyMap = SpringUtils.getBean(RemoteConfigService.class).remotegetConfigMap(Arrays.asList(DH_1, DH_2, HIK_1, HIK_2, FILE_URL, APP_URL, DOWNLOAD_URL)).getData();
+        Map<String, String> keyMap = SpringUtils.getBean(RemoteConfigService.class).remotegetConfigMap(Arrays.asList(DH_1, DH_2, HIK_1, HIK_2, FILE_URL, APP_URL, DOWNLOAD_URL, INSECT_PESTS_URL)).getData();
         String token = RemoteApiUtil.getInstance().getToken();
         attachList.forEach(attach -> {
             if (DH_1.equals(attach.getSourceType())) {

src/main/java/com/sooka/sponest/event/utils/eventConstants/EventConstants.java

@@ -102,6 +102,7 @@ public class EventConstants {
     public static final String DH_2 = "DH_2"; //大华其他事件
     public static final String HIK_1 = "HIK_1"; //海康火险事件
     public static final String HIK_2 = "HIK_2"; //海康城管事件
+    public static final String INSECT_PESTS_URL = "insectPestsUrl"; //海康城管事件
     public static final String FILE_URL = "fileUrl"; //文件地址
     public static final String APP_URL = "appUrl"; //手机端查看地址
     public static final String DOWNLOAD_URL = "downloadUrl"; //文件下载地址

src/main/resources/mapper/event/eventProcess/EventProcessMapper.xml

@@ -266,11 +266,11 @@
         LEFT JOIN ${database_system}.sys_dept d on ed.dept_id = d.dept_id
         <where>
             <if test="eventId != null and eventId != ''">
-                event_id = #{eventId}
+                a.event_id = #{eventId}
             </if>
             ${params.dataScope}
         </where>
-        order by create_time desc
+        order by a.create_time desc
     </select>
 
     <select id="getUnconfirmedEventDetailById" parameterType="string" resultMap="EventDetailResult">
@@ -284,11 +284,11 @@
         LEFT JOIN ${database_system}.sys_dept d on ed.dept_id = d.dept_id
         <where>
             <if test="eventId != null and eventId != ''">
-                event_id = #{eventId}
+                a.event_id = #{eventId}
             </if>
             ${params.dataScope}
         </where>
-        order by create_time desc
+        order by a.create_time desc
     </select>
 
     <select id="getConfirmedEventDetailById" resultMap="EventDetailProcessResult">
@@ -302,11 +302,11 @@
         LEFT JOIN ${database_system}.sys_dept d on ed.dept_id = d.dept_id
         <where>
             <if test="eventId!= null and eventId!= ''">
-                event_id = #{eventId}
+                a.event_id = #{eventId}
             </if>
             ${params.dataScope}
         </where>
-        order by create_time desc
+        order by a.create_time desc
     </select>
 
     <select id="getUsualEventDetailById" resultMap="EventDetailProcessResult">