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

bug修改

Browse Source
This commit is contained in:
guoshengxiong 2024-04-20 18:25:12 +08:00
parent 6f15550272
commit eb2d7424dc
13 changed files with 295 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java
View File

@ -2,6 +2,7 @@ package com.zhgd.xmgl.async;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@ -28,7 +29,6 @@ import org.springframework.context.annotation.Lazy;
import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.net.SocketTimeoutException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -320,14 +320,14 @@ public class AsyncHikvision {
String sucSbStr = sucSb.toString(); String sucSbStr = sucSb.toString();
if (StringUtils.isNotBlank(sucSbStr)) { if (StringUtils.isNotBlank(sucSbStr)) {
sucSbStr = "下发权限成功：" + sucSbStr; sucSbStr = "下发权限成功：" + sucSbStr;
msg += sucSbStr + "，"; msg += sucSbStr + " ";
} }
String failSbStr = failSb.toString(); String failSbStr = failSb.toString();
if (StringUtils.isNotBlank(failSbStr)) { if (StringUtils.isNotBlank(failSbStr)) {
failSbStr = "下发权限失败：" + failSbStr; failSbStr = "下发权限失败：" + failSbStr;
msg += failSbStr + "，"; msg += failSbStr + " ";
} }
noticeService.addUserNotice(SecurityUtils.getUser().getUserId(), msg, title, type); noticeService.addUserNotice(SecurityUtils.getUser().getUserId(), StringUtils.substring(msg, 0, msg.length() - 1), title, type);
} }
} catch (Exception e) { } catch (Exception e) {
log.error("海康：", e); log.error("海康：", e);

2
src/main/java/com/zhgd/xmgl/call/HikvisionCall.java
View File

@ -1946,7 +1946,7 @@ public class HikvisionCall {
JSONObject jo = HikvisionUtil.getJSONObjectData(rs); JSONObject jo = HikvisionUtil.getJSONObjectData(rs);
JSONArray listJa = jo.getJSONArray("list"); JSONArray listJa = jo.getJSONArray("list");
if (CollUtil.isEmpty(listJa)) { if (CollUtil.isEmpty(listJa)) {
failSb.append(workerInfo.getWorkerName() + "，" + dev.getDevName() + "，失败信息：isc不存在该设备,"); failSb.append(workerInfo.getWorkerName() + "，" + dev.getDevName() + "，失败信息：isc不存在该设备；");
return; return;
} }
String channelNo = listJa.getJSONObject(0).getString("channelNo"); String channelNo = listJa.getJSONObject(0).getString("channelNo");

5
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/LoginController.java
View File

@ -103,8 +103,11 @@ public class LoginController {
return Result.success(resultMap); return Result.success(resultMap);
} }
@PostMapping("/getLoginInfoByToken")
@ApiOperation(value = "根据token获取用户登录信息", notes = "根据token获取用户登录信息", httpMethod = "POST") @ApiOperation(value = "根据token获取用户登录信息", notes = "根据token获取用户登录信息", httpMethod = "POST")
@ApiImplicitParams({
@ApiImplicitParam(name = "headquartersSn", required = false, value = "总公司sn", paramType = "body"),
})
@PostMapping("/getLoginInfoByToken")
public Result getLoginInfoByToken(@RequestBody LoginInfoByTokenDto dto) { public Result getLoginInfoByToken(@RequestBody LoginInfoByTokenDto dto) {
return systemUserService.loginByToken(dto); return systemUserService.loginByToken(dto);
} }

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

@ -128,7 +128,9 @@ public class SystemUser implements Serializable {
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date pwUpdateTime; private Date pwUpdateTime;
/**
* 无关
*/
@ApiModelProperty(value = "新用户和供应商的总公司sn") @ApiModelProperty(value = "新用户和供应商的总公司sn")
private String headquartersSn; private String headquartersSn;

1
src/main/java/com/zhgd/xmgl/modules/basicdata/entity/dto/LoginInfoByTokenDto.java
View File

@ -7,4 +7,5 @@ import lombok.Data;
public class LoginInfoByTokenDto { public class LoginInfoByTokenDto {
@ApiModelProperty("登录的token") @ApiModelProperty("登录的token")
private String token; private String token;
private String headquartersSn;
} }

2
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/CompanyConfigMapper.java
View File

@ -19,5 +19,7 @@ public interface CompanyConfigMapper extends BaseMapper<CompanyConfig> {
CompanyConfig getCompanyConfigByProject(String sn); CompanyConfig getCompanyConfigByProject(String sn);
CompanyConfig getCompanyConfigByHeadquartersSn(String headquartersSn);
CompanyConfig selectConfigByProject(@Param("projectSn") String projectSn); CompanyConfig selectConfigByProject(@Param("projectSn") String projectSn);
} }

34
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/CompanyConfigMapper.xml
View File

@ -18,21 +18,33 @@
<select id="getCompanyConfigByProject" resultMap="companyConfigMap"> <select id="getCompanyConfigByProject" resultMap="companyConfigMap">
SELECT c.*, b.headquarters_sn, d.company_name, b.propagate_file SELECT c.*, b.headquarters_sn, d.company_name, b.propagate_file
FROM project a FROM project a
INNER JOIN company b ON a.company_sn = b.company_sn INNER JOIN company b ON a.company_sn = b.company_sn
INNER JOIN company_config c ON b.headquarters_sn = c.company_sn INNER JOIN company_config c ON b.headquarters_sn = c.company_sn
LEFT JOIN company d ON b.headquarters_sn = d.company_sn LEFT JOIN company d ON b.headquarters_sn = d.company_sn
WHERE a.project_sn = #{sn} WHERE a.project_sn = #{sn}
</select> </select>
<select id="getCompanyConfigByHeadquartersSn" resultMap="companyConfigMap">
SELECT
c.*,
b.headquarters_sn,
d.company_name,
b.propagate_file
FROM
company b
INNER JOIN company_config c ON b.headquarters_sn = c.company_sn
LEFT JOIN company d ON b.headquarters_sn = d.company_sn
WHERE b.company_sn = #{headquartersSn}
</select>
<select id="selectConfigByProject" resultMap="companyConfigMap"> <select id="selectConfigByProject" resultMap="companyConfigMap">
select c.style_type, select c.style_type,
c.customer_service_phone, c.customer_service_phone,
c.company_big_screen, c.company_big_screen,
c.project_kanban, c.project_kanban,
c.input_qr_code, c.input_qr_code,
c.mobile_attendance, c.mobile_attendance,
c.module_show_type, c.module_show_type,
c.project_num, c.project_num,
c.expire_time, c.expire_time,
c.is_enable, c.is_enable,
c.company_sn c.company_sn
FROM project a FROM project a

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

@ -18,7 +18,6 @@ import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper;
import com.zhgd.xmgl.modules.basicdata.service.IBaseAuthorityService; import com.zhgd.xmgl.modules.basicdata.service.IBaseAuthorityService;
import com.zhgd.xmgl.modules.basicdata.service.IBaseModuleService; import com.zhgd.xmgl.modules.basicdata.service.IBaseModuleService;
import org.apache.commons.collections.MapUtils; import org.apache.commons.collections.MapUtils;
import org.mortbay.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -134,7 +133,7 @@ public class BaseModuleServiceImpl extends ServiceImpl<BaseModuleMapper, BaseMod
if (companyConfig == null) { if (companyConfig == null) {
throw new OpenAlertException("企业配置不存在"); throw new OpenAlertException("企业配置不存在");
} }
if (Objects.equals(systemUser.getAccountType(), 10)) { if (Objects.equals(systemUser.getAccountType(), 10) || Objects.equals(systemUser.getAccountType(), 11)) {
return systemUserService.getUserAuthority(null, 5, projectSn, companyConfig.getHeadquartersSn(), companyConfig.getStyleType(), moduleType); return systemUserService.getUserAuthority(null, 5, projectSn, companyConfig.getHeadquartersSn(), companyConfig.getStyleType(), moduleType);
} else if (Objects.equals(systemUser.getAccountType(), 5) || Objects.equals(systemUser.getAccountType(), 6)) { } else if (Objects.equals(systemUser.getAccountType(), 5) || Objects.equals(systemUser.getAccountType(), 6)) {
return systemUserService.getUserAuthority(Long.valueOf(userId), systemUser.getAccountType(), projectSn, companyConfig.getHeadquartersSn(), companyConfig.getStyleType(), moduleType); return systemUserService.getUserAuthority(Long.valueOf(userId), systemUser.getAccountType(), projectSn, companyConfig.getHeadquartersSn(), companyConfig.getStyleType(), moduleType);

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

@ -805,12 +805,12 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
if (systemUser == null) { if (systemUser == null) {
throw new OpenAlertException("未找到对应实体"); throw new OpenAlertException("未找到对应实体");
} }
if (Objects.equals(systemUser.getAccountType(), 10)) { if (Objects.equals(systemUser.getAccountType(), 10) || Objects.equals(systemUser.getAccountType(), 11)) {
return baseMapper.getMyHeadquarterCompanyList(paramMap); return baseMapper.getMyHeadquarterCompanyList(paramMap);
} else if (Objects.equals(systemUser.getAccountType(), 5) || Objects.equals(systemUser.getAccountType(), 6)) { } else if (Objects.equals(systemUser.getAccountType(), 5) || Objects.equals(systemUser.getAccountType(), 6)) {
return companyMapper.getMyHeadquarterCompanyListForProject(paramMap); return companyMapper.getMyHeadquarterCompanyListForProject(paramMap);
} else { } else {
throw new OpenAlertException("只有新用户和项目账号和项目子账号有效"); throw new OpenAlertException("只有新用户和供应商和项目账号和项目子账号有效");
} }
} }

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

@ -243,121 +243,244 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
} }
} }
} }
Map<String, Object> result = new HashMap<>(); Map<String, Object> result = new HashMap<>();
CompanyConfig companyConfig = null;
if (systemUser.getAccountType() == 1) {
companyConfig = new CompanyConfig();
companyConfig.setIsEnable(1);
companyConfig.setEffectiveTime(60 * 60 * 24);
companyConfig.setDiffDay(20);
companyConfig.setModuleShowType(0);
companyConfig.setMobileAttendance(0);
companyConfig.setProjectKanban(0);
companyConfig.setCompanyBigScreen(0);
companyConfig.setInputQrCode(0);
companyConfig.setStyleType(1);
companyConfig.setEnterProjectBackType(0);
companyConfig.setExpireTime(DateUtil.format(DateUtil.tomorrow(), DatePattern.NORM_DATE_PATTERN));
companyConfig.setAddProjectType(0);
companyConfig.setStyleType(1);
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());
}
log.info("companyConfig：{}", JSON.toJSONString(companyConfig));
if (companyConfig.getExpireTime() == null) {
throw new OpenAlertException(MessageUtil.get("loginEnabledErr"));
} else {
DateTime expireTime = DateUtil.parse(companyConfig.getExpireTime(), "yyyy-MM-dd");
DateTime currentDate = new DateTime();
if (expireTime.getTime() < currentDate.getTime()) { if ((Objects.equals(systemUser.getAccountType(), 10) || Objects.equals(systemUser.getAccountType(), 11)) &&
throw new OpenAlertException(MessageUtil.get("loginExpiredErr")); StringUtils.isBlank(MapUtils.getString(map, "headquartersSn"))) {
} else { //新用户和供应商
companyConfig.setDiffDay((int) DateUtil.between(currentDate, DateUtil.offset(expireTime, DateField.DAY_OF_MONTH, 1), DateUnit.DAY)); //CompanyConfig companyConfig = null;
} //if (systemUser.getAccountType() == 1) {
} // companyConfig = new CompanyConfig();
// companyConfig.setIsEnable(1);
// companyConfig.setEffectiveTime(60 * 60 * 24);
if (companyConfig == null || companyConfig.getIsEnable() == 0) { // companyConfig.setDiffDay(20);
throw new OpenAlertException(MessageUtil.get("loginEnabledErr")); // companyConfig.setModuleShowType(0);
} // companyConfig.setMobileAttendance(0);
if (companyConfig.getDiffDay() == 0) { // companyConfig.setProjectKanban(0);
throw new OpenAlertException(MessageUtil.get("loginExpiredErr")); // companyConfig.setCompanyBigScreen(0);
} // companyConfig.setInputQrCode(0);
if (companyConfig.getEffectiveTime() == null) { // companyConfig.setStyleType(1);
companyConfig.setEffectiveTime(60 * 60 * 24 * 30 * 12); // companyConfig.setEnterProjectBackType(0);
} // companyConfig.setExpireTime(DateUtil.format(DateUtil.tomorrow(), DatePattern.NORM_DATE_PATTERN));
SystemLogoConfig slc = systemLogoConfigMapper.selectOne(new LambdaQueryWrapper<SystemLogoConfig>().eq(SystemLogoConfig::getHeadquartersSn, companyConfig.getHeadquartersSn())); // companyConfig.setAddProjectType(0);
if (slc == null) { // companyConfig.setStyleType(1);
slc = systemLogoConfigMapper.selectOne(new LambdaQueryWrapper<SystemLogoConfig>().eq(SystemLogoConfig::getHeadquartersSn, "-1")); // companyConfig.setHeadquartersSn("-1");
} //} else if (systemUser.getAccountType() == 5 || systemUser.getAccountType() == 6) {
String token = jwtTokenProvider.createToken(MapUtils.getString(map, "account"), companyConfig.getEffectiveTime(), slc != null ? slc.getLoginTimeOut() : null); // companyConfig = companyConfigMapper.getCompanyConfigByProject(systemUser.getSn());
UserEnterprise userEnterprise = userEnterpriseService.selectUserEnterpriseByUserId(systemUser.getUserId()); //} else if (systemUser.getAccountType() == 10 || systemUser.getAccountType() == 11) {
if (userEnterprise != null) { //
result.put("userEnterpriseId", userEnterprise.getEnterpriseId()); // companyConfig = companyConfigMapper.getCompanyConfigByProject(systemUser.getSn());
} else { //} else {
// companyConfig = companyConfigMapper.getCompanyConfigBySN(systemUser.getSn());
//}
//log.info("companyConfig：{}", JSON.toJSONString(companyConfig));
//if (companyConfig.getExpireTime() == null) {
// throw new OpenAlertException(MessageUtil.get("loginEnabledErr"));
//} else {
// DateTime expireTime = DateUtil.parse(companyConfig.getExpireTime(), "yyyy-MM-dd");
// DateTime currentDate = new DateTime();
//
// if (expireTime.getTime() < currentDate.getTime()) {
// throw new OpenAlertException(MessageUtil.get("loginExpiredErr"));
// } else {
// companyConfig.setDiffDay((int) DateUtil.between(currentDate, DateUtil.offset(expireTime, DateField.DAY_OF_MONTH, 1), DateUnit.DAY));
// }
//}
//
//
//if (companyConfig == null || companyConfig.getIsEnable() == 0) {
// throw new OpenAlertException(MessageUtil.get("loginEnabledErr"));
//}
//if (companyConfig.getDiffDay() == 0) {
// throw new OpenAlertException(MessageUtil.get("loginExpiredErr"));
//}
//if (companyConfig.getEffectiveTime() == null) {
// companyConfig.setEffectiveTime(60 * 60 * 24 * 30 * 12);
//}
//SystemLogoConfig slc = systemLogoConfigMapper.selectOne(new LambdaQueryWrapper<SystemLogoConfig>().eq(SystemLogoConfig::getHeadquartersSn, companyConfig.getHeadquartersSn()));
//if (slc == null) {
// slc = systemLogoConfigMapper.selectOne(new LambdaQueryWrapper<SystemLogoConfig>().eq(SystemLogoConfig::getHeadquartersSn, "-1"));
//}
String token = jwtTokenProvider.createToken(MapUtils.getString(map, "account"), 60 * 60 * 24 * 30 * 12, 0);
//UserEnterprise userEnterprise = userEnterpriseService.selectUserEnterpriseByUserId(systemUser.getUserId());
//if (userEnterprise != null) {
// result.put("userEnterpriseId", userEnterprise.getEnterpriseId());
//} else {
result.put("userEnterpriseId", ""); result.put("userEnterpriseId", "");
} //}
if (systemUser.getAccountType() == 6) { //if (systemUser.getAccountType() == 6) {
//项目子账号要判断是否能查看设备中台 // //项目子账号要判断是否能查看设备中台
BaseRole baseRole = baseRoleMapper.selectRoleByUserId(systemUser.getUserId()); // BaseRole baseRole = baseRoleMapper.selectRoleByUserId(systemUser.getUserId());
if (baseRole == null) { // if (baseRole == null) {
result.put("seeEquipment", 1); // result.put("seeEquipment", 1);
} else { // } else {
result.put("seeEquipment", Integer.valueOf(baseRole.getSeeEquipment())); // result.put("seeEquipment", Integer.valueOf(baseRole.getSeeEquipment()));
} // }
} else { //} else {
result.put("seeEquipment", 0); result.put("seeEquipment", 0);
} //}
result.put("token", token); result.put("token", token);
if (systemUser != null && systemUser.getUserId() != null) { if (systemUser != null && systemUser.getUserId() != null) {
result.put("userId", systemUser.getUserId().toString()); result.put("userId", systemUser.getUserId().toString());
} else { } else {
result.put("userId", ""); result.put("userId", "");
}
result.put("account", systemUser.getAccount());
result.put("userTel", systemUser.getUserTel());
result.put("realName", systemUser.getRealName());
if (systemUser != null && systemUser.getWorkerId() != null) {
result.put("workerId", systemUser.getWorkerId().toString());
} else {
result.put("workerId", "");
}
result.put("sn", systemUser.getSn());
result.put("styleType", companyConfig.getStyleType());
result.put("accountType", systemUser.getAccountType());
result.put("headquartersSn", companyConfig.getHeadquartersSn());
result.put("companyName", companyConfig.getCompanyName());
result.put("propagateFile", companyConfig.getPropagateFile());
result.put("moduleShowType", companyConfig.getModuleShowType());
result.put("mobileAttendance", companyConfig.getMobileAttendance());
result.put("customerServicePhone", companyConfig.getCustomerServicePhone());
result.put("inputQrCode", companyConfig.getInputQrCode());
result.put("projectKanban", companyConfig.getProjectKanban());
result.put("addProjectType", companyConfig.getAddProjectType());
result.put("enterProjectBackType", companyConfig.getEnterProjectBackType());
result.put("companyBigScreen", companyConfig.getCompanyBigScreen());
Map<String, Object> menuAuthority = getUserAuthority(systemUser.getUserId(), systemUser.getAccountType(), systemUser.getSn(), companyConfig.getHeadquartersSn(), companyConfig.getStyleType());
result.put("menuAuthority", menuAuthority);
result.put("scope", scope);
result.put("expire", false);
result.put("systemLogoConfig", slc);
if (Objects.equals(systemUser.getAccountType(), 10)) {
XzSystemUserToCompanyProject xzSystemUserToCompanyProject = xzSystemUserToCompanyProjectMapper.selectOne(new LambdaQueryWrapper<XzSystemUserToCompanyProject>()
.eq(XzSystemUserToCompanyProject::getType, 2)
.last("limit 1")
);
if (xzSystemUserToCompanyProject != null) {
result.put("sn", xzSystemUserToCompanyProject.getSn());
} }
result.put("account", systemUser.getAccount());
result.put("userTel", systemUser.getUserTel());
result.put("realName", systemUser.getRealName());
if (systemUser != null && systemUser.getWorkerId() != null) {
result.put("workerId", systemUser.getWorkerId().toString());
} else {
result.put("workerId", "");
}
result.put("sn", systemUser.getSn());
result.put("styleType", null);
result.put("accountType", systemUser.getAccountType());
result.put("headquartersSn", null);
result.put("companyName", null);
result.put("propagateFile", null);
result.put("moduleShowType", null);
result.put("mobileAttendance", null);
result.put("customerServicePhone", null);
result.put("inputQrCode", null);
result.put("projectKanban", null);
result.put("addProjectType", null);
result.put("enterProjectBackType", null);
result.put("companyBigScreen", null);
//Map<String, Object> menuAuthority = getUserAuthority(systemUser.getUserId(), systemUser.getAccountType(), systemUser.getSn(), companyConfig.getHeadquartersSn(), companyConfig.getStyleType());
Map<String, Object> menuAuthority = new HashMap<>();
menuAuthority.put("moduleList", new ArrayList<>());
menuAuthority.put("menuList", new ArrayList<>());
result.put("menuAuthority", menuAuthority);
result.put("scope", scope);
result.put("expire", false);
result.put("systemLogoConfig", new SystemLogoConfig());
if (Objects.equals(systemUser.getAccountType(), 10)) {
XzSystemUserToCompanyProject xzSystemUserToCompanyProject = xzSystemUserToCompanyProjectMapper.selectOne(new LambdaQueryWrapper<XzSystemUserToCompanyProject>()
.eq(XzSystemUserToCompanyProject::getType, 2)
.last("limit 1")
);
if (xzSystemUserToCompanyProject != null) {
result.put("sn", xzSystemUserToCompanyProject.getSn());
}
}
return result;
} else {
CompanyConfig companyConfig = null;
if (systemUser.getAccountType() == 1) {
companyConfig = new CompanyConfig();
companyConfig.setIsEnable(1);
companyConfig.setEffectiveTime(60 * 60 * 24);
companyConfig.setDiffDay(20);
companyConfig.setModuleShowType(0);
companyConfig.setMobileAttendance(0);
companyConfig.setProjectKanban(0);
companyConfig.setCompanyBigScreen(0);
companyConfig.setInputQrCode(0);
companyConfig.setStyleType(1);
companyConfig.setEnterProjectBackType(0);
companyConfig.setExpireTime(DateUtil.format(DateUtil.tomorrow(), DatePattern.NORM_DATE_PATTERN));
companyConfig.setAddProjectType(0);
companyConfig.setStyleType(1);
companyConfig.setHeadquartersSn("-1");
} else if (systemUser.getAccountType() == 5 || systemUser.getAccountType() == 6) {
companyConfig = companyConfigMapper.getCompanyConfigByProject(systemUser.getSn());
} else if (systemUser.getAccountType() == 10 || systemUser.getAccountType() == 11) {
companyConfig = companyConfigMapper.getCompanyConfigByHeadquartersSn(MapUtils.getString(map, "headquartersSn"));
} else {
companyConfig = companyConfigMapper.getCompanyConfigBySN(systemUser.getSn());
}
log.info("companyConfig：{}", JSON.toJSONString(companyConfig));
if (companyConfig.getExpireTime() == null) {
throw new OpenAlertException(MessageUtil.get("loginEnabledErr"));
} else {
DateTime expireTime = DateUtil.parse(companyConfig.getExpireTime(), "yyyy-MM-dd");
DateTime currentDate = new DateTime();
if (expireTime.getTime() < currentDate.getTime()) {
throw new OpenAlertException(MessageUtil.get("loginExpiredErr"));
} else {
companyConfig.setDiffDay((int) DateUtil.between(currentDate, DateUtil.offset(expireTime, DateField.DAY_OF_MONTH, 1), DateUnit.DAY));
}
}
if (companyConfig == null || companyConfig.getIsEnable() == 0) {
throw new OpenAlertException(MessageUtil.get("loginEnabledErr"));
}
if (companyConfig.getDiffDay() == 0) {
throw new OpenAlertException(MessageUtil.get("loginExpiredErr"));
}
if (companyConfig.getEffectiveTime() == null) {
companyConfig.setEffectiveTime(60 * 60 * 24 * 30 * 12);
}
SystemLogoConfig slc = systemLogoConfigMapper.selectOne(new LambdaQueryWrapper<SystemLogoConfig>().eq(SystemLogoConfig::getHeadquartersSn, companyConfig.getHeadquartersSn()));
if (slc == null) {
slc = systemLogoConfigMapper.selectOne(new LambdaQueryWrapper<SystemLogoConfig>().eq(SystemLogoConfig::getHeadquartersSn, "-1"));
}
String token = jwtTokenProvider.createToken(MapUtils.getString(map, "account"), companyConfig.getEffectiveTime(), slc != null ? slc.getLoginTimeOut() : null);
UserEnterprise userEnterprise = userEnterpriseService.selectUserEnterpriseByUserId(systemUser.getUserId());
if (userEnterprise != null) {
result.put("userEnterpriseId", userEnterprise.getEnterpriseId());
} else {
result.put("userEnterpriseId", "");
}
if (systemUser.getAccountType() == 6) {
//项目子账号要判断是否能查看设备中台
BaseRole baseRole = baseRoleMapper.selectRoleByUserId(systemUser.getUserId());
if (baseRole == null) {
result.put("seeEquipment", 1);
} else {
result.put("seeEquipment", Integer.valueOf(baseRole.getSeeEquipment()));
}
} else {
result.put("seeEquipment", 0);
}
result.put("token", token);
if (systemUser != null && systemUser.getUserId() != null) {
result.put("userId", systemUser.getUserId().toString());
} else {
result.put("userId", "");
}
result.put("account", systemUser.getAccount());
result.put("userTel", systemUser.getUserTel());
result.put("realName", systemUser.getRealName());
if (systemUser != null && systemUser.getWorkerId() != null) {
result.put("workerId", systemUser.getWorkerId().toString());
} else {
result.put("workerId", "");
}
result.put("sn", systemUser.getSn());
result.put("styleType", companyConfig.getStyleType());
result.put("accountType", systemUser.getAccountType());
result.put("headquartersSn", companyConfig.getHeadquartersSn());
result.put("companyName", companyConfig.getCompanyName());
result.put("propagateFile", companyConfig.getPropagateFile());
result.put("moduleShowType", companyConfig.getModuleShowType());
result.put("mobileAttendance", companyConfig.getMobileAttendance());
result.put("customerServicePhone", companyConfig.getCustomerServicePhone());
result.put("inputQrCode", companyConfig.getInputQrCode());
result.put("projectKanban", companyConfig.getProjectKanban());
result.put("addProjectType", companyConfig.getAddProjectType());
result.put("enterProjectBackType", companyConfig.getEnterProjectBackType());
result.put("companyBigScreen", companyConfig.getCompanyBigScreen());
Map<String, Object> menuAuthority = getUserAuthority(systemUser.getUserId(), systemUser.getAccountType(), systemUser.getSn(), companyConfig.getHeadquartersSn(), companyConfig.getStyleType());
result.put("menuAuthority", menuAuthority);
result.put("scope", scope);
result.put("expire", false);
result.put("systemLogoConfig", slc);
if (Objects.equals(systemUser.getAccountType(), 10)) {
XzSystemUserToCompanyProject xzSystemUserToCompanyProject = xzSystemUserToCompanyProjectMapper.selectOne(new LambdaQueryWrapper<XzSystemUserToCompanyProject>()
.eq(XzSystemUserToCompanyProject::getType, 2)
.last("limit 1")
);
if (xzSystemUserToCompanyProject != null) {
result.put("sn", xzSystemUserToCompanyProject.getSn());
}
}
return result;
} }
return result;
} }
@ -1024,6 +1147,7 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
SystemUser systemUser = systemUserMapper.selectOne(queryWrapper); SystemUser systemUser = systemUserMapper.selectOne(queryWrapper);
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = new HashMap<>();
map.put("account", username); map.put("account", username);
map.put("headquartersSn", dto.getHeadquartersSn());
Map<String, Object> rsMap = doLogin(map, systemUser); Map<String, Object> rsMap = doLogin(map, systemUser);
return Result.success(rsMap); return Result.success(rsMap);
} }
@ -1294,6 +1418,7 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
public Map<String, Object> deviceLogin(Map<String, Object> map) { public Map<String, Object> deviceLogin(Map<String, Object> map) {
Integer type = MapUtils.getInteger(map, "type"); Integer type = MapUtils.getInteger(map, "type");
String idCard = MapUtils.getString(map, "idCard"); String idCard = MapUtils.getString(map, "idCard");
String name = MapUtils.getString(map, "name");
String carNumber = MapUtils.getString(map, "carNumber"); String carNumber = MapUtils.getString(map, "carNumber");
Map<String, Object> result = new HashMap<>(); Map<String, Object> result = new HashMap<>();
if (Objects.equals(type, 1)) { if (Objects.equals(type, 1)) {
@ -1301,6 +1426,11 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
if (CollUtil.isEmpty(devs)) { if (CollUtil.isEmpty(devs)) {
throw new OpenAlertException("该人员的安全帽设备不存在"); throw new OpenAlertException("该人员的安全帽设备不存在");
} }
for (SafetyHatDev dev : devs) {
if (!dev.getWorkerName().equals(name)) {
throw new OpenAlertException("人员姓名错误");
}
}
result.put("devInfoList", devs); result.put("devInfoList", devs);
} else if (Objects.equals(type, 2)) { } else if (Objects.equals(type, 2)) {
MechanicalEquipmentPositionDev dev = mechanicalEquipmentPositionDevMapper.selectOne(new LambdaQueryWrapper<MechanicalEquipmentPositionDev>() MechanicalEquipmentPositionDev dev = mechanicalEquipmentPositionDevMapper.selectOne(new LambdaQueryWrapper<MechanicalEquipmentPositionDev>()

14
src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml
View File

@ -73,8 +73,18 @@
(case (case
when ex.contract_period_end_time >= DATE_FORMAT(now(), "%Y-%m-%d") then 1 when ex.contract_period_end_time >= DATE_FORMAT(now(), "%Y-%m-%d") then 1
else 2 end) contract_period_type, else 2 end) contract_period_type,
round(IFNULL(TRUNCATE(DATEDIFF(ex.contract_period_start_time, DATE_FORMAT(now(), "%Y-%m-%d")) / round(
DATEDIFF(ex.contract_period_start_time, ex.contract_period_end_time), 4), 0) * 100, IFNULL(
IF
(
DATEDIFF(
DATE_FORMAT( now(), "%Y-%m-%d" ),ex.contract_period_start_time)>= DATEDIFF( ex.contract_period_end_time
,ex.contract_period_start_time),
1,
TRUNCATE ( DATEDIFF( DATE_FORMAT( now(), "%Y-%m-%d" ),ex.contract_period_start_time) / DATEDIFF(
ex.contract_period_end_time ,ex.contract_period_start_time), 4 )),
0
) * 100,
2) period_ratio 2) period_ratio
FROM project a FROM project a
INNER JOIN company b ON a.company_sn = b.company_sn INNER JOIN company b ON a.company_sn = b.company_sn

1
src/main/java/com/zhgd/xmgl/modules/xz/controller/XzRegistryController.java
View File

@ -161,6 +161,7 @@ public class XzRegistryController {
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "星纵-用户和供应商注册ID", paramType = "body", required = true, dataType = "String"), @ApiImplicitParam(name = "id", value = "星纵-用户和供应商注册ID", paramType = "body", required = true, dataType = "String"),
@ApiImplicitParam(name = "approvalProcess", value = "审核进程2审批通过3拒绝申请", paramType = "body", required = true, dataType = "Integer"), @ApiImplicitParam(name = "approvalProcess", value = "审核进程2审批通过3拒绝申请", paramType = "body", required = true, dataType = "Integer"),
@ApiImplicitParam(name = "headquartersSn", value = "总企业sn", paramType = "body", required = true, dataType = "Integer"),
}) })
@PostMapping(value = "/approval") @PostMapping(value = "/approval")
public Result<XzRegistry> approval(@RequestBody XzRegistry xzRegistry) { public Result<XzRegistry> approval(@RequestBody XzRegistry xzRegistry) {

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

@ -183,7 +183,7 @@ public class XzRegistryServiceImpl extends ServiceImpl<XzRegistryMapper, XzRegis
systemUser.setPassword(xz.getPw()); systemUser.setPassword(xz.getPw());
systemUser.setRealName(xz.getAccount()); systemUser.setRealName(xz.getAccount());
systemUser.setAccountType(10); systemUser.setAccountType(10);
systemUser.setHeadquartersSn(xz.getHeadquartersSn());//无关 systemUser.setHeadquartersSn(null);//无关
Long userId = null; Long userId = null;
try { try {
userId = systemUserService.saveSystemUser(systemUser); userId = systemUserService.saveSystemUser(systemUser);
@ -196,6 +196,7 @@ public class XzRegistryServiceImpl extends ServiceImpl<XzRegistryMapper, XzRegis
map.put("userId", userId); map.put("userId", userId);
map.put("projectSns", projectSns); map.put("projectSns", projectSns);
map.put("companySns", companySns); map.put("companySns", companySns);
map.put("headquartersSn", r.getHeadquartersSn());
companyService.updateTenantOrg(map); companyService.updateTenantOrg(map);
emailUtils.sendSimpleMail(email, xz.getAccount() + "账号审批通过", "您在平台申请的账号已经审核通过，账号：" + xz.getAccount() + "密码：" + xz.getPw()); emailUtils.sendSimpleMail(email, xz.getAccount() + "账号审批通过", "您在平台申请的账号已经审核通过，账号：" + xz.getAccount() + "密码：" + xz.getPw());
} else if (Objects.equals(approvalProcess, 3)) { } else if (Objects.equals(approvalProcess, 3)) {