Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc

location-rescue-service/pom.xml

@@ -202,14 +202,47 @@
    </pluginRepositories>
    <build>
        <resources>
            <resource>
                <directory>src/main/resources</directory>
                <!-- 根据输入参数动态修改相关内容 -->
                <filtering>true</filtering>
                <excludes/>
            </resource>
        </resources>
        <plugins>
            <!-- 配置文件转移到conf目录 -->
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-resources-plugin</artifactId>
                <executions>
                    <execution>
                        <id>copy-resources</id>
                        <phase>package</phase>
                        <goals>
                            <goal>copy-resources</goal>
                        </goals>
                        <configuration>
                            <encoding>UTF-8</encoding>
                            <!-- 表示把配置文件拷到和jar包同一个路径下 -->
                            <outputDirectory>
                                ${project.build.directory}/conf
                            </outputDirectory>
                            <resources>
                                <resource>
                                    <directory>${project.build.directory}/classes</directory>
                                    <includes>
                                        <include>db/*.sql</include>
                                        <include>**/*.yml</include>
                                        <include>**/*.xml</include>
                                        <include>**/*.properties</include>
                                    </includes>
                                </resource>
                            </resources>
                        </configuration>
                    </execution>
                </executions>
            </plugin>
            <!-- The configuration of maven-jar-plugin -->
            <plugin>
@@ -218,7 +251,7 @@
                <version>2.4</version>
                <!-- The configuration of the plugin -->
                <configuration>
                    <!-- Configuration of the archiver -->
                    <!-- Configuration of the archive -->
                    <archive>
                        <!--生成的jar中，不要包含pom.xml和pom.properties这两个文件-->
                        <addMavenDescriptor>false</addMavenDescriptor>
@@ -231,20 +264,25 @@
                            <classpathPrefix>lib/</classpathPrefix>
                            <!--应用的main class-->
                            <mainClass>com.ai.bss.location.rescue.LocationRescueApp</mainClass>
                            <!--                            <useUniqueVersions>true</useUniqueVersions>-->
                            <!-- MANIFEST.MF文件添加SNAPSHOT依赖包的时候，不带时间戳，直接使用SNAPSHOT -->
                            <useUniqueVersions>false</useUniqueVersions>
                        </manifest>
                        <manifestEntries>
                            <Class-Path>./config/</Class-Path>
                            <Class-Path>./conf/</Class-Path>
                        </manifestEntries>
                    </archive>
                    <!--过滤掉不希望包含在jar中的文件-->
                    <excludes>
                        <exclude>**/*.properties</exclude>
                        <exclude>**/*.xml</exclude>
                        <exclude>**/*.yml</exclude>
                        <exclude>**/*.sql</exclude>
                        <exclude>db</exclude>
                    </excludes>
                </configuration>
            </plugin>
            <!-- 配置依赖jar转移到lib目录 -->
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-dependency-plugin</artifactId>
@@ -272,7 +310,7 @@
                <configuration>
                    <!-- Specifies the configuration file of the assembly plugin -->
                    <descriptors>
                        <descriptor>src/main/assembly/package.xml</descriptor>
                        <descriptor>src/main/assembly/assembly.xml</descriptor>
                    </descriptors>
                </configuration>
                <executions>
@@ -286,6 +324,7 @@
                </executions>
            </plugin>
            <!-- 不打包test代码 -->
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-surefire-plugin</artifactId>
@@ -294,8 +333,7 @@
                </configuration>
            </plugin>
        </plugins>
        <finalName>${project.artifactId}</finalName>
    </build>
</project>

location-rescue-service/src/main/assembly/assembly.xml

@@ -0,0 +1,68 @@
<assembly>
    <id>bin</id>
    <!-- 最终打包成一个用于发布的zip文件 -->
    <formats>
        <format>zip</format>
    </formats>
    <fileSets>
        <!-- 把项目相关的说明文件，打包进zip文件的根目录 -->
        <fileSet>
            <directory>${project.basedir}</directory>
            <outputDirectory>/</outputDirectory>
            <includes>
                <include>README*</include>
                <include>LICENSE*</include>
                <include>NOTICE*</include>
            </includes>
        </fileSet>
        <!-- 把项目的配置文件，打包进zip文件的conf目录 -->
        <fileSet>
            <directory>${project.build.directory}/conf</directory>
            <outputDirectory>/${project.build.finalName}/conf</outputDirectory>
            <directoryMode>0755</directoryMode>
            <fileMode>0644</fileMode>
        </fileSet>
        <!-- Adds dependencies to zip package under lib directory -->
        <fileSet>
            <directory>${project.build.directory}/lib</directory>
            <outputDirectory>/${project.build.finalName}/lib</outputDirectory>
            <directoryMode>0755</directoryMode>
            <fileMode>0644</fileMode>
        </fileSet>
         <!--把项目的脚本文件目录（ src/main/scripts ）中的启动脚本文件，打包进zip文件的根目录下script文件夹下 -->
         <fileSet>
             <directory>${project.basedir}/src/bin</directory>
             <outputDirectory>/bin</outputDirectory>
             <directoryMode>0755</directoryMode>
             <fileMode>0755</fileMode>
             <lineEnding>unix</lineEnding>
             <includes>
                 <include>*.sh</include>
                 <include>*.conf</include>
             </includes>
         </fileSet>
        <fileSet>
            <directory>${project.basedir}/src/bin</directory>
            <outputDirectory>/bin</outputDirectory>
            <directoryMode>0755</directoryMode>
            <fileMode>0755</fileMode>
            <lineEnding>dos</lineEnding>
            <includes>
                <include>*.bat</include>
            </includes>
        </fileSet>
        <!-- 把项目自己编译出来的jar文件，打包进zip文件的根目录 -->
        <fileSet>
            <directory>${project.build.directory}</directory>
            <outputDirectory>/${project.build.finalName}</outputDirectory>
            <includes>
                <include>${project.build.finalName}.jar</include>
            </includes>
        </fileSet>
    </fileSets>
</assembly>

security-protection-service/pom.xml

@@ -189,10 +189,44 @@
        <resources>
            <resource>
                <directory>src/main/resources</directory>
                <!-- 根据输入参数动态修改相关内容 -->
                <filtering>true</filtering>
                <excludes/>
            </resource>
        </resources>
        <plugins>
            <!-- 配置文件转移到conf目录 -->
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-resources-plugin</artifactId>
                <executions>
                    <execution>
                        <id>copy-resources</id>
                        <phase>package</phase>
                        <goals>
                            <goal>copy-resources</goal>
                        </goals>
                        <configuration>
                            <encoding>UTF-8</encoding>
                            <!-- 表示把配置文件拷到和jar包同一个路径下 -->
                            <outputDirectory>
                                ${project.build.directory}/conf
                            </outputDirectory>
                            <resources>
                                <resource>
                                    <directory>${project.build.directory}/classes</directory>
                                    <includes>
                                        <include>db/*.sql</include>
                                        <include>**/*.yml</include>
                                        <include>**/*.xml</include>
                                        <include>**/*.properties</include>
                                    </includes>
                                </resource>
                            </resources>
                        </configuration>
                    </execution>
                </executions>
            </plugin>
            <!-- The configuration of maven-jar-plugin -->
            <plugin>
@@ -201,7 +235,7 @@
                <version>2.4</version>
                <!-- The configuration of the plugin -->
                <configuration>
                    <!-- Configuration of the archiver -->
                    <!-- Configuration of the archive -->
                    <archive>
                        <!--生成的jar中，不要包含pom.xml和pom.properties这两个文件-->
                        <addMavenDescriptor>false</addMavenDescriptor>
@@ -214,19 +248,25 @@
                            <classpathPrefix>lib/</classpathPrefix>
                            <!--应用的main class-->
                            <mainClass>com.ai.bss.security.protection.SecurityProtectionApp</mainClass>
                            <!-- MANIFEST.MF文件添加SNAPSHOT依赖包的时候，不带时间戳，直接使用SNAPSHOT -->
                            <useUniqueVersions>false</useUniqueVersions>
                        </manifest>
                        <manifestEntries>
                            <Class-Path>./config/</Class-Path>
                            <Class-Path>./conf/</Class-Path>
                        </manifestEntries>
                    </archive>
                    <!--过滤掉不希望包含在jar中的文件-->
                    <excludes>
                        <exclude>**/*.properties</exclude>
                        <exclude>**/*.xml</exclude>
                        <exclude>**/*.yml</exclude>
                        <exclude>**/*.sql</exclude>
                        <exclude>db</exclude>
                    </excludes>
                </configuration>
            </plugin>
            <!-- 配置依赖jar转移到lib目录 -->
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-dependency-plugin</artifactId>
@@ -240,7 +280,6 @@
                        </goals>
                        <configuration>
                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
                            <outputAbsoluteArtifactFilename></outputAbsoluteArtifactFilename>
                        </configuration>
                    </execution>
                </executions>
@@ -255,7 +294,7 @@
                <configuration>
                    <!-- Specifies the configuration file of the assembly plugin -->
                    <descriptors>
                        <descriptor>src/main/assembly/package.xml</descriptor>
                        <descriptor>src/main/assembly/assembly.xml</descriptor>
                    </descriptors>
                </configuration>
                <executions>
@@ -269,6 +308,7 @@
                </executions>
            </plugin>
            <!-- 不打包test代码 -->
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-surefire-plugin</artifactId>
@@ -277,8 +317,6 @@
                </configuration>
            </plugin>
        </plugins>
        <finalName>${project.artifactId}</finalName>
    </build>
</project>

security-protection-service/src/main/assembly/assembly.xml

@@ -0,0 +1,68 @@
<assembly>
    <id>bin</id>
    <!-- 最终打包成一个用于发布的zip文件 -->
    <formats>
        <format>zip</format>
    </formats>
    <fileSets>
        <!-- 把项目相关的说明文件，打包进zip文件的根目录 -->
        <fileSet>
            <directory>${project.basedir}</directory>
            <outputDirectory>/</outputDirectory>
            <includes>
                <include>README*</include>
                <include>LICENSE*</include>
                <include>NOTICE*</include>
            </includes>
        </fileSet>
        <!-- 把项目的配置文件，打包进zip文件的conf目录 -->
        <fileSet>
            <directory>${project.build.directory}/conf</directory>
            <outputDirectory>/${project.build.finalName}/conf</outputDirectory>
            <directoryMode>0755</directoryMode>
            <fileMode>0644</fileMode>
        </fileSet>
        <!-- Adds dependencies to zip package under lib directory -->
        <fileSet>
            <directory>${project.build.directory}/lib</directory>
            <outputDirectory>/${project.build.finalName}/lib</outputDirectory>
            <directoryMode>0755</directoryMode>
            <fileMode>0644</fileMode>
        </fileSet>
         <!--把项目的脚本文件目录（ src/main/scripts ）中的启动脚本文件，打包进zip文件的根目录下script文件夹下 -->
         <fileSet>
             <directory>${project.basedir}/src/bin</directory>
             <outputDirectory>/bin</outputDirectory>
             <directoryMode>0755</directoryMode>
             <fileMode>0755</fileMode>
             <lineEnding>unix</lineEnding>
             <includes>
                 <include>*.sh</include>
                 <include>*.conf</include>
             </includes>
         </fileSet>
        <fileSet>
            <directory>${project.basedir}/src/bin</directory>
            <outputDirectory>/bin</outputDirectory>
            <directoryMode>0755</directoryMode>
            <fileMode>0755</fileMode>
            <lineEnding>dos</lineEnding>
            <includes>
                <include>*.bat</include>
            </includes>
        </fileSet>
        <!-- 把项目自己编译出来的jar文件，打包进zip文件的根目录 -->
        <fileSet>
            <directory>${project.build.directory}</directory>
            <outputDirectory>/${project.build.finalName}</outputDirectory>
            <includes>
                <include>${project.build.finalName}.jar</include>
            </includes>
        </fileSet>
    </fileSets>
</assembly>

security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/AiAlarmManageServiceImpl.java

@@ -18,6 +18,7 @@ import com.ai.bss.security.protection.service.interfaces.AiAlarmManageService;
import com.ai.bss.security.protection.service.interfaces.CharSpecService;
import com.ai.bss.security.protection.service.interfaces.MonitorVideoLogManageService;
import com.ai.bss.security.protection.service.interfaces.UploadFileService;
import com.ai.bss.security.protection.utils.DateUtil;
import com.ai.bss.security.protection.utils.EbcConstant;
import com.ai.bss.user.dto.EmployeeDto;
import com.ai.bss.user.service.api.EmployeeService;
@@ -26,6 +27,9 @@ import com.ai.bss.work.safety.model.WorkTaskSafetyAlarm;
import com.ai.bss.work.safety.service.api.AiTaskQuery;
import com.ai.bss.work.service.api.WorkTaskCommand;
import com.ai.bss.work.task.model.common.WorkTask;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
/**
 * @Auther: 王超
@@ -91,7 +95,7 @@ public class AiAlarmManageServiceImpl implements AiAlarmManageService {
    @Override
    public CommonResponse<WorkTask> changeTaskStatus(CommonRequest<WorkTask> workTaskRequest) {
        CommonResponse changeResultResponse = workTaskCommand.changeTaskStatus(workTaskRequest);
    	CommonResponse<WorkTask> changeResultResponse = workTaskCommand.changeTaskStatus(workTaskRequest);
        return changeResultResponse;
    }
    
@@ -118,40 +122,53 @@ public class AiAlarmManageServiceImpl implements AiAlarmManageService {
			return CommonResponse.fail("504", "获取失败");
		}
		
		WorkTaskSafetyAlarm workTaskSafetyAlarm=response.getData();
		//报警详细信息
		Map<String, String> workTaskSafetyAlarmMap= JSON.parseObject(JSON.toJSONString(response.getData()), new TypeReference<Map<String, String>>() {
        });
		
		List<CharacteristicSpecValue> aiAlarmTypeList = charSpecService.getCharSpecList(EbcConstant.BUSINESS_SPEC_AI_ALARM_TYPE);
		for (CharacteristicSpecValue characteristicSpecValue : aiAlarmTypeList) {
			if (characteristicSpecValue.getCode().equals(workTaskSafetyAlarm.getAlarmTypeCode())) {
				workTaskSafetyAlarm.setAlarmTypeCode(characteristicSpecValue.getValue());
			if (characteristicSpecValue.getCode().equals(workTaskSafetyAlarmMap.get("alarmTypeCode"))) {
				workTaskSafetyAlarmMap.put("alarmTypeCodeZh",characteristicSpecValue.getValue());
				break;
			}
		}
		List<CharacteristicSpecValue> aiAlarmStatusList = charSpecService.getCharSpecList(EbcConstant.BUSINESS_SPEC_AI_TASK_STATUS);
		for (CharacteristicSpecValue characteristicSpecValue : aiAlarmStatusList) {
			if (characteristicSpecValue.getCode().equals(workTaskSafetyAlarm.getStatus())) {
				workTaskSafetyAlarm.setStatus(characteristicSpecValue.getValue());
			if (characteristicSpecValue.getCode().equals(workTaskSafetyAlarmMap.get("status"))) {
				workTaskSafetyAlarmMap.put("statusZh",characteristicSpecValue.getValue());
				break;
			}
		}
		
		if(StringUtils.isNotEmpty(workTaskSafetyAlarm.getWorkEmployeeRoleId())){
            long relateEmployeeRoleId = Long.parseLong(workTaskSafetyAlarm.getWorkEmployeeRoleId());
		if(StringUtils.isNotEmpty(workTaskSafetyAlarmMap.get("workEmployeeRoleId"))){
            long relateEmployeeRoleId = Long.parseLong(workTaskSafetyAlarmMap.get("workEmployeeRoleId"));
            EmployeeDto employeeDto = new EmployeeDto();
            employeeDto.setId(relateEmployeeRoleId);
            CommonRequest<EmployeeDto> employeeDtoRequest = new CommonRequest<EmployeeDto>(employeeDto);
            CommonResponse<EmployeeDto> employeeDtoResponse = employeeService.queryEmployee(employeeDtoRequest);
            if (employeeDtoResponse==null||employeeDtoResponse.getData()==null) {
            	workTaskSafetyAlarm.setWorkEmployeeRoleName("--");
            	workTaskSafetyAlarmMap.put("workEmployeeRoleName","--");
			}else {
				workTaskSafetyAlarm.setWorkEmployeeRoleName(employeeDtoResponse.getData().getName());
				workTaskSafetyAlarmMap.put("workEmployeeRoleName",employeeDtoResponse.getData().getName());
			}
        }
		
		Map<String, String> pictureMap= uploadFileService.getFileUrlToMap(workTaskSafetyAlarm.getIdenPictureUrl());
		if (WorkTask.END_STATUS.equals(workTaskSafetyAlarmMap.get("status"))||WorkTask.FALSE_ALARM_STATUS.equals(workTaskSafetyAlarmMap.get("status"))) {
			workTaskSafetyAlarmMap.put("disposeDate",DateUtil.formatDate(response.getData().getDoneDate()));
		}else {
			workTaskSafetyAlarmMap.put("disposeDate","");
		}
		
		workTaskSafetyAlarmMap.put("createDate",DateUtil.formatDate(response.getData().getCreateDate()));
		workTaskSafetyAlarmMap.put("aiIdenTime",DateUtil.formatDate(response.getData().getAiIdenTime()));
		
		//图片信息
		Map<String, String> pictureMap= uploadFileService.getFileUrlToMap(workTaskSafetyAlarmMap.get("idenPictureUrl"));
		
		List<EbcMonitorVideoLog> logsList=monitorVideoLogManageService.getMonitorVideoLogByPictureTime(pictureMap.get("fileDateTimeStr"), workTaskSafetyAlarm.getResourceToolId()).getData();
		//视频信息
		List<EbcMonitorVideoLog> logsList=monitorVideoLogManageService.getMonitorVideoLogByPictureTime(pictureMap.get("fileDateTimeStr"), workTaskSafetyAlarmMap.get("resourceToolId")).getData();
		EbcMonitorVideoLog ebcMonitorVideoLog=null;
		if (!CollectionUtils.isEmpty(logsList)) {
			ebcMonitorVideoLog=logsList.get(0);
@@ -159,7 +176,7 @@ public class AiAlarmManageServiceImpl implements AiAlarmManageService {
		}
		
		Map<String,Object> resultMap= new HashMap<String, Object>();
		resultMap.put("alarmInfo", workTaskSafetyAlarm);
		resultMap.put("alarmInfo", workTaskSafetyAlarmMap);
		resultMap.put("pictureInfo", pictureMap);
		resultMap.put("videoInfo", ebcMonitorVideoLog);
		return CommonResponse.ok(resultMap);