Skip to content

A
amos-boot-biz
Commit d6d191a6 authored by chenhao's avatar chenhao
Browse files
Options

Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

parents 40cc019a 56a909d6
Hide whitespace changes
Inline Side-by-side
Showing with 1439 additions and 1314 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/aop/ControllerAop.java → amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java
View file @ d6d191a6
package com.yeejoin.amos.boot.module.jcs.biz.aop; package com.yeejoin.amos.boot.biz.common.aop;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.biz.common.bo.CompanyBo; import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
...@@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Value; ...@@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.context.request.ServletRequestAttributes;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.utils.Bean; import org.typroject.tyboot.core.foundation.utils.Bean;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -46,7 +47,7 @@ public class ControllerAop { ...@@ -46,7 +47,7 @@ public class ControllerAop {
@Autowired @Autowired
private RedisUtils redisUtils; private RedisUtils redisUtils;
@Pointcut("execution(public * com.yeejoin.amos.boot.module.*.biz.controller..*(..))") @Pointcut("execution(public * com.yeejoin.amos.boot.module.*.biz.controller..*(..)) || execution(public * com.yeejoin.amos.*.business.controller..*(..))")
public void userCache() { public void userCache() {
} }
...@@ -56,6 +57,18 @@ public class ControllerAop { ...@@ -56,6 +57,18 @@ public class ControllerAop {
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
HttpServletRequest request = attributes.getRequest(); HttpServletRequest request = attributes.getRequest();
String token = request.getHeader("token"); String token = request.getHeader("token");
if (token == null) {
token = request.getHeader("X-Access-Token");
}
String authProduct = request.getHeader("product");
if (authProduct == null) {
authProduct = request.getParameter("product");
}
String authAppKey = request.getHeader("appKey");
if (authAppKey == null) {
authAppKey = request.getParameter("appKey");
}
String authToken = buildKey(token);
if (token != null) { if (token != null) {
//验证token有效性，防止token失效 //验证token有效性，防止token失效
AgencyUserModel userModel; AgencyUserModel userModel;
...@@ -67,7 +80,7 @@ public class ControllerAop { ...@@ -67,7 +80,7 @@ public class ControllerAop {
} }
} catch (Exception e) { } catch (Exception e) {
//删除失效token缓存 //删除失效token缓存
redisUtils.del(buildKey(token)); redisUtils.del(authToken);
throw new RuntimeException(e.getMessage()); throw new RuntimeException(e.getMessage());
} }
// 不需要添加请求头的接口 // 不需要添加请求头的接口
...@@ -76,12 +89,13 @@ public class ControllerAop { ...@@ -76,12 +89,13 @@ public class ControllerAop {
if (Arrays.asList(url).contains(request.getRequestURI())) { if (Arrays.asList(url).contains(request.getRequestURI())) {
// 暂无需要 // 暂无需要
} else { } else {
if (!redisUtils.hasKey(buildKey(token))) { if (!redisUtils.hasKey(authToken)) {
saveUserRedis(userModel, token); saveUserRedis(userModel, token);
} }
} }
} }
System.out.println(redisUtils.get(buildKey(token))); // buildRequestCxt(authToken,authProduct,authAppKey);
System.out.println(redisUtils.get(authToken));
} }
public void saveUserRedis(AgencyUserModel user, String token) { public void saveUserRedis(AgencyUserModel user, String token) {
...@@ -112,7 +126,8 @@ public class ControllerAop { ...@@ -112,7 +126,8 @@ public class ControllerAop {
reginParams.setRole(role); reginParams.setRole(role);
reginParams.setDepartment(department); reginParams.setDepartment(department);
reginParams.setUserModel(user); reginParams.setUserModel(user);
redisUtils.set(buildKey(token), JSONObject.toJSONString(reginParams), redisRegionTimeSecond); String authToken = buildKey(token);
redisUtils.set(authToken, JSONObject.toJSONString(reginParams), redisRegionTimeSecond);
} }
public String buildKey(String token) { public String buildKey(String token) {
//由于用户id 不是接口携带参数，为了避免，公共字段填充时频繁访问平台，缓存用户信息时， //由于用户id 不是接口携带参数，为了避免，公共字段填充时频繁访问平台，缓存用户信息时，
...@@ -130,4 +145,9 @@ public class ControllerAop { ...@@ -130,4 +145,9 @@ public class ControllerAop {
// GlobalCache.paramMap.remove(token); // GlobalCache.paramMap.remove(token);
// } // }
} }
// public void buildRequestCxt(String token,String product,String appKey){
// RequestContext.setToken(token);
// RequestContext.setProduct(product);
// RequestContext.setAppKey(appKey);
//}
} }
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/controller/BaseController.java
View file @ d6d191a6
package com.yeejoin.amos.boot.biz.common.controller; package com.yeejoin.amos.boot.biz.common.controller;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
...@@ -8,9 +10,6 @@ import org.typroject.tyboot.core.foundation.context.RequestContext; ...@@ -8,9 +10,6 @@ import org.typroject.tyboot.core.foundation.context.RequestContext;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils; import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.component.feign.config.InnerInvokException;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel; import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import springfox.documentation.annotations.ApiIgnore; import springfox.documentation.annotations.ApiIgnore;
...@@ -27,6 +26,8 @@ public class BaseController { ...@@ -27,6 +26,8 @@ public class BaseController {
@Autowired @Autowired
private RedisUtils redisUtils; private RedisUtils redisUtils;
@Autowired
protected HttpServletRequest request;
/** /**
* 获取token * 获取token
...@@ -34,28 +35,22 @@ public class BaseController { ...@@ -34,28 +35,22 @@ public class BaseController {
protected String getToken() { protected String getToken() {
return RequestContext.getToken(); return RequestContext.getToken();
} }
public String buildKey(String token) {
protected String buildKey(String token) { //由于用户id 不是接口携带参数，为了避免，公共字段填充时频繁访问平台，缓存用户信息时，
// 由于用户id 不是接口携带参数，为了避免，公共字段填充时频繁访问平台，缓存用户信息时， //return "region_" + userId + "_" + token;
return "region_" + token; return "region_"+ token;
}
}
/** /**
* 用户选择信心redis获取 * 用户选择信心redis获取
**/ **/
protected ReginParams getSelectedOrgInfo() { protected ReginParams getSelectedOrgInfo() {
return JSONObject.parseObject(redisUtils.get(buildKey(RequestContext.getToken())).toString(), return JSONObject.parseObject(redisUtils.get(buildKey(RequestContext.getToken())).toString(), ReginParams.class);
ReginParams.class);
} }
protected String getOrgCode(ReginParams reginParams) { protected String getOrgCode(ReginParams reginParams) {
if (reginParams == null) { if (reginParams == null) {
return null; return null;
} }
// if (reginParams.getDepartment() != null) {
// return reginParams.getDepartment().getDeptOrgCode();
// }
if (reginParams.getCompany() != null) { if (reginParams.getCompany() != null) {
return reginParams.getCompany().getOrgCode(); return reginParams.getCompany().getOrgCode();
} }
...@@ -67,19 +62,74 @@ public class BaseController { ...@@ -67,19 +62,74 @@ public class BaseController {
* 当前登录用户信息 * 当前登录用户信息
*/ */
protected AgencyUserModel getUserInfo() { protected AgencyUserModel getUserInfo() {
AgencyUserModel userModel = null; ReginParams reginParams = getSelectedOrgInfo();
if (getToken() != null) { return reginParams.getUserModel();
FeignClientResult<?> feignClientResult; }
try {
feignClientResult = Privilege.agencyUserClient.getme(); protected String getProduct() {
userModel = (AgencyUserModel) feignClientResult.getResult(); return RequestContext.getProduct();
}
protected String getAppKey() {
return RequestContext.getAppKey();
}
} catch (InnerInvokException e) { protected String getUserId() {
throw new RuntimeException(e.getMessage()); String userId = null;
} if (getUserInfo() != null) {
userId = getUserInfo().getUserId();
}
return userId;
}
protected String getRoleTypeName(ReginParams reginParams) {
if (reginParams == null) {
return null;
}
if (reginParams.getRole() != null) {
return reginParams.getRole().getRoleType();
} }
return userModel; return null;
}
protected String getDepartmentId(ReginParams reginParams) {
if (reginParams == null) {
return null;
}
if (reginParams.getDepartment().getSequenceNbr() != null) {
return reginParams.getDepartment().getSequenceNbr().toString();
}
return null;
}
protected String getDepartmentName(ReginParams reginParams) {
if (reginParams == null) {
return null;
}
if (reginParams.getDepartment().getDepartmentName() != null) {
return reginParams.getDepartment().getDepartmentName();
}
return null;
}
protected String getCompanyId(ReginParams reginParams) {
if (reginParams == null) {
return null;
}
if (reginParams.getCompany() != null) {
return reginParams.getCompany().getSequenceNbr().toString();
}
return null;
}
protected String getCompanyName(ReginParams reginParams) {
if (reginParams == null) {
return null;
}
if (reginParams.getCompany() != null) {
return reginParams.getCompany().getCompanyName();
}
return null;
} }
} }
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/RescueProcessDto.java
View file @ d6d191a6
...@@ -30,6 +30,12 @@ public class RescueProcessDto extends BaseDto { ...@@ -30,6 +30,12 @@ public class RescueProcessDto extends BaseDto {
@ApiModelProperty(value = "是否手动派遣") @ApiModelProperty(value = "是否手动派遣")
private Boolean dispatchByUser = false; private Boolean dispatchByUser = false;
@ApiModelProperty(value = "是否手动到达")
private Boolean arriveByUser = false;
@ApiModelProperty(value = "是否手动救援")
private Boolean saveByUser = false;
@ApiModelProperty(value = "派遣时间") @ApiModelProperty(value = "派遣时间")
private Date dispatchTime; private Date dispatchTime;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/Elevator.java
View file @ d6d191a6
...@@ -189,9 +189,6 @@ public class Elevator extends BaseEntity { ...@@ -189,9 +189,6 @@ public class Elevator extends BaseEntity {
@ApiModelProperty(value = "功率") @ApiModelProperty(value = "功率")
private String power; private String power;
@ApiModelProperty(value = "设备图片")
private String photos;
@ApiModelProperty(value = "原始表id（来自历史数据库）") @ApiModelProperty(value = "原始表id（来自历史数据库）")
private String originalId; private String originalId;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/enums/DispatchPaperEnums.java
View file @ d6d191a6
...@@ -9,63 +9,65 @@ public enum DispatchPaperEnums { ...@@ -9,63 +9,65 @@ public enum DispatchPaperEnums {
//完成状态 WCZT //完成状态 WCZT
notFinish("notFinish","未完成"), notFinish("858","notFinish","未完成"),
hasFinished("hasFinished","已完成"), hasFinished("859","hasFinished","已完成"),
//处置环节 CZHJ //处置环节 CZHJ
receivedAlert("receivedAlert","已接警"), receivedAlert("860","receivedAlert","已接警"),
dispatched("dispatched", "已派遣"), dispatched("861","dispatched", "已派遣"),
rescueArrived("rescueArrived", "救援已到达"), rescueArrived("862","rescueArrived", "救援已到达"),
repaireArrived("repaireArrived", "维保已到达"), repaireArrived("863","repaireArrived", "维保已到达"),
rescued("rescued", "救援完成"), rescued("864","rescued", "救援完成"),
rescueBack("rescueBack", "救援回访"), rescueBack("865","rescueBack", "救援回访"),
repaired("repaired", "维修完成"), repaired("866","repaired", "维修完成"),
reportorBack("reportorBack", "报修人已反馈"), reportorBack("867","reportorBack", "报修人已反馈"),
disposed("disposed", "维保已处置"), disposed("868","disposed", "维保已处置"),
complainantBack("complainantBack", "投诉人已回访"), complainantBack("869","complainantBack", "投诉人已回访"),
// 警情类型 JJLX // 警情类型 JJLX
KRJY("KRJY","困人救援","250"), KRJY("960","KRJY","困人救援","250"),
GZWX("GZWX", "故障维修","251"), GZWX("961","GZWX", "故障维修","251"),
TSZX("TSZX", "投诉咨询","252"), TSZX("962","TSZX", "投诉咨询","252"),
// 反馈方式 FKFS // 反馈方式 FKFS
mainBack("mainBack","主动反馈"), mainBack("856","mainBack","主动反馈"),
phoneBack("phoneBack","电话回访"), phoneBack("857","phoneBack","电话回访"),
// 维修结果 WXJG // 维修结果 WXJG
hasRepaired("hasRepaired","维修成功"), hasRepaired("940","hasRepaired","维修成功"),
other("other","其他"), other("941","other","其他"),
// 处置结果 CZJG // 处置结果 CZJG
hasDisposed("hasDisposed","已处置"), hasDisposed("944","hasDisposed","已处置"),
notDispose("notDispose","未处置"), notDispose("945","notDispose","未处置"),
// 反馈结果 FKJG // 反馈结果 FKJG
satisfactory("satisfactory","满意"), satisfactory("942","satisfactory","满意"),
unsatisfactory("unsatisfactory","不满意"), unsatisfactory("943","unsatisfactory","不满意"),
// 派遣单位 PQDW // 派遣单位 PQDW
useUnit("useUnit","使用单位"), useUnit("949","useUnit","使用单位"),
repairUnit("repairUnit","维保单位"), repairUnit("950","repairUnit","维保单位"),
levelOneUnit("levelOneUnit","一级响应"), levelOneUnit("951","levelOneUnit","一级响应"),
levelTwoUnit("levelTwoUnit","二级响应"), levelTwoUnit("952","levelTwoUnit","二级响应"),
levelThreeUnit("levelThreeUnit","三级响应"); levelThreeUnit("953","levelThreeUnit","三级响应");
private String id;
private String code; private String code;
private String value; private String value;
private String dynamicCode; private String dynamicCode;
DispatchPaperEnums(String code, String value) { DispatchPaperEnums(String id, String code, String value) {
this.id= id;
this.code=code; this.code=code;
this.value=value; this.value=value;
} }
DispatchPaperEnums(String code, String value, String dynamicCode) { DispatchPaperEnums(String id, String code, String value, String dynamicCode) {
this.id= id;
this.code=code; this.code=code;
this.value=value; this.value=value;
this.dynamicCode = dynamicCode; this.dynamicCode = dynamicCode;
...@@ -83,6 +85,14 @@ public enum DispatchPaperEnums { ...@@ -83,6 +85,14 @@ public enum DispatchPaperEnums {
this.value = value; this.value = value;
} }
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getDynamicCode() { public String getDynamicCode() {
return dynamicCode; return dynamicCode;
} }
...@@ -91,7 +101,7 @@ public enum DispatchPaperEnums { ...@@ -91,7 +101,7 @@ public enum DispatchPaperEnums {
this.dynamicCode = dynamicCode; this.dynamicCode = dynamicCode;
} }
public static DispatchPaperEnums getEnum(String code) public static DispatchPaperEnums getEnumByCode(String code)
{ {
for (DispatchPaperEnums status : DispatchPaperEnums.values()) for (DispatchPaperEnums status : DispatchPaperEnums.values())
{ {
...@@ -102,6 +112,16 @@ public enum DispatchPaperEnums { ...@@ -102,6 +112,16 @@ public enum DispatchPaperEnums {
} }
return null; return null;
} }
public static DispatchPaperEnums getEnumById(String code)
{
for (DispatchPaperEnums status : DispatchPaperEnums.values())
{
if (status.getId().equals(code))
{
return status;
}
}
return null;
}
} }
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/IDispatchPaperService.java
View file @ d6d191a6
...@@ -41,7 +41,7 @@ public interface IDispatchPaperService { ...@@ -41,7 +41,7 @@ public interface IDispatchPaperService {
* @param dispatchSaveFeedbackDto * @param dispatchSaveFeedbackDto
* @return * @return
*/ */
Boolean saveDispatchSaveFeedback(DispatchSaveFeedbackDto dispatchSaveFeedbackDto); Boolean saveDispatchSaveFeedback(DispatchSaveFeedbackDto dispatchSaveFeedbackDto, AgencyUserModel user);
/** /**
* 根据警情id 返回 维修回访相关信息 * 根据警情id 返回 维修回访相关信息
...@@ -56,7 +56,7 @@ public interface IDispatchPaperService { ...@@ -56,7 +56,7 @@ public interface IDispatchPaperService {
* @param dispatchRepairFeedbackDto * @param dispatchRepairFeedbackDto
* @return * @return
*/ */
Boolean saveDispatchRepairFeedback(DispatchRepairFeedbackDto dispatchRepairFeedbackDto); Boolean saveDispatchRepairFeedback(DispatchRepairFeedbackDto dispatchRepairFeedbackDto, AgencyUserModel user);
/** /**
* 根据警情id 返回 投诉回访相关信息 * 根据警情id 返回 投诉回访相关信息
...@@ -71,7 +71,7 @@ public interface IDispatchPaperService { ...@@ -71,7 +71,7 @@ public interface IDispatchPaperService {
* @param dispatchConsultFeedbackDto * @param dispatchConsultFeedbackDto
* @return * @return
*/ */
Boolean saveDispatchConsultFeedback(DispatchConsultFeedbackDto dispatchConsultFeedbackDto); Boolean saveDispatchConsultFeedback(DispatchConsultFeedbackDto dispatchConsultFeedbackDto, AgencyUserModel user);
} }
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/IRepairConsultService.java
View file @ d6d191a6
package com.yeejoin.amos.boot.module.tzs.api.service; package com.yeejoin.amos.boot.module.tzs.api.service;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
/** /**
* 警情填报业务数据项接口类 * 警情填报业务数据项接口类
* *
...@@ -16,6 +18,6 @@ public interface IRepairConsultService { ...@@ -16,6 +18,6 @@ public interface IRepairConsultService {
* @param taskId * @param taskId
* @return * @return
*/ */
Boolean saveRepairConsultByAlertIdType(Long alertId, String type, Long taskId); Boolean saveRepairConsultByAlertIdType(Long alertId, String type, Long taskId, AgencyUserModel user);
} }
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FailureDetailsController.java
View file @ d6d191a6
...@@ -4,6 +4,7 @@ import java.util.List; ...@@ -4,6 +4,7 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -125,7 +126,8 @@ public class FailureDetailsController extends BaseController { ...@@ -125,7 +126,8 @@ public class FailureDetailsController extends BaseController {
Page<FailureDetailsDto> page = new Page<FailureDetailsDto>(); Page<FailureDetailsDto> page = new Page<FailureDetailsDto>();
page.setCurrent(current); page.setCurrent(current);
page.setSize(size); page.setSize(size);
return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryForFailureDetailsPage(page,currentStatus)); final AgencyUserModel userInfo = getUserInfo();
return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryForFailureDetailsPage(page,currentStatus,userInfo));
} }
/** /**
...@@ -165,4 +167,21 @@ public class FailureDetailsController extends BaseController { ...@@ -165,4 +167,21 @@ public class FailureDetailsController extends BaseController {
return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryStatusCount(currentStatus)); return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryStatusCount(currentStatus));
} }
/**
* 查询我提交状态任务数量
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "查询我提交状态任务数量", notes = "查询我提交状态任务数量")
@GetMapping(value = "/list/userID")
public ResponseModel<Page<FailureDetailsDto>> selectISubmit(@RequestParam(value = "current") int current,@RequestParam
(value = "size") int size) {
Page<FailureDetailsDto> page = new Page<FailureDetailsDto>();
page.setCurrent(current);
page.setSize(size);
String userId = getUserInfo().getUserId();
return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryForPage(page,userId));
}
} }
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureDetailsServiceImpl.java
View file @ d6d191a6
...@@ -32,6 +32,7 @@ import com.yeejoin.amos.boot.module.common.api.enums.FailureStatuEnum; ...@@ -32,6 +32,7 @@ import com.yeejoin.amos.boot.module.common.api.enums.FailureStatuEnum;
import com.yeejoin.amos.boot.module.common.api.mapper.FailureDetailsMapper; import com.yeejoin.amos.boot.module.common.api.mapper.FailureDetailsMapper;
import com.yeejoin.amos.boot.module.common.api.service.IFailureAuditService; import com.yeejoin.amos.boot.module.common.api.service.IFailureAuditService;
import com.yeejoin.amos.boot.module.common.api.service.IFailureDetailsService; import com.yeejoin.amos.boot.module.common.api.service.IFailureDetailsService;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
/** /**
* 服务实现类 * 服务实现类
...@@ -65,8 +66,21 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa ...@@ -65,8 +66,21 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
/** /**
* 分页查询 * 分页查询
*/ */
public Page<FailureDetailsDto> queryForFailureDetailsPage(Page<FailureDetailsDto> page,Long currentStatus) { public Page<FailureDetailsDto> queryForFailureDetailsPage(Page<FailureDetailsDto> page, Long currentStatus, AgencyUserModel userInfo ) {
return this.queryForPage(page, null, false,currentStatus); if (currentStatus == null){
return this.queryForPage(page, "submission_time", true);
}
return this.queryForPage(page, "submission_time", true,currentStatus);
}
/**
* 我发起分页查询
*/
public Page<FailureDetailsDto> queryForPage(Page<FailureDetailsDto> page, String userId ) {
if (userId == null){
return null;
}
return this.queryForPage(page, "submission_time", true,userId);
} }
/** /**
...@@ -124,7 +138,9 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa ...@@ -124,7 +138,9 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
sourceFileServiceImpl.saveSourceFile(failureDetailsDto.getSequenceNbr(), sourceFileServiceImpl.saveSourceFile(failureDetailsDto.getSequenceNbr(),
failureDetailsDto.getAttachment()); failureDetailsDto.getAttachment());
} }
/*failureDetailsDto.set*/
model = this.createWithModel(failureDetailsDto); model = this.createWithModel(failureDetailsDto);
FailureAuditDto failureAuditDto = new FailureAuditDto(); FailureAuditDto failureAuditDto = new FailureAuditDto();
failureAuditDto.setAuditor(model.getRecUserName()); failureAuditDto.setAuditor(model.getRecUserName());
failureAuditDto.setFaultId(model.getSequenceNbr()); failureAuditDto.setFaultId(model.getSequenceNbr());
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertCalledController.java
View file @ d6d191a6
...@@ -89,8 +89,8 @@ public class AlertCalledController extends BaseController { ...@@ -89,8 +89,8 @@ public class AlertCalledController extends BaseController {
|| ValidationUtil.isEmpty(alertCalledObjsDto.getAlertCalled())) || ValidationUtil.isEmpty(alertCalledObjsDto.getAlertCalled()))
throw new BadRequest("参数校验失败."); throw new BadRequest("参数校验失败.");
ReginParams reginParams = ReginParams reginParams =
JSONObject.parseObject(null != redisUtils.get(buildKey(getToken())) ? JSONObject.parseObject(null != redisUtils.get(getToken()) ?
redisUtils.get(buildKey(getToken())).toString() : null, ReginParams.class); redisUtils.get(getToken()).toString() : null, ReginParams.class);
//获取当前登录人公司 //获取当前登录人公司
String name= reginParams.getCompany().getCompanyName(); String name= reginParams.getCompany().getCompanyName();
AlertCalled alertCalled = alertCalledObjsDto.getAlertCalled(); AlertCalled alertCalled = alertCalledObjsDto.getAlertCalled();
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/AbstractBaseController.java
View file @ d6d191a6
...@@ -7,26 +7,11 @@ import java.util.List; ...@@ -7,26 +7,11 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.validation.ConstraintViolationException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cglib.beans.BeanMap; import org.springframework.cglib.beans.BeanMap;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.transaction.TransactionSystemException;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.controller.BaseController; import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.component.feign.config.InnerInvokException;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.maintenance.business.constants.XJConstant; import com.yeejoin.amos.maintenance.business.constants.XJConstant;
import com.yeejoin.amos.maintenance.business.util.DaoCriteria; import com.yeejoin.amos.maintenance.business.util.DaoCriteria;
import com.yeejoin.amos.maintenance.core.common.request.CommonRequest; import com.yeejoin.amos.maintenance.core.common.request.CommonRequest;
...@@ -47,151 +32,151 @@ public abstract class AbstractBaseController extends BaseController{ ...@@ -47,151 +32,151 @@ public abstract class AbstractBaseController extends BaseController{
/*@Autowired /*@Autowired
private RemoteSecurityServer remoteSecurityServer; private RemoteSecurityServer remoteSecurityServer;
*/ */
@Autowired // @Autowired
protected HttpServletRequest request; // protected HttpServletRequest request;
//
/** // /**
* 成功返回状态 // * 成功返回状态
*/ // */
protected static final String SUCCESS = "SUCCESS"; // protected static final String SUCCESS = "SUCCESS";
//
/** // /**
* 失败返回状态 // * 失败返回状态
*/ // */
protected static final String FAILED = "FAILED"; // protected static final String FAILED = "FAILED";
//
/** // /**
* 默认页大小 // * 默认页大小
*/ // */
protected static final int DEFAULT_PAGE_SIZE = 10; // protected static final int DEFAULT_PAGE_SIZE = 10;
//
@Autowired // @Autowired
private RedisTemplate<String, String> redisTemplate; // private RedisTemplate<String, String> redisTemplate;
//
//
protected String getToken() { // protected String getToken() {
String authToken = request.getHeader("token"); // String authToken = request.getHeader("token");
if (authToken == null) { // if (authToken == null) {
authToken = request.getHeader("X-Access-Token"); // authToken = request.getHeader("X-Access-Token");
} // }
return authToken; // return authToken;
} // }
//
protected String getProduct() { // protected String getProduct() {
String authToken = request.getHeader("product"); // String authToken = request.getHeader("product");
if (authToken == null) { // if (authToken == null) {
authToken = request.getParameter("product"); // authToken = request.getParameter("product");
} // }
return authToken; // return authToken;
} // }
//
//
protected String getAppKey() { // protected String getAppKey() {
String authToken = request.getHeader("appKey"); // String authToken = request.getHeader("appKey");
if (authToken == null) { // if (authToken == null) {
authToken = request.getParameter("appKey"); // authToken = request.getParameter("appKey");
} // }
return authToken; // return authToken;
} // }
/** // /**
* // *
* <pre> // * <pre>
* 判断当前用户角色级别：true:主管/false:装备管理员 // * 判断当前用户角色级别：true:主管/false:装备管理员
* </pre> // * </pre>
* // *
* @return // * @return
*/ // */
/*protected boolean isDirector() { // /*protected boolean isDirector() {
if (getUserInfo() == null) { // if (getUserInfo() == null) {
return false; // return false;
} // }
return getUserInfo().getRole().getRoleType() != 3; // return getUserInfo().getRole().getRoleType() != 3;
}*/ // }*/
//
/** // /**
* 获取用户角色id // * 获取用户角色id
* // *
* @return // * @return
*/ // */
/*protected String getRoleId() { // /*protected String getRoleId() {
if (getUserInfo() == null) { // if (getUserInfo() == null) {
return ""; // return "";
} // }
return getUserInfo().getRole().getRoleType().toString(); // return getUserInfo().getRole().getRoleType().toString();
}*/ // }*/
//
/** // /**
* 当前登录用户信息 // * 当前登录用户信息
*/ // */
/*protected User getUserInfo() { // /*protected User getUserInfo() {
if (getToken() == null) { // if (getToken() == null) {
return null; // return null;
} // }
return remoteSecurityServer.loginAuthentication(getToken()); // return remoteSecurityServer.loginAuthentication(getToken());
}*/ // }*/
//
protected AgencyUserModel getUserInfo() { // protected AgencyUserModel getUserInfo() {
AgencyUserModel userModel=null; // AgencyUserModel userModel=null;
if(getToken()!=null){ // if(getToken()!=null){
RequestContext.setToken(getToken()); // RequestContext.setToken(getToken());
RequestContext.setProduct(getProduct()); // RequestContext.setProduct(getProduct());
RequestContext.setAppKey(getAppKey()); // RequestContext.setAppKey(getAppKey());
//
FeignClientResult feignClientResult; // FeignClientResult feignClientResult;
try { // try {
feignClientResult = Privilege.agencyUserClient.getme(); // feignClientResult = Privilege.agencyUserClient.getme();
userModel = (AgencyUserModel) feignClientResult.getResult(); // userModel = (AgencyUserModel) feignClientResult.getResult();
//
} catch (InnerInvokException e) { // } catch (InnerInvokException e) {
e.printStackTrace(); // e.printStackTrace();
} // }
//
} // }
return userModel; // return userModel;
//
// return CurrentAuthentication.getAuthenticatedUserThreadLocal(); // // return CurrentAuthentication.getAuthenticatedUserThreadLocal();
} // }
//
protected String getCompanyId(ReginParams reginParams) { // protected String getCompanyId(ReginParams reginParams) {
if (reginParams == null) { // if (reginParams == null) {
return null; // return null;
} // }
if (reginParams.getCompany() != null) { // if (reginParams.getCompany() != null) {
return reginParams.getCompany().getSequenceNbr().toString(); // return reginParams.getCompany().getSequenceNbr().toString();
} // }
return null; // return null;
} // }
//
protected String getDepartmentName(ReginParams reginParams) { // protected String getDepartmentName(ReginParams reginParams) {
if (reginParams == null) { // if (reginParams == null) {
return null; // return null;
} // }
if (reginParams.getDepartment() != null) { // if (reginParams.getDepartment() != null) {
return reginParams.getDepartment().getDepartmentName(); // return reginParams.getDepartment().getDepartmentName();
} // }
return null; // return null;
} // }
//
protected String getUserId() { // protected String getUserId() {
String userId = null; // String userId = null;
if (getUserInfo() != null) { // if (getUserInfo() != null) {
userId = getUserInfo().getUserId(); // userId = getUserInfo().getUserId();
} // }
return userId; // return userId;
} // }
//
/** // /**
* 获取当前用户所属公司名称 // * 获取当前用户所属公司名称
* // *
* @return // * @return
*/ // */
protected String getCurrentCompanyNameOfUser() { // protected String getCurrentCompanyNameOfUser() {
if (getUserInfo() == null) { // if (getUserInfo() == null) {
return ""; // return "";
} // }
//
return getSelectedOrgInfo().getCompany().getCompanyName(); // return getSelectedOrgInfo().getCompany().getCompanyName();
} // }
/*protected LoginUserParam getLoginUserParam() { /*protected LoginUserParam getLoginUserParam() {
LoginUserParam param = CurUserCompanyCache.getInstance().getCurCompany(getUserId(), getToken()); LoginUserParam param = CurUserCompanyCache.getInstance().getCurCompany(getUserId(), getToken());
...@@ -200,70 +185,70 @@ public abstract class AbstractBaseController extends BaseController{ ...@@ -200,70 +185,70 @@ public abstract class AbstractBaseController extends BaseController{
}*/ }*/
private String buildKey(String userId, String token) { // private String buildKey(String userId, String token) {
//return "region_" + userId + "_" + token.substring(0, token.indexOf('_', 1)); // //return "region_" + userId + "_" + token.substring(0, token.indexOf('_', 1));
return "region_" + userId + "_" + token; // return "region_" + userId + "_" + token;
//
} // }
protected void saveSelectedOrgInfo(ReginParams reginParams) { // protected void saveSelectedOrgInfo(ReginParams reginParams) {
redisTemplate.opsForValue().set(buildKey(getUserId(), getToken()), JSONObject.toJSONString(reginParams)); // redisTemplate.opsForValue().set(buildKey(getUserId(), getToken()), JSONObject.toJSONString(reginParams));
} // }
protected ReginParams getSelectedOrgInfo() { // protected ReginParams getSelectedOrgInfo() {
return JSON.parseObject(redisTemplate.opsForValue().get(buildKey(getUserId(), getToken())), ReginParams.class); // return JSON.parseObject(redisTemplate.opsForValue().get(buildKey(getUserId(), getToken())), ReginParams.class);
} // }
/** /**
* 获取请求的cookies * 获取请求的cookies
* *
* @return * @return
*/ */
protected HashMap<String, String> getCookInfoMap() { // protected HashMap<String, String> getCookInfoMap() {
HashMap<String, String> map = new HashMap<String, String>(); // HashMap<String, String> map = new HashMap<String, String>();
Cookie[] cookies = request.getCookies(); // Cookie[] cookies = request.getCookies();
if (cookies != null) { // if (cookies != null) {
for (Cookie ck : cookies) { // for (Cookie ck : cookies) {
map.put(ck.getName(), ck.getValue()); // map.put(ck.getName(), ck.getValue());
} // }
} // }
return map; // return map;
} // }
protected String getCompanyName(ReginParams reginParams) { // protected String getCompanyName(ReginParams reginParams) {
if (reginParams == null) { // if (reginParams == null) {
return null; // return null;
}
if (reginParams.getCompany() != null) {
return reginParams.getCompany().getCompanyName();
}
return null;
}
protected String getLoginOrgCode(ReginParams reginParams) {
if (reginParams == null) {
return null;
}
// if (reginParams.getDepartment() != null) {
// return reginParams.getDepartment().getDeptOrgCode();
// } // }
if (reginParams.getCompany() != null) { // if (reginParams.getCompany() != null) {
return reginParams.getCompany().getOrgCode(); // return reginParams.getCompany().getCompanyName();
} // }
return null; // return null;
} // }
//
// protected String getLoginOrgCode(ReginParams reginParams) {
/** // if (reginParams == null) {
* 获取公司orgcode // return null;
* // }
* @return //// if (reginParams.getDepartment() != null) {
*//* //// return reginParams.getDepartment().getDeptOrgCode();
protected String getOrgCode() { //// }
if (getUserInfo() == null) { // if (reginParams.getCompany() != null) {
return ""; // return reginParams.getCompany().getOrgCode();
} // }
return getUserInfo().getCompanys().getCompCode(); // return null;
}*/ // }
//
//
// /**
// * 获取公司orgcode
// *
// * @return
// *//*
// protected String getOrgCode() {
// if (getUserInfo() == null) {
// return "";
// }
// return getUserInfo().getCompanys().getCompCode();
// }*/
//
/** /**
* 生成查询条件 * 生成查询条件
* *
...@@ -331,90 +316,90 @@ public abstract class AbstractBaseController extends BaseController{ ...@@ -331,90 +316,90 @@ public abstract class AbstractBaseController extends BaseController{
return daoCriterias; return daoCriterias;
} }
/* public List<DaoCriteria> buildDaoCriterias(List<CommonRequest> queryRequests, Boolean flag) { ///* public List<DaoCriteria> buildDaoCriterias(List<CommonRequest> queryRequests, Boolean flag) {
List<DaoCriteria> daoCriterias = new ArrayList<DaoCriteria>(); // List<DaoCriteria> daoCriterias = new ArrayList<DaoCriteria>();
String orgCode = null; // String orgCode = null;
if (queryRequests != null && !queryRequests.isEmpty()) { // if (queryRequests != null && !queryRequests.isEmpty()) {
for (CommonRequest query : queryRequests) { // for (CommonRequest query : queryRequests) {
DaoCriteria criteria = new DaoCriteria(); // DaoCriteria criteria = new DaoCriteria();
if (StringUtil.isNotEmpty(query.getValue())) { // if (StringUtil.isNotEmpty(query.getValue())) {
if (query.getValue().toString().equals("-0")) { // if (query.getValue().toString().equals("-0")) {
criteria.setPropertyName(query.getName()); // criteria.setPropertyName(query.getName());
criteria.setOperator(QueryOperatorEnum.IS.getName()); // criteria.setOperator(QueryOperatorEnum.IS.getName());
criteria.setValue(null); // criteria.setValue(null);
} else { // } else {
criteria.setPropertyName(query.getName()); // criteria.setPropertyName(query.getName());
String column = criteria.getPropertyName(); // String column = criteria.getPropertyName();
if (!(query.getValue() instanceof Collection<?>) // if (!(query.getValue() instanceof Collection<?>)
&& column.substring(column.length() - 2, column.length()).toUpperCase().equals("ID")) { // && column.substring(column.length() - 2, column.length()).toUpperCase().equals("ID")) {
criteria.setValue(Long.valueOf(query.getValue().toString())); // criteria.setValue(Long.valueOf(query.getValue().toString()));
} else { // } else {
criteria.setValue(query.getValue()); // criteria.setValue(query.getValue());
} // }
//
String operator = query.getType(); // String operator = query.getType();
if (!StringUtil.isNotEmpty(operator)) { // if (!StringUtil.isNotEmpty(operator)) {
criteria.setOperator(QueryOperatorEnum.EQUAL.getName()); // criteria.setOperator(QueryOperatorEnum.EQUAL.getName());
} else if (operator.equals(QueryOperatorEnum.LIKE.getName())) { // } else if (operator.equals(QueryOperatorEnum.LIKE.getName())) {
setLikeCriteria(criteria, query); // setLikeCriteria(criteria, query);
} else if (operator.equals(QueryOperatorEnum.BIGGER_EQUAL.getName())) { // } else if (operator.equals(QueryOperatorEnum.BIGGER_EQUAL.getName())) {
criteria.setOperator(QueryOperatorEnum.getEnum(operator).getName()); // criteria.setOperator(QueryOperatorEnum.getEnum(operator).getName());
} else if (operator.equals(QueryOperatorEnum.LESS_EQUAL.getName())) { // } else if (operator.equals(QueryOperatorEnum.LESS_EQUAL.getName())) {
criteria.setOperator(QueryOperatorEnum.getEnum(operator).getName()); // criteria.setOperator(QueryOperatorEnum.getEnum(operator).getName());
} else if (QueryOperatorEnum.getEnum(operator) != null) { // } else if (QueryOperatorEnum.getEnum(operator) != null) {
criteria.setOperator(QueryOperatorEnum.getEnum(operator).getName()); // criteria.setOperator(QueryOperatorEnum.getEnum(operator).getName());
} else { // } else {
criteria.setOperator(operator); // criteria.setOperator(operator);
} // }
} // }
daoCriterias.add(criteria); // daoCriterias.add(criteria);
} // }
} // }
} // }
if (flag) { // if (flag) {
ReginParams param = getSelectedOrgInfo(); // ReginParams param = getSelectedOrgInfo();
if (param == null) { // if (param == null) {
throw new YeeException("非法请求"); // throw new YeeException("非法请求");
} // }
String roleTypeName = param.getRole().getRoleName(); // String roleTypeName = param.getRole().getRoleName();
if (XJConstant.ROLE_NAME_SUPERADMIN.equals(roleTypeName) // if (XJConstant.ROLE_NAME_SUPERADMIN.equals(roleTypeName)
|| XJConstant.ROLE_NAME_ADMIN.equals(roleTypeName)) { // || XJConstant.ROLE_NAME_ADMIN.equals(roleTypeName)) {
orgCode = param.getCompany().getOrgCode(); // orgCode = param.getCompany().getOrgCode();
daoCriterias = buildOrgDaoCriteriaInChildren(daoCriterias, orgCode); // daoCriterias = buildOrgDaoCriteriaInChildren(daoCriterias, orgCode);
} else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName)) { // } else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName)) {
orgCode = param.getUserOrgCode(); // orgCode = param.getUserOrgCode();
daoCriterias = buildOrgDaoCriteriaOutChildren(daoCriterias, orgCode); // daoCriterias = buildOrgDaoCriteriaOutChildren(daoCriterias, orgCode);
} else if (XJConstant.ROLE_NAME_PERSON.equals(roleTypeName)) { // } else if (XJConstant.ROLE_NAME_PERSON.equals(roleTypeName)) {
DaoCriteria compDaoCriteria = new DaoCriteria(); // DaoCriteria compDaoCriteria = new DaoCriteria();
compDaoCriteria.setPropertyName("userId"); // compDaoCriteria.setPropertyName("userId");
compDaoCriteria.setOperator(QueryOperatorEnum.EQUAL.getName()); // compDaoCriteria.setOperator(QueryOperatorEnum.EQUAL.getName());
compDaoCriteria.setValue(param.); // compDaoCriteria.setValue(param.);
daoCriterias.add(compDaoCriteria); // daoCriterias.add(compDaoCriteria);
} // }
//
} // }
return daoCriterias; // return daoCriterias;
//
}*/ // }*/
protected String getRoleTypeName(ReginParams reginParams) { // protected String getRoleTypeName(ReginParams reginParams) {
if (reginParams == null) { // if (reginParams == null) {
return null; // return null;
} // }
if (reginParams.getRole() != null) { // if (reginParams.getRole() != null) {
return reginParams.getRole().getRoleType(); // return reginParams.getRole().getRoleType();
} // }
return null; // return null;
} // }
protected String getDepartmentId(ReginParams reginParams) { // protected String getDepartmentId(ReginParams reginParams) {
if (reginParams == null) { // if (reginParams == null) {
return null; // return null;
} // }
if (reginParams.getDepartment() != null) { // if (reginParams.getDepartment() != null) {
return reginParams.getDepartment().getSequenceNbr().toString(); // return reginParams.getDepartment().getSequenceNbr().toString();
} // }
return null; // return null;
} // }
//
/** /**
* 构建数据权限 返回字段：orgCode(机构)，expression（表达式） * 构建数据权限 返回字段：orgCode(机构)，expression（表达式）
* *
...@@ -434,30 +419,30 @@ public abstract class AbstractBaseController extends BaseController{ ...@@ -434,30 +419,30 @@ public abstract class AbstractBaseController extends BaseController{
} }
return paramMap; return paramMap;
} }
/*public HashMap<String, Object> buildMybatisDaoCriterias() { // /*public HashMap<String, Object> buildMybatisDaoCriterias() {
String orgCode = null; // String orgCode = null;
LoginUserParam param = getLoginUserParam(); // LoginUserParam param = getLoginUserParam();
if (param == null) { // if (param == null) {
throw new YeeException("非法请求"); // throw new YeeException("非法请求");
} // }
HashMap<String, Object> paramMap = new HashMap<String, Object>(); // HashMap<String, Object> paramMap = new HashMap<String, Object>();
String roleTypeName = param.getRoleTypeName(); // String roleTypeName = param.getRoleTypeName();
//
if (XJConstant.ROLE_NAME_SUPERADMIN.equals(roleTypeName) || XJConstant.ROLE_NAME_ADMIN.equals(roleTypeName)) { // if (XJConstant.ROLE_NAME_SUPERADMIN.equals(roleTypeName) || XJConstant.ROLE_NAME_ADMIN.equals(roleTypeName)) {
orgCode = param.getLoginOrgCode(); // orgCode = param.getLoginOrgCode();
paramMap.put("orgCode", orgCode + "%"); // paramMap.put("orgCode", orgCode + "%");
paramMap.put("roleFlag", XJConstant.ADMIN_FLAG); // paramMap.put("roleFlag", XJConstant.ADMIN_FLAG);
} else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName)) { // } else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName)) {
orgCode = param.getUserOrgCode(); // orgCode = param.getUserOrgCode();
paramMap.put("orgCode", orgCode + "%"); // paramMap.put("orgCode", orgCode + "%");
paramMap.put("roleFlag", XJConstant.DEPART_FLAG); // paramMap.put("roleFlag", XJConstant.DEPART_FLAG);
} else if (XJConstant.ROLE_NAME_PERSON.equals(roleTypeName)) { // } else if (XJConstant.ROLE_NAME_PERSON.equals(roleTypeName)) {
paramMap.put("userId", param.getUserId()); // paramMap.put("userId", param.getUserId());
paramMap.put("roleFlag", XJConstant.PERSON_FLAG); // paramMap.put("roleFlag", XJConstant.PERSON_FLAG);
} // }
return paramMap; // return paramMap;
//
}*/ // }*/
public HashMap<String, Object> buildMybatisCriterias(String orgCode, String roleTypeName) { public HashMap<String, Object> buildMybatisCriterias(String orgCode, String roleTypeName) {
HashMap<String, Object> paramMap = new HashMap<>(); HashMap<String, Object> paramMap = new HashMap<>();
if(StringUtil.isNotEmpty(roleTypeName)){ if(StringUtil.isNotEmpty(roleTypeName)){
...@@ -478,48 +463,48 @@ public abstract class AbstractBaseController extends BaseController{ ...@@ -478,48 +463,48 @@ public abstract class AbstractBaseController extends BaseController{
return paramMap; return paramMap;
} }
//
/*public HashMap<String, Object> buildMybatisCriterias() { // /*public HashMap<String, Object> buildMybatisCriterias() {
String orgCode = null; // String orgCode = null;
LoginUserParam param = getLoginUserParam(); // LoginUserParam param = getLoginUserParam();
if (param == null) { // if (param == null) {
throw new YeeException("非法请求"); // throw new YeeException("非法请求");
} // }
HashMap<String, Object> paramMap = new HashMap<String, Object>(); // HashMap<String, Object> paramMap = new HashMap<String, Object>();
String roleTypeName = param.getRoleTypeName(); // String roleTypeName = param.getRoleTypeName();
//
if (XJConstant.ROLE_NAME_SUPERADMIN.equals(roleTypeName) || XJConstant.ROLE_NAME_ADMIN.equals(roleTypeName)) { // if (XJConstant.ROLE_NAME_SUPERADMIN.equals(roleTypeName) || XJConstant.ROLE_NAME_ADMIN.equals(roleTypeName)) {
orgCode = param.getLoginOrgCode(); // orgCode = param.getLoginOrgCode();
paramMap.put("orgCode", orgCode); // paramMap.put("orgCode", orgCode);
paramMap.put("roleFlag", XJConstant.ADMIN_FLAG); // paramMap.put("roleFlag", XJConstant.ADMIN_FLAG);
} else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName)) { // } else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName)) {
orgCode = param.getUserOrgCode(); // orgCode = param.getUserOrgCode();
paramMap.put("orgCode", orgCode); // paramMap.put("orgCode", orgCode);
paramMap.put("roleFlag", XJConstant.DEPART_FLAG); // paramMap.put("roleFlag", XJConstant.DEPART_FLAG);
} else if (XJConstant.ROLE_NAME_PERSON.equals(roleTypeName)) { // } else if (XJConstant.ROLE_NAME_PERSON.equals(roleTypeName)) {
paramMap.put("userId", param.getUserId()); // paramMap.put("userId", param.getUserId());
paramMap.put("roleFlag", XJConstant.PERSON_FLAG); // paramMap.put("roleFlag", XJConstant.PERSON_FLAG);
} // }
return paramMap; // return paramMap;
//
}*/ // }*/
//
/** // /**
* 暂时未用到 // * 暂时未用到
* // *
* @return // * @return
*/ // */
/* public List<DaoCriteria> buildDaoCriteriasNoParam() { ///* public List<DaoCriteria> buildDaoCriteriasNoParam() {
List<DaoCriteria> daoCriterias = new ArrayList<DaoCriteria>(); // List<DaoCriteria> daoCriterias = new ArrayList<DaoCriteria>();
String orgCode = getOrgCode(); // String orgCode = getOrgCode();
if (isDirector()) { // if (isDirector()) {
daoCriterias = buildOrgDaoCriteriaInChildren(daoCriterias, orgCode); // daoCriterias = buildOrgDaoCriteriaInChildren(daoCriterias, orgCode);
} else { // } else {
daoCriterias = buildOrgDaoCriteriaOutChildren(daoCriterias, orgCode); // daoCriterias = buildOrgDaoCriteriaOutChildren(daoCriterias, orgCode);
} // }
return daoCriterias; // return daoCriterias;
}*/ // }*/
/** /**
* *
* <pre> * <pre>
...@@ -548,29 +533,29 @@ public abstract class AbstractBaseController extends BaseController{ ...@@ -548,29 +533,29 @@ public abstract class AbstractBaseController extends BaseController{
return daoCriterias; return daoCriterias;
} }
/** // /**
* // *
* <pre> // * <pre>
* 生成通过当前用户所属组织机构（不包含子机构）过滤的查询条件 // * 生成通过当前用户所属组织机构（不包含子机构）过滤的查询条件
* </pre> // * </pre>
* // *
* @param daoCriterias // * @param daoCriterias
* 查询条件集合 // * 查询条件集合
* @param orgCode // * @param orgCode
* @return // * @return
*/ // */
public List<DaoCriteria> buildOrgDaoCriteriaOutChildren(List<DaoCriteria> daoCriterias, String orgCode) { // public List<DaoCriteria> buildOrgDaoCriteriaOutChildren(List<DaoCriteria> daoCriterias, String orgCode) {
/** // /**
* 当前用户所属公司 // * 当前用户所属公司
*/ // */
//
DaoCriteria compDaoCriteria = new DaoCriteria(); // DaoCriteria compDaoCriteria = new DaoCriteria();
compDaoCriteria.setPropertyName("orgCode"); // compDaoCriteria.setPropertyName("orgCode");
compDaoCriteria.setOperator(QueryOperatorEnum.EQUAL.getName()); // compDaoCriteria.setOperator(QueryOperatorEnum.EQUAL.getName());
compDaoCriteria.setValue(orgCode); // compDaoCriteria.setValue(orgCode);
daoCriterias.add(compDaoCriteria); // daoCriterias.add(compDaoCriteria);
return daoCriterias; // return daoCriterias;
} // }
/** /**
* 对like查询语句的内容进行特殊字符转义 * 对like查询语句的内容进行特殊字符转义
...@@ -600,43 +585,43 @@ public abstract class AbstractBaseController extends BaseController{ ...@@ -600,43 +585,43 @@ public abstract class AbstractBaseController extends BaseController{
} }
} }
/** // /**
* <pre> // * <pre>
* 提取错误异常中的错误消息 // * 提取错误异常中的错误消息
* </pre> // * </pre>
* // *
* <p> // * <p>
* 当实体类中对属相注解了以下类似的注解，需要用try.catch语句捕获异常，使用 #getErrorMessage(Exception) // * 当实体类中对属相注解了以下类似的注解，需要用try.catch语句捕获异常，使用 #getErrorMessage(Exception)
* 提取出异常信息NotNull(message = "属性不能为空！") // * 提取出异常信息NotNull(message = "属性不能为空！")
* </p> // * </p>
* // *
* @see {@code NotBlank} ... NotNull、NotEmpty... // * @see {@code NotBlank} ... NotNull、NotEmpty...
* @see {@code Valid} // * @see {@code Valid}
* // *
* @param e // * @param e
* @return // * @return
*/ // */
public String getErrorMessage(Exception e) { // public String getErrorMessage(Exception e) {
StringBuilder message = new StringBuilder(); // StringBuilder message = new StringBuilder();
if (e instanceof TransactionSystemException) { // if (e instanceof TransactionSystemException) {
TransactionSystemException exception = (TransactionSystemException) e; // TransactionSystemException exception = (TransactionSystemException) e;
if (exception.getRootCause() instanceof ConstraintViolationException) { // if (exception.getRootCause() instanceof ConstraintViolationException) {
ConstraintViolationException root = (ConstraintViolationException) exception.getRootCause(); // ConstraintViolationException root = (ConstraintViolationException) exception.getRootCause();
root.getConstraintViolations().forEach(constraintViolation -> { // root.getConstraintViolations().forEach(constraintViolation -> {
message.append(constraintViolation.getMessageTemplate()); // message.append(constraintViolation.getMessageTemplate());
}); // });
} else { // } else {
message.append(e.getMessage()); // message.append(e.getMessage());
} // }
} else if (e instanceof ConstraintViolationException) { // } else if (e instanceof ConstraintViolationException) {
((ConstraintViolationException) e).getConstraintViolations() // ((ConstraintViolationException) e).getConstraintViolations()
.forEach(constraintViolation -> message.append(constraintViolation.getMessageTemplate())); // .forEach(constraintViolation -> message.append(constraintViolation.getMessageTemplate()));
} else { // } else {
message.append("操作异常！"); // message.append("操作异常！");
} // }
return message.toString(); // return message.toString();
} // }
//
public static <T> List<Map<String, Object>> objectsToMaps(List<T> objList) { public static <T> List<Map<String, Object>> objectsToMaps(List<T> objList) {
List<Map<String, Object>> list = Lists.newArrayList(); List<Map<String, Object>> list = Lists.newArrayList();
if (objList != null && objList.size() > 0) { if (objList != null && objList.size() > 0) {
...@@ -668,9 +653,4 @@ public abstract class AbstractBaseController extends BaseController{ ...@@ -668,9 +653,4 @@ public abstract class AbstractBaseController extends BaseController{
return map; return map;
} }
public void buildRequestCxt(){
RequestContext.setToken(getToken());
RequestContext.setProduct(getProduct());
RequestContext.setAppKey(getAppKey());
}
} }
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/CatalogTreeController.java
View file @ d6d191a6
...@@ -48,7 +48,7 @@ public class CatalogTreeController extends AbstractBaseController { ...@@ -48,7 +48,7 @@ public class CatalogTreeController extends AbstractBaseController {
@RequestMapping(value = "/getCatalogTree", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/getCatalogTree", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse getCatalogTree() { public CommonResponse getCatalogTree() {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
List<Object> list = catalogTreeService.getCatalogTree(orgCode); List<Object> list = catalogTreeService.getCatalogTree(orgCode);
return CommonResponseUtil.success(list); return CommonResponseUtil.success(list);
} }
...@@ -63,7 +63,7 @@ public class CatalogTreeController extends AbstractBaseController { ...@@ -63,7 +63,7 @@ public class CatalogTreeController extends AbstractBaseController {
@RequestMapping(value = "/catalogList", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/catalogList", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse getCatalogList() { public CommonResponse getCatalogList() {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
List<CatalogTree> list = catalogTreeService.getCatalogList(orgCode); List<CatalogTree> list = catalogTreeService.getCatalogList(orgCode);
return CommonResponseUtil.success(list); return CommonResponseUtil.success(list);
} }
...@@ -80,7 +80,7 @@ public class CatalogTreeController extends AbstractBaseController { ...@@ -80,7 +80,7 @@ public class CatalogTreeController extends AbstractBaseController {
try { try {
String userId = getUserId(); String userId = getUserId();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
HashMap<String,Object> map = new HashMap<String,Object>(); HashMap<String,Object> map = new HashMap<String,Object>();
map.put("org_code", orgCode); map.put("org_code", orgCode);
map.put("user_id", userId); map.put("user_id", userId);
...@@ -151,7 +151,7 @@ public class CatalogTreeController extends AbstractBaseController { ...@@ -151,7 +151,7 @@ public class CatalogTreeController extends AbstractBaseController {
public CommonResponse qryCatalogTreeInfoPage(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests, public CommonResponse qryCatalogTreeInfoPage(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
@ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) { @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
HashMap<String,Object> paramMap = new HashMap<String,Object>(); HashMap<String,Object> paramMap = new HashMap<String,Object>();
paramMap.put("orgCode",orgCode); paramMap.put("orgCode",orgCode);
CatalogTreePageParam param = CatalogTreePageParamUtil.fillPageParam(queryRequests, commonPageable, paramMap); CatalogTreePageParam param = CatalogTreePageParamUtil.fillPageParam(queryRequests, commonPageable, paramMap);
......
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 @ d6d191a6
...@@ -123,7 +123,7 @@ public class CheckController extends AbstractBaseController { ...@@ -123,7 +123,7 @@ public class CheckController extends AbstractBaseController {
@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests, @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
@ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) { @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
boolean hasOrgCode = Boolean.TRUE; boolean hasOrgCode = Boolean.TRUE;
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
if (0 < queryRequests.size()) { if (0 < queryRequests.size()) {
...@@ -155,7 +155,7 @@ public class CheckController extends AbstractBaseController { ...@@ -155,7 +155,7 @@ public class CheckController extends AbstractBaseController {
@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests, @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
HttpServletResponse response) { HttpServletResponse response) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
boolean hasOrgCode = Boolean.TRUE; boolean hasOrgCode = Boolean.TRUE;
if (0 < queryRequests.size()) { if (0 < queryRequests.size()) {
...@@ -205,7 +205,7 @@ public class CheckController extends AbstractBaseController { ...@@ -205,7 +205,7 @@ public class CheckController extends AbstractBaseController {
@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests, @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
HttpServletResponse response) { HttpServletResponse response) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
boolean hasOrgCode = Boolean.TRUE; boolean hasOrgCode = Boolean.TRUE;
if (0 < queryRequests.size()) { if (0 < queryRequests.size()) {
...@@ -289,7 +289,7 @@ public class CheckController extends AbstractBaseController { ...@@ -289,7 +289,7 @@ public class CheckController extends AbstractBaseController {
int count = checkService.checkHasRecord(requestParam); int count = checkService.checkHasRecord(requestParam);
if (count < 1 || requestParam.getPlanTaskId() < 1) { if (count < 1 || requestParam.getPlanTaskId() < 1) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
String departmentId = getDepartmentId(reginParams); String departmentId = getDepartmentId(reginParams);
requestParam.setOrgCode(orgCode); requestParam.setOrgCode(orgCode);
requestParam.setUserId(getUserId()); requestParam.setUserId(getUserId());
...@@ -423,7 +423,7 @@ public class CheckController extends AbstractBaseController { ...@@ -423,7 +423,7 @@ public class CheckController extends AbstractBaseController {
@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) { @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) {
try { try {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
List<DaoCriteria> daoCriterias = buildDaoCriterias(queryRequests, true, loginOrgCode, roleTypeName); List<DaoCriteria> daoCriterias = buildDaoCriterias(queryRequests, true, loginOrgCode, roleTypeName);
...@@ -443,7 +443,7 @@ public class CheckController extends AbstractBaseController { ...@@ -443,7 +443,7 @@ public class CheckController extends AbstractBaseController {
public CommonResponse queryRecordByPointId( public CommonResponse queryRecordByPointId(
@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) { @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
String departmentId = getDepartmentId(reginParams); String departmentId = getDepartmentId(reginParams);
HashMap<String, Object> req = CheckPageParamUtil.fillInfo(queryRequests); HashMap<String, Object> req = CheckPageParamUtil.fillInfo(queryRequests);
...@@ -518,7 +518,7 @@ public class CheckController extends AbstractBaseController { ...@@ -518,7 +518,7 @@ public class CheckController extends AbstractBaseController {
if (htmlFile.exists()) { if (htmlFile.exists()) {
htmlFile.delete(); htmlFile.delete();
} }
return new CommonResponse(SUCCESS, data, "查询成功"); return new CommonResponse("SUCCESS", data, "查询成功");
} catch (TransformerException | IOException e) { } catch (TransformerException | IOException e) {
e.printStackTrace(); e.printStackTrace();
return null; return null;
...@@ -551,7 +551,7 @@ public class CheckController extends AbstractBaseController { ...@@ -551,7 +551,7 @@ public class CheckController extends AbstractBaseController {
public CommonResponse getCheckStatisticalAnalysis( public CommonResponse getCheckStatisticalAnalysis(
@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) CheckStatisticalParam queryRequests) { @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) CheckStatisticalParam queryRequests) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
queryRequests.setOrgCode(loginOrgCode); queryRequests.setOrgCode(loginOrgCode);
List<CheckAnalysisVo> list = checkService.getCheckStatisticalAnalysis(getToken(), getProduct(), getAppKey(), queryRequests); List<CheckAnalysisVo> list = checkService.getCheckStatisticalAnalysis(getToken(), getProduct(), getAppKey(), queryRequests);
return CommonResponseUtil.success(list); return CommonResponseUtil.success(list);
...@@ -565,7 +565,7 @@ public class CheckController extends AbstractBaseController { ...@@ -565,7 +565,7 @@ public class CheckController extends AbstractBaseController {
HttpServletResponse response) { HttpServletResponse response) {
String userId = getUserId(); String userId = getUserId();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
queryRequests.setOrgCode(loginOrgCode); queryRequests.setOrgCode(loginOrgCode);
List<CheckAnalysisVo> list = checkService.getCheckStatisticalAnalysis(getToken(), getProduct(), getAppKey(), queryRequests); List<CheckAnalysisVo> list = checkService.getCheckStatisticalAnalysis(getToken(), getProduct(), getAppKey(), queryRequests);
String fileName = "巡检记录" + new Date().getTime(); String fileName = "巡检记录" + new Date().getTime();
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/EquipmentRuleController.java
View file @ d6d191a6
...@@ -52,7 +52,7 @@ public class EquipmentRuleController extends AbstractBaseController { ...@@ -52,7 +52,7 @@ public class EquipmentRuleController extends AbstractBaseController {
token.setToke(getToken()); token.setToke(getToken());
token.setAppKey(getAppKey()); token.setAppKey(getAppKey());
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
map.put("orgCode", orgCode); map.put("orgCode", orgCode);
equipmentHandlerService.fireEquipRuleMessagePush(map, token); equipmentHandlerService.fireEquipRuleMessagePush(map, token);
return CommonResponseUtil.success(); return CommonResponseUtil.success();
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/ExcelExportController.java
View file @ d6d191a6
...@@ -72,7 +72,7 @@ public class ExcelExportController extends AbstractBaseController{ ...@@ -72,7 +72,7 @@ public class ExcelExportController extends AbstractBaseController{
startDate += " 00:00:00"; startDate += " 00:00:00";
endDate += " 23:59:59"; endDate += " 23:59:59";
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
Map<String,Object> map = taskReportService.queryForTaskReport(getToken(),getProduct(),getAppKey(),statistical,startDate,endDate,planId,routeId,orgCode); Map<String,Object> map = taskReportService.queryForTaskReport(getToken(),getProduct(),getAppKey(),statistical,startDate,endDate,planId,routeId,orgCode);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/HomeController.java
View file @ d6d191a6
...@@ -55,11 +55,11 @@ public class HomeController extends AbstractBaseController{ ...@@ -55,11 +55,11 @@ public class HomeController extends AbstractBaseController{
HashMap<String, Object> response = new HashMap<String, Object>(); HashMap<String, Object> response = new HashMap<String, Object>();
HashMap<String, Object> statusList = new HashMap<String, Object>(); HashMap<String, Object> statusList = new HashMap<String, Object>();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String companyName = getCompanyName(reginParams); String companyName = getCompanyName(reginParams);
/*if (XJConstant.ROLE_NAME_ADMIN.equals(loginParam.getRoleTypeName()) || /*if (XJConstant.ROLE_NAME_ADMIN.equals(loginParam.getRoleTypeName()) ||
XJConstant.ROLE_NAME_SUPERADMIN.equals(loginParam.getRoleTypeName())) { XJConstant.ROLE_NAME_SUPERADMIN.equals(loginParam.getRoleTypeName())) {
orgCode = loginParam.getLoginOrgCode(); orgCode = loginParam.getOrgCode();
} else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(loginParam.getRoleTypeName())) { } else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(loginParam.getRoleTypeName())) {
orgCode = loginParam.getUserOrgCode(); orgCode = loginParam.getUserOrgCode();
}*/ }*/
...@@ -90,7 +90,7 @@ public class HomeController extends AbstractBaseController{ ...@@ -90,7 +90,7 @@ public class HomeController extends AbstractBaseController{
public CommonResponse getCheckData() { public CommonResponse getCheckData() {
String userId = getUserId(); String userId = getUserId();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
SimpleDateFormat sdf = new SimpleDateFormat("MM月dd日"); SimpleDateFormat sdf = new SimpleDateFormat("MM月dd日");
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
...@@ -107,7 +107,7 @@ public class HomeController extends AbstractBaseController{ ...@@ -107,7 +107,7 @@ public class HomeController extends AbstractBaseController{
HashMap<String, Object> param = new HashMap<String, Object>(); HashMap<String, Object> param = new HashMap<String, Object>();
/*if (XJConstant.ROLE_NAME_ADMIN.equals(loginParam.getRoleTypeName()) || /*if (XJConstant.ROLE_NAME_ADMIN.equals(loginParam.getRoleTypeName()) ||
XJConstant.ROLE_NAME_SUPERADMIN.equals(loginParam.getRoleTypeName())) { XJConstant.ROLE_NAME_SUPERADMIN.equals(loginParam.getRoleTypeName())) {
param.put("orgCode", loginParam.getLoginOrgCode()); param.put("orgCode", loginParam.getOrgCode());
} else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(loginParam.getRoleTypeName())) { } else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(loginParam.getRoleTypeName())) {
param.put("orgCode", loginParam.getUserOrgCode()); param.put("orgCode", loginParam.getUserOrgCode());
} else { } else {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/InputItemController.java
View file @ d6d191a6
...@@ -92,7 +92,7 @@ public class InputItemController extends AbstractBaseController { ...@@ -92,7 +92,7 @@ public class InputItemController extends AbstractBaseController {
try { try {
InputItem inputItem = new InputItem(); InputItem inputItem = new InputItem();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
BeanUtils.copyProperties(param, inputItem); BeanUtils.copyProperties(param, inputItem);
inputItem.setOrgCode(loginOrgCode); inputItem.setOrgCode(loginOrgCode);
inputItem.setCreateBy(user.getUserId()); inputItem.setCreateBy(user.getUserId());
...@@ -224,7 +224,7 @@ public class InputItemController extends AbstractBaseController { ...@@ -224,7 +224,7 @@ public class InputItemController extends AbstractBaseController {
@ApiParam(value = "组合查询条件", required = false, defaultValue = "[]") @RequestBody(required = false) List<CommonRequest> queryRequests, @ApiParam(value = "组合查询条件", required = false, defaultValue = "[]") @RequestBody(required = false) List<CommonRequest> queryRequests,
@ApiParam(value = "分页参数", required = false, defaultValue = "current=0&pageSize=10或pageNumber0&pageSize=10") CommonPageable pageable) { @ApiParam(value = "分页参数", required = false, defaultValue = "current=0&pageSize=10或pageNumber0&pageSize=10") CommonPageable pageable) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
HashMap<String, Object> paramMap = new HashMap<String, Object>(); HashMap<String, Object> paramMap = new HashMap<String, Object>();
paramMap.put("orgCode", loginOrgCode); paramMap.put("orgCode", loginOrgCode);
InputItemPageParam criterias = InputItemParamUtil.fillInputItemPageParam(queryRequests, pageable, paramMap); InputItemPageParam criterias = InputItemParamUtil.fillInputItemPageParam(queryRequests, pageable, paramMap);
...@@ -245,7 +245,7 @@ public class InputItemController extends AbstractBaseController { ...@@ -245,7 +245,7 @@ public class InputItemController extends AbstractBaseController {
@ApiParam(value = "组合查询条件", required = false, defaultValue = "[]") @RequestBody(required = false) List<CommonRequest> queryRequests) { @ApiParam(value = "组合查询条件", required = false, defaultValue = "[]") @RequestBody(required = false) List<CommonRequest> queryRequests) {
// 1.组织查询条件数据 // 1.组织查询条件数据
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
List<DaoCriteria> criterias = buildDaoCriterias(queryRequests, false, loginOrgCode, null); List<DaoCriteria> criterias = buildDaoCriterias(queryRequests, false, loginOrgCode, null);
// 2.组织数据权限过滤条件，基础数据不管roleType，全按照选择的公司orgCode过滤 // 2.组织数据权限过滤条件，基础数据不管roleType，全按照选择的公司orgCode过滤
DaoCriteria compDaoCriteria = new DaoCriteria(); DaoCriteria compDaoCriteria = new DaoCriteria();
...@@ -268,7 +268,7 @@ public class InputItemController extends AbstractBaseController { ...@@ -268,7 +268,7 @@ public class InputItemController extends AbstractBaseController {
@ApiOperation(value = "条件查询检查项", notes = "条件查询检查项") @ApiOperation(value = "条件查询检查项", notes = "条件查询检查项")
public CommonResponse queryCustomInputItem(@RequestBody HashMap<String, Object> params) { public CommonResponse queryCustomInputItem(@RequestBody HashMap<String, Object> params) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
List<PointInputItemVo> list = inputItemService.queryCustomInputItem(params, orgCode); List<PointInputItemVo> list = inputItemService.queryCustomInputItem(params, orgCode);
return CommonResponseUtil.success(list); return CommonResponseUtil.success(list);
} }
...@@ -286,7 +286,7 @@ public class InputItemController extends AbstractBaseController { ...@@ -286,7 +286,7 @@ public class InputItemController extends AbstractBaseController {
@ApiParam(value = "组合查询条件", required = false, defaultValue = "[]") @RequestBody(required = false) List<CommonRequest> queryRequests) { @ApiParam(value = "组合查询条件", required = false, defaultValue = "[]") @RequestBody(required = false) List<CommonRequest> queryRequests) {
// 组织数据权限过滤条件，基础数据不管roleType，全按照选择的公司orgCode过滤 // 组织数据权限过滤条件，基础数据不管roleType，全按照选择的公司orgCode过滤
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
List<InputItem> list = null; List<InputItem> list = null;
if (ObjectUtils.isEmpty(queryRequests)) { if (ObjectUtils.isEmpty(queryRequests)) {
list = inputItemDao.findAllByLevel(loginOrgCode); list = inputItemDao.findAllByLevel(loginOrgCode);
...@@ -328,7 +328,7 @@ public class InputItemController extends AbstractBaseController { ...@@ -328,7 +328,7 @@ public class InputItemController extends AbstractBaseController {
@ApiParam(value = "巡检点id", required = true) @PathVariable(name = "itemId") Long itemId, @ApiParam(value = "巡检点id", required = true) @PathVariable(name = "itemId") Long itemId,
@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) { @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
if (ObjectUtils.isEmpty(reginParams)) { if (ObjectUtils.isEmpty(reginParams)) {
return CommonResponseUtil.failure("用户session过期"); return CommonResponseUtil.failure("用户session过期");
} }
...@@ -396,7 +396,7 @@ public class InputItemController extends AbstractBaseController { ...@@ -396,7 +396,7 @@ public class InputItemController extends AbstractBaseController {
throw new Exception("请使用指定模板进行上传"); throw new Exception("请使用指定模板进行上传");
} }
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
String userId = getUserId(); String userId = getUserId();
List<InputItemTemplateVo> itemTemplateVoList = ExcelUtils.importExcel(file, 1, 1, InputItemTemplateVo.class); List<InputItemTemplateVo> itemTemplateVoList = ExcelUtils.importExcel(file, 1, 1, InputItemTemplateVo.class);
return CommonResponseUtil.success(inputItemService.uploadListByTemplate(itemTemplateVoList, orgCode, userId)); return CommonResponseUtil.success(inputItemService.uploadListByTemplate(itemTemplateVoList, orgCode, userId));
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/LatentDangerController.java
View file @ d6d191a6
...@@ -65,7 +65,7 @@ public class LatentDangerController extends AbstractBaseController { ...@@ -65,7 +65,7 @@ public class LatentDangerController extends AbstractBaseController {
} }
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String deptId = getDepartmentId(reginParams); String deptId = getDepartmentId(reginParams);
String companyId = getCompanyId(reginParams); String companyId = getCompanyId(reginParams);
String departmentName = getDepartmentName(reginParams); String departmentName = getDepartmentName(reginParams);
...@@ -87,7 +87,7 @@ public class LatentDangerController extends AbstractBaseController { ...@@ -87,7 +87,7 @@ public class LatentDangerController extends AbstractBaseController {
return CommonResponseUtil.failure("用户session过期"); return CommonResponseUtil.failure("用户session过期");
} }
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String deptId = getDepartmentId(reginParams); String deptId = getDepartmentId(reginParams);
String companyId = getCompanyId(reginParams); String companyId = getCompanyId(reginParams);
String departmentName = getDepartmentName(reginParams); String departmentName = getDepartmentName(reginParams);
...@@ -110,7 +110,7 @@ public class LatentDangerController extends AbstractBaseController { ...@@ -110,7 +110,7 @@ public class LatentDangerController extends AbstractBaseController {
return CommonResponseUtil.failure("用户session过期"); return CommonResponseUtil.failure("用户session过期");
} }
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String deptId = null; String deptId = null;
return iLatentDangerService.list(getToken(), getProduct(), getAppKey(), latentDangerListParam, user, loginOrgCode, deptId); return iLatentDangerService.list(getToken(), getProduct(), getAppKey(), latentDangerListParam, user, loginOrgCode, deptId);
} catch (Exception e) { } catch (Exception e) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/MsgController.java
View file @ d6d191a6
...@@ -99,7 +99,7 @@ public class MsgController extends AbstractBaseController { ...@@ -99,7 +99,7 @@ public class MsgController extends AbstractBaseController {
AgencyUserModel userModel = getUserInfo(); AgencyUserModel userModel = getUserInfo();
String userId = userModel.getUserId(); String userId = userModel.getUserId();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String deptId=null; String deptId=null;
if( reginParams.getDepartment()!=null){ if( reginParams.getDepartment()!=null){
deptId = reginParams.getDepartment().getDepartmentDesc(); deptId = reginParams.getDepartment().getDepartmentDesc();
...@@ -190,7 +190,7 @@ public class MsgController extends AbstractBaseController { ...@@ -190,7 +190,7 @@ public class MsgController extends AbstractBaseController {
AgencyUserModel userModel = getUserInfo(); AgencyUserModel userModel = getUserInfo();
String userId = userModel.getUserId(); String userId = userModel.getUserId();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
for (MsgSubscribe s: subscribe) { for (MsgSubscribe s: subscribe) {
s.setOrgCode(orgCode); s.setOrgCode(orgCode);
s.setUserId(userModel.getUserId()); s.setUserId(userModel.getUserId());
...@@ -299,7 +299,7 @@ public class MsgController extends AbstractBaseController { ...@@ -299,7 +299,7 @@ public class MsgController extends AbstractBaseController {
AgencyUserModel user = getUserInfo(); AgencyUserModel user = getUserInfo();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
CommonRequest request = new CommonRequest(); CommonRequest request = new CommonRequest();
CommonRequest request1 = new CommonRequest(); CommonRequest request1 = new CommonRequest();
...@@ -367,7 +367,7 @@ public class MsgController extends AbstractBaseController { ...@@ -367,7 +367,7 @@ public class MsgController extends AbstractBaseController {
@ApiParam(value = "分页参数", required = true, defaultValue = "pageNumber=0&pageSize=10") CommonPageable commonPageable) { @ApiParam(value = "分页参数", required = true, defaultValue = "pageNumber=0&pageSize=10") CommonPageable commonPageable) {
try { try {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, roleTypeName); HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, roleTypeName);
if(XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName)||XJConstant.ROLE_NAME_PERSON.equals(roleTypeName)) if(XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName)||XJConstant.ROLE_NAME_PERSON.equals(roleTypeName))
...@@ -414,7 +414,7 @@ public class MsgController extends AbstractBaseController { ...@@ -414,7 +414,7 @@ public class MsgController extends AbstractBaseController {
msg.setCreateBy(user.getUserId()); msg.setCreateBy(user.getUserId());
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
msg.setUserName(user.getRealName()); msg.setUserName(user.getRealName());
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
msg.setOrgCode(loginOrgCode); msg.setOrgCode(loginOrgCode);
List<Msg> msgList = iMsgService.publishNotice(getToken(),getProduct(),getAppKey(),msg); List<Msg> msgList = iMsgService.publishNotice(getToken(),getProduct(),getAppKey(),msg);
msgList.forEach(m->{ msgList.forEach(m->{
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/PlanController.java
View file @ d6d191a6
...@@ -50,9 +50,9 @@ public class PlanController extends AbstractBaseController { ...@@ -50,9 +50,9 @@ public class PlanController extends AbstractBaseController {
public CommonResponse qryCheckInfoPage(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests, public CommonResponse qryCheckInfoPage(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
@ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) { @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, null); HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, null);
buildRequestCxt(); // buildRequestCxt();
PlanInfoPageParam param = PlanPageParamUtil.fillPlanInfoParam(queryRequests, commonPageable, paramMap); PlanInfoPageParam param = PlanPageParamUtil.fillPlanInfoParam(queryRequests, commonPageable, paramMap);
Page<HashMap<String, Object>> list = planService.getPlanInfo(param); Page<HashMap<String, Object>> list = planService.getPlanInfo(param);
return CommonResponseUtil.success(list); return CommonResponseUtil.success(list);
...@@ -71,7 +71,7 @@ public class PlanController extends AbstractBaseController { ...@@ -71,7 +71,7 @@ public class PlanController extends AbstractBaseController {
public CommonResponse queryInfoPage(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests, public CommonResponse queryInfoPage(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
@ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) { @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
HashMap<String, Object> paramMap = buildMybatisCriterias(null, null); HashMap<String, Object> paramMap = buildMybatisCriterias(null, null);
buildRequestCxt(); // buildRequestCxt();
PlanInfoPageParam param = PlanPageParamUtil.fillPlanInfoParam(queryRequests, commonPageable, paramMap); PlanInfoPageParam param = PlanPageParamUtil.fillPlanInfoParam(queryRequests, commonPageable, paramMap);
Page<HashMap<String, Object>> list = planService.getPlanInfo(param); Page<HashMap<String, Object>> list = planService.getPlanInfo(param);
return CommonResponseUtil.success(list); return CommonResponseUtil.success(list);
...@@ -90,7 +90,7 @@ public class PlanController extends AbstractBaseController { ...@@ -90,7 +90,7 @@ public class PlanController extends AbstractBaseController {
try { try {
String userId = getUserId(); String userId = getUserId();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
HashMap<String, Object> map = new HashMap<String, Object>(); HashMap<String, Object> map = new HashMap<String, Object>();
map.put("org_code", loginOrgCode); map.put("org_code", loginOrgCode);
map.put("user_id", userId); map.put("user_id", userId);
...@@ -171,7 +171,7 @@ public class PlanController extends AbstractBaseController { ...@@ -171,7 +171,7 @@ public class PlanController extends AbstractBaseController {
@RequestMapping(value = "/queryPlanByOrgCode", produces = "application/json;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/queryPlanByOrgCode", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse qryCheckInfo(@ApiParam(value = "查询条件") @RequestBody(required = false) List<CommonRequest> queryRequests) { public CommonResponse qryCheckInfo(@ApiParam(value = "查询条件") @RequestBody(required = false) List<CommonRequest> queryRequests) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, null); HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, null);
PlanInfoPageParam param = PlanPageParamUtil.fillPlanInfoParam(queryRequests, null, paramMap); PlanInfoPageParam param = PlanPageParamUtil.fillPlanInfoParam(queryRequests, null, paramMap);
List<HashMap<String, Object>> list = planService.getPlanInfoNoPage(param); List<HashMap<String, Object>> list = planService.getPlanInfoNoPage(param);
...@@ -183,7 +183,7 @@ public class PlanController extends AbstractBaseController { ...@@ -183,7 +183,7 @@ public class PlanController extends AbstractBaseController {
@RequestMapping(value = "/queryPlanList", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/queryPlanList", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse queryPlanList() { public CommonResponse queryPlanList() {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
List<HashMap<String, Object>> list = planService.queryPlanListByOrgCode(loginOrgCode); List<HashMap<String, Object>> list = planService.queryPlanListByOrgCode(loginOrgCode);
return CommonResponseUtil.success(list); return CommonResponseUtil.success(list);
} }
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/PlanTaskController.java
View file @ d6d191a6
...@@ -90,7 +90,7 @@ public class PlanTaskController extends AbstractBaseController { ...@@ -90,7 +90,7 @@ public class PlanTaskController extends AbstractBaseController {
@ApiParam(value = "查询条件") @RequestBody(required = false) List<CommonRequest> queryRequests, @ApiParam(value = "查询条件") @RequestBody(required = false) List<CommonRequest> queryRequests,
@ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) { @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, null); HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, null);
PlanTaskPageParam params = new PlanTaskPageParam(); PlanTaskPageParam params = new PlanTaskPageParam();
PlanTaskPageParamUtil.fillChkInfoParam(queryRequests, commonPageable, params, paramMap); PlanTaskPageParamUtil.fillChkInfoParam(queryRequests, commonPageable, params, paramMap);
...@@ -183,7 +183,7 @@ public class PlanTaskController extends AbstractBaseController { ...@@ -183,7 +183,7 @@ public class PlanTaskController extends AbstractBaseController {
HttpServletResponse response) { HttpServletResponse response) {
try { try {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
HashMap<String, Object> paramMap = buildMybatisDaoCriterias(loginOrgCode, null); HashMap<String, Object> paramMap = buildMybatisDaoCriterias(loginOrgCode, null);
PlanTaskPageParam params = new PlanTaskPageParam(); PlanTaskPageParam params = new PlanTaskPageParam();
PlanTaskPageParamUtil.fillChkInfoParam(queryRequests, null, params, paramMap); PlanTaskPageParamUtil.fillChkInfoParam(queryRequests, null, params, paramMap);
...@@ -261,7 +261,7 @@ public class PlanTaskController extends AbstractBaseController { ...@@ -261,7 +261,7 @@ public class PlanTaskController extends AbstractBaseController {
try { try {
HashMap<String, Object> params = new HashMap<String, Object>(); HashMap<String, Object> params = new HashMap<String, Object>();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
params.put("orgCode", loginOrgCode); params.put("orgCode", loginOrgCode);
String pointNo = serial; String pointNo = serial;
params.put("pointNo", pointNo); params.put("pointNo", pointNo);
...@@ -502,7 +502,7 @@ public class PlanTaskController extends AbstractBaseController { ...@@ -502,7 +502,7 @@ public class PlanTaskController extends AbstractBaseController {
@ApiParam(value = "页大小") @RequestParam(value = "pageSize") int pageSize) throws Exception { @ApiParam(value = "页大小") @RequestParam(value = "pageSize") int pageSize) throws Exception {
HashMap<String, Object> params = new HashMap<String, Object>(); HashMap<String, Object> params = new HashMap<String, Object>();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
Map<String, Object> authMap = Bean.BeantoMap(reginParams.getPersonIdentity()); Map<String, Object> authMap = Bean.BeantoMap(reginParams.getPersonIdentity());
params.putAll(authMap); params.putAll(authMap);
params.put("companyId", companyId); params.put("companyId", companyId);
...@@ -550,7 +550,7 @@ public class PlanTaskController extends AbstractBaseController { ...@@ -550,7 +550,7 @@ public class PlanTaskController extends AbstractBaseController {
HashMap<String, Object> params = new HashMap<String, Object>(); HashMap<String, Object> params = new HashMap<String, Object>();
HashMap<String, Object> resp = new HashMap<String, Object>(); HashMap<String, Object> resp = new HashMap<String, Object>();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
PlanTaskPageParamUtil.fillPlanTask(queryRequests, params); PlanTaskPageParamUtil.fillPlanTask(queryRequests, params);
params.put("userId", getUserId()); params.put("userId", getUserId());
if (queryRequests != null && queryRequests.size() > 0) { if (queryRequests != null && queryRequests.size() > 0) {
...@@ -635,7 +635,7 @@ public class PlanTaskController extends AbstractBaseController { ...@@ -635,7 +635,7 @@ public class PlanTaskController extends AbstractBaseController {
public CommonResponse queryLeavePlanTask() { public CommonResponse queryLeavePlanTask() {
String userId = getUserId(); String userId = getUserId();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
HashMap<String, Object> params = new HashMap<String, Object>(); HashMap<String, Object> params = new HashMap<String, Object>();
params.put("userId", userId); params.put("userId", userId);
params.put("orgCode", loginOrgCode); params.put("orgCode", loginOrgCode);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/PointController.java
View file @ d6d191a6
...@@ -92,7 +92,7 @@ public class PointController extends AbstractBaseController { ...@@ -92,7 +92,7 @@ public class PointController extends AbstractBaseController {
} }
try { try {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
//点归属于公司 //点归属于公司
pointParam.getPoint().setOrgCode(loginOrgCode); pointParam.getPoint().setOrgCode(loginOrgCode);
pointParam.getPoint().setCreatorId(user.getUserId()); pointParam.getPoint().setCreatorId(user.getUserId());
...@@ -115,7 +115,7 @@ public class PointController extends AbstractBaseController { ...@@ -115,7 +115,7 @@ public class PointController extends AbstractBaseController {
} }
try { try {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
//点归属于公司 //点归属于公司
param.setOrgCode(loginOrgCode); param.setOrgCode(loginOrgCode);
param.setCreatorId(user.getUserId()); param.setCreatorId(user.getUserId());
...@@ -226,7 +226,7 @@ public class PointController extends AbstractBaseController { ...@@ -226,7 +226,7 @@ public class PointController extends AbstractBaseController {
@ApiParam(value = "查询条件") @RequestBody(required = false) List<CommonRequest> queryRequests, @ApiParam(value = "查询条件") @RequestBody(required = false) List<CommonRequest> queryRequests,
@ApiParam(value = "分页参数", required = true, defaultValue = "pageNumber=0&pageSize=10") CommonPageable commonPageable) { @ApiParam(value = "分页参数", required = true, defaultValue = "pageNumber=0&pageSize=10") CommonPageable commonPageable) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
if (ObjectUtils.isEmpty(reginParams)) { if (ObjectUtils.isEmpty(reginParams)) {
return CommonResponseUtil.failure("用户session过期"); return CommonResponseUtil.failure("用户session过期");
} }
...@@ -279,7 +279,7 @@ public class PointController extends AbstractBaseController { ...@@ -279,7 +279,7 @@ public class PointController extends AbstractBaseController {
public CommonResponse listAllPoint() { public CommonResponse listAllPoint() {
List<CommonRequest> queryRequests = new ArrayList<>(); List<CommonRequest> queryRequests = new ArrayList<>();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
CommonRequest commonRequest = new CommonRequest(); CommonRequest commonRequest = new CommonRequest();
commonRequest.setName("orgCode"); commonRequest.setName("orgCode");
commonRequest.setValue(loginOrgCode); commonRequest.setValue(loginOrgCode);
...@@ -304,7 +304,7 @@ public class PointController extends AbstractBaseController { ...@@ -304,7 +304,7 @@ public class PointController extends AbstractBaseController {
} }
String userId = getUserId(); String userId = getUserId();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
if (ObjectUtils.isEmpty(reginParams)) { if (ObjectUtils.isEmpty(reginParams)) {
return CommonResponseUtil.failure("用户session过期"); return CommonResponseUtil.failure("用户session过期");
} }
...@@ -324,7 +324,7 @@ public class PointController extends AbstractBaseController { ...@@ -324,7 +324,7 @@ public class PointController extends AbstractBaseController {
public CommonResponse exportTemplate(HttpServletResponse response) { public CommonResponse exportTemplate(HttpServletResponse response) {
String userId = getUserId(); String userId = getUserId();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String fileName = "巡检点导入模板"; //模板名称 String fileName = "巡检点导入模板"; //模板名称
String[] handers = {"点编号", "点名称", "是否为移动点", "计划外巡检是否评分", "是否允许离线巡检", "参考地址", "3维地图坐标", "3维地图楼层", "最少拍照数量", "最多拍照数量", "风险等级", "备注说明", "所属分类目录", "检查项目", "是否室内"}; //列标题 String[] handers = {"点编号", "点名称", "是否为移动点", "计划外巡检是否评分", "是否允许离线巡检", "参考地址", "3维地图坐标", "3维地图楼层", "最少拍照数量", "最多拍照数量", "风险等级", "备注说明", "所属分类目录", "检查项目", "是否室内"}; //列标题
List<String[]> downData = new ArrayList(); List<String[]> downData = new ArrayList();
...@@ -357,7 +357,7 @@ public class PointController extends AbstractBaseController { ...@@ -357,7 +357,7 @@ public class PointController extends AbstractBaseController {
@RequestParam(value = "exportType", required = false) int exportType, @RequestParam(value = "exportType", required = false) int exportType,
HttpServletResponse response) { HttpServletResponse response) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
if (ObjectUtils.isEmpty(reginParams)) { if (ObjectUtils.isEmpty(reginParams)) {
return CommonResponseUtil.failure("用户session过期"); return CommonResponseUtil.failure("用户session过期");
} }
...@@ -384,7 +384,7 @@ public class PointController extends AbstractBaseController { ...@@ -384,7 +384,7 @@ public class PointController extends AbstractBaseController {
@RequestParam(value = "exportType", required = false) int exportType, @RequestParam(value = "exportType", required = false) int exportType,
HttpServletResponse response) { HttpServletResponse response) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
if (ObjectUtils.isEmpty(reginParams)) { if (ObjectUtils.isEmpty(reginParams)) {
return CommonResponseUtil.failure("用户session过期"); return CommonResponseUtil.failure("用户session过期");
} }
...@@ -414,7 +414,7 @@ public class PointController extends AbstractBaseController { ...@@ -414,7 +414,7 @@ public class PointController extends AbstractBaseController {
@ApiParam(value = "分页参数", required = true, defaultValue = "pageNumber=0&pageSize=10") CommonPageable commonPageable) { @ApiParam(value = "分页参数", required = true, defaultValue = "pageNumber=0&pageSize=10") CommonPageable commonPageable) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
if (ObjectUtils.isEmpty(reginParams)) { if (ObjectUtils.isEmpty(reginParams)) {
return CommonResponseUtil.failure("用户session过期"); return CommonResponseUtil.failure("用户session过期");
} }
...@@ -438,7 +438,7 @@ public class PointController extends AbstractBaseController { ...@@ -438,7 +438,7 @@ public class PointController extends AbstractBaseController {
public CommonResponse listPoint(@ApiParam(value = "巡检点编码", required = false) @RequestParam("ids") List<String> ids, public CommonResponse listPoint(@ApiParam(value = "巡检点编码", required = false) @RequestParam("ids") List<String> ids,
@ApiParam(value = "巡检点名称", required = false) @RequestParam("names") List<String> names) { @ApiParam(value = "巡检点名称", required = false) @RequestParam("names") List<String> names) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
try { try {
List<Point> list = iPointService.queryPointList(ids, names, orgCode); List<Point> list = iPointService.queryPointList(ids, names, orgCode);
return CommonResponseUtil.success(list); return CommonResponseUtil.success(list);
...@@ -460,7 +460,7 @@ public class PointController extends AbstractBaseController { ...@@ -460,7 +460,7 @@ public class PointController extends AbstractBaseController {
public CommonResponse queryPoints(@ApiParam(value = "巡检点编码", required = false) @RequestParam("code") String code, public CommonResponse queryPoints(@ApiParam(value = "巡检点编码", required = false) @RequestParam("code") String code,
@ApiParam(value = "巡检点名称", required = false) @RequestParam("name") String name) { @ApiParam(value = "巡检点名称", required = false) @RequestParam("name") String name) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
try { try {
List<HashMap<String, Object>> list = iPointService.findPointList(code, name, orgCode); List<HashMap<String, Object>> list = iPointService.findPointList(code, name, orgCode);
return CommonResponseUtil.success(list); return CommonResponseUtil.success(list);
...@@ -621,7 +621,7 @@ public class PointController extends AbstractBaseController { ...@@ -621,7 +621,7 @@ public class PointController extends AbstractBaseController {
@GetMapping(value = "/queryPointPie", produces = "application/json;charset=UTF-8") @GetMapping(value = "/queryPointPie", produces = "application/json;charset=UTF-8")
public CommonResponse queryPointPie() { public CommonResponse queryPointPie() {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
HashMap<String, Object> params = new HashMap<String, Object>(); HashMap<String, Object> params = new HashMap<String, Object>();
params.put("orgCode", loginOrgCode); params.put("orgCode", loginOrgCode);
HashMap<String, Object> response = iPointService.queryPointPie(params); HashMap<String, Object> response = iPointService.queryPointPie(params);
...@@ -633,7 +633,7 @@ public class PointController extends AbstractBaseController { ...@@ -633,7 +633,7 @@ public class PointController extends AbstractBaseController {
@GetMapping(value = "/queryPointHistogram", produces = "application/json;charset=UTF-8") @GetMapping(value = "/queryPointHistogram", produces = "application/json;charset=UTF-8")
public CommonResponse queryPointHistogram() { public CommonResponse queryPointHistogram() {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
HashMap<String, Object> params = new HashMap<String, Object>(); HashMap<String, Object> params = new HashMap<String, Object>();
params.put("orgCode", loginOrgCode); params.put("orgCode", loginOrgCode);
List<HashMap<String, Object>> response = iPointService.queryPointHistogram(params); List<HashMap<String, Object>> response = iPointService.queryPointHistogram(params);
...@@ -682,7 +682,7 @@ public class PointController extends AbstractBaseController { ...@@ -682,7 +682,7 @@ public class PointController extends AbstractBaseController {
@ApiParam(value = "巡检点id", required = true) @PathVariable(name = "pointId") Long pointId, @ApiParam(value = "巡检点id", required = true) @PathVariable(name = "pointId") Long pointId,
@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) { @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
if (ObjectUtils.isEmpty(reginParams)) { if (ObjectUtils.isEmpty(reginParams)) {
return CommonResponseUtil.failure("用户session过期"); return CommonResponseUtil.failure("用户session过期");
} }
...@@ -714,7 +714,7 @@ public class PointController extends AbstractBaseController { ...@@ -714,7 +714,7 @@ public class PointController extends AbstractBaseController {
@GetMapping(value = "/queryLeavelPoint", produces = "application/json;charset=UTF-8") @GetMapping(value = "/queryLeavelPoint", produces = "application/json;charset=UTF-8")
public CommonResponse queryLeavelPoint(@ApiParam(value = "数据同步开始时间（不传为全部同步）", required = false) @RequestParam(required = false) String startTime) { public CommonResponse queryLeavelPoint(@ApiParam(value = "数据同步开始时间（不传为全部同步）", required = false) @RequestParam(required = false) String startTime) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
if (ObjectUtils.isEmpty(reginParams)) { if (ObjectUtils.isEmpty(reginParams)) {
return CommonResponseUtil.failure("用户session过期"); return CommonResponseUtil.failure("用户session过期");
} }
...@@ -742,7 +742,7 @@ public class PointController extends AbstractBaseController { ...@@ -742,7 +742,7 @@ public class PointController extends AbstractBaseController {
@PostMapping(value = "/exportPoint/iec", produces = "application/json;charset=UTF-8") @PostMapping(value = "/exportPoint/iec", produces = "application/json;charset=UTF-8")
public CommonResponse exportIecPoint(HttpServletResponse response) { public CommonResponse exportIecPoint(HttpServletResponse response) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String fileName = "巡检点点位"; //模板名称 String fileName = "巡检点点位"; //模板名称
List<Map<String, Object>> list = iPointService.queryAllPointConfig(loginOrgCode); List<Map<String, Object>> list = iPointService.queryAllPointConfig(loginOrgCode);
try { try {
...@@ -814,7 +814,7 @@ public class PointController extends AbstractBaseController { ...@@ -814,7 +814,7 @@ public class PointController extends AbstractBaseController {
@ApiParam(value = "同步请求参数") @RequestBody() List<MaintenanceResourceData> list) { @ApiParam(value = "同步请求参数") @RequestBody() List<MaintenanceResourceData> list) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
AgencyUserModel model = getUserInfo(); AgencyUserModel model = getUserInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
iPointService.syncSavePoint(list, orgCode, model.getUserId()); iPointService.syncSavePoint(list, orgCode, model.getUserId());
return CommonResponseUtil.success(); return CommonResponseUtil.success();
} }
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/QueryStatsController.java
View file @ d6d191a6
...@@ -47,7 +47,7 @@ public class QueryStatsController extends AbstractBaseController { ...@@ -47,7 +47,7 @@ public class QueryStatsController extends AbstractBaseController {
@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests, @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
@ApiParam(value = "分页参数", required = true, defaultValue = "pageNumber=0&pageSize=10") CommonPageable commonPageable) { @ApiParam(value = "分页参数", required = true, defaultValue = "pageNumber=0&pageSize=10") CommonPageable commonPageable) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
HashMap<String, Object> paramMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName); HashMap<String, Object> paramMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName);
CheckStatsListPageParam param = CheckStatsParamUtils.fillCheckInfoParam(queryRequests, commonPageable, paramMap); CheckStatsListPageParam param = CheckStatsParamUtils.fillCheckInfoParam(queryRequests, commonPageable, paramMap);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/RouteController.java
View file @ d6d191a6
...@@ -63,7 +63,7 @@ public class RouteController extends AbstractBaseController { ...@@ -63,7 +63,7 @@ public class RouteController extends AbstractBaseController {
public CommonResponse addRoute(@ApiParam(value = "巡检路线", required = true) @RequestBody Route route) { public CommonResponse addRoute(@ApiParam(value = "巡检路线", required = true) @RequestBody Route route) {
try { try {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
route.setOrgCode(loginOrgCode); route.setOrgCode(loginOrgCode);
route.setIsDelete(false); route.setIsDelete(false);
if (routeService.existRouteName(loginOrgCode, route.getName())) { if (routeService.existRouteName(loginOrgCode, route.getName())) {
...@@ -90,7 +90,7 @@ public class RouteController extends AbstractBaseController { ...@@ -90,7 +90,7 @@ public class RouteController extends AbstractBaseController {
public CommonResponse updateRoute(@ApiParam(value = "巡检路线", required = true) @RequestBody Route route) { public CommonResponse updateRoute(@ApiParam(value = "巡检路线", required = true) @RequestBody Route route) {
try { try {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
route.setOrgCode(orgCode); route.setOrgCode(orgCode);
route.setCreatorId(getUserId()); route.setCreatorId(getUserId());
routeService.updateRoute(route); routeService.updateRoute(route);
...@@ -195,7 +195,7 @@ public class RouteController extends AbstractBaseController { ...@@ -195,7 +195,7 @@ public class RouteController extends AbstractBaseController {
@ApiParam(value = "分页参数", required = true, defaultValue = "pageNumber=0&pageSize=10") CommonPageable commonPageable) { @ApiParam(value = "分页参数", required = true, defaultValue = "pageNumber=0&pageSize=10") CommonPageable commonPageable) {
try { try {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
HashMap<String, Object> paramMap = new HashMap<String, Object>(); HashMap<String, Object> paramMap = new HashMap<String, Object>();
paramMap.put("orgCode", loginOrgCode); paramMap.put("orgCode", loginOrgCode);
RoutePageParam params = RoutePageParamUtil.fillRouteInfoParam(queryRequests, commonPageable, paramMap); RoutePageParam params = RoutePageParamUtil.fillRouteInfoParam(queryRequests, commonPageable, paramMap);
...@@ -214,7 +214,7 @@ public class RouteController extends AbstractBaseController { ...@@ -214,7 +214,7 @@ public class RouteController extends AbstractBaseController {
try { try {
//1.组织数据权限信息 //1.组织数据权限信息
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String org = getLoginOrgCode(reginParams); String org = getOrgCode(reginParams);
//2.查询 //2.查询
List<Route> routeList; List<Route> routeList;
if (null != orgCode && 0 == orgCode) { if (null != orgCode && 0 == orgCode) {
...@@ -235,7 +235,7 @@ public class RouteController extends AbstractBaseController { ...@@ -235,7 +235,7 @@ public class RouteController extends AbstractBaseController {
public CommonResponse queryRouteList() { public CommonResponse queryRouteList() {
try { try {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
List<HashMap<String, Object>> routeList = routeService.queryRouteListByOrgCode(loginOrgCode, null, null); List<HashMap<String, Object>> routeList = routeService.queryRouteListByOrgCode(loginOrgCode, null, null);
routeList = routeList.stream().distinct().collect(Collectors.toList()); routeList = routeList.stream().distinct().collect(Collectors.toList());
return CommonResponseUtil.success(routeList); return CommonResponseUtil.success(routeList);
...@@ -293,7 +293,7 @@ public class RouteController extends AbstractBaseController { ...@@ -293,7 +293,7 @@ public class RouteController extends AbstractBaseController {
try { try {
String uid = getUserId(); String uid = getUserId();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
List<RoutePoint> routePointList = new ArrayList<>(); List<RoutePoint> routePointList = new ArrayList<>();
for (String pointId : pointIds) { for (String pointId : pointIds) {
RoutePoint routePoint = new RoutePoint(); RoutePoint routePoint = new RoutePoint();
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/SafetyController.java
View file @ d6d191a6
...@@ -62,7 +62,7 @@ public class SafetyController extends AbstractBaseController{ ...@@ -62,7 +62,7 @@ public class SafetyController extends AbstractBaseController{
@ApiOperation(value = " 保存登陆用户选择公司信息", notes = " 保存登陆用户选择公司信息") @ApiOperation(value = " 保存登陆用户选择公司信息", notes = " 保存登陆用户选择公司信息")
@PostMapping(value = "/save/curCompany") @PostMapping(value = "/save/curCompany")
public CommonResponse saveCurCompany(@RequestBody ReginParams reginParams) { public CommonResponse saveCurCompany(@RequestBody ReginParams reginParams) {
this.saveSelectedOrgInfo(reginParams); // this.saveSelectedOrgInfo(reginParams);
// CatalogTree hh4= new CatalogTree(); // CatalogTree hh4= new CatalogTree();
// CommonResponse hh= pointService.pushSpcCheckResult(hh4); // CommonResponse hh= pointService.pushSpcCheckResult(hh4);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/SafetyPreCtrlController.java
View file @ d6d191a6
...@@ -77,7 +77,7 @@ public class SafetyPreCtrlController extends AbstractBaseController { ...@@ -77,7 +77,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
@RequestMapping(value = "/countPoint", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/countPoint", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse sumCheckPtById() { public CommonResponse sumCheckPtById() {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, roleTypeName); HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, roleTypeName);
List<HashMap<String, Object>> List = pointService.getSumPtByRole(paramMap); List<HashMap<String, Object>> List = pointService.getSumPtByRole(paramMap);
...@@ -95,7 +95,7 @@ public class SafetyPreCtrlController extends AbstractBaseController { ...@@ -95,7 +95,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
@RequestMapping(value = "/countMonth/{dateMonth}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/countMonth/{dateMonth}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse countMonthCheckById(@ApiParam(value = "年月日(yyyyMMdd)8位", required = false) @PathVariable String dateMonth) { public CommonResponse countMonthCheckById(@ApiParam(value = "年月日(yyyyMMdd)8位", required = false) @PathVariable String dateMonth) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, roleTypeName); HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, roleTypeName);
List<HashMap<String, Object>> countList = checkService.getCountMonthChkByRole(paramMap, dateMonth); List<HashMap<String, Object>> countList = checkService.getCountMonthChkByRole(paramMap, dateMonth);
...@@ -114,7 +114,7 @@ public class SafetyPreCtrlController extends AbstractBaseController { ...@@ -114,7 +114,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
public CommonResponse findChkExList(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests, public CommonResponse findChkExList(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
@ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) { @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, roleTypeName); HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, roleTypeName);
CheckPtListPageParam params = CheckPageParamUtil.fillChkExParam(queryRequests, commonPageable, paramMap); CheckPtListPageParam params = CheckPageParamUtil.fillChkExParam(queryRequests, commonPageable, paramMap);
...@@ -132,7 +132,7 @@ public class SafetyPreCtrlController extends AbstractBaseController { ...@@ -132,7 +132,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
@RequestMapping(value = "/point/queryCriteria/init", method = RequestMethod.GET, produces = "application/json;charset=UTF-8") @RequestMapping(value = "/point/queryCriteria/init", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
public CommonResponse getQueryCriteriaInit() { public CommonResponse getQueryCriteriaInit() {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
String departmentId = getDepartmentId(reginParams); String departmentId = getDepartmentId(reginParams);
String companyId = getCompanyId(reginParams); String companyId = getCompanyId(reginParams);
...@@ -153,7 +153,7 @@ public class SafetyPreCtrlController extends AbstractBaseController { ...@@ -153,7 +153,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
@RequestMapping(value = "/check-info/count", produces = "application/json;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/check-info/count", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse countCheckInfoDate(@ApiParam(value = "查询条件", required = false) @RequestBody HashMap<String, Object> map) { public CommonResponse countCheckInfoDate(@ApiParam(value = "查询条件", required = false) @RequestBody HashMap<String, Object> map) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
HashMap<String, Object> paramsMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName); HashMap<String, Object> paramsMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName);
paramsMap.put("checkMonth", map.get("date").toString().subSequence(0, 6)); paramsMap.put("checkMonth", map.get("date").toString().subSequence(0, 6));
...@@ -173,7 +173,7 @@ public class SafetyPreCtrlController extends AbstractBaseController { ...@@ -173,7 +173,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
@RequestMapping(value = "/check-user/{PointID}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/check-user/{PointID}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse qryCheckUserById(@ApiParam(value = "点编号", required = true) @PathVariable int PointID) { public CommonResponse qryCheckUserById(@ApiParam(value = "点编号", required = true) @PathVariable int PointID) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
HashMap<String, Object> paramsMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName); HashMap<String, Object> paramsMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName);
List<CheckUserBo> userList = checkService.getAuthUserInfo(paramsMap); List<CheckUserBo> userList = checkService.getAuthUserInfo(paramsMap);
...@@ -193,7 +193,7 @@ public class SafetyPreCtrlController extends AbstractBaseController { ...@@ -193,7 +193,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
public CommonResponse qryCheckInfoPage(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests, public CommonResponse qryCheckInfoPage(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
@ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) { @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
HashMap<String, Object> paramMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName); HashMap<String, Object> paramMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName);
CheckInfoListPageParam params = CheckPageParamUtil.fillChkInfoListParam(queryRequests, commonPageable, paramMap); CheckInfoListPageParam params = CheckPageParamUtil.fillChkInfoListParam(queryRequests, commonPageable, paramMap);
...@@ -214,14 +214,14 @@ public class SafetyPreCtrlController extends AbstractBaseController { ...@@ -214,14 +214,14 @@ public class SafetyPreCtrlController extends AbstractBaseController {
CommonPage<CheckInputBo> checkInputBos = null; CommonPage<CheckInputBo> checkInputBos = null;
try { try {
checkInputBos = checkService.getCheckInputByCheckId(param); checkInputBos = checkService.getCheckInputByCheckId(param);
checkInputBos.setResult(SUCCESS); checkInputBos.setResult("SUCCESS");
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
if (ObjectUtils.isEmpty(checkInputBos)) { if (ObjectUtils.isEmpty(checkInputBos)) {
checkInputBos = new CommonPage(null, null, 0); checkInputBos = new CommonPage(null, null, 0);
} }
checkInputBos.setMessage(e.getMessage()); checkInputBos.setMessage(e.getMessage());
checkInputBos.setResult(FAILED); checkInputBos.setResult("FAILED");
} }
return CommonResponseUtil.success(checkInputBos); return CommonResponseUtil.success(checkInputBos);
} }
...@@ -280,7 +280,7 @@ public class SafetyPreCtrlController extends AbstractBaseController { ...@@ -280,7 +280,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
@ApiParam(value = "查询条件") @RequestBody(required = false) List<CommonRequest> queryRequests, @ApiParam(value = "查询条件") @RequestBody(required = false) List<CommonRequest> queryRequests,
@ApiParam(value = "分页参数") CommonPageable commonPageable) { @ApiParam(value = "分页参数") CommonPageable commonPageable) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, null); HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, null);
CheckPtListPageParam params = CheckPageParamUtil.fillChkPtParam(queryRequests, commonPageable, paramMap); CheckPtListPageParam params = CheckPageParamUtil.fillChkPtParam(queryRequests, commonPageable, paramMap);
Page<CheckPtListBo> checkPtListBo = pointService.getCheckPtList(getToken(), getProduct(), getAppKey(), params); Page<CheckPtListBo> checkPtListBo = pointService.getCheckPtList(getToken(), getProduct(), getAppKey(), params);
...@@ -389,7 +389,7 @@ public class SafetyPreCtrlController extends AbstractBaseController { ...@@ -389,7 +389,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
@ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) { @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
try { try {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
HashMap<String, Object> paramMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName); HashMap<String, Object> paramMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName);
CheckPtListPageParam params = CheckPageParamUtil.fillTraParam(queryRequests, commonPageable, paramMap); CheckPtListPageParam params = CheckPageParamUtil.fillTraParam(queryRequests, commonPageable, paramMap);
...@@ -412,7 +412,7 @@ public class SafetyPreCtrlController extends AbstractBaseController { ...@@ -412,7 +412,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
@RequestMapping(value = "/routePlanPoint/list", produces = "application/json;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/routePlanPoint/list", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse findRoutePlanPointList(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) { public CommonResponse findRoutePlanPointList(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
HashMap<String, Object> paramMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName); HashMap<String, Object> paramMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName);
CheckPtListPageParam params = CheckPageParamUtil.fillChkPtParam(queryRequests, null, paramMap); CheckPtListPageParam params = CheckPageParamUtil.fillChkPtParam(queryRequests, null, paramMap);
...@@ -425,7 +425,7 @@ public class SafetyPreCtrlController extends AbstractBaseController { ...@@ -425,7 +425,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
@RequestMapping(value = "/queryConditions/init/{type}", method = RequestMethod.GET, produces = "application/json;charset=UTF-8") @RequestMapping(value = "/queryConditions/init/{type}", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
public CommonResponse findCheckSystemInit(@ApiParam(value = "类型", required = true) @PathVariable String type) { public CommonResponse findCheckSystemInit(@ApiParam(value = "类型", required = true) @PathVariable String type) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
String departmentId = getDepartmentId(reginParams); String departmentId = getDepartmentId(reginParams);
String companyId = getCompanyId(reginParams); String companyId = getCompanyId(reginParams);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/SynDataController.java
View file @ d6d191a6
...@@ -54,7 +54,7 @@ public class SynDataController extends AbstractBaseController { ...@@ -54,7 +54,7 @@ public class SynDataController extends AbstractBaseController {
@ApiParam(value = "巡检项信息", required = true) @RequestBody SynInputItemParam synInputItemParam) { @ApiParam(value = "巡检项信息", required = true) @RequestBody SynInputItemParam synInputItemParam) {
try { try {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
String userId = getUserId(); String userId = getUserId();
if (ObjectUtils.isEmpty(reginParams)) { if (ObjectUtils.isEmpty(reginParams)) {
return CommonResponseUtil.failure("用户session过期"); return CommonResponseUtil.failure("用户session过期");
...@@ -86,7 +86,7 @@ public class SynDataController extends AbstractBaseController { ...@@ -86,7 +86,7 @@ public class SynDataController extends AbstractBaseController {
try { try {
if (operationType.equals(saveOperationType)) { if (operationType.equals(saveOperationType)) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
String userId = getUserId(); String userId = getUserId();
if (ObjectUtils.isEmpty(reginParams)) { if (ObjectUtils.isEmpty(reginParams)) {
return CommonResponseUtil.failure("用户session过期"); return CommonResponseUtil.failure("用户session过期");
...@@ -143,12 +143,12 @@ public class SynDataController extends AbstractBaseController { ...@@ -143,12 +143,12 @@ public class SynDataController extends AbstractBaseController {
@ApiParam(value = "巡检路线信息") @RequestBody SynRouteParam synRouteParam) { @ApiParam(value = "巡检路线信息") @RequestBody SynRouteParam synRouteParam) {
try { try {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
String userId = getUserId(); String userId = getUserId();
if (ObjectUtils.isEmpty(reginParams)) { if (ObjectUtils.isEmpty(reginParams)) {
return CommonResponseUtil.failure("用户session过期"); return CommonResponseUtil.failure("用户session过期");
} }
// String orgCode = getLoginUserParam().getLoginOrgCode(); // String orgCode = getLoginUserParam().getOrgCode();
if (operationType.equals(saveOperationType)) { if (operationType.equals(saveOperationType)) {
return iSynDataService.saveRoute(synRouteParam, userId, orgCode); return iSynDataService.saveRoute(synRouteParam, userId, orgCode);
} }
...@@ -172,7 +172,7 @@ public class SynDataController extends AbstractBaseController { ...@@ -172,7 +172,7 @@ public class SynDataController extends AbstractBaseController {
@ApiParam(value = "巡检计划信息") @RequestBody SynPlanParam synPlanParam) { @ApiParam(value = "巡检计划信息") @RequestBody SynPlanParam synPlanParam) {
try { try {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
String userId = getUserId(); String userId = getUserId();
Toke toke = new Toke(); Toke toke = new Toke();
toke.setAppKey(getAppKey()); toke.setAppKey(getAppKey());
...@@ -181,7 +181,7 @@ public class SynDataController extends AbstractBaseController { ...@@ -181,7 +181,7 @@ public class SynDataController extends AbstractBaseController {
if (ObjectUtils.isEmpty(reginParams)) { if (ObjectUtils.isEmpty(reginParams)) {
return CommonResponseUtil.failure("用户session过期"); return CommonResponseUtil.failure("用户session过期");
} }
// String orgCode = getLoginUserParam().getLoginOrgCode(); // String orgCode = getLoginUserParam().getOrgCode();
if (operationType.equals(saveOperationType)) { if (operationType.equals(saveOperationType)) {
return iSynDataService.savePlan(synPlanParam, userId, orgCode,toke); return iSynDataService.savePlan(synPlanParam, userId, orgCode,toke);
} }
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/TaskController.java
View file @ d6d191a6
...@@ -123,7 +123,7 @@ public class TaskController extends AbstractBaseController{ ...@@ -123,7 +123,7 @@ public class TaskController extends AbstractBaseController{
return CommonResponseUtil.failure("完成时间应当大于当前时间！" ); return CommonResponseUtil.failure("完成时间应当大于当前时间！" );
} }
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
param.getTaskInfo().setOrgCode(orgCode); param.getTaskInfo().setOrgCode(orgCode);
// param.getTaskInfo().setCreateDate(new Date()); // param.getTaskInfo().setCreateDate(new Date());
param.getTaskInfo().setPublisher(user.getUserId()); param.getTaskInfo().setPublisher(user.getUserId());
...@@ -239,7 +239,7 @@ public class TaskController extends AbstractBaseController{ ...@@ -239,7 +239,7 @@ public class TaskController extends AbstractBaseController{
if (htmlFile.exists()) { if (htmlFile.exists()) {
htmlFile.delete(); htmlFile.delete();
} }
return new CommonResponse(SUCCESS, data, "查询成功"); return new CommonResponse("SUCCESS", data, "查询成功");
} catch (TransformerException | IOException e) { } catch (TransformerException | IOException e) {
e.printStackTrace(); e.printStackTrace();
return null; return null;
...@@ -296,7 +296,7 @@ public class TaskController extends AbstractBaseController{ ...@@ -296,7 +296,7 @@ public class TaskController extends AbstractBaseController{
try { try {
AgencyUserModel user = getUserInfo(); AgencyUserModel user = getUserInfo();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
taskService.handleTask(taskIds, status, user, orgCode); taskService.handleTask(taskIds, status, user, orgCode);
return CommonResponseUtil.success(); return CommonResponseUtil.success();
} catch (Exception e) { } catch (Exception e) {
...@@ -352,7 +352,7 @@ public class TaskController extends AbstractBaseController{ ...@@ -352,7 +352,7 @@ public class TaskController extends AbstractBaseController{
public CommonResponse feedbackTask(@ApiParam(value = "回复信息（包含图片base64编码）") @RequestBody FeedbackParam param) { public CommonResponse feedbackTask(@ApiParam(value = "回复信息（包含图片base64编码）") @RequestBody FeedbackParam param) {
AgencyUserModel user = getUserInfo(); AgencyUserModel user = getUserInfo();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
if (ObjectUtils.isEmpty(user)) { if (ObjectUtils.isEmpty(user)) {
return CommonResponseUtil.failure("用户session过期"); return CommonResponseUtil.failure("用户session过期");
} }
...@@ -441,7 +441,7 @@ public class TaskController extends AbstractBaseController{ ...@@ -441,7 +441,7 @@ public class TaskController extends AbstractBaseController{
@ApiParam(value = "分页参数", required = false, defaultValue = "current=0&pageSize=10或pageNumber0&pageSize=10") CommonPageable pageable) { @ApiParam(value = "分页参数", required = false, defaultValue = "current=0&pageSize=10或pageNumber0&pageSize=10") CommonPageable pageable) {
try { try {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
String deptId =""; String deptId ="";
String userId =""; String userId ="";
...@@ -480,7 +480,7 @@ public class TaskController extends AbstractBaseController{ ...@@ -480,7 +480,7 @@ public class TaskController extends AbstractBaseController{
queryRequests = new ArrayList<>(); queryRequests = new ArrayList<>();
} }
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
List<DaoCriteria> criterias = buildDaoCriterias(queryRequests, true, orgCode, roleTypeName); List<DaoCriteria> criterias = buildDaoCriterias(queryRequests, true, orgCode, roleTypeName);
List<Task> list = taskService.queryTaskByCondition(criterias); List<Task> list = taskService.queryTaskByCondition(criterias);
...@@ -501,7 +501,7 @@ public class TaskController extends AbstractBaseController{ ...@@ -501,7 +501,7 @@ public class TaskController extends AbstractBaseController{
queryRequests = new ArrayList<>(); queryRequests = new ArrayList<>();
} }
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
List<DaoCriteria> criterias = buildDaoCriterias(queryRequests, true, orgCode, roleTypeName); List<DaoCriteria> criterias = buildDaoCriterias(queryRequests, true, orgCode, roleTypeName);
int count = taskService.queryTaskCountByCondition(criterias); int count = taskService.queryTaskCountByCondition(criterias);
...@@ -513,7 +513,7 @@ public class TaskController extends AbstractBaseController{ ...@@ -513,7 +513,7 @@ public class TaskController extends AbstractBaseController{
@ApiOperation(value = "条件查询任务图表数据(<font color='blue'>手机app</font>)", notes = "条件查询任务图表数据(<font color='blue'>手机app</font>)") @ApiOperation(value = "条件查询任务图表数据(<font color='blue'>手机app</font>)", notes = "条件查询任务图表数据(<font color='blue'>手机app</font>)")
public CommonResponse queryTaskCharts(@ApiParam(value = "组合查询条件", required = false, defaultValue = "[]") @RequestBody(required = false) List<CommonRequest> queryRequests) { public CommonResponse queryTaskCharts(@ApiParam(value = "组合查询条件", required = false, defaultValue = "[]") @RequestBody(required = false) List<CommonRequest> queryRequests) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
String departmentId = getDepartmentId(reginParams); String departmentId = getDepartmentId(reginParams);
if (queryRequests == null) { if (queryRequests == null) {
...@@ -563,7 +563,7 @@ public class TaskController extends AbstractBaseController{ ...@@ -563,7 +563,7 @@ public class TaskController extends AbstractBaseController{
public CommonResponse queryTasksByPage(@ApiParam(value = "组合查询条件", required = false, defaultValue = "[]") @RequestBody(required = false) List<CommonRequest> queryRequests, public CommonResponse queryTasksByPage(@ApiParam(value = "组合查询条件", required = false, defaultValue = "[]") @RequestBody(required = false) List<CommonRequest> queryRequests,
@ApiParam(value = "分页参数", required = false, defaultValue = "current=0&pageSize=10或pageNumber0&pageSize=10") CommonPageable pageable) { @ApiParam(value = "分页参数", required = false, defaultValue = "current=0&pageSize=10或pageNumber0&pageSize=10") CommonPageable pageable) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
String departmentId = getDepartmentId(reginParams); String departmentId = getDepartmentId(reginParams);
if (queryRequests == null) { if (queryRequests == null) {
...@@ -618,7 +618,7 @@ public class TaskController extends AbstractBaseController{ ...@@ -618,7 +618,7 @@ public class TaskController extends AbstractBaseController{
@RequestMapping(value = "/queryCriteria/init", method = RequestMethod.GET, produces = "application/json;charset=UTF-8") @RequestMapping(value = "/queryCriteria/init", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
public CommonResponse getQueryCriteriaInit(){ public CommonResponse getQueryCriteriaInit(){
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
if (ObjectUtils.isEmpty(reginParams)) { if (ObjectUtils.isEmpty(reginParams)) {
return CommonResponseUtil.failure("用户session过期"); return CommonResponseUtil.failure("用户session过期");
...@@ -660,7 +660,7 @@ public class TaskController extends AbstractBaseController{ ...@@ -660,7 +660,7 @@ public class TaskController extends AbstractBaseController{
public CommonResponse hiddenDangerCountByDate(@ApiParam(value = "年月日(yyyyMMdd)8位", required = true) @PathVariable String dateMonth) { public CommonResponse hiddenDangerCountByDate(@ApiParam(value = "年月日(yyyyMMdd)8位", required = true) @PathVariable String dateMonth) {
HashMap<String,Object> params = new HashMap<String,Object>(); HashMap<String,Object> params = new HashMap<String,Object>();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
if (XJConstant.ROLE_NAME_ADMIN.equals(roleTypeName.toUpperCase()) || if (XJConstant.ROLE_NAME_ADMIN.equals(roleTypeName.toUpperCase()) ||
XJConstant.ROLE_NAME_SUPERADMIN.equals(roleTypeName.toUpperCase())) { XJConstant.ROLE_NAME_SUPERADMIN.equals(roleTypeName.toUpperCase())) {
...@@ -707,7 +707,7 @@ public class TaskController extends AbstractBaseController{ ...@@ -707,7 +707,7 @@ public class TaskController extends AbstractBaseController{
HashMap<String,Object> params = new HashMap<String,Object>(); HashMap<String,Object> resp = new HashMap<String,Object>(); HashMap<String,Object> params = new HashMap<String,Object>(); HashMap<String,Object> resp = new HashMap<String,Object>();
AgencyUserModel user = getUserInfo(); AgencyUserModel user = getUserInfo();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
String departmentId = getDepartmentId(reginParams); String departmentId = getDepartmentId(reginParams);
params.put("orgCode",orgCode); params.put("orgCode",orgCode);
...@@ -740,7 +740,7 @@ public class TaskController extends AbstractBaseController{ ...@@ -740,7 +740,7 @@ public class TaskController extends AbstractBaseController{
@ApiOperation(value = "查询任务统计", notes = "查询任务统计") @ApiOperation(value = "查询任务统计", notes = "查询任务统计")
public CommonResponse getTaskStatistics(@RequestBody(required=true) TaskStatisticsParam param) { public CommonResponse getTaskStatistics(@RequestBody(required=true) TaskStatisticsParam param) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
param.setOrgCode(orgCode); param.setOrgCode(orgCode);
List<TaskStatisticsVo> list = taskService.getTaskStatistics(param); List<TaskStatisticsVo> list = taskService.getTaskStatistics(param);
if (list!=null&&list.size()>0){ if (list!=null&&list.size()>0){
...@@ -793,7 +793,7 @@ public class TaskController extends AbstractBaseController{ ...@@ -793,7 +793,7 @@ public class TaskController extends AbstractBaseController{
@ApiOperation(value = "查询任务统计", notes = "查询任务统计") @ApiOperation(value = "查询任务统计", notes = "查询任务统计")
public void exportStatisticsData(@RequestBody(required=true) TaskStatisticsParam param, HttpServletResponse response) { public void exportStatisticsData(@RequestBody(required=true) TaskStatisticsParam param, HttpServletResponse response) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
param.setOrgCode(orgCode); param.setOrgCode(orgCode);
List<TaskStatisticsVo> list = taskService.getTaskStatistics(param); List<TaskStatisticsVo> list = taskService.getTaskStatistics(param);
if (list!=null&&list.size()>0){ if (list!=null&&list.size()>0){
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/TaskReportController.java
View file @ d6d191a6
...@@ -48,7 +48,7 @@ public class TaskReportController extends AbstractBaseController{ ...@@ -48,7 +48,7 @@ public class TaskReportController extends AbstractBaseController{
startDate += " 00:00:00"; startDate += " 00:00:00";
endDate += " 23:59:59"; endDate += " 23:59:59";
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
return CommonResponseUtil.success(taskReportService.queryForTaskReport(getToken(),getProduct(),getAppKey(),statistical,startDate,endDate,planId,routeId,orgCode)); return CommonResponseUtil.success(taskReportService.queryForTaskReport(getToken(),getProduct(),getAppKey(),statistical,startDate,endDate,planId,routeId,orgCode));
} }
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/UserController.java
View file @ d6d191a6
...@@ -186,7 +186,7 @@ public class UserController extends AbstractBaseController { ...@@ -186,7 +186,7 @@ public class UserController extends AbstractBaseController {
CompanyModel companyModel = remoteSecurityService.listUserByCompanyId1(getToken(), getProduct(), getAppKey(), reginParams.getCompany().getSequenceNbr().toString()); CompanyModel companyModel = remoteSecurityService.listUserByCompanyId1(getToken(), getProduct(), getAppKey(), reginParams.getCompany().getSequenceNbr().toString());
List children = (List) companyModel.getChildren(); List children = (List) companyModel.getChildren();
List<DepartmentUserTreeWebVo> list = Lists.newArrayList(); List<DepartmentUserTreeWebVo> list = Lists.newArrayList();
String loginOrgCode= getLoginOrgCode(reginParams); String loginOrgCode= getOrgCode(reginParams);
for (int i = 0; i < children.size(); i++) { for (int i = 0; i < children.size(); i++) {
Map<String, Object> map = (LinkedHashMap) children.get(i); Map<String, Object> map = (LinkedHashMap) children.get(i);
JSONObject json = JSON.parseObject(JSON.toJSONString(map)); JSONObject json = JSON.parseObject(JSON.toJSONString(map));
...@@ -302,7 +302,7 @@ public class UserController extends AbstractBaseController { ...@@ -302,7 +302,7 @@ public class UserController extends AbstractBaseController {
public CommonResponse queryAllUser() { public CommonResponse queryAllUser() {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
List<AgencyUserModel> userModels = remoteSecurityService.listUserByOrgCode(getToken(), getProduct(), getAppKey(), loginOrgCode); List<AgencyUserModel> userModels = remoteSecurityService.listUserByOrgCode(getToken(), getProduct(), getAppKey(), loginOrgCode);
List<LinkedHashMap<String, Object>> userList = paraseData(userModels, null); List<LinkedHashMap<String, Object>> userList = paraseData(userModels, null);
return CommonResponseUtil.success(userList); return CommonResponseUtil.success(userList);
...@@ -747,7 +747,7 @@ public class UserController extends AbstractBaseController { ...@@ -747,7 +747,7 @@ public class UserController extends AbstractBaseController {
public CommonResponse saveCurCompany(@ApiParam(value = "当前登陆用户所选单位机构编号", required = true) @RequestBody ReginParams reginParams) { public CommonResponse saveCurCompany(@ApiParam(value = "当前登陆用户所选单位机构编号", required = true) @RequestBody ReginParams reginParams) {
try { try {
AgencyUserModel user = getUserInfo(); AgencyUserModel user = getUserInfo();
saveSelectedOrgInfo(reginParams); // saveSelectedOrgInfo(reginParams);
return CommonResponseUtil.success(buildCurCompany(getToken(),getProduct(),getAppKey(),reginParams, user)); return CommonResponseUtil.success(buildCurCompany(getToken(),getProduct(),getAppKey(),reginParams, user));
} catch (Exception e) { } catch (Exception e) {
logger.error("保存登陆用户选择公司信息异常", e); logger.error("保存登陆用户选择公司信息异常", e);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/AbstractBaseController.java
View file @ d6d191a6
...@@ -47,151 +47,151 @@ public abstract class AbstractBaseController extends BaseController{ ...@@ -47,151 +47,151 @@ public abstract class AbstractBaseController extends BaseController{
/*@Autowired /*@Autowired
private RemoteSecurityServer remoteSecurityServer; private RemoteSecurityServer remoteSecurityServer;
*/ */
@Autowired // @Autowired
protected HttpServletRequest request; // protected HttpServletRequest request;
//
/** // /**
* 成功返回状态 // * 成功返回状态
*/ // */
protected static final String SUCCESS = "SUCCESS"; // protected static final String SUCCESS = "SUCCESS";
//
/** // /**
* 失败返回状态 // * 失败返回状态
*/ // */
protected static final String FAILED = "FAILED"; // protected static final String FAILED = "FAILED";
//
/** // /**
* 默认页大小 // * 默认页大小
*/ // */
protected static final int DEFAULT_PAGE_SIZE = 10; // protected static final int DEFAULT_PAGE_SIZE = 10;
//
@Autowired // @Autowired
private RedisTemplate<String, String> redisTemplate; // private RedisTemplate<String, String> redisTemplate;
//
//
protected String getToken() { // protected String getToken() {
String authToken = request.getHeader("token"); // String authToken = request.getHeader("token");
if (authToken == null) { // if (authToken == null) {
authToken = request.getHeader("X-Access-Token"); // authToken = request.getHeader("X-Access-Token");
} // }
return authToken; // return authToken;
} // }
//
protected String getProduct() { // protected String getProduct() {
String authToken = request.getHeader("product"); // String authToken = request.getHeader("product");
if (authToken == null) { // if (authToken == null) {
authToken = request.getParameter("product"); // authToken = request.getParameter("product");
} // }
return authToken; // return authToken;
} // }
//
//
protected String getAppKey() { // protected String getAppKey() {
String authToken = request.getHeader("appKey"); // String authToken = request.getHeader("appKey");
if (authToken == null) { // if (authToken == null) {
authToken = request.getParameter("appKey"); // authToken = request.getParameter("appKey");
} // }
return authToken; // return authToken;
} // }
/** // /**
* // *
* <pre> // * <pre>
* 判断当前用户角色级别：true:主管/false:装备管理员 // * 判断当前用户角色级别：true:主管/false:装备管理员
* </pre> // * </pre>
* // *
* @return // * @return
*/ // */
/*protected boolean isDirector() { // /*protected boolean isDirector() {
if (getUserInfo() == null) { // if (getUserInfo() == null) {
return false; // return false;
} // }
return getUserInfo().getRole().getRoleType() != 3; // return getUserInfo().getRole().getRoleType() != 3;
}*/ // }*/
//
/** // /**
* 获取用户角色id // * 获取用户角色id
* // *
* @return // * @return
*/ // */
/*protected String getRoleId() { // /*protected String getRoleId() {
if (getUserInfo() == null) { // if (getUserInfo() == null) {
return ""; // return "";
} // }
return getUserInfo().getRole().getRoleType().toString(); // return getUserInfo().getRole().getRoleType().toString();
}*/ // }*/
//
/** // /**
* 当前登录用户信息 // * 当前登录用户信息
*/ // */
/*protected User getUserInfo() { // /*protected User getUserInfo() {
if (getToken() == null) { // if (getToken() == null) {
return null; // return null;
} // }
return remoteSecurityServer.loginAuthentication(getToken()); // return remoteSecurityServer.loginAuthentication(getToken());
}*/ // }*/
//
protected AgencyUserModel getUserInfo() { // protected AgencyUserModel getUserInfo() {
AgencyUserModel userModel=null; // AgencyUserModel userModel=null;
if(getToken()!=null){ // if(getToken()!=null){
RequestContext.setToken(getToken()); // RequestContext.setToken(getToken());
RequestContext.setProduct(getProduct()); // RequestContext.setProduct(getProduct());
RequestContext.setAppKey(getAppKey()); // RequestContext.setAppKey(getAppKey());
//
FeignClientResult feignClientResult; // FeignClientResult feignClientResult;
try { // try {
feignClientResult = Privilege.agencyUserClient.getme(); // feignClientResult = Privilege.agencyUserClient.getme();
userModel = (AgencyUserModel) feignClientResult.getResult(); // userModel = (AgencyUserModel) feignClientResult.getResult();
//
} catch (InnerInvokException e) { // } catch (InnerInvokException e) {
e.printStackTrace(); // e.printStackTrace();
} // }
//
} // }
return userModel; // return userModel;
//
// return CurrentAuthentication.getAuthenticatedUserThreadLocal(); // // return CurrentAuthentication.getAuthenticatedUserThreadLocal();
} // }
//
protected String getCompanyId(ReginParams reginParams) { // protected String getCompanyId(ReginParams reginParams) {
if (reginParams == null) { // if (reginParams == null) {
return null; // return null;
} // }
if (reginParams.getCompany() != null) { // if (reginParams.getCompany() != null) {
return reginParams.getCompany().getSequenceNbr().toString(); // return reginParams.getCompany().getSequenceNbr().toString();
} // }
return null; // return null;
} // }
//
protected String getDepartmentName(ReginParams reginParams) { // protected String getDepartmentName(ReginParams reginParams) {
if (reginParams == null) { // if (reginParams == null) {
return null; // return null;
} // }
if (reginParams.getDepartment() != null) { // if (reginParams.getDepartment() != null) {
return reginParams.getDepartment().getDepartmentName(); // return reginParams.getDepartment().getDepartmentName();
} // }
return null; // return null;
} // }
//
protected String getUserId() { // protected String getUserId() {
String userId = null; // String userId = null;
if (getUserInfo() != null) { // if (getUserInfo() != null) {
userId = getUserInfo().getUserId(); // userId = getUserInfo().getUserId();
} // }
return userId; // return userId;
} // }
//
/** // /**
* 获取当前用户所属公司名称 // * 获取当前用户所属公司名称
* // *
* @return // * @return
*/ // */
protected String getCurrentCompanyNameOfUser() { // protected String getCurrentCompanyNameOfUser() {
if (getUserInfo() == null) { // if (getUserInfo() == null) {
return ""; // return "";
} // }
//
return getSelectedOrgInfo().getCompany().getCompanyName(); // return getSelectedOrgInfo().getCompany().getCompanyName();
} // }
/*protected LoginUserParam getLoginUserParam() { /*protected LoginUserParam getLoginUserParam() {
LoginUserParam param = CurUserCompanyCache.getInstance().getCurCompany(getUserId(), getToken()); LoginUserParam param = CurUserCompanyCache.getInstance().getCurCompany(getUserId(), getToken());
...@@ -200,70 +200,70 @@ public abstract class AbstractBaseController extends BaseController{ ...@@ -200,70 +200,70 @@ public abstract class AbstractBaseController extends BaseController{
}*/ }*/
private String buildKey(String userId, String token) { // private String buildKey(String userId, String token) {
//return "region_" + userId + "_" + token.substring(0, token.indexOf('_', 1)); // //return "region_" + userId + "_" + token.substring(0, token.indexOf('_', 1));
return "region_" + userId + "_" + token; // return "region_" + userId + "_" + token;
//
} // }
protected void saveSelectedOrgInfo(ReginParams reginParams) { // protected void saveSelectedOrgInfo(ReginParams reginParams) {
redisTemplate.opsForValue().set(buildKey(getUserId(), getToken()), JSONObject.toJSONString(reginParams)); // redisTemplate.opsForValue().set(buildKey(getUserId(), getToken()), JSONObject.toJSONString(reginParams));
} // }
protected ReginParams getSelectedOrgInfo() { // protected ReginParams getSelectedOrgInfo() {
return JSON.parseObject(redisTemplate.opsForValue().get(buildKey(getUserId(), getToken())), ReginParams.class); // return JSON.parseObject(redisTemplate.opsForValue().get(buildKey(getUserId(), getToken())), ReginParams.class);
} // }
/** /**
* 获取请求的cookies * 获取请求的cookies
* *
* @return * @return
*/ */
protected HashMap<String, String> getCookInfoMap() { // protected HashMap<String, String> getCookInfoMap() {
HashMap<String, String> map = new HashMap<String, String>(); // HashMap<String, String> map = new HashMap<String, String>();
Cookie[] cookies = request.getCookies(); // Cookie[] cookies = request.getCookies();
if (cookies != null) { // if (cookies != null) {
for (Cookie ck : cookies) { // for (Cookie ck : cookies) {
map.put(ck.getName(), ck.getValue()); // map.put(ck.getName(), ck.getValue());
} // }
} // }
return map; // return map;
} // }
protected String getCompanyName(ReginParams reginParams) { // protected String getCompanyName(ReginParams reginParams) {
if (reginParams == null) { // if (reginParams == null) {
return null; // return null;
}
if (reginParams.getCompany() != null) {
return reginParams.getCompany().getCompanyName();
}
return null;
}
protected String getLoginOrgCode(ReginParams reginParams) {
if (reginParams == null) {
return null;
}
// if (reginParams.getDepartment() != null) {
// return reginParams.getDepartment().getDeptOrgCode();
// } // }
if (reginParams.getCompany() != null) { // if (reginParams.getCompany() != null) {
return reginParams.getCompany().getOrgCode(); // return reginParams.getCompany().getCompanyName();
} // }
return null; // return null;
} // }
//
// protected String getLoginOrgCode(ReginParams reginParams) {
/** // if (reginParams == null) {
* 获取公司orgcode // return null;
* // }
* @return //// if (reginParams.getDepartment() != null) {
*//* //// return reginParams.getDepartment().getDeptOrgCode();
protected String getOrgCode() { //// }
if (getUserInfo() == null) { // if (reginParams.getCompany() != null) {
return ""; // return reginParams.getCompany().getOrgCode();
} // }
return getUserInfo().getCompanys().getCompCode(); // return null;
}*/ // }
//
//
// /**
// * 获取公司orgcode
// *
// * @return
// *//*
// protected String getOrgCode() {
// if (getUserInfo() == null) {
// return "";
// }
// return getUserInfo().getCompanys().getCompCode();
// }*/
//
/** /**
* 生成查询条件 * 生成查询条件
* *
...@@ -331,90 +331,90 @@ public abstract class AbstractBaseController extends BaseController{ ...@@ -331,90 +331,90 @@ public abstract class AbstractBaseController extends BaseController{
return daoCriterias; return daoCriterias;
} }
/* public List<DaoCriteria> buildDaoCriterias(List<CommonRequest> queryRequests, Boolean flag) { ///* public List<DaoCriteria> buildDaoCriterias(List<CommonRequest> queryRequests, Boolean flag) {
List<DaoCriteria> daoCriterias = new ArrayList<DaoCriteria>(); // List<DaoCriteria> daoCriterias = new ArrayList<DaoCriteria>();
String orgCode = null; // String orgCode = null;
if (queryRequests != null && !queryRequests.isEmpty()) { // if (queryRequests != null && !queryRequests.isEmpty()) {
for (CommonRequest query : queryRequests) { // for (CommonRequest query : queryRequests) {
DaoCriteria criteria = new DaoCriteria(); // DaoCriteria criteria = new DaoCriteria();
if (StringUtil.isNotEmpty(query.getValue())) { // if (StringUtil.isNotEmpty(query.getValue())) {
if (query.getValue().toString().equals("-0")) { // if (query.getValue().toString().equals("-0")) {
criteria.setPropertyName(query.getName()); // criteria.setPropertyName(query.getName());
criteria.setOperator(QueryOperatorEnum.IS.getName()); // criteria.setOperator(QueryOperatorEnum.IS.getName());
criteria.setValue(null); // criteria.setValue(null);
} else { // } else {
criteria.setPropertyName(query.getName()); // criteria.setPropertyName(query.getName());
String column = criteria.getPropertyName(); // String column = criteria.getPropertyName();
if (!(query.getValue() instanceof Collection<?>) // if (!(query.getValue() instanceof Collection<?>)
&& column.substring(column.length() - 2, column.length()).toUpperCase().equals("ID")) { // && column.substring(column.length() - 2, column.length()).toUpperCase().equals("ID")) {
criteria.setValue(Long.valueOf(query.getValue().toString())); // criteria.setValue(Long.valueOf(query.getValue().toString()));
} else { // } else {
criteria.setValue(query.getValue()); // criteria.setValue(query.getValue());
} // }
//
String operator = query.getType(); // String operator = query.getType();
if (!StringUtil.isNotEmpty(operator)) { // if (!StringUtil.isNotEmpty(operator)) {
criteria.setOperator(QueryOperatorEnum.EQUAL.getName()); // criteria.setOperator(QueryOperatorEnum.EQUAL.getName());
} else if (operator.equals(QueryOperatorEnum.LIKE.getName())) { // } else if (operator.equals(QueryOperatorEnum.LIKE.getName())) {
setLikeCriteria(criteria, query); // setLikeCriteria(criteria, query);
} else if (operator.equals(QueryOperatorEnum.BIGGER_EQUAL.getName())) { // } else if (operator.equals(QueryOperatorEnum.BIGGER_EQUAL.getName())) {
criteria.setOperator(QueryOperatorEnum.getEnum(operator).getName()); // criteria.setOperator(QueryOperatorEnum.getEnum(operator).getName());
} else if (operator.equals(QueryOperatorEnum.LESS_EQUAL.getName())) { // } else if (operator.equals(QueryOperatorEnum.LESS_EQUAL.getName())) {
criteria.setOperator(QueryOperatorEnum.getEnum(operator).getName()); // criteria.setOperator(QueryOperatorEnum.getEnum(operator).getName());
} else if (QueryOperatorEnum.getEnum(operator) != null) { // } else if (QueryOperatorEnum.getEnum(operator) != null) {
criteria.setOperator(QueryOperatorEnum.getEnum(operator).getName()); // criteria.setOperator(QueryOperatorEnum.getEnum(operator).getName());
} else { // } else {
criteria.setOperator(operator); // criteria.setOperator(operator);
} // }
} // }
daoCriterias.add(criteria); // daoCriterias.add(criteria);
} // }
} // }
} // }
if (flag) { // if (flag) {
ReginParams param = getSelectedOrgInfo(); // ReginParams param = getSelectedOrgInfo();
if (param == null) { // if (param == null) {
throw new YeeException("非法请求"); // throw new YeeException("非法请求");
} // }
String roleTypeName = param.getRole().getRoleName(); // String roleTypeName = param.getRole().getRoleName();
if (XJConstant.ROLE_NAME_SUPERADMIN.equals(roleTypeName) // if (XJConstant.ROLE_NAME_SUPERADMIN.equals(roleTypeName)
|| XJConstant.ROLE_NAME_ADMIN.equals(roleTypeName)) { // || XJConstant.ROLE_NAME_ADMIN.equals(roleTypeName)) {
orgCode = param.getCompany().getOrgCode(); // orgCode = param.getCompany().getOrgCode();
daoCriterias = buildOrgDaoCriteriaInChildren(daoCriterias, orgCode); // daoCriterias = buildOrgDaoCriteriaInChildren(daoCriterias, orgCode);
} else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName)) { // } else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName)) {
orgCode = param.getUserOrgCode(); // orgCode = param.getUserOrgCode();
daoCriterias = buildOrgDaoCriteriaOutChildren(daoCriterias, orgCode); // daoCriterias = buildOrgDaoCriteriaOutChildren(daoCriterias, orgCode);
} else if (XJConstant.ROLE_NAME_PERSON.equals(roleTypeName)) { // } else if (XJConstant.ROLE_NAME_PERSON.equals(roleTypeName)) {
DaoCriteria compDaoCriteria = new DaoCriteria(); // DaoCriteria compDaoCriteria = new DaoCriteria();
compDaoCriteria.setPropertyName("userId"); // compDaoCriteria.setPropertyName("userId");
compDaoCriteria.setOperator(QueryOperatorEnum.EQUAL.getName()); // compDaoCriteria.setOperator(QueryOperatorEnum.EQUAL.getName());
compDaoCriteria.setValue(param.); // compDaoCriteria.setValue(param.);
daoCriterias.add(compDaoCriteria); // daoCriterias.add(compDaoCriteria);
} // }
//
} // }
return daoCriterias; // return daoCriterias;
//
}*/ // }*/
protected String getRoleTypeName(ReginParams reginParams) { // protected String getRoleTypeName(ReginParams reginParams) {
if (reginParams == null) { // if (reginParams == null) {
return null; // return null;
} // }
if (reginParams.getRole() != null) { // if (reginParams.getRole() != null) {
return reginParams.getRole().getRoleType(); // return reginParams.getRole().getRoleType();
} // }
return null; // return null;
} // }
protected String getDepartmentId(ReginParams reginParams) { // protected String getDepartmentId(ReginParams reginParams) {
if (reginParams == null) { // if (reginParams == null) {
return null; // return null;
} // }
if (reginParams.getDepartment() != null) { // if (reginParams.getDepartment() != null) {
return reginParams.getDepartment().getSequenceNbr().toString(); // return reginParams.getDepartment().getSequenceNbr().toString();
} // }
return null; // return null;
} // }
//
/** /**
* 构建数据权限 返回字段：orgCode(机构)，expression（表达式） * 构建数据权限 返回字段：orgCode(机构)，expression（表达式）
* *
...@@ -434,30 +434,30 @@ public abstract class AbstractBaseController extends BaseController{ ...@@ -434,30 +434,30 @@ public abstract class AbstractBaseController extends BaseController{
} }
return paramMap; return paramMap;
} }
/*public HashMap<String, Object> buildMybatisDaoCriterias() { // /*public HashMap<String, Object> buildMybatisDaoCriterias() {
String orgCode = null; // String orgCode = null;
LoginUserParam param = getLoginUserParam(); // LoginUserParam param = getLoginUserParam();
if (param == null) { // if (param == null) {
throw new YeeException("非法请求"); // throw new YeeException("非法请求");
} // }
HashMap<String, Object> paramMap = new HashMap<String, Object>(); // HashMap<String, Object> paramMap = new HashMap<String, Object>();
String roleTypeName = param.getRoleTypeName(); // String roleTypeName = param.getRoleTypeName();
//
if (XJConstant.ROLE_NAME_SUPERADMIN.equals(roleTypeName) || XJConstant.ROLE_NAME_ADMIN.equals(roleTypeName)) { // if (XJConstant.ROLE_NAME_SUPERADMIN.equals(roleTypeName) || XJConstant.ROLE_NAME_ADMIN.equals(roleTypeName)) {
orgCode = param.getLoginOrgCode(); // orgCode = param.getLoginOrgCode();
paramMap.put("orgCode", orgCode + "%"); // paramMap.put("orgCode", orgCode + "%");
paramMap.put("roleFlag", XJConstant.ADMIN_FLAG); // paramMap.put("roleFlag", XJConstant.ADMIN_FLAG);
} else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName)) { // } else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName)) {
orgCode = param.getUserOrgCode(); // orgCode = param.getUserOrgCode();
paramMap.put("orgCode", orgCode + "%"); // paramMap.put("orgCode", orgCode + "%");
paramMap.put("roleFlag", XJConstant.DEPART_FLAG); // paramMap.put("roleFlag", XJConstant.DEPART_FLAG);
} else if (XJConstant.ROLE_NAME_PERSON.equals(roleTypeName)) { // } else if (XJConstant.ROLE_NAME_PERSON.equals(roleTypeName)) {
paramMap.put("userId", param.getUserId()); // paramMap.put("userId", param.getUserId());
paramMap.put("roleFlag", XJConstant.PERSON_FLAG); // paramMap.put("roleFlag", XJConstant.PERSON_FLAG);
} // }
return paramMap; // return paramMap;
//
}*/ // }*/
public HashMap<String, Object> buildMybatisCriterias(String orgCode, String roleTypeName) { public HashMap<String, Object> buildMybatisCriterias(String orgCode, String roleTypeName) {
HashMap<String, Object> paramMap = new HashMap<>(); HashMap<String, Object> paramMap = new HashMap<>();
if(StringUtil.isNotEmpty(roleTypeName)){ if(StringUtil.isNotEmpty(roleTypeName)){
...@@ -478,48 +478,48 @@ public abstract class AbstractBaseController extends BaseController{ ...@@ -478,48 +478,48 @@ public abstract class AbstractBaseController extends BaseController{
return paramMap; return paramMap;
} }
//
/*public HashMap<String, Object> buildMybatisCriterias() { // /*public HashMap<String, Object> buildMybatisCriterias() {
String orgCode = null; // String orgCode = null;
LoginUserParam param = getLoginUserParam(); // LoginUserParam param = getLoginUserParam();
if (param == null) { // if (param == null) {
throw new YeeException("非法请求"); // throw new YeeException("非法请求");
} // }
HashMap<String, Object> paramMap = new HashMap<String, Object>(); // HashMap<String, Object> paramMap = new HashMap<String, Object>();
String roleTypeName = param.getRoleTypeName(); // String roleTypeName = param.getRoleTypeName();
//
if (XJConstant.ROLE_NAME_SUPERADMIN.equals(roleTypeName) || XJConstant.ROLE_NAME_ADMIN.equals(roleTypeName)) { // if (XJConstant.ROLE_NAME_SUPERADMIN.equals(roleTypeName) || XJConstant.ROLE_NAME_ADMIN.equals(roleTypeName)) {
orgCode = param.getLoginOrgCode(); // orgCode = param.getLoginOrgCode();
paramMap.put("orgCode", orgCode); // paramMap.put("orgCode", orgCode);
paramMap.put("roleFlag", XJConstant.ADMIN_FLAG); // paramMap.put("roleFlag", XJConstant.ADMIN_FLAG);
} else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName)) { // } else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName)) {
orgCode = param.getUserOrgCode(); // orgCode = param.getUserOrgCode();
paramMap.put("orgCode", orgCode); // paramMap.put("orgCode", orgCode);
paramMap.put("roleFlag", XJConstant.DEPART_FLAG); // paramMap.put("roleFlag", XJConstant.DEPART_FLAG);
} else if (XJConstant.ROLE_NAME_PERSON.equals(roleTypeName)) { // } else if (XJConstant.ROLE_NAME_PERSON.equals(roleTypeName)) {
paramMap.put("userId", param.getUserId()); // paramMap.put("userId", param.getUserId());
paramMap.put("roleFlag", XJConstant.PERSON_FLAG); // paramMap.put("roleFlag", XJConstant.PERSON_FLAG);
} // }
return paramMap; // return paramMap;
//
}*/ // }*/
//
/** // /**
* 暂时未用到 // * 暂时未用到
* // *
* @return // * @return
*/ // */
/* public List<DaoCriteria> buildDaoCriteriasNoParam() { ///* public List<DaoCriteria> buildDaoCriteriasNoParam() {
List<DaoCriteria> daoCriterias = new ArrayList<DaoCriteria>(); // List<DaoCriteria> daoCriterias = new ArrayList<DaoCriteria>();
String orgCode = getOrgCode(); // String orgCode = getOrgCode();
if (isDirector()) { // if (isDirector()) {
daoCriterias = buildOrgDaoCriteriaInChildren(daoCriterias, orgCode); // daoCriterias = buildOrgDaoCriteriaInChildren(daoCriterias, orgCode);
} else { // } else {
daoCriterias = buildOrgDaoCriteriaOutChildren(daoCriterias, orgCode); // daoCriterias = buildOrgDaoCriteriaOutChildren(daoCriterias, orgCode);
} // }
return daoCriterias; // return daoCriterias;
}*/ // }*/
/** /**
* *
* <pre> * <pre>
...@@ -548,29 +548,29 @@ public abstract class AbstractBaseController extends BaseController{ ...@@ -548,29 +548,29 @@ public abstract class AbstractBaseController extends BaseController{
return daoCriterias; return daoCriterias;
} }
/** // /**
* // *
* <pre> // * <pre>
* 生成通过当前用户所属组织机构（不包含子机构）过滤的查询条件 // * 生成通过当前用户所属组织机构（不包含子机构）过滤的查询条件
* </pre> // * </pre>
* // *
* @param daoCriterias // * @param daoCriterias
* 查询条件集合 // * 查询条件集合
* @param orgCode // * @param orgCode
* @return // * @return
*/ // */
public List<DaoCriteria> buildOrgDaoCriteriaOutChildren(List<DaoCriteria> daoCriterias, String orgCode) { // public List<DaoCriteria> buildOrgDaoCriteriaOutChildren(List<DaoCriteria> daoCriterias, String orgCode) {
/** // /**
* 当前用户所属公司 // * 当前用户所属公司
*/ // */
//
DaoCriteria compDaoCriteria = new DaoCriteria(); // DaoCriteria compDaoCriteria = new DaoCriteria();
compDaoCriteria.setPropertyName("orgCode"); // compDaoCriteria.setPropertyName("orgCode");
compDaoCriteria.setOperator(QueryOperatorEnum.EQUAL.getName()); // compDaoCriteria.setOperator(QueryOperatorEnum.EQUAL.getName());
compDaoCriteria.setValue(orgCode); // compDaoCriteria.setValue(orgCode);
daoCriterias.add(compDaoCriteria); // daoCriterias.add(compDaoCriteria);
return daoCriterias; // return daoCriterias;
} // }
/** /**
* 对like查询语句的内容进行特殊字符转义 * 对like查询语句的内容进行特殊字符转义
...@@ -600,43 +600,43 @@ public abstract class AbstractBaseController extends BaseController{ ...@@ -600,43 +600,43 @@ public abstract class AbstractBaseController extends BaseController{
} }
} }
/** // /**
* <pre> // * <pre>
* 提取错误异常中的错误消息 // * 提取错误异常中的错误消息
* </pre> // * </pre>
* // *
* <p> // * <p>
* 当实体类中对属相注解了以下类似的注解，需要用try.catch语句捕获异常，使用 #getErrorMessage(Exception) // * 当实体类中对属相注解了以下类似的注解，需要用try.catch语句捕获异常，使用 #getErrorMessage(Exception)
* 提取出异常信息NotNull(message = "属性不能为空！") // * 提取出异常信息NotNull(message = "属性不能为空！")
* </p> // * </p>
* // *
* @see {@code NotBlank} ... NotNull、NotEmpty... // * @see {@code NotBlank} ... NotNull、NotEmpty...
* @see {@code Valid} // * @see {@code Valid}
* // *
* @param e // * @param e
* @return // * @return
*/ // */
public String getErrorMessage(Exception e) { // public String getErrorMessage(Exception e) {
StringBuilder message = new StringBuilder(); // StringBuilder message = new StringBuilder();
if (e instanceof TransactionSystemException) { // if (e instanceof TransactionSystemException) {
TransactionSystemException exception = (TransactionSystemException) e; // TransactionSystemException exception = (TransactionSystemException) e;
if (exception.getRootCause() instanceof ConstraintViolationException) { // if (exception.getRootCause() instanceof ConstraintViolationException) {
ConstraintViolationException root = (ConstraintViolationException) exception.getRootCause(); // ConstraintViolationException root = (ConstraintViolationException) exception.getRootCause();
root.getConstraintViolations().forEach(constraintViolation -> { // root.getConstraintViolations().forEach(constraintViolation -> {
message.append(constraintViolation.getMessageTemplate()); // message.append(constraintViolation.getMessageTemplate());
}); // });
} else { // } else {
message.append(e.getMessage()); // message.append(e.getMessage());
} // }
} else if (e instanceof ConstraintViolationException) { // } else if (e instanceof ConstraintViolationException) {
((ConstraintViolationException) e).getConstraintViolations() // ((ConstraintViolationException) e).getConstraintViolations()
.forEach(constraintViolation -> message.append(constraintViolation.getMessageTemplate())); // .forEach(constraintViolation -> message.append(constraintViolation.getMessageTemplate()));
} else { // } else {
message.append("操作异常！"); // message.append("操作异常！");
} // }
return message.toString(); // return message.toString();
} // }
//
public static <T> List<Map<String, Object>> objectsToMaps(List<T> objList) { public static <T> List<Map<String, Object>> objectsToMaps(List<T> objList) {
List<Map<String, Object>> list = Lists.newArrayList(); List<Map<String, Object>> list = Lists.newArrayList();
if (objList != null && objList.size() > 0) { if (objList != null && objList.size() > 0) {
...@@ -667,4 +667,6 @@ public abstract class AbstractBaseController extends BaseController{ ...@@ -667,4 +667,6 @@ public abstract class AbstractBaseController extends BaseController{
} }
return map; return map;
} }
} }
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/CatalogTreeController.java
View file @ d6d191a6
...@@ -47,7 +47,7 @@ public class CatalogTreeController extends AbstractBaseController { ...@@ -47,7 +47,7 @@ public class CatalogTreeController extends AbstractBaseController {
@RequestMapping(value = "/getCatalogTree", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/getCatalogTree", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse getCatalogTree() { public CommonResponse getCatalogTree() {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
List<Object> list = catalogTreeService.getCatalogTree(orgCode); List<Object> list = catalogTreeService.getCatalogTree(orgCode);
return CommonResponseUtil.success(list); return CommonResponseUtil.success(list);
} }
...@@ -62,7 +62,7 @@ public class CatalogTreeController extends AbstractBaseController { ...@@ -62,7 +62,7 @@ public class CatalogTreeController extends AbstractBaseController {
@RequestMapping(value = "/catalogList", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/catalogList", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse getCatalogList() { public CommonResponse getCatalogList() {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
List<CatalogTree> list = catalogTreeService.getCatalogList(orgCode); List<CatalogTree> list = catalogTreeService.getCatalogList(orgCode);
return CommonResponseUtil.success(list); return CommonResponseUtil.success(list);
} }
...@@ -79,7 +79,7 @@ public class CatalogTreeController extends AbstractBaseController { ...@@ -79,7 +79,7 @@ public class CatalogTreeController extends AbstractBaseController {
try { try {
String userId = getUserId(); String userId = getUserId();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
HashMap<String,Object> map = new HashMap<String,Object>(); HashMap<String,Object> map = new HashMap<String,Object>();
map.put("org_code", orgCode); map.put("org_code", orgCode);
map.put("user_id", userId); map.put("user_id", userId);
...@@ -150,7 +150,7 @@ public class CatalogTreeController extends AbstractBaseController { ...@@ -150,7 +150,7 @@ public class CatalogTreeController extends AbstractBaseController {
public CommonResponse qryCatalogTreeInfoPage(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests, public CommonResponse qryCatalogTreeInfoPage(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
@ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) { @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
HashMap<String,Object> paramMap = new HashMap<String,Object>(); HashMap<String,Object> paramMap = new HashMap<String,Object>();
paramMap.put("orgCode",orgCode); paramMap.put("orgCode",orgCode);
CatalogTreePageParam param = CatalogTreePageParamUtil.fillPageParam(queryRequests, commonPageable, paramMap); CatalogTreePageParam param = CatalogTreePageParamUtil.fillPageParam(queryRequests, commonPageable, paramMap);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/CheckController.java
View file @ d6d191a6
...@@ -126,7 +126,7 @@ public class CheckController extends AbstractBaseController { ...@@ -126,7 +126,7 @@ public class CheckController extends AbstractBaseController {
@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests, @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
@ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) { @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
HashMap<String, Object> paramMap = buildMybatisCriterias(orgCode, roleTypeName); HashMap<String, Object> paramMap = buildMybatisCriterias(orgCode, roleTypeName);
...@@ -151,7 +151,7 @@ public class CheckController extends AbstractBaseController { ...@@ -151,7 +151,7 @@ public class CheckController extends AbstractBaseController {
@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests, @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
HttpServletResponse response) { HttpServletResponse response) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
HashMap<String, Object> paramMap = buildMybatisCriterias(orgCode, roleTypeName); HashMap<String, Object> paramMap = buildMybatisCriterias(orgCode, roleTypeName);
CheckInfoPageParam param = CheckPageParamUtil.fillCheckInfoParam(queryRequests, null, paramMap); CheckInfoPageParam param = CheckPageParamUtil.fillCheckInfoParam(queryRequests, null, paramMap);
...@@ -188,7 +188,7 @@ public class CheckController extends AbstractBaseController { ...@@ -188,7 +188,7 @@ public class CheckController extends AbstractBaseController {
@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests, @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
HttpServletResponse response) { HttpServletResponse response) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
HashMap<String, Object> paramMap = buildMybatisCriterias(orgCode, roleTypeName); HashMap<String, Object> paramMap = buildMybatisCriterias(orgCode, roleTypeName);
CheckInfoPageParam param = CheckPageParamUtil.fillCheckInfoParam(queryRequests, null, paramMap); CheckInfoPageParam param = CheckPageParamUtil.fillCheckInfoParam(queryRequests, null, paramMap);
...@@ -258,7 +258,7 @@ public class CheckController extends AbstractBaseController { ...@@ -258,7 +258,7 @@ public class CheckController extends AbstractBaseController {
int count = checkService.checkHasRecord(requestParam); int count = checkService.checkHasRecord(requestParam);
if (count < 1 || requestParam.getPlanTaskId() < 1) { if (count < 1 || requestParam.getPlanTaskId() < 1) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
String departmentId = getDepartmentId(reginParams); String departmentId = getDepartmentId(reginParams);
requestParam.setOrgCode(orgCode); requestParam.setOrgCode(orgCode);
requestParam.setUserId(getUserId()); requestParam.setUserId(getUserId());
...@@ -330,8 +330,8 @@ public class CheckController extends AbstractBaseController { ...@@ -330,8 +330,8 @@ public class CheckController extends AbstractBaseController {
// // LoginUserParam loginParam = CurUserCompanyCache.getInstance().getCurCompany(getUserId(), getToken()); // // LoginUserParam loginParam = CurUserCompanyCache.getInstance().getCurCompany(getUserId(), getToken());
// SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd"); // SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
// ReginParams reginParams = getSelectedOrgInfo(); // ReginParams reginParams = getSelectedOrgInfo();
// String loginOrgCode = getLoginOrgCode(reginParams); // String loginOrgCode = getOrgCode(reginParams);
// //String loginOrgCode = loginParam.getLoginOrgCode(); // //String loginOrgCode = loginParam.getOrgCode();
// String[] companys = loginOrgCode.split("\\*"); // String[] companys = loginOrgCode.split("\\*");
// //
// String path = XJConstant.UPLOAD_ROOT_PATH + File.separator + companys[companys.length - 1] + File.separator // String path = XJConstant.UPLOAD_ROOT_PATH + File.separator + companys[companys.length - 1] + File.separator
...@@ -462,7 +462,7 @@ public class CheckController extends AbstractBaseController { ...@@ -462,7 +462,7 @@ public class CheckController extends AbstractBaseController {
@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) { @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) {
try { try {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
List<DaoCriteria> daoCriterias = buildDaoCriterias(queryRequests, true, loginOrgCode, roleTypeName); List<DaoCriteria> daoCriterias = buildDaoCriterias(queryRequests, true, loginOrgCode, roleTypeName);
...@@ -483,7 +483,7 @@ public class CheckController extends AbstractBaseController { ...@@ -483,7 +483,7 @@ public class CheckController extends AbstractBaseController {
public CommonResponse queryRecordByPointId( public CommonResponse queryRecordByPointId(
@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) { @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
String departmentId = getDepartmentId(reginParams); String departmentId = getDepartmentId(reginParams);
HashMap<String, Object> req = CheckPageParamUtil.fillInfo(queryRequests); HashMap<String, Object> req = CheckPageParamUtil.fillInfo(queryRequests);
...@@ -558,7 +558,7 @@ public class CheckController extends AbstractBaseController { ...@@ -558,7 +558,7 @@ public class CheckController extends AbstractBaseController {
if (htmlFile.exists()) { if (htmlFile.exists()) {
htmlFile.delete(); htmlFile.delete();
} }
return new CommonResponse(SUCCESS, data, "查询成功"); return new CommonResponse("SUCCESS", data, "查询成功");
} catch (TransformerException | IOException e) { } catch (TransformerException | IOException e) {
e.printStackTrace(); e.printStackTrace();
return null; return null;
...@@ -592,7 +592,7 @@ public class CheckController extends AbstractBaseController { ...@@ -592,7 +592,7 @@ public class CheckController extends AbstractBaseController {
@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) CheckStatisticalParam queryRequests) { @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) CheckStatisticalParam queryRequests) {
String userId = getUserId(); String userId = getUserId();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
queryRequests.setOrgCode(loginOrgCode); queryRequests.setOrgCode(loginOrgCode);
List<CheckAnalysisVo> list = checkService.getCheckStatisticalAnalysis(getToken(),getProduct(),getAppKey(),queryRequests); List<CheckAnalysisVo> list = checkService.getCheckStatisticalAnalysis(getToken(),getProduct(),getAppKey(),queryRequests);
return CommonResponseUtil.success(list); return CommonResponseUtil.success(list);
...@@ -606,7 +606,7 @@ public class CheckController extends AbstractBaseController { ...@@ -606,7 +606,7 @@ public class CheckController extends AbstractBaseController {
HttpServletResponse response) { HttpServletResponse response) {
String userId = getUserId(); String userId = getUserId();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
queryRequests.setOrgCode(loginOrgCode); queryRequests.setOrgCode(loginOrgCode);
List<CheckAnalysisVo> list = checkService.getCheckStatisticalAnalysis(getToken(),getProduct(),getAppKey(),queryRequests); List<CheckAnalysisVo> list = checkService.getCheckStatisticalAnalysis(getToken(),getProduct(),getAppKey(),queryRequests);
String fileName = "巡检记录" + new Date().getTime(); String fileName = "巡检记录" + new Date().getTime();
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/EquipmentRuleController.java
View file @ d6d191a6
...@@ -53,7 +53,7 @@ public class EquipmentRuleController extends AbstractBaseController{ ...@@ -53,7 +53,7 @@ public class EquipmentRuleController extends AbstractBaseController{
token.setToke(request.getHeader("X-Access-Token")); token.setToke(request.getHeader("X-Access-Token"));
token.setAppKey(request.getHeader("appKey")); token.setAppKey(request.getHeader("appKey"));
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
map.put("orgCode",orgCode); map.put("orgCode",orgCode);
equipmentHandlerService.fireEquipRuleMessagePush(map,token); equipmentHandlerService.fireEquipRuleMessagePush(map,token);
return CommonResponseUtil.success(); return CommonResponseUtil.success();
...@@ -69,7 +69,7 @@ public class EquipmentRuleController extends AbstractBaseController{ ...@@ -69,7 +69,7 @@ public class EquipmentRuleController extends AbstractBaseController{
public CommonResponse getEquipmnetRules( public CommonResponse getEquipmnetRules(
@ApiParam(value = "装备名称", required = true) @RequestParam(required = true) String equipmentName) { @ApiParam(value = "装备名称", required = true) @RequestParam(required = true) String equipmentName) {
// ReginParams reginParams = getSelectedOrgInfo(); // ReginParams reginParams = getSelectedOrgInfo();
// String orgCode = getLoginOrgCode(reginParams); // String orgCode = getOrgCode(reginParams);
// HashMap<String, Object> param = new HashMap<>(); // HashMap<String, Object> param = new HashMap<>();
// param.put("equipmentName",equipmentName); // param.put("equipmentName",equipmentName);
// param.put("classifyId",classifyId); // param.put("classifyId",classifyId);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/ExcelExportController.java
View file @ d6d191a6
...@@ -71,7 +71,7 @@ public class ExcelExportController extends AbstractBaseController{ ...@@ -71,7 +71,7 @@ public class ExcelExportController extends AbstractBaseController{
startDate += " 00:00:00"; startDate += " 00:00:00";
endDate += " 23:59:59"; endDate += " 23:59:59";
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
Map<String,Object> map = taskReportService.queryForTaskReport(getToken(),getProduct(),getAppKey(),statistical,startDate,endDate,planId,routeId,orgCode); Map<String,Object> map = taskReportService.queryForTaskReport(getToken(),getProduct(),getAppKey(),statistical,startDate,endDate,planId,routeId,orgCode);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/HomeController.java
View file @ d6d191a6
...@@ -54,11 +54,11 @@ public class HomeController extends AbstractBaseController{ ...@@ -54,11 +54,11 @@ public class HomeController extends AbstractBaseController{
HashMap<String, Object> response = new HashMap<String, Object>(); HashMap<String, Object> response = new HashMap<String, Object>();
HashMap<String, Object> statusList = new HashMap<String, Object>(); HashMap<String, Object> statusList = new HashMap<String, Object>();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String companyName = getCompanyName(reginParams); String companyName = getCompanyName(reginParams);
/*if (XJConstant.ROLE_NAME_ADMIN.equals(loginParam.getRoleTypeName()) || /*if (XJConstant.ROLE_NAME_ADMIN.equals(loginParam.getRoleTypeName()) ||
XJConstant.ROLE_NAME_SUPERADMIN.equals(loginParam.getRoleTypeName())) { XJConstant.ROLE_NAME_SUPERADMIN.equals(loginParam.getRoleTypeName())) {
orgCode = loginParam.getLoginOrgCode(); orgCode = loginParam.getOrgCode();
} else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(loginParam.getRoleTypeName())) { } else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(loginParam.getRoleTypeName())) {
orgCode = loginParam.getUserOrgCode(); orgCode = loginParam.getUserOrgCode();
}*/ }*/
...@@ -89,7 +89,7 @@ public class HomeController extends AbstractBaseController{ ...@@ -89,7 +89,7 @@ public class HomeController extends AbstractBaseController{
public CommonResponse getCheckData() { public CommonResponse getCheckData() {
String userId = getUserId(); String userId = getUserId();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
SimpleDateFormat sdf = new SimpleDateFormat("MM月dd日"); SimpleDateFormat sdf = new SimpleDateFormat("MM月dd日");
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
...@@ -106,7 +106,7 @@ public class HomeController extends AbstractBaseController{ ...@@ -106,7 +106,7 @@ public class HomeController extends AbstractBaseController{
HashMap<String, Object> param = new HashMap<String, Object>(); HashMap<String, Object> param = new HashMap<String, Object>();
/*if (XJConstant.ROLE_NAME_ADMIN.equals(loginParam.getRoleTypeName()) || /*if (XJConstant.ROLE_NAME_ADMIN.equals(loginParam.getRoleTypeName()) ||
XJConstant.ROLE_NAME_SUPERADMIN.equals(loginParam.getRoleTypeName())) { XJConstant.ROLE_NAME_SUPERADMIN.equals(loginParam.getRoleTypeName())) {
param.put("orgCode", loginParam.getLoginOrgCode()); param.put("orgCode", loginParam.getOrgCode());
} else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(loginParam.getRoleTypeName())) { } else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(loginParam.getRoleTypeName())) {
param.put("orgCode", loginParam.getUserOrgCode()); param.put("orgCode", loginParam.getUserOrgCode());
} else { } else {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/InputItemController.java
View file @ d6d191a6
...@@ -81,7 +81,7 @@ public class InputItemController extends AbstractBaseController { ...@@ -81,7 +81,7 @@ public class InputItemController extends AbstractBaseController {
try { try {
InputItem inputItem = new InputItem(); InputItem inputItem = new InputItem();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
BeanUtils.copyProperties(param, inputItem); BeanUtils.copyProperties(param, inputItem);
///LoginUserParam loginParam = getLoginUserParam(); ///LoginUserParam loginParam = getLoginUserParam();
...@@ -219,7 +219,7 @@ public class InputItemController extends AbstractBaseController { ...@@ -219,7 +219,7 @@ public class InputItemController extends AbstractBaseController {
//LoginUserParam user = CurUserCompanyCache.getInstance().getCurCompany(getUserId(), getToken()); //LoginUserParam user = CurUserCompanyCache.getInstance().getCurCompany(getUserId(), getToken());
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
HashMap<String, Object> paramMap = new HashMap<String, Object>(); HashMap<String, Object> paramMap = new HashMap<String, Object>();
...@@ -242,7 +242,7 @@ public class InputItemController extends AbstractBaseController { ...@@ -242,7 +242,7 @@ public class InputItemController extends AbstractBaseController {
@ApiParam(value = "组合查询条件", required = false, defaultValue = "[]") @RequestBody(required = false) List<CommonRequest> queryRequests) { @ApiParam(value = "组合查询条件", required = false, defaultValue = "[]") @RequestBody(required = false) List<CommonRequest> queryRequests) {
// 1.组织查询条件数据 // 1.组织查询条件数据
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
List<DaoCriteria> criterias = buildDaoCriterias(queryRequests, false, loginOrgCode, roleTypeName); List<DaoCriteria> criterias = buildDaoCriterias(queryRequests, false, loginOrgCode, roleTypeName);
// 2.组织数据权限过滤条件，基础数据不管roleType，全按照选择的公司orgCode过滤 // 2.组织数据权限过滤条件，基础数据不管roleType，全按照选择的公司orgCode过滤
...@@ -266,7 +266,7 @@ public class InputItemController extends AbstractBaseController { ...@@ -266,7 +266,7 @@ public class InputItemController extends AbstractBaseController {
@ApiOperation(value = "条件查询检查项", notes = "条件查询检查项") @ApiOperation(value = "条件查询检查项", notes = "条件查询检查项")
public CommonResponse queryCustomInputItem( @RequestBody HashMap<String,Object> params){ public CommonResponse queryCustomInputItem( @RequestBody HashMap<String,Object> params){
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
List<PointInputItemVo> list = inputItemService.queryCustomInputItem(params.get("itemType").toString(),params.get("nameOrItemNo").toString(),orgCode); List<PointInputItemVo> list = inputItemService.queryCustomInputItem(params.get("itemType").toString(),params.get("nameOrItemNo").toString(),orgCode);
return CommonResponseUtil.success(list); return CommonResponseUtil.success(list);
} }
...@@ -283,7 +283,7 @@ public class InputItemController extends AbstractBaseController { ...@@ -283,7 +283,7 @@ public class InputItemController extends AbstractBaseController {
@ApiParam(value = "组合查询条件", required = false, defaultValue = "[]") @RequestBody(required = false) List<CommonRequest> queryRequests) { @ApiParam(value = "组合查询条件", required = false, defaultValue = "[]") @RequestBody(required = false) List<CommonRequest> queryRequests) {
// 组织数据权限过滤条件，基础数据不管roleType，全按照选择的公司orgCode过滤 // 组织数据权限过滤条件，基础数据不管roleType，全按照选择的公司orgCode过滤
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
List<InputItem> list = null; List<InputItem> list = null;
if (ObjectUtils.isEmpty(queryRequests)) { if (ObjectUtils.isEmpty(queryRequests)) {
...@@ -328,7 +328,7 @@ public class InputItemController extends AbstractBaseController { ...@@ -328,7 +328,7 @@ public class InputItemController extends AbstractBaseController {
@ApiParam(value = "巡检点id", required = true) @PathVariable(name = "itemId") Long itemId, @ApiParam(value = "巡检点id", required = true) @PathVariable(name = "itemId") Long itemId,
@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) { @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
if (ObjectUtils.isEmpty(reginParams)) { if (ObjectUtils.isEmpty(reginParams)) {
return CommonResponseUtil.failure("用户session过期"); return CommonResponseUtil.failure("用户session过期");
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/LatentDangerController.java
View file @ d6d191a6
...@@ -65,7 +65,7 @@ public class LatentDangerController extends AbstractBaseController { ...@@ -65,7 +65,7 @@ public class LatentDangerController extends AbstractBaseController {
} }
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String deptId = getDepartmentId(reginParams); String deptId = getDepartmentId(reginParams);
String companyId = getCompanyId(reginParams); String companyId = getCompanyId(reginParams);
String departmentName = getDepartmentName(reginParams); String departmentName = getDepartmentName(reginParams);
...@@ -87,7 +87,7 @@ public class LatentDangerController extends AbstractBaseController { ...@@ -87,7 +87,7 @@ public class LatentDangerController extends AbstractBaseController {
return CommonResponseUtil.failure("用户session过期"); return CommonResponseUtil.failure("用户session过期");
} }
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String deptId = getDepartmentId(reginParams); String deptId = getDepartmentId(reginParams);
String companyId = getCompanyId(reginParams); String companyId = getCompanyId(reginParams);
String departmentName = getDepartmentName(reginParams); String departmentName = getDepartmentName(reginParams);
...@@ -110,7 +110,7 @@ public class LatentDangerController extends AbstractBaseController { ...@@ -110,7 +110,7 @@ public class LatentDangerController extends AbstractBaseController {
return CommonResponseUtil.failure("用户session过期"); return CommonResponseUtil.failure("用户session过期");
} }
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String deptId = null; String deptId = null;
return iLatentDangerService.list(getToken(), getProduct(), getAppKey(), latentDangerListParam, user, loginOrgCode, deptId); return iLatentDangerService.list(getToken(), getProduct(), getAppKey(), latentDangerListParam, user, loginOrgCode, deptId);
} catch (Exception e) { } catch (Exception e) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/MsgController.java
View file @ d6d191a6
...@@ -98,7 +98,7 @@ public class MsgController extends AbstractBaseController { ...@@ -98,7 +98,7 @@ public class MsgController extends AbstractBaseController {
AgencyUserModel userModel = getUserInfo(); AgencyUserModel userModel = getUserInfo();
String userId = userModel.getUserId(); String userId = userModel.getUserId();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String deptId=null; String deptId=null;
if( reginParams.getDepartment()!=null){ if( reginParams.getDepartment()!=null){
deptId = reginParams.getDepartment().getDepartmentDesc(); deptId = reginParams.getDepartment().getDepartmentDesc();
...@@ -189,7 +189,7 @@ public class MsgController extends AbstractBaseController { ...@@ -189,7 +189,7 @@ public class MsgController extends AbstractBaseController {
AgencyUserModel userModel = getUserInfo(); AgencyUserModel userModel = getUserInfo();
String userId = userModel.getUserId(); String userId = userModel.getUserId();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
for (MsgSubscribe s: subscribe) { for (MsgSubscribe s: subscribe) {
s.setOrgCode(orgCode); s.setOrgCode(orgCode);
s.setUserId(userModel.getUserId()); s.setUserId(userModel.getUserId());
...@@ -298,7 +298,7 @@ public class MsgController extends AbstractBaseController { ...@@ -298,7 +298,7 @@ public class MsgController extends AbstractBaseController {
AgencyUserModel user = getUserInfo(); AgencyUserModel user = getUserInfo();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
CommonRequest request = new CommonRequest(); CommonRequest request = new CommonRequest();
CommonRequest request1 = new CommonRequest(); CommonRequest request1 = new CommonRequest();
...@@ -366,7 +366,7 @@ public class MsgController extends AbstractBaseController { ...@@ -366,7 +366,7 @@ public class MsgController extends AbstractBaseController {
@ApiParam(value = "分页参数", required = true, defaultValue = "pageNumber=0&pageSize=10") CommonPageable commonPageable) { @ApiParam(value = "分页参数", required = true, defaultValue = "pageNumber=0&pageSize=10") CommonPageable commonPageable) {
try { try {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, roleTypeName); HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, roleTypeName);
if(XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName)||XJConstant.ROLE_NAME_PERSON.equals(roleTypeName)) if(XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName)||XJConstant.ROLE_NAME_PERSON.equals(roleTypeName))
...@@ -413,7 +413,7 @@ public class MsgController extends AbstractBaseController { ...@@ -413,7 +413,7 @@ public class MsgController extends AbstractBaseController {
msg.setCreateBy(user.getUserId()); msg.setCreateBy(user.getUserId());
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
msg.setUserName(user.getRealName()); msg.setUserName(user.getRealName());
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
msg.setOrgCode(loginOrgCode); msg.setOrgCode(loginOrgCode);
List<Msg> msgList = iMsgService.publishNotice(getToken(),getProduct(),getAppKey(),msg); List<Msg> msgList = iMsgService.publishNotice(getToken(),getProduct(),getAppKey(),msg);
msgList.forEach(m->{ msgList.forEach(m->{
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PlanController.java
View file @ d6d191a6
...@@ -47,7 +47,7 @@ public class PlanController extends AbstractBaseController { ...@@ -47,7 +47,7 @@ public class PlanController extends AbstractBaseController {
public CommonResponse qryCheckInfoPage(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests, public CommonResponse qryCheckInfoPage(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
@ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) { @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
String deptId=""; String deptId="";
String userId=""; String userId="";
...@@ -78,7 +78,7 @@ public class PlanController extends AbstractBaseController { ...@@ -78,7 +78,7 @@ public class PlanController extends AbstractBaseController {
try { try {
String userId = getUserId(); String userId = getUserId();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
HashMap<String,Object> map = new HashMap<String,Object>(); HashMap<String,Object> map = new HashMap<String,Object>();
map.put("org_code", loginOrgCode); map.put("org_code", loginOrgCode);
map.put("user_id", userId); map.put("user_id", userId);
...@@ -157,7 +157,7 @@ public class PlanController extends AbstractBaseController { ...@@ -157,7 +157,7 @@ public class PlanController extends AbstractBaseController {
public CommonResponse qryCheckInfo(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) { public CommonResponse qryCheckInfo(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, roleTypeName); HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, roleTypeName);
PlanInfoPageParam param = PlanPageParamUtil.fillPlanInfoParam(queryRequests, null, paramMap); PlanInfoPageParam param = PlanPageParamUtil.fillPlanInfoParam(queryRequests, null, paramMap);
List<HashMap<String,Object>> list= planService.getPlanInfoNoPage(param); List<HashMap<String,Object>> list= planService.getPlanInfoNoPage(param);
...@@ -169,7 +169,7 @@ public class PlanController extends AbstractBaseController { ...@@ -169,7 +169,7 @@ public class PlanController extends AbstractBaseController {
@RequestMapping(value = "/queryPlanList", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/queryPlanList", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse queryPlanList() { public CommonResponse queryPlanList() {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
List<HashMap<String,Object>> list= planService.queryPlanListByOrgCode(loginOrgCode); List<HashMap<String,Object>> list= planService.queryPlanListByOrgCode(loginOrgCode);
return CommonResponseUtil.success(list); return CommonResponseUtil.success(list);
} }
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PlanTaskController.java
View file @ d6d191a6
...@@ -94,7 +94,7 @@ public class PlanTaskController extends AbstractBaseController { ...@@ -94,7 +94,7 @@ public class PlanTaskController extends AbstractBaseController {
@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests, @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
@ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) { @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, roleTypeName); HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, roleTypeName);
PlanTaskPageParam params = new PlanTaskPageParam(); PlanTaskPageParam params = new PlanTaskPageParam();
...@@ -190,7 +190,7 @@ public class PlanTaskController extends AbstractBaseController { ...@@ -190,7 +190,7 @@ public class PlanTaskController extends AbstractBaseController {
HttpServletResponse response) { HttpServletResponse response) {
try { try {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
HashMap<String, Object> paramMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName); HashMap<String, Object> paramMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName);
PlanTaskPageParam params = new PlanTaskPageParam(); PlanTaskPageParam params = new PlanTaskPageParam();
...@@ -271,7 +271,7 @@ public class PlanTaskController extends AbstractBaseController { ...@@ -271,7 +271,7 @@ public class PlanTaskController extends AbstractBaseController {
HashMap<String, Object> params = new HashMap<String, Object>(); HashMap<String, Object> params = new HashMap<String, Object>();
//LoginUserParam loginParam = CurUserCompanyCache.getInstance().getCurCompany(getUserId(), getToken()); //LoginUserParam loginParam = CurUserCompanyCache.getInstance().getCurCompany(getUserId(), getToken());
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
/* if (ObjectUtils.isEmpty(loginParam)) { /* if (ObjectUtils.isEmpty(loginParam)) {
return CommonResponseUtil.failure("公司选择失效"); return CommonResponseUtil.failure("公司选择失效");
}*/ }*/
...@@ -509,7 +509,7 @@ public class PlanTaskController extends AbstractBaseController { ...@@ -509,7 +509,7 @@ public class PlanTaskController extends AbstractBaseController {
@ApiParam(value = "分页参数", required = false, defaultValue = "current=0&pageSize=10或pageNumber0&pageSize=10") CommonPageable pageable) { @ApiParam(value = "分页参数", required = false, defaultValue = "current=0&pageSize=10或pageNumber0&pageSize=10") CommonPageable pageable) {
HashMap<String, Object> params = new HashMap<String, Object>(); HashMap<String, Object> params = new HashMap<String, Object>();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
params = PlanTaskPageParamUtil.fillPlanTask(queryRequests, params); params = PlanTaskPageParamUtil.fillPlanTask(queryRequests, params);
// LoginUserParam loginParam = CurUserCompanyCache.getInstance().getCurCompany(getUserId(), getToken()); // LoginUserParam loginParam = CurUserCompanyCache.getInstance().getCurCompany(getUserId(), getToken());
...@@ -625,7 +625,7 @@ public class PlanTaskController extends AbstractBaseController { ...@@ -625,7 +625,7 @@ public class PlanTaskController extends AbstractBaseController {
HashMap<String, Object> params = new HashMap<String, Object>(); HashMap<String, Object> params = new HashMap<String, Object>();
HashMap<String, Object> resp = new HashMap<String, Object>(); HashMap<String, Object> resp = new HashMap<String, Object>();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
String departmentId = getDepartmentId(reginParams); String departmentId = getDepartmentId(reginParams);
PlanTaskPageParamUtil.fillPlanTask(queryRequests, params); PlanTaskPageParamUtil.fillPlanTask(queryRequests, params);
...@@ -728,7 +728,7 @@ public class PlanTaskController extends AbstractBaseController { ...@@ -728,7 +728,7 @@ public class PlanTaskController extends AbstractBaseController {
public CommonResponse queryLeavePlanTask() { public CommonResponse queryLeavePlanTask() {
String userId = getUserId(); String userId = getUserId();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
HashMap<String, Object> params = new HashMap<String, Object>(); HashMap<String, Object> params = new HashMap<String, Object>();
params.put("userId", userId); params.put("userId", userId);
params.put("orgCode", loginOrgCode); params.put("orgCode", loginOrgCode);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PointController.java
View file @ d6d191a6
...@@ -95,7 +95,7 @@ public class PointController extends AbstractBaseController { ...@@ -95,7 +95,7 @@ public class PointController extends AbstractBaseController {
} }
try { try {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
pointParam.getPoint().setOrgCode(loginOrgCode); //点归属于公司 pointParam.getPoint().setOrgCode(loginOrgCode); //点归属于公司
pointParam.getPoint().setCreatorId(user.getUserId()); pointParam.getPoint().setCreatorId(user.getUserId());
Point point = iPointService.addPoint(pointParam); Point point = iPointService.addPoint(pointParam);
...@@ -127,7 +127,7 @@ public class PointController extends AbstractBaseController { ...@@ -127,7 +127,7 @@ public class PointController extends AbstractBaseController {
} }
try { try {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
pointParam.getPoint().setOrgCode(loginOrgCode); //点归属于公司 pointParam.getPoint().setOrgCode(loginOrgCode); //点归属于公司
pointParam.getPoint().setCreatorId(user.getUserId()); pointParam.getPoint().setCreatorId(user.getUserId());
Point point = iPointService.newAddPoint(pointParam); Point point = iPointService.newAddPoint(pointParam);
...@@ -165,7 +165,7 @@ public class PointController extends AbstractBaseController { ...@@ -165,7 +165,7 @@ public class PointController extends AbstractBaseController {
} }
try { try {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
param.setOrgCode(loginOrgCode); //点归属于公司 param.setOrgCode(loginOrgCode); //点归属于公司
param.setCreatorId(user.getUserId()); param.setCreatorId(user.getUserId());
...@@ -293,7 +293,7 @@ public class PointController extends AbstractBaseController { ...@@ -293,7 +293,7 @@ public class PointController extends AbstractBaseController {
@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests, @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
@ApiParam(value = "分页参数", required = true, defaultValue = "pageNumber=0&pageSize=10") CommonPageable commonPageable) { @ApiParam(value = "分页参数", required = true, defaultValue = "pageNumber=0&pageSize=10") CommonPageable commonPageable) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
if (ObjectUtils.isEmpty(reginParams)) { if (ObjectUtils.isEmpty(reginParams)) {
return CommonResponseUtil.failure("用户session过期"); return CommonResponseUtil.failure("用户session过期");
...@@ -344,7 +344,7 @@ public class PointController extends AbstractBaseController { ...@@ -344,7 +344,7 @@ public class PointController extends AbstractBaseController {
} }
String userId = getUserId(); String userId = getUserId();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
if (ObjectUtils.isEmpty(reginParams)) { if (ObjectUtils.isEmpty(reginParams)) {
return CommonResponseUtil.failure("用户session过期"); return CommonResponseUtil.failure("用户session过期");
} }
...@@ -366,7 +366,7 @@ public class PointController extends AbstractBaseController { ...@@ -366,7 +366,7 @@ public class PointController extends AbstractBaseController {
public CommonResponse exportTemplate(HttpServletResponse response) { public CommonResponse exportTemplate(HttpServletResponse response) {
String userId = getUserId(); String userId = getUserId();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String fileName = "巡检点导入模板"; //模板名称 String fileName = "巡检点导入模板"; //模板名称
String[] handers = {"点编号","点名称","是否为移动点","计划外巡检是否评分","是否允许离线巡检","参考地址","3维地图坐标","3维地图楼层","最少拍照数量","最多拍照数量","风险等级","备注说明","所属分类目录","检查项目","是否室内"}; //列标题 String[] handers = {"点编号","点名称","是否为移动点","计划外巡检是否评分","是否允许离线巡检","参考地址","3维地图坐标","3维地图楼层","最少拍照数量","最多拍照数量","风险等级","备注说明","所属分类目录","检查项目","是否室内"}; //列标题
List<String[]> downData = new ArrayList(); List<String[]> downData = new ArrayList();
...@@ -400,7 +400,7 @@ public class PointController extends AbstractBaseController { ...@@ -400,7 +400,7 @@ public class PointController extends AbstractBaseController {
HttpServletResponse response) { HttpServletResponse response) {
String userId = getUserId(); String userId = getUserId();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
if (ObjectUtils.isEmpty(reginParams)) { if (ObjectUtils.isEmpty(reginParams)) {
return CommonResponseUtil.failure("用户session过期"); return CommonResponseUtil.failure("用户session过期");
} }
...@@ -427,7 +427,7 @@ public class PointController extends AbstractBaseController { ...@@ -427,7 +427,7 @@ public class PointController extends AbstractBaseController {
@RequestParam(value="exportType",required = false) int exportType, @RequestParam(value="exportType",required = false) int exportType,
HttpServletResponse response) { HttpServletResponse response) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
if (ObjectUtils.isEmpty(reginParams)) { if (ObjectUtils.isEmpty(reginParams)) {
return CommonResponseUtil.failure("用户session过期"); return CommonResponseUtil.failure("用户session过期");
} }
...@@ -457,7 +457,7 @@ public class PointController extends AbstractBaseController { ...@@ -457,7 +457,7 @@ public class PointController extends AbstractBaseController {
@ApiParam(value = "分页参数", required = true, defaultValue = "pageNumber=0&pageSize=10") CommonPageable commonPageable) { @ApiParam(value = "分页参数", required = true, defaultValue = "pageNumber=0&pageSize=10") CommonPageable commonPageable) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
if (ObjectUtils.isEmpty(reginParams)) { if (ObjectUtils.isEmpty(reginParams)) {
return CommonResponseUtil.failure("用户session过期"); return CommonResponseUtil.failure("用户session过期");
} }
...@@ -481,7 +481,7 @@ public class PointController extends AbstractBaseController { ...@@ -481,7 +481,7 @@ public class PointController extends AbstractBaseController {
public CommonResponse listPoint(@ApiParam(value = "巡检点编码", required = false) @RequestParam("ids") List<String> ids, public CommonResponse listPoint(@ApiParam(value = "巡检点编码", required = false) @RequestParam("ids") List<String> ids,
@ApiParam(value = "巡检点名称", required = false) @RequestParam("names") List<String> names) { @ApiParam(value = "巡检点名称", required = false) @RequestParam("names") List<String> names) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
try { try {
...@@ -504,11 +504,11 @@ public class PointController extends AbstractBaseController { ...@@ -504,11 +504,11 @@ public class PointController extends AbstractBaseController {
public CommonResponse queryPoints(@ApiParam(value = "巡检点编码", required = false) @RequestParam("code") String code, public CommonResponse queryPoints(@ApiParam(value = "巡检点编码", required = false) @RequestParam("code") String code,
@ApiParam(value = "巡检点名称", required = false) @RequestParam("name") String name) { @ApiParam(value = "巡检点名称", required = false) @RequestParam("name") String name) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
try { try {
/*String orgCode = null; /*String orgCode = null;
if (!ObjectUtils.isEmpty(reginParams)) { if (!ObjectUtils.isEmpty(reginParams)) {
orgCode = loginUserParam.getLoginOrgCode(); orgCode = loginUserParam.getOrgCode();
} */ } */
List<HashMap<String, Object>> list = iPointService.findPointList(code, name, orgCode); List<HashMap<String, Object>> list = iPointService.findPointList(code, name, orgCode);
return CommonResponseUtil.success(list); return CommonResponseUtil.success(list);
...@@ -666,7 +666,7 @@ public class PointController extends AbstractBaseController { ...@@ -666,7 +666,7 @@ public class PointController extends AbstractBaseController {
@GetMapping(value = "/queryPointPie", produces = "application/json;charset=UTF-8") @GetMapping(value = "/queryPointPie", produces = "application/json;charset=UTF-8")
public CommonResponse queryPointPie() { public CommonResponse queryPointPie() {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
String departmentId = getDepartmentId(reginParams); String departmentId = getDepartmentId(reginParams);
HashMap<String, Object> params = new HashMap<String, Object>(); HashMap<String, Object> params = new HashMap<String, Object>();
...@@ -685,7 +685,7 @@ public class PointController extends AbstractBaseController { ...@@ -685,7 +685,7 @@ public class PointController extends AbstractBaseController {
@GetMapping(value = "/queryPointHistogram", produces = "application/json;charset=UTF-8") @GetMapping(value = "/queryPointHistogram", produces = "application/json;charset=UTF-8")
public CommonResponse queryPointHistogram() { public CommonResponse queryPointHistogram() {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
String departmentId = getDepartmentId(reginParams); String departmentId = getDepartmentId(reginParams);
HashMap<String, Object> params = new HashMap<String, Object>(); HashMap<String, Object> params = new HashMap<String, Object>();
...@@ -751,7 +751,7 @@ public class PointController extends AbstractBaseController { ...@@ -751,7 +751,7 @@ public class PointController extends AbstractBaseController {
@ApiParam(value = "巡检点id", required = true) @PathVariable(name = "pointId") Long pointId, @ApiParam(value = "巡检点id", required = true) @PathVariable(name = "pointId") Long pointId,
@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) { @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
String departmentId = getDepartmentId(reginParams); String departmentId = getDepartmentId(reginParams);
if (ObjectUtils.isEmpty(reginParams)) { if (ObjectUtils.isEmpty(reginParams)) {
...@@ -784,12 +784,12 @@ public class PointController extends AbstractBaseController { ...@@ -784,12 +784,12 @@ public class PointController extends AbstractBaseController {
@GetMapping(value = "/queryLeavelPoint", produces = "application/json;charset=UTF-8") @GetMapping(value = "/queryLeavelPoint", produces = "application/json;charset=UTF-8")
public CommonResponse queryLeavelPoint(@ApiParam(value = "数据同步开始时间（不传为全部同步）", required = false) @RequestParam(required=false) String startTime) { public CommonResponse queryLeavelPoint(@ApiParam(value = "数据同步开始时间（不传为全部同步）", required = false) @RequestParam(required=false) String startTime) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
if (ObjectUtils.isEmpty(reginParams)) { if (ObjectUtils.isEmpty(reginParams)) {
return CommonResponseUtil.failure("用户session过期"); return CommonResponseUtil.failure("用户session过期");
} }
//String orgCode = loginUserParam.getLoginOrgCode(); //String orgCode = loginUserParam.getOrgCode();
return CommonResponseUtil.success(iPointService.queryLeavelPoint(getToken(), getProduct(), getAppKey(),loginOrgCode, startTime)); return CommonResponseUtil.success(iPointService.queryLeavelPoint(getToken(), getProduct(), getAppKey(),loginOrgCode, startTime));
} }
...@@ -814,7 +814,7 @@ public class PointController extends AbstractBaseController { ...@@ -814,7 +814,7 @@ public class PointController extends AbstractBaseController {
@PostMapping(value = "/exportPoint/iec", produces = "application/json;charset=UTF-8") @PostMapping(value = "/exportPoint/iec", produces = "application/json;charset=UTF-8")
public CommonResponse exportIecPoint(HttpServletResponse response) { public CommonResponse exportIecPoint(HttpServletResponse response) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
String fileName = "巡检点点位"; //模板名称 String fileName = "巡检点点位"; //模板名称
String[] handers = {"点位名称","点位编码"}; //列标题 String[] handers = {"点位名称","点位编码"}; //列标题
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/QueryStatsController.java
View file @ d6d191a6
...@@ -46,7 +46,7 @@ public class QueryStatsController extends AbstractBaseController { ...@@ -46,7 +46,7 @@ public class QueryStatsController extends AbstractBaseController {
@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests, @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
@ApiParam(value = "分页参数", required = true, defaultValue = "pageNumber=0&pageSize=10") CommonPageable commonPageable) { @ApiParam(value = "分页参数", required = true, defaultValue = "pageNumber=0&pageSize=10") CommonPageable commonPageable) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
HashMap<String, Object> paramMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName); HashMap<String, Object> paramMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName);
CheckStatsListPageParam param = CheckStatsParamUtils.fillCheckInfoParam(queryRequests, commonPageable, paramMap); CheckStatsListPageParam param = CheckStatsParamUtils.fillCheckInfoParam(queryRequests, commonPageable, paramMap);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/RouteController.java
View file @ d6d191a6
...@@ -76,7 +76,7 @@ public class RouteController extends AbstractBaseController { ...@@ -76,7 +76,7 @@ public class RouteController extends AbstractBaseController {
public CommonResponse addRoute(@ApiParam(value = "巡检路线", required = true) @RequestBody Route route) { public CommonResponse addRoute(@ApiParam(value = "巡检路线", required = true) @RequestBody Route route) {
try { try {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
route.setOrgCode(loginOrgCode); route.setOrgCode(loginOrgCode);
route.setIsDelete(false); route.setIsDelete(false);
if (routeService.existRouteName(loginOrgCode, route.getName())) { if (routeService.existRouteName(loginOrgCode, route.getName())) {
...@@ -126,7 +126,7 @@ public class RouteController extends AbstractBaseController { ...@@ -126,7 +126,7 @@ public class RouteController extends AbstractBaseController {
public CommonResponse updateRoute(@ApiParam(value = "巡检路线", required = true) @RequestBody Route route) { public CommonResponse updateRoute(@ApiParam(value = "巡检路线", required = true) @RequestBody Route route) {
try { try {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
route.setOrgCode(orgCode); route.setOrgCode(orgCode);
route.setCreatorId(getUserId()); route.setCreatorId(getUserId());
Route newRoute = routeService.updateRoute(route); Route newRoute = routeService.updateRoute(route);
...@@ -238,7 +238,7 @@ public class RouteController extends AbstractBaseController { ...@@ -238,7 +238,7 @@ public class RouteController extends AbstractBaseController {
@ApiParam(value = "分页参数", required = true, defaultValue = "pageNumber=0&pageSize=10") CommonPageable commonPageable) { @ApiParam(value = "分页参数", required = true, defaultValue = "pageNumber=0&pageSize=10") CommonPageable commonPageable) {
try { try {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
HashMap<String,Object> paramMap = new HashMap<String,Object>(); HashMap<String,Object> paramMap = new HashMap<String,Object>();
paramMap.put("orgCode",loginOrgCode); paramMap.put("orgCode",loginOrgCode);
RoutePageParam params = RoutePageParamUtil.fillRouteInfoParam(queryRequests, commonPageable, paramMap); RoutePageParam params = RoutePageParamUtil.fillRouteInfoParam(queryRequests, commonPageable, paramMap);
...@@ -288,7 +288,7 @@ public class RouteController extends AbstractBaseController { ...@@ -288,7 +288,7 @@ public class RouteController extends AbstractBaseController {
// List<DaoCriteria> criterias = new ArrayList<DaoCriteria>(); // List<DaoCriteria> criterias = new ArrayList<DaoCriteria>();
//1.组织数据权限信息 //1.组织数据权限信息
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
// DaoCriteria compDaoCriteria = new DaoCriteria(); // DaoCriteria compDaoCriteria = new DaoCriteria();
// compDaoCriteria.setPropertyName("orgCode"); // compDaoCriteria.setPropertyName("orgCode");
// compDaoCriteria.setOperator(QueryOperatorEnum.LIKE.getName()); // compDaoCriteria.setOperator(QueryOperatorEnum.LIKE.getName());
...@@ -316,14 +316,14 @@ public class RouteController extends AbstractBaseController { ...@@ -316,14 +316,14 @@ public class RouteController extends AbstractBaseController {
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
if(XJConstant.ROLE_NAME_SUPERADMIN.equals(roleTypeName.toUpperCase()) || XJConstant.ROLE_NAME_ADMIN.equals(roleTypeName.toUpperCase())){ if(XJConstant.ROLE_NAME_SUPERADMIN.equals(roleTypeName.toUpperCase()) || XJConstant.ROLE_NAME_ADMIN.equals(roleTypeName.toUpperCase())){
loginOrgCode = getLoginOrgCode(reginParams); loginOrgCode = getOrgCode(reginParams);
}else if(XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName.toUpperCase())){ }else if(XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName.toUpperCase())){
departmentId = getDepartmentId(reginParams); departmentId = getDepartmentId(reginParams);
loginOrgCode = getLoginOrgCode(reginParams); loginOrgCode = getOrgCode(reginParams);
userId = userModel.getUserId(); userId = userModel.getUserId();
}else if(XJConstant.ROLE_NAME_PERSON.equals(roleTypeName.toUpperCase())){ }else if(XJConstant.ROLE_NAME_PERSON.equals(roleTypeName.toUpperCase())){
userId = userModel.getUserId(); userId = userModel.getUserId();
loginOrgCode = getLoginOrgCode(reginParams); loginOrgCode = getOrgCode(reginParams);
} }
List<HashMap<String, Object>> routeList = routeService.queryRouteListByOrgCode(loginOrgCode,userId,departmentId); List<HashMap<String, Object>> routeList = routeService.queryRouteListByOrgCode(loginOrgCode,userId,departmentId);
routeList=routeList.stream().distinct().collect(Collectors.toList()); routeList=routeList.stream().distinct().collect(Collectors.toList());
...@@ -348,7 +348,7 @@ public class RouteController extends AbstractBaseController { ...@@ -348,7 +348,7 @@ public class RouteController extends AbstractBaseController {
try { try {
String uid = getUserId(); String uid = getUserId();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
HashMap<String, Object> reqParam = new HashMap<>(); HashMap<String, Object> reqParam = new HashMap<>();
reqParam.put("orgCode", orgCode); reqParam.put("orgCode", orgCode);
RoutePageParamUtil.fillRouteInfo(queryRequests, reqParam); RoutePageParamUtil.fillRouteInfo(queryRequests, reqParam);
...@@ -390,7 +390,7 @@ public class RouteController extends AbstractBaseController { ...@@ -390,7 +390,7 @@ public class RouteController extends AbstractBaseController {
try { try {
String uid = getUserId(); String uid = getUserId();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
List<RoutePoint> routePointList = new ArrayList<>(); List<RoutePoint> routePointList = new ArrayList<>();
for (String pointId : pointIds) { for (String pointId : pointIds) {
RoutePoint routePoint = new RoutePoint(); RoutePoint routePoint = new RoutePoint();
...@@ -526,7 +526,7 @@ public class RouteController extends AbstractBaseController { ...@@ -526,7 +526,7 @@ public class RouteController extends AbstractBaseController {
public CommonResponse updateRouteNew(@ApiParam(value = "巡检路线", required = true) @RequestBody Route route) { public CommonResponse updateRouteNew(@ApiParam(value = "巡检路线", required = true) @RequestBody Route route) {
try { try {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
route.setOrgCode(orgCode); route.setOrgCode(orgCode);
route.setCreatorId(getUserId()); route.setCreatorId(getUserId());
return CommonResponseUtil.success(routeService.updateRouteNew(route)); return CommonResponseUtil.success(routeService.updateRouteNew(route));
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/SafetyController.java
View file @ d6d191a6
...@@ -61,7 +61,7 @@ public class SafetyController extends AbstractBaseController{ ...@@ -61,7 +61,7 @@ public class SafetyController extends AbstractBaseController{
@ApiOperation(value = " 保存登陆用户选择公司信息", notes = " 保存登陆用户选择公司信息") @ApiOperation(value = " 保存登陆用户选择公司信息", notes = " 保存登陆用户选择公司信息")
@PostMapping(value = "/save/curCompany") @PostMapping(value = "/save/curCompany")
public CommonResponse saveCurCompany(@RequestBody ReginParams reginParams) { public CommonResponse saveCurCompany(@RequestBody ReginParams reginParams) {
this.saveSelectedOrgInfo(reginParams); // this.saveSelectedOrgInfo(reginParams);
// CatalogTree hh4= new CatalogTree(); // CatalogTree hh4= new CatalogTree();
// CommonResponse hh= pointService.pushSpcCheckResult(hh4); // CommonResponse hh= pointService.pushSpcCheckResult(hh4);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/SafetyPreCtrlController.java
View file @ d6d191a6
...@@ -75,7 +75,7 @@ public class SafetyPreCtrlController extends AbstractBaseController { ...@@ -75,7 +75,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
@RequestMapping(value = "/countPoint", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/countPoint", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse sumCheckPtById() { public CommonResponse sumCheckPtById() {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, roleTypeName); HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, roleTypeName);
List<HashMap<String,Object>> List= pointService.getSumPtByRole(paramMap); List<HashMap<String,Object>> List= pointService.getSumPtByRole(paramMap);
...@@ -92,7 +92,7 @@ public class SafetyPreCtrlController extends AbstractBaseController { ...@@ -92,7 +92,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
@RequestMapping(value = "/countMonth/{dateMonth}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/countMonth/{dateMonth}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse countMonthCheckById(@ApiParam(value = "年月日(yyyyMMdd)8位", required = false) @PathVariable String dateMonth) { public CommonResponse countMonthCheckById(@ApiParam(value = "年月日(yyyyMMdd)8位", required = false) @PathVariable String dateMonth) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, roleTypeName); HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, roleTypeName);
List<HashMap<String, Object>> countList = checkService.getCountMonthChkByRole(paramMap,dateMonth); List<HashMap<String, Object>> countList = checkService.getCountMonthChkByRole(paramMap,dateMonth);
...@@ -110,7 +110,7 @@ public class SafetyPreCtrlController extends AbstractBaseController { ...@@ -110,7 +110,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
public CommonResponse findChkExList(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests, public CommonResponse findChkExList(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
@ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) { @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, roleTypeName); HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, roleTypeName);
CheckPtListPageParam params = CheckPageParamUtil.fillChkExParam(queryRequests,commonPageable,paramMap); CheckPtListPageParam params = CheckPageParamUtil.fillChkExParam(queryRequests,commonPageable,paramMap);
...@@ -127,7 +127,7 @@ public class SafetyPreCtrlController extends AbstractBaseController { ...@@ -127,7 +127,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
@RequestMapping(value = "/point/queryCriteria/init", method = RequestMethod.GET, produces = "application/json;charset=UTF-8") @RequestMapping(value = "/point/queryCriteria/init", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
public CommonResponse getQueryCriteriaInit(){ public CommonResponse getQueryCriteriaInit(){
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
String departmentId = getDepartmentId(reginParams); String departmentId = getDepartmentId(reginParams);
String companyId = getCompanyId(reginParams); String companyId = getCompanyId(reginParams);
...@@ -147,7 +147,7 @@ public class SafetyPreCtrlController extends AbstractBaseController { ...@@ -147,7 +147,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
@RequestMapping(value = "/check-info/count", produces = "application/json;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/check-info/count", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse countCheckInfoDate(@ApiParam(value = "查询条件", required = false) @RequestBody HashMap<String,Object> map ) { public CommonResponse countCheckInfoDate(@ApiParam(value = "查询条件", required = false) @RequestBody HashMap<String,Object> map ) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
HashMap<String, Object> paramsMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName); HashMap<String, Object> paramsMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName);
paramsMap.put("checkMonth", map.get("date").toString().subSequence(0, 6)); paramsMap.put("checkMonth", map.get("date").toString().subSequence(0, 6));
...@@ -166,7 +166,7 @@ public class SafetyPreCtrlController extends AbstractBaseController { ...@@ -166,7 +166,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
@RequestMapping(value = "/check-user/{PointID}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/check-user/{PointID}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse qryCheckUserById(@ApiParam(value = "点编号", required = true) @PathVariable int PointID) { public CommonResponse qryCheckUserById(@ApiParam(value = "点编号", required = true) @PathVariable int PointID) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
HashMap<String, Object> paramsMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName); HashMap<String, Object> paramsMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName);
List<CheckUserBo> userList = checkService.getAuthUserInfo(paramsMap); List<CheckUserBo> userList = checkService.getAuthUserInfo(paramsMap);
...@@ -185,7 +185,7 @@ public class SafetyPreCtrlController extends AbstractBaseController { ...@@ -185,7 +185,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
public CommonResponse qryCheckInfoPage(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests, public CommonResponse qryCheckInfoPage(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
@ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) { @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
HashMap<String, Object> paramMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName); HashMap<String, Object> paramMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName);
CheckInfoListPageParam params = CheckPageParamUtil.fillChkInfoListParam(queryRequests, commonPageable, paramMap); CheckInfoListPageParam params = CheckPageParamUtil.fillChkInfoListParam(queryRequests, commonPageable, paramMap);
...@@ -206,14 +206,14 @@ public class SafetyPreCtrlController extends AbstractBaseController { ...@@ -206,14 +206,14 @@ public class SafetyPreCtrlController extends AbstractBaseController {
CommonPage<CheckInputBo> checkInputBos = null; CommonPage<CheckInputBo> checkInputBos = null;
try { try {
checkInputBos = checkService.getCheckInputByCheckId(param); checkInputBos = checkService.getCheckInputByCheckId(param);
checkInputBos.setResult(SUCCESS); checkInputBos.setResult("SUCCESS");
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
if (ObjectUtils.isEmpty(checkInputBos)) { if (ObjectUtils.isEmpty(checkInputBos)) {
checkInputBos = new CommonPage(null, null, 0); checkInputBos = new CommonPage(null, null, 0);
} }
checkInputBos.setMessage(e.getMessage()); checkInputBos.setMessage(e.getMessage());
checkInputBos.setResult(FAILED); checkInputBos.setResult("FAILED");
} }
return CommonResponseUtil.success(checkInputBos); return CommonResponseUtil.success(checkInputBos);
} }
...@@ -271,7 +271,7 @@ public class SafetyPreCtrlController extends AbstractBaseController { ...@@ -271,7 +271,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests, @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
@ApiParam(value = "分页参数", required = false) CommonPageable commonPageable) { @ApiParam(value = "分页参数", required = false) CommonPageable commonPageable) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, roleTypeName); HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, roleTypeName);
CheckPtListPageParam params = CheckPageParamUtil.fillChkPtParam(queryRequests, commonPageable, paramMap); CheckPtListPageParam params = CheckPageParamUtil.fillChkPtParam(queryRequests, commonPageable, paramMap);
...@@ -382,7 +382,7 @@ public class SafetyPreCtrlController extends AbstractBaseController { ...@@ -382,7 +382,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
@ApiParam(value = "分页参数", required = true) CommonPageable commonPageable){ @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable){
try { try {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
HashMap<String, Object> paramMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName); HashMap<String, Object> paramMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName);
CheckPtListPageParam params = CheckPageParamUtil.fillTraParam(queryRequests, commonPageable, paramMap); CheckPtListPageParam params = CheckPageParamUtil.fillTraParam(queryRequests, commonPageable, paramMap);
...@@ -404,7 +404,7 @@ public class SafetyPreCtrlController extends AbstractBaseController { ...@@ -404,7 +404,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
@RequestMapping(value = "/routePlanPoint/list", produces = "application/json;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/routePlanPoint/list", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse findRoutePlanPointList(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) { public CommonResponse findRoutePlanPointList(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
HashMap<String, Object> paramMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName); HashMap<String, Object> paramMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName);
CheckPtListPageParam params = CheckPageParamUtil.fillChkPtParam(queryRequests,null,paramMap); CheckPtListPageParam params = CheckPageParamUtil.fillChkPtParam(queryRequests,null,paramMap);
...@@ -417,7 +417,7 @@ public class SafetyPreCtrlController extends AbstractBaseController { ...@@ -417,7 +417,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
@RequestMapping(value = "/queryConditions/init/{type}", method = RequestMethod.GET, produces = "application/json;charset=UTF-8") @RequestMapping(value = "/queryConditions/init/{type}", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
public CommonResponse findCheckSystemInit(@ApiParam(value="类型", required=true)@PathVariable String type) { public CommonResponse findCheckSystemInit(@ApiParam(value="类型", required=true)@PathVariable String type) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
String departmentId = getDepartmentId(reginParams); String departmentId = getDepartmentId(reginParams);
String companyId = getCompanyId(reginParams); String companyId = getCompanyId(reginParams);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/SynDataController.java
View file @ d6d191a6
...@@ -53,7 +53,7 @@ public class SynDataController extends AbstractBaseController { ...@@ -53,7 +53,7 @@ public class SynDataController extends AbstractBaseController {
@ApiParam(value = "巡检项信息", required = true) @RequestBody SynInputItemParam synInputItemParam) { @ApiParam(value = "巡检项信息", required = true) @RequestBody SynInputItemParam synInputItemParam) {
try { try {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
String userId = getUserId(); String userId = getUserId();
if (ObjectUtils.isEmpty(reginParams)) { if (ObjectUtils.isEmpty(reginParams)) {
return CommonResponseUtil.failure("用户session过期"); return CommonResponseUtil.failure("用户session过期");
...@@ -85,7 +85,7 @@ public class SynDataController extends AbstractBaseController { ...@@ -85,7 +85,7 @@ public class SynDataController extends AbstractBaseController {
try { try {
if (operationType.equals(saveOperationType)) { if (operationType.equals(saveOperationType)) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
String userId = getUserId(); String userId = getUserId();
if (ObjectUtils.isEmpty(reginParams)) { if (ObjectUtils.isEmpty(reginParams)) {
return CommonResponseUtil.failure("用户session过期"); return CommonResponseUtil.failure("用户session过期");
...@@ -142,12 +142,12 @@ public class SynDataController extends AbstractBaseController { ...@@ -142,12 +142,12 @@ public class SynDataController extends AbstractBaseController {
@ApiParam(value = "巡检路线信息") @RequestBody SynRouteParam synRouteParam) { @ApiParam(value = "巡检路线信息") @RequestBody SynRouteParam synRouteParam) {
try { try {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
String userId = getUserId(); String userId = getUserId();
if (ObjectUtils.isEmpty(reginParams)) { if (ObjectUtils.isEmpty(reginParams)) {
return CommonResponseUtil.failure("用户session过期"); return CommonResponseUtil.failure("用户session过期");
} }
// String orgCode = getLoginUserParam().getLoginOrgCode(); // String orgCode = getLoginUserParam().getOrgCode();
if (operationType.equals(saveOperationType)) { if (operationType.equals(saveOperationType)) {
return iSynDataService.saveRoute(synRouteParam, userId, orgCode); return iSynDataService.saveRoute(synRouteParam, userId, orgCode);
} }
...@@ -171,7 +171,7 @@ public class SynDataController extends AbstractBaseController { ...@@ -171,7 +171,7 @@ public class SynDataController extends AbstractBaseController {
@ApiParam(value = "巡检计划信息") @RequestBody SynPlanParam synPlanParam) { @ApiParam(value = "巡检计划信息") @RequestBody SynPlanParam synPlanParam) {
try { try {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
String userId = getUserId(); String userId = getUserId();
Toke toke = new Toke(); Toke toke = new Toke();
toke.setAppKey(getAppKey()); toke.setAppKey(getAppKey());
...@@ -180,7 +180,7 @@ public class SynDataController extends AbstractBaseController { ...@@ -180,7 +180,7 @@ public class SynDataController extends AbstractBaseController {
if (ObjectUtils.isEmpty(reginParams)) { if (ObjectUtils.isEmpty(reginParams)) {
return CommonResponseUtil.failure("用户session过期"); return CommonResponseUtil.failure("用户session过期");
} }
// String orgCode = getLoginUserParam().getLoginOrgCode(); // String orgCode = getLoginUserParam().getOrgCode();
if (operationType.equals(saveOperationType)) { if (operationType.equals(saveOperationType)) {
return iSynDataService.savePlan(synPlanParam, userId, orgCode,toke); return iSynDataService.savePlan(synPlanParam, userId, orgCode,toke);
} }
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/TaskController.java
View file @ d6d191a6
...@@ -122,7 +122,7 @@ public class TaskController extends AbstractBaseController{ ...@@ -122,7 +122,7 @@ public class TaskController extends AbstractBaseController{
return CommonResponseUtil.failure("完成时间应当大于当前时间！" ); return CommonResponseUtil.failure("完成时间应当大于当前时间！" );
} }
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
param.getTaskInfo().setOrgCode(orgCode); param.getTaskInfo().setOrgCode(orgCode);
// param.getTaskInfo().setCreateDate(new Date()); // param.getTaskInfo().setCreateDate(new Date());
param.getTaskInfo().setPublisher(user.getUserId()); param.getTaskInfo().setPublisher(user.getUserId());
...@@ -238,7 +238,7 @@ public class TaskController extends AbstractBaseController{ ...@@ -238,7 +238,7 @@ public class TaskController extends AbstractBaseController{
if (htmlFile.exists()) { if (htmlFile.exists()) {
htmlFile.delete(); htmlFile.delete();
} }
return new CommonResponse(SUCCESS, data, "查询成功"); return new CommonResponse("SUCCESS", data, "查询成功");
} catch (TransformerException | IOException e) { } catch (TransformerException | IOException e) {
e.printStackTrace(); e.printStackTrace();
return null; return null;
...@@ -295,7 +295,7 @@ public class TaskController extends AbstractBaseController{ ...@@ -295,7 +295,7 @@ public class TaskController extends AbstractBaseController{
try { try {
AgencyUserModel user = getUserInfo(); AgencyUserModel user = getUserInfo();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
taskService.handleTask(taskIds, status, user, orgCode); taskService.handleTask(taskIds, status, user, orgCode);
return CommonResponseUtil.success(); return CommonResponseUtil.success();
} catch (Exception e) { } catch (Exception e) {
...@@ -351,7 +351,7 @@ public class TaskController extends AbstractBaseController{ ...@@ -351,7 +351,7 @@ public class TaskController extends AbstractBaseController{
public CommonResponse feedbackTask(@ApiParam(value = "回复信息（包含图片base64编码）") @RequestBody FeedbackParam param) { public CommonResponse feedbackTask(@ApiParam(value = "回复信息（包含图片base64编码）") @RequestBody FeedbackParam param) {
AgencyUserModel user = getUserInfo(); AgencyUserModel user = getUserInfo();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
if (ObjectUtils.isEmpty(user)) { if (ObjectUtils.isEmpty(user)) {
return CommonResponseUtil.failure("用户session过期"); return CommonResponseUtil.failure("用户session过期");
} }
...@@ -440,7 +440,7 @@ public class TaskController extends AbstractBaseController{ ...@@ -440,7 +440,7 @@ public class TaskController extends AbstractBaseController{
@ApiParam(value = "分页参数", required = false, defaultValue = "current=0&pageSize=10或pageNumber0&pageSize=10") CommonPageable pageable) { @ApiParam(value = "分页参数", required = false, defaultValue = "current=0&pageSize=10或pageNumber0&pageSize=10") CommonPageable pageable) {
try { try {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
String deptId =""; String deptId ="";
String userId =""; String userId ="";
...@@ -479,7 +479,7 @@ public class TaskController extends AbstractBaseController{ ...@@ -479,7 +479,7 @@ public class TaskController extends AbstractBaseController{
queryRequests = new ArrayList<>(); queryRequests = new ArrayList<>();
} }
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
List<DaoCriteria> criterias = buildDaoCriterias(queryRequests, true, orgCode, roleTypeName); List<DaoCriteria> criterias = buildDaoCriterias(queryRequests, true, orgCode, roleTypeName);
List<Task> list = taskService.queryTaskByCondition(criterias); List<Task> list = taskService.queryTaskByCondition(criterias);
...@@ -500,7 +500,7 @@ public class TaskController extends AbstractBaseController{ ...@@ -500,7 +500,7 @@ public class TaskController extends AbstractBaseController{
queryRequests = new ArrayList<>(); queryRequests = new ArrayList<>();
} }
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
List<DaoCriteria> criterias = buildDaoCriterias(queryRequests, true, orgCode, roleTypeName); List<DaoCriteria> criterias = buildDaoCriterias(queryRequests, true, orgCode, roleTypeName);
int count = taskService.queryTaskCountByCondition(criterias); int count = taskService.queryTaskCountByCondition(criterias);
...@@ -512,7 +512,7 @@ public class TaskController extends AbstractBaseController{ ...@@ -512,7 +512,7 @@ public class TaskController extends AbstractBaseController{
@ApiOperation(value = "条件查询任务图表数据(<font color='blue'>手机app</font>)", notes = "条件查询任务图表数据(<font color='blue'>手机app</font>)") @ApiOperation(value = "条件查询任务图表数据(<font color='blue'>手机app</font>)", notes = "条件查询任务图表数据(<font color='blue'>手机app</font>)")
public CommonResponse queryTaskCharts(@ApiParam(value = "组合查询条件", required = false, defaultValue = "[]") @RequestBody(required = false) List<CommonRequest> queryRequests) { public CommonResponse queryTaskCharts(@ApiParam(value = "组合查询条件", required = false, defaultValue = "[]") @RequestBody(required = false) List<CommonRequest> queryRequests) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
String departmentId = getDepartmentId(reginParams); String departmentId = getDepartmentId(reginParams);
if (queryRequests == null) { if (queryRequests == null) {
...@@ -562,7 +562,7 @@ public class TaskController extends AbstractBaseController{ ...@@ -562,7 +562,7 @@ public class TaskController extends AbstractBaseController{
public CommonResponse queryTasksByPage(@ApiParam(value = "组合查询条件", required = false, defaultValue = "[]") @RequestBody(required = false) List<CommonRequest> queryRequests, public CommonResponse queryTasksByPage(@ApiParam(value = "组合查询条件", required = false, defaultValue = "[]") @RequestBody(required = false) List<CommonRequest> queryRequests,
@ApiParam(value = "分页参数", required = false, defaultValue = "current=0&pageSize=10或pageNumber0&pageSize=10") CommonPageable pageable) { @ApiParam(value = "分页参数", required = false, defaultValue = "current=0&pageSize=10或pageNumber0&pageSize=10") CommonPageable pageable) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
String departmentId = getDepartmentId(reginParams); String departmentId = getDepartmentId(reginParams);
if (queryRequests == null) { if (queryRequests == null) {
...@@ -617,7 +617,7 @@ public class TaskController extends AbstractBaseController{ ...@@ -617,7 +617,7 @@ public class TaskController extends AbstractBaseController{
@RequestMapping(value = "/queryCriteria/init", method = RequestMethod.GET, produces = "application/json;charset=UTF-8") @RequestMapping(value = "/queryCriteria/init", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
public CommonResponse getQueryCriteriaInit(){ public CommonResponse getQueryCriteriaInit(){
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
if (ObjectUtils.isEmpty(reginParams)) { if (ObjectUtils.isEmpty(reginParams)) {
return CommonResponseUtil.failure("用户session过期"); return CommonResponseUtil.failure("用户session过期");
...@@ -659,7 +659,7 @@ public class TaskController extends AbstractBaseController{ ...@@ -659,7 +659,7 @@ public class TaskController extends AbstractBaseController{
public CommonResponse hiddenDangerCountByDate(@ApiParam(value = "年月日(yyyyMMdd)8位", required = true) @PathVariable String dateMonth) { public CommonResponse hiddenDangerCountByDate(@ApiParam(value = "年月日(yyyyMMdd)8位", required = true) @PathVariable String dateMonth) {
HashMap<String,Object> params = new HashMap<String,Object>(); HashMap<String,Object> params = new HashMap<String,Object>();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
if (XJConstant.ROLE_NAME_ADMIN.equals(roleTypeName.toUpperCase()) || if (XJConstant.ROLE_NAME_ADMIN.equals(roleTypeName.toUpperCase()) ||
XJConstant.ROLE_NAME_SUPERADMIN.equals(roleTypeName.toUpperCase())) { XJConstant.ROLE_NAME_SUPERADMIN.equals(roleTypeName.toUpperCase())) {
...@@ -706,7 +706,7 @@ public class TaskController extends AbstractBaseController{ ...@@ -706,7 +706,7 @@ public class TaskController extends AbstractBaseController{
HashMap<String,Object> params = new HashMap<String,Object>(); HashMap<String,Object> resp = new HashMap<String,Object>(); HashMap<String,Object> params = new HashMap<String,Object>(); HashMap<String,Object> resp = new HashMap<String,Object>();
AgencyUserModel user = getUserInfo(); AgencyUserModel user = getUserInfo();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
String roleTypeName = getRoleTypeName(reginParams); String roleTypeName = getRoleTypeName(reginParams);
String departmentId = getDepartmentId(reginParams); String departmentId = getDepartmentId(reginParams);
params.put("orgCode",orgCode); params.put("orgCode",orgCode);
...@@ -739,7 +739,7 @@ public class TaskController extends AbstractBaseController{ ...@@ -739,7 +739,7 @@ public class TaskController extends AbstractBaseController{
@ApiOperation(value = "查询任务统计", notes = "查询任务统计") @ApiOperation(value = "查询任务统计", notes = "查询任务统计")
public CommonResponse getTaskStatistics(@RequestBody(required=true) TaskStatisticsParam param) { public CommonResponse getTaskStatistics(@RequestBody(required=true) TaskStatisticsParam param) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
param.setOrgCode(orgCode); param.setOrgCode(orgCode);
List<TaskStatisticsVo> list = taskService.getTaskStatistics(param); List<TaskStatisticsVo> list = taskService.getTaskStatistics(param);
if (list!=null&&list.size()>0){ if (list!=null&&list.size()>0){
...@@ -792,7 +792,7 @@ public class TaskController extends AbstractBaseController{ ...@@ -792,7 +792,7 @@ public class TaskController extends AbstractBaseController{
@ApiOperation(value = "查询任务统计", notes = "查询任务统计") @ApiOperation(value = "查询任务统计", notes = "查询任务统计")
public void exportStatisticsData(@RequestBody(required=true) TaskStatisticsParam param, HttpServletResponse response) { public void exportStatisticsData(@RequestBody(required=true) TaskStatisticsParam param, HttpServletResponse response) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
param.setOrgCode(orgCode); param.setOrgCode(orgCode);
List<TaskStatisticsVo> list = taskService.getTaskStatistics(param); List<TaskStatisticsVo> list = taskService.getTaskStatistics(param);
if (list!=null&&list.size()>0){ if (list!=null&&list.size()>0){
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/TaskReportController.java
View file @ d6d191a6
...@@ -47,7 +47,7 @@ public class TaskReportController extends AbstractBaseController{ ...@@ -47,7 +47,7 @@ public class TaskReportController extends AbstractBaseController{
startDate += " 00:00:00"; startDate += " 00:00:00";
endDate += " 23:59:59"; endDate += " 23:59:59";
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getLoginOrgCode(reginParams); String orgCode = getOrgCode(reginParams);
return CommonResponseUtil.success(taskReportService.queryForTaskReport(getToken(),getProduct(),getAppKey(),statistical,startDate,endDate,planId,routeId,orgCode)); return CommonResponseUtil.success(taskReportService.queryForTaskReport(getToken(),getProduct(),getAppKey(),statistical,startDate,endDate,planId,routeId,orgCode));
} }
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/UserController.java
View file @ d6d191a6
...@@ -185,7 +185,7 @@ public class UserController extends AbstractBaseController { ...@@ -185,7 +185,7 @@ public class UserController extends AbstractBaseController {
CompanyModel companyModel = remoteSecurityService.listUserByCompanyId1(getToken(), getProduct(), getAppKey(), reginParams.getCompany().getSequenceNbr().toString()); CompanyModel companyModel = remoteSecurityService.listUserByCompanyId1(getToken(), getProduct(), getAppKey(), reginParams.getCompany().getSequenceNbr().toString());
List children = (List) companyModel.getChildren(); List children = (List) companyModel.getChildren();
List<DepartmentUserTreeWebVo> list = Lists.newArrayList(); List<DepartmentUserTreeWebVo> list = Lists.newArrayList();
String loginOrgCode= getLoginOrgCode(reginParams); String loginOrgCode= getOrgCode(reginParams);
for (int i = 0; i < children.size(); i++) { for (int i = 0; i < children.size(); i++) {
Map<String, Object> map = (LinkedHashMap) children.get(i); Map<String, Object> map = (LinkedHashMap) children.get(i);
JSONObject json = JSON.parseObject(JSON.toJSONString(map)); JSONObject json = JSON.parseObject(JSON.toJSONString(map));
...@@ -301,7 +301,7 @@ public class UserController extends AbstractBaseController { ...@@ -301,7 +301,7 @@ public class UserController extends AbstractBaseController {
public CommonResponse queryAllUser() { public CommonResponse queryAllUser() {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
List<AgencyUserModel> userModels = remoteSecurityService.listUserByOrgCode(getToken(), getProduct(), getAppKey(), loginOrgCode); List<AgencyUserModel> userModels = remoteSecurityService.listUserByOrgCode(getToken(), getProduct(), getAppKey(), loginOrgCode);
List<LinkedHashMap<String, Object>> userList = paraseData(userModels, null); List<LinkedHashMap<String, Object>> userList = paraseData(userModels, null);
return CommonResponseUtil.success(userList); return CommonResponseUtil.success(userList);
...@@ -746,7 +746,7 @@ public class UserController extends AbstractBaseController { ...@@ -746,7 +746,7 @@ public class UserController extends AbstractBaseController {
public CommonResponse saveCurCompany(@ApiParam(value = "当前登陆用户所选单位机构编号", required = true) @RequestBody ReginParams reginParams) { public CommonResponse saveCurCompany(@ApiParam(value = "当前登陆用户所选单位机构编号", required = true) @RequestBody ReginParams reginParams) {
try { try {
AgencyUserModel user = getUserInfo(); AgencyUserModel user = getUserInfo();
saveSelectedOrgInfo(reginParams); // saveSelectedOrgInfo(reginParams);
return CommonResponseUtil.success(buildCurCompany(getToken(),getProduct(),getAppKey(),reginParams, user)); return CommonResponseUtil.success(buildCurCompany(getToken(),getProduct(),getAppKey(),reginParams, user));
} catch (Exception e) { } catch (Exception e) {
logger.error("保存登陆用户选择公司信息异常", e); logger.error("保存登陆用户选择公司信息异常", e);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/AlertCalledController.java
View file @ d6d191a6
...@@ -87,16 +87,8 @@ public class AlertCalledController extends BaseController { ...@@ -87,16 +87,8 @@ public class AlertCalledController extends BaseController {
|| ValidationUtil.isEmpty(alertCalledObjsDto.getAlertCalledDto())){ || ValidationUtil.isEmpty(alertCalledObjsDto.getAlertCalledDto())){
throw new BadRequest("参数校验失败."); throw new BadRequest("参数校验失败.");
} }
ReginParams reginParams = ReginParams reginParams =getSelectedOrgInfo();
JSONObject.parseObject(null != redisUtils.get(buildKey(getToken())) ? alertCalledObjsDto =iAlertCalledService.createAlertCalled(alertCalledObjsDto,reginParams.getUserModel());
redisUtils.get(buildKey(getToken())).toString() : null, ReginParams.class);
//获取当前登录人公司
// Integer code= reginParams.getCompany().getCompanyOrgCode();
// AlertCalled alertCalled = alertCalledObjsDto.getAlertCalled();
// alertCalled.setOrgCode(String.valueOf(code));
// alertCalledObjsDto.setAlertCalled(alertCalled);
alertCalledObjsDto =iAlertCalledService.createAlertCalled(alertCalledObjsDto);
return ResponseHelper.buildResponse(alertCalledObjsDto.getAlertCalledDto()); return ResponseHelper.buildResponse(alertCalledObjsDto.getAlertCalledDto());
} }
...@@ -171,14 +163,12 @@ public class AlertCalledController extends BaseController { ...@@ -171,14 +163,12 @@ public class AlertCalledController extends BaseController {
String number = DateUtils.stampToDate(SystemClock.now(),"yyyy-MM-dd HH:mm:ss SSS"); String number = DateUtils.stampToDate(SystemClock.now(),"yyyy-MM-dd HH:mm:ss SSS");
String newNumber = number.replace("-","").replace(" ","").replace(":",""); String newNumber = number.replace("-","").replace(" ","").replace(":","");
ReginParams reginParams = ReginParams reginParams =getSelectedOrgInfo();
JSONObject.parseObject(null != redisUtils.get(buildKey(getToken())) ?
redisUtils.get(buildKey(getToken())).toString() : null, ReginParams.class);
// Map<String, Object> map = iAlertCalledService.getAlertInfoList(DateUtils.dateFormat(new Date(),"")+" 00:00:00", // Map<String, Object> map = iAlertCalledService.getAlertInfoList(DateUtils.dateFormat(new Date(),"")+" 00:00:00",
// DateUtils.dateFormat(new Date(),"")+" 23:59:59",reginParams.getCompany().getOrgCode(), // DateUtils.dateFormat(new Date(),"")+" 23:59:59",reginParams.getCompany().getOrgCode(),
// reginParams.getUserModel().getUserId()); // reginParams.getUserModel().getUserId());
Map<String, Object> map = iAlertCalledService.getAlertInfoList(DateUtils.dateFormat(new Date(),"")+" 00:00:00", Map<String, Object> map = iAlertCalledService.getAlertInfoList(DateUtils.stampToDate(System.currentTimeMillis(),"yyyy-MM-dd")+" 00:00:00",
DateUtils.dateFormat(new Date(),"")+" 23:59:59",null, DateUtils.stampToDate(System.currentTimeMillis(),"yyyy-MM-dd")+" 23:59:59",null,
null); null);
StringBuilder stringBuilder = new StringBuilder(); StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append(newNumber); stringBuilder.append(newNumber);
...@@ -195,9 +185,8 @@ public class AlertCalledController extends BaseController { ...@@ -195,9 +185,8 @@ public class AlertCalledController extends BaseController {
@GetMapping(value = "/alertStatistics") @GetMapping(value = "/alertStatistics")
@ApiOperation(httpMethod = "GET",value = "警情统计", notes = "警情统计") @ApiOperation(httpMethod = "GET",value = "警情统计", notes = "警情统计")
public ResponseModel<AlarmStatisticsDto> alertStatistics() throws ParseException { public ResponseModel<AlarmStatisticsDto> alertStatistics() throws ParseException {
ReginParams reginParams = ReginParams reginParams =getSelectedOrgInfo();
JSONObject.parseObject(null != redisUtils.get(buildKey(getToken())) ?
redisUtils.get(buildKey(getToken())).toString() : null, ReginParams.class);
//我的待办数量 //我的待办数量
QueryWrapper<AlertCalled> todoNumQueryWrapper = new QueryWrapper<>(); QueryWrapper<AlertCalled> todoNumQueryWrapper = new QueryWrapper<>();
//全部待办数量 //全部待办数量
...@@ -214,9 +203,11 @@ public class AlertCalledController extends BaseController { ...@@ -214,9 +203,11 @@ public class AlertCalledController extends BaseController {
alarmStatisticsDto.setTodoNum(iAlertCalledService.list(todoNumQueryWrapper).size()); alarmStatisticsDto.setTodoNum(iAlertCalledService.list(todoNumQueryWrapper).size());
alarmStatisticsDto.setAllNum(iAlertCalledService.list(allNumQueryWrapper).size()); alarmStatisticsDto.setAllNum(iAlertCalledService.list(allNumQueryWrapper).size());
Map<String, Object> map = iAlertCalledService.getAlertInfoList(DateUtils.dateFormat(new Date(),"")+" 00:00:00",
DateUtils.dateFormat(new Date(),"")+" 23:59:59",reginParams.getCompany().getOrgCode(), Map<String, Object> map = iAlertCalledService.getAlertInfoList(DateUtils.stampToDate(System.currentTimeMillis(),"yyyy-MM-dd")+" 00:00:00",
reginParams.getUserModel().getUserId()); DateUtils.stampToDate(System.currentTimeMillis(),"yyyy-MM-dd")+" 23:59:59",null,
getUserInfo().getUserId());
// 当天接警 // 当天接警
alarmStatisticsDto.setTodayAlarmNum(map.get("calledCount") == null ? 0 : Integer.valueOf(map.get("calledCount").toString())) ; alarmStatisticsDto.setTodayAlarmNum(map.get("calledCount") == null ? 0 : Integer.valueOf(map.get("calledCount").toString())) ;
//当天提交 //当天提交
...@@ -231,10 +222,9 @@ public class AlertCalledController extends BaseController { ...@@ -231,10 +222,9 @@ public class AlertCalledController extends BaseController {
Map<String,Integer> recordMap = Maps.newHashMap(); Map<String,Integer> recordMap = Maps.newHashMap();
// 近七天办理数量 // 近七天办理数量
for(int i = 1 ; i < 8; i++) { for(int i = 1 ; i < 8; i++) {
Map<String, Object> nearlySevenDaysMap = iAlertCalledService.getAlertInfoList( Map<String, Object> nearlySevenDaysMap = iAlertCalledService.getAlertInfoList(DateUtils.stampToDate(System.currentTimeMillis(),"yyyy-MM-dd")+" 00:00:00",
DateUtils.dateFormat(DateUtils.dateAddDays(new Date(), -i),"")+" 00:00:00", DateUtils.stampToDate(System.currentTimeMillis(),"yyyy-MM-dd")+" 23:59:59",null,
DateUtils.dateFormat(DateUtils.dateAddDays(new Date(), -i),"")+" 23:59:59",reginParams.getCompany().getOrgCode(), getUserInfo().getUserId());
reginParams.getUserModel().getUserId());
recordMap.put(DateUtils.dateFormat(DateUtils.dateAddDays(new Date(), -i),""),nearlySevenDaysMap.get("calledCount") == null ? 0 : Integer.valueOf(nearlySevenDaysMap.get("calledCount").toString())); recordMap.put(DateUtils.dateFormat(DateUtils.dateAddDays(new Date(), -i),""),nearlySevenDaysMap.get("calledCount") == null ? 0 : Integer.valueOf(nearlySevenDaysMap.get("calledCount").toString()));
} }
alarmStatisticsDto.setNearlySevenDaysNum(recordMap); alarmStatisticsDto.setNearlySevenDaysNum(recordMap);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/DispatchPaperController.java
View file @ d6d191a6
...@@ -71,7 +71,7 @@ public class DispatchPaperController extends BaseController { ...@@ -71,7 +71,7 @@ public class DispatchPaperController extends BaseController {
if (ValidationUtil.isEmpty(dispatchSaveFeedbackDto) if (ValidationUtil.isEmpty(dispatchSaveFeedbackDto)
|| ValidationUtil.isEmpty(dispatchSaveFeedbackDto.getAlertId())) || ValidationUtil.isEmpty(dispatchSaveFeedbackDto.getAlertId()))
throw new BadRequest("参数校验失败."); throw new BadRequest("参数校验失败.");
return ResponseHelper.buildResponse(dispatchPaperServiceImpl.saveDispatchSaveFeedback(dispatchSaveFeedbackDto)); return ResponseHelper.buildResponse(dispatchPaperServiceImpl.saveDispatchSaveFeedback(dispatchSaveFeedbackDto,getSelectedOrgInfo().getUserModel()));
} }
/** /**
...@@ -100,7 +100,7 @@ public class DispatchPaperController extends BaseController { ...@@ -100,7 +100,7 @@ public class DispatchPaperController extends BaseController {
if (ValidationUtil.isEmpty(dispatchRepairFeedbackDto) if (ValidationUtil.isEmpty(dispatchRepairFeedbackDto)
|| ValidationUtil.isEmpty(dispatchRepairFeedbackDto.getAlertId())) || ValidationUtil.isEmpty(dispatchRepairFeedbackDto.getAlertId()))
throw new BadRequest("参数校验失败."); throw new BadRequest("参数校验失败.");
return ResponseHelper.buildResponse(dispatchPaperServiceImpl.saveDispatchRepairFeedback(dispatchRepairFeedbackDto)); return ResponseHelper.buildResponse(dispatchPaperServiceImpl.saveDispatchRepairFeedback(dispatchRepairFeedbackDto,getSelectedOrgInfo().getUserModel()));
} }
/** /**
...@@ -128,7 +128,7 @@ public class DispatchPaperController extends BaseController { ...@@ -128,7 +128,7 @@ public class DispatchPaperController extends BaseController {
if (ValidationUtil.isEmpty(dispatchConsultFeedbackDto) if (ValidationUtil.isEmpty(dispatchConsultFeedbackDto)
|| ValidationUtil.isEmpty(dispatchConsultFeedbackDto.getAlertId())) || ValidationUtil.isEmpty(dispatchConsultFeedbackDto.getAlertId()))
throw new BadRequest("参数校验失败."); throw new BadRequest("参数校验失败.");
return ResponseHelper.buildResponse(dispatchPaperServiceImpl.saveDispatchConsultFeedback(dispatchConsultFeedbackDto)); return ResponseHelper.buildResponse(dispatchPaperServiceImpl.saveDispatchConsultFeedback(dispatchConsultFeedbackDto,getSelectedOrgInfo().getUserModel()));
} }
/** /**
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/DispatchTaskController.java
View file @ d6d191a6
package com.yeejoin.amos.boot.module.tzs.biz.controller; package com.yeejoin.amos.boot.module.tzs.biz.controller;
import com.alibaba.fastjson.JSONObject; import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import org.springframework.beans.factory.annotation.Autowired;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils; import org.springframework.web.bind.annotation.GetMapping;
import com.yeejoin.amos.boot.module.tzs.api.entity.AlertFormValue; import org.springframework.web.bind.annotation.PathVariable;
import com.yeejoin.amos.boot.module.tzs.api.entity.DispatchTask; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.yeejoin.amos.boot.biz.common.controller.BaseController; import org.typroject.tyboot.core.foundation.enumeration.UserType;
import java.util.List; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import com.yeejoin.amos.boot.module.tzs.biz.service.impl.DispatchTaskServiceImpl;
import org.typroject.tyboot.core.restful.utils.ResponseHelper; import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import org.springframework.beans.factory.annotation.Autowired;
import javax.servlet.http.HttpServletRequest; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.springframework.web.bind.annotation.*; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.tzs.api.dto.DispatchTaskDto; import com.yeejoin.amos.boot.module.tzs.api.dto.DispatchTaskDto;
import org.typroject.tyboot.core.restful.doc.TycloudOperation; import com.yeejoin.amos.boot.module.tzs.api.entity.DispatchTask;
import org.typroject.tyboot.core.foundation.enumeration.UserType; import com.yeejoin.amos.boot.module.tzs.biz.service.impl.DispatchTaskServiceImpl;
import static org.typroject.tyboot.core.foundation.context.RequestContext.getToken; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
/** /**
* 派遣任务 * 派遣任务
...@@ -64,9 +64,7 @@ public class DispatchTaskController extends BaseController { ...@@ -64,9 +64,7 @@ public class DispatchTaskController extends BaseController {
@PostMapping(value = "/save") @PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增派遣任务", notes = "新增派遣任务") @ApiOperation(httpMethod = "POST", value = "新增派遣任务", notes = "新增派遣任务")
public ResponseModel<Boolean> save(@RequestBody DispatchTaskDto model) { public ResponseModel<Boolean> save(@RequestBody DispatchTaskDto model) {
ReginParams reginParams = ReginParams reginParams =getSelectedOrgInfo();
JSONObject.parseObject(null != redisUtils.get(buildKey(getToken())) ?
redisUtils.get(buildKey(getToken())).toString() : null, ReginParams.class);
Boolean flag = dispatchTaskServiceImpl.createDispatchTask(model,reginParams.getUserModel()); Boolean flag = dispatchTaskServiceImpl.createDispatchTask(model,reginParams.getUserModel());
return ResponseHelper.buildResponse(flag); return ResponseHelper.buildResponse(flag);
} }
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/RescueProcessController.java
View file @ d6d191a6
package com.yeejoin.amos.boot.module.tzs.biz.controller; package com.yeejoin.amos.boot.module.tzs.biz.controller;
import com.alibaba.fastjson.JSONObject; import java.util.List;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils; import org.springframework.beans.factory.annotation.Autowired;
import com.yeejoin.amos.boot.module.tzs.api.entity.RescueStation; import org.springframework.web.bind.annotation.GetMapping;
import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.RequestParam;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.yeejoin.amos.boot.biz.common.controller.BaseController; import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import java.util.Date;
import java.util.List;
import com.yeejoin.amos.boot.module.tzs.biz.service.impl.RescueProcessServiceImpl;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.restful.utils.ResponseHelper; import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import org.springframework.beans.factory.annotation.Autowired;
import javax.servlet.http.HttpServletRequest;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.tzs.api.dto.RescueProcessDto; import com.yeejoin.amos.boot.module.tzs.api.dto.RescueProcessDto;
import org.typroject.tyboot.core.restful.doc.TycloudOperation; import com.yeejoin.amos.boot.module.tzs.biz.service.impl.RescueProcessServiceImpl;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
/** /**
* 救援过程表 * 救援过程表
...@@ -52,9 +52,7 @@ public class RescueProcessController extends BaseController { ...@@ -52,9 +52,7 @@ public class RescueProcessController extends BaseController {
@PostMapping(value = "/updateByAlertId") @PostMapping(value = "/updateByAlertId")
@ApiOperation(httpMethod = "PUT", value = "根据警情id 更新救援信息表", notes = "根据警情id 更新救援信息表") @ApiOperation(httpMethod = "PUT", value = "根据警情id 更新救援信息表", notes = "根据警情id 更新救援信息表")
public ResponseModel<Boolean> save(@RequestBody RescueProcessDto model) { public ResponseModel<Boolean> save(@RequestBody RescueProcessDto model) {
ReginParams reginParams = ReginParams reginParams =getSelectedOrgInfo();
JSONObject.parseObject(null != redisUtils.get(buildKey(getToken())) ?
redisUtils.get(buildKey(getToken())).toString() : null, ReginParams.class);
boolean update = rescueProcessServiceImpl.updateByAlertId(model,reginParams.getUserModel()); boolean update = rescueProcessServiceImpl.updateByAlertId(model,reginParams.getUserModel());
return ResponseHelper.buildResponse(update); return ResponseHelper.buildResponse(update);
} }
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/AlertCalledServiceImpl.java
View file @ d6d191a6
...@@ -20,6 +20,7 @@ import com.yeejoin.amos.boot.module.tzs.api.mapper.AlertCalledMapper; ...@@ -20,6 +20,7 @@ import com.yeejoin.amos.boot.module.tzs.api.mapper.AlertCalledMapper;
import com.yeejoin.amos.boot.module.tzs.api.service.IAlertCalledService; import com.yeejoin.amos.boot.module.tzs.api.service.IAlertCalledService;
import com.yeejoin.amos.boot.module.tzs.biz.utils.AlertBeanDtoVoUtils; import com.yeejoin.amos.boot.module.tzs.biz.utils.AlertBeanDtoVoUtils;
import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils; import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -69,6 +70,8 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall ...@@ -69,6 +70,8 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
@Autowired @Autowired
RescueProcessServiceImpl rescueProcessServiceImpl; RescueProcessServiceImpl rescueProcessServiceImpl;
@Autowired
RepairConsultServiceImpl repairConsultServiceImpl;
private final Logger logger = LogManager.getLogger(AlertCalledServiceImpl.class); private final Logger logger = LogManager.getLogger(AlertCalledServiceImpl.class);
...@@ -159,7 +162,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall ...@@ -159,7 +162,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
* @return * @return
*/ */
@Transactional(rollbackFor = RuntimeException.class) @Transactional(rollbackFor = RuntimeException.class)
public AlertCalledObjsDto createAlertCalled(AlertCalledObjsDto alertCalledObjsDto) { public AlertCalledObjsDto createAlertCalled(AlertCalledObjsDto alertCalledObjsDto, AgencyUserModel user) {
try { try {
// 警情基本信息 // 警情基本信息
...@@ -172,9 +175,9 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall ...@@ -172,9 +175,9 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
// 警情归并，设置当前警情状态为结束。 // 警情归并，设置当前警情状态为结束。
alertCalled.setAlertStatus(true); alertCalled.setAlertStatus(true);
alertCalled.setAlertStage(AlertStageEnums.JJ.getValue()); alertCalled.setAlertStage(AlertStageEnums.JJ.getValue());
alertCalled.setAlertStageCode(AlertStageEnums.JJ.getCode()); alertCalled.setAlertStageCode(AlertStageEnums.JJ.getId());
alertCalled.setType(AlertStageEnums.JQGB.getValue()); alertCalled.setType(AlertStageEnums.JQGB.getValue());
alertCalled.setTypeCode(AlertStageEnums.JQGB.getCode()); alertCalled.setTypeCode(AlertStageEnums.JQGB.getId());
this.save(alertCalled); this.save(alertCalled);
// 动态表单 // 动态表单
List<AlertFormValue> alertFormValuelist = alertCalledObjsDto.getAlertFormValue(); List<AlertFormValue> alertFormValuelist = alertCalledObjsDto.getAlertFormValue();
...@@ -195,9 +198,9 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall ...@@ -195,9 +198,9 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
alertCalled.setAlertStatus(false); alertCalled.setAlertStatus(false);
alertCalled.setIsDelete(false); alertCalled.setIsDelete(false);
alertCalled.setAlertStage(AlertStageEnums.JJ.getValue()); alertCalled.setAlertStage(AlertStageEnums.JJ.getValue());
alertCalled.setAlertStageCode(AlertStageEnums.JJ.getCode()); alertCalled.setAlertStageCode(AlertStageEnums.JJ.getId());
alertCalled.setType(AlertStageEnums.JQCB.getValue()); alertCalled.setType(AlertStageEnums.JQCB.getValue());
alertCalled.setTypeCode(AlertStageEnums.JQCB.getCode()); alertCalled.setTypeCode(AlertStageEnums.JQCB.getId());
this.save(alertCalled); this.save(alertCalled);
// 动态表单 // 动态表单
...@@ -207,7 +210,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall ...@@ -207,7 +210,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
alertFormValue.setAlertCalledId(alertCalled.getSequenceNbr()); alertFormValue.setAlertCalledId(alertCalled.getSequenceNbr());
alertFormValue.setAlertTypeCode(alertCalled.getAlarmTypeCode()); alertFormValue.setAlertTypeCode(alertCalled.getAlarmTypeCode());
}); });
if(AlertStageEnums.KRJY.getCode().equals(alertCalled.getAlarmTypeCode()) ) { if(AlertStageEnums.KRJY.getId().equals(alertCalled.getAlarmTypeCode()) ) {
//困人救援创建警情时创建救援过程信息 //困人救援创建警情时创建救援过程信息
rescueProcessServiceImpl.getProcessByAlertId(alertCalled.getSequenceNbr()); rescueProcessServiceImpl.getProcessByAlertId(alertCalled.getSequenceNbr());
} }
...@@ -216,15 +219,8 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall ...@@ -216,15 +219,8 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
iAlertFormValueService.saveBatch(alertFormValuelist); iAlertFormValueService.saveBatch(alertFormValuelist);
alertCalledObjsDto.setAlertCalledDto(BeanDtoVoUtils.convert(alertCalled,AlertCalledDto.class)); alertCalledObjsDto.setAlertCalledDto(BeanDtoVoUtils.convert(alertCalled,AlertCalledDto.class));
alertCalledObjsDto.setAlertFormValue(alertFormValuelist); alertCalledObjsDto.setAlertFormValue(alertFormValuelist);
//保存处置记录-接警 //保存处置记录-接警
if(AlertStageEnums.KRJY.getCode().equals(alertCalled.getAlarmTypeCode())) { repairConsultServiceImpl.saveRepairConsultByAlertIdType(alertCalled.getSequenceNbr(),"JJ",null, user); //保存接警日志
saveRapairConsylt(AlertStageEnums.JJ.getCode(),alertCalled);
} else if(AlertStageEnums.GZWX.getCode().equals(alertCalled.getAlarmTypeCode())) {
saveRapairConsylt(AlertStageEnums.JJ.getCode(),alertCalled);
} else {
saveRapairConsylt(AlertStageEnums.JJ.getCode(),alertCalled);
}
} }
/** /**
...@@ -239,25 +235,6 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall ...@@ -239,25 +235,6 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
} }
} }
private void saveRapairConsylt(String typeCode,AlertCalled alertCalled ) throws ParseException {
// 获取警情接警处置记录模板
Template template = templateService.getOne(new QueryWrapper<Template>().eq("type_code",
typeCode).eq("format", false));
String templateContent = template.getContent();
String transferDetails = templateContent.replace("callTime", DateUtils.dateTimeToDateString(alertCalled.getCallTime()))
.replace("user",alertCalled.getRecUserName()).replace("emergencyCall",alertCalled.getEmergencyCall());
RepairConsult repairConsult = new RepairConsult();
repairConsult.setParentId(alertCalled.getSequenceNbr());
repairConsult.setType(alertCalled.getAlarmTypeCode());
repairConsult.setAlertStageCode(alertCalled.getAlertStageCode());
repairConsult.setAlertStatus(alertCalled.getAlertStage());
repairConsult.setContactUser(alertCalled.getEmergencyPerson());
repairConsult.setContactPhone(alertCalled.getContactPhone());
repairConsult.setDescription(transferDetails);
repairConsultService.save(repairConsult);
}
public Map<String, Object> getAlertInfoList(String beginDate, String endDate,String orgCode, String recUserId) { public Map<String, Object> getAlertInfoList(String beginDate, String endDate,String orgCode, String recUserId) {
Map<String, Object> result = Maps.newHashMap(); Map<String, Object> result = Maps.newHashMap();
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/DispatchPaperServiceImpl.java
View file @ d6d191a6
...@@ -18,6 +18,7 @@ import com.yeejoin.amos.boot.module.tzs.api.entity.DispatchPaper; ...@@ -18,6 +18,7 @@ import com.yeejoin.amos.boot.module.tzs.api.entity.DispatchPaper;
import com.yeejoin.amos.boot.module.tzs.api.entity.DispatchTask; import com.yeejoin.amos.boot.module.tzs.api.entity.DispatchTask;
import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator; import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
import com.yeejoin.amos.boot.module.tzs.api.entity.MaintenanceUnit; import com.yeejoin.amos.boot.module.tzs.api.entity.MaintenanceUnit;
import com.yeejoin.amos.boot.module.tzs.api.enums.AlertStageEnums;
import com.yeejoin.amos.boot.module.tzs.api.enums.DispatchPaperEnums; import com.yeejoin.amos.boot.module.tzs.api.enums.DispatchPaperEnums;
import com.yeejoin.amos.boot.module.tzs.api.mapper.DispatchPaperMapper; import com.yeejoin.amos.boot.module.tzs.api.mapper.DispatchPaperMapper;
import com.yeejoin.amos.boot.module.tzs.api.service.IDispatchPaperService; import com.yeejoin.amos.boot.module.tzs.api.service.IDispatchPaperService;
...@@ -69,6 +70,8 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa ...@@ -69,6 +70,8 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
@Autowired @Autowired
private RescueProcessServiceImpl rescueProcessServiceImpl; private RescueProcessServiceImpl rescueProcessServiceImpl;
@Autowired
RepairConsultServiceImpl repairConsultServiceImpl;
/** /**
* 分页查询 * 分页查询
...@@ -108,7 +111,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa ...@@ -108,7 +111,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
// 填充警情主键 // 填充警情主键
paperFormValuelist.stream().forEach(paperFormValue -> { paperFormValuelist.stream().forEach(paperFormValue -> {
paperFormValue.setAlertCalledId(dispatchPaper.getSequenceNbr()); paperFormValue.setAlertCalledId(dispatchPaper.getSequenceNbr());
paperFormValue.setAlertTypeCode(DispatchPaperEnums.getEnum(dispatchPaper.getAlertCode()).getDynamicCode()); paperFormValue.setAlertTypeCode(DispatchPaperEnums.getEnumById(dispatchPaper.getAlertCode()).getDynamicCode());
}); });
// 保存动态表单数据 // 保存动态表单数据
iAlertFormValueService.saveBatch(paperFormValuelist); iAlertFormValueService.saveBatch(paperFormValuelist);
...@@ -134,7 +137,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa ...@@ -134,7 +137,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
dispatchPaperFormDto.setDispatchPaper(dispatchPaper); dispatchPaperFormDto.setDispatchPaper(dispatchPaper);
QueryWrapper<AlertFormValue> queryWrapper = new QueryWrapper<>(); QueryWrapper<AlertFormValue> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("alert_called_id", dispatchPaper.getSequenceNbr()).eq("alert_type_code", DispatchPaperEnums.getEnum(dispatchPaper.getAlertCode()).getDynamicCode()); queryWrapper.eq("alert_called_id", dispatchPaper.getSequenceNbr()).eq("alert_type_code", DispatchPaperEnums.getEnumById(dispatchPaper.getAlertCode()).getDynamicCode());
// 派遣单动态表单数据 // 派遣单动态表单数据
List<AlertFormValue> list = iAlertFormValueService.list(queryWrapper); List<AlertFormValue> list = iAlertFormValueService.list(queryWrapper);
dispatchPaperFormDto.setDynamicFormAlert(list); dispatchPaperFormDto.setDynamicFormAlert(list);
...@@ -154,13 +157,13 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa ...@@ -154,13 +157,13 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
dispatchPaper.setDispatchTime(new Date()); dispatchPaper.setDispatchTime(new Date());
dispatchPaper.setIsDelete(false); dispatchPaper.setIsDelete(false);
// 完成状态 派遣状态 派遣人 // 完成状态 派遣状态 派遣人
DispatchPaperEnums finishStatus = DispatchPaperEnums.getEnum("notFinish"); DispatchPaperEnums finishStatus = DispatchPaperEnums.getEnumByCode("notFinish");
dispatchPaper.setPaperStatus(finishStatus.getValue()); dispatchPaper.setPaperStatus(finishStatus.getValue());
dispatchPaper.setPaperStatusCode(finishStatus.getCode()); dispatchPaper.setPaperStatusCode(finishStatus.getId());
DispatchPaperEnums dispatchStatus = DispatchPaperEnums.getEnum("receivedAlert"); DispatchPaperEnums dispatchStatus = DispatchPaperEnums.getEnumByCode("receivedAlert");
dispatchPaper.setProcessStatus(dispatchStatus.getValue()); dispatchPaper.setProcessStatus(dispatchStatus.getValue());
dispatchPaper.setProcessStatusCode(dispatchStatus.getCode()); dispatchPaper.setProcessStatusCode(dispatchStatus.getId());
dispatchPaper.setSendUserId(sendUser.getUserId()); dispatchPaper.setSendUserId(sendUser.getUserId());
dispatchPaper.setSendUserName(sendUser.getUserName()); dispatchPaper.setSendUserName(sendUser.getUserName());
...@@ -173,13 +176,13 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa ...@@ -173,13 +176,13 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
this.save(dispatchPaper); this.save(dispatchPaper);
// 根据类型创建动态表单信息 // 根据类型创建动态表单信息
String dynamicCode = DispatchPaperEnums.getEnum(alertCode).getDynamicCode(); String dynamicCode = DispatchPaperEnums.getEnumById(alertCode).getDynamicCode();
List<AlertFormInitDto> alertFormInitDtoList = alertFormServiceImpl.getFormlist(dynamicCode); List<AlertFormInitDto> alertFormInitDtoList = alertFormServiceImpl.getFormlist(dynamicCode);
List<AlertFormValue> paperFormValuelist = new ArrayList<AlertFormValue>(alertFormInitDtoList.size()); List<AlertFormValue> paperFormValuelist = new ArrayList<AlertFormValue>(alertFormInitDtoList.size());
// 填充警情主键 // 填充警情主键
alertFormInitDtoList.stream().forEach(initDto -> { alertFormInitDtoList.stream().forEach(initDto -> {
initDto.getFormItemDescr().setAlertCalledId(dispatchPaper.getSequenceNbr()); initDto.getFormItemDescr().setAlertCalledId(dispatchPaper.getSequenceNbr());
initDto.getFormItemDescr().setAlertTypeCode(DispatchPaperEnums.getEnum(dispatchPaper.getAlertCode()).getDynamicCode()); initDto.getFormItemDescr().setAlertTypeCode(dynamicCode);
initDto.getFormItemDescr().setFieldValue(null); initDto.getFormItemDescr().setFieldValue(null);
paperFormValuelist.add(initDto.getFormItemDescr()); paperFormValuelist.add(initDto.getFormItemDescr());
}); });
...@@ -188,7 +191,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa ...@@ -188,7 +191,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
dispatchPaperFormDto.setDispatchPaper(dispatchPaper); dispatchPaperFormDto.setDispatchPaper(dispatchPaper);
dispatchPaperFormDto.setDynamicFormAlert(paperFormValuelist); dispatchPaperFormDto.setDynamicFormAlert(paperFormValuelist);
if("KRJY".equals(alertCode)) { if("KRJY".equals(AlertStageEnums.getEnumById(alertCode).getCode())) {
RescueProcessDto rescueProcessDto = new RescueProcessDto(); RescueProcessDto rescueProcessDto = new RescueProcessDto();
rescueProcessDto.setAlertId(alertId); rescueProcessDto.setAlertId(alertId);
rescueProcessDto.setDispatchStatus(true); rescueProcessDto.setDispatchStatus(true);
...@@ -299,7 +302,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa ...@@ -299,7 +302,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
} }
@Override @Override
public Boolean saveDispatchSaveFeedback(DispatchSaveFeedbackDto dispatchSaveFeedbackDto) { public Boolean saveDispatchSaveFeedback(DispatchSaveFeedbackDto dispatchSaveFeedbackDto, AgencyUserModel user) {
Boolean flag = false; Boolean flag = false;
// 保存救援回访信息 // 保存救援回访信息
DispatchPaperFormDto dispatchPaperFormDto = this.selectDispatchPaperDtoByAlertId(dispatchSaveFeedbackDto.getAlertId()); DispatchPaperFormDto dispatchPaperFormDto = this.selectDispatchPaperDtoByAlertId(dispatchSaveFeedbackDto.getAlertId());
...@@ -356,6 +359,14 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa ...@@ -356,6 +359,14 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
iAlertFormValueService.updateBatchById(dynamicFormAlert); iAlertFormValueService.updateBatchById(dynamicFormAlert);
// 保存派遣表 // 保存派遣表
flag = this.updateById(dispatchPaper); flag = this.updateById(dispatchPaper);
// 坐席回访
repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchSaveFeedbackDto.getAlertId(),"JYHF",null,user);
Long taskId = dispatchPaper.getRepairOrgTaskId() != null ? dispatchPaper.getRepairOrgTaskId() : dispatchPaper.getUseOrgTaskId();
if(taskId == null) {
throw new BadRequest("未找到反馈任务单");
}
// 维修反馈
repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchSaveFeedbackDto.getAlertId(),"WXFK",taskId,user);
return flag; return flag;
} }
...@@ -471,7 +482,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa ...@@ -471,7 +482,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
} }
@Override @Override
public Boolean saveDispatchRepairFeedback(DispatchRepairFeedbackDto dispatchRepairFeedbackDto) { public Boolean saveDispatchRepairFeedback(DispatchRepairFeedbackDto dispatchRepairFeedbackDto, AgencyUserModel user) {
Boolean flag = false; Boolean flag = false;
// 保存救援回访信息 // 保存救援回访信息
DispatchPaperFormDto dispatchPaperFormDto = this.selectDispatchPaperDtoByAlertId(dispatchRepairFeedbackDto.getAlertId()); DispatchPaperFormDto dispatchPaperFormDto = this.selectDispatchPaperDtoByAlertId(dispatchRepairFeedbackDto.getAlertId());
...@@ -546,6 +557,12 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa ...@@ -546,6 +557,12 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
iAlertFormValueService.updateBatchById(dynamicFormAlert); iAlertFormValueService.updateBatchById(dynamicFormAlert);
// 保存派遣表 // 保存派遣表
flag = this.updateById(dispatchPaper); flag = this.updateById(dispatchPaper);
// 报修反馈
Long taskId = dispatchPaper.getRepairOrgTaskId() != null ? dispatchPaper.getRepairOrgTaskId() : dispatchPaper.getUseOrgTaskId();
if(taskId == null) {
throw new BadRequest("未找到反馈任务单");
}
repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchRepairFeedbackDto.getAlertId(),"BXFK",taskId,user);
return flag; return flag;
} }
...@@ -657,7 +674,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa ...@@ -657,7 +674,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
} }
@Override @Override
public Boolean saveDispatchConsultFeedback(DispatchConsultFeedbackDto dispatchConsultFeedbackDto) { public Boolean saveDispatchConsultFeedback(DispatchConsultFeedbackDto dispatchConsultFeedbackDto, AgencyUserModel user) {
Boolean flag = false; Boolean flag = false;
// 保存救援回访信息 // 保存救援回访信息
DispatchPaperFormDto dispatchPaperFormDto = this.selectDispatchPaperDtoByAlertId(dispatchConsultFeedbackDto.getAlertId()); DispatchPaperFormDto dispatchPaperFormDto = this.selectDispatchPaperDtoByAlertId(dispatchConsultFeedbackDto.getAlertId());
...@@ -723,6 +740,12 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa ...@@ -723,6 +740,12 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
iAlertFormValueService.updateBatchById(dynamicFormAlert); iAlertFormValueService.updateBatchById(dynamicFormAlert);
// 保存派遣表 // 保存派遣表
flag = this.updateById(dispatchPaper); flag = this.updateById(dispatchPaper);
// 投诉人反馈
Long taskId = dispatchPaper.getRepairOrgTaskId() != null ? dispatchPaper.getRepairOrgTaskId() : dispatchPaper.getUseOrgTaskId();
if(taskId == null) {
throw new BadRequest("未找到反馈任务单");
}
repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchConsultFeedbackDto.getAlertId(),"TSRFK",taskId,user);
return flag; return flag;
} }
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/DispatchTaskServiceImpl.java
View file @ d6d191a6
...@@ -15,6 +15,7 @@ import com.yeejoin.amos.boot.module.tzs.api.entity.RescueStation; ...@@ -15,6 +15,7 @@ import com.yeejoin.amos.boot.module.tzs.api.entity.RescueStation;
import com.yeejoin.amos.boot.module.tzs.api.entity.Template; import com.yeejoin.amos.boot.module.tzs.api.entity.Template;
import com.yeejoin.amos.boot.module.tzs.api.entity.UseUnit; import com.yeejoin.amos.boot.module.tzs.api.entity.UseUnit;
import com.yeejoin.amos.boot.module.tzs.api.enums.AlertStageEnums; import com.yeejoin.amos.boot.module.tzs.api.enums.AlertStageEnums;
import com.yeejoin.amos.boot.module.tzs.api.enums.DispatchPaperEnums;
import com.yeejoin.amos.boot.module.tzs.api.mapper.DispatchTaskMapper; import com.yeejoin.amos.boot.module.tzs.api.mapper.DispatchTaskMapper;
import com.yeejoin.amos.boot.module.tzs.api.service.IDispatchTaskService; import com.yeejoin.amos.boot.module.tzs.api.service.IDispatchTaskService;
import com.yeejoin.amos.boot.module.tzs.api.service.IMaintenanceUnitService; import com.yeejoin.amos.boot.module.tzs.api.service.IMaintenanceUnitService;
...@@ -67,6 +68,9 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc ...@@ -67,6 +68,9 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
@Autowired @Autowired
IRescueStationService iRescueStationService; IRescueStationService iRescueStationService;
@Autowired
RepairConsultServiceImpl repairConsultServiceImpl;
/** /**
* 分页查询 * 分页查询
*/ */
...@@ -83,6 +87,9 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc ...@@ -83,6 +87,9 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
@Override @Override
public Boolean createDispatchTask(DispatchTaskDto dispatchTaskDto, AgencyUserModel sendUser) { public Boolean createDispatchTask(DispatchTaskDto dispatchTaskDto, AgencyUserModel sendUser) {
if(sendUser == null) {
throw new BadRequest("派遣任务创建人不能为空");
}
boolean flag = false; boolean flag = false;
// 判断派遣单是否存在 如果不存在先创建派遣单 // 判断派遣单是否存在 如果不存在先创建派遣单
DispatchPaperFormDto dispatchPaperDto = dispatchPaperServiceImpl.selectDispatchPaperDtoByAlertId(dispatchTaskDto.getAlertId()); DispatchPaperFormDto dispatchPaperDto = dispatchPaperServiceImpl.selectDispatchPaperDtoByAlertId(dispatchTaskDto.getAlertId());
...@@ -114,7 +121,7 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc ...@@ -114,7 +121,7 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
UseUnit useUnit = iUseUnitService.getById(dispatchTask.getResponseOrgId()); UseUnit useUnit = iUseUnitService.getById(dispatchTask.getResponseOrgId());
dispatchPaper.setUseOrgId(useUnit.getSequenceNbr()); dispatchPaper.setUseOrgId(useUnit.getSequenceNbr());
dispatchPaper.setUseOrgTaskId(dispatchTask.getSequenceNbr()); dispatchPaper.setUseOrgTaskId(dispatchTask.getSequenceNbr());
if(dispatchPaper.getAlertCode().equals("KRJY")) { if(AlertStageEnums.getEnumById(dispatchPaper.getAlertCode()).getCode().equals("KRJY")) {
dynamicFormAlert.stream().forEach(alertFormValue -> { dynamicFormAlert.stream().forEach(alertFormValue -> {
if(alertFormValue.getFieldCode().equals("dispatch_status")) { if(alertFormValue.getFieldCode().equals("dispatch_status")) {
alertFormValue.setFieldValue("已派遣"); alertFormValue.setFieldValue("已派遣");
...@@ -166,6 +173,8 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc ...@@ -166,6 +173,8 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
dispatchPaperServiceImpl.updateById(dispatchPaper); dispatchPaperServiceImpl.updateById(dispatchPaper);
// 保存动态表单数据 // 保存动态表单数据
iAlertFormValueService.updateBatchById(dynamicFormAlert); iAlertFormValueService.updateBatchById(dynamicFormAlert);
// 记录日志
repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchTask.getAlertId(),"PQ", dispatchTask.getSequenceNbr(),sendUser);
} }
return flag; return flag;
} }
...@@ -175,12 +184,13 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc ...@@ -175,12 +184,13 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
DispatchTaskDto dispatchTaskDto = new DispatchTaskDto(); DispatchTaskDto dispatchTaskDto = new DispatchTaskDto();
// 获取警情信息 填充模板返回 // 获取警情信息 填充模板返回
AlertCalledDto alertCalledDto = alertCalledServiceImpl.queryBySeq(alertId); AlertCalledDto alertCalledDto = alertCalledServiceImpl.queryBySeq(alertId);
dispatchTaskDto.setOrgTypeCode(orgTypeCode); dispatchTaskDto.setOrgType(DispatchPaperEnums.getEnumByCode(orgTypeCode).getValue());
dispatchTaskDto.setOrgTypeCode(DispatchPaperEnums.getEnumByCode(orgTypeCode).getId());
dispatchTaskDto.setAlertId(alertId); dispatchTaskDto.setAlertId(alertId);
dispatchTaskDto.setAlertCode(alertCalledDto.getAlarmTypeCode()); dispatchTaskDto.setAlertCode(alertCalledDto.getAlarmTypeCode());
// 获取模板 拼接json // 获取模板 拼接json
QueryWrapper<Template> templateQueryWrapper = new QueryWrapper<>(); QueryWrapper<Template> templateQueryWrapper = new QueryWrapper<>();
String alertTypeCode = alertCalledDto.getAlarmTypeCode(); String alertTypeCode = AlertStageEnums.getEnumById(alertCalledDto.getAlarmTypeCode()).getCode() ;
templateQueryWrapper.eq("type_code","TASK-" + alertTypeCode); templateQueryWrapper.eq("type_code","TASK-" + alertTypeCode);
Template template = templateServiceImpl.getOne(templateQueryWrapper); Template template = templateServiceImpl.getOne(templateQueryWrapper);
String content = template.getContent(); String content = template.getContent();
...@@ -200,11 +210,11 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc ...@@ -200,11 +210,11 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
content = content.replace("$call_time",createTime).replace("$address",address).replace("$rescue_code",rescueCode).replace("$use_site_category",useSiteCategory); content = content.replace("$call_time",createTime).replace("$address",address).replace("$rescue_code",rescueCode).replace("$use_site_category",useSiteCategory);
String typeCode = ""; String typeCode = "";
if(AlertStageEnums.KRJY.toString().equals(alertTypeCode)) { if(AlertStageEnums.KRJY.toString().equals(alertTypeCode)) {
typeCode = AlertStageEnums.KRJY.getCode(); typeCode = AlertStageEnums.KRJY.getId();
} else if(AlertStageEnums.GZWX.toString().equals(alertTypeCode)) { } else if(AlertStageEnums.GZWX.toString().equals(alertTypeCode)) {
typeCode = AlertStageEnums.GZWX.getCode(); typeCode = AlertStageEnums.GZWX.getId();
} else if(AlertStageEnums.TSZX.toString().equals(alertTypeCode)) { } else if(AlertStageEnums.TSZX.toString().equals(alertTypeCode)) {
typeCode = AlertStageEnums.TSZX.getCode(); typeCode = AlertStageEnums.TSZX.getId();
} }
// 警情信息动态数据 // 警情信息动态数据
QueryWrapper<AlertFormValue> queryWrapper = new QueryWrapper<>(); QueryWrapper<AlertFormValue> queryWrapper = new QueryWrapper<>();
...@@ -219,6 +229,7 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc ...@@ -219,6 +229,7 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
String desc = ""; String desc = "";
switch(alertTypeCode) { switch(alertTypeCode) {
case "KRJY" : // 困人救援 case "KRJY" : // 困人救援
dispatchTaskDto.setIsSaveTask(true);
String trappedNum = dynamicParms.get("trapped_num"); String trappedNum = dynamicParms.get("trapped_num");
String trappedFloorNum = dynamicParms.get("trapped_floor_num"); String trappedFloorNum = dynamicParms.get("trapped_floor_num");
String isLight = dynamicParms.get("is_light"); String isLight = dynamicParms.get("is_light");
...@@ -228,10 +239,12 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc ...@@ -228,10 +239,12 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
content = content.replace("$is_light",isLight).replace("$trapped_time",trappedTime); content = content.replace("$is_light",isLight).replace("$trapped_time",trappedTime);
break; break;
case "GZWX" : // 故障维修 case "GZWX" : // 故障维修
dispatchTaskDto.setIsSaveTask(false);
desc = dynamicParms.get("desc"); desc = dynamicParms.get("desc");
content = content.replace("$use_unit",useUnit).replace("$desc",desc); content = content.replace("$use_unit",useUnit).replace("$desc",desc);
break; break;
case "TSZX" : // 投诉咨询 case "TSZX" : // 投诉咨询
dispatchTaskDto.setIsSaveTask(false);
desc = dynamicParms.get("desc"); desc = dynamicParms.get("desc");
content = content.replace("$emergency_call",emergencyCall).replace("$contact_phone",contactPhone); content = content.replace("$emergency_call",emergencyCall).replace("$contact_phone",contactPhone);
content = content.replace("$use_unit",useUnit).replace("$desc",desc); content = content.replace("$use_unit",useUnit).replace("$desc",desc);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/ESAlertCalledService.java
View file @ d6d191a6
...@@ -190,7 +190,7 @@ public class ESAlertCalledService { ...@@ -190,7 +190,7 @@ public class ESAlertCalledService {
} }
//警情类型一致 //警情类型一致
BoolQueryBuilder qb4 = QueryBuilders.boolQuery() BoolQueryBuilder qb4 = QueryBuilders.boolQuery()
.must(QueryBuilders.termQuery("alarmTypeCode.keyword", alertCalled.getAlarmTypeCode())); .must(QueryBuilders.termQuery("alarmTypeCode", alertCalled.getAlarmTypeCode()));
boolMust.should(qb4); boolMust.should(qb4);
//使用单位名称一致 //使用单位名称一致
if (!ValidationUtil.isEmpty(alertCalled.getUseUnit())) if (!ValidationUtil.isEmpty(alertCalled.getUseUnit()))
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/RepairConsultServiceImpl.java
View file @ d6d191a6
...@@ -9,6 +9,7 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledDto; ...@@ -9,6 +9,7 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledFormDto; import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledFormDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.DispatchPaperFormDto; import com.yeejoin.amos.boot.module.tzs.api.dto.DispatchPaperFormDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.RepairConsultDto; import com.yeejoin.amos.boot.module.tzs.api.dto.RepairConsultDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.RescueProcessDto;
import com.yeejoin.amos.boot.module.tzs.api.entity.AlertFormValue; import com.yeejoin.amos.boot.module.tzs.api.entity.AlertFormValue;
import com.yeejoin.amos.boot.module.tzs.api.entity.DispatchTask; import com.yeejoin.amos.boot.module.tzs.api.entity.DispatchTask;
import com.yeejoin.amos.boot.module.tzs.api.entity.RepairConsult; import com.yeejoin.amos.boot.module.tzs.api.entity.RepairConsult;
...@@ -59,6 +60,9 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai ...@@ -59,6 +60,9 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
@Autowired @Autowired
DispatchTaskServiceImpl dispatchTaskServiceImpl; DispatchTaskServiceImpl dispatchTaskServiceImpl;
@Autowired
RescueProcessServiceImpl rescueProcessServiceImpl;
/** /**
* 列表查询 示例 * 列表查询 示例
*/ */
...@@ -67,7 +71,7 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai ...@@ -67,7 +71,7 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
} }
@Override @Override
public Boolean saveRepairConsultByAlertIdType(Long alertId, String type, Long taskId) { public Boolean saveRepairConsultByAlertIdType(Long alertId, String type, Long taskId,AgencyUserModel user) {
Boolean flag = false; Boolean flag = false;
RepairConsult repairConsult = new RepairConsult(); RepairConsult repairConsult = new RepairConsult();
repairConsult.setParentId(alertId); repairConsult.setParentId(alertId);
...@@ -84,19 +88,23 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai ...@@ -84,19 +88,23 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String createTime = sdf.format(new Date()); String createTime = sdf.format(new Date());
if("JJ".equals(type)) { if("JJ".equals(type)) {
String createUser = getUser().getUserName(); String createUser = user.getUserName();
String emergency_call = alertCalledVo.getEmergencyCall(); String emergency_call = alertCalledVo.getEmergencyCall();
String area = alertCalledVo.getAddress(); String area = alertCalledVo.getAddress();
String alertType = alertCalledVo.getAlarmType(); String alertType = alertCalledVo.getAlarmType();
content = content.replace("$createTime",createTime).replace("$createUser",createUser).replace("$call",emergency_call); content = content.replace("$createTime",createTime).replace("$createUser",createUser).replace("$call",emergency_call);
content = content.replace("$area",area).replace("$alertType",alertType); content = content.replace("$area",area).replace("$alertType",alertType);
} else if("PQ".equals(type)) { } else if("PQ".equals(type)) {
String createUser = getUser().getUserName(); String createUser = user.getUserName();
DispatchTask dispatchTask = dispatchTaskServiceImpl.getById(taskId); DispatchTask dispatchTask = dispatchTaskServiceImpl.getById(taskId);
String unit = dispatchTask.getResponseOrgName(); String unit = dispatchTask.getResponseOrgName();
String person = dispatchTask.getResponseUserName(); String person = dispatchTask.getResponseUserName();
String phone = dispatchTask.getResponseUserTel(); String phone = dispatchTask.getResponseUserTel();
if("119".equals(unit)) {
person = "";
phone = "";
}
String taskType = ""; String taskType = "";
if("960".equals( alertCalledVo.getAlarmTypeCode())) { if("960".equals( alertCalledVo.getAlarmTypeCode())) {
taskType = "救援任务单"; taskType = "救援任务单";
...@@ -110,31 +118,18 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai ...@@ -110,31 +118,18 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
} else if("DD".equals(type)) { } else if("DD".equals(type)) {
DispatchTask dispatchTask = dispatchTaskServiceImpl.getById(taskId); DispatchTask dispatchTask = dispatchTaskServiceImpl.getById(taskId);
String person = dispatchTask.getResponseUserName(); String person = dispatchTask.getResponseUserName();
DispatchPaperFormDto dispatchPaperFormDto = dispatchPaperServiceImpl.selectDispatchPaperDtoByAlertId(alertId); RescueProcessDto rescueProcessDto = rescueProcessServiceImpl.getProcessByAlertId(alertId);
List<AlertFormValue> dynamicForm = dispatchPaperFormDto.getDynamicFormAlert(); String FKFS = rescueProcessDto.getArriveFeedbackType();
content = content.replace("$createTime",createTime).replace("$person",person); content = content.replace("$FKFS",FKFS);
dynamicForm.stream().forEach(alertFormValue -> {
if("arrive_feedback_type".equals(alertFormValue.getFieldCode())) {
String FKFS = alertFormValue.getFieldValue();
repairConsult.setDescription(FKFS);
}
});
content = content.replace("$FKFS",repairConsult.getDescription());
} else if("JC".equals(type)) { } else if("JC".equals(type)) {
DispatchTask dispatchTask = dispatchTaskServiceImpl.getById(taskId); DispatchTask dispatchTask = dispatchTaskServiceImpl.getById(taskId);
String person = dispatchTask.getResponseUserName(); String person = dispatchTask.getResponseUserName();
DispatchPaperFormDto dispatchPaperFormDto = dispatchPaperServiceImpl.selectDispatchPaperDtoByAlertId(alertId);
List<AlertFormValue> dynamicForm = dispatchPaperFormDto.getDynamicFormAlert();
Map<String,String> tempMap = new HashMap<String,String>();
content = content.replace("$createTime",createTime).replace("$person",person); content = content.replace("$createTime",createTime).replace("$person",person);
dynamicForm.stream().forEach(alertFormValue -> { RescueProcessDto rescueProcessDto = rescueProcessServiceImpl.getProcessByAlertId(alertId);
if("arrive_feedback_type".equals(alertFormValue.getFieldCode())) { String FKFS = rescueProcessDto.getArriveFeedbackType();
tempMap.put("FKFS",alertFormValue.getFieldValue()); content = content.replace("$FKFS",FKFS);
}
});
content = content.replace("$FKFS",tempMap.get("FKFS"));
} else if("JYHF".equals(type)) { } else if("JYHF".equals(type)) {
String createUser = getUser().getUserName(); String createUser = user.getUserName();
String create = alertCalledVo.getEmergencyPerson(); String create = alertCalledVo.getEmergencyPerson();
content = content.replace("$createTime",createTime).replace("$createUser",createUser).replace("$create",create); content = content.replace("$createTime",createTime).replace("$createUser",createUser).replace("$create",create);
} else if("WXFK".equals(type)) { } else if("WXFK".equals(type)) {
...@@ -172,8 +167,7 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai ...@@ -172,8 +167,7 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
} else if("TSRFK".equals(type)) { } else if("TSRFK".equals(type)) {
DispatchTask dispatchTask = dispatchTaskServiceImpl.getById(taskId); DispatchTask dispatchTask = dispatchTaskServiceImpl.getById(taskId);
String person = dispatchTask.getResponseUserName(); String person = dispatchTask.getResponseUserName();
String fix_result = content = content.replace("$createTime",createTime).replace("$person",person);
content = content.replace("$createTime",createTime).replace("$person",person);
DispatchPaperFormDto dispatchPaperFormDto = dispatchPaperServiceImpl.selectDispatchPaperDtoByAlertId(alertId); DispatchPaperFormDto dispatchPaperFormDto = dispatchPaperServiceImpl.selectDispatchPaperDtoByAlertId(alertId);
List<AlertFormValue> dynamicForm = dispatchPaperFormDto.getDynamicFormAlert(); List<AlertFormValue> dynamicForm = dispatchPaperFormDto.getDynamicFormAlert();
Map<String,String> tempMap = new HashMap<String,String>(); Map<String,String> tempMap = new HashMap<String,String>();
...@@ -194,25 +188,7 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai ...@@ -194,25 +188,7 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
return flag; return flag;
} }
private AgencyUserModel getUser() {
ReginParams reginParams =
JSONObject.parseObject(null != redisUtils.get(buildKey(getToken())) ?
redisUtils.get(buildKey(getToken())).toString() : null, ReginParams.class);
return reginParams.getUserModel();
}
protected String buildKey(String token) {
// 由于用户id 不是接口携带参数，为了避免，公共字段填充时频繁访问平台，缓存用户信息时，
return "region_" + token;
}
/**
* 获取token
**/
protected String getToken() {
return RequestContext.getToken();
}
} }
\ No newline at end of file
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/RescueProcessServiceImpl.java
View file @ d6d191a6
...@@ -52,6 +52,9 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu ...@@ -52,6 +52,9 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
@Autowired @Autowired
private AlertFormValueServiceImpl iAlertFormValueService; private AlertFormValueServiceImpl iAlertFormValueService;
@Autowired
RepairConsultServiceImpl repairConsultServiceImpl;
/** /**
* 分页查询 * 分页查询
*/ */
...@@ -105,12 +108,13 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu ...@@ -105,12 +108,13 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
// 创建派遣单 // 创建派遣单
DispatchTaskDto dispatchTaskDto = new DispatchTaskDto(); DispatchTaskDto dispatchTaskDto = new DispatchTaskDto();
dispatchTaskDto.setDispatchTime(rescueProcessDto.getDispatchTime()); dispatchTaskDto.setDispatchTime(rescueProcessDto.getDispatchTime());
dispatchTaskDto.setOrgTypeCode(DispatchPaperEnums.getEnum("levelThreeUnit").getCode()); dispatchTaskDto.setOrgTypeCode(DispatchPaperEnums.getEnumByCode("levelThreeUnit").getId());
dispatchTaskDto.setOrgType(DispatchPaperEnums.getEnumByCode("levelThreeUnit").getValue());
dispatchTaskDto.setAlertId(rescueProcessDto.getAlertId()); dispatchTaskDto.setAlertId(rescueProcessDto.getAlertId());
dispatchTaskDto.setResponseOrgName("119"); dispatchTaskDto.setResponseOrgName("119");
dispatchTaskDto.setResponseUserName("119"); dispatchTaskDto.setResponseUserName("119");
DispatchTask dispatchTask = BeanDtoVoUtils.convert(dispatchTaskDto, DispatchTask.class); DispatchTask dispatchTask = BeanDtoVoUtils.convert(dispatchTaskDto, DispatchTask.class);
dispatchTask.setPaperId(dispatchPaperDto.getSequenceNbr()); dispatchTask.setPaperId(dispatchPaper.getSequenceNbr());
Boolean flag = dispatchTaskServiceImpl.save(dispatchTask); Boolean flag = dispatchTaskServiceImpl.save(dispatchTask);
if (flag) { // 创建好派遣任务单以后根据任务单类型修改派遣单信息 if (flag) { // 创建好派遣任务单以后根据任务单类型修改派遣单信息
if (dispatchPaper.getRepairOrgId() != null) { // 已经派遣过调派 if (dispatchPaper.getRepairOrgId() != null) { // 已经派遣过调派
...@@ -130,11 +134,43 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu ...@@ -130,11 +134,43 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
} }
}); });
} }
// 保存派遣单 // 更新派遣单
dispatchPaperServiceImpl.save(dispatchPaper); dispatchPaperServiceImpl.updateById(dispatchPaper);
// 保存动态表单数据 // 保存动态表单数据
iAlertFormValueService.saveBatch(dynamicFormAlert); iAlertFormValueService.updateBatchById(dynamicFormAlert);
// 记录日志
repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchTask.getAlertId(),"PQ", dispatchTask.getSequenceNbr(),sendUser);
}
}
if(rescueProcessDto.getArriveByUser()) { // 手动到达
DispatchPaperFormDto dispatchPaperDto = dispatchPaperServiceImpl.selectDispatchPaperDtoByAlertId(rescueProcessDto.getAlertId());
if (dispatchPaperDto == null || dispatchPaperDto.getDispatchPaper() == null) {
throw new BadRequest("派遣单信息未找到");
}
// 如果存在三级响应id 则默认三级响应 否则为使用单位
Long taskId = dispatchPaperDto.getDispatchPaper().getRepairOrgTaskId();
if(taskId == null) {
taskId = dispatchPaperDto.getDispatchPaper().getUseOrgTaskId();
}
if(taskId == null) {
throw new BadRequest("派遣任务单信息未找到");
}
repairConsultServiceImpl.saveRepairConsultByAlertIdType( rescueProcessDto.getAlertId(),"DD",taskId,sendUser); //保存接警日志
}
if(rescueProcessDto.getSaveByUser()) { // 手动救援
DispatchPaperFormDto dispatchPaperDto = dispatchPaperServiceImpl.selectDispatchPaperDtoByAlertId(rescueProcessDto.getAlertId());
if (dispatchPaperDto == null || dispatchPaperDto.getDispatchPaper() == null) {
throw new BadRequest("派遣单信息未找到");
}
// 如果存在三级响应id 则默认三级响应 否则为使用单位
Long taskId = dispatchPaperDto.getDispatchPaper().getRepairOrgTaskId();
if(taskId == null) {
taskId = dispatchPaperDto.getDispatchPaper().getUseOrgTaskId();
}
if(taskId == null) {
throw new BadRequest("派遣任务单信息未找到");
} }
repairConsultServiceImpl.saveRepairConsultByAlertIdType(rescueProcessDto.getAlertId(),"JC",taskId,sendUser); //保存接警日志
} }
rescueProcessDto.setSequenceNbr(rescueProcess.getSequenceNbr()); rescueProcessDto.setSequenceNbr(rescueProcess.getSequenceNbr());
rescueProcessDto.setRecDate(rescueProcess.getRecDate()); rescueProcessDto.setRecDate(rescueProcess.getRecDate());
......
amos-boot-system-tzs/src/main/resources/application-dev.properties
View file @ d6d191a6
...@@ -39,3 +39,5 @@ emqx.password=a123456 ...@@ -39,3 +39,5 @@ emqx.password=a123456
## redisʱʱ ## redisʱʱ
redis.cache.failure.time=10800 redis.cache.failure.time=10800
failure.work.flow.processDefinitionKey=malfunction_repair
\ No newline at end of file
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