Skip to content

A
amos-boot-biz
Commit fbf969b9 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 5a0c92e4 8222c978
Show whitespace changes
Inline Side-by-side
Showing with 94 additions and 23 deletions
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/service/impl/WorkflowExcuteServiceImpl.java
View file @ fbf969b9
......@@ -6,7 +6,9 @@ import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.Random;
import java.util.Set;
import com.google.common.collect.Sets;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -55,7 +57,13 @@ public class WorkflowExcuteServiceImpl implements IWorkflowExcuteService {
@Override
public Map<String, Object> checkTaskAuthMap(String processInstanceId, ReginParams userInfo) {
// 获取当前登录用户的角色
String currentLoginUserRole = userInfo.getRole().getRoleName();
// String currentLoginUserRole = userInfo.getRole().getRoleName();
Set<String> roleNameSet = Sets.newHashSet();
userInfo.getUserModel().getOrgRoles().values().forEach(i -> {
i.forEach(e -> {
roleNameSet.add(e.getRoleName());
});
});
String currentLoginUserName = userInfo.getUserModel().getUserName();
Map<String, Object> map = new HashMap<String, Object>();
map.put(WorkFlowEnum.CHECKFLAG.getCode(), false);
......@@ -67,7 +75,7 @@ public class WorkflowExcuteServiceImpl implements IWorkflowExcuteService {
if (WorkFlowEnum.制定计划内容.getCode().equals(detail.getString(WorkFlowEnum.NAME.getCode()))
|| WorkFlowEnum.现场确认.getCode().equals(detail.getString(WorkFlowEnum.NAME.getCode()))) {
String groupName = getFristFlowDetail(processInstanceId);
if (StringUtils.isNotBlank(groupName) && currentLoginUserRole.equals(groupName)) {
if (StringUtils.isNotBlank(groupName) && roleNameSet.contains(groupName)) {
map.put(WorkFlowEnum.TASKID.getCode(), detail.getString(WorkFlowEnum.ID.getCode()));
map.put(WorkFlowEnum.CHECKFLAG.getCode(), true);
map.put(WorkFlowEnum.NAME.getCode(), detail.getString(WorkFlowEnum.NAME.getCode()));
......@@ -104,13 +112,13 @@ public class WorkflowExcuteServiceImpl implements IWorkflowExcuteService {
continue;
}
// 判断当前登录人的角色是不是与流程中设置的当前任务节点权限一致，一致则执行，不一致则退出
if (!defaultExecutionRoleProcess.equals(currentLoginUserRole)) {
if (!roleNameSet.contains(defaultExecutionRoleProcess)) {
continue;
}
map.put(WorkFlowEnum.TASKID.getCode(), detail.getString(WorkFlowEnum.ID.getCode()));
map.put(WorkFlowEnum.CHECKFLAG.getCode(), true);
map.put(WorkFlowEnum.NAME.getCode(), detail.getString(WorkFlowEnum.NAME.getCode()));
map.put(WorkFlowEnum.GROUPNAME.getCode(), currentLoginUserRole);
map.put(WorkFlowEnum.GROUPNAME.getCode(), defaultExecutionRoleProcess);
}
}
return map;
......@@ -224,7 +232,13 @@ public class WorkflowExcuteServiceImpl implements IWorkflowExcuteService {
* @throws Exception
*/
public Object getCurrentUserAllTaskList(String key, ReginParams userInfo) throws Exception {
String currentLoginUserRole = userInfo.getRole().getRoleName();
Set<String> roleNameSet = Sets.newHashSet();
userInfo.getUserModel().getOrgRoles().values().forEach(i -> {
i.forEach(e -> {
roleNameSet.add(e.getRoleName());
});
});
// String currentLoginUserRole = userInfo.getRole().getRoleName();
JSONObject CurrentUserAllTaskResult = null;
try {
//获取该登录用户已经分配到他名下和他对应的角色权限所能执行的任务组
......@@ -240,7 +254,7 @@ public class WorkflowExcuteServiceImpl implements IWorkflowExcuteService {
SpecifyTaskArray.stream().forEach(i -> {
JSONObject json = JSONObject.parseObject(JSONObject.toJSONString(i));
String groupName = getFristFlowDetail(json.getString(WorkFlowEnum.PROCESSINSTANCEID.getCode()));
if (StringUtils.isNotBlank(groupName) && currentLoginUserRole.equals(groupName)) {
if (StringUtils.isNotBlank(groupName) && roleNameSet.contains(groupName)) {
allTaskResultList.add(i);
}
});
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FireStationMapper.java
View file @ fbf969b9
......@@ -23,7 +23,7 @@ public interface FireStationMapper extends BaseMapper<FireStation> {
// 微型消防站按时间倒叙排列add order by cb_fire_station.rec_date desc 2021-09-08 by kongfm
@Select("<script>"
+ "select * ,(SELECT COUNT(*)FROM jc_firestation_jacket WHERE firefighters_id = a.sequence_nbr and is_delete =0) AS eqNum from cb_fire_station a where a.is_delete=0 "
+ "select * ,(SELECT count(i.instance_id) from cb_dynamic_form_instance i where i.field_value = a.sequence_nbr ) As userNum,(SELECT COUNT(*)FROM jc_firestation_jacket WHERE firefighters_id = a.sequence_nbr and is_delete =0) AS eqNum from cb_fire_station a where a.is_delete=0 "
+ "<if test='par.name!=null'> and a.name like CONCAT('%',#{par.name},'%') </if>"
+ "<if test='par.bizCompanyId!=null'> and a.biz_company_id = #{par.bizCompanyId} </if>"
+ "<if test='par.bizCompanyCode!=null'> and a.biz_company_code like CONCAT('',#{par.bizCompanyCode},'%') </if>"
......
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/PowerTransferCompanyResources.java
View file @ fbf969b9
......@@ -45,4 +45,11 @@ public class PowerTransferCompanyResources extends BaseEntity {
@ApiModelProperty(value = "车辆任务状态")
private String carStatus;
@ApiModelProperty(value = "任务状态")
@TableField(exist = false)
private String statusName;
@ApiModelProperty(value = "车辆任务")
@TableField(exist = false)
private String carStatusName;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/PowerTransferCompanyMapper.xml
View file @ fbf969b9
......@@ -35,7 +35,9 @@ GROUP BY
g.dispatch_type,
g.address,
g.is_distribution_agencies,
g.sequence_nbr;
g.sequence_nbr
ORDER BY
g.rec_date desc;
</select>
......
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/PowerTransferCompanyResourcesMapper.xml
View file @ fbf969b9
......@@ -4,20 +4,48 @@
<select id="selectAllPage" resultType="com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled">
<select id="getByPowerTransferCompanyResourId" resultType="com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled">
SELECT
*
a.*
FROM
jc_alert_called a LEFT JOIN jc_power_transfer b on a.sequence_nbr=b.alert_called_id
LEFT JOIN jc_power_transfer_company c on c.power_transfer_id=b.sequence_nbr
LEFT JOIN jc_power_transfer_company_resources d on d.power_transfer_company_id=c.sequence_nbr where d.sequence_nbr= #{id}
LEFT JOIN jc_power_transfer_company_resources d on d.power_transfer_company_id=c.sequence_nbr where c.sequence_nbr= #{id}
</select>
<select id="getByAlertCalledIdCarId" resultType="com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources">
SELECT
d.*
SELECT d.sequence_nbr,
d.power_transfer_company_id,
d.status,
d.type,
d.resources_id,
d.resources_name,
d.resources_num,
d.rec_user_name,
d.rec_user_id,
d.rec_date,
d.car_status,
d.is_delete,
CASE d.status
WHEN 'executing' THEN '未完成'
WHEN 'finished' THEN '已完成'
ELSE '' END statusName,
CASE d.car_status
WHEN "2" THEN "出动"
WHEN "3" THEN "途中"
WHEN "4" THEN "到场"
WHEN "5" THEN "出水"
WHEN "6" THEN "停水"
WHEN "7" THEN "驻防"
WHEN "8" THEN "返队"
WHEN "9" THEN "训练"
WHEN "10" THEN "演练"
WHEN "11" THEN "加油"
WHEN "12" THEN "试车"
ELSE '' END carStatusName
FROM
jc_alert_called a LEFT JOIN jc_power_transfer b on a.sequence_nbr=b.alert_called_id
LEFT JOIN jc_power_transfer_company c on c.power_transfer_id=b.sequence_nbr
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java
View file @ fbf969b9
......@@ -1236,26 +1236,31 @@ public class CommandController extends BaseController {
@TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "getAlertCalledId", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "获取绑定车辆装", notes = "获取绑定车辆装")
public ResponseModel<Object> getAlertCalledId() {
public ResponseModel<UserCar> getAlertCalledId() {
AgencyUserModel agencyUserModel= getUserInfo();
Long id =null;
//获取用户已绑定车辆id、
UserCar userCar=userCarService.selectByAmosUserId(Long.valueOf(agencyUserModel.getUserId()));
return ResponseHelper.buildResponse(userCar);
}
@TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "getAlertCalled", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
@RequestMapping(value = "getAlertCalledData", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "获取当前执行灾情", notes = "获取当前执行灾情")
public ResponseModel<Object> getAlertCalled() {
AgencyUserModel agencyUserModel= getUserInfo();
Long id =null;
//获取用户已绑定车辆id、
UserCar userCar=userCarService.selectByAmosUserId(Long.valueOf(agencyUserModel.getUserId()));
//获取正在进行的灾情
//获取正在进行的灾情null
if(userCar!=null){
AlertCalled alertCalled= powerTransferCompanyResourcesService.getByPowerTransferCompanyResourId(userCar.getCarId());
return ResponseHelper.buildResponse(alertCalled);
}
return ResponseHelper.buildResponse(null);
}
@TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
......@@ -1265,6 +1270,7 @@ public class CommandController extends BaseController {
@PathVariable Long alertCalledId) {
//获取正在进行的灾情
PowerTransferCompanyResources powerTransferCompanyResources= powerTransferCompanyResourcesService.getByAlertCalledIdCarId(alertCalledId,carid);
return ResponseHelper.buildResponse(powerTransferCompanyResources);
}
@TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferCompanyResourcesServiceImpl.java
View file @ fbf969b9
......@@ -38,11 +38,13 @@ public class PowerTransferCompanyResourcesServiceImpl extends BaseService<PowerT
QueryWrapper<PowerTransferCompanyResources> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("status", FireCarStatusEnum.执行中.getCode() );
queryWrapper.eq("resources_id", id );
queryWrapper.eq("resources_id", id.toString() );
PowerTransferCompanyResources alertFormValue = this.getOne(queryWrapper);
if(alertFormValue!=null){
return powerTransferCompanyResourcesMapper.getByPowerTransferCompanyResourId(alertFormValue.getPowerTransferCompanyId());
}
return null;
}
@Override
public PowerTransferCompanyResources getByAlertCalledIdCarId(Long alertCalledId, Long carId) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/CheckServiceImpl.java
View file @ fbf969b9
......@@ -942,12 +942,12 @@ public class CheckServiceImpl implements ICheckService {
List<DepartmentBo> departmentBos = ModelToBo(departmentModels);
for (DepartmentBo d : departmentBos) {
LinkedHashMap<String, Object> dept = new LinkedHashMap<>();
dept.put("id", d.getSequenceNbr());
dept.put("key", d.getSequenceNbr());
dept.put("value", d.getSequenceNbr());
dept.put("id", String.valueOf(d.getSequenceNbr()));
dept.put("key", String.valueOf(d.getSequenceNbr()));
dept.put("value", String.valueOf(d.getSequenceNbr()));
dept.put("state", "open");
dept.put("type", "department");
dept.put("orgCode", d.getSequenceNbr());
dept.put("orgCode", String.valueOf(d.getSequenceNbr()));
dept.put("label", d.getDepartmentName());
dept.put("title", d.getDepartmentName());
dept.put("name", d.getDepartmentName());
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/util/CheckPageParamUtil.java
View file @ fbf969b9
......@@ -147,7 +147,7 @@ public class CheckPageParamUtil {
paramMap.setCheckType(toString(queryRequests.get(i).getValue()));
} else if ("checkStatus".equals(name)) {
paramMap.setCheckStatus(toString(queryRequests.get(i).getValue()));
} else if ("groupId".equals(name)) {
} else if ("deptId".equals(name)) {
paramMap.setGroupId(toString(queryRequests.get(i).getValue()));
} else if ("userId".equals(name)) {
paramMap.setUserId(toString(queryRequests.get(i).getValue()));
......
amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml
View file @ fbf969b9
......@@ -1883,5 +1883,17 @@
</sql>
</changeSet>
<changeSet author="chenzhao" id="2021-10-20">
<preConditions onFail="MARK_RAN">
<tableExists tableName="jc_template" />
</preConditions>
<comment>update data jc_template</comment>
<sql>
UPDATE `jc_template` SET type='120急救' WHERE sequence_nbr=24;
UPDATE `jc_template` SET type='120急救' WHERE sequence_nbr=25;
UPDATE `jc_template` SET content ='【120急救】时间：callTime；地址：address；保障类别：securityCategory；事件概述：eventOverview；备注：remarks；警情阶段：alertStage' WHERE sequence_nbr=23;
</sql>
</changeSet>
</databaseChangeLog>
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