调整检查地图显示

src/main/java/com/cm/inspection/controller/app/apis/gridpersonnel/GridPersonnelAppController.java

@@ -108,4 +108,14 @@ public class GridPersonnelAppController extends AbstractController {
         return gridPersonnelService.listPageGridPersonnel(page);
     }
 
+    @ApiOperation(value = "获取我的网格员身份", notes = "获取我的网格员身份")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "token", value = "token", paramType = "header")
+    })
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @GetMapping("getgridpersonnelofmine")
+    public GridPersonnelDTO getGridPersonnelOfMine(@RequestHeader("token") String token) {
+        return gridPersonnelService.getGridPersonnelOfMine(token);
+    }
+
 }

src/main/java/com/cm/inspection/pojo/dtos/publicareareport/PublicAreaReportDTO.java

@@ -1,10 +1,10 @@
 package com.cm.inspection.pojo.dtos.publicareareport;
 
+import com.cm.common.annotation.CheckEmptyAnnotation;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
- *
  * @ClassName: PublicAreaReportDTO
  * @Description: 公共区域上报
  * @Author: WenG
@@ -16,6 +16,26 @@ public class PublicAreaReportDTO {
 
     @ApiModelProperty(name = "publicAreaReportId", value = "主键")
     private String publicAreaReportId;
+    @ApiModelProperty(name = "area1Id", value = "区域1")
+    private String area1Id;
+    @ApiModelProperty(name = "area1DictionaryName", value = "区域1名称")
+    private String area1DictionaryName;
+    @ApiModelProperty(name = "area2Id", value = "区域2")
+    private String area2Id;
+    @ApiModelProperty(name = "area2DictionaryName", value = "区域2名称")
+    private String area2DictionaryName;
+    @ApiModelProperty(name = "area3Id", value = "区域3")
+    private String area3Id;
+    @ApiModelProperty(name = "area3DictionaryName", value = "区域3名称")
+    private String area3DictionaryName;
+    @ApiModelProperty(name = "area4Id", value = "区域4")
+    private String area4Id;
+    @ApiModelProperty(name = "area4DictionaryName", value = "区域4名称")
+    private String area4DictionaryName;
+    @ApiModelProperty(name = "area5Id", value = "区域5")
+    private String area5Id;
+    @ApiModelProperty(name = "area5DictionaryName", value = "区域5名称")
+    private String area5DictionaryName;
     @ApiModelProperty(name = "checkAddress", value = "检查地址")
     private String checkAddress;
     @ApiModelProperty(name = "checkDate", value = "检查时间")
@@ -33,6 +53,86 @@ public class PublicAreaReportDTO {
     @ApiModelProperty(name = "checkUserName", value = "检查人")
     private String checkUserName;
 
+    public String getArea1Id() {
+        return area1Id == null ? "" : area1Id.trim();
+    }
+
+    public void setArea1Id(String area1Id) {
+        this.area1Id = area1Id;
+    }
+
+    public String getArea1DictionaryName() {
+        return area1DictionaryName == null ? "" : area1DictionaryName.trim();
+    }
+
+    public void setArea1DictionaryName(String area1DictionaryName) {
+        this.area1DictionaryName = area1DictionaryName;
+    }
+
+    public String getArea2Id() {
+        return area2Id == null ? "" : area2Id.trim();
+    }
+
+    public void setArea2Id(String area2Id) {
+        this.area2Id = area2Id;
+    }
+
+    public String getArea2DictionaryName() {
+        return area2DictionaryName == null ? "" : area2DictionaryName.trim();
+    }
+
+    public void setArea2DictionaryName(String area2DictionaryName) {
+        this.area2DictionaryName = area2DictionaryName;
+    }
+
+    public String getArea3Id() {
+        return area3Id == null ? "" : area3Id.trim();
+    }
+
+    public void setArea3Id(String area3Id) {
+        this.area3Id = area3Id;
+    }
+
+    public String getArea3DictionaryName() {
+        return area3DictionaryName == null ? "" : area3DictionaryName.trim();
+    }
+
+    public void setArea3DictionaryName(String area3DictionaryName) {
+        this.area3DictionaryName = area3DictionaryName;
+    }
+
+    public String getArea4Id() {
+        return area4Id == null ? "" : area4Id.trim();
+    }
+
+    public void setArea4Id(String area4Id) {
+        this.area4Id = area4Id;
+    }
+
+    public String getArea4DictionaryName() {
+        return area4DictionaryName == null ? "" : area4DictionaryName.trim();
+    }
+
+    public void setArea4DictionaryName(String area4DictionaryName) {
+        this.area4DictionaryName = area4DictionaryName;
+    }
+
+    public String getArea5Id() {
+        return area5Id == null ? "" : area5Id.trim();
+    }
+
+    public void setArea5Id(String area5Id) {
+        this.area5Id = area5Id;
+    }
+
+    public String getArea5DictionaryName() {
+        return area5DictionaryName == null ? "" : area5DictionaryName.trim();
+    }
+
+    public void setArea5DictionaryName(String area5DictionaryName) {
+        this.area5DictionaryName = area5DictionaryName;
+    }
+
     public String getPublicAreaReportId() {
         return publicAreaReportId == null ? "" : publicAreaReportId;
     }
@@ -105,5 +205,48 @@ public class PublicAreaReportDTO {
         this.checkUserName = checkUserName;
     }
 
-
+    @Override
+    public String toString() {
+        final StringBuilder sb = new StringBuilder("{");
+        sb.append("\"publicAreaReportId\":\"")
+                .append(publicAreaReportId).append('\"');
+        sb.append(",\"area1Id\":\"")
+                .append(area1Id).append('\"');
+        sb.append(",\"area1DictionaryName\":\"")
+                .append(area1DictionaryName).append('\"');
+        sb.append(",\"area2Id\":\"")
+                .append(area2Id).append('\"');
+        sb.append(",\"area2DictionaryName\":\"")
+                .append(area2DictionaryName).append('\"');
+        sb.append(",\"area3Id\":\"")
+                .append(area3Id).append('\"');
+        sb.append(",\"area3DictionaryName\":\"")
+                .append(area3DictionaryName).append('\"');
+        sb.append(",\"area4Id\":\"")
+                .append(area4Id).append('\"');
+        sb.append(",\"area4DictionaryName\":\"")
+                .append(area4DictionaryName).append('\"');
+        sb.append(",\"area5Id\":\"")
+                .append(area5Id).append('\"');
+        sb.append(",\"area5DictionaryName\":\"")
+                .append(area5DictionaryName).append('\"');
+        sb.append(",\"checkAddress\":\"")
+                .append(checkAddress).append('\"');
+        sb.append(",\"checkDate\":\"")
+                .append(checkDate).append('\"');
+        sb.append(",\"checkContent\":\"")
+                .append(checkContent).append('\"');
+        sb.append(",\"checkPhotos\":\"")
+                .append(checkPhotos).append('\"');
+        sb.append(",\"checkType\":")
+                .append(checkType);
+        sb.append(",\"checkLng\":\"")
+                .append(checkLng).append('\"');
+        sb.append(",\"checkLat\":\"")
+                .append(checkLat).append('\"');
+        sb.append(",\"checkUserName\":\"")
+                .append(checkUserName).append('\"');
+        sb.append('}');
+        return sb.toString();
+    }
 }

src/main/java/com/cm/inspection/pojo/vos/publicareareport/PublicAreaReportVO.java

@@ -15,6 +15,21 @@ import io.swagger.annotations.ApiModelProperty;
 @ApiModel
 public class PublicAreaReportVO {
 
+    @ApiModelProperty(name = "area1Id", value = "区域1")
+    @CheckEmptyAnnotation(name = "区域1")
+    private String area1Id;
+    @ApiModelProperty(name = "area2Id", value = "区域2")
+    @CheckEmptyAnnotation(name = "区域2")
+    private String area2Id;
+    @ApiModelProperty(name = "area3Id", value = "区域3")
+    @CheckEmptyAnnotation(name = "区域3")
+    private String area3Id;
+    @ApiModelProperty(name = "area4Id", value = "区域4")
+    @CheckEmptyAnnotation(name = "区域4")
+    private String area4Id;
+    @ApiModelProperty(name = "area5Id", value = "区域5")
+    @CheckEmptyAnnotation(name = "区域5")
+    private String area5Id;
     @ApiModelProperty(name = "checkAddress", value = "检查地址")
     @CheckEmptyAnnotation(name = "检查地址")
     private String checkAddress;
@@ -36,6 +51,46 @@ public class PublicAreaReportVO {
     @ApiModelProperty(name = "checkUserName", value = "检查人")
     private String checkUserName;
 
+    public String getArea1Id() {
+        return area1Id == null ? "" : area1Id.trim();
+    }
+
+    public void setArea1Id(String area1Id) {
+        this.area1Id = area1Id;
+    }
+
+    public String getArea2Id() {
+        return area2Id == null ? "" : area2Id.trim();
+    }
+
+    public void setArea2Id(String area2Id) {
+        this.area2Id = area2Id;
+    }
+
+    public String getArea3Id() {
+        return area3Id == null ? "" : area3Id.trim();
+    }
+
+    public void setArea3Id(String area3Id) {
+        this.area3Id = area3Id;
+    }
+
+    public String getArea4Id() {
+        return area4Id == null ? "" : area4Id.trim();
+    }
+
+    public void setArea4Id(String area4Id) {
+        this.area4Id = area4Id;
+    }
+
+    public String getArea5Id() {
+        return area5Id == null ? "" : area5Id.trim();
+    }
+
+    public void setArea5Id(String area5Id) {
+        this.area5Id = area5Id;
+    }
+
     public String getCheckAddress() {
         return checkAddress == null ? "" : checkAddress;
     }
@@ -103,7 +158,17 @@ public class PublicAreaReportVO {
     @Override
     public String toString() {
         final StringBuilder sb = new StringBuilder("{");
-        sb.append("\"checkAddress\":\"")
+        sb.append("\"area1Id\":\"")
+                .append(area1Id).append('\"');
+        sb.append(",\"area2Id\":\"")
+                .append(area2Id).append('\"');
+        sb.append(",\"area3Id\":\"")
+                .append(area3Id).append('\"');
+        sb.append(",\"area4Id\":\"")
+                .append(area4Id).append('\"');
+        sb.append(",\"area5Id\":\"")
+                .append(area5Id).append('\"');
+        sb.append(",\"checkAddress\":\"")
                 .append(checkAddress).append('\"');
         sb.append(",\"checkDate\":\"")
                 .append(checkDate).append('\"');

src/main/java/com/cm/inspection/service/gridpersonnel/IGridPersonnelService.java

@@ -175,4 +175,12 @@ public interface IGridPersonnelService {
      */
     SuccessResultList<List<GridPersonnelDTO>> listPageGridPersonnelOfMine(ListPage page) throws SearchException;
 
+    /**
+     * 获取我的网格员身份
+     *
+     * @param token
+     * @return
+     * @throws SearchException
+     */
+    GridPersonnelDTO getGridPersonnelOfMine(String token) throws SearchException;
 }

src/main/java/com/cm/inspection/service/gridpersonnel/impl/GridPersonnelServiceImpl.java

@@ -8,6 +8,7 @@ import com.cm.common.pojo.ListPage;
 import com.cm.common.result.SuccessResult;
 import com.cm.common.result.SuccessResultData;
 import com.cm.common.result.SuccessResultList;
+import com.cm.common.token.app.AppTokenManager;
 import com.cm.common.utils.HashMapUtil;
 import com.cm.common.utils.UUIDUtil;
 import com.cm.inspection.dao.gridpersonnel.IGridPersonnelDao;
@@ -56,6 +57,10 @@ public class GridPersonnelServiceImpl extends BaseService implements IGridPerson
      * @throws Exception
      */
     private void saveGridPersonnelInfo(String token, GridPersonnelVO gridPersonnelVO) throws Exception {
+        GridPersonnelDTO gridPersonnelDTO = getGridPersonnelByUserId(gridPersonnelVO.getUserId());
+        if (gridPersonnelDTO != null) {
+            throw new SaveException("人员信息已经存在");
+        }
         Map<String, Object> params = HashMapUtil.beanToMap(gridPersonnelVO);
         params.put("gridPersonnelId", UUIDUtil.getUUID());
         if (token != null) {
@@ -244,4 +249,13 @@ public class GridPersonnelServiceImpl extends BaseService implements IGridPerson
         return listPageGridPersonnel(page);
     }
 
+    @Override
+    public GridPersonnelDTO getGridPersonnelOfMine(String token) throws SearchException {
+        GridPersonnelDTO gridPersonnelDTO = getGridPersonnelByUserId(AppTokenManager.getInstance().getToken(token).getUserId());
+        if (gridPersonnelDTO == null) {
+            gridPersonnelDTO = new GridPersonnelDTO();
+        }
+        return gridPersonnelDTO;
+    }
+
 }

src/main/java/com/cm/inspection/service/publicareareport/impl/PublicAreaReportServiceImpl.java

@@ -3,6 +3,7 @@ package com.cm.inspection.service.publicareareport.impl;
 import com.cm.common.exception.RemoveException;
 import com.cm.common.exception.SaveException;
 import com.cm.common.exception.SearchException;
+import com.cm.common.plugin.service.datadictionary.IDataDictionaryService;
 import com.cm.common.pojo.ListPage;
 import com.cm.common.result.SuccessResult;
 import com.cm.common.result.SuccessResultList;
@@ -14,7 +15,6 @@ import com.cm.inspection.pojo.dtos.gridpersonnel.GridPersonnelDTO;
 import com.cm.inspection.pojo.dtos.publicareareport.PublicAreaReportDTO;
 import com.cm.inspection.pojo.vos.publicareareport.PublicAreaReportVO;
 import com.cm.inspection.pojo.vos.publicleaderhandle.PublicLeaderHandleVO;
-import com.cm.inspection.pojo.vos.publiclog.PublicLogVO;
 import com.cm.inspection.service.BaseService;
 import com.cm.inspection.service.gridpersonnel.IGridPersonnelService;
 import com.cm.inspection.service.publicareareport.IPublicAreaReportService;
@@ -46,6 +46,9 @@ public class PublicAreaReportServiceImpl extends BaseService implements IPublicA
     private IPublicLogService publicLogService;
     @Autowired
     private IGridPersonnelService gridPersonnelService;
+    @Autowired
+    private IDataDictionaryService dataDictionaryService;
+
 
     @Override
     public SuccessResult savePublicAreaReport(PublicAreaReportVO publicAreaReportVO) throws Exception {
@@ -71,6 +74,7 @@ public class PublicAreaReportServiceImpl extends BaseService implements IPublicA
         publicAreaReportVO.setCheckUserName(userName);
         String publicAreaReportId = UUIDUtil.getUUID();
         Map<String, Object> params = HashMapUtil.beanToMap(publicAreaReportVO);
+        setAreaDictionaryName(params, publicAreaReportVO);
         params.put("publicAreaReportId", publicAreaReportId);
         if (token != null) {
             setSaveInfo(token, params);
@@ -103,7 +107,6 @@ public class PublicAreaReportServiceImpl extends BaseService implements IPublicA
         }
     }
 
-
     /**
      * 获取人员名称
      *
@@ -167,6 +170,7 @@ public class PublicAreaReportServiceImpl extends BaseService implements IPublicA
      */
     private void updatePublicAreaReportInfo(String token, String publicAreaReportId, PublicAreaReportVO publicAreaReportVO) throws Exception {
         Map<String, Object> params = HashMapUtil.beanToMap(publicAreaReportVO);
+        setAreaDictionaryName(params, publicAreaReportVO);
         params.put("publicAreaReportId", publicAreaReportId);
         if (token != null) {
             setUpdateInfo(token, params);
@@ -176,6 +180,40 @@ public class PublicAreaReportServiceImpl extends BaseService implements IPublicA
         publicAreaReportDao.updatePublicAreaReport(params);
     }
 
+    /**
+     * 设置区域
+     *
+     * @param params
+     * @param publicAreaReportVO
+     */
+    private void setAreaDictionaryName(Map<String, Object> params, PublicAreaReportVO publicAreaReportVO) {
+        String area1DictionaryName = null;
+        String area2DictionaryName = null;
+        String area3DictionaryName = null;
+        String area4DictionaryName = null;
+        String area5DictionaryName = null;
+        if (!StringUtils.isBlank(publicAreaReportVO.getArea1Id())) {
+            area1DictionaryName = dataDictionaryService.getDictionaryById(publicAreaReportVO.getArea1Id()).getDictionaryName();
+        }
+        if (!StringUtils.isBlank(publicAreaReportVO.getArea2Id())) {
+            area2DictionaryName = dataDictionaryService.getDictionaryById(publicAreaReportVO.getArea2Id()).getDictionaryName();
+        }
+        if (!StringUtils.isBlank(publicAreaReportVO.getArea3Id())) {
+            area3DictionaryName = dataDictionaryService.getDictionaryById(publicAreaReportVO.getArea3Id()).getDictionaryName();
+        }
+        if (!StringUtils.isBlank(publicAreaReportVO.getArea4Id())) {
+            area4DictionaryName = dataDictionaryService.getDictionaryById(publicAreaReportVO.getArea4Id()).getDictionaryName();
+        }
+        if (!StringUtils.isBlank(publicAreaReportVO.getArea5Id())) {
+            area5DictionaryName = dataDictionaryService.getDictionaryById(publicAreaReportVO.getArea5Id()).getDictionaryName();
+        }
+        params.put("area1DictionaryName", area1DictionaryName);
+        params.put("area2DictionaryName", area2DictionaryName);
+        params.put("area3DictionaryName", area3DictionaryName);
+        params.put("area4DictionaryName", area4DictionaryName);
+        params.put("area5DictionaryName", area5DictionaryName);
+    }
+
     @Override
     public PublicAreaReportDTO getPublicAreaReportById(String publicAreaReportId) throws SearchException {
         Map<String, Object> params = super.getHashMap(1);

src/main/resources/mybatis/mapper/publicareareport/publicareareport-mapper.xml

@@ -4,6 +4,16 @@
 
     <resultMap id="publicAreaReportDTO" type="com.cm.inspection.pojo.dtos.publicareareport.PublicAreaReportDTO">
         <id column="public_area_report_id" property="publicAreaReportId"/>
+        <result column="area1_id" property="area1Id"/>
+        <result column="area1_dictionary_name" property="area1DictionaryName"/>
+        <result column="area2_id" property="area2Id"/>
+        <result column="area2_dictionary_name" property="area2DictionaryName"/>
+        <result column="area3_id" property="area3Id"/>
+        <result column="area3_dictionary_name" property="area3DictionaryName"/>
+        <result column="area4_id" property="area4Id"/>
+        <result column="area4_dictionary_name" property="area4DictionaryName"/>
+        <result column="area5_id" property="area5Id"/>
+        <result column="area5_dictionary_name" property="area5DictionaryName"/>
         <result column="check_address" property="checkAddress"/>
         <result column="check_date" property="checkDate"/>
         <result column="check_content" property="checkContent"/>
@@ -18,6 +28,16 @@
     <insert id="savePublicAreaReport" parameterType="map">
         INSERT INTO gen_public_area_report(
             public_area_report_id,
+            area1_id,
+            area1_dictionary_name,
+            area2_id,
+            area2_dictionary_name,
+            area3_id,
+            area3_dictionary_name,
+            area4_id,
+            area4_dictionary_name,
+            area5_id,
+            area5_dictionary_name,
             check_address,
             check_date,
             check_content,
@@ -33,6 +53,16 @@
             is_delete
         ) VALUES(
             #{publicAreaReportId},
+            #{area1Id},
+            #{area1DictionaryName},
+            #{area2Id},
+            #{area2DictionaryName},
+            #{area3Id},
+            #{area3DictionaryName},
+            #{area4Id},
+            #{area4DictionaryName},
+            #{area5Id},
+            #{area5DictionaryName},
             #{checkAddress},
             #{checkDate},
             #{checkContent},
@@ -69,6 +99,36 @@
         UPDATE
             gen_public_area_report
         SET
+        <if test="area1Id != null">
+            area1_id = #{area1Id},
+        </if>
+        <if test="area1DictionaryName != null">
+            area1_dictionary_name = #{area1DictionaryName},
+        </if>
+        <if test="area2Id != null">
+            area2_id = #{area2Id},
+        </if>
+        <if test="area2DictionaryName != null">
+            area2_dictionary_name = #{area2DictionaryName},
+        </if>
+        <if test="area3Id != null">
+            area3_id = #{area3Id},
+        </if>
+        <if test="area3DictionaryName != null">
+            area3_dictionary_name = #{area3DictionaryName},
+        </if>
+        <if test="area4Id != null">
+            area4_id = #{area4Id},
+        </if>
+        <if test="area4DictionaryName != null">
+            area4_dictionary_name = #{area4DictionaryName},
+        </if>
+        <if test="area5Id != null">
+            area5_id = #{area5Id},
+        </if>
+        <if test="area5DictionaryName != null">
+            area5_dictionary_name = #{area5DictionaryName},
+        </if>
         <if test="checkAddress != null and checkAddress != ''">
             check_address = #{checkAddress},
         </if>
@@ -102,6 +162,16 @@
     <!-- 公共区域上报详情 -->
     <select id="getPublicAreaReport" parameterType="map" resultMap="publicAreaReportDTO">
         SELECT
+            t1.area1_id,
+            t1.area1_dictionary_name,
+            t1.area2_id,
+            t1.area2_dictionary_name,
+            t1.area3_id,
+            t1.area3_dictionary_name,
+            t1.area4_id,
+            t1.area4_dictionary_name,
+            t1.area5_id,
+            t1.area5_dictionary_name,
             t1.check_address,
             t1.check_date,
             t1.check_content,
@@ -123,6 +193,16 @@
     <!-- 公共区域上报列表 -->
     <select id="listPublicAreaReport" parameterType="map" resultMap="publicAreaReportDTO">
         SELECT
+            t1.area1_id,
+            t1.area1_dictionary_name,
+            t1.area2_id,
+            t1.area2_dictionary_name,
+            t1.area3_id,
+            t1.area3_dictionary_name,
+            t1.area4_id,
+            t1.area4_dictionary_name,
+            t1.area5_id,
+            t1.area5_dictionary_name,
             t1.check_address,
             t1.check_date,
             t1.check_content,

src/main/resources/static/assets/js/vendor/ckplayer/ckplayer/hls/LICENSE

@@ -0,0 +1,28 @@
+Copyright (c) 2017 Dailymotion (http://www.dailymotion.com)
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+src/remux/mp4-generator.js and src/demux/exp-golomb.js implementation in this project
+are derived from the HLS library for video.js (https://github.com/videojs/videojs-contrib-hls)
+
+That work is also covered by the Apache 2 License, following copyright:
+Copyright (c) 2013-2015 Brightcove
+
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

src/main/resources/static/assets/js/vendor/ckplayer/ckplayer/language.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+	<language>
+		<adCountdown>[$second]</adCountdown><!--广告播放结束倒计时-->
+		<skipDelay>[$second]</skipDelay>
+		<buttonOver>
+			<play>点击播放</play>
+			<pause>暂停播放</pause>
+			<mute>静音</mute>
+			<escMute>恢复音量</escMute>
+			<full>全屏</full>
+			<escFull>退出全屏</escFull>
+			<previousPage>上一集</previousPage>
+			<nextPage>下一集</nextPage>
+			<definition>点击选择清晰度</definition>
+			<subtitle>选择字幕</subtitle>
+		</buttonOver>
+		<volumeSliderOver>
+			音量：[$volume]%
+		</volumeSliderOver>
+		<buffer>[$percentage]%</buffer>
+		<timeSliderOver><!--鼠标经过进度条显示的时间格式-->
+			[$timeh]:[$timei]:[$times]
+		</timeSliderOver>
+		<liveAndVod>
+			[$timeh]:[$timei]:[$times]
+		</liveAndVod>
+		<live>
+			直播中 [$liveTimeY]-[$liveTimem]-[$liveTimed] [$liveTimeh]:[$liveTimei]:[$liveTimes]
+		</live>
+		<m3u8Definition>
+			<name>流畅</name>
+			<name>低清</name>
+			<name>标清</name>
+			<name>高清</name>
+			<name>超清</name>
+			<name>蓝光</name>
+			<name>未知</name>
+		</m3u8Definition>
+		<error>
+			<cannotFindUrl>视频地址不存在</cannotFindUrl>
+			<streamNotFound>加载失败</streamNotFound>
+			<formatError>视频格式错误</formatError>
+		</error>
+		<definition>自动</definition>
+		<subtitle>默认</subtitle>
+	</language>

src/main/resources/static/assets/js/vendor/ckplayer/material/en.srt

@@ -0,0 +1,16 @@
+1
+00:00:01,210 --> 00:00:10,400
+= subtitle effect = -
+Support multiple rows
+
+2
+00:00:11,210 --> 00:00:30,400
+Encoding requires UTF-8
+
+3
+00:00:31,210 --> 00:01:00,400
+The format is .Srt  or .vtt.
+
+4
+00:01:01,210 --> 00:01:55,400
+Thank you for your support for ckplayer

src/main/resources/static/assets/js/vendor/ckplayer/material/zh.vtt

@@ -0,0 +1,18 @@
+WEBVTT
+
+1
+00:00:01.210 --> 00:00:10.400
+-=字幕效果=-
+支持多行
+
+2
+00:00:11.210 --> 00:00:30.400
+编码需要使用UTF-8
+
+3
+00:00:31.210 --> 00:01:00.400
+格式是.srt或.vtt
+
+4
+00:01:01.210 --> 00:01:55.400
+感谢您对ckplayer的支持

src/main/resources/static/route/check/list-check.html

@@ -381,12 +381,19 @@
             var lng = this.dataset.lng;
             var lat = this.dataset.lat;
             if(lng && lat) {
+                top.dialog.dialogData.enterpriseCheckData = {
+                    enterpriseId: this.dataset.enterpriseId,
+                    enterpriseName: this.dataset.enterpriseName,
+                    photoArray: this.dataset.photoArray,
+                }
                 top.dialog.open({
                     url: top.restAjax.path('route/check/get-map-location.html?lng={lng}&lat={lat}', [lng, lat]),
                     title: '企业位置信息',
                     width: '80%',
                     height: '80%',
-                    onClose: function() {}
+                    onClose: function() {
+                        top.dialog.dialogData.enterpriseCheckData = null;
+                    }
                 });
             } else {
                 top.dialog.msg('暂无定位信息');

src/main/resources/static/route/check/list-inspect-mine.html

@@ -154,7 +154,7 @@
                             infoDiv += '<tr><td class="col-title">管理行业</td><td class="col-content">'+ (row.industryDictionaryName ? row.industryDictionaryName : '-') +'</td></tr>';
                             infoDiv += '<tr><td class="col-title">作业风险</td><td class="col-content">'+ (row.riskOperationDictionaryName ? row.riskOperationDictionaryName : '-') +'</td></tr>';
                             if(row.enterpriseLngByEnterpriseId && row.enterpriseLatByEnterpriseId) {
-                                infoDiv += '<tr><td colspan="2" class="col-content"><div class="col-content-div enterprise-location" title="'+ row.addressJoinByEnterpriseId +'" data-lng="'+ row.enterpriseLngByEnterpriseId +'" data-lat="'+ row.enterpriseLatByEnterpriseId +'"><i class="fa fa-map-marker"></i> '+ (row.addressJoinByEnterpriseId ? row.addressJoinByEnterpriseId : '查看企业定位') +'</div></td></tr>';
+                                infoDiv += '<tr><td colspan="2" class="col-content"><div class="col-content-div enterprise-location" title="'+ row.addressJoinByEnterpriseId +'" data-lng="'+ row.enterpriseLngByEnterpriseId +'" data-lat="'+ row.enterpriseLatByEnterpriseId +'" data-enterprise-name="'+ row.nameJoinByEnterpriseId +'" data-enterprise-id="'+ row.enterpriseId +'" data-enterprise-photos="'+ row.factoryGateByEnterpriseId +'"><i class="fa fa-map-marker"></i> '+ (row.addressJoinByEnterpriseId ? row.addressJoinByEnterpriseId : '查看企业定位') +'</div></td></tr>';
                             } else {
                                 infoDiv += '<tr><td colspan="2" class="col-content"><div class="col-content-div" title="'+ row.addressJoinByEnterpriseId +'">'+ (row.addressJoinByEnterpriseId ? row.addressJoinByEnterpriseId : '-') +'</div></td></tr>';
                             }
@@ -196,7 +196,7 @@
                             return infoDiv;
                         }
                     },
-                    {field:'col5', width: 120, title: '检查情况', align: 'center',
+                    {field:'col5', width: 160, title: '检查情况', align: 'center',
                         templet: function(row) {
                             var isCoordinationBtn = '<button type="button" class="layui-btn layui-btn-normal layui-btn-xs check-detail" data-checkid="'+ row.checkId +'" data-name="'+ row.nameJoinByEnterpriseId +'"><i class="fa fa-lg fa-search"></i> 检查项</button>';
                             if(row.isCoordination != 1) {
@@ -205,7 +205,7 @@
                             var infoDiv = '<table>';
                             infoDiv += '<tr><td class="col-content">'+ isCoordinationBtn +'</td></tr>';
                             if(row.checkLng && row.checkLat) {
-                                infoDiv += '<tr><td class="col-content-opition"><div class="col-content-div check-location" data-lng="'+ row.checkLng +'" data-lat="'+ row.checkLat +'"><i class="fa fa-map-marker"></i> 查看检查位置</div></td></tr>';
+                                infoDiv += '<tr><td class="col-content-opition"><div class="col-content-div check-location" data-lng="'+ row.checkLng +'" data-lat="'+ row.checkLat +'" data-enterprise-name="'+ row.nameJoinByEnterpriseId +'" data-enterprise-id="'+ row.enterpriseId +'" data-enterprise-photos="'+ row.factoryGateByEnterpriseId +'"><i class="fa fa-map-marker"></i> 查看检查位置</div></td></tr>';
                             }
                             infoDiv += '</table>';
                             return infoDiv;
@@ -265,8 +265,6 @@
         });
         // 执行检查
         function inspect(msg, checkId, type) {
-            console.log(checkId, type)
-            return;
             top.dialog.confirm(msg, function(index) {
                 top.dialog.close(index);
                 var loadLayerIndex;
@@ -303,7 +301,51 @@
                 onClose: function() {}
             });
         });
+        $(document).on('click', '.enterprise-location', function() {
+            var lng = this.dataset.lng;
+            var lat = this.dataset.lat;
+            if(lng && lat) {
+                top.dialog.dialogData.enterpriseCheckData = {
+                    enterpriseId: this.dataset.enterpriseId,
+                    enterpriseName: this.dataset.enterpriseName,
+                    photoArray: this.dataset.photoArray,
+                }
+                top.dialog.open({
+                    url: top.restAjax.path('route/check/get-map-location.html?lng={lng}&lat={lat}', [lng, lat]),
+                    title: '企业位置信息',
+                    width: '80%',
+                    height: '80%',
+                    onClose: function() {
+                        top.dialog.dialogData.enterpriseCheckData = null;
+                    }
+                });
+            } else {
+                top.dialog.msg('暂无定位信息');
+            }
+        });
 
+        $(document).on('click', '.check-location', function() {
+            var lng = this.dataset.lng;
+            var lat = this.dataset.lat;
+            if(lng && lat) {
+                top.dialog.dialogData.enterpriseCheckData = {
+                    enterpriseId: this.dataset.enterpriseId,
+                    enterpriseName: this.dataset.enterpriseName,
+                    photoArray: this.dataset.photoArray,
+                }
+                top.dialog.open({
+                    url: top.restAjax.path('route/check/get-map-location.html?lng={lng}&lat={lat}', [lng, lat]),
+                    title: '检查位置信息',
+                    width: '80%',
+                    height: '80%',
+                    onClose: function() {
+                        top.dialog.dialogData.enterpriseCheckData = null;
+                    }
+                });
+            } else {
+                top.dialog.msg('暂无检查定位信息');
+            }
+        });
     });
 </script>
 </body>

src/main/resources/static/route/enterprise/get-enterprise.html

@@ -442,6 +442,7 @@
                     selectObj['industry'] = selectValue;
                     form.val('dataForm', selectObj);
                 });
+                return;
             }
             top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/{industryType}', [industryType]), {}, null, function(code, data, args) {
                 initSelectRadioCheckboxTemplate('industrySelectTemplate', 'industrySelectTemplateBox', data, function() {

src/main/resources/static/route/enterprise/update-enterprise.html

@@ -464,6 +464,7 @@
                     selectObj['industry'] = selectValue;
                     form.val('dataForm', selectObj);
                 });
+                return;
             }
             top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/{industryType}', [industryType]), {}, null, function(code, data, args) {
                 initSelectRadioCheckboxTemplate('industrySelectTemplate', 'industrySelectTemplateBox', data, function() {

src/main/resources/static/route/publicareareport/get-map-location.html

@@ -0,0 +1,51 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <base href="/inspection/">
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
+    <link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+<div class="layui-anim layui-anim-fadein">
+    <div class="layui-card">
+        <div id="mapContainer" class="layui-card-body" style="padding: 15px;"></div>
+    </div>
+</div>
+<script type="text/javascript" src="http://api.map.baidu.com/api?v=3.0&ak=f6GW67DsG2Q8neoailgV7aGObleUGX1N"></script>
+<script src="assets/layuiadmin/layui/layui.js"></script>
+<script>
+    layui.config({
+        base: 'assets/layuiadmin/' //静态资源所在路径
+    }).extend({
+        index: 'lib/index' //主入口模块
+    }).use(['index', 'form', 'laydate', 'laytpl'], function(){
+        var $ = layui.$;
+        var $win = $(window);
+        $('#mapContainer').css('height', ($win.height() - 32) +'px');
+        var lng = top.restAjax.params(window.location.href).lng;
+        var lat = top.restAjax.params(window.location.href).lat;
+
+        var map = new BMap.Map('mapContainer');
+        map.enableScrollWheelZoom();
+        map.enableContinuousZoom();
+        map.addControl(new BMap.NavigationControl());
+        map.addControl(new BMap.ScaleControl());
+        map.addControl(new BMap.OverviewMapControl());
+        map.addControl(new BMap.MapTypeControl({
+            type: BMAP_MAPTYPE_CONTROL_HORIZONTAL,
+            mapTypes: [BMAP_NORMAL_MAP, BMAP_SATELLITE_MAP]
+        }));
+
+        var point = new BMap.Point(lng, lat);
+        map.centerAndZoom(point, 15);
+        var marker = new BMap.Marker(point);
+        map.addOverlay(marker);
+    });
+</script>
+</body>
+</html>

src/main/resources/static/route/publicareareport/list-publicareareport.html

@@ -11,6 +11,11 @@
     <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
     <link rel="stylesheet" href="assets/js/vendor/swiper3/css/swiper.min.css" media="all">
     <link rel="stylesheet" href="assets/css/list-css.css" media="all">
+    <style>
+        .col-area {width: 100px;}
+        .col-area-content {width: 100px; margin: 0 8px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;}
+        .col-area-address {width: 480px !important;}
+    </style>
 </head>
 <body>
 <div class="layui-fluid layui-anim layui-anim-fadein">
@@ -34,6 +39,7 @@
                     </div>
                     <table class="layui-hide" id="dataTable" lay-filter="dataTable"></table>
                     <!-- 表头按钮组 -->
+                    <!--
                     <script type="text/html" id="headerToolBar">
                         <div class="layui-btn-group">
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="saveEvent">
@@ -47,6 +53,7 @@
                             </button>
                         </div>
                     </script>
+                    -->
                 </div>
             </div>
         </div>
@@ -77,10 +84,10 @@
                 id: 'dataTable',
                 url: top.restAjax.path(tableUrl, []),
                 width: admin.screen() > 1 ? '100%' : '',
-                height: $win.height() - 90,
+                height: $win.height() - 60,
                 limit: 20,
                 limits: [20, 40, 60, 80, 100, 200],
-                toolbar: '#headerToolBar',
+                // toolbar: '#headerToolBar',
                 request: {
                     pageName: 'page',
                     limitName: 'rows'
@@ -126,11 +133,18 @@
                             return infoDiv;
                         }
                     },
-                    {field:'col2', width: 300, title: '检查企业', align: 'center',
+                    {field:'col2', width: 600, title: '检查区域', align: 'center',
                         templet: function(row) {
                             var infoDiv = '<table>';
-                            infoDiv += '<tr><td class="col-title">检查地址</td><td class="col-content"><div class="col-content-name check-location" title="'+ row.checkAddress +'" data-lng="'+ row.checkLng +'" data-lat="'+ row.checkLat +'"><i class="fa fa-map-marker"></i> '+ row.checkAddress +'</div></td></tr>';
-                            infoDiv += '<tr><td class="col-title">检查内容</td><td class="col-content"><div class="col-content-name" title="'+ row.checkContent +'">'+ row.checkContent +'</div></td></tr>';
+                            infoDiv += '<tr>' +
+                                '<td class="col-area"><div class="col-area-content">'+ (row.area1DictionaryName ? row.area1DictionaryName : '-') +'</div></td>' +
+                                '<td class="col-area"><div class="col-area-content">'+ (row.area2DictionaryName ? row.area2DictionaryName : '-') +'</div></td>' +
+                                '<td class="col-area"><div class="col-area-content">'+ (row.area3DictionaryName ? row.area3DictionaryName : '-') +'</div></td>' +
+                                '<td class="col-area"><div class="col-area-content">'+ (row.area4DictionaryName ? row.area4DictionaryName : '-') +'</div></td>' +
+                                '<td class="col-area"><div class="col-area-content">'+ (row.area5DictionaryName ? row.area5DictionaryName : '-') +'</div></td>' +
+                                '</tr>';
+                            infoDiv += '<tr><td class="col-title">检查地址</td><td class="col-content" colspan="4"><div class="col-content-name col-area-address check-location" title="'+ row.checkAddress +'" data-lng="'+ row.checkLng +'" data-lat="'+ row.checkLat +'"><i class="fa fa-map-marker"></i> '+ row.checkAddress +'</div></td></tr>';
+                            infoDiv += '<tr><td class="col-title">检查内容</td><td class="col-content" colspan="4"><div class="col-content-name" title="'+ row.checkContent +'">'+ row.checkContent +'</div></td></tr>';
                             infoDiv += '</table>';
                             return infoDiv;
                         }
@@ -164,7 +178,7 @@
                 page: {
                     curr: currentPage
                 },
-                height: $win.height() - 90,
+                height: $win.height() - 60,
             });
         }
         // 初始化日期
@@ -282,6 +296,15 @@
         $(document).on('click', '.check-location', function() {
             var checkLng = this.dataset.lng;
             var checkLat = this.dataset.lat;
+            top.dialog.open({
+                url: top.restAjax.path('route/publicareareport/get-map-location.html?lng={lng}&lat={lat}', [checkLng, checkLat]),
+                title: '检查位置信息',
+                width: '80%',
+                height: '80%',
+                onClose: function() {
+                    top.dialog.dialogData.enterpriseCheckData = null;
+                }
+            });
         });
     });
 </script>

src/main/resources/static/route/publiclog/get-publiclog.html

@@ -9,6 +9,7 @@
     <link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
     <link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
+    <link rel="stylesheet" type="text/css" href="assets/js/vendor/viewer/viewer.min.css">
     <style>
         .table-left-header {text-align: center; background-color: #f2f2f2;}
     </style>
@@ -82,6 +83,7 @@
         </div>
     </div>
 </div>
+<script src="assets/js/vendor/viewer/viewer.min.js"></script>
 <script src="assets/layuiadmin/layui/layui.js"></script>
 <script>
     layui.config({
@@ -100,10 +102,12 @@
 
         // 初始化内容
         function initData() {
+            var loadLayerIndex;
             top.restAjax.get(top.restAjax.path('api/publiclog/listpubliclogbypublicareareportid/{publicAreaReportId}', [publicAreaReportId]), {}, null, function(code, data) {
                 laytpl(document.getElementById('timelineTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('timelineTemplateBox').innerHTML = html;
                 });
+                new Viewer(document.getElementById('timelineTemplateBox'), {navbar: false});
             }, function(code, data) {
                 top.dialog.msg(data.msg);
             }, function() {