From 2c36c61b8bc71f9b03484d61da0d208294b08ba6 Mon Sep 17 00:00:00 2001 From: guo Date: Thu, 28 Mar 2024 18:25:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=9F=E6=88=B7=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BaseModuleController.java | 13 +++- .../controller/CompanyController.java | 13 +++- .../modules/basicdata/entity/BaseModule.java | 4 +- .../basicdata/mapper/BaseMenuMapper.java | 4 ++ .../basicdata/mapper/BaseModuleMapper.java | 8 +++ .../basicdata/mapper/xml/BaseMenuMapper.xml | 19 +++++- .../basicdata/mapper/xml/BaseModuleMapper.xml | 7 ++ .../basicdata/service/IBaseMenuService.java | 16 ++++- .../basicdata/service/IBaseModuleService.java | 3 + .../basicdata/service/ICompanyService.java | 5 +- .../service/impl/BaseMenuServiceImpl.java | 26 +++++--- .../service/impl/BaseModuleServiceImpl.java | 11 ++++ .../service/impl/CompanyServiceImpl.java | 65 ++++++++++++++++++- .../service/impl/SystemUserServiceImpl.java | 14 ++++ ...eriorScaffoldingCurrentDataController.java | 4 +- .../entity/qo/CurrentDataListQO.java | 3 + .../ExteriorScaffoldingCurrentDataMapper.java | 5 +- .../ExteriorScaffoldingCurrentDataMapper.xml | 3 + ...ExteriorScaffoldingCurrentDataService.java | 4 +- ...riorScaffoldingCurrentDataServiceImpl.java | 8 +-- .../service/impl/XzRegistryServiceImpl.java | 17 ++++- .../zhgd/xmgl/security/WebSecurityConfig.java | 4 ++ 22 files changed, 226 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/BaseModuleController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/BaseModuleController.java index 7d9f2742e..f8f552332 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/BaseModuleController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/BaseModuleController.java @@ -14,7 +14,9 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -175,11 +177,20 @@ public class BaseModuleController { } /** - * 复制模块和菜单（copy一份模块系统版本） + * 测试：复制模块和菜单（copy一份模块系统版本） */ @GetMapping("copyModuleAndMenu") public void copyModuleAndMenu() { baseModuleService.copyModuleAndMenu(); } + @ApiOperation(value = "查询项目配置的模块和菜单列表", notes = "查询项目配置的模块和菜单列表", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + }) + @PostMapping(value = "/getModuleAndMenuList") + public Result> getModuleAndMenuList(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(baseModuleService.getModuleAndMenuList(paramMap)); + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/CompanyController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/CompanyController.java index 89a403528..9ae24996b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/CompanyController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/CompanyController.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.basicdata.controller; +import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; @@ -200,8 +201,8 @@ public class CompanyController { @ApiImplicitParam(name = "projectType", value = "是否展示，0否，1是", paramType = "body", required = true, dataType = "String"), }) @PostMapping("/getComapnyStatisticsList") - public Result> getComapnyStatisticsList(@RequestBody Map map) { - return Result.success(companyService.getComapnyStatisticsList(map)); + public Result> getCompanyStatisticsList(@RequestBody Map map) { + return Result.success(companyService.getCompanyStatisticsList(map)); } @ApiOperation(value = "查询企业下项目视频列表统计", notes = "查询企业下项目视频列表统计") @@ -285,4 +286,12 @@ public class CompanyController { return Result.ok(); } + @ApiOperation(value = "查询新用户（租户）的所属的组织的tree列表（包含企业和项目）", notes = "查询新用户（租户）的所属的组织的tree列表（包含企业和项目）", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "userId", value = "用户id", paramType = "body", required = true, dataType = "String"), + }) + @PostMapping(value = "/getTenantOrgTreeList") + public Result getTenantOrgTreeList(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(companyService.getTenantOrgTreeList(paramMap)); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/BaseModule.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/BaseModule.java index 573876d60..c8b45ead5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/BaseModule.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/BaseModule.java @@ -51,9 +51,7 @@ public class BaseModule implements Serializable { @ApiModelProperty(value="是否设备中台模块，0否，1是") private java.lang.Integer moduleEquipment; - /**模块类型，1企业模块，2项目模块*/ - @Excel(name = "模块类型，1企业模块，2项目模块", width = 15) - @ApiModelProperty(value="模块类型，1企业模块，2项目后台模块，3企业后台，4项目看板") + @ApiModelProperty(value = "模块类型，1企业模块，2项目后台模块，3企业后台，4项目看板，5项目前台，6供应商") private java.lang.Integer moduleType ; /**图标*/ @Excel(name = "图标", width = 15) diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/BaseMenuMapper.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/BaseMenuMapper.java index c9db82954..f5f0a2bd8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/BaseMenuMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/BaseMenuMapper.java @@ -28,4 +28,8 @@ public interface BaseMenuMapper extends BaseMapper { List selectHeadquartersMenuList(Map param); List selectComapnyUserMenuList(Map param); + + List getSupplierMenuList(Map param); + + List getSupplierActionList(Map param); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/BaseModuleMapper.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/BaseModuleMapper.java index 72f457e69..faaa74922 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/BaseModuleMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/BaseModuleMapper.java @@ -30,4 +30,12 @@ public interface BaseModuleMapper extends BaseMapper { List getModuleList(Map map); Page getModuleListByPage(Page page, @Param("dto") ModuleListPageDto dto); + + /** + * 查询供应商的模块列表 + * + * @param param + * @return + */ + List getSupplierModuleList(Map param); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseMenuMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseMenuMapper.xml index 5d749c4d5..d11d58cc0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseMenuMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseMenuMapper.xml @@ -47,8 +47,25 @@ + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml index 36613c0d1..9f5335163 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml @@ -68,4 +68,11 @@ ORDER BY a.module_type,a.label_sort_num,a.label_name,a.module_id + + diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IBaseMenuService.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IBaseMenuService.java index ba58f7dd0..de5b447e9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IBaseMenuService.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IBaseMenuService.java @@ -1,9 +1,9 @@ package com.zhgd.xmgl.modules.basicdata.service; import com.alibaba.fastjson.JSONArray; +import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.basicdata.entity.BaseMenu; -import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.xmgl.modules.basicdata.entity.BaseModule; import java.util.List; @@ -12,7 +12,7 @@ import java.util.Map; /** * @Description: 系统菜单 * @author： pds - * @date： 2020-10-12 + * @date： 2020-10-12 * @version： V1.0 */ public interface IBaseMenuService extends IService { @@ -25,7 +25,7 @@ public interface IBaseMenuService extends IService { List getProjectModuleGroupMenuList(Map map); - List groupMenu(List list,List actionList); + List groupMenu(List list, List actionList); List getProjectUserMenuList(Map param); @@ -40,4 +40,14 @@ public interface IBaseMenuService extends IService { void editBaseMenu(BaseMenu baseMenu); JSONArray selectGroupList(Map map); + + /** + * 查询供应商的菜单列表 + * + * @param param + * @return + */ + List getSupplierMenuList(Map param); + + List getSupplierActionList(Map param); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IBaseModuleService.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IBaseModuleService.java index 15343b8dd..2699d416b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IBaseModuleService.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IBaseModuleService.java @@ -5,6 +5,7 @@ import com.zhgd.xmgl.modules.basicdata.entity.dto.ModuleListPageDto; import com.zhgd.xmgl.modules.basicdata.entity.BaseModule; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -27,4 +28,6 @@ public interface IBaseModuleService extends IService { Page getModuleListByPage(ModuleListPageDto dto); void copyModuleAndMenu(); + + Map getModuleAndMenuList(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ICompanyService.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ICompanyService.java index 9ff139fe7..9687c951e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ICompanyService.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ICompanyService.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.basicdata.service; +import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.jeecg.common.mybatis.EntityMap; @@ -41,7 +42,7 @@ public interface ICompanyService extends IService { void addCompany(Company company); - Map getComapnyStatisticsList(Map map); + Map getCompanyStatisticsList(Map map); void editCompanyBySn(Company company); @@ -66,4 +67,6 @@ public interface ICompanyService extends IService { void updateTenantOrg(HashMap paramMap); List getOrgSnListByUserId(HashMap paramMap); + + JSONArray getTenantOrgTreeList(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java index 486ab45a6..b2246f332 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java @@ -52,19 +52,29 @@ public class BaseMenuServiceImpl extends ServiceImpl i @Override public JSONArray selectGroupList(Map map) { - List list=baseMenuMapper.selectBaseMenuList(map); - JSONArray result = ListUtils.listToTree(JSONArray.parseArray(JSON.toJSONString(list)),"menuId","parentId","children"); + List list = baseMenuMapper.selectBaseMenuList(map); + JSONArray result = ListUtils.listToTree(JSONArray.parseArray(JSON.toJSONString(list)), "menuId", "parentId", "children"); return result; } + @Override + public List getSupplierMenuList(Map param) { + return baseMenuMapper.getSupplierMenuList(param); + } + + @Override + public List getSupplierActionList(Map param) { + return baseMenuMapper.getSupplierActionList(param); + } + @Override public Map getProjectModuleAndMenu(Map map) { - map.put("styleType",getStyleType(MapUtils.getString(map,"projectSn"))); - List menuList=baseMenuMapper.getProjectBaseMenuList(map); - List moduleList=baseModuleMapper.getProjectModuleList(map); - Map data=new HashMap<>(); - data.put("menuList",menuList); - data.put("moduleList",moduleList); + map.put("styleType", getStyleType(MapUtils.getString(map, "projectSn"))); + List menuList = baseMenuMapper.getProjectBaseMenuList(map); + List moduleList = baseModuleMapper.getProjectModuleList(map); + Map data = new HashMap<>(); + data.put("menuList", menuList); + data.put("moduleList", moduleList); return data; } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseModuleServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseModuleServiceImpl.java index f348537de..aa337136a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseModuleServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseModuleServiceImpl.java @@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.function.Function; @@ -37,6 +38,8 @@ public class BaseModuleServiceImpl extends ServiceImpl getModuleAndMenuList(HashMap paramMap) { + String projectSn = MapUtils.getString(paramMap, "projectSn"); + CompanyConfig companyConfig = companyConfigMapper.getCompanyConfigByProject(projectSn); + Map menuAuthority = systemUserService.getUserAuthority(null, 5, projectSn, companyConfig.getHeadquartersSn(), companyConfig.getStyleType()); + return menuAuthority; + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java index 44ea82b8b..23023d4cf 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java @@ -1,11 +1,13 @@ package com.zhgd.xmgl.modules.basicdata.service.impl; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializerFeature; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -281,7 +283,7 @@ public class CompanyServiceImpl extends ServiceImpl impl } @Override - public Map getComapnyStatisticsList(Map map) { + public Map getCompanyStatisticsList(Map map) { Map data = new HashMap<>(); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(Company::getCompanySn, MapUtils.getString(map, "sn")); @@ -642,6 +644,67 @@ public class CompanyServiceImpl extends ServiceImpl impl return systemUserMapper.getOrgSnListByUserId(paramMap); } + @Override + public JSONArray getTenantOrgTreeList(HashMap paramMap) { + Long userId = MapUtils.getLong(paramMap, "userId"); + SystemUser systemUser = systemUserMapper.selectById(userId); + if (systemUser == null) { + throw new OpenAlertException("未找到对应实体"); + } + HashMap qm = new HashMap<>(); + qm.put("sn", systemUser.getHeadquartersSn()); + qm.put("projectType", "1"); + Map companyMap = getCompanyStatisticsList(qm); + JSONArray clJa = JSON.parseArray(JSON.toJSONString(MapUtils.getObject(companyMap, "companyList"))); + JSONArray rtJa = new JSONArray(); + if (CollUtil.isEmpty(clJa)) { + return null; + } + List companyProjects = xzSystemUserToCompanyProjectMapper.selectList(new LambdaQueryWrapper() + .eq(XzSystemUserToCompanyProject::getUserId, userId)); + if (CollUtil.isEmpty(companyProjects)) { + return null; + } + Map existSnMap = companyProjects.stream().collect(Collectors.toMap(XzSystemUserToCompanyProject::getSn, a -> a, (t, t2) -> t)); + for (int i = 0; i < clJa.size(); i++) { + JSONObject clJo = clJa.getJSONObject(i); + recursionFilterData(existSnMap, clJo, rtJa); + } + return rtJa; + } + + private void recursionFilterData(Map existSnMap, JSONObject clJo, JSONArray rtJa) { + String sn = getSn(clJo); + if (!existSnMap.containsKey(sn)) { + return; + } else { + rtJa.add(clJo); + } + JSONArray listJa = clJo.getJSONArray("list"); + if (listJa == null || listJa.size() == 0) { + return; + } + JSONArray childrenJa = new JSONArray(); + clJo.put("list", childrenJa); + for (int i = 0; i < listJa.size(); i++) { + JSONObject lja = listJa.getJSONObject(i); + recursionFilterData(existSnMap, lja, childrenJa); + } + } + + private String getSn(JSONObject clJo) { + String projectSn = clJo.getString("projectSn"); + String sn = null; + if (StringUtils.isNotBlank(projectSn)) { + //项目 + sn = projectSn; + } else { + //企业 + sn = clJo.getString("companySn"); + } + return sn; + } + private void insertTenantOrg(String sns, int type, Long userId) { if (StringUtils.isNotBlank(sns)) { String[] snArr = StringUtils.split(sns, ","); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java index a735e6dde..5cfa431f2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java @@ -238,6 +238,9 @@ public class SystemUserServiceImpl extends ServiceImpl page = exteriorScaffoldingCurrentDataService.selectExteriorScaffoldingCurrentDataList(currentDataListQO.getProjectSn() , measurePointNumber, sensorSn, currentDataListQO.getExteriorScaffoldingEngineeringToMonitorTypeId(), currentDataListQO.getStartTime() - , currentDataListQO.getEndTime(), currentDataListQO.getAlarmState(), currentDataListQO.getPageNo(), currentDataListQO.getPageSize()); + , currentDataListQO.getEndTime(), currentDataListQO.getAlarmState(), currentDataListQO.getPageNo(), currentDataListQO.getPageSize(), currentDataListQO.getExteriorScaffoldingEngineeringId()); currentDataListVO.setData(page); if (StringUtils.isNotBlank(sensorSn)) { List records = page.getRecords(); @@ -169,7 +169,7 @@ public class ExteriorScaffoldingCurrentDataController { @GetMapping(value = "/exportData") public void exportData(HttpServletResponse response, CurrentDataListQO currentDataListQO) { exteriorScaffoldingCurrentDataService.exportData(response, currentDataListQO.getProjectSn(), currentDataListQO.getMeasurePointNumber(), currentDataListQO.getSensorSn(), currentDataListQO.getExteriorScaffoldingEngineeringToMonitorTypeId() - , currentDataListQO.getStartTime(), currentDataListQO.getEndTime(), currentDataListQO.getAlarmState()); + , currentDataListQO.getStartTime(), currentDataListQO.getEndTime(), currentDataListQO.getAlarmState(), currentDataListQO.getExteriorScaffoldingEngineeringId()); } @ApiOperation(value = "gxlt大屏导出", notes = "gxlt大屏导出", httpMethod = "POST") diff --git a/src/main/java/com/zhgd/xmgl/modules/exteriorscaffolding/entity/qo/CurrentDataListQO.java b/src/main/java/com/zhgd/xmgl/modules/exteriorscaffolding/entity/qo/CurrentDataListQO.java index 5b7c51089..fb04a4fcc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/exteriorscaffolding/entity/qo/CurrentDataListQO.java +++ b/src/main/java/com/zhgd/xmgl/modules/exteriorscaffolding/entity/qo/CurrentDataListQO.java @@ -32,4 +32,7 @@ public class CurrentDataListQO extends PageQO { @ApiModelProperty(value = "报警状态 1.正常 2.超报警 3.超控制 4.变化速率报警", required = false) private Integer alarmState; + + @ApiModelProperty(value = "外墙脚手架自动化监测系统-工程id", required = false) + private String exteriorScaffoldingEngineeringId; } diff --git a/src/main/java/com/zhgd/xmgl/modules/exteriorscaffolding/mapper/ExteriorScaffoldingCurrentDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/exteriorscaffolding/mapper/ExteriorScaffoldingCurrentDataMapper.java index 9fb2a37e7..5a4166317 100644 --- a/src/main/java/com/zhgd/xmgl/modules/exteriorscaffolding/mapper/ExteriorScaffoldingCurrentDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/exteriorscaffolding/mapper/ExteriorScaffoldingCurrentDataMapper.java @@ -28,7 +28,10 @@ public interface ExteriorScaffoldingCurrentDataMapper extends BaseMapper selectExteriorScaffoldingCurrentDataList(@Param("projectSn") String projectSn, @Param("measurePointNumber") String measurePointNumber, @Param("sensorSn") String sensorSn, @Param("exteriorScaffoldingEngineeringToMonitorTypeId") Long exteriorScaffoldingEngineeringToMonitorTypeId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("alarmState") Integer alarmState, Page tPage); + IPage selectExteriorScaffoldingCurrentDataList(@Param("projectSn") String projectSn, @Param("measurePointNumber") String measurePointNumber, + @Param("sensorSn") String sensorSn, @Param("exteriorScaffoldingEngineeringToMonitorTypeId") Long exteriorScaffoldingEngineeringToMonitorTypeId, + @Param("startTime") String startTime, @Param("endTime") String endTime, + @Param("alarmState") Integer alarmState, Page tPage, @Param("exteriorScaffoldingEngineeringId") String exteriorScaffoldingEngineeringId); List selectArticleOneDataList(Set sensorSnList); diff --git a/src/main/java/com/zhgd/xmgl/modules/exteriorscaffolding/mapper/xml/ExteriorScaffoldingCurrentDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/exteriorscaffolding/mapper/xml/ExteriorScaffoldingCurrentDataMapper.xml index 7b7ad132b..a6cafb5fb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/exteriorscaffolding/mapper/xml/ExteriorScaffoldingCurrentDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/exteriorscaffolding/mapper/xml/ExteriorScaffoldingCurrentDataMapper.xml @@ -128,6 +128,9 @@ and decd.alarm_state = #{alarmState} + + and dee.id = #{exteriorScaffoldingEngineeringId} + order by decd.receive_time desc diff --git a/src/main/java/com/zhgd/xmgl/modules/exteriorscaffolding/service/IExteriorScaffoldingCurrentDataService.java b/src/main/java/com/zhgd/xmgl/modules/exteriorscaffolding/service/IExteriorScaffoldingCurrentDataService.java index 59461f423..b4e17bcaa 100644 --- a/src/main/java/com/zhgd/xmgl/modules/exteriorscaffolding/service/IExteriorScaffoldingCurrentDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/exteriorscaffolding/service/IExteriorScaffoldingCurrentDataService.java @@ -33,7 +33,7 @@ public interface IExteriorScaffoldingCurrentDataService extends IService selectExteriorScaffoldingCurrentDataList(String projectSn, String measurePointNumber, String sensorSn, Long exteriorScaffoldingEngineeringToMonitorTypeId, String startTime, String endTime, Integer alarmState, Integer pageNo, Integer pageSize); + IPage selectExteriorScaffoldingCurrentDataList(String projectSn, String measurePointNumber, String sensorSn, Long exteriorScaffoldingEngineeringToMonitorTypeId, String startTime, String endTime, Integer alarmState, Integer pageNo, Integer pageSize, String exteriorScaffoldingEngineeringId); /** * 获取所有传感器最后一条数据时间 @@ -44,7 +44,7 @@ public interface IExteriorScaffoldingCurrentDataService extends IService selectExteriorScaffoldingCurrentDataList(String projectSn, String measurePointNumber, String sensorSn, Long exteriorScaffoldingEngineeringToMonitorTypeId, String startTime, String endTime, Integer alarmState, Integer pageNo, Integer pageSize) { - IPage page = exteriorScaffoldingCurrentDataMapper.selectExteriorScaffoldingCurrentDataList(projectSn, measurePointNumber, sensorSn, exteriorScaffoldingEngineeringToMonitorTypeId, startTime, endTime, alarmState, new Page<>(pageNo, pageSize)); + public IPage selectExteriorScaffoldingCurrentDataList(String projectSn, String measurePointNumber, String sensorSn, Long exteriorScaffoldingEngineeringToMonitorTypeId, String startTime, String endTime, Integer alarmState, Integer pageNo, Integer pageSize, String exteriorScaffoldingEngineeringId) { + IPage page = exteriorScaffoldingCurrentDataMapper.selectExteriorScaffoldingCurrentDataList(projectSn, measurePointNumber, sensorSn, exteriorScaffoldingEngineeringToMonitorTypeId, startTime, endTime, alarmState, new Page<>(pageNo, pageSize), exteriorScaffoldingEngineeringId); for (ExteriorScaffoldingCurrentData currentData : page.getRecords()) { currentData.setLastTimeData(NumberUtil.sub(Optional.ofNullable(currentData.getData()).orElse(0f), Optional.ofNullable(currentData.getDataThis()).orElse(0f)).floatValue()); } @@ -113,9 +113,9 @@ public class ExteriorScaffoldingCurrentDataServiceImpl extends ServiceImpl list = exteriorScaffoldingCurrentDataMapper.selectExteriorScaffoldingCurrentDataList(projectSn, measurePointNumber, sensorSn, exteriorScaffoldingEngineeringToMonitorTypeId, startTime, endTime, alarmState, new Page<>().setSize(-1)).getRecords(); + List list = exteriorScaffoldingCurrentDataMapper.selectExteriorScaffoldingCurrentDataList(projectSn, measurePointNumber, sensorSn, exteriorScaffoldingEngineeringToMonitorTypeId, startTime, endTime, alarmState, new Page<>().setSize(-1), exteriorScaffoldingEngineeringId).getRecords(); for (ExteriorScaffoldingCurrentData currentData : list) { currentData.setLastTimeData(NumberUtil.sub(Optional.ofNullable(currentData.getData()).orElse(0f), Optional.ofNullable(currentData.getDataThis()).orElse(0f)).floatValue()); currentData.setAlarmStateStr(DataStatusEnum.getStatusNameById(currentData.getAlarmState())); diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzRegistryServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzRegistryServiceImpl.java index 5d25a4641..7f2822d58 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzRegistryServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzRegistryServiceImpl.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.xz.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -7,7 +8,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.modules.basicdata.entity.SystemLogoConfig; import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; +import com.zhgd.xmgl.modules.basicdata.mapper.SystemLogoConfigMapper; import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper; import com.zhgd.xmgl.modules.basicdata.service.ICompanyService; import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService; @@ -38,6 +41,8 @@ public class XzRegistryServiceImpl extends ServiceImpl queryPageList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); @@ -79,6 +85,14 @@ public class XzRegistryServiceImpl extends ServiceImpl().eq(SystemLogoConfig::getHeadquartersSn, "-1")); + if (StrUtil.isBlank(slc.getDefaultApprovalCompanySn())) { + throw new OpenAlertException("请先配置默认审批公司"); + } + xz.setHeadquartersSn(slc.getDefaultApprovalCompanySn()); + } if (Objects.equals(xz.getAccountType(), 2)) { //供应商不用审批 SystemUser su = new SystemUser(); @@ -129,8 +143,9 @@ public class XzRegistryServiceImpl extends ServiceImpl map = new HashMap<>(); map.put("userId", userId); map.put("projectSns", projectSns); diff --git a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java index fff7e5def..d03049002 100644 --- a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java +++ b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java @@ -342,6 +342,10 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { .antMatchers("/xmgl/frontierProtectionNoNetDev/countFrontierProtectionNoNetDev").permitAll() .antMatchers("/xmgl/frontierProtectionNoNetData/getTrendData").permitAll() .antMatchers("/xmgl/frontierProtectionNoNetDev/page").permitAll() + .antMatchers("/xmgl/exteriorScaffoldingCurrentData/selectExteriorScaffoldingCurrentDataList").permitAll() + .antMatchers("/xmgl/exteriorScaffoldingMonitorType/selectMonitorTypeAlarmCountList").permitAll() + .antMatchers("/xmgl/exteriorScaffoldingMonitorType/page").permitAll() + .antMatchers("/xmgl/exteriorScaffoldingMonitorType/selectMonitorTypeCount").permitAll() .antMatchers(HttpMethod.OPTIONS, "/**").anonymous() .anyRequest().authenticated() // 剩下所有的验证都需要验证. .and()