Skip to content

A
amos-boot-biz
Commit bdc92b74 authored by tangwei's avatar tangwei
Browse files
Options

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

parents 4949ea6f afce51b8
Hide whitespace changes
Inline Side-by-side
Showing with 155 additions and 45 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/OrgUsrMapper.java
View file @ bdc92b74
......@@ -23,6 +23,9 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
List<Map<String, Object>> selectPersonList(@Param("map")Map<String, Object> map);
//BUG 2880 by litw start 2021年9月16日
List<OrgUsr> selectAllChildrenList(@Param("map")Map<String, Object> map);
List<OrgUsr> selectCompanyDepartmentMsg();
List<Map<String, Object>> selectPersonAllList(Map<String, Object> map);
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml
View file @ bdc92b74
......@@ -94,6 +94,21 @@
LIMIT #{map.pageNum}, #{map.pageSize}
</select>
<!--机场单位查询机构下所有子数据 2021-09-16 by litw -->
<select id="selectAllChildrenList" resultType="com.yeejoin.amos.boot.module.common.api.entity.OrgUsr">
select
u.sequence_nbr sequenceNbr,
u.biz_org_name bizOrgName,
u.biz_org_code bizOrgCode
FROM
cb_org_usr u
where
u.is_delete = 0
<if test="map.bizOrgCode != null and map.bizOrgCode != '-1'">
AND u.biz_org_code like concat(#{map.bizOrgCode}, '%')
</if>
</select>
<select id="selectPersonAllList" resultType="Map">
select * from (
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/WaterResourceMapper.xml
View file @ bdc92b74
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yeejoin.amos.boot.module.common.api.mapper.WaterResourceMapper">
<!--BUG 2919 消防水源导出没有设施定义 分类名称 设施编码 维保周期 by kongfm 2021-09-16 -->
<select id="exportToExcel" resultType="com.yeejoin.amos.boot.module.common.api.dto.WaterResourceDto">
select r.name,
r.address,
......@@ -16,6 +16,10 @@
r.reality_img,
r.contact_user,
r.contact_phone,
r.equip_name,
r.equip_category_name,
r.equip_code,
r.maintenance_period,
(case r.resource_type when 'crane' then rc.height when 'natural' then rn.height end) height,
(case r.resource_type
when 'crane' then rc.status
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgPersonController.java
View file @ bdc92b74
......@@ -7,8 +7,12 @@ import com.yeejoin.amos.boot.module.common.api.dto.*;
import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
import com.yeejoin.amos.boot.module.common.api.excel.ExcelUtil;
import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.paho.client.mqttv3.MqttException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
......@@ -165,12 +169,22 @@ public class OrgPersonController {
@RequestMapping(value = "/{orgCode}/users", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据orgCode查询", notes = "根据orgCode查询")
public ResponseModel<Collection<OrgUsr>> selectUsersByOrgCode(HttpServletRequest request, String pageNum,
String pageSize, @PathVariable Long orgCode) {
String pageSize, @PathVariable String orgCode) {
Map<String, Object> columnMap = new HashMap<>();
columnMap.put("is_delete", CommonConstant.IS_DELETE_00);
columnMap.put("biz_org_code", orgCode);
columnMap.put("biz_org_type", CommonConstant.BIZ_ORG_TYPE_PERSON);
return ResponseHelper.buildResponse(iOrgUsrService.listByMap(columnMap));
Collection<OrgUsr> temp = iOrgUsrService.listByMap(columnMap);
temp.stream().forEach(t -> {
// BUG2886 因为前期沟通 人员code 可能会发生改变 所以 现在接口code 不再保存，查询数据时通过接口重新赋值 by kongfm 2021-09-16
if(StringUtils.isNotEmpty(t.getAmosOrgId())) {
FeignClientResult<AgencyUserModel> result1 = Privilege.agencyUserClient.queryByUserId(t.getAmosOrgId());
if(null !=result1.getResult()) {
t.setAmosOrgCode(result1.getResult().getRealName());
}
}
});
return ResponseHelper.buildResponse(temp);
}
/**
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java
View file @ bdc92b74
package com.yeejoin.amos.boot.module.common.biz.service.impl;
import java.io.Serializable;
import java.lang.reflect.Method;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
......@@ -363,8 +364,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
}
/*BUG2680 查询部门人员错误 传递参数类型不正确 修改为string 2021-09-14 陈召 开始*/
if (req.get("parentId") != null && req.get("parentId") != ""){
OrgUsr parent = this.getById(req.get("parentId").toString());
map.put("bizOrgCode", ObjectUtils.isEmpty(parent) ? null : parent.getBizOrgCode());
OrgUsr parent = this.getById(req.get("parentId").toString());
map.put("bizOrgCode", ObjectUtils.isEmpty(parent) ? null : parent.getBizOrgCode());
}
/*BUG2680 查询部门人员错误 传递参数类型不正确 修改为string 2021-09-14 陈召 开始*/
......@@ -379,7 +380,16 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
map.put("pageNum", (pageBean.getCurrent() - 1) * pageBean.getSize());
map.put("pageSize", pageBean.getSize());
List<Map<String, Object>> list = this.baseMapper.selectPersonList(map);
list.stream().forEach(t -> {
// BUG2886 因为前期沟通 人员code 可能会发生改变 所以 现在接口code 不再保存，查询数据时通过接口重新赋值 by kongfm 2021-09-16
if(null != t.get("amosOrgId") && StringUtils.isNotEmpty(t.get("amosOrgId").toString())) {
FeignClientResult<AgencyUserModel> result1 = Privilege.agencyUserClient.queryByUserId(t.get("amosOrgId").toString());
if(null !=result1.getResult()) {
t.put("amosOrgCode",result1.getResult().getRealName());
}
}
});
/*Bug2652 根据名字和工号模糊查询失效 已添加模糊匹配 2021-09-01 陈召 结束*/
pageBean.setRecords(list);
return pageBean;
......@@ -543,7 +553,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
Map<String, Object> result = new HashMap<>();
// 机场人员AMOS角色丢失修正, by litw start 2021年9月10日
if(null != orgUsr.getAmosOrgId()) {
if(StringUtils.isNotEmpty(orgUsr.getAmosOrgId())) {
FeignClientResult<AgencyUserModel> result1 = Privilege.agencyUserClient.queryByUserId(orgUsr.getAmosOrgId());
if(null !=result1.getResult()) {
orgUsr.setAmosOrgCode(result1.getResult().getRealName());
......@@ -662,6 +672,16 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
}
orgUsr.setSequenceNbr(id);
// 查询机构下的所有部门单位人员数据，进行bizOrgCode的统一修改 BUG 2880 by litw start 2021年9月16日
String oriOrgCode = oriOrgUsr.getBizOrgCode();
Map<String, Object> columnMap = new HashMap<>();
columnMap.put("bizOrgCode", oriOrgCode);
List<OrgUsr> list = orgUsrMapper.selectAllChildrenList(columnMap);
list.stream().forEach(e->{
e.setBizOrgCode(e.getBizOrgCode().replace(oriOrgCode,orgUsr.getBizOrgCode()));
});
this.updateBatchById(list);
/*单位编辑后 code值也应做出修改 2021-09-09 陈召 结束 */
saveOrgUsr(orgUsr, oriOrgUsr);
// 保存动态表单数据
......@@ -768,6 +788,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
@Override
public OrgPersonFormDto selectPersonByIdDetail(Long id) throws Exception {
OrgUsr orgUsr = getById(id);
// 动态表单数据
List<FormValue> formValue = getFormValueDetail(id);
OrgPersonFormDto orgPersonFormVo = new OrgPersonFormDto(formValue);
......@@ -788,6 +809,15 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
columnMap.put("is_delete", CommonConstant.IS_DELETE_00);
columnMap.put("biz_org_type", CommonConstant.BIZ_ORG_TYPE_PERSON);
Collection<OrgUsr> list = listByMap(columnMap);
// list.stream().forEach(t-> {
// // BUG2886 因为前期沟通 人员code 可能会发生改变 所以 现在接口code 不再保存，查询数据时通过接口重新赋值 by kongfm 2021-09-16
// if(StringUtils.isNotEmpty(t.getAmosOrgId())) {
// FeignClientResult<AgencyUserModel> result1 = Privilege.agencyUserClient.queryByUserId(t.getAmosOrgId());
// if(null !=result1.getResult()) {
// t.setAmosOrgCode(result1.getResult().getRealName());
// }
// }
// });
return getTree(null, list, OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId",
"getBizOrgType");
}
......@@ -1016,19 +1046,19 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
if (ObjectUtils.isEmpty(ids)) {
return null;
}
return ids.stream().map(m -> {
List<CompanyPerson> tempList = new ArrayList<CompanyPerson>();
for(Long tempId : ids) {
// BUG 2740 机场单位主键varchar 导致 通过主键搜索返回多条数据 2021 - 09 - 09by kongfm
OrgUsr org = getById(m.toString());
OrgUsr org = getById(tempId.toString());
if (ObjectUtils.isEmpty(org)) {
return null;
continue;
}
CompanyPerson company = new CompanyPerson();
BeanUtils.copyProperties(org, company);
company.setPersons(this.queryForListByParentIdAndOrgType(org.getSequenceNbr(), OrgPersonEnum.人员.getKey()));
return company;
}).filter(c -> {
return c != null;
}).collect(Collectors.toList());
tempList.add(company);
}
return tempList;
}
// BUG 2736 人员导出过滤已经删除的数据by kongfm
......@@ -1038,7 +1068,17 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
}
public List<OrgUsrDto> queryForListByParentIdAndOrgType(Long parentId, String bizOrgType) {
return Bean.toModels(this.list(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getIsDelete,false).eq(OrgUsr::getParentId,parentId).eq(OrgUsr::getBizOrgType,bizOrgType)), this.getModelClass());
// BUG 2843 过滤没有绑定关联账户的user by kongfm 2021-09-16
List<OrgUsr> tempUserList = this.list(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getIsDelete,false).eq(OrgUsr::getParentId,parentId).eq(OrgUsr::getBizOrgType,bizOrgType).isNotNull(OrgUsr::getAmosOrgId));
tempUserList.stream().forEach(m -> {
if( StringUtils.isNotEmpty(m.getAmosOrgId())) {
FeignClientResult<AgencyUserModel> result1 = Privilege.agencyUserClient.queryByUserId(m.getAmosOrgId());
if(null !=result1.getResult()) {
m.setAmosOrgCode(result1.getResult().getRealName());
}
}
});
return Bean.toModels(tempUserList,this.getModelClass());
}
public OrgUsrDto getOrg(String amosUserId) {
......@@ -1455,7 +1495,23 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
return orgUsrList;
}
/**
* 重写getByid 方法 因为前期沟通 人员code 可能会发生改变 所以 现在接口code 不再保存，查询数据时通过接口重新赋值 by kongfm 2021-09-16
* @param id
* @return
*/
@Override
public OrgUsr getById(Serializable id) {
OrgUsr orgUser = this.baseMapper.selectById(id);
// BUG2886 因为前期沟通 人员code 可能会发生改变 所以 现在接口code 不再保存，查询数据时通过接口重新赋值 by kongfm 2021-09-16
if(orgUser != null && StringUtils.isNotEmpty(orgUser.getAmosOrgId())) {
FeignClientResult<AgencyUserModel> result1 = Privilege.agencyUserClient.queryByUserId(orgUser.getAmosOrgId());
if(null !=result1.getResult()) {
orgUser.setAmosOrgCode(result1.getResult().getRealName());
}
}
return orgUser;
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/ExcelController.java
View file @ bdc92b74
......@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
......@@ -86,10 +87,14 @@ public class ExcelController extends BaseController {
ExcelDto excelDto = new ExcelDto(excelEnums.getFileName(), excelEnums.getSheetName(), excelEnums.getClassUrl(), excelEnums.getType());
excelService.commonUpload(multipartFile, excelDto);
return ResponseHelper.buildResponse(null);
} catch (Exception e) {
} catch (RuntimeException e) {
e.printStackTrace();
throw new BadRequest("文件格式不正确或excel 模板不匹配"); // BUG 2821 by litw 2021年9月16日
}catch (Exception e){
throw new RuntimeException("系统异常！");
}
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java
View file @ bdc92b74
......@@ -412,13 +412,11 @@ if (excelDtoList != null && excelDtoList.size() > 0) {
dynamicFormValue.forEach(dynamicFormInstanceDto -> {
switch (dynamicFormInstanceDto.getFieldCode()) {
case "administrativePositionCode":
if (orgUsrExcelDto.getAdministrativePositionCode() != null) {
String[] certificates = orgUsrExcelDto.getAdministrativePositionCode().split("@");
dynamicFormInstanceDto.setFieldValue(certificates[1]);
dynamicFormInstanceDto.setFieldValueLabel(certificates[0]);
}
break;
case "auditCycle":
......@@ -440,23 +438,26 @@ if (excelDtoList != null && excelDtoList.size() > 0) {
}
break;
case "certificateType":
case "certificateType": //持证类别
if (orgUsrExcelDto.getCertificateType() != null) {
String[] certificates = orgUsrExcelDto.getCertificateType().split("@");
dynamicFormInstanceDto.setFieldValue(certificates[1]);
dynamicFormInstanceDto.setFieldValueLabel(certificates[0]);
}
break; // BUG 2892 导入机场单位没有持证类别和 人员性别 处理 by kongfm 2021-09-16
case "fireManagementPostCode":
if (orgUsrExcelDto.getFireManagementPostCode() != null) {
String[] certificates = orgUsrExcelDto.getFireManagementPostCode().split("@");
dynamicFormInstanceDto.setFieldValue(certificates[1]);
dynamicFormInstanceDto.setFieldValueLabel(certificates[0]);
}
break;
case "gender":
dynamicFormInstanceDto.setFieldValue(orgUsrExcelDto.getGender());
if (orgUsrExcelDto.getGender() != null) {// BUG 2892 导入机场单位没有持证类别和 人员性别 处理 by kongfm 2021-09-16
String[] gender = orgUsrExcelDto.getGender().split("@");
dynamicFormInstanceDto.setFieldValue(gender[1]);
dynamicFormInstanceDto.setFieldValueLabel(gender[0]);
}
break;
case "internalPositionCode":
if (orgUsrExcelDto.getInternalPositionCode() != null) {
......
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 @ bdc92b74
......@@ -104,8 +104,8 @@ public class CheckController extends AbstractBaseController {
// @Value("${file.port}")
// private String filePort;
@Value("${file.url}")
private String fileUrl;
// @Value("${file.url}")
// private String fileUrl;
@Value("${amosRefresh.patrol.topic}")
private String patrolTopic;
......@@ -196,7 +196,8 @@ public class CheckController extends AbstractBaseController {
String fileName = "巡检记录图片" + new Date().getTime() + ".zip";
// String rootPath = "http://" + fileIp + ":" + filePort + "/";
for (Map<String, Object> map : list) {
map.put("photoData", fileUrl + map.get("photoData").toString());
// map.put("photoData", fileUrl + map.get("photoData").toString());
map.put("photoData", map.get("photoData").toString());
}
FileHelper.exportZip(list, fileName, response);
}
......@@ -210,7 +211,8 @@ public class CheckController extends AbstractBaseController {
String fileName = "巡检记录图片" + new Date().getTime() + ".zip";
// String rootPath = "http://" + fileIp + ":" + filePort + "/";
for (Map<String, Object> map : list) {
map.put("photoData", fileUrl + map.get("photoData").toString());
// map.put("photoData", fileUrl + map.get("photoData").toString());
map.put("photoData", map.get("photoData").toString());
}
FileHelper.exportZip(list, fileName, response);
}
......
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 @ bdc92b74
......@@ -142,8 +142,8 @@ public class CheckServiceImpl implements ICheckService {
//
// @Value("${file.port}")
// private String filePort;
@Value("${file.url}")
private String fileUrl;
// @Value("${file.url}")
// private String fileUrl;
@Override
public Page<CheckInfoVo> getCheckInfo(String toke,String product,String appKey,CheckInfoPageParam param) {
......@@ -549,7 +549,8 @@ public class CheckServiceImpl implements ICheckService {
PointCheckDetailBo pointCheckDetailBo = list.get(0);
List<CheckShot> pointShot = checkShotDao.findAllByCheckIdAndCheckInputIdAndClassifyId(pointCheckDetailBo.getCheckId(), 0l,0l);
pointShot.forEach(action -> {
pointImgUrls.add(fileUrl + action.getPhotoData());
// pointImgUrls.add(fileUrl + action.getPhotoData());
pointImgUrls.add(action.getPhotoData());
});
Check check = checkDao.findById(checkId).get();
pointCheckRespone.setPointId(pointCheckDetailBo.getPointId());
......@@ -586,7 +587,8 @@ public class CheckServiceImpl implements ICheckService {
List<String> pointInputImgUrls = new ArrayList<>();
List<CheckShot> pointInputShot = checkShotDao.findAllByCheckIdAndCheckInputIdAndClassifyId(pointCheckDetailBo.getCheckId(), action.getCheckInputId(),action.getClassifyId());
pointInputShot.forEach(inputShot -> {
pointInputImgUrls.add(fileUrl + inputShot.getPhotoData());
// pointInputImgUrls.add(fileUrl + inputShot.getPhotoData());
pointInputImgUrls.add(inputShot.getPhotoData());
});
AppCheckInputRespone appCheckInputRespone = new AppCheckInputRespone();
appCheckInputRespone.setCheckInputId(action.getCheckInputId());
......@@ -633,7 +635,8 @@ public class CheckServiceImpl implements ICheckService {
PointCheckDetailBo pointCheckDetailBo = list.get(0);
List<CheckShot> pointShot = checkShotDao.findAllByCheckIdAndCheckInputIdAndClassifyId(pointCheckDetailBo.getCheckId(), 0l,0l);
pointShot.forEach(action -> {
pointImgUrls.add(fileUrl + action.getPhotoData());
// pointImgUrls.add(fileUrl + action.getPhotoData());
pointImgUrls.add(action.getPhotoData());
});
Check check = checkDao.findById(checkId).get();
pointCheckRespone.setPointId(pointCheckDetailBo.getPointId());
......@@ -674,7 +677,8 @@ public class CheckServiceImpl implements ICheckService {
List<String> pointInputImgUrls = new ArrayList<>();
List<CheckShot> pointInputShot = checkShotDao.findAllByCheckIdAndCheckInputIdAndClassifyId(pointCheckDetailBo.getCheckId(), action.getCheckInputId(),action.getClassifyId());
pointInputShot.forEach(inputShot -> {
pointInputImgUrls.add(fileUrl + inputShot.getPhotoData());
// pointInputImgUrls.add(fileUrl + inputShot.getPhotoData());
pointInputImgUrls.add(inputShot.getPhotoData());
});
AppCheckInputRespone appCheckInputRespone = new AppCheckInputRespone();
appCheckInputRespone.setCheckInputId(action.getCheckInputId());
......@@ -765,8 +769,10 @@ public class CheckServiceImpl implements ICheckService {
// String ipPort = "http://" + fileIp + ":" + filePort + "/";
for (Map<String, Object> map : checkimgs) {
String imgPath = map.get("photoData").toString().replace("\\", "/");
map.put("photoData", fileUrl + imgPath);
map.put("openOperUrl", "window.open('" + fileUrl + imgPath + "')");
// map.put("photoData", fileUrl + imgPath);
// map.put("openOperUrl", "window.open('" + fileUrl + imgPath + "')");
map.put("photoData", imgPath);
map.put("openOperUrl", "window.open('" + imgPath + "')");
}
resp.put("imgs", checkimgs);
return resp;
......@@ -1118,8 +1124,8 @@ public class CheckServiceImpl implements ICheckService {
//checkInputId
if (e.get("inputId").toString().equals(imgContent.get(i).get("checkInputId").toString())
&& e.get("classifyId").toString().equals(imgContent.get(i).get("classifyId").toString())) {
photoList.add(fileUrl + imgContent.get(i).get("photoData"));
// photoList.add(fileUrl + imgContent.get(i).get("photoData"));
photoList.add(String.valueOf(imgContent.get(i).get("photoData")));
}
if (PointStatusEnum.UNQUALIFIED.getName().equals(e.get("IsOK").toString())) {
equip.put("IsOK", PointStatusEnum.UNQUALIFIED.getName());
......@@ -1177,7 +1183,8 @@ public class CheckServiceImpl implements ICheckService {
//checkInputId
if(e.get("checkInputId").toString().equals(imgContent.get(i).get("checkInputId").toString())
&& e.get("classifyId").toString().equals(imgContent.get(i).get("classifyId").toString())){
e.put("photoData",fileUrl+imgContent.get(i).get("photoData"));
// e.put("photoData",fileUrl+imgContent.get(i).get("photoData"));
e.put("photoData",imgContent.get(i).get("photoData"));
}
}
});
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/LatentDangerServiceImpl.java
View file @ bdc92b74
......@@ -179,8 +179,8 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
// @Value("${LatentDanger.flow.photoUrls}")
// private String photoUrlPre;
@Value("${file.url}")
private String fileUrl;
// @Value("${file.url}")
// private String fileUrl;
@Value("${file.url}")
private String fileServerAddress;
......@@ -418,7 +418,8 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
String[] photoUrlsList = photoUrls.split(",");
for (String url : photoUrlsList) {
if (!"".equals(url)){
photoUrlsB.append(fileUrl+url);
// photoUrlsB.append(fileUrl+url);
photoUrlsB.append(url);
photoUrlsB.append(",");
}
}
......@@ -439,7 +440,8 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
record.setExcuteUserId(userId);
record.setExcuteDepartmentId(departmentId);
if(flowJson != null && org.apache.commons.lang3.StringUtils.isNotBlank(flowJson.getString("photoUrls"))){
flowJson.put("photoUrls",fileUrl+flowJson.getString("photoUrls"));
// flowJson.put("photoUrls",fileUrl+flowJson.getString("photoUrls"));
flowJson.put("photoUrls",flowJson.getString("photoUrls"));
}
record.setFlowJson(flowJson != null ? flowJson.toJSONString() : null);
record.setFlowTaskName(taskName);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/TaskServiceImpl.java
View file @ bdc92b74
......@@ -105,8 +105,8 @@ public class TaskServiceImpl implements ITaskService {
// @Value("${LatentDanger.flow.photoUrls}")
// private String photoUrl;
@Value("${file.url}")
private String fileUrl;
// @Value("${file.url}")
// private String fileUrl;
@Override
@Transactional
public Long addNewTask(TaskParam param) {
......@@ -174,7 +174,8 @@ public class TaskServiceImpl implements ITaskService {
List<String> list = new ArrayList<>();
List<String> picList = taskPictureMapper.queryTaskFeedbackPic(feedback.getId());
for (int i = 0; i <picList.size() ; i++) {
list.add(fileUrl+ picList.get(i));
// list.add(fileUrl+ picList.get(i));
list.add(picList.get(i));
}
feedbackBo.setFeedbackPics(list);
feedbackList.add(feedbackBo);
......
amos-boot-system-jcs/src/main/resources/application.properties
View file @ bdc92b74
......@@ -74,7 +74,7 @@ jcs.company.topic.delete=jcs/company/topic/delete
iot.fegin.name=AMOS-API-IOT
equip.fegin.name=AMOS-EQUIPMANAGE
equip.fegin.name=AMOS-EQUIPMANAGE-kfm
## 设备联动服务（车库门、广播、警铃）
control.fegin.name=JCS-API-CONTROL
......
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