bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

南网注册和领料数据权限修改

This commit is contained in:
liang.chao 2024-02-20 18:04:13 +08:00
parent e900a0c3fe
commit 5dd287a0b7
9 changed files with 248 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java
View File

@ -48,8 +48,8 @@ public class TokenController {
@Resource
private NwUserLoginService nwUserLoginService;
/* @Autowired
private NwRegisterService registerService;*/
@Autowired
private NwRegisterService registerService;
//web端登录
@PostMapping("login")
@ -143,7 +143,7 @@ public class TokenController {
}
/* @ApiOperation("用户中心注册")
@ApiOperation("用户中心注册")
@PostMapping("/registers")
public AjaxResult registers(HttpServletRequest request, @RequestBody RegisterForms registerForms) {
AccountRegister accountRegister = new AccountRegister();
@ -152,5 +152,5 @@ public class TokenController {
accountRegister.setRemark("个人用户注册");
registerForms.setIsPersonal(accountRegister.getCode());
return AjaxResult.success("success", registerService.registersNew(request, registerForms));
}*/
}
}

29
sgzb-auth/src/main/java/com/bonus/sgzb/auth/form/NwLoginConstants.java
View File

@ -76,6 +76,7 @@ public class NwLoginConstants {
public static final Long PLATFORM_ID = 20L;
public static final String REGISTERIP_SUCCESS = "注册成功";
public static final String REGISTERIP_SUCCESS_BIND = "该账号已注册";
public static final String REGISTERIP_FAIL = "注册失败";
/**
* 授权范围
@ -139,15 +140,15 @@ public class NwLoginConstants {
//短信验证码校验
public static String verifyPhoneCode;
/* @Value("${verifyPhoneCode}")
@Value("${verifyPhoneCode}")
public void setVerifyPhoneCode(String verifyPhoneCode) {
NwLoginConstants.verifyPhoneCode = verifyPhoneCode;
}*/
}
// 绑定默认系统角色
public static String userBindUrl;
/* @Value("${userBindUrl}")
@Value("${userBindUrl}")
public void setUserBindUrl(String userBindUrl) {
NwLoginConstants.userBindUrl = userBindUrl;
}
@ -155,15 +156,15 @@ public class NwLoginConstants {
@Value("${registerPhone}")
public void setRegisterPhone(String registerPhone) {
NwLoginConstants.registerPhone = registerPhone;
}*/
}
//用户列表查询（简单信息）
public static String personEasyList;
/* @Value("${getPersonDetailData}")
@Value("${getPersonDetailData}")
public void setGetPersonDetailData(String getPersonDetailData) {
NwLoginConstants.getPersonDetailData = getPersonDetailData;
}*/
}
//用户信息查询 详细信息
public static String getPersonDetailData;
@ -182,21 +183,21 @@ public class NwLoginConstants {
public static String appAppsecret;
/* @Value("${appAppsecret}")
@Value("${appAppsecret}")
public void setAppAppsecret(String appAppsecret) {
NwLoginConstants.appAppsecret = appAppsecret;
}*/
}
/* @Value("${personEasyList}")
@Value("${personEasyList}")
public void setPersonEasyList(String personEasyList) {
NwLoginConstants.personEasyList = personEasyList;
}*/
}
public static String appsecret;
public static String h5Appsecret;
/* @Value("${h5Appsecret}")
@Value("${h5Appsecret}")
public void setH5Appsecret(String h5Appsecret) {
NwLoginConstants.h5Appsecret = h5Appsecret;
}
@ -204,7 +205,7 @@ public class NwLoginConstants {
@Value("${appsecret}")
public void setAppsecret(String appsecret) {
NwLoginConstants.appsecret = appsecret;
}*/
}
public static String appId;
@ -213,7 +214,7 @@ public class NwLoginConstants {
public static String appAppId;
/* @Value("${appAppId}")
@Value("${appAppId}")
public void setAppAppId(String appAppId) {
NwLoginConstants.appAppId = appAppId;
}
@ -227,7 +228,7 @@ public class NwLoginConstants {
@Value("${appId}")
public void setAppId(String appId) {
NwLoginConstants.appId = appId;
}*/
}
@Value("${baseUrl}")
public void setBaseUrl(String baseUrl) {

39
sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/impl/NwRegisterServiceImpl.java
View File

@ -25,14 +25,14 @@ import java.util.regex.Pattern;
* @date: 2021/8/14 18:47
* @description: 注册实现类
*/
/*@Service
@Service
@Slf4j
public class NwRegisterServiceImpl implements NwRegisterService {
@Override
public String registersNew(HttpServletRequest request, RegisterForms registerForms) {
log.info("统一个人手机注册 registersForPersonal方法 入参 request:{}, registerForms:{}", request, JSON.toJSONString(registerForms));
*//**校验请求参数*//*
//校验请求参数
this.checkRequestParam(request, registerForms);
Integer loginModeType = registerForms.getLoginModeType();
NwApp nwApp = new NwApp();
@ -56,25 +56,31 @@ public class NwRegisterServiceImpl implements NwRegisterService {
try {
//发送注册请求(调用南网的注册方法)
RespLoginData respLoginData = null;
*//*查询用户中心是否存在当前用户*//*
// 查询用户中心是否存在当前用户
CloudUserVo cloudUserVo = this.queryUserBySso(registerForms);
*//*数据幂等性操作 记录日志*//*
// 数据幂等性操作 记录日志
RegistersVo registersVo = getRegisterVo(registerForms);
log.error("check001_registersVo:{}", JSON.toJSONString(registersVo));
if (null == cloudUserVo) {
log.info("系统不存在,用户中心不存在,同步数据到用户中心");
respLoginData = HttpUtils.postJson(NwLoginConstants.registerPhone, registersVo, null, Map.class, null);
} else {
log.info("系统不存在,用户中心存在,操作绑定业务");
respLoginData = this.bindSsoUser(registerForms);
}
log.error("check002_respLoginData:{}", JSON.toJSONString(respLoginData));
if (respLoginData.getCode().equals(NwLoginConstants.HTTP_RESPONSE_CODE_200)) {
return NwLoginConstants.REGISTERIP_SUCCESS;
}else {
return NwLoginConstants.REGISTERIP_FAIL;
}
} else {
log.info("系统不存在,用户中心存在,操作绑定业务");
respLoginData = this.bindSsoUser(registerForms);
log.error("check002_respLoginData:{}", JSON.toJSONString(respLoginData));
if (respLoginData.getCode().equals(NwLoginConstants.HTTP_RESPONSE_CODE_200)) {
return NwLoginConstants.REGISTERIP_SUCCESS_BIND;
}else {
return NwLoginConstants.REGISTERIP_FAIL;
}
}
} catch (Exception e) {
throw new BaseException("9999", e.getMessage());
}
@ -133,12 +139,12 @@ public class NwRegisterServiceImpl implements NwRegisterService {
}
}
*//**
/* *
* 验证手机号
*
* @param phone
* @return 验证成功返回true，验证失败返回false
*//*
* @return 验证成功返回true，验证失败返回false*/
public static boolean checkPhone(String phone) {
String regex = "^1\\d{10}$";
return Pattern.matches(regex, phone);
@ -186,12 +192,9 @@ public class NwRegisterServiceImpl implements NwRegisterService {
}
}
*//**
* 封装南网需要的注册信息
*
* @author: LYJ
* @date: 2021/8/17 8:57
*//*
/* 封装南网需要的注册信息*/
private RegistersVo getRegisterVo(RegisterForms registerForms) {
RegistersVo registersVo = new RegistersVo();
if (null != registerForms.getEnterpriseName()) {
@ -256,4 +259,4 @@ public class NwRegisterServiceImpl implements NwRegisterService {
return HttpUtils.postJson(NwLoginConstants.userBindUrl, lbcloudUserVo, null, Map.class, null);
}
}*/
}

11
sgzb-auth/src/main/resources/bootstrap.yml
View File

@ -31,3 +31,14 @@ wechatAppId: crhmaxnE
wechatAppsecret: 3893e6ed90d325f00e34583dd970a56580c05549
getNowPersonDetailData: /lbcloud-user/user/queryLoginUserInfo
baseUrl: https://test-sso.csgmall.com.cn
appAppsecret: d8e6db9fa9bb09da0e270fa739233c823bf9c5f0
personEasyList: /lbcloud-user/api/user/queryAndPaging/basicInfo
h5Appsecret: 3c4a67b7f6a268b4202a5328e6a1726979d5903b
h5AppId: G3NksDH2
appsecret: 596e4863c8d112842ce820c130b236001297ea73
appId: akvVFYgy
appAppId: u8LLfynf
getPersonDetailData: /lbcloud-user/api/user/queryById
registerPhone: /lbcloud-user/api/user/registrationByPhone
userBindUrl: /lbcloud-authority/api/RoleClient/bindDefaultSystemRole
verifyPhoneCode: /lbcloud-mbroker/api/broker/simpleVerificationCode

27
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java
View File

@ -274,13 +274,13 @@ public class TmTaskController extends BaseController {
/**
* 查询机具领料审核列表
* 查询机具领料申请列表
*
* @param task 筛选条件
* @param souceBy app为1 web为0
* @return 列表
*/
@Log(title = "查询机具领料审核列表", businessType = BusinessType.QUERY)
@Log(title = "查询机具领料申请列表", businessType = BusinessType.QUERY)
@GetMapping(value = "getLeaseAuditListAll")
public AjaxResult getLeaseAuditListAll(TmTask task, Integer souceBy) {
if (StringUtils.isNull(task)) {
@ -296,6 +296,29 @@ public class TmTaskController extends BaseController {
return AjaxResult.success(getDataTable(leaseAuditList));
}
/**
* 查询机具领料管理列表
*
* @param task 筛选条件
* @param souceBy app为1 web为0
* @return 列表
*/
@Log(title = "查询机具领料管理列表", businessType = BusinessType.QUERY)
@GetMapping(value = "getLeaseManageListAll")
public AjaxResult getLeaseManageListAll(TmTask task, Integer souceBy) {
if (StringUtils.isNull(task)) {
return AjaxResult.error("参数错误");
}
List<TmTask> leaseAuditList = new ArrayList<>();
if (souceBy == 1) {
leaseAuditList = tmTaskService.getLeaseAuditManageList(task);
return AjaxResult.success(leaseAuditList);
}
startPage();
leaseAuditList = tmTaskService.getLeaseAuditManageList(task);
return AjaxResult.success(getDataTable(leaseAuditList));
}
/**
* 领料申请导出
* 注意：备注字段到时要换

4
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java
View File

@ -27,9 +27,13 @@ public interface TmTaskMapper {
*/
List<TmTask> getAuditListByLeaseTmTask(@Param("record") TmTask record);
List<TmTask> getAuditManageListByLeaseTmTask(@Param("record") TmTask record);
List<LeaseApplyInfo> getAuditListByLeaseInfo(@Param("record") TmTask record);
List<LeaseApplyInfo> getAuditManageListByLeaseInfo(@Param("record") TmTask record);
List<LeaseApplyDetails> getLeaseApplyDetails(@Param("record") LeaseApplyInfo record);
List<LeaseApplyDetails> getLeaseApplyManageDetails(@Param("record") LeaseApplyInfo record);
/** 更新TmTask审批状态 */
int updateTmTaskAuditStatus(@Param("record") TmTask record);

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java
View File

@ -19,6 +19,8 @@ public interface TmTaskService{
List<TmTask> getLeaseAuditList(TmTask record);
List<TmTask> getLeaseAuditManageList(TmTask record);
List<TmTask> getLeaseAuditListForApp(TmTask record);
/** 领料任务审核通过状态修改 */

76
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
View File

@ -107,11 +107,13 @@ public class TmTaskServiceImpl implements TmTaskService {
}
/**
* 获取审核列表 - web端
* 获取领料申请列表
*/
@Override
public List<TmTask> getLeaseAuditList(TmTask record) {
List<TmTask> tmTaskList = tmTaskMapper.getAuditListByLeaseTmTask(record);
List<TmTask> collect = tmTaskMapper.getAuditListByLeaseTmTask(record);
String username = SecurityUtils.getLoginUser().getUsername();
List<TmTask> tmTaskList = collect.stream().filter(t -> t.getCreateBy().equals(username)).collect(Collectors.toList());
for (TmTask tmTask : tmTaskList) {
int count = 0;
if (tmTask != null) {
@ -142,6 +144,76 @@ public class TmTaskServiceImpl implements TmTaskService {
tmTask.setPreCountNum(count);
}
}
return tmTaskList;
}
/**
* 获取领料管理列表
*/
@Override
public List<TmTask> getLeaseAuditManageList(TmTask record) {
List<TmTask> tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record);
Set<String> roles = SecurityUtils.getLoginUser().getRoles();
for (TmTask tmTask : tmTaskList) {
int count = 0;
if (tmTask != null) {
// 去查询任务分单表
List<LeaseApplyInfo> collect = tmTaskMapper.getAuditManageListByLeaseInfo(tmTask);
//施管部只能看到机具分公司（101）的数据
if (roles.contains("sgb")){
List<LeaseApplyInfo> auditListByLeaseInfo = collect.stream().filter(t -> t.getCompanyId() == 101).collect(Collectors.toList());
if (auditListByLeaseInfo != null && !auditListByLeaseInfo.isEmpty()) {
// 对领料任务集合查询具体详情
for (LeaseApplyInfo leaseApplyInfo : auditListByLeaseInfo) {
if (leaseApplyInfo != null) {
// 去查询领料任务详情表
List<LeaseApplyDetails> leaseApplyDetails = tmTaskMapper.getLeaseApplyManageDetails(leaseApplyInfo);
if (leaseApplyDetails != null && !leaseApplyDetails.isEmpty()) {
for (LeaseApplyDetails leaseApplyDetail : leaseApplyDetails) {
if (leaseApplyDetail != null) {
// 统计预领数量
count += leaseApplyDetail.getPreNum();
}
}
// 塞入领料任务详情的集合中
leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails);
}
}
}
// 存入领料任务实体集合
tmTask.setLeaseApplyInfoList(auditListByLeaseInfo);
}
}
//安监部只能看到设备分公司（102）的数据
if (roles.contains("ajb")){
List<LeaseApplyInfo> auditListByLeaseInfo = collect.stream().filter(t -> t.getCompanyId() == 102).collect(Collectors.toList());
if (auditListByLeaseInfo != null && !auditListByLeaseInfo.isEmpty()) {
// 对领料任务集合查询具体详情
for (LeaseApplyInfo leaseApplyInfo : auditListByLeaseInfo) {
if (leaseApplyInfo != null) {
// 去查询领料任务详情表
List<LeaseApplyDetails> leaseApplyDetails = tmTaskMapper.getLeaseApplyManageDetails(leaseApplyInfo);
if (leaseApplyDetails != null && !leaseApplyDetails.isEmpty()) {
for (LeaseApplyDetails leaseApplyDetail : leaseApplyDetails) {
if (leaseApplyDetail != null) {
// 统计预领数量
count += leaseApplyDetail.getPreNum();
}
}
// 塞入领料任务详情的集合中
leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails);
}
}
}
// 存入领料任务实体集合
tmTask.setLeaseApplyInfoList(auditListByLeaseInfo);
}
}
// 塞入预领的合计数量
tmTask.setPreCountNum(count);
}
}
return tmTaskList;
}

73
sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
View File

@ -503,6 +503,56 @@
ORDER BY tt.update_time DESC
</select>
<select id="getAuditManageListByLeaseTmTask" resultType="com.bonus.sgzb.app.domain.TmTask">
SELECT DISTINCT
tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName,
bpl.lot_id as proId,bpl.lot_name as proName,
bui.unit_id as unitId,bui.unit_name as unitName,
lai.lease_person as leasePerson, lai.phone as leasePhone, tt.create_by as applyFor,d.`name` as taskName,
case when d.id = '30' then lai.company_audit_remark
when d.id = '31' then lai.dept_audit_remark
when d.id = '32' then lai.direct_audit_remark
when d.id = '98' then lai.company_audit_remark
when d.id = '99' then lai.dept_audit_remark
when d.id = '100' then lai.direct_audit_remark
end examineStatus ,
d.id as examineStatusId,
bai.agreement_code as agreementCode,
tt.create_time as createTimes, tt.update_time as updateTimes
FROM
tm_task tt
LEFT JOIN sys_user su ON tt.create_by = su.user_name
LEFT JOIN sys_dept sd ON su.dept_id = sd.dept_id
LEFT JOIN tm_task_agreement tta ON tt.task_id = tta.task_id
LEFT JOIN bm_agreement_info bai ON bai.agreement_id = tta.agreement_id
LEFT JOIN bm_project_lot bpl ON bpl.lot_id = bai.project_id
LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id
LEFT JOIN lease_apply_info lai ON lai.task_id = tt.task_id
LEFT JOIN sys_dic d ON d.id = tt.task_status
WHERE
tt.task_type = '29' and tt.status = '1'
<if test="record.taskId != null and record.taskId != '' ">
AND tt.task_id = #{record.taskId}
</if>
<if test="record.startTime != null and record.startTime != '' and record.endTime != null and record.endTime != '' ">
AND tt.update_time BETWEEN CONCAT(#{record.startTime}, ' 00:00:00') AND CONCAT(#{record.endTime}, ' 23:59:59')
</if>
<if test="record.unitId != null and record.unitId != ''">
AND bui.unit_id = #{record.unitId}
</if>
<if test="record.projectId != null and record.projectId != ''">
AND bpi.pro_id = #{record.projectId}
</if>
<if test="record.keyWord != null and record.keyWord != ''">
AND bai.agreement_code like concat('%', #{record.keyWord}, '%')
</if>
ORDER BY tt.update_time DESC
</select>
<select id="getAuditListByLeaseInfo" resultType="com.bonus.sgzb.app.domain.LeaseApplyInfo">
SELECT
lai.*
@ -511,6 +561,14 @@
WHERE
lai.task_id = #{record.taskId} AND lai.`code` = #{record.code}
</select>
<select id="getAuditManageListByLeaseInfo" resultType="com.bonus.sgzb.app.domain.LeaseApplyInfo">
SELECT
lai.*
FROM
lease_apply_info lai
WHERE
lai.task_id = #{record.taskId} AND lai.`code` = #{record.code}
</select>
<select id="getLeaseApplyDetails" resultType="com.bonus.sgzb.app.domain.LeaseApplyDetails">
SELECT
@ -527,6 +585,21 @@
GROUP BY
lad.id
</select>
<select id="getLeaseApplyManageDetails" resultType="com.bonus.sgzb.app.domain.LeaseApplyDetails">
SELECT
lad.*, mt.type_name AS typeModelName, mt1.type_name AS typeName,mt.unit_name as unitName, mt.manage_type as manageType,
case WHEN mt.manage_type = '0' then '编号' else '计数' end manageTypeName,
mt.num, (lad.pre_num - IF(lad.al_num IS NULL,'0',lad.al_num)) AS outNum,mm.ma_code as maCode
FROM
lease_apply_details lad
LEFT JOIN ma_type mt ON lad.type_id = mt.type_id
LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id
LEFT JOIN ma_machine mm ON lad.type_id = mm.type_id
WHERE
lad.parennt_id = #{record.id} AND lad.company_id = #{record.companyId}
GROUP BY
lad.id
</select>
<select id="selectNumByMonth" resultType="java.lang.Integer">
select count(*) from tm_task where DATE_FORMAT(create_time,'%y%m') = DATE_FORMAT(#{date},'%y%m') AND task_type='29'