luhaojie/agricultural-monitoring-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设备在线率统计等

Browse Source
This commit is contained in:
mi9688
2024-11-26 13:45:08 +08:00
parent eda321d9d8
commit 45b3381eb2
9 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/ServerController.java
View File

@ -20,7 +20,7 @@ import com.fastbee.framework.web.domain.Server;
public class ServerController
{
@ApiOperation("获取服务器信息")
@PreAuthorize("@ss.hasPermi('monitor:server:list')")
// @PreAuthorize("@ss.hasPermi('monitor:server:list')")
@GetMapping()
public AjaxResult getInfo() throws Exception
{

2
fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysNoticeController.java
View File

@ -40,7 +40,7 @@ public class SysNoticeController extends BaseController
* 获取通知公告列表
*/
@ApiOperation("获取通知公告列表")
@PreAuthorize("@ss.hasPermi('system:notice:list')")
// @PreAuthorize("@ss.hasPermi('system:notice:list')")
@GetMapping("/list")
public TableDataInfo list(SysNotice notice)
{

2
fastbee-framework/src/main/java/com/fastbee/framework/config/ResourcesConfig.java
View File

@ -61,7 +61,7 @@ public class ResourcesConfig implements WebMvcConfigurer
"/tool/gen/**");
//配置项目数据隔离拦截器
registry.addInterceptor(projectDataIsolationInterceptor)
.addPathPatterns("/gis/groups/**", "/gis/legend/**","/gis/site/**","/project/**","/system/**");
.addPathPatterns("/gis/groups/**", "/gis/legend/**","/gis/site/**","/project/**","/system/**","/device/statistics/**");
}
/**

1
fastbee-framework/src/main/java/com/fastbee/framework/config/SecurityConfig.java
View File

@ -131,6 +131,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
//安防小板
.antMatchers("/iot/photos","/iot/photos/**","/yinghsiyun/webhook").permitAll()
.antMatchers("/test/**/*").permitAll()
.antMatchers("/prod-api/**").permitAll()
.antMatchers("/system/district/tree").permitAll()
// 除上面外的所有请求全部需要鉴权认证
.anyRequest().authenticated()

2
fastbee-open-api/src/main/java/com/fastbee/data/controller/AlertLogController.java
View File

@ -51,7 +51,7 @@ public class AlertLogController extends BaseController
* 查询设备告警列表
*/
@ApiOperation("查询设备告警列表")
@PreAuthorize("@ss.hasPermi('iot:alertLog:list')")
// @PreAuthorize("@ss.hasPermi('iot:alertLog:list')")
@GetMapping("/list")
public TableDataInfo list(AlertLog alertLog)
{

12
fastbee-open-api/src/main/java/com/fastbee/data/controller/xunjian/XjInspectionRecordsController.java
View File

@ -31,7 +31,7 @@ public class XjInspectionRecordsController extends BaseController
/**
* 查询记录列表
*/
@PreAuthorize("@ss.hasPermi('inspection:records:list')")
// @PreAuthorize("@ss.hasPermi('inspection:records:list')")
@GetMapping("/list")
public TableDataInfo list(XjInspectionRecords klxjInspectionRecords)
{
@ -44,7 +44,7 @@ public class XjInspectionRecordsController extends BaseController
/**
* 导出记录列表
*/
@PreAuthorize("@ss.hasPermi('inspection:records:export')")
// @PreAuthorize("@ss.hasPermi('inspection:records:export')")
@Log(title = "记录", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, XjInspectionRecords klxjInspectionRecords)
@ -57,7 +57,7 @@ public class XjInspectionRecordsController extends BaseController
/**
* 获取记录详细信息
*/
@PreAuthorize("@ss.hasPermi('inspection:records:query')")
// @PreAuthorize("@ss.hasPermi('inspection:records:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@ -67,7 +67,7 @@ public class XjInspectionRecordsController extends BaseController
/**
* 新增记录
*/
@PreAuthorize("@ss.hasPermi('inspection:records:add')")
// @PreAuthorize("@ss.hasPermi('inspection:records:add')")
@Log(title = "记录", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody XjInspectionRecords klxjInspectionRecords)
@ -78,7 +78,7 @@ public class XjInspectionRecordsController extends BaseController
/**
* 修改记录
*/
@PreAuthorize("@ss.hasPermi('inspection:records:edit')")
// @PreAuthorize("@ss.hasPermi('inspection:records:edit')")
@Log(title = "记录", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody XjInspectionRecords klxjInspectionRecords)
@ -89,7 +89,7 @@ public class XjInspectionRecordsController extends BaseController
/**
* 删除记录
*/
@PreAuthorize("@ss.hasPermi('inspection:records:remove')")
// @PreAuthorize("@ss.hasPermi('inspection:records:remove')")
@Log(title = "记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)

4
fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/timer/DeviceDateTask.java
View File

@ -91,8 +91,10 @@ public class DeviceDateTask {
*/
public void getDevLinkMoistureDeviceRealtimeData() throws Exception{
DeviceRealtimedataMoisture deviceRealtimedataMoisture = moistureDataService.setData(moistureDataService.getDeviceRealTimeData("3270"));
DeviceRealtimedataMoisture deviceRealtimedataMoisture1 = moistureDataService.setData(moistureDataService.getDeviceRealTimeData("3271"));
int i = deviceRealtimedataMoistureMapper.insert(deviceRealtimedataMoisture);
if (i<1)
int i1 = deviceRealtimedataMoistureMapper.insert(deviceRealtimedataMoisture1);
if (i<1||i1<1)
System.out.println("插入数据失败!");
}

2
fastbee-service/fastbee-project-service/src/main/java/com/fastbee/project/domain/vo/ProjectLoginBaseInfo.java
View File

@ -32,4 +32,6 @@ public class ProjectLoginBaseInfo {
private BigDecimal longitude;
// 项目的行政区划中心点纬度
private BigDecimal latitude;
// 项目类型
private Long projectType;
}

4
fastbee-service/fastbee-project-service/src/main/java/com/fastbee/project/service/impl/ProjectServiceImpl.java
View File

@ -426,7 +426,7 @@ public class ProjectServiceImpl implements IProjectService
//查询该管理员所管理的项目id以及子项目id列表
Project project = new LambdaQueryChainWrapper<>(projectMapper)
.select(Project::getId, Project::getProjectName,Project::getLevel,Project::getDeptId
,Project::getCityCode,Project::getCountyCode)
,Project::getCityCode,Project::getCountyCode,Project::getType)
.eq(Project::getId, sysDept.getProjectId())
.one();
if(Objects.isNull(project)){
@ -443,6 +443,8 @@ public class ProjectServiceImpl implements IProjectService
projectLoginBaseInfo.setProjectId(project.getId());
//设置项目名称
projectLoginBaseInfo.setProjectName(project.getProjectName());
//设置项目类型
projectLoginBaseInfo.setProjectType(project.getType());
//根据项目级别获取对应的行政区划编码
if(project.getLevel().equals("市级")){