kaiyu
2020-12-01 dbc664b7b328809818bd070e152248249ff2f939
获取用户信息添加站点id
2 files modified
32 ■■■■ changed files
src/main/java/com/moral/controller/WebController.java 4 ●●●● patch | view | raw | blame | history
src/main/java/com/moral/service/impl/AccountServiceImpl.java 28 ●●●●● patch | view | raw | blame | history
src/main/java/com/moral/controller/WebController.java
@@ -205,6 +205,7 @@
     * @Date: 2020/10/19
     */
    @UserLoginToken
    @GetMapping("fiveMinuteAvgDataNew")
    public ResultBean<Map<String, Object>> getSensorFiveMinuteAvgDataNew(HttpServletRequest request) {
        //获取参数,传感器和regionCode
@@ -501,14 +502,13 @@
        List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsAndDevicesByRegion(paramMap);
        if (ObjectUtils.isEmpty(monitorPoints))
            return new ResultBean<>("无对应站点设备信息", ResultBean.FAIL);
        return new ResultBean<>(monitorPoints);
        return new ResultBean<List<MonitorPoint>>(monitorPoints);
    }
    /**
     * @Description: 返回结果添加设备经纬度以及state
     * @Param: [datas, devices]
     * @return: java.util.List<java.util.Map                               <                               java.lang.String                               ,                               java.lang.Object>>
     * @Author: 下雨听风
     * @Date: 2020/10/19
     */
src/main/java/com/moral/service/impl/AccountServiceImpl.java
@@ -11,10 +11,13 @@
import java.util.Set;
import javax.annotation.Resource;
import javax.management.monitor.Monitor;
import com.moral.entity.*;
import com.moral.mapper.DictionaryDataMapper;
import com.moral.mapper.MonitorPointMapper;
import com.moral.service.MonitorPointService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
@@ -56,6 +59,11 @@
    @Resource
    private OrganizationMapper organizationMapper;
    @Resource
    private MonitorPointService monitorPointService;
    @Resource
    private MonitorPointMapper monitorPointMapper;
    @Override
    public Map<String, Object> getAccountInfoById(String accountId) {
@@ -68,15 +76,31 @@
            result.put("accountId", -1);
        } else {
            result = judgeAccountInfo(account);
            String regionCode = getRegionCodeByAccount(account);
            if (!String.valueOf(result.get("accountId")).equals("-1")) {
                List<MonitorPoint> monitorPoints = new ArrayList<>();
                if (account.getOrganizationId().equals(dictionaryDataMapper.selectSupperOrgId())) {
                    Map<String, Object> paramMap = new HashMap<>();
                    paramMap.put("regionCode", regionCode);
                    paramMap.put("organizationId", account.getOrganizationId());
                    monitorPoints = monitorPointService.getMonitorPointsAndDevicesByRegion(paramMap);
                } else {
                    Set<Integer> orgIds = organizationService.getChildOrganizationIds(account.getOrganizationId());
                    orgIds.add(account.getOrganizationId());
                    monitorPoints = monitorPointService.getMonitorPointsByOrganizationIds(orgIds);
                }
                List<Integer> monitorPointIds = new ArrayList<>();
                monitorPoints.forEach(value -> {
                    monitorPointIds.add(value.getId());
                });
                List<Menu> menuList = accountMapper.getScreenMenuListsByAccountName(account.getAccountName());
                result.put("msg", "获取成功!");
                result.put("accountId", account.getId());
                result.put("orgId", account.getOrganizationId());
                result.put("data", menuList);
                String regionCode = getRegionCodeByAccount(account);
                if (!ObjectUtils.isEmpty(regionCode))
                    result.put("regionCode", regionCode);
                result.put("monitorPointIds", monitorPointIds);
                setOrgIdsByAccount(result);
            }
        }