Skip to content

A
amos-boot-biz
Commit e060c2be authored by suhuiguang's avatar suhuiguang
Browse files
Options

1.导出修改

parent 4a98b776
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 229 deletions
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/RedisKey.java
View file @ e060c2be
......@@ -42,7 +42,7 @@ public class RedisKey {
public static final String REGION_REDIS_PREFIX = "biz_";
/**
* 创建区域key
* @param token
* @param token 权限
* @return String
*/
public static String buildReginKey(String userId, String token) {
......@@ -51,8 +51,8 @@ public class RedisKey {
/**
* 模糊重新区域key
* @param token
* @return
* @param token 权限
* @return String
*/
public static String buildPatternKey(String token) {
return REGION_REDIS_PREFIX + "*" + "_" + token;
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/CheckController.java
View file @ e060c2be
......@@ -106,7 +106,7 @@ public class CheckController extends AbstractBaseController {
if (ObjectUtils.isEmpty(param.getOrderBy())) {
param.setOrderBy("checkDate desc");
}
Page<CheckInfoVo> list = checkService.getCheckInfo(getToken(), getProduct(), getAppKey(), param);
Page<CheckInfoVo> list = checkService.getCheckInfo(param);
return CommonResponseUtil.success(list);
}
......@@ -114,7 +114,7 @@ public class CheckController extends AbstractBaseController {
@ApiOperation(value = "导出巡检记录", notes = "导出巡检记录")
@PostMapping(value = "/export", produces = "application/vnd.ms-excel;charset=UTF-8")
public void exportCheck(
@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
@ApiParam(value = "查询条件") @RequestBody(required = false) List<CommonRequest> queryRequests,
HttpServletResponse response) {
ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getOrgCode(reginParams);
......@@ -136,7 +136,7 @@ public class CheckController extends AbstractBaseController {
CheckInfoPageParam param = CheckPageParamUtil.fillCheckInfoParam(queryRequests, null, paramMap);
param.setPageSize(-1);
param.setOrderBy("checkDate DESC");
List<CheckInfoVo> list = checkService.getCheckInfoList(getToken(), getProduct(), getAppKey(), param);
List<CheckInfoVo> list = checkService.getCheckInfoListNoPage(param);
String fileName = "巡检记录" + new Date().getTime();
FileHelper.exportExcel(list, "维保记录", "维保记录", CheckInfoVo.class, fileName + ".xls", response);
}
......@@ -147,7 +147,7 @@ public class CheckController extends AbstractBaseController {
public void exportSelectCheckRecord(
@ApiParam(value = "查询条件") @RequestParam(required = false) Long[] ids,
HttpServletResponse response) {
List<CheckInfoVo> list = checkService.getSelectedCheckInfoList(getToken(), getProduct(), getAppKey(), ids);
List<CheckInfoVo> list = checkService.getSelectedCheckInfoList(ids);
String fileName = "巡检记录" + new Date().getTime();
FileHelper.exportExcel(list, "巡检记录", "巡检记录", CheckInfoVo.class, fileName + ".xls", response);
}
......@@ -168,7 +168,6 @@ public class CheckController extends AbstractBaseController {
hasOrgCode = Boolean.FALSE;
}
}
;
}
HashMap<String, Object> paramMap;
if (hasOrgCode) {
......@@ -521,7 +520,7 @@ public class CheckController extends AbstractBaseController {
@ApiOperation(value = "维保记录详情", notes = "维保记录详情")
@GetMapping(value = "/{id}/detail")
public CommonResponse getCheckDetail(
@ApiParam(value = "记录Id",required = true) @PathVariable(value = "id") String id) {
@ApiParam(value = "记录Id", required = true) @PathVariable(value = "id") String id) {
return CommonResponseUtil.success(checkService.getCheckDetail(id));
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/CheckServiceImpl.java
View file @ e060c2be
......@@ -119,7 +119,7 @@ public class CheckServiceImpl implements ICheckService {
@Override
public Page<CheckInfoVo> getCheckInfo(String toke, String product, String appKey, CheckInfoPageParam param) {
public Page<CheckInfoVo> getCheckInfo(CheckInfoPageParam param) {
long total = checkMapper.countCheckInfoData(param);
List<CheckInfoVo> content = Lists.newArrayList();
if (total == 0) {
......@@ -347,7 +347,6 @@ public class CheckServiceImpl implements ICheckService {
public static CheckInput paraseNumber(CheckInput checkInput, String json, CheckInputParam item, String isScore) {
JSONObject jsonObject = JSONObject.parseObject(json);
String OkUpStr = jsonObject.get("OkUp").toString();
;
String OkDownStr = jsonObject.get("OkDown").toString();
Double OkUp = StringUtil.isNotEmpty(OkUpStr) ? Double.valueOf(OkUpStr) : null;
Double OkDown = StringUtil.isNotEmpty(OkDownStr) ? Double.valueOf(OkDownStr) : null;
......@@ -728,43 +727,8 @@ public class CheckServiceImpl implements ICheckService {
}
@Override
public List<CheckInfoVo> getCheckInfoList(String toke, String product, String appKey, CheckInfoPageParam param) {
List<CheckInfoVo> list = checkMapper.getCheckInfo(param);
Set<String> userIds = Sets.newHashSet(Lists.transform(list, CheckInfoVo::getUserId));
Set<String> deptIds = Sets.newHashSet(Lists.transform(list, CheckInfoVo::getDepId));
deptIds.remove("");
deptIds.remove(null);
String joinUserId = "";
for (String userId : userIds) {
if (userId != null && !userId.trim().equals("")) {
joinUserId = joinUserId + userId + ",";
}
}
List<AgencyUserModel> userModels = remoteSecurityService.listUserByUserIds(toke, product, appKey, joinUserId);
Map<String, String> deptMap = new HashMap<String, String>();
if (!CollectionUtils.isEmpty(deptIds)) {
List<LinkedHashMap> deptList = remoteSecurityService.listDepartmentByDeptIds(toke, product, appKey, Joiner.on(",").join(deptIds));
// deptMap = deptList.stream().collect(Collectors.toMap(DepartmentModel::getSequenceNbr, DepartmentModel::getDepartmentName));
for (int i = 0; i < deptList.size(); i++) {
deptMap.put(deptList.get(i).get("sequenceNbr").toString(), deptList.get(i).get("departmentName").toString());
}
}
Map<String, String> userModelMap = userModels.stream().collect(Collectors.toMap(AgencyUserModel::getUserId, AgencyUserModel::getRealName, (k1, k2) -> k2));
Map<String, String> deptMapNew = deptMap;
List<String> userNames = new ArrayList<>();
list.forEach(e -> {
userNames.clear();
List<String> userIds1 = Arrays.asList(e.getUserId().split(","));
for (String userId : userIds1) {
userNames.add(userModelMap.get(userId));
}
userNames.remove(null);
e.setUserName(Joiner.on(",").join(userNames));
e.setDepartmentName(deptMapNew.get(e.getDepId()));
});
return list;
public List<CheckInfoVo> getCheckInfoListNoPage(CheckInfoPageParam param) {
return checkMapper.getCheckInfo(param);
}
@Override
......@@ -778,36 +742,8 @@ public class CheckServiceImpl implements ICheckService {
}
@Override
public List<CheckInfoVo> getSelectedCheckInfoList(String toke, String product, String appKey, Long[] ids) {
List<CheckInfoVo> list = checkMapper.getSelectedCheckInfoList(ids);
Set<String> userIds = Sets.newHashSet(Lists.transform(list, CheckInfoVo::getUserId));
Set<String> deptIds = Sets.newHashSet(Lists.transform(list, CheckInfoVo::getDepId));
deptIds.remove("");
deptIds.remove(null);
List<AgencyUserModel> userModels = remoteSecurityService.listUserByUserIds(toke, product, appKey, Joiner.on(",").join(userIds));
Map<String, String> deptMap = new HashMap<String, String>();
// if(!CollectionUtils.isEmpty(deptIds)){
// List<LinkedHashMap> deptList = remoteSecurityService.listDepartmentByDeptIds( toke, product, appKey,Joiner.on(",").join(deptIds));
// //deptMap = deptList.stream().collect(Collectors.toMap(DepartmentModel::getSequenceNbr, DepartmentModel::getDepartmentName));
// for (int i = 0; i < deptList.size(); i++) {
// deptMap.put(deptList.get(i).get("sequenceNbr").toString(), deptList.get(i).get("departmentName").toString());
// }
// }
Map<String, String> userModelMap = userModels.stream().collect(Collectors.toMap(AgencyUserModel::getUserId, AgencyUserModel::getRealName, (k1, k2) -> k2));
Map<String, String> deptMapNew = deptMap;
List<String> userNames = new ArrayList<>();
list.forEach(e -> {
userNames.clear();
List<String> userIds1 = Arrays.asList(e.getUserId().split(","));
for (String userId : userIds1) {
userNames.add(userModelMap.get(userId));
}
userNames.remove(null);
e.setUserName(Joiner.on(",").join(userNames));
// e.setDepartmentName(deptMapNew.get(e.getDepId()));
});
return list;
public List<CheckInfoVo> getSelectedCheckInfoList(Long[] ids) {
return checkMapper.getSelectedCheckInfoList(ids);
}
@Override
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/PointServiceImpl.java
View file @ e060c2be
......@@ -1106,7 +1106,7 @@ public class PointServiceImpl implements IPointService {
point.setOwnerName(x.getOwnerUnitName());
point.setBuildingId(x.getBuildingId() != null ? x.getBuildingId().toString() : "");
point.setBuildingName(x.getBuildingName());
point.setAddress(x.getArea());
point.setAddress(x.getLocation());
point.setLevel("");
point.setCreatorId(RequestContext.getExeUserId());
//TODO BUG orgCode 取值 没值来源
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/intfc/ICheckService.java
View file @ e060c2be
......@@ -14,7 +14,6 @@ import com.yeejoin.amos.maintenance.core.common.response.AppPointCheckRespone;
import com.yeejoin.amos.maintenance.core.common.response.CommonPage;
import com.yeejoin.amos.maintenance.core.common.response.GraphInitDataResponse;
import com.yeejoin.amos.maintenance.core.common.response.QueryCriteriaRespone;
import com.yeejoin.amos.maintenance.dao.entity.Check;
import com.yeejoin.amos.maintenance.exception.YeeException;
import org.springframework.data.domain.Page;
import org.springframework.transaction.annotation.Transactional;
......@@ -31,10 +30,11 @@ public interface ICheckService {
* @param param
* @return
*/
Page<CheckInfoVo> getCheckInfo(String toke, String product, String appKey, CheckInfoPageParam param);
Page<CheckInfoVo> getCheckInfo(CheckInfoPageParam param);
/**
* 保存检查记录
*
* @param recordParam 填写记录
* @param reginParams 权限信息
* @return CheckDto
......@@ -58,9 +58,9 @@ public interface ICheckService {
List<Map> queryUnqualifiedInputItem(int checkId);
AppPointCheckRespone queryCheckPointDetail(String toke,String product,String appKey,long checkId);
AppPointCheckRespone queryCheckPointDetail(String toke, String product, String appKey, long checkId);
AppPointCheckRespone queryCheckPointDetailInVersion2(String toke,String product,String appKey,long checkId);
AppPointCheckRespone queryCheckPointDetailInVersion2(String toke, String product, String appKey, long checkId);
/**
* 巡检统计
......@@ -86,7 +86,7 @@ public interface ICheckService {
*/
Map<String, Object> queryRecordById(int checkId);
List<CheckInfoVo> getCheckInfoList(String toke,String product,String appKey,CheckInfoPageParam param);
List<CheckInfoVo> getCheckInfoListNoPage(CheckInfoPageParam param);
/**
* 查询巡检记录所有图片
......@@ -110,7 +110,7 @@ public interface ICheckService {
* @param ids
* @return
*/
List<CheckInfoVo> getSelectedCheckInfoList(String toke,String product,String appKey,Long[] ids);
List<CheckInfoVo> getSelectedCheckInfoList(Long[] ids);
/**
* 本月隐患治理趋势统计
......@@ -128,7 +128,7 @@ public interface ICheckService {
* @param userInfo
* @return
*/
QueryCriteriaRespone getQueryCriteriaInit(String toke,String product,String appKey,String loginOrgCode, String roleTypeName, String departmentId, String companyId);
QueryCriteriaRespone getQueryCriteriaInit(String toke, String product, String appKey, String loginOrgCode, String roleTypeName, String departmentId, String companyId);
List<HashMap<String, String>> getCalCountChkInfo(HashMap<String, Object> paramMap);
......@@ -154,7 +154,8 @@ public interface ICheckService {
* @param param
* @return
*/
List<HashMap<String,Object>> getEquipInputByCheckId(CheckDetailInputPageParam param);
List<HashMap<String, Object>> getEquipInputByCheckId(CheckDetailInputPageParam param);
/**
* 根据巡检记录ID和巡检点ID获取巡检记录详情
*
......@@ -195,7 +196,7 @@ public interface ICheckService {
* @param user
* @return
*/
QueryCriteriaRespone findCheckSystemInit(String toke,String product,String appKey,String type, String orgCode, String roleTypeName, String departmentId, String companyId);
QueryCriteriaRespone findCheckSystemInit(String toke, String product, String appKey, String type, String orgCode, String roleTypeName, String departmentId, String companyId);
/**
* 巡检记录查询
......@@ -205,7 +206,7 @@ public interface ICheckService {
*/
Page<CheckInfoBo> getCheckInfoList(CheckInfoListPageParam params);
Page<Map<String, Object>> getCheckInfoList1(String toke,String product,String appKey,CheckInfoListPageParam params);
Page<Map<String, Object>> getCheckInfoList1(String toke, String product, String appKey, CheckInfoListPageParam params);
/**
* 视图模块初始化数据
......@@ -238,31 +239,35 @@ public interface ICheckService {
*/
List<Long> getCheckDataCount(HashMap<String, Object> param);
List<String> getCheckPhotosByCheckAndInputId(int checkId, int checkInputId,int classifyId);
List<String> getCheckPhotosByCheckAndInputId(int checkId, int checkInputId, int classifyId);
List<String> getLivePhotos(Long checkID);
List<Long> getPlanCheckDataCount(HashMap<String, Object> param);
/**
* 查询巡检装备
*
* @param param
* @return
*/
List<HashMap<String,Object>> getEquipByCheckId(CheckDetailInputPageParam param);
List<HashMap<String, Object>> getEquipByCheckId(CheckDetailInputPageParam param);
/**
* 最近一次漏检记录
*
* @param relationId 关系id
* @return CheckRecordDto
*/
Map<String,CheckRecordDto> obtainLastCheckRecord(String[] relationId);
Map<String, CheckRecordDto> obtainLastCheckRecord(String[] relationId);
Page<Map<String, Object>> getCheckPage(HashMap<String, Object> map, CommonPageable pageable);
Map<String, Object> getCheckDetail(String id);
/**
* 校验是否已经填写过
*
* @param planTaskId
* @param pointId
* @return
......@@ -272,14 +277,16 @@ public interface ICheckService {
/**
* 维保记录-按照管理id查询
*
* @param originalId 关联id
* @param pageable 分页信息 0页开始
* @return Page<Map<String,Object>>
* @param pageable 分页信息 0页开始
* @return Page<Map < String, Object>>
*/
Page<Map<String,Object>> getCheckListByOriginalId(String originalId, CommonPageable pageable);
Page<Map<String, Object>> getCheckListByOriginalId(String originalId, CommonPageable pageable);
/**
* 维保检查项详情
*
* @param checkId 记录ID
* @return List<CheckInputDto>
*/
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/vo/CheckInfoVo.java
View file @ e060c2be
package com.yeejoin.amos.maintenance.business.vo;
import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
@Data
public class CheckInfoVo {
private String id;
private String orgCode;
private String pointId;
@Excel(name = "点名称", orderNum = "0")
@Excel(name = "点名称")
private String pointName;
@Excel(name = "点编号", orderNum = "1")
private String pointNo;
......@@ -15,6 +18,10 @@ public class CheckInfoVo {
private String depId;
@Excel(name = "维保人员", orderNum = "2")
private String userName;
/**
* 维保公司名称
*/
private String companyName;
@Excel(name = "维保部门", orderNum = "3")
private String departmentName;
@Excel(name = "维保时间", orderNum = "4")
......@@ -43,135 +50,4 @@ public class CheckInfoVo {
private String error;
@Excel(name = "备注说明", orderNum = "14")
private String remark;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getDepId() {
return depId;
}
public void setDepId(String depId) {
this.depId = depId;
}
public String getOrgCode() {
return orgCode;
}
public void setOrgCode(String orgCode) {
this.orgCode = orgCode;
}
public String getPointId() {
return pointId;
}
public void setPointId(String pointId) {
this.pointId = pointId;
}
public String getPointName() {
return pointName;
}
public void setPointName(String pointName) {
this.pointName = pointName;
}
public String getPointNo() {
return pointNo;
}
public void setPointNo(String pointNo) {
this.pointNo = pointNo;
}
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
public String getUserName() {
return userName;
}
public String getDepartmentName() {
return departmentName;
}
public void setDepartmentName(String departmentName) {
this.departmentName = departmentName;
}
public void setUserName(String userName) {
this.userName = userName;
}
public String getCheckTime() {
return checkTime;
}
public void setCheckTime(String checkTime) {
this.checkTime = checkTime;
}
public String getUploadTime() {
return uploadTime;
}
public void setUploadTime(String uploadTime) {
this.uploadTime = uploadTime;
}
public String getFinishStatus() {
return finishStatus;
}
public void setFinishStatus(String finishStatus) {
this.finishStatus = finishStatus;
}
public String getIsOk() {
return isOk;
}
public void setIsOk(String isOk) {
this.isOk = isOk;
}
public String getScore() {
return score;
}
public void setScore(String score) {
this.score = score;
}
public String getRouteName() {
return routeName;
}
public void setRouteName(String routeName) {
this.routeName = routeName;
}
public String getCheckMode() {
return checkMode;
}
public void setCheckMode(String checkMode) {
this.checkMode = checkMode;
}
public String getPlanName() {
return planName;
}
public void setPlanName(String planName) {
this.planName = planName;
}
public String getPlanTaskId() {
return planTaskId;
}
public void setPlanTaskId(String planTaskId) {
this.planTaskId = planTaskId;
}
public String getError() {
return error;
}
public void setError(String error) {
this.error = error;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getCatalogId() {
return CatalogId;
}
public void setCatalogId(String catalogId) {
CatalogId = catalogId;
}
}
amos-boot-system-maintenance/src/main/resources/db/mapper/dbTemplate_check.xml
View file @ e060c2be
......@@ -38,7 +38,6 @@
</choose>
<trim prefix="WHERE" prefixOverrides="AND ">
<if test="beginDate!=null and endDate!=null">and a.check_time BETWEEN #{beginDate} and #{endDate}</if>
<!-- <if test="endDate!=null"> and #{endDate} <![CDATA[>=]]> a.check_time </if> -->
<if test="userName!=null">and a.user_name like concat(concat("%",#{userName}),"%")</if>
<if test="pointName!=null">and b.name like concat(concat("%",#{pointName}),"%")</if>
<if test="pointNo!=null">and b.point_no like concat('%',#{pointNo},'%')</if>
......@@ -74,6 +73,7 @@
a.user_name,
a.dep_name department_name,
a.dep_id departmentId,
a.company_name,
date_format(
`a`.`check_time`,
'%Y-%m-%d %H:%i:%s'
......@@ -456,7 +456,6 @@
</choose>
<trim prefix="WHERE" prefixOverrides="AND ">
<if test="beginDate!=null and endDate!=null">and a.check_time BETWEEN #{beginDate} and #{endDate}</if>
<!-- <if test="endDate!=null"> and #{endDate} <![CDATA[>=]]> a.check_time </if> -->
<if test="userName!=null">and a.user_name like concat(concat("%",#{userName}),"%")</if>
<if test="pointName!=null">and a.point_name like concat(concat("%",#{pointName}),"%")</if>
<if test="pointNo!=null">and b.point_no = #{pointNo}</if>
......
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