Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/VideoDto.java

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2021/10/21
+ */
+@Data
+public class VideoDto {
+    private Long id;
+    private String code;
+    private String name;
+    private String region;
+    private String address;
+    private String status;
+    private String type;
+    private String url;
+    private String img;
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/EquipFeignClient.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.common.api.feign;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.common.api.dto.PageDto;
+import com.yeejoin.amos.boot.module.common.api.dto.VideoDto;
 import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -196,7 +197,7 @@ public interface EquipFeignClient {
 
 
     @RequestMapping(value = "/video/pageList", method = RequestMethod.GET)
-    ResponseModel<Page<Map<String, Object>>> pageList( @RequestParam Integer current,
+    ResponseModel<Page<VideoDto>> pageList(@RequestParam Integer current,
                                            @RequestParam Integer size,
                                            @RequestParam String code,
                                            @RequestParam String name,

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FirefightersMapper.java

@@ -32,7 +32,7 @@ public interface FirefightersMapper extends BaseMapper<Firefighters> {
 
     List<FirefightersTreeDto> getFirefightersJobTitleCount();
 
-    List<String> getFirefightersName( );
+    List<Map<String,String>> getFirefightersName( );
 
 	List<FirefightersExcelDto> exportToExcel(Boolean isDelete, String name, String postQualification, String fireTeamId,
 			String state, String areasExpertise, String jobTitle);

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FirefightersMapper.xml

@@ -159,9 +159,10 @@ WHERE
 <if test='jobTitle!=null'>and f.job_title_code = #{jobTitle}</if>
 	</select>
 
-	<select id="getFirefightersName" resultType="string">
+	<select id="getFirefightersName" resultType="Map">
 		SELECT
-			cb_firefighters.name
+			cb_firefighters.name AS name,
+			cb_firefighters.mobile_phone AS phone
 		FROM
 			cb_firefighters
 		WHERE

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -23,33 +23,51 @@
                                      u.sequence_nbr sequenceNbr,
                                      u.biz_org_name bizOrgName,
                                      u.biz_org_code bizOrgCode,
-        <if test="fields != null">
-            <foreach collection="fields" item="item" separator=",">MAX(case f.field_code when #{item} then v.field_value
-                end) ${item}
-            </foreach>
-        </if>
+                                     g.*
                                  FROM
-        cb_org_usr u LEFT JOIN
-        cb_dynamic_form_instance v on u.sequence_nbr = v.instance_id
-        LEFT JOIN cb_dynamic_form_column f ON f.sequence_nbr = v.form_column_id
+                                     cb_org_usr u
+
+                                         LEFT JOIN
+                                     (  SELECT
+                                            v.`instance_id`,
+                                            max(case v.field_code when 'personNumber' then IFNULL(v.field_value_label,v.field_value) end) personNumber,
+                                            max(case v.field_code when 'certificatesTypeCode' then IFNULL(v.field_value_label,v.field_value) end) certificatesTypeCode,
+                                            max(case v.field_code when 'gender' then IFNULL(v.field_value_label,v.field_value) end) gender,
+                                            max(case v.field_code when 'certificatesNumber' then IFNULL(v.field_value_label,v.field_value) end) certificatesNumber,
+                                            max(case v.field_code when 'telephone' then IFNULL(v.field_value_label,v.field_value) end) telephone,
+                                            max(case v.field_code when 'state' then IFNULL(v.field_value_label,v.field_value) end) state,
+                                            max(case v.field_code when 'safetyTraining' then IFNULL(v.field_value_label,v.field_value) end) safetyTraining,
+                                            max(case v.field_code when 'administrativePositionCode' then IFNULL(v.field_value_label,v.field_value) end) administrativePositionCode,
+                                            max(case v.field_code when 'internalPositionCode' then IFNULL(v.field_value_label,v.field_value) end) internalPositionCode,
+                                            max(case v.field_code when 'fireManagementPostCode' then IFNULL(v.field_value_label,v.field_value) end) fireManagementPostCode,
+                                            max(case v.field_code when 'positionType' then IFNULL(v.field_value_label,v.field_value) end) positionType,
+                                            max(case v.field_code when 'certificateType' then IFNULL(v.field_value_label,v.field_value) end) certificateType,
+                                            max(case v.field_code when 'holdingTime' then IFNULL(v.field_value_label,v.field_value) end) holdingTime,
+                                            max(case v.field_code when 'auditCycle' then IFNULL(v.field_value_label,v.field_value) end) auditCycle,
+                                            max(case v.field_code when 'personImg' then IFNULL(v.field_value_label,v.field_value) end) personImg,
+                                            max(case v.field_code when 'certificateImg' then IFNULL(v.field_value_label,v.field_value) end) certificateImg
+                                        FROM
+                                            `cb_dynamic_form_instance` v
+                                        WHERE
+                                            v.group_code = 246
+                                        GROUP BY
+                                            v.`instance_id`
+                                     ) g
+
+                                     on u.sequence_nbr = g.instance_id
+
                                  where
-        u.biz_org_type = #{bizOrgType}
-        AND u.is_delete = 0
-        <if test="bizOrgName != null">
-            AND u.biz_org_name = #{bizOrgName}
-        </if>
-        <if test="bizOrgCode != null and bizOrgCode != '-1'">
-            AND u.biz_org_code like concat(#{bizOrgCode}, '%')
-        </if>
+                                     u.biz_org_type = 'person'
+                                   AND
+                                     u.is_delete = 0
+
                                  GROUP BY
                                      u.sequence_nbr ,
                                      u.biz_org_name ,
                                      u.biz_org_code
+                                 order by u.rec_date desc
                              )a where a.sequenceNbr is not null
 
-        <if test="fieldsValue != null">
-            <foreach collection="fieldsValue.keys" item="item">AND a.${item} = #{fieldsValue[${item}]}</foreach>
-        </if>
     </select>
 
     <!--机场单位人员按时间倒叙排列add order by u.rec_date desc 2021-09-08 by kongfm  -->
@@ -72,7 +90,7 @@
             max(case v.field_code when 'gender' then IFNULL(v.field_value_label,v.field_value) end) gender,
             max(case v.field_code when 'certificatesNumber' then IFNULL(v.field_value_label,v.field_value) end) certificatesNumber,
             max(case v.field_code when 'telephone' then IFNULL(v.field_value_label,v.field_value) end) telephone,
-        max(case v.field_code when 'state' then IFNULL(v.field_value_label,v.field_value) end) state,
+            max(case v.field_code when 'stateCode' then IFNULL(v.field_value_label,v.field_value) end) state,
             max(case v.field_code when 'safetyTraining' then IFNULL(v.field_value_label,v.field_value) end) safetyTraining,
             max(case v.field_code when 'administrativePositionCode' then IFNULL(v.field_value_label,v.field_value) end) administrativePositionCode,
             max(case v.field_code when 'internalPositionCode' then IFNULL(v.field_value_label,v.field_value) end) internalPositionCode,

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/AlertCalledMapper.java

@@ -36,7 +36,7 @@ public interface AlertCalledMapper extends BaseMapper<AlertCalled> {
 
     List<AlertCalledTodyDto> getTodayAlertCalled();
 
-    List<String> getContactName( );
+    List<Map<String,String>> getContactName( );
 
     List<String> getAddress();
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -232,9 +232,10 @@
 
     </select>
 
-    <select id="getContactName" resultType="string">
+    <select id="getContactName" resultType="Map">
         SELECT
-            jc_alert_called.contact_user
+            jc_alert_called.contact_user AS name,
+            jc_alert_called.contact_phone AS phone
         FROM
             jc_alert_called
         WHERE

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -3,7 +3,6 @@ package com.yeejoin.amos.boot.module.command.biz.controller;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -19,8 +18,6 @@ import com.yeejoin.amos.boot.module.command.api.dto.SeismometeorologyDto;
 import com.yeejoin.amos.boot.module.command.biz.service.impl.RemoteSecurityService;
 import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
-import com.yeejoin.amos.boot.module.common.api.entity.Firefighters;
-import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
 import com.yeejoin.amos.boot.module.common.api.feign.IotFeignClient;
 import com.yeejoin.amos.boot.module.common.api.feign.VideoFeignClient;
@@ -42,12 +39,11 @@ import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources;
 import com.yeejoin.amos.boot.module.jcs.api.entity.UserCar;
 import com.yeejoin.amos.boot.module.jcs.api.enums.AlertStageEnums;
-import com.yeejoin.amos.boot.module.jcs.api.enums.FireCarStatusEnum;
 import com.yeejoin.amos.boot.module.jcs.api.service.*;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import com.yeejoin.amos.feign.privilege.model.PermissionModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
@@ -286,8 +282,20 @@ public class CommandController extends BaseController {
           par.setLatitude(alertCalled.getCoordinateX());
           par.setLongitude(alertCalled.getCoordinateY());
       }
-        ResponseModel<Page<Map<String, Object>>> data=  equipFeignClient.pageVideo(pageNum,pageSize,par.getLongitude(),par.getLatitude(),par.getDistance());
-        return ResponseHelper.buildResponse(data!=null?data.getResult():null);
+        ResponseModel<Page<Map<String, Object>>> data=  equipFeignClient.pageVideo(pageNum==0?1:pageNum,pageSize,par.getLongitude(),par.getLatitude(),par.getDistance());
+
+
+        Page<Map<String, Object>>  pag=  data!=null?data.getResult():null;
+        List<Map<String, Object>> records =pag!=null?pag.getRecords():null;
+        if(records!=null&&records.size()>0){
+            for (Map<String, Object> record : records) {
+                ResponseModel<String> da=videoFeignClient.videoUrlByIndexCode(record.get("code")+"");
+                String url=  da!=null?da.getResult().substring(da.getResult().indexOf("openUrl")):null;
+                record.put("url",url);
+            }
+            pag.setRecords(records);
+        }
+        return ResponseHelper.buildResponse(pag);
     }
 
 
@@ -295,18 +303,28 @@ public class CommandController extends BaseController {
     /**
      * 水源列表分页查询
      *
-     * @return
+     * @returngetVideo
      */
     @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
     @PostMapping (value = "video/pageList")
     @ApiOperation(httpMethod = "POST", value = " app视频分页查询88", notes = "app视频分页查询88")
     public ResponseModel<Object> pageList(@RequestBody PageDto pageDto) {
-        ResponseModel<Page<Map<String, Object>>> data=  equipFeignClient.pageList(pageDto.getCurrent(),
+        ResponseModel<Page<VideoDto>> data=  equipFeignClient.pageList(pageDto.getCurrent(),
                 pageDto.getSize(),
                 pageDto.getCode()==null?"":pageDto.getCode(),
                 pageDto.getName()==null?"":pageDto.getName(),
                 pageDto.getTypeCode()==null?"":pageDto.getTypeCode());
-        return ResponseHelper.buildResponse(data!=null?data.getResult():null);
+        Page<VideoDto>  pag=  data!=null?data.getResult():null;
+        List<VideoDto> records =pag!=null?pag.getRecords():null;
+        if(records!=null&&records.size()>0){
+            for (VideoDto record : records) {
+                ResponseModel<String> da=videoFeignClient.videoUrlByIndexCode(record.getCode());
+                String url=  da!=null?da.getResult():null;
+                record.setUrl(url);
+            }
+            pag.setRecords(records);
+        }
+        return ResponseHelper.buildResponse(pag);
     }
 
 
@@ -965,8 +983,19 @@ public class CommandController extends BaseController {
         Page page = new Page(current,  size);
         List<OrderItem>  list= OrderItem.ascs("id");
         page.setOrders(list);
-        ResponseModel<Page<Map<String, Object>>>  date= equipFeignClient.getVideo(current,size,0l);
-        return ResponseHelper.buildResponse(date!=null?date.getResult():null);
+        ResponseModel<Page<Map<String, Object>>>  data= equipFeignClient.getVideo(current,size,0l);
+
+        Page<Map<String, Object>>  pag=  data!=null?data.getResult():null;
+        List<Map<String, Object>> records =pag!=null?pag.getRecords():null;
+        if(records!=null&&records.size()>0){
+            for (Map<String, Object> record : records) {
+                ResponseModel<String> da=videoFeignClient.videoUrlByIndexCode(record.get("code")+"");
+                String url=  da!=null?da.getResult().substring(da.getResult().indexOf("openUrl")):null;
+                record.put("url",url);
+            }
+            pag.setRecords(records);
+        }
+        return ResponseHelper.buildResponse(pag);
     }
 
     

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FirefightersServiceImpl.java

@@ -124,7 +124,7 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 		return menus;
 	}
 
-	public List<String> getFirefightersName() {
+	public List<Map<String,String>> getFirefightersName() {
 
 		return firefightersMapper.getFirefightersName();
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertCalledController.java

@@ -362,7 +362,7 @@ public class AlertCalledController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/getAmosId", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "警情填报联系人模糊查询", notes = "警情填报联系人模糊查询")
-    public ResponseModel< List<String>> getContact ( ) {
+    public ResponseModel< List<Map<String,String>>> getContact ( ) {
 
         return ResponseHelper.buildResponse(iAlertCalledService.getContactName());
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertCalledServiceImpl.java

@@ -797,9 +797,9 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
     }
 
     /*2304 地址 联系人模糊查询缺失  陈召 2021-09-23 开始*/
-    public List<String> getContactName() {
-        List<String> firefightersName = firefightersService.getFirefightersName();
-        List<String> contactNames = alertCalledMapper.getContactName();
+    public List<Map<String,String>> getContactName() {
+        List<Map<String,String>> firefightersName = firefightersService.getFirefightersName();
+        List<Map<String,String>> contactNames = alertCalledMapper.getContactName();
         firefightersName.addAll(contactNames);
 
         return firefightersName;

amos-boot-system-jcs/src/main/resources/application.properties

@@ -86,3 +86,4 @@ spring.servlet.multipart.maxFileSize=3MB
 spring.servlet.multipart.maxRequestSize=3MB
 
 supervision.feign.name=AMOS-SUPERVISION-API
+video.fegin.name=VIDEO888
\ No newline at end of file