Skip to content

A
amos-boot-biz
Commit 0c52bbe0 authored by lisong's avatar lisong
Browse files
Options

修复小程序企业信息设备信息报错，修复使用信息街道未转义

parent 6317cef4
Hide whitespace changes
Inline Side-by-side
Showing with 191 additions and 9 deletions
amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-api/src/main/java/com/yeejoin/amos/boot/module/app/api/dto/EquipTechParamLiftingModel.java
View file @ 0c52bbe0
......@@ -16,7 +16,7 @@ import java.math.BigDecimal;
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="MidEquipTechParamLiftingDto", description="安全追溯-起重机械Dto")
@ApiModel(value="MidEquipTechParamLiftingDto", description="起重机械参数")
public class EquipTechParamLiftingModel extends BaseDto {
private static final long serialVersionUID = 1L;
......
amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-biz/src/main/java/com/yeejoin/amos/boot/module/app/biz/service/impl/TzsAppService.java
View file @ 0c52bbe0
......@@ -65,6 +65,7 @@ import com.yeejoin.amos.boot.module.app.api.mapper.EquipmentCategoryMapper;
import com.yeejoin.amos.boot.module.app.api.mapper.ViewJgClaimMapper;
import com.yeejoin.amos.boot.module.app.biz.utils.HttpUtils;
import com.yeejoin.amos.boot.module.app.biz.utils.JsonUtils;
import com.yeejoin.amos.boot.module.app.biz.utils.RedisUtil;
import com.yeejoin.amos.boot.module.app.flc.api.feign.IdxFeignService;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.privilege.Privilege;
......@@ -178,6 +179,11 @@ public class TzsAppService {
@Value("classpath:/json/equipCategory.json")
private Resource equipCategory;
@Autowired
private RedisUtil redisUtil;
private static final String STREET = "STREET";
public Map<String, Object> getEquipmentInfo(String record) {
List<DataDictionary> dictionaryList = getDictionary();
List<EquipmentCategory> equipmentCategories = equipmentCategoryMapper.selectList(null);
......@@ -211,16 +217,35 @@ public class TzsAppService {
// 注册
JSONObject registrationJsonObject = new JSONObject();
String equipType = String.valueOf(map.get("EQU_LIST_CODE"));
List registrationList = new ArrayList();
switch (equipType) {
case "4000":
getGroupList(null, record, EquipTechParamLifting.class, EquipTechParamLiftingModel.class, elevatorService, registrationList, false, dictionaryList, equipmentCategories);
break;
case "3000":
getGroupList(null, record, EquipTechParamElevator.class, EquipTechParamElevatorModel.class, elevatorService, registrationList, false, dictionaryList, equipmentCategories);
break;
case "5000":
getGroupList(null, record, EquipTechParamVehicle.class, EquipTechParamVehicleModel.class, vehicleService, registrationList, false, dictionaryList, equipmentCategories);
break;
case "1000":
getGroupList(null, record, EquipTechParamBoiler.class, EquipTechParamBoilerModel.class, boilerService, registrationList, false, dictionaryList, equipmentCategories);
break;
case "2000":
getGroupList(null, record, EquipTechParamVessel.class, EquipTechParamVesselModel.class, vesselService, registrationList, false, dictionaryList, equipmentCategories);
break;
case "8000":
getGroupList(null, record, EquipTechParamPipeline.class, EquipTechParamPipelineModel.class, pipelineService, registrationList, false, dictionaryList, equipmentCategories);
break;
case "6000":
getGroupList(null, record, EquipTechParamRides.class, EquipTechParamRidesModel.class, ridesService, registrationList, false, dictionaryList, equipmentCategories);
break;
case "9000":
getGroupList(null, record, EquipTechParamRopeway.class, EquipTechParamRopewayModel.class, ropewayService, registrationList, false, dictionaryList, equipmentCategories);
break;
}
getGroupList(null, record, RegistrationInfo.class, RegistrationInfoModel.class, registrationInfoService, registrationList, false, dictionaryList, equipmentCategories);
getGroupList(null, record, EquipTechParamBoiler.class, EquipTechParamBoilerModel.class, boilerService, registrationList, false, dictionaryList, equipmentCategories);
getGroupList(null, record, EquipTechParamElevator.class, EquipTechParamElevatorModel.class, elevatorService, registrationList, false, dictionaryList, equipmentCategories);
getGroupList(null, record, EquipTechParamLifting.class, EquipTechParamLiftingModel.class, elevatorService, registrationList, false, dictionaryList, equipmentCategories);
getGroupList(null, record, EquipTechParamPipeline.class, EquipTechParamPipelineModel.class, pipelineService, registrationList, false, dictionaryList, equipmentCategories);
getGroupList(null, record, EquipTechParamRides.class, EquipTechParamRidesModel.class, ridesService, registrationList, false, dictionaryList, equipmentCategories);
getGroupList(null, record, EquipTechParamRopeway.class, EquipTechParamRopewayModel.class, ropewayService, registrationList, false, dictionaryList, equipmentCategories);
getGroupList(null, record, EquipTechParamVehicle.class, EquipTechParamVehicleModel.class, vehicleService, registrationList, false, dictionaryList, equipmentCategories);
getGroupList(null, record, EquipTechParamVessel.class, EquipTechParamVesselModel.class, vesselService, registrationList, false, dictionaryList, equipmentCategories);
getGroupList(null, record, MainParts.class, MainPartsModel.class, mainPartsService, registrationList, false, dictionaryList, equipmentCategories);
getGroupList(null, record, ProtectionDevices.class, ProtectionDevicesModel.class, protectionDevicesService, registrationList, false, dictionaryList, equipmentCategories);
registrationJsonObject.put("title", "注册");
......@@ -480,6 +505,10 @@ public class TzsAppService {
putMap.put(field.getName(), map.get("fieldValue"));
}
}
// 街道信息处理
if (String.valueOf(map.get("fieldKey")).equals("factoryUseSiteStreet")) {
map.put("fieldValue", getStreet(String.valueOf(map.get("fieldValue"))));
}
list.add(map);
}
}
......@@ -534,6 +563,20 @@ public class TzsAppService {
return result;
}
public String getStreet(String code) {
List<LinkedHashMap<String, Object>> streetList = null;
if (redisUtil.hasKey(STREET)) {
streetList = (List<LinkedHashMap<String, Object>>) redisUtil.get(STREET);
}
if (!ObjectUtils.isEmpty(code) && !ObjectUtils.isEmpty(streetList)) {
List<LinkedHashMap<String, Object>> collect = streetList.stream().filter(item -> item.get("regionCode").toString().equals(code)).collect(Collectors.toList());
if (!org.apache.commons.lang3.ObjectUtils.isEmpty(collect)) {
return String.valueOf(collect.get(0).get("regionName"));
}
}
return null;
}
/**
* 获取焊口编号
*
......
amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-biz/src/main/resources/json/appApplyInfo.json 0 → 100644
View file @ 0c52bbe0
{
"appApplyInfo": [
{
"name": "城燃管道",
"appKey": "studio_normalapp_4403119",
"image": "upload/tzs/amos_studio/9C968B74AC9F8C9F21C8E4A284FDEAB4.png"
},
{
"name": "气瓶安全追溯系统",
"appKey": "studio_normalapp_3404491",
"image": "upload/tzs/amos_studio/9C968B74AC9F8C9F21C8E4A284FDEAB4.png"
},
{
"name": "特种设备安全追溯",
"appKey": "studio_normalapp_4391091",
"image": "upload/tzs/amos_studio/9C968B74AC9F8C9F21C8E4A284FDEAB4.png"
}
]
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-biz/src/main/resources/json/equipCategory.json 0 → 100644
View file @ 0c52bbe0
{
"eightCategory": [
{
"name": "电梯",
"code": "3000",
"image": "upload/tzs/common/image/总览电梯.png",
"waitClaim": "0",
"alreadyClaim": "0",
"refuseClaim": "0",
"sum": "0",
"type": "elevator"
},
{
"name": "起重机械",
"code": "4000",
"image": "upload/tzs/common/image/总览起重机械.png",
"waitClaim": "0",
"alreadyClaim": "0",
"refuseClaim": "0",
"sum": "0",
"type": "lifting"
},
{
"name": "场内机动车辆",
"code": "5000",
"image": "upload/tzs/common/image/总览厂车.png",
"waitClaim": "0",
"alreadyClaim": "0",
"refuseClaim": "0",
"sum": "0",
"type": "vehicle"
},
{
"name": "锅炉",
"code": "1000",
"image": "upload/tzs/common/image/总览锅炉.png",
"waitClaim": "0",
"alreadyClaim": "0",
"refuseClaim": "0",
"sum": "0",
"type": "boiler"
},
{
"name": "压力容器",
"code": "2000",
"image": "upload/tzs/common/image/总览压力容器.png",
"waitClaim": "0",
"alreadyClaim": "0",
"refuseClaim": "0",
"sum": "0",
"type": "vessel"
},
{
"name": "压力管道",
"code": "8000",
"image": "upload/tzs/common/image/总览压力管道.png",
"waitClaim": "0",
"alreadyClaim": "0",
"refuseClaim": "0",
"sum": "0",
"type": "pipeline"
},
{
"name": "大型游乐设施",
"code": "6000",
"image": "upload/tzs/common/image/总览游乐设施.png",
"waitClaim": "0",
"alreadyClaim": "0",
"refuseClaim": "0",
"sum": "0",
"type": "rides"
},
{
"name": "客运索道",
"code": "9000",
"image": "upload/tzs/common/image/总览索道.png",
"waitClaim": "0",
"alreadyClaim": "0",
"refuseClaim": "0",
"sum": "0",
"type": "ropeway"
}
],
"other": [
{
"name": "电梯",
"code": "3000"
},
{
"name": "起重机械",
"code": "4000"
},
{
"name": "场内机动车辆",
"code": "5000"
},
{
"name": "锅炉",
"code": "1000"
},
{
"name": "压力容器",
"code": "2000"
},
{
"name": "压力管道",
"code": "8000"
},
{
"name": "大型游乐设施",
"code": "6000"
},
{
"name": "客运索道",
"code": "9000"
}
]
}
\ 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