admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

租户接口

Browse Source
This commit is contained in:
guo 2024-03-28 18:25:00 +08:00
parent ac829c91df
commit 2c36c61b8b
22 changed files with 226 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/BaseModuleController.java
View File

@ -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<Map<String, Object>> getModuleAndMenuList(@ApiIgnore @RequestBody HashMap<String, Object> paramMap) {
return Result.success(baseModuleService.getModuleAndMenuList(paramMap));
}
}

13
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/CompanyController.java
View File

@ -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<Map<String, Object>> getComapnyStatisticsList(@RequestBody Map<String, Object> map) {
return Result.success(companyService.getComapnyStatisticsList(map));
public Result<Map<String, Object>> getCompanyStatisticsList(@RequestBody Map<String, Object> 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<JSONArray> getTenantOrgTreeList(@ApiIgnore @RequestBody HashMap<String, Object> paramMap) {
return Result.success(companyService.getTenantOrgTreeList(paramMap));
}
}

4
src/main/java/com/zhgd/xmgl/modules/basicdata/entity/BaseModule.java
View File

@ -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)

4
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/BaseMenuMapper.java
View File

@ -28,4 +28,8 @@ public interface BaseMenuMapper extends BaseMapper<BaseMenu> {
List<EntityMap> selectHeadquartersMenuList(Map<String, Object> param);
List<EntityMap> selectComapnyUserMenuList(Map<String, Object> param);
List<EntityMap> getSupplierMenuList(Map<String, Object> param);
List<EntityMap> getSupplierActionList(Map<String, Object> param);
}

8
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/BaseModuleMapper.java
View File

@ -30,4 +30,12 @@ public interface BaseModuleMapper extends BaseMapper<BaseModule> {
List<BaseModule> getModuleList(Map<String, Object> map);
Page<BaseModule> getModuleListByPage(Page<BaseModule> page, @Param("dto") ModuleListPageDto dto);
/**
* 查询供应商的模块列表
*
* @param param
* @return
*/
List<BaseModule> getSupplierModuleList(Map<String, Object> param);
}

17
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseMenuMapper.xml
View File

@ -51,4 +51,21 @@
WHERE b.user_id=#{userId} and a.status=1 and m.style_type=#{styleType}
order by a.parent_id,a.priority
</select>
<select id="getSupplierMenuList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
SELECT DISTINCT a.*
from base_menu a INNER JOIN base_module m ON a.module_id=m.module_id
WHERE a.status=1 and m.style_type=#{styleType} and m.module_type = 6
order by a.parent_id,a.priority
</select>
<select id="getSupplierActionList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
SELECT t.*,c.authority_id,t.action_name name
from base_action t INNER JOIN base_menu a ON t.menu_id=a.menu_id
INNER JOIN base_module m ON a.module_id=m.module_id
LEFT JOIN base_module_project b ON a.module_id=b.module_id
LEFT JOIN base_authority c ON t.action_id=c.action_id
WHERE b.type=2 and t.status=1 and a.status=1 and m.style_type=#{styleType}
order by a.parent_id,a.priority
</select>
</mapper>

7
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml
View File

@ -68,4 +68,11 @@
</where>
ORDER BY a.module_type,a.label_sort_num,a.label_name,a.module_id
</select>
<select id="getSupplierModuleList" resultType="com.zhgd.xmgl.modules.basicdata.entity.BaseModule">
SELECT a.*
from base_module a
WHERE a.style_type=6 and a.style_type=#{styleType}
ORDER BY a.module_type,a.label_sort_num,a.label_name,a.module_id
</select>
</mapper>

12
src/main/java/com/zhgd/xmgl/modules/basicdata/service/IBaseMenuService.java
View File

@ -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;
@ -40,4 +40,14 @@ public interface IBaseMenuService extends IService<BaseMenu> {
void editBaseMenu(BaseMenu baseMenu);
JSONArray selectGroupList(Map<String, Object> map);
/**
* 查询供应商的菜单列表
*
* @param param
* @return
*/
List<EntityMap> getSupplierMenuList(Map<String, Object> param);
List<EntityMap> getSupplierActionList(Map<String, Object> param);
}

3
src/main/java/com/zhgd/xmgl/modules/basicdata/service/IBaseModuleService.java
View File

@ -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<BaseModule> {
Page<BaseModule> getModuleListByPage(ModuleListPageDto dto);
void copyModuleAndMenu();
Map<String, Object> getModuleAndMenuList(HashMap<String, Object> paramMap);
}

5
src/main/java/com/zhgd/xmgl/modules/basicdata/service/ICompanyService.java
View File

@ -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<Company> {
void addCompany(Company company);
Map<String, Object> getComapnyStatisticsList(Map<String, Object> map);
Map<String, Object> getCompanyStatisticsList(Map<String, Object> map);
void editCompanyBySn(Company company);
@ -66,4 +67,6 @@ public interface ICompanyService extends IService<Company> {
void updateTenantOrg(HashMap<String, Object> paramMap);
List<String> getOrgSnListByUserId(HashMap<String, Object> paramMap);
JSONArray getTenantOrgTreeList(HashMap<String, Object> paramMap);
}

10
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java
View File

@ -57,6 +57,16 @@ public class BaseMenuServiceImpl extends ServiceImpl<BaseMenuMapper, BaseMenu> i
return result;
}
@Override
public List<EntityMap> getSupplierMenuList(Map<String, Object> param) {
return baseMenuMapper.getSupplierMenuList(param);
}
@Override
public List<EntityMap> getSupplierActionList(Map<String, Object> param) {
return baseMenuMapper.getSupplierActionList(param);
}
@Override
public Map<String, Object> getProjectModuleAndMenu(Map<String, Object> map) {
map.put("styleType", getStyleType(MapUtils.getString(map, "projectSn")));

11
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseModuleServiceImpl.java
View File

@ -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<BaseModuleMapper, BaseMod
@Autowired
private BaseMenuMapper baseMenuMapper;
@Autowired
private SystemUserServiceImpl systemUserService;
@Autowired
private CompanyConfigMapper companyConfigMapper;
@Autowired
private IBaseAuthorityService baseAuthorityService;
@ -107,4 +110,12 @@ public class BaseModuleServiceImpl extends ServiceImpl<BaseModuleMapper, BaseMod
}
}
}
@Override
public Map<String, Object> getModuleAndMenuList(HashMap<String, Object> paramMap) {
String projectSn = MapUtils.getString(paramMap, "projectSn");
CompanyConfig companyConfig = companyConfigMapper.getCompanyConfigByProject(projectSn);
Map<String, Object> menuAuthority = systemUserService.getUserAuthority(null, 5, projectSn, companyConfig.getHeadquartersSn(), companyConfig.getStyleType());
return menuAuthority;
}
}

65
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java
View File

@ -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<CompanyMapper, Company> impl
}
@Override
public Map<String, Object> getComapnyStatisticsList(Map<String, Object> map) {
public Map<String, Object> getCompanyStatisticsList(Map<String, Object> map) {
Map<String, Object> data = new HashMap<>();
QueryWrapper<Company> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(Company::getCompanySn, MapUtils.getString(map, "sn"));
@ -642,6 +644,67 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
return systemUserMapper.getOrgSnListByUserId(paramMap);
}
@Override
public JSONArray getTenantOrgTreeList(HashMap<String, Object> paramMap) {
Long userId = MapUtils.getLong(paramMap, "userId");
SystemUser systemUser = systemUserMapper.selectById(userId);
if (systemUser == null) {
throw new OpenAlertException("未找到对应实体");
}
HashMap<String, Object> qm = new HashMap<>();
qm.put("sn", systemUser.getHeadquartersSn());
qm.put("projectType", "1");
Map<String, Object> companyMap = getCompanyStatisticsList(qm);
JSONArray clJa = JSON.parseArray(JSON.toJSONString(MapUtils.getObject(companyMap, "companyList")));
JSONArray rtJa = new JSONArray();
if (CollUtil.isEmpty(clJa)) {
return null;
}
List<XzSystemUserToCompanyProject> companyProjects = xzSystemUserToCompanyProjectMapper.selectList(new LambdaQueryWrapper<XzSystemUserToCompanyProject>()
.eq(XzSystemUserToCompanyProject::getUserId, userId));
if (CollUtil.isEmpty(companyProjects)) {
return null;
}
Map<String, XzSystemUserToCompanyProject> 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<String, XzSystemUserToCompanyProject> 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, ",");

14
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
View File

@ -238,6 +238,9 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
companyConfig.setHeadquartersSn("-1");
} else if (systemUser.getAccountType() == 5 || systemUser.getAccountType() == 6) {
companyConfig = companyConfigMapper.getCompanyConfigByProject(systemUser.getSn());
} else if (Objects.equals(systemUser.getAccountType(), 10) || Objects.equals(systemUser.getAccountType(), 11)) {
//租户或供应商
companyConfig = companyConfigMapper.getCompanyConfigBySN(systemUser.getHeadquartersSn());
} else {
companyConfig = companyConfigMapper.getCompanyConfigBySN(systemUser.getSn());
}
@ -802,6 +805,12 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
actionList = baseActionMapper.getProjectUserActionList(param);
String roleName = baseRoleUserMapper.getUserRoleName(param);
data.put("roleName", roleName);
} else if (accountType == 11) {
//供应商
moduleList = baseModuleMapper.getSupplierModuleList(param);
menuList = baseMenuService.getSupplierMenuList(param);
actionList = baseMenuService.getSupplierActionList(param);
data.put("roleName", "供应商");
}
menuList = groupMenuAction(menuList, actionList);
moduleList = groupModuleMenu(moduleList, menuList);
@ -1130,4 +1139,9 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
return baseMapper.getTenantListBySn(map);
}
public static void main(String[] args) {
String timestamp = "1711613997695";
String pw = "123";
System.out.println(SecureUtil.md5(SecureUtil.md5(pw) + timestamp));
}
}

4
src/main/java/com/zhgd/xmgl/modules/exteriorscaffolding/controller/ExteriorScaffoldingCurrentDataController.java
View File

@ -140,7 +140,7 @@ public class ExteriorScaffoldingCurrentDataController {
String measurePointNumber = currentDataListQO.getMeasurePointNumber();
IPage<ExteriorScaffoldingCurrentData> 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<ExteriorScaffoldingCurrentData> 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")

3
src/main/java/com/zhgd/xmgl/modules/exteriorscaffolding/entity/qo/CurrentDataListQO.java
View File

@ -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;
}

5
src/main/java/com/zhgd/xmgl/modules/exteriorscaffolding/mapper/ExteriorScaffoldingCurrentDataMapper.java
View File

@ -28,7 +28,10 @@ public interface ExteriorScaffoldingCurrentDataMapper extends BaseMapper<Exterio
ExteriorScaffoldingCurrentData selectNewestExteriorScaffoldingCurrentData(@Param("measurePointNumber") String measurePointNumber, @Param("projectSn") String projectSn);
IPage<ExteriorScaffoldingCurrentData> 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<ExteriorScaffoldingCurrentData> 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<ExteriorScaffoldingCurrentData> selectArticleOneDataList(Set<String> sensorSnList);

3
src/main/java/com/zhgd/xmgl/modules/exteriorscaffolding/mapper/xml/ExteriorScaffoldingCurrentDataMapper.xml
View File

@ -128,6 +128,9 @@
<if test="alarmState != null">
and decd.alarm_state = #{alarmState}
</if>
<if test="exteriorScaffoldingEngineeringId != null and exteriorScaffoldingEngineeringId != ''">
and dee.id = #{exteriorScaffoldingEngineeringId}
</if>
</where>
order by decd.receive_time desc
</select>

4
src/main/java/com/zhgd/xmgl/modules/exteriorscaffolding/service/IExteriorScaffoldingCurrentDataService.java
View File

@ -33,7 +33,7 @@ public interface IExteriorScaffoldingCurrentDataService extends IService<Exterio
*/
void saveBatchExteriorScaffoldingCurrentData(JSONArray jsonArray);
IPage<ExteriorScaffoldingCurrentData> selectExteriorScaffoldingCurrentDataList(String projectSn, String measurePointNumber, String sensorSn, Long exteriorScaffoldingEngineeringToMonitorTypeId, String startTime, String endTime, Integer alarmState, Integer pageNo, Integer pageSize);
IPage<ExteriorScaffoldingCurrentData> 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<Exterio
void updateDataTotalAndAlarmState(String sensorSn, Float fiducialValue, Float alarmValue, Float rateAlarmValue);
void exportData(HttpServletResponse response, String projectSn, String measurePointNumber, String sensorSn, Long exteriorScaffoldingEngineeringToMonitorTypeId, String startTime, String endTime, Integer alarmState);
void exportData(HttpServletResponse response, String projectSn, String measurePointNumber, String sensorSn, Long exteriorScaffoldingEngineeringToMonitorTypeId, String startTime, String endTime, Integer alarmState, String exteriorScaffoldingEngineeringId);
void zwExportData(HttpServletResponse response, String measurePointName, Long sensorTypeId, String startDate, String endDate, String projectSn);

8
src/main/java/com/zhgd/xmgl/modules/exteriorscaffolding/service/impl/ExteriorScaffoldingCurrentDataServiceImpl.java
View File

@ -94,8 +94,8 @@ public class ExteriorScaffoldingCurrentDataServiceImpl extends ServiceImpl<Exter
}
@Override
public IPage<ExteriorScaffoldingCurrentData> selectExteriorScaffoldingCurrentDataList(String projectSn, String measurePointNumber, String sensorSn, Long exteriorScaffoldingEngineeringToMonitorTypeId, String startTime, String endTime, Integer alarmState, Integer pageNo, Integer pageSize) {
IPage<ExteriorScaffoldingCurrentData> page = exteriorScaffoldingCurrentDataMapper.selectExteriorScaffoldingCurrentDataList(projectSn, measurePointNumber, sensorSn, exteriorScaffoldingEngineeringToMonitorTypeId, startTime, endTime, alarmState, new Page<>(pageNo, pageSize));
public IPage<ExteriorScaffoldingCurrentData> selectExteriorScaffoldingCurrentDataList(String projectSn, String measurePointNumber, String sensorSn, Long exteriorScaffoldingEngineeringToMonitorTypeId, String startTime, String endTime, Integer alarmState, Integer pageNo, Integer pageSize, String exteriorScaffoldingEngineeringId) {
IPage<ExteriorScaffoldingCurrentData> 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<Exter
}
@Override
public void exportData(HttpServletResponse response, String projectSn, String measurePointNumber, String sensorSn, Long exteriorScaffoldingEngineeringToMonitorTypeId, String startTime, String endTime, Integer alarmState) {
public void exportData(HttpServletResponse response, String projectSn, String measurePointNumber, String sensorSn, Long exteriorScaffoldingEngineeringToMonitorTypeId, String startTime, String endTime, Integer alarmState, String exteriorScaffoldingEngineeringId) {
try {
List<ExteriorScaffoldingCurrentData> list = exteriorScaffoldingCurrentDataMapper.selectExteriorScaffoldingCurrentDataList(projectSn, measurePointNumber, sensorSn, exteriorScaffoldingEngineeringToMonitorTypeId, startTime, endTime, alarmState, new Page<>().setSize(-1)).getRecords();
List<ExteriorScaffoldingCurrentData> 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()));

17
src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzRegistryServiceImpl.java
View File

@ -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<XzRegistryMapper, XzRegis
@Autowired
private XzRegistryMapper xzRegistryMapper;
@Autowired
private SystemLogoConfigMapper systemLogoConfigMapper;
@Autowired
SystemUserMapper systemUserMapper;
@Autowired
ISystemUserService systemUserService;
@ -46,6 +51,7 @@ public class XzRegistryServiceImpl extends ServiceImpl<XzRegistryMapper, XzRegis
@Autowired
EmailUtils emailUtils;
@Override
public IPage<XzRegistry> queryPageList(HashMap<String, Object> paramMap) {
QueryWrapper<XzRegistry> queryWrapper = getQueryWrapper(paramMap);
@ -79,6 +85,14 @@ public class XzRegistryServiceImpl extends ServiceImpl<XzRegistryMapper, XzRegis
if (systemUser != null) {
throw new OpenAlertException("账号已存在");
}
if (StrUtil.isBlank(xz.getHeadquartersSn())) {
//选择默认的headquartersSn
SystemLogoConfig slc = systemLogoConfigMapper.selectOne(new LambdaQueryWrapper<SystemLogoConfig>().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<XzRegistryMapper, XzRegis
systemUser.setPassword(xz.getPw());
systemUser.setRealName(xz.getAccount());
systemUser.setAccountType(10);
systemUser.setHeadquartersSn(r.getHeadquartersSn());
Long userId = systemUserService.saveSystemUser(systemUser);
//处理权限
//处理组织权限
HashMap<String, Object> map = new HashMap<>();
map.put("userId", userId);
map.put("projectSns", projectSns);

4
src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
View File

@ -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()