任务下发 隐患反馈 gengdidi

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

@@ -27,7 +27,7 @@ import com.zehong.common.core.page.TableDataInfo;
  * @date 2022-03-24
  */
 @RestController
-@RequestMapping("/system/info")
+@RequestMapping("/system/hidden")
 public class THiddenTroubleInfoController extends BaseController
 {
     @Autowired
@@ -36,7 +36,7 @@ public class THiddenTroubleInfoController extends BaseController
     /**
      * 查询燃气隐患列表
      */
-    @PreAuthorize("@ss.hasPermi('system:info:list')")
+    @PreAuthorize("@ss.hasPermi('system:hidden:list')")
     @GetMapping("/list")
     public TableDataInfo list(THiddenTroubleInfo tHiddenTroubleInfo)
     {
@@ -53,7 +53,7 @@ public class THiddenTroubleInfoController extends BaseController
     /**
      * 导出燃气隐患列表
      */
-    @PreAuthorize("@ss.hasPermi('system:info:export')")
+    @PreAuthorize("@ss.hasPermi('system:hidden:export')")
     @Log(title = "燃气隐患", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(THiddenTroubleInfo tHiddenTroubleInfo)
@@ -66,7 +66,7 @@ public class THiddenTroubleInfoController extends BaseController
     /**
      * 获取燃气隐患详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:info:query')")
+    @PreAuthorize("@ss.hasPermi('system:hidden:query')")
     @GetMapping(value = "/{hiddenTroubleId}")
     public AjaxResult getInfo(@PathVariable("hiddenTroubleId") Long hiddenTroubleId)
     {
@@ -76,7 +76,7 @@ public class THiddenTroubleInfoController extends BaseController
     /**
      * 新增燃气隐患
      */
-    @PreAuthorize("@ss.hasPermi('system:info:add')")
+    @PreAuthorize("@ss.hasPermi('system:hidden:add')")
     @Log(title = "燃气隐患", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody THiddenTroubleInfo tHiddenTroubleInfo)
@@ -87,7 +87,7 @@ public class THiddenTroubleInfoController extends BaseController
     /**
      * 修改燃气隐患
      */
-    @PreAuthorize("@ss.hasPermi('system:info:edit')")
+    @PreAuthorize("@ss.hasPermi('system:hidden:edit')")
     @Log(title = "燃气隐患", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody THiddenTroubleInfo tHiddenTroubleInfo)
@@ -98,7 +98,7 @@ public class THiddenTroubleInfoController extends BaseController
     /**
      * 删除燃气隐患
      */
-    @PreAuthorize("@ss.hasPermi('system:info:remove')")
+    @PreAuthorize("@ss.hasPermi('system:hidden:remove')")
     @Log(title = "燃气隐患", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{hiddenTroubleIds}")
     public AjaxResult remove(@PathVariable Long[] hiddenTroubleIds)

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

@@ -83,7 +83,18 @@ public class THiddenTroubleInfo extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
-    public void setHiddenTroubleId(Long hiddenTroubleId) 
+    /**上报人名称*/
+    private String reportPersonName;
+
+    public String getReportPersonName() {
+        return reportPersonName;
+    }
+
+    public void setReportPersonName(String reportPersonName) {
+        this.reportPersonName = reportPersonName;
+    }
+
+    public void setHiddenTroubleId(Long hiddenTroubleId)
     {
         this.hiddenTroubleId = hiddenTroubleId;
     }

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

@@ -21,10 +21,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="hiddenTroubleDealFinishTime"    column="hidden_trouble_deal_finish_time"    />
         <result property="isDel"    column="is_del"    />
         <result property="remarks"    column="remarks"    />
+        <result property="reportPersonName"    column="report_person_name"    />
     </resultMap>
 
     <sql id="selectTHiddenTroubleInfoVo">
-        select hidden_trouble_id, work_id, hidden_trouble_name, hidden_trouble_level, hidden_trouble_type, longitude, latitude, picture_url, hidden_trouble_describe, report_time, (select u.user_name from sys_user u where u.user_id = report_person) AS report_person, hidden_trouble_deal_status, hidden_trouble_deal_condition, hidden_trouble_deal_finish_time, is_del, remarks from t_hidden_trouble_info
+        select hidden_trouble_id, work_id, hidden_trouble_name, hidden_trouble_level, hidden_trouble_type, longitude, latitude, picture_url, hidden_trouble_describe, report_time, (select u.user_name from sys_user u where u.user_id = report_person) AS report_person_name, report_person, hidden_trouble_deal_status, hidden_trouble_deal_condition, hidden_trouble_deal_finish_time, is_del, remarks from t_hidden_trouble_info
     </sql>
 
     <select id="selectTHiddenTroubleInfoList" parameterType="THiddenTroubleInfo" resultMap="THiddenTroubleInfoResult">

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

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询燃气隐患列表
 export function listInfo(query) {
   return request({
-    url: '/system/info/list',
+    url: '/system/hidden/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listInfo(query) {
 // 查询燃气隐患
 export function hiddenTroubleList(query) {
   return request({
-    url: '/system/info/hiddenTroubleList',
+    url: '/system/hidden/hiddenTroubleList',
     method: 'get',
     params: query
   })
@@ -21,41 +21,41 @@ export function hiddenTroubleList(query) {
 // 查询燃气隐患详细
 export function getInfo(hiddenTroubleId) {
   return request({
-    url: '/system/info/' + hiddenTroubleId,
+    url: '/system/hidden/' + hiddenTroubleId,
     method: 'get'
   })
 }
 
 // 新增燃气隐患
-export function addInfo(data) {
+export function addHiddenInfo(data) {
   return request({
-    url: '/system/info',
+    url: '/system/hidden',
     method: 'post',
     data: data
   })
 }
 
 // 修改燃气隐患
-export function updateInfo(data) {
+export function updateHiddenInfo(data) {
   return request({
-    url: '/system/info',
+    url: '/system/hidden',
     method: 'put',
     data: data
   })
 }
 
 // 删除燃气隐患
-export function delInfo(hiddenTroubleId) {
+export function delHiddenInfo(hiddenTroubleId) {
   return request({
-    url: '/system/info/' + hiddenTroubleId,
+    url: '/system/hidden/' + hiddenTroubleId,
     method: 'delete'
   })
 }
 
 // 导出燃气隐患
-export function exportInfo(query) {
+export function exportHiddenInfo(query) {
   return request({
-    url: '/system/info/export',
+    url: '/system/hidden/export',
     method: 'get',
     params: query
   })