Skip to content

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

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

parents bdab12a5 3c28a05f
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 11 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/WaterResourceController.java
View file @ dc202f1f
......@@ -458,16 +458,16 @@ public class WaterResourceController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
public ResponseModel<Page<WaterResourceDto>> queryForPage(@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size, String name,
public ResponseModel<Page<WaterResourceDto>> queryForPage(@RequestParam(value = "pageNum") int pageNum,
@RequestParam(value = "pageSize") int pageSize, String name,
@RequestParam(value = "belongBuildingId", required = false) ArrayList<Long> belongBuildingId,
Long belongFightingSystemId, Long sequenceNbr,
String resourceType,
String classifyId,
String bizOrgCode) {
Page<WaterResourceDto> page = new Page<>();
page.setCurrent(current);
page.setSize(size);
page.setCurrent(pageNum);
page.setSize(pageSize);
/*bug 2913 更换保存方式 存储到公共附件表 chenzhao 2021-10-18 start*/
Page<WaterResourceDto> waterResourceDtoPage = waterResourceServiceImpl.queryForWaterResourcePage(page, name, resourceType,
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/CarController.java
View file @ dc202f1f
......@@ -231,6 +231,7 @@ public class CarController extends AbstractBaseController {
}
});
}
iCarService.refreshStaData();
return iCarService.saveOne(car);
}
......@@ -291,6 +292,7 @@ public class CarController extends AbstractBaseController {
// carInstance = iCarService.saveCar(getUserInfo(), carInstance, carInfo, carpList);
// saveFile(carInstance);视频图片文件后期统一处理
EquipmentSpecificSerivceImpl.registerMqttTopic(car.getIotCode(), equipmentIotMqttReceiveConfig);
iCarService.refreshStaData();
return iCarService.updateOneById(car);
}
......@@ -341,6 +343,7 @@ public class CarController extends AbstractBaseController {
}
}
}
iCarService.refreshStaData();
return new CommonResponse(SUCCESS);
}
}
......@@ -600,6 +603,7 @@ public class CarController extends AbstractBaseController {
@ApiParam(value = "车辆Id", required = true) @PathVariable(value = "carId") String carId,
@ApiParam(value = "灭火剂损耗请求条件", required = false) @RequestBody(required = false) List<ExtinguishantLossRequest> requests) {
try {
iCarService.refreshStaData();
return iCarService.lossExtinguishants(Long.valueOf(carId), requests);
} catch (Exception e) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentSpecificController.java
View file @ dc202f1f
......@@ -71,6 +71,7 @@ public class EquipmentSpecificController extends AbstractBaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "列表分页查询", notes = "补码列表接口,废弃未用到")
public IPage<ComplementCodeVO> saveEquipmentPoint(@RequestBody EquipmentSpecificDTO equipmentSpecific) {
equipmentSpecificSerivce.refreshStaData();
return equipmentSpecificSerivce.selectEquipmentSpecific(equipmentSpecific);
}
......@@ -108,6 +109,7 @@ public class EquipmentSpecificController extends AbstractBaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "修改", notes = "修改")
public EquipmentSpecific updateEquipmentSpecific(@RequestBody EquipmentSpecific equipmentSpecific) {
equipmentSpecificSerivce.refreshStaData();
EquipmentSpecific updateEquipmentSpecific = equipmentSpecificSerivce.updateEquipmentSpecific(equipmentSpecific, getSelectedOrgInfo(), getUserInfo());
if (syncSwitch) {
// TODO 后续判断成功，执行同步
......@@ -247,6 +249,7 @@ public class EquipmentSpecificController extends AbstractBaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation( value = "删除装备相关所有数据", notes = "删除装备相关所有数据")
public ResponseModel delEquipmentBySpecificId(@RequestParam Long specificId) {
equipmentSpecificSerivce.refreshStaData();
return CommonResponseUtil.success(equipmentSpecificSerivce.delEquipmentBySpecificId(specificId));
}
......@@ -259,6 +262,7 @@ public class EquipmentSpecificController extends AbstractBaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation( value = "批量删除装备相关所有数据", notes = "批量删除装备相关所有数据")
public ResponseModel delEquipmentBySpecificId(@RequestBody List<Long> specificIds) {
equipmentSpecificSerivce.refreshStaData();
if(ObjectUtils.isEmpty(specificIds)){
return CommonResponseUtil.failure("参数为空");
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FireFightingSystemController.java
View file @ dc202f1f
......@@ -707,7 +707,6 @@ public class FireFightingSystemController extends AbstractBaseController {
@ApiOperation(value = "获取装备类型和统计值", notes = "获取装备类型和统计值")
@GetMapping(value = "/getEquipmentTypeAndCount/tree")
public Object getEquipmentTypeAndCount( @RequestParam(required = false) String bizOrgCode) throws Exception {
equipmentSpecificSerivce.refreshStaData();
return fireFightingSystemService.getEquipmentTypeAndCount(bizOrgCode);
}
......@@ -719,7 +718,6 @@ public class FireFightingSystemController extends AbstractBaseController {
@ApiOperation(value = "获取车辆类型和统计值", notes = "获取车辆类型和统计值")
@GetMapping(value = "/getCarTypeAndCount/tree")
public Object getCarTypeAndCount( @RequestParam(required = false) String bizOrgCode) throws Exception {
carService.refreshStaData();
return fireFightingSystemService.getCarTypeAndCount(bizOrgCode);
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/CarServiceImpl.java
View file @ dc202f1f
......@@ -1545,7 +1545,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
carForUE4VO.setCarType(equipment.getEquipmentCategory().getName());
// 数据库字段（is_import 0->国产， 1->进口）
carForUE4VO.setIsImport(Boolean.TRUE == car.getIsImport() ? TrueOrFalseEnum.real.desc : TrueOrFalseEnum.fake.desc);
carForUE4VO.setIsImport(Boolean.TRUE.equals(car.getIsImport()) ? TrueOrFalseEnum.real.desc : TrueOrFalseEnum.fake.desc);
carForUE4VO.setBrand(car.getBrand());
QueryWrapper<SystemDic> countryQueryWrapper = new QueryWrapper<>();
countryQueryWrapper.eq("id", car.getCountry());
......@@ -1554,7 +1554,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
carForUE4VO.setStandard(car.getStandard());
ManufacturerInfo manufacturerInfo = iManufacturerInfoService.getById(car.getManufacturerId());
carForUE4VO.setManufacturerName(manufacturerInfo.getName());
carForUE4VO.setCccAuth(Boolean.TRUE == car.getCccAuth() ? TrueOrFalseEnum.real.flag : TrueOrFalseEnum.fake.flag);
carForUE4VO.setCccAuth(Boolean.TRUE.equals(car.getCccAuth()) ? TrueOrFalseEnum.real.flag : TrueOrFalseEnum.fake.flag);
QueryWrapper<SystemDic> chassisCountryQueryWrapper = new QueryWrapper<>();
chassisCountryQueryWrapper.eq("id", car.getChassisCountry());
SystemDic dic = iSystemDicService.getBaseMapper().selectOne(chassisCountryQueryWrapper);
......@@ -1620,7 +1620,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
@Override
public void refreshStaData() {
List<Map<String, Object>> result = this.baseMapper.queryCompanyCarStaData();
result.forEach(m -> redisUtils.set((buildKey(m)), m.get("total")));
result.forEach(m -> redisUtils.set((buildKey(m)), m.get("total"),86400));
}
private String buildKey(Map<String, Object> row) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java
View file @ dc202f1f
......@@ -1589,7 +1589,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
@Override
public void refreshStaData() {
List<Map<String, Object>> result = this.baseMapper.queryCompanyStaData();
result.forEach(m -> redisUtils.set((buildKey(m)), m.get("total")));
result.forEach(m -> redisUtils.set((buildKey(m)), m.get("total"),86400));
}
private String buildKey(Map<String, Object> row) {
......
amos-boot-system-equip/src/main/resources/application.properties
View file @ dc202f1f
......@@ -36,7 +36,7 @@ dutyMode.fegin.name=AMOS-DUTYMODE
riskSource.feign.name=AMOS-AUTOSYS
equipManage.name=AMOS-EQUIPMANAGE
iot.vehicle.track=AMOS-API-IOT
jcs.fegin.name=JCS-chen
jcs.fegin.name=JCS
video.fegin.name=VIDEO
#项目初始化画布id
morphic.projectSeq=1390314016458514433
......
amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml
View file @ dc202f1f
......@@ -2410,5 +2410,30 @@
ALTER TABLE `cb_fire_station` add column `biz_org_name` varchar(104) DEFAULT NULL COMMENT '机构/部门名称';
</sql>
</changeSet>
<changeSet author="chenhao" id="2021-12-28-chenhao-1">
<preConditions onFail="MARK_RAN">
<not>
<columnExists tableName="cb_fire_team" columnName="biz_org_code"/>
</not>
</preConditions>
<comment>modify table cb_fire_team add one columns</comment>
<sql>
ALTER TABLE `cb_fire_team` add column `biz_org_code` varchar(1000) DEFAULT NULL COMMENT '机构编码';
ALTER TABLE `cb_fire_team` add column `biz_org_name` varchar(104) DEFAULT NULL COMMENT '机构/部门名称';
</sql>
</changeSet>
<changeSet author="chenhao" id="2021-12-28-chenhao-2">
<preConditions onFail="MARK_RAN">
<not>
<columnExists tableName="cb_water_resource" columnName="biz_org_code"/>
</not>
</preConditions>
<comment>modify table cb_water_resource add one columns</comment>
<sql>
ALTER TABLE `cb_water_resource` add column `biz_org_code` varchar(1000) DEFAULT NULL COMMENT '机构编码';
ALTER TABLE `cb_water_resource` add column `equip_category_code` varchar(100) DEFAULT NULL COMMENT '设施分类编码';
ALTER TABLE `cb_water_resource` add column `biz_org_name` varchar(104) DEFAULT NULL COMMENT '机构/部门名称';
</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