Merge remote-tracking branch 'origin/master_tuzuo' into master_tuzuo

data-ui/src/api/centerdata_emergency1/attach.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询附件列表
 export function listAttach(query) {
   return request({
-    url: '/system/attach/list',
+    url: '/sooka-sponest-center-data/attach/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listAttach(query) {
 // 查询附件详细
 export function getAttach(attachId) {
   return request({
-    url: '/system/attach/' + attachId,
+    url: '/sooka-sponest-center-data/attach/' + attachId,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getAttach(attachId) {
 // 新增附件
 export function addAttach(data) {
   return request({
-    url: '/system/attach',
+    url: '/sooka-sponest-center-data/attach',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addAttach(data) {
 // 修改附件
 export function updateAttach(data) {
   return request({
-    url: '/system/attach',
+    url: '/sooka-sponest-center-data/attach',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateAttach(data) {
 // 删除附件
 export function delAttach(attachId) {
   return request({
-    url: '/system/attach/' + attachId,
+    url: '/sooka-sponest-center-data/attach/' + attachId,
     method: 'delete'
   })
 }

data-ui/src/api/centerdata_emergency1/dept.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询业务部门列表
 export function listDept(query) {
   return request({
-    url: '/system/busdept/list',
+    url: '/sooka-sponest-center-data/busdept/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listDept(query) {
 // 查询业务部门详细
 export function getDept(busDeptId) {
   return request({
-    url: '/system/busdept/' + busDeptId,
+    url: '/sooka-sponest-center-data/busdept/' + busDeptId,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getDept(busDeptId) {
 // 新增业务部门
 export function addDept(data) {
   return request({
-    url: '/system/busdept',
+    url: '/sooka-sponest-center-data/busdept',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addDept(data) {
 // 修改业务部门
 export function updateDept(data) {
   return request({
-    url: '/system/busdept',
+    url: '/sooka-sponest-center-data/busdept',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateDept(data) {
 // 删除业务部门
 export function delDept(busDeptId) {
   return request({
-    url: '/system/busdept/' + busDeptId,
+    url: '/sooka-sponest-center-data/busdept/' + busDeptId,
     method: 'delete'
   })
 }

data-ui/src/api/centerdata_emergency1/enterprise.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询企业列表
 export function listEnterprise(query) {
   return request({
-    url: '/system/enterprise/list',
+    url: '/sooka-sponest-center-data/enterprise/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listEnterprise(query) {
 // 查询企业详细
 export function getEnterprise(busEnterpriseId) {
   return request({
-    url: '/system/enterprise/' + busEnterpriseId,
+    url: '/sooka-sponest-center-data/enterprise/' + busEnterpriseId,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getEnterprise(busEnterpriseId) {
 // 新增企业
 export function addEnterprise(data) {
   return request({
-    url: '/system/enterprise',
+    url: '/sooka-sponest-center-data/enterprise',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addEnterprise(data) {
 // 修改企业
 export function updateEnterprise(data) {
   return request({
-    url: '/system/enterprise',
+    url: '/sooka-sponest-center-data/enterprise',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateEnterprise(data) {
 // 删除企业
 export function delEnterprise(busEnterpriseId) {
   return request({
-    url: '/system/enterprise/' + busEnterpriseId,
+    url: '/sooka-sponest-center-data/enterprise/' + busEnterpriseId,
     method: 'delete'
   })
 }

data-ui/src/api/centerdata_emergency1/inspection.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 
 export function detail(query) {
   return request({
-    url: '/system/inspection/detail',
+    url: '/sooka-sponest-center-data/inspection/detail',
     method: 'get',
     params: query
   })
@@ -14,7 +14,7 @@ export function detail(query) {
 // 查询巡检项记录列表
 export function listInspection(query) {
   return request({
-    url: '/system/inspection/list',
+    url: '/sooka-sponest-center-data/inspection/list',
     method: 'get',
     params: query
   })
@@ -23,7 +23,7 @@ export function listInspection(query) {
 // 查询巡检项记录详细
 export function getInspection(busInspectionId) {
   return request({
-    url: '/system/inspection/' + busInspectionId,
+    url: '/sooka-sponest-center-data/inspection/' + busInspectionId,
     method: 'get'
   })
 }
@@ -31,7 +31,7 @@ export function getInspection(busInspectionId) {
 // 新增巡检项记录
 export function addInspection(data) {
   return request({
-    url: '/system/inspection',
+    url: '/sooka-sponest-center-data/inspection',
     method: 'post',
     data: data
   })
@@ -40,7 +40,7 @@ export function addInspection(data) {
 // 修改巡检项记录
 export function updateInspection(data) {
   return request({
-    url: '/system/inspection',
+    url: '/sooka-sponest-center-data/inspection',
     method: 'put',
     data: data
   })
@@ -49,7 +49,7 @@ export function updateInspection(data) {
 // 删除巡检项记录
 export function delInspection(busInspectionId) {
   return request({
-    url: '/system/inspection/' + busInspectionId,
+    url: '/sooka-sponest-center-data/inspection/' + busInspectionId,
     method: 'delete'
   })
 }

data-ui/src/api/centerdata_emergency1/items.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询巡检项列表
 export function listItems(query) {
   return request({
-    url: '/system/items/list',
+    url: '/sooka-sponest-center-data/items/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listItems(query) {
 // 查询巡检项详细
 export function getItems(busItemsId) {
   return request({
-    url: '/system/items/' + busItemsId,
+    url: '/sooka-sponest-center-data/items/' + busItemsId,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getItems(busItemsId) {
 // 新增巡检项
 export function addItems(data) {
   return request({
-    url: '/system/items',
+    url: '/sooka-sponest-center-data/items',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addItems(data) {
 // 修改巡检项
 export function updateItems(data) {
   return request({
-    url: '/system/items',
+    url: '/sooka-sponest-center-data/items',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateItems(data) {
 // 删除巡检项
 export function delItems(busItemsId) {
   return request({
-    url: '/system/items/' + busItemsId,
+    url: '/sooka-sponest-center-data/items/' + busItemsId,
     method: 'delete'
   })
 }

data-ui/src/api/centerdata_emergency1/log.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询日志列表
 export function listLog(query) {
   return request({
-    url: '/system/log/list',
+    url: '/sooka-sponest-center-data/log/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listLog(query) {
 // 查询日志详细
 export function getLog(busLogId) {
   return request({
-    url: '/system/log/' + busLogId,
+    url: '/sooka-sponest-center-data/log/' + busLogId,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getLog(busLogId) {
 // 新增日志
 export function addLog(data) {
   return request({
-    url: '/system/log',
+    url: '/sooka-sponest-center-data/log',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addLog(data) {
 // 修改日志
 export function updateLog(data) {
   return request({
-    url: '/system/log',
+    url: '/sooka-sponest-center-data/log',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateLog(data) {
 // 删除日志
 export function delLog(busLogId) {
   return request({
-    url: '/system/log/' + busLogId,
+    url: '/sooka-sponest-center-data/log/' + busLogId,
     method: 'delete'
   })
 }

data-ui/src/api/centerdata_emergency1/main.js

@@ -4,14 +4,14 @@ import request from '@/utils/request'
 //查询有隐患的日志
 export function getMainInfo(query) {
   return request({
-    url: '/system/ManagerMainController/getMainInfo',
+    url: '/sooka-sponest-center-data/ManagerMainController/getMainInfo',
     method: 'post',
     params: query
   })
 }
 export function getLoginUser() {
   return request({
-    url: '/system/ManagerMainController/getLoginUser',
+    url: '/sooka-sponest-center-data/ManagerMainController/getLoginUser',
     method: 'post',
   })
 }
@@ -19,41 +19,41 @@ export function getLoginUser() {
 //企业
 export function getInitEnterpriseData() {
   return request({
-    url: '/system/AppEnterpriseController/getInitEnterpriseData',
+    url: '/sooka-sponest-center-data/AppEnterpriseController/getInitEnterpriseData',
     method: 'post',
   })
 }
 
 export function getInitEnterpriseList() {
   return request({
-    url: '/system/AppEnterpriseController/getInitEnterpriseList',
+    url: '/sooka-sponest-center-data/AppEnterpriseController/getInitEnterpriseList',
     method: 'post',
   })
 }
 //巡查
 export function getXunchaCount() {
   return request({
-    url: '/system/AppXunchaController/getXunchaCount',
+    url: '/sooka-sponest-center-data/AppXunchaController/getXunchaCount',
     method: 'post',
   })
 }
 export function getXunchaList() {
   return request({
-    url: '/system/AppXunchaController/getXunchaList',
+    url: '/sooka-sponest-center-data/AppXunchaController/getXunchaList',
     method: 'post',
   })
 }
 //隐患
 export function getXunjianimgList() {
   return request({
-    url: '/system/AppXunjianimgController/getXunjianimgList',
+    url: '/sooka-sponest-center-data/AppXunjianimgController/getXunjianimgList',
     method: 'post',
   })
 }
 //判断用户密码是否为默认密码
 export function isDefaultPassword(pwd) {
   return request({
-    url: '/system/ManagerMainController/isDefaultPassword?password='+pwd,
+    url: '/sooka-sponest-center-data/ManagerMainController/isDefaultPassword?password='+pwd,
     method: 'post',
   })
 }

data-ui/src/api/centerdata_emergency1/mapping.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询企业与巡检项映射列表
 export function listMapping(query) {
   return request({
-    url: '/system/mapping/list',
+    url: '/sooka-sponest-center-data/mapping/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listMapping(query) {
 // 查询企业与巡检项映射详细
 export function getMapping(busEnterpriseId) {
   return request({
-    url: '/system/mapping/' + busEnterpriseId,
+    url: '/sooka-sponest-center-data/mapping/' + busEnterpriseId,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getMapping(busEnterpriseId) {
 // 新增企业与巡检项映射
 export function addMapping(data) {
   return request({
-    url: '/system/mapping',
+    url: '/sooka-sponest-center-data/mapping',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addMapping(data) {
 // 修改企业与巡检项映射
 export function updateMapping(data) {
   return request({
-    url: '/system/mapping',
+    url: '/sooka-sponest-center-data/mapping',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateMapping(data) {
 // 删除企业与巡检项映射
 export function delMapping(busEnterpriseId) {
   return request({
-    url: '/system/mapping/' + busEnterpriseId,
+    url: '/sooka-sponest-center-data/mapping/' + busEnterpriseId,
     method: 'delete'
   })
 }

data-ui/src/api/centerdata_emergency1/material.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询物资列表
 export function listMaterial(query) {
   return request({
-    url: '/system/material/list',
+    url: '/sooka-sponest-center-data/material/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listMaterial(query) {
 // 查询物资详细
 export function getMaterial(materialId) {
   return request({
-    url: '/system/material/' + materialId,
+    url: '/sooka-sponest-center-data/material/' + materialId,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getMaterial(materialId) {
 // 新增物资
 export function addMaterial(data) {
   return request({
-    url: '/system/material',
+    url: '/sooka-sponest-center-data/material',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addMaterial(data) {
 // 修改物资
 export function updateMaterial(data) {
   return request({
-    url: '/system/material',
+    url: '/sooka-sponest-center-data/material',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateMaterial(data) {
 // 删除物资
 export function delMaterial(materialId) {
   return request({
-    url: '/system/material/' + materialId,
+    url: '/sooka-sponest-center-data/material/' + materialId,
     method: 'delete'
   })
 }

data-ui/src/api/centerdata_emergency1/patrolstation.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询巡更点列表
 export function listPatrolstation(query) {
   return request({
-    url: '/system/patrolstation/list',
+    url: '/sooka-sponest-center-data/patrolstation/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listPatrolstation(query) {
 // 查询巡更点详细
 export function getPatrolstation(busPatrolstationId) {
   return request({
-    url: '/system/patrolstation/' + busPatrolstationId,
+    url: '/sooka-sponest-center-data/patrolstation/' + busPatrolstationId,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getPatrolstation(busPatrolstationId) {
 // 新增巡更点
 export function addPatrolstation(data) {
   return request({
-    url: '/system/patrolstation',
+    url: '/sooka-sponest-center-data/patrolstation',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addPatrolstation(data) {
 // 修改巡更点
 export function updatePatrolstation(data) {
   return request({
-    url: '/system/patrolstation',
+    url: '/sooka-sponest-center-data/patrolstation',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updatePatrolstation(data) {
 // 删除巡更点
 export function delPatrolstation(busPatrolstationId) {
   return request({
-    url: '/system/patrolstation/' + busPatrolstationId,
+    url: '/sooka-sponest-center-data/patrolstation/' + busPatrolstationId,
     method: 'delete'
   })
 }

data-ui/src/api/centerdata_emergency1/team.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询救援队伍列表
 export function listTeam(query) {
   return request({
-    url: '/system/team/list',
+    url: '/sooka-sponest-center-data/team/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listTeam(query) {
 // 查询救援队伍详细
 export function getTeam(teamId) {
   return request({
-    url: '/system/team/' + teamId,
+    url: '/sooka-sponest-center-data/team/' + teamId,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getTeam(teamId) {
 // 新增救援队伍
 export function addTeam(data) {
   return request({
-    url: '/system/team',
+    url: '/sooka-sponest-center-data/team',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addTeam(data) {
 // 修改救援队伍
 export function updateTeam(data) {
   return request({
-    url: '/system/team',
+    url: '/sooka-sponest-center-data/team',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateTeam(data) {
 // 删除救援队伍
 export function delTeam(teamId) {
   return request({
-    url: '/system/team/' + teamId,
+    url: '/sooka-sponest-center-data/team/' + teamId,
     method: 'delete'
   })
 }

data-ui/src/api/centerdata_emergency1/track.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询进度列表
 export function listTrack(query) {
   return request({
-    url: '/system/track/list',
+    url: '/sooka-sponest-center-data/track/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listTrack(query) {
 // 查询进度详细
 export function getTrack(busTrackId) {
   return request({
-    url: '/system/track/' + busTrackId,
+    url: '/sooka-sponest-center-data/track/' + busTrackId,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getTrack(busTrackId) {
 // 新增进度
 export function addTrack(data) {
   return request({
-    url: '/system/track',
+    url: '/sooka-sponest-center-data/track',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addTrack(data) {
 // 修改进度
 export function updateTrack(data) {
   return request({
-    url: '/system/track',
+    url: '/sooka-sponest-center-data/track',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateTrack(data) {
 // 删除进度
 export function delTrack(busTrackId) {
   return request({
-    url: '/system/track/' + busTrackId,
+    url: '/sooka-sponest-center-data/track/' + busTrackId,
     method: 'delete'
   })
 }

data-ui/src/api/centerdata_emergency1/user.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询微信用户列表
 export function listUser(query) {
   return request({
-    url: '/system/wechatuser/list',
+    url: '/sooka-sponest-center-data/wechatuser/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listUser(query) {
 // 查询微信用户详细
 export function getUser(wechaId) {
   return request({
-    url: '/system/wechatuser/' + wechaId,
+    url: '/sooka-sponest-center-data/wechatuser/' + wechaId,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getUser(wechaId) {
 // 新增微信用户
 export function addUser(data) {
   return request({
-    url: '/system/weachatuser',
+    url: '/sooka-sponest-center-data/weachatuser',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addUser(data) {
 // 修改微信用户
 export function updateUser(data) {
   return request({
-    url: '/system/wechatuser',
+    url: '/sooka-sponest-center-data/wechatuser',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateUser(data) {
 // 删除微信用户
 export function delUser(wechaId) {
   return request({
-    url: '/system/wechatuser/' + wechaId,
+    url: '/sooka-sponest-center-data/wechatuser/' + wechaId,
     method: 'delete'
   })
 }

data-ui/src/api/centerdata_emergency1/warehouse.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询仓库列表
 export function listWarehouse(query) {
   return request({
-    url: '/system/warehouse/list',
+    url: '/sooka-sponest-center-data/warehouse/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listWarehouse(query) {
 // 查询仓库详细
 export function getWarehouse(warehouseId) {
   return request({
-    url: '/system/warehouse/' + warehouseId,
+    url: '/sooka-sponest-center-data/warehouse/' + warehouseId,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getWarehouse(warehouseId) {
 // 新增仓库
 export function addWarehouse(data) {
   return request({
-    url: '/system/warehouse',
+    url: '/sooka-sponest-center-data/warehouse',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addWarehouse(data) {
 // 修改仓库
 export function updateWarehouse(data) {
   return request({
-    url: '/system/warehouse',
+    url: '/sooka-sponest-center-data/warehouse',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateWarehouse(data) {
 // 删除仓库
 export function delWarehouse(warehouseId) {
   return request({
-    url: '/system/warehouse/' + warehouseId,
+    url: '/sooka-sponest-center-data/warehouse/' + warehouseId,
     method: 'delete'
   })
 }

src/main/java/com/sooka/sponest/data/emergency/appmin/enterprise/controller/AppEnterpriseController.java

@@ -5,8 +5,7 @@ import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.sooka.sponest.data.emergency.appmin.enterprise.domain.AppEnterpriseVO;
 import com.sooka.sponest.data.emergency.appmin.enterprise.service.AppEnterpriseService;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -84,8 +83,8 @@ public class AppEnterpriseController extends BaseController {
         return appEnterpriseService.addEnterprise(vo);
     }
 
-    @RequestMapping("updateEnterprise")
-    public AjaxResult updateEnterprise(AppEnterpriseVO vo) {
+    @PostMapping("updateEnterprise")
+    public AjaxResult updateEnterprise(@RequestBody AppEnterpriseVO vo) {
         return appEnterpriseService.updateEnterprise(vo);
     }
 

src/main/java/com/sooka/sponest/data/emergency/appmin/patrolstation/controller/AppPatrolstationController.java

@@ -1,39 +1,46 @@
 package com.sooka.sponest.data.emergency.appmin.patrolstation.controller;
 
+import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.sooka.sponest.data.digitalwater.domain.CenterdataTHydraulicChannelBlueline;
 import com.sooka.sponest.data.emergency.appmin.patrolstation.domain.AppPatrolstationVO;
 import com.sooka.sponest.data.emergency.appmin.patrolstation.service.AppPatrolstationService;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.sooka.sponest.data.emergency.domain.TBusPatrolstation;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @RestController
 @RequestMapping("AppPatrolstationController")
-public class AppPatrolstationController {
+public class AppPatrolstationController extends BaseController {
 
     @Resource
     AppPatrolstationService appPatrolstationService;
 
     @RequestMapping("addPatrolstation")
-    public AjaxResult addPatrolstation(AppPatrolstationVO vo){
+    public AjaxResult addPatrolstation(@RequestBody AppPatrolstationVO vo){
         return appPatrolstationService.addPatrolstation(vo);
     }
-    @RequestMapping("getPatrolstationList")
+
+    @GetMapping("getPatrolstationList")
     public AjaxResult getPatrolstationList(AppPatrolstationVO vo){
-        return appPatrolstationService.getPatrolstationList(vo);
+        startPage();
+        List<TBusPatrolstation> list = appPatrolstationService.getPatrolstationList(vo);
+        return AjaxResult.success(getDataTable(list).getRows());
     }
+
     @RequestMapping("getPatrolstationDetail")
     public AjaxResult getPatrolstationDetail(AppPatrolstationVO vo){
         return appPatrolstationService.getPatrolstationDetail(vo);
     }
 
-    @RequestMapping("edittPatrolstationList")
-    public AjaxResult edittPatrolstationList(AppPatrolstationVO vo){
+    @PostMapping("edittPatrolstationList")
+    public AjaxResult edittPatrolstationList(@RequestBody AppPatrolstationVO vo){
         return appPatrolstationService.edittPatrolstationList(vo);
     }
     @RequestMapping("deletePatrolstationList")
-    public AjaxResult deletePatrolstationList(AppPatrolstationVO vo){
+    public AjaxResult deletePatrolstationList(@RequestBody AppPatrolstationVO vo){
         return appPatrolstationService.deletePatrolstationList(vo);
     }
 

src/main/java/com/sooka/sponest/data/emergency/appmin/patrolstation/service/AppPatrolstationService.java

@@ -2,12 +2,15 @@ package com.sooka.sponest.data.emergency.appmin.patrolstation.service;
 
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.sooka.sponest.data.emergency.appmin.patrolstation.domain.AppPatrolstationVO;
+import com.sooka.sponest.data.emergency.domain.TBusPatrolstation;
+
+import java.util.List;
 
 public interface AppPatrolstationService {
 
     public AjaxResult addPatrolstation(AppPatrolstationVO vo);
 
-    public AjaxResult getPatrolstationList(AppPatrolstationVO vo);
+    public List<TBusPatrolstation> getPatrolstationList(AppPatrolstationVO vo);
 
     public AjaxResult edittPatrolstationList(AppPatrolstationVO vo);
 

src/main/java/com/sooka/sponest/data/emergency/appmin/patrolstation/service/impl/AppPatrolstationServiceImpl.java

@@ -4,6 +4,7 @@ import com.ruoyi.common.core.utils.uuid.UUID;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.datascope.annotation.DataScope;
 import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
+import com.sooka.sponest.data.digitalwater.domain.CenterdataTHydraulicChannelBlueline;
 import com.sooka.sponest.data.emergency.appmin.base.AppBaseService;
 import com.sooka.sponest.data.emergency.appmin.patrolstation.domain.AppPatrolstationVO;
 import com.sooka.sponest.data.emergency.appmin.patrolstation.service.AppPatrolstationService;
@@ -57,17 +58,12 @@ public class AppPatrolstationServiceImpl extends BaseServiceImpl implements AppP
     }
 
     @Override
-    public AjaxResult getPatrolstationList(AppPatrolstationVO vo) {
-        try {
-            TBusPatrolstation tBusPatrolstation = new TBusPatrolstation();
-            tBusPatrolstation.setBusEnterpriseId(vo.getBusEnterpriseId());
-            tBusPatrolstation.setSearchValue(vo.getSearchValue());
-            List patrolstation_list = tBusPatrolstationMapper.selectTBusPatrolstationList(tBusPatrolstation);
-            return AjaxResult.success(patrolstation_list);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return AjaxResult.error("查询失败");
-        }
+    public List<TBusPatrolstation> getPatrolstationList(AppPatrolstationVO vo) {
+        TBusPatrolstation tBusPatrolstation = new TBusPatrolstation();
+        tBusPatrolstation.setBusEnterpriseId(vo.getBusEnterpriseId());
+        tBusPatrolstation.setSearchValue(vo.getSearchValue());
+        return tBusPatrolstationMapper.selectTBusPatrolstationList(tBusPatrolstation);
+
     }
 
     @Override

src/main/java/com/sooka/sponest/data/emergency/appmin/xunjian/controller/AppXunjianController.java

@@ -25,7 +25,7 @@ public class AppXunjianController {
         return AjaxResult.success(appXunjianService.getXunjianItems(vo));
     }
 
-    @RequestMapping("submitXunjian")
+    @PostMapping("submitXunjian")
     public AjaxResult submitXunjian(@RequestBody AppXunjianVO vo) {
         return appXunjianService.submitXunjian(vo);
     }

src/main/java/com/sooka/sponest/data/emergency/appmin/xunjian/service/impl/AppXunjianServiceImpl.java

@@ -4,14 +4,12 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ruoyi.common.core.utils.uuid.UUID;
 import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.datascope.annotation.DataScope;
 import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.RemoteConfigService;
 import com.ruoyi.system.api.domain.SysDept;
 import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.api.model.LoginUser;
-import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
 import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
-import com.sooka.sponest.data.emergency.appmin.base.AppBaseService;
 import com.sooka.sponest.data.emergency.appmin.enterprise.domain.AppEnterpriseVO;
 import com.sooka.sponest.data.emergency.appmin.util.ImageUtil;
 import com.sooka.sponest.data.emergency.appmin.xunjian.domain.*;
@@ -69,6 +67,9 @@ public class AppXunjianServiceImpl extends BaseServiceImpl implements AppXunjian
     @Autowired
     private RemoteSystemBaseService remoteSystemBaseService;
 
+    @Autowired
+    private RemoteConfigService remoteConfigService;
+
 
     @Override
     public AjaxResult getXunjianItems(AppXunjianVO vo) {
@@ -133,7 +134,7 @@ public class AppXunjianServiceImpl extends BaseServiceImpl implements AppXunjian
         //是否有限期整改的
         Boolean haveXQZG = false;//限期整改
         Boolean haveLCLG = false;//立查立改
-        String pictures_local_path = remoteSystemBaseService.configKeyapp("pictures_local_path").get("code").toString();
+        String pictures_local_path = remoteConfigService.remotegetConfigKey("appUrl").getData();
         Date createTime = new Date();
         try {
             //取得登录人信息
@@ -191,7 +192,7 @@ public class AppXunjianServiceImpl extends BaseServiceImpl implements AppXunjian
                         tBusTrack.setBusTrackId(UUID.fastUUID().toString());
                         tBusTrack.setBusLogId(logId);
                         tBusTrack.setBusInspectionId(busInspectionId);
-                        tBusTrack.setDeptId(sysUser.getSysUser().getDept().getDeptId());
+                        tBusTrack.setDeptId(sysUser.getSysUser().getDeptId());
                         tBusTrack.setUserId(sysUser.getSysUser().getUserId());
                         tBusTrack.setRiskStatus("risk_status_0");
                         tBusTrack.setBusTrackContent(listDataBO.getBusTrackContent());
@@ -260,7 +261,7 @@ public class AppXunjianServiceImpl extends BaseServiceImpl implements AppXunjian
             tBusDept.setDeptId(sysUser.getSysUser().getDeptId());
             tBusDept.setUserId(sysUser.getUserid());
             tBusDept.setCreateTime(new Date());
-            tBusDept.setDeptType(sysUser.getSysUser().getDept().getDeptType());
+            tBusDept.setDeptType(sysUser.getSysUser().getDepts().get(0).getDeptType());
             tBusDeptMapper.insertTBusDept(tBusDept);
 
             result.put("logId", logId);

src/main/resources/mapper/emergency/system/TBusMaterialMapper.xml

@@ -49,8 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ifnull(m.technology,'') technology,
         m.production_date production_date,
         ifnull(m.connector,'') connector,
-        ifnull(m.connector_phone,'') connector_phone,
-        ifnull(m.remark,'') remark
+        ifnull(m.connector_phone,'') connector_phone
         from t_bus_material m,t_bus_warehouse w
         <where>
             m.warehouse_id = w.warehouse_id