Merge remote-tracking branch 'origin/master'

gassafetyprogress-admin/pom.xml

@@ -61,6 +61,13 @@
             <artifactId>gassafetyprogress-generator</artifactId>
         </dependency>
 
+        <!--海康-->
+        <dependency>
+            <groupId>com.hikvision.ga</groupId>
+            <artifactId>artemis-http-client</artifactId>
+            <version>1.1.3</version>
+        </dependency>
+
     </dependencies>
 
     <build>

gassafetyprogress-admin/src/main/bin/startup.sh

@@ -41,7 +41,7 @@ JAVA_MEM_OPTS="-server -Xms2048M -Xmx2048M -Xmn1024M"
 echo -e "Starting the GassafetyProgressApplication ...\c"
 
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$DEPLOY_DIR/libs/linux_64
-nohup java -Dlog.path=$LOGS_DIR -Dapp.home=$DEPLOY_DIR $JAVA_OPTS $JAVA_MEM_OPTS $JAVA_DEBUG_OPTS $JAVA_JMX_OPTS -classpath $CONF_DIR:$LIB_JARS $APP_MAINCLASS >/dev/null 2>&1
+nohup java -Dlog.path=$LOGS_DIR -Dapp.home=$DEPLOY_DIR $JAVA_OPTS $JAVA_MEM_OPTS $JAVA_DEBUG_OPTS $JAVA_JMX_OPTS -classpath $CONF_DIR:$LIB_JARS $APP_MAINCLASS >/dev/null 2>&1 &
 sleep 1
 echo "started"
 PIDS=`ps -ef | grep java | grep "$DEPLOY_DIR" | awk '{print $2}'`

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/complainDeal/TComplainDealController.java

+package com.zehong.web.controller.complainDeal;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zehong.common.annotation.Log;
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.enums.BusinessType;
+import com.zehong.system.domain.TComplainDeal;
+import com.zehong.system.service.ITComplainDealService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 投诉处置Controller
+ * 
+ * @author zehong
+ * @date 2022-02-15
+ */
+@RestController
+@RequestMapping("/complainDeal")
+public class TComplainDealController extends BaseController
+{
+    @Autowired
+    private ITComplainDealService tComplainDealService;
+
+    /**
+     * 查询投诉处置列表
+     */
+    @PreAuthorize("@ss.hasPermi('complainDeal:complainDeal:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TComplainDeal tComplainDeal)
+    {
+        startPage();
+        List<TComplainDeal> list = tComplainDealService.selectTComplainDealList(tComplainDeal);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出投诉处置列表
+     */
+    @PreAuthorize("@ss.hasPermi('complainDeal:complainDeal:export')")
+    @Log(title = "投诉处置", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TComplainDeal tComplainDeal)
+    {
+        List<TComplainDeal> list = tComplainDealService.selectTComplainDealList(tComplainDeal);
+        ExcelUtil<TComplainDeal> util = new ExcelUtil<TComplainDeal>(TComplainDeal.class);
+        return util.exportExcel(list, "投诉处置数据");
+    }
+
+    /**
+     * 获取投诉处置详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('complainDeal:complainDeal:query')")
+    @GetMapping(value = "/{complainDealId}")
+    public AjaxResult getInfo(@PathVariable("complainDealId") Long complainDealId)
+    {
+        return AjaxResult.success(tComplainDealService.selectTComplainDealById(complainDealId));
+    }
+
+    /**
+     * 新增投诉处置
+     */
+    @PreAuthorize("@ss.hasPermi('complainDeal:complainDeal:add')")
+    @Log(title = "投诉处置", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TComplainDeal tComplainDeal)
+    {
+        return toAjax(tComplainDealService.insertTComplainDeal(tComplainDeal));
+    }
+
+    /**
+     * 修改投诉处置
+     */
+    @PreAuthorize("@ss.hasPermi('complainDeal:complainDeal:edit')")
+    @Log(title = "投诉处置", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TComplainDeal tComplainDeal)
+    {
+        return toAjax(tComplainDealService.updateTComplainDeal(tComplainDeal));
+    }
+
+    /**
+     * 删除投诉处置
+     */
+    @PreAuthorize("@ss.hasPermi('complainDeal:complainDeal:remove')")
+    @Log(title = "投诉处置", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{complainDealIds}")
+    public AjaxResult remove(@PathVariable Long[] complainDealIds)
+    {
+        return toAjax(tComplainDealService.deleteTComplainDealByIds(complainDealIds));
+    }
+}

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/operationMonitor/TDeviceReportDataController.java

+package com.zehong.web.controller.operationMonitor;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zehong.common.annotation.Log;
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.enums.BusinessType;
+import com.zehong.system.domain.TDeviceReportData;
+import com.zehong.system.service.ITDeviceReportDataService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 设备监控Controller
+ * 
+ * @author zehong
+ * @date 2022-02-16
+ */
+@RestController
+@RequestMapping("/system/data")
+public class TDeviceReportDataController extends BaseController
+{
+    @Autowired
+    private ITDeviceReportDataService tDeviceReportDataService;
+
+    /**
+     * 查询设备监控列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:data:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TDeviceReportData tDeviceReportData)
+    {
+        startPage();
+        List<TDeviceReportData> list = tDeviceReportDataService.selectTDeviceReportDataList(tDeviceReportData);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出设备监控列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:data:export')")
+    @Log(title = "设备监控", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TDeviceReportData tDeviceReportData)
+    {
+        List<TDeviceReportData> list = tDeviceReportDataService.selectTDeviceReportDataList(tDeviceReportData);
+        ExcelUtil<TDeviceReportData> util = new ExcelUtil<TDeviceReportData>(TDeviceReportData.class);
+        return util.exportExcel(list, "设备监控数据");
+    }
+
+    /**
+     * 获取设备监控详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:data:query')")
+    @GetMapping(value = "/{deviceReportDataId}")
+    public AjaxResult getInfo(@PathVariable("deviceReportDataId") Long deviceReportDataId)
+    {
+        return AjaxResult.success(tDeviceReportDataService.selectTDeviceReportDataById(deviceReportDataId));
+    }
+
+    /**
+     * 新增设备监控
+     */
+    @PreAuthorize("@ss.hasPermi('system:data:add')")
+    @Log(title = "设备监控", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TDeviceReportData tDeviceReportData)
+    {
+        return toAjax(tDeviceReportDataService.insertTDeviceReportData(tDeviceReportData));
+    }
+
+    /**
+     * 修改设备监控
+     */
+    @PreAuthorize("@ss.hasPermi('system:data:edit')")
+    @Log(title = "设备监控", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TDeviceReportData tDeviceReportData)
+    {
+        return toAjax(tDeviceReportDataService.updateTDeviceReportData(tDeviceReportData));
+    }
+
+    /**
+     * 删除设备监控
+     */
+    @PreAuthorize("@ss.hasPermi('system:data:remove')")
+    @Log(title = "设备监控", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{deviceReportDataIds}")
+    public AjaxResult remove(@PathVariable Long[] deviceReportDataIds)
+    {
+        return toAjax(tDeviceReportDataService.deleteTDeviceReportDataByIds(deviceReportDataIds));
+    }
+}

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/video/ArtemisController.java

+package com.zehong.web.controller.video;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hikvision.artemis.sdk.ArtemisHttpUtil;
+import com.hikvision.artemis.sdk.config.ArtemisConfig;
+import com.zehong.common.core.domain.AjaxResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 海康视频接口
+ */
+@RestController
+@RequestMapping("artemis")
+@Slf4j
+public class ArtemisController {
+
+    /**
+     * 请根据自己的appKey和appSecret更换static静态块中的三个参数. [1 host]
+     * 如果你选择的是和现场环境对接,host要修改为现场环境的ip,https端口默认为443，http端口默认为80.例如10.33.25.22:443 或者10.33.25.22:80
+     * appKey和appSecret请按照或得到的appKey和appSecret更改.
+     */
+    static {
+        // 代理API网关nginx服务器ip端口
+        ArtemisConfig.host = "222.223.203.154:1443";
+        // 秘钥appkey
+        ArtemisConfig.appKey = "24786595";
+        // 秘钥appSecret
+        ArtemisConfig.appSecret = "AxzrQTvNWvSVKjKbYGOn";
+    }
+    /**
+     * 能力开放平台的网站路径
+     */
+    private static final String ARTEMIS_PATH = "/artemis";
+
+    /**
+     * 获取监控点预览取流URL
+     */
+    private static final String GET_PREVIEWURLS = ARTEMIS_PATH + "/api/video/v1/cameras/previewURLs";
+
+    /**
+     * 分页获取监控点资源
+     */
+    private static final String GET_CAMERAS = ARTEMIS_PATH + "/api/resource/v1/cameras";
+
+    private static final String VEDIO_CONTROLLING = ARTEMIS_PATH + "/api/video/v1/ptzs/controlling";
+
+    /**
+     * 获取监控点预览取流URL
+     * @return
+     */
+    @GetMapping("/getPreviewURLs")
+    public Object getPreviewURLs(@RequestParam(value = "cameraIndexCode") String cameraIndexCode){
+        /**
+         * 根据API文档可以看出来，这是一个POST请求的Rest接口，而且传入的参数值为一个json
+         * ArtemisHttpUtil工具类提供了doPostStringArtemis这个函数，一共六个参数在文档里写明其中的意思，因为接口是https，
+         * 所以第一个参数path是一个hashmap类型，请put一个key-value，query为传入的参数，body为传入的json数据
+         * 传入的contentType为application/json，accept不指定为null
+         * header没有额外参数可不传,指定为null
+         *
+         */
+
+        Map<String, String> path = new HashMap<String, String>(2) {
+            {
+                //根据现场环境部署确认是http还是https
+                put("https://", GET_PREVIEWURLS);
+            }
+        };
+
+        JSONObject jsonBody = new JSONObject();
+
+        //jsonBody.put("cameraIndexCode", "2a9891a194c24747b277f3ea4836d433");
+        jsonBody.put("cameraIndexCode", cameraIndexCode);
+        jsonBody.put("streamType", 1);
+        jsonBody.put("protocol", "ws");
+        jsonBody.put("transmode", 1);
+        String body = jsonBody.toJSONString();
+        // post请求application/json类型参数
+        String result = ArtemisHttpUtil.doPostStringArtemis(path,body,null,null,"application/json",null);
+        return AjaxResult.success(JSONObject.parseObject(result));
+    }
+
+    /**
+     * 分页获取监控点资源
+     * @param pageNo    页码
+     * @param pageSize  每页条数
+     * @return
+     */
+    @GetMapping("/getCameras")
+    public Object getCameras(@RequestParam("pageNo") int pageNo, @RequestParam("pageSize") int pageSize){
+
+        Map<String, String> path = new HashMap<String, String>(2) {
+            {
+                //根据现场环境部署确认是http还是https
+                put("https://", GET_CAMERAS);
+            }
+        };
+
+        JSONObject jsonBody = new JSONObject();
+
+        jsonBody.put("pageNo", pageNo);
+        jsonBody.put("pageSize", pageSize);
+        jsonBody.put("treeCode", 0);
+        String body = jsonBody.toJSONString();
+        // post请求application/json类型参数
+        String result = ArtemisHttpUtil.doPostStringArtemis(path,body,null,null,"application/json",null);
+        return JSONObject.parseObject(result);
+    }
+
+    /**
+     * 云控操作
+     * @param cameraIndexCode
+     * @param command
+     * @param action
+     * @return
+     */
+    @RequestMapping("/videoControlling")
+    public Object videoControlling(@RequestParam("cameraIndexCode") String cameraIndexCode, @RequestParam("command") String command, @RequestParam("action") String action){
+        Map<String, String> path = new HashMap<String, String>(2) {
+            {
+                //根据现场环境部署确认是http还是https
+                put("https://", VEDIO_CONTROLLING);
+            }
+        };
+        JSONObject jsonBody = new JSONObject();
+
+        jsonBody.put("cameraIndexCode", cameraIndexCode);
+        jsonBody.put("action", action);
+        jsonBody.put("command", command);
+        jsonBody.put("speed", 40);
+        String body = jsonBody.toJSONString();
+        // post请求application/json类型参数
+        String result = ArtemisHttpUtil.doPostStringArtemis(path,body,null,null,"application/json",null);
+        return JSONObject.parseObject(result);
+    }
+}

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/video/TVideoManagerController.java

+package com.zehong.web.controller.video;
+
+import com.zehong.common.annotation.Log;
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.core.page.TableDataInfo;
+import com.zehong.common.enums.BusinessType;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.system.domain.TEnterpriseInfo;
+import com.zehong.system.domain.TVideoManager;
+import com.zehong.system.domain.vo.EnterpriseVideoTreeNode;
+import com.zehong.system.service.ITEnterpriseInfoService;
+import com.zehong.system.service.ITVideoManagerService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 视频管理Controller
+ * 
+ * @author zehong
+ * @date 2022-02-15
+ */
+@RestController
+@RequestMapping("/system/manager")
+public class TVideoManagerController extends BaseController
+{
+    @Autowired
+    private ITVideoManagerService tVideoManagerService;
+
+    @Autowired
+    private ITEnterpriseInfoService itEmployedPeopleInfoService;
+
+    /**
+     * 查询视频管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:manager:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TVideoManager tVideoManager)
+    {
+        startPage();
+        List<TVideoManager> list = tVideoManagerService.selectTVideoManagerList(tVideoManager);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出视频管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:manager:export')")
+    @Log(title = "视频管理", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TVideoManager tVideoManager)
+    {
+        List<TVideoManager> list = tVideoManagerService.selectTVideoManagerList(tVideoManager);
+        ExcelUtil<TVideoManager> util = new ExcelUtil<TVideoManager>(TVideoManager.class);
+        return util.exportExcel(list, "视频管理数据");
+    }
+
+    /**
+     * 获取视频tree
+     * @param tVideoManager
+     * @return
+     */
+    @GetMapping("/getVideoTree")
+    public AjaxResult getVideoTree(TVideoManager tVideoManager){
+
+        List<EnterpriseVideoTreeNode> enterpriseVideoList = new ArrayList<>();
+
+
+        //I级树
+        EnterpriseVideoTreeNode enterpriseVideoFirst = new EnterpriseVideoTreeNode();
+        List<EnterpriseVideoTreeNode> enterpriseVideoFirstChildrnList = new ArrayList<>();
+        enterpriseVideoFirst.setVideoName("企业监控");
+        enterpriseVideoFirst.setLevel("1");
+
+
+        List<TEnterpriseInfo> tEnterpriseInfos = itEmployedPeopleInfoService.selectTEnterpriseInfoList(new TEnterpriseInfo());
+        for(TEnterpriseInfo tEnterpriseInfo : tEnterpriseInfos){
+
+
+            //II级树
+            EnterpriseVideoTreeNode enterpriseVideoSecond= new EnterpriseVideoTreeNode();
+            List<EnterpriseVideoTreeNode> enterpriseVideoSecondChildrenList = new ArrayList<>();
+            enterpriseVideoSecond.setVideoName(tEnterpriseInfo.getEnterpriseName());
+            enterpriseVideoSecond.setLevel("2");
+
+
+            tVideoManager.setBeyondEnterpriseId(tEnterpriseInfo.getEnterpriseId());
+            List<TVideoManager> tVideoManagers = tVideoManagerService.selectTVideoManagerList(tVideoManager);
+            for(TVideoManager manager : tVideoManagers){
+                //III级树
+                EnterpriseVideoTreeNode enterpriseVideoThird= new EnterpriseVideoTreeNode();
+                enterpriseVideoThird.setVideoName(manager.getVideoName());
+                enterpriseVideoThird.setResourceId(manager.getResourceId());
+                enterpriseVideoThird.setLevel("3");
+                enterpriseVideoSecondChildrenList.add(enterpriseVideoThird);
+            }
+            enterpriseVideoSecond.setChildrenVideo(enterpriseVideoSecondChildrenList);
+            enterpriseVideoFirstChildrnList.add(enterpriseVideoSecond);
+        }
+        enterpriseVideoFirst.setChildrenVideo(enterpriseVideoFirstChildrnList);
+        enterpriseVideoList.add(enterpriseVideoFirst);
+        return AjaxResult.success(enterpriseVideoList);
+    }
+
+    /**
+     * 获取视频管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:manager:query')")
+    @GetMapping(value = "/{videoManagerId}")
+    public AjaxResult getInfo(@PathVariable("videoManagerId") Long videoManagerId)
+    {
+        return AjaxResult.success(tVideoManagerService.selectTVideoManagerById(videoManagerId));
+    }
+
+    /**
+     * 新增视频管理
+     */
+    @PreAuthorize("@ss.hasPermi('system:manager:add')")
+    @Log(title = "视频管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TVideoManager tVideoManager)
+    {
+        return toAjax(tVideoManagerService.insertTVideoManager(tVideoManager));
+    }
+
+    /**
+     * 修改视频管理
+     */
+    @PreAuthorize("@ss.hasPermi('system:manager:edit')")
+    @Log(title = "视频管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TVideoManager tVideoManager)
+    {
+        return toAjax(tVideoManagerService.updateTVideoManager(tVideoManager));
+    }
+
+    /**
+     * 删除视频管理
+     */
+    @PreAuthorize("@ss.hasPermi('system:manager:remove')")
+    @Log(title = "视频管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{videoManagerIds}")
+    public AjaxResult remove(@PathVariable Long[] videoManagerIds)
+    {
+        return toAjax(tVideoManagerService.deleteTVideoManagerByIds(videoManagerIds));
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TComplainDeal.java

+package com.zehong.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+
+/**
+ * 投诉处置对象 t_complain_deal
+ * 
+ * @author zehong
+ * @date 2022-02-15
+ */
+public class TComplainDeal extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 投诉处置id */
+    private Long complainDealId;
+
+    /** 投诉人姓名 */
+    @Excel(name = "投诉人姓名")
+    private String complainName;
+
+    /** 投诉人电话 */
+    @Excel(name = "投诉人电话")
+    private String complainPhone;
+
+    /** 投诉事项 */
+    @Excel(name = "投诉事项")
+    private String complainMatter;
+
+    /** 转办记录 */
+    @Excel(name = "转办记录")
+    private String transferRecord;
+
+    /** 办理情况 */
+    @Excel(name = "办理情况")
+    private String dealCondition;
+
+    /** 指派单位名称 */
+    @Excel(name = "指派单位名称")
+    private String complainAssignEnterproseName;
+
+    /** 指派单位id */
+    @Excel(name = "指派单位id")
+    private Long complainAssignEnterproseId;
+
+    /** 指派人 */
+    @Excel(name = "指派人")
+    private String complainAssignManId;
+
+    /** 指派人id */
+    @Excel(name = "指派人id")
+    private Long complainAssignMan;
+
+    /** 任务状态：1.派发中 2.反馈 3.归档 */
+    @Excel(name = "任务状态：1.派发中 2.反馈 3.归档")
+    private String complainStatus;
+
+    /** 是否删除(0正常，1删除) */
+    @Excel(name = "是否删除(0正常，1删除)")
+    private String isDel;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    public void setComplainDealId(Long complainDealId) 
+    {
+        this.complainDealId = complainDealId;
+    }
+
+    public Long getComplainDealId() 
+    {
+        return complainDealId;
+    }
+    public void setComplainName(String complainName) 
+    {
+        this.complainName = complainName;
+    }
+
+    public String getComplainName() 
+    {
+        return complainName;
+    }
+    public void setComplainPhone(String complainPhone) 
+    {
+        this.complainPhone = complainPhone;
+    }
+
+    public String getComplainPhone() 
+    {
+        return complainPhone;
+    }
+    public void setComplainMatter(String complainMatter) 
+    {
+        this.complainMatter = complainMatter;
+    }
+
+    public String getComplainMatter() 
+    {
+        return complainMatter;
+    }
+    public void setTransferRecord(String transferRecord) 
+    {
+        this.transferRecord = transferRecord;
+    }
+
+    public String getTransferRecord() 
+    {
+        return transferRecord;
+    }
+    public void setDealCondition(String dealCondition) 
+    {
+        this.dealCondition = dealCondition;
+    }
+
+    public String getDealCondition() 
+    {
+        return dealCondition;
+    }
+    public void setComplainAssignEnterproseName(String complainAssignEnterproseName) 
+    {
+        this.complainAssignEnterproseName = complainAssignEnterproseName;
+    }
+
+    public String getComplainAssignEnterproseName() 
+    {
+        return complainAssignEnterproseName;
+    }
+    public void setComplainAssignEnterproseId(Long complainAssignEnterproseId) 
+    {
+        this.complainAssignEnterproseId = complainAssignEnterproseId;
+    }
+
+    public Long getComplainAssignEnterproseId() 
+    {
+        return complainAssignEnterproseId;
+    }
+    public void setComplainAssignManId(String complainAssignManId) 
+    {
+        this.complainAssignManId = complainAssignManId;
+    }
+
+    public String getComplainAssignManId() 
+    {
+        return complainAssignManId;
+    }
+    public void setComplainAssignMan(Long complainAssignMan) 
+    {
+        this.complainAssignMan = complainAssignMan;
+    }
+
+    public Long getComplainAssignMan() 
+    {
+        return complainAssignMan;
+    }
+    public void setComplainStatus(String complainStatus) 
+    {
+        this.complainStatus = complainStatus;
+    }
+
+    public String getComplainStatus() 
+    {
+        return complainStatus;
+    }
+    public void setIsDel(String isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public String getIsDel() 
+    {
+        return isDel;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("complainDealId", getComplainDealId())
+            .append("complainName", getComplainName())
+            .append("complainPhone", getComplainPhone())
+            .append("complainMatter", getComplainMatter())
+            .append("transferRecord", getTransferRecord())
+            .append("dealCondition", getDealCondition())
+            .append("complainAssignEnterproseName", getComplainAssignEnterproseName())
+            .append("complainAssignEnterproseId", getComplainAssignEnterproseId())
+            .append("complainAssignManId", getComplainAssignManId())
+            .append("complainAssignMan", getComplainAssignMan())
+            .append("complainStatus", getComplainStatus())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("isDel", getIsDel())
+            .append("remarks", getRemarks())
+            .toString();
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TDeviceReportData.java

+package com.zehong.system.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+
+/**
+ * 设备监控对象 t_device_report_data
+ * 
+ * @author zehong
+ * @date 2022-02-16
+ */
+public class TDeviceReportData extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 设备上报id */
+    private Long deviceReportDataId;
+
+    /** 设备id（物联网编号） */
+    @Excel(name = "设备id", readConverterExp = "物=联网编号")
+    private String deviceNum;
+
+    /** 标况累计量 */
+    @Excel(name = "标况累计量")
+    private BigDecimal standardConditionAccumulation;
+
+    /** 工况累计量 */
+    @Excel(name = "工况累计量")
+    private BigDecimal workingConditionAccumulation;
+
+    /** 逆向标况累计量 */
+    @Excel(name = "逆向标况累计量")
+    private BigDecimal backingStandardConditionAccumulation;
+
+    /** 剩余量 */
+    @Excel(name = "剩余量")
+    private BigDecimal residualQuantity;
+
+    /** 标况流量 */
+    @Excel(name = "标况流量")
+    private BigDecimal standardConditionFlow;
+
+    /** 工况流量 */
+    @Excel(name = "工况流量")
+    private BigDecimal workingConditionFlow;
+
+    /** 温度 */
+    @Excel(name = "温度")
+    private BigDecimal temperature;
+
+    /** 压力 */
+    @Excel(name = "压力")
+    private BigDecimal pressure;
+
+    /** 上报时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "上报时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date reportTime;
+
+    /** 通讯状态 */
+    @Excel(name = "通讯状态")
+    private String communicationStatus;
+
+    /** 设备状态 */
+    @Excel(name = "设备状态")
+    private String deviceStatus;
+
+    /** 是否删除(0正常，1删除) */
+    @Excel(name = "是否删除(0正常，1删除)")
+    private String isDel;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    public void setDeviceReportDataId(Long deviceReportDataId) 
+    {
+        this.deviceReportDataId = deviceReportDataId;
+    }
+
+    public Long getDeviceReportDataId() 
+    {
+        return deviceReportDataId;
+    }
+    public void setDeviceNum(String deviceNum) 
+    {
+        this.deviceNum = deviceNum;
+    }
+
+    public String getDeviceNum() 
+    {
+        return deviceNum;
+    }
+    public void setStandardConditionAccumulation(BigDecimal standardConditionAccumulation) 
+    {
+        this.standardConditionAccumulation = standardConditionAccumulation;
+    }
+
+    public BigDecimal getStandardConditionAccumulation() 
+    {
+        return standardConditionAccumulation;
+    }
+    public void setWorkingConditionAccumulation(BigDecimal workingConditionAccumulation) 
+    {
+        this.workingConditionAccumulation = workingConditionAccumulation;
+    }
+
+    public BigDecimal getWorkingConditionAccumulation() 
+    {
+        return workingConditionAccumulation;
+    }
+    public void setBackingStandardConditionAccumulation(BigDecimal backingStandardConditionAccumulation) 
+    {
+        this.backingStandardConditionAccumulation = backingStandardConditionAccumulation;
+    }
+
+    public BigDecimal getBackingStandardConditionAccumulation() 
+    {
+        return backingStandardConditionAccumulation;
+    }
+    public void setResidualQuantity(BigDecimal residualQuantity) 
+    {
+        this.residualQuantity = residualQuantity;
+    }
+
+    public BigDecimal getResidualQuantity() 
+    {
+        return residualQuantity;
+    }
+    public void setStandardConditionFlow(BigDecimal standardConditionFlow) 
+    {
+        this.standardConditionFlow = standardConditionFlow;
+    }
+
+    public BigDecimal getStandardConditionFlow() 
+    {
+        return standardConditionFlow;
+    }
+    public void setWorkingConditionFlow(BigDecimal workingConditionFlow) 
+    {
+        this.workingConditionFlow = workingConditionFlow;
+    }
+
+    public BigDecimal getWorkingConditionFlow() 
+    {
+        return workingConditionFlow;
+    }
+    public void setTemperature(BigDecimal temperature) 
+    {
+        this.temperature = temperature;
+    }
+
+    public BigDecimal getTemperature() 
+    {
+        return temperature;
+    }
+    public void setPressure(BigDecimal pressure) 
+    {
+        this.pressure = pressure;
+    }
+
+    public BigDecimal getPressure() 
+    {
+        return pressure;
+    }
+    public void setReportTime(Date reportTime) 
+    {
+        this.reportTime = reportTime;
+    }
+
+    public Date getReportTime() 
+    {
+        return reportTime;
+    }
+    public void setCommunicationStatus(String communicationStatus) 
+    {
+        this.communicationStatus = communicationStatus;
+    }
+
+    public String getCommunicationStatus() 
+    {
+        return communicationStatus;
+    }
+    public void setDeviceStatus(String deviceStatus) 
+    {
+        this.deviceStatus = deviceStatus;
+    }
+
+    public String getDeviceStatus() 
+    {
+        return deviceStatus;
+    }
+    public void setIsDel(String isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public String getIsDel() 
+    {
+        return isDel;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("deviceReportDataId", getDeviceReportDataId())
+            .append("deviceNum", getDeviceNum())
+            .append("standardConditionAccumulation", getStandardConditionAccumulation())
+            .append("workingConditionAccumulation", getWorkingConditionAccumulation())
+            .append("backingStandardConditionAccumulation", getBackingStandardConditionAccumulation())
+            .append("residualQuantity", getResidualQuantity())
+            .append("standardConditionFlow", getStandardConditionFlow())
+            .append("workingConditionFlow", getWorkingConditionFlow())
+            .append("temperature", getTemperature())
+            .append("pressure", getPressure())
+            .append("reportTime", getReportTime())
+            .append("communicationStatus", getCommunicationStatus())
+            .append("deviceStatus", getDeviceStatus())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("isDel", getIsDel())
+            .append("remarks", getRemarks())
+            .toString();
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TTroubleStandingBook.java

@@ -47,6 +47,18 @@ public class TTroubleStandingBook extends BaseEntity
     @Excel(name = "事故原因")
     private String troubleReason;
 
+    /** 是否人员伤亡 */
+    @Excel(name = "是否人员伤亡")
+    private String isCasualties;
+
+    /** 受伤人数 */
+    @Excel(name = "受伤人数")
+    private int injuryNum;
+
+    /** 死亡人数 */
+    @Excel(name = "死亡人数")
+    private int deathNum;
+
     /** 责任单位 */
     @Excel(name = "责任单位")
     private String responsibleUnit;
@@ -148,6 +160,31 @@ public class TTroubleStandingBook extends BaseEntity
     {
         return troubleReason;
     }
+
+    public String getIsCasualties() {
+        return isCasualties;
+    }
+
+    public void setIsCasualties(String isCasualties) {
+        this.isCasualties = isCasualties;
+    }
+
+    public int getInjuryNum() {
+        return injuryNum;
+    }
+
+    public void setInjuryNum(int injuryNum) {
+        this.injuryNum = injuryNum;
+    }
+
+    public int getDeathNum() {
+        return deathNum;
+    }
+
+    public void setDeathNum(int deathNum) {
+        this.deathNum = deathNum;
+    }
+
     public void setResponsibleUnit(String responsibleUnit)
     {
         this.responsibleUnit = responsibleUnit;

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TVideoManager.java

+package com.zehong.system.domain;
+
+import java.math.BigDecimal;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+
+/**
+ * 视频管理对象 t_video_manager
+ * 
+ * @author zehong
+ * @date 2022-02-15
+ */
+public class TVideoManager extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 视频管理id */
+    private Long videoManagerId;
+
+    /** 视频名称 */
+    @Excel(name = "视频名称")
+    private String videoName;
+
+    /** 视频资源id */
+    @Excel(name = "视频资源id")
+    private String resourceId;
+
+    /** 经度 */
+    @Excel(name = "经度")
+    private BigDecimal longitude;
+
+    /** 纬度 */
+    @Excel(name = "纬度")
+    private BigDecimal latitude;
+
+    /** 视频地址 */
+    @Excel(name = "视频地址")
+    private String videoAddress;
+
+    /** 视频类型 */
+    @Excel(name = "视频类型")
+    private String type;
+
+    /** 所属企业 */
+    @Excel(name = "所属企业")
+    private Long beyondEnterpriseId;
+
+    /** 所属企业名称 */
+    @Excel(name = "所属企业名称")
+    private String beyondEnterpriseName;
+
+    /** 是否删除(0正常，1删除) */
+    @Excel(name = "是否删除(0正常，1删除)")
+    private String isDel;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    public void setVideoManagerId(Long videoManagerId) 
+    {
+        this.videoManagerId = videoManagerId;
+    }
+
+    public Long getVideoManagerId() 
+    {
+        return videoManagerId;
+    }
+    public void setVideoName(String videoName) 
+    {
+        this.videoName = videoName;
+    }
+
+    public String getVideoName() 
+    {
+        return videoName;
+    }
+    public void setResourceId(String resourceId) 
+    {
+        this.resourceId = resourceId;
+    }
+
+    public String getResourceId() 
+    {
+        return resourceId;
+    }
+    public void setLongitude(BigDecimal longitude) 
+    {
+        this.longitude = longitude;
+    }
+
+    public BigDecimal getLongitude() 
+    {
+        return longitude;
+    }
+    public void setLatitude(BigDecimal latitude) 
+    {
+        this.latitude = latitude;
+    }
+
+    public BigDecimal getLatitude() 
+    {
+        return latitude;
+    }
+    public void setVideoAddress(String videoAddress) 
+    {
+        this.videoAddress = videoAddress;
+    }
+
+    public String getVideoAddress() 
+    {
+        return videoAddress;
+    }
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+    public void setBeyondEnterpriseId(Long beyondEnterpriseId) 
+    {
+        this.beyondEnterpriseId = beyondEnterpriseId;
+    }
+
+    public Long getBeyondEnterpriseId() 
+    {
+        return beyondEnterpriseId;
+    }
+    public void setBeyondEnterpriseName(String beyondEnterpriseName) 
+    {
+        this.beyondEnterpriseName = beyondEnterpriseName;
+    }
+
+    public String getBeyondEnterpriseName() 
+    {
+        return beyondEnterpriseName;
+    }
+    public void setIsDel(String isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public String getIsDel() 
+    {
+        return isDel;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("videoManagerId", getVideoManagerId())
+            .append("videoName", getVideoName())
+            .append("resourceId", getResourceId())
+            .append("longitude", getLongitude())
+            .append("latitude", getLatitude())
+            .append("videoAddress", getVideoAddress())
+            .append("type", getType())
+            .append("beyondEnterpriseId", getBeyondEnterpriseId())
+            .append("beyondEnterpriseName", getBeyondEnterpriseName())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("isDel", getIsDel())
+            .append("remarks", getRemarks())
+            .toString();
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/domain/form/THiddenDangerStandingBookForm.java

@@ -21,6 +21,9 @@ public class THiddenDangerStandingBookForm
     /** 隐患类型 */
     private String hiddenType;
 
+    /** 整治情况 */
+    private String remediation;
+
     /** 发现起始时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date hiddenFindDateStart;

gassafetyprogress-system/src/main/java/com/zehong/system/domain/vo/EnterpriseVideoTreeNode.java

+package com.zehong.system.domain.vo;
+
+import com.zehong.system.domain.TEnterpriseInfo;
+import com.zehong.system.domain.TVideoManager;
+
+import java.util.List;
+
+/**
+ * 企业视频树
+ */
+public class EnterpriseVideoTreeNode {
+
+
+    /**视频名称*/
+    private String videoName;
+
+    /**视频资源号*/
+    private String resourceId;
+
+    //菜单级别
+    private String level;
+
+    private List<EnterpriseVideoTreeNode> childrenVideo;
+
+    public String getVideoName() {
+        return videoName;
+    }
+
+    public void setVideoName(String videoName) {
+        this.videoName = videoName;
+    }
+
+    public String getResourceId() {
+        return resourceId;
+    }
+
+    public void setResourceId(String resourceId) {
+        this.resourceId = resourceId;
+    }
+
+    public String getLevel() {
+        return level;
+    }
+
+    public void setLevel(String level) {
+        this.level = level;
+    }
+
+    public List<EnterpriseVideoTreeNode> getChildrenVideo() {
+        return childrenVideo;
+    }
+
+    public void setChildrenVideo(List<EnterpriseVideoTreeNode> childrenVideo) {
+        this.childrenVideo = childrenVideo;
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/mapper/TComplainDealMapper.java

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TComplainDeal;
+
+/**
+ * 投诉处置Mapper接口
+ * 
+ * @author zehong
+ * @date 2022-02-15
+ */
+public interface TComplainDealMapper 
+{
+    /**
+     * 查询投诉处置
+     * 
+     * @param complainDealId 投诉处置ID
+     * @return 投诉处置
+     */
+    public TComplainDeal selectTComplainDealById(Long complainDealId);
+
+    /**
+     * 查询投诉处置列表
+     * 
+     * @param tComplainDeal 投诉处置
+     * @return 投诉处置集合
+     */
+    public List<TComplainDeal> selectTComplainDealList(TComplainDeal tComplainDeal);
+
+    /**
+     * 新增投诉处置
+     * 
+     * @param tComplainDeal 投诉处置
+     * @return 结果
+     */
+    public int insertTComplainDeal(TComplainDeal tComplainDeal);
+
+    /**
+     * 修改投诉处置
+     * 
+     * @param tComplainDeal 投诉处置
+     * @return 结果
+     */
+    public int updateTComplainDeal(TComplainDeal tComplainDeal);
+
+    /**
+     * 删除投诉处置
+     * 
+     * @param complainDealId 投诉处置ID
+     * @return 结果
+     */
+    public int deleteTComplainDealById(Long complainDealId);
+
+    /**
+     * 批量删除投诉处置
+     * 
+     * @param complainDealIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTComplainDealByIds(Long[] complainDealIds);
+}

gassafetyprogress-system/src/main/java/com/zehong/system/mapper/TDeviceReportDataMapper.java

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TDeviceReportData;
+
+/**
+ * 设备监控Mapper接口
+ * 
+ * @author zehong
+ * @date 2022-02-16
+ */
+public interface TDeviceReportDataMapper 
+{
+    /**
+     * 查询设备监控
+     * 
+     * @param deviceReportDataId 设备监控ID
+     * @return 设备监控
+     */
+    public TDeviceReportData selectTDeviceReportDataById(Long deviceReportDataId);
+
+    /**
+     * 查询设备监控列表
+     * 
+     * @param tDeviceReportData 设备监控
+     * @return 设备监控集合
+     */
+    public List<TDeviceReportData> selectTDeviceReportDataList(TDeviceReportData tDeviceReportData);
+
+    /**
+     * 新增设备监控
+     * 
+     * @param tDeviceReportData 设备监控
+     * @return 结果
+     */
+    public int insertTDeviceReportData(TDeviceReportData tDeviceReportData);
+
+    /**
+     * 修改设备监控
+     * 
+     * @param tDeviceReportData 设备监控
+     * @return 结果
+     */
+    public int updateTDeviceReportData(TDeviceReportData tDeviceReportData);
+
+    /**
+     * 删除设备监控
+     * 
+     * @param deviceReportDataId 设备监控ID
+     * @return 结果
+     */
+    public int deleteTDeviceReportDataById(Long deviceReportDataId);
+
+    /**
+     * 批量删除设备监控
+     * 
+     * @param deviceReportDataIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTDeviceReportDataByIds(Long[] deviceReportDataIds);
+}

gassafetyprogress-system/src/main/java/com/zehong/system/mapper/TVideoManagerMapper.java

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TVideoManager;
+
+/**
+ * 视频管理Mapper接口
+ * 
+ * @author zehong
+ * @date 2022-02-15
+ */
+public interface TVideoManagerMapper 
+{
+    /**
+     * 查询视频管理
+     * 
+     * @param videoManagerId 视频管理ID
+     * @return 视频管理
+     */
+    public TVideoManager selectTVideoManagerById(Long videoManagerId);
+
+    /**
+     * 查询视频管理列表
+     * 
+     * @param tVideoManager 视频管理
+     * @return 视频管理集合
+     */
+    public List<TVideoManager> selectTVideoManagerList(TVideoManager tVideoManager);
+
+    /**
+     * 新增视频管理
+     * 
+     * @param tVideoManager 视频管理
+     * @return 结果
+     */
+    public int insertTVideoManager(TVideoManager tVideoManager);
+
+    /**
+     * 修改视频管理
+     * 
+     * @param tVideoManager 视频管理
+     * @return 结果
+     */
+    public int updateTVideoManager(TVideoManager tVideoManager);
+
+    /**
+     * 删除视频管理
+     * 
+     * @param videoManagerId 视频管理ID
+     * @return 结果
+     */
+    public int deleteTVideoManagerById(Long videoManagerId);
+
+    /**
+     * 批量删除视频管理
+     * 
+     * @param videoManagerIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTVideoManagerByIds(Long[] videoManagerIds);
+}

gassafetyprogress-system/src/main/java/com/zehong/system/service/ITComplainDealService.java

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TComplainDeal;
+
+/**
+ * 投诉处置Service接口
+ * 
+ * @author zehong
+ * @date 2022-02-15
+ */
+public interface ITComplainDealService 
+{
+    /**
+     * 查询投诉处置
+     * 
+     * @param complainDealId 投诉处置ID
+     * @return 投诉处置
+     */
+    public TComplainDeal selectTComplainDealById(Long complainDealId);
+
+    /**
+     * 查询投诉处置列表
+     * 
+     * @param tComplainDeal 投诉处置
+     * @return 投诉处置集合
+     */
+    public List<TComplainDeal> selectTComplainDealList(TComplainDeal tComplainDeal);
+
+    /**
+     * 新增投诉处置
+     * 
+     * @param tComplainDeal 投诉处置
+     * @return 结果
+     */
+    public int insertTComplainDeal(TComplainDeal tComplainDeal);
+
+    /**
+     * 修改投诉处置
+     * 
+     * @param tComplainDeal 投诉处置
+     * @return 结果
+     */
+    public int updateTComplainDeal(TComplainDeal tComplainDeal);
+
+    /**
+     * 批量删除投诉处置
+     * 
+     * @param complainDealIds 需要删除的投诉处置ID
+     * @return 结果
+     */
+    public int deleteTComplainDealByIds(Long[] complainDealIds);
+
+    /**
+     * 删除投诉处置信息
+     * 
+     * @param complainDealId 投诉处置ID
+     * @return 结果
+     */
+    public int deleteTComplainDealById(Long complainDealId);
+}

gassafetyprogress-system/src/main/java/com/zehong/system/service/ITDeviceReportDataService.java

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TDeviceReportData;
+
+/**
+ * 设备监控Service接口
+ * 
+ * @author zehong
+ * @date 2022-02-16
+ */
+public interface ITDeviceReportDataService 
+{
+    /**
+     * 查询设备监控
+     * 
+     * @param deviceReportDataId 设备监控ID
+     * @return 设备监控
+     */
+    public TDeviceReportData selectTDeviceReportDataById(Long deviceReportDataId);
+
+    /**
+     * 查询设备监控列表
+     * 
+     * @param tDeviceReportData 设备监控
+     * @return 设备监控集合
+     */
+    public List<TDeviceReportData> selectTDeviceReportDataList(TDeviceReportData tDeviceReportData);
+
+    /**
+     * 新增设备监控
+     * 
+     * @param tDeviceReportData 设备监控
+     * @return 结果
+     */
+    public int insertTDeviceReportData(TDeviceReportData tDeviceReportData);
+
+    /**
+     * 修改设备监控
+     * 
+     * @param tDeviceReportData 设备监控
+     * @return 结果
+     */
+    public int updateTDeviceReportData(TDeviceReportData tDeviceReportData);
+
+    /**
+     * 批量删除设备监控
+     * 
+     * @param deviceReportDataIds 需要删除的设备监控ID
+     * @return 结果
+     */
+    public int deleteTDeviceReportDataByIds(Long[] deviceReportDataIds);
+
+    /**
+     * 删除设备监控信息
+     * 
+     * @param deviceReportDataId 设备监控ID
+     * @return 结果
+     */
+    public int deleteTDeviceReportDataById(Long deviceReportDataId);
+}

gassafetyprogress-system/src/main/java/com/zehong/system/service/ITVideoManagerService.java

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TVideoManager;
+
+/**
+ * 视频管理Service接口
+ * 
+ * @author zehong
+ * @date 2022-02-15
+ */
+public interface ITVideoManagerService 
+{
+    /**
+     * 查询视频管理
+     * 
+     * @param videoManagerId 视频管理ID
+     * @return 视频管理
+     */
+    public TVideoManager selectTVideoManagerById(Long videoManagerId);
+
+    /**
+     * 查询视频管理列表
+     * 
+     * @param tVideoManager 视频管理
+     * @return 视频管理集合
+     */
+    public List<TVideoManager> selectTVideoManagerList(TVideoManager tVideoManager);
+
+    /**
+     * 新增视频管理
+     * 
+     * @param tVideoManager 视频管理
+     * @return 结果
+     */
+    public int insertTVideoManager(TVideoManager tVideoManager);
+
+    /**
+     * 修改视频管理
+     * 
+     * @param tVideoManager 视频管理
+     * @return 结果
+     */
+    public int updateTVideoManager(TVideoManager tVideoManager);
+
+    /**
+     * 批量删除视频管理
+     * 
+     * @param videoManagerIds 需要删除的视频管理ID
+     * @return 结果
+     */
+    public int deleteTVideoManagerByIds(Long[] videoManagerIds);
+
+    /**
+     * 删除视频管理信息
+     * 
+     * @param videoManagerId 视频管理ID
+     * @return 结果
+     */
+    public int deleteTVideoManagerById(Long videoManagerId);
+}

gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TComplainDealServiceImpl.java

+package com.zehong.system.service.impl;
+
+import java.util.List;
+import com.zehong.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TComplainDealMapper;
+import com.zehong.system.domain.TComplainDeal;
+import com.zehong.system.service.ITComplainDealService;
+
+/**
+ * 投诉处置Service业务层处理
+ * 
+ * @author zehong
+ * @date 2022-02-15
+ */
+@Service
+public class TComplainDealServiceImpl implements ITComplainDealService 
+{
+    @Autowired
+    private TComplainDealMapper tComplainDealMapper;
+
+    /**
+     * 查询投诉处置
+     * 
+     * @param complainDealId 投诉处置ID
+     * @return 投诉处置
+     */
+    @Override
+    public TComplainDeal selectTComplainDealById(Long complainDealId)
+    {
+        return tComplainDealMapper.selectTComplainDealById(complainDealId);
+    }
+
+    /**
+     * 查询投诉处置列表
+     * 
+     * @param tComplainDeal 投诉处置
+     * @return 投诉处置
+     */
+    @Override
+    public List<TComplainDeal> selectTComplainDealList(TComplainDeal tComplainDeal)
+    {
+        return tComplainDealMapper.selectTComplainDealList(tComplainDeal);
+    }
+
+    /**
+     * 新增投诉处置
+     * 
+     * @param tComplainDeal 投诉处置
+     * @return 结果
+     */
+    @Override
+    public int insertTComplainDeal(TComplainDeal tComplainDeal)
+    {
+        tComplainDeal.setCreateTime(DateUtils.getNowDate());
+        return tComplainDealMapper.insertTComplainDeal(tComplainDeal);
+    }
+
+    /**
+     * 修改投诉处置
+     * 
+     * @param tComplainDeal 投诉处置
+     * @return 结果
+     */
+    @Override
+    public int updateTComplainDeal(TComplainDeal tComplainDeal)
+    {
+        tComplainDeal.setUpdateTime(DateUtils.getNowDate());
+        return tComplainDealMapper.updateTComplainDeal(tComplainDeal);
+    }
+
+    /**
+     * 批量删除投诉处置
+     * 
+     * @param complainDealIds 需要删除的投诉处置ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTComplainDealByIds(Long[] complainDealIds)
+    {
+        return tComplainDealMapper.deleteTComplainDealByIds(complainDealIds);
+    }
+
+    /**
+     * 删除投诉处置信息
+     * 
+     * @param complainDealId 投诉处置ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTComplainDealById(Long complainDealId)
+    {
+        return tComplainDealMapper.deleteTComplainDealById(complainDealId);
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TDeviceReportDataServiceImpl.java

+package com.zehong.system.service.impl;
+
+import java.util.List;
+import com.zehong.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TDeviceReportDataMapper;
+import com.zehong.system.domain.TDeviceReportData;
+import com.zehong.system.service.ITDeviceReportDataService;
+
+/**
+ * 设备监控Service业务层处理
+ * 
+ * @author zehong
+ * @date 2022-02-16
+ */
+@Service
+public class TDeviceReportDataServiceImpl implements ITDeviceReportDataService 
+{
+    @Autowired
+    private TDeviceReportDataMapper tDeviceReportDataMapper;
+
+    /**
+     * 查询设备监控
+     * 
+     * @param deviceReportDataId 设备监控ID
+     * @return 设备监控
+     */
+    @Override
+    public TDeviceReportData selectTDeviceReportDataById(Long deviceReportDataId)
+    {
+        return tDeviceReportDataMapper.selectTDeviceReportDataById(deviceReportDataId);
+    }
+
+    /**
+     * 查询设备监控列表
+     * 
+     * @param tDeviceReportData 设备监控
+     * @return 设备监控
+     */
+    @Override
+    public List<TDeviceReportData> selectTDeviceReportDataList(TDeviceReportData tDeviceReportData)
+    {
+        return tDeviceReportDataMapper.selectTDeviceReportDataList(tDeviceReportData);
+    }
+
+    /**
+     * 新增设备监控
+     * 
+     * @param tDeviceReportData 设备监控
+     * @return 结果
+     */
+    @Override
+    public int insertTDeviceReportData(TDeviceReportData tDeviceReportData)
+    {
+        tDeviceReportData.setCreateTime(DateUtils.getNowDate());
+        return tDeviceReportDataMapper.insertTDeviceReportData(tDeviceReportData);
+    }
+
+    /**
+     * 修改设备监控
+     * 
+     * @param tDeviceReportData 设备监控
+     * @return 结果
+     */
+    @Override
+    public int updateTDeviceReportData(TDeviceReportData tDeviceReportData)
+    {
+        tDeviceReportData.setUpdateTime(DateUtils.getNowDate());
+        return tDeviceReportDataMapper.updateTDeviceReportData(tDeviceReportData);
+    }
+
+    /**
+     * 批量删除设备监控
+     * 
+     * @param deviceReportDataIds 需要删除的设备监控ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTDeviceReportDataByIds(Long[] deviceReportDataIds)
+    {
+        return tDeviceReportDataMapper.deleteTDeviceReportDataByIds(deviceReportDataIds);
+    }
+
+    /**
+     * 删除设备监控信息
+     * 
+     * @param deviceReportDataId 设备监控ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTDeviceReportDataById(Long deviceReportDataId)
+    {
+        return tDeviceReportDataMapper.deleteTDeviceReportDataById(deviceReportDataId);
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TTroubleStandingBookServiceImpl.java

@@ -67,6 +67,11 @@ public class TTroubleStandingBookServiceImpl implements ITTroubleStandingBookSer
     @Override
     public int updateTTroubleStandingBook(TTroubleStandingBook tTroubleStandingBook)
     {
+        // 是否人员伤亡：2否，受伤人数和死亡人数改为0
+        if(tTroubleStandingBook.getIsCasualties().equals("2")){
+            tTroubleStandingBook.setInjuryNum(0);
+            tTroubleStandingBook.setDeathNum(0);
+        }
         tTroubleStandingBook.setUpdateTime(DateUtils.getNowDate());
         return tTroubleStandingBookMapper.updateTTroubleStandingBook(tTroubleStandingBook);
     }

gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TVideoManagerServiceImpl.java

+package com.zehong.system.service.impl;
+
+import java.util.List;
+import com.zehong.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TVideoManagerMapper;
+import com.zehong.system.domain.TVideoManager;
+import com.zehong.system.service.ITVideoManagerService;
+
+/**
+ * 视频管理Service业务层处理
+ * 
+ * @author zehong
+ * @date 2022-02-15
+ */
+@Service
+public class TVideoManagerServiceImpl implements ITVideoManagerService 
+{
+    @Autowired
+    private TVideoManagerMapper tVideoManagerMapper;
+
+    /**
+     * 查询视频管理
+     * 
+     * @param videoManagerId 视频管理ID
+     * @return 视频管理
+     */
+    @Override
+    public TVideoManager selectTVideoManagerById(Long videoManagerId)
+    {
+        return tVideoManagerMapper.selectTVideoManagerById(videoManagerId);
+    }
+
+    /**
+     * 查询视频管理列表
+     * 
+     * @param tVideoManager 视频管理
+     * @return 视频管理
+     */
+    @Override
+    public List<TVideoManager> selectTVideoManagerList(TVideoManager tVideoManager)
+    {
+        return tVideoManagerMapper.selectTVideoManagerList(tVideoManager);
+    }
+
+    /**
+     * 新增视频管理
+     * 
+     * @param tVideoManager 视频管理
+     * @return 结果
+     */
+    @Override
+    public int insertTVideoManager(TVideoManager tVideoManager)
+    {
+        tVideoManager.setCreateTime(DateUtils.getNowDate());
+        return tVideoManagerMapper.insertTVideoManager(tVideoManager);
+    }
+
+    /**
+     * 修改视频管理
+     * 
+     * @param tVideoManager 视频管理
+     * @return 结果
+     */
+    @Override
+    public int updateTVideoManager(TVideoManager tVideoManager)
+    {
+        tVideoManager.setUpdateTime(DateUtils.getNowDate());
+        return tVideoManagerMapper.updateTVideoManager(tVideoManager);
+    }
+
+    /**
+     * 批量删除视频管理
+     * 
+     * @param videoManagerIds 需要删除的视频管理ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTVideoManagerByIds(Long[] videoManagerIds)
+    {
+        return tVideoManagerMapper.deleteTVideoManagerByIds(videoManagerIds);
+    }
+
+    /**
+     * 删除视频管理信息
+     * 
+     * @param videoManagerId 视频管理ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTVideoManagerById(Long videoManagerId)
+    {
+        return tVideoManagerMapper.deleteTVideoManagerById(videoManagerId);
+    }
+}

gassafetyprogress-system/src/main/resources/mapper/system/TComplainDealMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zehong.system.mapper.TComplainDealMapper">
+    
+    <resultMap type="TComplainDeal" id="TComplainDealResult">
+        <result property="complainDealId"    column="complain_deal_id"    />
+        <result property="complainName"    column="complain_name"    />
+        <result property="complainPhone"    column="complain_phone"    />
+        <result property="complainMatter"    column="complain_matter"    />
+        <result property="transferRecord"    column="transfer_record"    />
+        <result property="dealCondition"    column="deal_condition"    />
+        <result property="complainAssignEnterproseName"    column="complain_assign_enterprose_name"    />
+        <result property="complainAssignEnterproseId"    column="complain_assign_enterprose_id"    />
+        <result property="complainAssignManId"    column="complain_assign_man_id"    />
+        <result property="complainAssignMan"    column="complain_assign_man"    />
+        <result property="complainStatus"    column="complain_status"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="remarks"    column="remarks"    />
+    </resultMap>
+
+    <sql id="selectTComplainDealVo">
+        select complain_deal_id, complain_name, complain_phone, complain_matter, transfer_record, deal_condition, complain_assign_enterprose_name, complain_assign_enterprose_id, complain_assign_man_id, complain_assign_man, complain_status, create_by, create_time, update_by, update_time, is_del, remarks from t_complain_deal
+    </sql>
+
+    <select id="selectTComplainDealList" parameterType="TComplainDeal" resultMap="TComplainDealResult">
+        <include refid="selectTComplainDealVo"/>
+        <where>  
+            <if test="complainName != null  and complainName != ''"> and complain_name like concat('%', #{complainName}, '%')</if>
+            <if test="complainPhone != null  and complainPhone != ''"> and complain_phone = #{complainPhone}</if>
+            <if test="complainMatter != null  and complainMatter != ''"> and complain_matter = #{complainMatter}</if>
+            <if test="transferRecord != null  and transferRecord != ''"> and transfer_record = #{transferRecord}</if>
+            <if test="dealCondition != null  and dealCondition != ''"> and deal_condition = #{dealCondition}</if>
+            <if test="complainAssignEnterproseName != null  and complainAssignEnterproseName != ''"> and complain_assign_enterprose_name like concat('%', #{complainAssignEnterproseName}, '%')</if>
+            <if test="complainAssignEnterproseId != null "> and complain_assign_enterprose_id = #{complainAssignEnterproseId}</if>
+            <if test="complainAssignManId != null  and complainAssignManId != ''"> and complain_assign_man_id = #{complainAssignManId}</if>
+            <if test="complainAssignMan != null "> and complain_assign_man = #{complainAssignMan}</if>
+            <if test="complainStatus != null  and complainStatus != ''"> and complain_status = #{complainStatus}</if>
+            <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+        </where>
+    </select>
+    
+    <select id="selectTComplainDealById" parameterType="Long" resultMap="TComplainDealResult">
+        <include refid="selectTComplainDealVo"/>
+        where complain_deal_id = #{complainDealId}
+    </select>
+        
+    <insert id="insertTComplainDeal" parameterType="TComplainDeal" useGeneratedKeys="true" keyProperty="complainDealId">
+        insert into t_complain_deal
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="complainName != null">complain_name,</if>
+            <if test="complainPhone != null">complain_phone,</if>
+            <if test="complainMatter != null">complain_matter,</if>
+            <if test="transferRecord != null">transfer_record,</if>
+            <if test="dealCondition != null">deal_condition,</if>
+            <if test="complainAssignEnterproseName != null">complain_assign_enterprose_name,</if>
+            <if test="complainAssignEnterproseId != null">complain_assign_enterprose_id,</if>
+            <if test="complainAssignManId != null">complain_assign_man_id,</if>
+            <if test="complainAssignMan != null">complain_assign_man,</if>
+            <if test="complainStatus != null">complain_status,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="remarks != null">remarks,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="complainName != null">#{complainName},</if>
+            <if test="complainPhone != null">#{complainPhone},</if>
+            <if test="complainMatter != null">#{complainMatter},</if>
+            <if test="transferRecord != null">#{transferRecord},</if>
+            <if test="dealCondition != null">#{dealCondition},</if>
+            <if test="complainAssignEnterproseName != null">#{complainAssignEnterproseName},</if>
+            <if test="complainAssignEnterproseId != null">#{complainAssignEnterproseId},</if>
+            <if test="complainAssignManId != null">#{complainAssignManId},</if>
+            <if test="complainAssignMan != null">#{complainAssignMan},</if>
+            <if test="complainStatus != null">#{complainStatus},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="remarks != null">#{remarks},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTComplainDeal" parameterType="TComplainDeal">
+        update t_complain_deal
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="complainName != null">complain_name = #{complainName},</if>
+            <if test="complainPhone != null">complain_phone = #{complainPhone},</if>
+            <if test="complainMatter != null">complain_matter = #{complainMatter},</if>
+            <if test="transferRecord != null">transfer_record = #{transferRecord},</if>
+            <if test="dealCondition != null">deal_condition = #{dealCondition},</if>
+            <if test="complainAssignEnterproseName != null">complain_assign_enterprose_name = #{complainAssignEnterproseName},</if>
+            <if test="complainAssignEnterproseId != null">complain_assign_enterprose_id = #{complainAssignEnterproseId},</if>
+            <if test="complainAssignManId != null">complain_assign_man_id = #{complainAssignManId},</if>
+            <if test="complainAssignMan != null">complain_assign_man = #{complainAssignMan},</if>
+            <if test="complainStatus != null">complain_status = #{complainStatus},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where complain_deal_id = #{complainDealId}
+    </update>
+
+    <delete id="deleteTComplainDealById" parameterType="Long">
+        delete from t_complain_deal where complain_deal_id = #{complainDealId}
+    </delete>
+
+    <delete id="deleteTComplainDealByIds" parameterType="String">
+        delete from t_complain_deal where complain_deal_id in 
+        <foreach item="complainDealId" collection="array" open="(" separator="," close=")">
+            #{complainDealId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

gassafetyprogress-system/src/main/resources/mapper/system/TDeviceReportDataMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zehong.system.mapper.TDeviceReportDataMapper">
+    
+    <resultMap type="TDeviceReportData" id="TDeviceReportDataResult">
+        <result property="deviceReportDataId"    column="device_report_data_id"    />
+        <result property="deviceNum"    column="device_num"    />
+        <result property="standardConditionAccumulation"    column="standard_condition_accumulation"    />
+        <result property="workingConditionAccumulation"    column="working_condition_accumulation"    />
+        <result property="backingStandardConditionAccumulation"    column="backing_standard_condition_accumulation"    />
+        <result property="residualQuantity"    column="residual_quantity"    />
+        <result property="standardConditionFlow"    column="standard_condition_flow"    />
+        <result property="workingConditionFlow"    column="working_condition_flow"    />
+        <result property="temperature"    column="temperature"    />
+        <result property="pressure"    column="pressure"    />
+        <result property="reportTime"    column="report_time"    />
+        <result property="communicationStatus"    column="communication_status"    />
+        <result property="deviceStatus"    column="device_status"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="remarks"    column="remarks"    />
+    </resultMap>
+
+    <sql id="selectTDeviceReportDataVo">
+        select device_report_data_id, device_num, standard_condition_accumulation, working_condition_accumulation, backing_standard_condition_accumulation, residual_quantity, standard_condition_flow, working_condition_flow, temperature, pressure, report_time, communication_status, device_status, create_by, create_time, update_by, update_time, is_del, remarks from t_device_report_data
+    </sql>
+
+    <select id="selectTDeviceReportDataList" parameterType="TDeviceReportData" resultMap="TDeviceReportDataResult">
+        <include refid="selectTDeviceReportDataVo"/>
+        <where>  
+            <if test="deviceNum != null  and deviceNum != ''"> and device_num = #{deviceNum}</if>
+            <if test="standardConditionAccumulation != null "> and standard_condition_accumulation = #{standardConditionAccumulation}</if>
+            <if test="workingConditionAccumulation != null "> and working_condition_accumulation = #{workingConditionAccumulation}</if>
+            <if test="backingStandardConditionAccumulation != null "> and backing_standard_condition_accumulation = #{backingStandardConditionAccumulation}</if>
+            <if test="residualQuantity != null "> and residual_quantity = #{residualQuantity}</if>
+            <if test="standardConditionFlow != null "> and standard_condition_flow = #{standardConditionFlow}</if>
+            <if test="workingConditionFlow != null "> and working_condition_flow = #{workingConditionFlow}</if>
+            <if test="temperature != null "> and temperature = #{temperature}</if>
+            <if test="pressure != null "> and pressure = #{pressure}</if>
+            <if test="reportTime != null "> and report_time = #{reportTime}</if>
+            <if test="communicationStatus != null  and communicationStatus != ''"> and communication_status = #{communicationStatus}</if>
+            <if test="deviceStatus != null  and deviceStatus != ''"> and device_status = #{deviceStatus}</if>
+            <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+        </where>
+    </select>
+    
+    <select id="selectTDeviceReportDataById" parameterType="Long" resultMap="TDeviceReportDataResult">
+        <include refid="selectTDeviceReportDataVo"/>
+        where device_report_data_id = #{deviceReportDataId}
+    </select>
+        
+    <insert id="insertTDeviceReportData" parameterType="TDeviceReportData" useGeneratedKeys="true" keyProperty="deviceReportDataId">
+        insert into t_device_report_data
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="deviceNum != null and deviceNum != ''">device_num,</if>
+            <if test="standardConditionAccumulation != null">standard_condition_accumulation,</if>
+            <if test="workingConditionAccumulation != null">working_condition_accumulation,</if>
+            <if test="backingStandardConditionAccumulation != null">backing_standard_condition_accumulation,</if>
+            <if test="residualQuantity != null">residual_quantity,</if>
+            <if test="standardConditionFlow != null">standard_condition_flow,</if>
+            <if test="workingConditionFlow != null">working_condition_flow,</if>
+            <if test="temperature != null">temperature,</if>
+            <if test="pressure != null">pressure,</if>
+            <if test="reportTime != null">report_time,</if>
+            <if test="communicationStatus != null">communication_status,</if>
+            <if test="deviceStatus != null">device_status,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="remarks != null">remarks,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="deviceNum != null and deviceNum != ''">#{deviceNum},</if>
+            <if test="standardConditionAccumulation != null">#{standardConditionAccumulation},</if>
+            <if test="workingConditionAccumulation != null">#{workingConditionAccumulation},</if>
+            <if test="backingStandardConditionAccumulation != null">#{backingStandardConditionAccumulation},</if>
+            <if test="residualQuantity != null">#{residualQuantity},</if>
+            <if test="standardConditionFlow != null">#{standardConditionFlow},</if>
+            <if test="workingConditionFlow != null">#{workingConditionFlow},</if>
+            <if test="temperature != null">#{temperature},</if>
+            <if test="pressure != null">#{pressure},</if>
+            <if test="reportTime != null">#{reportTime},</if>
+            <if test="communicationStatus != null">#{communicationStatus},</if>
+            <if test="deviceStatus != null">#{deviceStatus},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="remarks != null">#{remarks},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTDeviceReportData" parameterType="TDeviceReportData">
+        update t_device_report_data
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="deviceNum != null and deviceNum != ''">device_num = #{deviceNum},</if>
+            <if test="standardConditionAccumulation != null">standard_condition_accumulation = #{standardConditionAccumulation},</if>
+            <if test="workingConditionAccumulation != null">working_condition_accumulation = #{workingConditionAccumulation},</if>
+            <if test="backingStandardConditionAccumulation != null">backing_standard_condition_accumulation = #{backingStandardConditionAccumulation},</if>
+            <if test="residualQuantity != null">residual_quantity = #{residualQuantity},</if>
+            <if test="standardConditionFlow != null">standard_condition_flow = #{standardConditionFlow},</if>
+            <if test="workingConditionFlow != null">working_condition_flow = #{workingConditionFlow},</if>
+            <if test="temperature != null">temperature = #{temperature},</if>
+            <if test="pressure != null">pressure = #{pressure},</if>
+            <if test="reportTime != null">report_time = #{reportTime},</if>
+            <if test="communicationStatus != null">communication_status = #{communicationStatus},</if>
+            <if test="deviceStatus != null">device_status = #{deviceStatus},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where device_report_data_id = #{deviceReportDataId}
+    </update>
+
+    <delete id="deleteTDeviceReportDataById" parameterType="Long">
+        delete from t_device_report_data where device_report_data_id = #{deviceReportDataId}
+    </delete>
+
+    <delete id="deleteTDeviceReportDataByIds" parameterType="String">
+        delete from t_device_report_data where device_report_data_id in 
+        <foreach item="deviceReportDataId" collection="array" open="(" separator="," close=")">
+            #{deviceReportDataId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

gassafetyprogress-system/src/main/resources/mapper/system/THiddenDangerStandingBookMapper.xml

@@ -34,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  is_del = '0'
             <if test="hiddenTitle != null  and hiddenTitle != ''"> and hidden_title like concat('%', #{hiddenTitle}, '%')</if>
             <if test="hiddenType != null  and hiddenType != ''"> and hidden_type = #{hiddenType}</if>
+            <if test="remediation != null  and remediation != ''"> and remediation = #{remediation}</if>
             <if test="hiddenFindDateStart != null "> and hidden_find_date &gt;= #{hiddenFindDateStart}</if>
             <if test="hiddenFindDateEnd != null "> and hidden_find_date &lt;= #{hiddenFindDateEnd}</if>
         </where>

gassafetyprogress-system/src/main/resources/mapper/system/TTroubleStandingBookMapper.xml

@@ -13,6 +13,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="troubleType"    column="trouble_type"    />
         <result property="briefProcess"    column="brief_process"    />
         <result property="troubleReason"    column="trouble_reason"    />
+        <result property="isCasualties"    column="is_casualties"    />
+        <result property="injuryNum"    column="injury_num"    />
+        <result property="deathNum"    column="death_num"    />
         <result property="responsibleUnit"    column="responsible_unit"    />
         <result property="responsiblePeople"    column="responsible_people"    />
         <result property="isDeal"    column="is_deal"    />
@@ -27,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTTroubleStandingBookVo">
-        select trouble_id, trouble_name, trouble_location, longitude, latitude, trouble_type, brief_process, trouble_reason, responsible_unit, responsible_people, is_deal,happen_date, deal_date, create_by, create_time, update_by, update_time, is_del, remarks from t_trouble_standing_book
+        select trouble_id, trouble_name, trouble_location, longitude, latitude, trouble_type, brief_process, trouble_reason, is_casualties, injury_num, death_num, responsible_unit, responsible_people, is_deal,happen_date, deal_date, create_by, create_time, update_by, update_time, is_del, remarks from t_trouble_standing_book
     </sql>
 
     <select id="selectTTroubleStandingBookList" parameterType="TTroubleStandingBookForm" resultMap="TTroubleStandingBookResult">
@@ -58,6 +61,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="troubleType != null">trouble_type,</if>
             <if test="briefProcess != null">brief_process,</if>
             <if test="troubleReason != null">trouble_reason,</if>
+            <if test="isCasualties != null">is_casualties,</if>
+            <if test="injuryNum != null">injury_num,</if>
+            <if test="deathNum != null">death_num,</if>
             <if test="responsibleUnit != null">responsible_unit,</if>
             <if test="responsiblePeople != null">responsible_people,</if>
             <if test="isDeal != null">is_deal,</if>
@@ -78,6 +84,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="troubleType != null">#{troubleType},</if>
             <if test="briefProcess != null">#{briefProcess},</if>
             <if test="troubleReason != null">#{troubleReason},</if>
+            <if test="isCasualties != null">#{isCasualties},</if>
+            <if test="injuryNum != null">#{injuryNum},</if>
+            <if test="deathNum != null">#{deathNum},</if>
             <if test="responsibleUnit != null">#{responsibleUnit},</if>
             <if test="responsiblePeople != null">#{responsiblePeople},</if>
             <if test="isDeal != null">#{isDeal},</if>
@@ -102,6 +111,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="troubleType != null">trouble_type = #{troubleType},</if>
             <if test="briefProcess != null">brief_process = #{briefProcess},</if>
             <if test="troubleReason != null">trouble_reason = #{troubleReason},</if>
+            <if test="isCasualties != null">is_casualties = #{isCasualties},</if>
+            <if test="injuryNum != null">injury_num = #{injuryNum},</if>
+            <if test="deathNum != null">death_num = #{deathNum},</if>
             <if test="responsibleUnit != null">responsible_unit = #{responsibleUnit},</if>
             <if test="responsiblePeople != null">responsible_people = #{responsiblePeople},</if>
             <if test="isDeal != null">is_deal = #{isDeal},</if>

gassafetyprogress-system/src/main/resources/mapper/system/TVideoManagerMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zehong.system.mapper.TVideoManagerMapper">
+    
+    <resultMap type="TVideoManager" id="TVideoManagerResult">
+        <result property="videoManagerId"    column="video_manager_id"    />
+        <result property="videoName"    column="video_name"    />
+        <result property="resourceId"    column="resource_id"    />
+        <result property="longitude"    column="longitude"    />
+        <result property="latitude"    column="latitude"    />
+        <result property="videoAddress"    column="video_address"    />
+        <result property="type"    column="type"    />
+        <result property="beyondEnterpriseId"    column="beyond_enterprise_id"    />
+        <result property="beyondEnterpriseName"    column="beyond_enterprise_name"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="remarks"    column="remarks"    />
+    </resultMap>
+
+    <sql id="selectTVideoManagerVo">
+        select video_manager_id, video_name, resource_id, longitude, latitude, video_address, type, beyond_enterprise_id, beyond_enterprise_name, create_by, create_time, update_by, update_time, is_del, remarks from t_video_manager
+    </sql>
+
+    <select id="selectTVideoManagerList" parameterType="TVideoManager" resultMap="TVideoManagerResult">
+        <include refid="selectTVideoManagerVo"/>
+        <where>  
+            <if test="videoName != null  and videoName != ''"> and video_name like concat('%', #{videoName}, '%')</if>
+            <if test="resourceId != null  and resourceId != ''"> and resource_id = #{resourceId}</if>
+            <if test="longitude != null "> and longitude = #{longitude}</if>
+            <if test="latitude != null "> and latitude = #{latitude}</if>
+            <if test="videoAddress != null  and videoAddress != ''"> and video_address = #{videoAddress}</if>
+            <if test="type != null  and type != ''"> and type = #{type}</if>
+            <if test="beyondEnterpriseId != null "> and beyond_enterprise_id = #{beyondEnterpriseId}</if>
+            <if test="beyondEnterpriseName != null  and beyondEnterpriseName != ''"> and beyond_enterprise_name like concat('%', #{beyondEnterpriseName}, '%')</if>
+            <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+        </where>
+    </select>
+    
+    <select id="selectTVideoManagerById" parameterType="Long" resultMap="TVideoManagerResult">
+        <include refid="selectTVideoManagerVo"/>
+        where video_manager_id = #{videoManagerId}
+    </select>
+        
+    <insert id="insertTVideoManager" parameterType="TVideoManager" useGeneratedKeys="true" keyProperty="videoManagerId">
+        insert into t_video_manager
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="videoName != null">video_name,</if>
+            <if test="resourceId != null">resource_id,</if>
+            <if test="longitude != null">longitude,</if>
+            <if test="latitude != null">latitude,</if>
+            <if test="videoAddress != null">video_address,</if>
+            <if test="type != null">type,</if>
+            <if test="beyondEnterpriseId != null">beyond_enterprise_id,</if>
+            <if test="beyondEnterpriseName != null">beyond_enterprise_name,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="remarks != null">remarks,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="videoName != null">#{videoName},</if>
+            <if test="resourceId != null">#{resourceId},</if>
+            <if test="longitude != null">#{longitude},</if>
+            <if test="latitude != null">#{latitude},</if>
+            <if test="videoAddress != null">#{videoAddress},</if>
+            <if test="type != null">#{type},</if>
+            <if test="beyondEnterpriseId != null">#{beyondEnterpriseId},</if>
+            <if test="beyondEnterpriseName != null">#{beyondEnterpriseName},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="remarks != null">#{remarks},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTVideoManager" parameterType="TVideoManager">
+        update t_video_manager
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="videoName != null">video_name = #{videoName},</if>
+            <if test="resourceId != null">resource_id = #{resourceId},</if>
+            <if test="longitude != null">longitude = #{longitude},</if>
+            <if test="latitude != null">latitude = #{latitude},</if>
+            <if test="videoAddress != null">video_address = #{videoAddress},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="beyondEnterpriseId != null">beyond_enterprise_id = #{beyondEnterpriseId},</if>
+            <if test="beyondEnterpriseName != null">beyond_enterprise_name = #{beyondEnterpriseName},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where video_manager_id = #{videoManagerId}
+    </update>
+
+    <delete id="deleteTVideoManagerById" parameterType="Long">
+        delete from t_video_manager where video_manager_id = #{videoManagerId}
+    </delete>
+
+    <delete id="deleteTVideoManagerByIds" parameterType="String">
+        delete from t_video_manager where video_manager_id in 
+        <foreach item="videoManagerId" collection="array" open="(" separator="," close=")">
+            #{videoManagerId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

gassafetyprogress-web/public/index.html

@@ -9,6 +9,7 @@
     <title><%= webpackConfig.name %></title>
     <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
     <script src="https://webapi.amap.com/maps?v=2.0&key=eed7ca3167f765467aa377fa78e61ece&plugin=Map3D,AMap.DistrictSearch,AMap.Scale,AMap.OverView,AMap.ToolBar,AMap.MouseTool,AMap.ControlBar,AMap.CircleEditor,AMap.PolyEditor"></script>
+	  <script src="h5player/h5player.min.js"></script>
     <style>
     html,
     body,

gassafetyprogress-web/src/api/complainDeal/complainDeal.js

+import request from '@/utils/request'
+
+// 查询投诉处置列表
+export function listComplainDeal(query) {
+  return request({
+    url: '/complainDeal/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询投诉处置详细
+export function getComplainDeal(complainDealId) {
+  return request({
+    url: '/complainDeal/' + complainDealId,
+    method: 'get'
+  })
+}
+
+// 新增投诉处置
+export function addComplainDeal(data) {
+  return request({
+    url: '/complainDeal',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改投诉处置
+export function updateComplainDeal(data) {
+  return request({
+    url: '/complainDeal',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除投诉处置
+export function delComplainDeal(complainDealId) {
+  return request({
+    url: '/complainDeal/' + complainDealId,
+    method: 'delete'
+  })
+}
+
+// 导出投诉处置
+export function exportComplainDeal(query) {
+  return request({
+    url: '/complainDeal/complainDeal/export',
+    method: 'get',
+    params: query
+  })
+}

gassafetyprogress-web/src/api/operationMonitor/data.js

+import request from '@/utils/request'
+
+// 查询设备监控列表
+export function listData(query) {
+  return request({
+    url: '/system/data/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询设备监控详细
+export function getData(deviceReportDataId) {
+  return request({
+    url: '/system/data/' + deviceReportDataId,
+    method: 'get'
+  })
+}
+
+// 新增设备监控
+export function addData(data) {
+  return request({
+    url: '/system/data',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改设备监控
+export function updateData(data) {
+  return request({
+    url: '/system/data',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除设备监控
+export function delData(deviceReportDataId) {
+  return request({
+    url: '/system/data/' + deviceReportDataId,
+    method: 'delete'
+  })
+}
+
+// 导出设备监控
+export function exportData(query) {
+  return request({
+    url: '/system/data/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file

gassafetyprogress-web/src/api/video/artemis.js

+import request from '@/utils/request'
+
+// 查询视频地址
+export function getPreviewURLs(query) {
+  return request({
+    url: '/artemis/getPreviewURLs',
+    method: 'get',
+    params: query
+  })
+}

gassafetyprogress-web/src/api/video/manager.js

+import request from '@/utils/request'
+
+// 查询视频管理列表
+export function listManager(query) {
+  return request({
+    url: '/system/manager/list',
+    method: 'get',
+    params: query
+  })
+}
+
+//获取视频树
+export function getVideoTree(query) {
+  return request({
+    url: '/system/manager/getVideoTree',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询视频管理详细
+export function getManager(videoManagerId) {
+  return request({
+    url: '/system/manager/' + videoManagerId,
+    method: 'get'
+  })
+}
+
+// 新增视频管理
+export function addManager(data) {
+  return request({
+    url: '/system/manager',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改视频管理
+export function updateManager(data) {
+  return request({
+    url: '/system/manager',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除视频管理
+export function delManager(videoManagerId) {
+  return request({
+    url: '/system/manager/' + videoManagerId,
+    method: 'delete'
+  })
+}
+
+// 导出视频管理
+export function exportManager(query) {
+  return request({
+    url: '/system/manager/export',
+    method: 'get',
+    params: query
+  })
+}

gassafetyprogress-web/src/components/GetPos/index.vue

 <!--
  * @Author: your name
  * @Date: 2022-02-12 11:07:10
- * @LastEditTime: 2022-02-15 10:33:20
+ * @LastEditTime: 2022-02-16 17:08:55
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /test/hello-world/src/components/GetPos.vue/index.vue
@@ -79,6 +79,7 @@ export default {
         this.init();
       } else {
         this.map.destroy();
+        this.searchinput="";
       }
       this.$nextTick(() => {
         const input = this.$refs.input.$refs.input;

gassafetyprogress-web/src/views/operationMonitor/video/index.vue

+<template>
+
+  <div class="app-container">
+    <el-row>
+      <el-col :span="5">
+        <el-tree :data="videoData" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
+      </el-col>
+      <el-col :span="19">
+        <div id="player" style="width: calc(67vw - 8px);height: calc((67vw - 8px) * 5 / 8)"></div>
+      </el-col>
+    </el-row>
+
+
+
+  </div>
+</template>
+<!--<script src="@api/video/h5player.js"></script>-->
+<script>
+import { getVideoTree } from "@/api/video/manager";
+import { getPreviewURLs } from "@/api/video/artemis"
+const IS_MOVE_DEVICE = document.body.clientWidth < 992 // 是否移动设备
+const MSE_IS_SUPPORT = !!window.MediaSource // 是否支持mse
+export default {
+  name: "Video",
+  components: {
+  },
+  data() {
+    return {
+      videoData: [],
+      defaultProps: {
+        children: 'childrenVideo',
+        label: 'videoName'
+      },
+      queryParam: {
+        cameraIndexCode: ""
+      },
+      player: null,
+      videoOpenNum: -1,
+      cameraIndexCode: ""
+    }
+  },
+  created() {
+    this.getVideoData();
+  },
+  methods: {
+    getVideoData(){
+      getVideoTree().then(response =>{
+        this.videoData = response.data;
+      })
+    },
+    handleNodeClick(data){
+      if(this.cameraIndexCode == data.resourceId){
+        return;
+      }
+      this.cameraIndexCode = data.resourceId;
+      if(data.resourceId){
+        this.queryParam.cameraIndexCode = data.resourceId;
+        getPreviewURLs(this.queryParam).then(response =>{
+            if(response.data.code == '0'){
+                this.videoOpenNum++;
+                let url = response.data.data.url;
+                //let index = this.player.currentWindowIndex;
+                this.player.JS_Play(url,{playURL: url, mode:"0" }, this.videoOpenNum%4).then(() => {
+                  console.log('realplay success')
+                },
+                  e => { console.error(e) }
+                )
+            }
+        });
+      }
+    },
+    init() {
+      // 设置播放容器的宽高并监听窗口大小变化
+      window.addEventListener('resize', () => {
+            this.player.JS_Resize()
+      })
+    },
+    createPlayer() {
+      this.player = new window.JSPlugin({
+        szId: 'player',
+        szBasePath: "/h5player",
+        iMaxSplit: 4,
+        iCurrentSplit: IS_MOVE_DEVICE ? 1 : 2,
+        openDebug: true,
+        oStyle: {
+          borderSelect: IS_MOVE_DEVICE ? '#000' : '#FFCC00',
+        }
+      })
+    },
+    loadScript(src){
+      return new Promise(reslove =>{
+        let scpritE1 = document.createElement("script");
+          scpritE1.type = "text/javascript";
+          scpritE1.src = src;
+          scpritE1.onload = () => {
+          reslove();
+        }
+      document.body.appendChild(scpritE1);
+    })
+    }
+
+  },
+  mounted() {
+    //this.$el.style.setProperty('display', 'block')
+    if(!window.JSPlugin){
+      this.loadScript("/h5player/h5player.min.js").then(() =>{
+        this.createPlayer();
+        this.init()
+      })
+
+    }else{
+      this.createPlayer();
+      this.init()
+    }
+
+  }
+};
+</script>

gassafetyprogress-web/src/views/standingBook/equipment/index.vue

 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="80px">
+    <el-form :model="queryParams" ref="queryParams" :inline="true" v-show="showSearch" label-width="80px">
       <el-form-item label="用户名称" prop="userName">
         <el-input
           v-model="queryParams.userName"
@@ -360,7 +360,16 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        userName: null,
+        idCard: null,
+        linkMobile: null,
+        installTimeStart: null,
+        installTimeEnd: null
+      },
+      this.resetForm("queryParams");
       this.handleQuery();
     },
     /** 新增按钮操作 */

gassafetyprogress-web/src/views/standingBook/hidden/index.vue

 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="80px">
-      <el-form-item label="隐患名称" prop="hiddenTitle">
-        <el-input
-          v-model="queryParams.hiddenTitle"
-          placeholder="请输入隐患名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+    <el-form :model="queryParams" ref="queryParams" :inline="true" v-show="showSearch" label-width="80px">
       <el-form-item label="隐患类型" prop="hiddenType">
         <el-select v-model="queryParams.hiddenType" placeholder="请选择隐患类型" clearable size="small">
           <el-option
@@ -20,6 +11,16 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="整治情况" prop="remediation">
+        <el-select v-model="queryParams.remediation" placeholder="请选择整治情况" clearable size="small">
+          <el-option
+            v-for="dict in remediationOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="发现时间" prop="hiddenFindDate">
         <el-date-picker clearable size="small"
                         v-model="queryParams.hiddenFindDateStart"
@@ -91,8 +92,8 @@
       </el-table-column>
       <el-table-column label="整治情况" align="center" prop="remediation">
         <template slot-scope="scope">
-          <span v-if="scope.row.remediation != '' && scope.row.remediation != null">{{ scope.row.remediation }}</span>
-          <span v-else>-</span>
+          <span v-if="scope.row.remediation == '1'">已完成</span>
+          <span v-if="scope.row.remediation == '2'">未完成</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" width="180px">
@@ -215,7 +216,14 @@
           <el-row>
             <el-col :span="23">
               <el-form-item label="整治情况" prop="remediation">
-                <el-input v-model="form.remediation" placeholder="请输入整治情况" />
+                <el-select v-model="form.remediation" placeholder="请选择整治情况" clearable size="small">
+                  <el-option
+                    v-for="dict in remediationOptions"
+                    :key="dict.dictValue"
+                    :label="dict.dictLabel"
+                    :value="dict.dictValue"
+                  ></el-option>
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
@@ -273,8 +281,8 @@
               </el-row>
               <el-row>
                 <el-form-item label="整治情况:">
-                  <font v-if="detailForm.remediation != '' && detailForm.remediation != null">{{detailForm.remediation}}</font>
-                  <font v-else> - </font>
+                  <font v-if="detailForm.remediation == '1'">已完成</font>
+                  <font v-if="detailForm.remediation == '2'">未完成</font>
                 </el-form-item>
               </el-row>
               <el-row>
@@ -344,6 +352,8 @@ export default {
       open2: false,
       // 隐患类型字典
       typeOptions: [],
+      // 整治情况字典
+      remediationOptions: [],
       // 上传文件列表
       fileList: [],
       // 地图
@@ -356,6 +366,7 @@ export default {
         pageSize: 10,
         hiddenTitle: null,
         hiddenType: null,
+        remediation: null,
         hiddenFindDateStart: null,
         hiddenFindDateEnd: null
       },
@@ -385,6 +396,9 @@ export default {
         hiddenFindDate: [
           { required: true, message: "请选择发现时间", trigger: "change" },
         ],
+        remediation: [
+          { required: true, message: "请选择整治情况", trigger: "change" },
+        ],
         dealPlan: [
           { required: true, message: "请上传文件", trigger: "change" },
         ],
@@ -396,6 +410,9 @@ export default {
     this.getDicts("t_hidden_type").then(response => {
       this.typeOptions = response.data;
     });
+    this.getDicts("t_remediation").then(response => {
+      this.remediationOptions = response.data;
+    });
   },
   methods: {
     /** 查询隐患整治台账列表 */
@@ -473,7 +490,16 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        hiddenTitle: null,
+        hiddenType: null,
+        remediation: null,
+        hiddenFindDateStart: null,
+        hiddenFindDateEnd: null
+    },
+      this.resetForm("queryParams");
       this.handleQuery();
     },
     /** 新增按钮操作 */

gassafetyprogress-web/src/views/standingBook/trouble/index.vue

 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form :model="queryParams" ref="queryParams" :inline="true" v-show="showSearch" label-width="100px">
       <!--<el-form-item label="事故名称" prop="troubleName">
         <el-input
           v-model="queryParams.troubleName"
@@ -85,7 +85,13 @@
       </el-table-column>
       <el-table-column label="事故地点" align="center" prop="troubleLocation" width="300px"/>
       <el-table-column label="事故发生时间" align="center" prop="happenDate" width="150px"/>
-      <el-table-column label="责任单位" align="center" prop="responsibleUnit"/>
+      <el-table-column label="是否人员伤亡" align="center" prop="isCasualties" width="150px">
+        <template slot-scope="scope">
+          <span v-if="scope.row.isCasualties == 1">是</span>
+          <span v-if="scope.row.isCasualties == 2">否</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="责任单位" align="center" prop="responsibleUnit" width="150px"/>
       <el-table-column label="责任人员" align="center" prop="responsiblePeople"/>
       <el-table-column label="是否处理" align="center" prop="isDeal">
         <template slot-scope="scope">
@@ -194,6 +200,28 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="23">
+            <el-form-item label="是否人员伤亡" prop="isCasualties">
+              <el-select v-model="form.isCasualties" placeholder="请选择是否人员伤亡">
+                <el-option label="是" value="1" />
+                <el-option label="否" value="2" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="form.isCasualties == '1'">
+          <el-col :span="11">
+            <el-form-item label="受伤人数" prop="injuryNum">
+              <el-input v-model.number="form.injuryNum" placeholder="请输入受伤人数" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="死亡人数" prop="deathNum">
+              <el-input v-model.number="form.deathNum" placeholder="请输入死亡人数" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="11">
             <el-form-item label="责任单位" prop="responsibleUnit">
@@ -209,9 +237,13 @@
         <el-row>
           <el-col :span="11">
             <el-form-item label="是否处理" prop="isDeal">
-              <el-select v-model="form.isDeal" placeholder="请选择处理结果">
-                <el-option label="已处理" value="1" />
-                <el-option label="未处理" value="2" />
+              <el-select v-model="form.isDeal" placeholder="请选择处理结果" filterable style="width: 100%" >
+                <el-option
+                  v-for="dict in isDealOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -258,6 +290,10 @@
                   <font v-if="detailForm.responsibleUnit != '' && detailForm.responsibleUnit != null">{{detailForm.responsibleUnit}}</font>
                   <font v-else> - </font>
                 </el-form-item>
+                <el-form-item label="是否人员伤亡:">
+                  <font v-if="detailForm.isCasualties == '1'">是</font>
+                  <font v-if="detailForm.isCasualties == '2'">否</font>
+                </el-form-item>
               </el-col>
               <el-col :span="13">
                 <el-form-item label="事故类型:">
@@ -271,27 +307,36 @@
                   <font v-if="detailForm.responsiblePeople != '' && detailForm.responsiblePeople != null">{{detailForm.responsiblePeople}}</font>
                   <font v-else> - </font>
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-form-item label="简要经过:">
-                <font v-if="detailForm.briefProcess != '' && detailForm.briefProcess != null">{{detailForm.briefProcess}}</font>
-                <font v-else> - </font>
-              </el-form-item>
-            </el-row>
-            <el-row>
-              <el-col :span="11">
                 <el-form-item label="是否处理:">
                   <font v-if="detailForm.isDeal == '1'">已处理</font>
                   <font v-if="detailForm.isDeal == '2'">未处理</font>
                 </el-form-item>
               </el-col>
+            </el-row>
+            <el-row v-if="detailForm.isCasualties == '1'">
+              <el-col :span="11">
+                <el-form-item label="受伤人数:">
+                  <font>{{detailForm.injuryNum}}</font>
+                </el-form-item>
+              </el-col>
               <el-col :span="12">
-                <el-form-item label="处理完成时间:">
-                  <font>{{detailForm.dealDate}}</font>
+                <el-form-item label="死亡人数:">
+                  <font>{{detailForm.deathNum}}</font>
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-row>
+              <el-form-item label="处理完成时间:">
+                <font v-if="detailForm.dealDate != '' && detailForm.dealDate != null">{{detailForm.dealDate}}</font>
+                <font v-else> - </font>
+              </el-form-item>
+            </el-row>
+            <el-row>
+              <el-form-item label="简要经过:">
+                <font v-if="detailForm.briefProcess != '' && detailForm.briefProcess != null">{{detailForm.briefProcess}}</font>
+                <font v-else> - </font>
+              </el-form-item>
+            </el-row>
             <el-row>
               <el-form-item label="备注信息:">
                 <font v-if="detailForm.remarks != '' && detailForm.remarks != null">{{detailForm.remarks}}</font>
@@ -396,12 +441,18 @@ export default {
         troubleReason: [
           { required: true, message: "请输入事故原因", trigger: "blur" },
         ],
+        isCasualties: [
+          { required: true, message: "请选择是否人员伤亡", trigger: "change" },
+        ],
         responsibleUnit: [
           { required: true, message: "请输入责任单位", trigger: "blur" },
         ],
         responsiblePeople: [
           { required: true, message: "请输入责任人员", trigger: "blur" },
         ],
+        isDeal: [
+          { required: true, message: "请选择是否已处理", trigger: "change" },
+        ],
       }
     };
   },
@@ -445,6 +496,9 @@ export default {
         troubleType: null,
         briefProcess: null,
         troubleReason: null,
+        isCasualties: null,
+        injuryNum: null,
+        deathNum: null,
         responsibleUnit: null,
         responsiblePeople: null,
         isDeal: null,
@@ -470,6 +524,9 @@ export default {
         troubleType: null,
         briefProcess: null,
         troubleReason: null,
+        isCasualties: null,
+        injuryNum: null,
+        deathNum: null,
         responsibleUnit: null,
         responsiblePeople: null,
         isDeal: null,
@@ -492,7 +549,18 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        troubleName: null,
+        troubleType: null,
+        isDeal: null,
+        happenDateStart: null,
+        happenDateEnd: null,
+        dealDateStart: null,
+        dealDateEnd: null
+      },
+      this.resetForm("queryParams");
       this.handleQuery();
     },
     /** 新增按钮操作 */

gassafetyprogress-web/src/views/system/eventInfo/index.vue

@@ -476,7 +476,7 @@ export default {
         this.form = response.data;
         this.open = true;
         this.title = "修改事件处置";
-        if(row.iconUrl!=null){
+        if(this.form.iconUrl!=null){
           this.fileList = [{name: '附件', url: uploadfile}];
         }
       this.display="";

gassafetyprogress-web/src/views/system/planInfo/index.vue

@@ -456,7 +456,7 @@ export default {
         this.form = response.data;
 
         this.title = "应急预案详情";
-        this.fileList = [{name: 'file', url:uploadfile}];
+        this.fileList = [{name: '附件', url:uploadfile}];
         this.fileurl = row.iconUrl;
       document.getElementById("yesbutton").style.display="none" ;
       document.getElementById("fujian").style.display="none"
@@ -473,7 +473,7 @@ export default {
         this.form = response.data;
         this.open = true;
         this.title = "修改应急预案";
-        if(row.iconUrl!=null||row.iconUrl==""){
+        if(this.form.iconUrl!=null||this.form.iconUrl==""){
           this.fileList = [{name: 'file', url:uploadfile}];
           this.$nextTick(()=>{
             document.getElementsByClassName("el-upload--picture-card")[0].style.display="none"