Skip to content

D
dd_school
Commit 6c9c2781 by baochunxin
Options

#修改页面权限，新增群机器人功能

parent 56b18d1f
Showing with 226 additions and 157 deletions
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/CirculationServiceImpl.java
...@@ -63,20 +63,22 @@ public class CirculationServiceImpl extends ServiceImpl<CirculationMapper, Schoo ...@@ -63,20 +63,22 @@ public class CirculationServiceImpl extends ServiceImpl<CirculationMapper, Schoo
*/ */
@Override @Override
public List<SchoolCirculationVo> selectSchoolCirculationVoList(SchoolCirculationVo schoolCirculationVo) { public List<SchoolCirculationVo> selectSchoolCirculationVoList(SchoolCirculationVo schoolCirculationVo) {
List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles(); return circulationMapper.selectSchoolCirculationVoList(schoolCirculationVo);
SysUser user = SecurityUtils.getLoginUser().getUser();
for (SysRole role : roles) { // List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
if (role.getRoleKey().equals("admin")){ // SysUser user = SecurityUtils.getLoginUser().getUser();
return circulationMapper.selectSchoolCirculationVoList(schoolCirculationVo); // for (SysRole role : roles) {
}else if (role.getRoleKey().equals("productCategoryAdmin")){ // if (role.getRoleKey().equals("admin")){
schoolCirculationVo.setAdminId(SecurityUtils.getLoginUser().getUser().getUserId()); // return circulationMapper.selectSchoolCirculationVoList(schoolCirculationVo);
return circulationMapper.selectSchoolCirculationVoListGr(schoolCirculationVo); // }else if (role.getRoleKey().equals("productCategoryAdmin")){
} // schoolCirculationVo.setAdminId(SecurityUtils.getLoginUser().getUser().getUserId());
} // return circulationMapper.selectSchoolCirculationVoListGr(schoolCirculationVo);
if (user.isAdmin()){ // }
return circulationMapper.selectSchoolCirculationVoList(schoolCirculationVo); // }
} // if (user.isAdmin()){
return new ArrayList<>(); // return circulationMapper.selectSchoolCirculationVoList(schoolCirculationVo);
// }
// return new ArrayList<>();
} }
public List<SchoolCirculationVo> selectVxSchoolCirculationVoList( public List<SchoolCirculationVo> selectVxSchoolCirculationVoList(
SchoolReceiveQuery schoolReceiveQuery) { SchoolReceiveQuery schoolReceiveQuery) {
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/EquipmentLedgerServiceImpl.java
...@@ -48,20 +48,22 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe ...@@ -48,20 +48,22 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
*/ */
@Override @Override
public List<SchoolEquipmentLedger> selectSchoolEquipmentLedgerList(SchoolEquipmentLedgerVo schoolEquipmentLedgerVo) { public List<SchoolEquipmentLedger> selectSchoolEquipmentLedgerList(SchoolEquipmentLedgerVo schoolEquipmentLedgerVo) {
List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles(); return equipmentLedgerMapper.selectSchoolEquipmentLedgerList(schoolEquipmentLedgerVo);
SysUser user = SecurityUtils.getLoginUser().getUser();
for (SysRole role : roles) { // List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
if (role.getRoleKey().equals("admin")){ // SysUser user = SecurityUtils.getLoginUser().getUser();
return equipmentLedgerMapper.selectSchoolEquipmentLedgerList(schoolEquipmentLedgerVo); // for (SysRole role : roles) {
}else if (role.getRoleKey().equals("productCategoryAdmin")){ // if (role.getRoleKey().equals("admin")){
schoolEquipmentLedgerVo.setAdminId(SecurityUtils.getLoginUser().getUser().getUserId()); // return equipmentLedgerMapper.selectSchoolEquipmentLedgerList(schoolEquipmentLedgerVo);
return equipmentLedgerMapper.selectSchoolEquipmentLedgerListGr(schoolEquipmentLedgerVo); // }else if (role.getRoleKey().equals("productCategoryAdmin")){
} // schoolEquipmentLedgerVo.setAdminId(SecurityUtils.getLoginUser().getUser().getUserId());
} // return equipmentLedgerMapper.selectSchoolEquipmentLedgerListGr(schoolEquipmentLedgerVo);
if (user.isAdmin()){ // }
return equipmentLedgerMapper.selectSchoolEquipmentLedgerList(schoolEquipmentLedgerVo); // }
} // if (user.isAdmin()){
return new ArrayList<>(); // return equipmentLedgerMapper.selectSchoolEquipmentLedgerList(schoolEquipmentLedgerVo);
// }
// return new ArrayList<>();
} }
/** /**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/EquipmentRepairServiceImpl.java
package yangtz.cs.liu.campus.service.impl.schoolEquipment; package yangtz.cs.liu.campus.service.impl.schoolEquipment;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.core.utils.HttpClientUtil;
import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
...@@ -8,12 +10,15 @@ import com.ruoyi.common.exception.ServiceException; ...@@ -8,12 +10,15 @@ import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.http.HttpUtils;
import com.ruoyi.system.mapper.SysUserMapper; import com.ruoyi.system.mapper.SysUserMapper;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
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;
import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentLedger;
import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentRepair; import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentRepair;
import yangtz.cs.liu.campus.mapper.schoolEquipment.EquipmentLedgerMapper;
import yangtz.cs.liu.campus.mapper.schoolEquipment.EquipmentRepairMapper; import yangtz.cs.liu.campus.mapper.schoolEquipment.EquipmentRepairMapper;
import yangtz.cs.liu.campus.service.schoolEquipment.IEquipmentRepairService; import yangtz.cs.liu.campus.service.schoolEquipment.IEquipmentRepairService;
import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolEquipmentRepairVo; import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolEquipmentRepairVo;
...@@ -32,6 +37,9 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe ...@@ -32,6 +37,9 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe
@Autowired @Autowired
private SysUserMapper sysUserMapper; private SysUserMapper sysUserMapper;
@Autowired
private EquipmentLedgerMapper equipmentLedgerMapper;
/** /**
* 查看设备报修列表 * 查看设备报修列表
* @param schoolEquipmentRepairVo * @param schoolEquipmentRepairVo
...@@ -39,20 +47,21 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe ...@@ -39,20 +47,21 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe
*/ */
@Override @Override
public List<SchoolEquipmentRepairVo> selectSchoolEquipmentRepairVoList(SchoolEquipmentRepairVo schoolEquipmentRepairVo) { public List<SchoolEquipmentRepairVo> selectSchoolEquipmentRepairVoList(SchoolEquipmentRepairVo schoolEquipmentRepairVo) {
List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles(); return equipmentRepairMapper.selectSchoolEquipmentRepairVoList(schoolEquipmentRepairVo);
SysUser user = SecurityUtils.getLoginUser().getUser(); // List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
for (SysRole role : roles) { // SysUser user = SecurityUtils.getLoginUser().getUser();
if (role.getRoleKey().equals("admin")){ // for (SysRole role : roles) {
return equipmentRepairMapper.selectSchoolEquipmentRepairVoList(schoolEquipmentRepairVo); // if (role.getRoleKey().equals("admin")){
}else if (role.getRoleKey().equals("productCategoryAdmin")){ // return equipmentRepairMapper.selectSchoolEquipmentRepairVoList(schoolEquipmentRepairVo);
schoolEquipmentRepairVo.setAdminId(SecurityUtils.getLoginUser().getUser().getUserId()); // }else if (role.getRoleKey().equals("productCategoryAdmin")){
return equipmentRepairMapper.selectSchoolEquipmentRepairVoListGr(schoolEquipmentRepairVo); // schoolEquipmentRepairVo.setAdminId(SecurityUtils.getLoginUser().getUser().getUserId());
} // return equipmentRepairMapper.selectSchoolEquipmentRepairVoListGr(schoolEquipmentRepairVo);
} // }
if (user.isAdmin()){ // }
return equipmentRepairMapper.selectSchoolEquipmentRepairVoList(schoolEquipmentRepairVo); // if (user.isAdmin()){
} // return equipmentRepairMapper.selectSchoolEquipmentRepairVoList(schoolEquipmentRepairVo);
return new ArrayList<>(); // }
// return new ArrayList<>();
} }
/** /**
...@@ -184,5 +193,38 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe ...@@ -184,5 +193,38 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe
public List<SchoolEquipmentRepairVo> getMaintenanceUserList(SchoolReceiveQuery schoolReceiveQuery) { public List<SchoolEquipmentRepairVo> getMaintenanceUserList(SchoolReceiveQuery schoolReceiveQuery) {
return equipmentRepairMapper.getMaintenanceUserList(schoolReceiveQuery); return equipmentRepairMapper.getMaintenanceUserList(schoolReceiveQuery);
} }
String url ="https://oapi.dingtalk.com/robot/send?access_token=06ac9f1927d64a8058d6df0ae21a4a2c6c6414c8567fb3fe89bbd3ec12fe0e3f";
//发送订单机器人
@Override
public void sendDDJqr(SchoolEquipmentRepair schoolEquipmentRepair) {
//根据设备id获取设备信息
SchoolEquipmentLedger schoolEquipmentLedger = equipmentLedgerMapper.selectById(schoolEquipmentRepair.getEquipmentId());
StringBuffer sb = new StringBuffer();
sb.append("[智慧校园]消息通知:");
sb.append("\n");
sb.append("报修人:");
sb.append(schoolEquipmentRepair.getReportRepair());
sb.append("\n");
sb.append("设备名称:");
sb.append(schoolEquipmentLedger.getEquipmentName());
sb.append("\n");
sb.append("保修地点");
sb.append(schoolEquipmentRepair.getPlace());
sb.append("\n");
sb.append("问题:");
sb.append(schoolEquipmentRepair.getProblem());
//构造text语句
JSONObject text = new JSONObject();
text.put("content",sb.toString());
JSONObject at = new JSONObject();
at.put("atMobiles", new String[]{"13800000000"});
at.put("isAtAll", false);
//构造发送语句
JSONObject json = new JSONObject();
json.put("msgtype", "text");
json.put("text", text);
json.put("at", at);
HttpUtils.sendJsonPost(url, json);
}
} }
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/InStockServiceImpl.java
...@@ -28,20 +28,22 @@ public class InStockServiceImpl extends ServiceImpl<InStockMapper, SchoolInStock ...@@ -28,20 +28,22 @@ public class InStockServiceImpl extends ServiceImpl<InStockMapper, SchoolInStock
*/ */
@Override @Override
public List<SchoolInStockVo> selectSchoolInStockVoList(SchoolInStockVo schoolInStockVo) { public List<SchoolInStockVo> selectSchoolInStockVoList(SchoolInStockVo schoolInStockVo) {
List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles(); return inStockMapper.selectSchoolInStockVoList(schoolInStockVo);
SysUser user = SecurityUtils.getLoginUser().getUser();
for (SysRole role : roles) { // List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
if (role.getRoleKey().equals("admin")){ // SysUser user = SecurityUtils.getLoginUser().getUser();
return inStockMapper.selectSchoolInStockVoList(schoolInStockVo); // for (SysRole role : roles) {
}else if (role.getRoleKey().equals("productCategoryAdmin")){ // if (role.getRoleKey().equals("admin")){
schoolInStockVo.setAdminId(SecurityUtils.getLoginUser().getUser().getUserId()); // return inStockMapper.selectSchoolInStockVoList(schoolInStockVo);
return inStockMapper.selectSchoolInStockVoListGr(schoolInStockVo); // }else if (role.getRoleKey().equals("productCategoryAdmin")){
} // schoolInStockVo.setAdminId(SecurityUtils.getLoginUser().getUser().getUserId());
} // return inStockMapper.selectSchoolInStockVoListGr(schoolInStockVo);
if (user.isAdmin()){ // }
return inStockMapper.selectSchoolInStockVoList(schoolInStockVo); // }
} // if (user.isAdmin()){
return new ArrayList<>(); // return inStockMapper.selectSchoolInStockVoList(schoolInStockVo);
// }
// return new ArrayList<>();
} }
/** /**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/OutStockServiceImpl.java
...@@ -28,20 +28,22 @@ public class OutStockServiceImpl extends ServiceImpl<OutStockMapper, SchoolOutSt ...@@ -28,20 +28,22 @@ public class OutStockServiceImpl extends ServiceImpl<OutStockMapper, SchoolOutSt
*/ */
@Override @Override
public List<SchoolOutStockVo> selectSchoolOutStockVoList(SchoolOutStockVo schoolOutStockVo) { public List<SchoolOutStockVo> selectSchoolOutStockVoList(SchoolOutStockVo schoolOutStockVo) {
List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles(); return outStockMapper.selectSchoolOutStockVoList(schoolOutStockVo);
SysUser user = SecurityUtils.getLoginUser().getUser();
for (SysRole role : roles) { // List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
if (role.getRoleKey().equals("admin")){ // SysUser user = SecurityUtils.getLoginUser().getUser();
return outStockMapper.selectSchoolOutStockVoList(schoolOutStockVo); // for (SysRole role : roles) {
}else if (role.getRoleKey().equals("productCategoryAdmin")){ // if (role.getRoleKey().equals("admin")){
schoolOutStockVo.setAdminId(SecurityUtils.getLoginUser().getUser().getUserId()); // return outStockMapper.selectSchoolOutStockVoList(schoolOutStockVo);
return outStockMapper.selectSchoolOutStockVoListGr(schoolOutStockVo); // }else if (role.getRoleKey().equals("productCategoryAdmin")){
} // schoolOutStockVo.setAdminId(SecurityUtils.getLoginUser().getUser().getUserId());
} // return outStockMapper.selectSchoolOutStockVoListGr(schoolOutStockVo);
if (user.isAdmin()){ // }
return outStockMapper.selectSchoolOutStockVoList(schoolOutStockVo); // }
} // if (user.isAdmin()){
return new ArrayList<>(); // return outStockMapper.selectSchoolOutStockVoList(schoolOutStockVo);
// }
// return new ArrayList<>();
} }
/** /**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/ProductCategoryServiceImpl.java
...@@ -37,20 +37,22 @@ public class ProductCategoryServiceImpl extends ServiceImpl<ProductCategoryMappe ...@@ -37,20 +37,22 @@ public class ProductCategoryServiceImpl extends ServiceImpl<ProductCategoryMappe
*/ */
@Override @Override
public List<SchoolProductCategory> selectSchoolProductCateGory(SchoolProductCategory schoolProductCategory) { public List<SchoolProductCategory> selectSchoolProductCateGory(SchoolProductCategory schoolProductCategory) {
List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles(); return productCategoryMapper.selectSchoolProductCateGory(schoolProductCategory);
SysUser user = SecurityUtils.getLoginUser().getUser();
for (SysRole role : roles) { // List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
if (role.getRoleKey().equals("admin")){ // SysUser user = SecurityUtils.getLoginUser().getUser();
return productCategoryMapper.selectSchoolProductCateGory(schoolProductCategory); // for (SysRole role : roles) {
}else if (role.getRoleKey().equals("productCategoryAdmin")){ // if (role.getRoleKey().equals("admin")){
schoolProductCategory.setAdminId(SecurityUtils.getLoginUser().getUser().getUserId()); // return productCategoryMapper.selectSchoolProductCateGory(schoolProductCategory);
return productCategoryMapper.selectSchoolProductCateGoryGr(schoolProductCategory); // }else if (role.getRoleKey().equals("productCategoryAdmin")){
} // schoolProductCategory.setAdminId(SecurityUtils.getLoginUser().getUser().getUserId());
} // return productCategoryMapper.selectSchoolProductCateGoryGr(schoolProductCategory);
if (user.isAdmin()){ // }
return productCategoryMapper.selectSchoolProductCateGory(schoolProductCategory); // }
} // if (user.isAdmin()){
return new ArrayList<>(); // return productCategoryMapper.selectSchoolProductCateGory(schoolProductCategory);
// }
// return new ArrayList<>();
} }
/** /**
...@@ -222,20 +224,22 @@ public class ProductCategoryServiceImpl extends ServiceImpl<ProductCategoryMappe ...@@ -222,20 +224,22 @@ public class ProductCategoryServiceImpl extends ServiceImpl<ProductCategoryMappe
@Override @Override
// @DataScope(userAlias = "u") // @DataScope(userAlias = "u")
public List<Map<String, String>> getEquipmentType(SchoolProductCategory schoolProductCategory) { public List<Map<String, String>> getEquipmentType(SchoolProductCategory schoolProductCategory) {
List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles(); return productCategoryMapper.getEquipmentType(schoolProductCategory);
SysUser user = SecurityUtils.getLoginUser().getUser();
for (SysRole role : roles) { // List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
if (role.getRoleKey().equals("admin")){ // SysUser user = SecurityUtils.getLoginUser().getUser();
return productCategoryMapper.getEquipmentType(schoolProductCategory); // for (SysRole role : roles) {
}else if (role.getRoleKey().equals("productCategoryAdmin")){ // if (role.getRoleKey().equals("admin")){
schoolProductCategory.setAdminId(SecurityUtils.getLoginUser().getUser().getUserId()); // return productCategoryMapper.getEquipmentType(schoolProductCategory);
return productCategoryMapper.getEquipmentTypeGr(schoolProductCategory); // }else if (role.getRoleKey().equals("productCategoryAdmin")){
} // schoolProductCategory.setAdminId(SecurityUtils.getLoginUser().getUser().getUserId());
} // return productCategoryMapper.getEquipmentTypeGr(schoolProductCategory);
if (user.isAdmin()){ // }
return productCategoryMapper.getEquipmentType(schoolProductCategory); // }
} // if (user.isAdmin()){
return new ArrayList<>(); // return productCategoryMapper.getEquipmentType(schoolProductCategory);
// }
// return new ArrayList<>();
} }
/** /**
...@@ -268,31 +272,35 @@ public class ProductCategoryServiceImpl extends ServiceImpl<ProductCategoryMappe ...@@ -268,31 +272,35 @@ public class ProductCategoryServiceImpl extends ServiceImpl<ProductCategoryMappe
*/ */
@Override @Override
public SchoolProductCategory getEquipmentByCode(String code) { public SchoolProductCategory getEquipmentByCode(String code) {
// List<SchoolProductCategory> list = new ArrayList<>(); LambdaQueryWrapper<SchoolProductCategory> wrapper = new LambdaQueryWrapper<>();
List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles(); wrapper.eq(SchoolProductCategory::getClassificationCode,code);
SysUser user = SecurityUtils.getLoginUser().getUser();
if (user.isAdmin()){
// list.clear();
LambdaQueryWrapper<SchoolProductCategory> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SchoolProductCategory::getClassificationCode,code);
return productCategoryMapper.selectOne(wrapper);
}
for (SysRole role : roles) {
if (role.getRoleKey().equals("admin")){
// list.clear();
LambdaQueryWrapper<SchoolProductCategory> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SchoolProductCategory::getClassificationCode,code);
// list.add(productCategoryMapper.selectOne(wrapper)); // list.add(productCategoryMapper.selectOne(wrapper));
return productCategoryMapper.selectOne(wrapper); return productCategoryMapper.selectOne(wrapper);
// break; // List<SchoolProductCategory> list = new ArrayList<>();
}else if (role.getRoleKey().equals("productCategoryAdmin")){ // List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
// list.clear(); // SysUser user = SecurityUtils.getLoginUser().getUser();
LambdaQueryWrapper<SchoolProductCategory> wrapper = new LambdaQueryWrapper<>(); // if (user.isAdmin()){
wrapper.eq(SchoolProductCategory::getClassificationCode,code) //// list.clear();
.eq(SchoolProductCategory::getAdminId,SecurityUtils.getLoginUser().getUser().getUserId()); // LambdaQueryWrapper<SchoolProductCategory> wrapper = new LambdaQueryWrapper<>();
return productCategoryMapper.selectOne(wrapper); // wrapper.eq(SchoolProductCategory::getClassificationCode,code);
} // return productCategoryMapper.selectOne(wrapper);
} // }
throw new ServiceException("该设备不再您管辖范围内"); // for (SysRole role : roles) {
// if (role.getRoleKey().equals("admin")){
//// list.clear();
// LambdaQueryWrapper<SchoolProductCategory> wrapper = new LambdaQueryWrapper<>();
// wrapper.eq(SchoolProductCategory::getClassificationCode,code);
//// list.add(productCategoryMapper.selectOne(wrapper));
// return productCategoryMapper.selectOne(wrapper);
//// break;
// }else if (role.getRoleKey().equals("productCategoryAdmin")){
//// list.clear();
// LambdaQueryWrapper<SchoolProductCategory> wrapper = new LambdaQueryWrapper<>();
// wrapper.eq(SchoolProductCategory::getClassificationCode,code)
// .eq(SchoolProductCategory::getAdminId,SecurityUtils.getLoginUser().getUser().getUserId());
// return productCategoryMapper.selectOne(wrapper);
// }
// }
// throw new ServiceException("该设备不再您管辖范围内");
} }
} }
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/ReceiveServiceImpl.java
...@@ -39,20 +39,22 @@ public class ReceiveServiceImpl extends ServiceImpl<ReceiveMapper, SchoolReceive ...@@ -39,20 +39,22 @@ public class ReceiveServiceImpl extends ServiceImpl<ReceiveMapper, SchoolReceive
*/ */
@Override @Override
public List<SchoolReceiveVo> selectSchoolReceiveVoList(SchoolReceiveVo schoolReceiveVo) { public List<SchoolReceiveVo> selectSchoolReceiveVoList(SchoolReceiveVo schoolReceiveVo) {
List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles(); return receiveMapper.selectSchoolReceiveVoList(schoolReceiveVo);
SysUser user = SecurityUtils.getLoginUser().getUser();
for (SysRole role : roles) { // List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
if (role.getRoleKey().equals("admin")){ // SysUser user = SecurityUtils.getLoginUser().getUser();
return receiveMapper.selectSchoolReceiveVoList(schoolReceiveVo); // for (SysRole role : roles) {
}else if (role.getRoleKey().equals("productCategoryAdmin")){ // if (role.getRoleKey().equals("admin")){
schoolReceiveVo.setAdminId(SecurityUtils.getLoginUser().getUser().getUserId()); // return receiveMapper.selectSchoolReceiveVoList(schoolReceiveVo);
return receiveMapper.selectSchoolReceiveVoListGr(schoolReceiveVo); // }else if (role.getRoleKey().equals("productCategoryAdmin")){
} // schoolReceiveVo.setAdminId(SecurityUtils.getLoginUser().getUser().getUserId());
} // return receiveMapper.selectSchoolReceiveVoListGr(schoolReceiveVo);
if (user.isAdmin()){ // }
return receiveMapper.selectSchoolReceiveVoList(schoolReceiveVo); // }
} // if (user.isAdmin()){
return new ArrayList<>(); // return receiveMapper.selectSchoolReceiveVoList(schoolReceiveVo);
// }
// return new ArrayList<>();
} }
/** /**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolEquipment/IEquipmentRepairService.java
...@@ -68,5 +68,8 @@ public interface IEquipmentRepairService extends IService<SchoolEquipmentRepair> ...@@ -68,5 +68,8 @@ public interface IEquipmentRepairService extends IService<SchoolEquipmentRepair>
public List<SchoolEquipmentRepairVo> getMaintenanceUserList(SchoolReceiveQuery schoolReceiveQuery); public List<SchoolEquipmentRepairVo> getMaintenanceUserList(SchoolReceiveQuery schoolReceiveQuery);
//发送机器人保修信息
public void sendDDJqr( SchoolEquipmentRepair schoolEquipmentRepair);
} }
smart-campus/src/main/java/yangtz/cs/liu/wechat/controller/equipment/EquipmentLeaseController.java
...@@ -152,24 +152,26 @@ public class EquipmentLeaseController { ...@@ -152,24 +152,26 @@ public class EquipmentLeaseController {
*/ */
@GetMapping("/getMaintenanceList") @GetMapping("/getMaintenanceList")
private AjaxResult getMaintenanceList(SchoolReceiveQuery schoolReceiveQuery){ private AjaxResult getMaintenanceList(SchoolReceiveQuery schoolReceiveQuery){
Boolean flag= false; List<SchoolEquipmentRepairVo> getlist = iEquipmentRepairService.getAdminList(schoolReceiveQuery);
//1.管理员可以查看所有维修列表 return AjaxResult.success(getlist);
SysUser sysUser = iSysUserService.selectUserById(schoolReceiveQuery.getReportRepairid()); // Boolean flag= false;
List<SysRole> roles = sysUser.getRoles(); // //1.管理员可以查看所有维修列表
for(SysRole data :roles){ // SysUser sysUser = iSysUserService.selectUserById(schoolReceiveQuery.getReportRepairid());
if (data.getRoleKey().contains("productCategoryAdmin")){ // List<SysRole> roles = sysUser.getRoles();
flag=true; // for(SysRole data :roles){
break; // if (data.getRoleKey().contains("productCategoryAdmin")){
} // flag=true;
}; // break;
if (false){ // }
List<SchoolEquipmentRepairVo> getlist = iEquipmentRepairService.getAdminList(schoolReceiveQuery); // };
return AjaxResult.success(getlist); // if (false){
}else { // List<SchoolEquipmentRepairVo> getlist = iEquipmentRepairService.getAdminList(schoolReceiveQuery);
List<SchoolEquipmentRepairVo> maintenanceList = iEquipmentRepairService // return AjaxResult.success(getlist);
.getMaintenanceList(schoolReceiveQuery); // }else {
return AjaxResult.success(maintenanceList); // List<SchoolEquipmentRepairVo> maintenanceList = iEquipmentRepairService
} // .getMaintenanceList(schoolReceiveQuery);
// return AjaxResult.success(maintenanceList);
// }
} }
/** /**
...@@ -177,6 +179,7 @@ public class EquipmentLeaseController { ...@@ -177,6 +179,7 @@ public class EquipmentLeaseController {
*/ */
@PostMapping("/addMaintenance") @PostMapping("/addMaintenance")
private AjaxResult addMaintenance(@RequestBody SchoolEquipmentRepair schoolEquipmentRepair){ private AjaxResult addMaintenance(@RequestBody SchoolEquipmentRepair schoolEquipmentRepair){
iEquipmentRepairService.sendDDJqr(schoolEquipmentRepair);
boolean save = iEquipmentRepairService.save(schoolEquipmentRepair); boolean save = iEquipmentRepairService.save(schoolEquipmentRepair);
return AjaxResult.success(save); return AjaxResult.success(save);
} }
...@@ -316,4 +319,8 @@ public class EquipmentLeaseController { ...@@ -316,4 +319,8 @@ public class EquipmentLeaseController {
return AjaxResult.success(iEquipmentRepairService.getRepair()); return AjaxResult.success(iEquipmentRepairService.getRepair());
} }
} }
smart-campus/src/main/resources/mapper/schoolEquipment/EquipmentRepairMapper.xml
...@@ -160,8 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -160,8 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT er.id,er.equipment_id,el.encode,el.equipment_name,el.model,el.date_of_production,er.place,el.place,el.classification_code, SELECT er.id,er.equipment_id,el.encode,el.equipment_name,el.model,el.date_of_production,er.place,el.place,el.classification_code,
er.report_repair_time,er.report_repair_id,er.report_repair,er.problem,er.repair_id,er.repair_name,er.repair_phone, er.report_repair_time,er.report_repair_id,er.report_repair,er.problem,er.repair_id,er.repair_name,er.repair_phone,
er.repair_time,er.repair_state,er.dispose_state,er.evaluate,er.remark FROM school_equipment_repair er LEFT JOIN er.repair_time,er.repair_state,er.dispose_state,er.evaluate,er.remark FROM school_equipment_repair er LEFT JOIN
school_equipment_ledger el on er.equipment_id = el.id LEFT JOIN school_product_category pc school_equipment_ledger el on er.equipment_id = el.id where er.del_flag=0
on pc.classification_code = el.classification_code WHERE pc.admin_id=#{reportRepairid} AND er.del_flag=0
<if test="equipmentName != null and equipmentName != ''">and el.equipment_name like concat('%', #{equipmentName}, '%')</if> <if test="equipmentName != null and equipmentName != ''">and el.equipment_name like concat('%', #{equipmentName}, '%')</if>
ORDER BY er.report_repair_time DESC ORDER BY er.report_repair_time DESC
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment