bug修改

src/main/java/com/zhgd/xmgl/async/AsyncCommon.java

@@ -341,17 +341,21 @@ public class AsyncCommon {
 
     @Async("asyncExecutor")
     public Future<HashMap<String, Object>> getPlayUrlAsync(ProjectVideoConfig videoConfig, EntityMap entityMap) {
-        String serialNumber = MapUtils.getString(entityMap, "serialNumber");
-        if (StringUtils.isNotEmpty(serialNumber)) {
-            String url = HikVideoUtil.callPostApiGetPreviewURL(serialNumber, "hls", null, videoConfig.getAccount(),
-                    videoConfig.getPassword(), videoConfig.getAppId(), videoConfig.getAppSecret());
-            if (StringUtils.isNotEmpty(url)) {
-                HashMap<String, Object> map = new HashMap<>();
-                map.put("url", url);
-                map.putAll(entityMap);
-                Future<HashMap<String, Object>> future = new AsyncResult<>(map);
-                return future;
+        try {
+            String serialNumber = MapUtils.getString(entityMap, "serialNumber");
+            if (StringUtils.isNotEmpty(serialNumber)) {
+                String url = HikVideoUtil.callPostApiGetPreviewURL(serialNumber, "hls", null, videoConfig.getAccount(),
+                        videoConfig.getPassword(), videoConfig.getAppId(), videoConfig.getAppSecret());
+                if (StringUtils.isNotEmpty(url)) {
+                    HashMap<String, Object> map = new HashMap<>();
+                    map.put("url", url);
+                    map.putAll(entityMap);
+                    Future<HashMap<String, Object>> future = new AsyncResult<>(map);
+                    return future;
+                }
             }
+        } catch (Exception e) {
+            log.error("err:", e);
         }
         return null;
     }

src/main/java/com/zhgd/xmgl/modules/edu/mapper/xml/SafeEducationQuestionMapper.xml

@@ -68,8 +68,8 @@
     </select>
     <select id="exportExcelWorkerEducation" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
             SELECT a.id,a.study_time,
-                   a.is_qualified ,
-                    (case when a.is_qualified=1 then '合格' when a.is_qualified=2 then '不合格'  else '' end)  is_qualified,
+        a.score,
+        (case when a.is_qualified=1 then '合格' when a.is_qualified=2 then '不合格'  else '' end)  is_qualified,
                    w.worker_name,b.edu_content,b.edu_course_name,
                     (case when b.edu_type=1 then '入场三级教育' when b.edu_type=2 then '定期安全教育'  when b.edu_type=3 then '安全技术交底'  when b.edu_type=4 then 'VR安全教育'  else '' end)  edu_type
             from worker_safe_education_worker a

src/main/java/com/zhgd/xmgl/modules/edu/service/impl/SafeEducationQuestionServiceImpl.java

@@ -157,7 +157,7 @@ public class SafeEducationQuestionServiceImpl extends ServiceImpl<SafeEducationQ
         try {
             List<EntityMap> list = safeEducationQuestionMapper.exportExcelWorkerEducation(workerSafeEducation);
             String[] heads = {"人员姓名", "培训日期", "培训类型", "培训主题", "考试分数", "是否及格"};
-            String[] headsStr = {"workerName", "studyTime", "eduType", "eduCourseName", "isQualified"};
+            String[] headsStr = {"workerName", "studyTime", "eduType", "eduCourseName", "score", "isQualified"};
             JxlExcelUtils.excelExport("培训记录数据列表", heads, headsStr, list, response);
         } catch (Exception e) {
             log.error("导出培训记录数据异常" + e);

src/main/java/com/zhgd/xmgl/modules/environment/service/impl/DustNoiseDataServiceImpl.java

@@ -72,22 +72,23 @@ public class DustNoiseDataServiceImpl extends ServiceImpl<DustNoiseDataMapper, D
 
         if (map.get("deviceId") == null) {
             DustNoiseData nd = dustNoiseDataMapper.getRealTimeDustNoiseData(map);
-            List<DustNoiseData> noiseDataList = Arrays.asList(nd);
-            for (DustNoiseData dustNoiseData : noiseDataList) {
-                DustNoiseData dataBuilder = dataBuilder(dustNoiseData);
-                if (noiseData == null) {
-                    noiseData = dataBuilder;
-                    continue;
+            if (nd != null) {
+                List<DustNoiseData> noiseDataList = Arrays.asList(nd);
+                for (DustNoiseData dustNoiseData : noiseDataList) {
+                    DustNoiseData dataBuilder = dataBuilder(dustNoiseData);
+                    if (noiseData == null) {
+                        noiseData = dataBuilder;
+                        continue;
+                    }
+                    noiseData.setPm25(NumberUtil.div(NumberUtil.add(noiseData.getPm25(), dataBuilder.getPm25()), 2).floatValue());
+                    noiseData.setPm10(NumberUtil.div(NumberUtil.add(noiseData.getPm10(), dataBuilder.getPm10()), 2).floatValue());
+                    noiseData.setNoise(NumberUtil.div(NumberUtil.add(noiseData.getNoise(), dataBuilder.getNoise()), 2).floatValue());
+                    noiseData.setTemperature(NumberUtil.div(NumberUtil.add(noiseData.getTemperature(), dataBuilder.getTemperature()), 2).floatValue());
+                    noiseData.setHumidity(NumberUtil.div(NumberUtil.add(noiseData.getHumidity(), dataBuilder.getHumidity()), 2).floatValue());
+                    noiseData.setWindspeed(NumberUtil.div(NumberUtil.add(noiseData.getWindspeed(), dataBuilder.getWindspeed()), 2).floatValue());
+                    noiseData.setPressure(NumberUtil.div(NumberUtil.add(noiseData.getPressure(), dataBuilder.getPressure()), 2).floatValue());
                 }
-                noiseData.setPm25(NumberUtil.div(NumberUtil.add(noiseData.getPm25(), dataBuilder.getPm25()), 2).floatValue());
-                noiseData.setPm10(NumberUtil.div(NumberUtil.add(noiseData.getPm10(), dataBuilder.getPm10()), 2).floatValue());
-                noiseData.setNoise(NumberUtil.div(NumberUtil.add(noiseData.getNoise(), dataBuilder.getNoise()), 2).floatValue());
-                noiseData.setTemperature(NumberUtil.div(NumberUtil.add(noiseData.getTemperature(), dataBuilder.getTemperature()), 2).floatValue());
-                noiseData.setHumidity(NumberUtil.div(NumberUtil.add(noiseData.getHumidity(), dataBuilder.getHumidity()), 2).floatValue());
-                noiseData.setWindspeed(NumberUtil.div(NumberUtil.add(noiseData.getWindspeed(), dataBuilder.getWindspeed()), 2).floatValue());
-                noiseData.setPressure(NumberUtil.div(NumberUtil.add(noiseData.getPressure(), dataBuilder.getPressure()), 2).floatValue());
             }
-
         } else {
             noiseData = dustNoiseDataMapper.getRealTimeDustNoiseData(map);
             if (noiseData != null) {

src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/DangerItemRecordMapper.xml

@@ -2,8 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhgd.xmgl.modules.quality.mapper.DangerItemRecordMapper">
     <select id="selectDangerItemRecordList" resultType="com.zhgd.xmgl.modules.quality.entity.DangerItemRecord">
-        SELECT a.*,
-        IFNULL(b.record_status,0) record_status
+        SELECT IFNULL(b.record_status,0) record_status,a.*
         from danger_item_record a LEFT JOIN
         (SELECT * FROM project_danger_type_disable WHERE project_sn=#{projectSn} and type=2) b ON b.danger_type_id=a.id
         WHERE a.danger_type_id=#{dangerTypeId}